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 ++++++++- src/data/battle_frontier/battle_tent.h | 3006 ++++++++++++++++++++++++++++++++ 2 files changed, 3810 insertions(+), 24 deletions(-) create mode 100644 src/data/battle_frontier/battle_tent.h (limited to 'src') 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, diff --git a/src/data/battle_frontier/battle_tent.h b/src/data/battle_frontier/battle_tent.h new file mode 100644 index 000000000..d96f8935e --- /dev/null +++ b/src/data/battle_frontier/battle_tent.h @@ -0,0 +1,3006 @@ + +// Slateport Battle Tent. +const u16 gSlateportBattleTentTrainerMons_Jolie[] = +{ + 9, + 10, + 13, + 27, + 35, + 37, + 42, + 44, + 45, + 46, + 63, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Malachi[] = +{ + 9, + 16, + 17, + 27, + 36, + 39, + 42, + 45, + 48, + 49, + 53, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Kelsie[] = +{ + 4, + 5, + 6, + 11, + 28, + 34, + 35, + 37, + 43, + 51, + 53, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Davon[] = +{ + 4, + 5, + 6, + 12, + 26, + 36, + 37, + 38, + 40, + 44, + 46, + 50, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Glenda[] = +{ + 0, + 1, + 17, + 18, + 19, + 22, + 23, + 33, + 42, + 61, + 64, + 65, + 66, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Helena[] = +{ + 18, + 19, + 21, + 38, + 39, + 41, + 42, + 52, + 54, + 58, + 63, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Rodolfo[] = +{ + 0, + 1, + 4, + 5, + 7, + 8, + 18, + 20, + 21, + 37, + 38, + 40, + 62, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Davion[] = +{ + 17, + 23, + 24, + 25, + 31, + 32, + 33, + 34, + 39, + 43, + 44, + 49, + 57, + 69, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Kendall[] = +{ + 4, + 7, + 8, + 9, + 11, + 12, + 13, + 27, + 38, + 40, + 45, + 46, + 47, + 63, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Colten[] = +{ + 0, + 2, + 12, + 22, + 28, + 30, + 35, + 38, + 43, + 44, + 56, + 57, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Irvin[] = +{ + 0, + 1, + 2, + 3, + 14, + 15, + 24, + 25, + 32, + 34, + 39, + 59, + 60, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Shaun[] = +{ + 17, + 18, + 19, + 22, + 29, + 36, + 42, + 48, + 61, + 62, + 66, + 68, + 69, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Kyler[] = +{ + 22, + 23, + 28, + 29, + 31, + 32, + 34, + 39, + 55, + 64, + 65, + 67, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Maggie[] = +{ + 10, + 13, + 17, + 27, + 45, + 46, + 53, + 56, + 61, + 62, + 63, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Stephon[] = +{ + 8, + 10, + 16, + 23, + 29, + 43, + 44, + 60, + 62, + 63, + 68, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Rebecca[] = +{ + 8, + 13, + 21, + 29, + 33, + 41, + 48, + 54, + 59, + 61, + 68, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Reggie[] = +{ + 6, + 7, + 17, + 23, + 24, + 26, + 32, + 36, + 52, + 53, + 57, + 65, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Janae[] = +{ + 0, + 1, + 27, + 28, + 32, + 34, + 36, + 37, + 52, + 53, + 57, + 65, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Caiden[] = +{ + 10, + 14, + 15, + 16, + 20, + 21, + 25, + 30, + 35, + 47, + 48, + 50, + 69, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Kirsten[] = +{ + 10, + 16, + 18, + 19, + 20, + 21, + 25, + 30, + 35, + 39, + 41, + 48, + 69, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Kurtis[] = +{ + 0, + 1, + 36, + 37, + 40, + 46, + 49, + 51, + 64, + 67, + 68, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Stefan[] = +{ + 4, + 5, + 21, + 33, + 37, + 38, + 40, + 51, + 52, + 64, + 65, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Avery[] = +{ + 2, + 3, + 7, + 8, + 22, + 23, + 28, + 29, + 30, + 51, + 67, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Dwane[] = +{ + 14, + 15, + 30, + 43, + 44, + 45, + 46, + 55, + 58, + 59, + 63, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Mckenna[] = +{ + 27, + 29, + 30, + 32, + 36, + 48, + 51, + 52, + 53, + 57, + 67, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Camryn[] = +{ + 5, + 6, + 7, + 8, + 10, + 16, + 17, + 20, + 21, + 37, + 43, + 44, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Natasha[] = +{ + 1, + 3, + 4, + 5, + 9, + 11, + 12, + 20, + 21, + 22, + 51, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Austyn[] = +{ + 25, + 31, + 35, + 37, + 38, + 39, + 50, + 51, + 52, + 58, + 68, + 69, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Donovan[] = +{ + 10, + 16, + 17, + 24, + 25, + 43, + 44, + 47, + 49, + 53, + 59, + 60, + 64, + 65, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Tamia[] = +{ + 2, + 6, + 9, + 13, + 17, + 19, + 20, + 24, + 27, + 29, + 30, + -1 +}; + +const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] = +{ + [0] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("JOLIE"), + .speechBefore = {EC_WORD_WHAT, EC_WORD_WILL, EC_WORD_I, EC_WORD_BE, EC_WORD_TOMORROW, EC_WORD_QUES}, + .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_LIKE, EC_WORD_IT_S, EC_WORD_FRIDAY, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_LIKE, EC_WORD_IT_S, EC_WORD_MONDAY, EC_WORD_ELLIPSIS}, + .monSets = gSlateportBattleTentTrainerMons_Jolie + }, + [1] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("MALACHI"), + .speechBefore = {EC_WORD_BAD, EC_WORD_NEWS, EC_WORD_EXCL, EC_WORD_IT_S, EC_WORD_A, EC_MOVE(SAND_TOMB)}, + .speechWin = {EC_WORD_YEEHAW_EXCL, -1, -1, EC_WORD_I_VE, EC_WORD_DONE, EC_WORD_IT}, + .speechLose = {EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_IN, EC_WORD_THIS, EC_MOVE(SAND_TOMB), EC_WORD_ELLIPSIS}, + .monSets = gSlateportBattleTentTrainerMons_Malachi + }, + [2] = { + .facilityClass = FACILITY_CLASS_TUBER_1, + .trainerName = _("KELSIE"), + .speechBefore = {EC_WORD_GO, EC_WORD_EXCL_EXCL, EC_WORD_MY, EC_WORD_BATH, EC_WORD_POKEMON, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_WORD_YAHOO, EC_WORD_EXCL_EXCL, EC_WORD_MY, EC_WORD_BATH, EC_WORD_POKEMON, EC_WORD_EXCL_EXCL}, + .speechLose = {EC_WORD_GWAH, EC_WORD_EXCL_EXCL, EC_WORD_MY, EC_WORD_BATH, EC_WORD_POKEMON, EC_WORD_EXCL_EXCL}, + .monSets = gSlateportBattleTentTrainerMons_Kelsie + }, + [3] = { + .facilityClass = FACILITY_CLASS_TUBER_2, + .trainerName = _("DAVON"), + .speechBefore = {EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_GREAT, EC_MOVE(WHIRLPOOL), EC_WORD_ISN_T_IT_QUES}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_LIKE, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL}, + .speechLose = {EC_WORD_DON_T, EC_WORD_GET, EC_MOVE2(BEAT_UP), EC_WORD_IN, EC_WORD_THAT, EC_MOVE(WHIRLPOOL)}, + .monSets = gSlateportBattleTentTrainerMons_Davon + }, + [4] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("GLENDA"), + .speechBefore = {EC_WORD_CONVERSATION, EC_WORD_CAN, EC_WORD_WAIT, EC_WORD_UNTIL, EC_WORD_I, EC_WORD_WIN}, + .speechWin = {EC_WORD_FABULOUS, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_ROCK}, + .speechLose = {EC_WORD_NO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_WASN_T, EC_WORD_SERIOUS}, + .monSets = gSlateportBattleTentTrainerMons_Glenda + }, + [5] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("HELENA"), + .speechBefore = {EC_WORD_DOES, EC_WORD_MY, EC_WORD_BEAUTY, EC_WORD_INTIMIDATE, EC_WORD_YOU, EC_WORD_QUES}, + .speechWin = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SORRY, EC_WORD_BUT, EC_WORD_YOU_RE, EC_WORD_BORING}, + .speechLose = {EC_WORD_I, EC_WORD_DO, EC_WORD_SO, EC_WORD_ENJOY, EC_WORD_THIS, EC_WORD_EXCL}, + .monSets = gSlateportBattleTentTrainerMons_Helena + }, + [6] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("RODOLFO"), + .speechBefore = {EC_WORD_GO, EC_WORD_GET, EC_WORD_A, EC_POKEMON(WHISCASH), EC_WORD_FOR, EC_WORD_ME}, + .speechWin = {EC_WORD_AWW, EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_HAVE, EC_WORD_A, EC_POKEMON(WHISCASH)}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_POKEMON(WHISCASH), EC_WORD_BADLY}, + .monSets = gSlateportBattleTentTrainerMons_Rodolfo + }, + [7] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("DAVION"), + .speechBefore = {EC_WORD_GRAAAH, EC_WORD_GRAAAH, EC_WORD_EXCL_EXCL, EC_WORD_GRAAAH, EC_WORD_GRAAAH, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_MOVE2(ROAR), EC_WORD_EXCL, -1, EC_MOVE2(ROAR), EC_WORD_EXCL_EXCL, -1}, + .speechLose = {EC_WORD_URGH, EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, -1, -1, -1}, + .monSets = gSlateportBattleTentTrainerMons_Davion + }, + [8] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("KENDALL"), + .speechBefore = {EC_WORD_A_LITTLE, EC_MOVE2(PETAL_DANCE), EC_WORD_TO, EC_WORD_PLEASE, EC_WORD_YOU, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I, EC_WORD_DO, EC_WORD_THIS, EC_WORD_ONLY, EC_WORD_FOR, EC_WORD_WORK}, + .speechLose = {EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_MOVE2(POUND), EC_WORD_ME, EC_WORD_QUES}, + .monSets = gSlateportBattleTentTrainerMons_Kendall + }, + [9] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("COLTEN"), + .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_RUN, EC_WORD_AROUND}, + .speechWin = {EC_WORD_YAY, EC_WORD_EXCL, EC_WORD_WANT, EC_WORD_TO, EC_WORD_RUN, EC_WORD_QUES}, + .speechLose = {EC_WORD_A, EC_WORD_SWIFT_SWIM, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_GOOD, EC_WORD_TOO}, + .monSets = gSlateportBattleTentTrainerMons_Colten + }, + [10] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("IRVIN"), + .speechBefore = {EC_WORD_HAVE, EC_WORD_A, EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_MOVE(CONFUSE_RAY)}, + .speechWin = {EC_WORD_YAHOO, EC_WORD_MY, EC_MOVE(CONFUSE_RAY), EC_WORD_IS, EC_WORD_THE, EC_WORD_BEST}, + .speechLose = {EC_WORD_GWAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_EXCL}, + .monSets = gSlateportBattleTentTrainerMons_Irvin + }, + [11] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("SHAUN"), + .speechBefore = {EC_WORD_LISTEN, EC_WORD_ELLIPSIS, EC_WORD_YOU, EC_WORD_AREN_T, EC_WORD_VERY, EC_WORD_GOOD}, + .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I, EC_WORD_WAS, EC_WORD_RIGHT}, + .speechLose = {EC_WORD_YES, EC_WORD_YES, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_QUITE, EC_WORD_SOMETHING}, + .monSets = gSlateportBattleTentTrainerMons_Shaun + }, + [12] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("KYLER"), + .speechBefore = {EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_QUES}, + .speechWin = {EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_YAY}, + .speechLose = {EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_WOW}, + .monSets = gSlateportBattleTentTrainerMons_Kyler + }, + [13] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("MAGGIE"), + .speechBefore = {EC_POKEMON(VULPIX), EC_POKEMON(XATU), EC_POKEMON2(UMBREON), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_WORD_ELLIPSIS}, + .speechWin = {EC_POKEMON(NOSEPASS), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_POKEMON(SEVIPER), EC_WORD_EXCL, -1}, + .speechLose = {EC_POKEMON(NOSEPASS), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_POKEMON2(SNORLAX), EC_WORD_ELLIPSIS, EC_WORD_UH_OH}, + .monSets = gSlateportBattleTentTrainerMons_Maggie + }, + [14] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("STEPHON"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_ENJOY, EC_WORD_AN, EC_WORD_EGG}, + .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_ENJOY, EC_WORD_THIS, EC_WORD_TASTY, EC_WORD_VICTORY}, + .speechLose = {EC_WORD_AWFUL, EC_WORD_EXCL_EXCL, -1, EC_WORD_JUST, EC_WORD_AWFUL, EC_WORD_EXCL_EXCL}, + .monSets = gSlateportBattleTentTrainerMons_Stephon + }, + [15] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("REBECCA"), + .speechBefore = {EC_WORD_THAT, EC_WORD_EGG, EC_WORD_HAS, EC_WORD_A, EC_WORD_TASTY, EC_WORD_SHINE}, + .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_EXCL, EC_WORD_SMELL, EC_WORD_THAT, EC_WORD_STENCH}, + .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_STOP, EC_WORD_ELLIPSIS}, + .monSets = gSlateportBattleTentTrainerMons_Rebecca + }, + [16] = { + .facilityClass = FACILITY_CLASS_POKEFAN_1, + .trainerName = _("REGGIE"), + .speechBefore = {EC_WORD_POKEMON, EC_WORD_COME, EC_WORD_BEFORE, EC_WORD_MONEY, EC_WORD_OR, EC_WORD_FAMILY}, + .speechWin = {EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_ME, EC_WORD_STRONG}, + .speechLose = {EC_WORD_THAT_S, EC_WORD_WHY, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_THICK, EC_WORD_ELLIPSIS}, + .monSets = gSlateportBattleTentTrainerMons_Reggie + }, + [17] = { + .facilityClass = FACILITY_CLASS_POKEFAN_2, + .trainerName = _("JANAE"), + .speechBefore = {EC_WORD_I, EC_WORD_JUST, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_TOUGH, EC_WORD_LOOK}, + .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_HOW, EC_WORD_YOU, EC_MOVE2(STRUGGLE), -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_MEAN, EC_WORD_AND, EC_WORD_AWFUL, EC_WORD_TRAINER}, + .monSets = gSlateportBattleTentTrainerMons_Janae + }, + [18] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("CAIDEN"), + .speechBefore = {EC_WORD_MY, EC_MOVE2(CURSE), EC_WORD_WILL, EC_WORD_BREAK, EC_WORD_YOUR, EC_WORD_SPIRIT}, + .speechWin = {EC_MOVE2(CURSE), EC_WORD_QUES, EC_WORD_IT_S, EC_WORD_A, EC_WORD_LIE, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_MY, EC_MOVE2(CURSE), EC_WORD_WILL, EC_WORD_LAST, EC_WORD_FOREVER, -1}, + .monSets = gSlateportBattleTentTrainerMons_Caiden + }, + [19] = { + .facilityClass = FACILITY_CLASS_EXPERT_2, + .trainerName = _("KIRSTEN"), + .speechBefore = {EC_WORD_HUH_QUES, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_YOU, EC_WORD_SAID, EC_WORD_QUES}, + .speechWin = {EC_WORD_HUH_QUES, EC_WORD_STRONG, EC_WORD_BUT, EC_WORD_NOT, EC_WORD_STRONG, EC_WORD_ENOUGH}, + .speechLose = {EC_WORD_HUH_QUES, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_TO, EC_WORD_YOUR, EC_MOVE(STRENGTH)}, + .monSets = gSlateportBattleTentTrainerMons_Kirsten + }, + [20] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("KURTIS"), + .speechBefore = {EC_WORD_SORRY, EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_GET, EC_MOVE2(BEAT_UP)}, + .speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_WE, EC_WORD_WOULD, EC_MOVE2(POUND), EC_WORD_YOU}, + .speechLose = {EC_WORD_HOW, EC_WORD_DID, EC_WORD_I, EC_WORD_GET, EC_MOVE2(BEAT_UP), EC_WORD_QUES}, + .monSets = gSlateportBattleTentTrainerMons_Kurtis + }, + [21] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("STEFAN"), + .speechBefore = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_WANT, EC_WORD_CUTE, EC_WORD_POKEMON, -1}, + .speechWin = {EC_WORD_WHAT, EC_WORD_IS, EC_WORD_IT, EC_WORD_TO, EC_WORD_YOU, EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_KIND, EC_WORD_OF, EC_WORD_AWESOME, EC_WORD_ELLIPSIS, -1}, + .monSets = gSlateportBattleTentTrainerMons_Stefan + }, + [22] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("AVERY"), + .speechBefore = {EC_WORD_TOYS, EC_WORD_EXCL, EC_WORD_I, EC_WORD_NEED, EC_WORD_MORE, EC_WORD_TOYS}, + .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_SOME, EC_WORD_EASY, EC_WORD_MONEY, EC_WORD_FAST}, + .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_WORK, EC_WORD_FOR, EC_WORD_MONEY}, + .monSets = gSlateportBattleTentTrainerMons_Avery + }, + [23] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("DWANE"), + .speechBefore = {EC_WORD_MMM, EC_WORD_TASTY, EC_WORD_ELLIPSIS, EC_WORD_WONDER, EC_WORD_WHAT, EC_WORD_QUES}, + .speechWin = {EC_WORD_MMM, EC_WORD_MMM, EC_WORD_ELLIPSIS, EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_KNOW}, + .speechLose = {EC_WORD_MMM, EC_WORD_MMM, EC_WORD_ELLIPSIS, EC_WORD_OH_YEAH, EC_WORD_THIS_IS_IT_EXCL, -1}, + .monSets = gSlateportBattleTentTrainerMons_Dwane + }, + [24] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("MCKENNA"), + .speechBefore = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_SMALL, EC_WORD_TALK, EC_WORD_LET_S, EC_WORD_GO}, + .speechWin = {EC_WORD_YUP, EC_WORD_THAT_S, EC_WORD_THAT, -1, -1, -1}, + .speechLose = {EC_WORD_KTHX_BYE, -1, -1, -1, -1, -1}, + .monSets = gSlateportBattleTentTrainerMons_Mckenna + }, + [25] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("CAMRYN"), + .speechBefore = {EC_WORD_MR, EC_WORD_JUDGE, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_OUR, EC_WORD_TRUST}, + .speechWin = {EC_WORD_YES_SIR_EXCL, EC_WORD_WE_RE, EC_WORD_NO_1, EC_WORD_IN, EC_WORD_THIS, EC_WORD_CONTEST}, + .speechLose = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_GIVE_UP, EC_WORD_MY, EC_WORD_IDOL, EC_WORD_DREAM}, + .monSets = gSlateportBattleTentTrainerMons_Camryn + }, + [26] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("NATASHA"), + .speechBefore = {EC_WORD_COME_OVER, EC_WORD_TO, EC_WORD_MY, EC_WORD_PLACE, EC_WORD_OK_QUES, -1}, + .speechWin = {EC_WORD_COME_ON, EC_WORD_OVER, EC_WORD_IT, EC_WORD_WILL, EC_WORD_BE, EC_WORD_GREAT}, + .speechLose = {EC_WORD_AWW, EC_WORD_WON_T, EC_WORD_YOU, EC_WORD_COME_OVER, EC_WORD_QUES, -1}, + .monSets = gSlateportBattleTentTrainerMons_Natasha + }, + [27] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("AUSTYN"), + .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_CARE, EC_WORD_HOW, EC_WORD_WE, EC_WORD_MATCH_UP}, + .speechWin = {EC_WORD_HAH, EC_WORD_BACK, EC_WORD_TO, EC_WORD_SCHOOL, EC_WORD_FOR, EC_WORD_YOU}, + .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MY, EC_WORD_LESSONS}, + .monSets = gSlateportBattleTentTrainerMons_Austyn + }, + [28] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("DONOVAN"), + .speechBefore = {EC_WORD_OH, EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_SLIMY, EC_WORD_ALL, EC_WORD_OVER}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_DOWN, EC_WORD_THE, EC_MOVE2(MEGA_DRAIN), EC_WORD_HAHAHA}, + .speechLose = {EC_WORD_I_AM, EC_WORD_NATURALLY, EC_WORD_SLIMY, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM}, + .monSets = gSlateportBattleTentTrainerMons_Donovan + }, + [29] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("TAMIA"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_ANGRY, EC_WORD_WITH, EC_WORD_MY, EC_WORD_FATHER, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_DISLIKE, EC_WORD_MY, EC_WORD_FATHER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_JUST, EC_WORD_SO, EC_WORD_ADORE, EC_WORD_MY, EC_WORD_FATHER}, + .monSets = gSlateportBattleTentTrainerMons_Tamia + } +}; + +const struct FacilityMon gSlateportBattleTentMons[] = +{ + [0] = { + .species = SPECIES_ZIGZAGOON, + .moves = {MOVE_TACKLE, MOVE_CHARM, MOVE_ODOR_SLEUTH, MOVE_PIN_MISSILE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [1] = { + .species = SPECIES_ZIGZAGOON, + .moves = {MOVE_DIG, MOVE_MUD_SPORT, MOVE_TAIL_WHIP, MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [2] = { + .species = SPECIES_BEAUTIFLY, + .moves = {MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_GUST, MOVE_HARDEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [3] = { + .species = SPECIES_DUSTOX, + .moves = {MOVE_POISON_STING, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_GUST}, + .itemTableId = BATTLE_FRONTIER_ITEM_ORAN_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [4] = { + .species = SPECIES_WAILMER, + .moves = {MOVE_ROLLOUT, MOVE_CURSE, MOVE_GROWL, MOVE_WHIRLPOOL}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [5] = { + .species = SPECIES_WAILMER, + .moves = {MOVE_ROLLOUT, MOVE_GROWL, MOVE_WHIRLPOOL, MOVE_WATER_PULSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [6] = { + .species = SPECIES_MARILL, + .moves = {MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [7] = { + .species = SPECIES_WINGULL, + .moves = {MOVE_SUPERSONIC, MOVE_GROWL, MOVE_WING_ATTACK, MOVE_STEEL_WING}, + .itemTableId = BATTLE_FRONTIER_ITEM_METAL_COAT, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAIVE + }, + [8] = { + .species = SPECIES_PELIPPER, + .moves = {MOVE_TWISTER, MOVE_WATER_SPORT, MOVE_GROWL, MOVE_WING_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_FANG, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [9] = { + .species = SPECIES_CACNEA, + .moves = {MOVE_SANDSTORM, MOVE_LEER, MOVE_LEECH_SEED, MOVE_PIN_MISSILE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SPEED, + .nature = NATURE_JOLLY + }, + [10] = { + .species = SPECIES_LOMBRE, + .moves = {MOVE_ASTONISH, MOVE_WATER_GUN, MOVE_FAKE_OUT, MOVE_ABSORB}, + .itemTableId = BATTLE_FRONTIER_ITEM_MIRACLE_SEED, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [11] = { + .species = SPECIES_LOTAD, + .moves = {MOVE_SYNTHESIS, MOVE_NATURE_POWER, MOVE_RAIN_DANCE, MOVE_MEGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [12] = { + .species = SPECIES_SEEDOT, + .moves = {MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_LEECH_SEED, MOVE_BIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_TIMID + }, + [13] = { + .species = SPECIES_NUZLEAF, + .moves = {MOVE_FAKE_OUT, MOVE_NATURE_POWER, MOVE_HARDEN, MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [14] = { + .species = SPECIES_NINJASK, + .moves = {MOVE_FURY_CUTTER, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [15] = { + .species = SPECIES_NINJASK, + .moves = {MOVE_FURY_CUTTER, MOVE_DOUBLE_TEAM, MOVE_SCREECH, MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [16] = { + .species = SPECIES_GRAVELER, + .moves = {MOVE_MUD_SPORT, MOVE_BLOCK, MOVE_ROCK_TOMB, MOVE_MAGNITUDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [17] = { + .species = SPECIES_BALTOY, + .moves = {MOVE_SELF_DESTRUCT, MOVE_ANCIENT_POWER, MOVE_PSYBEAM, MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAIVE + }, + [18] = { + .species = SPECIES_MIGHTYENA, + .moves = {MOVE_BITE, MOVE_ROAR, MOVE_SWAGGER, MOVE_TACKLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [19] = { + .species = SPECIES_MIGHTYENA, + .moves = {MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_SAND_ATTACK, MOVE_POISON_FANG}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [20] = { + .species = SPECIES_LINOONE, + .moves = {MOVE_HEADBUTT, MOVE_TICKLE, MOVE_TAIL_WHIP, MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [21] = { + .species = SPECIES_GOLDEEN, + .moves = {MOVE_WATER_SPORT, MOVE_HORN_ATTACK, MOVE_WATERFALL, MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_CALM + }, + [22] = { + .species = SPECIES_ELECTRIKE, + .moves = {MOVE_BITE, MOVE_SPARK, MOVE_ROAR, MOVE_FLASH}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_MODEST + }, + [23] = { + .species = SPECIES_VOLTORB, + .moves = {MOVE_SPARK, MOVE_ROLLOUT, MOVE_CHARGE, MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, + .nature = NATURE_MILD + }, + [24] = { + .species = SPECIES_ARON, + .moves = {MOVE_DIG, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ENDEAVOR}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [25] = { + .species = SPECIES_ARON, + .moves = {MOVE_MUD_SLAP, MOVE_IRON_TAIL, MOVE_HARDEN, MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [26] = { + .species = SPECIES_TRAPINCH, + .moves = {MOVE_BODY_SLAM, MOVE_FOCUS_ENERGY, MOVE_SAND_TOMB, MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [27] = { + .species = SPECIES_CACNEA, + .moves = {MOVE_INGRAIN, MOVE_SANDSTORM, MOVE_POISON_STING, MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_TIMID + }, + [28] = { + .species = SPECIES_TAILLOW, + .moves = {MOVE_GROWL, MOVE_AERIAL_ACE, MOVE_AGILITY, MOVE_ENDEAVOR}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [29] = { + .species = SPECIES_SWELLOW, + .moves = {MOVE_SUPERSONIC, MOVE_GROWL, MOVE_FOCUS_ENERGY, MOVE_PECK}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [30] = { + .species = SPECIES_GOLBAT, + .moves = {MOVE_ASTONISH, MOVE_GUST, MOVE_MEAN_LOOK, MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SPELL_TAG, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, + .nature = NATURE_TIMID + }, + [31] = { + .species = SPECIES_LOUDRED, + .moves = {MOVE_ASTONISH, MOVE_SCREECH, MOVE_UPROAR, MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [32] = { + .species = SPECIES_SPINDA, + .moves = {MOVE_DIZZY_PUNCH, MOVE_FAINT_ATTACK, MOVE_HYPNOSIS, MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [33] = { + .species = SPECIES_MAGNEMITE, + .moves = {MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SPARK}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_SERIOUS + }, + [34] = { + .species = SPECIES_WHISMUR, + .moves = {MOVE_REST, MOVE_SLEEP_TALK, MOVE_HOWL, MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [35] = { + .species = SPECIES_MAKUHITA, + .moves = {MOVE_SAND_ATTACK, MOVE_KNOCK_OFF, MOVE_ARM_THRUST, MOVE_BELLY_DRUM}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [36] = { + .species = SPECIES_NUMEL, + .moves = {MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_GROWL, MOVE_FOCUS_ENERGY}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_MODEST + }, + [37] = { + .species = SPECIES_BARBOACH, + .moves = {MOVE_MAGNITUDE, MOVE_MUD_SPORT, MOVE_WATER_SPORT, MOVE_WATER_GUN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SEA_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [38] = { + .species = SPECIES_TENTACOOL, + .moves = {MOVE_SCREECH, MOVE_BUBBLE_BEAM, MOVE_ACID, MOVE_BARRIER}, + .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [39] = { + .species = SPECIES_VIGOROTH, + .moves = {MOVE_FOCUS_ENERGY, MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_YAWN}, + .itemTableId = BATTLE_FRONTIER_ITEM_AGUAV_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [40] = { + .species = SPECIES_MAGIKARP, + .moves = {MOVE_TACKLE, MOVE_FLAIL, MOVE_SPLASH, MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_SCALE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [41] = { + .species = SPECIES_SEVIPER, + .moves = {MOVE_LICK, MOVE_POISON_FANG, MOVE_GLARE, MOVE_WRAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [42] = { + .species = SPECIES_SOLROCK, + .moves = {MOVE_ROCK_THROW, MOVE_HARDEN, MOVE_PSYWAVE, MOVE_TACKLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [43] = { + .species = SPECIES_KECLEON, + .moves = {MOVE_PSYBEAM, MOVE_SUBSTITUTE, MOVE_THIEF, MOVE_TAIL_WHIP}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [44] = { + .species = SPECIES_KECLEON, + .moves = {MOVE_FAINT_ATTACK, MOVE_ASTONISH, MOVE_LICK, MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_IAPAPA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [45] = { + .species = SPECIES_SHROOMISH, + .moves = {MOVE_STUN_SPORE, MOVE_TACKLE, MOVE_LEECH_SEED, MOVE_MEGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [46] = { + .species = SPECIES_SHROOMISH, + .moves = {MOVE_ABSORB, MOVE_STUN_SPORE, MOVE_SPORE, MOVE_LEECH_SEED}, + .itemTableId = BATTLE_FRONTIER_ITEM_FIGY_BERRY, + .evSpread = F_EV_SPREAD_ATTACK, + .nature = NATURE_BRAVE + }, + [47] = { + .species = SPECIES_LOMBRE, + .moves = {MOVE_NATURE_POWER, MOVE_ASTONISH, MOVE_GROWL, MOVE_ABSORB}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_LONELY + }, + [48] = { + .species = SPECIES_NUMEL, + .moves = {MOVE_EMBER, MOVE_GROWL, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [49] = { + .species = SPECIES_TRAPINCH, + .moves = {MOVE_FAINT_ATTACK, MOVE_DIG, MOVE_BITE, MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [50] = { + .species = SPECIES_PELIPPER, + .moves = {MOVE_WING_ATTACK, MOVE_SUPERSONIC, MOVE_MIST, MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_WIKI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [51] = { + .species = SPECIES_WINGULL, + .moves = {MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_GROWL, MOVE_ICY_WIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [52] = { + .species = SPECIES_MARILL, + .moves = {MOVE_DOUBLE_EDGE, MOVE_RAIN_DANCE, MOVE_TAIL_WHIP, MOVE_WATER_GUN}, + .itemTableId = BATTLE_FRONTIER_ITEM_GANLON_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [53] = { + .species = SPECIES_SKITTY, + .moves = {MOVE_ASSIST, MOVE_ATTRACT, MOVE_SING, MOVE_CHARM}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [54] = { + .species = SPECIES_SEVIPER, + .moves = {MOVE_SWAGGER, MOVE_WRAP, MOVE_POISON_TAIL, MOVE_HAZE}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BRAVE + }, + [55] = { + .species = SPECIES_GOLBAT, + .moves = {MOVE_BITE, MOVE_TORMENT, MOVE_SCREECH, MOVE_POISON_FANG}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [56] = { + .species = SPECIES_RALTS, + .moves = {MOVE_HYPNOSIS, MOVE_IMPRISON, MOVE_PSYCHIC, MOVE_DREAM_EATER}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_TIMID + }, + [57] = { + .species = SPECIES_SANDSHREW, + .moves = {MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_SAND_TOMB, MOVE_DEFENSE_CURL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, + .evSpread = 0, + .nature = NATURE_HARDY + }, + [58] = { + .species = SPECIES_SWALOT, + .moves = {MOVE_YAWN, MOVE_SLUDGE, MOVE_ENCORE, MOVE_POUND}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_IMPISH + }, + [59] = { + .species = SPECIES_VOLBEAT, + .moves = {MOVE_TACKLE, MOVE_CONFUSE_RAY, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [60] = { + .species = SPECIES_ILLUMISE, + .moves = {MOVE_CHARM, MOVE_TACKLE, MOVE_ENCORE, MOVE_MOONLIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [61] = { + .species = SPECIES_KADABRA, + .moves = {MOVE_DISABLE, MOVE_CONFUSION, MOVE_REFLECT, MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [62] = { + .species = SPECIES_KIRLIA, + .moves = {MOVE_CALM_MIND, MOVE_CONFUSION, MOVE_DOUBLE_TEAM, MOVE_GROWL}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [63] = { + .species = SPECIES_BRELOOM, + .moves = {MOVE_ABSORB, MOVE_TACKLE, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAIVE + }, + [64] = { + .species = SPECIES_PLUSLE, + .moves = {MOVE_SPARK, MOVE_ENCORE, MOVE_THUNDER_WAVE, MOVE_GROWL}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_LONELY + }, + [65] = { + .species = SPECIES_PLUSLE, + .moves = {MOVE_SPARK, MOVE_FAKE_TEARS, MOVE_SUBSTITUTE, MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MILD + }, + [66] = { + .species = SPECIES_ELECTRIKE, + .moves = {MOVE_SPARK, MOVE_CHARGE, MOVE_ROAR, MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_APICOT_BERRY, + .evSpread = F_EV_SPREAD_SPEED, + .nature = NATURE_TIMID + }, + [67] = { + .species = SPECIES_SWABLU, + .moves = {MOVE_SING, MOVE_PECK, MOVE_STEEL_WING, MOVE_SAFEGUARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [68] = { + .species = SPECIES_MACHOP, + .moves = {MOVE_FOCUS_ENERGY, MOVE_VITAL_THROW, MOVE_SEISMIC_TOSS, MOVE_FORESIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [69] = { + .species = SPECIES_MACHOKE, + .moves = {MOVE_FOCUS_ENERGY, MOVE_LEER, MOVE_KARATE_CHOP, MOVE_FORESIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + } +}; + +// Verdanturf Battle Tent. +const u16 gVerdanturfBattleTentTrainerMons_Brenna[] = +{ + 4, + 11, + 13, + 18, + 26, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Dilan[] = +{ + 30, + 37, + 13, + 29, + 42, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Eliana[] = +{ + 6, + 7, + 17, + 18, + 40, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Markus[] = +{ + 6, + 7, + 18, + 24, + 38, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Caitlyn[] = +{ + 0, + 12, + 25, + 28, + 22, + 44, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Desiree[] = +{ + 8, + 12, + 21, + 22, + 31, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Ronald[] = +{ + 1, + 20, + 23, + 25, + 32, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Ashten[] = +{ + 9, + 12, + 27, + 37, + 43, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Gerard[] = +{ + 36, + 7, + 34, + 6, + 40, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Bradly[] = +{ + 26, + 3, + 0, + 2, + 17, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Dennis[] = +{ + 14, + 37, + 2, + 38, + 27, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Prestin[] = +{ + 31, + 28, + 22, + 25, + 44, + 43, + 41, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Ernesto[] = +{ + 33, + 32, + 25, + 35, + 34, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Nala[] = +{ + 1, + 4, + 8, + 11, + 17, + 40, + 34, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Darnell[] = +{ + 0, + 29, + 35, + 37, + 39, + 43, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Ashlyn[] = +{ + 29, + 36, + 32, + 30, + 17, + 6, + 44, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Addison[] = +{ + 0, + 1, + 16, + 31, + 6, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Justine[] = +{ + 0, + 1, + 16, + 36, + 18, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Tyson[] = +{ + 5, + 15, + 22, + 30, + 16, + 39, + 43, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Laila[] = +{ + 5, + 15, + 19, + 24, + 41, + 43, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Waren[] = +{ + 0, + 9, + 10, + 11, + 23, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Tobias[] = +{ + 6, + 7, + 24, + 38, + 40, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Josiah[] = +{ + 8, + 16, + 23, + 34, + 3, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Dion[] = +{ + 14, + 2, + 11, + 39, + 21, + 38, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Kenzie[] = +{ + 18, + 10, + 16, + 26, + 25, + 27, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Lillian[] = +{ + 24, + 34, + 36, + 38, + 5, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Lesley[] = +{ + 26, + 0, + 18, + 13, + 25, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Marquis[] = +{ + 24, + 34, + 5, + 15, + 7, + 42, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Freddy[] = +{ + 18, + 21, + 26, + 29, + 41, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Cecilia[] = +{ + 23, + 26, + 27, + 28, + 31, + -1 +}; + +const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] = +{ + [0] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("BRENNA"), + .speechBefore = {EC_WORD_NO, EC_WORD_DAYS, EC_WORD_GO, EC_WORD_WITHOUT, EC_WORD_MY, EC_MOVE(FAKE_TEARS)}, + .speechWin = {EC_WORD_OH, EC_WORD_THAT_WAS, EC_WORD_SO, EC_WORD_REFRESHING, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_ALL, EC_WORD_I, EC_WORD_EVER, EC_WORD_GET, EC_WORD_IS, EC_MOVE(TORMENT)}, + .monSets = gVerdanturfBattleTentTrainerMons_Brenna + }, + [1] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("DILAN"), + .speechBefore = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_BORED, EC_WORD_I_AM}, + .speechWin = {EC_WORD_LOSING, EC_WORD_ISN_T, EC_WORD_EXCITING, EC_WORD_AT, EC_WORD_ALL, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_EXCITING, EC_WORD_EXCL_EXCL, EC_WORD_BYE_BYE, EC_WORD_TO, EC_WORD_BEING, EC_WORD_BORED}, + .monSets = gVerdanturfBattleTentTrainerMons_Dilan + }, + [2] = { + .facilityClass = FACILITY_CLASS_TUBER_1, + .trainerName = _("ELIANA"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_ON, EC_WORD_A, EC_WORD_VACATION, EC_WORD_SOON}, + .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_GET, EC_WORD_SOME, EC_WORD_MONEY}, + .speechLose = {EC_WORD_NO, EC_WORD_SLEEP, EC_WORD_UNTIL, EC_WORD_I, EC_WORD_GET, EC_WORD_HOME}, + .monSets = gVerdanturfBattleTentTrainerMons_Eliana + }, + [3] = { + .facilityClass = FACILITY_CLASS_TUBER_2, + .trainerName = _("MARKUS"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_SMART, EC_WORD_EXCL, EC_WORD_IF_I_LOSE, EC_WORD_I, EC_MOVE(SELF_DESTRUCT)}, + .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_NON_STOP, EC_MOVE2(EXPLOSION), EC_WORD_OF, EC_WORD_JOY}, + .speechLose = {EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_ELLIPSIS, EC_WORD_TIME, EC_WORD_TO, EC_MOVE(SELF_DESTRUCT)}, + .monSets = gVerdanturfBattleTentTrainerMons_Markus + }, + [4] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("CAITLYN"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_BORED, EC_WORD_OF, EC_WORD_BEING, EC_WORD_AN, EC_WORD_IDOL}, + .speechWin = {EC_WORD_A, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_BEST, EC_WORD_FOR, EC_WORD_HAPPINESS}, + .speechLose = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_BUG, EC_WORD_ME, EC_WORD_AT, EC_WORD_ALL}, + .monSets = gVerdanturfBattleTentTrainerMons_Caitlyn + }, + [5] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("DESIREE"), + .speechBefore = {EC_WORD_DOESN_T, EC_WORD_MY, EC_WORD_BEAUTY, EC_MOVE(ASTONISH), EC_WORD_YOU, EC_WORD_QUES}, + .speechWin = {EC_WORD_DID, EC_WORD_I, EC_WORD_INTIMIDATE, EC_WORD_YOU, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_MY, EC_WORD_BEAUTY, EC_WORD_DID, EC_WORD_NOTHING, EC_WORD_FOR, EC_WORD_YOU}, + .monSets = gVerdanturfBattleTentTrainerMons_Desiree + }, + [6] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("RONALD"), + .speechBefore = {EC_WORD_COME_ON, EC_WORD_I, EC_WORD_WILL, EC_WORD_BATTLE, EC_WORD_SERIOUSLY, -1}, + .speechWin = {EC_WORD_GIVE_UP, EC_WORD_QUES, -1, EC_WORD_THAT_S, EC_WORD_REALLY, EC_WORD_WEAK}, + .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_DO, EC_WORD_A, EC_MOVE2(BATON_PASS)}, + .monSets = gVerdanturfBattleTentTrainerMons_Ronald + }, + [7] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("ASHTEN"), + .speechBefore = {EC_WORD_OH_YEAH, EC_WORD_ANOTHER, EC_WORD_EXCITING, EC_WORD_BATTLE, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_WIMPY, EC_WORD_AND, EC_WORD_BORING}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_AN, EC_WORD_EXCITING, EC_WORD_LOSS, EC_WORD_WOW, EC_WORD_EXCL}, + .monSets = gVerdanturfBattleTentTrainerMons_Ashten + }, + [8] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("GERARD"), + .speechBefore = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_SUPER, EC_MOVE2(TEETER_DANCE), EC_WORD_EXCL}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_HARD, EC_WORD_ELLIPSIS, EC_WORD_AM, EC_WORD_I, EC_WORD_OK_QUES}, + .speechLose = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_FORGIVE, EC_WORD_YOU, EC_WORD_FOR, EC_WORD_THAT}, + .monSets = gVerdanturfBattleTentTrainerMons_Gerard + }, + [9] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("BRADLY"), + .speechBefore = {EC_WORD_IT_S, EC_WORD_LONESOME, EC_WORD_BUT, EC_WORD_I, EC_WORD_VACATION, EC_WORD_ALONE}, + .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(WITHDRAW), EC_WORD_INSIDE, EC_WORD_MY, EC_WORD_SHELL_ARMOR}, + .speechLose = {EC_WORD_OH, EC_WORD_ELLIPSIS, -1, EC_WORD_ALONE, EC_WORD_AS, EC_WORD_ALWAYS}, + .monSets = gVerdanturfBattleTentTrainerMons_Bradly + }, + [10] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("DENNIS"), + .speechBefore = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_STRONG, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, -1, EC_WORD_WAHAHAHA, EC_WORD_EXCL_EXCL, -1}, + .speechLose = {EC_WORD_NICE, EC_WORD_GOING, EC_WORD_EXCL, EC_WORD_I, EC_WORD_WAS, EC_WORD_CHILD_S_PLAY}, + .monSets = gVerdanturfBattleTentTrainerMons_Dennis + }, + [11] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("PRESTIN"), + .speechBefore = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_MOVE(NIGHTMARE), EC_WORD_FOR, EC_WORD_YOU}, + .speechWin = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_A, EC_WORD_DREAM}, + .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_WAKE_UP, EC_WORD_FROM, EC_WORD_THIS}, + .monSets = gVerdanturfBattleTentTrainerMons_Prestin + }, + [12] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("ERNESTO"), + .speechBefore = {EC_WORD_THIS, EC_WORD_PARTY, EC_WORD_GOES, EC_WORD_ON, EC_WORD_FOREVER, EC_WORD_EXCL}, + .speechWin = {EC_WORD_THE, EC_WORD_MUSIC, EC_WORD_PLAYS, EC_WORD_ON, EC_WORD_WITHOUT, EC_WORD_END}, + .speechLose = {EC_WORD_NO, EC_WORD_EXCL, EC_WORD_THE, EC_WORD_MUSIC, EC_WORD_CAN_T, EC_WORD_STOP}, + .monSets = gVerdanturfBattleTentTrainerMons_Ernesto + }, + [13] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("NALA"), + .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_THE, EC_WORD_WORLD, EC_WORD_MOVIE, EC_WORD_COLLECTION}, + .speechWin = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_LIKE, EC_WORD_RADIO, EC_WORD_VERY, EC_WORD_MUCH}, + .speechLose = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_BELIEVE, EC_WORD_THIS, EC_WORD_EXCL}, + .monSets = gVerdanturfBattleTentTrainerMons_Nala + }, + [14] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("DARNELL"), + .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GO_EASY, EC_WORD_ON, EC_WORD_YOU, -1}, + .speechWin = {EC_WORD_YOUR, EC_MOVE2(FRUSTRATION), EC_WORD_SHOULD, EC_WORD_BE, EC_WORD_HIDDEN, EC_WORD_AWAY}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_TAKE, EC_WORD_ELLIPSIS}, + .monSets = gVerdanturfBattleTentTrainerMons_Darnell + }, + [15] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("ASHLYN"), + .speechBefore = {EC_WORD_I, EC_WORD_LOOK, EC_WORD_TOUGH, EC_WORD_DO, EC_WORD_I, EC_WORD_QUES}, + .speechWin = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_OVER, EC_WORD_YOUR, EC_MOVE2(TAUNT), EC_WORD_YET}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_MEAN, EC_WORD_EXCL_EXCL, -1, -1, -1}, + .monSets = gVerdanturfBattleTentTrainerMons_Ashlyn + }, + [16] = { + .facilityClass = FACILITY_CLASS_POKEFAN_1, + .trainerName = _("ADDISON"), + .speechBefore = {EC_WORD_YES, EC_WORD_EXCL, -1, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_EXCL}, + .speechWin = {EC_WORD_WELL, EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_EASY, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, -1, EC_WORD_BUT, EC_WORD_WHY, EC_WORD_QUES}, + .monSets = gVerdanturfBattleTentTrainerMons_Addison + }, + [17] = { + .facilityClass = FACILITY_CLASS_POKEFAN_2, + .trainerName = _("JUSTINE"), + .speechBefore = {EC_WORD_YES, EC_WORD_EXCL, -1, EC_WORD_COME_ON, EC_WORD_I_AM, EC_WORD_READY}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_JUST, EC_WORD_NOT, EC_WORD_GOOD, EC_WORD_ENOUGH, EC_WORD_EXCL}, + .speechLose = {EC_WORD_WOWEE, EC_WORD_EXCL_EXCL, -1, -1, -1, -1}, + .monSets = gVerdanturfBattleTentTrainerMons_Justine + }, + [18] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("TYSON"), + .speechBefore = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_PRESSURE, EC_WORD_ME, EC_WORD_QUES}, + .speechWin = {EC_WORD_WHAT, EC_WORD_QUES, EC_WORD_YOU_RE, EC_WORD_MUCH, EC_WORD_TOO_WEAK, EC_WORD_EXCL}, + .speechLose = {EC_WORD_THIS, EC_WORD_DOESN_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_HAPPY, EC_WORD_EXCL}, + .monSets = gVerdanturfBattleTentTrainerMons_Tyson + }, + [19] = { + .facilityClass = FACILITY_CLASS_EXPERT_2, + .trainerName = _("LAILA"), + .speechBefore = {EC_WORD_A, EC_MOVE2(STRUGGLE), EC_WORD_ISN_T, EC_WORD_VERY, EC_WORD_COOL, -1}, + .speechWin = {EC_WORD_NOPE, EC_WORD_NOT_VERY, EC_WORD_COOL, EC_WORD_AT, EC_WORD_ALL, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_COOL, EC_WORD_BUT, EC_WORD_YOU, EC_WORD_WON}, + .monSets = gVerdanturfBattleTentTrainerMons_Laila + }, + [20] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("WAREN"), + .speechBefore = {EC_WORD_DANGER, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_SENSE, EC_WORD_DANGER}, + .speechWin = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_BELIEVE, EC_WORD_MY, EC_WORD_LIE, EC_WORD_QUES_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_DID, EC_WORD_SENSE, EC_WORD_DANGER, EC_WORD_ELLIPSIS}, + .monSets = gVerdanturfBattleTentTrainerMons_Waren + }, + [21] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("TOBIAS"), + .speechBefore = {EC_MOVE2(BARRIER), EC_WORD_EXCL_EXCL, -1, EC_WORD_NOW, EC_WORD_COME_ON, EC_WORD_EXCL}, + .speechWin = {EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES}, + .speechLose = {EC_WORD_I, EC_WORD_SHOULD, EC_WORD_KNOW, EC_WORD_THAT, EC_WORD_IT_S, EC_WORD_HOPELESS}, + .monSets = gVerdanturfBattleTentTrainerMons_Tobias + }, + [22] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("JOSIAH"), + .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_MOVE(FLY), EC_WORD_IF_I_LOSE, -1}, + .speechWin = {EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS, -1, EC_WORD_YOU, EC_MOVE(FLY), EC_WORD_INSTEAD}, + .speechLose = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_MOVE(FLY), EC_WORD_SOMETIME, EC_WORD_SOON}, + .monSets = gVerdanturfBattleTentTrainerMons_Josiah + }, + [23] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("DION"), + .speechBefore = {EC_WORD_IT_S, EC_WORD_TRENDY, EC_WORD_UM, EC_WORD_BATTLE, EC_WORD_SOMETHING, -1}, + .speechWin = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_BATTLE, EC_WORD_DATE, EC_WORD_QUES}, + .speechLose = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_BATTLE, EC_WORD_GOURMET, EC_WORD_QUES}, + .monSets = gVerdanturfBattleTentTrainerMons_Dion + }, + [24] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("KENZIE"), + .speechBefore = {EC_WORD_THE, EC_MOVE(MORNING_SUN), EC_WORD_GIVES, EC_WORD_ME, EC_MOVE(STRENGTH), -1}, + .speechWin = {EC_WORD_BUT, EC_WORD_I, EC_WORD_LIKE, EC_MOVE2(MOONLIGHT), EC_WORD_TOO, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_LIKE, EC_WORD_A, EC_WORD_TERRIBLE, EC_MOVE(SANDSTORM), EC_WORD_ELLIPSIS}, + .monSets = gVerdanturfBattleTentTrainerMons_Kenzie + }, + [25] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("LILLIAN"), + .speechBefore = {EC_WORD_I, EC_WORD_DO, EC_WORD_THINGS, EC_WORD_AT, EC_WORD_MY, EC_WORD_OWN_TEMPO}, + .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_QUES, EC_WORD_WHAT, EC_WORD_A, EC_WORD_SURPRISE}, + .speechLose = {EC_WORD_AWW, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_WORD_NAP}, + .monSets = gVerdanturfBattleTentTrainerMons_Lillian + }, + [26] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("LESLEY"), + .speechBefore = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_BE, EC_WORD_LOLLING, EC_WORD_ABOUT}, + .speechWin = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_GET, EC_WORD_UP, EC_WORD_EARLIER, -1}, + .speechLose = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_BE, EC_WORD_HAPPENING, EC_WORD_EXCL}, + .monSets = gVerdanturfBattleTentTrainerMons_Lesley + }, + [27] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("MARQUIS"), + .speechBefore = {EC_WORD_NONE, EC_WORD_OF, EC_WORD_THIS, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_SENSE}, + .speechWin = {EC_WORD_SEE, EC_WORD_QUES, EC_WORD_THIS, EC_WORD_JUST, EC_WORD_ISN_T, EC_WORD_NORMAL}, + .speechLose = {EC_WORD_SHOULD, EC_WORD_I, EC_WORD_CAUSE, EC_WORD_AN, EC_MOVE(UPROAR), EC_WORD_QUES}, + .monSets = gVerdanturfBattleTentTrainerMons_Marquis + }, + [28] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("FREDDY"), + .speechBefore = {EC_WORD_I, EC_WORD_ADORE, EC_WORD_THIS, EC_WORD_CUTE, EC_WORD_TELEVISION, EC_WORD_IDOL}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_SO, EC_WORD_FUNNY, EC_WORD_WHEN, EC_WORD_YOU_RE, EC_WORD_ANGRY}, + .speechLose = {EC_WORD_LATE, EC_WORD_NIGHT, EC_WORD_TELEVISION, EC_WORD_IS, EC_WORD_MY, EC_WORD_LIFE}, + .monSets = gVerdanturfBattleTentTrainerMons_Freddy + }, + [29] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("CECILIA"), + .speechBefore = {EC_WORD_MY, EC_WORD_FABULOUS, EC_WORD_CUTENESS, EC_WORD_IS, EC_WORD_IN, EC_WORD_FASHION}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_NO, EC_WORD_MATCH, EC_WORD_FOR, EC_WORD_MY, EC_WORD_CUTE_CHARM}, + .speechLose = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_QUES}, + .monSets = gVerdanturfBattleTentTrainerMons_Cecilia + } +}; + +const struct FacilityMon gVerdanturfBattleTentMons[] = +{ + [0] = { + .species = SPECIES_POOCHYENA, + .moves = {MOVE_ROAR, MOVE_THIEF, MOVE_BITE, MOVE_HOWL}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [1] = { + .species = SPECIES_ZIGZAGOON, + .moves = {MOVE_COVET, MOVE_GROWL, MOVE_PIN_MISSILE, MOVE_MUD_SPORT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [2] = { + .species = SPECIES_DUSTOX, + .moves = {MOVE_CONFUSION, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_FLASH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [3] = { + .species = SPECIES_TAILLOW, + .moves = {MOVE_AGILITY, MOVE_DOUBLE_TEAM, MOVE_WING_ATTACK, MOVE_GROWL}, + .itemTableId = BATTLE_FRONTIER_ITEM_ORAN_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [4] = { + .species = SPECIES_SHROOMISH, + .moves = {MOVE_HEADBUTT, MOVE_STUN_SPORE, MOVE_LEECH_SEED, MOVE_FLASH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_RASH + }, + [5] = { + .species = SPECIES_MACHOP, + .moves = {MOVE_LOW_KICK, MOVE_LEER, MOVE_FOCUS_ENERGY, MOVE_ENCORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_LONELY + }, + [6] = { + .species = SPECIES_MAGIKARP, + .moves = {MOVE_SPLASH, MOVE_FLAIL, MOVE_TACKLE, MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [7] = { + .species = SPECIES_BARBOACH, + .moves = {MOVE_MUD_SLAP, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_SPARK}, + .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY, + .evSpread = F_EV_SPREAD_SPEED, + .nature = NATURE_HASTY + }, + [8] = { + .species = SPECIES_WINGULL, + .moves = {MOVE_ATTRACT, MOVE_TWISTER, MOVE_WING_ATTACK, MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_FANG, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_IMPISH + }, + [9] = { + .species = SPECIES_ARON, + .moves = {MOVE_ENDEAVOR, MOVE_METAL_CLAW, MOVE_TACKLE, MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [10] = { + .species = SPECIES_NUMEL, + .moves = {MOVE_EMBER, MOVE_ROCK_SLIDE, MOVE_ROLLOUT, MOVE_GROWL}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_SASSY + }, + [11] = { + .species = SPECIES_SWALOT, + .moves = {MOVE_YAWN, MOVE_SLUDGE, MOVE_ACID_ARMOR, MOVE_AMNESIA}, + .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [12] = { + .species = SPECIES_KECLEON, + .moves = {MOVE_SUBSTITUTE, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_BIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIET + }, + [13] = { + .species = SPECIES_BALTOY, + .moves = {MOVE_SANDSTORM, MOVE_FLASH, MOVE_SELF_DESTRUCT, MOVE_HARDEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [14] = { + .species = SPECIES_NINJASK, + .moves = {MOVE_DIG, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_LEECH_LIFE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [15] = { + .species = SPECIES_MAKUHITA, + .moves = {MOVE_BULK_UP, MOVE_ARM_THRUST, MOVE_SMELLING_SALT, MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [16] = { + .species = SPECIES_SWABLU, + .moves = {MOVE_REFRESH, MOVE_SAFEGUARD, MOVE_ATTRACT, MOVE_MIRROR_MOVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MILD + }, + [17] = { + .species = SPECIES_GOLDEEN, + .moves = {MOVE_WATERFALL, MOVE_MUD_SPORT, MOVE_SUPERSONIC, MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_GENTLE + }, + [18] = { + .species = SPECIES_LOTAD, + .moves = {MOVE_GROWL, MOVE_WATER_GUN, MOVE_MEGA_DRAIN, MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_IAPAPA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [19] = { + .species = SPECIES_NUMEL, + .moves = {MOVE_MAGNITUDE, MOVE_EMBER, MOVE_GROWL, MOVE_DEFENSE_CURL}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_RELAXED + }, + [20] = { + .species = SPECIES_LINOONE, + .moves = {MOVE_HEADBUTT, MOVE_TICKLE, MOVE_PROTECT, MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [21] = { + .species = SPECIES_SEVIPER, + .moves = {MOVE_WRAP, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [22] = { + .species = SPECIES_SKARMORY, + .moves = {MOVE_AIR_CUTTER, MOVE_SANDSTORM, MOVE_LEER, MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_MACHO_BRACE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_BASHFUL + }, + [23] = { + .species = SPECIES_SWELLOW, + .moves = {MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [24] = { + .species = SPECIES_GOLDEEN, + .moves = {MOVE_PECK, MOVE_SUPERSONIC, MOVE_PSYBEAM, MOVE_RAIN_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_GENTLE + }, + [25] = { + .species = SPECIES_ELECTRIKE, + .moves = {MOVE_SHOCK_WAVE, MOVE_TACKLE, MOVE_CHARGE, MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MILD + }, + [26] = { + .species = SPECIES_NUZLEAF, + .moves = {MOVE_SUNNY_DAY, MOVE_TORMENT, MOVE_FAKE_OUT, MOVE_THIEF}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [27] = { + .species = SPECIES_ARON, + .moves = {MOVE_TAKE_DOWN, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [28] = { + .species = SPECIES_MIGHTYENA, + .moves = {MOVE_HOWL, MOVE_TAKE_DOWN, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [29] = { + .species = SPECIES_SOLROCK, + .moves = {MOVE_HARDEN, MOVE_FIRE_SPIN, MOVE_MIMIC, MOVE_PSYWAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [30] = { + .species = SPECIES_GRAVELER, + .moves = {MOVE_ROLLOUT, MOVE_ROCK_SMASH, MOVE_SANDSTORM, MOVE_BLOCK}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_IMPISH + }, + [31] = { + .species = SPECIES_KADABRA, + .moves = {MOVE_ENCORE, MOVE_PSYBEAM, MOVE_DISABLE, MOVE_KINESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [32] = { + .species = SPECIES_VOLTORB, + .moves = {MOVE_PROTECT, MOVE_SELF_DESTRUCT, MOVE_SPARK, MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_BASHFUL + }, + [33] = { + .species = SPECIES_MAGNEMITE, + .moves = {MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SERIOUS + }, + [34] = { + .species = SPECIES_PELIPPER, + .moves = {MOVE_WING_ATTACK, MOVE_MIST, MOVE_AGILITY, MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FIGY_BERRY, + .evSpread = 0, + .nature = NATURE_BRAVE + }, + [35] = { + .species = SPECIES_LOUDRED, + .moves = {MOVE_HOWL, MOVE_UPROAR, MOVE_REST, MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [36] = { + .species = SPECIES_MARILL, + .moves = {MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [37] = { + .species = SPECIES_TRAPINCH, + .moves = {MOVE_DIG, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_FAINT_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [38] = { + .species = SPECIES_TENTACOOL, + .moves = {MOVE_SCREECH, MOVE_CONFUSE_RAY, MOVE_WRAP, MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [39] = { + .species = SPECIES_VIGOROTH, + .moves = {MOVE_ENCORE, MOVE_SLACK_OFF, MOVE_YAWN, MOVE_SECRET_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [40] = { + .species = SPECIES_WAILMER, + .moves = {MOVE_WATER_PULSE, MOVE_ROLLOUT, MOVE_CURSE, MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [41] = { + .species = SPECIES_ILLUMISE, + .moves = {MOVE_TACKLE, MOVE_SWEET_SCENT, MOVE_WISH, MOVE_ENCORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [42] = { + .species = SPECIES_MACHOKE, + .moves = {MOVE_LEER, MOVE_KARATE_CHOP, MOVE_BULK_UP, MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_CALM + }, + [43] = { + .species = SPECIES_WHISMUR, + .moves = {MOVE_SECRET_POWER, MOVE_SUPERSONIC, MOVE_STOMP, MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [44] = { + .species = SPECIES_CACNEA, + .moves = {MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_NEEDLE_ARM, MOVE_GROWTH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SERIOUS + } +}; + +// Fallarbor Battle Tent. +const u16 gFallarborBattleTentTrainerMons_Amber[] = +{ + 39, + 40, + 41, + 42, + 43, + 44, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Javier[] = +{ + 6, + 35, + 36, + 37, + 38, + 44, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Natalie[] = +{ + 5, + 29, + 30, + 32, + 34, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Treve[] = +{ + 28, + 29, + 30, + 32, + 33, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Arianna[] = +{ + 18, + 23, + 24, + 27, + 44, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Jadyn[] = +{ + 0, + 22, + 24, + 27, + 32, + 39, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Gerardo[] = +{ + 6, + 18, + 23, + 24, + 29, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Jonn[] = +{ + 16, + 17, + 21, + 22, + 37, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Esteban[] = +{ + 5, + 28, + 30, + 33, + 42, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Jameson[] = +{ + 1, + 2, + 3, + 5, + 9, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Alanzo[] = +{ + 9, + 10, + 11, + 12, + 13, + 14, + 15, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Howard[] = +{ + 18, + 23, + 31, + 38, + 43, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Conrad[] = +{ + 18, + 19, + 20, + 21, + 22, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Makenna[] = +{ + 4, + 21, + 25, + 36, + 40, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Brayan[] = +{ + 0, + 4, + 6, + 12, + 19, + 23, + 28, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Mariana[] = +{ + 0, + 4, + 13, + 19, + 28, + 30, + 37, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Sheldon[] = +{ + 2, + 3, + 21, + 31, + 39, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Gianna[] = +{ + 1, + 2, + 30, + 32, + 41, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Yahir[] = +{ + 4, + 8, + 15, + 17, + 22, + 24, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Britney[] = +{ + 4, + 7, + 14, + 20, + 23, + 43, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Hecter[] = +{ + 0, + 1, + 2, + 5, + 9, + 35, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Tannor[] = +{ + 5, + 30, + 31, + 33, + 34, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Benji[] = +{ + 25, + 26, + 27, + 28, + 29, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Rory[] = +{ + 9, + 11, + 14, + 15, + 27, + 39, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Eleanor[] = +{ + 23, + 28, + 31, + 36, + 38, + 42, + 44, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Evelyn[] = +{ + 29, + 31, + 32, + 33, + 34, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Arielle[] = +{ + 1, + 3, + 38, + 39, + 41, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Connar[] = +{ + 7, + 8, + 28, + 29, + 31, + 32, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Maurice[] = +{ + 4, + 5, + 6, + 12, + 13, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Kianna[] = +{ + 22, + 24, + 26, + 27, + 34, + 37, + -1 +}; + +const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] = +{ + [0] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("AMBER"), + .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_DIET, EC_WORD_EVERY, EC_WORD_DAY}, + .speechWin = {EC_WORD_A, EC_MOVE(NIGHTMARE), EC_WORD_OF, EC_WORD_SWEETS, EC_WORD_SHOCKED, EC_WORD_ME}, + .speechLose = {EC_WORD_IF, EC_WORD_YOU, EC_WORD_GIVE_UP, EC_WORD_YOU, EC_WORD_WILL, EC_WORD_LOSE}, + .monSets = gFallarborBattleTentTrainerMons_Amber + }, + [1] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("JAVIER"), + .speechBefore = {EC_WORD_I, EC_WORD_NEVER, EC_WORD_EVER, EC_WORD_HAVE, EC_WORD_ENOUGH, EC_WORD_MONEY}, + .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_BUT, EC_WORD_I, EC_WORD_NEED, EC_WORD_MONEY}, + .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_MONEY, EC_WORD_FOR, EC_WORD_A, EC_WORD_BIKE}, + .monSets = gFallarborBattleTentTrainerMons_Javier + }, + [2] = { + .facilityClass = FACILITY_CLASS_TUBER_1, + .trainerName = _("NATALIE"), + .speechBefore = {EC_WORD_THE, EC_WORD_WAY, EC_WORD_I, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_WEIRD}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_MUCH, EC_WORD_TOO_WEAK, EC_WORD_FOR, EC_WORD_THIS, EC_WORD_PLACE}, + .speechLose = {EC_WORD_GIVE_ME, EC_WORD_AN, EC_WORD_EASY, EC_WORD_MATCH, EC_WORD_NEXT, EC_WORD_TIME}, + .monSets = gFallarborBattleTentTrainerMons_Natalie + }, + [3] = { + .facilityClass = FACILITY_CLASS_TUBER_2, + .trainerName = _("TREVE"), + .speechBefore = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_MOVE2(METRONOME), EC_WORD_AND, EC_WORD_SLEEP}, + .speechWin = {EC_WORD_YEAH, EC_WORD_EXCL, EC_MOVE(HYPNOSIS), EC_WORD_IS, EC_WORD_TOTALLY, EC_WORD_GREAT}, + .speechLose = {EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_DIDN_T, EC_WORD_WORK, EC_WORD_ELLIPSIS, -1}, + .monSets = gFallarborBattleTentTrainerMons_Treve + }, + [4] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("ARIANNA"), + .speechBefore = {EC_WORD_IF_I_WIN, EC_WORD_GIVE_ME, EC_WORD_POKEMON, EC_WORD_FOR, EC_WORD_MY, EC_WORD_COLLECTION}, + .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_COLLECT}, + .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SOMETHING, EC_WORD_ELSE, EC_WORD_ELLIPSIS}, + .monSets = gFallarborBattleTentTrainerMons_Arianna + }, + [5] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("JADYN"), + .speechBefore = {EC_WORD_MY, EC_WORD_NAME, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_A, EC_WORD_MYSTERY}, + .speechWin = {EC_WORD_MY, EC_WORD_NAME, EC_WORD_GOES, EC_WORD_ON, EC_WORD_A, EC_WORD_MYSTERY}, + .speechLose = {EC_WORD_MY, EC_WORD_NAME, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_YOUR, EC_WORD_MOTHER}, + .monSets = gFallarborBattleTentTrainerMons_Jadyn + }, + [6] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("GERARDO"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_BEST, EC_WORD_HERO, EC_WORD_EVER, EC_WORD_EXCL}, + .speechWin = {EC_WORD_SEE, EC_WORD_WHAT, EC_WORD_I, EC_WORD_MEAN, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_WERE, EC_WORD_RIGHT, EC_WORD_QUES, -1}, + .monSets = gFallarborBattleTentTrainerMons_Gerardo + }, + [7] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("JONN"), + .speechBefore = {EC_WORD_THE, EC_WORD_WORLD, EC_MOVE2(SUPERPOWER), EC_MOVE2(STOMP), EC_WORD_CONTEST, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_EXCL_EXCL, EC_WORD_HEAR, EC_WORD_ME, EC_MOVE2(ROAR)}, + .speechLose = {EC_WORD_I, EC_WORD_GIVE_UP, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_NO_1, EC_WORD_EXCL}, + .monSets = gFallarborBattleTentTrainerMons_Jonn + }, + [8] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("ESTEBAN"), + .speechBefore = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_GOOD, EC_WORD_TRAINER, EC_WORD_QUES, EC_WORD_UNBELIEVABLE}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_SOME, EC_WORD_PUSHOVER, EC_WORD_OF, EC_WORD_A, EC_WORD_TRAINER}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_MUCH, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_ME}, + .monSets = gFallarborBattleTentTrainerMons_Esteban + }, + [9] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("JAMESON"), + .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SILKY, EC_WORD_SMOOTH, EC_WORD_EXCL}, + .speechWin = {EC_WORD_MY, EC_WORD_SILKY, EC_WORD_SMOOTH, EC_WORD_POKEMON, EC_WORD_RULE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_MY, EC_WORD_POKEMON, EC_MOVE2(STRUGGLE), EC_WORD_IN, EC_WORD_YOUR, EC_WORD_STICKY_HOLD}, + .monSets = gFallarborBattleTentTrainerMons_Jameson + }, + [10] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("ALANZO"), + .speechBefore = {EC_MOVE2(FORESIGHT), EC_WORD_IS, EC_WORD_A, EC_WORD_POWER, EC_WORD_I, EC_WORD_HAVE}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_OBLIVIOUS, EC_WORD_ABOUT, EC_MOVE2(FORESIGHT), EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_IS, EC_WORD_ALWAYS, EC_WORD_RIGHT, EC_WORD_EXCL}, + .monSets = gFallarborBattleTentTrainerMons_Alanzo + }, + [11] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("HOWARD"), + .speechBefore = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, -1}, + .speechWin = {EC_WORD_YOU, EC_WORD_COULDN_T, EC_WORD_WIN, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU, EC_WORD_WOULD, EC_WORD_GO, EC_WORD_ALL, EC_WORD_OUT, EC_WORD_ELLIPSIS}, + .monSets = gFallarborBattleTentTrainerMons_Howard + }, + [12] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("CONRAD"), + .speechBefore = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_PRETTY, EC_WORD_WILD, EC_WORD_EXCL}, + .speechWin = {EC_WORD_WHOAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_LET_S, EC_WORD_DANCE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_MY, EC_WORD_MUSIC, EC_WORD_WILL, EC_WORD_PLAY, EC_WORD_ON, EC_WORD_ELLIPSIS}, + .monSets = gFallarborBattleTentTrainerMons_Conrad + }, + [13] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("MAKENNA"), + .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THAT, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_IT}, + .speechWin = {EC_WORD_THAT_S, EC_WORD_WHY, EC_WORD_I, EC_WORD_STUDY, EC_WORD_EVERY, EC_WORD_DAY}, + .speechLose = {EC_WORD_AWW, EC_WORD_I, EC_WORD_STUDY, EC_WORD_EVERY, EC_WORD_DAY, EC_WORD_TOO}, + .monSets = gFallarborBattleTentTrainerMons_Makenna + }, + [14] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("BRAYAN"), + .speechBefore = {EC_WORD_CAN, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_MY, EC_WORD_POWER, EC_WORD_QUES}, + .speechWin = {EC_WORD_HOW, EC_WORD_BORING, EC_WORD_ELLIPSIS, EC_WORD_THIS, EC_WORD_IS, EC_WORD_GOOD_BYE}, + .speechLose = {EC_WORD_AM, EC_WORD_I, EC_WORD_THE, EC_WORD_WEAK, EC_WORD_TRAINER, EC_WORD_QUES}, + .monSets = gFallarborBattleTentTrainerMons_Brayan + }, + [15] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("MARIANA"), + .speechBefore = {EC_WORD_A, EC_WORD_LIE, EC_WORD_CAN, EC_WORD_BE, EC_WORD_KIND, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_LIKE, EC_WORD_THE, EC_WORD_SUNDAY, EC_WORD_COMICS}, + .speechLose = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_LIKE, EC_WORD_FROM, EC_WORD_A, EC_WORD_MOVIE}, + .monSets = gFallarborBattleTentTrainerMons_Mariana + }, + [16] = { + .facilityClass = FACILITY_CLASS_POKEFAN_1, + .trainerName = _("SHELDON"), + .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_TEACHER, EC_WORD_GETS, EC_WORD_NO, EC_MOVE2(REST)}, + .speechWin = {EC_WORD_MY, EC_WORD_SMARTNESS, EC_WORD_GETS, EC_WORD_ME, EC_WORD_EASY, EC_WORD_WINS}, + .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_GO, EC_WORD_WORK, EC_WORD_BYE_BYE}, + .monSets = gFallarborBattleTentTrainerMons_Sheldon + }, + [17] = { + .facilityClass = FACILITY_CLASS_POKEFAN_2, + .trainerName = _("GIANNA"), + .speechBefore = {EC_WORD_AHAHA, EC_WORD_YES, EC_WORD_EXCL, EC_WORD_LOVEY_DOVEY, EC_WORD_POKEMON, EC_WORD_WORLD}, + .speechWin = {EC_WORD_MY, EC_WORD_SHINE, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_THINGS, EC_WORD_BETTER}, + .speechLose = {EC_WORD_DO, EC_WORD_YOU, EC_WORD_DISLIKE, EC_WORD_POKEMON, EC_WORD_QUES, -1}, + .monSets = gFallarborBattleTentTrainerMons_Gianna + }, + [18] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("YAHIR"), + .speechBefore = {EC_WORD_YOU, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_COME_ON, EC_WORD_EXCL}, + .speechWin = {EC_WORD_YOU, EC_WORD_NEED, EC_WORD_TO, EC_WORD_TRAIN, EC_WORD_A_LOT, EC_WORD_MORE}, + .speechLose = {EC_WORD_NOT, EC_WORD_ENOUGH, EC_WORD_ELLIPSIS, EC_WORD_JUST, EC_WORD_NOT, EC_WORD_ENOUGH}, + .monSets = gFallarborBattleTentTrainerMons_Yahir + }, + [19] = { + .facilityClass = FACILITY_CLASS_EXPERT_2, + .trainerName = _("BRITNEY"), + .speechBefore = {EC_WORD_IT, EC_WORD_SEEMS, EC_WORD_THAT, EC_WORD_YOU_RE, EC_WORD_QUITE, EC_WORD_GOOD}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_LUKEWARM, EC_WORD_TALENT, EC_WORD_AT, EC_WORD_BEST}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_COOL, EC_WORD_HERO, EC_WORD_AT, EC_WORD_THIS}, + .monSets = gFallarborBattleTentTrainerMons_Britney + }, + [20] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("HECTER"), + .speechBefore = {EC_WORD_MY, EC_MOVE2(HIDDEN_POWER), EC_WORD_IS, EC_WORD_EXCITING, EC_WORD_ME, EC_WORD_EXCL}, + .speechWin = {EC_WORD_YEEHAW_EXCL, EC_WORD_LET_S, EC_WORD_HAVE, EC_WORD_A, EC_MOVE2(HIDDEN_POWER), EC_WORD_PARTY}, + .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, EC_WORD_DON_T, EC_WORD_YOU, EC_MOVE2(MIMIC), EC_WORD_ME}, + .monSets = gFallarborBattleTentTrainerMons_Hecter + }, + [21] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("TANNOR"), + .speechBefore = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GOT, EC_WORD_TO, EC_WORD_BE, EC_WORD_JOKING}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_THE, EC_WORD_BEST, EC_WORD_AT, EC_WORD_BEING, EC_WORD_FUNNY}, + .speechLose = {EC_WORD_YOU, EC_WORD_WEREN_T, EC_WORD_BEING, EC_WORD_FUNNY, EC_WORD_AT, EC_WORD_ALL}, + .monSets = gFallarborBattleTentTrainerMons_Tannor + }, + [22] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("BENJI"), + .speechBefore = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_THINK, EC_WORD_VERY, EC_WORD_FAST, EC_WORD_HUH_QUES}, + .speechWin = {EC_WORD_SORRY, EC_WORD_EXCL, EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_MEAN, EC_WORD_YOU}, + .speechLose = {EC_WORD_YOU, EC_WORD_LEFT, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_SAD, EC_WORD_ELLIPSIS}, + .monSets = gFallarborBattleTentTrainerMons_Benji + }, + [23] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("RORY"), + .speechBefore = {EC_WORD_DON_T, EC_WORD_CAUSE, EC_WORD_AN, EC_MOVE(UPROAR), EC_WORD_YOU, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_NEED, EC_WORD_AN, EC_MOVE(UPROAR), EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_CAUSE, EC_WORD_AN, EC_MOVE(UPROAR)}, + .monSets = gFallarborBattleTentTrainerMons_Rory + }, + [24] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("ELEANOR"), + .speechBefore = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_WANT, EC_WORD_TO, EC_WORD_PARTY, -1}, + .speechWin = {EC_WORD_A, EC_WORD_TRENDY, EC_WORD_PARTY, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_REFRESHING}, + .speechLose = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_PARTY, EC_WORD_QUES}, + .monSets = gFallarborBattleTentTrainerMons_Eleanor + }, + [25] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("EVELYN"), + .speechBefore = {EC_WORD_MY, EC_WORD_PC, EC_WORD_IS, EC_WORD_MY, EC_WORD_SECRET_BASE, EC_WORD_EXCL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_ALL, EC_WORD_SECRET, EC_WORD_ON, EC_WORD_MY, EC_WORD_PC}, + .speechLose = {EC_WORD_NO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_REJECT, EC_WORD_THIS}, + .monSets = gFallarborBattleTentTrainerMons_Evelyn + }, + [26] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("ARIELLE"), + .speechBefore = {EC_WORD_IT_S, EC_WORD_NOT_VERY, EC_WORD_PRETTY, EC_WORD_BUT, EC_WORD_I, EC_WORD_TRY}, + .speechWin = {EC_WORD_WE_RE, EC_WORD_NOT_VERY, EC_WORD_PRETTY, EC_WORD_BUT, EC_WORD_WE_RE, EC_WORD_GREAT}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_PRETTY, EC_WORD_MEAN, EC_WORD_OF, EC_WORD_YOU, EC_WORD_EXCL}, + .monSets = gFallarborBattleTentTrainerMons_Arielle + }, + [27] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("CONNAR"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_STRONG, EC_WORD_ENOUGH, EC_WORD_FOR, EC_WORD_THIS}, + .speechWin = {EC_WORD_DO, EC_WORD_YOU, EC_WORD_THINK, EC_WORD_YOU_RE, EC_WORD_OK_QUES, -1}, + .speechLose = {EC_WORD_GOOD_BYE, EC_WORD_AND, EC_WORD_THANK_YOU, -1, -1, -1}, + .monSets = gFallarborBattleTentTrainerMons_Connar + }, + [28] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("MAURICE"), + .speechBefore = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_WORD_RADIO, EC_WORD_OR, EC_WORD_TELEVISION}, + .speechWin = {EC_WORD_BUT, EC_WORD_THERE, EC_WORD_IS, EC_WORD_A_LOT, EC_WORD_OF, EC_WORD_POKEMON}, + .speechLose = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_ENJOY, EC_WORD_MYSELF, EC_WORD_WITHOUT, EC_WORD_MONEY}, + .monSets = gFallarborBattleTentTrainerMons_Maurice + }, + [29] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("KIANNA"), + .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_DEPT_STORE, EC_WORD_SHOPPING}, + .speechWin = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_SHOPPING, EC_WORD_ALONE, -1, -1}, + .speechLose = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_SHOPPING, EC_WORD_TOGETHER, EC_WORD_QUES}, + .monSets = gFallarborBattleTentTrainerMons_Kianna + } +}; + +const struct FacilityMon gFallarborBattleTentMons[] = +{ + [0] = { + .species = SPECIES_NUMEL, + .moves = {MOVE_GROWL, MOVE_FLAMETHROWER, MOVE_TACKLE, MOVE_SUNNY_DAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [1] = { + .species = SPECIES_LINOONE, + .moves = {MOVE_ODOR_SLEUTH, MOVE_COVET, MOVE_ROCK_SMASH, MOVE_CHARM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_SASSY + }, + [2] = { + .species = SPECIES_PLUSLE, + .moves = {MOVE_SPARK, MOVE_GROWL, MOVE_QUICK_ATTACK, MOVE_FAKE_TEARS}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [3] = { + .species = SPECIES_POOCHYENA, + .moves = {MOVE_YAWN, MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_FRUSTRATION}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [4] = { + .species = SPECIES_KECLEON, + .moves = {MOVE_LICK, MOVE_SLASH, MOVE_FAINT_ATTACK, MOVE_PSYBEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_WIKI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_MODEST + }, + [5] = { + .species = SPECIES_MAGIKARP, + .moves = {MOVE_SPLASH, MOVE_TACKLE, MOVE_FLAIL, MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_SCALE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [6] = { + .species = SPECIES_SOLROCK, + .moves = {MOVE_ROCK_THROW, MOVE_FLASH, MOVE_SANDSTORM, MOVE_PSYWAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [7] = { + .species = SPECIES_MAKUHITA, + .moves = {MOVE_DETECT, MOVE_ARM_THRUST, MOVE_FAKE_OUT, MOVE_SMELLING_SALT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [8] = { + .species = SPECIES_MACHOKE, + .moves = {MOVE_COUNTER, MOVE_REVENGE, MOVE_BULK_UP, MOVE_FOCUS_ENERGY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAIVE + }, + [9] = { + .species = SPECIES_NINCADA, + .moves = {MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_MUD_SLAP, MOVE_DIG}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_SERIOUS + }, + [10] = { + .species = SPECIES_BEAUTIFLY, + .moves = {MOVE_FLASH, MOVE_MORNING_SUN, MOVE_HARDEN, MOVE_MEGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [11] = { + .species = SPECIES_DUSTOX, + .moves = {MOVE_MOONLIGHT, MOVE_HARDEN, MOVE_POISON_STING, MOVE_PSYBEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, + .nature = NATURE_DOCILE + }, + [12] = { + .species = SPECIES_ILLUMISE, + .moves = {MOVE_METRONOME, MOVE_FLATTER, MOVE_WISH, MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [13] = { + .species = SPECIES_VOLBEAT, + .moves = {MOVE_TACKLE, MOVE_MOONLIGHT, MOVE_SIGNAL_BEAM, MOVE_TAIL_GLOW}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [14] = { + .species = SPECIES_NINJASK, + .moves = {MOVE_DOUBLE_TEAM, MOVE_PROTECT, MOVE_DIG, MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_TIMID + }, + [15] = { + .species = SPECIES_NINJASK, + .moves = {MOVE_SWORDS_DANCE, MOVE_CUT, MOVE_FURY_CUTTER, MOVE_LEECH_LIFE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [16] = { + .species = SPECIES_ARON, + .moves = {MOVE_METAL_CLAW, MOVE_PROTECT, MOVE_SHOCK_WAVE, MOVE_METAL_SOUND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [17] = { + .species = SPECIES_ARON, + .moves = {MOVE_SECRET_POWER, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_GENTLE + }, + [18] = { + .species = SPECIES_ELECTRIKE, + .moves = {MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_HOWL, MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SEA_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HASTY + }, + [19] = { + .species = SPECIES_MAGNEMITE, + .moves = {MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_ENDURE, MOVE_SPARK}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [20] = { + .species = SPECIES_VOLTORB, + .moves = {MOVE_CHARGE, MOVE_SPARK, MOVE_SCREECH, MOVE_SONIC_BOOM}, + .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [21] = { + .species = SPECIES_WHISMUR, + .moves = {MOVE_REST, MOVE_SLEEP_TALK, MOVE_HYPER_VOICE, MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [22] = { + .species = SPECIES_LOUDRED, + .moves = {MOVE_STOMP, MOVE_REST, MOVE_SCREECH, MOVE_UPROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [23] = { + .species = SPECIES_LINOONE, + .moves = {MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_SHOCK_WAVE, MOVE_GROWL}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [24] = { + .species = SPECIES_MIGHTYENA, + .moves = {MOVE_SAND_ATTACK, MOVE_HOWL, MOVE_SWAGGER, MOVE_SECRET_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [25] = { + .species = SPECIES_SWABLU, + .moves = {MOVE_TAKE_DOWN, MOVE_SING, MOVE_GROWL, MOVE_SAFEGUARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [26] = { + .species = SPECIES_SKARMORY, + .moves = {MOVE_AGILITY, MOVE_STEEL_WING, MOVE_SAND_ATTACK, MOVE_TORMENT}, + .itemTableId = BATTLE_FRONTIER_ITEM_METAL_COAT, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [27] = { + .species = SPECIES_GOLBAT, + .moves = {MOVE_CONFUSE_RAY, MOVE_BITE, MOVE_DOUBLE_TEAM, MOVE_SUBSTITUTE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [28] = { + .species = SPECIES_WINGULL, + .moves = {MOVE_WING_ATTACK, MOVE_HAIL, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [29] = { + .species = SPECIES_PELIPPER, + .moves = {MOVE_TWISTER, MOVE_ICY_WIND, MOVE_DOUBLE_TEAM, MOVE_WATER_GUN}, + .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_FANG, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [30] = { + .species = SPECIES_BARBOACH, + .moves = {MOVE_SPARK, MOVE_WATER_GUN, MOVE_EARTHQUAKE, MOVE_WATER_SPORT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [31] = { + .species = SPECIES_WAILMER, + .moves = {MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_SPLASH, MOVE_CURSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [32] = { + .species = SPECIES_MARILL, + .moves = {MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [33] = { + .species = SPECIES_GOLDEEN, + .moves = {MOVE_WATERFALL, MOVE_RAIN_DANCE, MOVE_FLAIL, MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_GANLON_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HASTY + }, + [34] = { + .species = SPECIES_GOLDEEN, + .moves = {MOVE_SLEEP_TALK, MOVE_HORN_DRILL, MOVE_REST, MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [35] = { + .species = SPECIES_TRAPINCH, + .moves = {MOVE_RETURN, MOVE_SAND_ATTACK, MOVE_ATTRACT, MOVE_STRENGTH}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGO_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [36] = { + .species = SPECIES_BALTOY, + .moves = {MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_RAPID_SPIN, MOVE_MIMIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [37] = { + .species = SPECIES_GRAVELER, + .moves = {MOVE_ROCK_BLAST, MOVE_DEFENSE_CURL, MOVE_MAGNITUDE, MOVE_MUD_SPORT}, + .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [38] = { + .species = SPECIES_SANDSHREW, + .moves = {MOVE_SAND_TOMB, MOVE_SANDSTORM, MOVE_DOUBLE_TEAM, MOVE_FOCUS_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [39] = { + .species = SPECIES_SWALOT, + .moves = {MOVE_YAWN, MOVE_ENCORE, MOVE_BULLET_SEED, MOVE_SLUDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [40] = { + .species = SPECIES_SHROOMISH, + .moves = {MOVE_HEADBUTT, MOVE_SPORE, MOVE_SWAGGER, MOVE_LEECH_SEED}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [41] = { + .species = SPECIES_KIRLIA, + .moves = {MOVE_HYPNOSIS, MOVE_GROWL, MOVE_ATTRACT, MOVE_DREAM_EATER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [42] = { + .species = SPECIES_LOMBRE, + .moves = {MOVE_NATURE_POWER, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_FLASH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BASHFUL + }, + [43] = { + .species = SPECIES_NUZLEAF, + .moves = {MOVE_NATURE_POWER, MOVE_TORMENT, MOVE_SWAGGER, MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [44] = { + .species = SPECIES_CACNEA, + .moves = {MOVE_SANDSTORM, MOVE_NEEDLE_ARM, MOVE_TEETER_DANCE, MOVE_LEECH_SEED}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + } +}; -- cgit v1.2.3 From e69cb6b2767d1b4ae9b73eba9aeb9496b25be4d9 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 3 Dec 2018 17:21:34 -0500 Subject: update frontier class names --- src/data/battle_frontier/battle_tent.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/data/battle_frontier/battle_tent.h b/src/data/battle_frontier/battle_tent.h index d96f8935e..9a1539772 100644 --- a/src/data/battle_frontier/battle_tent.h +++ b/src/data/battle_frontier/battle_tent.h @@ -527,7 +527,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] = .monSets = gSlateportBattleTentTrainerMons_Malachi }, [2] = { - .facilityClass = FACILITY_CLASS_TUBER_1, + .facilityClass = FACILITY_CLASS_TUBER_F, .trainerName = _("KELSIE"), .speechBefore = {EC_WORD_GO, EC_WORD_EXCL_EXCL, EC_WORD_MY, EC_WORD_BATH, EC_WORD_POKEMON, EC_WORD_EXCL_EXCL}, .speechWin = {EC_WORD_YAHOO, EC_WORD_EXCL_EXCL, EC_WORD_MY, EC_WORD_BATH, EC_WORD_POKEMON, EC_WORD_EXCL_EXCL}, @@ -535,7 +535,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] = .monSets = gSlateportBattleTentTrainerMons_Kelsie }, [3] = { - .facilityClass = FACILITY_CLASS_TUBER_2, + .facilityClass = FACILITY_CLASS_TUBER_M, .trainerName = _("DAVON"), .speechBefore = {EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_GREAT, EC_MOVE(WHIRLPOOL), EC_WORD_ISN_T_IT_QUES}, .speechWin = {EC_WORD_THAT_WAS, EC_WORD_LIKE, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL}, @@ -639,7 +639,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] = .monSets = gSlateportBattleTentTrainerMons_Rebecca }, [16] = { - .facilityClass = FACILITY_CLASS_POKEFAN_1, + .facilityClass = FACILITY_CLASS_POKEFAN_M, .trainerName = _("REGGIE"), .speechBefore = {EC_WORD_POKEMON, EC_WORD_COME, EC_WORD_BEFORE, EC_WORD_MONEY, EC_WORD_OR, EC_WORD_FAMILY}, .speechWin = {EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_ME, EC_WORD_STRONG}, @@ -647,7 +647,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] = .monSets = gSlateportBattleTentTrainerMons_Reggie }, [17] = { - .facilityClass = FACILITY_CLASS_POKEFAN_2, + .facilityClass = FACILITY_CLASS_POKEFAN_F, .trainerName = _("JANAE"), .speechBefore = {EC_WORD_I, EC_WORD_JUST, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_TOUGH, EC_WORD_LOOK}, .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_HOW, EC_WORD_YOU, EC_MOVE2(STRUGGLE), -1}, @@ -663,7 +663,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] = .monSets = gSlateportBattleTentTrainerMons_Caiden }, [19] = { - .facilityClass = FACILITY_CLASS_EXPERT_2, + .facilityClass = FACILITY_CLASS_EXPERT_F, .trainerName = _("KIRSTEN"), .speechBefore = {EC_WORD_HUH_QUES, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_YOU, EC_WORD_SAID, EC_WORD_QUES}, .speechWin = {EC_WORD_HUH_QUES, EC_WORD_STRONG, EC_WORD_BUT, EC_WORD_NOT, EC_WORD_STRONG, EC_WORD_ENOUGH}, @@ -1580,7 +1580,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] = .monSets = gVerdanturfBattleTentTrainerMons_Dilan }, [2] = { - .facilityClass = FACILITY_CLASS_TUBER_1, + .facilityClass = FACILITY_CLASS_TUBER_F, .trainerName = _("ELIANA"), .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_ON, EC_WORD_A, EC_WORD_VACATION, EC_WORD_SOON}, .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_GET, EC_WORD_SOME, EC_WORD_MONEY}, @@ -1588,7 +1588,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] = .monSets = gVerdanturfBattleTentTrainerMons_Eliana }, [3] = { - .facilityClass = FACILITY_CLASS_TUBER_2, + .facilityClass = FACILITY_CLASS_TUBER_M, .trainerName = _("MARKUS"), .speechBefore = {EC_WORD_I_AM, EC_WORD_SMART, EC_WORD_EXCL, EC_WORD_IF_I_LOSE, EC_WORD_I, EC_MOVE(SELF_DESTRUCT)}, .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_NON_STOP, EC_MOVE2(EXPLOSION), EC_WORD_OF, EC_WORD_JOY}, @@ -1692,7 +1692,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] = .monSets = gVerdanturfBattleTentTrainerMons_Ashlyn }, [16] = { - .facilityClass = FACILITY_CLASS_POKEFAN_1, + .facilityClass = FACILITY_CLASS_POKEFAN_M, .trainerName = _("ADDISON"), .speechBefore = {EC_WORD_YES, EC_WORD_EXCL, -1, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_EXCL}, .speechWin = {EC_WORD_WELL, EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_EASY, EC_WORD_QUES, -1}, @@ -1700,7 +1700,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] = .monSets = gVerdanturfBattleTentTrainerMons_Addison }, [17] = { - .facilityClass = FACILITY_CLASS_POKEFAN_2, + .facilityClass = FACILITY_CLASS_POKEFAN_F, .trainerName = _("JUSTINE"), .speechBefore = {EC_WORD_YES, EC_WORD_EXCL, -1, EC_WORD_COME_ON, EC_WORD_I_AM, EC_WORD_READY}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_JUST, EC_WORD_NOT, EC_WORD_GOOD, EC_WORD_ENOUGH, EC_WORD_EXCL}, @@ -1716,7 +1716,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] = .monSets = gVerdanturfBattleTentTrainerMons_Tyson }, [19] = { - .facilityClass = FACILITY_CLASS_EXPERT_2, + .facilityClass = FACILITY_CLASS_EXPERT_F, .trainerName = _("LAILA"), .speechBefore = {EC_WORD_A, EC_MOVE2(STRUGGLE), EC_WORD_ISN_T, EC_WORD_VERY, EC_WORD_COOL, -1}, .speechWin = {EC_WORD_NOPE, EC_WORD_NOT_VERY, EC_WORD_COOL, EC_WORD_AT, EC_WORD_ALL, EC_WORD_EXCL}, @@ -2461,7 +2461,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] = .monSets = gFallarborBattleTentTrainerMons_Javier }, [2] = { - .facilityClass = FACILITY_CLASS_TUBER_1, + .facilityClass = FACILITY_CLASS_TUBER_F, .trainerName = _("NATALIE"), .speechBefore = {EC_WORD_THE, EC_WORD_WAY, EC_WORD_I, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_WEIRD}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_MUCH, EC_WORD_TOO_WEAK, EC_WORD_FOR, EC_WORD_THIS, EC_WORD_PLACE}, @@ -2469,7 +2469,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] = .monSets = gFallarborBattleTentTrainerMons_Natalie }, [3] = { - .facilityClass = FACILITY_CLASS_TUBER_2, + .facilityClass = FACILITY_CLASS_TUBER_M, .trainerName = _("TREVE"), .speechBefore = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_MOVE2(METRONOME), EC_WORD_AND, EC_WORD_SLEEP}, .speechWin = {EC_WORD_YEAH, EC_WORD_EXCL, EC_MOVE(HYPNOSIS), EC_WORD_IS, EC_WORD_TOTALLY, EC_WORD_GREAT}, @@ -2573,7 +2573,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] = .monSets = gFallarborBattleTentTrainerMons_Mariana }, [16] = { - .facilityClass = FACILITY_CLASS_POKEFAN_1, + .facilityClass = FACILITY_CLASS_POKEFAN_M, .trainerName = _("SHELDON"), .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_TEACHER, EC_WORD_GETS, EC_WORD_NO, EC_MOVE2(REST)}, .speechWin = {EC_WORD_MY, EC_WORD_SMARTNESS, EC_WORD_GETS, EC_WORD_ME, EC_WORD_EASY, EC_WORD_WINS}, @@ -2581,7 +2581,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] = .monSets = gFallarborBattleTentTrainerMons_Sheldon }, [17] = { - .facilityClass = FACILITY_CLASS_POKEFAN_2, + .facilityClass = FACILITY_CLASS_POKEFAN_F, .trainerName = _("GIANNA"), .speechBefore = {EC_WORD_AHAHA, EC_WORD_YES, EC_WORD_EXCL, EC_WORD_LOVEY_DOVEY, EC_WORD_POKEMON, EC_WORD_WORLD}, .speechWin = {EC_WORD_MY, EC_WORD_SHINE, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_THINGS, EC_WORD_BETTER}, @@ -2597,7 +2597,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] = .monSets = gFallarborBattleTentTrainerMons_Yahir }, [19] = { - .facilityClass = FACILITY_CLASS_EXPERT_2, + .facilityClass = FACILITY_CLASS_EXPERT_F, .trainerName = _("BRITNEY"), .speechBefore = {EC_WORD_IT, EC_WORD_SEEMS, EC_WORD_THAT, EC_WORD_YOU_RE, EC_WORD_QUITE, EC_WORD_GOOD}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_LUKEWARM, EC_WORD_TALENT, EC_WORD_AT, EC_WORD_BEST}, -- 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 +- src/data/battle_frontier/battle_frontier_mons.h | 6177 ++++++++ .../battle_frontier/battle_frontier_trainer_mons.h | 15229 +++++++++++++++++++ .../battle_frontier/battle_frontier_trainers.h | 2403 +++ src/data/battle_frontier/battle_tent.h | 1 - 5 files changed, 23995 insertions(+), 13 deletions(-) create mode 100644 src/data/battle_frontier/battle_frontier_mons.h create mode 100644 src/data/battle_frontier/battle_frontier_trainer_mons.h create mode 100644 src/data/battle_frontier/battle_frontier_trainers.h (limited to 'src') 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]; /* diff --git a/src/data/battle_frontier/battle_frontier_mons.h b/src/data/battle_frontier/battle_frontier_mons.h new file mode 100644 index 000000000..371b0f170 --- /dev/null +++ b/src/data/battle_frontier/battle_frontier_mons.h @@ -0,0 +1,6177 @@ +const struct FacilityMon gBattleFrontierMons[] = +{ + [0] = { + .species = SPECIES_SUNKERN, + .moves = {MOVE_MEGA_DRAIN MOVE_HELPING_HAND MOVE_SUNNY_DAY MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [1] = { + .species = SPECIES_AZURILL, + .moves = {MOVE_WATER_PULSE MOVE_ATTRACT MOVE_SING MOVE_CHARM}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RASH + }, + [2] = { + .species = SPECIES_CATERPIE, + .moves = {MOVE_TACKLE MOVE_STRING_SHOT MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [3] = { + .species = SPECIES_WEEDLE, + .moves = {MOVE_POISON_STING MOVE_STRING_SHOT MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [4] = { + .species = SPECIES_WURMPLE, + .moves = {MOVE_TACKLE MOVE_STRING_SHOT MOVE_POISON_STING MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [5] = { + .species = SPECIES_RALTS, + .moves = {MOVE_CONFUSION MOVE_IMPRISON MOVE_DOUBLE_TEAM MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [6] = { + .species = SPECIES_MAGIKARP, + .moves = {MOVE_FLAIL MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [7] = { + .species = SPECIES_FEEBAS, + .moves = {MOVE_FLAIL MOVE_MIRROR_COAT MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [8] = { + .species = SPECIES_METAPOD, + .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BASHFUL + }, + [9] = { + .species = SPECIES_KAKUNA, + .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BASHFUL + }, + [10] = { + .species = SPECIES_PICHU, + .moves = {MOVE_SWEET_KISS MOVE_THUNDER_WAVE MOVE_ATTRACT MOVE_SHOCK_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RASH + }, + [11] = { + .species = SPECIES_SILCOON, + .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BASHFUL + }, + [12] = { + .species = SPECIES_CASCOON, + .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BASHFUL + }, + [13] = { + .species = SPECIES_IGGLYBUFF, + .moves = {MOVE_SWEET_KISS MOVE_SING MOVE_ATTRACT MOVE_SEISMIC_TOSS}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [14] = { + .species = SPECIES_WOOPER, + .moves = {MOVE_YAWN MOVE_DIG MOVE_WATER_PULSE MOVE_RAIN_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [15] = { + .species = SPECIES_TYROGUE, + .moves = {MOVE_MACH_PUNCH MOVE_PROTECT MOVE_DOUBLE_TEAM MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [16] = { + .species = SPECIES_SENTRET, + .moves = {MOVE_QUICK_ATTACK MOVE_FOLLOW_ME MOVE_HELPING_HAND MOVE_ASSIST}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [17] = { + .species = SPECIES_CLEFFA, + .moves = {MOVE_SWEET_KISS MOVE_SING MOVE_ATTRACT MOVE_METRONOME}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SERIOUS + }, + [18] = { + .species = SPECIES_SEEDOT, + .moves = {MOVE_BULLET_SEED MOVE_BIDE MOVE_DEFENSE_CURL MOVE_ROLLOUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [19] = { + .species = SPECIES_LOTAD, + .moves = {MOVE_RAIN_DANCE MOVE_WATER_PULSE MOVE_SUNNY_DAY MOVE_MEGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [20] = { + .species = SPECIES_POOCHYENA, + .moves = {MOVE_CRUNCH MOVE_SWAGGER MOVE_ROAR MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [21] = { + .species = SPECIES_SHEDINJA, + .moves = {MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_SILVER_WIND MOVE_GRUDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_NAIVE + }, + [22] = { + .species = SPECIES_MAKUHITA, + .moves = {MOVE_FAKE_OUT MOVE_SEISMIC_TOSS MOVE_DETECT MOVE_WHIRLWIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [23] = { + .species = SPECIES_WHISMUR, + .moves = {MOVE_UPROAR MOVE_SWAGGER MOVE_BODY_SLAM MOVE_SMELLING_SALT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [24] = { + .species = SPECIES_ZIGZAGOON, + .moves = {MOVE_HEADBUTT MOVE_PIN_MISSILE MOVE_SWIFT MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_TIMID + }, + [25] = { + .species = SPECIES_ZUBAT, + .moves = {MOVE_POISON_FANG MOVE_WHIRLWIND MOVE_CONFUSE_RAY MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [26] = { + .species = SPECIES_TOGEPI, + .moves = {MOVE_RETURN MOVE_YAWN MOVE_WISH MOVE_SWEET_KISS}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [27] = { + .species = SPECIES_SPINARAK, + .moves = {MOVE_SIGNAL_BEAM MOVE_NIGHT_SHADE MOVE_SPIDER_WEB MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [28] = { + .species = SPECIES_MARILL, + .moves = {MOVE_WATER_PULSE MOVE_RAIN_DANCE MOVE_LIGHT_SCREEN MOVE_RETURN}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_GENTLE + }, + [29] = { + .species = SPECIES_HOPPIP, + .moves = {MOVE_MEGA_DRAIN MOVE_LEECH_SEED MOVE_SLEEP_POWDER MOVE_STUN_SPORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_LAX + }, + [30] = { + .species = SPECIES_SLUGMA, + .moves = {MOVE_EMBER MOVE_ROCK_SLIDE MOVE_YAWN MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [31] = { + .species = SPECIES_SWINUB, + .moves = {MOVE_ICY_WIND MOVE_DIG MOVE_ROCK_TOMB MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_GENTLE + }, + [32] = { + .species = SPECIES_SMEARGLE, + .moves = {MOVE_EXTREME_SPEED MOVE_FAKE_OUT MOVE_QUICK_ATTACK MOVE_MACH_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [33] = { + .species = SPECIES_PIDGEY, + .moves = {MOVE_GUST MOVE_SAND_ATTACK MOVE_WHIRLWIND MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [34] = { + .species = SPECIES_RATTATA, + .moves = {MOVE_HYPER_FANG MOVE_PURSUIT MOVE_QUICK_ATTACK MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [35] = { + .species = SPECIES_WYNAUT, + .moves = {MOVE_ENCORE MOVE_COUNTER MOVE_MIRROR_COAT MOVE_CHARM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_JOLLY + }, + [36] = { + .species = SPECIES_SKITTY, + .moves = {MOVE_SING MOVE_ATTRACT MOVE_CHARM MOVE_DOUBLE_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [37] = { + .species = SPECIES_SPEAROW, + .moves = {MOVE_FURY_ATTACK MOVE_PURSUIT MOVE_MIRROR_MOVE MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [38] = { + .species = SPECIES_HOOTHOOT, + .moves = {MOVE_CONFUSION MOVE_HYPNOSIS MOVE_SUPERSONIC MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [39] = { + .species = SPECIES_DIGLETT, + .moves = {MOVE_MAGNITUDE MOVE_SLASH MOVE_ROCK_TOMB MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAIVE + }, + [40] = { + .species = SPECIES_LEDYBA, + .moves = {MOVE_PSYBEAM MOVE_AGILITY MOVE_BATON_PASS MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BASHFUL + }, + [41] = { + .species = SPECIES_NINCADA, + .moves = {MOVE_MUD_SLAP MOVE_DIG MOVE_TOXIC MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [42] = { + .species = SPECIES_SURSKIT, + .moves = {MOVE_BUBBLE_BEAM MOVE_RAIN_DANCE MOVE_SWEET_SCENT MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [43] = { + .species = SPECIES_JIGGLYPUFF, + .moves = {MOVE_SING MOVE_WISH MOVE_MIMIC MOVE_DOUBLE_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [44] = { + .species = SPECIES_TAILLOW, + .moves = {MOVE_FLY MOVE_QUICK_ATTACK MOVE_ENDEAVOR MOVE_FOCUS_ENERGY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_GENTLE + }, + [45] = { + .species = SPECIES_WINGULL, + .moves = {MOVE_WATER_PULSE MOVE_FLY MOVE_QUICK_ATTACK MOVE_STEEL_WING}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [46] = { + .species = SPECIES_NIDORAN_M, + .moves = {MOVE_DOUBLE_KICK MOVE_POISON_STING MOVE_DISABLE MOVE_HELPING_HAND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [47] = { + .species = SPECIES_NIDORAN_F, + .moves = {MOVE_CRUNCH MOVE_DOUBLE_KICK MOVE_FLATTER MOVE_HELPING_HAND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [48] = { + .species = SPECIES_KIRLIA, + .moves = {MOVE_CONFUSION MOVE_WILL_O_WISP MOVE_FUTURE_SIGHT MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [49] = { + .species = SPECIES_MAREEP, + .moves = {MOVE_SHOCK_WAVE MOVE_FLASH MOVE_REFLECT MOVE_COTTON_SPORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [50] = { + .species = SPECIES_MEDITITE, + .moves = {MOVE_HI_JUMP_KICK MOVE_MEDITATE MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [51] = { + .species = SPECIES_SLAKOTH, + .moves = {MOVE_YAWN MOVE_SCRATCH MOVE_ENCORE MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [52] = { + .species = SPECIES_PARAS, + .moves = {MOVE_SPORE MOVE_LEECH_LIFE MOVE_SLASH MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [53] = { + .species = SPECIES_EKANS, + .moves = {MOVE_ACID MOVE_DIG MOVE_SCREECH MOVE_TORMENT}, + .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [54] = { + .species = SPECIES_DITTO, + .moves = {MOVE_TRANSFORM MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_METAL_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [55] = { + .species = SPECIES_BARBOACH, + .moves = {MOVE_MAGNITUDE MOVE_WATER_PULSE MOVE_SPARK MOVE_FUTURE_SIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_BASHFUL + }, + [56] = { + .species = SPECIES_MEOWTH, + .moves = {MOVE_SLASH MOVE_BITE MOVE_SCREECH MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [57] = { + .species = SPECIES_PINECO, + .moves = {MOVE_SELF_DESTRUCT MOVE_TAKE_DOWN MOVE_REFLECT MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [58] = { + .species = SPECIES_TRAPINCH, + .moves = {MOVE_TOXIC MOVE_DIG MOVE_SANDSTORM MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SERIOUS + }, + [59] = { + .species = SPECIES_SPHEAL, + .moves = {MOVE_ICE_BALL MOVE_WATER_PULSE MOVE_HAIL MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [60] = { + .species = SPECIES_HORSEA, + .moves = {MOVE_WATER_GUN MOVE_AGILITY MOVE_ICY_WIND MOVE_TWISTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [61] = { + .species = SPECIES_SHROOMISH, + .moves = {MOVE_SPORE MOVE_BULLET_SEED MOVE_LEECH_SEED MOVE_HEADBUTT}, + .itemTableId = BATTLE_FRONTIER_ITEM_MIRACLE_SEED, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [62] = { + .species = SPECIES_SHUPPET, + .moves = {MOVE_WILL_O_WISP MOVE_NIGHT_SHADE MOVE_GRUDGE MOVE_KNOCK_OFF}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RASH + }, + [63] = { + .species = SPECIES_DUSKULL, + .moves = {MOVE_SKILL_SWAP MOVE_NIGHT_SHADE MOVE_DISABLE MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [64] = { + .species = SPECIES_ELECTRIKE, + .moves = {MOVE_SPARK MOVE_THUNDER_WAVE MOVE_ROAR MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [65] = { + .species = SPECIES_VULPIX, + .moves = {MOVE_WILL_O_WISP MOVE_CONFUSE_RAY MOVE_FIRE_SPIN MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [66] = { + .species = SPECIES_PIKACHU, + .moves = {MOVE_THUNDER_PUNCH MOVE_THUNDER_WAVE MOVE_DOUBLE_TEAM MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIGHT_BALL, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [67] = { + .species = SPECIES_SANDSHREW, + .moves = {MOVE_DIG MOVE_ROCK_TOMB MOVE_SANDSTORM MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [68] = { + .species = SPECIES_POLIWAG, + .moves = {MOVE_HYPNOSIS MOVE_ICY_WIND MOVE_WATER_GUN MOVE_RAIN_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [69] = { + .species = SPECIES_BELLSPROUT, + .moves = {MOVE_RAZOR_LEAF MOVE_ACID MOVE_STUN_SPORE MOVE_WRAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_LAX + }, + [70] = { + .species = SPECIES_GEODUDE, + .moves = {MOVE_MAGNITUDE MOVE_ROCK_BLAST MOVE_STRENGTH MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [71] = { + .species = SPECIES_DRATINI, + .moves = {MOVE_OUTRAGE MOVE_THUNDER_WAVE MOVE_SUPERSONIC MOVE_WATER_PULSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [72] = { + .species = SPECIES_SNUBBULL, + .moves = {MOVE_BITE MOVE_CHARM MOVE_SWAGGER MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [73] = { + .species = SPECIES_REMORAID, + .moves = {MOVE_BUBBLE_BEAM MOVE_AURORA_BEAM MOVE_PSYBEAM MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [74] = { + .species = SPECIES_LARVITAR, + .moves = {MOVE_THRASH MOVE_ROCK_SLIDE MOVE_DIG MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [75] = { + .species = SPECIES_BALTOY, + .moves = {MOVE_PSYBEAM MOVE_ANCIENT_POWER MOVE_LIGHT_SCREEN MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [76] = { + .species = SPECIES_SNORUNT, + .moves = {MOVE_ICY_WIND MOVE_HEADBUTT MOVE_LEER MOVE_BITE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [77] = { + .species = SPECIES_BAGON, + .moves = {MOVE_DRAGON_BREATH MOVE_HEADBUTT MOVE_BRICK_BREAK MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [78] = { + .species = SPECIES_BELDUM, + .moves = {MOVE_TAKE_DOWN MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [79] = { + .species = SPECIES_GULPIN, + .moves = {MOVE_TOXIC MOVE_YAWN MOVE_PAIN_SPLIT MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SERIOUS + }, + [80] = { + .species = SPECIES_VENONAT, + .moves = {MOVE_PSYBEAM MOVE_SUPERSONIC MOVE_STUN_SPORE MOVE_SKILL_SWAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [81] = { + .species = SPECIES_MANKEY, + .moves = {MOVE_KARATE_CHOP MOVE_LOW_KICK MOVE_SCREECH MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [82] = { + .species = SPECIES_MACHOP, + .moves = {MOVE_SEISMIC_TOSS MOVE_REVENGE MOVE_ROCK_TOMB MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [83] = { + .species = SPECIES_SHELLDER, + .moves = {MOVE_ICICLE_SPEAR MOVE_SUPERSONIC MOVE_CLAMP MOVE_WITHDRAW}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [84] = { + .species = SPECIES_SMOOCHUM, + .moves = {MOVE_SWEET_KISS MOVE_SING MOVE_MUD_SLAP MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [85] = { + .species = SPECIES_NUMEL, + .moves = {MOVE_EMBER MOVE_MAGNITUDE MOVE_ROCK_TOMB MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [86] = { + .species = SPECIES_CARVANHA, + .moves = {MOVE_BITE MOVE_SCREECH MOVE_SCARY_FACE MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [87] = { + .species = SPECIES_CORPHISH, + .moves = {MOVE_CRABHAMMER MOVE_WATER_PULSE MOVE_MUD_SLAP MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [88] = { + .species = SPECIES_CHARMANDER, + .moves = {MOVE_FIRE_SPIN MOVE_METAL_CLAW MOVE_SMOKESCREEN MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [89] = { + .species = SPECIES_CYNDAQUIL, + .moves = {MOVE_EMBER MOVE_SWIFT MOVE_QUICK_ATTACK MOVE_SMOKESCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [90] = { + .species = SPECIES_ABRA, + .moves = {MOVE_MIMIC MOVE_METRONOME MOVE_FLASH MOVE_SEISMIC_TOSS}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [91] = { + .species = SPECIES_DODUO, + .moves = {MOVE_FURY_ATTACK MOVE_UPROAR MOVE_MUD_SLAP MOVE_FAINT_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [92] = { + .species = SPECIES_GASTLY, + .moves = {MOVE_DREAM_EATER MOVE_HYPNOSIS MOVE_NIGHT_SHADE MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [93] = { + .species = SPECIES_SWABLU, + .moves = {MOVE_TAKE_DOWN MOVE_DREAM_EATER MOVE_SING MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [94] = { + .species = SPECIES_TREECKO, + .moves = {MOVE_BULLET_SEED MOVE_AERIAL_ACE MOVE_QUICK_ATTACK MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_LONELY + }, + [95] = { + .species = SPECIES_TORCHIC, + .moves = {MOVE_FIRE_SPIN MOVE_QUICK_ATTACK MOVE_SAND_ATTACK MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [96] = { + .species = SPECIES_MUDKIP, + .moves = {MOVE_WHIRLPOOL MOVE_ENDEAVOR MOVE_MUD_SPORT MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [97] = { + .species = SPECIES_SQUIRTLE, + .moves = {MOVE_WATER_PULSE MOVE_BITE MOVE_WITHDRAW MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [98] = { + .species = SPECIES_TOTODILE, + .moves = {MOVE_SLASH MOVE_WATER_PULSE MOVE_SCREECH MOVE_ICY_WIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [99] = { + .species = SPECIES_SLOWPOKE, + .moves = {MOVE_CONFUSION MOVE_DISABLE MOVE_WATER_PULSE MOVE_YAWN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [100] = { + .species = SPECIES_BULBASAUR, + .moves = {MOVE_RAZOR_LEAF MOVE_SWEET_SCENT MOVE_SLEEP_POWDER MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [101] = { + .species = SPECIES_CHIKORITA, + .moves = {MOVE_SECRET_POWER MOVE_BULLET_SEED MOVE_MUD_SLAP MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [102] = { + .species = SPECIES_ODDISH, + .moves = {MOVE_ACID MOVE_STUN_SPORE MOVE_SWEET_SCENT MOVE_MOONLIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [103] = { + .species = SPECIES_PSYDUCK, + .moves = {MOVE_CONFUSION MOVE_FURY_SWIPES MOVE_AERIAL_ACE MOVE_DISABLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HASTY + }, + [104] = { + .species = SPECIES_CUBONE, + .moves = {MOVE_BONE_CLUB MOVE_HEADBUTT MOVE_BRICK_BREAK MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [105] = { + .species = SPECIES_GOLDEEN, + .moves = {MOVE_WATERFALL MOVE_FURY_ATTACK MOVE_AGILITY MOVE_PSYBEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [106] = { + .species = SPECIES_NATU, + .moves = {MOVE_NIGHT_SHADE MOVE_FUTURE_SIGHT MOVE_CONFUSE_RAY MOVE_FLASH}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [107] = { + .species = SPECIES_CLEFAIRY, + .moves = {MOVE_FOLLOW_ME MOVE_RETURN MOVE_ENCORE MOVE_SING}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [108] = { + .species = SPECIES_MAGNEMITE, + .moves = {MOVE_SHOCK_WAVE MOVE_SUPERSONIC MOVE_METAL_SOUND MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_GENTLE + }, + [109] = { + .species = SPECIES_SEEL, + .moves = {MOVE_AURORA_BEAM MOVE_DIVE MOVE_BODY_SLAM MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [110] = { + .species = SPECIES_GRIMER, + .moves = {MOVE_SLUDGE MOVE_ROCK_TOMB MOVE_ACID_ARMOR MOVE_MINIMIZE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [111] = { + .species = SPECIES_KRABBY, + .moves = {MOVE_CRABHAMMER MOVE_MUD_SHOT MOVE_FLAIL MOVE_KNOCK_OFF}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [112] = { + .species = SPECIES_EXEGGCUTE, + .moves = {MOVE_CONFUSION MOVE_ANCIENT_POWER MOVE_LEECH_SEED MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [113] = { + .species = SPECIES_EEVEE, + .moves = {MOVE_CHARM MOVE_ATTRACT MOVE_FLAIL MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [114] = { + .species = SPECIES_DROWZEE, + .moves = {MOVE_CONFUSION MOVE_HEADBUTT MOVE_DISABLE MOVE_BARRIER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [115] = { + .species = SPECIES_VOLTORB, + .moves = {MOVE_SPARK MOVE_SCREECH MOVE_ROLLOUT MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [116] = { + .species = SPECIES_CHINCHOU, + .moves = {MOVE_SPARK MOVE_DIVE MOVE_CONFUSE_RAY MOVE_TAKE_DOWN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [117] = { + .species = SPECIES_TEDDIURSA, + .moves = {MOVE_SECRET_POWER MOVE_FAKE_TEARS MOVE_FAINT_ATTACK MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [118] = { + .species = SPECIES_DELIBIRD, + .moves = {MOVE_PRESENT MOVE_ICE_BALL MOVE_AERIAL_ACE MOVE_HAIL}, + .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [119] = { + .species = SPECIES_HOUNDOUR, + .moves = {MOVE_CRUNCH MOVE_EMBER MOVE_ROAR MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [120] = { + .species = SPECIES_PHANPY, + .moves = {MOVE_ROLLOUT MOVE_DEFENSE_CURL MOVE_ROCK_TOMB MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [121] = { + .species = SPECIES_SPOINK, + .moves = {MOVE_PSYWAVE MOVE_BOUNCE MOVE_MAGIC_COAT MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [122] = { + .species = SPECIES_ARON, + .moves = {MOVE_METAL_CLAW MOVE_AERIAL_ACE MOVE_METAL_SOUND MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [123] = { + .species = SPECIES_LUVDISC, + .moves = {MOVE_SWEET_KISS MOVE_ATTRACT MOVE_DIVE MOVE_RAIN_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [124] = { + .species = SPECIES_TENTACOOL, + .moves = {MOVE_BUBBLE_BEAM MOVE_ACID MOVE_BARRIER MOVE_WRAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [125] = { + .species = SPECIES_CACNEA, + .moves = {MOVE_NEEDLE_ARM MOVE_FAINT_ATTACK MOVE_COTTON_SPORE MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [126] = { + .species = SPECIES_UNOWN, + .moves = {MOVE_HIDDEN_POWER MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [127] = { + .species = SPECIES_KOFFING, + .moves = {MOVE_SLUDGE MOVE_SMOKESCREEN MOVE_TORMENT MOVE_HAZE}, + .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [128] = { + .species = SPECIES_STARYU, + .moves = {MOVE_BUBBLE_BEAM MOVE_MINIMIZE MOVE_SWIFT MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [129] = { + .species = SPECIES_SKIPLOOM, + .moves = {MOVE_MEGA_DRAIN MOVE_CONFUSION MOVE_COTTON_SPORE MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [130] = { + .species = SPECIES_NUZLEAF, + .moves = {MOVE_EXTRASENSORY MOVE_FAKE_OUT MOVE_RAZOR_WIND MOVE_FAINT_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [131] = { + .species = SPECIES_LOMBRE, + .moves = {MOVE_WATER_PULSE MOVE_FAKE_OUT MOVE_BRICK_BREAK MOVE_ABSORB}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [132] = { + .species = SPECIES_VIBRAVA, + .moves = {MOVE_DRAGON_BREATH MOVE_DIG MOVE_SCREECH MOVE_ROCK_TOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [133] = { + .species = SPECIES_RHYHORN, + .moves = {MOVE_ROCK_BLAST MOVE_DIG MOVE_SCARY_FACE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [134] = { + .species = SPECIES_CLAMPERL, + .moves = {MOVE_DIVE MOVE_TOXIC MOVE_IRON_DEFENSE MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_DEEP_SEA_SCALE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [135] = { + .species = SPECIES_PIDGEOTTO, + .moves = {MOVE_AERIAL_ACE MOVE_QUICK_ATTACK MOVE_FEATHER_DANCE MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [136] = { + .species = SPECIES_GROWLITHE, + .moves = {MOVE_FLAME_WHEEL MOVE_BITE MOVE_ROAR MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [137] = { + .species = SPECIES_FARFETCHD, + .moves = {MOVE_SLASH MOVE_KNOCK_OFF MOVE_SWORDS_DANCE MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_STICK, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [138] = { + .species = SPECIES_OMANYTE, + .moves = {MOVE_MUD_SHOT MOVE_WATER_GUN MOVE_ANCIENT_POWER MOVE_TICKLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [139] = { + .species = SPECIES_KABUTO, + .moves = {MOVE_MEGA_DRAIN MOVE_ANCIENT_POWER MOVE_SAND_ATTACK MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [140] = { + .species = SPECIES_LILEEP, + .moves = {MOVE_ANCIENT_POWER MOVE_ACID MOVE_INGRAIN MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [141] = { + .species = SPECIES_ANORITH, + .moves = {MOVE_METAL_CLAW MOVE_FURY_CUTTER MOVE_ANCIENT_POWER MOVE_WATER_GUN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [142] = { + .species = SPECIES_AIPOM, + .moves = {MOVE_FURY_SWIPES MOVE_SAND_ATTACK MOVE_BATON_PASS MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [143] = { + .species = SPECIES_ELEKID, + .moves = {MOVE_THUNDER_PUNCH MOVE_QUICK_ATTACK MOVE_SWIFT MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAIVE + }, + [144] = { + .species = SPECIES_LOUDRED, + .moves = {MOVE_STOMP MOVE_HOWL MOVE_ASTONISH MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [145] = { + .species = SPECIES_SPINDA, + .moves = {MOVE_DIZZY_PUNCH MOVE_TEETER_DANCE MOVE_PSYBEAM MOVE_FAINT_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [146] = { + .species = SPECIES_NIDORINA, + .moves = {MOVE_DOUBLE_KICK MOVE_BITE MOVE_AERIAL_ACE MOVE_FLATTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [147] = { + .species = SPECIES_NIDORINO, + .moves = {MOVE_DOUBLE_KICK MOVE_WATER_PULSE MOVE_MUD_SLAP MOVE_FLATTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [148] = { + .species = SPECIES_FLAAFFY, + .moves = {MOVE_SHOCK_WAVE MOVE_THUNDER_WAVE MOVE_COTTON_SPORE MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MILD + }, + [149] = { + .species = SPECIES_MAGBY, + .moves = {MOVE_FIRE_PUNCH MOVE_SMOKESCREEN MOVE_CONFUSE_RAY MOVE_SMOG}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [150] = { + .species = SPECIES_NOSEPASS, + .moves = {MOVE_ROCK_SLIDE MOVE_SHOCK_WAVE MOVE_THUNDER_WAVE MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [151] = { + .species = SPECIES_CORSOLA, + .moves = {MOVE_BUBBLE_BEAM MOVE_MIRROR_COAT MOVE_ATTRACT MOVE_ANCIENT_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [152] = { + .species = SPECIES_MAWILE, + .moves = {MOVE_CRUNCH MOVE_FAKE_TEARS MOVE_IRON_DEFENSE MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [153] = { + .species = SPECIES_BUTTERFREE, + .moves = {MOVE_SILVER_WIND MOVE_PSYBEAM MOVE_TOXIC MOVE_WHIRLWIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [154] = { + .species = SPECIES_BEEDRILL, + .moves = {MOVE_TWINEEDLE MOVE_PURSUIT MOVE_ENDEAVOR MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [155] = { + .species = SPECIES_POLIWHIRL, + .moves = {MOVE_WATER_PULSE MOVE_DOUBLE_SLAP MOVE_ICY_WIND MOVE_RAIN_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [156] = { + .species = SPECIES_ONIX, + .moves = {MOVE_ROCK_SLIDE MOVE_BIND MOVE_DRAGON_BREATH MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [157] = { + .species = SPECIES_BEAUTIFLY, + .moves = {MOVE_SILVER_WIND MOVE_MEGA_DRAIN MOVE_ATTRACT MOVE_WHIRLWIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [158] = { + .species = SPECIES_DUSTOX, + .moves = {MOVE_SILVER_WIND MOVE_TOXIC MOVE_PSYBEAM MOVE_WHIRLWIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [159] = { + .species = SPECIES_LEDIAN, + .moves = {MOVE_COMET_PUNCH MOVE_BATON_PASS MOVE_SWORDS_DANCE MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_BASHFUL + }, + [160] = { + .species = SPECIES_ARIADOS, + .moves = {MOVE_SIGNAL_BEAM MOVE_SPIDER_WEB MOVE_NIGHT_SHADE MOVE_TOXIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SERIOUS + }, + [161] = { + .species = SPECIES_YANMA, + .moves = {MOVE_SIGNAL_BEAM MOVE_AERIAL_ACE MOVE_DOUBLE_TEAM MOVE_DETECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_RELAXED + }, + [162] = { + .species = SPECIES_DELCATTY, + .moves = {MOVE_SECRET_POWER MOVE_FAINT_ATTACK MOVE_DOUBLE_TEAM MOVE_HEAL_BELL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [163] = { + .species = SPECIES_SABLEYE, + .moves = {MOVE_FAINT_ATTACK MOVE_CONFUSE_RAY MOVE_KNOCK_OFF MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [164] = { + .species = SPECIES_LICKITUNG, + .moves = {MOVE_SLAM MOVE_BRICK_BREAK MOVE_LICK MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [165] = { + .species = SPECIES_WEEPINBELL, + .moves = {MOVE_RAZOR_LEAF MOVE_ACID MOVE_WRAP MOVE_SWEET_SCENT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [166] = { + .species = SPECIES_GRAVELER, + .moves = {MOVE_MAGNITUDE MOVE_ROCK_THROW MOVE_DEFENSE_CURL MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [167] = { + .species = SPECIES_GLOOM, + .moves = {MOVE_PETAL_DANCE MOVE_ACID MOVE_STUN_SPORE MOVE_MOONLIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [168] = { + .species = SPECIES_PORYGON, + .moves = {MOVE_PSYBEAM MOVE_ICY_WIND MOVE_RECYCLE MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [169] = { + .species = SPECIES_KADABRA, + .moves = {MOVE_CONFUSION MOVE_ROLE_PLAY MOVE_FUTURE_SIGHT MOVE_DISABLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [170] = { + .species = SPECIES_WAILMER, + .moves = {MOVE_WHIRLPOOL MOVE_ROAR MOVE_DEFENSE_CURL MOVE_ROLLOUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_DOCILE + }, + [171] = { + .species = SPECIES_ROSELIA, + .moves = {MOVE_MAGICAL_LEAF MOVE_TOXIC MOVE_GRASS_WHISTLE MOVE_COTTON_SPORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [172] = { + .species = SPECIES_VOLBEAT, + .moves = {MOVE_SILVER_WIND MOVE_CONFUSE_RAY MOVE_QUICK_ATTACK MOVE_HELPING_HAND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [173] = { + .species = SPECIES_ILLUMISE, + .moves = {MOVE_SILVER_WIND MOVE_WISH MOVE_QUICK_ATTACK MOVE_HELPING_HAND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [174] = { + .species = SPECIES_IVYSAUR, + .moves = {MOVE_PETAL_DANCE MOVE_GROWTH MOVE_SWEET_SCENT MOVE_FURY_CUTTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_GENTLE + }, + [175] = { + .species = SPECIES_CHARMELEON, + .moves = {MOVE_SLASH MOVE_FIRE_SPIN MOVE_SWORDS_DANCE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [176] = { + .species = SPECIES_WARTORTLE, + .moves = {MOVE_WATER_PULSE MOVE_BITE MOVE_MUD_SLAP MOVE_YAWN}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [177] = { + .species = SPECIES_PARASECT, + .moves = {MOVE_SLASH MOVE_PSYBEAM MOVE_STUN_SPORE MOVE_FLASH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_RASH + }, + [178] = { + .species = SPECIES_MACHOKE, + .moves = {MOVE_LOW_KICK MOVE_ROCK_TOMB MOVE_FORESIGHT MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [179] = { + .species = SPECIES_HAUNTER, + .moves = {MOVE_SHADOW_PUNCH MOVE_CONFUSE_RAY MOVE_SPITE MOVE_GRUDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RASH + }, + [180] = { + .species = SPECIES_BAYLEEF, + .moves = {MOVE_RAZOR_LEAF MOVE_TOXIC MOVE_SAFEGUARD MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [181] = { + .species = SPECIES_QUILAVA, + .moves = {MOVE_FLAME_WHEEL MOVE_FURY_SWIPES MOVE_SWIFT MOVE_SMOKESCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [182] = { + .species = SPECIES_CROCONAW, + .moves = {MOVE_SLASH MOVE_WATER_PULSE MOVE_BITE MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [183] = { + .species = SPECIES_TOGETIC, + .moves = {MOVE_AERIAL_ACE MOVE_MAGICAL_LEAF MOVE_WISH MOVE_FOLLOW_ME}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [184] = { + .species = SPECIES_MURKROW, + .moves = {MOVE_FAINT_ATTACK MOVE_FLY MOVE_TORMENT MOVE_TAUNT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [185] = { + .species = SPECIES_WOBBUFFET, + .moves = {MOVE_COUNTER MOVE_MIRROR_COAT MOVE_CHARM MOVE_SAFEGUARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [186] = { + .species = SPECIES_PLUSLE, + .moves = {MOVE_SPARK MOVE_FAKE_TEARS MOVE_QUICK_ATTACK MOVE_HELPING_HAND}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [187] = { + .species = SPECIES_MINUN, + .moves = {MOVE_SPARK MOVE_CHARM MOVE_ENCORE MOVE_HELPING_HAND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [188] = { + .species = SPECIES_GROVYLE, + .moves = {MOVE_FURY_CUTTER MOVE_ENDEAVOR MOVE_BRICK_BREAK MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [189] = { + .species = SPECIES_COMBUSKEN, + .moves = {MOVE_EMBER MOVE_DOUBLE_KICK MOVE_QUICK_ATTACK MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [190] = { + .species = SPECIES_MARSHTOMP, + .moves = {MOVE_MUD_SHOT MOVE_WATER_GUN MOVE_ROCK_TOMB MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [191] = { + .species = SPECIES_PONYTA, + .moves = {MOVE_FIRE_SPIN MOVE_BOUNCE MOVE_QUICK_ATTACK MOVE_TAIL_WHIP}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [192] = { + .species = SPECIES_AZUMARILL, + .moves = {MOVE_BUBBLE_BEAM MOVE_FACADE MOVE_DIG MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_DOCILE + }, + [193] = { + .species = SPECIES_SUDOWOODO, + .moves = {MOVE_ROCK_SLIDE MOVE_FAINT_ATTACK MOVE_SANDSTORM MOVE_BLOCK}, + .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [194] = { + .species = SPECIES_MAGCARGO, + .moves = {MOVE_ROCK_SLIDE MOVE_EMBER MOVE_ACID_ARMOR MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_GENTLE + }, + [195] = { + .species = SPECIES_PUPITAR, + .moves = {MOVE_DIG MOVE_BITE MOVE_SCARY_FACE MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [196] = { + .species = SPECIES_SEALEO, + .moves = {MOVE_ICE_BALL MOVE_HAIL MOVE_SNORE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [197] = { + .species = SPECIES_RATICATE, + .moves = {MOVE_ENDEAVOR MOVE_PURSUIT MOVE_SCARY_FACE MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAIVE + }, + [198] = { + .species = SPECIES_MASQUERAIN, + .moves = {MOVE_SILVER_WIND MOVE_AERIAL_ACE MOVE_ICY_WIND MOVE_STUN_SPORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_RELAXED + }, + [199] = { + .species = SPECIES_FURRET, + .moves = {MOVE_SLAM MOVE_PROTECT MOVE_HELPING_HAND MOVE_FOLLOW_ME}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_SERIOUS + }, + [200] = { + .species = SPECIES_DUNSPARCE, + .moves = {MOVE_HEADBUTT MOVE_GLARE MOVE_DEFENSE_CURL MOVE_ROLLOUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [201] = { + .species = SPECIES_DRAGONAIR, + .moves = {MOVE_DRAGON_BREATH MOVE_LEER MOVE_WRAP MOVE_SAFEGUARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [202] = { + .species = SPECIES_MIGHTYENA, + .moves = {MOVE_BITE MOVE_POISON_FANG MOVE_TAUNT MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_TIMID + }, + [203] = { + .species = SPECIES_LINOONE, + .moves = {MOVE_SECRET_POWER MOVE_SAND_ATTACK MOVE_COVET MOVE_TICKLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [204] = { + .species = SPECIES_CASTFORM, + .moves = {MOVE_EMBER MOVE_WATER_PULSE MOVE_SHOCK_WAVE MOVE_ICY_WIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HASTY + }, + [205] = { + .species = SPECIES_SHELGON, + .moves = {MOVE_HEADBUTT MOVE_DRAGON_BREATH MOVE_PROTECT MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [206] = { + .species = SPECIES_METANG, + .moves = {MOVE_METAL_CLAW MOVE_CONFUSION MOVE_PURSUIT MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [207] = { + .species = SPECIES_WIGGLYTUFF, + .moves = {MOVE_SING MOVE_DISABLE MOVE_WISH MOVE_SECRET_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_RELAXED + }, + [208] = { + .species = SPECIES_SUNFLORA, + .moves = {MOVE_PETAL_DANCE MOVE_INGRAIN MOVE_LEECH_SEED MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [209] = { + .species = SPECIES_CHIMECHO, + .moves = {MOVE_PSYWAVE MOVE_TAKE_DOWN MOVE_HEAL_BELL MOVE_SAFEGUARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [210] = { + .species = SPECIES_GLIGAR, + .moves = {MOVE_METAL_CLAW MOVE_DIG MOVE_AERIAL_ACE MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HASTY + }, + [211] = { + .species = SPECIES_QWILFISH, + .moves = {MOVE_BUBBLE_BEAM MOVE_PIN_MISSILE MOVE_SPIKES MOVE_MINIMIZE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, + .nature = NATURE_IMPISH + }, + [212] = { + .species = SPECIES_SNEASEL, + .moves = {MOVE_FAINT_ATTACK MOVE_FAKE_OUT MOVE_ICY_WIND MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [213] = { + .species = SPECIES_PELIPPER, + .moves = {MOVE_WATER_PULSE MOVE_AERIAL_ACE MOVE_STOCKPILE MOVE_SWALLOW}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [214] = { + .species = SPECIES_SWELLOW, + .moves = {MOVE_FLY MOVE_ENDEAVOR MOVE_FACADE MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [215] = { + .species = SPECIES_LAIRON, + .moves = {MOVE_METAL_CLAW MOVE_ROCK_TOMB MOVE_IRON_DEFENSE MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_METAL_COAT, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [216] = { + .species = SPECIES_TANGELA, + .moves = {MOVE_MEGA_DRAIN MOVE_SLAM MOVE_TOXIC MOVE_BIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [217] = { + .species = SPECIES_ARBOK, + .moves = {MOVE_POISON_FANG MOVE_DIG MOVE_BITE MOVE_GLARE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [218] = { + .species = SPECIES_PERSIAN, + .moves = {MOVE_FAKE_OUT MOVE_SLASH MOVE_TORMENT MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [219] = { + .species = SPECIES_SEADRA, + .moves = {MOVE_AURORA_BEAM MOVE_SMOKESCREEN MOVE_WATER_GUN MOVE_RAIN_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [220] = { + .species = SPECIES_KECLEON, + .moves = {MOVE_SECRET_POWER MOVE_PSYBEAM MOVE_MAGIC_COAT MOVE_SEISMIC_TOSS}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAIVE + }, + [221] = { + .species = SPECIES_VIGOROTH, + .moves = {MOVE_SLASH MOVE_COUNTER MOVE_ENCORE MOVE_UPROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [222] = { + .species = SPECIES_LUNATONE, + .moves = {MOVE_CONFUSION MOVE_COSMIC_POWER MOVE_LIGHT_SCREEN MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [223] = { + .species = SPECIES_SOLROCK, + .moves = {MOVE_CONFUSION MOVE_FIRE_SPIN MOVE_LIGHT_SCREEN MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [224] = { + .species = SPECIES_NOCTOWL, + .moves = {MOVE_CONFUSION MOVE_AERIAL_ACE MOVE_FAINT_ATTACK MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [225] = { + .species = SPECIES_SANDSLASH, + .moves = {MOVE_CRUSH_CLAW MOVE_ROCK_SLIDE MOVE_SWIFT MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [226] = { + .species = SPECIES_VENOMOTH, + .moves = {MOVE_SILVER_WIND MOVE_PSYBEAM MOVE_SLEEP_POWDER MOVE_SKILL_SWAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [227] = { + .species = SPECIES_CHANSEY, + .moves = {MOVE_METRONOME MOVE_REFRESH MOVE_DEFENSE_CURL MOVE_MINIMIZE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_RELAXED + }, + [228] = { + .species = SPECIES_SEAKING, + .moves = {MOVE_WATER_PULSE MOVE_PSYBEAM MOVE_SWIFT MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [229] = { + .species = SPECIES_JUMPLUFF, + .moves = {MOVE_AERIAL_ACE MOVE_SWAGGER MOVE_PSYCH_UP MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [230] = { + .species = SPECIES_PILOSWINE, + .moves = {MOVE_DIG MOVE_ANCIENT_POWER MOVE_HAIL MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [231] = { + .species = SPECIES_GOLBAT, + .moves = {MOVE_AIR_CUTTER MOVE_CONFUSE_RAY MOVE_TOXIC MOVE_STEEL_WING}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [232] = { + .species = SPECIES_PRIMEAPE, + .moves = {MOVE_KARATE_CHOP MOVE_COUNTER MOVE_SWAGGER MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [233] = { + .species = SPECIES_HITMONLEE, + .moves = {MOVE_ROLLING_KICK MOVE_BRICK_BREAK MOVE_FOCUS_ENERGY MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [234] = { + .species = SPECIES_HITMONCHAN, + .moves = {MOVE_MACH_PUNCH MOVE_SKY_UPPERCUT MOVE_DETECT MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [235] = { + .species = SPECIES_GIRAFARIG, + .moves = {MOVE_PSYBEAM MOVE_STOMP MOVE_WISH MOVE_SKILL_SWAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [236] = { + .species = SPECIES_HITMONTOP, + .moves = {MOVE_TRIPLE_KICK MOVE_DIG MOVE_MACH_PUNCH MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [237] = { + .species = SPECIES_BANETTE, + .moves = {MOVE_NIGHT_SHADE MOVE_WILL_O_WISP MOVE_SPITE MOVE_KNOCK_OFF}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [238] = { + .species = SPECIES_NINJASK, + .moves = {MOVE_BATON_PASS MOVE_SWORDS_DANCE MOVE_ENDURE MOVE_DIG}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MILD + }, + [239] = { + .species = SPECIES_SEVIPER, + .moves = {MOVE_POISON_TAIL MOVE_BITE MOVE_GLARE MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [240] = { + .species = SPECIES_ZANGOOSE, + .moves = {MOVE_SLASH MOVE_DOUBLE_KICK MOVE_ROAR MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [241] = { + .species = SPECIES_CAMERUPT, + .moves = {MOVE_MAGNITUDE MOVE_PROTECT MOVE_SANDSTORM MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [242] = { + .species = SPECIES_SHARPEDO, + .moves = {MOVE_SLASH MOVE_BITE MOVE_WATER_PULSE MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [243] = { + .species = SPECIES_TROPIUS, + .moves = {MOVE_MAGICAL_LEAF MOVE_WHIRLWIND MOVE_AERIAL_ACE MOVE_STEEL_WING}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [244] = { + .species = SPECIES_MAGNETON, + .moves = {MOVE_SHOCK_WAVE MOVE_SONIC_BOOM MOVE_THUNDER_WAVE MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_LONELY + }, + [245] = { + .species = SPECIES_MANTINE, + .moves = {MOVE_BUBBLE_BEAM MOVE_AERIAL_ACE MOVE_RAIN_DANCE MOVE_ICY_WIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [246] = { + .species = SPECIES_STANTLER, + .moves = {MOVE_EXTRASENSORY MOVE_CONFUSE_RAY MOVE_STOMP MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_GENTLE + }, + [247] = { + .species = SPECIES_ABSOL, + .moves = {MOVE_BITE MOVE_RAZOR_WIND MOVE_FUTURE_SIGHT MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [248] = { + .species = SPECIES_SWALOT, + .moves = {MOVE_STOCKPILE MOVE_SWALLOW MOVE_SPIT_UP MOVE_SLUDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIRKY + }, + [249] = { + .species = SPECIES_CRAWDAUNT, + .moves = {MOVE_BUBBLE_BEAM MOVE_VICE_GRIP MOVE_KNOCK_OFF MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [250] = { + .species = SPECIES_PIDGEOT, + .moves = {MOVE_AERIAL_ACE MOVE_FEATHER_DANCE MOVE_MUD_SLAP MOVE_FAINT_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [251] = { + .species = SPECIES_GRUMPIG, + .moves = {MOVE_PSYBEAM MOVE_CONFUSE_RAY MOVE_FUTURE_SIGHT MOVE_MAGIC_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [252] = { + .species = SPECIES_TORKOAL, + .moves = {MOVE_EMBER MOVE_FIRE_SPIN MOVE_SMOKESCREEN MOVE_AMNESIA}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [253] = { + .species = SPECIES_KINGLER, + .moves = {MOVE_CRABHAMMER MOVE_METAL_CLAW MOVE_MUD_SHOT MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [254] = { + .species = SPECIES_CACTURNE, + .moves = {MOVE_NEEDLE_ARM MOVE_FAINT_ATTACK MOVE_ACID MOVE_MEGA_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_HASTY + }, + [255] = { + .species = SPECIES_BELLOSSOM, + .moves = {MOVE_PETAL_DANCE MOVE_SAFEGUARD MOVE_SUNNY_DAY MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [256] = { + .species = SPECIES_OCTILLERY, + .moves = {MOVE_OCTAZOOKA MOVE_AURORA_BEAM MOVE_PSYBEAM MOVE_ROCK_BLAST}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [257] = { + .species = SPECIES_HUNTAIL, + .moves = {MOVE_WHIRLPOOL MOVE_SCARY_FACE MOVE_MUD_SLAP MOVE_BITE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [258] = { + .species = SPECIES_GOREBYSS, + .moves = {MOVE_WHIRLPOOL MOVE_AMNESIA MOVE_ICY_WIND MOVE_CONFUSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [259] = { + .species = SPECIES_RELICANTH, + .moves = {MOVE_ANCIENT_POWER MOVE_WATER_PULSE MOVE_HARDEN MOVE_AMNESIA}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [260] = { + .species = SPECIES_OMASTAR, + .moves = {MOVE_BUBBLE_BEAM MOVE_SPIKE_CANNON MOVE_TICKLE MOVE_ANCIENT_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [261] = { + .species = SPECIES_KABUTOPS, + .moves = {MOVE_SLASH MOVE_DIG MOVE_FURY_CUTTER MOVE_KNOCK_OFF}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [262] = { + .species = SPECIES_POLIWRATH, + .moves = {MOVE_SUBMISSION MOVE_DIG MOVE_ROCK_TOMB MOVE_BUBBLE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [263] = { + .species = SPECIES_SCYTHER, + .moves = {MOVE_FURY_CUTTER MOVE_AERIAL_ACE MOVE_LIGHT_SCREEN MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [264] = { + .species = SPECIES_PINSIR, + .moves = {MOVE_SUBMISSION MOVE_FOCUS_ENERGY MOVE_SWORDS_DANCE MOVE_REVENGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [265] = { + .species = SPECIES_POLITOED, + .moves = {MOVE_DIVE MOVE_DIG MOVE_HYPNOSIS MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_RELAXED + }, + [266] = { + .species = SPECIES_CLOYSTER, + .moves = {MOVE_AURORA_BEAM MOVE_SPIKE_CANNON MOVE_SUPERSONIC MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [267] = { + .species = SPECIES_DELCATTY, + .moves = {MOVE_FAKE_TEARS MOVE_SING MOVE_THUNDERBOLT MOVE_ICE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [268] = { + .species = SPECIES_SABLEYE, + .moves = {MOVE_SHADOW_BALL MOVE_FAINT_ATTACK MOVE_CONFUSE_RAY MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [269] = { + .species = SPECIES_LICKITUNG, + .moves = {MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_SHADOW_BALL MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [270] = { + .species = SPECIES_WEEPINBELL, + .moves = {MOVE_SLUDGE_BOMB MOVE_RAZOR_LEAF MOVE_SLEEP_POWDER MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIRKY + }, + [271] = { + .species = SPECIES_GRAVELER, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [272] = { + .species = SPECIES_GLOOM, + .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_SLUDGE_BOMB MOVE_MOONLIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [273] = { + .species = SPECIES_PORYGON, + .moves = {MOVE_TRI_ATTACK MOVE_PSYCHIC MOVE_THUNDER_WAVE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [274] = { + .species = SPECIES_KADABRA, + .moves = {MOVE_PSYCHIC MOVE_THUNDER_WAVE MOVE_REFLECT MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [275] = { + .species = SPECIES_WAILMER, + .moves = {MOVE_WATER_SPOUT MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_DOCILE + }, + [276] = { + .species = SPECIES_ROSELIA, + .moves = {MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_GRASS_WHISTLE MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [277] = { + .species = SPECIES_VOLBEAT, + .moves = {MOVE_SIGNAL_BEAM MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_TAIL_GLOW}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [278] = { + .species = SPECIES_ILLUMISE, + .moves = {MOVE_SILVER_WIND MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [279] = { + .species = SPECIES_IVYSAUR, + .moves = {MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_SLEEP_POWDER MOVE_LEECH_SEED}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [280] = { + .species = SPECIES_CHARMELEON, + .moves = {MOVE_FLAMETHROWER MOVE_SLASH MOVE_ANCIENT_POWER MOVE_DRAGON_RAGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [281] = { + .species = SPECIES_WARTORTLE, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RAPID_SPIN MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [282] = { + .species = SPECIES_PARASECT, + .moves = {MOVE_SPORE MOVE_GIGA_DRAIN MOVE_DIG MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [283] = { + .species = SPECIES_MACHOKE, + .moves = {MOVE_CROSS_CHOP MOVE_ROCK_SLIDE MOVE_FORESIGHT MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [284] = { + .species = SPECIES_HAUNTER, + .moves = {MOVE_PSYCHIC MOVE_HYPNOSIS MOVE_NIGHTMARE MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [285] = { + .species = SPECIES_BAYLEEF, + .moves = {MOVE_GIGA_DRAIN MOVE_BODY_SLAM MOVE_GRASS_WHISTLE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [286] = { + .species = SPECIES_QUILAVA, + .moves = {MOVE_FLAMETHROWER MOVE_CRUSH_CLAW MOVE_BODY_SLAM MOVE_SMOKESCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [287] = { + .species = SPECIES_CROCONAW, + .moves = {MOVE_MEGA_KICK MOVE_AERIAL_ACE MOVE_ROCK_SLIDE MOVE_DIG}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [288] = { + .species = SPECIES_TOGETIC, + .moves = {MOVE_RETURN MOVE_SWEET_KISS MOVE_AERIAL_ACE MOVE_YAWN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [289] = { + .species = SPECIES_MURKROW, + .moves = {MOVE_PERISH_SONG MOVE_MEAN_LOOK MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [290] = { + .species = SPECIES_WOBBUFFET, + .moves = {MOVE_COUNTER MOVE_MIRROR_COAT MOVE_ENCORE MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_CAREFUL + }, + [291] = { + .species = SPECIES_PLUSLE, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_SEISMIC_TOSS MOVE_WISH}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [292] = { + .species = SPECIES_MINUN, + .moves = {MOVE_THUNDERBOLT MOVE_ATTRACT MOVE_CHARM MOVE_WISH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [293] = { + .species = SPECIES_GROVYLE, + .moves = {MOVE_GIGA_DRAIN MOVE_CRUSH_CLAW MOVE_SCREECH MOVE_ROCK_TOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [294] = { + .species = SPECIES_COMBUSKEN, + .moves = {MOVE_FLAMETHROWER MOVE_SKY_UPPERCUT MOVE_SLASH MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [295] = { + .species = SPECIES_MARSHTOMP, + .moves = {MOVE_MUDDY_WATER MOVE_EARTHQUAKE MOVE_MUD_SLAP MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [296] = { + .species = SPECIES_PONYTA, + .moves = {MOVE_FLAMETHROWER MOVE_BODY_SLAM MOVE_DOUBLE_KICK MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [297] = { + .species = SPECIES_AZUMARILL, + .moves = {MOVE_MEGA_KICK MOVE_BRICK_BREAK MOVE_IRON_TAIL MOVE_DIG}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [298] = { + .species = SPECIES_SUDOWOODO, + .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_LOW_KICK MOVE_SELF_DESTRUCT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [299] = { + .species = SPECIES_MAGCARGO, + .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [300] = { + .species = SPECIES_PUPITAR, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CRUNCH MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [301] = { + .species = SPECIES_SEALEO, + .moves = {MOVE_ICE_BEAM MOVE_SURF MOVE_BODY_SLAM MOVE_HAIL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [302] = { + .species = SPECIES_RATICATE, + .moves = {MOVE_SUPER_FANG MOVE_HYPER_FANG MOVE_SHADOW_BALL MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [303] = { + .species = SPECIES_MASQUERAIN, + .moves = {MOVE_HYDRO_PUMP MOVE_ICE_BEAM MOVE_GIGA_DRAIN MOVE_STUN_SPORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [304] = { + .species = SPECIES_FURRET, + .moves = {MOVE_TRICK MOVE_FRUSTRATION MOVE_SHADOW_BALL MOVE_FOLLOW_ME}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [305] = { + .species = SPECIES_DUNSPARCE, + .moves = {MOVE_ICE_BEAM MOVE_ROCK_TOMB MOVE_BITE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [306] = { + .species = SPECIES_DRAGONAIR, + .moves = {MOVE_RETURN MOVE_REST MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [307] = { + .species = SPECIES_MIGHTYENA, + .moves = {MOVE_CRUNCH MOVE_SHADOW_BALL MOVE_FRUSTRATION MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIRKY + }, + [308] = { + .species = SPECIES_LINOONE, + .moves = {MOVE_TRICK MOVE_FRUSTRATION MOVE_THUNDER_WAVE MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [309] = { + .species = SPECIES_CASTFORM, + .moves = {MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_WATER_PULSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [310] = { + .species = SPECIES_SHELGON, + .moves = {MOVE_FRUSTRATION MOVE_DRAGON_DANCE MOVE_CRUNCH MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [311] = { + .species = SPECIES_METANG, + .moves = {MOVE_METEOR_MASH MOVE_PSYCHIC MOVE_BODY_SLAM MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [312] = { + .species = SPECIES_WIGGLYTUFF, + .moves = {MOVE_FAKE_TEARS MOVE_SING MOVE_DREAM_EATER MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_DOCILE + }, + [313] = { + .species = SPECIES_SUNFLORA, + .moves = {MOVE_GIGA_DRAIN MOVE_GRASS_WHISTLE MOVE_GROWTH MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [314] = { + .species = SPECIES_CHIMECHO, + .moves = {MOVE_PSYCHIC MOVE_HYPNOSIS MOVE_DREAM_EATER MOVE_HEAL_BELL}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [315] = { + .species = SPECIES_GLIGAR, + .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_GUILLOTINE MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [316] = { + .species = SPECIES_QWILFISH, + .moves = {MOVE_REVENGE MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [317] = { + .species = SPECIES_SNEASEL, + .moves = {MOVE_CRUSH_CLAW MOVE_BRICK_BREAK MOVE_AERIAL_ACE MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [318] = { + .species = SPECIES_PELIPPER, + .moves = {MOVE_SURF MOVE_BLIZZARD MOVE_AERIAL_ACE MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [319] = { + .species = SPECIES_SWELLOW, + .moves = {MOVE_FACADE MOVE_AERIAL_ACE MOVE_PURSUIT MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [320] = { + .species = SPECIES_LAIRON, + .moves = {MOVE_EARTHQUAKE MOVE_IRON_TAIL MOVE_ROAR MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [321] = { + .species = SPECIES_TANGELA, + .moves = {MOVE_GIGA_DRAIN MOVE_STUN_SPORE MOVE_REST MOVE_AMNESIA}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [322] = { + .species = SPECIES_ARBOK, + .moves = {MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_IRON_TAIL MOVE_GLARE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [323] = { + .species = SPECIES_PERSIAN, + .moves = {MOVE_FRUSTRATION MOVE_SHADOW_BALL MOVE_ROAR MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [324] = { + .species = SPECIES_SEADRA, + .moves = {MOVE_HYDRO_PUMP MOVE_FRUSTRATION MOVE_DRAGON_BREATH MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [325] = { + .species = SPECIES_KECLEON, + .moves = {MOVE_TRICK MOVE_BRICK_BREAK MOVE_SHADOW_BALL MOVE_SKILL_SWAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [326] = { + .species = SPECIES_VIGOROTH, + .moves = {MOVE_CRUSH_CLAW MOVE_REVERSAL MOVE_ENDURE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [327] = { + .species = SPECIES_LUNATONE, + .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_COSMIC_POWER MOVE_CALM_MIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [328] = { + .species = SPECIES_SOLROCK, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_COSMIC_POWER MOVE_OVERHEAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [329] = { + .species = SPECIES_NOCTOWL, + .moves = {MOVE_PSYCHIC MOVE_FAINT_ATTACK MOVE_AERIAL_ACE MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [330] = { + .species = SPECIES_SANDSLASH, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CRUSH_CLAW MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [331] = { + .species = SPECIES_VENOMOTH, + .moves = {MOVE_SIGNAL_BEAM MOVE_PSYCHIC MOVE_SLUDGE_BOMB MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [332] = { + .species = SPECIES_CHANSEY, + .moves = {MOVE_SEISMIC_TOSS MOVE_SHADOW_BALL MOVE_DOUBLE_TEAM MOVE_SOFT_BOILED}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_RELAXED + }, + [333] = { + .species = SPECIES_SEAKING, + .moves = {MOVE_HORN_DRILL MOVE_MEGAHORN MOVE_SLEEP_TALK MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [334] = { + .species = SPECIES_JUMPLUFF, + .moves = {MOVE_LEECH_SEED MOVE_SLEEP_POWDER MOVE_GIGA_DRAIN MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BOLD + }, + [335] = { + .species = SPECIES_PILOSWINE, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BODY_SLAM MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_ADAMANT + }, + [336] = { + .species = SPECIES_GOLBAT, + .moves = {MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_AIR_CUTTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [337] = { + .species = SPECIES_PRIMEAPE, + .moves = {MOVE_CROSS_CHOP MOVE_ROCK_TOMB MOVE_OVERHEAT MOVE_BULK_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [338] = { + .species = SPECIES_HITMONLEE, + .moves = {MOVE_MEGA_KICK MOVE_BRICK_BREAK MOVE_FORESIGHT MOVE_ROCK_TOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [339] = { + .species = SPECIES_HITMONCHAN, + .moves = {MOVE_DYNAMIC_PUNCH MOVE_MACH_PUNCH MOVE_DETECT MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [340] = { + .species = SPECIES_GIRAFARIG, + .moves = {MOVE_PSYCHIC MOVE_CRUNCH MOVE_BATON_PASS MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [341] = { + .species = SPECIES_HITMONTOP, + .moves = {MOVE_DOUBLE_EDGE MOVE_SEISMIC_TOSS MOVE_ROCK_SLIDE MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [342] = { + .species = SPECIES_BANETTE, + .moves = {MOVE_SHADOW_BALL MOVE_FRUSTRATION MOVE_SCREECH MOVE_WILL_O_WISP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_ADAMANT + }, + [343] = { + .species = SPECIES_NINJASK, + .moves = {MOVE_SLASH MOVE_SHADOW_BALL MOVE_SWORDS_DANCE MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [344] = { + .species = SPECIES_SEVIPER, + .moves = {MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [345] = { + .species = SPECIES_ZANGOOSE, + .moves = {MOVE_CRUSH_CLAW MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [346] = { + .species = SPECIES_CAMERUPT, + .moves = {MOVE_EARTHQUAKE MOVE_ERUPTION MOVE_BODY_SLAM MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [347] = { + .species = SPECIES_SHARPEDO, + .moves = {MOVE_DOUBLE_EDGE MOVE_CRUNCH MOVE_EARTHQUAKE MOVE_SURF}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [348] = { + .species = SPECIES_TROPIUS, + .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_SYNTHESIS MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [349] = { + .species = SPECIES_MAGNETON, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_THUNDER_WAVE MOVE_METAL_SOUND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [350] = { + .species = SPECIES_MANTINE, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RAIN_DANCE MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [351] = { + .species = SPECIES_STANTLER, + .moves = {MOVE_FRUSTRATION MOVE_SHADOW_BALL MOVE_THUNDER_WAVE MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [352] = { + .species = SPECIES_ABSOL, + .moves = {MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_AERIAL_ACE MOVE_IRON_TAIL}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [353] = { + .species = SPECIES_SWALOT, + .moves = {MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_BODY_SLAM MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [354] = { + .species = SPECIES_CRAWDAUNT, + .moves = {MOVE_GUILLOTINE MOVE_FRUSTRATION MOVE_ANCIENT_POWER MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [355] = { + .species = SPECIES_PIDGEOT, + .moves = {MOVE_RETURN MOVE_AERIAL_ACE MOVE_STEEL_WING MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [356] = { + .species = SPECIES_GRUMPIG, + .moves = {MOVE_PSYCHIC MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [357] = { + .species = SPECIES_TORKOAL, + .moves = {MOVE_OVERHEAT MOVE_BODY_SLAM MOVE_SMOKESCREEN MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [358] = { + .species = SPECIES_KINGLER, + .moves = {MOVE_GUILLOTINE MOVE_ROCK_TOMB MOVE_FLAIL MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [359] = { + .species = SPECIES_CACTURNE, + .moves = {MOVE_MEGA_KICK MOVE_TEETER_DANCE MOVE_FAINT_ATTACK MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_HARDY + }, + [360] = { + .species = SPECIES_BELLOSSOM, + .moves = {MOVE_SOLAR_BEAM MOVE_ATTRACT MOVE_SUNNY_DAY MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [361] = { + .species = SPECIES_OCTILLERY, + .moves = {MOVE_OCTAZOOKA MOVE_FIRE_BLAST MOVE_THUNDER_WAVE MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [362] = { + .species = SPECIES_HUNTAIL, + .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_CRUNCH MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [363] = { + .species = SPECIES_GOREBYSS, + .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_PSYCHIC MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [364] = { + .species = SPECIES_RELICANTH, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AMNESIA MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [365] = { + .species = SPECIES_OMASTAR, + .moves = {MOVE_HYDRO_PUMP MOVE_RAIN_DANCE MOVE_ICE_BEAM MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [366] = { + .species = SPECIES_KABUTOPS, + .moves = {MOVE_SLASH MOVE_ROCK_SLIDE MOVE_FLAIL MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [367] = { + .species = SPECIES_POLIWRATH, + .moves = {MOVE_BRICK_BREAK MOVE_HYPNOSIS MOVE_REST MOVE_BELLY_DRUM}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [368] = { + .species = SPECIES_SCYTHER, + .moves = {MOVE_SILVER_WIND MOVE_AERIAL_ACE MOVE_SWORDS_DANCE MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [369] = { + .species = SPECIES_PINSIR, + .moves = {MOVE_GUILLOTINE MOVE_SWORDS_DANCE MOVE_FLAIL MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [370] = { + .species = SPECIES_POLITOED, + .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_MUD_SLAP MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [371] = { + .species = SPECIES_CLOYSTER, + .moves = {MOVE_DIVE MOVE_TOXIC MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [372] = { + .species = SPECIES_DUGTRIO, + .moves = {MOVE_EARTHQUAKE MOVE_TRI_ATTACK MOVE_SLASH MOVE_SAND_TOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [373] = { + .species = SPECIES_MEDICHAM, + .moves = {MOVE_PSYCHIC MOVE_HI_JUMP_KICK MOVE_CALM_MIND MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [374] = { + .species = SPECIES_MISDREAVUS, + .moves = {MOVE_PAIN_SPLIT MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [375] = { + .species = SPECIES_FEAROW, + .moves = {MOVE_DRILL_PECK MOVE_TRI_ATTACK MOVE_FACADE MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [376] = { + .species = SPECIES_GRANBULL, + .moves = {MOVE_MEGA_KICK MOVE_SMELLING_SALT MOVE_THUNDER_WAVE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [377] = { + .species = SPECIES_JYNX, + .moves = {MOVE_ICE_BEAM MOVE_FAKE_OUT MOVE_LOVELY_KISS MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [378] = { + .species = SPECIES_DUSCLOPS, + .moves = {MOVE_WILL_O_WISP MOVE_SEISMIC_TOSS MOVE_PAIN_SPLIT MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [379] = { + .species = SPECIES_DODRIO, + .moves = {MOVE_DRILL_PECK MOVE_TRI_ATTACK MOVE_SLEEP_TALK MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [380] = { + .species = SPECIES_MR_MIME, + .moves = {MOVE_PSYCHIC MOVE_MAGICAL_LEAF MOVE_FAKE_OUT MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [381] = { + .species = SPECIES_LANTURN, + .moves = {MOVE_SURF MOVE_CONFUSE_RAY MOVE_ATTRACT MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [382] = { + .species = SPECIES_BRELOOM, + .moves = {MOVE_SKY_UPPERCUT MOVE_MACH_PUNCH MOVE_HEADBUTT MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [383] = { + .species = SPECIES_FORRETRESS, + .moves = {MOVE_DOUBLE_EDGE MOVE_ROCK_SLIDE MOVE_LIGHT_SCREEN MOVE_SPIKES}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [384] = { + .species = SPECIES_WHISCASH, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AMNESIA MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [385] = { + .species = SPECIES_XATU, + .moves = {MOVE_DRILL_PECK MOVE_NIGHT_SHADE MOVE_WISH MOVE_FUTURE_SIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [386] = { + .species = SPECIES_SKARMORY, + .moves = {MOVE_STEEL_WING MOVE_AIR_CUTTER MOVE_COUNTER MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [387] = { + .species = SPECIES_MAROWAK, + .moves = {MOVE_BONEMERANG MOVE_ROCK_SLIDE MOVE_ICY_WIND MOVE_HEADBUTT}, + .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [388] = { + .species = SPECIES_QUAGSIRE, + .moves = {MOVE_EARTHQUAKE MOVE_BRICK_BREAK MOVE_COUNTER MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [389] = { + .species = SPECIES_CLEFABLE, + .moves = {MOVE_METRONOME MOVE_DOUBLE_TEAM MOVE_REFLECT MOVE_FOLLOW_ME}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BRAVE + }, + [390] = { + .species = SPECIES_HARIYAMA, + .moves = {MOVE_CROSS_CHOP MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [391] = { + .species = SPECIES_RAICHU, + .moves = {MOVE_THUNDERBOLT MOVE_QUICK_ATTACK MOVE_LIGHT_SCREEN MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [392] = { + .species = SPECIES_DEWGONG, + .moves = {MOVE_ICE_BEAM MOVE_ICY_WIND MOVE_HEADBUTT MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [393] = { + .species = SPECIES_MANECTRIC, + .moves = {MOVE_THUNDERBOLT MOVE_FLASH MOVE_QUICK_ATTACK MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [394] = { + .species = SPECIES_VILEPLUME, + .moves = {MOVE_SLUDGE_BOMB MOVE_PETAL_DANCE MOVE_MOONLIGHT MOVE_AROMATHERAPY}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [395] = { + .species = SPECIES_VICTREEBEL, + .moves = {MOVE_GIGA_DRAIN MOVE_SLEEP_POWDER MOVE_SWEET_SCENT MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [396] = { + .species = SPECIES_ELECTRODE, + .moves = {MOVE_THUNDERBOLT MOVE_SWIFT MOVE_LIGHT_SCREEN MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [397] = { + .species = SPECIES_EXPLOUD, + .moves = {MOVE_HYPER_VOICE MOVE_SHADOW_BALL MOVE_SLEEP_TALK MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [398] = { + .species = SPECIES_SHIFTRY, + .moves = {MOVE_GIGA_DRAIN MOVE_FAINT_ATTACK MOVE_QUICK_ATTACK MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_MIRACLE_SEED, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [399] = { + .species = SPECIES_GLALIE, + .moves = {MOVE_ICE_BEAM MOVE_CRUNCH MOVE_HAIL MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [400] = { + .species = SPECIES_LUDICOLO, + .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [401] = { + .species = SPECIES_HYPNO, + .moves = {MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_HYPNOSIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [402] = { + .species = SPECIES_GOLEM, + .moves = {MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_COUNTER MOVE_ROCK_TOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [403] = { + .species = SPECIES_RHYDON, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_TOMB MOVE_SCARY_FACE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [404] = { + .species = SPECIES_ALAKAZAM, + .moves = {MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [405] = { + .species = SPECIES_WEEZING, + .moves = {MOVE_SLUDGE_BOMB MOVE_WILL_O_WISP MOVE_SHADOW_BALL MOVE_SMOKESCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [406] = { + .species = SPECIES_KANGASKHAN, + .moves = {MOVE_DIZZY_PUNCH MOVE_BRICK_BREAK MOVE_COUNTER MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [407] = { + .species = SPECIES_ELECTABUZZ, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_BRICK_BREAK MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [408] = { + .species = SPECIES_TAUROS, + .moves = {MOVE_EARTHQUAKE MOVE_THRASH MOVE_SWAGGER MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [409] = { + .species = SPECIES_SLOWBRO, + .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_HEADBUTT MOVE_ICE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [410] = { + .species = SPECIES_SLOWKING, + .moves = {MOVE_PSYCHIC MOVE_BRICK_BREAK MOVE_AMNESIA MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [411] = { + .species = SPECIES_MILTANK, + .moves = {MOVE_FACADE MOVE_SHADOW_BALL MOVE_COUNTER MOVE_MILK_DRINK}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [412] = { + .species = SPECIES_ALTARIA, + .moves = {MOVE_DRAGON_CLAW MOVE_AERIAL_ACE MOVE_REFRESH MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [413] = { + .species = SPECIES_NIDOQUEEN, + .moves = {MOVE_SLUDGE_BOMB MOVE_DOUBLE_KICK MOVE_BODY_SLAM MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [414] = { + .species = SPECIES_NIDOKING, + .moves = {MOVE_HORN_DRILL MOVE_DOUBLE_KICK MOVE_BODY_SLAM MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [415] = { + .species = SPECIES_MAGMAR, + .moves = {MOVE_FLAMETHROWER MOVE_SMOKESCREEN MOVE_BRICK_BREAK MOVE_BARRIER}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [416] = { + .species = SPECIES_CRADILY, + .moves = {MOVE_GIGA_DRAIN MOVE_ROCK_SLIDE MOVE_BARRIER MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [417] = { + .species = SPECIES_ARMALDO, + .moves = {MOVE_SLASH MOVE_AERIAL_ACE MOVE_ANCIENT_POWER MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [418] = { + .species = SPECIES_GOLDUCK, + .moves = {MOVE_HYDRO_PUMP MOVE_DIG MOVE_BRICK_BREAK MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [419] = { + .species = SPECIES_RAPIDASH, + .moves = {MOVE_FLAMETHROWER MOVE_DOUBLE_KICK MOVE_QUICK_ATTACK MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIET + }, + [420] = { + .species = SPECIES_MUK, + .moves = {MOVE_SLUDGE_BOMB MOVE_BODY_SLAM MOVE_SCREECH MOVE_MINIMIZE}, + .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [421] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_DREAM_EATER MOVE_HYPNOSIS MOVE_CONFUSE_RAY MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_TIMID + }, + [422] = { + .species = SPECIES_AMPHAROS, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_THUNDER_WAVE MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [423] = { + .species = SPECIES_SCIZOR, + .moves = {MOVE_METAL_CLAW MOVE_AERIAL_ACE MOVE_COUNTER MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [424] = { + .species = SPECIES_HERACROSS, + .moves = {MOVE_MEGAHORN MOVE_BRICK_BREAK MOVE_ROCK_TOMB MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [425] = { + .species = SPECIES_URSARING, + .moves = {MOVE_MEGA_KICK MOVE_CRUNCH MOVE_AERIAL_ACE MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [426] = { + .species = SPECIES_HOUNDOOM, + .moves = {MOVE_FLAMETHROWER MOVE_SHADOW_BALL MOVE_COUNTER MOVE_WILL_O_WISP}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [427] = { + .species = SPECIES_DONPHAN, + .moves = {MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_SWAGGER MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [428] = { + .species = SPECIES_CLAYDOL, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [429] = { + .species = SPECIES_WAILORD, + .moves = {MOVE_SURF MOVE_ICY_WIND MOVE_BODY_SLAM MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [430] = { + .species = SPECIES_NINETALES, + .moves = {MOVE_FLAMETHROWER MOVE_ROAR MOVE_CONFUSE_RAY MOVE_WILL_O_WISP}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [431] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_CROSS_CHOP MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [432] = { + .species = SPECIES_SHUCKLE, + .moves = {MOVE_ROLLOUT MOVE_DEFENSE_CURL MOVE_SLEEP_TALK MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BRAVE + }, + [433] = { + .species = SPECIES_STEELIX, + .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_BREATH MOVE_ROCK_TOMB MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [434] = { + .species = SPECIES_TENTACRUEL, + .moves = {MOVE_SLUDGE_BOMB MOVE_ICY_WIND MOVE_BARRIER MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_IMPISH + }, + [435] = { + .species = SPECIES_AERODACTYL, + .moves = {MOVE_ANCIENT_POWER MOVE_DRAGON_BREATH MOVE_AERIAL_ACE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [436] = { + .species = SPECIES_PORYGON2, + .moves = {MOVE_TRI_ATTACK MOVE_AERIAL_ACE MOVE_SHADOW_BALL MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [437] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_DREAM_EATER MOVE_HYPNOSIS MOVE_MAGICAL_LEAF MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_TIMID + }, + [438] = { + .species = SPECIES_EXEGGUTOR, + .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_SYNTHESIS MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [439] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_PSYCHIC MOVE_CONFUSE_RAY MOVE_THUNDER_WAVE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [440] = { + .species = SPECIES_FLYGON, + .moves = {MOVE_EARTHQUAKE MOVE_STEEL_WING MOVE_FAINT_ATTACK MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [441] = { + .species = SPECIES_VENUSAUR, + .moves = {MOVE_GIGA_DRAIN MOVE_SUNNY_DAY MOVE_SYNTHESIS MOVE_SLEEP_POWDER}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [442] = { + .species = SPECIES_VAPOREON, + .moves = {MOVE_SURF MOVE_ROAR MOVE_BITE MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [443] = { + .species = SPECIES_JOLTEON, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_ATTRACT MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [444] = { + .species = SPECIES_FLAREON, + .moves = {MOVE_FLAMETHROWER MOVE_ROAR MOVE_BITE MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [445] = { + .species = SPECIES_MEGANIUM, + .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_LIGHT_SCREEN MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [446] = { + .species = SPECIES_ESPEON, + .moves = {MOVE_PSYCHIC MOVE_CHARM MOVE_CALM_MIND MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [447] = { + .species = SPECIES_UMBREON, + .moves = {MOVE_CONFUSE_RAY MOVE_FAINT_ATTACK MOVE_DOUBLE_TEAM MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [448] = { + .species = SPECIES_BLASTOISE, + .moves = {MOVE_HYDRO_PUMP MOVE_RAIN_DANCE MOVE_BITE MOVE_SEISMIC_TOSS}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [449] = { + .species = SPECIES_FERALIGATR, + .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_AERIAL_ACE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [450] = { + .species = SPECIES_AGGRON, + .moves = {MOVE_IRON_TAIL MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [451] = { + .species = SPECIES_BLAZIKEN, + .moves = {MOVE_FLAMETHROWER MOVE_SUNNY_DAY MOVE_DOUBLE_KICK MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [452] = { + .species = SPECIES_WALREIN, + .moves = {MOVE_BLIZZARD MOVE_HAIL MOVE_YAWN MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [453] = { + .species = SPECIES_SCEPTILE, + .moves = {MOVE_LEAF_BLADE MOVE_LEECH_SEED MOVE_AERIAL_ACE MOVE_DETECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [454] = { + .species = SPECIES_CHARIZARD, + .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_ROAR MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [455] = { + .species = SPECIES_TYPHLOSION, + .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_SMOKESCREEN MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [456] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_SURF MOVE_ATTRACT MOVE_CONFUSE_RAY MOVE_SING}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BOLD + }, + [457] = { + .species = SPECIES_CROBAT, + .moves = {MOVE_SLUDGE_BOMB MOVE_BITE MOVE_ASTONISH MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [458] = { + .species = SPECIES_SWAMPERT, + .moves = {MOVE_EARTHQUAKE MOVE_COUNTER MOVE_REST MOVE_CURSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [459] = { + .species = SPECIES_GYARADOS, + .moves = {MOVE_RETURN MOVE_BITE MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [460] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_FACADE MOVE_SHADOW_BALL MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [461] = { + .species = SPECIES_KINGDRA, + .moves = {MOVE_HYDRO_PUMP MOVE_DRAGON_BREATH MOVE_ICY_WIND MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [462] = { + .species = SPECIES_BLISSEY, + .moves = {MOVE_TOXIC MOVE_DOUBLE_TEAM MOVE_SING MOVE_SOFT_BOILED}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BOLD + }, + [463] = { + .species = SPECIES_MILOTIC, + .moves = {MOVE_HYDRO_PUMP MOVE_ICY_WIND MOVE_RECOVER MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [464] = { + .species = SPECIES_ARCANINE, + .moves = {MOVE_FLAMETHROWER MOVE_EXTREME_SPEED MOVE_CRUNCH MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [465] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_DRAGON_CLAW MOVE_AERIAL_ACE MOVE_HEADBUTT MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [466] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_METEOR_MASH MOVE_AERIAL_ACE MOVE_FACADE MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [467] = { + .species = SPECIES_SLAKING, + .moves = {MOVE_YAWN MOVE_BULK_UP MOVE_SWAGGER MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [468] = { + .species = SPECIES_DUGTRIO, + .moves = {MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_AERIAL_ACE MOVE_TRI_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [469] = { + .species = SPECIES_MEDICHAM, + .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_PSYCHIC MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [470] = { + .species = SPECIES_MAROWAK, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWORDS_DANCE MOVE_ICY_WIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [471] = { + .species = SPECIES_QUAGSIRE, + .moves = {MOVE_CURSE MOVE_ATTRACT MOVE_YAWN MOVE_ANCIENT_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_SASSY + }, + [472] = { + .species = SPECIES_MISDREAVUS, + .moves = {MOVE_PSYCHIC MOVE_ATTRACT MOVE_THUNDER_WAVE MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BOLD + }, + [473] = { + .species = SPECIES_FEAROW, + .moves = {MOVE_DRILL_PECK MOVE_TRI_ATTACK MOVE_ATTRACT MOVE_PURSUIT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [474] = { + .species = SPECIES_GRANBULL, + .moves = {MOVE_OVERHEAT MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, + .nature = NATURE_QUIET + }, + [475] = { + .species = SPECIES_JYNX, + .moves = {MOVE_PERISH_SONG MOVE_MEAN_LOOK MOVE_LOVELY_KISS MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [476] = { + .species = SPECIES_DUSCLOPS, + .moves = {MOVE_TOXIC MOVE_CONFUSE_RAY MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [477] = { + .species = SPECIES_DODRIO, + .moves = {MOVE_DRILL_PECK MOVE_DOUBLE_EDGE MOVE_FAINT_ATTACK MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [478] = { + .species = SPECIES_MR_MIME, + .moves = {MOVE_BATON_PASS MOVE_SWAGGER MOVE_PSYCH_UP MOVE_PSYCHIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [479] = { + .species = SPECIES_LANTURN, + .moves = {MOVE_FLAIL MOVE_ENDURE MOVE_THUNDERBOLT MOVE_SURF}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [480] = { + .species = SPECIES_BRELOOM, + .moves = {MOVE_GIGA_DRAIN MOVE_LEECH_SEED MOVE_FOCUS_PUNCH MOVE_SPORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [481] = { + .species = SPECIES_FORRETRESS, + .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_COUNTER MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [482] = { + .species = SPECIES_SKARMORY, + .moves = {MOVE_SPIKES MOVE_ROAR MOVE_DRILL_PECK MOVE_TOXIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [483] = { + .species = SPECIES_WHISCASH, + .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_SPARK MOVE_FUTURE_SIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [484] = { + .species = SPECIES_XATU, + .moves = {MOVE_FLY MOVE_TOXIC MOVE_CONFUSE_RAY MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [485] = { + .species = SPECIES_CLEFABLE, + .moves = {MOVE_METEOR_MASH MOVE_COSMIC_POWER MOVE_DOUBLE_TEAM MOVE_FOLLOW_ME}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [486] = { + .species = SPECIES_HARIYAMA, + .moves = {MOVE_CROSS_CHOP MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [487] = { + .species = SPECIES_RAICHU, + .moves = {MOVE_THUNDERBOLT MOVE_REVERSAL MOVE_ENDURE MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [488] = { + .species = SPECIES_DEWGONG, + .moves = {MOVE_BLIZZARD MOVE_DOUBLE_EDGE MOVE_ENCORE MOVE_DISABLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [489] = { + .species = SPECIES_MANECTRIC, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_CRUNCH MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [490] = { + .species = SPECIES_VILEPLUME, + .moves = {MOVE_INGRAIN MOVE_DOUBLE_TEAM MOVE_TOXIC MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [491] = { + .species = SPECIES_VICTREEBEL, + .moves = {MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_SLEEP_POWDER MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_SERIOUS + }, + [492] = { + .species = SPECIES_ELECTRODE, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [493] = { + .species = SPECIES_EXPLOUD, + .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_EARTHQUAKE MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [494] = { + .species = SPECIES_SHIFTRY, + .moves = {MOVE_LEECH_SEED MOVE_DIG MOVE_DOUBLE_TEAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_IMPISH + }, + [495] = { + .species = SPECIES_GLALIE, + .moves = {MOVE_EXPLOSION MOVE_ENDURE MOVE_BODY_SLAM MOVE_ICY_WIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [496] = { + .species = SPECIES_LUDICOLO, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [497] = { + .species = SPECIES_HYPNO, + .moves = {MOVE_HYPNOSIS MOVE_NIGHTMARE MOVE_DREAM_EATER MOVE_PSYCHIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [498] = { + .species = SPECIES_GOLEM, + .moves = {MOVE_FOCUS_PUNCH MOVE_SUBSTITUTE MOVE_DOUBLE_TEAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [499] = { + .species = SPECIES_RHYDON, + .moves = {MOVE_EARTHQUAKE MOVE_HORN_DRILL MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [500] = { + .species = SPECIES_ALAKAZAM, + .moves = {MOVE_PSYCHIC MOVE_CALM_MIND MOVE_THUNDER_WAVE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [501] = { + .species = SPECIES_WEEZING, + .moves = {MOVE_MEMENTO MOVE_SLUDGE_BOMB MOVE_FACADE MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [502] = { + .species = SPECIES_KANGASKHAN, + .moves = {MOVE_CRUSH_CLAW MOVE_SHADOW_BALL MOVE_ATTRACT MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [503] = { + .species = SPECIES_ELECTABUZZ, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_ATTRACT MOVE_FOCUS_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [504] = { + .species = SPECIES_TAUROS, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_DOUBLE_TEAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [505] = { + .species = SPECIES_SLOWBRO, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_YAWN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_MODEST + }, + [506] = { + .species = SPECIES_SLOWKING, + .moves = {MOVE_YAWN MOVE_THUNDER_WAVE MOVE_SURF MOVE_PSYCHIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [507] = { + .species = SPECIES_MILTANK, + .moves = {MOVE_FOCUS_PUNCH MOVE_SHADOW_BALL MOVE_ATTRACT MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [508] = { + .species = SPECIES_ALTARIA, + .moves = {MOVE_PERISH_SONG MOVE_DRAGON_BREATH MOVE_PURSUIT MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [509] = { + .species = SPECIES_NIDOQUEEN, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [510] = { + .species = SPECIES_NIDOKING, + .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [511] = { + .species = SPECIES_MAGMAR, + .moves = {MOVE_FIRE_BLAST MOVE_SMOKESCREEN MOVE_THUNDER_PUNCH MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [512] = { + .species = SPECIES_CRADILY, + .moves = {MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [513] = { + .species = SPECIES_ARMALDO, + .moves = {MOVE_IRON_TAIL MOVE_ANCIENT_POWER MOVE_BRICK_BREAK MOVE_KNOCK_OFF}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [514] = { + .species = SPECIES_GOLDUCK, + .moves = {MOVE_CROSS_CHOP MOVE_SURF MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [515] = { + .species = SPECIES_RAPIDASH, + .moves = {MOVE_FIRE_BLAST MOVE_BOUNCE MOVE_DOUBLE_TEAM MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [516] = { + .species = SPECIES_MUK, + .moves = {MOVE_CURSE MOVE_REST MOVE_SLUDGE_BOMB MOVE_DYNAMIC_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [517] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_WILL_O_WISP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [518] = { + .species = SPECIES_AMPHAROS, + .moves = {MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_FOCUS_PUNCH MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [519] = { + .species = SPECIES_SCIZOR, + .moves = {MOVE_SILVER_WIND MOVE_STEEL_WING MOVE_SWORDS_DANCE MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [520] = { + .species = SPECIES_HERACROSS, + .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_ATTRACT MOVE_BULK_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [521] = { + .species = SPECIES_URSARING, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_BRICK_BREAK MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [522] = { + .species = SPECIES_HOUNDOOM, + .moves = {MOVE_FIRE_BLAST MOVE_CRUNCH MOVE_ROAR MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [523] = { + .species = SPECIES_DONPHAN, + .moves = {MOVE_FLAIL MOVE_ENDURE MOVE_EARTHQUAKE MOVE_ROCK_TOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [524] = { + .species = SPECIES_CLAYDOL, + .moves = {MOVE_PSYCHIC MOVE_EARTHQUAKE MOVE_DOUBLE_TEAM MOVE_COSMIC_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [525] = { + .species = SPECIES_WAILORD, + .moves = {MOVE_DOUBLE_EDGE MOVE_REST MOVE_CURSE MOVE_AMNESIA}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [526] = { + .species = SPECIES_NINETALES, + .moves = {MOVE_HEAT_WAVE MOVE_BODY_SLAM MOVE_GRUDGE MOVE_SUNNY_DAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [527] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_BULK_UP MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [528] = { + .species = SPECIES_SHUCKLE, + .moves = {MOVE_SANDSTORM MOVE_DIG MOVE_FLASH MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_CAREFUL + }, + [529] = { + .species = SPECIES_STEELIX, + .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_BREATH MOVE_SANDSTORM MOVE_BLOCK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [530] = { + .species = SPECIES_TENTACRUEL, + .moves = {MOVE_TOXIC MOVE_GIGA_DRAIN MOVE_CONFUSE_RAY MOVE_SURF}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [531] = { + .species = SPECIES_AERODACTYL, + .moves = {MOVE_HYPER_BEAM MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ANCIENT_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [532] = { + .species = SPECIES_PORYGON2, + .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_THUNDER_WAVE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [533] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_PSYCHIC MOVE_CALM_MIND MOVE_DOUBLE_TEAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [534] = { + .species = SPECIES_EXEGGUTOR, + .moves = {MOVE_RETURN MOVE_CURSE MOVE_SLEEP_POWDER MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [535] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_HYDRO_PUMP MOVE_THUNDER MOVE_RAIN_DANCE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [536] = { + .species = SPECIES_FLYGON, + .moves = {MOVE_SOLAR_BEAM MOVE_FIRE_BLAST MOVE_CRUNCH MOVE_SUNNY_DAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [537] = { + .species = SPECIES_VENUSAUR, + .moves = {MOVE_LEECH_SEED MOVE_GIGA_DRAIN MOVE_DOUBLE_TEAM MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [538] = { + .species = SPECIES_VAPOREON, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_BODY_SLAM MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [539] = { + .species = SPECIES_JOLTEON, + .moves = {MOVE_THUNDERBOLT MOVE_DIG MOVE_DOUBLE_KICK MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [540] = { + .species = SPECIES_FLAREON, + .moves = {MOVE_CURSE MOVE_ATTRACT MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [541] = { + .species = SPECIES_MEGANIUM, + .moves = {MOVE_LEECH_SEED MOVE_SUBSTITUTE MOVE_DOUBLE_TEAM MOVE_GRASS_WHISTLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [542] = { + .species = SPECIES_ESPEON, + .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_CALM_MIND MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [543] = { + .species = SPECIES_UMBREON, + .moves = {MOVE_CURSE MOVE_SCREECH MOVE_DOUBLE_TEAM MOVE_DOUBLE_EDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [544] = { + .species = SPECIES_BLASTOISE, + .moves = {MOVE_HYDRO_PUMP MOVE_MEGA_KICK MOVE_BRICK_BREAK MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [545] = { + .species = SPECIES_FERALIGATR, + .moves = {MOVE_SURF MOVE_DRAGON_CLAW MOVE_BRICK_BREAK MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [546] = { + .species = SPECIES_AGGRON, + .moves = {MOVE_FOCUS_PUNCH MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [547] = { + .species = SPECIES_BLAZIKEN, + .moves = {MOVE_BLAZE_KICK MOVE_MEGA_KICK MOVE_THUNDER_PUNCH MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [548] = { + .species = SPECIES_WALREIN, + .moves = {MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_CURSE MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [549] = { + .species = SPECIES_SCEPTILE, + .moves = {MOVE_LEAF_BLADE MOVE_THUNDER_PUNCH MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [550] = { + .species = SPECIES_CHARIZARD, + .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_DRAGON_DANCE MOVE_SMOKESCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [551] = { + .species = SPECIES_TYPHLOSION, + .moves = {MOVE_FLAMETHROWER MOVE_THUNDER_PUNCH MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [552] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_BODY_SLAM MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_TIMID + }, + [553] = { + .species = SPECIES_CROBAT, + .moves = {MOVE_TOXIC MOVE_GIGA_DRAIN MOVE_CONFUSE_RAY MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [554] = { + .species = SPECIES_SWAMPERT, + .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_COUNTER MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [555] = { + .species = SPECIES_GYARADOS, + .moves = {MOVE_HYDRO_PUMP MOVE_THUNDERBOLT MOVE_FIRE_BLAST MOVE_BLIZZARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [556] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CURSE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [557] = { + .species = SPECIES_KINGDRA, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_DRAGON_BREATH MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [558] = { + .species = SPECIES_BLISSEY, + .moves = {MOVE_SEISMIC_TOSS MOVE_SING MOVE_ATTRACT MOVE_SUBSTITUTE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BOLD + }, + [559] = { + .species = SPECIES_MILOTIC, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_SAFEGUARD MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [560] = { + .species = SPECIES_ARCANINE, + .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_CRUNCH MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [561] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_DOUBLE_EDGE MOVE_CRUNCH MOVE_SWAGGER MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [562] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_EARTHQUAKE MOVE_METEOR_MASH MOVE_PSYCH_UP MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [563] = { + .species = SPECIES_SLAKING, + .moves = {MOVE_MEGA_KICK MOVE_SHADOW_BALL MOVE_YAWN MOVE_AMNESIA}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_ADAMANT + }, + [564] = { + .species = SPECIES_DUGTRIO, + .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_SLUDGE_BOMB MOVE_FISSURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [565] = { + .species = SPECIES_MEDICHAM, + .moves = {MOVE_DYNAMIC_PUNCH MOVE_THUNDER_PUNCH MOVE_ICE_PUNCH MOVE_FIRE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_HARDY + }, + [566] = { + .species = SPECIES_MISDREAVUS, + .moves = {MOVE_PERISH_SONG MOVE_MEAN_LOOK MOVE_THUNDER_WAVE MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [567] = { + .species = SPECIES_FEAROW, + .moves = {MOVE_DRILL_PECK MOVE_RETURN MOVE_STEEL_WING MOVE_FAINT_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [568] = { + .species = SPECIES_GRANBULL, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_SLUDGE_BOMB MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [569] = { + .species = SPECIES_JYNX, + .moves = {MOVE_DREAM_EATER MOVE_LOVELY_KISS MOVE_ATTRACT MOVE_SUBSTITUTE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [570] = { + .species = SPECIES_DUSCLOPS, + .moves = {MOVE_PSYCH_UP MOVE_SWAGGER MOVE_SHADOW_BALL MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [571] = { + .species = SPECIES_DODRIO, + .moves = {MOVE_DOUBLE_EDGE MOVE_DRILL_PECK MOVE_STEEL_WING MOVE_FAINT_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [572] = { + .species = SPECIES_MR_MIME, + .moves = {MOVE_TRICK MOVE_TORMENT MOVE_PSYCHIC MOVE_THUNDERBOLT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [573] = { + .species = SPECIES_LANTURN, + .moves = {MOVE_HYDRO_PUMP MOVE_THUNDER MOVE_CONFUSE_RAY MOVE_RAIN_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [574] = { + .species = SPECIES_BRELOOM, + .moves = {MOVE_IRON_TAIL MOVE_FOCUS_PUNCH MOVE_ATTRACT MOVE_SPORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [575] = { + .species = SPECIES_FORRETRESS, + .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_GIGA_DRAIN MOVE_ZAP_CANNON}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [576] = { + .species = SPECIES_WHISCASH, + .moves = {MOVE_SLEEP_TALK MOVE_REST MOVE_SURF MOVE_FISSURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_HARDY + }, + [577] = { + .species = SPECIES_XATU, + .moves = {MOVE_DRILL_PECK MOVE_PSYCHIC MOVE_GIGA_DRAIN MOVE_STEEL_WING}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [578] = { + .species = SPECIES_SKARMORY, + .moves = {MOVE_TOXIC MOVE_CURSE MOVE_REST MOVE_FLY}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [579] = { + .species = SPECIES_MAROWAK, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWORDS_DANCE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [580] = { + .species = SPECIES_QUAGSIRE, + .moves = {MOVE_EARTHQUAKE MOVE_SLUDGE_BOMB MOVE_DOUBLE_EDGE MOVE_CURSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [581] = { + .species = SPECIES_CLEFABLE, + .moves = {MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_FLAMETHROWER MOVE_MAGICAL_LEAF}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [582] = { + .species = SPECIES_HARIYAMA, + .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [583] = { + .species = SPECIES_RAICHU, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_IRON_TAIL MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [584] = { + .species = SPECIES_DEWGONG, + .moves = {MOVE_HORN_DRILL MOVE_SHEER_COLD MOVE_SLEEP_TALK MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [585] = { + .species = SPECIES_MANECTRIC, + .moves = {MOVE_THUNDERBOLT MOVE_IRON_TAIL MOVE_THUNDER_WAVE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [586] = { + .species = SPECIES_VILEPLUME, + .moves = {MOVE_ATTRACT MOVE_STUN_SPORE MOVE_SLUDGE_BOMB MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [587] = { + .species = SPECIES_VICTREEBEL, + .moves = {MOVE_STUN_SPORE MOVE_INGRAIN MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [588] = { + .species = SPECIES_ELECTRODE, + .moves = {MOVE_EXPLOSION MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [589] = { + .species = SPECIES_EXPLOUD, + .moves = {MOVE_OVERHEAT MOVE_ICE_BEAM MOVE_THUNDER_PUNCH MOVE_EXTRASENSORY}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [590] = { + .species = SPECIES_SHIFTRY, + .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_EXPLOSION MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [591] = { + .species = SPECIES_GLALIE, + .moves = {MOVE_BLIZZARD MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [592] = { + .species = SPECIES_LUDICOLO, + .moves = {MOVE_LEECH_SEED MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [593] = { + .species = SPECIES_HYPNO, + .moves = {MOVE_PSYCH_UP MOVE_SWAGGER MOVE_MEGA_KICK MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [594] = { + .species = SPECIES_GOLEM, + .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [595] = { + .species = SPECIES_RHYDON, + .moves = {MOVE_MEGAHORN MOVE_CRUSH_CLAW MOVE_EARTHQUAKE MOVE_HORN_DRILL}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [596] = { + .species = SPECIES_ALAKAZAM, + .moves = {MOVE_TRICK MOVE_DISABLE MOVE_PSYCHIC MOVE_SKILL_SWAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [597] = { + .species = SPECIES_WEEZING, + .moves = {MOVE_EXPLOSION MOVE_SLUDGE_BOMB MOVE_FLAMETHROWER MOVE_THUNDERBOLT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [598] = { + .species = SPECIES_KANGASKHAN, + .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_THUNDERBOLT MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [599] = { + .species = SPECIES_ELECTABUZZ, + .moves = {MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_THUNDERBOLT MOVE_CROSS_CHOP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [600] = { + .species = SPECIES_TAUROS, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_ICE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [601] = { + .species = SPECIES_SLOWBRO, + .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, + .nature = NATURE_QUIET + }, + [602] = { + .species = SPECIES_SLOWKING, + .moves = {MOVE_PSYCHIC MOVE_SURF MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [603] = { + .species = SPECIES_MILTANK, + .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_EARTHQUAKE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [604] = { + .species = SPECIES_ALTARIA, + .moves = {MOVE_SING MOVE_DRAGON_DANCE MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [605] = { + .species = SPECIES_NIDOQUEEN, + .moves = {MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_CRUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [606] = { + .species = SPECIES_NIDOKING, + .moves = {MOVE_HORN_DRILL MOVE_FIRE_BLAST MOVE_BLIZZARD MOVE_SURF}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [607] = { + .species = SPECIES_MAGMAR, + .moves = {MOVE_MEGA_KICK MOVE_CROSS_CHOP MOVE_IRON_TAIL MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_IMPISH + }, + [608] = { + .species = SPECIES_CRADILY, + .moves = {MOVE_SUBSTITUTE MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [609] = { + .species = SPECIES_ARMALDO, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK MOVE_SWORDS_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [610] = { + .species = SPECIES_GOLDUCK, + .moves = {MOVE_HYDRO_PUMP MOVE_CROSS_CHOP MOVE_BLIZZARD MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [611] = { + .species = SPECIES_RAPIDASH, + .moves = {MOVE_OVERHEAT MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_HYPNOSIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [612] = { + .species = SPECIES_MUK, + .moves = {MOVE_SLUDGE_BOMB MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [613] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_GIGA_DRAIN MOVE_SKILL_SWAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [614] = { + .species = SPECIES_AMPHAROS, + .moves = {MOVE_THUNDERBOLT MOVE_MEGA_KICK MOVE_IRON_TAIL MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [615] = { + .species = SPECIES_SCIZOR, + .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_AGILITY MOVE_SLASH}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_CAREFUL + }, + [616] = { + .species = SPECIES_HERACROSS, + .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [617] = { + .species = SPECIES_URSARING, + .moves = {MOVE_FIRE_PUNCH MOVE_THUNDER_PUNCH MOVE_ICE_PUNCH MOVE_CRUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [618] = { + .species = SPECIES_HOUNDOOM, + .moves = {MOVE_OVERHEAT MOVE_SHADOW_BALL MOVE_SLUDGE_BOMB MOVE_DOUBLE_EDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [619] = { + .species = SPECIES_DONPHAN, + .moves = {MOVE_FISSURE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SECRET_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [620] = { + .species = SPECIES_CLAYDOL, + .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_SOLAR_BEAM MOVE_SUNNY_DAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [621] = { + .species = SPECIES_WAILORD, + .moves = {MOVE_HYDRO_PUMP MOVE_FISSURE MOVE_DOUBLE_TEAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [622] = { + .species = SPECIES_NINETALES, + .moves = {MOVE_FIRE_BLAST MOVE_IRON_TAIL MOVE_CONFUSE_RAY MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [623] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_CROSS_CHOP MOVE_FIRE_BLAST MOVE_THUNDER_PUNCH MOVE_ICE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [624] = { + .species = SPECIES_SHUCKLE, + .moves = {MOVE_SUBSTITUTE MOVE_ATTRACT MOVE_TOXIC MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_CAREFUL + }, + [625] = { + .species = SPECIES_STEELIX, + .moves = {MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_ROCK_SLIDE MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [626] = { + .species = SPECIES_TENTACRUEL, + .moves = {MOVE_SURF MOVE_GIGA_DRAIN MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [627] = { + .species = SPECIES_AERODACTYL, + .moves = {MOVE_DOUBLE_EDGE MOVE_ROCK_SLIDE MOVE_FIRE_BLAST MOVE_DRAGON_CLAW}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [628] = { + .species = SPECIES_PORYGON2, + .moves = {MOVE_PSYCHIC MOVE_TRI_ATTACK MOVE_THUNDER_WAVE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [629] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_PSYCHIC MOVE_ICE_PUNCH MOVE_FIRE_PUNCH MOVE_MAGICAL_LEAF}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [630] = { + .species = SPECIES_EXEGGUTOR, + .moves = {MOVE_LEECH_SEED MOVE_GIGA_DRAIN MOVE_TOXIC MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [631] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [632] = { + .species = SPECIES_FLYGON, + .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_CLAW MOVE_FLAMETHROWER MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [633] = { + .species = SPECIES_VENUSAUR, + .moves = {MOVE_DOUBLE_EDGE MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_SLEEP_POWDER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [634] = { + .species = SPECIES_VAPOREON, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_ACID_ARMOR MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [635] = { + .species = SPECIES_JOLTEON, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_AGILITY MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [636] = { + .species = SPECIES_FLAREON, + .moves = {MOVE_SHADOW_BALL MOVE_FLAIL MOVE_ENDURE MOVE_OVERHEAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [637] = { + .species = SPECIES_MEGANIUM, + .moves = {MOVE_EARTHQUAKE MOVE_FLAIL MOVE_ENDURE MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [638] = { + .species = SPECIES_ESPEON, + .moves = {MOVE_PSYCHIC MOVE_BITE MOVE_WISH MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [639] = { + .species = SPECIES_UMBREON, + .moves = {MOVE_SWAGGER MOVE_PSYCH_UP MOVE_ATTRACT MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [640] = { + .species = SPECIES_BLASTOISE, + .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [641] = { + .species = SPECIES_FERALIGATR, + .moves = {MOVE_HYDRO_PUMP MOVE_CRUNCH MOVE_EARTHQUAKE MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [642] = { + .species = SPECIES_AGGRON, + .moves = {MOVE_SURF MOVE_THUNDER MOVE_FIRE_BLAST MOVE_BLIZZARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [643] = { + .species = SPECIES_BLAZIKEN, + .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_ENDURE MOVE_REVERSAL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [644] = { + .species = SPECIES_WALREIN, + .moves = {MOVE_SHEER_COLD MOVE_FISSURE MOVE_SURF MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [645] = { + .species = SPECIES_SCEPTILE, + .moves = {MOVE_LEAF_BLADE MOVE_EARTHQUAKE MOVE_CRUSH_CLAW MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [646] = { + .species = SPECIES_CHARIZARD, + .moves = {MOVE_FLAMETHROWER MOVE_DRAGON_CLAW MOVE_BITE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [647] = { + .species = SPECIES_TYPHLOSION, + .moves = {MOVE_EARTHQUAKE MOVE_OVERHEAT MOVE_ENDURE MOVE_REVERSAL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [648] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_DOUBLE_EDGE MOVE_PSYCHIC MOVE_CONFUSE_RAY MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [649] = { + .species = SPECIES_CROBAT, + .moves = {MOVE_AIR_CUTTER MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [650] = { + .species = SPECIES_SWAMPERT, + .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_BRAVE + }, + [651] = { + .species = SPECIES_GYARADOS, + .moves = {MOVE_SURF MOVE_THUNDER MOVE_RAIN_DANCE MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [652] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_MEGA_KICK MOVE_SHADOW_BALL MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_ADAMANT + }, + [653] = { + .species = SPECIES_KINGDRA, + .moves = {MOVE_FLAIL MOVE_HYDRO_PUMP MOVE_DRAGON_DANCE MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [654] = { + .species = SPECIES_BLISSEY, + .moves = {MOVE_FIRE_BLAST MOVE_BLIZZARD MOVE_CALM_MIND MOVE_SOFT_BOILED}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BOLD + }, + [655] = { + .species = SPECIES_MILOTIC, + .moves = {MOVE_SURF MOVE_BLIZZARD MOVE_ATTRACT MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [656] = { + .species = SPECIES_ARCANINE, + .moves = {MOVE_OVERHEAT MOVE_EXTREME_SPEED MOVE_CRUNCH MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [657] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [658] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_EARTHQUAKE MOVE_METEOR_MASH MOVE_DOUBLE_TEAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [659] = { + .species = SPECIES_SLAKING, + .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_AERIAL_ACE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_ADAMANT + }, + [660] = { + .species = SPECIES_DUGTRIO, + .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_ROCK_SLIDE MOVE_FISSURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [661] = { + .species = SPECIES_MEDICHAM, + .moves = {MOVE_MEGA_KICK MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [662] = { + .species = SPECIES_MISDREAVUS, + .moves = {MOVE_DESTINY_BOND MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_THUNDERBOLT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_TIMID + }, + [663] = { + .species = SPECIES_FEAROW, + .moves = {MOVE_DRILL_PECK MOVE_DOUBLE_EDGE MOVE_STEEL_WING MOVE_SKY_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [664] = { + .species = SPECIES_GRANBULL, + .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_BRAVE + }, + [665] = { + .species = SPECIES_JYNX, + .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_LOVELY_KISS MOVE_FAKE_TEARS}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [666] = { + .species = SPECIES_DUSCLOPS, + .moves = {MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_CURSE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [667] = { + .species = SPECIES_DODRIO, + .moves = {MOVE_FLAIL MOVE_ENDURE MOVE_DRILL_PECK MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [668] = { + .species = SPECIES_MR_MIME, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_FIRE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [669] = { + .species = SPECIES_LANTURN, + .moves = {MOVE_SURF MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [670] = { + .species = SPECIES_BRELOOM, + .moves = {MOVE_FOCUS_PUNCH MOVE_SLUDGE_BOMB MOVE_SPORE MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [671] = { + .species = SPECIES_FORRETRESS, + .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DOUBLE_EDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [672] = { + .species = SPECIES_WHISCASH, + .moves = {MOVE_FISSURE MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [673] = { + .species = SPECIES_XATU, + .moves = {MOVE_PSYCHIC MOVE_DRILL_PECK MOVE_SHADOW_BALL MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [674] = { + .species = SPECIES_SKARMORY, + .moves = {MOVE_DRILL_PECK MOVE_STEEL_WING MOVE_COUNTER MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [675] = { + .species = SPECIES_MAROWAK, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWORDS_DANCE MOVE_MEGA_KICK}, + .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [676] = { + .species = SPECIES_QUAGSIRE, + .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_AMNESIA}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_SASSY + }, + [677] = { + .species = SPECIES_CLEFABLE, + .moves = {MOVE_MEGA_KICK MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_SOFT_BOILED}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [678] = { + .species = SPECIES_HARIYAMA, + .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [679] = { + .species = SPECIES_RAICHU, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_PROTECT MOVE_MEGA_KICK}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [680] = { + .species = SPECIES_DEWGONG, + .moves = {MOVE_SHEER_COLD MOVE_ICE_BEAM MOVE_SURF MOVE_SIGNAL_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [681] = { + .species = SPECIES_MANECTRIC, + .moves = {MOVE_THUNDERBOLT MOVE_CRUNCH MOVE_THUNDER_WAVE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [682] = { + .species = SPECIES_VILEPLUME, + .moves = {MOVE_SOLAR_BEAM MOVE_SLUDGE_BOMB MOVE_SUNNY_DAY MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [683] = { + .species = SPECIES_VICTREEBEL, + .moves = {MOVE_GIGA_DRAIN MOVE_DOUBLE_EDGE MOVE_SLUDGE_BOMB MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [684] = { + .species = SPECIES_ELECTRODE, + .moves = {MOVE_EXPLOSION MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [685] = { + .species = SPECIES_EXPLOUD, + .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_OVERHEAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [686] = { + .species = SPECIES_SHIFTRY, + .moves = {MOVE_EXPLOSION MOVE_GIGA_DRAIN MOVE_MEGA_KICK MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [687] = { + .species = SPECIES_GLALIE, + .moves = {MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [688] = { + .species = SPECIES_LUDICOLO, + .moves = {MOVE_LEECH_SEED MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_TOXIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [689] = { + .species = SPECIES_HYPNO, + .moves = {MOVE_PSYCHIC MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [690] = { + .species = SPECIES_GOLEM, + .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DOUBLE_EDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [691] = { + .species = SPECIES_RHYDON, + .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_HORN_DRILL}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [692] = { + .species = SPECIES_ALAKAZAM, + .moves = {MOVE_PSYCHIC MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [693] = { + .species = SPECIES_WEEZING, + .moves = {MOVE_EXPLOSION MOVE_SLUDGE_BOMB MOVE_FRUSTRATION MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [694] = { + .species = SPECIES_KANGASKHAN, + .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [695] = { + .species = SPECIES_ELECTABUZZ, + .moves = {MOVE_THUNDERBOLT MOVE_PSYCHIC MOVE_MEGA_KICK MOVE_CROSS_CHOP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [696] = { + .species = SPECIES_TAUROS, + .moves = {MOVE_DOUBLE_EDGE MOVE_ROCK_TOMB MOVE_THUNDERBOLT MOVE_SURF}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [697] = { + .species = SPECIES_SLOWBRO, + .moves = {MOVE_PSYCHIC MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, + .nature = NATURE_SASSY + }, + [698] = { + .species = SPECIES_SLOWKING, + .moves = {MOVE_PSYCHIC MOVE_SURF MOVE_ICE_BEAM MOVE_FLAMETHROWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [699] = { + .species = SPECIES_MILTANK, + .moves = {MOVE_DOUBLE_EDGE MOVE_CURSE MOVE_DOUBLE_TEAM MOVE_MILK_DRINK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [700] = { + .species = SPECIES_ALTARIA, + .moves = {MOVE_DRAGON_CLAW MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_ICE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [701] = { + .species = SPECIES_NIDOQUEEN, + .moves = {MOVE_SUPERPOWER MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [702] = { + .species = SPECIES_NIDOKING, + .moves = {MOVE_MEGAHORN MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_THUNDER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [703] = { + .species = SPECIES_MAGMAR, + .moves = {MOVE_FLAMETHROWER MOVE_PSYCHIC MOVE_CROSS_CHOP MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [704] = { + .species = SPECIES_CRADILY, + .moves = {MOVE_TOXIC MOVE_INGRAIN MOVE_MIRROR_COAT MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [705] = { + .species = SPECIES_ARMALDO, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [706] = { + .species = SPECIES_GOLDUCK, + .moves = {MOVE_SURF MOVE_CROSS_CHOP MOVE_ICE_BEAM MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [707] = { + .species = SPECIES_RAPIDASH, + .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_IRON_TAIL MOVE_DOUBLE_KICK}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [708] = { + .species = SPECIES_MUK, + .moves = {MOVE_SLUDGE_BOMB MOVE_BRICK_BREAK MOVE_GIGA_DRAIN MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_BRAVE + }, + [709] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_PSYCHIC MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [710] = { + .species = SPECIES_AMPHAROS, + .moves = {MOVE_THUNDERBOLT MOVE_FIRE_PUNCH MOVE_THUNDER_WAVE MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [711] = { + .species = SPECIES_SCIZOR, + .moves = {MOVE_SILVER_WIND MOVE_SWORDS_DANCE MOVE_AGILITY MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [712] = { + .species = SPECIES_HERACROSS, + .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_REVERSAL MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [713] = { + .species = SPECIES_URSARING, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [714] = { + .species = SPECIES_HOUNDOOM, + .moves = {MOVE_OVERHEAT MOVE_SOLAR_BEAM MOVE_CRUNCH MOVE_SUNNY_DAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [715] = { + .species = SPECIES_DONPHAN, + .moves = {MOVE_FISSURE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_IRON_TAIL}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [716] = { + .species = SPECIES_CLAYDOL, + .moves = {MOVE_PSYCHIC MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [717] = { + .species = SPECIES_WAILORD, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_FISSURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [718] = { + .species = SPECIES_NINETALES, + .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_CONFUSE_RAY MOVE_WILL_O_WISP}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [719] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [720] = { + .species = SPECIES_SHUCKLE, + .moves = {MOVE_TOXIC MOVE_DOUBLE_TEAM MOVE_WRAP MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_CAREFUL + }, + [721] = { + .species = SPECIES_STEELIX, + .moves = {MOVE_EARTHQUAKE MOVE_IRON_TAIL MOVE_DOUBLE_EDGE MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [722] = { + .species = SPECIES_TENTACRUEL, + .moves = {MOVE_HYDRO_PUMP MOVE_SLUDGE_BOMB MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [723] = { + .species = SPECIES_AERODACTYL, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_FIRE_BLAST MOVE_BITE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [724] = { + .species = SPECIES_PORYGON2, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [725] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_FIRE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [726] = { + .species = SPECIES_EXEGGUTOR, + .moves = {MOVE_PSYCHIC MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [727] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [728] = { + .species = SPECIES_FLYGON, + .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_CLAW MOVE_DOUBLE_EDGE MOVE_CRUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [729] = { + .species = SPECIES_VENUSAUR, + .moves = {MOVE_SOLAR_BEAM MOVE_SLUDGE_BOMB MOVE_SUNNY_DAY MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [730] = { + .species = SPECIES_VAPOREON, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_ACID_ARMOR MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [731] = { + .species = SPECIES_JOLTEON, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_BITE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_TIMID + }, + [732] = { + .species = SPECIES_FLAREON, + .moves = {MOVE_OVERHEAT MOVE_SUNNY_DAY MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [733] = { + .species = SPECIES_MEGANIUM, + .moves = {MOVE_GIGA_DRAIN MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [734] = { + .species = SPECIES_ESPEON, + .moves = {MOVE_PSYCHIC MOVE_BITE MOVE_ATTRACT MOVE_CALM_MIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [735] = { + .species = SPECIES_UMBREON, + .moves = {MOVE_CONFUSE_RAY MOVE_TOXIC MOVE_FAINT_ATTACK MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [736] = { + .species = SPECIES_BLASTOISE, + .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [737] = { + .species = SPECIES_FERALIGATR, + .moves = {MOVE_HYDRO_PUMP MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [738] = { + .species = SPECIES_AGGRON, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [739] = { + .species = SPECIES_BLAZIKEN, + .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_THUNDER_PUNCH MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [740] = { + .species = SPECIES_WALREIN, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_SHEER_COLD}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [741] = { + .species = SPECIES_SCEPTILE, + .moves = {MOVE_LEAF_BLADE MOVE_DRAGON_CLAW MOVE_CRUNCH MOVE_THUNDER_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [742] = { + .species = SPECIES_CHARIZARD, + .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [743] = { + .species = SPECIES_TYPHLOSION, + .moves = {MOVE_OVERHEAT MOVE_THUNDER_PUNCH MOVE_EARTHQUAKE MOVE_CRUSH_CLAW}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [744] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_PSYCHIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [745] = { + .species = SPECIES_CROBAT, + .moves = {MOVE_SLUDGE_BOMB MOVE_AERIAL_ACE MOVE_SHADOW_BALL MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [746] = { + .species = SPECIES_SWAMPERT, + .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [747] = { + .species = SPECIES_GYARADOS, + .moves = {MOVE_RETURN MOVE_EARTHQUAKE MOVE_DRAGON_DANCE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [748] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_CURSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [749] = { + .species = SPECIES_KINGDRA, + .moves = {MOVE_DOUBLE_EDGE MOVE_ICE_BEAM MOVE_DRAGON_DANCE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [750] = { + .species = SPECIES_BLISSEY, + .moves = {MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_COUNTER MOVE_SOFT_BOILED}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BOLD + }, + [751] = { + .species = SPECIES_MILOTIC, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RECOVER MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [752] = { + .species = SPECIES_ARCANINE, + .moves = {MOVE_OVERHEAT MOVE_EXTREME_SPEED MOVE_CRUNCH MOVE_DOUBLE_EDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [753] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [754] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_METEOR_MASH MOVE_PSYCHIC MOVE_EARTHQUAKE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [755] = { + .species = SPECIES_SLAKING, + .moves = {MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_YAWN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, + .nature = NATURE_MODEST + }, + [756] = { + .species = SPECIES_ARTICUNO, + .moves = {MOVE_ICE_BEAM MOVE_WATER_PULSE MOVE_ICY_WIND MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [757] = { + .species = SPECIES_ZAPDOS, + .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_THUNDER_WAVE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [758] = { + .species = SPECIES_MOLTRES, + .moves = {MOVE_FLAMETHROWER MOVE_AERIAL_ACE MOVE_MUD_SLAP MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [759] = { + .species = SPECIES_RAIKOU, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_CALM_MIND MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [760] = { + .species = SPECIES_ENTEI, + .moves = {MOVE_FLAMETHROWER MOVE_DOUBLE_TEAM MOVE_CALM_MIND MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [761] = { + .species = SPECIES_SUICUNE, + .moves = {MOVE_SURF MOVE_DOUBLE_TEAM MOVE_CALM_MIND MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [762] = { + .species = SPECIES_REGIROCK, + .moves = {MOVE_SUPERPOWER MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [763] = { + .species = SPECIES_REGICE, + .moves = {MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_AMNESIA MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [764] = { + .species = SPECIES_REGISTEEL, + .moves = {MOVE_METAL_CLAW MOVE_CURSE MOVE_AMNESIA MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [765] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_DRAGON_CLAW}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [766] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_DRAGON_CLAW}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [767] = { + .species = SPECIES_ARTICUNO, + .moves = {MOVE_SUBSTITUTE MOVE_TOXIC MOVE_BLIZZARD MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [768] = { + .species = SPECIES_ZAPDOS, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_DRILL_PECK MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [769] = { + .species = SPECIES_MOLTRES, + .moves = {MOVE_OVERHEAT MOVE_AERIAL_ACE MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [770] = { + .species = SPECIES_RAIKOU, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [771] = { + .species = SPECIES_ENTEI, + .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_SOLAR_BEAM MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [772] = { + .species = SPECIES_SUICUNE, + .moves = {MOVE_TOXIC MOVE_DIVE MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [773] = { + .species = SPECIES_REGIROCK, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [774] = { + .species = SPECIES_REGICE, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_BLIZZARD MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [775] = { + .species = SPECIES_REGISTEEL, + .moves = {MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [776] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [777] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [778] = { + .species = SPECIES_ARTICUNO, + .moves = {MOVE_ICE_BEAM MOVE_FACADE MOVE_AERIAL_ACE MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [779] = { + .species = SPECIES_ZAPDOS, + .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_THUNDER_WAVE MOVE_SUBSTITUTE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [780] = { + .species = SPECIES_MOLTRES, + .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_DOUBLE_TEAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [781] = { + .species = SPECIES_RAIKOU, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_QUICK_ATTACK MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [782] = { + .species = SPECIES_ENTEI, + .moves = {MOVE_FLAMETHROWER MOVE_DOUBLE_EDGE MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [783] = { + .species = SPECIES_SUICUNE, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RAIN_DANCE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [784] = { + .species = SPECIES_REGIROCK, + .moves = {MOVE_ROCK_SLIDE MOVE_EARTHQUAKE MOVE_CURSE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [785] = { + .species = SPECIES_REGICE, + .moves = {MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [786] = { + .species = SPECIES_REGISTEEL, + .moves = {MOVE_ANCIENT_POWER MOVE_AMNESIA MOVE_COUNTER MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [787] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [788] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [789] = { + .species = SPECIES_ARTICUNO, + .moves = {MOVE_BLIZZARD MOVE_DOUBLE_EDGE MOVE_REST MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [790] = { + .species = SPECIES_ZAPDOS, + .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_THUNDER_WAVE MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [791] = { + .species = SPECIES_MOLTRES, + .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_STEEL_WING MOVE_SAFEGUARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [792] = { + .species = SPECIES_RAIKOU, + .moves = {MOVE_THUNDERBOLT MOVE_BITE MOVE_THUNDER_WAVE MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [793] = { + .species = SPECIES_ENTEI, + .moves = {MOVE_FLAMETHROWER MOVE_BITE MOVE_DOUBLE_TEAM MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [794] = { + .species = SPECIES_SUICUNE, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_BITE MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [795] = { + .species = SPECIES_REGIROCK, + .moves = {MOVE_ROCK_SLIDE MOVE_BRICK_BREAK MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [796] = { + .species = SPECIES_REGICE, + .moves = {MOVE_ICE_BEAM MOVE_HAIL MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [797] = { + .species = SPECIES_REGISTEEL, + .moves = {MOVE_ANCIENT_POWER MOVE_EARTHQUAKE MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [798] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_MIST_BALL MOVE_SHADOW_BALL MOVE_CHARM MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [799] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_LUSTER_PURGE MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_DRAGON_CLAW}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [800] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_THUNDERBOLT MOVE_FIRE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [801] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_THUNDERBOLT MOVE_ICE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [802] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_FIRE_PUNCH MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [803] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [804] = { + .species = SPECIES_URSARING, + .moves = {MOVE_MEGA_KICK MOVE_AERIAL_ACE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [805] = { + .species = SPECIES_URSARING, + .moves = {MOVE_HYPER_BEAM MOVE_YAWN MOVE_SWORDS_DANCE MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [806] = { + .species = SPECIES_URSARING, + .moves = {MOVE_FACADE MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_BULK_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [807] = { + .species = SPECIES_URSARING, + .moves = {MOVE_FACADE MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [808] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_CROSS_CHOP MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [809] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_COUNTER MOVE_ROCK_TOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [810] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_FOCUS_PUNCH MOVE_SUBSTITUTE MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [811] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_REVENGE MOVE_ROCK_SLIDE MOVE_FACADE MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [812] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_ENDURE MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [813] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_WILL_O_WISP MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_TIMID + }, + [814] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_PSYCHIC MOVE_CALM_MIND MOVE_WILL_O_WISP MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [815] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_PSYCHIC MOVE_MAGICAL_LEAF MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [816] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_RECOVER MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [817] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_SURF MOVE_CONFUSE_RAY MOVE_THUNDER_WAVE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [818] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_COSMIC_POWER MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [819] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_SURF MOVE_THUNDERBOLT MOVE_COSMIC_POWER MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [820] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_IRON_TAIL MOVE_DOUBLE_EDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [821] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_HYDRO_PUMP MOVE_THUNDER MOVE_RAIN_DANCE MOVE_BLIZZARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [822] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_SHEER_COLD MOVE_HORN_DRILL MOVE_REST MOVE_SLEEP_TALK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [823] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_SHEER_COLD MOVE_HORN_DRILL MOVE_SING MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [824] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_MEGA_KICK MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [825] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [826] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_HYPER_BEAM MOVE_SHADOW_BALL MOVE_EARTHQUAKE MOVE_CURSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [827] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_RETURN MOVE_SHADOW_BALL MOVE_BELLY_DRUM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [828] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_FACADE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [829] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_HEADBUTT MOVE_AERIAL_ACE MOVE_CRUNCH MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [830] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_FLAMETHROWER MOVE_DRAGON_CLAW MOVE_CRUNCH MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [831] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_FLAMETHROWER MOVE_DRAGON_CLAW MOVE_CRUNCH MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [832] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [833] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_METEOR_MASH MOVE_PSYCHIC MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [834] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [835] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_METEOR_MASH MOVE_EARTHQUAKE MOVE_BRICK_BREAK MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [836] = { + .species = SPECIES_REGIROCK, + .moves = {MOVE_HYPER_BEAM MOVE_FOCUS_PUNCH MOVE_ROCK_SLIDE MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [837] = { + .species = SPECIES_REGIROCK, + .moves = {MOVE_SWAGGER MOVE_PSYCH_UP MOVE_ROCK_SLIDE MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [838] = { + .species = SPECIES_REGICE, + .moves = {MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_CURSE MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [839] = { + .species = SPECIES_REGICE, + .moves = {MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_SLEEP_TALK MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [840] = { + .species = SPECIES_REGISTEEL, + .moves = {MOVE_FOCUS_PUNCH MOVE_SUBSTITUTE MOVE_TOXIC MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [841] = { + .species = SPECIES_REGISTEEL, + .moves = {MOVE_SUPERPOWER MOVE_AERIAL_ACE MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [842] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_DRAGON_CLAW MOVE_THUNDER_WAVE MOVE_CALM_MIND MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [843] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_MIST_BALL MOVE_DRAGON_CLAW MOVE_ATTRACT MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [844] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [845] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [846] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_DRAGON_CLAW MOVE_THUNDER_WAVE MOVE_CALM_MIND MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [847] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_LUSTER_PURGE MOVE_SHADOW_BALL MOVE_DRAGON_CLAW MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [848] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_DRAGON_DANCE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [849] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [850] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_BRICK_BREAK MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [851] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_AERIAL_ACE MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [852] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_HYPER_BEAM MOVE_ATTRACT MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [853] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_HYPER_BEAM MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [854] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_OUTRAGE MOVE_DOUBLE_EDGE MOVE_THUNDER_WAVE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [855] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_SURF MOVE_FLAMETHROWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [856] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_SURF MOVE_ICE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [857] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_DRAGON_CLAW MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [858] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_THUNDER MOVE_SURF MOVE_RAIN_DANCE MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [859] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_FIRE_BLAST MOVE_BLIZZARD MOVE_SUNNY_DAY MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [860] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_THUNDERBOLT MOVE_SURF}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [861] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CRUNCH MOVE_THUNDERBOLT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [862] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [863] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_CRUNCH MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_FLAMETHROWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [864] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DRAGON_DANCE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [865] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CURSE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [866] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_ROCK_SLIDE MOVE_AERIAL_ACE MOVE_BRICK_BREAK MOVE_CURSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [867] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_ROCK_SLIDE MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [868] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_CRUNCH MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [869] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [870] = { + .species = SPECIES_ARTICUNO, + .moves = {MOVE_BLIZZARD MOVE_DOUBLE_EDGE MOVE_AGILITY MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [871] = { + .species = SPECIES_ARTICUNO, + .moves = {MOVE_ICE_BEAM MOVE_AERIAL_ACE MOVE_REFLECT MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [872] = { + .species = SPECIES_ZAPDOS, + .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_DOUBLE_EDGE MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [873] = { + .species = SPECIES_ZAPDOS, + .moves = {MOVE_THUNDER MOVE_DRILL_PECK MOVE_RAIN_DANCE MOVE_DOUBLE_EDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [874] = { + .species = SPECIES_MOLTRES, + .moves = {MOVE_OVERHEAT MOVE_SUNNY_DAY MOVE_SWAGGER MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [875] = { + .species = SPECIES_MOLTRES, + .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_AERIAL_ACE MOVE_STEEL_WING}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [876] = { + .species = SPECIES_RAIKOU, + .moves = {MOVE_THUNDERBOLT MOVE_DOUBLE_EDGE MOVE_ROAR MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [877] = { + .species = SPECIES_RAIKOU, + .moves = {MOVE_THUNDERBOLT MOVE_CALM_MIND MOVE_SUBSTITUTE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [878] = { + .species = SPECIES_ENTEI, + .moves = {MOVE_FIRE_BLAST MOVE_DOUBLE_EDGE MOVE_ENDURE MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_DOCILE + }, + [879] = { + .species = SPECIES_ENTEI, + .moves = {MOVE_FLAMETHROWER MOVE_CALM_MIND MOVE_ROAR MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [880] = { + .species = SPECIES_SUICUNE, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_ICY_WIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [881] = { + .species = SPECIES_SUICUNE, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + } +}; diff --git a/src/data/battle_frontier/battle_frontier_trainer_mons.h b/src/data/battle_frontier/battle_frontier_trainer_mons.h new file mode 100644 index 000000000..d0e21172b --- /dev/null +++ b/src/data/battle_frontier/battle_frontier_trainer_mons.h @@ -0,0 +1,15229 @@ +const u16 gBattleFrontierTrainerMons_Brady[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Conner[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Bradley[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Cybil[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Rodette[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Peggy[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Keith[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Grayson[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Glenn[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Liliana[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Elise[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Zoey[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Manuel[] = +{ + 5, + 20, + 21, + 25, + 27, + 35, + 46, + 47, + 48, + 50, + 53, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 119, + 121, + 124, + 127, + 146, + 147, + 154, + 158, + 160, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Russ[] = +{ + 5, + 20, + 21, + 25, + 27, + 35, + 46, + 47, + 48, + 50, + 53, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 119, + 121, + 124, + 127, + 146, + 147, + 154, + 158, + 160, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dustin[] = +{ + 5, + 20, + 21, + 25, + 27, + 35, + 46, + 47, + 48, + 50, + 53, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 119, + 121, + 124, + 127, + 146, + 147, + 154, + 158, + 160, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Tina[] = +{ + 5, + 20, + 21, + 25, + 27, + 35, + 46, + 47, + 48, + 50, + 53, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 119, + 121, + 124, + 127, + 146, + 147, + 154, + 158, + 160, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gillian[] = +{ + 5, + 20, + 21, + 25, + 27, + 35, + 46, + 47, + 48, + 50, + 53, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 119, + 121, + 124, + 127, + 146, + 147, + 154, + 158, + 160, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Zoe[] = +{ + 5, + 20, + 21, + 25, + 27, + 35, + 46, + 47, + 48, + 50, + 53, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 119, + 121, + 124, + 127, + 146, + 147, + 154, + 158, + 160, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Chen[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Al[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Mitch[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Anne[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alize[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lauren[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kipp[] = +{ + 5, + 6, + 7, + 14, + 19, + 28, + 35, + 42, + 45, + 48, + 50, + 55, + 59, + 60, + 68, + 73, + 83, + 84, + 86, + 87, + 90, + 96, + 97, + 98, + 99, + 103, + 105, + 106, + 109, + 112, + 114, + 121, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jason[] = +{ + 5, + 6, + 7, + 14, + 19, + 28, + 35, + 42, + 45, + 48, + 50, + 55, + 59, + 60, + 68, + 73, + 83, + 84, + 86, + 87, + 90, + 96, + 97, + 98, + 99, + 103, + 105, + 106, + 109, + 112, + 114, + 121, + -1 +}; + +const u16 gBattleFrontierTrainerMons_John[] = +{ + 5, + 6, + 7, + 14, + 19, + 28, + 35, + 42, + 45, + 48, + 50, + 55, + 59, + 60, + 68, + 73, + 83, + 84, + 86, + 87, + 90, + 96, + 97, + 98, + 99, + 103, + 105, + 106, + 109, + 112, + 114, + 121, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ann[] = +{ + 5, + 6, + 7, + 14, + 19, + 28, + 35, + 42, + 45, + 48, + 50, + 55, + 59, + 60, + 68, + 73, + 83, + 84, + 86, + 87, + 90, + 96, + 97, + 98, + 99, + 103, + 105, + 106, + 109, + 112, + 114, + 121, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Eileen[] = +{ + 5, + 6, + 7, + 14, + 19, + 28, + 35, + 42, + 45, + 48, + 50, + 55, + 59, + 60, + 68, + 73, + 83, + 84, + 86, + 87, + 90, + 96, + 97, + 98, + 99, + 103, + 105, + 106, + 109, + 112, + 114, + 121, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Carlie[] = +{ + 5, + 6, + 7, + 14, + 19, + 28, + 35, + 42, + 45, + 48, + 50, + 55, + 59, + 60, + 68, + 73, + 83, + 84, + 86, + 87, + 90, + 96, + 97, + 98, + 99, + 103, + 105, + 106, + 109, + 112, + 114, + 121, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gordon[] = +{ + 1, + 13, + 15, + 16, + 17, + 22, + 23, + 24, + 26, + 32, + 34, + 36, + 43, + 50, + 51, + 54, + 56, + 68, + 72, + 73, + 81, + 82, + 83, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 105, + 107, + 109, + 111, + 113, + 116, + 117, + 123, + 124, + 128, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 152, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ayden[] = +{ + 1, + 13, + 15, + 16, + 17, + 22, + 23, + 24, + 26, + 32, + 34, + 36, + 43, + 50, + 51, + 54, + 56, + 68, + 72, + 73, + 81, + 82, + 83, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 105, + 107, + 109, + 111, + 113, + 116, + 117, + 123, + 124, + 128, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 152, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Marco[] = +{ + 1, + 13, + 15, + 16, + 17, + 22, + 23, + 24, + 26, + 32, + 34, + 36, + 43, + 50, + 51, + 54, + 56, + 68, + 72, + 73, + 81, + 82, + 83, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 105, + 107, + 109, + 111, + 113, + 116, + 117, + 123, + 124, + 128, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 152, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Cierra[] = +{ + 1, + 13, + 16, + 17, + 23, + 24, + 26, + 32, + 34, + 36, + 43, + 51, + 54, + 56, + 68, + 72, + 73, + 76, + 83, + 84, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 105, + 107, + 109, + 111, + 113, + 116, + 117, + 118, + 123, + 124, + 128, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Marcy[] = +{ + 1, + 13, + 16, + 17, + 23, + 24, + 26, + 32, + 34, + 36, + 43, + 51, + 54, + 56, + 68, + 72, + 73, + 76, + 83, + 84, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 105, + 107, + 109, + 111, + 113, + 116, + 117, + 118, + 123, + 124, + 128, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kathy[] = +{ + 1, + 13, + 16, + 17, + 23, + 24, + 26, + 32, + 34, + 36, + 43, + 51, + 54, + 56, + 68, + 72, + 73, + 76, + 83, + 84, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 105, + 107, + 109, + 111, + 113, + 116, + 117, + 118, + 123, + 124, + 128, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Peyton[] = +{ + 84, + 85, + 87, + 88, + 89, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 105, + 106, + 107, + 109, + 112, + 113, + 117, + 120, + 121, + 123, + 129, + 134, + 142, + 143, + 145, + 148, + 149, + 151, + 152, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Julian[] = +{ + 84, + 85, + 87, + 88, + 89, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 105, + 106, + 107, + 109, + 112, + 113, + 117, + 120, + 121, + 123, + 129, + 134, + 142, + 143, + 145, + 148, + 149, + 151, + 152, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Quinn[] = +{ + 84, + 85, + 87, + 88, + 89, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 105, + 106, + 107, + 109, + 112, + 113, + 117, + 120, + 121, + 123, + 129, + 134, + 142, + 143, + 145, + 148, + 149, + 151, + 152, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Haylee[] = +{ + 1, + 5, + 6, + 10, + 13, + 14, + 16, + 17, + 18, + 19, + 20, + 23, + 24, + 26, + 28, + 29, + 31, + 32, + 33, + 34, + 35, + 36, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 54, + 56, + 59, + 61, + 65, + 66, + 67, + 68, + 71, + 72, + 79, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Amanda[] = +{ + 1, + 5, + 6, + 10, + 13, + 14, + 16, + 17, + 18, + 19, + 20, + 23, + 24, + 26, + 28, + 29, + 31, + 32, + 33, + 34, + 35, + 36, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 54, + 56, + 59, + 61, + 65, + 66, + 67, + 68, + 71, + 72, + 79, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Stacy[] = +{ + 1, + 5, + 6, + 10, + 13, + 14, + 16, + 17, + 18, + 19, + 20, + 23, + 24, + 26, + 28, + 29, + 31, + 32, + 33, + 34, + 35, + 36, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 54, + 56, + 59, + 61, + 65, + 66, + 67, + 68, + 71, + 72, + 79, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Rafael[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Oliver[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Payton[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Pamela[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Eliza[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Marisa[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lewis[] = +{ + 2, + 3, + 4, + 8, + 9, + 21, + 27, + 39, + 40, + 41, + 42, + 52, + 57, + 58, + 80, + 112, + 132, + 141, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Yoshi[] = +{ + 2, + 3, + 4, + 11, + 12, + 21, + 27, + 39, + 40, + 41, + 42, + 52, + 57, + 58, + 80, + 112, + 132, + 141, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Destin[] = +{ + 2, + 3, + 4, + 21, + 27, + 39, + 40, + 41, + 42, + 52, + 57, + 58, + 80, + 112, + 132, + 141, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Keon[] = +{ + 5, + 21, + 25, + 27, + 35, + 39, + 40, + 41, + 42, + 46, + 47, + 48, + 50, + 52, + 53, + 57, + 58, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 121, + 124, + 127, + 132, + 141, + 146, + 147, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Stuart[] = +{ + 5, + 21, + 25, + 27, + 35, + 39, + 40, + 41, + 42, + 46, + 47, + 48, + 50, + 52, + 53, + 57, + 58, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 121, + 124, + 127, + 132, + 141, + 146, + 147, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Nestor[] = +{ + 5, + 21, + 25, + 27, + 35, + 39, + 40, + 41, + 42, + 46, + 47, + 48, + 50, + 52, + 53, + 57, + 58, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 121, + 124, + 127, + 132, + 141, + 146, + 147, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Derrick[] = +{ + 21, + 27, + 29, + 39, + 40, + 41, + 42, + 52, + 57, + 58, + 61, + 62, + 63, + 69, + 80, + 92, + 102, + 112, + 125, + 129, + 132, + 140, + 141, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Bryson[] = +{ + 21, + 27, + 29, + 39, + 40, + 41, + 42, + 52, + 57, + 58, + 61, + 62, + 63, + 69, + 80, + 92, + 102, + 112, + 125, + 129, + 132, + 140, + 141, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Clayton[] = +{ + 21, + 27, + 29, + 39, + 40, + 41, + 42, + 52, + 57, + 58, + 61, + 62, + 63, + 69, + 80, + 92, + 102, + 112, + 125, + 129, + 132, + 140, + 141, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Trenton[] = +{ + 6, + 7, + 55, + 60, + 68, + 73, + 83, + 86, + 87, + 105, + 111, + 116, + 123, + 124, + 128, + 134, + 138, + 139, + 151, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jenson[] = +{ + 6, + 7, + 55, + 60, + 68, + 73, + 83, + 86, + 87, + 105, + 111, + 116, + 123, + 124, + 128, + 134, + 138, + 139, + 151, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Wesley[] = +{ + 6, + 7, + 55, + 60, + 68, + 73, + 83, + 86, + 87, + 105, + 111, + 116, + 123, + 124, + 128, + 134, + 138, + 139, + 151, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Anton[] = +{ + 31, + 39, + 58, + 67, + 70, + 74, + 75, + 78, + 85, + 104, + 108, + 120, + 122, + 133, + 138, + 139, + 140, + 141, + 150, + 151, + 152, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lawson[] = +{ + 31, + 39, + 58, + 67, + 70, + 74, + 75, + 78, + 85, + 104, + 108, + 120, + 122, + 133, + 138, + 139, + 140, + 141, + 150, + 151, + 152, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Sammy[] = +{ + 31, + 39, + 58, + 67, + 70, + 74, + 75, + 78, + 85, + 104, + 108, + 120, + 122, + 133, + 138, + 139, + 140, + 141, + 150, + 151, + 152, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Arnie[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Adrian[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Tristan[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Juliana[] = +{ + 0, + 14, + 19, + 28, + 42, + 58, + 59, + 67, + 68, + 85, + 118, + 120, + 123, + 155, + 156, + 193, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Rylee[] = +{ + 0, + 14, + 19, + 28, + 42, + 58, + 59, + 67, + 68, + 85, + 118, + 120, + 123, + 155, + 156, + 193, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Chelsea[] = +{ + 0, + 14, + 19, + 28, + 42, + 58, + 59, + 67, + 68, + 85, + 118, + 120, + 123, + 155, + 156, + 193, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Danela[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lizbeth[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Amelia[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jillian[] = +{ + 0, + 5, + 18, + 19, + 29, + 35, + 48, + 50, + 52, + 61, + 69, + 75, + 78, + 84, + 90, + 94, + 99, + 100, + 101, + 102, + 106, + 112, + 114, + 121, + 125, + 129, + 130, + 131, + 140, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Abbie[] = +{ + 0, + 5, + 18, + 19, + 29, + 35, + 48, + 50, + 52, + 61, + 69, + 75, + 78, + 84, + 90, + 94, + 99, + 100, + 101, + 102, + 106, + 112, + 114, + 121, + 125, + 129, + 130, + 131, + 140, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Briana[] = +{ + 0, + 5, + 18, + 19, + 29, + 35, + 48, + 50, + 52, + 61, + 69, + 75, + 78, + 84, + 90, + 94, + 99, + 100, + 101, + 102, + 106, + 112, + 114, + 121, + 125, + 129, + 130, + 131, + 140, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Antonio[] = +{ + 5, + 10, + 20, + 35, + 48, + 49, + 50, + 62, + 63, + 64, + 66, + 71, + 75, + 77, + 78, + 84, + 90, + 92, + 99, + 106, + 108, + 112, + 114, + 115, + 116, + 119, + 121, + 122, + 143, + 148, + 152, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jaden[] = +{ + 5, + 10, + 20, + 35, + 48, + 49, + 50, + 62, + 63, + 64, + 66, + 71, + 75, + 77, + 78, + 84, + 90, + 92, + 99, + 106, + 108, + 112, + 114, + 115, + 116, + 119, + 121, + 122, + 143, + 148, + 152, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dakota[] = +{ + 5, + 10, + 20, + 35, + 48, + 49, + 50, + 62, + 63, + 64, + 66, + 71, + 75, + 77, + 78, + 84, + 90, + 92, + 99, + 106, + 108, + 112, + 114, + 115, + 116, + 119, + 121, + 122, + 143, + 148, + 152, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Brayden[] = +{ + 1, + 13, + 16, + 17, + 23, + 24, + 25, + 26, + 32, + 33, + 34, + 36, + 37, + 38, + 43, + 44, + 45, + 51, + 54, + 56, + 72, + 91, + 93, + 95, + 106, + 107, + 113, + 117, + 118, + 135, + 137, + 142, + 144, + 145, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Corson[] = +{ + 1, + 13, + 16, + 17, + 23, + 24, + 25, + 26, + 32, + 33, + 34, + 36, + 37, + 38, + 43, + 44, + 45, + 51, + 54, + 56, + 72, + 91, + 93, + 95, + 106, + 107, + 113, + 117, + 118, + 135, + 137, + 142, + 144, + 145, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Trevin[] = +{ + 1, + 13, + 16, + 17, + 23, + 24, + 25, + 26, + 32, + 33, + 34, + 36, + 37, + 38, + 43, + 44, + 45, + 51, + 54, + 56, + 72, + 91, + 93, + 95, + 106, + 107, + 113, + 117, + 118, + 135, + 137, + 142, + 144, + 145, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Patrick[] = +{ + 15, + 22, + 50, + 67, + 70, + 71, + 74, + 77, + 81, + 82, + 83, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 104, + 109, + 111, + 120, + 124, + 128, + 131, + 133, + 134, + 138, + 139, + 151, + 155, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kaden[] = +{ + 15, + 22, + 50, + 67, + 70, + 71, + 74, + 77, + 81, + 82, + 83, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 104, + 109, + 111, + 120, + 124, + 128, + 131, + 133, + 134, + 138, + 139, + 151, + 155, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Maxwell[] = +{ + 15, + 22, + 50, + 67, + 70, + 71, + 74, + 77, + 81, + 82, + 83, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 104, + 109, + 111, + 120, + 124, + 128, + 131, + 133, + 134, + 138, + 139, + 151, + 155, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Daryl[] = +{ + 15, + 22, + 31, + 39, + 50, + 51, + 58, + 67, + 70, + 74, + 75, + 81, + 82, + 85, + 104, + 120, + 122, + 132, + 133, + 138, + 139, + 140, + 141, + 142, + 144, + 150, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kenneth[] = +{ + 15, + 22, + 31, + 39, + 50, + 51, + 58, + 67, + 70, + 74, + 75, + 81, + 82, + 85, + 104, + 120, + 122, + 132, + 133, + 138, + 139, + 140, + 141, + 142, + 144, + 150, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Rich[] = +{ + 15, + 22, + 31, + 39, + 50, + 51, + 58, + 67, + 70, + 74, + 75, + 81, + 82, + 85, + 104, + 120, + 122, + 132, + 133, + 138, + 139, + 140, + 141, + 142, + 144, + 150, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Caden[] = +{ + 30, + 62, + 63, + 65, + 70, + 74, + 77, + 78, + 85, + 88, + 89, + 95, + 108, + 119, + 122, + 133, + 136, + 149, + 150, + 152, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Marlon[] = +{ + 30, + 62, + 63, + 65, + 70, + 74, + 77, + 78, + 85, + 88, + 89, + 95, + 108, + 119, + 122, + 133, + 136, + 149, + 150, + 152, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Nash[] = +{ + 30, + 62, + 63, + 65, + 70, + 74, + 77, + 78, + 85, + 88, + 89, + 95, + 108, + 119, + 122, + 133, + 136, + 149, + 150, + 152, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Robby[] = +{ + 1, + 13, + 15, + 16, + 17, + 22, + 23, + 24, + 26, + 32, + 33, + 34, + 36, + 37, + 38, + 43, + 44, + 50, + 51, + 54, + 56, + 67, + 70, + 72, + 74, + 75, + 81, + 82, + 85, + 91, + 93, + 104, + 107, + 113, + 117, + 120, + 132, + 133, + 135, + 137, + 142, + 144, + 145, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Reece[] = +{ + 1, + 13, + 15, + 16, + 17, + 22, + 23, + 24, + 26, + 32, + 33, + 34, + 36, + 37, + 38, + 43, + 44, + 50, + 51, + 54, + 56, + 67, + 70, + 72, + 74, + 75, + 81, + 82, + 85, + 91, + 93, + 104, + 107, + 113, + 117, + 120, + 132, + 133, + 135, + 137, + 142, + 144, + 145, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kathryn[] = +{ + 1, + 13, + 15, + 16, + 17, + 22, + 23, + 24, + 26, + 32, + 33, + 34, + 36, + 37, + 38, + 43, + 44, + 50, + 51, + 54, + 56, + 67, + 70, + 72, + 74, + 75, + 81, + 82, + 85, + 91, + 93, + 104, + 107, + 113, + 117, + 120, + 132, + 133, + 135, + 137, + 142, + 144, + 145, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ellen[] = +{ + 1, + 13, + 15, + 16, + 17, + 22, + 23, + 24, + 26, + 32, + 33, + 34, + 36, + 37, + 38, + 43, + 44, + 50, + 51, + 54, + 56, + 67, + 70, + 72, + 74, + 75, + 81, + 82, + 85, + 91, + 93, + 104, + 107, + 113, + 117, + 120, + 132, + 133, + 135, + 137, + 142, + 144, + 145, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ramon[] = +{ + 15, + 22, + 50, + 71, + 72, + 76, + 77, + 81, + 82, + 83, + 84, + 87, + 96, + 97, + 98, + 99, + 103, + 107, + 109, + 111, + 113, + 117, + 118, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Arthur[] = +{ + 15, + 22, + 50, + 71, + 72, + 76, + 77, + 81, + 82, + 83, + 84, + 87, + 96, + 97, + 98, + 99, + 103, + 107, + 109, + 111, + 113, + 117, + 118, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alondra[] = +{ + 15, + 22, + 50, + 71, + 72, + 76, + 77, + 81, + 82, + 83, + 84, + 87, + 96, + 97, + 98, + 99, + 103, + 107, + 109, + 111, + 113, + 117, + 118, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Adriana[] = +{ + 15, + 22, + 50, + 71, + 72, + 76, + 77, + 81, + 82, + 83, + 84, + 87, + 96, + 97, + 98, + 99, + 103, + 107, + 109, + 111, + 113, + 117, + 118, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Malik[] = +{ + 10, + 15, + 22, + 49, + 50, + 64, + 66, + 71, + 72, + 77, + 78, + 81, + 82, + 91, + 93, + 107, + 108, + 113, + 115, + 117, + 122, + 135, + 137, + 142, + 143, + 144, + 145, + 148, + 152, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jill[] = +{ + 10, + 15, + 22, + 49, + 50, + 64, + 66, + 71, + 72, + 77, + 78, + 81, + 82, + 91, + 93, + 107, + 108, + 113, + 115, + 117, + 122, + 135, + 137, + 142, + 143, + 144, + 145, + 148, + 152, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Erik[] = +{ + 162, + 164, + 168, + 178, + 183, + 184, + 189, + 197, + 199, + 200, + 203, + 204, + 207, + 210, + 213, + 214, + 218, + 220, + 221, + 224, + 227, + 231, + 232, + 233, + 234, + 235, + 236, + 238, + 240, + 243, + 245, + 246, + 250, + 263, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Yazmin[] = +{ + 162, + 164, + 168, + 178, + 183, + 184, + 189, + 197, + 199, + 200, + 203, + 204, + 207, + 210, + 213, + 214, + 218, + 220, + 221, + 224, + 227, + 231, + 232, + 233, + 234, + 235, + 236, + 238, + 240, + 243, + 245, + 246, + 250, + 263, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jamal[] = +{ + 170, + 176, + 178, + 182, + 189, + 190, + 192, + 196, + 211, + 212, + 213, + 219, + 228, + 230, + 232, + 233, + 234, + 236, + 242, + 245, + 249, + 253, + 256, + 257, + 258, + 259, + 260, + 261, + 262, + 265, + 266, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Leslie[] = +{ + 170, + 176, + 178, + 182, + 189, + 190, + 192, + 196, + 211, + 212, + 213, + 219, + 228, + 230, + 232, + 233, + 234, + 236, + 242, + 245, + 249, + 253, + 256, + 257, + 258, + 259, + 260, + 261, + 262, + 265, + 266, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dave[] = +{ + 162, + 164, + 168, + 178, + 183, + 186, + 187, + 189, + 197, + 199, + 200, + 203, + 204, + 206, + 207, + 214, + 215, + 218, + 220, + 221, + 224, + 227, + 232, + 233, + 234, + 235, + 236, + 240, + 244, + 246, + 250, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Carlo[] = +{ + 162, + 164, + 168, + 178, + 183, + 186, + 187, + 189, + 197, + 199, + 200, + 203, + 204, + 206, + 207, + 214, + 215, + 218, + 220, + 221, + 224, + 227, + 232, + 233, + 234, + 235, + 236, + 240, + 244, + 246, + 250, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Emilia[] = +{ + 162, + 164, + 168, + 178, + 183, + 186, + 187, + 189, + 197, + 199, + 200, + 203, + 204, + 206, + 207, + 214, + 215, + 218, + 220, + 221, + 224, + 227, + 232, + 233, + 234, + 235, + 236, + 240, + 244, + 246, + 250, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dalia[] = +{ + 162, + 164, + 168, + 178, + 183, + 186, + 187, + 189, + 197, + 199, + 200, + 203, + 204, + 206, + 207, + 214, + 215, + 218, + 220, + 221, + 224, + 227, + 232, + 233, + 234, + 235, + 236, + 240, + 244, + 246, + 250, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Hitomi[] = +{ + 164, + 166, + 175, + 178, + 181, + 189, + 191, + 193, + 194, + 195, + 197, + 199, + 200, + 202, + 203, + 205, + 206, + 207, + 210, + 215, + 218, + 220, + 221, + 222, + 223, + 225, + 227, + 230, + 232, + 233, + 234, + 235, + 236, + 240, + 241, + 246, + 247, + 252, + 254, + 262, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ricardo[] = +{ + 164, + 166, + 175, + 178, + 181, + 189, + 191, + 193, + 194, + 195, + 197, + 199, + 200, + 202, + 203, + 205, + 206, + 207, + 210, + 215, + 218, + 220, + 221, + 222, + 223, + 225, + 227, + 230, + 232, + 233, + 234, + 235, + 236, + 240, + 241, + 246, + 247, + 252, + 254, + 262, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Shizuka[] = +{ + 164, + 166, + 175, + 178, + 181, + 189, + 191, + 193, + 194, + 195, + 197, + 199, + 200, + 202, + 203, + 205, + 206, + 207, + 210, + 215, + 218, + 220, + 221, + 222, + 223, + 225, + 227, + 230, + 232, + 233, + 234, + 235, + 236, + 240, + 241, + 246, + 247, + 252, + 254, + 262, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Joana[] = +{ + 164, + 166, + 175, + 178, + 181, + 189, + 191, + 193, + 194, + 195, + 197, + 199, + 200, + 202, + 203, + 205, + 206, + 207, + 210, + 215, + 218, + 220, + 221, + 222, + 223, + 225, + 227, + 230, + 232, + 233, + 234, + 235, + 236, + 240, + 241, + 246, + 247, + 252, + 254, + 262, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kelly[] = +{ + 164, + 166, + 175, + 178, + 181, + 189, + 191, + 193, + 194, + 195, + 197, + 199, + 200, + 202, + 203, + 205, + 206, + 207, + 210, + 215, + 218, + 220, + 221, + 222, + 223, + 225, + 227, + 230, + 232, + 233, + 234, + 235, + 236, + 240, + 241, + 246, + 247, + 252, + 254, + 262, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Rayna[] = +{ + 164, + 166, + 175, + 178, + 181, + 189, + 191, + 193, + 194, + 195, + 197, + 199, + 200, + 202, + 203, + 205, + 206, + 207, + 210, + 215, + 218, + 220, + 221, + 222, + 223, + 225, + 227, + 230, + 232, + 233, + 234, + 235, + 236, + 240, + 241, + 246, + 247, + 252, + 254, + 262, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Evan[] = +{ + 162, + 163, + 164, + 165, + 166, + 167, + 168, + 169, + 170, + 171, + 172, + 173, + 174, + 175, + 176, + 177, + 178, + 179, + 180, + 181, + 182, + 183, + 184, + 185, + 186, + 187, + 188, + 189, + 190, + 191, + 192, + 193, + 194, + 195, + 196, + 197, + 198, + 199, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jordan[] = +{ + 200, + 201, + 202, + 203, + 204, + 205, + 206, + 207, + 208, + 209, + 210, + 211, + 212, + 213, + 214, + 215, + 216, + 217, + 218, + 219, + 220, + 221, + 222, + 223, + 224, + 225, + 226, + 227, + 228, + 229, + 230, + 231, + 232, + 233, + 234, + 235, + 236, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Joel[] = +{ + 237, + 238, + 239, + 240, + 241, + 242, + 243, + 244, + 245, + 246, + 247, + 248, + 249, + 250, + 251, + 252, + 253, + 254, + 255, + 256, + 257, + 258, + 259, + 260, + 261, + 262, + 263, + 264, + 265, + 266, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kristen[] = +{ + 162, + 163, + 164, + 165, + 166, + 167, + 168, + 169, + 170, + 171, + 172, + 173, + 174, + 175, + 176, + 177, + 178, + 179, + 180, + 181, + 182, + 183, + 184, + 185, + 186, + 187, + 188, + 189, + 190, + 191, + 192, + 193, + 194, + 195, + 196, + 197, + 198, + 199, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Selphy[] = +{ + 200, + 201, + 202, + 203, + 204, + 205, + 206, + 207, + 208, + 209, + 210, + 211, + 212, + 213, + 214, + 215, + 216, + 217, + 218, + 219, + 220, + 221, + 222, + 223, + 224, + 225, + 226, + 227, + 228, + 229, + 230, + 231, + 232, + 233, + 234, + 235, + 236, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Chloe[] = +{ + 237, + 238, + 239, + 240, + 241, + 242, + 243, + 244, + 245, + 246, + 247, + 248, + 249, + 250, + 251, + 252, + 253, + 254, + 255, + 256, + 257, + 258, + 259, + 260, + 261, + 262, + 263, + 264, + 265, + 266, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Norton[] = +{ + 267, + 268, + 273, + 274, + 276, + 284, + 289, + 290, + 291, + 292, + 307, + 308, + 311, + 312, + 314, + 317, + 325, + 327, + 328, + 329, + 331, + 332, + 340, + 342, + 347, + 349, + 351, + 352, + 354, + 356, + 359, + 363, + 370, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lukas[] = +{ + 267, + 268, + 273, + 274, + 276, + 284, + 289, + 290, + 291, + 292, + 307, + 308, + 311, + 312, + 314, + 317, + 325, + 327, + 328, + 329, + 331, + 332, + 340, + 342, + 347, + 349, + 351, + 352, + 354, + 356, + 359, + 363, + 370, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Zach[] = +{ + 267, + 268, + 273, + 274, + 276, + 284, + 289, + 290, + 291, + 292, + 307, + 308, + 311, + 312, + 314, + 317, + 325, + 327, + 328, + 329, + 331, + 332, + 340, + 342, + 347, + 349, + 351, + 352, + 354, + 356, + 359, + 363, + 370, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kaitlyn[] = +{ + 267, + 268, + 273, + 274, + 276, + 284, + 289, + 290, + 291, + 292, + 307, + 308, + 311, + 312, + 314, + 317, + 325, + 327, + 328, + 329, + 331, + 332, + 340, + 342, + 347, + 349, + 351, + 352, + 354, + 356, + 359, + 363, + 370, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Breanna[] = +{ + 267, + 268, + 273, + 274, + 276, + 284, + 289, + 290, + 291, + 292, + 307, + 308, + 311, + 312, + 314, + 317, + 325, + 327, + 328, + 329, + 331, + 332, + 340, + 342, + 347, + 349, + 351, + 352, + 354, + 356, + 359, + 363, + 370, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kendra[] = +{ + 267, + 268, + 273, + 274, + 276, + 284, + 289, + 290, + 291, + 292, + 307, + 308, + 311, + 312, + 314, + 317, + 325, + 327, + 328, + 329, + 331, + 332, + 340, + 342, + 347, + 349, + 351, + 352, + 354, + 356, + 359, + 363, + 370, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Molly[] = +{ + 268, + 270, + 272, + 274, + 282, + 284, + 289, + 290, + 303, + 307, + 311, + 314, + 317, + 322, + 327, + 328, + 331, + 336, + 340, + 342, + 344, + 347, + 352, + 353, + 354, + 356, + 359, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jazmin[] = +{ + 268, + 270, + 272, + 274, + 282, + 284, + 289, + 290, + 303, + 307, + 311, + 314, + 317, + 322, + 327, + 328, + 331, + 336, + 340, + 342, + 344, + 347, + 352, + 353, + 354, + 356, + 359, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kelsey[] = +{ + 268, + 270, + 272, + 274, + 282, + 284, + 289, + 290, + 303, + 307, + 311, + 314, + 317, + 322, + 327, + 328, + 331, + 336, + 340, + 342, + 344, + 347, + 352, + 353, + 354, + 356, + 359, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jalen[] = +{ + 269, + 271, + 275, + 279, + 280, + 281, + 283, + 285, + 286, + 287, + 293, + 294, + 295, + 300, + 302, + 307, + 310, + 311, + 320, + 322, + 326, + 330, + 332, + 335, + 344, + 345, + 346, + 348, + 350, + 353, + 357, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Griffen[] = +{ + 269, + 271, + 275, + 279, + 280, + 281, + 283, + 285, + 286, + 287, + 293, + 294, + 295, + 300, + 302, + 307, + 310, + 311, + 320, + 322, + 326, + 330, + 332, + 335, + 344, + 345, + 346, + 348, + 350, + 353, + 357, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Xander[] = +{ + 269, + 271, + 275, + 279, + 280, + 281, + 283, + 285, + 286, + 287, + 293, + 294, + 295, + 300, + 302, + 307, + 310, + 311, + 320, + 322, + 326, + 330, + 332, + 335, + 344, + 345, + 346, + 348, + 350, + 353, + 357, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Marvin[] = +{ + 267, + 268, + 269, + 270, + 271, + 272, + 273, + 274, + 275, + 276, + 277, + 278, + 279, + 280, + 281, + 282, + 283, + 284, + 285, + 286, + 287, + 288, + 289, + 290, + 291, + 292, + 293, + 294, + 295, + 296, + 297, + 298, + 299, + 300, + 301, + 302, + 303, + 304, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Brennan[] = +{ + 305, + 306, + 307, + 308, + 309, + 310, + 311, + 312, + 313, + 314, + 315, + 316, + 317, + 318, + 319, + 320, + 321, + 322, + 323, + 324, + 325, + 326, + 327, + 328, + 329, + 330, + 331, + 332, + 333, + 334, + 335, + 336, + 337, + 338, + 339, + 340, + 341, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Baley[] = +{ + 159, + 160, + 161, + 172, + 173, + 177, + 198, + 226, + 238, + 263, + 264, + 277, + 278, + 282, + 303, + 331, + 343, + 368, + 369, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Zackary[] = +{ + 271, + 283, + 294, + 295, + 298, + 299, + 300, + 311, + 315, + 320, + 327, + 328, + 330, + 335, + 337, + 338, + 339, + 341, + 346, + 364, + 365, + 366, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gabriel[] = +{ + 342, + 343, + 344, + 345, + 346, + 347, + 348, + 349, + 350, + 351, + 352, + 353, + 354, + 355, + 356, + 357, + 358, + 359, + 360, + 361, + 362, + 363, + 364, + 365, + 366, + 367, + 368, + 369, + 370, + 371, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Emily[] = +{ + 272, + 301, + 309, + 330, + 348, + 349, + 350, + 359, + 360, + 362, + 363, + 365, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jordyn[] = +{ + 267, + 269, + 270, + 272, + 273, + 276, + 279, + 284, + 288, + 302, + 304, + 305, + 308, + 309, + 312, + 316, + 319, + 322, + 323, + 325, + 326, + 329, + 331, + 332, + 336, + 340, + 344, + 345, + 351, + 353, + 355, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Sofia[] = +{ + 270, + 272, + 274, + 276, + 279, + 282, + 285, + 290, + 293, + 313, + 314, + 321, + 334, + 340, + 348, + 356, + 359, + 360, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Braden[] = +{ + 372, + 373, + 374, + 375, + 376, + 377, + 378, + 379, + 380, + 381, + 382, + 383, + 384, + 385, + 386, + 387, + 388, + 389, + 390, + 391, + 392, + 393, + 394, + 395, + 396, + 397, + 398, + 399, + 400, + 401, + 402, + 403, + 404, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kayden[] = +{ + 405, + 406, + 407, + 408, + 409, + 410, + 411, + 412, + 413, + 414, + 415, + 416, + 417, + 418, + 419, + 420, + 421, + 422, + 423, + 424, + 425, + 426, + 427, + 428, + 429, + 430, + 431, + 432, + 433, + 434, + 435, + 436, + 437, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Cooper[] = +{ + 438, + 439, + 440, + 441, + 442, + 443, + 444, + 445, + 446, + 447, + 448, + 449, + 450, + 451, + 452, + 453, + 454, + 455, + 456, + 457, + 458, + 459, + 460, + 461, + 462, + 463, + 464, + 465, + 466, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Julia[] = +{ + 372, + 373, + 374, + 375, + 376, + 377, + 378, + 379, + 380, + 381, + 382, + 383, + 384, + 385, + 386, + 387, + 388, + 389, + 390, + 391, + 392, + 393, + 394, + 395, + 396, + 397, + 398, + 399, + 400, + 401, + 402, + 403, + 404, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Amara[] = +{ + 405, + 406, + 407, + 408, + 409, + 410, + 411, + 412, + 413, + 414, + 415, + 416, + 417, + 418, + 419, + 420, + 421, + 422, + 423, + 424, + 425, + 426, + 427, + 428, + 429, + 430, + 431, + 432, + 433, + 434, + 435, + 436, + 437, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lynn[] = +{ + 438, + 439, + 440, + 441, + 442, + 443, + 444, + 445, + 446, + 447, + 448, + 449, + 450, + 451, + 452, + 453, + 454, + 455, + 456, + 457, + 458, + 459, + 460, + 461, + 462, + 463, + 464, + 465, + 466, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jovan[] = +{ + 238, + 331, + 343, + 368, + 369, + 375, + 376, + 379, + 382, + 383, + 389, + 394, + 395, + 397, + 398, + 400, + 406, + 408, + 411, + 416, + 417, + 423, + 424, + 425, + 432, + 436, + 438, + 441, + 445, + 453, + 460, + 462, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dominic[] = +{ + 238, + 331, + 343, + 368, + 369, + 375, + 376, + 379, + 382, + 383, + 389, + 394, + 395, + 397, + 398, + 400, + 406, + 408, + 411, + 416, + 417, + 423, + 424, + 425, + 432, + 436, + 438, + 441, + 445, + 453, + 460, + 462, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Nikolas[] = +{ + 238, + 331, + 343, + 368, + 369, + 375, + 376, + 379, + 382, + 383, + 389, + 394, + 395, + 397, + 398, + 400, + 406, + 408, + 411, + 416, + 417, + 423, + 424, + 425, + 432, + 436, + 438, + 441, + 445, + 453, + 460, + 462, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Valeria[] = +{ + 238, + 331, + 343, + 368, + 369, + 375, + 376, + 379, + 382, + 383, + 389, + 394, + 395, + 397, + 398, + 400, + 406, + 408, + 411, + 416, + 417, + 423, + 424, + 425, + 432, + 436, + 438, + 441, + 445, + 453, + 460, + 462, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Delaney[] = +{ + 238, + 331, + 343, + 368, + 369, + 375, + 376, + 379, + 382, + 383, + 389, + 394, + 395, + 397, + 398, + 400, + 406, + 408, + 411, + 416, + 417, + 423, + 424, + 425, + 432, + 436, + 438, + 441, + 445, + 453, + 460, + 462, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Meghan[] = +{ + 238, + 331, + 343, + 368, + 369, + 375, + 376, + 379, + 382, + 383, + 389, + 394, + 395, + 397, + 398, + 400, + 406, + 408, + 411, + 416, + 417, + 423, + 424, + 425, + 432, + 436, + 438, + 441, + 445, + 453, + 460, + 462, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Roberto[] = +{ + 386, + 403, + 412, + 413, + 414, + 433, + 435, + 440, + 450, + 453, + 454, + 456, + 459, + 461, + 463, + 464, + 465, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Damian[] = +{ + 386, + 403, + 412, + 413, + 414, + 433, + 435, + 440, + 450, + 453, + 454, + 456, + 459, + 461, + 463, + 464, + 465, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Brody[] = +{ + 386, + 403, + 412, + 413, + 414, + 433, + 435, + 440, + 450, + 453, + 454, + 456, + 459, + 461, + 463, + 464, + 465, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Graham[] = +{ + 386, + 403, + 412, + 413, + 414, + 433, + 435, + 440, + 450, + 453, + 454, + 456, + 459, + 461, + 463, + 464, + 465, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Tylor[] = +{ + 374, + 381, + 382, + 385, + 388, + 389, + 391, + 392, + 394, + 409, + 411, + 412, + 419, + 430, + 432, + 436, + 440, + 456, + 460, + 462, + 463, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jaren[] = +{ + 374, + 381, + 382, + 385, + 388, + 389, + 391, + 392, + 394, + 409, + 411, + 412, + 419, + 430, + 432, + 436, + 440, + 456, + 460, + 462, + 463, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Cordell[] = +{ + 420, + 421, + 422, + 423, + 424, + 425, + 426, + 427, + 428, + 429, + 430, + 431, + 432, + 433, + 434, + 435, + 436, + 437, + 438, + 439, + 440, + 441, + 442, + 443, + 444, + 445, + 446, + 447, + 448, + 449, + 450, + 451, + 452, + 453, + 454, + 455, + 456, + 457, + 458, + 459, + 460, + 461, + 462, + 463, + 464, + 465, + 466, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jazlyn[] = +{ + 372, + 373, + 374, + 375, + 376, + 377, + 378, + 379, + 380, + 381, + 382, + 383, + 384, + 385, + 386, + 387, + 388, + 389, + 390, + 391, + 392, + 393, + 394, + 395, + 396, + 397, + 398, + 399, + 400, + 401, + 402, + 403, + 404, + 405, + 406, + 407, + 408, + 409, + 410, + 411, + 412, + 413, + 414, + 415, + 416, + 417, + 418, + 419, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Zachery[] = +{ + 468, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Johan[] = +{ + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Shea[] = +{ + 468, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kaila[] = +{ + 468, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Isiah[] = +{ + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Garrett[] = +{ + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Haylie[] = +{ + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Megan[] = +{ + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Issac[] = +{ + 534, + 535, + 536, + 537, + 538, + 539, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Quinton[] = +{ + 534, + 535, + 536, + 537, + 538, + 539, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Salma[] = +{ + 534, + 535, + 536, + 537, + 538, + 539, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ansley[] = +{ + 534, + 535, + 536, + 537, + 538, + 539, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Holden[] = +{ + 343, + 368, + 369, + 383, + 417, + 423, + 424, + 432, + 480, + 481, + 490, + 491, + 494, + 496, + 512, + 513, + 519, + 520, + 528, + 534, + 537, + 541, + 549, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Luca[] = +{ + 343, + 368, + 369, + 383, + 417, + 423, + 424, + 432, + 480, + 481, + 490, + 491, + 494, + 496, + 512, + 513, + 519, + 520, + 528, + 534, + 537, + 541, + 549, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jamison[] = +{ + 282, + 331, + 343, + 368, + 369, + 469, + 472, + 475, + 476, + 478, + 481, + 484, + 490, + 491, + 497, + 500, + 501, + 509, + 510, + 513, + 516, + 517, + 519, + 520, + 524, + 528, + 530, + 533, + 534, + 537, + 542, + 553, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gunnar[] = +{ + 282, + 331, + 343, + 368, + 369, + 469, + 472, + 475, + 476, + 478, + 481, + 484, + 490, + 491, + 497, + 500, + 501, + 509, + 510, + 513, + 516, + 517, + 519, + 520, + 524, + 528, + 530, + 533, + 534, + 537, + 542, + 553, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Craig[] = +{ + 471, + 474, + 475, + 479, + 483, + 485, + 488, + 493, + 495, + 496, + 502, + 504, + 505, + 506, + 507, + 514, + 521, + 525, + 530, + 532, + 535, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 556, + 557, + 558, + 559, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Pierce[] = +{ + 471, + 474, + 475, + 479, + 483, + 485, + 488, + 493, + 495, + 496, + 502, + 504, + 505, + 506, + 507, + 514, + 521, + 525, + 530, + 532, + 535, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 556, + 557, + 558, + 559, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Regina[] = +{ + 471, + 474, + 475, + 479, + 483, + 485, + 488, + 493, + 495, + 496, + 502, + 504, + 505, + 506, + 507, + 514, + 521, + 525, + 530, + 532, + 535, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 556, + 557, + 558, + 559, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alison[] = +{ + 471, + 474, + 475, + 479, + 483, + 485, + 488, + 493, + 495, + 496, + 502, + 504, + 505, + 506, + 507, + 514, + 521, + 525, + 530, + 532, + 535, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 556, + 557, + 558, + 559, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Hank[] = +{ + 277, + 278, + 282, + 303, + 331, + 343, + 368, + 369, + 383, + 417, + 423, + 424, + 432, + 481, + 513, + 519, + 520, + 528, + 575, + 609, + 615, + 616, + 624, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Earl[] = +{ + 277, + 278, + 282, + 303, + 331, + 343, + 368, + 369, + 383, + 417, + 423, + 424, + 432, + 481, + 513, + 519, + 520, + 528, + 575, + 609, + 615, + 616, + 624, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ramiro[] = +{ + 316, + 333, + 347, + 350, + 354, + 358, + 361, + 362, + 363, + 364, + 573, + 576, + 621, + 626, + 631, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Hunter[] = +{ + 316, + 333, + 347, + 350, + 354, + 358, + 361, + 362, + 363, + 364, + 573, + 576, + 621, + 626, + 631, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Aiden[] = +{ + 564, + 575, + 576, + 578, + 579, + 580, + 594, + 595, + 605, + 606, + 608, + 609, + 615, + 619, + 620, + 624, + 625, + 627, + 632, + 642, + 650, + 658, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Xavier[] = +{ + 564, + 575, + 576, + 578, + 579, + 580, + 594, + 595, + 605, + 606, + 608, + 609, + 615, + 619, + 620, + 624, + 625, + 627, + 632, + 642, + 650, + 658, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Clinton[] = +{ + 564, + 565, + 566, + 567, + 568, + 569, + 570, + 571, + 572, + 573, + 574, + 575, + 576, + 577, + 578, + 579, + 580, + 581, + 582, + 583, + 584, + 585, + 586, + 587, + 588, + 589, + 590, + 591, + 592, + 593, + 594, + 595, + 596, + 597, + 598, + 599, + 600, + 601, + 602, + 603, + 604, + 605, + 606, + 607, + 608, + 609, + 610, + 611, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jesse[] = +{ + 564, + 565, + 566, + 567, + 568, + 569, + 570, + 571, + 572, + 573, + 574, + 575, + 576, + 577, + 578, + 579, + 580, + 581, + 582, + 583, + 584, + 585, + 586, + 587, + 588, + 589, + 590, + 591, + 592, + 593, + 594, + 595, + 596, + 597, + 598, + 599, + 600, + 601, + 602, + 603, + 604, + 605, + 606, + 607, + 608, + 609, + 610, + 611, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Eduardo[] = +{ + 268, + 307, + 317, + 349, + 352, + 573, + 583, + 585, + 588, + 590, + 599, + 614, + 618, + 635, + 639, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Hal[] = +{ + 268, + 307, + 317, + 349, + 352, + 573, + 583, + 585, + 588, + 590, + 599, + 614, + 618, + 635, + 639, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gage[] = +{ + 289, + 318, + 319, + 329, + 355, + 375, + 379, + 385, + 386, + 457, + 473, + 477, + 482, + 484, + 553, + 567, + 571, + 577, + 578, + 649, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Arnold[] = +{ + 289, + 318, + 319, + 329, + 355, + 375, + 379, + 385, + 386, + 457, + 473, + 477, + 482, + 484, + 553, + 567, + 571, + 577, + 578, + 649, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jarrett[] = +{ + 565, + 573, + 576, + 580, + 582, + 584, + 592, + 601, + 602, + 610, + 621, + 623, + 626, + 631, + 634, + 640, + 641, + 644, + 648, + 650, + 651, + 653, + 655, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Garett[] = +{ + 565, + 573, + 576, + 580, + 582, + 584, + 592, + 601, + 602, + 610, + 621, + 623, + 626, + 631, + 634, + 640, + 641, + 644, + 648, + 650, + 651, + 653, + 655, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Emanuel[] = +{ + 564, + 565, + 574, + 579, + 582, + 594, + 595, + 605, + 606, + 608, + 609, + 616, + 619, + 620, + 623, + 624, + 625, + 627, + 642, + 643, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gustavo[] = +{ + 564, + 565, + 574, + 579, + 582, + 594, + 595, + 605, + 606, + 608, + 609, + 616, + 619, + 620, + 623, + 624, + 625, + 627, + 642, + 643, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kameron[] = +{ + 568, + 581, + 589, + 598, + 600, + 603, + 607, + 611, + 617, + 618, + 622, + 636, + 643, + 646, + 647, + 652, + 654, + 656, + 659, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alfredo[] = +{ + 568, + 581, + 589, + 598, + 600, + 603, + 607, + 611, + 617, + 618, + 622, + 636, + 643, + 646, + 647, + 652, + 654, + 656, + 659, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ruben[] = +{ + 612, + 613, + 614, + 615, + 616, + 617, + 618, + 619, + 620, + 621, + 622, + 623, + 624, + 625, + 626, + 627, + 628, + 629, + 630, + 631, + 632, + 633, + 634, + 635, + 636, + 637, + 638, + 639, + 640, + 641, + 642, + 643, + 644, + 645, + 646, + 647, + 648, + 649, + 650, + 651, + 652, + 653, + 654, + 655, + 656, + 657, + 658, + 659, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lamar[] = +{ + 612, + 613, + 614, + 615, + 616, + 617, + 618, + 619, + 620, + 621, + 622, + 623, + 624, + 625, + 626, + 627, + 628, + 629, + 630, + 631, + 632, + 633, + 634, + 635, + 636, + 637, + 638, + 639, + 640, + 641, + 642, + 643, + 644, + 645, + 646, + 647, + 648, + 649, + 650, + 651, + 652, + 653, + 654, + 655, + 656, + 657, + 658, + 659, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jaxon[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Logan[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Emilee[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Josie[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Armando[] = +{ + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Skyler[] = +{ + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ruth[] = +{ + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Melody[] = +{ + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Pedro[] = +{ + 347, + 661, + 664, + 669, + 672, + 676, + 677, + 678, + 680, + 685, + 688, + 694, + 696, + 697, + 698, + 699, + 706, + 713, + 717, + 719, + 722, + 724, + 727, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 748, + 749, + 750, + 751, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Erick[] = +{ + 347, + 661, + 664, + 669, + 672, + 676, + 677, + 678, + 680, + 685, + 688, + 694, + 696, + 697, + 698, + 699, + 706, + 713, + 717, + 719, + 722, + 724, + 727, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 748, + 749, + 750, + 751, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Elaine[] = +{ + 664, + 665, + 669, + 672, + 676, + 677, + 680, + 685, + 687, + 688, + 694, + 696, + 697, + 698, + 699, + 706, + 713, + 717, + 722, + 724, + 727, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 748, + 749, + 750, + 751, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Joyce[] = +{ + 664, + 665, + 669, + 672, + 676, + 677, + 680, + 685, + 687, + 688, + 694, + 696, + 697, + 698, + 699, + 706, + 713, + 717, + 722, + 724, + 727, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 748, + 749, + 750, + 751, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Todd[] = +{ + 267, + 273, + 305, + 312, + 325, + 332, + 352, + 662, + 665, + 668, + 669, + 670, + 672, + 673, + 676, + 677, + 679, + 680, + 682, + 688, + 697, + 698, + 699, + 700, + 707, + 710, + 718, + 720, + 724, + 725, + 728, + 730, + 731, + 732, + 734, + 735, + 744, + 748, + 750, + 751, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gavin[] = +{ + 267, + 273, + 305, + 312, + 325, + 332, + 352, + 662, + 665, + 668, + 669, + 670, + 672, + 673, + 676, + 677, + 679, + 680, + 682, + 688, + 697, + 698, + 699, + 700, + 707, + 710, + 718, + 720, + 724, + 725, + 728, + 730, + 731, + 732, + 734, + 735, + 744, + 748, + 750, + 751, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Malory[] = +{ + 267, + 273, + 305, + 312, + 325, + 332, + 352, + 662, + 665, + 668, + 669, + 670, + 672, + 673, + 676, + 677, + 679, + 680, + 682, + 688, + 697, + 698, + 699, + 700, + 707, + 710, + 718, + 720, + 724, + 725, + 728, + 730, + 731, + 732, + 734, + 735, + 744, + 748, + 750, + 751, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Esther[] = +{ + 267, + 273, + 305, + 312, + 325, + 332, + 352, + 662, + 665, + 668, + 669, + 670, + 672, + 673, + 676, + 677, + 679, + 680, + 682, + 688, + 697, + 698, + 699, + 700, + 707, + 710, + 718, + 720, + 724, + 725, + 728, + 730, + 731, + 732, + 734, + 735, + 744, + 748, + 750, + 751, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Oscar[] = +{ + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Wilson[] = +{ + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Clare[] = +{ + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Tess[] = +{ + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Leon[] = +{ + 420, + 421, + 422, + 423, + 424, + 425, + 426, + 427, + 428, + 429, + 430, + 431, + 432, + 433, + 434, + 435, + 436, + 437, + 438, + 439, + 440, + 441, + 442, + 443, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + 534, + 535, + 536, + 537, + 538, + 539, + 612, + 613, + 614, + 615, + 616, + 617, + 618, + 619, + 620, + 621, + 622, + 623, + 624, + 625, + 626, + 627, + 628, + 629, + 630, + 631, + 632, + 633, + 634, + 635, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + 726, + 727, + 728, + 729, + 730, + 731, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alonzo[] = +{ + 444, + 445, + 446, + 447, + 448, + 449, + 450, + 451, + 452, + 453, + 454, + 455, + 456, + 457, + 458, + 459, + 460, + 461, + 462, + 463, + 464, + 465, + 466, + 467, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + 636, + 637, + 638, + 639, + 640, + 641, + 642, + 643, + 644, + 645, + 646, + 647, + 648, + 649, + 650, + 651, + 652, + 653, + 654, + 655, + 656, + 657, + 658, + 659, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Vince[] = +{ + 421, + 425, + 431, + 437, + 439, + 456, + 460, + 465, + 466, + 517, + 521, + 527, + 533, + 535, + 552, + 556, + 561, + 562, + 613, + 617, + 623, + 629, + 631, + 648, + 652, + 657, + 658, + 709, + 713, + 719, + 725, + 727, + 744, + 748, + 753, + 754, + 766, + 777, + 788, + 799, + 800, + 801, + 802, + 803, + 804, + 805, + 806, + 807, + 808, + 809, + 810, + 811, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 820, + 821, + 822, + 823, + 824, + 825, + 826, + 827, + 828, + 829, + 830, + 831, + 832, + 833, + 834, + 835, + 846, + 847, + 848, + 849, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Bryon[] = +{ + 756, + 757, + 758, + 759, + 760, + 761, + 762, + 763, + 764, + 766, + 767, + 768, + 769, + 770, + 771, + 772, + 773, + 774, + 775, + 777, + 778, + 779, + 780, + 781, + 782, + 783, + 784, + 785, + 786, + 788, + 789, + 790, + 791, + 792, + 793, + 794, + 795, + 796, + 797, + 799, + 836, + 837, + 838, + 839, + 840, + 841, + 846, + 847, + 848, + 849, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + 870, + 871, + 872, + 873, + 874, + 875, + 876, + 877, + 878, + 879, + 880, + 881, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ava[] = +{ + 372, + 373, + 374, + 375, + 376, + 377, + 378, + 379, + 380, + 381, + 382, + 383, + 384, + 385, + 386, + 387, + 388, + 389, + 390, + 391, + 392, + 393, + 394, + 395, + 468, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 564, + 565, + 566, + 567, + 568, + 569, + 570, + 571, + 572, + 573, + 574, + 575, + 576, + 577, + 578, + 579, + 580, + 581, + 582, + 583, + 584, + 585, + 586, + 587, + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Miriam[] = +{ + 396, + 397, + 398, + 399, + 400, + 401, + 402, + 403, + 404, + 405, + 406, + 407, + 408, + 409, + 410, + 411, + 412, + 413, + 414, + 415, + 416, + 417, + 418, + 419, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 588, + 589, + 590, + 591, + 592, + 593, + 594, + 595, + 596, + 597, + 598, + 599, + 600, + 601, + 602, + 603, + 604, + 605, + 606, + 607, + 608, + 609, + 610, + 611, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Carrie[] = +{ + 421, + 425, + 431, + 437, + 439, + 456, + 460, + 465, + 466, + 517, + 521, + 527, + 533, + 535, + 552, + 556, + 561, + 562, + 613, + 617, + 623, + 629, + 631, + 648, + 652, + 657, + 658, + 709, + 713, + 719, + 725, + 727, + 744, + 748, + 753, + 754, + 765, + 776, + 787, + 798, + 800, + 801, + 802, + 803, + 804, + 805, + 806, + 807, + 808, + 809, + 810, + 811, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 820, + 821, + 822, + 823, + 824, + 825, + 826, + 827, + 828, + 829, + 830, + 831, + 832, + 833, + 834, + 835, + 842, + 843, + 844, + 845, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gillian2[] = +{ + 756, + 757, + 758, + 759, + 760, + 761, + 762, + 763, + 764, + 765, + 767, + 768, + 769, + 770, + 771, + 772, + 773, + 774, + 775, + 776, + 778, + 779, + 780, + 781, + 782, + 783, + 784, + 785, + 786, + 787, + 789, + 790, + 791, + 792, + 793, + 794, + 795, + 796, + 797, + 798, + 836, + 837, + 838, + 839, + 840, + 841, + 842, + 843, + 844, + 845, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + 870, + 871, + 872, + 873, + 874, + 875, + 876, + 877, + 878, + 879, + 880, + 881, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Tyler[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Chaz[] = +{ + 564, + 565, + 566, + 567, + 568, + 569, + 570, + 571, + 572, + 573, + 574, + 575, + 576, + 577, + 578, + 579, + 580, + 581, + 582, + 583, + 584, + 585, + 586, + 587, + 588, + 589, + 590, + 591, + 592, + 593, + 594, + 595, + 596, + 597, + 598, + 599, + 600, + 601, + 602, + 603, + 604, + 605, + 606, + 607, + 608, + 609, + 610, + 611, + 612, + 613, + 614, + 615, + 616, + 617, + 618, + 619, + 620, + 621, + 622, + 623, + 624, + 625, + 626, + 627, + 628, + 629, + 630, + 631, + 632, + 633, + 634, + 635, + 636, + 637, + 638, + 639, + 640, + 641, + 642, + 643, + 644, + 645, + 646, + 647, + 648, + 649, + 650, + 651, + 652, + 653, + 654, + 655, + 656, + 657, + 658, + 659, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Nelson[] = +{ + 756, + 757, + 758, + 759, + 760, + 761, + 762, + 763, + 764, + 766, + 767, + 768, + 769, + 770, + 771, + 772, + 773, + 774, + 775, + 777, + 778, + 779, + 780, + 781, + 782, + 783, + 784, + 785, + 786, + 788, + 789, + 790, + 791, + 792, + 793, + 794, + 795, + 796, + 797, + 799, + 836, + 837, + 838, + 839, + 840, + 841, + 846, + 847, + 848, + 849, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + 870, + 871, + 872, + 873, + 874, + 875, + 876, + 877, + 878, + 879, + 880, + 881, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Shania[] = +{ + 468, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + 534, + 535, + 536, + 537, + 538, + 539, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Stella[] = +{ + 372, + 373, + 374, + 375, + 376, + 377, + 378, + 379, + 380, + 381, + 382, + 383, + 384, + 385, + 386, + 387, + 388, + 389, + 390, + 391, + 392, + 393, + 394, + 395, + 396, + 397, + 398, + 399, + 400, + 401, + 402, + 403, + 404, + 405, + 406, + 407, + 408, + 409, + 410, + 411, + 412, + 413, + 414, + 415, + 416, + 417, + 418, + 419, + 420, + 421, + 422, + 423, + 424, + 425, + 426, + 427, + 428, + 429, + 430, + 431, + 432, + 433, + 434, + 435, + 436, + 437, + 438, + 439, + 440, + 441, + 442, + 443, + 444, + 445, + 446, + 447, + 448, + 449, + 450, + 451, + 452, + 453, + 454, + 455, + 456, + 457, + 458, + 459, + 460, + 461, + 462, + 463, + 464, + 465, + 466, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dorine[] = +{ + 756, + 757, + 758, + 759, + 760, + 761, + 762, + 763, + 764, + 765, + 767, + 768, + 769, + 770, + 771, + 772, + 773, + 774, + 775, + 776, + 778, + 779, + 780, + 781, + 782, + 783, + 784, + 785, + 786, + 787, + 789, + 790, + 791, + 792, + 793, + 794, + 795, + 796, + 797, + 798, + 836, + 837, + 838, + 839, + 840, + 841, + 842, + 843, + 844, + 845, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + 870, + 871, + 872, + 873, + 874, + 875, + 876, + 877, + 878, + 879, + 880, + 881, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Maddox[] = +{ + 403, + 412, + 413, + 414, + 433, + 435, + 440, + 450, + 454, + 456, + 459, + 461, + 463, + 465, + 499, + 508, + 509, + 510, + 529, + 531, + 536, + 546, + 550, + 552, + 555, + 557, + 559, + 561, + 595, + 604, + 605, + 606, + 625, + 627, + 632, + 642, + 646, + 648, + 651, + 653, + 655, + 657, + 691, + 700, + 701, + 702, + 721, + 723, + 728, + 738, + 742, + 744, + 747, + 749, + 751, + 753, + 765, + 766, + 776, + 777, + 787, + 788, + 798, + 799, + 828, + 829, + 830, + 831, + 842, + 843, + 844, + 845, + 846, + 847, + 848, + 849, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Davin[] = +{ + 403, + 412, + 413, + 414, + 433, + 435, + 440, + 450, + 454, + 456, + 459, + 461, + 463, + 465, + 499, + 508, + 509, + 510, + 529, + 531, + 536, + 546, + 550, + 552, + 555, + 557, + 559, + 561, + 595, + 604, + 605, + 606, + 625, + 627, + 632, + 642, + 646, + 648, + 651, + 653, + 655, + 657, + 691, + 700, + 701, + 702, + 721, + 723, + 728, + 738, + 742, + 744, + 747, + 749, + 751, + 753, + 765, + 766, + 776, + 777, + 787, + 788, + 798, + 799, + 828, + 829, + 830, + 831, + 842, + 843, + 844, + 845, + 846, + 847, + 848, + 849, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Trevon[] = +{ + 403, + 412, + 413, + 414, + 433, + 435, + 440, + 450, + 454, + 456, + 459, + 461, + 463, + 465, + 499, + 508, + 509, + 510, + 529, + 531, + 536, + 546, + 550, + 552, + 555, + 557, + 559, + 561, + 595, + 604, + 605, + 606, + 625, + 627, + 632, + 642, + 646, + 648, + 651, + 653, + 655, + 657, + 691, + 700, + 701, + 702, + 721, + 723, + 728, + 738, + 742, + 744, + 747, + 749, + 751, + 753, + 765, + 766, + 776, + 777, + 787, + 788, + 798, + 799, + 828, + 829, + 830, + 831, + 842, + 843, + 844, + 845, + 846, + 847, + 848, + 849, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Mateo[] = +{ + 373, + 382, + 390, + 402, + 403, + 416, + 417, + 424, + 431, + 432, + 435, + 450, + 451, + 469, + 480, + 486, + 498, + 499, + 512, + 513, + 520, + 527, + 528, + 531, + 546, + 547, + 565, + 574, + 582, + 594, + 595, + 608, + 609, + 616, + 623, + 624, + 627, + 642, + 643, + 661, + 670, + 678, + 690, + 691, + 704, + 705, + 712, + 719, + 720, + 723, + 738, + 739, + 808, + 809, + 810, + 811, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Bret[] = +{ + 373, + 382, + 390, + 415, + 419, + 424, + 426, + 430, + 431, + 444, + 451, + 454, + 455, + 464, + 469, + 480, + 486, + 511, + 515, + 520, + 522, + 526, + 527, + 540, + 547, + 550, + 551, + 560, + 565, + 574, + 582, + 607, + 611, + 616, + 618, + 622, + 623, + 636, + 643, + 646, + 647, + 656, + 661, + 670, + 678, + 703, + 707, + 712, + 714, + 718, + 719, + 732, + 739, + 742, + 743, + 752, + 808, + 809, + 810, + 811, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Raul[] = +{ + 373, + 382, + 383, + 386, + 390, + 423, + 424, + 431, + 433, + 450, + 451, + 466, + 469, + 480, + 481, + 482, + 486, + 519, + 520, + 527, + 529, + 546, + 547, + 562, + 565, + 574, + 575, + 578, + 582, + 615, + 616, + 623, + 625, + 642, + 643, + 658, + 661, + 670, + 671, + 674, + 678, + 711, + 712, + 719, + 721, + 738, + 739, + 754, + 808, + 809, + 810, + 811, + 832, + 833, + 834, + 835, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kay[] = +{ + 373, + 382, + 387, + 390, + 402, + 403, + 413, + 414, + 424, + 427, + 431, + 433, + 451, + 469, + 470, + 480, + 486, + 498, + 499, + 509, + 510, + 520, + 523, + 527, + 529, + 547, + 565, + 574, + 579, + 582, + 594, + 595, + 605, + 606, + 616, + 619, + 623, + 625, + 643, + 661, + 670, + 675, + 678, + 690, + 691, + 701, + 702, + 712, + 715, + 719, + 721, + 739, + 808, + 809, + 810, + 811, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Elena[] = +{ + 373, + 382, + 390, + 415, + 419, + 424, + 426, + 430, + 431, + 444, + 451, + 454, + 455, + 464, + 469, + 480, + 486, + 511, + 515, + 520, + 522, + 526, + 527, + 540, + 547, + 550, + 551, + 560, + 565, + 574, + 582, + 607, + 611, + 616, + 618, + 622, + 623, + 636, + 643, + 646, + 647, + 656, + 661, + 670, + 678, + 703, + 707, + 712, + 714, + 718, + 719, + 732, + 739, + 742, + 743, + 752, + 808, + 809, + 810, + 811, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alana[] = +{ + 373, + 382, + 383, + 386, + 390, + 423, + 424, + 431, + 433, + 450, + 451, + 466, + 469, + 480, + 481, + 482, + 486, + 519, + 520, + 527, + 529, + 546, + 547, + 562, + 565, + 574, + 575, + 578, + 582, + 615, + 616, + 623, + 625, + 642, + 643, + 658, + 661, + 670, + 671, + 674, + 678, + 711, + 712, + 719, + 721, + 738, + 739, + 754, + 808, + 809, + 810, + 811, + 832, + 833, + 834, + 835, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alexas[] = +{ + 382, + 387, + 403, + 423, + 424, + 425, + 431, + 433, + 435, + 450, + 459, + 461, + 465, + 466, + 470, + 480, + 499, + 519, + 520, + 521, + 527, + 529, + 531, + 546, + 555, + 557, + 561, + 562, + 574, + 579, + 595, + 615, + 616, + 617, + 623, + 625, + 627, + 642, + 651, + 653, + 657, + 658, + 670, + 675, + 691, + 711, + 712, + 713, + 719, + 721, + 723, + 738, + 747, + 749, + 753, + 754, + 762, + 763, + 764, + 773, + 774, + 775, + 784, + 785, + 786, + 795, + 796, + 797, + 804, + 805, + 806, + 807, + 808, + 809, + 810, + 811, + 828, + 829, + 830, + 831, + 832, + 833, + 834, + 835, + 836, + 837, + 838, + 839, + 840, + 841, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Weston[] = +{ + 374, + 377, + 404, + 421, + 422, + 426, + 437, + 439, + 446, + 451, + 453, + 457, + 458, + 472, + 475, + 500, + 517, + 518, + 522, + 533, + 535, + 542, + 547, + 549, + 553, + 554, + 566, + 569, + 596, + 613, + 614, + 618, + 629, + 631, + 638, + 643, + 645, + 649, + 650, + 662, + 665, + 692, + 709, + 710, + 714, + 725, + 727, + 734, + 739, + 741, + 745, + 746, + 762, + 763, + 764, + 766, + 773, + 774, + 775, + 777, + 784, + 785, + 786, + 788, + 795, + 796, + 797, + 799, + 800, + 801, + 802, + 803, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 836, + 837, + 838, + 839, + 840, + 841, + 846, + 847, + 848, + 849, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jasper[] = +{ + 378, + 388, + 400, + 409, + 410, + 411, + 416, + 429, + 432, + 438, + 447, + 452, + 456, + 460, + 462, + 463, + 471, + 476, + 496, + 505, + 506, + 507, + 512, + 525, + 528, + 534, + 543, + 548, + 552, + 556, + 558, + 559, + 570, + 580, + 592, + 601, + 602, + 603, + 608, + 621, + 624, + 630, + 639, + 644, + 648, + 652, + 654, + 655, + 666, + 676, + 688, + 697, + 698, + 699, + 704, + 717, + 720, + 726, + 735, + 740, + 744, + 748, + 750, + 751, + 762, + 763, + 764, + 773, + 774, + 775, + 784, + 785, + 786, + 795, + 796, + 797, + 820, + 821, + 822, + 823, + 824, + 825, + 826, + 827, + 836, + 837, + 838, + 839, + 840, + 841, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Nadia[] = +{ + 382, + 387, + 403, + 423, + 424, + 425, + 431, + 433, + 435, + 450, + 459, + 461, + 465, + 466, + 470, + 480, + 499, + 519, + 520, + 521, + 527, + 529, + 531, + 546, + 555, + 557, + 561, + 562, + 574, + 579, + 595, + 615, + 616, + 617, + 623, + 625, + 627, + 642, + 651, + 653, + 657, + 658, + 670, + 675, + 691, + 711, + 712, + 713, + 719, + 721, + 723, + 738, + 747, + 749, + 753, + 754, + 762, + 763, + 764, + 773, + 774, + 775, + 784, + 785, + 786, + 795, + 796, + 797, + 804, + 805, + 806, + 807, + 808, + 809, + 810, + 811, + 828, + 829, + 830, + 831, + 832, + 833, + 834, + 835, + 836, + 837, + 838, + 839, + 840, + 841, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Miranda[] = +{ + 374, + 377, + 404, + 421, + 422, + 426, + 437, + 439, + 446, + 451, + 453, + 457, + 458, + 472, + 475, + 500, + 517, + 518, + 522, + 533, + 535, + 542, + 547, + 549, + 553, + 554, + 566, + 569, + 596, + 613, + 614, + 618, + 629, + 631, + 638, + 643, + 645, + 649, + 650, + 662, + 665, + 692, + 709, + 710, + 714, + 725, + 727, + 734, + 739, + 741, + 745, + 746, + 762, + 763, + 764, + 765, + 773, + 774, + 775, + 776, + 784, + 785, + 786, + 787, + 795, + 796, + 797, + 798, + 800, + 801, + 802, + 803, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 836, + 837, + 838, + 839, + 840, + 841, + 842, + 843, + 844, + 845, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Emma[] = +{ + 378, + 388, + 400, + 409, + 410, + 411, + 416, + 429, + 432, + 438, + 447, + 452, + 456, + 460, + 462, + 463, + 471, + 476, + 496, + 505, + 506, + 507, + 512, + 525, + 528, + 534, + 543, + 548, + 552, + 556, + 558, + 559, + 570, + 580, + 592, + 601, + 602, + 603, + 608, + 621, + 624, + 630, + 639, + 644, + 648, + 652, + 654, + 655, + 666, + 676, + 688, + 697, + 698, + 699, + 704, + 717, + 720, + 726, + 735, + 740, + 744, + 748, + 750, + 751, + 762, + 763, + 764, + 773, + 774, + 775, + 784, + 785, + 786, + 795, + 796, + 797, + 820, + 821, + 822, + 823, + 824, + 825, + 826, + 827, + 836, + 837, + 838, + 839, + 840, + 841, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Rolando[] = +{ + 185, + 290, + 377, + 380, + 385, + 401, + 404, + 409, + 410, + 428, + 437, + 438, + 439, + 446, + 466, + 475, + 478, + 484, + 497, + 500, + 505, + 506, + 524, + 533, + 534, + 535, + 542, + 562, + 569, + 572, + 577, + 593, + 596, + 601, + 602, + 620, + 629, + 630, + 631, + 638, + 658, + 665, + 668, + 673, + 689, + 692, + 697, + 698, + 716, + 725, + 726, + 727, + 734, + 754, + 756, + 757, + 758, + 766, + 767, + 768, + 769, + 777, + 778, + 779, + 780, + 788, + 789, + 790, + 791, + 799, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 832, + 833, + 834, + 835, + 846, + 847, + 848, + 849, + 870, + 871, + 872, + 873, + 874, + 875, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Stanly[] = +{ + 185, + 290, + 377, + 380, + 385, + 401, + 404, + 409, + 410, + 428, + 437, + 438, + 439, + 446, + 466, + 475, + 478, + 484, + 497, + 500, + 505, + 506, + 524, + 533, + 534, + 535, + 542, + 562, + 569, + 572, + 577, + 593, + 596, + 601, + 602, + 620, + 629, + 630, + 631, + 638, + 658, + 665, + 668, + 673, + 689, + 692, + 697, + 698, + 716, + 725, + 726, + 727, + 734, + 754, + 759, + 760, + 761, + 766, + 770, + 771, + 772, + 777, + 781, + 782, + 783, + 788, + 792, + 793, + 794, + 799, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 832, + 833, + 834, + 835, + 846, + 847, + 848, + 849, + 876, + 877, + 878, + 879, + 880, + 881, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dario[] = +{ + 185, + 290, + 377, + 380, + 385, + 401, + 404, + 409, + 410, + 428, + 437, + 438, + 439, + 446, + 466, + 475, + 478, + 484, + 497, + 500, + 505, + 506, + 524, + 533, + 534, + 535, + 542, + 562, + 569, + 572, + 577, + 593, + 596, + 601, + 602, + 620, + 629, + 630, + 631, + 638, + 658, + 665, + 668, + 673, + 689, + 692, + 697, + 698, + 716, + 725, + 726, + 727, + 734, + 754, + 762, + 763, + 764, + 766, + 773, + 774, + 775, + 777, + 784, + 785, + 786, + 788, + 795, + 796, + 797, + 799, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 832, + 833, + 834, + 835, + 836, + 837, + 838, + 839, + 840, + 841, + 846, + 847, + 848, + 849, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Karlee[] = +{ + 185, + 290, + 377, + 380, + 385, + 401, + 404, + 409, + 410, + 428, + 437, + 438, + 439, + 446, + 466, + 475, + 478, + 484, + 497, + 500, + 505, + 506, + 524, + 533, + 534, + 535, + 542, + 562, + 569, + 572, + 577, + 593, + 596, + 601, + 602, + 620, + 629, + 630, + 631, + 638, + 658, + 665, + 668, + 673, + 689, + 692, + 697, + 698, + 716, + 725, + 726, + 727, + 734, + 754, + 756, + 757, + 758, + 765, + 767, + 768, + 769, + 776, + 778, + 779, + 780, + 787, + 789, + 790, + 791, + 798, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 832, + 833, + 834, + 835, + 842, + 843, + 844, + 845, + 870, + 871, + 872, + 873, + 874, + 875, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jaylin[] = +{ + 185, + 290, + 377, + 380, + 385, + 401, + 404, + 409, + 410, + 428, + 437, + 438, + 439, + 446, + 466, + 475, + 478, + 484, + 497, + 500, + 505, + 506, + 524, + 533, + 534, + 535, + 542, + 562, + 569, + 572, + 577, + 593, + 596, + 601, + 602, + 620, + 629, + 630, + 631, + 638, + 658, + 665, + 668, + 673, + 689, + 692, + 697, + 698, + 716, + 725, + 726, + 727, + 734, + 754, + 759, + 760, + 761, + 765, + 770, + 771, + 772, + 776, + 781, + 782, + 783, + 787, + 792, + 793, + 794, + 798, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 832, + 833, + 834, + 835, + 842, + 843, + 844, + 845, + 876, + 877, + 878, + 879, + 880, + 881, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ingrid[] = +{ + 185, + 290, + 377, + 380, + 385, + 401, + 404, + 409, + 410, + 428, + 437, + 438, + 439, + 446, + 466, + 475, + 478, + 484, + 497, + 500, + 505, + 506, + 524, + 533, + 534, + 535, + 542, + 562, + 569, + 572, + 577, + 593, + 596, + 601, + 602, + 620, + 629, + 630, + 631, + 638, + 658, + 665, + 668, + 673, + 689, + 692, + 697, + 698, + 716, + 725, + 726, + 727, + 734, + 754, + 762, + 763, + 764, + 765, + 773, + 774, + 775, + 776, + 784, + 785, + 786, + 787, + 795, + 796, + 797, + 798, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 832, + 833, + 834, + 835, + 836, + 837, + 838, + 839, + 840, + 841, + 842, + 843, + 844, + 845, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Delilah[] = +{ + 347, + 352, + 374, + 378, + 398, + 421, + 426, + 447, + 472, + 476, + 494, + 517, + 522, + 543, + 566, + 570, + 590, + 613, + 618, + 639, + 662, + 666, + 686, + 709, + 714, + 735, + 800, + 801, + 802, + 803, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Carly[] = +{ + 344, + 374, + 378, + 394, + 395, + 405, + 413, + 414, + 420, + 421, + 434, + 441, + 457, + 472, + 476, + 490, + 491, + 501, + 509, + 510, + 516, + 517, + 530, + 537, + 553, + 566, + 570, + 586, + 587, + 597, + 605, + 606, + 612, + 613, + 626, + 633, + 649, + 662, + 666, + 682, + 683, + 693, + 701, + 702, + 708, + 709, + 722, + 729, + 745, + 800, + 801, + 802, + 803, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lexie[] = +{ + 344, + 347, + 352, + 394, + 395, + 398, + 405, + 413, + 414, + 420, + 421, + 426, + 434, + 441, + 447, + 457, + 490, + 491, + 494, + 501, + 509, + 510, + 516, + 517, + 522, + 530, + 537, + 543, + 553, + 586, + 587, + 590, + 597, + 605, + 606, + 612, + 613, + 618, + 626, + 633, + 639, + 649, + 682, + 683, + 686, + 693, + 701, + 702, + 708, + 709, + 714, + 722, + 729, + 735, + 745, + 800, + 801, + 802, + 803, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Miller[] = +{ + 345, + 376, + 386, + 387, + 397, + 399, + 402, + 403, + 406, + 408, + 411, + 413, + 414, + 425, + 427, + 429, + 433, + 435, + 440, + 441, + 445, + 448, + 449, + 450, + 452, + 454, + 456, + 458, + 459, + 460, + 462, + 465, + 466, + 467, + 470, + 474, + 482, + 493, + 495, + 498, + 499, + 502, + 504, + 507, + 509, + 510, + 521, + 523, + 525, + 529, + 531, + 536, + 537, + 541, + 544, + 545, + 546, + 548, + 550, + 552, + 554, + 555, + 556, + 558, + 561, + 562, + 563, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Marv[] = +{ + 345, + 568, + 578, + 579, + 589, + 591, + 594, + 595, + 598, + 600, + 603, + 605, + 606, + 617, + 619, + 621, + 625, + 627, + 632, + 633, + 637, + 640, + 641, + 642, + 644, + 646, + 648, + 650, + 651, + 652, + 654, + 657, + 658, + 659, + 664, + 674, + 675, + 685, + 687, + 690, + 691, + 694, + 696, + 699, + 701, + 702, + 713, + 715, + 717, + 721, + 723, + 728, + 729, + 733, + 736, + 737, + 738, + 740, + 742, + 744, + 746, + 747, + 748, + 750, + 753, + 754, + 755, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Layton[] = +{ + 345, + 425, + 433, + 435, + 445, + 450, + 454, + 456, + 458, + 459, + 460, + 465, + 466, + 521, + 529, + 531, + 541, + 546, + 550, + 552, + 554, + 555, + 556, + 561, + 562, + 617, + 625, + 627, + 637, + 642, + 646, + 648, + 650, + 651, + 652, + 657, + 658, + 713, + 721, + 723, + 733, + 738, + 742, + 744, + 746, + 747, + 748, + 753, + 754, + 804, + 805, + 806, + 807, + 820, + 821, + 822, + 823, + 824, + 825, + 826, + 827, + 828, + 829, + 830, + 831, + 832, + 833, + 834, + 835, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Brooks[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gregory[] = +{ + 421, + 425, + 431, + 437, + 439, + 456, + 460, + 465, + 466, + 517, + 521, + 527, + 533, + 535, + 552, + 556, + 561, + 562, + 613, + 617, + 623, + 629, + 631, + 648, + 652, + 657, + 658, + 709, + 713, + 719, + 725, + 727, + 744, + 748, + 753, + 754, + 765, + 766, + 776, + 777, + 787, + 788, + 798, + 799, + 800, + 801, + 802, + 803, + 804, + 805, + 806, + 807, + 808, + 809, + 810, + 811, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 820, + 821, + 822, + 823, + 824, + 825, + 826, + 827, + 828, + 829, + 830, + 831, + 832, + 833, + 834, + 835, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Reese[] = +{ + 756, + 757, + 758, + 759, + 760, + 761, + 762, + 763, + 764, + 765, + 766, + 767, + 768, + 769, + 770, + 771, + 772, + 773, + 774, + 775, + 776, + 777, + 778, + 779, + 780, + 781, + 782, + 783, + 784, + 785, + 786, + 787, + 788, + 789, + 790, + 791, + 792, + 793, + 794, + 795, + 796, + 797, + 798, + 799, + 836, + 837, + 838, + 839, + 840, + 841, + 842, + 843, + 844, + 845, + 846, + 847, + 848, + 849, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + 870, + 871, + 872, + 873, + 874, + 875, + 876, + 877, + 878, + 879, + 880, + 881, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Mason[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Toby[] = +{ + 564, + 565, + 566, + 567, + 568, + 569, + 570, + 571, + 572, + 573, + 574, + 575, + 576, + 577, + 578, + 579, + 580, + 581, + 582, + 583, + 584, + 585, + 586, + 587, + 588, + 589, + 590, + 591, + 592, + 593, + 594, + 595, + 596, + 597, + 598, + 599, + 600, + 601, + 602, + 603, + 604, + 605, + 606, + 607, + 608, + 609, + 610, + 611, + 612, + 613, + 614, + 615, + 616, + 617, + 618, + 619, + 620, + 621, + 622, + 623, + 624, + 625, + 626, + 627, + 628, + 629, + 630, + 631, + 632, + 633, + 634, + 635, + 636, + 637, + 638, + 639, + 640, + 641, + 642, + 643, + 644, + 645, + 646, + 647, + 648, + 649, + 650, + 651, + 652, + 653, + 654, + 655, + 656, + 657, + 658, + 659, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dorothy[] = +{ + 468, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + 534, + 535, + 536, + 537, + 538, + 539, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Piper[] = +{ + 372, + 373, + 374, + 375, + 376, + 377, + 378, + 379, + 380, + 381, + 382, + 383, + 384, + 385, + 386, + 387, + 388, + 389, + 390, + 391, + 392, + 393, + 394, + 395, + 396, + 397, + 398, + 399, + 400, + 401, + 402, + 403, + 404, + 405, + 406, + 407, + 408, + 409, + 410, + 411, + 412, + 413, + 414, + 415, + 416, + 417, + 418, + 419, + 420, + 421, + 422, + 423, + 424, + 425, + 426, + 427, + 428, + 429, + 430, + 431, + 432, + 433, + 434, + 435, + 436, + 437, + 438, + 439, + 440, + 441, + 442, + 443, + 444, + 445, + 446, + 447, + 448, + 449, + 450, + 451, + 452, + 453, + 454, + 455, + 456, + 457, + 458, + 459, + 460, + 461, + 462, + 463, + 464, + 465, + 466, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Finn[] = +{ + 317, + 371, + 373, + 377, + 390, + 392, + 399, + 431, + 452, + 456, + 469, + 475, + 486, + 488, + 495, + 527, + 548, + 552, + 565, + 569, + 573, + 576, + 580, + 582, + 584, + 591, + 592, + 601, + 602, + 610, + 621, + 623, + 626, + 631, + 634, + 640, + 641, + 644, + 648, + 650, + 651, + 653, + 655, + 661, + 665, + 669, + 672, + 676, + 678, + 680, + 687, + 688, + 697, + 698, + 706, + 717, + 719, + 722, + 727, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 749, + 751, + 808, + 809, + 810, + 811, + 816, + 817, + 818, + 819, + 820, + 821, + 822, + 823, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Samir[] = +{ + 317, + 371, + 373, + 377, + 390, + 392, + 399, + 431, + 452, + 456, + 469, + 475, + 486, + 488, + 495, + 527, + 548, + 552, + 565, + 569, + 573, + 576, + 580, + 582, + 584, + 591, + 592, + 601, + 602, + 610, + 621, + 623, + 626, + 631, + 634, + 640, + 641, + 644, + 648, + 650, + 651, + 653, + 655, + 661, + 665, + 669, + 672, + 676, + 678, + 680, + 687, + 688, + 697, + 698, + 706, + 717, + 719, + 722, + 727, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 749, + 751, + 808, + 809, + 810, + 811, + 816, + 817, + 818, + 819, + 820, + 821, + 822, + 823, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Fiona[] = +{ + 317, + 371, + 373, + 377, + 381, + 384, + 388, + 390, + 392, + 399, + 400, + 409, + 410, + 418, + 429, + 431, + 434, + 439, + 442, + 448, + 449, + 452, + 456, + 458, + 459, + 461, + 463, + 469, + 471, + 475, + 479, + 483, + 486, + 488, + 495, + 496, + 505, + 506, + 514, + 525, + 527, + 530, + 535, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 557, + 559, + 565, + 569, + 582, + 584, + 591, + 623, + 644, + 648, + 661, + 665, + 678, + 680, + 687, + 719, + 740, + 744, + 808, + 809, + 810, + 811, + 816, + 817, + 818, + 819, + 820, + 821, + 822, + 823, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gloria[] = +{ + 317, + 371, + 373, + 377, + 381, + 384, + 388, + 390, + 392, + 399, + 400, + 409, + 410, + 418, + 429, + 431, + 434, + 439, + 442, + 448, + 449, + 452, + 456, + 458, + 459, + 461, + 463, + 469, + 471, + 475, + 479, + 483, + 486, + 488, + 495, + 496, + 505, + 506, + 514, + 525, + 527, + 530, + 535, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 557, + 559, + 565, + 569, + 582, + 584, + 591, + 623, + 644, + 648, + 661, + 665, + 678, + 680, + 687, + 719, + 740, + 744, + 808, + 809, + 810, + 811, + 816, + 817, + 818, + 819, + 820, + 821, + 822, + 823, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Nico[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jeremy[] = +{ + 564, + 565, + 566, + 567, + 568, + 569, + 570, + 571, + 572, + 573, + 574, + 575, + 576, + 577, + 578, + 579, + 580, + 581, + 582, + 583, + 584, + 585, + 586, + 587, + 588, + 589, + 590, + 591, + 592, + 593, + 594, + 595, + 596, + 597, + 598, + 599, + 600, + 601, + 602, + 603, + 604, + 605, + 606, + 607, + 608, + 609, + 610, + 611, + 612, + 613, + 614, + 615, + 616, + 617, + 618, + 619, + 620, + 621, + 622, + 623, + 624, + 625, + 626, + 627, + 628, + 629, + 630, + 631, + 632, + 633, + 634, + 635, + 636, + 637, + 638, + 639, + 640, + 641, + 642, + 643, + 644, + 645, + 646, + 647, + 648, + 649, + 650, + 651, + 652, + 653, + 654, + 655, + 656, + 657, + 658, + 659, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Caitlin[] = +{ + 468, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + 534, + 535, + 536, + 537, + 538, + 539, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Reena[] = +{ + 372, + 373, + 374, + 375, + 376, + 377, + 378, + 379, + 380, + 381, + 382, + 383, + 384, + 385, + 386, + 387, + 388, + 389, + 390, + 391, + 392, + 393, + 394, + 395, + 396, + 397, + 398, + 399, + 400, + 401, + 402, + 403, + 404, + 405, + 406, + 407, + 408, + 409, + 410, + 411, + 412, + 413, + 414, + 415, + 416, + 417, + 418, + 419, + 420, + 421, + 422, + 423, + 424, + 425, + 426, + 427, + 428, + 429, + 430, + 431, + 432, + 433, + 434, + 435, + 436, + 437, + 438, + 439, + 440, + 441, + 442, + 443, + 444, + 445, + 446, + 447, + 448, + 449, + 450, + 451, + 452, + 453, + 454, + 455, + 456, + 457, + 458, + 459, + 460, + 461, + 462, + 463, + 464, + 465, + 466, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Avery[] = +{ + 21, + 238, + 282, + 303, + 331, + 343, + 368, + 369, + 383, + 417, + 423, + 424, + 432, + 481, + 513, + 519, + 520, + 528, + 575, + 609, + 615, + 616, + 624, + 671, + 705, + 711, + 712, + 720, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Liam[] = +{ + 21, + 238, + 282, + 303, + 331, + 343, + 368, + 369, + 383, + 417, + 423, + 424, + 432, + 481, + 513, + 519, + 520, + 528, + 575, + 609, + 615, + 616, + 624, + 671, + 705, + 711, + 712, + 720, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Theo[] = +{ + 333, + 347, + 350, + 354, + 358, + 361, + 362, + 363, + 364, + 371, + 381, + 384, + 429, + 434, + 439, + 479, + 483, + 525, + 530, + 535, + 573, + 576, + 621, + 626, + 631, + 669, + 672, + 717, + 722, + 727, + 816, + 817, + 818, + 819, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Bailey[] = +{ + 333, + 347, + 350, + 354, + 358, + 361, + 362, + 363, + 364, + 371, + 381, + 384, + 429, + 434, + 439, + 479, + 483, + 525, + 530, + 535, + 573, + 576, + 621, + 626, + 631, + 669, + 672, + 717, + 722, + 727, + 816, + 817, + 818, + 819, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Hugo[] = +{ + 383, + 386, + 402, + 403, + 416, + 417, + 423, + 432, + 433, + 435, + 450, + 466, + 481, + 482, + 498, + 499, + 512, + 513, + 519, + 528, + 529, + 531, + 546, + 562, + 575, + 578, + 594, + 595, + 608, + 609, + 615, + 624, + 625, + 627, + 642, + 658, + 671, + 674, + 690, + 691, + 704, + 705, + 711, + 720, + 721, + 723, + 738, + 754, + 762, + 763, + 764, + 773, + 774, + 775, + 784, + 785, + 786, + 795, + 796, + 797, + 832, + 833, + 834, + 835, + 836, + 837, + 838, + 839, + 840, + 841, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Bryce[] = +{ + 383, + 386, + 402, + 403, + 416, + 417, + 423, + 432, + 433, + 435, + 450, + 466, + 481, + 482, + 498, + 499, + 512, + 513, + 519, + 528, + 529, + 531, + 546, + 562, + 575, + 578, + 594, + 595, + 608, + 609, + 615, + 624, + 625, + 627, + 642, + 658, + 671, + 674, + 690, + 691, + 704, + 705, + 711, + 720, + 721, + 723, + 738, + 754, + 762, + 763, + 764, + 773, + 774, + 775, + 784, + 785, + 786, + 795, + 796, + 797, + 832, + 833, + 834, + 835, + 836, + 837, + 838, + 839, + 840, + 841, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gideon[] = +{ + 441, + 445, + 448, + 449, + 451, + 453, + 454, + 455, + 458, + 537, + 541, + 544, + 545, + 547, + 549, + 550, + 551, + 554, + 633, + 637, + 640, + 641, + 643, + 645, + 646, + 647, + 650, + 729, + 733, + 736, + 737, + 739, + 741, + 742, + 743, + 746, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Triston[] = +{ + 441, + 445, + 448, + 449, + 451, + 453, + 454, + 455, + 458, + 537, + 541, + 544, + 545, + 547, + 549, + 550, + 551, + 554, + 633, + 637, + 640, + 641, + 643, + 645, + 646, + 647, + 650, + 729, + 733, + 736, + 737, + 739, + 741, + 742, + 743, + 746, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Charles[] = +{ + 352, + 381, + 391, + 393, + 396, + 398, + 407, + 422, + 426, + 443, + 447, + 479, + 487, + 489, + 492, + 494, + 503, + 518, + 522, + 539, + 543, + 573, + 583, + 585, + 588, + 590, + 599, + 614, + 618, + 635, + 639, + 669, + 679, + 681, + 684, + 686, + 695, + 710, + 714, + 731, + 735, + 756, + 757, + 758, + 767, + 768, + 769, + 778, + 779, + 780, + 789, + 790, + 791, + 870, + 871, + 872, + 873, + 874, + 875, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Raymond[] = +{ + 374, + 376, + 381, + 404, + 407, + 422, + 439, + 443, + 459, + 472, + 500, + 506, + 507, + 518, + 532, + 546, + 566, + 585, + 588, + 628, + 635, + 679, + 681, + 684, + 710, + 731, + 785, + 795, + 796, + 797, + 817, + 842, + 843, + 846, + 847, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dirk[] = +{ + 355, + 375, + 379, + 385, + 386, + 412, + 435, + 440, + 454, + 457, + 459, + 465, + 473, + 477, + 482, + 484, + 508, + 531, + 536, + 550, + 553, + 555, + 561, + 567, + 571, + 577, + 578, + 604, + 627, + 632, + 646, + 649, + 651, + 657, + 663, + 667, + 673, + 674, + 700, + 723, + 728, + 742, + 745, + 747, + 753, + 756, + 757, + 758, + 767, + 768, + 769, + 778, + 779, + 780, + 789, + 790, + 791, + 828, + 829, + 830, + 831, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Harold[] = +{ + 355, + 375, + 379, + 385, + 386, + 412, + 435, + 440, + 454, + 457, + 459, + 465, + 473, + 477, + 482, + 484, + 508, + 531, + 536, + 550, + 553, + 555, + 561, + 567, + 571, + 577, + 578, + 604, + 627, + 632, + 646, + 649, + 651, + 657, + 663, + 667, + 673, + 674, + 700, + 723, + 728, + 742, + 745, + 747, + 753, + 756, + 757, + 758, + 767, + 768, + 769, + 778, + 779, + 780, + 789, + 790, + 791, + 828, + 829, + 830, + 831, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Omar[] = +{ + 373, + 388, + 390, + 392, + 400, + 409, + 410, + 418, + 431, + 442, + 448, + 449, + 452, + 456, + 458, + 459, + 461, + 463, + 469, + 471, + 486, + 488, + 496, + 505, + 506, + 514, + 527, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 557, + 559, + 565, + 580, + 582, + 584, + 592, + 601, + 602, + 610, + 623, + 634, + 640, + 641, + 644, + 648, + 650, + 651, + 653, + 655, + 661, + 676, + 678, + 680, + 688, + 697, + 698, + 706, + 719, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 749, + 751, + 808, + 809, + 810, + 811, + 820, + 821, + 822, + 823, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Peter[] = +{ + 373, + 388, + 390, + 392, + 400, + 409, + 410, + 418, + 431, + 442, + 448, + 449, + 452, + 456, + 458, + 459, + 461, + 463, + 469, + 471, + 486, + 488, + 496, + 505, + 506, + 514, + 527, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 557, + 559, + 565, + 580, + 582, + 584, + 592, + 601, + 602, + 610, + 623, + 634, + 640, + 641, + 644, + 648, + 650, + 651, + 653, + 655, + 661, + 676, + 678, + 680, + 688, + 697, + 698, + 706, + 719, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 749, + 751, + 808, + 809, + 810, + 811, + 820, + 821, + 822, + 823, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dev[] = +{ + 372, + 387, + 402, + 403, + 413, + 414, + 416, + 417, + 427, + 428, + 432, + 433, + 435, + 440, + 450, + 466, + 468, + 470, + 498, + 499, + 509, + 510, + 512, + 513, + 523, + 524, + 528, + 529, + 531, + 536, + 546, + 562, + 564, + 579, + 594, + 595, + 605, + 606, + 608, + 609, + 619, + 620, + 624, + 625, + 627, + 632, + 642, + 658, + 660, + 675, + 690, + 691, + 701, + 702, + 704, + 705, + 715, + 716, + 720, + 721, + 723, + 728, + 738, + 754, + 832, + 833, + 834, + 835, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Corey[] = +{ + 372, + 387, + 402, + 403, + 413, + 414, + 416, + 417, + 427, + 428, + 432, + 433, + 435, + 440, + 450, + 466, + 468, + 470, + 498, + 499, + 509, + 510, + 512, + 513, + 523, + 524, + 528, + 529, + 531, + 536, + 546, + 562, + 564, + 579, + 594, + 595, + 605, + 606, + 608, + 609, + 619, + 620, + 624, + 625, + 627, + 632, + 642, + 658, + 660, + 675, + 690, + 691, + 701, + 702, + 704, + 705, + 715, + 716, + 720, + 721, + 723, + 728, + 738, + 754, + 832, + 833, + 834, + 835, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Andre[] = +{ + 374, + 378, + 415, + 419, + 421, + 426, + 430, + 444, + 451, + 454, + 455, + 464, + 472, + 476, + 511, + 515, + 517, + 522, + 526, + 540, + 547, + 550, + 551, + 560, + 566, + 570, + 607, + 611, + 613, + 618, + 622, + 636, + 643, + 646, + 647, + 656, + 662, + 666, + 703, + 707, + 709, + 714, + 718, + 732, + 739, + 742, + 743, + 752, + 800, + 801, + 802, + 803, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ferris[] = +{ + 374, + 378, + 415, + 419, + 421, + 426, + 430, + 444, + 451, + 454, + 455, + 464, + 472, + 476, + 511, + 515, + 517, + 522, + 526, + 540, + 547, + 550, + 551, + 560, + 566, + 570, + 607, + 611, + 613, + 618, + 622, + 636, + 643, + 646, + 647, + 656, + 662, + 666, + 703, + 707, + 709, + 714, + 718, + 732, + 739, + 742, + 743, + 752, + 800, + 801, + 802, + 803, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alivia[] = +{ + 399, + 400, + 409, + 422, + 438, + 441, + 445, + 448, + 449, + 451, + 452, + 454, + 455, + 489, + 492, + 493, + 503, + 526, + 532, + 535, + 536, + 560, + 573, + 583, + 590, + 592, + 608, + 611, + 620, + 651, + 682, + 688, + 714, + 729, + 732, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Paige[] = +{ + 399, + 400, + 409, + 422, + 438, + 441, + 445, + 448, + 449, + 451, + 452, + 454, + 455, + 489, + 492, + 493, + 503, + 526, + 532, + 535, + 536, + 560, + 573, + 583, + 590, + 592, + 608, + 611, + 620, + 651, + 682, + 688, + 714, + 729, + 732, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Anya[] = +{ + 442, + 443, + 444, + 446, + 447, + 538, + 539, + 540, + 542, + 543, + 634, + 635, + 636, + 638, + 639, + 730, + 731, + 732, + 734, + 735, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dawn[] = +{ + 377, + 381, + 410, + 421, + 422, + 443, + 456, + 460, + 461, + 471, + 472, + 473, + 484, + 491, + 502, + 503, + 507, + 508, + 515, + 520, + 540, + 549, + 569, + 574, + 583, + 586, + 601, + 622, + 624, + 639, + 644, + 655, + 734, + 804, + 810, + 815, + 823, + 831, + 843, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Abby[] = +{ + 185, + 290, + 313, + 334, + 348, + 359, + 360, + 377, + 380, + 382, + 385, + 394, + 395, + 398, + 400, + 401, + 404, + 409, + 410, + 416, + 437, + 438, + 439, + 441, + 445, + 446, + 453, + 475, + 478, + 480, + 484, + 490, + 491, + 494, + 496, + 497, + 500, + 505, + 506, + 512, + 533, + 534, + 535, + 537, + 541, + 542, + 549, + 569, + 572, + 574, + 577, + 586, + 587, + 590, + 592, + 593, + 596, + 601, + 602, + 608, + 629, + 630, + 631, + 633, + 637, + 638, + 645, + 665, + 668, + 670, + 673, + 682, + 683, + 686, + 688, + 689, + 692, + 697, + 698, + 704, + 725, + 726, + 727, + 729, + 733, + 734, + 741, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gretel[] = +{ + 185, + 290, + 313, + 334, + 348, + 359, + 360, + 377, + 380, + 382, + 385, + 394, + 395, + 398, + 400, + 401, + 404, + 409, + 410, + 416, + 437, + 438, + 439, + 441, + 445, + 446, + 453, + 475, + 478, + 480, + 484, + 490, + 491, + 494, + 496, + 497, + 500, + 505, + 506, + 512, + 533, + 534, + 535, + 537, + 541, + 542, + 549, + 569, + 572, + 574, + 577, + 586, + 587, + 590, + 592, + 593, + 596, + 601, + 602, + 608, + 629, + 630, + 631, + 633, + 637, + 638, + 645, + 665, + 668, + 670, + 673, + 682, + 683, + 686, + 688, + 689, + 692, + 697, + 698, + 704, + 725, + 726, + 727, + 729, + 733, + 734, + 741, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + -1 +}; diff --git a/src/data/battle_frontier/battle_frontier_trainers.h b/src/data/battle_frontier/battle_frontier_trainers.h new file mode 100644 index 000000000..2b6b0d443 --- /dev/null +++ b/src/data/battle_frontier/battle_frontier_trainers.h @@ -0,0 +1,2403 @@ +const struct BattleFrontierTrainer gBattleFrontierTrainers[] = +{ + [0] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("BRAD"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NEVER, EC_WORD_GOING, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I_AM, EC_WORD_STRONG, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_WHAT, EC_WORD_QUES, -1, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Brady + }, + [1] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("CONNE"), + .speechBefore = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_BUG, EC_WORD_ME, -1, -1}, + .speechWin = {EC_WORD_A, EC_WORD_WIN, EC_WORD_IS, EC_WORD_JUST, EC_WORD_AWESOME, -1}, + .speechLose = {EC_WORD_DARN, EC_WORD_ELLIPSIS, EC_WORD_LOSING, EC_WORD_DOES, EC_WORD_BUG, EC_WORD_ME}, + .monSets = gBattleFrontierTrainerMons_Conner + }, + [2] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("BRADLE"), + .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_MY, EC_WORD_OPPONENT, EC_WORD_TODAY}, + .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL, -1, EC_WORD_SEE_YA, EC_WORD_LATER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_TOMORROW, EC_WORD_IS, EC_WORD_WHEN, EC_WORD_WE, EC_WORD_REALLY, EC_WORD_BATTLE}, + .monSets = gBattleFrontierTrainerMons_Bradley + }, + [3] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("CYBI"), + .speechBefore = {EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_NOT_VERY, EC_WORD_SCARY, EC_WORD_AT, EC_WORD_ALL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_SAD, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOU, EC_MOVE2(STRUGGLE)}, + .speechLose = {EC_WORD_THIS, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_HAPPENING, EC_WORD_TO_ME, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Cybil + }, + [4] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("RODETT"), + .speechBefore = {EC_WORD_OH, EC_WORD_THIS, EC_WORD_IS, EC_WORD_SO, EC_WORD_EXCITING, EC_WORD_EXCL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_INCREDIBLE, EC_WORD_HOW, EC_WORD_STRONG, EC_WORD_I_AM, EC_WORD_EXCL}, + .speechLose = {EC_WORD_OH_DEAR, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_JUST, EC_WORD_NO, EC_WORD_GOOD}, + .monSets = gBattleFrontierTrainerMons_Rodette + }, + [5] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("PEGG"), + .speechBefore = {EC_WORD_GET, EC_WORD_READY, EC_WORD_TO, EC_WORD_BE, EC_WORD_DESTROYED, EC_WORD_EXCL}, + .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL_EXCL, -1, EC_WORD_I_AM, EC_WORD_LOLLING, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_SAD, EC_WORD_THANKS, EC_WORD_TO, EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Peggy + }, + [6] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, + .trainerName = _("KEIT"), + .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_JUST, EC_WORD_STUDY, EC_WORD_YOU, EC_WORD_KNOW}, + .speechWin = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_STUDY, EC_WORD_ENOUGH, EC_WORD_ELLIPSIS, -1}, + .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Keith + }, + [7] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, + .trainerName = _("GRAYSO"), + .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_BATTLE, EC_WORD_ISN_T, EC_WORD_CHILD_S_PLAY, EC_WORD_EXCL}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_DONE, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_WE, EC_WORD_WERE, EC_WORD_LIKE, EC_WORD_TOYS, EC_WORD_TO, EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Grayson + }, + [8] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, + .trainerName = _("GLEN"), + .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_COOL, EC_WORD_IF_I_WIN, -1}, + .speechWin = {EC_WORD_COOL, EC_WORD_EXCL, -1, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM}, + .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_COOL}, + .monSets = gBattleFrontierTrainerMons_Glenn + }, + [9] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("LILIAN"), + .speechBefore = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_GIVE_UP, EC_WORD_UNTIL, EC_WORD_I, EC_WORD_WIN}, + .speechWin = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_WORD_SURRENDER, EC_WORD_IN, EC_WORD_ME}, + .speechLose = {EC_WORD_THAT_S, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_GIVE_UP, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Liliana + }, + [10] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("ELIS"), + .speechBefore = {EC_WORD_MY, EC_WORD_STRATEGY, EC_WORD_IS, EC_WORD_FROM, EC_WORD_MY, EC_WORD_FATHER}, + .speechWin = {EC_WORD_I, EC_WORD_WIN, EC_WORD_EXCL, EC_WORD_FATHER, EC_WORD_I_VE, EC_WORD_WON}, + .speechLose = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_FATHER, EC_WORD_FOR, EC_WORD_I_VE, EC_WORD_LOST}, + .monSets = gBattleFrontierTrainerMons_Elise + }, + [11] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("ZOE"), + .speechBefore = {EC_WORD_PLEASE, EC_WORD_BATTLE, EC_WORD_LIKE, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_IT}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, -1, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, + .speechLose = {EC_WORD_WERE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_BEING, EC_WORD_SERIOUS, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Zoey + }, + [12] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("MANUE"), + .speechBefore = {EC_WORD_ME, EC_WORD_LOSE, EC_WORD_QUES, EC_WORD_THAT_S, EC_WORD_PREPOSTEROUS, EC_WORD_EXCL}, + .speechWin = {EC_WORD_NATURALLY, EC_WORD_I, EC_WORD_WIN, -1, -1, -1}, + .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_LOST, EC_WORD_MOTHER}, + .monSets = gBattleFrontierTrainerMons_Manuel + }, + [13] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("RUS"), + .speechBefore = {EC_WORD_THEY, EC_WORD_ALL, EC_WORD_WANT, EC_WORD_MY, EC_WORD_FABULOUS, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_HAVE, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_PARTY}, + .speechLose = {EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_DO, EC_WORD_THAT, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Russ + }, + [14] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("DUSTI"), + .speechBefore = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_COOL, EC_WORD_POKEMON, -1}, + .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_WHEN_I_WIN, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_IF_I_LOSE, EC_WORD_TOO, -1}, + .monSets = gBattleFrontierTrainerMons_Dustin + }, + [15] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("TIN"), + .speechBefore = {EC_WORD_IF_I_WIN, EC_WORD_YOU, EC_WORD_CAN, EC_WORD_HAVE, EC_WORD_A, EC_MOVE2(SWEET_KISS)}, + .speechWin = {EC_WORD_HERE_IT_IS, EC_WORD_YOUR, EC_MOVE2(SWEET_KISS), EC_WORD_FROM, EC_WORD_MY, EC_POKEMON2(JYNX)}, + .speechLose = {EC_WORD_YOU, EC_WORD_WANT, EC_WORD_A, EC_MOVE(SWIFT), EC_MOVE2(MEGA_KICK), EC_WORD_INSTEAD}, + .monSets = gBattleFrontierTrainerMons_Tina + }, + [16] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("GILLIA"), + .speechBefore = {EC_WORD_THE, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_IS, EC_WORD_SO, EC_WORD_YESTERDAY}, + .speechWin = {EC_WORD_POKEMON, EC_WORD_NEVER, EC_WORD_GO, EC_WORD_OUT, EC_WORD_OF, EC_WORD_FASHION}, + .speechLose = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_DISAPPOINT, EC_WORD_ME, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Gillian + }, + [17] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("ZO"), + .speechBefore = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_A, EC_WORD_WORRY, EC_WORD_AT, EC_WORD_ALL}, + .speechWin = {EC_WORD_LIFE, EC_WORD_IS, EC_WORD_ALWAYS, EC_WORD_GOOD, EC_WORD_TO_ME, -1}, + .speechLose = {EC_WORD_I, EC_WORD_WORRY, EC_WORD_ABOUT, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_SKILL}, + .monSets = gBattleFrontierTrainerMons_Zoe + }, + [18] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("CHE"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_TOTALLY, EC_WORD_READY, EC_WORD_TO, EC_WORD_ROCK, EC_WORD_TODAY}, + .speechWin = {EC_WORD_I_AM, EC_WORD_READY, EC_WORD_TO, EC_WORD_GO, EC_WORD_ON, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_MOVE(FOCUS_ENERGY), EC_WORD_AND, EC_WORD_TOUGHNESS}, + .monSets = gBattleFrontierTrainerMons_Chen + }, + [19] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("A"), + .speechBefore = {EC_WORD_YOUR, EC_WORD_LOOK, EC_WORD_SAYS, EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_TOUGH}, + .speechWin = {EC_WORD_IT_S, EC_WORD_ME, EC_WORD_WHO_IS, EC_WORD_REALLY, EC_WORD_TOUGH, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_RIGHT, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_TOUGH}, + .monSets = gBattleFrontierTrainerMons_Al + }, + [20] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("MITC"), + .speechBefore = {EC_WORD_MOTHER, EC_WORD_NATURE, EC_WORD_IS, EC_WORD_MY, EC_WORD_ALLY, EC_WORD_EXCL}, + .speechWin = {EC_WORD_WAS, EC_WORD_THAT, EC_WORD_ENOUGH, EC_WORD_FOR, EC_WORD_YOU, EC_WORD_QUES}, + .speechLose = {EC_WORD_MOTHER, EC_WORD_NATURE, EC_WORD_DIDN_T, EC_WORD_LET_ME_WIN, EC_WORD_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Mitch + }, + [21] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("ANN"), + .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_LET_S, EC_WORD_BATTLE, EC_WORD_NOW}, + .speechWin = {EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_IS, EC_WORD_OVERWHELMING, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_YOU_VE, EC_WORD_DESTROYED, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Anne + }, + [22] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("ALIZ"), + .speechBefore = {EC_WORD_CUTE, EC_WORD_AND, EC_WORD_AWFULLY, EC_WORD_STRONG, EC_WORD_THAT_S, EC_WORD_ME}, + .speechWin = {EC_WORD_YUP, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_AND, EC_WORD_AWFULLY, EC_WORD_STRONG}, + .speechLose = {EC_WORD_I_AM, EC_WORD_WEAK, EC_WORD_ELLIPSIS, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_CUTE}, + .monSets = gBattleFrontierTrainerMons_Alize + }, + [23] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("LAURE"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_OLD, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_ALSO, EC_WORD_GOOD}, + .speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_I_WAS, EC_WORD_OLD, EC_WORD_BUT, EC_WORD_GOOD}, + .speechLose = {EC_WORD_WHAT, EC_WORD_A, EC_WORD_WEIRD, EC_WORD_DREAM, EC_WORD_THAT_WAS, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Lauren + }, + [24] = { + .facilityClass = FACILITY_CLASS_TUBER_M, + .trainerName = _("KIP"), + .speechBefore = {EC_WORD_IF_I_WIN, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_GO, EC_MOVE2(SURF)}, + .speechWin = {EC_WORD_YEAH, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_OFF, EC_WORD_TO, EC_MOVE2(SURF)}, + .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_EXCL, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Kipp + }, + [25] = { + .facilityClass = FACILITY_CLASS_TUBER_M, + .trainerName = _("JASO"), + .speechBefore = {EC_WORD_TEACH, EC_WORD_ME, EC_WORD_A, EC_WORD_GOOD, EC_WORD_STRATEGY, -1}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_YOUR, EC_WORD_GOOD, EC_WORD_STRATEGY, EC_WORD_QUES_EXCL, -1}, + .speechLose = {EC_WORD_WOW, EC_WORD_THAT, EC_WORD_IS, EC_WORD_AN, EC_WORD_AWESOME, EC_WORD_STRATEGY}, + .monSets = gBattleFrontierTrainerMons_Jason + }, + [26] = { + .facilityClass = FACILITY_CLASS_TUBER_M, + .trainerName = _("JOH"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_PRETTY, EC_WORD_NEW, EC_WORD_TRAINER, -1}, + .speechWin = {EC_WORD_I_AM, EC_WORD_NEW, EC_WORD_BUT, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_NEW, EC_WORD_SO, EC_WORD_WHAT, EC_WORD_IF_I_LOSE, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_John + }, + [27] = { + .facilityClass = FACILITY_CLASS_TUBER_F, + .trainerName = _("AN"), + .speechBefore = {EC_WORD_IT_S, EC_WORD_SO, EC_WORD_EXCITING, EC_WORD_IT, EC_WORD_REALLY, EC_WORD_IS}, + .speechWin = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_HAPPY, EC_WORD_I, EC_WORD_CAN, EC_WORD_CRY}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SAD, EC_WORD_I, EC_WORD_WILL, EC_WORD_CRY}, + .monSets = gBattleFrontierTrainerMons_Ann + }, + [28] = { + .facilityClass = FACILITY_CLASS_TUBER_F, + .trainerName = _("EILEE"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_OK_QUES}, + .speechWin = {EC_WORD_SO, EC_WORD_THIS, EC_WORD_IS, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_FEELING}, + .speechLose = {EC_WORD_AN, EC_WORD_ADULT, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_YOU, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Eileen + }, + [29] = { + .facilityClass = FACILITY_CLASS_TUBER_F, + .trainerName = _("CARLI"), + .speechBefore = {EC_WORD_MY, EC_WORD_SUMMER, EC_WORD_VACATION, EC_WORD_IS, EC_WORD_FOR, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_MY, EC_WORD_SUMMER, EC_WORD_VACATION, EC_WORD_WILL, EC_WORD_BE, EC_WORD_AWESOME}, + .speechLose = {EC_WORD_I, EC_WORD_CAN_T_WIN, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Carlie + }, + [30] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("GORDO"), + .speechBefore = {EC_WORD_VICTORY, EC_WORD_WILL, EC_WORD_COME, EC_WORD_TO_ME, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_OH_YEAH, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_REALLY, EC_WORD_WON}, + .speechLose = {EC_WORD_NOTHING, EC_WORD_IS, EC_WORD_WORKING, EC_WORD_OUT, EC_WORD_FOR, EC_WORD_ME}, + .monSets = gBattleFrontierTrainerMons_Gordon + }, + [31] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("AYDE"), + .speechBefore = {EC_WORD_COME_ON, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_WORD_HOT, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_WATER, EC_WORD_TO, EC_WORD_COOL, EC_WORD_DOWN}, + .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_ICE, EC_WORD_COLD}, + .monSets = gBattleFrontierTrainerMons_Ayden + }, + [32] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("MARC"), + .speechBefore = {EC_WORD_I, EC_MOVE2(SURF), EC_WORD_IN, EC_WORD_THE, EC_WORD_WINTER, EC_WORD_TOO}, + .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GO, EC_MOVE2(SURF), EC_WORD_RIGHT, EC_WORD_NOW}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_MOVE2(BEAT_UP), EC_WORD_MY, EC_MOVE2(SURF), EC_WORD_BOARD}, + .monSets = gBattleFrontierTrainerMons_Marco + }, + [33] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("CIERR"), + .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_SYNCHRONIZE, EC_WORD_MY, EC_WORD_SWIFT_SWIM}, + .speechWin = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_SYNCHRONIZE, EC_WORD_WITH, EC_WORD_ME, -1}, + .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_SYNCHRONIZE, EC_WORD_BETTER, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Cierra + }, + [34] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("MARC"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_KNOCKOUT, EC_WORD_YOU, EC_WORD_CAN_T_WIN, EC_WORD_EXCL}, + .speechWin = {EC_WORD_AFTER, EC_WORD_ALL, EC_WORD_I_AM, EC_WORD_A, EC_WORD_KNOCKOUT, EC_WORD_EXCL}, + .speechLose = {EC_WORD_THAT_S, EC_WORD_NOT, EC_WORD_THE, EC_WORD_KNOCKOUT, EC_WORD_I, EC_WORD_MEAN}, + .monSets = gBattleFrontierTrainerMons_Marcy + }, + [35] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("KATH"), + .speechBefore = {EC_WORD_I_VE, EC_WORD_WON, EC_WORD_EVERY, EC_WORD_MATCH, EC_WORD_TODAY, EC_WORD_EXCL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_SO, EC_WORD_GREAT, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL}, + .speechLose = {EC_WORD_HUH_QUES, EC_WORD_I, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_HAVE, EC_WORD_LOST}, + .monSets = gBattleFrontierTrainerMons_Kathy + }, + [36] = { + .facilityClass = FACILITY_CLASS_POKEFAN_M, + .trainerName = _("PEYTO"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NEVER, EC_WORD_DISAPPOINTED, EC_WORD_WITH, EC_WORD_MY, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_IF, EC_WORD_WE, EC_WORD_WIN, EC_WORD_TOGETHER}, + .speechLose = {EC_WORD_I, EC_WORD_ADORE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_MORE, EC_WORD_IF_I_LOSE}, + .monSets = gBattleFrontierTrainerMons_Peyton + }, + [37] = { + .facilityClass = FACILITY_CLASS_POKEFAN_M, + .trainerName = _("JULIA"), + .speechBefore = {EC_WORD_YOU, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_RIGHT, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOTALLY, EC_WORD_OUT, EC_WORD_OF, EC_WORD_THE, EC_WORD_QUESTION}, + .speechLose = {EC_WORD_YOU, EC_WORD_DO, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Julian + }, + [38] = { + .facilityClass = FACILITY_CLASS_POKEFAN_M, + .trainerName = _("QUIN"), + .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_BUT, EC_WORD_A, EC_WORD_DREAM}, + .speechWin = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_WORD_BEAUTIFUL, EC_WORD_DREAM, EC_WORD_EXCL}, + .speechLose = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_AN, EC_WORD_AWFUL, EC_MOVE(NIGHTMARE), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Quinn + }, + [39] = { + .facilityClass = FACILITY_CLASS_POKEFAN_F, + .trainerName = _("HAYLE"), + .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_I_AM, EC_WORD_FEELING}, + .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_OVERWHELMING, EC_WORD_JOY, EC_WORD_OVER, EC_WORD_THIS}, + .speechLose = {EC_WORD_DESTROYED, EC_WORD_IS, EC_WORD_THE, EC_WORD_WAY, EC_WORD_I_AM, EC_WORD_FEELING}, + .monSets = gBattleFrontierTrainerMons_Haylee + }, + [40] = { + .facilityClass = FACILITY_CLASS_POKEFAN_F, + .trainerName = _("AMAND"), + .speechBefore = {EC_WORD_I, EC_WORD_COME, EC_WORD_FROM, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_FAMILY}, + .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_TREASURE, EC_WORD_THIS, EC_WORD_WIN, -1}, + .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO_HOME, EC_WORD_RIGHT, EC_WORD_NOW}, + .monSets = gBattleFrontierTrainerMons_Amanda + }, + [41] = { + .facilityClass = FACILITY_CLASS_POKEFAN_F, + .trainerName = _("STAC"), + .speechBefore = {EC_WORD_ALL, EC_WORD_POKEMON, EC_WORD_HAVE, EC_WORD_THEIR, EC_WORD_OWN, EC_WORD_CUTE_CHARM}, + .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_WHAT, EC_WORD_I, EC_WORD_MEAN, EC_WORD_QUES}, + .speechLose = {EC_WORD_SHOULD, EC_WORD_I, EC_WORD_NOT, EC_WORD_ADORE, EC_WORD_POKEMON, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Stacy + }, + [42] = { + .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, + .trainerName = _("RAFAE"), + .speechBefore = {EC_WORD_COME_ON, EC_WORD_EXCL, EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_SOME, EC_WORD_SPIRIT}, + .speechWin = {EC_WORD_THAT_S_IT_EXCL, EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_SPIRIT, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_WELL, EC_WORD_SO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_OUR, EC_WORD_SPIRIT}, + .monSets = gBattleFrontierTrainerMons_Rafael + }, + [43] = { + .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, + .trainerName = _("OLIVE"), + .speechBefore = {EC_WORD_A, EC_WORD_GENIUS, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL}, + .speechWin = {EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_WORKS, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_THAN, EC_WORD_I_AM}, + .monSets = gBattleFrontierTrainerMons_Oliver + }, + [44] = { + .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, + .trainerName = _("PAYTO"), + .speechBefore = {EC_WORD_I, EC_WORD_TRAIN, EC_WORD_FROM, EC_WORD_THE, EC_WORD_EGG, EC_WORD_UP}, + .speechWin = {EC_WORD_WELL, EC_WORD_DONE, EC_WORD_EXCL, -1, -1, -1}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_A, EC_MOVE2(SOFT_BOILED), EC_WORD_LOSS, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Payton + }, + [45] = { + .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, + .trainerName = _("PAMEL"), + .speechBefore = {EC_WORD_ALL, EC_WORD_POKEMON, EC_WORD_ADORE, EC_WORD_A, EC_WORD_KIND, EC_WORD_TRAINER}, + .speechWin = {EC_WORD_IT_S, EC_WORD_TOO, EC_WORD_BAD, EC_WORD_YOU, EC_WORD_LOST, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_KIND, EC_WORD_AND, EC_WORD_YOU_RE, EC_WORD_ALSO, EC_WORD_STRONG}, + .monSets = gBattleFrontierTrainerMons_Pamela + }, + [46] = { + .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, + .trainerName = _("ELIZ"), + .speechBefore = {EC_WORD_I, EC_WORD_ADORE, EC_WORD_POKEMON, EC_WORD_LIKE, EC_WORD_MY, EC_WORD_CHILDREN}, + .speechWin = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_MY, EC_WORD_POKEMON}, + .speechLose = {EC_WORD_OH_DEAR, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SORRY, EC_WORD_ABOUT, EC_WORD_THIS}, + .monSets = gBattleFrontierTrainerMons_Eliza + }, + [47] = { + .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, + .trainerName = _("MARIS"), + .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_WORD_BATTLE, EC_WORD_SERIOUSLY, -1}, + .speechWin = {EC_WORD_PROMISE, EC_WORD_ME, EC_WORD_YOU, EC_WORD_WILL, EC_WORD_DO, EC_WORD_BETTER}, + .speechLose = {EC_WORD_PROMISE, EC_WORD_ME, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_PLEASE, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Marisa + }, + [48] = { + .facilityClass = FACILITY_CLASS_BUG_CATCHER, + .trainerName = _("LEWI"), + .speechBefore = {EC_WORD_A_LITTLE, EC_WORD_BUG, EC_WORD_IS, EC_WORD_SCARY, EC_WORD_QUES, EC_WORD_HAHAHA}, + .speechWin = {EC_WORD_LOOK, EC_WORD_LOOK, EC_WORD_EXCL, EC_WORD_A, EC_WORD_SCARY, EC_WORD_BUG}, + .speechLose = {EC_WORD_OH, EC_WORD_A, EC_WORD_BUG, EC_WORD_ISN_T, EC_WORD_SCARY, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Lewis + }, + [49] = { + .facilityClass = FACILITY_CLASS_BUG_CATCHER, + .trainerName = _("YOSH"), + .speechBefore = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_LOVEY_DOVEY}, + .speechWin = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_THE, EC_WORD_BEST, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_IGNORANT, EC_WORD_ABOUT, EC_WORD_BUG, EC_WORD_POKEMON, -1}, + .monSets = gBattleFrontierTrainerMons_Yoshi + }, + [50] = { + .facilityClass = FACILITY_CLASS_BUG_CATCHER, + .trainerName = _("DESTI"), + .speechBefore = {EC_WORD_IT_S, EC_WORD_WAY, EC_WORD_TOO, EC_WORD_HOT, EC_WORD_HERE, -1}, + .speechWin = {EC_WORD_I_AM, EC_WORD_ABOUT, EC_WORD_TO, EC_MOVE(OVERHEAT), -1, -1}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_SOME, EC_WORD_WATER, -1}, + .monSets = gBattleFrontierTrainerMons_Destin + }, + [51] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("KEO"), + .speechBefore = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_BUT, EC_WORD_HERE_I_COME, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_FOR, EC_WORD_MY, EC_WORD_OVERWHELMING, EC_WORD_POWER}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, -1, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Keon + }, + [52] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("STUAR"), + .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_YOU, EC_WORD_A, EC_WORD_HOT, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_THE, EC_WORD_MASTER, EC_WORD_OF, EC_WORD_COOL, EC_WORD_THAT_S, EC_WORD_ME}, + .speechLose = {EC_WORD_I, EC_WORD_SEE, EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_SO, EC_WORD_COOL}, + .monSets = gBattleFrontierTrainerMons_Stuart + }, + [53] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("NESTO"), + .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_A, EC_WORD_REALLY, EC_WORD_SMOOTH, EC_WORD_MOVE}, + .speechWin = {EC_WORD_THERE, EC_WORD_WAS, EC_WORD_NOTHING, EC_WORD_SMOOTH, EC_WORD_ABOUT, EC_WORD_THAT}, + .speechLose = {EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_ARE, EC_WORD_SMOOTH, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Nestor + }, + [54] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("DERRIC"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_YOU, EC_MOVE2(MEDITATE), EC_WORD_LIKE, EC_WORD_ME}, + .speechWin = {EC_WORD_HOW, EC_WORD_I, EC_MOVE2(MEDITATE), EC_WORD_IS, EC_WORD_JUST, EC_WORD_BEAUTIFUL}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_MOVE2(MEDITATE), EC_WORD_FOR, EC_WORD_A, EC_MOVE2(CALM_MIND)}, + .monSets = gBattleFrontierTrainerMons_Derrick + }, + [55] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("BRYSO"), + .speechBefore = {EC_MOVE2(POISON_POWDER), EC_WORD_IS, EC_WORD_IN, EC_WORD_OUR, EC_MOVE2(COTTON_SPORE), EC_WORD_MOVE}, + .speechWin = {EC_WORD_HOW_DO, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_OUR, EC_MOVE2(POISON_POWDER), EC_WORD_QUES}, + .speechLose = {EC_WORD_MY, EC_MOVE2(COTTON_SPORE), EC_WORD_WAS, EC_WORD_USELESS, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Bryson + }, + [56] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("CLAYTO"), + .speechBefore = {EC_WORD_HUH_QUES, -1, -1, EC_WORD_WHERE, EC_WORD_IS_IT_QUES, -1}, + .speechWin = {EC_WORD_WHERE, EC_WORD_IS_IT_QUES, EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_WORD_POKENAV}, + .speechLose = {EC_WORD_WHERE, EC_WORD_IS_IT_QUES, EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_WORD_SENSE}, + .monSets = gBattleFrontierTrainerMons_Clayton + }, + [57] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("TRENTO"), + .speechBefore = {EC_WORD_COME_OVER, EC_WORD_FOR, EC_WORD_SOME, EC_WORD_TASTY, EC_WORD_WATER, -1}, + .speechWin = {EC_WORD_MMM, EC_WORD_DO, EC_WORD_YOU, EC_WORD_WANT, EC_WORD_SOME, EC_WORD_QUES}, + .speechLose = {EC_WORD_I, EC_WORD_GOT, EC_WORD_THIS, EC_WORD_TASTY, EC_WORD_WATER, EC_WORD_SHOPPING}, + .monSets = gBattleFrontierTrainerMons_Trenton + }, + [58] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("JENSO"), + .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_DOWNCAST}, + .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_THE, EC_MOVE(CUT)}, + .speechLose = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_TRAINER, EC_WORD_WHO_IS, EC_WORD_FEELING, EC_WORD_DOWNCAST}, + .monSets = gBattleFrontierTrainerMons_Jenson + }, + [59] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("WESLE"), + .speechBefore = {EC_POKEMON2(MEW), EC_POKEMON2(MEW), EC_WORD_IS, EC_WORD_HOW, EC_WORD_I, EC_WORD_CRY}, + .speechWin = {EC_WORD_YES, EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_EXCL}, + .speechLose = {EC_POKEMON2(MEW), EC_POKEMON2(MEW), EC_WORD_EXCL, EC_POKEMON2(MEW), EC_WORD_EXCL_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Wesley + }, + [60] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("ANTO"), + .speechBefore = {EC_WORD_GET, EC_WORD_READY, EC_WORD_FOR, EC_WORD_ME, EC_WORD_TO, EC_MOVE(THRASH)}, + .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, EC_WORD_SORRY, EC_WORD_ABOUT, EC_WORD_THAT, EC_WORD_EXCL}, + .speechLose = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_TOUGH, EC_WORD_LOSS, EC_WORD_TO, EC_MOVE2(SWALLOW)}, + .monSets = gBattleFrontierTrainerMons_Anton + }, + [61] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("LAWSO"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AT, EC_WORD_HEART, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_NOT, EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_NOT, EC_WORD_AT, EC_WORD_ALL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_OLD, EC_WORD_AND, EC_WORD_FEELING, EC_WORD_SHAKY, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Lawson + }, + [62] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("SAMM"), + .speechBefore = {EC_WORD_MY, EC_WORD_PARTY, EC_WORD_IS, EC_WORD_READY, EC_WORD_TO, EC_WORD_ROCK}, + .speechWin = {EC_WORD_MY, EC_WORD_PARTY, EC_WORD_IS, EC_WORD_JUST, EC_WORD_INCREDIBLE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_CRY, EC_WORD_FOR, EC_WORD_MY, EC_WORD_PARTY, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Sammy + }, + [63] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("ARNI"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_I, EC_WORD_HAVE, EC_WORD_NO, EC_WORD_RIVAL}, + .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I, EC_WORD_CAN_T, EC_WORD_LOSE}, + .speechLose = {EC_WORD_NO, EC_WORD_EXCL, EC_WORD_I, EC_WORD_WON_T, EC_WORD_ACCEPT, EC_WORD_THIS}, + .monSets = gBattleFrontierTrainerMons_Arnie + }, + [64] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("ADRIA"), + .speechBefore = {EC_WORD_YAHOO, EC_WORD_EXCL, -1, EC_WORD_YAHOO, EC_WORD_EXCL_EXCL, -1}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, -1, EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, -1}, + .speechLose = {EC_WORD_GOOD_BYE, EC_WORD_EXCL, -1, EC_WORD_GOOD_BYE, EC_WORD_EXCL_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Adrian + }, + [65] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("TRISTA"), + .speechBefore = {EC_WORD_CONFUSED, EC_WORD_QUES, -1, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS}, + .speechWin = {EC_WORD_SEE, EC_WORD_QUES, -1, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS}, + .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_IN, EC_WORD_BATTLE}, + .monSets = gBattleFrontierTrainerMons_Tristan + }, + [66] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("JULIAN"), + .speechBefore = {EC_WORD_I, EC_WORD_THINK, EC_WORD_I_AM, EC_WORD_SHOPPING, EC_WORD_TOO, EC_WORD_MUCH}, + .speechWin = {EC_WORD_BUT, EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_PLUSH_DOLL}, + .speechLose = {EC_WORD_I, EC_WORD_SO, EC_WORD_WANT, EC_WORD_ANOTHER, EC_WORD_POKEMON, EC_WORD_PLUSH_DOLL}, + .monSets = gBattleFrontierTrainerMons_Juliana + }, + [67] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("RYLE"), + .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THAT, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GUTS}, + .speechWin = {EC_WORD_BYE_BYE, EC_WORD_EXCL, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_NO, EC_WORD_GUTS}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_GUTSY, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_QUITE, EC_WORD_SUPER}, + .monSets = gBattleFrontierTrainerMons_Rylee + }, + [68] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("CHELSE"), + .speechBefore = {EC_WORD_I, EC_WORD_SERIOUSLY, EC_WORD_MEAN, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MY, EC_WORD_WILL, EC_WORD_TO, EC_WORD_WIN, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_FAR, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, -1}, + .monSets = gBattleFrontierTrainerMons_Chelsea + }, + [69] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("DANEL"), + .speechBefore = {EC_WORD_YOU, EC_WORD_MUST_BE, EC_WORD_MY, EC_WORD_OPPONENT, EC_WORD_NOW, EC_WORD_EXCL}, + .speechWin = {EC_WORD_OH_DEAR, EC_WORD_TOO_WEAK, EC_WORD_EXCL, EC_WORD_DON_T, EC_WORD_GIVE_UP, EC_WORD_EXCL}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_GOOD, EC_WORD_AND, EC_WORD_THIS, EC_WORD_IS, EC_WORD_GOOD_BYE}, + .monSets = gBattleFrontierTrainerMons_Danela + }, + [70] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("LIZBET"), + .speechBefore = {EC_WORD_IF_I_LOSE, EC_WORD_YOU, EC_WORD_CAN, EC_WORD_HAVE, EC_WORD_A, EC_MOVE2(PRESENT)}, + .speechWin = {EC_WORD_HERE_IT_IS, EC_WORD_A_LITTLE, EC_WORD_PRAISE, EC_WORD_AS, EC_WORD_YOUR, EC_MOVE2(PRESENT)}, + .speechLose = {EC_WORD_YOUR, EC_MOVE2(PRESENT), EC_WORD_QUES_EXCL, EC_WORD_HERE_IT_IS, EC_WORD_A, EC_MOVE(DOUBLE_SLAP)}, + .monSets = gBattleFrontierTrainerMons_Lizbeth + }, + [71] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("AMELI"), + .speechBefore = {EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_CUTE, EC_WORD_FASHION, EC_WORD_APPEAL}, + .speechWin = {EC_WORD_YOUR, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_A, EC_WORD_DISASTER}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_AWFUL, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_HOME}, + .monSets = gBattleFrontierTrainerMons_Amelia + }, + [72] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("JILLIA"), + .speechBefore = {EC_WORD_WHAT, EC_WORD_IS, EC_WORD_THAT, EC_WORD_I, EC_WORD_SMELL, EC_WORD_QUES}, + .speechWin = {EC_WORD_IT_S, EC_WORD_THE, EC_MOVE(SWEET_SCENT), EC_WORD_OF, EC_WORD_TASTY, EC_WORD_WATER}, + .speechLose = {EC_WORD_IT_S, EC_WORD_YOUR, EC_WORD_OFFENSIVE, EC_WORD_STENCH, EC_WORD_THAT_S, EC_WORD_WHAT}, + .monSets = gBattleFrontierTrainerMons_Jillian + }, + [73] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("ABBI"), + .speechBefore = {EC_WORD_YOU, EC_WORD_TRY, EC_WORD_MY, EC_WORD_SECRET, EC_MOVE(AROMATHERAPY), EC_WORD_OK_QUES}, + .speechWin = {EC_WORD_MY, EC_MOVE(AROMATHERAPY), EC_WORD_IS, EC_WORD_TERRIBLE, EC_WORD_FOR, EC_WORD_YOU}, + .speechLose = {EC_WORD_DIDN_T, EC_WORD_YOU, EC_WORD_SMELL, EC_WORD_A, EC_WORD_THING, EC_WORD_QUES_EXCL}, + .monSets = gBattleFrontierTrainerMons_Abbie + }, + [74] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("BRIAN"), + .speechBefore = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_WORKS, EC_WORD_TOO, EC_WORD_MUCH}, + .speechWin = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_MISS, EC_WORD_HIM, EC_WORD_MORE, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_LONESOME, EC_WORD_WITHOUT, EC_WORD_HIM, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Briana + }, + [75] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("ANTONI"), + .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_TO, EC_WORD_GO, EC_WORD_GO}, + .speechWin = {EC_WORD_BUT, EC_WORD_I, EC_WORD_DON_T, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_DANCE}, + .speechLose = {EC_WORD_GO, EC_WORD_GO, EC_WORD_ELLIPSIS, EC_WORD_JUST, EC_MOVE(FLAIL), EC_WORD_ABOUT}, + .monSets = gBattleFrontierTrainerMons_Antonio + }, + [76] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("JADE"), + .speechBefore = {EC_WORD_HELLO, EC_WORD_I, EC_WORD_THINK, EC_WORD_I, EC_WORD_ADORE, EC_WORD_YOU}, + .speechWin = {EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_MOVE(THRASH), EC_WORD_IN, EC_MOVE2(FRUSTRATION)}, + .speechLose = {EC_WORD_THIS_IS_IT_EXCL, -1, -1, EC_WORD_GOOD_BYE, EC_WORD_FOREVER, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Jaden + }, + [77] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("DAKOT"), + .speechBefore = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_DANCE, EC_WORD_WITH, EC_WORD_POWER}, + .speechWin = {EC_WORD_GOT, EC_WORD_IT, EC_WORD_QUES, EC_WORD_DANCE, EC_WORD_WITH, EC_WORD_POWER}, + .speechLose = {EC_WORD_OKAY, EC_WORD_YOU, EC_WORD_UNDERSTAND, EC_WORD_ALL_RIGHT, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Dakota + }, + [78] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("BRAYDE"), + .speechBefore = {EC_WORD_COLOR_CHANGE, EC_WORD_VERSION, EC_WORD_TOYS, EC_WORD_ARE, EC_WORD_USELESS, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_COLLECT, EC_WORD_NORMAL, EC_WORD_VERSION, EC_WORD_TOYS}, + .speechLose = {EC_WORD_I, EC_MOVE2(ATTRACT), EC_WORD_COLOR_CHANGE, EC_WORD_VERSION, EC_WORD_TOYS, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Brayden + }, + [79] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("CORSO"), + .speechBefore = {EC_WORD_I, EC_WORD_GET, EC_WORD_TO, EC_MOVE2(BEAT_UP), EC_WORD_ON, EC_WORD_YOU}, + .speechWin = {EC_WORD_TOO, EC_WORD_EASY, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_COOL}, + .speechLose = {EC_WORD_WHY, EC_WORD_QUES_EXCL, -1, EC_WORD_I, EC_MOVE2(CURSE), EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Corson + }, + [80] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("TREVI"), + .speechBefore = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NONE, EC_WORD_BETTER, EC_WORD_THAN, EC_WORD_ME}, + .speechWin = {EC_WORD_YES_SIR_EXCL, -1, -1, EC_WORD_I_AM, EC_WORD_THE, EC_WORD_BEST}, + .speechLose = {EC_WORD_SERIOUS, EC_WORD_QUES_EXCL, -1, -1, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Trevin + }, + [81] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("PATRIC"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_PERFECT, EC_WORD_EXCL, EC_WORD_GIVE_UP, EC_WORD_NOW, -1}, + .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_DISAPPOINTED, EC_WORD_I_AM, EC_WORD_PERFECT, -1}, + .speechLose = {EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_PERFECT, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Patrick + }, + [82] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("KADE"), + .speechBefore = {EC_WORD_WHAT, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_UP, EC_WORD_TO, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOU, EC_WORD_WERE, EC_WORD_A, EC_WORD_SURPRISE, EC_WORD_TO_ME, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_WHO, EC_WORD_I_AM, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Kaden + }, + [83] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("MAXWEL"), + .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_WHO_IS, EC_WORD_YOUR, EC_WORD_RIVAL, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_MY, EC_WORD_RIVAL, EC_WORD_IS, EC_WORD_MY, EC_WORD_GIRL, EC_WORD_FRIEND}, + .speechLose = {EC_WORD_I_AM, EC_WORD_MAKING, EC_WORD_YOU, EC_WORD_MY, EC_WORD_RIVAL, -1}, + .monSets = gBattleFrontierTrainerMons_Maxwell + }, + [84] = { + .facilityClass = FACILITY_CLASS_HIKER, + .trainerName = _("DARY"), + .speechBefore = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_TO, EC_MOVE(CHARGE)}, + .speechWin = {EC_WORD_AM, EC_WORD_I, EC_WORD_OVERWHELMING, EC_WORD_OR, EC_WORD_WHAT, EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_A, EC_WORD_LEGEND, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Daryl + }, + [85] = { + .facilityClass = FACILITY_CLASS_HIKER, + .trainerName = _("KENNET"), + .speechBefore = {EC_WORD_YOU, EC_WORD_BETTER, EC_WORD_NOT, EC_MOVE2(SLACK_OFF), EC_WORD_WITH, EC_WORD_ME}, + .speechWin = {EC_WORD_DID, EC_WORD_MY, EC_MOVE2(TAUNT), EC_WORD_INTIMIDATE, EC_WORD_YOU, EC_WORD_QUES}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, -1, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Kenneth + }, + [86] = { + .facilityClass = FACILITY_CLASS_HIKER, + .trainerName = _("RIC"), + .speechBefore = {EC_WORD_YOUR, EC_MOVE(FACADE), EC_WORD_DOESN_T, EC_MOVE2(TRICK), EC_WORD_ME, -1}, + .speechWin = {EC_WORD_SERIOUSLY, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_OK_QUES, -1}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_REALLY, EC_WORD_TOUGH, EC_WORD_ON, EC_WORD_ME, -1}, + .monSets = gBattleFrontierTrainerMons_Rich + }, + [87] = { + .facilityClass = FACILITY_CLASS_KINDLER, + .trainerName = _("CADE"), + .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_DEFEATED, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_FIRE, EC_WORD_EXCL, -1, EC_WORD_FIRE, EC_WORD_EXCL_EXCL, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_TIRED, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_SO, EC_WORD_HOT}, + .monSets = gBattleFrontierTrainerMons_Caden + }, + [88] = { + .facilityClass = FACILITY_CLASS_KINDLER, + .trainerName = _("MARLO"), + .speechBefore = {EC_WORD_A, EC_WORD_POKEDEX, EC_WORD_IS, EC_WORD_A_LITTLE, EC_WORD_RADIO, EC_WORD_QUES}, + .speechWin = {EC_WORD_A_LITTLE, EC_WORD_RADIO, EC_WORD_HUH_QUES, EC_WORD_THAT_S, EC_WORD_TOTALLY, EC_WORD_COOL}, + .speechLose = {EC_WORD_IT_S, EC_WORD_NOT, EC_WORD_QUES, EC_WORD_IS, EC_WORD_POKENAV, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Marlon + }, + [89] = { + .facilityClass = FACILITY_CLASS_KINDLER, + .trainerName = _("NAS"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_BABY, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_I, EC_WORD_LEFT, EC_WORD_YOU, EC_WORD_JUST, EC_WORD_AN, EC_MOVE2(EMBER)}, + .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, -1, EC_WORD_NO, EC_WORD_WATER, EC_WORD_PLEASE}, + .monSets = gBattleFrontierTrainerMons_Nash + }, + [90] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, + .trainerName = _("ROBB"), + .speechBefore = {EC_WORD_HAHAHA, EC_WORD_EXCL, EC_WORD_HAPPY, EC_WORD_TO, EC_WORD_MEET_YOU, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_LEADER, EC_WORD_WITH, EC_WORD_REFRESHING, EC_WORD_SERENE_GRACE}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(THRASH), EC_WORD_MY, EC_WORD_TOYS, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Robby + }, + [91] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, + .trainerName = _("REEC"), + .speechBefore = {EC_WORD_MY, EC_MOVE2(QUICK_ATTACK), EC_WORD_CAN, EC_WORD_BEAT, EC_WORD_A, EC_MOVE2(TELEPORT)}, + .speechWin = {EC_WORD_LIKE, EC_WORD_I, EC_WORD_SAID, EC_WORD_I_AM, EC_WORD_DARN, EC_WORD_FAST}, + .speechLose = {EC_WORD_I_WAS, EC_WORD_KIDDING, EC_WORD_ABOUT, EC_WORD_THAT, EC_MOVE2(TELEPORT), EC_WORD_THING}, + .monSets = gBattleFrontierTrainerMons_Reece + }, + [92] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, + .trainerName = _("KATHRY"), + .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_TRAIN, EC_WORD_GOOD, EC_WORD_ENOUGH, EC_WORD_QUES}, + .speechWin = {EC_WORD_DON_T, EC_MOVE2(TAUNT), EC_WORD_ME, EC_WORD_LIKE, EC_WORD_THAT, EC_WORD_OK_QUES}, + .speechLose = {EC_WORD_WHY, EC_WORD_COULDN_T, EC_WORD_I, EC_WORD_WIN, EC_WORD_THIS, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Kathryn + }, + [93] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, + .trainerName = _("ELLE"), + .speechBefore = {EC_WORD_CRUSH, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_AN, EC_WORD_EGG, EC_WORD_EXCL}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_A, EC_WORD_TASTY, EC_WORD_VICTORY, EC_WORD_FOR, EC_WORD_ME}, + .speechLose = {EC_WORD_TOO, EC_WORD_TOUGH, EC_WORD_TO, EC_WORD_CRUSH, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Ellen + }, + [94] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, + .trainerName = _("RAMO"), + .speechBefore = {EC_WORD_OKAY, EC_WORD_EXCL, -1, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PERFECTION}, + .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_THAT, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL}, + .speechLose = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_SECRET, EC_WORD_WHY, EC_WORD_I_AM, EC_WORD_HAPPY}, + .monSets = gBattleFrontierTrainerMons_Ramon + }, + [95] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, + .trainerName = _("ARTHU"), + .speechBefore = {EC_WORD_HERE_I_COME, EC_WORD_FEELING, EC_WORD_READY, EC_WORD_FOR, EC_WORD_IT, EC_WORD_ALL}, + .speechWin = {EC_WORD_THAT_S_IT_EXCL, -1, -1, EC_WORD_THAT_WAS, EC_WORD_FABULOUS, EC_WORD_EXCL}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_NOT, EC_WORD_WHAT, EC_WORD_I, EC_WORD_NEED, -1}, + .monSets = gBattleFrontierTrainerMons_Arthur + }, + [96] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, + .trainerName = _("ALONDR"), + .speechBefore = {EC_WORD_EVERY, EC_WORD_DAY, EC_WORD_IS, EC_WORD_A, EC_WORD_GREAT, EC_WORD_DAY}, + .speechWin = {EC_WORD_MY, EC_MOVE2(DIVE), EC_WORD_WILL, EC_WORD_BE, EC_WORD_A, EC_WORD_LEGEND}, + .speechLose = {EC_WORD_MY, EC_MOVE2(DIVE), EC_WORD_LEFT, EC_WORD_ME, EC_WORD_COLD, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Alondra + }, + [97] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, + .trainerName = _("ADRIAN"), + .speechBefore = {EC_WORD_COME, EC_WORD_SEE, EC_WORD_AN, EC_WORD_INCREDIBLE, EC_WORD_SWIFT_SWIM, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I, EC_WORD_MAKE, EC_WORD_IT, EC_WORD_LOOK, EC_WORD_SO, EC_WORD_EASY}, + .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_TIRED, -1}, + .monSets = gBattleFrontierTrainerMons_Adriana + }, + [98] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, + .trainerName = _("MALI"), + .speechBefore = {EC_WORD_OH, EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_PLEASE, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_WON, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_TIRED}, + .speechLose = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_LOST, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_TIRED}, + .monSets = gBattleFrontierTrainerMons_Malik + }, + [99] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, + .trainerName = _("JIL"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_WINS, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_GIVES, EC_WORD_UP, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Jill + }, + [100] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, + .trainerName = _("ERI"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_SPEED_BOOST, EC_WORD_HERO, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_FROM, EC_WORD_THE, EC_WORD_SPEED_BOOST, EC_WORD_HERO, EC_WORD_EXCL}, + .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL}, + .monSets = gBattleFrontierTrainerMons_Erik + }, + [101] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, + .trainerName = _("YAZMI"), + .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_RATHER, EC_WORD_RUN, EC_WORD_THAN, EC_WORD_BIKE}, + .speechWin = {EC_WORD_YES, EC_WORD_I, EC_WORD_WOULD, EC_WORD_MUCH, EC_WORD_RATHER, EC_WORD_RUN}, + .speechLose = {EC_WORD_BYE_BYE, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_RUN_AWAY}, + .monSets = gBattleFrontierTrainerMons_Yazmin + }, + [102] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, + .trainerName = _("JAMA"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_A, EC_WORD_FATHER}, + .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_FOR, EC_WORD_MY, EC_WORD_BABY}, + .speechLose = {EC_WORD_MY, EC_WORD_BABY, EC_WORD_WILL, EC_WORD_BE, EC_WORD_TOTALLY, EC_WORD_AWESOME}, + .monSets = gBattleFrontierTrainerMons_Jamal + }, + [103] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, + .trainerName = _("LESLI"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_A, EC_WORD_MOTHER}, + .speechWin = {EC_WORD_A, EC_WORD_BABY, EC_WORD_WILL, EC_WORD_BE, EC_WORD_A_LITTLE, EC_WORD_CHALLENGE}, + .speechLose = {EC_WORD_I_AM, EC_WORD_TOO, EC_WORD_HAPPY, EC_WORD_TO, EC_WORD_BE, EC_WORD_ANGRY}, + .monSets = gBattleFrontierTrainerMons_Leslie + }, + [104] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, + .trainerName = _("DAV"), + .speechBefore = {EC_WORD_WHAT, EC_WORD_SHOULD, EC_WORD_I, EC_WORD_DO, EC_WORD_TODAY, EC_WORD_QUES}, + .speechWin = {EC_WORD_I, EC_WORD_SHOULD, EC_WORD_ENJOY, EC_WORD_SOME, EC_WORD_SPORTS, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GO, EC_WORD_PLAY, EC_WORD_A, EC_WORD_GAME}, + .monSets = gBattleFrontierTrainerMons_Dave + }, + [105] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, + .trainerName = _("CARL"), + .speechBefore = {EC_WORD_HAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_YEAH, EC_WORD_EXCL_EXCL, -1}, + .speechWin = {EC_WORD_I, EC_WORD_DO, EC_WORD_THINGS, EC_WORD_AT, EC_MOVE(EXTREME_SPEED), EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_LOST, EC_WORD_AT, EC_MOVE(EXTREME_SPEED), EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Carlo + }, + [106] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, + .trainerName = _("EMILI"), + .speechBefore = {EC_WORD_ME, EC_WORD_WORRY, EC_WORD_QUES, EC_WORD_I, EC_WORD_HAVE, EC_WORD_NONE}, + .speechWin = {EC_WORD_AHAHA, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_THAT_WAS, EC_WORD_FANTASTIC, EC_WORD_EXCL}, + .speechLose = {EC_WORD_AHAHA, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_THAT_WAS, EC_WORD_ENTERTAINING, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Emilia + }, + [107] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, + .trainerName = _("DALI"), + .speechBefore = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_IS, EC_WORD_VERY, EC_WORD_EXPENSIVE, -1}, + .speechWin = {EC_WORD_DON_T, EC_WORD_COME, EC_WORD_NEAR, EC_WORD_MY, EC_WORD_BIKE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_IS, EC_WORD_MY, EC_WORD_BEST, EC_WORD_FRIEND}, + .monSets = gBattleFrontierTrainerMons_Dalia + }, + [108] = { + .facilityClass = FACILITY_CLASS_BLACK_BELT, + .trainerName = _("HITOM"), + .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_HAH, EC_WORD_EXCL_EXCL, -1}, + .speechWin = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, -1, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES_EXCL}, + .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, -1, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_EXCL_EXCL}, + .monSets = gBattleFrontierTrainerMons_Hitomi + }, + [109] = { + .facilityClass = FACILITY_CLASS_BLACK_BELT, + .trainerName = _("RICARD"), + .speechBefore = {EC_WORD_COME_ON, EC_WORD_EXCL, EC_WORD_PLAY, EC_WORD_TIME, EC_WORD_IS, EC_WORD_OVER}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_OUT, EC_WORD_OF, EC_WORD_HERE, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_HIT, EC_WORD_ME, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Ricardo + }, + [110] = { + .facilityClass = FACILITY_CLASS_BLACK_BELT, + .trainerName = _("SHIZUK"), + .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THAT, EC_WORD_YOU_RE, EC_WORD_SERIOUS, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_FORGET, EC_WORD_ABOUT, EC_WORD_YOU, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_PERFECT, EC_WORD_IN, EC_WORD_EVERY, EC_WORD_WAY, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Shizuka + }, + [111] = { + .facilityClass = FACILITY_CLASS_BATTLE_GIRL, + .trainerName = _("JOAN"), + .speechBefore = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_RIGHT, EC_WORD_AWAY}, + .speechWin = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_WINNER, EC_WORD_HEAR, EC_WORD_ME, EC_MOVE2(ROAR)}, + .speechLose = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_ACCEPT, EC_WORD_THAT, EC_MOVE(OUTRAGE)}, + .monSets = gBattleFrontierTrainerMons_Joana + }, + [112] = { + .facilityClass = FACILITY_CLASS_BATTLE_GIRL, + .trainerName = _("KELL"), + .speechBefore = {EC_WORD_MY, EC_WORD_NIGHT, EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_SCARY}, + .speechWin = {EC_WORD_A, EC_WORD_LADY, EC_WORD_GHOST, EC_WORD_APPEARS, EC_WORD_THERE, -1}, + .speechLose = {EC_WORD_THE, EC_WORD_HOME, EC_WORD_WORK, EC_WORD_IS, EC_WORD_AWFULLY, EC_WORD_SCARY}, + .monSets = gBattleFrontierTrainerMons_Kelly + }, + [113] = { + .facilityClass = FACILITY_CLASS_BATTLE_GIRL, + .trainerName = _("RAYN"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_WHEN, EC_WORD_IT_S, EC_WORD_ABOUT, EC_WORD_POWER}, + .speechWin = {EC_WORD_UNDERSTAND, EC_WORD_MY, EC_WORD_POWER, EC_WORD_NOW, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS, -1, EC_WORD_I_AM, EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Rayna + }, + [114] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("EVA"), + .speechBefore = {EC_WORD_EVERY, EC_WORD_BATTLE, EC_WORD_HAS, EC_WORD_A, EC_WORD_SMELL, -1}, + .speechWin = {EC_WORD_OH, EC_WORD_EXCL, EC_WORD_THE, EC_MOVE(SWEET_SCENT), EC_WORD_OF, EC_WORD_VICTORY}, + .speechLose = {EC_WORD_THE, EC_WORD_AWFUL, EC_WORD_STENCH, EC_WORD_OF, EC_WORD_A, EC_WORD_LOSS}, + .monSets = gBattleFrontierTrainerMons_Evan + }, + [115] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("JORDA"), + .speechBefore = {EC_WORD_GOOD, EC_WORD_EXCL, -1, EC_WORD_COME_ON, EC_WORD_EXCL_EXCL, -1}, + .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, -1, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Jordan + }, + [116] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("JOE"), + .speechBefore = {EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, -1, -1, -1, -1}, + .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, -1, -1, -1, -1}, + .speechLose = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, -1, -1, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Joel + }, + [117] = { + .facilityClass = FACILITY_CLASS_EXPERT_F, + .trainerName = _("KRISTE"), + .speechBefore = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, -1, EC_WORD_A, EC_WORD_KID, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_JUST, EC_WORD_A_LITTLE, EC_WORD_KID, EC_WORD_AFTER, EC_WORD_ALL, EC_WORD_EXCL}, + .speechLose = {EC_WORD_A, EC_WORD_TOUGH, EC_WORD_KID, EC_WORD_HUH_QUES, EC_WORD_HUMPH, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Kristen + }, + [118] = { + .facilityClass = FACILITY_CLASS_EXPERT_F, + .trainerName = _("SELPH"), + .speechBefore = {EC_WORD_HUH_QUES, EC_WORD_WHAT, EC_WORD_IS_IT_QUES, -1, -1, -1}, + .speechWin = {EC_WORD_OH, EC_WORD_YES, EC_WORD_EXCL, EC_WORD_WHY, EC_WORD_NOT, EC_WORD_QUES}, + .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_EXCL, EC_WORD_WHY, EC_WORD_NOT, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Selphy + }, + [119] = { + .facilityClass = FACILITY_CLASS_EXPERT_F, + .trainerName = _("CHLO"), + .speechBefore = {EC_WORD_COME, EC_WORD_WE, EC_WORD_WILL, EC_WORD_DO, EC_WORD_BATTLE, EC_WORD_NOW}, + .speechWin = {EC_WORD_MORE, EC_WORD_EXCL, -1, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_OH, EC_WORD_EXCL, -1, EC_WORD_STRONG, EC_WORD_YOU, EC_WORD_ARE}, + .monSets = gBattleFrontierTrainerMons_Chloe + }, + [120] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_M, + .trainerName = _("NORTO"), + .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_ONLY, EC_WORD_YOU, -1, -1}, + .speechWin = {EC_WORD_EXCUSE_ME, EC_WORD_BUT, EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_PUSHOVER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_SOME, EC_WORD_KIND, EC_WORD_OF, EC_WORD_AWESOME, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Norton + }, + [121] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_M, + .trainerName = _("LUKA"), + .speechBefore = {EC_WORD_MY, EC_WORD_JOKING, EC_WORD_IS, EC_WORD_PRETTY, EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_YOUR, EC_WORD_ROCK_HEAD, EC_WORD_EXISTS, EC_WORD_TO, EC_WORD_SHINE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOUR, EC_WORD_ROCK_HEAD, EC_WORD_COME, EC_WORD_TO, EC_WORD_SHINE, -1}, + .monSets = gBattleFrontierTrainerMons_Lukas + }, + [122] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_M, + .trainerName = _("ZAC"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_EXCELLENT, EC_MOVE2(MIMIC), EC_WORD_OF, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_LIKE, EC_WORD_A_LITTLE, EC_POKEMON2(TOGEPI), EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_ANGRY, EC_WORD_LIKE, EC_WORD_A, EC_POKEMON2(MANKEY), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Zach + }, + [123] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_F, + .trainerName = _("KAITLY"), + .speechBefore = {EC_WORD_I, EC_WORD_CRUSH, EC_WORD_THINGS, EC_WORD_WITH, EC_WORD_PSYCHIC, EC_WORD_POWER}, + .speechWin = {EC_WORD_MY, EC_WORD_VICTORY, EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_THE, EC_WORD_NEWS}, + .speechLose = {EC_WORD_NO, EC_WORD_NO, EC_WORD_ELLIPSIS, EC_WORD_THIS, EC_WORD_WON_T, EC_WORD_DO}, + .monSets = gBattleFrontierTrainerMons_Kaitlyn + }, + [124] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_F, + .trainerName = _("BREANN"), + .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_WILL, EC_WORD_CRUSH, EC_WORD_YOU, EC_WORD_EXCL}, + .speechWin = {EC_WORD_HAVE, EC_WORD_SOME, EC_WORD_MORE, EC_WORD_OF, EC_WORD_THIS, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GUTS, EC_WORD_AND, EC_WORD_SKILL, -1}, + .monSets = gBattleFrontierTrainerMons_Breanna + }, + [125] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_F, + .trainerName = _("KENDR"), + .speechBefore = {EC_WORD_IF, EC_WORD_YOU_RE, EC_WORD_SMART, EC_WORD_STOP, EC_WORD_RIGHT, EC_WORD_NOW}, + .speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_THAT, EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_STOP}, + .speechLose = {EC_WORD_WHY, EC_WORD_DIDN_T, EC_WORD_YOU, EC_WORD_STOP, EC_WORD_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Kendra + }, + [126] = { + .facilityClass = FACILITY_CLASS_HEX_MANIAC, + .trainerName = _("MOLL"), + .speechBefore = {EC_WORD_WILL, EC_WORD_MY, EC_WORD_CUTE_CHARM, EC_MOVE2(ATTRACT), EC_WORD_YOU, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_MY, EC_WORD_TOYS, EC_WORD_NOW}, + .speechLose = {EC_WORD_OH, EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Molly + }, + [127] = { + .facilityClass = FACILITY_CLASS_HEX_MANIAC, + .trainerName = _("JAZMI"), + .speechBefore = {EC_WORD_I, EC_WORD_FORECAST, EC_WORD_TERRIBLE, EC_WORD_THINGS, EC_WORD_FOR, EC_WORD_YOU}, + .speechWin = {EC_WORD_THERE, EC_WORD_WASN_T, EC_WORD_MY, EC_WORD_FORECAST, EC_WORD_RIGHT, EC_WORD_QUES}, + .speechLose = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_DIDN_T, EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THIS}, + .monSets = gBattleFrontierTrainerMons_Jazmin + }, + [128] = { + .facilityClass = FACILITY_CLASS_HEX_MANIAC, + .trainerName = _("KELSE"), + .speechBefore = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_SLEPT, EC_WORD_IN, EC_WORD_DAYS, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_MY, EC_WORD_SLEEP, EC_WORD_WILL, EC_WORD_BE, EC_WORD_EXCELLENT, EC_WORD_NOW}, + .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_DESTROYED, EC_WORD_MY, EC_WORD_SLEEP, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Kelsey + }, + [129] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("JALE"), + .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_ALLOW, EC_WORD_POKEMON, EC_WORD_TO, EC_MOVE(THRASH)}, + .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_ANGRY, EC_WORD_QUES}, + .speechLose = {EC_WORD_WHY, EC_WORD_IS, EC_WORD_THIS, EC_WORD_SO, EC_WORD_HARD, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Jalen + }, + [130] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("GRIFFE"), + .speechBefore = {EC_WORD_I, EC_MOVE2(SWALLOW), EC_MOVE2(SLUDGE), EC_WORD_TO, EC_MOVE2(TRANSFORM), EC_WORD_MYSELF}, + .speechWin = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GROWTH), EC_WORD_OF, EC_MOVE2(ACID_ARMOR)}, + .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GROWTH), EC_WORD_OF, EC_WORD_SUCTION_CUPS}, + .monSets = gBattleFrontierTrainerMons_Griffen + }, + [131] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("XANDE"), + .speechBefore = {EC_WORD_I, EC_WORD_GOT, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ON, EC_WORD_RENTAL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_INCREDIBLE, EC_WORD_MY, EC_WORD_RENTAL, EC_WORD_POKEMON, EC_WORD_WON}, + .speechLose = {EC_WORD_RENTAL, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_UP, EC_WORD_TO, EC_MOVE2(SCRATCH)}, + .monSets = gBattleFrontierTrainerMons_Xander + }, + [132] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("MARVI"), + .speechBefore = {EC_WORD_YOU_RE, EC_WORD_UP, EC_WORD_TO, EC_WORD_THE, EC_WORD_CHALLENGE, EC_WORD_QUES}, + .speechWin = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_THINK, EC_WORD_YOU_RE, EC_WORD_GOOD, EC_WORD_ENOUGH}, + .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_PERFECT, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, + .monSets = gBattleFrontierTrainerMons_Marvin + }, + [133] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("BRENNA"), + .speechBefore = {EC_WORD_I, EC_MOVE2(WISH), EC_WORD_TO, EC_WORD_SEE, EC_WORD_THE, EC_WORD_NEWS}, + .speechWin = {EC_WORD_COMICS, EC_WORD_GET, EC_WORD_DAMP, EC_WORD_FROM, EC_WORD_DRIZZLE, EC_WORD_QUES}, + .speechLose = {EC_WORD_THE, EC_WORD_TIGHT, EC_WORD_MONEY, EC_WORD_LIVING, EC_WORD_CHANNEL, EC_WORD_QUES_EXCL}, + .monSets = gBattleFrontierTrainerMons_Brennan + }, + [134] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("BALE"), + .speechBefore = {EC_MOVE(SCREECH), EC_WORD_IS, EC_WORD_LIKE, EC_WORD_MUSIC, EC_WORD_TO_ME, EC_WORD_EXCL}, + .speechWin = {EC_WORD_MY, EC_MOVE(SCREECH), EC_WORD_STRATEGY, EC_WORD_IS, EC_WORD_THE, EC_WORD_BEST}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_SOUNDPROOF, EC_WORD_QUES, -1, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Baley + }, + [135] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("ZACKAR"), + .speechBefore = {EC_WORD_CAN, EC_WORD_YOU, EC_MOVE(DIG), EC_WORD_IT, EC_WORD_YO, EC_WORD_QUES}, + .speechWin = {EC_MOVE2(TAKE_DOWN), EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(DIVE), EC_WORD_YO, EC_WORD_YO}, + .speechLose = {EC_WORD_BREAK, EC_WORD_DOWN, EC_MOVE2(DIVE), EC_WORD_TIME, EC_WORD_FOR, EC_WORD_ME}, + .monSets = gBattleFrontierTrainerMons_Zackary + }, + [136] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("GABRIE"), + .speechBefore = {EC_MOVE2(POUND), EC_WORD_THE, EC_WORD_THICK_FAT, EC_WORD_ON, EC_WORD_MY, EC_MOVE2(BELLY_DRUM)}, + .speechWin = {EC_MOVE2(POUND), EC_WORD_MY, EC_MOVE2(BELLY_DRUM), EC_MOVE2(POUND), EC_WORD_MY, EC_MOVE2(BELLY_DRUM)}, + .speechLose = {EC_WORD_MY, EC_MOVE2(BELLY_DRUM), EC_WORD_WAS, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Gabriel + }, + [137] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("EMIL"), + .speechBefore = {EC_WORD_HOW, EC_WORD_ABOUT, EC_WORD_A_TINY_BIT, EC_WORD_OF, EC_MOVE(HYPNOSIS), EC_WORD_QUES}, + .speechWin = {EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_STRATEGY, EC_WORD_WORKS, EC_WORD_TO, EC_WORD_PERFECTION}, + .speechLose = {EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_STRATEGY, EC_WORD_WENT, EC_WORD_BADLY, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Emily + }, + [138] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("JORDY"), + .speechBefore = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_MY, EC_WORD_SECRET, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_AS, EC_WORD_I, EC_WORD_APPEAR, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_BUT, EC_WORD_HOW, EC_WORD_DID, EC_WORD_YOU, EC_WORD_KNOW, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Jordyn + }, + [139] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("SOFI"), + .speechBefore = {EC_POKEMON(LOUDRED), EC_WORD_PROBABLY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), -1}, + .speechWin = {EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_FEELING, EC_WORD_THAT, EC_WORD_I, EC_WORD_GET}, + .speechLose = {EC_WORD_I, EC_WORD_WORK, EC_WORD_AT, EC_WORD_THE, EC_WORD_DEPT_STORE, -1}, + .monSets = gBattleFrontierTrainerMons_Sofia + }, + [140] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("BRADE"), + .speechBefore = {EC_WORD_I_CHOOSE_YOU, EC_WORD_EXCL, -1, EC_WORD_THIS_IS_IT_EXCL, -1, -1}, + .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_PRETTY, EC_WORD_AWESOME, EC_WORD_ABOUT, EC_WORD_MYSELF}, + .speechLose = {EC_WORD_ALL_RIGHT, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Braden + }, + [141] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("KAYDE"), + .speechBefore = {EC_WORD_THEY, EC_WORD_OVERDO, EC_WORD_THAT, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_THAT, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_ISN_T, EC_WORD_FOR, EC_WORD_ME}, + .speechLose = {EC_WORD_HEY, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PRETTY, EC_WORD_TASTY, -1}, + .monSets = gBattleFrontierTrainerMons_Kayden + }, + [142] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("COOPE"), + .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_ABSOLUTELY, EC_WORD_BE, EC_WORD_A, EC_WORD_PUSHOVER}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_TOO, EC_WORD_EXCITING, EC_WORD_FOR, EC_WORD_ME, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_EXCL, -1, EC_WORD_SORRY, EC_WORD_I_AM, EC_WORD_SORRY}, + .monSets = gBattleFrontierTrainerMons_Cooper + }, + [143] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("JULI"), + .speechBefore = {EC_WORD_SPIRIT, EC_WORD_ALONE, EC_WORD_WON_T, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_WIN}, + .speechWin = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_ACCEPT, EC_WORD_THIS, EC_WORD_WITH, EC_WORD_SERENE_GRACE}, + .speechLose = {EC_WORD_FOR_NOW, EC_WORD_GOOD_BYE, EC_WORD_BUT, EC_WORD_IT_S, EC_WORD_NOT, EC_WORD_OVER}, + .monSets = gBattleFrontierTrainerMons_Julia + }, + [144] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("AMAR"), + .speechBefore = {EC_WORD_WROOOAAR_EXCL, EC_WORD_EXCL_EXCL, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_READY, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_WORD_I, EC_WORD_LOSE, EC_WORD_MYSELF, EC_WORD_IF, EC_WORD_IT_S, EC_WORD_EXCITING}, + .speechLose = {EC_WORD_THAT_S, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_MOVE2(TACKLE), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Amara + }, + [145] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("LYN"), + .speechBefore = {EC_WORD_YOUR, EC_WORD_SECRET, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_HIDDEN, EC_WORD_FOREVER}, + .speechWin = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_YOUR, EC_WORD_SECRET, EC_WORD_NOW, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_MOVE(SAFEGUARD), EC_WORD_YOUR, EC_WORD_OWN, EC_WORD_SECRET}, + .monSets = gBattleFrontierTrainerMons_Lynn + }, + [146] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, + .trainerName = _("JOVA"), + .speechBefore = {EC_WORD_YOUR, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_SADLY, EC_WORD_LACKING}, + .speechWin = {EC_WORD_MY, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_COOL, EC_WORD_ISN_T_IT_QUES}, + .speechLose = {EC_WORD_I_WAS, EC_WORD_MINUS, EC_WORD_MY, EC_WORD_NORMAL, EC_WORD_POWER, EC_WORD_TODAY}, + .monSets = gBattleFrontierTrainerMons_Jovan + }, + [147] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, + .trainerName = _("DOMINI"), + .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_THIS, EC_WORD_EXCELLENT, EC_WORD_CAMERA, -1}, + .speechWin = {EC_WORD_MY, EC_WORD_CAMERA, EC_WORD_WAS, EC_WORD_AWFULLY, EC_WORD_EXPENSIVE, -1}, + .speechLose = {EC_WORD_MY, EC_WORD_CAMERA, EC_WORD_DOESN_T, EC_WORD_MISS, EC_WORD_A, EC_WORD_THING}, + .monSets = gBattleFrontierTrainerMons_Dominic + }, + [148] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, + .trainerName = _("NIKOLA"), + .speechBefore = {EC_WORD_I, EC_MOVE2(MIMIC), EC_WORD_POKEMON, EC_WORD_AFTER, EC_WORD_EVERY, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_IF_I_WIN, EC_WORD_I, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_A, EC_POKEMON2(TAUROS)}, + .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_A, EC_POKEMON2(MILTANK)}, + .monSets = gBattleFrontierTrainerMons_Nikolas + }, + [149] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, + .trainerName = _("VALERI"), + .speechBefore = {EC_WORD_I, EC_MOVE2(WISH), EC_WORD_YOU, EC_WORD_WOULD, EC_WORD_NOT, EC_MOVE2(GLARE)}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_MEAN, EC_WORD_EXCL, EC_WORD_I, EC_WORD_MEAN, EC_WORD_REALLY}, + .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_A, EC_WORD_REALLY, EC_MOVE(SCARY_FACE), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Valeria + }, + [150] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, + .trainerName = _("DELANE"), + .speechBefore = {EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_OVER, EC_WORD_TIME, EC_WORD_TO, EC_WORD_PLAY}, + .speechWin = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_IS, EC_WORD_FROM, EC_WORD_SCHOOL}, + .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_WORK, EC_WORD_NEXT, EC_WORD_WEEK}, + .monSets = gBattleFrontierTrainerMons_Delaney + }, + [151] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, + .trainerName = _("MEGHA"), + .speechBefore = {EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_OUT, EC_WORD_TIME, EC_WORD_TO, EC_WORD_PLAY}, + .speechWin = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_LIKES, EC_WORD_COMICS, -1}, + .speechLose = {EC_WORD_IT_S, EC_WORD_BACK, EC_WORD_TO, EC_WORD_SCHOOL, EC_WORD_SOON, -1}, + .monSets = gBattleFrontierTrainerMons_Meghan + }, + [152] = { + .facilityClass = FACILITY_CLASS_DRAGON_TAMER, + .trainerName = _("ROBERT"), + .speechBefore = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_INVINCIBLE, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_YOU, EC_WORD_WEREN_T, EC_WORD_BAD, EC_WORD_I_WAS, EC_WORD_JUST, EC_WORD_BETTER}, + .speechLose = {EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_SATISFIED, EC_WORD_YET, EC_WORD_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Roberto + }, + [153] = { + .facilityClass = FACILITY_CLASS_DRAGON_TAMER, + .trainerName = _("DAMIA"), + .speechBefore = {EC_WORD_MY, EC_WORD_PURE_POWER, EC_WORD_IS, EC_WORD_MACHINE, EC_WORD_LIKE, EC_WORD_EXCL}, + .speechWin = {EC_WORD_MY, EC_MOVE2(MACH_PUNCH), EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_A, EC_MOVE(BRICK_BREAK)}, + .speechLose = {EC_WORD_ARRGH, EC_WORD_EXCL, -1, EC_WORD_NO, EC_WORD_EXCL_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Damian + }, + [154] = { + .facilityClass = FACILITY_CLASS_DRAGON_TAMER, + .trainerName = _("BROD"), + .speechBefore = {EC_WORD_MY, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_SEEMS, EC_POKEMON(ODDISH), EC_WORD_QUES}, + .speechWin = {EC_WORD_IT_S, EC_WORD_MY, EC_WORD_FAMILY, EC_WORD_STAY_AT_HOME, EC_WORD_LOOK, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_QUESTION, EC_WORD_YOUR, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_SERIOUSLY}, + .monSets = gBattleFrontierTrainerMons_Brody + }, + [155] = { + .facilityClass = FACILITY_CLASS_DRAGON_TAMER, + .trainerName = _("GRAHA"), + .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL, -1, EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, -1}, + .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_WAHAHAHA, EC_WORD_EXCL, EC_WORD_WAHAHAHA, EC_WORD_WAHAHAHA, EC_WORD_EXCL_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_MY, EC_WORD_BAD}, + .monSets = gBattleFrontierTrainerMons_Graham + }, + [156] = { + .facilityClass = FACILITY_CLASS_POKEFAN_M, + .trainerName = _("TYLO"), + .speechBefore = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_FEELING, EC_WORD_MY, EC_MOVE2(HEAT_WAVE), EC_WORD_QUES}, + .speechWin = {EC_WORD_YES, EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_BUT, EC_WORD_I_WAS, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_FOR, EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Tylor + }, + [157] = { + .facilityClass = FACILITY_CLASS_POKEFAN_F, + .trainerName = _("JARE"), + .speechBefore = {EC_WORD_FIGHTING, EC_WORD_SPIRIT, EC_WORD_QUES, EC_WORD_ME, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MORE, EC_WORD_CUTE, EC_WORD_POKEMON, -1}, + .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_LOOK, EC_WORD_QUITE, EC_WORD_CUTE, -1}, + .monSets = gBattleFrontierTrainerMons_Jaren + }, + [158] = { + .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, + .trainerName = _("CORDEL"), + .speechBefore = {EC_WORD_A, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_DECIDED, EC_WORD_ON, EC_WORD_SPIRIT}, + .speechWin = {EC_WORD_CAN_T, EC_WORD_YOU, EC_WORD_ACCEPT, EC_WORD_THAT, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_BE, EC_WORD_ON, EC_WORD_MY, EC_WORD_WAY}, + .monSets = gBattleFrontierTrainerMons_Cordell + }, + [159] = { + .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, + .trainerName = _("JAZLY"), + .speechBefore = {EC_WORD_IS, EC_WORD_YOUR, EC_WORD_POKEDEX, EC_WORD_REALLY, EC_WORD_AWESOME, EC_WORD_QUES}, + .speechWin = {EC_WORD_OH_YEAH, EC_WORD_WOW, EC_WORD_YOUR, EC_WORD_POKEDEX, EC_WORD_IS, EC_WORD_SUPER}, + .speechLose = {EC_WORD_AN, EC_WORD_AVANT_GARDE, EC_WORD_POKEDEX, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_AWESOME}, + .monSets = gBattleFrontierTrainerMons_Jazlyn + }, + [160] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("ZACHER"), + .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_MY, EC_WORD_OWN, EC_WORD_PLACE, EC_WORD_YEEHAW_EXCL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_AN, EC_WORD_EXCITING, EC_WORD_TIME, EC_WORD_FOR, EC_WORD_ME}, + .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_FLATTEN, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Zachery + }, + [161] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("JOHA"), + .speechBefore = {EC_WORD_WINTER, EC_WORD_WILL, EC_WORD_SOON, EC_WORD_BE, EC_WORD_HERE, -1}, + .speechWin = {EC_WORD_MY, EC_WORD_ALLOWANCE, EC_WORD_COULD, EC_WORD_USE, EC_WORD_A, EC_MOVE2(HELPING_HAND)}, + .speechLose = {EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_USE, EC_WORD_MY, EC_WORD_ALLOWANCE, EC_WORD_UP}, + .monSets = gBattleFrontierTrainerMons_Johan + }, + [162] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("SHE"), + .speechBefore = {EC_WORD_DO, EC_WORD_YOU, EC_WORD_BATTLE, EC_WORD_WITH, EC_WORD_BEAUTY, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOU, EC_WORD_BATTLE, EC_WORD_IN, EC_WORD_AN, EC_WORD_UGLY, EC_WORD_WAY}, + .speechLose = {EC_WORD_WHAT, EC_WORD_IS, EC_WORD_BEAUTY, EC_WORD_TO, EC_WORD_YOU, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Shea + }, + [163] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("KAIL"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_THIRSTY, EC_WORD_RIGHT, EC_WORD_NOW, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_I, EC_WORD_COULD, EC_WORD_USE, EC_WORD_A, EC_WORD_COLD, EC_WORD_DRINK}, + .speechLose = {EC_WORD_THAT, EC_WORD_LOSS, EC_WORD_IS, EC_WORD_HARD, EC_WORD_TO, EC_MOVE2(SWALLOW)}, + .monSets = gBattleFrontierTrainerMons_Kaila + }, + [164] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, + .trainerName = _("ISIA"), + .speechBefore = {EC_WORD_I, EC_WORD_PRETEND, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_A_LOT, -1}, + .speechWin = {EC_WORD_I, EC_MOVE2(TRICK), EC_WORD_MOTHER, EC_WORD_FOR, EC_WORD_MY, EC_WORD_ALLOWANCE}, + .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_WANT, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE}, + .monSets = gBattleFrontierTrainerMons_Isiah + }, + [165] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, + .trainerName = _("GARRET"), + .speechBefore = {EC_WORD_I, EC_WORD_ENJOY, EC_WORD_COMICS, EC_WORD_AND, EC_WORD_THIS, EC_WORD_GAME}, + .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_MUSIC, EC_WORD_IDOL, EC_WORD_TOO}, + .speechLose = {EC_WORD_BUT, EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE}, + .monSets = gBattleFrontierTrainerMons_Garrett + }, + [166] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("HAYLI"), + .speechBefore = {EC_WORD_I, EC_WORD_WORRY, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_SLEEP}, + .speechWin = {EC_WORD_A, EC_WORD_WIN, EC_WORD_GIVES, EC_WORD_ME, EC_WORD_A, EC_MOVE2(CALM_MIND)}, + .speechLose = {EC_WORD_MY, EC_WORD_INSOMNIA, EC_WORD_WILL, EC_WORD_GET, EC_WORD_BAD, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Haylie + }, + [167] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("MEGA"), + .speechBefore = {EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_AN, EC_MOVE(AROMATHERAPY), EC_WORD_BATH}, + .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_HEALTHY, EC_WORD_CLEAR_BODY, -1}, + .speechLose = {EC_WORD_IF, EC_WORD_ONLY, EC_MOVE(AROMATHERAPY), EC_WORD_WERE, EC_WORD_LESS, EC_WORD_EXPENSIVE}, + .monSets = gBattleFrontierTrainerMons_Megan + }, + [168] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("ISSA"), + .speechBefore = {EC_WORD_MY, EC_WORD_HOBBY, EC_WORD_QUES, -1, -1, -1}, + .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_ANY, EC_WORD_KIND, EC_WORD_OF, EC_MOVE2(WATER_SPORT)}, + .speechLose = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_ANY, EC_WORD_KIND, EC_WORD_OF, EC_MOVE2(MUD_SPORT)}, + .monSets = gBattleFrontierTrainerMons_Issac + }, + [169] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("QUINTO"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_SAD, EC_WORD_CAUSE, EC_WORD_I_AM, EC_WORD_TOO_WEAK, -1}, + .speechWin = {EC_WORD_YOU, EC_WORD_AREN_T, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, -1}, + .speechLose = {EC_WORD_HEY, EC_WORD_WHAT, EC_WORD_DID, EC_WORD_I, EC_WORD_DO, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Quinton + }, + [170] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("SALM"), + .speechBefore = {EC_WORD_YOU_VE, EC_WORD_GOT, EC_WORD_YOUR, EC_WORD_HUSTLE, EC_WORD_ON, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I, EC_WORD_WIN, EC_WORD_YOU, EC_WORD_HUSTLE, EC_WORD_ON, EC_WORD_OUT}, + .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_GET, EC_WORD_HOW, EC_WORD_I, EC_WORD_LOST}, + .monSets = gBattleFrontierTrainerMons_Salma + }, + [171] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("ANSLE"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_BORED, EC_WORD_ELLIPSIS, EC_WORD_DANCE, EC_WORD_FOR, EC_WORD_ME}, + .speechWin = {EC_WORD_YOU_VE, EC_WORD_BORED, EC_WORD_ME, EC_WORD_SOME, EC_WORD_MORE, -1}, + .speechLose = {EC_WORD_TAKE, EC_WORD_YOUR, EC_MOVE2(FRUSTRATION), EC_WORD_SOME, EC_WORD_OTHER, EC_WORD_PLACE}, + .monSets = gBattleFrontierTrainerMons_Ansley + }, + [172] = { + .facilityClass = FACILITY_CLASS_BUG_CATCHER, + .trainerName = _("HOLDE"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_COMMEMORATE, EC_WORD_MY, EC_WORD_COOLNESS, EC_WORD_IN, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_FOR, EC_WORD_ANY, EC_WORD_PRAISE, -1}, + .speechLose = {EC_WORD_YOUR, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_AMUSING, -1}, + .monSets = gBattleFrontierTrainerMons_Holden + }, + [173] = { + .facilityClass = FACILITY_CLASS_BUG_CATCHER, + .trainerName = _("LUC"), + .speechBefore = {EC_WORD_WE, EC_WORD_WILL, EC_WORD_HAVE, EC_WORD_A, EC_WORD_COOL, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_IN, EC_WORD_A, EC_WORD_COOL, EC_WORD_WAY}, + .speechLose = {EC_WORD_HELLO, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_JUST, EC_WORD_A, EC_WORD_KID}, + .monSets = gBattleFrontierTrainerMons_Luca + }, + [174] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("JAMISO"), + .speechBefore = {EC_WORD_MY, EC_MOVE2(SECRET_POWER), EC_WORD_IS, EC_WORD_OVERWHELMING, EC_WORD_TO, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_USE, EC_MOVE(SMOKESCREEN), EC_WORD_TO, EC_WORD_ESCAPE}, + .monSets = gBattleFrontierTrainerMons_Jamison + }, + [175] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("GUNNA"), + .speechBefore = {EC_WORD_I, EC_MOVE(CUT), EC_WORD_DOWN, EC_WORD_EVERY, EC_WORD_OPPONENT, -1}, + .speechWin = {EC_WORD_DON_T, EC_MOVE(GRUDGE), EC_WORD_ME, EC_WORD_FOR, EC_WORD_YOUR, EC_WORD_LOSS}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_LOSE, EC_WORD_THAT, EC_MOVE(SCARY_FACE), EC_WORD_OF, EC_WORD_YOURS}, + .monSets = gBattleFrontierTrainerMons_Gunnar + }, + [176] = { + .facilityClass = FACILITY_CLASS_TUBER_M, + .trainerName = _("CRAI"), + .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_FOR, EC_WORD_MY, EC_WORD_TRAIN}, + .speechWin = {EC_WORD_MY, EC_WORD_TRAIN, EC_WORD_ISN_T, EC_WORD_HERE, EC_WORD_YET, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_HERE_IT_IS, EC_WORD_MY, EC_WORD_TRAIN, EC_WORD_SEE_YA, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Craig + }, + [177] = { + .facilityClass = FACILITY_CLASS_TUBER_M, + .trainerName = _("PIERC"), + .speechBefore = {EC_WORD_THERE, EC_WORD_WAS, EC_WORD_A, EC_MOVE2(HEAT_WAVE), EC_WORD_LAST, EC_WORD_WEEK}, + .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(HEAT_WAVE), -1}, + .speechLose = {EC_WORD_DIDN_T, EC_WORD_IT, EC_MOVE(HAIL), EC_WORD_TOO, EC_WORD_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Pierce + }, + [178] = { + .facilityClass = FACILITY_CLASS_TUBER_F, + .trainerName = _("REGIN"), + .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_PLAY, EC_WORD_IN, EC_WORD_WATER}, + .speechWin = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_COME, EC_WORD_OUT, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_MUCH, EC_WORD_GOOD, EC_WORD_IN, EC_WORD_WATER}, + .monSets = gBattleFrontierTrainerMons_Regina + }, + [179] = { + .facilityClass = FACILITY_CLASS_TUBER_F, + .trainerName = _("ALISO"), + .speechBefore = {EC_WORD_THIS, EC_WORD_KINDERGARTEN, EC_WORD_MAGAZINE, EC_WORD_IS, EC_WORD_TOO, EC_WORD_MUCH}, + .speechWin = {EC_WORD_HOW, EC_WORD_TO, EC_WORD_BUG, EC_WORD_YOUR, EC_WORD_TEACHER, EC_WORD_QUES}, + .speechLose = {EC_WORD_ENJOY, EC_WORD_A, EC_WORD_TASTY, EC_WORD_SCHOOL, EC_WORD_DIET, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Alison + }, + [180] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("HAN"), + .speechBefore = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_A, EC_WORD_BUG, EC_WORD_EVENT, EC_WORD_SOON}, + .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_BUG, EC_WORD_FASHION, EC_WORD_SHOW, EC_WORD_EXCL}, + .speechLose = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Hank + }, + [181] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("EAR"), + .speechBefore = {EC_WORD_THE, EC_WORD_INVINCIBLE, EC_WORD_BUG, EC_WORD_TRAINER, EC_WORD_IS, EC_WORD_HERE}, + .speechWin = {EC_WORD_THE, EC_WORD_INVINCIBLE, EC_WORD_BUG, EC_WORD_TRAINER, EC_WORD_AM, EC_WORD_I}, + .speechLose = {EC_WORD_SEE, EC_WORD_HOW, EC_WORD_FAST, EC_WORD_I, EC_WORD_RUN_AWAY, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Earl + }, + [182] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("RAMIR"), + .speechBefore = {EC_WORD_I, EC_WORD_WENT, EC_WORD_TO, EC_WORD_A, EC_WORD_FISHING, EC_WORD_SCHOOL}, + .speechWin = {EC_WORD_SERIOUSLY, EC_WORD_I_AM, EC_WORD_IN, EC_WORD_THE, EC_WORD_FISHING, EC_WORD_HALL_OF_FAME}, + .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_BACK, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Ramiro + }, + [183] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("HUNTE"), + .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_A, EC_WORD_TOTALLY, EC_WORD_COOL, EC_MOVE(CROSS_CHOP)}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_DO, EC_WORD_A, EC_MOVE(CROSS_CHOP)}, + .speechLose = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_A, EC_WORD_MISTAKE, EC_WORD_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Hunter + }, + [184] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("AIDE"), + .speechBefore = {EC_WORD_MY, EC_WORD_WORK, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_ME, EC_WORD_HEALTHY}, + .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_HEALTHY, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_HEALTHY, EC_WORD_THAN, EC_WORD_I_AM, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Aiden + }, + [185] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("XAVIE"), + .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_EXCL, -1, EC_WORD_LOOK, EC_WORD_LOOK, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_WORD_GOOD_BYE, EC_WORD_AND, EC_WORD_THANK_YOU, EC_WORD_THAT_WAS, EC_WORD_FUNNY, -1}, + .speechLose = {EC_WORD_WOWEE, EC_WORD_EXCL, -1, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL}, + .monSets = gBattleFrontierTrainerMons_Xavier + }, + [186] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("CLINTO"), + .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_QUES}, + .speechWin = {EC_WORD_YOUR, EC_MOVE2(FURY_SWIPES), EC_WORD_YOUR, EC_MOVE(STRENGTH), EC_WORD_YOUNG, EC_WORD_TRAINER}, + .speechLose = {EC_WORD_TCH, EC_WORD_ELLIPSIS, -1, EC_WORD_I_AM, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Clinton + }, + [187] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("JESS"), + .speechBefore = {EC_WORD_THIS, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_FOR, EC_WORD_MY, EC_WORD_MOTHER}, + .speechWin = {EC_WORD_MOTHER, EC_WORD_WILL, EC_WORD_BE, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_ME}, + .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MY, EC_WORD_MOTHER, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Jesse + }, + [188] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("EDUARD"), + .speechBefore = {EC_WORD_OUR, EC_WORD_MUSIC, EC_WORD_WILL, EC_WORD_PLAY, EC_WORD_ALL, EC_WORD_NIGHT}, + .speechWin = {EC_WORD_NIGHTTIME, EC_WORD_IS, EC_WORD_WHEN, EC_WORD_I, EC_WORD_PLAY, EC_WORD_BEST}, + .speechLose = {EC_WORD_LET_S, EC_WORD_PARTY, EC_WORD_UNTIL, EC_WORD_THE, EC_MOVE(MORNING_SUN), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Eduardo + }, + [189] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("HA"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_TRENDY, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_HIP_AND, EC_WORD_HAPPENING, EC_WORD_OH_YEAH, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_ALWAYS, EC_WORD_TRENDY, EC_WORD_THANK_YOU, EC_WORD_VERY, EC_WORD_MUCH}, + .monSets = gBattleFrontierTrainerMons_Hal + }, + [190] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("GAG"), + .speechBefore = {EC_WORD_HERE_IT_IS, EC_WORD_A, EC_WORD_FLYING, EC_WORD_TYPE, EC_WORD_HIDDEN, EC_WORD_MOVE}, + .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_FLYING, EC_WORD_TYPE, EC_WORD_VICTORY, EC_WORD_EXCL}, + .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_JUST, EC_MOVE(FLY), EC_WORD_AWAY, -1}, + .monSets = gBattleFrontierTrainerMons_Gage + }, + [191] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("ARNOL"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_WEIRD, EC_WORD_FROM, EC_WORD_A, EC_WORD_DREAM}, + .speechWin = {EC_WORD_YOUR, EC_MOVE(SCARY_FACE), EC_WORD_WAS, EC_WORD_IN, EC_WORD_MY, EC_WORD_DREAM}, + .speechLose = {EC_WORD_MY, EC_WORD_INCREDIBLE, EC_WORD_DREAM, EC_WORD_WAS, EC_WORD_SO, EC_WORD_WEIRD}, + .monSets = gBattleFrontierTrainerMons_Arnold + }, + [192] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("JARRET"), + .speechBefore = {EC_WORD_COME_ON, EC_WORD_LET_S, EC_WORD_DANCE, EC_WORD_LIKE, EC_WORD_IT_S, EC_WORD_YESTERDAY}, + .speechWin = {EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_HOW, EC_WORD_I, EC_WORD_DANCE, EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_APPRECIATE, EC_WORD_HOW, EC_WORD_I, EC_WORD_DANCE}, + .monSets = gBattleFrontierTrainerMons_Jarrett + }, + [193] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("GARET"), + .speechBefore = {EC_WORD_MY, EC_WORD_GIRL, EC_WORD_GIVES, EC_WORD_ME, EC_WORD_A_LITTLE, EC_MOVE2(SWEET_KISS)}, + .speechWin = {EC_WORD_MY, EC_WORD_GIRL, EC_WORD_FRIEND, EC_WORD_IS, EC_WORD_MY, EC_WORD_TREASURE}, + .speechLose = {EC_WORD_A, EC_WORD_TREASURE, EC_WORD_ISN_T, EC_WORD_ALWAYS, EC_WORD_ABOUT, EC_WORD_MONEY}, + .monSets = gBattleFrontierTrainerMons_Garett + }, + [194] = { + .facilityClass = FACILITY_CLASS_HIKER, + .trainerName = _("EMANUE"), + .speechBefore = {EC_WORD_SMARTNESS, EC_WORD_ALONE, EC_WORD_WON_T, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_WIN}, + .speechWin = {EC_WORD_I_AM, EC_WORD_NOT_VERY, EC_WORD_SMART, EC_WORD_BUT, EC_WORD_I, EC_WORD_WON}, + .speechLose = {EC_WORD_HOW, EC_WORD_DID, EC_WORD_YOU, EC_MOVE2(FAKE_OUT), EC_WORD_ME, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Emanuel + }, + [195] = { + .facilityClass = FACILITY_CLASS_HIKER, + .trainerName = _("GUSTAV"), + .speechBefore = {EC_MOVE(CHARGE), EC_WORD_EXCL, -1, EC_MOVE(CHARGE), EC_WORD_EXCL_EXCL, -1}, + .speechWin = {EC_WORD_SURRENDER, EC_WORD_QUES, -1, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_SURRENDER, EC_WORD_YET}, + .monSets = gBattleFrontierTrainerMons_Gustavo + }, + [196] = { + .facilityClass = FACILITY_CLASS_KINDLER, + .trainerName = _("KAMERO"), + .speechBefore = {EC_WORD_TAKE_THAT, EC_WORD_EXCL, EC_WORD_IT_S, EC_WORD_MY, EC_WORD_FIERY, EC_MOVE2(TRICK)}, + .speechWin = {EC_WORD_DID, EC_WORD_MY, EC_WORD_FIERY, EC_MOVE2(TRICK), EC_MOVE(ASTONISH), EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU, EC_WORD_DIDN_T, EC_WORD_FALL, EC_WORD_FOR, EC_WORD_MY, EC_MOVE2(TRICK)}, + .monSets = gBattleFrontierTrainerMons_Kameron + }, + [197] = { + .facilityClass = FACILITY_CLASS_KINDLER, + .trainerName = _("ALFRED"), + .speechBefore = {EC_WORD_A, EC_WORD_FIERY, EC_WORD_GOURMET, EC_WORD_AM, EC_WORD_I, EC_WORD_EXCL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_TASTY, EC_WORD_GOURMET, EC_WORD_VICTORY, EC_WORD_EXCL}, + .speechLose = {EC_WORD_WHAT, EC_WORD_A, EC_WORD_DISASTER, EC_WORD_THAT_WAS, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Alfredo + }, + [198] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("RUBE"), + .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_TO, EC_WORD_GET, EC_WORD_GOING}, + .speechWin = {EC_WORD_GET, EC_WORD_GOING, EC_WORD_EXCL, EC_WORD_THIS, EC_WORD_IS, EC_WORD_GOOD_BYE}, + .speechLose = {EC_WORD_I_VE, EC_WORD_GOT, EC_WORD_TO, EC_WORD_GET, EC_WORD_GOING, -1}, + .monSets = gBattleFrontierTrainerMons_Ruben + }, + [199] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("LAMA"), + .speechBefore = {EC_WORD_A, EC_MOVE2(PRESENT), EC_WORD_FOR, EC_WORD_ME, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_MMM, EC_WORD_THIS, EC_WORD_IS, EC_WORD_QUITE, EC_WORD_TASTY, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_OH, EC_WORD_IT_S, EC_WORD_A, EC_WORD_GAME, EC_WORD_IS_IT_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Lamar + }, + [200] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("JAXO"), + .speechBefore = {EC_WORD_A, EC_WORD_SHELL_ARMOR, EC_WORD_IS, EC_WORD_WHAT, EC_WORD_I, EC_WORD_WANT}, + .speechWin = {EC_WORD_MY, EC_WORD_FATHER, EC_WORD_AND, EC_WORD_MOTHER, EC_WORD_WON_T, EC_WORD_ACCEPT}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_WORD_SHELL_ARMOR, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Jaxon + }, + [201] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("LOGA"), + .speechBefore = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_WILL, EC_WORD_STUDY, EC_WORD_FOR, EC_WORD_SCHOOL}, + .speechWin = {EC_WORD_ME, EC_WORD_STUDY, EC_WORD_QUES, EC_WORD_NOT_VERY, EC_WORD_LIKELY_TO, EC_WORD_SEE}, + .speechLose = {EC_WORD_NO, EC_WORD_THANKS, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_SLEEP}, + .monSets = gBattleFrontierTrainerMons_Logan + }, + [202] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("EMILE"), + .speechBefore = {EC_WORD_IS, EC_WORD_THIS, EC_WORD_KIND, EC_WORD_OF, EC_WORD_BATTLE, EC_WORD_OK_QUES}, + .speechWin = {EC_WORD_LET_S, EC_WORD_GO, EC_WORD_FOR, EC_WORD_AN, EC_MOVE(ICY_WIND), EC_MOVE2(SURF)}, + .speechLose = {EC_WORD_HOW, EC_WORD_ABOUT, EC_WORD_A, EC_MOVE(ROCK_SLIDE), EC_WORD_SHOW, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Emilee + }, + [203] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("JOSI"), + .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_FASHION, EC_WORD_CONTEST, EC_WORD_IS, EC_WORD_PRETTY}, + .speechWin = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_MODE, EC_WORD_FASHION, EC_WORD_THINGS}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_TOTALLY, EC_WORD_LACKING, EC_WORD_IN, EC_WORD_FASHION, EC_WORD_SENSE}, + .monSets = gBattleFrontierTrainerMons_Josie + }, + [204] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("ARMAND"), + .speechBefore = {EC_WORD_I, EC_WORD_NEED, EC_WORD_MORE, EC_WORD_GRASS, EC_WORD_TYPE, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_TRADE, EC_WORD_ME, EC_WORD_A, EC_WORD_GRASS, EC_WORD_POKEMON, EC_WORD_PLEASE}, + .speechLose = {EC_WORD_THERE, EC_WORD_AREN_T, EC_WORD_ENOUGH, EC_WORD_GRASS, EC_WORD_TYPE, EC_WORD_POKEMON}, + .monSets = gBattleFrontierTrainerMons_Armando + }, + [205] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("SKYLE"), + .speechBefore = {EC_MOVE2(INGRAIN), EC_WORD_IS, EC_WORD_MY, EC_WORD_CHOICE, EC_WORD_BATTLE, EC_WORD_MOVE}, + .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MOVE, EC_WORD_ME, EC_WORD_NOW, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU, EC_MOVE(CUT), EC_WORD_ME, EC_WORD_DOWN, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Skyler + }, + [206] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("RUT"), + .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_ENJOY, EC_WORD_THIS, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MUCH, EC_WORD_TOO, EC_WORD_EASY, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_STOP, EC_WORD_I, EC_WORD_DON_T, EC_WORD_ENJOY, EC_WORD_THIS}, + .monSets = gBattleFrontierTrainerMons_Ruth + }, + [207] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("MELOD"), + .speechBefore = {EC_WORD_I, EC_MOVE2(WISH), EC_WORD_SUNDAY, EC_WORD_IS, EC_WORD_A, EC_MOVE2(SUNNY_DAY)}, + .speechWin = {EC_WORD_SUNDAY, EC_WORD_SEEMS, EC_WORD_FOREVER, EC_WORD_TO, EC_WORD_COME, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_THE, EC_WORD_FORECAST, EC_WORD_SAYS, EC_WORD_IT, EC_WORD_WILL, EC_MOVE(HAIL)}, + .monSets = gBattleFrontierTrainerMons_Melody + }, + [208] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("PEDR"), + .speechBefore = {EC_WORD_A, EC_WORD_SWIFT_SWIM, EC_WORD_WILL, EC_WORD_DO, EC_WORD_YOU, EC_WORD_GOOD}, + .speechWin = {EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_I, EC_WORD_SINK, EC_WORD_AN, EC_WORD_OPPONENT}, + .speechLose = {EC_WORD_UH_OH, EC_WORD_EXCL, -1, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Pedro + }, + [209] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("ERIC"), + .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_MOVE2(TACKLE), EC_WORD_YOU, EC_WORD_DOWN, EC_WORD_EXCL}, + .speechWin = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_RUN_AWAY, EC_WORD_YOU, EC_WORD_LOSER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_THINK, EC_WORD_YOU, EC_WORD_WOULD, EC_MOVE(COUNTER)}, + .monSets = gBattleFrontierTrainerMons_Erick + }, + [210] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("ELAIN"), + .speechBefore = {EC_WORD_MY, EC_WORD_HEROINE, EC_WORD_ADVENTURE, EC_WORD_ISN_T, EC_WORD_GOING, EC_WORD_WELL}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I, EC_WORD_NEED}, + .speechLose = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_HEROINE}, + .monSets = gBattleFrontierTrainerMons_Elaine + }, + [211] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("JOYC"), + .speechBefore = {EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_GO, EC_WORD_AHAHA, EC_WORD_EXCL}, + .speechWin = {EC_WORD_LALALA, EC_WORD_NO, EC_WORD_LOSING, EC_WORD_FOR, EC_WORD_ME, EC_WORD_EXCL}, + .speechLose = {EC_WORD_LALALA, EC_WORD_ELLIPSIS, -1, EC_WORD_HUH_QUES, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Joyce + }, + [212] = { + .facilityClass = FACILITY_CLASS_POKEFAN_M, + .trainerName = _("TOD"), + .speechBefore = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_LIGHTNINGROD, EC_WORD_FOR, EC_WORD_MY, EC_WORD_POWER}, + .speechWin = {EC_WORD_THAT_S, EC_WORD_ALL, EC_WORD_YOU, EC_WORD_COULD, EC_MOVE(ABSORB), EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU, EC_MOVE2(REFLECT), EC_WORD_MY, EC_WORD_POWER, EC_WORD_BACK, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Todd + }, + [213] = { + .facilityClass = FACILITY_CLASS_POKEFAN_M, + .trainerName = _("GAVI"), + .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(BIDE), EC_WORD_MY, EC_WORD_TIME, -1}, + .speechWin = {EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_MY, EC_WORD_MISTAKE, EC_WORD_WAS, EC_WORD_TOO, EC_WORD_EXPENSIVE, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Gavin + }, + [214] = { + .facilityClass = FACILITY_CLASS_POKEFAN_F, + .trainerName = _("MALOR"), + .speechBefore = {EC_WORD_PROMISE, EC_WORD_TO, EC_WORD_SHOW, EC_WORD_ME, EC_WORD_CUTE, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, -1, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, + .speechLose = {EC_WORD_TCH, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_VERY, EC_WORD_NICE}, + .monSets = gBattleFrontierTrainerMons_Malory + }, + [215] = { + .facilityClass = FACILITY_CLASS_POKEFAN_F, + .trainerName = _("ESTHE"), + .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_NICE, EC_MOVE2(PRESENT), EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_PLEASE, EC_WORD_GET, EC_WORD_ME, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_GAME}, + .speechLose = {EC_WORD_MESSAGE, EC_WORD_CARDS, EC_WORD_MAKE, EC_WORD_A, EC_WORD_WEAK, EC_MOVE2(PRESENT)}, + .monSets = gBattleFrontierTrainerMons_Esther + }, + [216] = { + .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, + .trainerName = _("OSCA"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_YOUR, EC_WORD_POWER, EC_WORD_IN, EC_WORD_FULL}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_NOT, EC_WORD_YOUR, EC_WORD_FULL, EC_WORD_POWER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_NOT, EC_WORD_FUNNY, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_TOO_STRONG, -1}, + .monSets = gBattleFrontierTrainerMons_Oscar + }, + [217] = { + .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, + .trainerName = _("WILSO"), + .speechBefore = {EC_WORD_WORK, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_ME, EC_WORD_AN, EC_WORD_EARLY_BIRD}, + .speechWin = {EC_WORD_ALL, EC_WORD_WORK, EC_WORD_AND, EC_WORD_NO, EC_WORD_PLAY, EC_WORD_ELLIPSIS}, + .speechLose = {EC_MOVE(ENDURE), EC_WORD_IS, EC_WORD_ALL, EC_WORD_I, EC_WORD_CAN, EC_WORD_DO}, + .monSets = gBattleFrontierTrainerMons_Wilson + }, + [218] = { + .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, + .trainerName = _("CLAR"), + .speechBefore = {EC_WORD_YAY, EC_WORD_EXCL, EC_WORD_A, EC_WORD_TOUGH, EC_WORD_TRAINER, EC_WORD_EXCL}, + .speechWin = {EC_WORD_AWW, EC_WORD_EXCL, EC_WORD_A, EC_WORD_WIMPY, EC_WORD_TRAINER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_TRAINER, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Clare + }, + [219] = { + .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, + .trainerName = _("TES"), + .speechBefore = {EC_WORD_WANT, EC_WORD_SOME, EC_POKEMON(GULPIN), EC_WORD_DESIGN, EC_WORD_SWEETS, EC_WORD_QUES}, + .speechWin = {EC_WORD_THEY_RE, EC_WORD_A, EC_WORD_SECRET, EC_WORD_POKEMON, EC_WORD_GOURMET, EC_WORD_ITEM}, + .speechLose = {EC_WORD_THEY_RE, EC_WORD_TASTY, EC_WORD_EXCL, EC_WORD_REFRESHING, EC_WORD_TOO, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Tess + }, + [220] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("LEO"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_BETTER, EC_WORD_THAN, EC_WORD_ANY, EC_WORD_OTHER, EC_WORD_TRAINER}, + .speechWin = {EC_WORD_I, EC_WORD_DID, EC_WORD_IT, EC_MOVE2(JUMP_KICK), EC_WORD_FOR, EC_WORD_JOY}, + .speechLose = {EC_WORD_BACK, EC_WORD_HOME, EC_WORD_I, EC_WORD_WILL, EC_WORD_GO, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Leon + }, + [221] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("ALONZ"), + .speechBefore = {EC_WORD_I_VE, EC_WORD_NOT, EC_WORD_LOST, EC_WORD_ONCE, EC_WORD_YET, EC_WORD_EXCL}, + .speechWin = {EC_WORD_YOUR, EC_WORD_SAD, EC_WORD_LOOK, EC_WORD_BECOMES, EC_WORD_YOU, -1}, + .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_BELIEVE, EC_WORD_THIS, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Alonzo + }, + [222] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("VINC"), + .speechBefore = {EC_WORD_THE, EC_WORD_TOP, EC_WORD_TRAINER, EC_WORD_THAT_S, EC_WORD_ME, EC_WORD_EXCL}, + .speechWin = {EC_WORD_THE, EC_WORD_TOP, EC_WORD_RANK, EC_WORD_BELONGS_TO, EC_WORD_ME, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_APPEAL, EC_WORD_THIS, EC_MOVE(OUTRAGE), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Vince + }, + [223] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("BRYO"), + .speechBefore = {EC_WORD_MY, EC_MOVE2(BARRAGE), EC_WORD_WILL, EC_MOVE2(SLAM), EC_WORD_YOU, EC_WORD_EXCL}, + .speechWin = {EC_WORD_YOU, EC_WORD_DIDN_T, EC_WORD_COUNT_ON, EC_WORD_ANY, EC_WORD_LESS, EC_WORD_QUES}, + .speechLose = {EC_WORD_I, EC_WORD_JUST, EC_WORD_DON_T, EC_WORD_GET, EC_WORD_IT, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Bryon + }, + [224] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("AV"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_TREASURE, EC_WORD_OF, EC_WORD_THIS, EC_WORD_WORLD}, + .speechWin = {EC_WORD_MY, EC_WORD_WORLD, EC_WORD_IS, EC_WORD_FULL, EC_WORD_OF, EC_WORD_WONDER}, + .speechLose = {EC_WORD_WHY, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_SO, EC_WORD_TERRIBLE, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Ava + }, + [225] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("MIRIA"), + .speechBefore = {EC_WORD_OH, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_WITH, EC_WORD_A, EC_MOVE(SCARY_FACE)}, + .speechWin = {EC_WORD_AHAHA, EC_WORD_YOU, EC_WORD_ONLY, EC_WORD_LOOK, EC_WORD_SCARY, EC_WORD_EXCL}, + .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_ARE, EC_WORD_SCARY}, + .monSets = gBattleFrontierTrainerMons_Miriam + }, + [226] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("CARRI"), + .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_WORD_SHOW, EC_WORD_YOU, EC_WORD_GUTSY, EC_WORD_EXCL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_ALL, EC_WORD_ABOUT, EC_WORD_GUTS, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_ELLIPSIS, EC_MOVE(SELF_DESTRUCT), EC_WORD_MODE, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Carrie + }, + [227] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("GILLIA"), + .speechBefore = {EC_WORD_I, EC_WORD_SEEK, EC_WORD_A, EC_WORD_TRULY, EC_WORD_GREAT, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_A_LOT, EC_WORD_BETTER, EC_WORD_BATTLE, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_A_LITTLE, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_TAKE}, + .monSets = gBattleFrontierTrainerMons_Gillian2 + }, + [228] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, + .trainerName = _("TYLE"), + .speechBefore = {EC_WORD_YO, EC_WORD_EXCL, -1, EC_WORD_LET_S, EC_WORD_GO, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_WORD_YO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_WON, EC_WORD_YO}, + .speechLose = {EC_WORD_YO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_LOST, EC_WORD_YO}, + .monSets = gBattleFrontierTrainerMons_Tyler + }, + [229] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, + .trainerName = _("CHA"), + .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_HAVE, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_POWER}, + .speechWin = {EC_WORD_THEY, EC_WORD_HAVE, EC_WORD_MORE, EC_WORD_POWER, EC_WORD_NOW, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YEAH, EC_MOVE2(TAKE_DOWN), EC_WORD_THEIR, EC_WORD_POWER, EC_WORD_A_TINY_BIT, EC_WORD_PLEASE}, + .monSets = gBattleFrontierTrainerMons_Chaz + }, + [230] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, + .trainerName = _("NELSO"), + .speechBefore = {EC_WORD_WELL_THEN, EC_WORD_WILL, EC_WORD_THIS, EC_WORD_POKEMON, EC_WORD_WORK, EC_WORD_QUES}, + .speechWin = {EC_WORD_I, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_IT, EC_WORD_WAS, EC_WORD_TOO_STRONG}, + .speechLose = {EC_WORD_IT, EC_WORD_DIDN_T, EC_WORD_MATCH_UP, EC_WORD_WELL, EC_WORD_I, EC_WORD_THINK}, + .monSets = gBattleFrontierTrainerMons_Nelson + }, + [231] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, + .trainerName = _("SHANI"), + .speechBefore = {EC_WORD_ALL, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ABSOLUTELY, EC_WORD_ADORE, EC_WORD_ME}, + .speechWin = {EC_WORD_HAPPINESS, EC_WORD_IS, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_WITH, EC_WORD_CUTE_CHARM}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_SO, EC_WORD_MEAN, EC_WORD_TO, EC_WORD_CUTE, EC_WORD_POKEMON}, + .monSets = gBattleFrontierTrainerMons_Shania + }, + [232] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, + .trainerName = _("STELL"), + .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOUR, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_WELL, EC_WORD_AREN_T, EC_WORD_THEY, EC_WORD_BORING, EC_WORD_QUES, EC_WORD_AHAHA}, + .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SOMETHING, EC_WORD_ELSE, EC_WORD_ALL_RIGHT}, + .monSets = gBattleFrontierTrainerMons_Stella + }, + [233] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, + .trainerName = _("DORIN"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AND, EC_WORD_STRONG, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_SEE, EC_WORD_QUES, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_GOOD, EC_WORD_QUES}, + .speechLose = {EC_WORD_THIS, EC_WORD_ISN_T, EC_WORD_WORKING, EC_WORD_OUT, EC_WORD_AT, EC_WORD_ALL}, + .monSets = gBattleFrontierTrainerMons_Dorine + }, + [234] = { + .facilityClass = FACILITY_CLASS_DRAGON_TAMER, + .trainerName = _("MADDO"), + .speechBefore = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_MY, EC_WORD_NO_1, EC_WORD_CHOICE}, + .speechWin = {EC_WORD_IT_S, EC_WORD_NO, EC_WORD_SECRET, EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_WIN}, + .speechLose = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_LOSE, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Maddox + }, + [235] = { + .facilityClass = FACILITY_CLASS_DRAGON_TAMER, + .trainerName = _("DAVI"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_HEAR, EC_WORD_YOU, EC_MOVE2(ROAR), EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_WROOOAAR_EXCL, -1, -1, EC_WORD_VICTORY, EC_WORD_EXCL_EXCL, -1}, + .speechLose = {EC_WORD_WROOOAAR_EXCL, -1, -1, EC_WORD_WHY, EC_WORD_QUES_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Davin + }, + [236] = { + .facilityClass = FACILITY_CLASS_DRAGON_TAMER, + .trainerName = _("TREVO"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_LIVING, EC_WORD_ONLY, EC_WORD_WITH, EC_WORD_DRAGON, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_THE, EC_WORD_WAY, EC_WORD_I_AM, EC_WORD_LIVING, EC_WORD_IS, EC_WORD_PERFECT}, + .speechLose = {EC_WORD_YOU_VE, EC_WORD_DESTROYED, EC_WORD_THE, EC_WORD_WAY, EC_WORD_I_AM, EC_WORD_LIVING}, + .monSets = gBattleFrontierTrainerMons_Trevon + }, + [237] = { + .facilityClass = FACILITY_CLASS_BLACK_BELT, + .trainerName = _("MATE"), + .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_BE, EC_WORD_OVER, EC_WORD_SOON, EC_WORD_ENOUGH}, + .speechWin = {EC_WORD_WELL, EC_WORD_THAT, EC_WORD_DIDN_T, EC_WORD_TAKE, EC_WORD_VERY, EC_WORD_MUCH}, + .speechLose = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_LOSE, EC_WORD_SO, EC_WORD_SOON, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Mateo + }, + [238] = { + .facilityClass = FACILITY_CLASS_BLACK_BELT, + .trainerName = _("BRE"), + .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_ROCK_SOLID, EC_WORD_POKEMON, EC_WORD_THE, EC_WORD_BEST}, + .speechWin = {EC_WORD_TOUGHNESS, EC_WORD_IS, EC_WORD_THE, EC_WORD_WAY, EC_WORD_TO, EC_WORD_GO}, + .speechLose = {EC_WORD_I, EC_WORD_ALSO, EC_WORD_HAVE, EC_WORD_A, EC_WORD_PLUSH_DOLL, EC_WORD_COLLECTION}, + .monSets = gBattleFrontierTrainerMons_Bret + }, + [239] = { + .facilityClass = FACILITY_CLASS_BLACK_BELT, + .trainerName = _("RAU"), + .speechBefore = {EC_WORD_I, EC_WORD_REJECT, EC_WORD_EVERY, EC_WORD_WEAK, EC_WORD_TRAINER, -1}, + .speechWin = {EC_WORD_HUMPH, EC_WORD_EXCL, EC_WORD_ANOTHER, EC_WORD_WEAK, EC_WORD_TRAINER, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NOTHING, EC_WORD_WEAK, EC_WORD_ABOUT, EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Raul + }, + [240] = { + .facilityClass = FACILITY_CLASS_BATTLE_GIRL, + .trainerName = _("KA"), + .speechBefore = {EC_WORD_AND, EC_WORD_YET, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_TIRED, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_GOOD, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_AT, EC_WORD_LAST, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Kay + }, + [241] = { + .facilityClass = FACILITY_CLASS_BATTLE_GIRL, + .trainerName = _("ELEN"), + .speechBefore = {EC_WORD_A, EC_WORD_BATTLE, EC_WORD_GIRL, EC_WORD_THAT_S, EC_WORD_ME, EC_WORD_EXCL}, + .speechWin = {EC_WORD_ISN_T, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_GIRL, EC_WORD_AWESOME, EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU, EC_WORD_DISLIKE, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_GIRL, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Elena + }, + [242] = { + .facilityClass = FACILITY_CLASS_BATTLE_GIRL, + .trainerName = _("ALAN"), + .speechBefore = {EC_WORD_EAT, EC_WORD_MY, EC_WORD_INVINCIBLE, EC_WORD_ATTACK, EC_WORD_YOU, EC_WORD_EXCL}, + .speechWin = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_LEARN, -1}, + .speechLose = {EC_WORD_SO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_MY, EC_WORD_INVINCIBLE, EC_WORD_ATTACK}, + .monSets = gBattleFrontierTrainerMons_Alana + }, + [243] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("ALEXA"), + .speechBefore = {EC_WORD_GOOD, EC_WORD_TO, EC_WORD_MEET_YOU, EC_WORD_YOUNG, EC_WORD_TRAINER, EC_WORD_EXCL}, + .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, -1, EC_WORD_GIVE, EC_WORD_IT, EC_WORD_UP}, + .speechLose = {EC_WORD_YOU, EC_WORD_ARE, EC_WORD_A, EC_WORD_STRONG, EC_WORD_TRAINER, EC_WORD_KID}, + .monSets = gBattleFrontierTrainerMons_Alexas + }, + [244] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("WESTO"), + .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_PLAY, EC_WORD_DOWN, EC_WORD_ALL_RIGHT, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_FAR, EC_WORD_TOO, EC_WORD_EASY, EC_WORD_TO, EC_WORD_ATTACK}, + .speechLose = {EC_WORD_WELL, EC_WORD_WELL, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Weston + }, + [245] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("JASPE"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_OLD, EC_WORD_I_AM, EC_WORD_SKILLED, EC_WORD_EXCL}, + .speechWin = {EC_WORD_SKILLED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SHOCKED, EC_WORD_EXCL, EC_WORD_DOWN, EC_WORD_I, EC_WORD_GO}, + .monSets = gBattleFrontierTrainerMons_Jasper + }, + [246] = { + .facilityClass = FACILITY_CLASS_EXPERT_F, + .trainerName = _("NADI"), + .speechBefore = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, EC_WORD_DOWN, EC_WORD_EXCL}, + .speechWin = {EC_WORD_HAH, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_BEAT, EC_WORD_YOU}, + .speechLose = {EC_WORD_I_AM, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_DOWNCAST, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Nadia + }, + [247] = { + .facilityClass = FACILITY_CLASS_EXPERT_F, + .trainerName = _("MIRAND"), + .speechBefore = {EC_WORD_WELL, EC_WORD_WELL, -1, EC_WORD_LET_S, EC_WORD_START, -1}, + .speechWin = {EC_WORD_WHAT, EC_WORD_QUES, EC_WORD_DONE, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES}, + .speechLose = {EC_WORD_WELL, EC_WORD_I, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_I_AM, EC_WORD_TOO_WEAK}, + .monSets = gBattleFrontierTrainerMons_Miranda + }, + [248] = { + .facilityClass = FACILITY_CLASS_EXPERT_F, + .trainerName = _("EMM"), + .speechBefore = {EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_HEARING, EC_WORD_ABOUT, EC_WORD_YOU, -1}, + .speechWin = {EC_WORD_I, EC_WORD_THINK, EC_WORD_I_VE, EC_WORD_MISHEARD, EC_WORD_THINGS, -1}, + .speechLose = {EC_WORD_WHAT, EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_HEARING, EC_WORD_IS, EC_WORD_RIGHT}, + .monSets = gBattleFrontierTrainerMons_Emma + }, + [249] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_M, + .trainerName = _("ROLAND"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_SUPER, EC_WORD_POKEMON, EC_WORD_HERO, EC_WORD_EXCL}, + .speechWin = {EC_WORD_WAS, EC_WORD_THAT, EC_WORD_ENOUGH, EC_WORD_FOR, EC_WORD_YOU, EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_BEAT, EC_WORD_A, EC_WORD_HERO}, + .monSets = gBattleFrontierTrainerMons_Rolando + }, + [250] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_M, + .trainerName = _("STANL"), + .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_BE, EC_WORD_AN, EC_WORD_EASY, EC_WORD_MATCH}, + .speechWin = {EC_WORD_IT, EC_WORD_REALLY, EC_WORD_WAS, EC_WORD_EASY, -1, -1}, + .speechLose = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_HAPPY, EC_WORD_NOW, EC_WORD_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Stanly + }, + [251] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_M, + .trainerName = _("DARI"), + .speechBefore = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_SAYS, EC_WORD_I, EC_WORD_WILL, EC_WORD_WIN}, + .speechWin = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_HAS, EC_WORD_BEEN, EC_WORD_PERFECT, -1}, + .speechLose = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_SEE, EC_WORD_THIS, EC_MOVE(REVERSAL), EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Dario + }, + [252] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_F, + .trainerName = _("KARLE"), + .speechBefore = {EC_WORD_SOMETHING, EC_WORD_GOOD, EC_WORD_WILL, EC_WORD_COME, EC_WORD_OF, EC_WORD_THIS}, + .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_FANTASTIC, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_THAT, EC_WORD_SOMETHING, EC_WORD_GOOD, EC_WORD_WENT, EC_WORD_TO, EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Karlee + }, + [253] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_F, + .trainerName = _("JAYLI"), + .speechBefore = {EC_WORD_EVERY, EC_WORD_TRAINER, EC_WORD_HAS, EC_WORD_BEEN, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_IT_S, EC_WORD_MAKING, EC_WORD_ME, EC_MOVE(YAWN), EC_WORD_THAT, EC_WORD_BATTLE}, + .speechLose = {EC_WORD_I, EC_WORD_SLEPT, EC_WORD_AND, EC_WORD_SO, EC_WORD_I, EC_WORD_LOST}, + .monSets = gBattleFrontierTrainerMons_Jaylin + }, + [254] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_F, + .trainerName = _("INGRI"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_VERY, EC_WORD_MEAN, EC_WORD_TRAINER}, + .speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_A, EC_WORD_GOOD, EC_WORD_MATCH, EC_WORD_QUES}, + .speechLose = {EC_WORD_I, EC_WORD_LOST, EC_WORD_CAUSE, EC_WORD_YOU_RE, EC_WORD_MEAN, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Ingrid + }, + [255] = { + .facilityClass = FACILITY_CLASS_HEX_MANIAC, + .trainerName = _("DELILA"), + .speechBefore = {EC_WORD_DON_T, EC_MOVE(GRUDGE), EC_WORD_ME, EC_WORD_IF_I_WIN, EC_WORD_OK_QUES, -1}, + .speechWin = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOU, EC_WORD_ANGRY}, + .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GRUDGE), EC_WORD_WITH, EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Delilah + }, + [256] = { + .facilityClass = FACILITY_CLASS_HEX_MANIAC, + .trainerName = _("CARL"), + .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_WORD_SCATTER, EC_WORD_SOME, EC_MOVE2(POISON_POWDER), EC_WORD_ABOUT}, + .speechWin = {EC_WORD_IT_S, EC_WORD_SCARY, EC_WORD_HOW, EC_WORD_MY, EC_WORD_STRATEGY, EC_WORD_WORKS}, + .speechLose = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_YOU, EC_WORD_AND, EC_WORD_YOUR, EC_WORD_POKEMON}, + .monSets = gBattleFrontierTrainerMons_Carly + }, + [257] = { + .facilityClass = FACILITY_CLASS_HEX_MANIAC, + .trainerName = _("LEXI"), + .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_SCARY, EC_WORD_POKEMON, EC_WORD_QUES}, + .speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_SCARY, EC_WORD_EH_QUES, -1, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_SCARY, EC_WORD_THAN, EC_WORD_MY, EC_WORD_POKEMON}, + .monSets = gBattleFrontierTrainerMons_Lexie + }, + [258] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("MILLE"), + .speechBefore = {EC_WORD_HELLO, EC_WORD_QUES, -1, EC_WORD_HELLO, EC_WORD_QUES_EXCL, -1}, + .speechWin = {EC_WORD_HELLO, EC_WORD_MOTHER, EC_WORD_EXCL, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL}, + .speechLose = {EC_WORD_MY, EC_WORD_PHONE, EC_WORD_ISN_T, EC_WORD_WORKING, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Miller + }, + [259] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("MAR"), + .speechBefore = {EC_WORD_YOU, EC_WORD_CAN, EC_WORD_LOSE, EC_WORD_YOUR, EC_MOVE(SWAGGER), EC_WORD_NOW}, + .speechWin = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_MOVE(SWAGGER), EC_WORD_LEFT, EC_WORD_EH_QUES}, + .speechLose = {EC_WORD_GO, EC_WORD_ON, EC_MOVE(SWAGGER), EC_WORD_ALL, EC_WORD_YOU, EC_WORD_WANT}, + .monSets = gBattleFrontierTrainerMons_Marv + }, + [260] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("LAYTO"), + .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_TOTALLY, EC_WORD_COOL, EC_WORD_EXCL}, + .speechWin = {EC_WORD_YOU, EC_WORD_CAN, EC_WORD_LOOK, EC_WORD_UP, EC_WORD_TO, EC_WORD_ME}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_NO, EC_WORD_REALLY, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Layton + }, + [261] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("BROOK"), + .speechBefore = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_WORD_HIGH, EC_WORD_LEVEL, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_HIGH, EC_WORD_LEVEL, EC_WORD_AND, EC_WORD_EXCITING, EC_WORD_TOO}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_TOO, EC_WORD_HIGH, EC_WORD_IN, EC_WORD_LEVEL, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Brooks + }, + [262] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("GREGOR"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_THAT, EC_WORD_OLD, EC_WORD_YET, -1}, + .speechWin = {EC_WORD_WHO, EC_WORD_SAYS, EC_WORD_I_AM, EC_WORD_TOO, EC_WORD_OLD, EC_WORD_QUES}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_I_AM, EC_WORD_REALLY, EC_WORD_NOT, EC_WORD_THAT, EC_WORD_OLD}, + .monSets = gBattleFrontierTrainerMons_Gregory + }, + [263] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("REES"), + .speechBefore = {EC_WORD_I_VE, EC_WORD_A, EC_WORD_COUPLE, EC_WORD_THINGS, -1, -1}, + .speechWin = {EC_WORD_DON_T, EC_WORD_DIET, EC_WORD_PLAY, EC_WORD_SPORTS, EC_WORD_INSTEAD, -1}, + .speechLose = {EC_WORD_INSTEAD, EC_WORD_OF, EC_WORD_TELEVISION, EC_WORD_GET, EC_WORD_A, EC_WORD_BOOK}, + .monSets = gBattleFrontierTrainerMons_Reese + }, + [264] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, + .trainerName = _("MASO"), + .speechBefore = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_THIS, EC_WORD_SCARY, -1}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_ELLIPSIS, -1, EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_NOW}, + .speechLose = {EC_WORD_I_AM, EC_WORD_DISAPPOINTED, EC_WORD_ELLIPSIS, -1, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Mason + }, + [265] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, + .trainerName = _("TOB"), + .speechBefore = {EC_WORD_LISTEN, EC_WORD_UP, -1, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_WIN}, + .speechWin = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_OR, EC_WORD_WHAT, EC_WORD_QUES}, + .speechLose = {EC_WORD_I, EC_WORD_CAN, EC_WORD_BEAT, EC_WORD_YOU, EC_WORD_AT, EC_WORD_SMARTNESS}, + .monSets = gBattleFrontierTrainerMons_Toby + }, + [266] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, + .trainerName = _("DOROTH"), + .speechBefore = {EC_WORD_THE, EC_WORD_SPORTS, EC_WORD_WORLD, EC_WORD_SHOULD, EC_WORD_ACCEPT, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_WORD_THAT, EC_WORD_WIN, EC_WORD_WAS, EC_WORD_REFRESHING}, + .speechLose = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_WORD_THAT, EC_WORD_LOSS, EC_WORD_WAS, EC_WORD_REFRESHING}, + .monSets = gBattleFrontierTrainerMons_Dorothy + }, + [267] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, + .trainerName = _("PIPE"), + .speechBefore = {EC_WORD_COME_ON, EC_WORD_YOU, EC_WORD_NEED, EC_WORD_A, EC_WORD_SPEED_BOOST, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOU, EC_WORD_NEED, EC_WORD_TO, EC_WORD_SHOW, EC_WORD_MORE, EC_WORD_GUTS}, + .speechLose = {EC_WORD_OH, EC_WORD_YOU, EC_WORD_EXCL, -1, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Piper + }, + [268] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, + .trainerName = _("FIN"), + .speechBefore = {EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_TRAINER, EC_WORD_BATTLE, EC_WORD_ELLIPSIS, -1}, + .speechWin = {EC_WORD_WON_T, EC_WORD_THIS, EC_WORD_EVER, EC_WORD_END, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_GET, EC_WORD_TO, EC_MOVE2(REST), EC_WORD_A_LITTLE}, + .monSets = gBattleFrontierTrainerMons_Finn + }, + [269] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, + .trainerName = _("SAMI"), + .speechBefore = {EC_WORD_I, EC_MOVE2(DIVE), EC_WORD_BELOW, EC_WORD_THE, EC_MOVE2(SURF), EC_WORD_EXCL}, + .speechWin = {EC_WORD_YAHOO, EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(DIVE), EC_WORD_YOU, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_SINK, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Samir + }, + [270] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, + .trainerName = _("FION"), + .speechBefore = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_LIMBER, EC_WORD_UP, EC_WORD_BEFORE, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOU, EC_WORD_NEED, EC_WORD_TO, EC_WORD_BE, EC_WORD_MORE, EC_WORD_READY}, + .speechLose = {EC_WORD_BEING, EC_WORD_LIMBER, EC_WORD_DIDN_T, EC_WORD_WORK, EC_WORD_FOR, EC_WORD_ME}, + .monSets = gBattleFrontierTrainerMons_Fiona + }, + [271] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, + .trainerName = _("GLORI"), + .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_ATTACK, EC_WORD_WITH, EC_WORD_SUCTION_CUPS}, + .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_FOR, EC_WORD_YOU}, + .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_GET, EC_WORD_HOW, EC_WORD_SUCTION_CUPS, EC_WORD_WORK}, + .monSets = gBattleFrontierTrainerMons_Gloria + }, + [272] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, + .trainerName = _("NIC"), + .speechBefore = {EC_WORD_LIKE, EC_WORD_A, EC_MOVE(SONIC_BOOM), EC_WORD_I_VE_ARRIVED, -1, -1}, + .speechWin = {EC_WORD_SORRY, EC_WORD_TO, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_SO, EC_WORD_DOWNCAST}, + .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_WITH, EC_WORD_A, EC_MOVE2(SUPERSONIC), EC_WORD_SPEED_BOOST}, + .monSets = gBattleFrontierTrainerMons_Nico + }, + [273] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, + .trainerName = _("JEREM"), + .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_MASTER, EC_WORD_THAT_S, EC_WORD_MY, EC_WORD_DREAM}, + .speechWin = {EC_WORD_MY, EC_WORD_DREAM, EC_WORD_ISN_T, EC_WORD_FAR, EC_WORD_OFF, EC_WORD_EXCL}, + .speechLose = {EC_WORD_WHAT, EC_WORD_I, EC_WORD_DREAM, EC_WORD_ISN_T, EC_WORD_HAPPENING, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Jeremy + }, + [274] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, + .trainerName = _("CAITLI"), + .speechBefore = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_THINK, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_QUES}, + .speechWin = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_MORE, EC_WORD_TO_ME, EC_WORD_THAN, EC_WORD_CUTENESS}, + .speechLose = {EC_WORD_MY, EC_WORD_CUTE_CHARM, EC_WORD_DOESN_T, EC_MOVE2(ATTRACT), EC_WORD_YOU, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Caitlin + }, + [275] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, + .trainerName = _("REEN"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_ALWAYS, EC_WORD_HAPPY, EC_WORD_HAPPY, EC_WORD_HAPPY, EC_WORD_EXCL}, + .speechWin = {EC_WORD_OH, EC_WORD_YAY, EC_WORD_EXCL, EC_WORD_YAHOO, EC_WORD_FOR, EC_WORD_ME}, + .speechLose = {EC_WORD_YAHOO, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Reena + }, + [276] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("AVER"), + .speechBefore = {EC_WORD_I_VE, EC_WORD_GOT, EC_WORD_A_LOT, EC_WORD_OF, EC_WORD_BUG, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_MY, EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_ALL, EC_WORD_UNBELIEVABLE}, + .speechLose = {EC_WORD_MY, EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_ALL, EC_WORD_UPSIDE_DOWN}, + .monSets = gBattleFrontierTrainerMons_Avery + }, + [277] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("LIA"), + .speechBefore = {EC_WORD_WE, EC_WORD_REALLY, EC_WORD_DISLIKE, EC_WORD_FIRE, EC_WORD_AND, EC_WORD_FLYING}, + .speechWin = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_BAD, EC_WORD_HEY_QUES, -1}, + .speechLose = {EC_WORD_YOU, EC_WORD_KNOW, EC_WORD_WHAT, EC_WORD_WE, EC_WORD_DISLIKE, EC_WORD_HEY_QUES}, + .monSets = gBattleFrontierTrainerMons_Liam + }, + [278] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("THE"), + .speechBefore = {EC_WORD_FISHING, EC_WORD_IS, EC_WORD_MY, EC_WORD_CHOICE, EC_WORD_IN, EC_WORD_LIFE}, + .speechWin = {EC_WORD_WATER, EC_WORD_POKEMON, EC_MOVE2(ATTRACT), EC_WORD_ME, EC_WORD_WITHOUT, EC_WORD_END}, + .speechLose = {EC_WORD_DON_T, EC_WORD_COUNT_ON, EC_WORD_THAT, EC_WORD_HAPPENING, EC_WORD_ANOTHER, EC_WORD_TIME}, + .monSets = gBattleFrontierTrainerMons_Theo + }, + [279] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("BAILE"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_I, EC_WORD_BATTLE, EC_WORD_EASY}, + .speechWin = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_I, EC_MOVE2(SWALLOW), EC_WORD_JOY}, + .speechLose = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_I, EC_MOVE2(SWALLOW), EC_MOVE2(FRUSTRATION)}, + .monSets = gBattleFrontierTrainerMons_Bailey + }, + [280] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("HUG"), + .speechBefore = {EC_WORD_I, EC_WORD_TRY, EC_WORD_THE, EC_WORD_BEST, EC_WORD_I, EC_WORD_CAN}, + .speechWin = {EC_WORD_I, EC_WORD_CAN_WIN, EC_WORD_IF, EC_WORD_I, EC_WORD_TRY, EC_WORD_ENOUGH}, + .speechLose = {EC_WORD_I, EC_WORD_DID, EC_WORD_TRY, EC_WORD_DIDN_T, EC_WORD_I, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Hugo + }, + [281] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("BRYC"), + .speechBefore = {EC_WORD_I_WAS, EC_WORD_ON, EC_WORD_VACATION, EC_WORD_UNTIL, EC_WORD_ONLY, EC_WORD_YESTERDAY}, + .speechWin = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_LOST, EC_WORD_MY, EC_WORD_SKILL, EC_WORD_YET}, + .speechLose = {EC_WORD_THAT_S, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_NEED, EC_WORD_SLEEP}, + .monSets = gBattleFrontierTrainerMons_Bryce + }, + [282] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("GIDEO"), + .speechBefore = {EC_WORD_WHAT_S_UP_QUES, EC_WORD_YOU, EC_WORD_THINK, EC_WORD_I_AM, EC_WORD_SCARY, EC_WORD_QUES}, + .speechWin = {EC_WORD_I_AM, EC_WORD_COOL, EC_WORD_BUT, EC_WORD_NOT, EC_WORD_SCARY, EC_WORD_EXCL}, + .speechLose = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_FABULOUS, EC_WORD_FASHION, EC_WORD_SENSE}, + .monSets = gBattleFrontierTrainerMons_Gideon + }, + [283] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("TRISTO"), + .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_RATHER, EC_WORD_LOOK, EC_WORD_AT, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES_EXCL}, + .speechLose = {EC_WORD_SEE, EC_WORD_QUES, -1, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_LOSE}, + .monSets = gBattleFrontierTrainerMons_Triston + }, + [284] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("CHARLE"), + .speechBefore = {EC_WORD_IT_S, EC_WORD_HOPELESS, EC_WORD_TO, EC_MOVE2(STRUGGLE), EC_WORD_WITH, EC_WORD_ME}, + .speechWin = {EC_MOVE(SUBMISSION), EC_WORD_WAS, EC_WORD_YOUR, EC_WORD_ONLY, EC_WORD_CHOICE, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_DOWN, EC_WORD_DOWN, EC_WORD_DOWN, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Charles + }, + [285] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("RAYMON"), + .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_HEAR, EC_WORD_MY, EC_WORD_SONG, EC_WORD_QUES}, + .speechWin = {EC_WORD_SATISFIED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_SATISFIED, EC_WORD_IS, EC_WORD_WHAT, EC_WORD_I, EC_WORD_CAN_T, EC_WORD_BE}, + .monSets = gBattleFrontierTrainerMons_Raymond + }, + [286] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("DIR"), + .speechBefore = {EC_WORD_FLYING, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_ABOVE, EC_WORD_THE, EC_MOVE2(REST)}, + .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T_WIN, EC_WORD_EXCL, EC_WORD_FLYING, EC_WORD_POKEMON, EC_WORD_RULE}, + .speechLose = {EC_WORD_AREN_T, EC_WORD_THERE, EC_WORD_MORE, EC_WORD_FLYING, EC_WORD_POKEMON, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Dirk + }, + [287] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("HAROL"), + .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_APPEAL, EC_WORD_TO, EC_WORD_YOU, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOU, EC_WORD_DO, EC_WORD_LIKE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_QUES}, + .speechLose = {EC_WORD_SO, EC_WORD_YOU, EC_WORD_DISLIKE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Harold + }, + [288] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("OMA"), + .speechBefore = {EC_WORD_LET_ME_WIN, EC_WORD_IN, EC_MOVE(RETURN), EC_WORD_FOR, EC_WORD_A, EC_MOVE2(PRESENT)}, + .speechWin = {EC_WORD_HERE, EC_WORD_YOU, EC_WORD_ARE, EC_WORD_SOME, EC_MOVE2(TOXIC), EC_WORD_SWEETS}, + .speechLose = {EC_WORD_YOUR, EC_MOVE2(PRESENT), EC_WORD_QUES, EC_WORD_WHAT, EC_WORD_FOR, EC_WORD_QUES_EXCL}, + .monSets = gBattleFrontierTrainerMons_Omar + }, + [289] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("PETE"), + .speechBefore = {EC_WORD_I, EC_WORD_BRAG, EC_WORD_ABOUT, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_OK_QUES}, + .speechWin = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_LISTEN, EC_WORD_TO_ME, EC_WORD_BRAG}, + .speechLose = {EC_WORD_I_AM, EC_WORD_DISAPPOINTED, EC_WORD_YOU, EC_WORD_WON_T, EC_WORD_LISTEN, EC_WORD_TO_ME}, + .monSets = gBattleFrontierTrainerMons_Peter + }, + [290] = { + .facilityClass = FACILITY_CLASS_HIKER, + .trainerName = _("DE"), + .speechBefore = {EC_WORD_COME_ON, EC_WORD_LET_S, EC_WORD_GET, EC_WORD_A, EC_WORD_MOVE, EC_WORD_ON}, + .speechWin = {EC_WORD_I, EC_WORD_GET, EC_WORD_TO, EC_WORD_NAP, EC_WORD_AFTER, EC_WORD_THAT}, + .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_NAP, EC_WORD_AFTER, EC_WORD_THAT}, + .monSets = gBattleFrontierTrainerMons_Dev + }, + [291] = { + .facilityClass = FACILITY_CLASS_HIKER, + .trainerName = _("CORE"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_TEACH, EC_WORD_YOU, EC_WORD_HOW, EC_WORD_TOUGH, EC_WORD_I_AM}, + .speechWin = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_ME, EC_WORD_MAKE, EC_WORD_A, EC_MOVE(BRICK_BREAK)}, + .speechLose = {EC_WORD_MY, EC_MOVE2(FRUSTRATION), EC_WORD_IS, EC_WORD_CLOSE, EC_WORD_TO, EC_MOVE2(ERUPTION)}, + .monSets = gBattleFrontierTrainerMons_Corey + }, + [292] = { + .facilityClass = FACILITY_CLASS_KINDLER, + .trainerName = _("ANDR"), + .speechBefore = {EC_WORD_NOW, EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_WORD_PERFECT, EC_WORD_FLAME_BODY}, + .speechWin = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_FIERY, EC_WORD_DANCE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU, EC_WORD_WANT, EC_WORD_AN, EC_MOVE2(EXPLOSION), EC_WORD_HERE, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Andre + }, + [293] = { + .facilityClass = FACILITY_CLASS_KINDLER, + .trainerName = _("FERRI"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_IN, EC_WORD_THE, EC_WORD_OLD, EC_WORD_CLASS}, + .speechWin = {EC_WORD_NO_1, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_NO_1, EC_WORD_ANY, EC_WORD_MORE, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Ferris + }, + [294] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("ALIVI"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_GIDDY, EC_WORD_SO, EC_WORD_SHOULD, EC_WORD_YOU}, + .speechWin = {EC_WORD_IT, EC_WORD_WAS, EC_WORD_ALL, EC_WORD_TOGETHER, EC_WORD_TOO, EC_WORD_EASY}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GIDDY, EC_WORD_UP, EC_WORD_AND, EC_WORD_AWAY}, + .monSets = gBattleFrontierTrainerMons_Alivia + }, + [295] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("PAIG"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_ENJOY, EC_WORD_OUR, EC_WORD_BATTLE, EC_WORD_TOGETHER, -1}, + .speechWin = {EC_WORD_THAT_S_IT_EXCL, -1, -1, EC_WORD_THANK_YOU, EC_WORD_VERY, EC_WORD_MUCH}, + .speechLose = {EC_WORD_THAT_S_IT_EXCL, -1, -1, EC_WORD_DO, EC_WORD_GO, EC_WORD_ON}, + .monSets = gBattleFrontierTrainerMons_Paige + }, + [296] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("ANY"), + .speechBefore = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_OH, EC_WORD_SO, EC_WORD_PRETTY, EC_WORD_FASHION}, + .speechWin = {EC_WORD_FASHION, EC_WORD_SHOULD, EC_WORD_MATCH, EC_WORD_THE, EC_WORD_PERSON, -1}, + .speechLose = {EC_WORD_PRETTY, EC_WORD_COULD, EC_WORD_BE, EC_WORD_GOOD, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Anya + }, + [297] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("DAW"), + .speechBefore = {EC_WORD_I, EC_WORD_GO, EC_WORD_ALL, EC_WORD_OUT, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_A, EC_WORD_BABY, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_YOU, EC_WORD_WON, EC_WORD_EXCL, EC_WORD_MOVE, EC_WORD_ON, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Dawn + }, + [298] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("ABB"), + .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_THAT_S, EC_WORD_REFRESHING}, + .speechWin = {EC_WORD_VICTORY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_WHAT, EC_WORD_AN, EC_WORD_AWFUL, EC_WORD_STENCH, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Abby + }, + [299] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("GRETE"), + .speechBefore = {EC_WORD_I, EC_WORD_CAUSE, EC_MOVE(OUTRAGE), EC_WORD_AS, EC_WORD_A, EC_WORD_TRAINER}, + .speechWin = {EC_WORD_IT_S, EC_WORD_ONLY, EC_WORD_NATURAL, EC_WORD_SEE_YA, EC_WORD_BYE_BYE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_IT_S, EC_WORD_HARD, EC_WORD_TO, EC_WORD_BELIEVE, EC_WORD_BUT, EC_WORD_CONGRATS}, + .monSets = gBattleFrontierTrainerMons_Gretel + } +}; diff --git a/src/data/battle_frontier/battle_tent.h b/src/data/battle_frontier/battle_tent.h index 9a1539772..946ca0187 100644 --- a/src/data/battle_frontier/battle_tent.h +++ b/src/data/battle_frontier/battle_tent.h @@ -1,4 +1,3 @@ - // Slateport Battle Tent. const u16 gSlateportBattleTentTrainerMons_Jolie[] = { -- 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') 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_dome.c | 11 +- src/battle_factory.c | 5 - src/battle_pike.c | 2 - src/battle_pyramid.c | 3 - src/battle_tent.c | 4 - src/battle_tower.c | 163 +- src/data/battle_frontier/battle_frontier_mons.h | 1766 ++++++++++---------- .../battle_frontier/battle_frontier_trainers.h | 1042 ++++++------ src/frontier_util.c | 2 - 9 files changed, 1487 insertions(+), 1511 deletions(-) (limited to 'src') diff --git a/src/battle_dome.c b/src/battle_dome.c index 0f5721fb9..77d120bd4 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -26,6 +26,7 @@ #include "international_string_util.h" #include "trainer_pokemon_sprites.h" #include "scanline_effect.h" +#include "script_pokemon_util_80F87D8.h" #include "graphics.h" #include "constants/species.h" #include "constants/moves.h" @@ -57,19 +58,9 @@ struct UnkStruct_860DD10 }; extern void sub_81B8558(void); -extern u16 GetFrontierBrainMonMove(u8 monId, u8 moveSlotId); -extern u8 GetFrontierBrainMonEvs(u8, u8); -extern u8 GetFrontierBrainMonNature(u8); -extern void sub_81A4C30(void); -extern u8 sub_81A3610(void); -extern u16 GetFrontierBrainMonSpecies(u8); -extern void ReducePlayerPartyToSelectedMons(void); extern u8 gSelectedOrderFromParty[]; -extern const u16 gBattleFrontierHeldItems[]; -extern const struct FacilityMon gBattleFrontierMons[]; -extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; extern const struct SpriteTemplate gUnknown_0860CFA8; // text diff --git a/src/battle_factory.c b/src/battle_factory.c index 1d7fbafc9..a693acfb6 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -13,11 +13,6 @@ #include "constants/trainers.h" #include "constants/moves.h" -extern const struct FacilityMon gBattleFrontierMons[]; -extern const struct FacilityMon gSlateportBattleTentMons[]; -extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; -extern const u16 gBattleFrontierHeldItems[]; - // IWRAM bss static IWRAM_DATA bool8 gUnknown_03001288; diff --git a/src/battle_pike.c b/src/battle_pike.c index 38d3e7d4a..39a911303 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -50,8 +50,6 @@ struct PikeWildMon u16 moves[4]; }; -extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; - // IWRAM bss static IWRAM_DATA u8 sRoomType; static IWRAM_DATA u8 sStatusMon; diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 23343ba20..def071435 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -37,9 +37,6 @@ extern void door_upload_tiles(void); extern const struct MapLayout *const gMapLayouts[]; extern const u16 gUnknown_08D856C8[][16]; -extern const u16 gBattleFrontierHeldItems[]; -extern const struct FacilityMon gBattleFrontierMons[]; -extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; #define TOTAL_ROUNDS 20 #define PICKUP_ITEMS_PER_ROUND 10 diff --git a/src/battle_tent.c b/src/battle_tent.c index c7e70912c..d66c093e9 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -14,10 +14,6 @@ #include "constants/items.h" #include "constants/region_map_sections.h" -extern const struct BattleFrontierTrainer gSlateportBattleTentTrainers[]; -extern const struct FacilityMon gSlateportBattleTentMons[]; -extern const u16 gBattleFrontierHeldItems[]; - // This file's functions. static void sub_81B99D4(void); static void sub_81B9A28(void); 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. diff --git a/src/data/battle_frontier/battle_frontier_mons.h b/src/data/battle_frontier/battle_frontier_mons.h index 371b0f170..44cfb8036 100644 --- a/src/data/battle_frontier/battle_frontier_mons.h +++ b/src/data/battle_frontier/battle_frontier_mons.h @@ -1,6175 +1,6175 @@ -const struct FacilityMon gBattleFrontierMons[] = +const struct FacilityMon gBattleFrontierMons[] = { [0] = { .species = SPECIES_SUNKERN, - .moves = {MOVE_MEGA_DRAIN MOVE_HELPING_HAND MOVE_SUNNY_DAY MOVE_LIGHT_SCREEN}, + .moves = {MOVE_MEGA_DRAIN, MOVE_HELPING_HAND, MOVE_SUNNY_DAY, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [1] = { .species = SPECIES_AZURILL, - .moves = {MOVE_WATER_PULSE MOVE_ATTRACT MOVE_SING MOVE_CHARM}, + .moves = {MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SING, MOVE_CHARM}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RASH }, [2] = { .species = SPECIES_CATERPIE, - .moves = {MOVE_TACKLE MOVE_STRING_SHOT MOVE_NONE MOVE_NONE}, + .moves = {MOVE_TACKLE, MOVE_STRING_SHOT, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [3] = { .species = SPECIES_WEEDLE, - .moves = {MOVE_POISON_STING MOVE_STRING_SHOT MOVE_NONE MOVE_NONE}, + .moves = {MOVE_POISON_STING, MOVE_STRING_SHOT, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [4] = { .species = SPECIES_WURMPLE, - .moves = {MOVE_TACKLE MOVE_STRING_SHOT MOVE_POISON_STING MOVE_NONE}, + .moves = {MOVE_TACKLE, MOVE_STRING_SHOT, MOVE_POISON_STING, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [5] = { .species = SPECIES_RALTS, - .moves = {MOVE_CONFUSION MOVE_IMPRISON MOVE_DOUBLE_TEAM MOVE_LIGHT_SCREEN}, + .moves = {MOVE_CONFUSION, MOVE_IMPRISON, MOVE_DOUBLE_TEAM, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [6] = { .species = SPECIES_MAGIKARP, - .moves = {MOVE_FLAIL MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_FLAIL, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [7] = { .species = SPECIES_FEEBAS, - .moves = {MOVE_FLAIL MOVE_MIRROR_COAT MOVE_NONE MOVE_NONE}, + .moves = {MOVE_FLAIL, MOVE_MIRROR_COAT, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [8] = { .species = SPECIES_METAPOD, - .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BASHFUL }, [9] = { .species = SPECIES_KAKUNA, - .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BASHFUL }, [10] = { .species = SPECIES_PICHU, - .moves = {MOVE_SWEET_KISS MOVE_THUNDER_WAVE MOVE_ATTRACT MOVE_SHOCK_WAVE}, + .moves = {MOVE_SWEET_KISS, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_SHOCK_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RASH }, [11] = { .species = SPECIES_SILCOON, - .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BASHFUL }, [12] = { .species = SPECIES_CASCOON, - .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BASHFUL }, [13] = { .species = SPECIES_IGGLYBUFF, - .moves = {MOVE_SWEET_KISS MOVE_SING MOVE_ATTRACT MOVE_SEISMIC_TOSS}, + .moves = {MOVE_SWEET_KISS, MOVE_SING, MOVE_ATTRACT, MOVE_SEISMIC_TOSS}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [14] = { .species = SPECIES_WOOPER, - .moves = {MOVE_YAWN MOVE_DIG MOVE_WATER_PULSE MOVE_RAIN_DANCE}, + .moves = {MOVE_YAWN, MOVE_DIG, MOVE_WATER_PULSE, MOVE_RAIN_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [15] = { .species = SPECIES_TYROGUE, - .moves = {MOVE_MACH_PUNCH MOVE_PROTECT MOVE_DOUBLE_TEAM MOVE_FACADE}, + .moves = {MOVE_MACH_PUNCH, MOVE_PROTECT, MOVE_DOUBLE_TEAM, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [16] = { .species = SPECIES_SENTRET, - .moves = {MOVE_QUICK_ATTACK MOVE_FOLLOW_ME MOVE_HELPING_HAND MOVE_ASSIST}, + .moves = {MOVE_QUICK_ATTACK, MOVE_FOLLOW_ME, MOVE_HELPING_HAND, MOVE_ASSIST}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [17] = { .species = SPECIES_CLEFFA, - .moves = {MOVE_SWEET_KISS MOVE_SING MOVE_ATTRACT MOVE_METRONOME}, + .moves = {MOVE_SWEET_KISS, MOVE_SING, MOVE_ATTRACT, MOVE_METRONOME}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SERIOUS }, [18] = { .species = SPECIES_SEEDOT, - .moves = {MOVE_BULLET_SEED MOVE_BIDE MOVE_DEFENSE_CURL MOVE_ROLLOUT}, + .moves = {MOVE_BULLET_SEED, MOVE_BIDE, MOVE_DEFENSE_CURL, MOVE_ROLLOUT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [19] = { .species = SPECIES_LOTAD, - .moves = {MOVE_RAIN_DANCE MOVE_WATER_PULSE MOVE_SUNNY_DAY MOVE_MEGA_DRAIN}, + .moves = {MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_SUNNY_DAY, MOVE_MEGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [20] = { .species = SPECIES_POOCHYENA, - .moves = {MOVE_CRUNCH MOVE_SWAGGER MOVE_ROAR MOVE_SAND_ATTACK}, + .moves = {MOVE_CRUNCH, MOVE_SWAGGER, MOVE_ROAR, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [21] = { .species = SPECIES_SHEDINJA, - .moves = {MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_SILVER_WIND MOVE_GRUDGE}, + .moves = {MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_SILVER_WIND, MOVE_GRUDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_NAIVE }, [22] = { .species = SPECIES_MAKUHITA, - .moves = {MOVE_FAKE_OUT MOVE_SEISMIC_TOSS MOVE_DETECT MOVE_WHIRLWIND}, + .moves = {MOVE_FAKE_OUT, MOVE_SEISMIC_TOSS, MOVE_DETECT, MOVE_WHIRLWIND}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [23] = { .species = SPECIES_WHISMUR, - .moves = {MOVE_UPROAR MOVE_SWAGGER MOVE_BODY_SLAM MOVE_SMELLING_SALT}, + .moves = {MOVE_UPROAR, MOVE_SWAGGER, MOVE_BODY_SLAM, MOVE_SMELLING_SALT}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [24] = { .species = SPECIES_ZIGZAGOON, - .moves = {MOVE_HEADBUTT MOVE_PIN_MISSILE MOVE_SWIFT MOVE_SAND_ATTACK}, + .moves = {MOVE_HEADBUTT, MOVE_PIN_MISSILE, MOVE_SWIFT, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_TIMID }, [25] = { .species = SPECIES_ZUBAT, - .moves = {MOVE_POISON_FANG MOVE_WHIRLWIND MOVE_CONFUSE_RAY MOVE_AERIAL_ACE}, + .moves = {MOVE_POISON_FANG, MOVE_WHIRLWIND, MOVE_CONFUSE_RAY, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [26] = { .species = SPECIES_TOGEPI, - .moves = {MOVE_RETURN MOVE_YAWN MOVE_WISH MOVE_SWEET_KISS}, + .moves = {MOVE_RETURN, MOVE_YAWN, MOVE_WISH, MOVE_SWEET_KISS}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [27] = { .species = SPECIES_SPINARAK, - .moves = {MOVE_SIGNAL_BEAM MOVE_NIGHT_SHADE MOVE_SPIDER_WEB MOVE_SCARY_FACE}, + .moves = {MOVE_SIGNAL_BEAM, MOVE_NIGHT_SHADE, MOVE_SPIDER_WEB, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [28] = { .species = SPECIES_MARILL, - .moves = {MOVE_WATER_PULSE MOVE_RAIN_DANCE MOVE_LIGHT_SCREEN MOVE_RETURN}, + .moves = {MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_LIGHT_SCREEN, MOVE_RETURN}, .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_GENTLE }, [29] = { .species = SPECIES_HOPPIP, - .moves = {MOVE_MEGA_DRAIN MOVE_LEECH_SEED MOVE_SLEEP_POWDER MOVE_STUN_SPORE}, + .moves = {MOVE_MEGA_DRAIN, MOVE_LEECH_SEED, MOVE_SLEEP_POWDER, MOVE_STUN_SPORE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_LAX }, [30] = { .species = SPECIES_SLUGMA, - .moves = {MOVE_EMBER MOVE_ROCK_SLIDE MOVE_YAWN MOVE_BODY_SLAM}, + .moves = {MOVE_EMBER, MOVE_ROCK_SLIDE, MOVE_YAWN, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [31] = { .species = SPECIES_SWINUB, - .moves = {MOVE_ICY_WIND MOVE_DIG MOVE_ROCK_TOMB MOVE_ENDURE}, + .moves = {MOVE_ICY_WIND, MOVE_DIG, MOVE_ROCK_TOMB, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_GENTLE }, [32] = { .species = SPECIES_SMEARGLE, - .moves = {MOVE_EXTREME_SPEED MOVE_FAKE_OUT MOVE_QUICK_ATTACK MOVE_MACH_PUNCH}, + .moves = {MOVE_EXTREME_SPEED, MOVE_FAKE_OUT, MOVE_QUICK_ATTACK, MOVE_MACH_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [33] = { .species = SPECIES_PIDGEY, - .moves = {MOVE_GUST MOVE_SAND_ATTACK MOVE_WHIRLWIND MOVE_QUICK_ATTACK}, + .moves = {MOVE_GUST, MOVE_SAND_ATTACK, MOVE_WHIRLWIND, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [34] = { .species = SPECIES_RATTATA, - .moves = {MOVE_HYPER_FANG MOVE_PURSUIT MOVE_QUICK_ATTACK MOVE_SWAGGER}, + .moves = {MOVE_HYPER_FANG, MOVE_PURSUIT, MOVE_QUICK_ATTACK, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [35] = { .species = SPECIES_WYNAUT, - .moves = {MOVE_ENCORE MOVE_COUNTER MOVE_MIRROR_COAT MOVE_CHARM}, + .moves = {MOVE_ENCORE, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_CHARM}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_JOLLY }, [36] = { .species = SPECIES_SKITTY, - .moves = {MOVE_SING MOVE_ATTRACT MOVE_CHARM MOVE_DOUBLE_SLAP}, + .moves = {MOVE_SING, MOVE_ATTRACT, MOVE_CHARM, MOVE_DOUBLE_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [37] = { .species = SPECIES_SPEAROW, - .moves = {MOVE_FURY_ATTACK MOVE_PURSUIT MOVE_MIRROR_MOVE MOVE_PROTECT}, + .moves = {MOVE_FURY_ATTACK, MOVE_PURSUIT, MOVE_MIRROR_MOVE, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [38] = { .species = SPECIES_HOOTHOOT, - .moves = {MOVE_CONFUSION MOVE_HYPNOSIS MOVE_SUPERSONIC MOVE_REFLECT}, + .moves = {MOVE_CONFUSION, MOVE_HYPNOSIS, MOVE_SUPERSONIC, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [39] = { .species = SPECIES_DIGLETT, - .moves = {MOVE_MAGNITUDE MOVE_SLASH MOVE_ROCK_TOMB MOVE_SAND_ATTACK}, + .moves = {MOVE_MAGNITUDE, MOVE_SLASH, MOVE_ROCK_TOMB, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_NAIVE }, [40] = { .species = SPECIES_LEDYBA, - .moves = {MOVE_PSYBEAM MOVE_AGILITY MOVE_BATON_PASS MOVE_LIGHT_SCREEN}, + .moves = {MOVE_PSYBEAM, MOVE_AGILITY, MOVE_BATON_PASS, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_BASHFUL }, [41] = { .species = SPECIES_NINCADA, - .moves = {MOVE_MUD_SLAP MOVE_DIG MOVE_TOXIC MOVE_PROTECT}, + .moves = {MOVE_MUD_SLAP, MOVE_DIG, MOVE_TOXIC, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [42] = { .species = SPECIES_SURSKIT, - .moves = {MOVE_BUBBLE_BEAM MOVE_RAIN_DANCE MOVE_SWEET_SCENT MOVE_QUICK_ATTACK}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_RAIN_DANCE, MOVE_SWEET_SCENT, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [43] = { .species = SPECIES_JIGGLYPUFF, - .moves = {MOVE_SING MOVE_WISH MOVE_MIMIC MOVE_DOUBLE_SLAP}, + .moves = {MOVE_SING, MOVE_WISH, MOVE_MIMIC, MOVE_DOUBLE_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [44] = { .species = SPECIES_TAILLOW, - .moves = {MOVE_FLY MOVE_QUICK_ATTACK MOVE_ENDEAVOR MOVE_FOCUS_ENERGY}, + .moves = {MOVE_FLY, MOVE_QUICK_ATTACK, MOVE_ENDEAVOR, MOVE_FOCUS_ENERGY}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_GENTLE }, [45] = { .species = SPECIES_WINGULL, - .moves = {MOVE_WATER_PULSE MOVE_FLY MOVE_QUICK_ATTACK MOVE_STEEL_WING}, + .moves = {MOVE_WATER_PULSE, MOVE_FLY, MOVE_QUICK_ATTACK, MOVE_STEEL_WING}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [46] = { .species = SPECIES_NIDORAN_M, - .moves = {MOVE_DOUBLE_KICK MOVE_POISON_STING MOVE_DISABLE MOVE_HELPING_HAND}, + .moves = {MOVE_DOUBLE_KICK, MOVE_POISON_STING, MOVE_DISABLE, MOVE_HELPING_HAND}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [47] = { .species = SPECIES_NIDORAN_F, - .moves = {MOVE_CRUNCH MOVE_DOUBLE_KICK MOVE_FLATTER MOVE_HELPING_HAND}, + .moves = {MOVE_CRUNCH, MOVE_DOUBLE_KICK, MOVE_FLATTER, MOVE_HELPING_HAND}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [48] = { .species = SPECIES_KIRLIA, - .moves = {MOVE_CONFUSION MOVE_WILL_O_WISP MOVE_FUTURE_SIGHT MOVE_LIGHT_SCREEN}, + .moves = {MOVE_CONFUSION, MOVE_WILL_O_WISP, MOVE_FUTURE_SIGHT, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [49] = { .species = SPECIES_MAREEP, - .moves = {MOVE_SHOCK_WAVE MOVE_FLASH MOVE_REFLECT MOVE_COTTON_SPORE}, + .moves = {MOVE_SHOCK_WAVE, MOVE_FLASH, MOVE_REFLECT, MOVE_COTTON_SPORE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [50] = { .species = SPECIES_MEDITITE, - .moves = {MOVE_HI_JUMP_KICK MOVE_MEDITATE MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [51] = { .species = SPECIES_SLAKOTH, - .moves = {MOVE_YAWN MOVE_SCRATCH MOVE_ENCORE MOVE_COUNTER}, + .moves = {MOVE_YAWN, MOVE_SCRATCH, MOVE_ENCORE, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [52] = { .species = SPECIES_PARAS, - .moves = {MOVE_SPORE MOVE_LEECH_LIFE MOVE_SLASH MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SPORE, MOVE_LEECH_LIFE, MOVE_SLASH, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [53] = { .species = SPECIES_EKANS, - .moves = {MOVE_ACID MOVE_DIG MOVE_SCREECH MOVE_TORMENT}, + .moves = {MOVE_ACID, MOVE_DIG, MOVE_SCREECH, MOVE_TORMENT}, .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [54] = { .species = SPECIES_DITTO, - .moves = {MOVE_TRANSFORM MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_TRANSFORM, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_METAL_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [55] = { .species = SPECIES_BARBOACH, - .moves = {MOVE_MAGNITUDE MOVE_WATER_PULSE MOVE_SPARK MOVE_FUTURE_SIGHT}, + .moves = {MOVE_MAGNITUDE, MOVE_WATER_PULSE, MOVE_SPARK, MOVE_FUTURE_SIGHT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_BASHFUL }, [56] = { .species = SPECIES_MEOWTH, - .moves = {MOVE_SLASH MOVE_BITE MOVE_SCREECH MOVE_FAKE_OUT}, + .moves = {MOVE_SLASH, MOVE_BITE, MOVE_SCREECH, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [57] = { .species = SPECIES_PINECO, - .moves = {MOVE_SELF_DESTRUCT MOVE_TAKE_DOWN MOVE_REFLECT MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SELF_DESTRUCT, MOVE_TAKE_DOWN, MOVE_REFLECT, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [58] = { .species = SPECIES_TRAPINCH, - .moves = {MOVE_TOXIC MOVE_DIG MOVE_SANDSTORM MOVE_SAND_ATTACK}, + .moves = {MOVE_TOXIC, MOVE_DIG, MOVE_SANDSTORM, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SERIOUS }, [59] = { .species = SPECIES_SPHEAL, - .moves = {MOVE_ICE_BALL MOVE_WATER_PULSE MOVE_HAIL MOVE_MUD_SLAP}, + .moves = {MOVE_ICE_BALL, MOVE_WATER_PULSE, MOVE_HAIL, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [60] = { .species = SPECIES_HORSEA, - .moves = {MOVE_WATER_GUN MOVE_AGILITY MOVE_ICY_WIND MOVE_TWISTER}, + .moves = {MOVE_WATER_GUN, MOVE_AGILITY, MOVE_ICY_WIND, MOVE_TWISTER}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [61] = { .species = SPECIES_SHROOMISH, - .moves = {MOVE_SPORE MOVE_BULLET_SEED MOVE_LEECH_SEED MOVE_HEADBUTT}, + .moves = {MOVE_SPORE, MOVE_BULLET_SEED, MOVE_LEECH_SEED, MOVE_HEADBUTT}, .itemTableId = BATTLE_FRONTIER_ITEM_MIRACLE_SEED, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [62] = { .species = SPECIES_SHUPPET, - .moves = {MOVE_WILL_O_WISP MOVE_NIGHT_SHADE MOVE_GRUDGE MOVE_KNOCK_OFF}, + .moves = {MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_GRUDGE, MOVE_KNOCK_OFF}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RASH }, [63] = { .species = SPECIES_DUSKULL, - .moves = {MOVE_SKILL_SWAP MOVE_NIGHT_SHADE MOVE_DISABLE MOVE_CONFUSE_RAY}, + .moves = {MOVE_SKILL_SWAP, MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [64] = { .species = SPECIES_ELECTRIKE, - .moves = {MOVE_SPARK MOVE_THUNDER_WAVE MOVE_ROAR MOVE_QUICK_ATTACK}, + .moves = {MOVE_SPARK, MOVE_THUNDER_WAVE, MOVE_ROAR, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [65] = { .species = SPECIES_VULPIX, - .moves = {MOVE_WILL_O_WISP MOVE_CONFUSE_RAY MOVE_FIRE_SPIN MOVE_QUICK_ATTACK}, + .moves = {MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_FIRE_SPIN, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [66] = { .species = SPECIES_PIKACHU, - .moves = {MOVE_THUNDER_PUNCH MOVE_THUNDER_WAVE MOVE_DOUBLE_TEAM MOVE_QUICK_ATTACK}, + .moves = {MOVE_THUNDER_PUNCH, MOVE_THUNDER_WAVE, MOVE_DOUBLE_TEAM, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_LIGHT_BALL, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [67] = { .species = SPECIES_SANDSHREW, - .moves = {MOVE_DIG MOVE_ROCK_TOMB MOVE_SANDSTORM MOVE_SAND_ATTACK}, + .moves = {MOVE_DIG, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [68] = { .species = SPECIES_POLIWAG, - .moves = {MOVE_HYPNOSIS MOVE_ICY_WIND MOVE_WATER_GUN MOVE_RAIN_DANCE}, + .moves = {MOVE_HYPNOSIS, MOVE_ICY_WIND, MOVE_WATER_GUN, MOVE_RAIN_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [69] = { .species = SPECIES_BELLSPROUT, - .moves = {MOVE_RAZOR_LEAF MOVE_ACID MOVE_STUN_SPORE MOVE_WRAP}, + .moves = {MOVE_RAZOR_LEAF, MOVE_ACID, MOVE_STUN_SPORE, MOVE_WRAP}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_LAX }, [70] = { .species = SPECIES_GEODUDE, - .moves = {MOVE_MAGNITUDE MOVE_ROCK_BLAST MOVE_STRENGTH MOVE_PROTECT}, + .moves = {MOVE_MAGNITUDE, MOVE_ROCK_BLAST, MOVE_STRENGTH, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_BRAVE }, [71] = { .species = SPECIES_DRATINI, - .moves = {MOVE_OUTRAGE MOVE_THUNDER_WAVE MOVE_SUPERSONIC MOVE_WATER_PULSE}, + .moves = {MOVE_OUTRAGE, MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_WATER_PULSE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [72] = { .species = SPECIES_SNUBBULL, - .moves = {MOVE_BITE MOVE_CHARM MOVE_SWAGGER MOVE_SCARY_FACE}, + .moves = {MOVE_BITE, MOVE_CHARM, MOVE_SWAGGER, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [73] = { .species = SPECIES_REMORAID, - .moves = {MOVE_BUBBLE_BEAM MOVE_AURORA_BEAM MOVE_PSYBEAM MOVE_PROTECT}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_AURORA_BEAM, MOVE_PSYBEAM, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [74] = { .species = SPECIES_LARVITAR, - .moves = {MOVE_THRASH MOVE_ROCK_SLIDE MOVE_DIG MOVE_DRAGON_DANCE}, + .moves = {MOVE_THRASH, MOVE_ROCK_SLIDE, MOVE_DIG, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [75] = { .species = SPECIES_BALTOY, - .moves = {MOVE_PSYBEAM MOVE_ANCIENT_POWER MOVE_LIGHT_SCREEN MOVE_MUD_SLAP}, + .moves = {MOVE_PSYBEAM, MOVE_ANCIENT_POWER, MOVE_LIGHT_SCREEN, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_NAUGHTY }, [76] = { .species = SPECIES_SNORUNT, - .moves = {MOVE_ICY_WIND MOVE_HEADBUTT MOVE_LEER MOVE_BITE}, + .moves = {MOVE_ICY_WIND, MOVE_HEADBUTT, MOVE_LEER, MOVE_BITE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_BRAVE }, [77] = { .species = SPECIES_BAGON, - .moves = {MOVE_DRAGON_BREATH MOVE_HEADBUTT MOVE_BRICK_BREAK MOVE_SCARY_FACE}, + .moves = {MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_BRICK_BREAK, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [78] = { .species = SPECIES_BELDUM, - .moves = {MOVE_TAKE_DOWN MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [79] = { .species = SPECIES_GULPIN, - .moves = {MOVE_TOXIC MOVE_YAWN MOVE_PAIN_SPLIT MOVE_ATTRACT}, + .moves = {MOVE_TOXIC, MOVE_YAWN, MOVE_PAIN_SPLIT, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SERIOUS }, [80] = { .species = SPECIES_VENONAT, - .moves = {MOVE_PSYBEAM MOVE_SUPERSONIC MOVE_STUN_SPORE MOVE_SKILL_SWAP}, + .moves = {MOVE_PSYBEAM, MOVE_SUPERSONIC, MOVE_STUN_SPORE, MOVE_SKILL_SWAP}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [81] = { .species = SPECIES_MANKEY, - .moves = {MOVE_KARATE_CHOP MOVE_LOW_KICK MOVE_SCREECH MOVE_SWAGGER}, + .moves = {MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SCREECH, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [82] = { .species = SPECIES_MACHOP, - .moves = {MOVE_SEISMIC_TOSS MOVE_REVENGE MOVE_ROCK_TOMB MOVE_SCARY_FACE}, + .moves = {MOVE_SEISMIC_TOSS, MOVE_REVENGE, MOVE_ROCK_TOMB, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [83] = { .species = SPECIES_SHELLDER, - .moves = {MOVE_ICICLE_SPEAR MOVE_SUPERSONIC MOVE_CLAMP MOVE_WITHDRAW}, + .moves = {MOVE_ICICLE_SPEAR, MOVE_SUPERSONIC, MOVE_CLAMP, MOVE_WITHDRAW}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [84] = { .species = SPECIES_SMOOCHUM, - .moves = {MOVE_SWEET_KISS MOVE_SING MOVE_MUD_SLAP MOVE_FAKE_OUT}, + .moves = {MOVE_SWEET_KISS, MOVE_SING, MOVE_MUD_SLAP, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [85] = { .species = SPECIES_NUMEL, - .moves = {MOVE_EMBER MOVE_MAGNITUDE MOVE_ROCK_TOMB MOVE_SANDSTORM}, + .moves = {MOVE_EMBER, MOVE_MAGNITUDE, MOVE_ROCK_TOMB, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [86] = { .species = SPECIES_CARVANHA, - .moves = {MOVE_BITE MOVE_SCREECH MOVE_SCARY_FACE MOVE_SWAGGER}, + .moves = {MOVE_BITE, MOVE_SCREECH, MOVE_SCARY_FACE, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [87] = { .species = SPECIES_CORPHISH, - .moves = {MOVE_CRABHAMMER MOVE_WATER_PULSE MOVE_MUD_SLAP MOVE_PROTECT}, + .moves = {MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_MUD_SLAP, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_BRAVE }, [88] = { .species = SPECIES_CHARMANDER, - .moves = {MOVE_FIRE_SPIN MOVE_METAL_CLAW MOVE_SMOKESCREEN MOVE_SCARY_FACE}, + .moves = {MOVE_FIRE_SPIN, MOVE_METAL_CLAW, MOVE_SMOKESCREEN, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [89] = { .species = SPECIES_CYNDAQUIL, - .moves = {MOVE_EMBER MOVE_SWIFT MOVE_QUICK_ATTACK MOVE_SMOKESCREEN}, + .moves = {MOVE_EMBER, MOVE_SWIFT, MOVE_QUICK_ATTACK, MOVE_SMOKESCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [90] = { .species = SPECIES_ABRA, - .moves = {MOVE_MIMIC MOVE_METRONOME MOVE_FLASH MOVE_SEISMIC_TOSS}, + .moves = {MOVE_MIMIC, MOVE_METRONOME, MOVE_FLASH, MOVE_SEISMIC_TOSS}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [91] = { .species = SPECIES_DODUO, - .moves = {MOVE_FURY_ATTACK MOVE_UPROAR MOVE_MUD_SLAP MOVE_FAINT_ATTACK}, + .moves = {MOVE_FURY_ATTACK, MOVE_UPROAR, MOVE_MUD_SLAP, MOVE_FAINT_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [92] = { .species = SPECIES_GASTLY, - .moves = {MOVE_DREAM_EATER MOVE_HYPNOSIS MOVE_NIGHT_SHADE MOVE_CONFUSE_RAY}, + .moves = {MOVE_DREAM_EATER, MOVE_HYPNOSIS, MOVE_NIGHT_SHADE, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [93] = { .species = SPECIES_SWABLU, - .moves = {MOVE_TAKE_DOWN MOVE_DREAM_EATER MOVE_SING MOVE_ATTRACT}, + .moves = {MOVE_TAKE_DOWN, MOVE_DREAM_EATER, MOVE_SING, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [94] = { .species = SPECIES_TREECKO, - .moves = {MOVE_BULLET_SEED MOVE_AERIAL_ACE MOVE_QUICK_ATTACK MOVE_DOUBLE_TEAM}, + .moves = {MOVE_BULLET_SEED, MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_LONELY }, [95] = { .species = SPECIES_TORCHIC, - .moves = {MOVE_FIRE_SPIN MOVE_QUICK_ATTACK MOVE_SAND_ATTACK MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FIRE_SPIN, MOVE_QUICK_ATTACK, MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [96] = { .species = SPECIES_MUDKIP, - .moves = {MOVE_WHIRLPOOL MOVE_ENDEAVOR MOVE_MUD_SPORT MOVE_MUD_SLAP}, + .moves = {MOVE_WHIRLPOOL, MOVE_ENDEAVOR, MOVE_MUD_SPORT, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [97] = { .species = SPECIES_SQUIRTLE, - .moves = {MOVE_WATER_PULSE MOVE_BITE MOVE_WITHDRAW MOVE_PROTECT}, + .moves = {MOVE_WATER_PULSE, MOVE_BITE, MOVE_WITHDRAW, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [98] = { .species = SPECIES_TOTODILE, - .moves = {MOVE_SLASH MOVE_WATER_PULSE MOVE_SCREECH MOVE_ICY_WIND}, + .moves = {MOVE_SLASH, MOVE_WATER_PULSE, MOVE_SCREECH, MOVE_ICY_WIND}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [99] = { .species = SPECIES_SLOWPOKE, - .moves = {MOVE_CONFUSION MOVE_DISABLE MOVE_WATER_PULSE MOVE_YAWN}, + .moves = {MOVE_CONFUSION, MOVE_DISABLE, MOVE_WATER_PULSE, MOVE_YAWN}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_BRAVE }, [100] = { .species = SPECIES_BULBASAUR, - .moves = {MOVE_RAZOR_LEAF MOVE_SWEET_SCENT MOVE_SLEEP_POWDER MOVE_LIGHT_SCREEN}, + .moves = {MOVE_RAZOR_LEAF, MOVE_SWEET_SCENT, MOVE_SLEEP_POWDER, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [101] = { .species = SPECIES_CHIKORITA, - .moves = {MOVE_SECRET_POWER MOVE_BULLET_SEED MOVE_MUD_SLAP MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SECRET_POWER, MOVE_BULLET_SEED, MOVE_MUD_SLAP, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [102] = { .species = SPECIES_ODDISH, - .moves = {MOVE_ACID MOVE_STUN_SPORE MOVE_SWEET_SCENT MOVE_MOONLIGHT}, + .moves = {MOVE_ACID, MOVE_STUN_SPORE, MOVE_SWEET_SCENT, MOVE_MOONLIGHT}, .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [103] = { .species = SPECIES_PSYDUCK, - .moves = {MOVE_CONFUSION MOVE_FURY_SWIPES MOVE_AERIAL_ACE MOVE_DISABLE}, + .moves = {MOVE_CONFUSION, MOVE_FURY_SWIPES, MOVE_AERIAL_ACE, MOVE_DISABLE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HASTY }, [104] = { .species = SPECIES_CUBONE, - .moves = {MOVE_BONE_CLUB MOVE_HEADBUTT MOVE_BRICK_BREAK MOVE_AERIAL_ACE}, + .moves = {MOVE_BONE_CLUB, MOVE_HEADBUTT, MOVE_BRICK_BREAK, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [105] = { .species = SPECIES_GOLDEEN, - .moves = {MOVE_WATERFALL MOVE_FURY_ATTACK MOVE_AGILITY MOVE_PSYBEAM}, + .moves = {MOVE_WATERFALL, MOVE_FURY_ATTACK, MOVE_AGILITY, MOVE_PSYBEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [106] = { .species = SPECIES_NATU, - .moves = {MOVE_NIGHT_SHADE MOVE_FUTURE_SIGHT MOVE_CONFUSE_RAY MOVE_FLASH}, + .moves = {MOVE_NIGHT_SHADE, MOVE_FUTURE_SIGHT, MOVE_CONFUSE_RAY, MOVE_FLASH}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [107] = { .species = SPECIES_CLEFAIRY, - .moves = {MOVE_FOLLOW_ME MOVE_RETURN MOVE_ENCORE MOVE_SING}, + .moves = {MOVE_FOLLOW_ME, MOVE_RETURN, MOVE_ENCORE, MOVE_SING}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [108] = { .species = SPECIES_MAGNEMITE, - .moves = {MOVE_SHOCK_WAVE MOVE_SUPERSONIC MOVE_METAL_SOUND MOVE_REFLECT}, + .moves = {MOVE_SHOCK_WAVE, MOVE_SUPERSONIC, MOVE_METAL_SOUND, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_GENTLE }, [109] = { .species = SPECIES_SEEL, - .moves = {MOVE_AURORA_BEAM MOVE_DIVE MOVE_BODY_SLAM MOVE_FAKE_OUT}, + .moves = {MOVE_AURORA_BEAM, MOVE_DIVE, MOVE_BODY_SLAM, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [110] = { .species = SPECIES_GRIMER, - .moves = {MOVE_SLUDGE MOVE_ROCK_TOMB MOVE_ACID_ARMOR MOVE_MINIMIZE}, + .moves = {MOVE_SLUDGE, MOVE_ROCK_TOMB, MOVE_ACID_ARMOR, MOVE_MINIMIZE}, .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [111] = { .species = SPECIES_KRABBY, - .moves = {MOVE_CRABHAMMER MOVE_MUD_SHOT MOVE_FLAIL MOVE_KNOCK_OFF}, + .moves = {MOVE_CRABHAMMER, MOVE_MUD_SHOT, MOVE_FLAIL, MOVE_KNOCK_OFF}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [112] = { .species = SPECIES_EXEGGCUTE, - .moves = {MOVE_CONFUSION MOVE_ANCIENT_POWER MOVE_LEECH_SEED MOVE_LIGHT_SCREEN}, + .moves = {MOVE_CONFUSION, MOVE_ANCIENT_POWER, MOVE_LEECH_SEED, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [113] = { .species = SPECIES_EEVEE, - .moves = {MOVE_CHARM MOVE_ATTRACT MOVE_FLAIL MOVE_ENDURE}, + .moves = {MOVE_CHARM, MOVE_ATTRACT, MOVE_FLAIL, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [114] = { .species = SPECIES_DROWZEE, - .moves = {MOVE_CONFUSION MOVE_HEADBUTT MOVE_DISABLE MOVE_BARRIER}, + .moves = {MOVE_CONFUSION, MOVE_HEADBUTT, MOVE_DISABLE, MOVE_BARRIER}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [115] = { .species = SPECIES_VOLTORB, - .moves = {MOVE_SPARK MOVE_SCREECH MOVE_ROLLOUT MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SPARK, MOVE_SCREECH, MOVE_ROLLOUT, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [116] = { .species = SPECIES_CHINCHOU, - .moves = {MOVE_SPARK MOVE_DIVE MOVE_CONFUSE_RAY MOVE_TAKE_DOWN}, + .moves = {MOVE_SPARK, MOVE_DIVE, MOVE_CONFUSE_RAY, MOVE_TAKE_DOWN}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [117] = { .species = SPECIES_TEDDIURSA, - .moves = {MOVE_SECRET_POWER MOVE_FAKE_TEARS MOVE_FAINT_ATTACK MOVE_REST}, + .moves = {MOVE_SECRET_POWER, MOVE_FAKE_TEARS, MOVE_FAINT_ATTACK, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [118] = { .species = SPECIES_DELIBIRD, - .moves = {MOVE_PRESENT MOVE_ICE_BALL MOVE_AERIAL_ACE MOVE_HAIL}, + .moves = {MOVE_PRESENT, MOVE_ICE_BALL, MOVE_AERIAL_ACE, MOVE_HAIL}, .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [119] = { .species = SPECIES_HOUNDOUR, - .moves = {MOVE_CRUNCH MOVE_EMBER MOVE_ROAR MOVE_PROTECT}, + .moves = {MOVE_CRUNCH, MOVE_EMBER, MOVE_ROAR, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [120] = { .species = SPECIES_PHANPY, - .moves = {MOVE_ROLLOUT MOVE_DEFENSE_CURL MOVE_ROCK_TOMB MOVE_SANDSTORM}, + .moves = {MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_ROCK_TOMB, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [121] = { .species = SPECIES_SPOINK, - .moves = {MOVE_PSYWAVE MOVE_BOUNCE MOVE_MAGIC_COAT MOVE_CONFUSE_RAY}, + .moves = {MOVE_PSYWAVE, MOVE_BOUNCE, MOVE_MAGIC_COAT, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [122] = { .species = SPECIES_ARON, - .moves = {MOVE_METAL_CLAW MOVE_AERIAL_ACE MOVE_METAL_SOUND MOVE_ROAR}, + .moves = {MOVE_METAL_CLAW, MOVE_AERIAL_ACE, MOVE_METAL_SOUND, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [123] = { .species = SPECIES_LUVDISC, - .moves = {MOVE_SWEET_KISS MOVE_ATTRACT MOVE_DIVE MOVE_RAIN_DANCE}, + .moves = {MOVE_SWEET_KISS, MOVE_ATTRACT, MOVE_DIVE, MOVE_RAIN_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [124] = { .species = SPECIES_TENTACOOL, - .moves = {MOVE_BUBBLE_BEAM MOVE_ACID MOVE_BARRIER MOVE_WRAP}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_ACID, MOVE_BARRIER, MOVE_WRAP}, .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [125] = { .species = SPECIES_CACNEA, - .moves = {MOVE_NEEDLE_ARM MOVE_FAINT_ATTACK MOVE_COTTON_SPORE MOVE_SAND_ATTACK}, + .moves = {MOVE_NEEDLE_ARM, MOVE_FAINT_ATTACK, MOVE_COTTON_SPORE, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [126] = { .species = SPECIES_UNOWN, - .moves = {MOVE_HIDDEN_POWER MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [127] = { .species = SPECIES_KOFFING, - .moves = {MOVE_SLUDGE MOVE_SMOKESCREEN MOVE_TORMENT MOVE_HAZE}, + .moves = {MOVE_SLUDGE, MOVE_SMOKESCREEN, MOVE_TORMENT, MOVE_HAZE}, .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [128] = { .species = SPECIES_STARYU, - .moves = {MOVE_BUBBLE_BEAM MOVE_MINIMIZE MOVE_SWIFT MOVE_LIGHT_SCREEN}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_MINIMIZE, MOVE_SWIFT, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [129] = { .species = SPECIES_SKIPLOOM, - .moves = {MOVE_MEGA_DRAIN MOVE_CONFUSION MOVE_COTTON_SPORE MOVE_SYNTHESIS}, + .moves = {MOVE_MEGA_DRAIN, MOVE_CONFUSION, MOVE_COTTON_SPORE, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [130] = { .species = SPECIES_NUZLEAF, - .moves = {MOVE_EXTRASENSORY MOVE_FAKE_OUT MOVE_RAZOR_WIND MOVE_FAINT_ATTACK}, + .moves = {MOVE_EXTRASENSORY, MOVE_FAKE_OUT, MOVE_RAZOR_WIND, MOVE_FAINT_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [131] = { .species = SPECIES_LOMBRE, - .moves = {MOVE_WATER_PULSE MOVE_FAKE_OUT MOVE_BRICK_BREAK MOVE_ABSORB}, + .moves = {MOVE_WATER_PULSE, MOVE_FAKE_OUT, MOVE_BRICK_BREAK, MOVE_ABSORB}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [132] = { .species = SPECIES_VIBRAVA, - .moves = {MOVE_DRAGON_BREATH MOVE_DIG MOVE_SCREECH MOVE_ROCK_TOMB}, + .moves = {MOVE_DRAGON_BREATH, MOVE_DIG, MOVE_SCREECH, MOVE_ROCK_TOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [133] = { .species = SPECIES_RHYHORN, - .moves = {MOVE_ROCK_BLAST MOVE_DIG MOVE_SCARY_FACE MOVE_ROAR}, + .moves = {MOVE_ROCK_BLAST, MOVE_DIG, MOVE_SCARY_FACE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [134] = { .species = SPECIES_CLAMPERL, - .moves = {MOVE_DIVE MOVE_TOXIC MOVE_IRON_DEFENSE MOVE_DOUBLE_TEAM}, + .moves = {MOVE_DIVE, MOVE_TOXIC, MOVE_IRON_DEFENSE, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_DEEP_SEA_SCALE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [135] = { .species = SPECIES_PIDGEOTTO, - .moves = {MOVE_AERIAL_ACE MOVE_QUICK_ATTACK MOVE_FEATHER_DANCE MOVE_SAND_ATTACK}, + .moves = {MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK, MOVE_FEATHER_DANCE, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [136] = { .species = SPECIES_GROWLITHE, - .moves = {MOVE_FLAME_WHEEL MOVE_BITE MOVE_ROAR MOVE_AGILITY}, + .moves = {MOVE_FLAME_WHEEL, MOVE_BITE, MOVE_ROAR, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [137] = { .species = SPECIES_FARFETCHD, - .moves = {MOVE_SLASH MOVE_KNOCK_OFF MOVE_SWORDS_DANCE MOVE_AGILITY}, + .moves = {MOVE_SLASH, MOVE_KNOCK_OFF, MOVE_SWORDS_DANCE, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_STICK, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [138] = { .species = SPECIES_OMANYTE, - .moves = {MOVE_MUD_SHOT MOVE_WATER_GUN MOVE_ANCIENT_POWER MOVE_TICKLE}, + .moves = {MOVE_MUD_SHOT, MOVE_WATER_GUN, MOVE_ANCIENT_POWER, MOVE_TICKLE}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [139] = { .species = SPECIES_KABUTO, - .moves = {MOVE_MEGA_DRAIN MOVE_ANCIENT_POWER MOVE_SAND_ATTACK MOVE_PROTECT}, + .moves = {MOVE_MEGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_SAND_ATTACK, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [140] = { .species = SPECIES_LILEEP, - .moves = {MOVE_ANCIENT_POWER MOVE_ACID MOVE_INGRAIN MOVE_CONFUSE_RAY}, + .moves = {MOVE_ANCIENT_POWER, MOVE_ACID, MOVE_INGRAIN, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [141] = { .species = SPECIES_ANORITH, - .moves = {MOVE_METAL_CLAW MOVE_FURY_CUTTER MOVE_ANCIENT_POWER MOVE_WATER_GUN}, + .moves = {MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_ANCIENT_POWER, MOVE_WATER_GUN}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [142] = { .species = SPECIES_AIPOM, - .moves = {MOVE_FURY_SWIPES MOVE_SAND_ATTACK MOVE_BATON_PASS MOVE_AGILITY}, + .moves = {MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_BATON_PASS, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [143] = { .species = SPECIES_ELEKID, - .moves = {MOVE_THUNDER_PUNCH MOVE_QUICK_ATTACK MOVE_SWIFT MOVE_LIGHT_SCREEN}, + .moves = {MOVE_THUNDER_PUNCH, MOVE_QUICK_ATTACK, MOVE_SWIFT, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAIVE }, [144] = { .species = SPECIES_LOUDRED, - .moves = {MOVE_STOMP MOVE_HOWL MOVE_ASTONISH MOVE_SUPERSONIC}, + .moves = {MOVE_STOMP, MOVE_HOWL, MOVE_ASTONISH, MOVE_SUPERSONIC}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [145] = { .species = SPECIES_SPINDA, - .moves = {MOVE_DIZZY_PUNCH MOVE_TEETER_DANCE MOVE_PSYBEAM MOVE_FAINT_ATTACK}, + .moves = {MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FAINT_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [146] = { .species = SPECIES_NIDORINA, - .moves = {MOVE_DOUBLE_KICK MOVE_BITE MOVE_AERIAL_ACE MOVE_FLATTER}, + .moves = {MOVE_DOUBLE_KICK, MOVE_BITE, MOVE_AERIAL_ACE, MOVE_FLATTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [147] = { .species = SPECIES_NIDORINO, - .moves = {MOVE_DOUBLE_KICK MOVE_WATER_PULSE MOVE_MUD_SLAP MOVE_FLATTER}, + .moves = {MOVE_DOUBLE_KICK, MOVE_WATER_PULSE, MOVE_MUD_SLAP, MOVE_FLATTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [148] = { .species = SPECIES_FLAAFFY, - .moves = {MOVE_SHOCK_WAVE MOVE_THUNDER_WAVE MOVE_COTTON_SPORE MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_COTTON_SPORE, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MILD }, [149] = { .species = SPECIES_MAGBY, - .moves = {MOVE_FIRE_PUNCH MOVE_SMOKESCREEN MOVE_CONFUSE_RAY MOVE_SMOG}, + .moves = {MOVE_FIRE_PUNCH, MOVE_SMOKESCREEN, MOVE_CONFUSE_RAY, MOVE_SMOG}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [150] = { .species = SPECIES_NOSEPASS, - .moves = {MOVE_ROCK_SLIDE MOVE_SHOCK_WAVE MOVE_THUNDER_WAVE MOVE_SANDSTORM}, + .moves = {MOVE_ROCK_SLIDE, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [151] = { .species = SPECIES_CORSOLA, - .moves = {MOVE_BUBBLE_BEAM MOVE_MIRROR_COAT MOVE_ATTRACT MOVE_ANCIENT_POWER}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_MIRROR_COAT, MOVE_ATTRACT, MOVE_ANCIENT_POWER}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [152] = { .species = SPECIES_MAWILE, - .moves = {MOVE_CRUNCH MOVE_FAKE_TEARS MOVE_IRON_DEFENSE MOVE_BATON_PASS}, + .moves = {MOVE_CRUNCH, MOVE_FAKE_TEARS, MOVE_IRON_DEFENSE, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [153] = { .species = SPECIES_BUTTERFREE, - .moves = {MOVE_SILVER_WIND MOVE_PSYBEAM MOVE_TOXIC MOVE_WHIRLWIND}, + .moves = {MOVE_SILVER_WIND, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_WHIRLWIND}, .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [154] = { .species = SPECIES_BEEDRILL, - .moves = {MOVE_TWINEEDLE MOVE_PURSUIT MOVE_ENDEAVOR MOVE_AGILITY}, + .moves = {MOVE_TWINEEDLE, MOVE_PURSUIT, MOVE_ENDEAVOR, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_NAUGHTY }, [155] = { .species = SPECIES_POLIWHIRL, - .moves = {MOVE_WATER_PULSE MOVE_DOUBLE_SLAP MOVE_ICY_WIND MOVE_RAIN_DANCE}, + .moves = {MOVE_WATER_PULSE, MOVE_DOUBLE_SLAP, MOVE_ICY_WIND, MOVE_RAIN_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [156] = { .species = SPECIES_ONIX, - .moves = {MOVE_ROCK_SLIDE MOVE_BIND MOVE_DRAGON_BREATH MOVE_SANDSTORM}, + .moves = {MOVE_ROCK_SLIDE, MOVE_BIND, MOVE_DRAGON_BREATH, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [157] = { .species = SPECIES_BEAUTIFLY, - .moves = {MOVE_SILVER_WIND MOVE_MEGA_DRAIN MOVE_ATTRACT MOVE_WHIRLWIND}, + .moves = {MOVE_SILVER_WIND, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_WHIRLWIND}, .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [158] = { .species = SPECIES_DUSTOX, - .moves = {MOVE_SILVER_WIND MOVE_TOXIC MOVE_PSYBEAM MOVE_WHIRLWIND}, + .moves = {MOVE_SILVER_WIND, MOVE_TOXIC, MOVE_PSYBEAM, MOVE_WHIRLWIND}, .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [159] = { .species = SPECIES_LEDIAN, - .moves = {MOVE_COMET_PUNCH MOVE_BATON_PASS MOVE_SWORDS_DANCE MOVE_AGILITY}, + .moves = {MOVE_COMET_PUNCH, MOVE_BATON_PASS, MOVE_SWORDS_DANCE, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_BASHFUL }, [160] = { .species = SPECIES_ARIADOS, - .moves = {MOVE_SIGNAL_BEAM MOVE_SPIDER_WEB MOVE_NIGHT_SHADE MOVE_TOXIC}, + .moves = {MOVE_SIGNAL_BEAM, MOVE_SPIDER_WEB, MOVE_NIGHT_SHADE, MOVE_TOXIC}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SERIOUS }, [161] = { .species = SPECIES_YANMA, - .moves = {MOVE_SIGNAL_BEAM MOVE_AERIAL_ACE MOVE_DOUBLE_TEAM MOVE_DETECT}, + .moves = {MOVE_SIGNAL_BEAM, MOVE_AERIAL_ACE, MOVE_DOUBLE_TEAM, MOVE_DETECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_RELAXED }, [162] = { .species = SPECIES_DELCATTY, - .moves = {MOVE_SECRET_POWER MOVE_FAINT_ATTACK MOVE_DOUBLE_TEAM MOVE_HEAL_BELL}, + .moves = {MOVE_SECRET_POWER, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_HEAL_BELL}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [163] = { .species = SPECIES_SABLEYE, - .moves = {MOVE_FAINT_ATTACK MOVE_CONFUSE_RAY MOVE_KNOCK_OFF MOVE_FAKE_OUT}, + .moves = {MOVE_FAINT_ATTACK, MOVE_CONFUSE_RAY, MOVE_KNOCK_OFF, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [164] = { .species = SPECIES_LICKITUNG, - .moves = {MOVE_SLAM MOVE_BRICK_BREAK MOVE_LICK MOVE_MUD_SLAP}, + .moves = {MOVE_SLAM, MOVE_BRICK_BREAK, MOVE_LICK, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [165] = { .species = SPECIES_WEEPINBELL, - .moves = {MOVE_RAZOR_LEAF MOVE_ACID MOVE_WRAP MOVE_SWEET_SCENT}, + .moves = {MOVE_RAZOR_LEAF, MOVE_ACID, MOVE_WRAP, MOVE_SWEET_SCENT}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [166] = { .species = SPECIES_GRAVELER, - .moves = {MOVE_MAGNITUDE MOVE_ROCK_THROW MOVE_DEFENSE_CURL MOVE_BRICK_BREAK}, + .moves = {MOVE_MAGNITUDE, MOVE_ROCK_THROW, MOVE_DEFENSE_CURL, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [167] = { .species = SPECIES_GLOOM, - .moves = {MOVE_PETAL_DANCE MOVE_ACID MOVE_STUN_SPORE MOVE_MOONLIGHT}, + .moves = {MOVE_PETAL_DANCE, MOVE_ACID, MOVE_STUN_SPORE, MOVE_MOONLIGHT}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [168] = { .species = SPECIES_PORYGON, - .moves = {MOVE_PSYBEAM MOVE_ICY_WIND MOVE_RECYCLE MOVE_AGILITY}, + .moves = {MOVE_PSYBEAM, MOVE_ICY_WIND, MOVE_RECYCLE, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [169] = { .species = SPECIES_KADABRA, - .moves = {MOVE_CONFUSION MOVE_ROLE_PLAY MOVE_FUTURE_SIGHT MOVE_DISABLE}, + .moves = {MOVE_CONFUSION, MOVE_ROLE_PLAY, MOVE_FUTURE_SIGHT, MOVE_DISABLE}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [170] = { .species = SPECIES_WAILMER, - .moves = {MOVE_WHIRLPOOL MOVE_ROAR MOVE_DEFENSE_CURL MOVE_ROLLOUT}, + .moves = {MOVE_WHIRLPOOL, MOVE_ROAR, MOVE_DEFENSE_CURL, MOVE_ROLLOUT}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_DOCILE }, [171] = { .species = SPECIES_ROSELIA, - .moves = {MOVE_MAGICAL_LEAF MOVE_TOXIC MOVE_GRASS_WHISTLE MOVE_COTTON_SPORE}, + .moves = {MOVE_MAGICAL_LEAF, MOVE_TOXIC, MOVE_GRASS_WHISTLE, MOVE_COTTON_SPORE}, .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [172] = { .species = SPECIES_VOLBEAT, - .moves = {MOVE_SILVER_WIND MOVE_CONFUSE_RAY MOVE_QUICK_ATTACK MOVE_HELPING_HAND}, + .moves = {MOVE_SILVER_WIND, MOVE_CONFUSE_RAY, MOVE_QUICK_ATTACK, MOVE_HELPING_HAND}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [173] = { .species = SPECIES_ILLUMISE, - .moves = {MOVE_SILVER_WIND MOVE_WISH MOVE_QUICK_ATTACK MOVE_HELPING_HAND}, + .moves = {MOVE_SILVER_WIND, MOVE_WISH, MOVE_QUICK_ATTACK, MOVE_HELPING_HAND}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [174] = { .species = SPECIES_IVYSAUR, - .moves = {MOVE_PETAL_DANCE MOVE_GROWTH MOVE_SWEET_SCENT MOVE_FURY_CUTTER}, + .moves = {MOVE_PETAL_DANCE, MOVE_GROWTH, MOVE_SWEET_SCENT, MOVE_FURY_CUTTER}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_GENTLE }, [175] = { .species = SPECIES_CHARMELEON, - .moves = {MOVE_SLASH MOVE_FIRE_SPIN MOVE_SWORDS_DANCE MOVE_AERIAL_ACE}, + .moves = {MOVE_SLASH, MOVE_FIRE_SPIN, MOVE_SWORDS_DANCE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [176] = { .species = SPECIES_WARTORTLE, - .moves = {MOVE_WATER_PULSE MOVE_BITE MOVE_MUD_SLAP MOVE_YAWN}, + .moves = {MOVE_WATER_PULSE, MOVE_BITE, MOVE_MUD_SLAP, MOVE_YAWN}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [177] = { .species = SPECIES_PARASECT, - .moves = {MOVE_SLASH MOVE_PSYBEAM MOVE_STUN_SPORE MOVE_FLASH}, + .moves = {MOVE_SLASH, MOVE_PSYBEAM, MOVE_STUN_SPORE, MOVE_FLASH}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_RASH }, [178] = { .species = SPECIES_MACHOKE, - .moves = {MOVE_LOW_KICK MOVE_ROCK_TOMB MOVE_FORESIGHT MOVE_SCARY_FACE}, + .moves = {MOVE_LOW_KICK, MOVE_ROCK_TOMB, MOVE_FORESIGHT, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [179] = { .species = SPECIES_HAUNTER, - .moves = {MOVE_SHADOW_PUNCH MOVE_CONFUSE_RAY MOVE_SPITE MOVE_GRUDGE}, + .moves = {MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_SPITE, MOVE_GRUDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RASH }, [180] = { .species = SPECIES_BAYLEEF, - .moves = {MOVE_RAZOR_LEAF MOVE_TOXIC MOVE_SAFEGUARD MOVE_LIGHT_SCREEN}, + .moves = {MOVE_RAZOR_LEAF, MOVE_TOXIC, MOVE_SAFEGUARD, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [181] = { .species = SPECIES_QUILAVA, - .moves = {MOVE_FLAME_WHEEL MOVE_FURY_SWIPES MOVE_SWIFT MOVE_SMOKESCREEN}, + .moves = {MOVE_FLAME_WHEEL, MOVE_FURY_SWIPES, MOVE_SWIFT, MOVE_SMOKESCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [182] = { .species = SPECIES_CROCONAW, - .moves = {MOVE_SLASH MOVE_WATER_PULSE MOVE_BITE MOVE_SCARY_FACE}, + .moves = {MOVE_SLASH, MOVE_WATER_PULSE, MOVE_BITE, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [183] = { .species = SPECIES_TOGETIC, - .moves = {MOVE_AERIAL_ACE MOVE_MAGICAL_LEAF MOVE_WISH MOVE_FOLLOW_ME}, + .moves = {MOVE_AERIAL_ACE, MOVE_MAGICAL_LEAF, MOVE_WISH, MOVE_FOLLOW_ME}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [184] = { .species = SPECIES_MURKROW, - .moves = {MOVE_FAINT_ATTACK MOVE_FLY MOVE_TORMENT MOVE_TAUNT}, + .moves = {MOVE_FAINT_ATTACK, MOVE_FLY, MOVE_TORMENT, MOVE_TAUNT}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [185] = { .species = SPECIES_WOBBUFFET, - .moves = {MOVE_COUNTER MOVE_MIRROR_COAT MOVE_CHARM MOVE_SAFEGUARD}, + .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_CHARM, MOVE_SAFEGUARD}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [186] = { .species = SPECIES_PLUSLE, - .moves = {MOVE_SPARK MOVE_FAKE_TEARS MOVE_QUICK_ATTACK MOVE_HELPING_HAND}, + .moves = {MOVE_SPARK, MOVE_FAKE_TEARS, MOVE_QUICK_ATTACK, MOVE_HELPING_HAND}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [187] = { .species = SPECIES_MINUN, - .moves = {MOVE_SPARK MOVE_CHARM MOVE_ENCORE MOVE_HELPING_HAND}, + .moves = {MOVE_SPARK, MOVE_CHARM, MOVE_ENCORE, MOVE_HELPING_HAND}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [188] = { .species = SPECIES_GROVYLE, - .moves = {MOVE_FURY_CUTTER MOVE_ENDEAVOR MOVE_BRICK_BREAK MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FURY_CUTTER, MOVE_ENDEAVOR, MOVE_BRICK_BREAK, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [189] = { .species = SPECIES_COMBUSKEN, - .moves = {MOVE_EMBER MOVE_DOUBLE_KICK MOVE_QUICK_ATTACK MOVE_SAND_ATTACK}, + .moves = {MOVE_EMBER, MOVE_DOUBLE_KICK, MOVE_QUICK_ATTACK, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [190] = { .species = SPECIES_MARSHTOMP, - .moves = {MOVE_MUD_SHOT MOVE_WATER_GUN MOVE_ROCK_TOMB MOVE_MUD_SLAP}, + .moves = {MOVE_MUD_SHOT, MOVE_WATER_GUN, MOVE_ROCK_TOMB, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [191] = { .species = SPECIES_PONYTA, - .moves = {MOVE_FIRE_SPIN MOVE_BOUNCE MOVE_QUICK_ATTACK MOVE_TAIL_WHIP}, + .moves = {MOVE_FIRE_SPIN, MOVE_BOUNCE, MOVE_QUICK_ATTACK, MOVE_TAIL_WHIP}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [192] = { .species = SPECIES_AZUMARILL, - .moves = {MOVE_BUBBLE_BEAM MOVE_FACADE MOVE_DIG MOVE_PROTECT}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_FACADE, MOVE_DIG, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_DOCILE }, [193] = { .species = SPECIES_SUDOWOODO, - .moves = {MOVE_ROCK_SLIDE MOVE_FAINT_ATTACK MOVE_SANDSTORM MOVE_BLOCK}, + .moves = {MOVE_ROCK_SLIDE, MOVE_FAINT_ATTACK, MOVE_SANDSTORM, MOVE_BLOCK}, .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [194] = { .species = SPECIES_MAGCARGO, - .moves = {MOVE_ROCK_SLIDE MOVE_EMBER MOVE_ACID_ARMOR MOVE_SANDSTORM}, + .moves = {MOVE_ROCK_SLIDE, MOVE_EMBER, MOVE_ACID_ARMOR, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_GENTLE }, [195] = { .species = SPECIES_PUPITAR, - .moves = {MOVE_DIG MOVE_BITE MOVE_SCARY_FACE MOVE_SANDSTORM}, + .moves = {MOVE_DIG, MOVE_BITE, MOVE_SCARY_FACE, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [196] = { .species = SPECIES_SEALEO, - .moves = {MOVE_ICE_BALL MOVE_HAIL MOVE_SNORE MOVE_REST}, + .moves = {MOVE_ICE_BALL, MOVE_HAIL, MOVE_SNORE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [197] = { .species = SPECIES_RATICATE, - .moves = {MOVE_ENDEAVOR MOVE_PURSUIT MOVE_SCARY_FACE MOVE_QUICK_ATTACK}, + .moves = {MOVE_ENDEAVOR, MOVE_PURSUIT, MOVE_SCARY_FACE, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAIVE }, [198] = { .species = SPECIES_MASQUERAIN, - .moves = {MOVE_SILVER_WIND MOVE_AERIAL_ACE MOVE_ICY_WIND MOVE_STUN_SPORE}, + .moves = {MOVE_SILVER_WIND, MOVE_AERIAL_ACE, MOVE_ICY_WIND, MOVE_STUN_SPORE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_RELAXED }, [199] = { .species = SPECIES_FURRET, - .moves = {MOVE_SLAM MOVE_PROTECT MOVE_HELPING_HAND MOVE_FOLLOW_ME}, + .moves = {MOVE_SLAM, MOVE_PROTECT, MOVE_HELPING_HAND, MOVE_FOLLOW_ME}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_SERIOUS }, [200] = { .species = SPECIES_DUNSPARCE, - .moves = {MOVE_HEADBUTT MOVE_GLARE MOVE_DEFENSE_CURL MOVE_ROLLOUT}, + .moves = {MOVE_HEADBUTT, MOVE_GLARE, MOVE_DEFENSE_CURL, MOVE_ROLLOUT}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [201] = { .species = SPECIES_DRAGONAIR, - .moves = {MOVE_DRAGON_BREATH MOVE_LEER MOVE_WRAP MOVE_SAFEGUARD}, + .moves = {MOVE_DRAGON_BREATH, MOVE_LEER, MOVE_WRAP, MOVE_SAFEGUARD}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [202] = { .species = SPECIES_MIGHTYENA, - .moves = {MOVE_BITE MOVE_POISON_FANG MOVE_TAUNT MOVE_ROAR}, + .moves = {MOVE_BITE, MOVE_POISON_FANG, MOVE_TAUNT, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_TIMID }, [203] = { .species = SPECIES_LINOONE, - .moves = {MOVE_SECRET_POWER MOVE_SAND_ATTACK MOVE_COVET MOVE_TICKLE}, + .moves = {MOVE_SECRET_POWER, MOVE_SAND_ATTACK, MOVE_COVET, MOVE_TICKLE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [204] = { .species = SPECIES_CASTFORM, - .moves = {MOVE_EMBER MOVE_WATER_PULSE MOVE_SHOCK_WAVE MOVE_ICY_WIND}, + .moves = {MOVE_EMBER, MOVE_WATER_PULSE, MOVE_SHOCK_WAVE, MOVE_ICY_WIND}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HASTY }, [205] = { .species = SPECIES_SHELGON, - .moves = {MOVE_HEADBUTT MOVE_DRAGON_BREATH MOVE_PROTECT MOVE_SCARY_FACE}, + .moves = {MOVE_HEADBUTT, MOVE_DRAGON_BREATH, MOVE_PROTECT, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [206] = { .species = SPECIES_METANG, - .moves = {MOVE_METAL_CLAW MOVE_CONFUSION MOVE_PURSUIT MOVE_SCARY_FACE}, + .moves = {MOVE_METAL_CLAW, MOVE_CONFUSION, MOVE_PURSUIT, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [207] = { .species = SPECIES_WIGGLYTUFF, - .moves = {MOVE_SING MOVE_DISABLE MOVE_WISH MOVE_SECRET_POWER}, + .moves = {MOVE_SING, MOVE_DISABLE, MOVE_WISH, MOVE_SECRET_POWER}, .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_RELAXED }, [208] = { .species = SPECIES_SUNFLORA, - .moves = {MOVE_PETAL_DANCE MOVE_INGRAIN MOVE_LEECH_SEED MOVE_LIGHT_SCREEN}, + .moves = {MOVE_PETAL_DANCE, MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [209] = { .species = SPECIES_CHIMECHO, - .moves = {MOVE_PSYWAVE MOVE_TAKE_DOWN MOVE_HEAL_BELL MOVE_SAFEGUARD}, + .moves = {MOVE_PSYWAVE, MOVE_TAKE_DOWN, MOVE_HEAL_BELL, MOVE_SAFEGUARD}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [210] = { .species = SPECIES_GLIGAR, - .moves = {MOVE_METAL_CLAW MOVE_DIG MOVE_AERIAL_ACE MOVE_QUICK_ATTACK}, + .moves = {MOVE_METAL_CLAW, MOVE_DIG, MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HASTY }, [211] = { .species = SPECIES_QWILFISH, - .moves = {MOVE_BUBBLE_BEAM MOVE_PIN_MISSILE MOVE_SPIKES MOVE_MINIMIZE}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_PIN_MISSILE, MOVE_SPIKES, MOVE_MINIMIZE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, .nature = NATURE_IMPISH }, [212] = { .species = SPECIES_SNEASEL, - .moves = {MOVE_FAINT_ATTACK MOVE_FAKE_OUT MOVE_ICY_WIND MOVE_QUICK_ATTACK}, + .moves = {MOVE_FAINT_ATTACK, MOVE_FAKE_OUT, MOVE_ICY_WIND, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [213] = { .species = SPECIES_PELIPPER, - .moves = {MOVE_WATER_PULSE MOVE_AERIAL_ACE MOVE_STOCKPILE MOVE_SWALLOW}, + .moves = {MOVE_WATER_PULSE, MOVE_AERIAL_ACE, MOVE_STOCKPILE, MOVE_SWALLOW}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [214] = { .species = SPECIES_SWELLOW, - .moves = {MOVE_FLY MOVE_ENDEAVOR MOVE_FACADE MOVE_QUICK_ATTACK}, + .moves = {MOVE_FLY, MOVE_ENDEAVOR, MOVE_FACADE, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [215] = { .species = SPECIES_LAIRON, - .moves = {MOVE_METAL_CLAW MOVE_ROCK_TOMB MOVE_IRON_DEFENSE MOVE_PROTECT}, + .moves = {MOVE_METAL_CLAW, MOVE_ROCK_TOMB, MOVE_IRON_DEFENSE, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_METAL_COAT, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [216] = { .species = SPECIES_TANGELA, - .moves = {MOVE_MEGA_DRAIN MOVE_SLAM MOVE_TOXIC MOVE_BIND}, + .moves = {MOVE_MEGA_DRAIN, MOVE_SLAM, MOVE_TOXIC, MOVE_BIND}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [217] = { .species = SPECIES_ARBOK, - .moves = {MOVE_POISON_FANG MOVE_DIG MOVE_BITE MOVE_GLARE}, + .moves = {MOVE_POISON_FANG, MOVE_DIG, MOVE_BITE, MOVE_GLARE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [218] = { .species = SPECIES_PERSIAN, - .moves = {MOVE_FAKE_OUT MOVE_SLASH MOVE_TORMENT MOVE_SWAGGER}, + .moves = {MOVE_FAKE_OUT, MOVE_SLASH, MOVE_TORMENT, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [219] = { .species = SPECIES_SEADRA, - .moves = {MOVE_AURORA_BEAM MOVE_SMOKESCREEN MOVE_WATER_GUN MOVE_RAIN_DANCE}, + .moves = {MOVE_AURORA_BEAM, MOVE_SMOKESCREEN, MOVE_WATER_GUN, MOVE_RAIN_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [220] = { .species = SPECIES_KECLEON, - .moves = {MOVE_SECRET_POWER MOVE_PSYBEAM MOVE_MAGIC_COAT MOVE_SEISMIC_TOSS}, + .moves = {MOVE_SECRET_POWER, MOVE_PSYBEAM, MOVE_MAGIC_COAT, MOVE_SEISMIC_TOSS}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAIVE }, [221] = { .species = SPECIES_VIGOROTH, - .moves = {MOVE_SLASH MOVE_COUNTER MOVE_ENCORE MOVE_UPROAR}, + .moves = {MOVE_SLASH, MOVE_COUNTER, MOVE_ENCORE, MOVE_UPROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [222] = { .species = SPECIES_LUNATONE, - .moves = {MOVE_CONFUSION MOVE_COSMIC_POWER MOVE_LIGHT_SCREEN MOVE_SANDSTORM}, + .moves = {MOVE_CONFUSION, MOVE_COSMIC_POWER, MOVE_LIGHT_SCREEN, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [223] = { .species = SPECIES_SOLROCK, - .moves = {MOVE_CONFUSION MOVE_FIRE_SPIN MOVE_LIGHT_SCREEN MOVE_SANDSTORM}, + .moves = {MOVE_CONFUSION, MOVE_FIRE_SPIN, MOVE_LIGHT_SCREEN, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [224] = { .species = SPECIES_NOCTOWL, - .moves = {MOVE_CONFUSION MOVE_AERIAL_ACE MOVE_FAINT_ATTACK MOVE_REFLECT}, + .moves = {MOVE_CONFUSION, MOVE_AERIAL_ACE, MOVE_FAINT_ATTACK, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [225] = { .species = SPECIES_SANDSLASH, - .moves = {MOVE_CRUSH_CLAW MOVE_ROCK_SLIDE MOVE_SWIFT MOVE_SANDSTORM}, + .moves = {MOVE_CRUSH_CLAW, MOVE_ROCK_SLIDE, MOVE_SWIFT, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [226] = { .species = SPECIES_VENOMOTH, - .moves = {MOVE_SILVER_WIND MOVE_PSYBEAM MOVE_SLEEP_POWDER MOVE_SKILL_SWAP}, + .moves = {MOVE_SILVER_WIND, MOVE_PSYBEAM, MOVE_SLEEP_POWDER, MOVE_SKILL_SWAP}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [227] = { .species = SPECIES_CHANSEY, - .moves = {MOVE_METRONOME MOVE_REFRESH MOVE_DEFENSE_CURL MOVE_MINIMIZE}, + .moves = {MOVE_METRONOME, MOVE_REFRESH, MOVE_DEFENSE_CURL, MOVE_MINIMIZE}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_RELAXED }, [228] = { .species = SPECIES_SEAKING, - .moves = {MOVE_WATER_PULSE MOVE_PSYBEAM MOVE_SWIFT MOVE_AGILITY}, + .moves = {MOVE_WATER_PULSE, MOVE_PSYBEAM, MOVE_SWIFT, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [229] = { .species = SPECIES_JUMPLUFF, - .moves = {MOVE_AERIAL_ACE MOVE_SWAGGER MOVE_PSYCH_UP MOVE_SYNTHESIS}, + .moves = {MOVE_AERIAL_ACE, MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [230] = { .species = SPECIES_PILOSWINE, - .moves = {MOVE_DIG MOVE_ANCIENT_POWER MOVE_HAIL MOVE_LIGHT_SCREEN}, + .moves = {MOVE_DIG, MOVE_ANCIENT_POWER, MOVE_HAIL, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [231] = { .species = SPECIES_GOLBAT, - .moves = {MOVE_AIR_CUTTER MOVE_CONFUSE_RAY MOVE_TOXIC MOVE_STEEL_WING}, + .moves = {MOVE_AIR_CUTTER, MOVE_CONFUSE_RAY, MOVE_TOXIC, MOVE_STEEL_WING}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [232] = { .species = SPECIES_PRIMEAPE, - .moves = {MOVE_KARATE_CHOP MOVE_COUNTER MOVE_SWAGGER MOVE_SCREECH}, + .moves = {MOVE_KARATE_CHOP, MOVE_COUNTER, MOVE_SWAGGER, MOVE_SCREECH}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [233] = { .species = SPECIES_HITMONLEE, - .moves = {MOVE_ROLLING_KICK MOVE_BRICK_BREAK MOVE_FOCUS_ENERGY MOVE_FACADE}, + .moves = {MOVE_ROLLING_KICK, MOVE_BRICK_BREAK, MOVE_FOCUS_ENERGY, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [234] = { .species = SPECIES_HITMONCHAN, - .moves = {MOVE_MACH_PUNCH MOVE_SKY_UPPERCUT MOVE_DETECT MOVE_COUNTER}, + .moves = {MOVE_MACH_PUNCH, MOVE_SKY_UPPERCUT, MOVE_DETECT, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [235] = { .species = SPECIES_GIRAFARIG, - .moves = {MOVE_PSYBEAM MOVE_STOMP MOVE_WISH MOVE_SKILL_SWAP}, + .moves = {MOVE_PSYBEAM, MOVE_STOMP, MOVE_WISH, MOVE_SKILL_SWAP}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [236] = { .species = SPECIES_HITMONTOP, - .moves = {MOVE_TRIPLE_KICK MOVE_DIG MOVE_MACH_PUNCH MOVE_QUICK_ATTACK}, + .moves = {MOVE_TRIPLE_KICK, MOVE_DIG, MOVE_MACH_PUNCH, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [237] = { .species = SPECIES_BANETTE, - .moves = {MOVE_NIGHT_SHADE MOVE_WILL_O_WISP MOVE_SPITE MOVE_KNOCK_OFF}, + .moves = {MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SPITE, MOVE_KNOCK_OFF}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [238] = { .species = SPECIES_NINJASK, - .moves = {MOVE_BATON_PASS MOVE_SWORDS_DANCE MOVE_ENDURE MOVE_DIG}, + .moves = {MOVE_BATON_PASS, MOVE_SWORDS_DANCE, MOVE_ENDURE, MOVE_DIG}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MILD }, [239] = { .species = SPECIES_SEVIPER, - .moves = {MOVE_POISON_TAIL MOVE_BITE MOVE_GLARE MOVE_SCREECH}, + .moves = {MOVE_POISON_TAIL, MOVE_BITE, MOVE_GLARE, MOVE_SCREECH}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [240] = { .species = SPECIES_ZANGOOSE, - .moves = {MOVE_SLASH MOVE_DOUBLE_KICK MOVE_ROAR MOVE_QUICK_ATTACK}, + .moves = {MOVE_SLASH, MOVE_DOUBLE_KICK, MOVE_ROAR, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [241] = { .species = SPECIES_CAMERUPT, - .moves = {MOVE_MAGNITUDE MOVE_PROTECT MOVE_SANDSTORM MOVE_ROCK_SLIDE}, + .moves = {MOVE_MAGNITUDE, MOVE_PROTECT, MOVE_SANDSTORM, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [242] = { .species = SPECIES_SHARPEDO, - .moves = {MOVE_SLASH MOVE_BITE MOVE_WATER_PULSE MOVE_SCARY_FACE}, + .moves = {MOVE_SLASH, MOVE_BITE, MOVE_WATER_PULSE, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [243] = { .species = SPECIES_TROPIUS, - .moves = {MOVE_MAGICAL_LEAF MOVE_WHIRLWIND MOVE_AERIAL_ACE MOVE_STEEL_WING}, + .moves = {MOVE_MAGICAL_LEAF, MOVE_WHIRLWIND, MOVE_AERIAL_ACE, MOVE_STEEL_WING}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [244] = { .species = SPECIES_MAGNETON, - .moves = {MOVE_SHOCK_WAVE MOVE_SONIC_BOOM MOVE_THUNDER_WAVE MOVE_SUPERSONIC}, + .moves = {MOVE_SHOCK_WAVE, MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_SUPERSONIC}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_LONELY }, [245] = { .species = SPECIES_MANTINE, - .moves = {MOVE_BUBBLE_BEAM MOVE_AERIAL_ACE MOVE_RAIN_DANCE MOVE_ICY_WIND}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_AERIAL_ACE, MOVE_RAIN_DANCE, MOVE_ICY_WIND}, .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [246] = { .species = SPECIES_STANTLER, - .moves = {MOVE_EXTRASENSORY MOVE_CONFUSE_RAY MOVE_STOMP MOVE_SAND_ATTACK}, + .moves = {MOVE_EXTRASENSORY, MOVE_CONFUSE_RAY, MOVE_STOMP, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_GENTLE }, [247] = { .species = SPECIES_ABSOL, - .moves = {MOVE_BITE MOVE_RAZOR_WIND MOVE_FUTURE_SIGHT MOVE_QUICK_ATTACK}, + .moves = {MOVE_BITE, MOVE_RAZOR_WIND, MOVE_FUTURE_SIGHT, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [248] = { .species = SPECIES_SWALOT, - .moves = {MOVE_STOCKPILE MOVE_SWALLOW MOVE_SPIT_UP MOVE_SLUDGE}, + .moves = {MOVE_STOCKPILE, MOVE_SWALLOW, MOVE_SPIT_UP, MOVE_SLUDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIRKY }, [249] = { .species = SPECIES_CRAWDAUNT, - .moves = {MOVE_BUBBLE_BEAM MOVE_VICE_GRIP MOVE_KNOCK_OFF MOVE_PROTECT}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_VICE_GRIP, MOVE_KNOCK_OFF, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [250] = { .species = SPECIES_PIDGEOT, - .moves = {MOVE_AERIAL_ACE MOVE_FEATHER_DANCE MOVE_MUD_SLAP MOVE_FAINT_ATTACK}, + .moves = {MOVE_AERIAL_ACE, MOVE_FEATHER_DANCE, MOVE_MUD_SLAP, MOVE_FAINT_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [251] = { .species = SPECIES_GRUMPIG, - .moves = {MOVE_PSYBEAM MOVE_CONFUSE_RAY MOVE_FUTURE_SIGHT MOVE_MAGIC_COAT}, + .moves = {MOVE_PSYBEAM, MOVE_CONFUSE_RAY, MOVE_FUTURE_SIGHT, MOVE_MAGIC_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [252] = { .species = SPECIES_TORKOAL, - .moves = {MOVE_EMBER MOVE_FIRE_SPIN MOVE_SMOKESCREEN MOVE_AMNESIA}, + .moves = {MOVE_EMBER, MOVE_FIRE_SPIN, MOVE_SMOKESCREEN, MOVE_AMNESIA}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [253] = { .species = SPECIES_KINGLER, - .moves = {MOVE_CRABHAMMER MOVE_METAL_CLAW MOVE_MUD_SHOT MOVE_PROTECT}, + .moves = {MOVE_CRABHAMMER, MOVE_METAL_CLAW, MOVE_MUD_SHOT, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [254] = { .species = SPECIES_CACTURNE, - .moves = {MOVE_NEEDLE_ARM MOVE_FAINT_ATTACK MOVE_ACID MOVE_MEGA_PUNCH}, + .moves = {MOVE_NEEDLE_ARM, MOVE_FAINT_ATTACK, MOVE_ACID, MOVE_MEGA_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_HASTY }, [255] = { .species = SPECIES_BELLOSSOM, - .moves = {MOVE_PETAL_DANCE MOVE_SAFEGUARD MOVE_SUNNY_DAY MOVE_SYNTHESIS}, + .moves = {MOVE_PETAL_DANCE, MOVE_SAFEGUARD, MOVE_SUNNY_DAY, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [256] = { .species = SPECIES_OCTILLERY, - .moves = {MOVE_OCTAZOOKA MOVE_AURORA_BEAM MOVE_PSYBEAM MOVE_ROCK_BLAST}, + .moves = {MOVE_OCTAZOOKA, MOVE_AURORA_BEAM, MOVE_PSYBEAM, MOVE_ROCK_BLAST}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [257] = { .species = SPECIES_HUNTAIL, - .moves = {MOVE_WHIRLPOOL MOVE_SCARY_FACE MOVE_MUD_SLAP MOVE_BITE}, + .moves = {MOVE_WHIRLPOOL, MOVE_SCARY_FACE, MOVE_MUD_SLAP, MOVE_BITE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [258] = { .species = SPECIES_GOREBYSS, - .moves = {MOVE_WHIRLPOOL MOVE_AMNESIA MOVE_ICY_WIND MOVE_CONFUSION}, + .moves = {MOVE_WHIRLPOOL, MOVE_AMNESIA, MOVE_ICY_WIND, MOVE_CONFUSION}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_BRAVE }, [259] = { .species = SPECIES_RELICANTH, - .moves = {MOVE_ANCIENT_POWER MOVE_WATER_PULSE MOVE_HARDEN MOVE_AMNESIA}, + .moves = {MOVE_ANCIENT_POWER, MOVE_WATER_PULSE, MOVE_HARDEN, MOVE_AMNESIA}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [260] = { .species = SPECIES_OMASTAR, - .moves = {MOVE_BUBBLE_BEAM MOVE_SPIKE_CANNON MOVE_TICKLE MOVE_ANCIENT_POWER}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_SPIKE_CANNON, MOVE_TICKLE, MOVE_ANCIENT_POWER}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [261] = { .species = SPECIES_KABUTOPS, - .moves = {MOVE_SLASH MOVE_DIG MOVE_FURY_CUTTER MOVE_KNOCK_OFF}, + .moves = {MOVE_SLASH, MOVE_DIG, MOVE_FURY_CUTTER, MOVE_KNOCK_OFF}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [262] = { .species = SPECIES_POLIWRATH, - .moves = {MOVE_SUBMISSION MOVE_DIG MOVE_ROCK_TOMB MOVE_BUBBLE_BEAM}, + .moves = {MOVE_SUBMISSION, MOVE_DIG, MOVE_ROCK_TOMB, MOVE_BUBBLE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [263] = { .species = SPECIES_SCYTHER, - .moves = {MOVE_FURY_CUTTER MOVE_AERIAL_ACE MOVE_LIGHT_SCREEN MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FURY_CUTTER, MOVE_AERIAL_ACE, MOVE_LIGHT_SCREEN, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [264] = { .species = SPECIES_PINSIR, - .moves = {MOVE_SUBMISSION MOVE_FOCUS_ENERGY MOVE_SWORDS_DANCE MOVE_REVENGE}, + .moves = {MOVE_SUBMISSION, MOVE_FOCUS_ENERGY, MOVE_SWORDS_DANCE, MOVE_REVENGE}, .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [265] = { .species = SPECIES_POLITOED, - .moves = {MOVE_DIVE MOVE_DIG MOVE_HYPNOSIS MOVE_SWAGGER}, + .moves = {MOVE_DIVE, MOVE_DIG, MOVE_HYPNOSIS, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_RELAXED }, [266] = { .species = SPECIES_CLOYSTER, - .moves = {MOVE_AURORA_BEAM MOVE_SPIKE_CANNON MOVE_SUPERSONIC MOVE_PROTECT}, + .moves = {MOVE_AURORA_BEAM, MOVE_SPIKE_CANNON, MOVE_SUPERSONIC, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [267] = { .species = SPECIES_DELCATTY, - .moves = {MOVE_FAKE_TEARS MOVE_SING MOVE_THUNDERBOLT MOVE_ICE_BEAM}, + .moves = {MOVE_FAKE_TEARS, MOVE_SING, MOVE_THUNDERBOLT, MOVE_ICE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [268] = { .species = SPECIES_SABLEYE, - .moves = {MOVE_SHADOW_BALL MOVE_FAINT_ATTACK MOVE_CONFUSE_RAY MOVE_RECOVER}, + .moves = {MOVE_SHADOW_BALL, MOVE_FAINT_ATTACK, MOVE_CONFUSE_RAY, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [269] = { .species = SPECIES_LICKITUNG, - .moves = {MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_SHADOW_BALL MOVE_ROCK_SLIDE}, + .moves = {MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [270] = { .species = SPECIES_WEEPINBELL, - .moves = {MOVE_SLUDGE_BOMB MOVE_RAZOR_LEAF MOVE_SLEEP_POWDER MOVE_REFLECT}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_RAZOR_LEAF, MOVE_SLEEP_POWDER, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIRKY }, [271] = { .species = SPECIES_GRAVELER, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK MOVE_COUNTER}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [272] = { .species = SPECIES_GLOOM, - .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_SLUDGE_BOMB MOVE_MOONLIGHT}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_SLUDGE_BOMB, MOVE_MOONLIGHT}, .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [273] = { .species = SPECIES_PORYGON, - .moves = {MOVE_TRI_ATTACK MOVE_PSYCHIC MOVE_THUNDER_WAVE MOVE_RECOVER}, + .moves = {MOVE_TRI_ATTACK, MOVE_PSYCHIC, MOVE_THUNDER_WAVE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [274] = { .species = SPECIES_KADABRA, - .moves = {MOVE_PSYCHIC MOVE_THUNDER_WAVE MOVE_REFLECT MOVE_RECOVER}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDER_WAVE, MOVE_REFLECT, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [275] = { .species = SPECIES_WAILMER, - .moves = {MOVE_WATER_SPOUT MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_REST}, + .moves = {MOVE_WATER_SPOUT, MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_DOCILE }, [276] = { .species = SPECIES_ROSELIA, - .moves = {MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_GRASS_WHISTLE MOVE_SYNTHESIS}, + .moves = {MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_GRASS_WHISTLE, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [277] = { .species = SPECIES_VOLBEAT, - .moves = {MOVE_SIGNAL_BEAM MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_TAIL_GLOW}, + .moves = {MOVE_SIGNAL_BEAM, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_TAIL_GLOW}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [278] = { .species = SPECIES_ILLUMISE, - .moves = {MOVE_SILVER_WIND MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_GIGA_DRAIN}, + .moves = {MOVE_SILVER_WIND, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [279] = { .species = SPECIES_IVYSAUR, - .moves = {MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_SLEEP_POWDER MOVE_LEECH_SEED}, + .moves = {MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_SLEEP_POWDER, MOVE_LEECH_SEED}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [280] = { .species = SPECIES_CHARMELEON, - .moves = {MOVE_FLAMETHROWER MOVE_SLASH MOVE_ANCIENT_POWER MOVE_DRAGON_RAGE}, + .moves = {MOVE_FLAMETHROWER, MOVE_SLASH, MOVE_ANCIENT_POWER, MOVE_DRAGON_RAGE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [281] = { .species = SPECIES_WARTORTLE, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RAPID_SPIN MOVE_PROTECT}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAPID_SPIN, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [282] = { .species = SPECIES_PARASECT, - .moves = {MOVE_SPORE MOVE_GIGA_DRAIN MOVE_DIG MOVE_DOUBLE_TEAM}, + .moves = {MOVE_SPORE, MOVE_GIGA_DRAIN, MOVE_DIG, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [283] = { .species = SPECIES_MACHOKE, - .moves = {MOVE_CROSS_CHOP MOVE_ROCK_SLIDE MOVE_FORESIGHT MOVE_SCARY_FACE}, + .moves = {MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FORESIGHT, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [284] = { .species = SPECIES_HAUNTER, - .moves = {MOVE_PSYCHIC MOVE_HYPNOSIS MOVE_NIGHTMARE MOVE_CONFUSE_RAY}, + .moves = {MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NIGHTMARE, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [285] = { .species = SPECIES_BAYLEEF, - .moves = {MOVE_GIGA_DRAIN MOVE_BODY_SLAM MOVE_GRASS_WHISTLE MOVE_REST}, + .moves = {MOVE_GIGA_DRAIN, MOVE_BODY_SLAM, MOVE_GRASS_WHISTLE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [286] = { .species = SPECIES_QUILAVA, - .moves = {MOVE_FLAMETHROWER MOVE_CRUSH_CLAW MOVE_BODY_SLAM MOVE_SMOKESCREEN}, + .moves = {MOVE_FLAMETHROWER, MOVE_CRUSH_CLAW, MOVE_BODY_SLAM, MOVE_SMOKESCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [287] = { .species = SPECIES_CROCONAW, - .moves = {MOVE_MEGA_KICK MOVE_AERIAL_ACE MOVE_ROCK_SLIDE MOVE_DIG}, + .moves = {MOVE_MEGA_KICK, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_DIG}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [288] = { .species = SPECIES_TOGETIC, - .moves = {MOVE_RETURN MOVE_SWEET_KISS MOVE_AERIAL_ACE MOVE_YAWN}, + .moves = {MOVE_RETURN, MOVE_SWEET_KISS, MOVE_AERIAL_ACE, MOVE_YAWN}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [289] = { .species = SPECIES_MURKROW, - .moves = {MOVE_PERISH_SONG MOVE_MEAN_LOOK MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .moves = {MOVE_PERISH_SONG, MOVE_MEAN_LOOK, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [290] = { .species = SPECIES_WOBBUFFET, - .moves = {MOVE_COUNTER MOVE_MIRROR_COAT MOVE_ENCORE MOVE_DESTINY_BOND}, + .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_ENCORE, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_CAREFUL }, [291] = { .species = SPECIES_PLUSLE, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_SEISMIC_TOSS MOVE_WISH}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_SEISMIC_TOSS, MOVE_WISH}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [292] = { .species = SPECIES_MINUN, - .moves = {MOVE_THUNDERBOLT MOVE_ATTRACT MOVE_CHARM MOVE_WISH}, + .moves = {MOVE_THUNDERBOLT, MOVE_ATTRACT, MOVE_CHARM, MOVE_WISH}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [293] = { .species = SPECIES_GROVYLE, - .moves = {MOVE_GIGA_DRAIN MOVE_CRUSH_CLAW MOVE_SCREECH MOVE_ROCK_TOMB}, + .moves = {MOVE_GIGA_DRAIN, MOVE_CRUSH_CLAW, MOVE_SCREECH, MOVE_ROCK_TOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [294] = { .species = SPECIES_COMBUSKEN, - .moves = {MOVE_FLAMETHROWER MOVE_SKY_UPPERCUT MOVE_SLASH MOVE_SAND_ATTACK}, + .moves = {MOVE_FLAMETHROWER, MOVE_SKY_UPPERCUT, MOVE_SLASH, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [295] = { .species = SPECIES_MARSHTOMP, - .moves = {MOVE_MUDDY_WATER MOVE_EARTHQUAKE MOVE_MUD_SLAP MOVE_PROTECT}, + .moves = {MOVE_MUDDY_WATER, MOVE_EARTHQUAKE, MOVE_MUD_SLAP, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [296] = { .species = SPECIES_PONYTA, - .moves = {MOVE_FLAMETHROWER MOVE_BODY_SLAM MOVE_DOUBLE_KICK MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FLAMETHROWER, MOVE_BODY_SLAM, MOVE_DOUBLE_KICK, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [297] = { .species = SPECIES_AZUMARILL, - .moves = {MOVE_MEGA_KICK MOVE_BRICK_BREAK MOVE_IRON_TAIL MOVE_DIG}, + .moves = {MOVE_MEGA_KICK, MOVE_BRICK_BREAK, MOVE_IRON_TAIL, MOVE_DIG}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [298] = { .species = SPECIES_SUDOWOODO, - .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_LOW_KICK MOVE_SELF_DESTRUCT}, + .moves = {MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_LOW_KICK, MOVE_SELF_DESTRUCT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [299] = { .species = SPECIES_MAGCARGO, - .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BODY_SLAM}, + .moves = {MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [300] = { .species = SPECIES_PUPITAR, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CRUNCH MOVE_SCARY_FACE}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CRUNCH, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [301] = { .species = SPECIES_SEALEO, - .moves = {MOVE_ICE_BEAM MOVE_SURF MOVE_BODY_SLAM MOVE_HAIL}, + .moves = {MOVE_ICE_BEAM, MOVE_SURF, MOVE_BODY_SLAM, MOVE_HAIL}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [302] = { .species = SPECIES_RATICATE, - .moves = {MOVE_SUPER_FANG MOVE_HYPER_FANG MOVE_SHADOW_BALL MOVE_SCARY_FACE}, + .moves = {MOVE_SUPER_FANG, MOVE_HYPER_FANG, MOVE_SHADOW_BALL, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [303] = { .species = SPECIES_MASQUERAIN, - .moves = {MOVE_HYDRO_PUMP MOVE_ICE_BEAM MOVE_GIGA_DRAIN MOVE_STUN_SPORE}, + .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_GIGA_DRAIN, MOVE_STUN_SPORE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [304] = { .species = SPECIES_FURRET, - .moves = {MOVE_TRICK MOVE_FRUSTRATION MOVE_SHADOW_BALL MOVE_FOLLOW_ME}, + .moves = {MOVE_TRICK, MOVE_FRUSTRATION, MOVE_SHADOW_BALL, MOVE_FOLLOW_ME}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [305] = { .species = SPECIES_DUNSPARCE, - .moves = {MOVE_ICE_BEAM MOVE_ROCK_TOMB MOVE_BITE MOVE_SHADOW_BALL}, + .moves = {MOVE_ICE_BEAM, MOVE_ROCK_TOMB, MOVE_BITE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [306] = { .species = SPECIES_DRAGONAIR, - .moves = {MOVE_RETURN MOVE_REST MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE}, + .moves = {MOVE_RETURN, MOVE_REST, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [307] = { .species = SPECIES_MIGHTYENA, - .moves = {MOVE_CRUNCH MOVE_SHADOW_BALL MOVE_FRUSTRATION MOVE_SCARY_FACE}, + .moves = {MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_FRUSTRATION, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIRKY }, [308] = { .species = SPECIES_LINOONE, - .moves = {MOVE_TRICK MOVE_FRUSTRATION MOVE_THUNDER_WAVE MOVE_SAND_ATTACK}, + .moves = {MOVE_TRICK, MOVE_FRUSTRATION, MOVE_THUNDER_WAVE, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_JOLLY }, [309] = { .species = SPECIES_CASTFORM, - .moves = {MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_WATER_PULSE}, + .moves = {MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_WATER_PULSE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [310] = { .species = SPECIES_SHELGON, - .moves = {MOVE_FRUSTRATION MOVE_DRAGON_DANCE MOVE_CRUNCH MOVE_SCARY_FACE}, + .moves = {MOVE_FRUSTRATION, MOVE_DRAGON_DANCE, MOVE_CRUNCH, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [311] = { .species = SPECIES_METANG, - .moves = {MOVE_METEOR_MASH MOVE_PSYCHIC MOVE_BODY_SLAM MOVE_SCARY_FACE}, + .moves = {MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_BODY_SLAM, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [312] = { .species = SPECIES_WIGGLYTUFF, - .moves = {MOVE_FAKE_TEARS MOVE_SING MOVE_DREAM_EATER MOVE_BRICK_BREAK}, + .moves = {MOVE_FAKE_TEARS, MOVE_SING, MOVE_DREAM_EATER, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_DOCILE }, [313] = { .species = SPECIES_SUNFLORA, - .moves = {MOVE_GIGA_DRAIN MOVE_GRASS_WHISTLE MOVE_GROWTH MOVE_DOUBLE_TEAM}, + .moves = {MOVE_GIGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_GROWTH, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [314] = { .species = SPECIES_CHIMECHO, - .moves = {MOVE_PSYCHIC MOVE_HYPNOSIS MOVE_DREAM_EATER MOVE_HEAL_BELL}, + .moves = {MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEAL_BELL}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [315] = { .species = SPECIES_GLIGAR, - .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_GUILLOTINE MOVE_SCREECH}, + .moves = {MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_GUILLOTINE, MOVE_SCREECH}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [316] = { .species = SPECIES_QWILFISH, - .moves = {MOVE_REVENGE MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_DESTINY_BOND}, + .moves = {MOVE_REVENGE, MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [317] = { .species = SPECIES_SNEASEL, - .moves = {MOVE_CRUSH_CLAW MOVE_BRICK_BREAK MOVE_AERIAL_ACE MOVE_SCREECH}, + .moves = {MOVE_CRUSH_CLAW, MOVE_BRICK_BREAK, MOVE_AERIAL_ACE, MOVE_SCREECH}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_JOLLY }, [318] = { .species = SPECIES_PELIPPER, - .moves = {MOVE_SURF MOVE_BLIZZARD MOVE_AERIAL_ACE MOVE_PROTECT}, + .moves = {MOVE_SURF, MOVE_BLIZZARD, MOVE_AERIAL_ACE, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [319] = { .species = SPECIES_SWELLOW, - .moves = {MOVE_FACADE MOVE_AERIAL_ACE MOVE_PURSUIT MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FACADE, MOVE_AERIAL_ACE, MOVE_PURSUIT, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [320] = { .species = SPECIES_LAIRON, - .moves = {MOVE_EARTHQUAKE MOVE_IRON_TAIL MOVE_ROAR MOVE_PROTECT}, + .moves = {MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_ROAR, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [321] = { .species = SPECIES_TANGELA, - .moves = {MOVE_GIGA_DRAIN MOVE_STUN_SPORE MOVE_REST MOVE_AMNESIA}, + .moves = {MOVE_GIGA_DRAIN, MOVE_STUN_SPORE, MOVE_REST, MOVE_AMNESIA}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [322] = { .species = SPECIES_ARBOK, - .moves = {MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_IRON_TAIL MOVE_GLARE}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_GLARE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [323] = { .species = SPECIES_PERSIAN, - .moves = {MOVE_FRUSTRATION MOVE_SHADOW_BALL MOVE_ROAR MOVE_FAKE_OUT}, + .moves = {MOVE_FRUSTRATION, MOVE_SHADOW_BALL, MOVE_ROAR, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [324] = { .species = SPECIES_SEADRA, - .moves = {MOVE_HYDRO_PUMP MOVE_FRUSTRATION MOVE_DRAGON_BREATH MOVE_DRAGON_DANCE}, + .moves = {MOVE_HYDRO_PUMP, MOVE_FRUSTRATION, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [325] = { .species = SPECIES_KECLEON, - .moves = {MOVE_TRICK MOVE_BRICK_BREAK MOVE_SHADOW_BALL MOVE_SKILL_SWAP}, + .moves = {MOVE_TRICK, MOVE_BRICK_BREAK, MOVE_SHADOW_BALL, MOVE_SKILL_SWAP}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [326] = { .species = SPECIES_VIGOROTH, - .moves = {MOVE_CRUSH_CLAW MOVE_REVERSAL MOVE_ENDURE MOVE_SHADOW_BALL}, + .moves = {MOVE_CRUSH_CLAW, MOVE_REVERSAL, MOVE_ENDURE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [327] = { .species = SPECIES_LUNATONE, - .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_COSMIC_POWER MOVE_CALM_MIND}, + .moves = {MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_COSMIC_POWER, MOVE_CALM_MIND}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [328] = { .species = SPECIES_SOLROCK, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_COSMIC_POWER MOVE_OVERHEAT}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_COSMIC_POWER, MOVE_OVERHEAT}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [329] = { .species = SPECIES_NOCTOWL, - .moves = {MOVE_PSYCHIC MOVE_FAINT_ATTACK MOVE_AERIAL_ACE MOVE_REFLECT}, + .moves = {MOVE_PSYCHIC, MOVE_FAINT_ATTACK, MOVE_AERIAL_ACE, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [330] = { .species = SPECIES_SANDSLASH, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CRUSH_CLAW MOVE_SANDSTORM}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CRUSH_CLAW, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [331] = { .species = SPECIES_VENOMOTH, - .moves = {MOVE_SIGNAL_BEAM MOVE_PSYCHIC MOVE_SLUDGE_BOMB MOVE_GIGA_DRAIN}, + .moves = {MOVE_SIGNAL_BEAM, MOVE_PSYCHIC, MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [332] = { .species = SPECIES_CHANSEY, - .moves = {MOVE_SEISMIC_TOSS MOVE_SHADOW_BALL MOVE_DOUBLE_TEAM MOVE_SOFT_BOILED}, + .moves = {MOVE_SEISMIC_TOSS, MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_SOFT_BOILED}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_RELAXED }, [333] = { .species = SPECIES_SEAKING, - .moves = {MOVE_HORN_DRILL MOVE_MEGAHORN MOVE_SLEEP_TALK MOVE_REST}, + .moves = {MOVE_HORN_DRILL, MOVE_MEGAHORN, MOVE_SLEEP_TALK, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [334] = { .species = SPECIES_JUMPLUFF, - .moves = {MOVE_LEECH_SEED MOVE_SLEEP_POWDER MOVE_GIGA_DRAIN MOVE_DOUBLE_TEAM}, + .moves = {MOVE_LEECH_SEED, MOVE_SLEEP_POWDER, MOVE_GIGA_DRAIN, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BOLD }, [335] = { .species = SPECIES_PILOSWINE, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BODY_SLAM MOVE_ROAR}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BODY_SLAM, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_ADAMANT }, [336] = { .species = SPECIES_GOLBAT, - .moves = {MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_AIR_CUTTER}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_AIR_CUTTER}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [337] = { .species = SPECIES_PRIMEAPE, - .moves = {MOVE_CROSS_CHOP MOVE_ROCK_TOMB MOVE_OVERHEAT MOVE_BULK_UP}, + .moves = {MOVE_CROSS_CHOP, MOVE_ROCK_TOMB, MOVE_OVERHEAT, MOVE_BULK_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [338] = { .species = SPECIES_HITMONLEE, - .moves = {MOVE_MEGA_KICK MOVE_BRICK_BREAK MOVE_FORESIGHT MOVE_ROCK_TOMB}, + .moves = {MOVE_MEGA_KICK, MOVE_BRICK_BREAK, MOVE_FORESIGHT, MOVE_ROCK_TOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [339] = { .species = SPECIES_HITMONCHAN, - .moves = {MOVE_DYNAMIC_PUNCH MOVE_MACH_PUNCH MOVE_DETECT MOVE_COUNTER}, + .moves = {MOVE_DYNAMIC_PUNCH, MOVE_MACH_PUNCH, MOVE_DETECT, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [340] = { .species = SPECIES_GIRAFARIG, - .moves = {MOVE_PSYCHIC MOVE_CRUNCH MOVE_BATON_PASS MOVE_AGILITY}, + .moves = {MOVE_PSYCHIC, MOVE_CRUNCH, MOVE_BATON_PASS, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [341] = { .species = SPECIES_HITMONTOP, - .moves = {MOVE_DOUBLE_EDGE MOVE_SEISMIC_TOSS MOVE_ROCK_SLIDE MOVE_COUNTER}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_SEISMIC_TOSS, MOVE_ROCK_SLIDE, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [342] = { .species = SPECIES_BANETTE, - .moves = {MOVE_SHADOW_BALL MOVE_FRUSTRATION MOVE_SCREECH MOVE_WILL_O_WISP}, + .moves = {MOVE_SHADOW_BALL, MOVE_FRUSTRATION, MOVE_SCREECH, MOVE_WILL_O_WISP}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_ADAMANT }, [343] = { .species = SPECIES_NINJASK, - .moves = {MOVE_SLASH MOVE_SHADOW_BALL MOVE_SWORDS_DANCE MOVE_BATON_PASS}, + .moves = {MOVE_SLASH, MOVE_SHADOW_BALL, MOVE_SWORDS_DANCE, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [344] = { .species = SPECIES_SEVIPER, - .moves = {MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_GIGA_DRAIN}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [345] = { .species = SPECIES_ZANGOOSE, - .moves = {MOVE_CRUSH_CLAW MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_AERIAL_ACE}, + .moves = {MOVE_CRUSH_CLAW, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [346] = { .species = SPECIES_CAMERUPT, - .moves = {MOVE_EARTHQUAKE MOVE_ERUPTION MOVE_BODY_SLAM MOVE_SCARY_FACE}, + .moves = {MOVE_EARTHQUAKE, MOVE_ERUPTION, MOVE_BODY_SLAM, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [347] = { .species = SPECIES_SHARPEDO, - .moves = {MOVE_DOUBLE_EDGE MOVE_CRUNCH MOVE_EARTHQUAKE MOVE_SURF}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_SURF}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [348] = { .species = SPECIES_TROPIUS, - .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_SYNTHESIS MOVE_BODY_SLAM}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [349] = { .species = SPECIES_MAGNETON, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_THUNDER_WAVE MOVE_METAL_SOUND}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [350] = { .species = SPECIES_MANTINE, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RAIN_DANCE MOVE_CONFUSE_RAY}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAIN_DANCE, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [351] = { .species = SPECIES_STANTLER, - .moves = {MOVE_FRUSTRATION MOVE_SHADOW_BALL MOVE_THUNDER_WAVE MOVE_CONFUSE_RAY}, + .moves = {MOVE_FRUSTRATION, MOVE_SHADOW_BALL, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [352] = { .species = SPECIES_ABSOL, - .moves = {MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_AERIAL_ACE MOVE_IRON_TAIL}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_IRON_TAIL}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [353] = { .species = SPECIES_SWALOT, - .moves = {MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_BODY_SLAM MOVE_COUNTER}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_BODY_SLAM, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [354] = { .species = SPECIES_CRAWDAUNT, - .moves = {MOVE_GUILLOTINE MOVE_FRUSTRATION MOVE_ANCIENT_POWER MOVE_AERIAL_ACE}, + .moves = {MOVE_GUILLOTINE, MOVE_FRUSTRATION, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [355] = { .species = SPECIES_PIDGEOT, - .moves = {MOVE_RETURN MOVE_AERIAL_ACE MOVE_STEEL_WING MOVE_MUD_SLAP}, + .moves = {MOVE_RETURN, MOVE_AERIAL_ACE, MOVE_STEEL_WING, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [356] = { .species = SPECIES_GRUMPIG, - .moves = {MOVE_PSYCHIC MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH}, + .moves = {MOVE_PSYCHIC, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [357] = { .species = SPECIES_TORKOAL, - .moves = {MOVE_OVERHEAT MOVE_BODY_SLAM MOVE_SMOKESCREEN MOVE_PROTECT}, + .moves = {MOVE_OVERHEAT, MOVE_BODY_SLAM, MOVE_SMOKESCREEN, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [358] = { .species = SPECIES_KINGLER, - .moves = {MOVE_GUILLOTINE MOVE_ROCK_TOMB MOVE_FLAIL MOVE_ENDURE}, + .moves = {MOVE_GUILLOTINE, MOVE_ROCK_TOMB, MOVE_FLAIL, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [359] = { .species = SPECIES_CACTURNE, - .moves = {MOVE_MEGA_KICK MOVE_TEETER_DANCE MOVE_FAINT_ATTACK MOVE_SANDSTORM}, + .moves = {MOVE_MEGA_KICK, MOVE_TEETER_DANCE, MOVE_FAINT_ATTACK, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_HARDY }, [360] = { .species = SPECIES_BELLOSSOM, - .moves = {MOVE_SOLAR_BEAM MOVE_ATTRACT MOVE_SUNNY_DAY MOVE_SYNTHESIS}, + .moves = {MOVE_SOLAR_BEAM, MOVE_ATTRACT, MOVE_SUNNY_DAY, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [361] = { .species = SPECIES_OCTILLERY, - .moves = {MOVE_OCTAZOOKA MOVE_FIRE_BLAST MOVE_THUNDER_WAVE MOVE_MUD_SLAP}, + .moves = {MOVE_OCTAZOOKA, MOVE_FIRE_BLAST, MOVE_THUNDER_WAVE, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [362] = { .species = SPECIES_HUNTAIL, - .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_CRUNCH MOVE_BODY_SLAM}, + .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_CRUNCH, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [363] = { .species = SPECIES_GOREBYSS, - .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_PSYCHIC MOVE_BODY_SLAM}, + .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_PSYCHIC, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [364] = { .species = SPECIES_RELICANTH, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AMNESIA MOVE_REST}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AMNESIA, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [365] = { .species = SPECIES_OMASTAR, - .moves = {MOVE_HYDRO_PUMP MOVE_RAIN_DANCE MOVE_ICE_BEAM MOVE_PROTECT}, + .moves = {MOVE_HYDRO_PUMP, MOVE_RAIN_DANCE, MOVE_ICE_BEAM, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [366] = { .species = SPECIES_KABUTOPS, - .moves = {MOVE_SLASH MOVE_ROCK_SLIDE MOVE_FLAIL MOVE_ENDURE}, + .moves = {MOVE_SLASH, MOVE_ROCK_SLIDE, MOVE_FLAIL, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [367] = { .species = SPECIES_POLIWRATH, - .moves = {MOVE_BRICK_BREAK MOVE_HYPNOSIS MOVE_REST MOVE_BELLY_DRUM}, + .moves = {MOVE_BRICK_BREAK, MOVE_HYPNOSIS, MOVE_REST, MOVE_BELLY_DRUM}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [368] = { .species = SPECIES_SCYTHER, - .moves = {MOVE_SILVER_WIND MOVE_AERIAL_ACE MOVE_SWORDS_DANCE MOVE_DOUBLE_TEAM}, + .moves = {MOVE_SILVER_WIND, MOVE_AERIAL_ACE, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [369] = { .species = SPECIES_PINSIR, - .moves = {MOVE_GUILLOTINE MOVE_SWORDS_DANCE MOVE_FLAIL MOVE_ENDURE}, + .moves = {MOVE_GUILLOTINE, MOVE_SWORDS_DANCE, MOVE_FLAIL, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_JOLLY }, [370] = { .species = SPECIES_POLITOED, - .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_MUD_SLAP MOVE_SWAGGER}, + .moves = {MOVE_SURF, MOVE_PSYCHIC, MOVE_MUD_SLAP, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [371] = { .species = SPECIES_CLOYSTER, - .moves = {MOVE_DIVE MOVE_TOXIC MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .moves = {MOVE_DIVE, MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [372] = { .species = SPECIES_DUGTRIO, - .moves = {MOVE_EARTHQUAKE MOVE_TRI_ATTACK MOVE_SLASH MOVE_SAND_TOMB}, + .moves = {MOVE_EARTHQUAKE, MOVE_TRI_ATTACK, MOVE_SLASH, MOVE_SAND_TOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [373] = { .species = SPECIES_MEDICHAM, - .moves = {MOVE_PSYCHIC MOVE_HI_JUMP_KICK MOVE_CALM_MIND MOVE_BATON_PASS}, + .moves = {MOVE_PSYCHIC, MOVE_HI_JUMP_KICK, MOVE_CALM_MIND, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [374] = { .species = SPECIES_MISDREAVUS, - .moves = {MOVE_PAIN_SPLIT MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_THUNDER_WAVE}, + .moves = {MOVE_PAIN_SPLIT, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [375] = { .species = SPECIES_FEAROW, - .moves = {MOVE_DRILL_PECK MOVE_TRI_ATTACK MOVE_FACADE MOVE_MUD_SLAP}, + .moves = {MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_FACADE, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [376] = { .species = SPECIES_GRANBULL, - .moves = {MOVE_MEGA_KICK MOVE_SMELLING_SALT MOVE_THUNDER_WAVE MOVE_ROAR}, + .moves = {MOVE_MEGA_KICK, MOVE_SMELLING_SALT, MOVE_THUNDER_WAVE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [377] = { .species = SPECIES_JYNX, - .moves = {MOVE_ICE_BEAM MOVE_FAKE_OUT MOVE_LOVELY_KISS MOVE_ATTRACT}, + .moves = {MOVE_ICE_BEAM, MOVE_FAKE_OUT, MOVE_LOVELY_KISS, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [378] = { .species = SPECIES_DUSCLOPS, - .moves = {MOVE_WILL_O_WISP MOVE_SEISMIC_TOSS MOVE_PAIN_SPLIT MOVE_CONFUSE_RAY}, + .moves = {MOVE_WILL_O_WISP, MOVE_SEISMIC_TOSS, MOVE_PAIN_SPLIT, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [379] = { .species = SPECIES_DODRIO, - .moves = {MOVE_DRILL_PECK MOVE_TRI_ATTACK MOVE_SLEEP_TALK MOVE_REST}, + .moves = {MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_SLEEP_TALK, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [380] = { .species = SPECIES_MR_MIME, - .moves = {MOVE_PSYCHIC MOVE_MAGICAL_LEAF MOVE_FAKE_OUT MOVE_REFLECT}, + .moves = {MOVE_PSYCHIC, MOVE_MAGICAL_LEAF, MOVE_FAKE_OUT, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [381] = { .species = SPECIES_LANTURN, - .moves = {MOVE_SURF MOVE_CONFUSE_RAY MOVE_ATTRACT MOVE_THUNDER_WAVE}, + .moves = {MOVE_SURF, MOVE_CONFUSE_RAY, MOVE_ATTRACT, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [382] = { .species = SPECIES_BRELOOM, - .moves = {MOVE_SKY_UPPERCUT MOVE_MACH_PUNCH MOVE_HEADBUTT MOVE_COUNTER}, + .moves = {MOVE_SKY_UPPERCUT, MOVE_MACH_PUNCH, MOVE_HEADBUTT, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_JOLLY }, [383] = { .species = SPECIES_FORRETRESS, - .moves = {MOVE_DOUBLE_EDGE MOVE_ROCK_SLIDE MOVE_LIGHT_SCREEN MOVE_SPIKES}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_ROCK_SLIDE, MOVE_LIGHT_SCREEN, MOVE_SPIKES}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [384] = { .species = SPECIES_WHISCASH, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AMNESIA MOVE_REST}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AMNESIA, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [385] = { .species = SPECIES_XATU, - .moves = {MOVE_DRILL_PECK MOVE_NIGHT_SHADE MOVE_WISH MOVE_FUTURE_SIGHT}, + .moves = {MOVE_DRILL_PECK, MOVE_NIGHT_SHADE, MOVE_WISH, MOVE_FUTURE_SIGHT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [386] = { .species = SPECIES_SKARMORY, - .moves = {MOVE_STEEL_WING MOVE_AIR_CUTTER MOVE_COUNTER MOVE_AGILITY}, + .moves = {MOVE_STEEL_WING, MOVE_AIR_CUTTER, MOVE_COUNTER, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [387] = { .species = SPECIES_MAROWAK, - .moves = {MOVE_BONEMERANG MOVE_ROCK_SLIDE MOVE_ICY_WIND MOVE_HEADBUTT}, + .moves = {MOVE_BONEMERANG, MOVE_ROCK_SLIDE, MOVE_ICY_WIND, MOVE_HEADBUTT}, .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [388] = { .species = SPECIES_QUAGSIRE, - .moves = {MOVE_EARTHQUAKE MOVE_BRICK_BREAK MOVE_COUNTER MOVE_MUD_SLAP}, + .moves = {MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_COUNTER, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [389] = { .species = SPECIES_CLEFABLE, - .moves = {MOVE_METRONOME MOVE_DOUBLE_TEAM MOVE_REFLECT MOVE_FOLLOW_ME}, + .moves = {MOVE_METRONOME, MOVE_DOUBLE_TEAM, MOVE_REFLECT, MOVE_FOLLOW_ME}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BRAVE }, [390] = { .species = SPECIES_HARIYAMA, - .moves = {MOVE_CROSS_CHOP MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_FAKE_OUT}, + .moves = {MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [391] = { .species = SPECIES_RAICHU, - .moves = {MOVE_THUNDERBOLT MOVE_QUICK_ATTACK MOVE_LIGHT_SCREEN MOVE_DOUBLE_TEAM}, + .moves = {MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_LIGHT_SCREEN, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [392] = { .species = SPECIES_DEWGONG, - .moves = {MOVE_ICE_BEAM MOVE_ICY_WIND MOVE_HEADBUTT MOVE_FAKE_OUT}, + .moves = {MOVE_ICE_BEAM, MOVE_ICY_WIND, MOVE_HEADBUTT, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [393] = { .species = SPECIES_MANECTRIC, - .moves = {MOVE_THUNDERBOLT MOVE_FLASH MOVE_QUICK_ATTACK MOVE_ROAR}, + .moves = {MOVE_THUNDERBOLT, MOVE_FLASH, MOVE_QUICK_ATTACK, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [394] = { .species = SPECIES_VILEPLUME, - .moves = {MOVE_SLUDGE_BOMB MOVE_PETAL_DANCE MOVE_MOONLIGHT MOVE_AROMATHERAPY}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_PETAL_DANCE, MOVE_MOONLIGHT, MOVE_AROMATHERAPY}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [395] = { .species = SPECIES_VICTREEBEL, - .moves = {MOVE_GIGA_DRAIN MOVE_SLEEP_POWDER MOVE_SWEET_SCENT MOVE_SYNTHESIS}, + .moves = {MOVE_GIGA_DRAIN, MOVE_SLEEP_POWDER, MOVE_SWEET_SCENT, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [396] = { .species = SPECIES_ELECTRODE, - .moves = {MOVE_THUNDERBOLT MOVE_SWIFT MOVE_LIGHT_SCREEN MOVE_PROTECT}, + .moves = {MOVE_THUNDERBOLT, MOVE_SWIFT, MOVE_LIGHT_SCREEN, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [397] = { .species = SPECIES_EXPLOUD, - .moves = {MOVE_HYPER_VOICE MOVE_SHADOW_BALL MOVE_SLEEP_TALK MOVE_REST}, + .moves = {MOVE_HYPER_VOICE, MOVE_SHADOW_BALL, MOVE_SLEEP_TALK, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [398] = { .species = SPECIES_SHIFTRY, - .moves = {MOVE_GIGA_DRAIN MOVE_FAINT_ATTACK MOVE_QUICK_ATTACK MOVE_FAKE_OUT}, + .moves = {MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_MIRACLE_SEED, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [399] = { .species = SPECIES_GLALIE, - .moves = {MOVE_ICE_BEAM MOVE_CRUNCH MOVE_HAIL MOVE_PROTECT}, + .moves = {MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_HAIL, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [400] = { .species = SPECIES_LUDICOLO, - .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH}, + .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [401] = { .species = SPECIES_HYPNO, - .moves = {MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_HYPNOSIS}, + .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_HYPNOSIS}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [402] = { .species = SPECIES_GOLEM, - .moves = {MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_COUNTER MOVE_ROCK_TOMB}, + .moves = {MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_COUNTER, MOVE_ROCK_TOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [403] = { .species = SPECIES_RHYDON, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_TOMB MOVE_SCARY_FACE MOVE_BRICK_BREAK}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SCARY_FACE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [404] = { .species = SPECIES_ALAKAZAM, - .moves = {MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_THUNDER_WAVE}, + .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [405] = { .species = SPECIES_WEEZING, - .moves = {MOVE_SLUDGE_BOMB MOVE_WILL_O_WISP MOVE_SHADOW_BALL MOVE_SMOKESCREEN}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_SMOKESCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [406] = { .species = SPECIES_KANGASKHAN, - .moves = {MOVE_DIZZY_PUNCH MOVE_BRICK_BREAK MOVE_COUNTER MOVE_FAKE_OUT}, + .moves = {MOVE_DIZZY_PUNCH, MOVE_BRICK_BREAK, MOVE_COUNTER, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [407] = { .species = SPECIES_ELECTABUZZ, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_BRICK_BREAK MOVE_LIGHT_SCREEN}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_BRICK_BREAK, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [408] = { .species = SPECIES_TAUROS, - .moves = {MOVE_EARTHQUAKE MOVE_THRASH MOVE_SWAGGER MOVE_FACADE}, + .moves = {MOVE_EARTHQUAKE, MOVE_THRASH, MOVE_SWAGGER, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [409] = { .species = SPECIES_SLOWBRO, - .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_HEADBUTT MOVE_ICE_PUNCH}, + .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_HEADBUTT, MOVE_ICE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [410] = { .species = SPECIES_SLOWKING, - .moves = {MOVE_PSYCHIC MOVE_BRICK_BREAK MOVE_AMNESIA MOVE_ATTRACT}, + .moves = {MOVE_PSYCHIC, MOVE_BRICK_BREAK, MOVE_AMNESIA, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [411] = { .species = SPECIES_MILTANK, - .moves = {MOVE_FACADE MOVE_SHADOW_BALL MOVE_COUNTER MOVE_MILK_DRINK}, + .moves = {MOVE_FACADE, MOVE_SHADOW_BALL, MOVE_COUNTER, MOVE_MILK_DRINK}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [412] = { .species = SPECIES_ALTARIA, - .moves = {MOVE_DRAGON_CLAW MOVE_AERIAL_ACE MOVE_REFRESH MOVE_BODY_SLAM}, + .moves = {MOVE_DRAGON_CLAW, MOVE_AERIAL_ACE, MOVE_REFRESH, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [413] = { .species = SPECIES_NIDOQUEEN, - .moves = {MOVE_SLUDGE_BOMB MOVE_DOUBLE_KICK MOVE_BODY_SLAM MOVE_COUNTER}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_DOUBLE_KICK, MOVE_BODY_SLAM, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [414] = { .species = SPECIES_NIDOKING, - .moves = {MOVE_HORN_DRILL MOVE_DOUBLE_KICK MOVE_BODY_SLAM MOVE_COUNTER}, + .moves = {MOVE_HORN_DRILL, MOVE_DOUBLE_KICK, MOVE_BODY_SLAM, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [415] = { .species = SPECIES_MAGMAR, - .moves = {MOVE_FLAMETHROWER MOVE_SMOKESCREEN MOVE_BRICK_BREAK MOVE_BARRIER}, + .moves = {MOVE_FLAMETHROWER, MOVE_SMOKESCREEN, MOVE_BRICK_BREAK, MOVE_BARRIER}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [416] = { .species = SPECIES_CRADILY, - .moves = {MOVE_GIGA_DRAIN MOVE_ROCK_SLIDE MOVE_BARRIER MOVE_CONFUSE_RAY}, + .moves = {MOVE_GIGA_DRAIN, MOVE_ROCK_SLIDE, MOVE_BARRIER, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [417] = { .species = SPECIES_ARMALDO, - .moves = {MOVE_SLASH MOVE_AERIAL_ACE MOVE_ANCIENT_POWER MOVE_PROTECT}, + .moves = {MOVE_SLASH, MOVE_AERIAL_ACE, MOVE_ANCIENT_POWER, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [418] = { .species = SPECIES_GOLDUCK, - .moves = {MOVE_HYDRO_PUMP MOVE_DIG MOVE_BRICK_BREAK MOVE_LIGHT_SCREEN}, + .moves = {MOVE_HYDRO_PUMP, MOVE_DIG, MOVE_BRICK_BREAK, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [419] = { .species = SPECIES_RAPIDASH, - .moves = {MOVE_FLAMETHROWER MOVE_DOUBLE_KICK MOVE_QUICK_ATTACK MOVE_PROTECT}, + .moves = {MOVE_FLAMETHROWER, MOVE_DOUBLE_KICK, MOVE_QUICK_ATTACK, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIET }, [420] = { .species = SPECIES_MUK, - .moves = {MOVE_SLUDGE_BOMB MOVE_BODY_SLAM MOVE_SCREECH MOVE_MINIMIZE}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_BODY_SLAM, MOVE_SCREECH, MOVE_MINIMIZE}, .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [421] = { .species = SPECIES_GENGAR, - .moves = {MOVE_DREAM_EATER MOVE_HYPNOSIS MOVE_CONFUSE_RAY MOVE_ATTRACT}, + .moves = {MOVE_DREAM_EATER, MOVE_HYPNOSIS, MOVE_CONFUSE_RAY, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_TIMID }, [422] = { .species = SPECIES_AMPHAROS, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_THUNDER_WAVE MOVE_ATTRACT}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_THUNDER_WAVE, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [423] = { .species = SPECIES_SCIZOR, - .moves = {MOVE_METAL_CLAW MOVE_AERIAL_ACE MOVE_COUNTER MOVE_QUICK_ATTACK}, + .moves = {MOVE_METAL_CLAW, MOVE_AERIAL_ACE, MOVE_COUNTER, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [424] = { .species = SPECIES_HERACROSS, - .moves = {MOVE_MEGAHORN MOVE_BRICK_BREAK MOVE_ROCK_TOMB MOVE_COUNTER}, + .moves = {MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_ROCK_TOMB, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [425] = { .species = SPECIES_URSARING, - .moves = {MOVE_MEGA_KICK MOVE_CRUNCH MOVE_AERIAL_ACE MOVE_COUNTER}, + .moves = {MOVE_MEGA_KICK, MOVE_CRUNCH, MOVE_AERIAL_ACE, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [426] = { .species = SPECIES_HOUNDOOM, - .moves = {MOVE_FLAMETHROWER MOVE_SHADOW_BALL MOVE_COUNTER MOVE_WILL_O_WISP}, + .moves = {MOVE_FLAMETHROWER, MOVE_SHADOW_BALL, MOVE_COUNTER, MOVE_WILL_O_WISP}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [427] = { .species = SPECIES_DONPHAN, - .moves = {MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_SWAGGER MOVE_REST}, + .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SWAGGER, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [428] = { .species = SPECIES_CLAYDOL, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [429] = { .species = SPECIES_WAILORD, - .moves = {MOVE_SURF MOVE_ICY_WIND MOVE_BODY_SLAM MOVE_ROAR}, + .moves = {MOVE_SURF, MOVE_ICY_WIND, MOVE_BODY_SLAM, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [430] = { .species = SPECIES_NINETALES, - .moves = {MOVE_FLAMETHROWER MOVE_ROAR MOVE_CONFUSE_RAY MOVE_WILL_O_WISP}, + .moves = {MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [431] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_CROSS_CHOP MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_SCARY_FACE}, + .moves = {MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [432] = { .species = SPECIES_SHUCKLE, - .moves = {MOVE_ROLLOUT MOVE_DEFENSE_CURL MOVE_SLEEP_TALK MOVE_REST}, + .moves = {MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_SLEEP_TALK, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BRAVE }, [433] = { .species = SPECIES_STEELIX, - .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_BREATH MOVE_ROCK_TOMB MOVE_ROAR}, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_ROCK_TOMB, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [434] = { .species = SPECIES_TENTACRUEL, - .moves = {MOVE_SLUDGE_BOMB MOVE_ICY_WIND MOVE_BARRIER MOVE_CONFUSE_RAY}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_ICY_WIND, MOVE_BARRIER, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_IMPISH }, [435] = { .species = SPECIES_AERODACTYL, - .moves = {MOVE_ANCIENT_POWER MOVE_DRAGON_BREATH MOVE_AERIAL_ACE MOVE_ROAR}, + .moves = {MOVE_ANCIENT_POWER, MOVE_DRAGON_BREATH, MOVE_AERIAL_ACE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [436] = { .species = SPECIES_PORYGON2, - .moves = {MOVE_TRI_ATTACK MOVE_AERIAL_ACE MOVE_SHADOW_BALL MOVE_RECOVER}, + .moves = {MOVE_TRI_ATTACK, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [437] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_DREAM_EATER MOVE_HYPNOSIS MOVE_MAGICAL_LEAF MOVE_REFLECT}, + .moves = {MOVE_DREAM_EATER, MOVE_HYPNOSIS, MOVE_MAGICAL_LEAF, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_TIMID }, [438] = { .species = SPECIES_EXEGGUTOR, - .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_SYNTHESIS MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [439] = { .species = SPECIES_STARMIE, - .moves = {MOVE_PSYCHIC MOVE_CONFUSE_RAY MOVE_THUNDER_WAVE MOVE_RECOVER}, + .moves = {MOVE_PSYCHIC, MOVE_CONFUSE_RAY, MOVE_THUNDER_WAVE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [440] = { .species = SPECIES_FLYGON, - .moves = {MOVE_EARTHQUAKE MOVE_STEEL_WING MOVE_FAINT_ATTACK MOVE_FACADE}, + .moves = {MOVE_EARTHQUAKE, MOVE_STEEL_WING, MOVE_FAINT_ATTACK, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [441] = { .species = SPECIES_VENUSAUR, - .moves = {MOVE_GIGA_DRAIN MOVE_SUNNY_DAY MOVE_SYNTHESIS MOVE_SLEEP_POWDER}, + .moves = {MOVE_GIGA_DRAIN, MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_SLEEP_POWDER}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [442] = { .species = SPECIES_VAPOREON, - .moves = {MOVE_SURF MOVE_ROAR MOVE_BITE MOVE_QUICK_ATTACK}, + .moves = {MOVE_SURF, MOVE_ROAR, MOVE_BITE, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [443] = { .species = SPECIES_JOLTEON, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_ATTRACT MOVE_PROTECT}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [444] = { .species = SPECIES_FLAREON, - .moves = {MOVE_FLAMETHROWER MOVE_ROAR MOVE_BITE MOVE_SAND_ATTACK}, + .moves = {MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_BITE, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [445] = { .species = SPECIES_MEGANIUM, - .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_LIGHT_SCREEN MOVE_SYNTHESIS}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_LIGHT_SCREEN, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [446] = { .species = SPECIES_ESPEON, - .moves = {MOVE_PSYCHIC MOVE_CHARM MOVE_CALM_MIND MOVE_BATON_PASS}, + .moves = {MOVE_PSYCHIC, MOVE_CHARM, MOVE_CALM_MIND, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [447] = { .species = SPECIES_UMBREON, - .moves = {MOVE_CONFUSE_RAY MOVE_FAINT_ATTACK MOVE_DOUBLE_TEAM MOVE_BATON_PASS}, + .moves = {MOVE_CONFUSE_RAY, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [448] = { .species = SPECIES_BLASTOISE, - .moves = {MOVE_HYDRO_PUMP MOVE_RAIN_DANCE MOVE_BITE MOVE_SEISMIC_TOSS}, + .moves = {MOVE_HYDRO_PUMP, MOVE_RAIN_DANCE, MOVE_BITE, MOVE_SEISMIC_TOSS}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [449] = { .species = SPECIES_FERALIGATR, - .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_AERIAL_ACE MOVE_ROAR}, + .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_AERIAL_ACE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [450] = { .species = SPECIES_AGGRON, - .moves = {MOVE_IRON_TAIL MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROAR}, + .moves = {MOVE_IRON_TAIL, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [451] = { .species = SPECIES_BLAZIKEN, - .moves = {MOVE_FLAMETHROWER MOVE_SUNNY_DAY MOVE_DOUBLE_KICK MOVE_ROAR}, + .moves = {MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_DOUBLE_KICK, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [452] = { .species = SPECIES_WALREIN, - .moves = {MOVE_BLIZZARD MOVE_HAIL MOVE_YAWN MOVE_PROTECT}, + .moves = {MOVE_BLIZZARD, MOVE_HAIL, MOVE_YAWN, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [453] = { .species = SPECIES_SCEPTILE, - .moves = {MOVE_LEAF_BLADE MOVE_LEECH_SEED MOVE_AERIAL_ACE MOVE_DETECT}, + .moves = {MOVE_LEAF_BLADE, MOVE_LEECH_SEED, MOVE_AERIAL_ACE, MOVE_DETECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [454] = { .species = SPECIES_CHARIZARD, - .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_ROAR MOVE_SCARY_FACE}, + .moves = {MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_ROAR, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [455] = { .species = SPECIES_TYPHLOSION, - .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_SMOKESCREEN MOVE_ROAR}, + .moves = {MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_SMOKESCREEN, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [456] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_SURF MOVE_ATTRACT MOVE_CONFUSE_RAY MOVE_SING}, + .moves = {MOVE_SURF, MOVE_ATTRACT, MOVE_CONFUSE_RAY, MOVE_SING}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BOLD }, [457] = { .species = SPECIES_CROBAT, - .moves = {MOVE_SLUDGE_BOMB MOVE_BITE MOVE_ASTONISH MOVE_SCREECH}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_BITE, MOVE_ASTONISH, MOVE_SCREECH}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [458] = { .species = SPECIES_SWAMPERT, - .moves = {MOVE_EARTHQUAKE MOVE_COUNTER MOVE_REST MOVE_CURSE}, + .moves = {MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_REST, MOVE_CURSE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [459] = { .species = SPECIES_GYARADOS, - .moves = {MOVE_RETURN MOVE_BITE MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE}, + .moves = {MOVE_RETURN, MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [460] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_FACADE MOVE_SHADOW_BALL MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FACADE, MOVE_SHADOW_BALL, MOVE_ATTRACT, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [461] = { .species = SPECIES_KINGDRA, - .moves = {MOVE_HYDRO_PUMP MOVE_DRAGON_BREATH MOVE_ICY_WIND MOVE_ATTRACT}, + .moves = {MOVE_HYDRO_PUMP, MOVE_DRAGON_BREATH, MOVE_ICY_WIND, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [462] = { .species = SPECIES_BLISSEY, - .moves = {MOVE_TOXIC MOVE_DOUBLE_TEAM MOVE_SING MOVE_SOFT_BOILED}, + .moves = {MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_SING, MOVE_SOFT_BOILED}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BOLD }, [463] = { .species = SPECIES_MILOTIC, - .moves = {MOVE_HYDRO_PUMP MOVE_ICY_WIND MOVE_RECOVER MOVE_MIRROR_COAT}, + .moves = {MOVE_HYDRO_PUMP, MOVE_ICY_WIND, MOVE_RECOVER, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [464] = { .species = SPECIES_ARCANINE, - .moves = {MOVE_FLAMETHROWER MOVE_EXTREME_SPEED MOVE_CRUNCH MOVE_BODY_SLAM}, + .moves = {MOVE_FLAMETHROWER, MOVE_EXTREME_SPEED, MOVE_CRUNCH, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [465] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_DRAGON_CLAW MOVE_AERIAL_ACE MOVE_HEADBUTT MOVE_ROCK_SLIDE}, + .moves = {MOVE_DRAGON_CLAW, MOVE_AERIAL_ACE, MOVE_HEADBUTT, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [466] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_METEOR_MASH MOVE_AERIAL_ACE MOVE_FACADE MOVE_LIGHT_SCREEN}, + .moves = {MOVE_METEOR_MASH, MOVE_AERIAL_ACE, MOVE_FACADE, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [467] = { .species = SPECIES_SLAKING, - .moves = {MOVE_YAWN MOVE_BULK_UP MOVE_SWAGGER MOVE_AERIAL_ACE}, + .moves = {MOVE_YAWN, MOVE_BULK_UP, MOVE_SWAGGER, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [468] = { .species = SPECIES_DUGTRIO, - .moves = {MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_AERIAL_ACE MOVE_TRI_ATTACK}, + .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_TRI_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [469] = { .species = SPECIES_MEDICHAM, - .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_PSYCHIC MOVE_FAKE_OUT}, + .moves = {MOVE_REVERSAL, MOVE_ENDURE, MOVE_PSYCHIC, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [470] = { .species = SPECIES_MAROWAK, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWORDS_DANCE MOVE_ICY_WIND}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_ICY_WIND}, .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [471] = { .species = SPECIES_QUAGSIRE, - .moves = {MOVE_CURSE MOVE_ATTRACT MOVE_YAWN MOVE_ANCIENT_POWER}, + .moves = {MOVE_CURSE, MOVE_ATTRACT, MOVE_YAWN, MOVE_ANCIENT_POWER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_SASSY }, [472] = { .species = SPECIES_MISDREAVUS, - .moves = {MOVE_PSYCHIC MOVE_ATTRACT MOVE_THUNDER_WAVE MOVE_CONFUSE_RAY}, + .moves = {MOVE_PSYCHIC, MOVE_ATTRACT, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_BOLD }, [473] = { .species = SPECIES_FEAROW, - .moves = {MOVE_DRILL_PECK MOVE_TRI_ATTACK MOVE_ATTRACT MOVE_PURSUIT}, + .moves = {MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_ATTRACT, MOVE_PURSUIT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [474] = { .species = SPECIES_GRANBULL, - .moves = {MOVE_OVERHEAT MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_FACADE}, + .moves = {MOVE_OVERHEAT, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, .nature = NATURE_QUIET }, [475] = { .species = SPECIES_JYNX, - .moves = {MOVE_PERISH_SONG MOVE_MEAN_LOOK MOVE_LOVELY_KISS MOVE_PROTECT}, + .moves = {MOVE_PERISH_SONG, MOVE_MEAN_LOOK, MOVE_LOVELY_KISS, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [476] = { .species = SPECIES_DUSCLOPS, - .moves = {MOVE_TOXIC MOVE_CONFUSE_RAY MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .moves = {MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_DOUBLE_TEAM, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [477] = { .species = SPECIES_DODRIO, - .moves = {MOVE_DRILL_PECK MOVE_DOUBLE_EDGE MOVE_FAINT_ATTACK MOVE_PROTECT}, + .moves = {MOVE_DRILL_PECK, MOVE_DOUBLE_EDGE, MOVE_FAINT_ATTACK, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [478] = { .species = SPECIES_MR_MIME, - .moves = {MOVE_BATON_PASS MOVE_SWAGGER MOVE_PSYCH_UP MOVE_PSYCHIC}, + .moves = {MOVE_BATON_PASS, MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_PSYCHIC}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [479] = { .species = SPECIES_LANTURN, - .moves = {MOVE_FLAIL MOVE_ENDURE MOVE_THUNDERBOLT MOVE_SURF}, + .moves = {MOVE_FLAIL, MOVE_ENDURE, MOVE_THUNDERBOLT, MOVE_SURF}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [480] = { .species = SPECIES_BRELOOM, - .moves = {MOVE_GIGA_DRAIN MOVE_LEECH_SEED MOVE_FOCUS_PUNCH MOVE_SPORE}, + .moves = {MOVE_GIGA_DRAIN, MOVE_LEECH_SEED, MOVE_FOCUS_PUNCH, MOVE_SPORE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [481] = { .species = SPECIES_FORRETRESS, - .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_COUNTER MOVE_PROTECT}, + .moves = {MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_COUNTER, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [482] = { .species = SPECIES_SKARMORY, - .moves = {MOVE_SPIKES MOVE_ROAR MOVE_DRILL_PECK MOVE_TOXIC}, + .moves = {MOVE_SPIKES, MOVE_ROAR, MOVE_DRILL_PECK, MOVE_TOXIC}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [483] = { .species = SPECIES_WHISCASH, - .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_SPARK MOVE_FUTURE_SIGHT}, + .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_SPARK, MOVE_FUTURE_SIGHT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [484] = { .species = SPECIES_XATU, - .moves = {MOVE_FLY MOVE_TOXIC MOVE_CONFUSE_RAY MOVE_ATTRACT}, + .moves = {MOVE_FLY, MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [485] = { .species = SPECIES_CLEFABLE, - .moves = {MOVE_METEOR_MASH MOVE_COSMIC_POWER MOVE_DOUBLE_TEAM MOVE_FOLLOW_ME}, + .moves = {MOVE_METEOR_MASH, MOVE_COSMIC_POWER, MOVE_DOUBLE_TEAM, MOVE_FOLLOW_ME}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [486] = { .species = SPECIES_HARIYAMA, - .moves = {MOVE_CROSS_CHOP MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH}, + .moves = {MOVE_CROSS_CHOP, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [487] = { .species = SPECIES_RAICHU, - .moves = {MOVE_THUNDERBOLT MOVE_REVERSAL MOVE_ENDURE MOVE_AGILITY}, + .moves = {MOVE_THUNDERBOLT, MOVE_REVERSAL, MOVE_ENDURE, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [488] = { .species = SPECIES_DEWGONG, - .moves = {MOVE_BLIZZARD MOVE_DOUBLE_EDGE MOVE_ENCORE MOVE_DISABLE}, + .moves = {MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_ENCORE, MOVE_DISABLE}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [489] = { .species = SPECIES_MANECTRIC, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_CRUNCH MOVE_ROAR}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_CRUNCH, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [490] = { .species = SPECIES_VILEPLUME, - .moves = {MOVE_INGRAIN MOVE_DOUBLE_TEAM MOVE_TOXIC MOVE_GIGA_DRAIN}, + .moves = {MOVE_INGRAIN, MOVE_DOUBLE_TEAM, MOVE_TOXIC, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [491] = { .species = SPECIES_VICTREEBEL, - .moves = {MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_SLEEP_POWDER MOVE_ATTRACT}, + .moves = {MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_SLEEP_POWDER, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_SERIOUS }, [492] = { .species = SPECIES_ELECTRODE, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_SWAGGER}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [493] = { .species = SPECIES_EXPLOUD, - .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_EARTHQUAKE MOVE_COUNTER}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [494] = { .species = SPECIES_SHIFTRY, - .moves = {MOVE_LEECH_SEED MOVE_DIG MOVE_DOUBLE_TEAM MOVE_REST}, + .moves = {MOVE_LEECH_SEED, MOVE_DIG, MOVE_DOUBLE_TEAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_IMPISH }, [495] = { .species = SPECIES_GLALIE, - .moves = {MOVE_EXPLOSION MOVE_ENDURE MOVE_BODY_SLAM MOVE_ICY_WIND}, + .moves = {MOVE_EXPLOSION, MOVE_ENDURE, MOVE_BODY_SLAM, MOVE_ICY_WIND}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [496] = { .species = SPECIES_LUDICOLO, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [497] = { .species = SPECIES_HYPNO, - .moves = {MOVE_HYPNOSIS MOVE_NIGHTMARE MOVE_DREAM_EATER MOVE_PSYCHIC}, + .moves = {MOVE_HYPNOSIS, MOVE_NIGHTMARE, MOVE_DREAM_EATER, MOVE_PSYCHIC}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [498] = { .species = SPECIES_GOLEM, - .moves = {MOVE_FOCUS_PUNCH MOVE_SUBSTITUTE MOVE_DOUBLE_TEAM MOVE_REST}, + .moves = {MOVE_FOCUS_PUNCH, MOVE_SUBSTITUTE, MOVE_DOUBLE_TEAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [499] = { .species = SPECIES_RHYDON, - .moves = {MOVE_EARTHQUAKE MOVE_HORN_DRILL MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .moves = {MOVE_EARTHQUAKE, MOVE_HORN_DRILL, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [500] = { .species = SPECIES_ALAKAZAM, - .moves = {MOVE_PSYCHIC MOVE_CALM_MIND MOVE_THUNDER_WAVE MOVE_RECOVER}, + .moves = {MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_THUNDER_WAVE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [501] = { .species = SPECIES_WEEZING, - .moves = {MOVE_MEMENTO MOVE_SLUDGE_BOMB MOVE_FACADE MOVE_DESTINY_BOND}, + .moves = {MOVE_MEMENTO, MOVE_SLUDGE_BOMB, MOVE_FACADE, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [502] = { .species = SPECIES_KANGASKHAN, - .moves = {MOVE_CRUSH_CLAW MOVE_SHADOW_BALL MOVE_ATTRACT MOVE_REST}, + .moves = {MOVE_CRUSH_CLAW, MOVE_SHADOW_BALL, MOVE_ATTRACT, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [503] = { .species = SPECIES_ELECTABUZZ, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_ATTRACT MOVE_FOCUS_PUNCH}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_ATTRACT, MOVE_FOCUS_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [504] = { .species = SPECIES_TAUROS, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_DOUBLE_TEAM MOVE_REST}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [505] = { .species = SPECIES_SLOWBRO, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_YAWN}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_YAWN}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_MODEST }, [506] = { .species = SPECIES_SLOWKING, - .moves = {MOVE_YAWN MOVE_THUNDER_WAVE MOVE_SURF MOVE_PSYCHIC}, + .moves = {MOVE_YAWN, MOVE_THUNDER_WAVE, MOVE_SURF, MOVE_PSYCHIC}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [507] = { .species = SPECIES_MILTANK, - .moves = {MOVE_FOCUS_PUNCH MOVE_SHADOW_BALL MOVE_ATTRACT MOVE_THUNDER_WAVE}, + .moves = {MOVE_FOCUS_PUNCH, MOVE_SHADOW_BALL, MOVE_ATTRACT, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [508] = { .species = SPECIES_ALTARIA, - .moves = {MOVE_PERISH_SONG MOVE_DRAGON_BREATH MOVE_PURSUIT MOVE_ATTRACT}, + .moves = {MOVE_PERISH_SONG, MOVE_DRAGON_BREATH, MOVE_PURSUIT, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [509] = { .species = SPECIES_NIDOQUEEN, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [510] = { .species = SPECIES_NIDOKING, - .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_BRICK_BREAK}, + .moves = {MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [511] = { .species = SPECIES_MAGMAR, - .moves = {MOVE_FIRE_BLAST MOVE_SMOKESCREEN MOVE_THUNDER_PUNCH MOVE_CONFUSE_RAY}, + .moves = {MOVE_FIRE_BLAST, MOVE_SMOKESCREEN, MOVE_THUNDER_PUNCH, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [512] = { .species = SPECIES_CRADILY, - .moves = {MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [513] = { .species = SPECIES_ARMALDO, - .moves = {MOVE_IRON_TAIL MOVE_ANCIENT_POWER MOVE_BRICK_BREAK MOVE_KNOCK_OFF}, + .moves = {MOVE_IRON_TAIL, MOVE_ANCIENT_POWER, MOVE_BRICK_BREAK, MOVE_KNOCK_OFF}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [514] = { .species = SPECIES_GOLDUCK, - .moves = {MOVE_CROSS_CHOP MOVE_SURF MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_CROSS_CHOP, MOVE_SURF, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [515] = { .species = SPECIES_RAPIDASH, - .moves = {MOVE_FIRE_BLAST MOVE_BOUNCE MOVE_DOUBLE_TEAM MOVE_ATTRACT}, + .moves = {MOVE_FIRE_BLAST, MOVE_BOUNCE, MOVE_DOUBLE_TEAM, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [516] = { .species = SPECIES_MUK, - .moves = {MOVE_CURSE MOVE_REST MOVE_SLUDGE_BOMB MOVE_DYNAMIC_PUNCH}, + .moves = {MOVE_CURSE, MOVE_REST, MOVE_SLUDGE_BOMB, MOVE_DYNAMIC_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [517] = { .species = SPECIES_GENGAR, - .moves = {MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_WILL_O_WISP}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [518] = { .species = SPECIES_AMPHAROS, - .moves = {MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_FOCUS_PUNCH MOVE_THUNDER_WAVE}, + .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_FOCUS_PUNCH, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [519] = { .species = SPECIES_SCIZOR, - .moves = {MOVE_SILVER_WIND MOVE_STEEL_WING MOVE_SWORDS_DANCE MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SILVER_WIND, MOVE_STEEL_WING, MOVE_SWORDS_DANCE, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [520] = { .species = SPECIES_HERACROSS, - .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_ATTRACT MOVE_BULK_UP}, + .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ATTRACT, MOVE_BULK_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_JOLLY }, [521] = { .species = SPECIES_URSARING, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_BRICK_BREAK MOVE_COUNTER}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [522] = { .species = SPECIES_HOUNDOOM, - .moves = {MOVE_FIRE_BLAST MOVE_CRUNCH MOVE_ROAR MOVE_REST}, + .moves = {MOVE_FIRE_BLAST, MOVE_CRUNCH, MOVE_ROAR, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [523] = { .species = SPECIES_DONPHAN, - .moves = {MOVE_FLAIL MOVE_ENDURE MOVE_EARTHQUAKE MOVE_ROCK_TOMB}, + .moves = {MOVE_FLAIL, MOVE_ENDURE, MOVE_EARTHQUAKE, MOVE_ROCK_TOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_JOLLY }, [524] = { .species = SPECIES_CLAYDOL, - .moves = {MOVE_PSYCHIC MOVE_EARTHQUAKE MOVE_DOUBLE_TEAM MOVE_COSMIC_POWER}, + .moves = {MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_COSMIC_POWER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [525] = { .species = SPECIES_WAILORD, - .moves = {MOVE_DOUBLE_EDGE MOVE_REST MOVE_CURSE MOVE_AMNESIA}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_REST, MOVE_CURSE, MOVE_AMNESIA}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [526] = { .species = SPECIES_NINETALES, - .moves = {MOVE_HEAT_WAVE MOVE_BODY_SLAM MOVE_GRUDGE MOVE_SUNNY_DAY}, + .moves = {MOVE_HEAT_WAVE, MOVE_BODY_SLAM, MOVE_GRUDGE, MOVE_SUNNY_DAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [527] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_BULK_UP MOVE_REST}, + .moves = {MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_BULK_UP, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [528] = { .species = SPECIES_SHUCKLE, - .moves = {MOVE_SANDSTORM MOVE_DIG MOVE_FLASH MOVE_DOUBLE_TEAM}, + .moves = {MOVE_SANDSTORM, MOVE_DIG, MOVE_FLASH, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_CAREFUL }, [529] = { .species = SPECIES_STEELIX, - .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_BREATH MOVE_SANDSTORM MOVE_BLOCK}, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_SANDSTORM, MOVE_BLOCK}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [530] = { .species = SPECIES_TENTACRUEL, - .moves = {MOVE_TOXIC MOVE_GIGA_DRAIN MOVE_CONFUSE_RAY MOVE_SURF}, + .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_SURF}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [531] = { .species = SPECIES_AERODACTYL, - .moves = {MOVE_HYPER_BEAM MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ANCIENT_POWER}, + .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ANCIENT_POWER}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [532] = { .species = SPECIES_PORYGON2, - .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_THUNDER_WAVE MOVE_RECOVER}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_THUNDER_WAVE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [533] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_PSYCHIC MOVE_CALM_MIND MOVE_DOUBLE_TEAM MOVE_REST}, + .moves = {MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_DOUBLE_TEAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [534] = { .species = SPECIES_EXEGGUTOR, - .moves = {MOVE_RETURN MOVE_CURSE MOVE_SLEEP_POWDER MOVE_REST}, + .moves = {MOVE_RETURN, MOVE_CURSE, MOVE_SLEEP_POWDER, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [535] = { .species = SPECIES_STARMIE, - .moves = {MOVE_HYDRO_PUMP MOVE_THUNDER MOVE_RAIN_DANCE MOVE_RECOVER}, + .moves = {MOVE_HYDRO_PUMP, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [536] = { .species = SPECIES_FLYGON, - .moves = {MOVE_SOLAR_BEAM MOVE_FIRE_BLAST MOVE_CRUNCH MOVE_SUNNY_DAY}, + .moves = {MOVE_SOLAR_BEAM, MOVE_FIRE_BLAST, MOVE_CRUNCH, MOVE_SUNNY_DAY}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [537] = { .species = SPECIES_VENUSAUR, - .moves = {MOVE_LEECH_SEED MOVE_GIGA_DRAIN MOVE_DOUBLE_TEAM MOVE_LIGHT_SCREEN}, + .moves = {MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_DOUBLE_TEAM, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [538] = { .species = SPECIES_VAPOREON, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_BODY_SLAM MOVE_SHADOW_BALL}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [539] = { .species = SPECIES_JOLTEON, - .moves = {MOVE_THUNDERBOLT MOVE_DIG MOVE_DOUBLE_KICK MOVE_ROAR}, + .moves = {MOVE_THUNDERBOLT, MOVE_DIG, MOVE_DOUBLE_KICK, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [540] = { .species = SPECIES_FLAREON, - .moves = {MOVE_CURSE MOVE_ATTRACT MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL}, + .moves = {MOVE_CURSE, MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [541] = { .species = SPECIES_MEGANIUM, - .moves = {MOVE_LEECH_SEED MOVE_SUBSTITUTE MOVE_DOUBLE_TEAM MOVE_GRASS_WHISTLE}, + .moves = {MOVE_LEECH_SEED, MOVE_SUBSTITUTE, MOVE_DOUBLE_TEAM, MOVE_GRASS_WHISTLE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [542] = { .species = SPECIES_ESPEON, - .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_CALM_MIND MOVE_REST}, + .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_CALM_MIND, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [543] = { .species = SPECIES_UMBREON, - .moves = {MOVE_CURSE MOVE_SCREECH MOVE_DOUBLE_TEAM MOVE_DOUBLE_EDGE}, + .moves = {MOVE_CURSE, MOVE_SCREECH, MOVE_DOUBLE_TEAM, MOVE_DOUBLE_EDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [544] = { .species = SPECIES_BLASTOISE, - .moves = {MOVE_HYDRO_PUMP MOVE_MEGA_KICK MOVE_BRICK_BREAK MOVE_MIRROR_COAT}, + .moves = {MOVE_HYDRO_PUMP, MOVE_MEGA_KICK, MOVE_BRICK_BREAK, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_BRAVE }, [545] = { .species = SPECIES_FERALIGATR, - .moves = {MOVE_SURF MOVE_DRAGON_CLAW MOVE_BRICK_BREAK MOVE_SCARY_FACE}, + .moves = {MOVE_SURF, MOVE_DRAGON_CLAW, MOVE_BRICK_BREAK, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [546] = { .species = SPECIES_AGGRON, - .moves = {MOVE_FOCUS_PUNCH MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_THUNDER_WAVE}, + .moves = {MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [547] = { .species = SPECIES_BLAZIKEN, - .moves = {MOVE_BLAZE_KICK MOVE_MEGA_KICK MOVE_THUNDER_PUNCH MOVE_BRICK_BREAK}, + .moves = {MOVE_BLAZE_KICK, MOVE_MEGA_KICK, MOVE_THUNDER_PUNCH, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [548] = { .species = SPECIES_WALREIN, - .moves = {MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_CURSE MOVE_DOUBLE_TEAM}, + .moves = {MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_CURSE, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [549] = { .species = SPECIES_SCEPTILE, - .moves = {MOVE_LEAF_BLADE MOVE_THUNDER_PUNCH MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .moves = {MOVE_LEAF_BLADE, MOVE_THUNDER_PUNCH, MOVE_ATTRACT, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [550] = { .species = SPECIES_CHARIZARD, - .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_DRAGON_DANCE MOVE_SMOKESCREEN}, + .moves = {MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_DRAGON_DANCE, MOVE_SMOKESCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [551] = { .species = SPECIES_TYPHLOSION, - .moves = {MOVE_FLAMETHROWER MOVE_THUNDER_PUNCH MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .moves = {MOVE_FLAMETHROWER, MOVE_THUNDER_PUNCH, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [552] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_BODY_SLAM MOVE_ROAR}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_BODY_SLAM, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_TIMID }, [553] = { .species = SPECIES_CROBAT, - .moves = {MOVE_TOXIC MOVE_GIGA_DRAIN MOVE_CONFUSE_RAY MOVE_DOUBLE_TEAM}, + .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [554] = { .species = SPECIES_SWAMPERT, - .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_COUNTER MOVE_MIRROR_COAT}, + .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [555] = { .species = SPECIES_GYARADOS, - .moves = {MOVE_HYDRO_PUMP MOVE_THUNDERBOLT MOVE_FIRE_BLAST MOVE_BLIZZARD}, + .moves = {MOVE_HYDRO_PUMP, MOVE_THUNDERBOLT, MOVE_FIRE_BLAST, MOVE_BLIZZARD}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [556] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CURSE MOVE_REST}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CURSE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [557] = { .species = SPECIES_KINGDRA, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_DRAGON_BREATH MOVE_REST}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_DRAGON_BREATH, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [558] = { .species = SPECIES_BLISSEY, - .moves = {MOVE_SEISMIC_TOSS MOVE_SING MOVE_ATTRACT MOVE_SUBSTITUTE}, + .moves = {MOVE_SEISMIC_TOSS, MOVE_SING, MOVE_ATTRACT, MOVE_SUBSTITUTE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BOLD }, [559] = { .species = SPECIES_MILOTIC, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_SAFEGUARD MOVE_MIRROR_COAT}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_SAFEGUARD, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [560] = { .species = SPECIES_ARCANINE, - .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_CRUNCH MOVE_ROAR}, + .moves = {MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_CRUNCH, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [561] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_DOUBLE_EDGE MOVE_CRUNCH MOVE_SWAGGER MOVE_PROTECT}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_CRUNCH, MOVE_SWAGGER, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [562] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_EARTHQUAKE MOVE_METEOR_MASH MOVE_PSYCH_UP MOVE_SWAGGER}, + .moves = {MOVE_EARTHQUAKE, MOVE_METEOR_MASH, MOVE_PSYCH_UP, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [563] = { .species = SPECIES_SLAKING, - .moves = {MOVE_MEGA_KICK MOVE_SHADOW_BALL MOVE_YAWN MOVE_AMNESIA}, + .moves = {MOVE_MEGA_KICK, MOVE_SHADOW_BALL, MOVE_YAWN, MOVE_AMNESIA}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_ADAMANT }, [564] = { .species = SPECIES_DUGTRIO, - .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_SLUDGE_BOMB MOVE_FISSURE}, + .moves = {MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_SLUDGE_BOMB, MOVE_FISSURE}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [565] = { .species = SPECIES_MEDICHAM, - .moves = {MOVE_DYNAMIC_PUNCH MOVE_THUNDER_PUNCH MOVE_ICE_PUNCH MOVE_FIRE_PUNCH}, + .moves = {MOVE_DYNAMIC_PUNCH, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_HARDY }, [566] = { .species = SPECIES_MISDREAVUS, - .moves = {MOVE_PERISH_SONG MOVE_MEAN_LOOK MOVE_THUNDER_WAVE MOVE_CONFUSE_RAY}, + .moves = {MOVE_PERISH_SONG, MOVE_MEAN_LOOK, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [567] = { .species = SPECIES_FEAROW, - .moves = {MOVE_DRILL_PECK MOVE_RETURN MOVE_STEEL_WING MOVE_FAINT_ATTACK}, + .moves = {MOVE_DRILL_PECK, MOVE_RETURN, MOVE_STEEL_WING, MOVE_FAINT_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [568] = { .species = SPECIES_GRANBULL, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_SLUDGE_BOMB MOVE_ROCK_SLIDE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_SLUDGE_BOMB, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [569] = { .species = SPECIES_JYNX, - .moves = {MOVE_DREAM_EATER MOVE_LOVELY_KISS MOVE_ATTRACT MOVE_SUBSTITUTE}, + .moves = {MOVE_DREAM_EATER, MOVE_LOVELY_KISS, MOVE_ATTRACT, MOVE_SUBSTITUTE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [570] = { .species = SPECIES_DUSCLOPS, - .moves = {MOVE_PSYCH_UP MOVE_SWAGGER MOVE_SHADOW_BALL MOVE_EARTHQUAKE}, + .moves = {MOVE_PSYCH_UP, MOVE_SWAGGER, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [571] = { .species = SPECIES_DODRIO, - .moves = {MOVE_DOUBLE_EDGE MOVE_DRILL_PECK MOVE_STEEL_WING MOVE_FAINT_ATTACK}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_DRILL_PECK, MOVE_STEEL_WING, MOVE_FAINT_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [572] = { .species = SPECIES_MR_MIME, - .moves = {MOVE_TRICK MOVE_TORMENT MOVE_PSYCHIC MOVE_THUNDERBOLT}, + .moves = {MOVE_TRICK, MOVE_TORMENT, MOVE_PSYCHIC, MOVE_THUNDERBOLT}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [573] = { .species = SPECIES_LANTURN, - .moves = {MOVE_HYDRO_PUMP MOVE_THUNDER MOVE_CONFUSE_RAY MOVE_RAIN_DANCE}, + .moves = {MOVE_HYDRO_PUMP, MOVE_THUNDER, MOVE_CONFUSE_RAY, MOVE_RAIN_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [574] = { .species = SPECIES_BRELOOM, - .moves = {MOVE_IRON_TAIL MOVE_FOCUS_PUNCH MOVE_ATTRACT MOVE_SPORE}, + .moves = {MOVE_IRON_TAIL, MOVE_FOCUS_PUNCH, MOVE_ATTRACT, MOVE_SPORE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [575] = { .species = SPECIES_FORRETRESS, - .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_GIGA_DRAIN MOVE_ZAP_CANNON}, + .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_ZAP_CANNON}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [576] = { .species = SPECIES_WHISCASH, - .moves = {MOVE_SLEEP_TALK MOVE_REST MOVE_SURF MOVE_FISSURE}, + .moves = {MOVE_SLEEP_TALK, MOVE_REST, MOVE_SURF, MOVE_FISSURE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_HARDY }, [577] = { .species = SPECIES_XATU, - .moves = {MOVE_DRILL_PECK MOVE_PSYCHIC MOVE_GIGA_DRAIN MOVE_STEEL_WING}, + .moves = {MOVE_DRILL_PECK, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_STEEL_WING}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_JOLLY }, [578] = { .species = SPECIES_SKARMORY, - .moves = {MOVE_TOXIC MOVE_CURSE MOVE_REST MOVE_FLY}, + .moves = {MOVE_TOXIC, MOVE_CURSE, MOVE_REST, MOVE_FLY}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [579] = { .species = SPECIES_MAROWAK, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWORDS_DANCE MOVE_BRICK_BREAK}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [580] = { .species = SPECIES_QUAGSIRE, - .moves = {MOVE_EARTHQUAKE MOVE_SLUDGE_BOMB MOVE_DOUBLE_EDGE MOVE_CURSE}, + .moves = {MOVE_EARTHQUAKE, MOVE_SLUDGE_BOMB, MOVE_DOUBLE_EDGE, MOVE_CURSE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [581] = { .species = SPECIES_CLEFABLE, - .moves = {MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_FLAMETHROWER MOVE_MAGICAL_LEAF}, + .moves = {MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_FLAMETHROWER, MOVE_MAGICAL_LEAF}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [582] = { .species = SPECIES_HARIYAMA, - .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_FACADE}, + .moves = {MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [583] = { .species = SPECIES_RAICHU, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_IRON_TAIL MOVE_ATTRACT}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_IRON_TAIL, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [584] = { .species = SPECIES_DEWGONG, - .moves = {MOVE_HORN_DRILL MOVE_SHEER_COLD MOVE_SLEEP_TALK MOVE_REST}, + .moves = {MOVE_HORN_DRILL, MOVE_SHEER_COLD, MOVE_SLEEP_TALK, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [585] = { .species = SPECIES_MANECTRIC, - .moves = {MOVE_THUNDERBOLT MOVE_IRON_TAIL MOVE_THUNDER_WAVE MOVE_ROAR}, + .moves = {MOVE_THUNDERBOLT, MOVE_IRON_TAIL, MOVE_THUNDER_WAVE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [586] = { .species = SPECIES_VILEPLUME, - .moves = {MOVE_ATTRACT MOVE_STUN_SPORE MOVE_SLUDGE_BOMB MOVE_GIGA_DRAIN}, + .moves = {MOVE_ATTRACT, MOVE_STUN_SPORE, MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [587] = { .species = SPECIES_VICTREEBEL, - .moves = {MOVE_STUN_SPORE MOVE_INGRAIN MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB}, + .moves = {MOVE_STUN_SPORE, MOVE_INGRAIN, MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [588] = { .species = SPECIES_ELECTRODE, - .moves = {MOVE_EXPLOSION MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_ENDURE}, + .moves = {MOVE_EXPLOSION, MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_NAUGHTY }, [589] = { .species = SPECIES_EXPLOUD, - .moves = {MOVE_OVERHEAT MOVE_ICE_BEAM MOVE_THUNDER_PUNCH MOVE_EXTRASENSORY}, + .moves = {MOVE_OVERHEAT, MOVE_ICE_BEAM, MOVE_THUNDER_PUNCH, MOVE_EXTRASENSORY}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [590] = { .species = SPECIES_SHIFTRY, - .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_EXPLOSION MOVE_SYNTHESIS}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [591] = { .species = SPECIES_GLALIE, - .moves = {MOVE_BLIZZARD MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL}, + .moves = {MOVE_BLIZZARD, MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [592] = { .species = SPECIES_LUDICOLO, - .moves = {MOVE_LEECH_SEED MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_GIGA_DRAIN}, + .moves = {MOVE_LEECH_SEED, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [593] = { .species = SPECIES_HYPNO, - .moves = {MOVE_PSYCH_UP MOVE_SWAGGER MOVE_MEGA_KICK MOVE_SHADOW_BALL}, + .moves = {MOVE_PSYCH_UP, MOVE_SWAGGER, MOVE_MEGA_KICK, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [594] = { .species = SPECIES_GOLEM, - .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_BRICK_BREAK}, + .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [595] = { .species = SPECIES_RHYDON, - .moves = {MOVE_MEGAHORN MOVE_CRUSH_CLAW MOVE_EARTHQUAKE MOVE_HORN_DRILL}, + .moves = {MOVE_MEGAHORN, MOVE_CRUSH_CLAW, MOVE_EARTHQUAKE, MOVE_HORN_DRILL}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [596] = { .species = SPECIES_ALAKAZAM, - .moves = {MOVE_TRICK MOVE_DISABLE MOVE_PSYCHIC MOVE_SKILL_SWAP}, + .moves = {MOVE_TRICK, MOVE_DISABLE, MOVE_PSYCHIC, MOVE_SKILL_SWAP}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [597] = { .species = SPECIES_WEEZING, - .moves = {MOVE_EXPLOSION MOVE_SLUDGE_BOMB MOVE_FLAMETHROWER MOVE_THUNDERBOLT}, + .moves = {MOVE_EXPLOSION, MOVE_SLUDGE_BOMB, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [598] = { .species = SPECIES_KANGASKHAN, - .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_THUNDERBOLT MOVE_EARTHQUAKE}, + .moves = {MOVE_REVERSAL, MOVE_ENDURE, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_JOLLY }, [599] = { .species = SPECIES_ELECTABUZZ, - .moves = {MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_THUNDERBOLT MOVE_CROSS_CHOP}, + .moves = {MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_THUNDERBOLT, MOVE_CROSS_CHOP}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [600] = { .species = SPECIES_TAUROS, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_ICE_BEAM}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ICE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [601] = { .species = SPECIES_SLOWBRO, - .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_ATTRACT}, + .moves = {MOVE_SURF, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, .nature = NATURE_QUIET }, [602] = { .species = SPECIES_SLOWKING, - .moves = {MOVE_PSYCHIC MOVE_SURF MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .moves = {MOVE_PSYCHIC, MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [603] = { .species = SPECIES_MILTANK, - .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_EARTHQUAKE MOVE_SHADOW_BALL}, + .moves = {MOVE_REVERSAL, MOVE_ENDURE, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [604] = { .species = SPECIES_ALTARIA, - .moves = {MOVE_SING MOVE_DRAGON_DANCE MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .moves = {MOVE_SING, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [605] = { .species = SPECIES_NIDOQUEEN, - .moves = {MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_CRUNCH}, + .moves = {MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_CRUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [606] = { .species = SPECIES_NIDOKING, - .moves = {MOVE_HORN_DRILL MOVE_FIRE_BLAST MOVE_BLIZZARD MOVE_SURF}, + .moves = {MOVE_HORN_DRILL, MOVE_FIRE_BLAST, MOVE_BLIZZARD, MOVE_SURF}, .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [607] = { .species = SPECIES_MAGMAR, - .moves = {MOVE_MEGA_KICK MOVE_CROSS_CHOP MOVE_IRON_TAIL MOVE_COUNTER}, + .moves = {MOVE_MEGA_KICK, MOVE_CROSS_CHOP, MOVE_IRON_TAIL, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_IMPISH }, [608] = { .species = SPECIES_CRADILY, - .moves = {MOVE_SUBSTITUTE MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_RECOVER}, + .moves = {MOVE_SUBSTITUTE, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [609] = { .species = SPECIES_ARMALDO, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK MOVE_SWORDS_DANCE}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK, MOVE_SWORDS_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [610] = { .species = SPECIES_GOLDUCK, - .moves = {MOVE_HYDRO_PUMP MOVE_CROSS_CHOP MOVE_BLIZZARD MOVE_PROTECT}, + .moves = {MOVE_HYDRO_PUMP, MOVE_CROSS_CHOP, MOVE_BLIZZARD, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [611] = { .species = SPECIES_RAPIDASH, - .moves = {MOVE_OVERHEAT MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_HYPNOSIS}, + .moves = {MOVE_OVERHEAT, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_HYPNOSIS}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [612] = { .species = SPECIES_MUK, - .moves = {MOVE_SLUDGE_BOMB MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_PUNCH}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [613] = { .species = SPECIES_GENGAR, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_GIGA_DRAIN MOVE_SKILL_SWAP}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_GIGA_DRAIN, MOVE_SKILL_SWAP}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [614] = { .species = SPECIES_AMPHAROS, - .moves = {MOVE_THUNDERBOLT MOVE_MEGA_KICK MOVE_IRON_TAIL MOVE_BRICK_BREAK}, + .moves = {MOVE_THUNDERBOLT, MOVE_MEGA_KICK, MOVE_IRON_TAIL, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [615] = { .species = SPECIES_SCIZOR, - .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_AGILITY MOVE_SLASH}, + .moves = {MOVE_REVERSAL, MOVE_ENDURE, MOVE_AGILITY, MOVE_SLASH}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_CAREFUL }, [616] = { .species = SPECIES_HERACROSS, - .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [617] = { .species = SPECIES_URSARING, - .moves = {MOVE_FIRE_PUNCH MOVE_THUNDER_PUNCH MOVE_ICE_PUNCH MOVE_CRUNCH}, + .moves = {MOVE_FIRE_PUNCH, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH, MOVE_CRUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [618] = { .species = SPECIES_HOUNDOOM, - .moves = {MOVE_OVERHEAT MOVE_SHADOW_BALL MOVE_SLUDGE_BOMB MOVE_DOUBLE_EDGE}, + .moves = {MOVE_OVERHEAT, MOVE_SHADOW_BALL, MOVE_SLUDGE_BOMB, MOVE_DOUBLE_EDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [619] = { .species = SPECIES_DONPHAN, - .moves = {MOVE_FISSURE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SECRET_POWER}, + .moves = {MOVE_FISSURE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SECRET_POWER}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [620] = { .species = SPECIES_CLAYDOL, - .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_SOLAR_BEAM MOVE_SUNNY_DAY}, + .moves = {MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [621] = { .species = SPECIES_WAILORD, - .moves = {MOVE_HYDRO_PUMP MOVE_FISSURE MOVE_DOUBLE_TEAM MOVE_REST}, + .moves = {MOVE_HYDRO_PUMP, MOVE_FISSURE, MOVE_DOUBLE_TEAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [622] = { .species = SPECIES_NINETALES, - .moves = {MOVE_FIRE_BLAST MOVE_IRON_TAIL MOVE_CONFUSE_RAY MOVE_ATTRACT}, + .moves = {MOVE_FIRE_BLAST, MOVE_IRON_TAIL, MOVE_CONFUSE_RAY, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [623] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_CROSS_CHOP MOVE_FIRE_BLAST MOVE_THUNDER_PUNCH MOVE_ICE_PUNCH}, + .moves = {MOVE_CROSS_CHOP, MOVE_FIRE_BLAST, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [624] = { .species = SPECIES_SHUCKLE, - .moves = {MOVE_SUBSTITUTE MOVE_ATTRACT MOVE_TOXIC MOVE_DOUBLE_TEAM}, + .moves = {MOVE_SUBSTITUTE, MOVE_ATTRACT, MOVE_TOXIC, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_CAREFUL }, [625] = { .species = SPECIES_STEELIX, - .moves = {MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_ROCK_SLIDE MOVE_EXPLOSION}, + .moves = {MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_ROCK_SLIDE, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [626] = { .species = SPECIES_TENTACRUEL, - .moves = {MOVE_SURF MOVE_GIGA_DRAIN MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .moves = {MOVE_SURF, MOVE_GIGA_DRAIN, MOVE_ICE_BEAM, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [627] = { .species = SPECIES_AERODACTYL, - .moves = {MOVE_DOUBLE_EDGE MOVE_ROCK_SLIDE MOVE_FIRE_BLAST MOVE_DRAGON_CLAW}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_DRAGON_CLAW}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [628] = { .species = SPECIES_PORYGON2, - .moves = {MOVE_PSYCHIC MOVE_TRI_ATTACK MOVE_THUNDER_WAVE MOVE_RECOVER}, + .moves = {MOVE_PSYCHIC, MOVE_TRI_ATTACK, MOVE_THUNDER_WAVE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [629] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_PSYCHIC MOVE_ICE_PUNCH MOVE_FIRE_PUNCH MOVE_MAGICAL_LEAF}, + .moves = {MOVE_PSYCHIC, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH, MOVE_MAGICAL_LEAF}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [630] = { .species = SPECIES_EXEGGUTOR, - .moves = {MOVE_LEECH_SEED MOVE_GIGA_DRAIN MOVE_TOXIC MOVE_EXPLOSION}, + .moves = {MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [631] = { .species = SPECIES_STARMIE, - .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM}, + .moves = {MOVE_SURF, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [632] = { .species = SPECIES_FLYGON, - .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_CLAW MOVE_FLAMETHROWER MOVE_GIGA_DRAIN}, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FLAMETHROWER, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [633] = { .species = SPECIES_VENUSAUR, - .moves = {MOVE_DOUBLE_EDGE MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_SLEEP_POWDER}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_SLEEP_POWDER}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [634] = { .species = SPECIES_VAPOREON, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_ACID_ARMOR MOVE_BATON_PASS}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_ACID_ARMOR, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [635] = { .species = SPECIES_JOLTEON, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_AGILITY MOVE_BATON_PASS}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_AGILITY, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [636] = { .species = SPECIES_FLAREON, - .moves = {MOVE_SHADOW_BALL MOVE_FLAIL MOVE_ENDURE MOVE_OVERHEAT}, + .moves = {MOVE_SHADOW_BALL, MOVE_FLAIL, MOVE_ENDURE, MOVE_OVERHEAT}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_JOLLY }, [637] = { .species = SPECIES_MEGANIUM, - .moves = {MOVE_EARTHQUAKE MOVE_FLAIL MOVE_ENDURE MOVE_GIGA_DRAIN}, + .moves = {MOVE_EARTHQUAKE, MOVE_FLAIL, MOVE_ENDURE, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_JOLLY }, [638] = { .species = SPECIES_ESPEON, - .moves = {MOVE_PSYCHIC MOVE_BITE MOVE_WISH MOVE_REFLECT}, + .moves = {MOVE_PSYCHIC, MOVE_BITE, MOVE_WISH, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [639] = { .species = SPECIES_UMBREON, - .moves = {MOVE_SWAGGER MOVE_PSYCH_UP MOVE_ATTRACT MOVE_SHADOW_BALL}, + .moves = {MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_ATTRACT, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [640] = { .species = SPECIES_BLASTOISE, - .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_COUNTER}, + .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [641] = { .species = SPECIES_FERALIGATR, - .moves = {MOVE_HYDRO_PUMP MOVE_CRUNCH MOVE_EARTHQUAKE MOVE_ROCK_SLIDE}, + .moves = {MOVE_HYDRO_PUMP, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [642] = { .species = SPECIES_AGGRON, - .moves = {MOVE_SURF MOVE_THUNDER MOVE_FIRE_BLAST MOVE_BLIZZARD}, + .moves = {MOVE_SURF, MOVE_THUNDER, MOVE_FIRE_BLAST, MOVE_BLIZZARD}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [643] = { .species = SPECIES_BLAZIKEN, - .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_ENDURE MOVE_REVERSAL}, + .moves = {MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_ENDURE, MOVE_REVERSAL}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [644] = { .species = SPECIES_WALREIN, - .moves = {MOVE_SHEER_COLD MOVE_FISSURE MOVE_SURF MOVE_ATTRACT}, + .moves = {MOVE_SHEER_COLD, MOVE_FISSURE, MOVE_SURF, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [645] = { .species = SPECIES_SCEPTILE, - .moves = {MOVE_LEAF_BLADE MOVE_EARTHQUAKE MOVE_CRUSH_CLAW MOVE_AERIAL_ACE}, + .moves = {MOVE_LEAF_BLADE, MOVE_EARTHQUAKE, MOVE_CRUSH_CLAW, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [646] = { .species = SPECIES_CHARIZARD, - .moves = {MOVE_FLAMETHROWER MOVE_DRAGON_CLAW MOVE_BITE MOVE_BRICK_BREAK}, + .moves = {MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_BITE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [647] = { .species = SPECIES_TYPHLOSION, - .moves = {MOVE_EARTHQUAKE MOVE_OVERHEAT MOVE_ENDURE MOVE_REVERSAL}, + .moves = {MOVE_EARTHQUAKE, MOVE_OVERHEAT, MOVE_ENDURE, MOVE_REVERSAL}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [648] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_DOUBLE_EDGE MOVE_PSYCHIC MOVE_CONFUSE_RAY MOVE_DRAGON_DANCE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_PSYCHIC, MOVE_CONFUSE_RAY, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [649] = { .species = SPECIES_CROBAT, - .moves = {MOVE_AIR_CUTTER MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_SCREECH}, + .moves = {MOVE_AIR_CUTTER, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_SCREECH}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [650] = { .species = SPECIES_SWAMPERT, - .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_COUNTER}, + .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_BRAVE }, [651] = { .species = SPECIES_GYARADOS, - .moves = {MOVE_SURF MOVE_THUNDER MOVE_RAIN_DANCE MOVE_EARTHQUAKE}, + .moves = {MOVE_SURF, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [652] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_MEGA_KICK MOVE_SHADOW_BALL MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_MEGA_KICK, MOVE_SHADOW_BALL, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_ADAMANT }, [653] = { .species = SPECIES_KINGDRA, - .moves = {MOVE_FLAIL MOVE_HYDRO_PUMP MOVE_DRAGON_DANCE MOVE_ENDURE}, + .moves = {MOVE_FLAIL, MOVE_HYDRO_PUMP, MOVE_DRAGON_DANCE, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [654] = { .species = SPECIES_BLISSEY, - .moves = {MOVE_FIRE_BLAST MOVE_BLIZZARD MOVE_CALM_MIND MOVE_SOFT_BOILED}, + .moves = {MOVE_FIRE_BLAST, MOVE_BLIZZARD, MOVE_CALM_MIND, MOVE_SOFT_BOILED}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BOLD }, [655] = { .species = SPECIES_MILOTIC, - .moves = {MOVE_SURF MOVE_BLIZZARD MOVE_ATTRACT MOVE_RECOVER}, + .moves = {MOVE_SURF, MOVE_BLIZZARD, MOVE_ATTRACT, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [656] = { .species = SPECIES_ARCANINE, - .moves = {MOVE_OVERHEAT MOVE_EXTREME_SPEED MOVE_CRUNCH MOVE_AERIAL_ACE}, + .moves = {MOVE_OVERHEAT, MOVE_EXTREME_SPEED, MOVE_CRUNCH, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [657] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_ENDURE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [658] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_EARTHQUAKE MOVE_METEOR_MASH MOVE_DOUBLE_TEAM MOVE_REST}, + .moves = {MOVE_EARTHQUAKE, MOVE_METEOR_MASH, MOVE_DOUBLE_TEAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [659] = { .species = SPECIES_SLAKING, - .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_AERIAL_ACE MOVE_BRICK_BREAK}, + .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_ADAMANT }, [660] = { .species = SPECIES_DUGTRIO, - .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_ROCK_SLIDE MOVE_FISSURE}, + .moves = {MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_ROCK_SLIDE, MOVE_FISSURE}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [661] = { .species = SPECIES_MEDICHAM, - .moves = {MOVE_MEGA_KICK MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_ROCK_SLIDE}, + .moves = {MOVE_MEGA_KICK, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [662] = { .species = SPECIES_MISDREAVUS, - .moves = {MOVE_DESTINY_BOND MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_THUNDERBOLT}, + .moves = {MOVE_DESTINY_BOND, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_TIMID }, [663] = { .species = SPECIES_FEAROW, - .moves = {MOVE_DRILL_PECK MOVE_DOUBLE_EDGE MOVE_STEEL_WING MOVE_SKY_ATTACK}, + .moves = {MOVE_DRILL_PECK, MOVE_DOUBLE_EDGE, MOVE_STEEL_WING, MOVE_SKY_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [664] = { .species = SPECIES_GRANBULL, - .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_SHADOW_BALL}, + .moves = {MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_BRAVE }, [665] = { .species = SPECIES_JYNX, - .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_LOVELY_KISS MOVE_FAKE_TEARS}, + .moves = {MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_LOVELY_KISS, MOVE_FAKE_TEARS}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [666] = { .species = SPECIES_DUSCLOPS, - .moves = {MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_CURSE MOVE_REST}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_CURSE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [667] = { .species = SPECIES_DODRIO, - .moves = {MOVE_FLAIL MOVE_ENDURE MOVE_DRILL_PECK MOVE_FACADE}, + .moves = {MOVE_FLAIL, MOVE_ENDURE, MOVE_DRILL_PECK, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [668] = { .species = SPECIES_MR_MIME, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_FIRE_PUNCH}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [669] = { .species = SPECIES_LANTURN, - .moves = {MOVE_SURF MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_CONFUSE_RAY}, + .moves = {MOVE_SURF, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [670] = { .species = SPECIES_BRELOOM, - .moves = {MOVE_FOCUS_PUNCH MOVE_SLUDGE_BOMB MOVE_SPORE MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FOCUS_PUNCH, MOVE_SLUDGE_BOMB, MOVE_SPORE, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [671] = { .species = SPECIES_FORRETRESS, - .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DOUBLE_EDGE}, + .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DOUBLE_EDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [672] = { .species = SPECIES_WHISCASH, - .moves = {MOVE_FISSURE MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM}, + .moves = {MOVE_FISSURE, MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [673] = { .species = SPECIES_XATU, - .moves = {MOVE_PSYCHIC MOVE_DRILL_PECK MOVE_SHADOW_BALL MOVE_CONFUSE_RAY}, + .moves = {MOVE_PSYCHIC, MOVE_DRILL_PECK, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [674] = { .species = SPECIES_SKARMORY, - .moves = {MOVE_DRILL_PECK MOVE_STEEL_WING MOVE_COUNTER MOVE_ROCK_SLIDE}, + .moves = {MOVE_DRILL_PECK, MOVE_STEEL_WING, MOVE_COUNTER, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [675] = { .species = SPECIES_MAROWAK, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWORDS_DANCE MOVE_MEGA_KICK}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_MEGA_KICK}, .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [676] = { .species = SPECIES_QUAGSIRE, - .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_AMNESIA}, + .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_AMNESIA}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_SASSY }, [677] = { .species = SPECIES_CLEFABLE, - .moves = {MOVE_MEGA_KICK MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_SOFT_BOILED}, + .moves = {MOVE_MEGA_KICK, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_SOFT_BOILED}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [678] = { .species = SPECIES_HARIYAMA, - .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_FAKE_OUT}, + .moves = {MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [679] = { .species = SPECIES_RAICHU, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_PROTECT MOVE_MEGA_KICK}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_PROTECT, MOVE_MEGA_KICK}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [680] = { .species = SPECIES_DEWGONG, - .moves = {MOVE_SHEER_COLD MOVE_ICE_BEAM MOVE_SURF MOVE_SIGNAL_BEAM}, + .moves = {MOVE_SHEER_COLD, MOVE_ICE_BEAM, MOVE_SURF, MOVE_SIGNAL_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [681] = { .species = SPECIES_MANECTRIC, - .moves = {MOVE_THUNDERBOLT MOVE_CRUNCH MOVE_THUNDER_WAVE MOVE_ROAR}, + .moves = {MOVE_THUNDERBOLT, MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [682] = { .species = SPECIES_VILEPLUME, - .moves = {MOVE_SOLAR_BEAM MOVE_SLUDGE_BOMB MOVE_SUNNY_DAY MOVE_SYNTHESIS}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SLUDGE_BOMB, MOVE_SUNNY_DAY, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [683] = { .species = SPECIES_VICTREEBEL, - .moves = {MOVE_GIGA_DRAIN MOVE_DOUBLE_EDGE MOVE_SLUDGE_BOMB MOVE_SYNTHESIS}, + .moves = {MOVE_GIGA_DRAIN, MOVE_DOUBLE_EDGE, MOVE_SLUDGE_BOMB, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [684] = { .species = SPECIES_ELECTRODE, - .moves = {MOVE_EXPLOSION MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_MIRROR_COAT}, + .moves = {MOVE_EXPLOSION, MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_NAUGHTY }, [685] = { .species = SPECIES_EXPLOUD, - .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_OVERHEAT}, + .moves = {MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_OVERHEAT}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [686] = { .species = SPECIES_SHIFTRY, - .moves = {MOVE_EXPLOSION MOVE_GIGA_DRAIN MOVE_MEGA_KICK MOVE_FAKE_OUT}, + .moves = {MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_MEGA_KICK, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [687] = { .species = SPECIES_GLALIE, - .moves = {MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_SHADOW_BALL}, + .moves = {MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [688] = { .species = SPECIES_LUDICOLO, - .moves = {MOVE_LEECH_SEED MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_TOXIC}, + .moves = {MOVE_LEECH_SEED, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_TOXIC}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [689] = { .species = SPECIES_HYPNO, - .moves = {MOVE_PSYCHIC MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [690] = { .species = SPECIES_GOLEM, - .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DOUBLE_EDGE}, + .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DOUBLE_EDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [691] = { .species = SPECIES_RHYDON, - .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_HORN_DRILL}, + .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_HORN_DRILL}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [692] = { .species = SPECIES_ALAKAZAM, - .moves = {MOVE_PSYCHIC MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [693] = { .species = SPECIES_WEEZING, - .moves = {MOVE_EXPLOSION MOVE_SLUDGE_BOMB MOVE_FRUSTRATION MOVE_SHADOW_BALL}, + .moves = {MOVE_EXPLOSION, MOVE_SLUDGE_BOMB, MOVE_FRUSTRATION, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [694] = { .species = SPECIES_KANGASKHAN, - .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_SHADOW_BALL}, + .moves = {MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [695] = { .species = SPECIES_ELECTABUZZ, - .moves = {MOVE_THUNDERBOLT MOVE_PSYCHIC MOVE_MEGA_KICK MOVE_CROSS_CHOP}, + .moves = {MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_MEGA_KICK, MOVE_CROSS_CHOP}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [696] = { .species = SPECIES_TAUROS, - .moves = {MOVE_DOUBLE_EDGE MOVE_ROCK_TOMB MOVE_THUNDERBOLT MOVE_SURF}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_ROCK_TOMB, MOVE_THUNDERBOLT, MOVE_SURF}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [697] = { .species = SPECIES_SLOWBRO, - .moves = {MOVE_PSYCHIC MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM}, + .moves = {MOVE_PSYCHIC, MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, .nature = NATURE_SASSY }, [698] = { .species = SPECIES_SLOWKING, - .moves = {MOVE_PSYCHIC MOVE_SURF MOVE_ICE_BEAM MOVE_FLAMETHROWER}, + .moves = {MOVE_PSYCHIC, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [699] = { .species = SPECIES_MILTANK, - .moves = {MOVE_DOUBLE_EDGE MOVE_CURSE MOVE_DOUBLE_TEAM MOVE_MILK_DRINK}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_CURSE, MOVE_DOUBLE_TEAM, MOVE_MILK_DRINK}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [700] = { .species = SPECIES_ALTARIA, - .moves = {MOVE_DRAGON_CLAW MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_ICE_BEAM}, + .moves = {MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ICE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [701] = { .species = SPECIES_NIDOQUEEN, - .moves = {MOVE_SUPERPOWER MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_SHADOW_BALL}, + .moves = {MOVE_SUPERPOWER, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [702] = { .species = SPECIES_NIDOKING, - .moves = {MOVE_MEGAHORN MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_THUNDER}, + .moves = {MOVE_MEGAHORN, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_THUNDER}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [703] = { .species = SPECIES_MAGMAR, - .moves = {MOVE_FLAMETHROWER MOVE_PSYCHIC MOVE_CROSS_CHOP MOVE_CONFUSE_RAY}, + .moves = {MOVE_FLAMETHROWER, MOVE_PSYCHIC, MOVE_CROSS_CHOP, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [704] = { .species = SPECIES_CRADILY, - .moves = {MOVE_TOXIC MOVE_INGRAIN MOVE_MIRROR_COAT MOVE_GIGA_DRAIN}, + .moves = {MOVE_TOXIC, MOVE_INGRAIN, MOVE_MIRROR_COAT, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [705] = { .species = SPECIES_ARMALDO, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [706] = { .species = SPECIES_GOLDUCK, - .moves = {MOVE_SURF MOVE_CROSS_CHOP MOVE_ICE_BEAM MOVE_AERIAL_ACE}, + .moves = {MOVE_SURF, MOVE_CROSS_CHOP, MOVE_ICE_BEAM, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [707] = { .species = SPECIES_RAPIDASH, - .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_IRON_TAIL MOVE_DOUBLE_KICK}, + .moves = {MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_IRON_TAIL, MOVE_DOUBLE_KICK}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [708] = { .species = SPECIES_MUK, - .moves = {MOVE_SLUDGE_BOMB MOVE_BRICK_BREAK MOVE_GIGA_DRAIN MOVE_EXPLOSION}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_BRICK_BREAK, MOVE_GIGA_DRAIN, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_BRAVE }, [709] = { .species = SPECIES_GENGAR, - .moves = {MOVE_PSYCHIC MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_DESTINY_BOND}, + .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [710] = { .species = SPECIES_AMPHAROS, - .moves = {MOVE_THUNDERBOLT MOVE_FIRE_PUNCH MOVE_THUNDER_WAVE MOVE_REFLECT}, + .moves = {MOVE_THUNDERBOLT, MOVE_FIRE_PUNCH, MOVE_THUNDER_WAVE, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [711] = { .species = SPECIES_SCIZOR, - .moves = {MOVE_SILVER_WIND MOVE_SWORDS_DANCE MOVE_AGILITY MOVE_BATON_PASS}, + .moves = {MOVE_SILVER_WIND, MOVE_SWORDS_DANCE, MOVE_AGILITY, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [712] = { .species = SPECIES_HERACROSS, - .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_REVERSAL MOVE_ENDURE}, + .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_REVERSAL, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [713] = { .species = SPECIES_URSARING, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AERIAL_ACE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [714] = { .species = SPECIES_HOUNDOOM, - .moves = {MOVE_OVERHEAT MOVE_SOLAR_BEAM MOVE_CRUNCH MOVE_SUNNY_DAY}, + .moves = {MOVE_OVERHEAT, MOVE_SOLAR_BEAM, MOVE_CRUNCH, MOVE_SUNNY_DAY}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [715] = { .species = SPECIES_DONPHAN, - .moves = {MOVE_FISSURE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_IRON_TAIL}, + .moves = {MOVE_FISSURE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_IRON_TAIL}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [716] = { .species = SPECIES_CLAYDOL, - .moves = {MOVE_PSYCHIC MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_EXPLOSION}, + .moves = {MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [717] = { .species = SPECIES_WAILORD, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_FISSURE}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_FISSURE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [718] = { .species = SPECIES_NINETALES, - .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_CONFUSE_RAY MOVE_WILL_O_WISP}, + .moves = {MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [719] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_ROCK_SLIDE}, + .moves = {MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [720] = { .species = SPECIES_SHUCKLE, - .moves = {MOVE_TOXIC MOVE_DOUBLE_TEAM MOVE_WRAP MOVE_REST}, + .moves = {MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_WRAP, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_CAREFUL }, [721] = { .species = SPECIES_STEELIX, - .moves = {MOVE_EARTHQUAKE MOVE_IRON_TAIL MOVE_DOUBLE_EDGE MOVE_EXPLOSION}, + .moves = {MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_DOUBLE_EDGE, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [722] = { .species = SPECIES_TENTACRUEL, - .moves = {MOVE_HYDRO_PUMP MOVE_SLUDGE_BOMB MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .moves = {MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [723] = { .species = SPECIES_AERODACTYL, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_FIRE_BLAST MOVE_BITE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_FIRE_BLAST, MOVE_BITE}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [724] = { .species = SPECIES_PORYGON2, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_RECOVER}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [725] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_FIRE_PUNCH}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [726] = { .species = SPECIES_EXEGGUTOR, - .moves = {MOVE_PSYCHIC MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_EXPLOSION}, + .moves = {MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [727] = { .species = SPECIES_STARMIE, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_RECOVER}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [728] = { .species = SPECIES_FLYGON, - .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_CLAW MOVE_DOUBLE_EDGE MOVE_CRUNCH}, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_DOUBLE_EDGE, MOVE_CRUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [729] = { .species = SPECIES_VENUSAUR, - .moves = {MOVE_SOLAR_BEAM MOVE_SLUDGE_BOMB MOVE_SUNNY_DAY MOVE_EARTHQUAKE}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SLUDGE_BOMB, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [730] = { .species = SPECIES_VAPOREON, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_ACID_ARMOR MOVE_REST}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_ACID_ARMOR, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [731] = { .species = SPECIES_JOLTEON, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_BITE MOVE_SHADOW_BALL}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_BITE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_TIMID }, [732] = { .species = SPECIES_FLAREON, - .moves = {MOVE_OVERHEAT MOVE_SUNNY_DAY MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL}, + .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [733] = { .species = SPECIES_MEGANIUM, - .moves = {MOVE_GIGA_DRAIN MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_BODY_SLAM}, + .moves = {MOVE_GIGA_DRAIN, MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [734] = { .species = SPECIES_ESPEON, - .moves = {MOVE_PSYCHIC MOVE_BITE MOVE_ATTRACT MOVE_CALM_MIND}, + .moves = {MOVE_PSYCHIC, MOVE_BITE, MOVE_ATTRACT, MOVE_CALM_MIND}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [735] = { .species = SPECIES_UMBREON, - .moves = {MOVE_CONFUSE_RAY MOVE_TOXIC MOVE_FAINT_ATTACK MOVE_DOUBLE_TEAM}, + .moves = {MOVE_CONFUSE_RAY, MOVE_TOXIC, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [736] = { .species = SPECIES_BLASTOISE, - .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [737] = { .species = SPECIES_FERALIGATR, - .moves = {MOVE_HYDRO_PUMP MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [738] = { .species = SPECIES_AGGRON, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AERIAL_ACE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [739] = { .species = SPECIES_BLAZIKEN, - .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_THUNDER_PUNCH MOVE_ROCK_SLIDE}, + .moves = {MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_THUNDER_PUNCH, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [740] = { .species = SPECIES_WALREIN, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_SHEER_COLD}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_SHEER_COLD}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [741] = { .species = SPECIES_SCEPTILE, - .moves = {MOVE_LEAF_BLADE MOVE_DRAGON_CLAW MOVE_CRUNCH MOVE_THUNDER_PUNCH}, + .moves = {MOVE_LEAF_BLADE, MOVE_DRAGON_CLAW, MOVE_CRUNCH, MOVE_THUNDER_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [742] = { .species = SPECIES_CHARIZARD, - .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .moves = {MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [743] = { .species = SPECIES_TYPHLOSION, - .moves = {MOVE_OVERHEAT MOVE_THUNDER_PUNCH MOVE_EARTHQUAKE MOVE_CRUSH_CLAW}, + .moves = {MOVE_OVERHEAT, MOVE_THUNDER_PUNCH, MOVE_EARTHQUAKE, MOVE_CRUSH_CLAW}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [744] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_PSYCHIC}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_PSYCHIC}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [745] = { .species = SPECIES_CROBAT, - .moves = {MOVE_SLUDGE_BOMB MOVE_AERIAL_ACE MOVE_SHADOW_BALL MOVE_CONFUSE_RAY}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [746] = { .species = SPECIES_SWAMPERT, - .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [747] = { .species = SPECIES_GYARADOS, - .moves = {MOVE_RETURN MOVE_EARTHQUAKE MOVE_DRAGON_DANCE MOVE_REST}, + .moves = {MOVE_RETURN, MOVE_EARTHQUAKE, MOVE_DRAGON_DANCE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [748] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_CURSE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_CURSE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [749] = { .species = SPECIES_KINGDRA, - .moves = {MOVE_DOUBLE_EDGE MOVE_ICE_BEAM MOVE_DRAGON_DANCE MOVE_REST}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_ICE_BEAM, MOVE_DRAGON_DANCE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [750] = { .species = SPECIES_BLISSEY, - .moves = {MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_COUNTER MOVE_SOFT_BOILED}, + .moves = {MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_COUNTER, MOVE_SOFT_BOILED}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BOLD }, [751] = { .species = SPECIES_MILOTIC, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RECOVER MOVE_MIRROR_COAT}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [752] = { .species = SPECIES_ARCANINE, - .moves = {MOVE_OVERHEAT MOVE_EXTREME_SPEED MOVE_CRUNCH MOVE_DOUBLE_EDGE}, + .moves = {MOVE_OVERHEAT, MOVE_EXTREME_SPEED, MOVE_CRUNCH, MOVE_DOUBLE_EDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [753] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_DRAGON_DANCE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [754] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_METEOR_MASH MOVE_PSYCHIC MOVE_EARTHQUAKE MOVE_SHADOW_BALL}, + .moves = {MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [755] = { .species = SPECIES_SLAKING, - .moves = {MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_YAWN}, + .moves = {MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_YAWN}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, .nature = NATURE_MODEST }, [756] = { .species = SPECIES_ARTICUNO, - .moves = {MOVE_ICE_BEAM MOVE_WATER_PULSE MOVE_ICY_WIND MOVE_ROAR}, + .moves = {MOVE_ICE_BEAM, MOVE_WATER_PULSE, MOVE_ICY_WIND, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [757] = { .species = SPECIES_ZAPDOS, - .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_THUNDER_WAVE MOVE_ROAR}, + .moves = {MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_THUNDER_WAVE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [758] = { .species = SPECIES_MOLTRES, - .moves = {MOVE_FLAMETHROWER MOVE_AERIAL_ACE MOVE_MUD_SLAP MOVE_ROAR}, + .moves = {MOVE_FLAMETHROWER, MOVE_AERIAL_ACE, MOVE_MUD_SLAP, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [759] = { .species = SPECIES_RAIKOU, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_CALM_MIND MOVE_REST}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_CALM_MIND, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [760] = { .species = SPECIES_ENTEI, - .moves = {MOVE_FLAMETHROWER MOVE_DOUBLE_TEAM MOVE_CALM_MIND MOVE_REST}, + .moves = {MOVE_FLAMETHROWER, MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [761] = { .species = SPECIES_SUICUNE, - .moves = {MOVE_SURF MOVE_DOUBLE_TEAM MOVE_CALM_MIND MOVE_REST}, + .moves = {MOVE_SURF, MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [762] = { .species = SPECIES_REGIROCK, - .moves = {MOVE_SUPERPOWER MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_EXPLOSION}, + .moves = {MOVE_SUPERPOWER, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [763] = { .species = SPECIES_REGICE, - .moves = {MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_AMNESIA MOVE_REST}, + .moves = {MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_AMNESIA, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [764] = { .species = SPECIES_REGISTEEL, - .moves = {MOVE_METAL_CLAW MOVE_CURSE MOVE_AMNESIA MOVE_REST}, + .moves = {MOVE_METAL_CLAW, MOVE_CURSE, MOVE_AMNESIA, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [765] = { .species = SPECIES_LATIAS, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_DRAGON_CLAW}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [766] = { .species = SPECIES_LATIOS, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_DRAGON_CLAW}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [767] = { .species = SPECIES_ARTICUNO, - .moves = {MOVE_SUBSTITUTE MOVE_TOXIC MOVE_BLIZZARD MOVE_DOUBLE_TEAM}, + .moves = {MOVE_SUBSTITUTE, MOVE_TOXIC, MOVE_BLIZZARD, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [768] = { .species = SPECIES_ZAPDOS, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_DRILL_PECK MOVE_DOUBLE_TEAM}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_DRILL_PECK, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [769] = { .species = SPECIES_MOLTRES, - .moves = {MOVE_OVERHEAT MOVE_AERIAL_ACE MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .moves = {MOVE_OVERHEAT, MOVE_AERIAL_ACE, MOVE_DOUBLE_TEAM, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [770] = { .species = SPECIES_RAIKOU, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_REFLECT}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [771] = { .species = SPECIES_ENTEI, - .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_SOLAR_BEAM MOVE_REFLECT}, + .moves = {MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [772] = { .species = SPECIES_SUICUNE, - .moves = {MOVE_TOXIC MOVE_DIVE MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .moves = {MOVE_TOXIC, MOVE_DIVE, MOVE_DOUBLE_TEAM, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [773] = { .species = SPECIES_REGIROCK, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_EXPLOSION}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [774] = { .species = SPECIES_REGICE, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_BLIZZARD MOVE_BRICK_BREAK}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_BLIZZARD, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [775] = { .species = SPECIES_REGISTEEL, - .moves = {MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .moves = {MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [776] = { .species = SPECIES_LATIAS, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [777] = { .species = SPECIES_LATIOS, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [778] = { .species = SPECIES_ARTICUNO, - .moves = {MOVE_ICE_BEAM MOVE_FACADE MOVE_AERIAL_ACE MOVE_PROTECT}, + .moves = {MOVE_ICE_BEAM, MOVE_FACADE, MOVE_AERIAL_ACE, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [779] = { .species = SPECIES_ZAPDOS, - .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_THUNDER_WAVE MOVE_SUBSTITUTE}, + .moves = {MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_THUNDER_WAVE, MOVE_SUBSTITUTE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [780] = { .species = SPECIES_MOLTRES, - .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_DOUBLE_TEAM MOVE_REST}, + .moves = {MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_DOUBLE_TEAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [781] = { .species = SPECIES_RAIKOU, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_QUICK_ATTACK MOVE_ROAR}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [782] = { .species = SPECIES_ENTEI, - .moves = {MOVE_FLAMETHROWER MOVE_DOUBLE_EDGE MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_FLAMETHROWER, MOVE_DOUBLE_EDGE, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [783] = { .species = SPECIES_SUICUNE, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RAIN_DANCE MOVE_ROAR}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAIN_DANCE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [784] = { .species = SPECIES_REGIROCK, - .moves = {MOVE_ROCK_SLIDE MOVE_EARTHQUAKE MOVE_CURSE MOVE_REST}, + .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_CURSE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [785] = { .species = SPECIES_REGICE, - .moves = {MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_EXPLOSION}, + .moves = {MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [786] = { .species = SPECIES_REGISTEEL, - .moves = {MOVE_ANCIENT_POWER MOVE_AMNESIA MOVE_COUNTER MOVE_EXPLOSION}, + .moves = {MOVE_ANCIENT_POWER, MOVE_AMNESIA, MOVE_COUNTER, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [787] = { .species = SPECIES_LATIAS, - .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [788] = { .species = SPECIES_LATIOS, - .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [789] = { .species = SPECIES_ARTICUNO, - .moves = {MOVE_BLIZZARD MOVE_DOUBLE_EDGE MOVE_REST MOVE_REFLECT}, + .moves = {MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_REST, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [790] = { .species = SPECIES_ZAPDOS, - .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_THUNDER_WAVE MOVE_LIGHT_SCREEN}, + .moves = {MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [791] = { .species = SPECIES_MOLTRES, - .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_STEEL_WING MOVE_SAFEGUARD}, + .moves = {MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_STEEL_WING, MOVE_SAFEGUARD}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [792] = { .species = SPECIES_RAIKOU, - .moves = {MOVE_THUNDERBOLT MOVE_BITE MOVE_THUNDER_WAVE MOVE_REFLECT}, + .moves = {MOVE_THUNDERBOLT, MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [793] = { .species = SPECIES_ENTEI, - .moves = {MOVE_FLAMETHROWER MOVE_BITE MOVE_DOUBLE_TEAM MOVE_REFLECT}, + .moves = {MOVE_FLAMETHROWER, MOVE_BITE, MOVE_DOUBLE_TEAM, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [794] = { .species = SPECIES_SUICUNE, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_BITE MOVE_REFLECT}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_BITE, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [795] = { .species = SPECIES_REGIROCK, - .moves = {MOVE_ROCK_SLIDE MOVE_BRICK_BREAK MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .moves = {MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [796] = { .species = SPECIES_REGICE, - .moves = {MOVE_ICE_BEAM MOVE_HAIL MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .moves = {MOVE_ICE_BEAM, MOVE_HAIL, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [797] = { .species = SPECIES_REGISTEEL, - .moves = {MOVE_ANCIENT_POWER MOVE_EARTHQUAKE MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .moves = {MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [798] = { .species = SPECIES_LATIAS, - .moves = {MOVE_MIST_BALL MOVE_SHADOW_BALL MOVE_CHARM MOVE_REFLECT}, + .moves = {MOVE_MIST_BALL, MOVE_SHADOW_BALL, MOVE_CHARM, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [799] = { .species = SPECIES_LATIOS, - .moves = {MOVE_LUSTER_PURGE MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_DRAGON_CLAW}, + .moves = {MOVE_LUSTER_PURGE, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [800] = { .species = SPECIES_GENGAR, - .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_THUNDERBOLT MOVE_FIRE_PUNCH}, + .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT, MOVE_FIRE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [801] = { .species = SPECIES_GENGAR, - .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_THUNDERBOLT MOVE_ICE_PUNCH}, + .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [802] = { .species = SPECIES_GENGAR, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_FIRE_PUNCH MOVE_DESTINY_BOND}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FIRE_PUNCH, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [803] = { .species = SPECIES_GENGAR, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_DESTINY_BOND}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [804] = { .species = SPECIES_URSARING, - .moves = {MOVE_MEGA_KICK MOVE_AERIAL_ACE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .moves = {MOVE_MEGA_KICK, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [805] = { .species = SPECIES_URSARING, - .moves = {MOVE_HYPER_BEAM MOVE_YAWN MOVE_SWORDS_DANCE MOVE_DOUBLE_TEAM}, + .moves = {MOVE_HYPER_BEAM, MOVE_YAWN, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [806] = { .species = SPECIES_URSARING, - .moves = {MOVE_FACADE MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_BULK_UP}, + .moves = {MOVE_FACADE, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_BULK_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [807] = { .species = SPECIES_URSARING, - .moves = {MOVE_FACADE MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_BRICK_BREAK}, + .moves = {MOVE_FACADE, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [808] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_CROSS_CHOP MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE}, + .moves = {MOVE_CROSS_CHOP, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [809] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_COUNTER MOVE_ROCK_TOMB}, + .moves = {MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_ROCK_TOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [810] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_FOCUS_PUNCH MOVE_SUBSTITUTE MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FOCUS_PUNCH, MOVE_SUBSTITUTE, MOVE_ATTRACT, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [811] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_REVENGE MOVE_ROCK_SLIDE MOVE_FACADE MOVE_COUNTER}, + .moves = {MOVE_REVENGE, MOVE_ROCK_SLIDE, MOVE_FACADE, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [812] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_ENDURE MOVE_DESTINY_BOND}, + .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_ENDURE, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [813] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_WILL_O_WISP MOVE_DESTINY_BOND}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_WILL_O_WISP, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_TIMID }, [814] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_PSYCHIC MOVE_CALM_MIND MOVE_WILL_O_WISP MOVE_DESTINY_BOND}, + .moves = {MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_WILL_O_WISP, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [815] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_PSYCHIC MOVE_MAGICAL_LEAF MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .moves = {MOVE_PSYCHIC, MOVE_MAGICAL_LEAF, MOVE_ATTRACT, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [816] = { .species = SPECIES_STARMIE, - .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_RECOVER MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SURF, MOVE_PSYCHIC, MOVE_RECOVER, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [817] = { .species = SPECIES_STARMIE, - .moves = {MOVE_SURF MOVE_CONFUSE_RAY MOVE_THUNDER_WAVE MOVE_RECOVER}, + .moves = {MOVE_SURF, MOVE_CONFUSE_RAY, MOVE_THUNDER_WAVE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [818] = { .species = SPECIES_STARMIE, - .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_COSMIC_POWER MOVE_RECOVER}, + .moves = {MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_COSMIC_POWER, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [819] = { .species = SPECIES_STARMIE, - .moves = {MOVE_SURF MOVE_THUNDERBOLT MOVE_COSMIC_POWER MOVE_RECOVER}, + .moves = {MOVE_SURF, MOVE_THUNDERBOLT, MOVE_COSMIC_POWER, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [820] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_IRON_TAIL MOVE_DOUBLE_EDGE}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_IRON_TAIL, MOVE_DOUBLE_EDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [821] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_HYDRO_PUMP MOVE_THUNDER MOVE_RAIN_DANCE MOVE_BLIZZARD}, + .moves = {MOVE_HYDRO_PUMP, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_BLIZZARD}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [822] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_SHEER_COLD MOVE_HORN_DRILL MOVE_REST MOVE_SLEEP_TALK}, + .moves = {MOVE_SHEER_COLD, MOVE_HORN_DRILL, MOVE_REST, MOVE_SLEEP_TALK}, .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [823] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_SHEER_COLD MOVE_HORN_DRILL MOVE_SING MOVE_ATTRACT}, + .moves = {MOVE_SHEER_COLD, MOVE_HORN_DRILL, MOVE_SING, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [824] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_MEGA_KICK MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_COUNTER}, + .moves = {MOVE_MEGA_KICK, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [825] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_COUNTER}, + .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [826] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_HYPER_BEAM MOVE_SHADOW_BALL MOVE_EARTHQUAKE MOVE_CURSE}, + .moves = {MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_CURSE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [827] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_RETURN MOVE_SHADOW_BALL MOVE_BELLY_DRUM MOVE_REST}, + .moves = {MOVE_RETURN, MOVE_SHADOW_BALL, MOVE_BELLY_DRUM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [828] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_FACADE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DRAGON_DANCE}, + .moves = {MOVE_FACADE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [829] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_HEADBUTT MOVE_AERIAL_ACE MOVE_CRUNCH MOVE_DRAGON_DANCE}, + .moves = {MOVE_HEADBUTT, MOVE_AERIAL_ACE, MOVE_CRUNCH, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [830] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_FLAMETHROWER MOVE_DRAGON_CLAW MOVE_CRUNCH MOVE_BRICK_BREAK}, + .moves = {MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_CRUNCH, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [831] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_FLAMETHROWER MOVE_DRAGON_CLAW MOVE_CRUNCH MOVE_ATTRACT}, + .moves = {MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_CRUNCH, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [832] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_JOLLY }, [833] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_METEOR_MASH MOVE_PSYCHIC MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH}, + .moves = {MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [834] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH}, + .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [835] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_METEOR_MASH MOVE_EARTHQUAKE MOVE_BRICK_BREAK MOVE_EXPLOSION}, + .moves = {MOVE_METEOR_MASH, MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [836] = { .species = SPECIES_REGIROCK, - .moves = {MOVE_HYPER_BEAM MOVE_FOCUS_PUNCH MOVE_ROCK_SLIDE MOVE_DOUBLE_TEAM}, + .moves = {MOVE_HYPER_BEAM, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [837] = { .species = SPECIES_REGIROCK, - .moves = {MOVE_SWAGGER MOVE_PSYCH_UP MOVE_ROCK_SLIDE MOVE_EXPLOSION}, + .moves = {MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_ROCK_SLIDE, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [838] = { .species = SPECIES_REGICE, - .moves = {MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_CURSE MOVE_COUNTER}, + .moves = {MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_CURSE, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BRAVE }, [839] = { .species = SPECIES_REGICE, - .moves = {MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_SLEEP_TALK MOVE_REST}, + .moves = {MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_SLEEP_TALK, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [840] = { .species = SPECIES_REGISTEEL, - .moves = {MOVE_FOCUS_PUNCH MOVE_SUBSTITUTE MOVE_TOXIC MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FOCUS_PUNCH, MOVE_SUBSTITUTE, MOVE_TOXIC, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [841] = { .species = SPECIES_REGISTEEL, - .moves = {MOVE_SUPERPOWER MOVE_AERIAL_ACE MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_SUPERPOWER, MOVE_AERIAL_ACE, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [842] = { .species = SPECIES_LATIAS, - .moves = {MOVE_DRAGON_CLAW MOVE_THUNDER_WAVE MOVE_CALM_MIND MOVE_RECOVER}, + .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDER_WAVE, MOVE_CALM_MIND, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [843] = { .species = SPECIES_LATIAS, - .moves = {MOVE_MIST_BALL MOVE_DRAGON_CLAW MOVE_ATTRACT MOVE_THUNDER_WAVE}, + .moves = {MOVE_MIST_BALL, MOVE_DRAGON_CLAW, MOVE_ATTRACT, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [844] = { .species = SPECIES_LATIAS, - .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [845] = { .species = SPECIES_LATIAS, - .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [846] = { .species = SPECIES_LATIOS, - .moves = {MOVE_DRAGON_CLAW MOVE_THUNDER_WAVE MOVE_CALM_MIND MOVE_RECOVER}, + .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDER_WAVE, MOVE_CALM_MIND, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [847] = { .species = SPECIES_LATIOS, - .moves = {MOVE_LUSTER_PURGE MOVE_SHADOW_BALL MOVE_DRAGON_CLAW MOVE_THUNDER_WAVE}, + .moves = {MOVE_LUSTER_PURGE, MOVE_SHADOW_BALL, MOVE_DRAGON_CLAW, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [848] = { .species = SPECIES_LATIOS, - .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_DRAGON_DANCE MOVE_RECOVER}, + .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_DRAGON_DANCE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [849] = { .species = SPECIES_LATIOS, - .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [850] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_BRICK_BREAK MOVE_DRAGON_DANCE}, + .moves = {MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [851] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_AERIAL_ACE MOVE_DRAGON_DANCE}, + .moves = {MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_AERIAL_ACE, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [852] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_HYPER_BEAM MOVE_ATTRACT MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .moves = {MOVE_HYPER_BEAM, MOVE_ATTRACT, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [853] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_HYPER_BEAM MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE MOVE_REST}, + .moves = {MOVE_HYPER_BEAM, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [854] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_OUTRAGE MOVE_DOUBLE_EDGE MOVE_THUNDER_WAVE MOVE_ROAR}, + .moves = {MOVE_OUTRAGE, MOVE_DOUBLE_EDGE, MOVE_THUNDER_WAVE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [855] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_SURF MOVE_FLAMETHROWER}, + .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_FLAMETHROWER}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [856] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_SURF MOVE_ICE_BEAM}, + .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [857] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_DRAGON_CLAW MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_BRICK_BREAK}, + .moves = {MOVE_DRAGON_CLAW, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [858] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_THUNDER MOVE_SURF MOVE_RAIN_DANCE MOVE_EARTHQUAKE}, + .moves = {MOVE_THUNDER, MOVE_SURF, MOVE_RAIN_DANCE, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [859] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_FIRE_BLAST MOVE_BLIZZARD MOVE_SUNNY_DAY MOVE_EARTHQUAKE}, + .moves = {MOVE_FIRE_BLAST, MOVE_BLIZZARD, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [860] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_THUNDERBOLT MOVE_SURF}, + .moves = {MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_THUNDERBOLT, MOVE_SURF}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [861] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CRUNCH MOVE_THUNDERBOLT}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CRUNCH, MOVE_THUNDERBOLT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [862] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_DRAGON_DANCE}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [863] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_CRUNCH MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_FLAMETHROWER}, + .moves = {MOVE_CRUNCH, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [864] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DRAGON_DANCE MOVE_REST}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_DANCE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [865] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CURSE MOVE_REST}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CURSE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [866] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_ROCK_SLIDE MOVE_AERIAL_ACE MOVE_BRICK_BREAK MOVE_CURSE}, + .moves = {MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_CURSE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [867] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_ROCK_SLIDE MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE MOVE_REST}, + .moves = {MOVE_ROCK_SLIDE, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [868] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_CRUNCH MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ATTRACT}, + .moves = {MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [869] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DRAGON_DANCE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [870] = { .species = SPECIES_ARTICUNO, - .moves = {MOVE_BLIZZARD MOVE_DOUBLE_EDGE MOVE_AGILITY MOVE_SWAGGER}, + .moves = {MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_AGILITY, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [871] = { .species = SPECIES_ARTICUNO, - .moves = {MOVE_ICE_BEAM MOVE_AERIAL_ACE MOVE_REFLECT MOVE_REST}, + .moves = {MOVE_ICE_BEAM, MOVE_AERIAL_ACE, MOVE_REFLECT, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [872] = { .species = SPECIES_ZAPDOS, - .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_DOUBLE_EDGE MOVE_THUNDER_WAVE}, + .moves = {MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_DOUBLE_EDGE, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [873] = { .species = SPECIES_ZAPDOS, - .moves = {MOVE_THUNDER MOVE_DRILL_PECK MOVE_RAIN_DANCE MOVE_DOUBLE_EDGE}, + .moves = {MOVE_THUNDER, MOVE_DRILL_PECK, MOVE_RAIN_DANCE, MOVE_DOUBLE_EDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [874] = { .species = SPECIES_MOLTRES, - .moves = {MOVE_OVERHEAT MOVE_SUNNY_DAY MOVE_SWAGGER MOVE_FACADE}, + .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_SWAGGER, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [875] = { .species = SPECIES_MOLTRES, - .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_AERIAL_ACE MOVE_STEEL_WING}, + .moves = {MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_AERIAL_ACE, MOVE_STEEL_WING}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [876] = { .species = SPECIES_RAIKOU, - .moves = {MOVE_THUNDERBOLT MOVE_DOUBLE_EDGE MOVE_ROAR MOVE_REFLECT}, + .moves = {MOVE_THUNDERBOLT, MOVE_DOUBLE_EDGE, MOVE_ROAR, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [877] = { .species = SPECIES_RAIKOU, - .moves = {MOVE_THUNDERBOLT MOVE_CALM_MIND MOVE_SUBSTITUTE MOVE_REST}, + .moves = {MOVE_THUNDERBOLT, MOVE_CALM_MIND, MOVE_SUBSTITUTE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [878] = { .species = SPECIES_ENTEI, - .moves = {MOVE_FIRE_BLAST MOVE_DOUBLE_EDGE MOVE_ENDURE MOVE_REFLECT}, + .moves = {MOVE_FIRE_BLAST, MOVE_DOUBLE_EDGE, MOVE_ENDURE, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_DOCILE }, [879] = { .species = SPECIES_ENTEI, - .moves = {MOVE_FLAMETHROWER MOVE_CALM_MIND MOVE_ROAR MOVE_REST}, + .moves = {MOVE_FLAMETHROWER, MOVE_CALM_MIND, MOVE_ROAR, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [880] = { .species = SPECIES_SUICUNE, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_ICY_WIND}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_ICY_WIND}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [881] = { .species = SPECIES_SUICUNE, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_REST}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST diff --git a/src/data/battle_frontier/battle_frontier_trainers.h b/src/data/battle_frontier/battle_frontier_trainers.h index 2b6b0d443..faef40656 100644 --- a/src/data/battle_frontier/battle_frontier_trainers.h +++ b/src/data/battle_frontier/battle_frontier_trainers.h @@ -1,32 +1,32 @@ -const struct BattleFrontierTrainer gBattleFrontierTrainers[] = +const struct BattleFrontierTrainer gBattleFrontierTrainers[] = { [0] = { .facilityClass = FACILITY_CLASS_YOUNGSTER, - .trainerName = _("BRAD"), + .trainerName = _("BRADY"), .speechBefore = {EC_WORD_I_AM, EC_WORD_NEVER, EC_WORD_GOING, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_EXCL}, - .speechWin = {EC_WORD_I_AM, EC_WORD_STRONG, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, -1}, - .speechLose = {EC_WORD_WHAT, EC_WORD_QUES, -1, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES}, + .speechWin = {EC_WORD_I_AM, EC_WORD_STRONG, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, 0xFFFF}, + .speechLose = {EC_WORD_WHAT, EC_WORD_QUES, 0xFFFF, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES}, .monSets = gBattleFrontierTrainerMons_Brady }, [1] = { .facilityClass = FACILITY_CLASS_YOUNGSTER, - .trainerName = _("CONNE"), - .speechBefore = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_BUG, EC_WORD_ME, -1, -1}, - .speechWin = {EC_WORD_A, EC_WORD_WIN, EC_WORD_IS, EC_WORD_JUST, EC_WORD_AWESOME, -1}, + .trainerName = _("CONNER"), + .speechBefore = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_BUG, EC_WORD_ME, 0xFFFF, 0xFFFF}, + .speechWin = {EC_WORD_A, EC_WORD_WIN, EC_WORD_IS, EC_WORD_JUST, EC_WORD_AWESOME, 0xFFFF}, .speechLose = {EC_WORD_DARN, EC_WORD_ELLIPSIS, EC_WORD_LOSING, EC_WORD_DOES, EC_WORD_BUG, EC_WORD_ME}, .monSets = gBattleFrontierTrainerMons_Conner }, [2] = { .facilityClass = FACILITY_CLASS_YOUNGSTER, - .trainerName = _("BRADLE"), + .trainerName = _("BRADLEY"), .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_MY, EC_WORD_OPPONENT, EC_WORD_TODAY}, - .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL, -1, EC_WORD_SEE_YA, EC_WORD_LATER, EC_WORD_EXCL}, + .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL, 0xFFFF, EC_WORD_SEE_YA, EC_WORD_LATER, EC_WORD_EXCL}, .speechLose = {EC_WORD_TOMORROW, EC_WORD_IS, EC_WORD_WHEN, EC_WORD_WE, EC_WORD_REALLY, EC_WORD_BATTLE}, .monSets = gBattleFrontierTrainerMons_Bradley }, [3] = { .facilityClass = FACILITY_CLASS_LASS, - .trainerName = _("CYBI"), + .trainerName = _("CYBIL"), .speechBefore = {EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_NOT_VERY, EC_WORD_SCARY, EC_WORD_AT, EC_WORD_ALL}, .speechWin = {EC_WORD_IT_S, EC_WORD_SAD, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOU, EC_MOVE2(STRUGGLE)}, .speechLose = {EC_WORD_THIS, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_HAPPENING, EC_WORD_TO_ME, EC_WORD_EXCL}, @@ -34,7 +34,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [4] = { .facilityClass = FACILITY_CLASS_LASS, - .trainerName = _("RODETT"), + .trainerName = _("RODETTE"), .speechBefore = {EC_WORD_OH, EC_WORD_THIS, EC_WORD_IS, EC_WORD_SO, EC_WORD_EXCITING, EC_WORD_EXCL}, .speechWin = {EC_WORD_IT_S, EC_WORD_INCREDIBLE, EC_WORD_HOW, EC_WORD_STRONG, EC_WORD_I_AM, EC_WORD_EXCL}, .speechLose = {EC_WORD_OH_DEAR, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_JUST, EC_WORD_NO, EC_WORD_GOOD}, @@ -42,39 +42,39 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [5] = { .facilityClass = FACILITY_CLASS_LASS, - .trainerName = _("PEGG"), + .trainerName = _("PEGGY"), .speechBefore = {EC_WORD_GET, EC_WORD_READY, EC_WORD_TO, EC_WORD_BE, EC_WORD_DESTROYED, EC_WORD_EXCL}, - .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL_EXCL, -1, EC_WORD_I_AM, EC_WORD_LOLLING, EC_WORD_EXCL}, + .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_I_AM, EC_WORD_LOLLING, EC_WORD_EXCL}, .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_SAD, EC_WORD_THANKS, EC_WORD_TO, EC_WORD_YOU}, .monSets = gBattleFrontierTrainerMons_Peggy }, [6] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, - .trainerName = _("KEIT"), + .trainerName = _("KEITH"), .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_JUST, EC_WORD_STUDY, EC_WORD_YOU, EC_WORD_KNOW}, - .speechWin = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_STUDY, EC_WORD_ENOUGH, EC_WORD_ELLIPSIS, -1}, + .speechWin = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_STUDY, EC_WORD_ENOUGH, EC_WORD_ELLIPSIS, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Keith }, [7] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, - .trainerName = _("GRAYSO"), + .trainerName = _("GRAYSON"), .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_BATTLE, EC_WORD_ISN_T, EC_WORD_CHILD_S_PLAY, EC_WORD_EXCL}, - .speechWin = {EC_WORD_YOU_RE, EC_WORD_DONE, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_DONE, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_QUES, 0xFFFF}, .speechLose = {EC_WORD_WE, EC_WORD_WERE, EC_WORD_LIKE, EC_WORD_TOYS, EC_WORD_TO, EC_WORD_YOU}, .monSets = gBattleFrontierTrainerMons_Grayson }, [8] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, - .trainerName = _("GLEN"), - .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_COOL, EC_WORD_IF_I_WIN, -1}, - .speechWin = {EC_WORD_COOL, EC_WORD_EXCL, -1, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM}, + .trainerName = _("GLENN"), + .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_COOL, EC_WORD_IF_I_WIN, 0xFFFF}, + .speechWin = {EC_WORD_COOL, EC_WORD_EXCL, 0xFFFF, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM}, .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_COOL}, .monSets = gBattleFrontierTrainerMons_Glenn }, [9] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, - .trainerName = _("LILIAN"), + .trainerName = _("LILIANA"), .speechBefore = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_GIVE_UP, EC_WORD_UNTIL, EC_WORD_I, EC_WORD_WIN}, .speechWin = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_WORD_SURRENDER, EC_WORD_IN, EC_WORD_ME}, .speechLose = {EC_WORD_THAT_S, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_GIVE_UP, EC_WORD_ELLIPSIS}, @@ -82,7 +82,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [10] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, - .trainerName = _("ELIS"), + .trainerName = _("ELISE"), .speechBefore = {EC_WORD_MY, EC_WORD_STRATEGY, EC_WORD_IS, EC_WORD_FROM, EC_WORD_MY, EC_WORD_FATHER}, .speechWin = {EC_WORD_I, EC_WORD_WIN, EC_WORD_EXCL, EC_WORD_FATHER, EC_WORD_I_VE, EC_WORD_WON}, .speechLose = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_FATHER, EC_WORD_FOR, EC_WORD_I_VE, EC_WORD_LOST}, @@ -90,23 +90,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [11] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, - .trainerName = _("ZOE"), + .trainerName = _("ZOEY"), .speechBefore = {EC_WORD_PLEASE, EC_WORD_BATTLE, EC_WORD_LIKE, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_IT}, - .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, -1, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, .speechLose = {EC_WORD_WERE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_BEING, EC_WORD_SERIOUS, EC_WORD_QUES}, .monSets = gBattleFrontierTrainerMons_Zoey }, [12] = { .facilityClass = FACILITY_CLASS_RICH_BOY, - .trainerName = _("MANUE"), + .trainerName = _("MANUEL"), .speechBefore = {EC_WORD_ME, EC_WORD_LOSE, EC_WORD_QUES, EC_WORD_THAT_S, EC_WORD_PREPOSTEROUS, EC_WORD_EXCL}, - .speechWin = {EC_WORD_NATURALLY, EC_WORD_I, EC_WORD_WIN, -1, -1, -1}, - .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_LOST, EC_WORD_MOTHER}, + .speechWin = {EC_WORD_NATURALLY, EC_WORD_I, EC_WORD_WIN, 0xFFFF, 0xFFFF, 0xFFFF}, + .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_LOST, EC_WORD_MOTHER}, .monSets = gBattleFrontierTrainerMons_Manuel }, [13] = { .facilityClass = FACILITY_CLASS_RICH_BOY, - .trainerName = _("RUS"), + .trainerName = _("RUSS"), .speechBefore = {EC_WORD_THEY, EC_WORD_ALL, EC_WORD_WANT, EC_WORD_MY, EC_WORD_FABULOUS, EC_WORD_POKEMON}, .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_HAVE, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_PARTY}, .speechLose = {EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_DO, EC_WORD_THAT, EC_WORD_QUES}, @@ -114,15 +114,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [14] = { .facilityClass = FACILITY_CLASS_RICH_BOY, - .trainerName = _("DUSTI"), - .speechBefore = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_COOL, EC_WORD_POKEMON, -1}, - .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_WHEN_I_WIN, EC_WORD_EXCL, -1}, - .speechLose = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_IF_I_LOSE, EC_WORD_TOO, -1}, + .trainerName = _("DUSTIN"), + .speechBefore = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_COOL, EC_WORD_POKEMON, 0xFFFF}, + .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_WHEN_I_WIN, EC_WORD_EXCL, 0xFFFF}, + .speechLose = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_IF_I_LOSE, EC_WORD_TOO, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Dustin }, [15] = { .facilityClass = FACILITY_CLASS_LADY, - .trainerName = _("TIN"), + .trainerName = _("TINA"), .speechBefore = {EC_WORD_IF_I_WIN, EC_WORD_YOU, EC_WORD_CAN, EC_WORD_HAVE, EC_WORD_A, EC_MOVE2(SWEET_KISS)}, .speechWin = {EC_WORD_HERE_IT_IS, EC_WORD_YOUR, EC_MOVE2(SWEET_KISS), EC_WORD_FROM, EC_WORD_MY, EC_POKEMON2(JYNX)}, .speechLose = {EC_WORD_YOU, EC_WORD_WANT, EC_WORD_A, EC_MOVE(SWIFT), EC_MOVE2(MEGA_KICK), EC_WORD_INSTEAD}, @@ -130,23 +130,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [16] = { .facilityClass = FACILITY_CLASS_LADY, - .trainerName = _("GILLIA"), + .trainerName = _("GILLIAN"), .speechBefore = {EC_WORD_THE, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_IS, EC_WORD_SO, EC_WORD_YESTERDAY}, .speechWin = {EC_WORD_POKEMON, EC_WORD_NEVER, EC_WORD_GO, EC_WORD_OUT, EC_WORD_OF, EC_WORD_FASHION}, - .speechLose = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_DISAPPOINT, EC_WORD_ME, -1, -1}, + .speechLose = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_DISAPPOINT, EC_WORD_ME, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Gillian }, [17] = { .facilityClass = FACILITY_CLASS_LADY, - .trainerName = _("ZO"), + .trainerName = _("ZOE"), .speechBefore = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_A, EC_WORD_WORRY, EC_WORD_AT, EC_WORD_ALL}, - .speechWin = {EC_WORD_LIFE, EC_WORD_IS, EC_WORD_ALWAYS, EC_WORD_GOOD, EC_WORD_TO_ME, -1}, + .speechWin = {EC_WORD_LIFE, EC_WORD_IS, EC_WORD_ALWAYS, EC_WORD_GOOD, EC_WORD_TO_ME, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_WORRY, EC_WORD_ABOUT, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_SKILL}, .monSets = gBattleFrontierTrainerMons_Zoe }, [18] = { .facilityClass = FACILITY_CLASS_CAMPER, - .trainerName = _("CHE"), + .trainerName = _("CHEN"), .speechBefore = {EC_WORD_I_AM, EC_WORD_TOTALLY, EC_WORD_READY, EC_WORD_TO, EC_WORD_ROCK, EC_WORD_TODAY}, .speechWin = {EC_WORD_I_AM, EC_WORD_READY, EC_WORD_TO, EC_WORD_GO, EC_WORD_ON, EC_WORD_EXCL}, .speechLose = {EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_MOVE(FOCUS_ENERGY), EC_WORD_AND, EC_WORD_TOUGHNESS}, @@ -154,31 +154,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [19] = { .facilityClass = FACILITY_CLASS_CAMPER, - .trainerName = _("A"), + .trainerName = _("AL"), .speechBefore = {EC_WORD_YOUR, EC_WORD_LOOK, EC_WORD_SAYS, EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_TOUGH}, - .speechWin = {EC_WORD_IT_S, EC_WORD_ME, EC_WORD_WHO_IS, EC_WORD_REALLY, EC_WORD_TOUGH, -1}, + .speechWin = {EC_WORD_IT_S, EC_WORD_ME, EC_WORD_WHO_IS, EC_WORD_REALLY, EC_WORD_TOUGH, 0xFFFF}, .speechLose = {EC_WORD_I_AM, EC_WORD_RIGHT, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_TOUGH}, .monSets = gBattleFrontierTrainerMons_Al }, [20] = { .facilityClass = FACILITY_CLASS_CAMPER, - .trainerName = _("MITC"), + .trainerName = _("MITCH"), .speechBefore = {EC_WORD_MOTHER, EC_WORD_NATURE, EC_WORD_IS, EC_WORD_MY, EC_WORD_ALLY, EC_WORD_EXCL}, .speechWin = {EC_WORD_WAS, EC_WORD_THAT, EC_WORD_ENOUGH, EC_WORD_FOR, EC_WORD_YOU, EC_WORD_QUES}, - .speechLose = {EC_WORD_MOTHER, EC_WORD_NATURE, EC_WORD_DIDN_T, EC_WORD_LET_ME_WIN, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_MOTHER, EC_WORD_NATURE, EC_WORD_DIDN_T, EC_WORD_LET_ME_WIN, EC_WORD_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Mitch }, [21] = { .facilityClass = FACILITY_CLASS_PICNICKER, - .trainerName = _("ANN"), + .trainerName = _("ANNE"), .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_LET_S, EC_WORD_BATTLE, EC_WORD_NOW}, - .speechWin = {EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_IS, EC_WORD_OVERWHELMING, EC_WORD_EXCL, -1}, - .speechLose = {EC_WORD_YOU_VE, EC_WORD_DESTROYED, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_ELLIPSIS, -1}, + .speechWin = {EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_IS, EC_WORD_OVERWHELMING, EC_WORD_EXCL, 0xFFFF}, + .speechLose = {EC_WORD_YOU_VE, EC_WORD_DESTROYED, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Anne }, [22] = { .facilityClass = FACILITY_CLASS_PICNICKER, - .trainerName = _("ALIZ"), + .trainerName = _("ALIZE"), .speechBefore = {EC_WORD_CUTE, EC_WORD_AND, EC_WORD_AWFULLY, EC_WORD_STRONG, EC_WORD_THAT_S, EC_WORD_ME}, .speechWin = {EC_WORD_YUP, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_AND, EC_WORD_AWFULLY, EC_WORD_STRONG}, .speechLose = {EC_WORD_I_AM, EC_WORD_WEAK, EC_WORD_ELLIPSIS, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_CUTE}, @@ -186,7 +186,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [23] = { .facilityClass = FACILITY_CLASS_PICNICKER, - .trainerName = _("LAURE"), + .trainerName = _("LAUREN"), .speechBefore = {EC_WORD_I_AM, EC_WORD_OLD, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_ALSO, EC_WORD_GOOD}, .speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_I_WAS, EC_WORD_OLD, EC_WORD_BUT, EC_WORD_GOOD}, .speechLose = {EC_WORD_WHAT, EC_WORD_A, EC_WORD_WEIRD, EC_WORD_DREAM, EC_WORD_THAT_WAS, EC_WORD_EXCL}, @@ -194,7 +194,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [24] = { .facilityClass = FACILITY_CLASS_TUBER_M, - .trainerName = _("KIP"), + .trainerName = _("KIPP"), .speechBefore = {EC_WORD_IF_I_WIN, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_GO, EC_MOVE2(SURF)}, .speechWin = {EC_WORD_YEAH, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_OFF, EC_WORD_TO, EC_MOVE2(SURF)}, .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_EXCL, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_EXCL}, @@ -202,23 +202,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [25] = { .facilityClass = FACILITY_CLASS_TUBER_M, - .trainerName = _("JASO"), - .speechBefore = {EC_WORD_TEACH, EC_WORD_ME, EC_WORD_A, EC_WORD_GOOD, EC_WORD_STRATEGY, -1}, - .speechWin = {EC_WORD_THAT_WAS, EC_WORD_YOUR, EC_WORD_GOOD, EC_WORD_STRATEGY, EC_WORD_QUES_EXCL, -1}, + .trainerName = _("JASON"), + .speechBefore = {EC_WORD_TEACH, EC_WORD_ME, EC_WORD_A, EC_WORD_GOOD, EC_WORD_STRATEGY, 0xFFFF}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_YOUR, EC_WORD_GOOD, EC_WORD_STRATEGY, EC_WORD_QUES_EXCL, 0xFFFF}, .speechLose = {EC_WORD_WOW, EC_WORD_THAT, EC_WORD_IS, EC_WORD_AN, EC_WORD_AWESOME, EC_WORD_STRATEGY}, .monSets = gBattleFrontierTrainerMons_Jason }, [26] = { .facilityClass = FACILITY_CLASS_TUBER_M, - .trainerName = _("JOH"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_PRETTY, EC_WORD_NEW, EC_WORD_TRAINER, -1}, + .trainerName = _("JOHN"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_PRETTY, EC_WORD_NEW, EC_WORD_TRAINER, 0xFFFF}, .speechWin = {EC_WORD_I_AM, EC_WORD_NEW, EC_WORD_BUT, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL}, .speechLose = {EC_WORD_I_AM, EC_WORD_NEW, EC_WORD_SO, EC_WORD_WHAT, EC_WORD_IF_I_LOSE, EC_WORD_QUES}, .monSets = gBattleFrontierTrainerMons_John }, [27] = { .facilityClass = FACILITY_CLASS_TUBER_F, - .trainerName = _("AN"), + .trainerName = _("ANN"), .speechBefore = {EC_WORD_IT_S, EC_WORD_SO, EC_WORD_EXCITING, EC_WORD_IT, EC_WORD_REALLY, EC_WORD_IS}, .speechWin = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_HAPPY, EC_WORD_I, EC_WORD_CAN, EC_WORD_CRY}, .speechLose = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SAD, EC_WORD_I, EC_WORD_WILL, EC_WORD_CRY}, @@ -226,7 +226,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [28] = { .facilityClass = FACILITY_CLASS_TUBER_F, - .trainerName = _("EILEE"), + .trainerName = _("EILEEN"), .speechBefore = {EC_WORD_LET_S, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_OK_QUES}, .speechWin = {EC_WORD_SO, EC_WORD_THIS, EC_WORD_IS, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_FEELING}, .speechLose = {EC_WORD_AN, EC_WORD_ADULT, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_YOU, EC_WORD_QUES}, @@ -234,23 +234,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [29] = { .facilityClass = FACILITY_CLASS_TUBER_F, - .trainerName = _("CARLI"), + .trainerName = _("CARLIE"), .speechBefore = {EC_WORD_MY, EC_WORD_SUMMER, EC_WORD_VACATION, EC_WORD_IS, EC_WORD_FOR, EC_WORD_POKEMON}, .speechWin = {EC_WORD_MY, EC_WORD_SUMMER, EC_WORD_VACATION, EC_WORD_WILL, EC_WORD_BE, EC_WORD_AWESOME}, - .speechLose = {EC_WORD_I, EC_WORD_CAN_T_WIN, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_ELLIPSIS, -1}, + .speechLose = {EC_WORD_I, EC_WORD_CAN_T_WIN, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Carlie }, [30] = { .facilityClass = FACILITY_CLASS_SWIMMER_M, - .trainerName = _("GORDO"), - .speechBefore = {EC_WORD_VICTORY, EC_WORD_WILL, EC_WORD_COME, EC_WORD_TO_ME, EC_WORD_EXCL, -1}, - .speechWin = {EC_WORD_OH_YEAH, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_REALLY, EC_WORD_WON}, + .trainerName = _("GORDON"), + .speechBefore = {EC_WORD_VICTORY, EC_WORD_WILL, EC_WORD_COME, EC_WORD_TO_ME, EC_WORD_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_OH_YEAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_REALLY, EC_WORD_WON}, .speechLose = {EC_WORD_NOTHING, EC_WORD_IS, EC_WORD_WORKING, EC_WORD_OUT, EC_WORD_FOR, EC_WORD_ME}, .monSets = gBattleFrontierTrainerMons_Gordon }, [31] = { .facilityClass = FACILITY_CLASS_SWIMMER_M, - .trainerName = _("AYDE"), + .trainerName = _("AYDEN"), .speechBefore = {EC_WORD_COME_ON, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_WORD_HOT, EC_WORD_BATTLE}, .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_WATER, EC_WORD_TO, EC_WORD_COOL, EC_WORD_DOWN}, .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_ICE, EC_WORD_COLD}, @@ -258,7 +258,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [32] = { .facilityClass = FACILITY_CLASS_SWIMMER_M, - .trainerName = _("MARC"), + .trainerName = _("MARCO"), .speechBefore = {EC_WORD_I, EC_MOVE2(SURF), EC_WORD_IN, EC_WORD_THE, EC_WORD_WINTER, EC_WORD_TOO}, .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GO, EC_MOVE2(SURF), EC_WORD_RIGHT, EC_WORD_NOW}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_MOVE2(BEAT_UP), EC_WORD_MY, EC_MOVE2(SURF), EC_WORD_BOARD}, @@ -266,15 +266,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [33] = { .facilityClass = FACILITY_CLASS_SWIMMER_F, - .trainerName = _("CIERR"), + .trainerName = _("CIERRA"), .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_SYNCHRONIZE, EC_WORD_MY, EC_WORD_SWIFT_SWIM}, - .speechWin = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_SYNCHRONIZE, EC_WORD_WITH, EC_WORD_ME, -1}, + .speechWin = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_SYNCHRONIZE, EC_WORD_WITH, EC_WORD_ME, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_SYNCHRONIZE, EC_WORD_BETTER, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Cierra }, [34] = { .facilityClass = FACILITY_CLASS_SWIMMER_F, - .trainerName = _("MARC"), + .trainerName = _("MARCY"), .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_KNOCKOUT, EC_WORD_YOU, EC_WORD_CAN_T_WIN, EC_WORD_EXCL}, .speechWin = {EC_WORD_AFTER, EC_WORD_ALL, EC_WORD_I_AM, EC_WORD_A, EC_WORD_KNOCKOUT, EC_WORD_EXCL}, .speechLose = {EC_WORD_THAT_S, EC_WORD_NOT, EC_WORD_THE, EC_WORD_KNOCKOUT, EC_WORD_I, EC_WORD_MEAN}, @@ -282,7 +282,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [35] = { .facilityClass = FACILITY_CLASS_SWIMMER_F, - .trainerName = _("KATH"), + .trainerName = _("KATHY"), .speechBefore = {EC_WORD_I_VE, EC_WORD_WON, EC_WORD_EVERY, EC_WORD_MATCH, EC_WORD_TODAY, EC_WORD_EXCL}, .speechWin = {EC_WORD_IT_S, EC_WORD_SO, EC_WORD_GREAT, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL}, .speechLose = {EC_WORD_HUH_QUES, EC_WORD_I, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_HAVE, EC_WORD_LOST}, @@ -290,7 +290,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [36] = { .facilityClass = FACILITY_CLASS_POKEFAN_M, - .trainerName = _("PEYTO"), + .trainerName = _("PEYTON"), .speechBefore = {EC_WORD_I_AM, EC_WORD_NEVER, EC_WORD_DISAPPOINTED, EC_WORD_WITH, EC_WORD_MY, EC_WORD_POKEMON}, .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_IF, EC_WORD_WE, EC_WORD_WIN, EC_WORD_TOGETHER}, .speechLose = {EC_WORD_I, EC_WORD_ADORE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_MORE, EC_WORD_IF_I_LOSE}, @@ -298,7 +298,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [37] = { .facilityClass = FACILITY_CLASS_POKEFAN_M, - .trainerName = _("JULIA"), + .trainerName = _("JULIAN"), .speechBefore = {EC_WORD_YOU, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_RIGHT, EC_WORD_QUES}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOTALLY, EC_WORD_OUT, EC_WORD_OF, EC_WORD_THE, EC_WORD_QUESTION}, .speechLose = {EC_WORD_YOU, EC_WORD_DO, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_EXCL}, @@ -306,7 +306,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [38] = { .facilityClass = FACILITY_CLASS_POKEFAN_M, - .trainerName = _("QUIN"), + .trainerName = _("QUINN"), .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_BUT, EC_WORD_A, EC_WORD_DREAM}, .speechWin = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_WORD_BEAUTIFUL, EC_WORD_DREAM, EC_WORD_EXCL}, .speechLose = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_AN, EC_WORD_AWFUL, EC_MOVE(NIGHTMARE), EC_WORD_EXCL}, @@ -314,7 +314,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [39] = { .facilityClass = FACILITY_CLASS_POKEFAN_F, - .trainerName = _("HAYLE"), + .trainerName = _("HAYLEE"), .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_I_AM, EC_WORD_FEELING}, .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_OVERWHELMING, EC_WORD_JOY, EC_WORD_OVER, EC_WORD_THIS}, .speechLose = {EC_WORD_DESTROYED, EC_WORD_IS, EC_WORD_THE, EC_WORD_WAY, EC_WORD_I_AM, EC_WORD_FEELING}, @@ -322,15 +322,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [40] = { .facilityClass = FACILITY_CLASS_POKEFAN_F, - .trainerName = _("AMAND"), + .trainerName = _("AMANDA"), .speechBefore = {EC_WORD_I, EC_WORD_COME, EC_WORD_FROM, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_FAMILY}, - .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_TREASURE, EC_WORD_THIS, EC_WORD_WIN, -1}, + .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_TREASURE, EC_WORD_THIS, EC_WORD_WIN, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO_HOME, EC_WORD_RIGHT, EC_WORD_NOW}, .monSets = gBattleFrontierTrainerMons_Amanda }, [41] = { .facilityClass = FACILITY_CLASS_POKEFAN_F, - .trainerName = _("STAC"), + .trainerName = _("STACY"), .speechBefore = {EC_WORD_ALL, EC_WORD_POKEMON, EC_WORD_HAVE, EC_WORD_THEIR, EC_WORD_OWN, EC_WORD_CUTE_CHARM}, .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_WHAT, EC_WORD_I, EC_WORD_MEAN, EC_WORD_QUES}, .speechLose = {EC_WORD_SHOULD, EC_WORD_I, EC_WORD_NOT, EC_WORD_ADORE, EC_WORD_POKEMON, EC_WORD_QUES}, @@ -338,15 +338,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [42] = { .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, - .trainerName = _("RAFAE"), + .trainerName = _("RAFAEL"), .speechBefore = {EC_WORD_COME_ON, EC_WORD_EXCL, EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_SOME, EC_WORD_SPIRIT}, - .speechWin = {EC_WORD_THAT_S_IT_EXCL, EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_SPIRIT, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_THAT_S_IT_EXCL, EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_SPIRIT, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_WELL, EC_WORD_SO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_OUR, EC_WORD_SPIRIT}, .monSets = gBattleFrontierTrainerMons_Rafael }, [43] = { .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, - .trainerName = _("OLIVE"), + .trainerName = _("OLIVER"), .speechBefore = {EC_WORD_A, EC_WORD_GENIUS, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL}, .speechWin = {EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_WORKS, EC_WORD_EXCL}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_THAN, EC_WORD_I_AM}, @@ -354,23 +354,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [44] = { .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, - .trainerName = _("PAYTO"), + .trainerName = _("PAYTON"), .speechBefore = {EC_WORD_I, EC_WORD_TRAIN, EC_WORD_FROM, EC_WORD_THE, EC_WORD_EGG, EC_WORD_UP}, - .speechWin = {EC_WORD_WELL, EC_WORD_DONE, EC_WORD_EXCL, -1, -1, -1}, - .speechLose = {EC_WORD_THAT_WAS, EC_WORD_A, EC_MOVE2(SOFT_BOILED), EC_WORD_LOSS, EC_WORD_ELLIPSIS, -1}, + .speechWin = {EC_WORD_WELL, EC_WORD_DONE, EC_WORD_EXCL, 0xFFFF, 0xFFFF, 0xFFFF}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_A, EC_MOVE2(SOFT_BOILED), EC_WORD_LOSS, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Payton }, [45] = { .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, - .trainerName = _("PAMEL"), + .trainerName = _("PAMELA"), .speechBefore = {EC_WORD_ALL, EC_WORD_POKEMON, EC_WORD_ADORE, EC_WORD_A, EC_WORD_KIND, EC_WORD_TRAINER}, - .speechWin = {EC_WORD_IT_S, EC_WORD_TOO, EC_WORD_BAD, EC_WORD_YOU, EC_WORD_LOST, -1}, + .speechWin = {EC_WORD_IT_S, EC_WORD_TOO, EC_WORD_BAD, EC_WORD_YOU, EC_WORD_LOST, 0xFFFF}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_KIND, EC_WORD_AND, EC_WORD_YOU_RE, EC_WORD_ALSO, EC_WORD_STRONG}, .monSets = gBattleFrontierTrainerMons_Pamela }, [46] = { .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, - .trainerName = _("ELIZ"), + .trainerName = _("ELIZA"), .speechBefore = {EC_WORD_I, EC_WORD_ADORE, EC_WORD_POKEMON, EC_WORD_LIKE, EC_WORD_MY, EC_WORD_CHILDREN}, .speechWin = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_MY, EC_WORD_POKEMON}, .speechLose = {EC_WORD_OH_DEAR, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SORRY, EC_WORD_ABOUT, EC_WORD_THIS}, @@ -378,15 +378,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [47] = { .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, - .trainerName = _("MARIS"), - .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_WORD_BATTLE, EC_WORD_SERIOUSLY, -1}, + .trainerName = _("MARISA"), + .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_WORD_BATTLE, EC_WORD_SERIOUSLY, 0xFFFF}, .speechWin = {EC_WORD_PROMISE, EC_WORD_ME, EC_WORD_YOU, EC_WORD_WILL, EC_WORD_DO, EC_WORD_BETTER}, .speechLose = {EC_WORD_PROMISE, EC_WORD_ME, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_PLEASE, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Marisa }, [48] = { .facilityClass = FACILITY_CLASS_BUG_CATCHER, - .trainerName = _("LEWI"), + .trainerName = _("LEWIS"), .speechBefore = {EC_WORD_A_LITTLE, EC_WORD_BUG, EC_WORD_IS, EC_WORD_SCARY, EC_WORD_QUES, EC_WORD_HAHAHA}, .speechWin = {EC_WORD_LOOK, EC_WORD_LOOK, EC_WORD_EXCL, EC_WORD_A, EC_WORD_SCARY, EC_WORD_BUG}, .speechLose = {EC_WORD_OH, EC_WORD_A, EC_WORD_BUG, EC_WORD_ISN_T, EC_WORD_SCARY, EC_WORD_ELLIPSIS}, @@ -394,31 +394,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [49] = { .facilityClass = FACILITY_CLASS_BUG_CATCHER, - .trainerName = _("YOSH"), + .trainerName = _("YOSHI"), .speechBefore = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_LOVEY_DOVEY}, .speechWin = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_THE, EC_WORD_BEST, EC_WORD_EXCL}, - .speechLose = {EC_WORD_YOU_RE, EC_WORD_IGNORANT, EC_WORD_ABOUT, EC_WORD_BUG, EC_WORD_POKEMON, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_IGNORANT, EC_WORD_ABOUT, EC_WORD_BUG, EC_WORD_POKEMON, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Yoshi }, [50] = { .facilityClass = FACILITY_CLASS_BUG_CATCHER, - .trainerName = _("DESTI"), - .speechBefore = {EC_WORD_IT_S, EC_WORD_WAY, EC_WORD_TOO, EC_WORD_HOT, EC_WORD_HERE, -1}, - .speechWin = {EC_WORD_I_AM, EC_WORD_ABOUT, EC_WORD_TO, EC_MOVE(OVERHEAT), -1, -1}, - .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_SOME, EC_WORD_WATER, -1}, + .trainerName = _("DESTIN"), + .speechBefore = {EC_WORD_IT_S, EC_WORD_WAY, EC_WORD_TOO, EC_WORD_HOT, EC_WORD_HERE, 0xFFFF}, + .speechWin = {EC_WORD_I_AM, EC_WORD_ABOUT, EC_WORD_TO, EC_MOVE(OVERHEAT), 0xFFFF, 0xFFFF}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_SOME, EC_WORD_WATER, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Destin }, [51] = { .facilityClass = FACILITY_CLASS_NINJA_BOY, - .trainerName = _("KEO"), - .speechBefore = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_BUT, EC_WORD_HERE_I_COME, EC_WORD_EXCL, -1}, + .trainerName = _("KEON"), + .speechBefore = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_BUT, EC_WORD_HERE_I_COME, EC_WORD_EXCL, 0xFFFF}, .speechWin = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_FOR, EC_WORD_MY, EC_WORD_OVERWHELMING, EC_WORD_POWER}, - .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, -1, -1, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Keon }, [52] = { .facilityClass = FACILITY_CLASS_NINJA_BOY, - .trainerName = _("STUAR"), + .trainerName = _("STUART"), .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_YOU, EC_WORD_A, EC_WORD_HOT, EC_WORD_BATTLE}, .speechWin = {EC_WORD_THE, EC_WORD_MASTER, EC_WORD_OF, EC_WORD_COOL, EC_WORD_THAT_S, EC_WORD_ME}, .speechLose = {EC_WORD_I, EC_WORD_SEE, EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_SO, EC_WORD_COOL}, @@ -426,15 +426,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [53] = { .facilityClass = FACILITY_CLASS_NINJA_BOY, - .trainerName = _("NESTO"), + .trainerName = _("NESTOR"), .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_A, EC_WORD_REALLY, EC_WORD_SMOOTH, EC_WORD_MOVE}, .speechWin = {EC_WORD_THERE, EC_WORD_WAS, EC_WORD_NOTHING, EC_WORD_SMOOTH, EC_WORD_ABOUT, EC_WORD_THAT}, - .speechLose = {EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_ARE, EC_WORD_SMOOTH, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_ARE, EC_WORD_SMOOTH, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Nestor }, [54] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("DERRIC"), + .trainerName = _("DERRICK"), .speechBefore = {EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_YOU, EC_MOVE2(MEDITATE), EC_WORD_LIKE, EC_WORD_ME}, .speechWin = {EC_WORD_HOW, EC_WORD_I, EC_MOVE2(MEDITATE), EC_WORD_IS, EC_WORD_JUST, EC_WORD_BEAUTIFUL}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_MOVE2(MEDITATE), EC_WORD_FOR, EC_WORD_A, EC_MOVE2(CALM_MIND)}, @@ -442,31 +442,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [55] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("BRYSO"), + .trainerName = _("BRYSON"), .speechBefore = {EC_MOVE2(POISON_POWDER), EC_WORD_IS, EC_WORD_IN, EC_WORD_OUR, EC_MOVE2(COTTON_SPORE), EC_WORD_MOVE}, .speechWin = {EC_WORD_HOW_DO, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_OUR, EC_MOVE2(POISON_POWDER), EC_WORD_QUES}, - .speechLose = {EC_WORD_MY, EC_MOVE2(COTTON_SPORE), EC_WORD_WAS, EC_WORD_USELESS, -1, -1}, + .speechLose = {EC_WORD_MY, EC_MOVE2(COTTON_SPORE), EC_WORD_WAS, EC_WORD_USELESS, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Bryson }, [56] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("CLAYTO"), - .speechBefore = {EC_WORD_HUH_QUES, -1, -1, EC_WORD_WHERE, EC_WORD_IS_IT_QUES, -1}, + .trainerName = _("CLAYTON"), + .speechBefore = {EC_WORD_HUH_QUES, 0xFFFF, 0xFFFF, EC_WORD_WHERE, EC_WORD_IS_IT_QUES, 0xFFFF}, .speechWin = {EC_WORD_WHERE, EC_WORD_IS_IT_QUES, EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_WORD_POKENAV}, .speechLose = {EC_WORD_WHERE, EC_WORD_IS_IT_QUES, EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_WORD_SENSE}, .monSets = gBattleFrontierTrainerMons_Clayton }, [57] = { .facilityClass = FACILITY_CLASS_FISHERMAN, - .trainerName = _("TRENTO"), - .speechBefore = {EC_WORD_COME_OVER, EC_WORD_FOR, EC_WORD_SOME, EC_WORD_TASTY, EC_WORD_WATER, -1}, + .trainerName = _("TRENTON"), + .speechBefore = {EC_WORD_COME_OVER, EC_WORD_FOR, EC_WORD_SOME, EC_WORD_TASTY, EC_WORD_WATER, 0xFFFF}, .speechWin = {EC_WORD_MMM, EC_WORD_DO, EC_WORD_YOU, EC_WORD_WANT, EC_WORD_SOME, EC_WORD_QUES}, .speechLose = {EC_WORD_I, EC_WORD_GOT, EC_WORD_THIS, EC_WORD_TASTY, EC_WORD_WATER, EC_WORD_SHOPPING}, .monSets = gBattleFrontierTrainerMons_Trenton }, [58] = { .facilityClass = FACILITY_CLASS_FISHERMAN, - .trainerName = _("JENSO"), + .trainerName = _("JENSON"), .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_DOWNCAST}, .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_THE, EC_MOVE(CUT)}, .speechLose = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_TRAINER, EC_WORD_WHO_IS, EC_WORD_FEELING, EC_WORD_DOWNCAST}, @@ -474,15 +474,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [59] = { .facilityClass = FACILITY_CLASS_FISHERMAN, - .trainerName = _("WESLE"), + .trainerName = _("WESLEY"), .speechBefore = {EC_POKEMON2(MEW), EC_POKEMON2(MEW), EC_WORD_IS, EC_WORD_HOW, EC_WORD_I, EC_WORD_CRY}, .speechWin = {EC_WORD_YES, EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_EXCL}, - .speechLose = {EC_POKEMON2(MEW), EC_POKEMON2(MEW), EC_WORD_EXCL, EC_POKEMON2(MEW), EC_WORD_EXCL_EXCL, -1}, + .speechLose = {EC_POKEMON2(MEW), EC_POKEMON2(MEW), EC_WORD_EXCL, EC_POKEMON2(MEW), EC_WORD_EXCL_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Wesley }, [60] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("ANTO"), + .trainerName = _("ANTON"), .speechBefore = {EC_WORD_GET, EC_WORD_READY, EC_WORD_FOR, EC_WORD_ME, EC_WORD_TO, EC_MOVE(THRASH)}, .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, EC_WORD_SORRY, EC_WORD_ABOUT, EC_WORD_THAT, EC_WORD_EXCL}, .speechLose = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_TOUGH, EC_WORD_LOSS, EC_WORD_TO, EC_MOVE2(SWALLOW)}, @@ -490,15 +490,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [61] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("LAWSO"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AT, EC_WORD_HEART, EC_WORD_EXCL, -1}, + .trainerName = _("LAWSON"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AT, EC_WORD_HEART, EC_WORD_EXCL, 0xFFFF}, .speechWin = {EC_WORD_NOT, EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_NOT, EC_WORD_AT, EC_WORD_ALL}, .speechLose = {EC_WORD_I_AM, EC_WORD_OLD, EC_WORD_AND, EC_WORD_FEELING, EC_WORD_SHAKY, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Lawson }, [62] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("SAMM"), + .trainerName = _("SAMMY"), .speechBefore = {EC_WORD_MY, EC_WORD_PARTY, EC_WORD_IS, EC_WORD_READY, EC_WORD_TO, EC_WORD_ROCK}, .speechWin = {EC_WORD_MY, EC_WORD_PARTY, EC_WORD_IS, EC_WORD_JUST, EC_WORD_INCREDIBLE, EC_WORD_EXCL}, .speechLose = {EC_WORD_I, EC_WORD_CRY, EC_WORD_FOR, EC_WORD_MY, EC_WORD_PARTY, EC_WORD_ELLIPSIS}, @@ -506,7 +506,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [63] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("ARNI"), + .trainerName = _("ARNIE"), .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_I, EC_WORD_HAVE, EC_WORD_NO, EC_WORD_RIVAL}, .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I, EC_WORD_CAN_T, EC_WORD_LOSE}, .speechLose = {EC_WORD_NO, EC_WORD_EXCL, EC_WORD_I, EC_WORD_WON_T, EC_WORD_ACCEPT, EC_WORD_THIS}, @@ -514,23 +514,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [64] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("ADRIA"), - .speechBefore = {EC_WORD_YAHOO, EC_WORD_EXCL, -1, EC_WORD_YAHOO, EC_WORD_EXCL_EXCL, -1}, - .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, -1, EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, -1}, - .speechLose = {EC_WORD_GOOD_BYE, EC_WORD_EXCL, -1, EC_WORD_GOOD_BYE, EC_WORD_EXCL_EXCL, -1}, + .trainerName = _("ADRIAN"), + .speechBefore = {EC_WORD_YAHOO, EC_WORD_EXCL, 0xFFFF, EC_WORD_YAHOO, EC_WORD_EXCL_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, 0xFFFF}, + .speechLose = {EC_WORD_GOOD_BYE, EC_WORD_EXCL, 0xFFFF, EC_WORD_GOOD_BYE, EC_WORD_EXCL_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Adrian }, [65] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("TRISTA"), - .speechBefore = {EC_WORD_CONFUSED, EC_WORD_QUES, -1, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS}, - .speechWin = {EC_WORD_SEE, EC_WORD_QUES, -1, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS}, + .trainerName = _("TRISTAN"), + .speechBefore = {EC_WORD_CONFUSED, EC_WORD_QUES, 0xFFFF, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS}, + .speechWin = {EC_WORD_SEE, EC_WORD_QUES, 0xFFFF, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS}, .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_IN, EC_WORD_BATTLE}, .monSets = gBattleFrontierTrainerMons_Tristan }, [66] = { .facilityClass = FACILITY_CLASS_PARASOL_LADY, - .trainerName = _("JULIAN"), + .trainerName = _("JULIANA"), .speechBefore = {EC_WORD_I, EC_WORD_THINK, EC_WORD_I_AM, EC_WORD_SHOPPING, EC_WORD_TOO, EC_WORD_MUCH}, .speechWin = {EC_WORD_BUT, EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_PLUSH_DOLL}, .speechLose = {EC_WORD_I, EC_WORD_SO, EC_WORD_WANT, EC_WORD_ANOTHER, EC_WORD_POKEMON, EC_WORD_PLUSH_DOLL}, @@ -538,7 +538,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [67] = { .facilityClass = FACILITY_CLASS_PARASOL_LADY, - .trainerName = _("RYLE"), + .trainerName = _("RYLEE"), .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THAT, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GUTS}, .speechWin = {EC_WORD_BYE_BYE, EC_WORD_EXCL, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_NO, EC_WORD_GUTS}, .speechLose = {EC_WORD_THAT_WAS, EC_WORD_GUTSY, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_QUITE, EC_WORD_SUPER}, @@ -546,15 +546,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [68] = { .facilityClass = FACILITY_CLASS_PARASOL_LADY, - .trainerName = _("CHELSE"), + .trainerName = _("CHELSEA"), .speechBefore = {EC_WORD_I, EC_WORD_SERIOUSLY, EC_WORD_MEAN, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL}, - .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MY, EC_WORD_WILL, EC_WORD_TO, EC_WORD_WIN, -1}, - .speechLose = {EC_WORD_YOU_RE, EC_WORD_FAR, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, -1}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MY, EC_WORD_WILL, EC_WORD_TO, EC_WORD_WIN, 0xFFFF}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_FAR, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Chelsea }, [69] = { .facilityClass = FACILITY_CLASS_BEAUTY, - .trainerName = _("DANEL"), + .trainerName = _("DANELA"), .speechBefore = {EC_WORD_YOU, EC_WORD_MUST_BE, EC_WORD_MY, EC_WORD_OPPONENT, EC_WORD_NOW, EC_WORD_EXCL}, .speechWin = {EC_WORD_OH_DEAR, EC_WORD_TOO_WEAK, EC_WORD_EXCL, EC_WORD_DON_T, EC_WORD_GIVE_UP, EC_WORD_EXCL}, .speechLose = {EC_WORD_THAT_WAS, EC_WORD_GOOD, EC_WORD_AND, EC_WORD_THIS, EC_WORD_IS, EC_WORD_GOOD_BYE}, @@ -562,7 +562,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [70] = { .facilityClass = FACILITY_CLASS_BEAUTY, - .trainerName = _("LIZBET"), + .trainerName = _("LIZBETH"), .speechBefore = {EC_WORD_IF_I_LOSE, EC_WORD_YOU, EC_WORD_CAN, EC_WORD_HAVE, EC_WORD_A, EC_MOVE2(PRESENT)}, .speechWin = {EC_WORD_HERE_IT_IS, EC_WORD_A_LITTLE, EC_WORD_PRAISE, EC_WORD_AS, EC_WORD_YOUR, EC_MOVE2(PRESENT)}, .speechLose = {EC_WORD_YOUR, EC_MOVE2(PRESENT), EC_WORD_QUES_EXCL, EC_WORD_HERE_IT_IS, EC_WORD_A, EC_MOVE(DOUBLE_SLAP)}, @@ -570,7 +570,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [71] = { .facilityClass = FACILITY_CLASS_BEAUTY, - .trainerName = _("AMELI"), + .trainerName = _("AMELIA"), .speechBefore = {EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_CUTE, EC_WORD_FASHION, EC_WORD_APPEAL}, .speechWin = {EC_WORD_YOUR, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_A, EC_WORD_DISASTER}, .speechLose = {EC_WORD_THAT_WAS, EC_WORD_AWFUL, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_HOME}, @@ -578,7 +578,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [72] = { .facilityClass = FACILITY_CLASS_AROMA_LADY, - .trainerName = _("JILLIA"), + .trainerName = _("JILLIAN"), .speechBefore = {EC_WORD_WHAT, EC_WORD_IS, EC_WORD_THAT, EC_WORD_I, EC_WORD_SMELL, EC_WORD_QUES}, .speechWin = {EC_WORD_IT_S, EC_WORD_THE, EC_MOVE(SWEET_SCENT), EC_WORD_OF, EC_WORD_TASTY, EC_WORD_WATER}, .speechLose = {EC_WORD_IT_S, EC_WORD_YOUR, EC_WORD_OFFENSIVE, EC_WORD_STENCH, EC_WORD_THAT_S, EC_WORD_WHAT}, @@ -586,7 +586,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [73] = { .facilityClass = FACILITY_CLASS_AROMA_LADY, - .trainerName = _("ABBI"), + .trainerName = _("ABBIE"), .speechBefore = {EC_WORD_YOU, EC_WORD_TRY, EC_WORD_MY, EC_WORD_SECRET, EC_MOVE(AROMATHERAPY), EC_WORD_OK_QUES}, .speechWin = {EC_WORD_MY, EC_MOVE(AROMATHERAPY), EC_WORD_IS, EC_WORD_TERRIBLE, EC_WORD_FOR, EC_WORD_YOU}, .speechLose = {EC_WORD_DIDN_T, EC_WORD_YOU, EC_WORD_SMELL, EC_WORD_A, EC_WORD_THING, EC_WORD_QUES_EXCL}, @@ -594,7 +594,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [74] = { .facilityClass = FACILITY_CLASS_AROMA_LADY, - .trainerName = _("BRIAN"), + .trainerName = _("BRIANA"), .speechBefore = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_WORKS, EC_WORD_TOO, EC_WORD_MUCH}, .speechWin = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_MISS, EC_WORD_HIM, EC_WORD_MORE, EC_WORD_ELLIPSIS}, .speechLose = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_LONESOME, EC_WORD_WITHOUT, EC_WORD_HIM, EC_WORD_ELLIPSIS}, @@ -602,7 +602,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [75] = { .facilityClass = FACILITY_CLASS_GUITARIST, - .trainerName = _("ANTONI"), + .trainerName = _("ANTONIO"), .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_TO, EC_WORD_GO, EC_WORD_GO}, .speechWin = {EC_WORD_BUT, EC_WORD_I, EC_WORD_DON_T, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_DANCE}, .speechLose = {EC_WORD_GO, EC_WORD_GO, EC_WORD_ELLIPSIS, EC_WORD_JUST, EC_MOVE(FLAIL), EC_WORD_ABOUT}, @@ -610,23 +610,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [76] = { .facilityClass = FACILITY_CLASS_GUITARIST, - .trainerName = _("JADE"), + .trainerName = _("JADEN"), .speechBefore = {EC_WORD_HELLO, EC_WORD_I, EC_WORD_THINK, EC_WORD_I, EC_WORD_ADORE, EC_WORD_YOU}, .speechWin = {EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_MOVE(THRASH), EC_WORD_IN, EC_MOVE2(FRUSTRATION)}, - .speechLose = {EC_WORD_THIS_IS_IT_EXCL, -1, -1, EC_WORD_GOOD_BYE, EC_WORD_FOREVER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_THIS_IS_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_GOOD_BYE, EC_WORD_FOREVER, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Jaden }, [77] = { .facilityClass = FACILITY_CLASS_GUITARIST, - .trainerName = _("DAKOT"), + .trainerName = _("DAKOTA"), .speechBefore = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_DANCE, EC_WORD_WITH, EC_WORD_POWER}, .speechWin = {EC_WORD_GOT, EC_WORD_IT, EC_WORD_QUES, EC_WORD_DANCE, EC_WORD_WITH, EC_WORD_POWER}, - .speechLose = {EC_WORD_OKAY, EC_WORD_YOU, EC_WORD_UNDERSTAND, EC_WORD_ALL_RIGHT, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_OKAY, EC_WORD_YOU, EC_WORD_UNDERSTAND, EC_WORD_ALL_RIGHT, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Dakota }, [78] = { .facilityClass = FACILITY_CLASS_BIRD_KEEPER, - .trainerName = _("BRAYDE"), + .trainerName = _("BRAYDEN"), .speechBefore = {EC_WORD_COLOR_CHANGE, EC_WORD_VERSION, EC_WORD_TOYS, EC_WORD_ARE, EC_WORD_USELESS, EC_WORD_EXCL}, .speechWin = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_COLLECT, EC_WORD_NORMAL, EC_WORD_VERSION, EC_WORD_TOYS}, .speechLose = {EC_WORD_I, EC_MOVE2(ATTRACT), EC_WORD_COLOR_CHANGE, EC_WORD_VERSION, EC_WORD_TOYS, EC_WORD_ELLIPSIS}, @@ -634,31 +634,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [79] = { .facilityClass = FACILITY_CLASS_BIRD_KEEPER, - .trainerName = _("CORSO"), + .trainerName = _("CORSON"), .speechBefore = {EC_WORD_I, EC_WORD_GET, EC_WORD_TO, EC_MOVE2(BEAT_UP), EC_WORD_ON, EC_WORD_YOU}, .speechWin = {EC_WORD_TOO, EC_WORD_EASY, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_COOL}, - .speechLose = {EC_WORD_WHY, EC_WORD_QUES_EXCL, -1, EC_WORD_I, EC_MOVE2(CURSE), EC_WORD_YOU}, + .speechLose = {EC_WORD_WHY, EC_WORD_QUES_EXCL, 0xFFFF, EC_WORD_I, EC_MOVE2(CURSE), EC_WORD_YOU}, .monSets = gBattleFrontierTrainerMons_Corson }, [80] = { .facilityClass = FACILITY_CLASS_BIRD_KEEPER, - .trainerName = _("TREVI"), + .trainerName = _("TREVIN"), .speechBefore = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NONE, EC_WORD_BETTER, EC_WORD_THAN, EC_WORD_ME}, - .speechWin = {EC_WORD_YES_SIR_EXCL, -1, -1, EC_WORD_I_AM, EC_WORD_THE, EC_WORD_BEST}, - .speechLose = {EC_WORD_SERIOUS, EC_WORD_QUES_EXCL, -1, -1, -1, -1}, + .speechWin = {EC_WORD_YES_SIR_EXCL, 0xFFFF, 0xFFFF, EC_WORD_I_AM, EC_WORD_THE, EC_WORD_BEST}, + .speechLose = {EC_WORD_SERIOUS, EC_WORD_QUES_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Trevin }, [81] = { .facilityClass = FACILITY_CLASS_SAILOR, - .trainerName = _("PATRIC"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_PERFECT, EC_WORD_EXCL, EC_WORD_GIVE_UP, EC_WORD_NOW, -1}, - .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_DISAPPOINTED, EC_WORD_I_AM, EC_WORD_PERFECT, -1}, + .trainerName = _("PATRICK"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_PERFECT, EC_WORD_EXCL, EC_WORD_GIVE_UP, EC_WORD_NOW, 0xFFFF}, + .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_DISAPPOINTED, EC_WORD_I_AM, EC_WORD_PERFECT, 0xFFFF}, .speechLose = {EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_PERFECT, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Patrick }, [82] = { .facilityClass = FACILITY_CLASS_SAILOR, - .trainerName = _("KADE"), + .trainerName = _("KADEN"), .speechBefore = {EC_WORD_WHAT, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_UP, EC_WORD_TO, EC_WORD_QUES}, .speechWin = {EC_WORD_YOU, EC_WORD_WERE, EC_WORD_A, EC_WORD_SURPRISE, EC_WORD_TO_ME, EC_WORD_EXCL}, .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_WHO, EC_WORD_I_AM, EC_WORD_ELLIPSIS}, @@ -666,15 +666,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [83] = { .facilityClass = FACILITY_CLASS_SAILOR, - .trainerName = _("MAXWEL"), - .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_WHO_IS, EC_WORD_YOUR, EC_WORD_RIVAL, EC_WORD_QUES, -1}, + .trainerName = _("MAXWELL"), + .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_WHO_IS, EC_WORD_YOUR, EC_WORD_RIVAL, EC_WORD_QUES, 0xFFFF}, .speechWin = {EC_WORD_MY, EC_WORD_RIVAL, EC_WORD_IS, EC_WORD_MY, EC_WORD_GIRL, EC_WORD_FRIEND}, - .speechLose = {EC_WORD_I_AM, EC_WORD_MAKING, EC_WORD_YOU, EC_WORD_MY, EC_WORD_RIVAL, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_MAKING, EC_WORD_YOU, EC_WORD_MY, EC_WORD_RIVAL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Maxwell }, [84] = { .facilityClass = FACILITY_CLASS_HIKER, - .trainerName = _("DARY"), + .trainerName = _("DARYL"), .speechBefore = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_TO, EC_MOVE(CHARGE)}, .speechWin = {EC_WORD_AM, EC_WORD_I, EC_WORD_OVERWHELMING, EC_WORD_OR, EC_WORD_WHAT, EC_WORD_QUES}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_A, EC_WORD_LEGEND, EC_WORD_EXCL}, @@ -682,31 +682,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [85] = { .facilityClass = FACILITY_CLASS_HIKER, - .trainerName = _("KENNET"), + .trainerName = _("KENNETH"), .speechBefore = {EC_WORD_YOU, EC_WORD_BETTER, EC_WORD_NOT, EC_MOVE2(SLACK_OFF), EC_WORD_WITH, EC_WORD_ME}, .speechWin = {EC_WORD_DID, EC_WORD_MY, EC_MOVE2(TAUNT), EC_WORD_INTIMIDATE, EC_WORD_YOU, EC_WORD_QUES}, - .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, -1, -1, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Kenneth }, [86] = { .facilityClass = FACILITY_CLASS_HIKER, - .trainerName = _("RIC"), - .speechBefore = {EC_WORD_YOUR, EC_MOVE(FACADE), EC_WORD_DOESN_T, EC_MOVE2(TRICK), EC_WORD_ME, -1}, - .speechWin = {EC_WORD_SERIOUSLY, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_OK_QUES, -1}, - .speechLose = {EC_WORD_THAT_WAS, EC_WORD_REALLY, EC_WORD_TOUGH, EC_WORD_ON, EC_WORD_ME, -1}, + .trainerName = _("RICH"), + .speechBefore = {EC_WORD_YOUR, EC_MOVE(FACADE), EC_WORD_DOESN_T, EC_MOVE2(TRICK), EC_WORD_ME, 0xFFFF}, + .speechWin = {EC_WORD_SERIOUSLY, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_OK_QUES, 0xFFFF}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_REALLY, EC_WORD_TOUGH, EC_WORD_ON, EC_WORD_ME, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Rich }, [87] = { .facilityClass = FACILITY_CLASS_KINDLER, - .trainerName = _("CADE"), - .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_DEFEATED, EC_WORD_EXCL, -1}, - .speechWin = {EC_WORD_FIRE, EC_WORD_EXCL, -1, EC_WORD_FIRE, EC_WORD_EXCL_EXCL, -1}, + .trainerName = _("CADEN"), + .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_DEFEATED, EC_WORD_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_FIRE, EC_WORD_EXCL, 0xFFFF, EC_WORD_FIRE, EC_WORD_EXCL_EXCL, 0xFFFF}, .speechLose = {EC_WORD_I_AM, EC_WORD_TIRED, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_SO, EC_WORD_HOT}, .monSets = gBattleFrontierTrainerMons_Caden }, [88] = { .facilityClass = FACILITY_CLASS_KINDLER, - .trainerName = _("MARLO"), + .trainerName = _("MARLON"), .speechBefore = {EC_WORD_A, EC_WORD_POKEDEX, EC_WORD_IS, EC_WORD_A_LITTLE, EC_WORD_RADIO, EC_WORD_QUES}, .speechWin = {EC_WORD_A_LITTLE, EC_WORD_RADIO, EC_WORD_HUH_QUES, EC_WORD_THAT_S, EC_WORD_TOTALLY, EC_WORD_COOL}, .speechLose = {EC_WORD_IT_S, EC_WORD_NOT, EC_WORD_QUES, EC_WORD_IS, EC_WORD_POKENAV, EC_WORD_QUES}, @@ -714,15 +714,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [89] = { .facilityClass = FACILITY_CLASS_KINDLER, - .trainerName = _("NAS"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_BABY, EC_WORD_EXCL, -1}, + .trainerName = _("NASH"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_BABY, EC_WORD_EXCL, 0xFFFF}, .speechWin = {EC_WORD_I, EC_WORD_LEFT, EC_WORD_YOU, EC_WORD_JUST, EC_WORD_AN, EC_MOVE2(EMBER)}, - .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, -1, EC_WORD_NO, EC_WORD_WATER, EC_WORD_PLEASE}, + .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_WATER, EC_WORD_PLEASE}, .monSets = gBattleFrontierTrainerMons_Nash }, [90] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, - .trainerName = _("ROBB"), + .trainerName = _("ROBBY"), .speechBefore = {EC_WORD_HAHAHA, EC_WORD_EXCL, EC_WORD_HAPPY, EC_WORD_TO, EC_WORD_MEET_YOU, EC_WORD_EXCL}, .speechWin = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_LEADER, EC_WORD_WITH, EC_WORD_REFRESHING, EC_WORD_SERENE_GRACE}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(THRASH), EC_WORD_MY, EC_WORD_TOYS, EC_WORD_EXCL}, @@ -730,7 +730,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [91] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, - .trainerName = _("REEC"), + .trainerName = _("REECE"), .speechBefore = {EC_WORD_MY, EC_MOVE2(QUICK_ATTACK), EC_WORD_CAN, EC_WORD_BEAT, EC_WORD_A, EC_MOVE2(TELEPORT)}, .speechWin = {EC_WORD_LIKE, EC_WORD_I, EC_WORD_SAID, EC_WORD_I_AM, EC_WORD_DARN, EC_WORD_FAST}, .speechLose = {EC_WORD_I_WAS, EC_WORD_KIDDING, EC_WORD_ABOUT, EC_WORD_THAT, EC_MOVE2(TELEPORT), EC_WORD_THING}, @@ -738,7 +738,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [92] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, - .trainerName = _("KATHRY"), + .trainerName = _("KATHRYN"), .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_TRAIN, EC_WORD_GOOD, EC_WORD_ENOUGH, EC_WORD_QUES}, .speechWin = {EC_WORD_DON_T, EC_MOVE2(TAUNT), EC_WORD_ME, EC_WORD_LIKE, EC_WORD_THAT, EC_WORD_OK_QUES}, .speechLose = {EC_WORD_WHY, EC_WORD_COULDN_T, EC_WORD_I, EC_WORD_WIN, EC_WORD_THIS, EC_WORD_QUES}, @@ -746,31 +746,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [93] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, - .trainerName = _("ELLE"), + .trainerName = _("ELLEN"), .speechBefore = {EC_WORD_CRUSH, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_AN, EC_WORD_EGG, EC_WORD_EXCL}, .speechWin = {EC_WORD_THAT_WAS, EC_WORD_A, EC_WORD_TASTY, EC_WORD_VICTORY, EC_WORD_FOR, EC_WORD_ME}, - .speechLose = {EC_WORD_TOO, EC_WORD_TOUGH, EC_WORD_TO, EC_WORD_CRUSH, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_TOO, EC_WORD_TOUGH, EC_WORD_TO, EC_WORD_CRUSH, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Ellen }, [94] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, - .trainerName = _("RAMO"), - .speechBefore = {EC_WORD_OKAY, EC_WORD_EXCL, -1, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PERFECTION}, + .trainerName = _("RAMON"), + .speechBefore = {EC_WORD_OKAY, EC_WORD_EXCL, 0xFFFF, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PERFECTION}, .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_THAT, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL}, .speechLose = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_SECRET, EC_WORD_WHY, EC_WORD_I_AM, EC_WORD_HAPPY}, .monSets = gBattleFrontierTrainerMons_Ramon }, [95] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, - .trainerName = _("ARTHU"), + .trainerName = _("ARTHUR"), .speechBefore = {EC_WORD_HERE_I_COME, EC_WORD_FEELING, EC_WORD_READY, EC_WORD_FOR, EC_WORD_IT, EC_WORD_ALL}, - .speechWin = {EC_WORD_THAT_S_IT_EXCL, -1, -1, EC_WORD_THAT_WAS, EC_WORD_FABULOUS, EC_WORD_EXCL}, - .speechLose = {EC_WORD_THAT_WAS, EC_WORD_NOT, EC_WORD_WHAT, EC_WORD_I, EC_WORD_NEED, -1}, + .speechWin = {EC_WORD_THAT_S_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_THAT_WAS, EC_WORD_FABULOUS, EC_WORD_EXCL}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_NOT, EC_WORD_WHAT, EC_WORD_I, EC_WORD_NEED, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Arthur }, [96] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, - .trainerName = _("ALONDR"), + .trainerName = _("ALONDRA"), .speechBefore = {EC_WORD_EVERY, EC_WORD_DAY, EC_WORD_IS, EC_WORD_A, EC_WORD_GREAT, EC_WORD_DAY}, .speechWin = {EC_WORD_MY, EC_MOVE2(DIVE), EC_WORD_WILL, EC_WORD_BE, EC_WORD_A, EC_WORD_LEGEND}, .speechLose = {EC_WORD_MY, EC_MOVE2(DIVE), EC_WORD_LEFT, EC_WORD_ME, EC_WORD_COLD, EC_WORD_ELLIPSIS}, @@ -778,15 +778,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [97] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, - .trainerName = _("ADRIAN"), + .trainerName = _("ADRIANA"), .speechBefore = {EC_WORD_COME, EC_WORD_SEE, EC_WORD_AN, EC_WORD_INCREDIBLE, EC_WORD_SWIFT_SWIM, EC_WORD_EXCL}, .speechWin = {EC_WORD_I, EC_WORD_MAKE, EC_WORD_IT, EC_WORD_LOOK, EC_WORD_SO, EC_WORD_EASY}, - .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_TIRED, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_TIRED, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Adriana }, [98] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, - .trainerName = _("MALI"), + .trainerName = _("MALIK"), .speechBefore = {EC_WORD_OH, EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_PLEASE, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_WON, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_TIRED}, .speechLose = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_LOST, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_TIRED}, @@ -794,23 +794,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [99] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, - .trainerName = _("JIL"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_EXCL, -1}, - .speechWin = {EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_WINS, EC_WORD_EXCL, -1}, + .trainerName = _("JILL"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_WINS, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_GIVES, EC_WORD_UP, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Jill }, [100] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, - .trainerName = _("ERI"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_SPEED_BOOST, EC_WORD_HERO, EC_WORD_EXCL, -1}, + .trainerName = _("ERIK"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_SPEED_BOOST, EC_WORD_HERO, EC_WORD_EXCL, 0xFFFF}, .speechWin = {EC_WORD_THANK_YOU, EC_WORD_FROM, EC_WORD_THE, EC_WORD_SPEED_BOOST, EC_WORD_HERO, EC_WORD_EXCL}, - .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL}, + .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL}, .monSets = gBattleFrontierTrainerMons_Erik }, [101] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, - .trainerName = _("YAZMI"), + .trainerName = _("YAZMIN"), .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_RATHER, EC_WORD_RUN, EC_WORD_THAN, EC_WORD_BIKE}, .speechWin = {EC_WORD_YES, EC_WORD_I, EC_WORD_WOULD, EC_WORD_MUCH, EC_WORD_RATHER, EC_WORD_RUN}, .speechLose = {EC_WORD_BYE_BYE, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_RUN_AWAY}, @@ -818,7 +818,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [102] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, - .trainerName = _("JAMA"), + .trainerName = _("JAMAL"), .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_A, EC_WORD_FATHER}, .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_FOR, EC_WORD_MY, EC_WORD_BABY}, .speechLose = {EC_WORD_MY, EC_WORD_BABY, EC_WORD_WILL, EC_WORD_BE, EC_WORD_TOTALLY, EC_WORD_AWESOME}, @@ -826,7 +826,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [103] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, - .trainerName = _("LESLI"), + .trainerName = _("LESLIE"), .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_A, EC_WORD_MOTHER}, .speechWin = {EC_WORD_A, EC_WORD_BABY, EC_WORD_WILL, EC_WORD_BE, EC_WORD_A_LITTLE, EC_WORD_CHALLENGE}, .speechLose = {EC_WORD_I_AM, EC_WORD_TOO, EC_WORD_HAPPY, EC_WORD_TO, EC_WORD_BE, EC_WORD_ANGRY}, @@ -834,7 +834,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [104] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, - .trainerName = _("DAV"), + .trainerName = _("DAVE"), .speechBefore = {EC_WORD_WHAT, EC_WORD_SHOULD, EC_WORD_I, EC_WORD_DO, EC_WORD_TODAY, EC_WORD_QUES}, .speechWin = {EC_WORD_I, EC_WORD_SHOULD, EC_WORD_ENJOY, EC_WORD_SOME, EC_WORD_SPORTS, EC_WORD_EXCL}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GO, EC_WORD_PLAY, EC_WORD_A, EC_WORD_GAME}, @@ -842,15 +842,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [105] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, - .trainerName = _("CARL"), - .speechBefore = {EC_WORD_HAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_YEAH, EC_WORD_EXCL_EXCL, -1}, + .trainerName = _("CARLO"), + .speechBefore = {EC_WORD_HAH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF}, .speechWin = {EC_WORD_I, EC_WORD_DO, EC_WORD_THINGS, EC_WORD_AT, EC_MOVE(EXTREME_SPEED), EC_WORD_EXCL}, - .speechLose = {EC_WORD_I, EC_WORD_LOST, EC_WORD_AT, EC_MOVE(EXTREME_SPEED), EC_WORD_ELLIPSIS, -1}, + .speechLose = {EC_WORD_I, EC_WORD_LOST, EC_WORD_AT, EC_MOVE(EXTREME_SPEED), EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Carlo }, [106] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, - .trainerName = _("EMILI"), + .trainerName = _("EMILIA"), .speechBefore = {EC_WORD_ME, EC_WORD_WORRY, EC_WORD_QUES, EC_WORD_I, EC_WORD_HAVE, EC_WORD_NONE}, .speechWin = {EC_WORD_AHAHA, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_THAT_WAS, EC_WORD_FANTASTIC, EC_WORD_EXCL}, .speechLose = {EC_WORD_AHAHA, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_THAT_WAS, EC_WORD_ENTERTAINING, EC_WORD_EXCL}, @@ -858,39 +858,39 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [107] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, - .trainerName = _("DALI"), - .speechBefore = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_IS, EC_WORD_VERY, EC_WORD_EXPENSIVE, -1}, + .trainerName = _("DALIA"), + .speechBefore = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_IS, EC_WORD_VERY, EC_WORD_EXPENSIVE, 0xFFFF}, .speechWin = {EC_WORD_DON_T, EC_WORD_COME, EC_WORD_NEAR, EC_WORD_MY, EC_WORD_BIKE, EC_WORD_EXCL}, .speechLose = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_IS, EC_WORD_MY, EC_WORD_BEST, EC_WORD_FRIEND}, .monSets = gBattleFrontierTrainerMons_Dalia }, [108] = { .facilityClass = FACILITY_CLASS_BLACK_BELT, - .trainerName = _("HITOM"), - .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_HAH, EC_WORD_EXCL_EXCL, -1}, - .speechWin = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, -1, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES_EXCL}, - .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, -1, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_EXCL_EXCL}, + .trainerName = _("HITOMI"), + .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_HAH, EC_WORD_EXCL_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES_EXCL}, + .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_EXCL_EXCL}, .monSets = gBattleFrontierTrainerMons_Hitomi }, [109] = { .facilityClass = FACILITY_CLASS_BLACK_BELT, - .trainerName = _("RICARD"), + .trainerName = _("RICARDO"), .speechBefore = {EC_WORD_COME_ON, EC_WORD_EXCL, EC_WORD_PLAY, EC_WORD_TIME, EC_WORD_IS, EC_WORD_OVER}, - .speechWin = {EC_WORD_YOU_RE, EC_WORD_OUT, EC_WORD_OF, EC_WORD_HERE, EC_WORD_EXCL, -1}, - .speechLose = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_HIT, EC_WORD_ME, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_OUT, EC_WORD_OF, EC_WORD_HERE, EC_WORD_EXCL, 0xFFFF}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_HIT, EC_WORD_ME, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Ricardo }, [110] = { .facilityClass = FACILITY_CLASS_BLACK_BELT, - .trainerName = _("SHIZUK"), + .trainerName = _("SHIZUKA"), .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THAT, EC_WORD_YOU_RE, EC_WORD_SERIOUS, EC_WORD_EXCL}, - .speechWin = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_FORGET, EC_WORD_ABOUT, EC_WORD_YOU, -1}, + .speechWin = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_FORGET, EC_WORD_ABOUT, EC_WORD_YOU, 0xFFFF}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_PERFECT, EC_WORD_IN, EC_WORD_EVERY, EC_WORD_WAY, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Shizuka }, [111] = { .facilityClass = FACILITY_CLASS_BATTLE_GIRL, - .trainerName = _("JOAN"), + .trainerName = _("JOANA"), .speechBefore = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_RIGHT, EC_WORD_AWAY}, .speechWin = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_WINNER, EC_WORD_HEAR, EC_WORD_ME, EC_MOVE2(ROAR)}, .speechLose = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_ACCEPT, EC_WORD_THAT, EC_MOVE(OUTRAGE)}, @@ -898,87 +898,87 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [112] = { .facilityClass = FACILITY_CLASS_BATTLE_GIRL, - .trainerName = _("KELL"), + .trainerName = _("KELLY"), .speechBefore = {EC_WORD_MY, EC_WORD_NIGHT, EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_SCARY}, - .speechWin = {EC_WORD_A, EC_WORD_LADY, EC_WORD_GHOST, EC_WORD_APPEARS, EC_WORD_THERE, -1}, + .speechWin = {EC_WORD_A, EC_WORD_LADY, EC_WORD_GHOST, EC_WORD_APPEARS, EC_WORD_THERE, 0xFFFF}, .speechLose = {EC_WORD_THE, EC_WORD_HOME, EC_WORD_WORK, EC_WORD_IS, EC_WORD_AWFULLY, EC_WORD_SCARY}, .monSets = gBattleFrontierTrainerMons_Kelly }, [113] = { .facilityClass = FACILITY_CLASS_BATTLE_GIRL, - .trainerName = _("RAYN"), + .trainerName = _("RAYNA"), .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_WHEN, EC_WORD_IT_S, EC_WORD_ABOUT, EC_WORD_POWER}, - .speechWin = {EC_WORD_UNDERSTAND, EC_WORD_MY, EC_WORD_POWER, EC_WORD_NOW, EC_WORD_QUES, -1}, - .speechLose = {EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS, -1, EC_WORD_I_AM, EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_UNDERSTAND, EC_WORD_MY, EC_WORD_POWER, EC_WORD_NOW, EC_WORD_QUES, 0xFFFF}, + .speechLose = {EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_I_AM, EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Rayna }, [114] = { .facilityClass = FACILITY_CLASS_EXPERT_M, - .trainerName = _("EVA"), - .speechBefore = {EC_WORD_EVERY, EC_WORD_BATTLE, EC_WORD_HAS, EC_WORD_A, EC_WORD_SMELL, -1}, + .trainerName = _("EVAN"), + .speechBefore = {EC_WORD_EVERY, EC_WORD_BATTLE, EC_WORD_HAS, EC_WORD_A, EC_WORD_SMELL, 0xFFFF}, .speechWin = {EC_WORD_OH, EC_WORD_EXCL, EC_WORD_THE, EC_MOVE(SWEET_SCENT), EC_WORD_OF, EC_WORD_VICTORY}, .speechLose = {EC_WORD_THE, EC_WORD_AWFUL, EC_WORD_STENCH, EC_WORD_OF, EC_WORD_A, EC_WORD_LOSS}, .monSets = gBattleFrontierTrainerMons_Evan }, [115] = { .facilityClass = FACILITY_CLASS_EXPERT_M, - .trainerName = _("JORDA"), - .speechBefore = {EC_WORD_GOOD, EC_WORD_EXCL, -1, EC_WORD_COME_ON, EC_WORD_EXCL_EXCL, -1}, - .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, EC_WORD_EXCL, -1}, - .speechLose = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, -1, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES}, + .trainerName = _("JORDAN"), + .speechBefore = {EC_WORD_GOOD, EC_WORD_EXCL, 0xFFFF, EC_WORD_COME_ON, EC_WORD_EXCL_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, EC_WORD_EXCL, 0xFFFF}, + .speechLose = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, 0xFFFF, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES}, .monSets = gBattleFrontierTrainerMons_Jordan }, [116] = { .facilityClass = FACILITY_CLASS_EXPERT_M, - .trainerName = _("JOE"), - .speechBefore = {EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, -1, -1, -1, -1}, - .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, -1, -1, -1, -1}, - .speechLose = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, -1, -1, -1, -1}, + .trainerName = _("JOEL"), + .speechBefore = {EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, + .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, + .speechLose = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Joel }, [117] = { .facilityClass = FACILITY_CLASS_EXPERT_F, - .trainerName = _("KRISTE"), - .speechBefore = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, -1, EC_WORD_A, EC_WORD_KID, EC_WORD_ELLIPSIS}, + .trainerName = _("KRISTEN"), + .speechBefore = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_A, EC_WORD_KID, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_JUST, EC_WORD_A_LITTLE, EC_WORD_KID, EC_WORD_AFTER, EC_WORD_ALL, EC_WORD_EXCL}, .speechLose = {EC_WORD_A, EC_WORD_TOUGH, EC_WORD_KID, EC_WORD_HUH_QUES, EC_WORD_HUMPH, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Kristen }, [118] = { .facilityClass = FACILITY_CLASS_EXPERT_F, - .trainerName = _("SELPH"), - .speechBefore = {EC_WORD_HUH_QUES, EC_WORD_WHAT, EC_WORD_IS_IT_QUES, -1, -1, -1}, + .trainerName = _("SELPHY"), + .speechBefore = {EC_WORD_HUH_QUES, EC_WORD_WHAT, EC_WORD_IS_IT_QUES, 0xFFFF, 0xFFFF, 0xFFFF}, .speechWin = {EC_WORD_OH, EC_WORD_YES, EC_WORD_EXCL, EC_WORD_WHY, EC_WORD_NOT, EC_WORD_QUES}, .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_EXCL, EC_WORD_WHY, EC_WORD_NOT, EC_WORD_QUES}, .monSets = gBattleFrontierTrainerMons_Selphy }, [119] = { .facilityClass = FACILITY_CLASS_EXPERT_F, - .trainerName = _("CHLO"), + .trainerName = _("CHLOE"), .speechBefore = {EC_WORD_COME, EC_WORD_WE, EC_WORD_WILL, EC_WORD_DO, EC_WORD_BATTLE, EC_WORD_NOW}, - .speechWin = {EC_WORD_MORE, EC_WORD_EXCL, -1, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_EXCL}, - .speechLose = {EC_WORD_OH, EC_WORD_EXCL, -1, EC_WORD_STRONG, EC_WORD_YOU, EC_WORD_ARE}, + .speechWin = {EC_WORD_MORE, EC_WORD_EXCL, 0xFFFF, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_OH, EC_WORD_EXCL, 0xFFFF, EC_WORD_STRONG, EC_WORD_YOU, EC_WORD_ARE}, .monSets = gBattleFrontierTrainerMons_Chloe }, [120] = { .facilityClass = FACILITY_CLASS_PSYCHIC_M, - .trainerName = _("NORTO"), - .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_ONLY, EC_WORD_YOU, -1, -1}, + .trainerName = _("NORTON"), + .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_ONLY, EC_WORD_YOU, 0xFFFF, 0xFFFF}, .speechWin = {EC_WORD_EXCUSE_ME, EC_WORD_BUT, EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_PUSHOVER, EC_WORD_EXCL}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_SOME, EC_WORD_KIND, EC_WORD_OF, EC_WORD_AWESOME, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Norton }, [121] = { .facilityClass = FACILITY_CLASS_PSYCHIC_M, - .trainerName = _("LUKA"), + .trainerName = _("LUKAS"), .speechBefore = {EC_WORD_MY, EC_WORD_JOKING, EC_WORD_IS, EC_WORD_PRETTY, EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_YOUR, EC_WORD_ROCK_HEAD, EC_WORD_EXISTS, EC_WORD_TO, EC_WORD_SHINE, EC_WORD_EXCL}, - .speechLose = {EC_WORD_YOUR, EC_WORD_ROCK_HEAD, EC_WORD_COME, EC_WORD_TO, EC_WORD_SHINE, -1}, + .speechLose = {EC_WORD_YOUR, EC_WORD_ROCK_HEAD, EC_WORD_COME, EC_WORD_TO, EC_WORD_SHINE, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Lukas }, [122] = { .facilityClass = FACILITY_CLASS_PSYCHIC_M, - .trainerName = _("ZAC"), + .trainerName = _("ZACH"), .speechBefore = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_EXCELLENT, EC_MOVE2(MIMIC), EC_WORD_OF, EC_WORD_POKEMON}, .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_LIKE, EC_WORD_A_LITTLE, EC_POKEMON2(TOGEPI), EC_WORD_EXCL}, .speechLose = {EC_WORD_I_AM, EC_WORD_ANGRY, EC_WORD_LIKE, EC_WORD_A, EC_POKEMON2(MANKEY), EC_WORD_EXCL}, @@ -986,7 +986,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [123] = { .facilityClass = FACILITY_CLASS_PSYCHIC_F, - .trainerName = _("KAITLY"), + .trainerName = _("KAITLYN"), .speechBefore = {EC_WORD_I, EC_WORD_CRUSH, EC_WORD_THINGS, EC_WORD_WITH, EC_WORD_PSYCHIC, EC_WORD_POWER}, .speechWin = {EC_WORD_MY, EC_WORD_VICTORY, EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_THE, EC_WORD_NEWS}, .speechLose = {EC_WORD_NO, EC_WORD_NO, EC_WORD_ELLIPSIS, EC_WORD_THIS, EC_WORD_WON_T, EC_WORD_DO}, @@ -994,31 +994,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [124] = { .facilityClass = FACILITY_CLASS_PSYCHIC_F, - .trainerName = _("BREANN"), + .trainerName = _("BREANNA"), .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_WILL, EC_WORD_CRUSH, EC_WORD_YOU, EC_WORD_EXCL}, .speechWin = {EC_WORD_HAVE, EC_WORD_SOME, EC_WORD_MORE, EC_WORD_OF, EC_WORD_THIS, EC_WORD_EXCL}, - .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GUTS, EC_WORD_AND, EC_WORD_SKILL, -1}, + .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GUTS, EC_WORD_AND, EC_WORD_SKILL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Breanna }, [125] = { .facilityClass = FACILITY_CLASS_PSYCHIC_F, - .trainerName = _("KENDR"), + .trainerName = _("KENDRA"), .speechBefore = {EC_WORD_IF, EC_WORD_YOU_RE, EC_WORD_SMART, EC_WORD_STOP, EC_WORD_RIGHT, EC_WORD_NOW}, .speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_THAT, EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_STOP}, - .speechLose = {EC_WORD_WHY, EC_WORD_DIDN_T, EC_WORD_YOU, EC_WORD_STOP, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_WHY, EC_WORD_DIDN_T, EC_WORD_YOU, EC_WORD_STOP, EC_WORD_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Kendra }, [126] = { .facilityClass = FACILITY_CLASS_HEX_MANIAC, - .trainerName = _("MOLL"), + .trainerName = _("MOLLY"), .speechBefore = {EC_WORD_WILL, EC_WORD_MY, EC_WORD_CUTE_CHARM, EC_MOVE2(ATTRACT), EC_WORD_YOU, EC_WORD_QUES}, .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_MY, EC_WORD_TOYS, EC_WORD_NOW}, - .speechLose = {EC_WORD_OH, EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_OH, EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Molly }, [127] = { .facilityClass = FACILITY_CLASS_HEX_MANIAC, - .trainerName = _("JAZMI"), + .trainerName = _("JAZMIN"), .speechBefore = {EC_WORD_I, EC_WORD_FORECAST, EC_WORD_TERRIBLE, EC_WORD_THINGS, EC_WORD_FOR, EC_WORD_YOU}, .speechWin = {EC_WORD_THERE, EC_WORD_WASN_T, EC_WORD_MY, EC_WORD_FORECAST, EC_WORD_RIGHT, EC_WORD_QUES}, .speechLose = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_DIDN_T, EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THIS}, @@ -1026,7 +1026,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [128] = { .facilityClass = FACILITY_CLASS_HEX_MANIAC, - .trainerName = _("KELSE"), + .trainerName = _("KELSEY"), .speechBefore = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_SLEPT, EC_WORD_IN, EC_WORD_DAYS, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_MY, EC_WORD_SLEEP, EC_WORD_WILL, EC_WORD_BE, EC_WORD_EXCELLENT, EC_WORD_NOW}, .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_DESTROYED, EC_WORD_MY, EC_WORD_SLEEP, EC_WORD_ELLIPSIS}, @@ -1034,7 +1034,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [129] = { .facilityClass = FACILITY_CLASS_POKEMANIAC, - .trainerName = _("JALE"), + .trainerName = _("JALEN"), .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_ALLOW, EC_WORD_POKEMON, EC_WORD_TO, EC_MOVE(THRASH)}, .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_ANGRY, EC_WORD_QUES}, .speechLose = {EC_WORD_WHY, EC_WORD_IS, EC_WORD_THIS, EC_WORD_SO, EC_WORD_HARD, EC_WORD_QUES}, @@ -1042,7 +1042,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [130] = { .facilityClass = FACILITY_CLASS_POKEMANIAC, - .trainerName = _("GRIFFE"), + .trainerName = _("GRIFFEN"), .speechBefore = {EC_WORD_I, EC_MOVE2(SWALLOW), EC_MOVE2(SLUDGE), EC_WORD_TO, EC_MOVE2(TRANSFORM), EC_WORD_MYSELF}, .speechWin = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GROWTH), EC_WORD_OF, EC_MOVE2(ACID_ARMOR)}, .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GROWTH), EC_WORD_OF, EC_WORD_SUCTION_CUPS}, @@ -1050,7 +1050,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [131] = { .facilityClass = FACILITY_CLASS_POKEMANIAC, - .trainerName = _("XANDE"), + .trainerName = _("XANDER"), .speechBefore = {EC_WORD_I, EC_WORD_GOT, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ON, EC_WORD_RENTAL}, .speechWin = {EC_WORD_IT_S, EC_WORD_INCREDIBLE, EC_WORD_MY, EC_WORD_RENTAL, EC_WORD_POKEMON, EC_WORD_WON}, .speechLose = {EC_WORD_RENTAL, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_UP, EC_WORD_TO, EC_MOVE2(SCRATCH)}, @@ -1058,7 +1058,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [132] = { .facilityClass = FACILITY_CLASS_GENTLEMAN, - .trainerName = _("MARVI"), + .trainerName = _("MARVIN"), .speechBefore = {EC_WORD_YOU_RE, EC_WORD_UP, EC_WORD_TO, EC_WORD_THE, EC_WORD_CHALLENGE, EC_WORD_QUES}, .speechWin = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_THINK, EC_WORD_YOU_RE, EC_WORD_GOOD, EC_WORD_ENOUGH}, .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_PERFECT, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, @@ -1066,7 +1066,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [133] = { .facilityClass = FACILITY_CLASS_GENTLEMAN, - .trainerName = _("BRENNA"), + .trainerName = _("BRENNAN"), .speechBefore = {EC_WORD_I, EC_MOVE2(WISH), EC_WORD_TO, EC_WORD_SEE, EC_WORD_THE, EC_WORD_NEWS}, .speechWin = {EC_WORD_COMICS, EC_WORD_GET, EC_WORD_DAMP, EC_WORD_FROM, EC_WORD_DRIZZLE, EC_WORD_QUES}, .speechLose = {EC_WORD_THE, EC_WORD_TIGHT, EC_WORD_MONEY, EC_WORD_LIVING, EC_WORD_CHANNEL, EC_WORD_QUES_EXCL}, @@ -1074,15 +1074,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [134] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("BALE"), + .trainerName = _("BALEY"), .speechBefore = {EC_MOVE(SCREECH), EC_WORD_IS, EC_WORD_LIKE, EC_WORD_MUSIC, EC_WORD_TO_ME, EC_WORD_EXCL}, .speechWin = {EC_WORD_MY, EC_MOVE(SCREECH), EC_WORD_STRATEGY, EC_WORD_IS, EC_WORD_THE, EC_WORD_BEST}, - .speechLose = {EC_WORD_YOU_RE, EC_WORD_SOUNDPROOF, EC_WORD_QUES, -1, -1, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_SOUNDPROOF, EC_WORD_QUES, 0xFFFF, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Baley }, [135] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("ZACKAR"), + .trainerName = _("ZACKARY"), .speechBefore = {EC_WORD_CAN, EC_WORD_YOU, EC_MOVE(DIG), EC_WORD_IT, EC_WORD_YO, EC_WORD_QUES}, .speechWin = {EC_MOVE2(TAKE_DOWN), EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(DIVE), EC_WORD_YO, EC_WORD_YO}, .speechLose = {EC_WORD_BREAK, EC_WORD_DOWN, EC_MOVE2(DIVE), EC_WORD_TIME, EC_WORD_FOR, EC_WORD_ME}, @@ -1090,15 +1090,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [136] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("GABRIE"), + .trainerName = _("GABRIEL"), .speechBefore = {EC_MOVE2(POUND), EC_WORD_THE, EC_WORD_THICK_FAT, EC_WORD_ON, EC_WORD_MY, EC_MOVE2(BELLY_DRUM)}, .speechWin = {EC_MOVE2(POUND), EC_WORD_MY, EC_MOVE2(BELLY_DRUM), EC_MOVE2(POUND), EC_WORD_MY, EC_MOVE2(BELLY_DRUM)}, - .speechLose = {EC_WORD_MY, EC_MOVE2(BELLY_DRUM), EC_WORD_WAS, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS, -1}, + .speechLose = {EC_WORD_MY, EC_MOVE2(BELLY_DRUM), EC_WORD_WAS, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Gabriel }, [137] = { .facilityClass = FACILITY_CLASS_PARASOL_LADY, - .trainerName = _("EMIL"), + .trainerName = _("EMILY"), .speechBefore = {EC_WORD_HOW, EC_WORD_ABOUT, EC_WORD_A_TINY_BIT, EC_WORD_OF, EC_MOVE(HYPNOSIS), EC_WORD_QUES}, .speechWin = {EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_STRATEGY, EC_WORD_WORKS, EC_WORD_TO, EC_WORD_PERFECTION}, .speechLose = {EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_STRATEGY, EC_WORD_WENT, EC_WORD_BADLY, EC_WORD_ELLIPSIS}, @@ -1106,7 +1106,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [138] = { .facilityClass = FACILITY_CLASS_BEAUTY, - .trainerName = _("JORDY"), + .trainerName = _("JORDYN"), .speechBefore = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_MY, EC_WORD_SECRET, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_AS, EC_WORD_I, EC_WORD_APPEAR, EC_WORD_ELLIPSIS}, .speechLose = {EC_WORD_BUT, EC_WORD_HOW, EC_WORD_DID, EC_WORD_YOU, EC_WORD_KNOW, EC_WORD_QUES}, @@ -1114,39 +1114,39 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [139] = { .facilityClass = FACILITY_CLASS_AROMA_LADY, - .trainerName = _("SOFI"), - .speechBefore = {EC_POKEMON(LOUDRED), EC_WORD_PROBABLY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), -1}, + .trainerName = _("SOFIA"), + .speechBefore = {EC_POKEMON(LOUDRED), EC_WORD_PROBABLY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), 0xFFFF}, .speechWin = {EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_FEELING, EC_WORD_THAT, EC_WORD_I, EC_WORD_GET}, - .speechLose = {EC_WORD_I, EC_WORD_WORK, EC_WORD_AT, EC_WORD_THE, EC_WORD_DEPT_STORE, -1}, + .speechLose = {EC_WORD_I, EC_WORD_WORK, EC_WORD_AT, EC_WORD_THE, EC_WORD_DEPT_STORE, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Sofia }, [140] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_M, - .trainerName = _("BRADE"), - .speechBefore = {EC_WORD_I_CHOOSE_YOU, EC_WORD_EXCL, -1, EC_WORD_THIS_IS_IT_EXCL, -1, -1}, + .trainerName = _("BRADEN"), + .speechBefore = {EC_WORD_I_CHOOSE_YOU, EC_WORD_EXCL, 0xFFFF, EC_WORD_THIS_IS_IT_EXCL, 0xFFFF, 0xFFFF}, .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_PRETTY, EC_WORD_AWESOME, EC_WORD_ABOUT, EC_WORD_MYSELF}, - .speechLose = {EC_WORD_ALL_RIGHT, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_ALL_RIGHT, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Braden }, [141] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_M, - .trainerName = _("KAYDE"), + .trainerName = _("KAYDEN"), .speechBefore = {EC_WORD_THEY, EC_WORD_OVERDO, EC_WORD_THAT, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_THAT, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_ISN_T, EC_WORD_FOR, EC_WORD_ME}, - .speechLose = {EC_WORD_HEY, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PRETTY, EC_WORD_TASTY, -1}, + .speechLose = {EC_WORD_HEY, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PRETTY, EC_WORD_TASTY, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Kayden }, [142] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_M, - .trainerName = _("COOPE"), + .trainerName = _("COOPER"), .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_ABSOLUTELY, EC_WORD_BE, EC_WORD_A, EC_WORD_PUSHOVER}, .speechWin = {EC_WORD_THAT_WAS, EC_WORD_TOO, EC_WORD_EXCITING, EC_WORD_FOR, EC_WORD_ME, EC_WORD_ELLIPSIS}, - .speechLose = {EC_WORD_PLEASE, EC_WORD_EXCL, -1, EC_WORD_SORRY, EC_WORD_I_AM, EC_WORD_SORRY}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_EXCL, 0xFFFF, EC_WORD_SORRY, EC_WORD_I_AM, EC_WORD_SORRY}, .monSets = gBattleFrontierTrainerMons_Cooper }, [143] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_F, - .trainerName = _("JULI"), + .trainerName = _("JULIA"), .speechBefore = {EC_WORD_SPIRIT, EC_WORD_ALONE, EC_WORD_WON_T, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_WIN}, .speechWin = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_ACCEPT, EC_WORD_THIS, EC_WORD_WITH, EC_WORD_SERENE_GRACE}, .speechLose = {EC_WORD_FOR_NOW, EC_WORD_GOOD_BYE, EC_WORD_BUT, EC_WORD_IT_S, EC_WORD_NOT, EC_WORD_OVER}, @@ -1154,7 +1154,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [144] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_F, - .trainerName = _("AMAR"), + .trainerName = _("AMARA"), .speechBefore = {EC_WORD_WROOOAAR_EXCL, EC_WORD_EXCL_EXCL, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_READY, EC_WORD_EXCL_EXCL}, .speechWin = {EC_WORD_I, EC_WORD_LOSE, EC_WORD_MYSELF, EC_WORD_IF, EC_WORD_IT_S, EC_WORD_EXCITING}, .speechLose = {EC_WORD_THAT_S, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_MOVE2(TACKLE), EC_WORD_EXCL}, @@ -1162,7 +1162,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [145] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_F, - .trainerName = _("LYN"), + .trainerName = _("LYNN"), .speechBefore = {EC_WORD_YOUR, EC_WORD_SECRET, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_HIDDEN, EC_WORD_FOREVER}, .speechWin = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_YOUR, EC_WORD_SECRET, EC_WORD_NOW, EC_WORD_EXCL}, .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_MOVE(SAFEGUARD), EC_WORD_YOUR, EC_WORD_OWN, EC_WORD_SECRET}, @@ -1170,7 +1170,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [146] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, - .trainerName = _("JOVA"), + .trainerName = _("JOVAN"), .speechBefore = {EC_WORD_YOUR, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_SADLY, EC_WORD_LACKING}, .speechWin = {EC_WORD_MY, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_COOL, EC_WORD_ISN_T_IT_QUES}, .speechLose = {EC_WORD_I_WAS, EC_WORD_MINUS, EC_WORD_MY, EC_WORD_NORMAL, EC_WORD_POWER, EC_WORD_TODAY}, @@ -1178,15 +1178,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [147] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, - .trainerName = _("DOMINI"), - .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_THIS, EC_WORD_EXCELLENT, EC_WORD_CAMERA, -1}, - .speechWin = {EC_WORD_MY, EC_WORD_CAMERA, EC_WORD_WAS, EC_WORD_AWFULLY, EC_WORD_EXPENSIVE, -1}, + .trainerName = _("DOMINIC"), + .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_THIS, EC_WORD_EXCELLENT, EC_WORD_CAMERA, 0xFFFF}, + .speechWin = {EC_WORD_MY, EC_WORD_CAMERA, EC_WORD_WAS, EC_WORD_AWFULLY, EC_WORD_EXPENSIVE, 0xFFFF}, .speechLose = {EC_WORD_MY, EC_WORD_CAMERA, EC_WORD_DOESN_T, EC_WORD_MISS, EC_WORD_A, EC_WORD_THING}, .monSets = gBattleFrontierTrainerMons_Dominic }, [148] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, - .trainerName = _("NIKOLA"), + .trainerName = _("NIKOLAS"), .speechBefore = {EC_WORD_I, EC_MOVE2(MIMIC), EC_WORD_POKEMON, EC_WORD_AFTER, EC_WORD_EVERY, EC_WORD_BATTLE}, .speechWin = {EC_WORD_IF_I_WIN, EC_WORD_I, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_A, EC_POKEMON2(TAUROS)}, .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_A, EC_POKEMON2(MILTANK)}, @@ -1194,7 +1194,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [149] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, - .trainerName = _("VALERI"), + .trainerName = _("VALERIA"), .speechBefore = {EC_WORD_I, EC_MOVE2(WISH), EC_WORD_YOU, EC_WORD_WOULD, EC_WORD_NOT, EC_MOVE2(GLARE)}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_MEAN, EC_WORD_EXCL, EC_WORD_I, EC_WORD_MEAN, EC_WORD_REALLY}, .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_A, EC_WORD_REALLY, EC_MOVE(SCARY_FACE), EC_WORD_EXCL}, @@ -1202,7 +1202,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [150] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, - .trainerName = _("DELANE"), + .trainerName = _("DELANEY"), .speechBefore = {EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_OVER, EC_WORD_TIME, EC_WORD_TO, EC_WORD_PLAY}, .speechWin = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_IS, EC_WORD_FROM, EC_WORD_SCHOOL}, .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_WORK, EC_WORD_NEXT, EC_WORD_WEEK}, @@ -1210,31 +1210,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [151] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, - .trainerName = _("MEGHA"), + .trainerName = _("MEGHAN"), .speechBefore = {EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_OUT, EC_WORD_TIME, EC_WORD_TO, EC_WORD_PLAY}, - .speechWin = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_LIKES, EC_WORD_COMICS, -1}, - .speechLose = {EC_WORD_IT_S, EC_WORD_BACK, EC_WORD_TO, EC_WORD_SCHOOL, EC_WORD_SOON, -1}, + .speechWin = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_LIKES, EC_WORD_COMICS, 0xFFFF}, + .speechLose = {EC_WORD_IT_S, EC_WORD_BACK, EC_WORD_TO, EC_WORD_SCHOOL, EC_WORD_SOON, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Meghan }, [152] = { .facilityClass = FACILITY_CLASS_DRAGON_TAMER, - .trainerName = _("ROBERT"), - .speechBefore = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_INVINCIBLE, EC_WORD_EXCL, -1}, + .trainerName = _("ROBERTO"), + .speechBefore = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_INVINCIBLE, EC_WORD_EXCL, 0xFFFF}, .speechWin = {EC_WORD_YOU, EC_WORD_WEREN_T, EC_WORD_BAD, EC_WORD_I_WAS, EC_WORD_JUST, EC_WORD_BETTER}, - .speechLose = {EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_SATISFIED, EC_WORD_YET, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_SATISFIED, EC_WORD_YET, EC_WORD_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Roberto }, [153] = { .facilityClass = FACILITY_CLASS_DRAGON_TAMER, - .trainerName = _("DAMIA"), + .trainerName = _("DAMIAN"), .speechBefore = {EC_WORD_MY, EC_WORD_PURE_POWER, EC_WORD_IS, EC_WORD_MACHINE, EC_WORD_LIKE, EC_WORD_EXCL}, .speechWin = {EC_WORD_MY, EC_MOVE2(MACH_PUNCH), EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_A, EC_MOVE(BRICK_BREAK)}, - .speechLose = {EC_WORD_ARRGH, EC_WORD_EXCL, -1, EC_WORD_NO, EC_WORD_EXCL_EXCL, -1}, + .speechLose = {EC_WORD_ARRGH, EC_WORD_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_EXCL_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Damian }, [154] = { .facilityClass = FACILITY_CLASS_DRAGON_TAMER, - .trainerName = _("BROD"), + .trainerName = _("BRODY"), .speechBefore = {EC_WORD_MY, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_SEEMS, EC_POKEMON(ODDISH), EC_WORD_QUES}, .speechWin = {EC_WORD_IT_S, EC_WORD_MY, EC_WORD_FAMILY, EC_WORD_STAY_AT_HOME, EC_WORD_LOOK, EC_WORD_EXCL}, .speechLose = {EC_WORD_I, EC_WORD_QUESTION, EC_WORD_YOUR, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_SERIOUSLY}, @@ -1242,39 +1242,39 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [155] = { .facilityClass = FACILITY_CLASS_DRAGON_TAMER, - .trainerName = _("GRAHA"), - .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL, -1, EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, -1}, + .trainerName = _("GRAHAM"), + .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF}, .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_WAHAHAHA, EC_WORD_EXCL, EC_WORD_WAHAHAHA, EC_WORD_WAHAHAHA, EC_WORD_EXCL_EXCL}, .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_MY, EC_WORD_BAD}, .monSets = gBattleFrontierTrainerMons_Graham }, [156] = { .facilityClass = FACILITY_CLASS_POKEFAN_M, - .trainerName = _("TYLO"), + .trainerName = _("TYLOR"), .speechBefore = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_FEELING, EC_WORD_MY, EC_MOVE2(HEAT_WAVE), EC_WORD_QUES}, - .speechWin = {EC_WORD_YES, EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_YES, EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_BUT, EC_WORD_I_WAS, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_FOR, EC_WORD_YOU}, .monSets = gBattleFrontierTrainerMons_Tylor }, [157] = { .facilityClass = FACILITY_CLASS_POKEFAN_F, - .trainerName = _("JARE"), - .speechBefore = {EC_WORD_FIGHTING, EC_WORD_SPIRIT, EC_WORD_QUES, EC_WORD_ME, EC_WORD_QUES, -1}, - .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MORE, EC_WORD_CUTE, EC_WORD_POKEMON, -1}, - .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_LOOK, EC_WORD_QUITE, EC_WORD_CUTE, -1}, + .trainerName = _("JAREN"), + .speechBefore = {EC_WORD_FIGHTING, EC_WORD_SPIRIT, EC_WORD_QUES, EC_WORD_ME, EC_WORD_QUES, 0xFFFF}, + .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MORE, EC_WORD_CUTE, EC_WORD_POKEMON, 0xFFFF}, + .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_LOOK, EC_WORD_QUITE, EC_WORD_CUTE, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Jaren }, [158] = { .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, - .trainerName = _("CORDEL"), + .trainerName = _("CORDELL"), .speechBefore = {EC_WORD_A, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_DECIDED, EC_WORD_ON, EC_WORD_SPIRIT}, - .speechWin = {EC_WORD_CAN_T, EC_WORD_YOU, EC_WORD_ACCEPT, EC_WORD_THAT, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_CAN_T, EC_WORD_YOU, EC_WORD_ACCEPT, EC_WORD_THAT, EC_WORD_QUES, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_BE, EC_WORD_ON, EC_WORD_MY, EC_WORD_WAY}, .monSets = gBattleFrontierTrainerMons_Cordell }, [159] = { .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, - .trainerName = _("JAZLY"), + .trainerName = _("JAZLYN"), .speechBefore = {EC_WORD_IS, EC_WORD_YOUR, EC_WORD_POKEDEX, EC_WORD_REALLY, EC_WORD_AWESOME, EC_WORD_QUES}, .speechWin = {EC_WORD_OH_YEAH, EC_WORD_WOW, EC_WORD_YOUR, EC_WORD_POKEDEX, EC_WORD_IS, EC_WORD_SUPER}, .speechLose = {EC_WORD_AN, EC_WORD_AVANT_GARDE, EC_WORD_POKEDEX, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_AWESOME}, @@ -1282,7 +1282,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [160] = { .facilityClass = FACILITY_CLASS_YOUNGSTER, - .trainerName = _("ZACHER"), + .trainerName = _("ZACHERY"), .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_MY, EC_WORD_OWN, EC_WORD_PLACE, EC_WORD_YEEHAW_EXCL}, .speechWin = {EC_WORD_IT_S, EC_WORD_AN, EC_WORD_EXCITING, EC_WORD_TIME, EC_WORD_FOR, EC_WORD_ME}, .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_FLATTEN, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_EXCL}, @@ -1290,15 +1290,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [161] = { .facilityClass = FACILITY_CLASS_YOUNGSTER, - .trainerName = _("JOHA"), - .speechBefore = {EC_WORD_WINTER, EC_WORD_WILL, EC_WORD_SOON, EC_WORD_BE, EC_WORD_HERE, -1}, + .trainerName = _("JOHAN"), + .speechBefore = {EC_WORD_WINTER, EC_WORD_WILL, EC_WORD_SOON, EC_WORD_BE, EC_WORD_HERE, 0xFFFF}, .speechWin = {EC_WORD_MY, EC_WORD_ALLOWANCE, EC_WORD_COULD, EC_WORD_USE, EC_WORD_A, EC_MOVE2(HELPING_HAND)}, .speechLose = {EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_USE, EC_WORD_MY, EC_WORD_ALLOWANCE, EC_WORD_UP}, .monSets = gBattleFrontierTrainerMons_Johan }, [162] = { .facilityClass = FACILITY_CLASS_LASS, - .trainerName = _("SHE"), + .trainerName = _("SHEA"), .speechBefore = {EC_WORD_DO, EC_WORD_YOU, EC_WORD_BATTLE, EC_WORD_WITH, EC_WORD_BEAUTY, EC_WORD_QUES}, .speechWin = {EC_WORD_YOU, EC_WORD_BATTLE, EC_WORD_IN, EC_WORD_AN, EC_WORD_UGLY, EC_WORD_WAY}, .speechLose = {EC_WORD_WHAT, EC_WORD_IS, EC_WORD_BEAUTY, EC_WORD_TO, EC_WORD_YOU, EC_WORD_QUES}, @@ -1306,7 +1306,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [163] = { .facilityClass = FACILITY_CLASS_LASS, - .trainerName = _("KAIL"), + .trainerName = _("KAILA"), .speechBefore = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_THIRSTY, EC_WORD_RIGHT, EC_WORD_NOW, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_I, EC_WORD_COULD, EC_WORD_USE, EC_WORD_A, EC_WORD_COLD, EC_WORD_DRINK}, .speechLose = {EC_WORD_THAT, EC_WORD_LOSS, EC_WORD_IS, EC_WORD_HARD, EC_WORD_TO, EC_MOVE2(SWALLOW)}, @@ -1314,15 +1314,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [164] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, - .trainerName = _("ISIA"), - .speechBefore = {EC_WORD_I, EC_WORD_PRETEND, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_A_LOT, -1}, + .trainerName = _("ISIAH"), + .speechBefore = {EC_WORD_I, EC_WORD_PRETEND, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_A_LOT, 0xFFFF}, .speechWin = {EC_WORD_I, EC_MOVE2(TRICK), EC_WORD_MOTHER, EC_WORD_FOR, EC_WORD_MY, EC_WORD_ALLOWANCE}, .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_WANT, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE}, .monSets = gBattleFrontierTrainerMons_Isiah }, [165] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, - .trainerName = _("GARRET"), + .trainerName = _("GARRETT"), .speechBefore = {EC_WORD_I, EC_WORD_ENJOY, EC_WORD_COMICS, EC_WORD_AND, EC_WORD_THIS, EC_WORD_GAME}, .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_MUSIC, EC_WORD_IDOL, EC_WORD_TOO}, .speechLose = {EC_WORD_BUT, EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE}, @@ -1330,7 +1330,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [166] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, - .trainerName = _("HAYLI"), + .trainerName = _("HAYLIE"), .speechBefore = {EC_WORD_I, EC_WORD_WORRY, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_SLEEP}, .speechWin = {EC_WORD_A, EC_WORD_WIN, EC_WORD_GIVES, EC_WORD_ME, EC_WORD_A, EC_MOVE2(CALM_MIND)}, .speechLose = {EC_WORD_MY, EC_WORD_INSOMNIA, EC_WORD_WILL, EC_WORD_GET, EC_WORD_BAD, EC_WORD_ELLIPSIS}, @@ -1338,31 +1338,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [167] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, - .trainerName = _("MEGA"), + .trainerName = _("MEGAN"), .speechBefore = {EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_AN, EC_MOVE(AROMATHERAPY), EC_WORD_BATH}, - .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_HEALTHY, EC_WORD_CLEAR_BODY, -1}, + .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_HEALTHY, EC_WORD_CLEAR_BODY, 0xFFFF}, .speechLose = {EC_WORD_IF, EC_WORD_ONLY, EC_MOVE(AROMATHERAPY), EC_WORD_WERE, EC_WORD_LESS, EC_WORD_EXPENSIVE}, .monSets = gBattleFrontierTrainerMons_Megan }, [168] = { .facilityClass = FACILITY_CLASS_RICH_BOY, - .trainerName = _("ISSA"), - .speechBefore = {EC_WORD_MY, EC_WORD_HOBBY, EC_WORD_QUES, -1, -1, -1}, + .trainerName = _("ISSAC"), + .speechBefore = {EC_WORD_MY, EC_WORD_HOBBY, EC_WORD_QUES, 0xFFFF, 0xFFFF, 0xFFFF}, .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_ANY, EC_WORD_KIND, EC_WORD_OF, EC_MOVE2(WATER_SPORT)}, .speechLose = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_ANY, EC_WORD_KIND, EC_WORD_OF, EC_MOVE2(MUD_SPORT)}, .monSets = gBattleFrontierTrainerMons_Issac }, [169] = { .facilityClass = FACILITY_CLASS_RICH_BOY, - .trainerName = _("QUINTO"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_SAD, EC_WORD_CAUSE, EC_WORD_I_AM, EC_WORD_TOO_WEAK, -1}, - .speechWin = {EC_WORD_YOU, EC_WORD_AREN_T, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, -1}, + .trainerName = _("QUINTON"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_SAD, EC_WORD_CAUSE, EC_WORD_I_AM, EC_WORD_TOO_WEAK, 0xFFFF}, + .speechWin = {EC_WORD_YOU, EC_WORD_AREN_T, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, 0xFFFF}, .speechLose = {EC_WORD_HEY, EC_WORD_WHAT, EC_WORD_DID, EC_WORD_I, EC_WORD_DO, EC_WORD_QUES}, .monSets = gBattleFrontierTrainerMons_Quinton }, [170] = { .facilityClass = FACILITY_CLASS_LADY, - .trainerName = _("SALM"), + .trainerName = _("SALMA"), .speechBefore = {EC_WORD_YOU_VE, EC_WORD_GOT, EC_WORD_YOUR, EC_WORD_HUSTLE, EC_WORD_ON, EC_WORD_EXCL}, .speechWin = {EC_WORD_I, EC_WORD_WIN, EC_WORD_YOU, EC_WORD_HUSTLE, EC_WORD_ON, EC_WORD_OUT}, .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_GET, EC_WORD_HOW, EC_WORD_I, EC_WORD_LOST}, @@ -1370,23 +1370,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [171] = { .facilityClass = FACILITY_CLASS_LADY, - .trainerName = _("ANSLE"), + .trainerName = _("ANSLEY"), .speechBefore = {EC_WORD_I_AM, EC_WORD_BORED, EC_WORD_ELLIPSIS, EC_WORD_DANCE, EC_WORD_FOR, EC_WORD_ME}, - .speechWin = {EC_WORD_YOU_VE, EC_WORD_BORED, EC_WORD_ME, EC_WORD_SOME, EC_WORD_MORE, -1}, + .speechWin = {EC_WORD_YOU_VE, EC_WORD_BORED, EC_WORD_ME, EC_WORD_SOME, EC_WORD_MORE, 0xFFFF}, .speechLose = {EC_WORD_TAKE, EC_WORD_YOUR, EC_MOVE2(FRUSTRATION), EC_WORD_SOME, EC_WORD_OTHER, EC_WORD_PLACE}, .monSets = gBattleFrontierTrainerMons_Ansley }, [172] = { .facilityClass = FACILITY_CLASS_BUG_CATCHER, - .trainerName = _("HOLDE"), + .trainerName = _("HOLDEN"), .speechBefore = {EC_WORD_LET_S, EC_WORD_COMMEMORATE, EC_WORD_MY, EC_WORD_COOLNESS, EC_WORD_IN, EC_WORD_BATTLE}, - .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_FOR, EC_WORD_ANY, EC_WORD_PRAISE, -1}, - .speechLose = {EC_WORD_YOUR, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_AMUSING, -1}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_FOR, EC_WORD_ANY, EC_WORD_PRAISE, 0xFFFF}, + .speechLose = {EC_WORD_YOUR, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_AMUSING, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Holden }, [173] = { .facilityClass = FACILITY_CLASS_BUG_CATCHER, - .trainerName = _("LUC"), + .trainerName = _("LUCA"), .speechBefore = {EC_WORD_WE, EC_WORD_WILL, EC_WORD_HAVE, EC_WORD_A, EC_WORD_COOL, EC_WORD_BATTLE}, .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_IN, EC_WORD_A, EC_WORD_COOL, EC_WORD_WAY}, .speechLose = {EC_WORD_HELLO, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_JUST, EC_WORD_A, EC_WORD_KID}, @@ -1394,47 +1394,47 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [174] = { .facilityClass = FACILITY_CLASS_NINJA_BOY, - .trainerName = _("JAMISO"), + .trainerName = _("JAMISON"), .speechBefore = {EC_WORD_MY, EC_MOVE2(SECRET_POWER), EC_WORD_IS, EC_WORD_OVERWHELMING, EC_WORD_TO, EC_WORD_POKEMON}, - .speechWin = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_QUES, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_USE, EC_MOVE(SMOKESCREEN), EC_WORD_TO, EC_WORD_ESCAPE}, .monSets = gBattleFrontierTrainerMons_Jamison }, [175] = { .facilityClass = FACILITY_CLASS_NINJA_BOY, - .trainerName = _("GUNNA"), - .speechBefore = {EC_WORD_I, EC_MOVE(CUT), EC_WORD_DOWN, EC_WORD_EVERY, EC_WORD_OPPONENT, -1}, + .trainerName = _("GUNNAR"), + .speechBefore = {EC_WORD_I, EC_MOVE(CUT), EC_WORD_DOWN, EC_WORD_EVERY, EC_WORD_OPPONENT, 0xFFFF}, .speechWin = {EC_WORD_DON_T, EC_MOVE(GRUDGE), EC_WORD_ME, EC_WORD_FOR, EC_WORD_YOUR, EC_WORD_LOSS}, .speechLose = {EC_WORD_PLEASE, EC_WORD_LOSE, EC_WORD_THAT, EC_MOVE(SCARY_FACE), EC_WORD_OF, EC_WORD_YOURS}, .monSets = gBattleFrontierTrainerMons_Gunnar }, [176] = { .facilityClass = FACILITY_CLASS_TUBER_M, - .trainerName = _("CRAI"), + .trainerName = _("CRAIG"), .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_FOR, EC_WORD_MY, EC_WORD_TRAIN}, .speechWin = {EC_WORD_MY, EC_WORD_TRAIN, EC_WORD_ISN_T, EC_WORD_HERE, EC_WORD_YET, EC_WORD_ELLIPSIS}, - .speechLose = {EC_WORD_HERE_IT_IS, EC_WORD_MY, EC_WORD_TRAIN, EC_WORD_SEE_YA, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_HERE_IT_IS, EC_WORD_MY, EC_WORD_TRAIN, EC_WORD_SEE_YA, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Craig }, [177] = { .facilityClass = FACILITY_CLASS_TUBER_M, - .trainerName = _("PIERC"), + .trainerName = _("PIERCE"), .speechBefore = {EC_WORD_THERE, EC_WORD_WAS, EC_WORD_A, EC_MOVE2(HEAT_WAVE), EC_WORD_LAST, EC_WORD_WEEK}, - .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(HEAT_WAVE), -1}, - .speechLose = {EC_WORD_DIDN_T, EC_WORD_IT, EC_MOVE(HAIL), EC_WORD_TOO, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(HEAT_WAVE), 0xFFFF}, + .speechLose = {EC_WORD_DIDN_T, EC_WORD_IT, EC_MOVE(HAIL), EC_WORD_TOO, EC_WORD_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Pierce }, [178] = { .facilityClass = FACILITY_CLASS_TUBER_F, - .trainerName = _("REGIN"), + .trainerName = _("REGINA"), .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_PLAY, EC_WORD_IN, EC_WORD_WATER}, - .speechWin = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_COME, EC_WORD_OUT, -1}, + .speechWin = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_COME, EC_WORD_OUT, 0xFFFF}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_MUCH, EC_WORD_GOOD, EC_WORD_IN, EC_WORD_WATER}, .monSets = gBattleFrontierTrainerMons_Regina }, [179] = { .facilityClass = FACILITY_CLASS_TUBER_F, - .trainerName = _("ALISO"), + .trainerName = _("ALISON"), .speechBefore = {EC_WORD_THIS, EC_WORD_KINDERGARTEN, EC_WORD_MAGAZINE, EC_WORD_IS, EC_WORD_TOO, EC_WORD_MUCH}, .speechWin = {EC_WORD_HOW, EC_WORD_TO, EC_WORD_BUG, EC_WORD_YOUR, EC_WORD_TEACHER, EC_WORD_QUES}, .speechLose = {EC_WORD_ENJOY, EC_WORD_A, EC_WORD_TASTY, EC_WORD_SCHOOL, EC_WORD_DIET, EC_WORD_QUES}, @@ -1442,7 +1442,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [180] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("HAN"), + .trainerName = _("HANK"), .speechBefore = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_A, EC_WORD_BUG, EC_WORD_EVENT, EC_WORD_SOON}, .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_BUG, EC_WORD_FASHION, EC_WORD_SHOW, EC_WORD_EXCL}, .speechLose = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_QUES}, @@ -1450,7 +1450,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [181] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("EAR"), + .trainerName = _("EARL"), .speechBefore = {EC_WORD_THE, EC_WORD_INVINCIBLE, EC_WORD_BUG, EC_WORD_TRAINER, EC_WORD_IS, EC_WORD_HERE}, .speechWin = {EC_WORD_THE, EC_WORD_INVINCIBLE, EC_WORD_BUG, EC_WORD_TRAINER, EC_WORD_AM, EC_WORD_I}, .speechLose = {EC_WORD_SEE, EC_WORD_HOW, EC_WORD_FAST, EC_WORD_I, EC_WORD_RUN_AWAY, EC_WORD_EXCL}, @@ -1458,7 +1458,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [182] = { .facilityClass = FACILITY_CLASS_FISHERMAN, - .trainerName = _("RAMIR"), + .trainerName = _("RAMIRO"), .speechBefore = {EC_WORD_I, EC_WORD_WENT, EC_WORD_TO, EC_WORD_A, EC_WORD_FISHING, EC_WORD_SCHOOL}, .speechWin = {EC_WORD_SERIOUSLY, EC_WORD_I_AM, EC_WORD_IN, EC_WORD_THE, EC_WORD_FISHING, EC_WORD_HALL_OF_FAME}, .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_BACK, EC_WORD_ELLIPSIS}, @@ -1466,15 +1466,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [183] = { .facilityClass = FACILITY_CLASS_FISHERMAN, - .trainerName = _("HUNTE"), + .trainerName = _("HUNTER"), .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_A, EC_WORD_TOTALLY, EC_WORD_COOL, EC_MOVE(CROSS_CHOP)}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_DO, EC_WORD_A, EC_MOVE(CROSS_CHOP)}, - .speechLose = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_A, EC_WORD_MISTAKE, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_A, EC_WORD_MISTAKE, EC_WORD_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Hunter }, [184] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("AIDE"), + .trainerName = _("AIDEN"), .speechBefore = {EC_WORD_MY, EC_WORD_WORK, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_ME, EC_WORD_HEALTHY}, .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_HEALTHY, EC_WORD_EXCL}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_HEALTHY, EC_WORD_THAN, EC_WORD_I_AM, EC_WORD_ELLIPSIS}, @@ -1482,31 +1482,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [185] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("XAVIE"), - .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_EXCL, -1, EC_WORD_LOOK, EC_WORD_LOOK, EC_WORD_EXCL_EXCL}, - .speechWin = {EC_WORD_GOOD_BYE, EC_WORD_AND, EC_WORD_THANK_YOU, EC_WORD_THAT_WAS, EC_WORD_FUNNY, -1}, - .speechLose = {EC_WORD_WOWEE, EC_WORD_EXCL, -1, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL}, + .trainerName = _("XAVIER"), + .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_EXCL, 0xFFFF, EC_WORD_LOOK, EC_WORD_LOOK, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_WORD_GOOD_BYE, EC_WORD_AND, EC_WORD_THANK_YOU, EC_WORD_THAT_WAS, EC_WORD_FUNNY, 0xFFFF}, + .speechLose = {EC_WORD_WOWEE, EC_WORD_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL}, .monSets = gBattleFrontierTrainerMons_Xavier }, [186] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("CLINTO"), + .trainerName = _("CLINTON"), .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_QUES}, .speechWin = {EC_WORD_YOUR, EC_MOVE2(FURY_SWIPES), EC_WORD_YOUR, EC_MOVE(STRENGTH), EC_WORD_YOUNG, EC_WORD_TRAINER}, - .speechLose = {EC_WORD_TCH, EC_WORD_ELLIPSIS, -1, EC_WORD_I_AM, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_TCH, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_I_AM, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Clinton }, [187] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("JESS"), + .trainerName = _("JESSE"), .speechBefore = {EC_WORD_THIS, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_FOR, EC_WORD_MY, EC_WORD_MOTHER}, .speechWin = {EC_WORD_MOTHER, EC_WORD_WILL, EC_WORD_BE, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_ME}, - .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MY, EC_WORD_MOTHER, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MY, EC_WORD_MOTHER, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Jesse }, [188] = { .facilityClass = FACILITY_CLASS_GUITARIST, - .trainerName = _("EDUARD"), + .trainerName = _("EDUARDO"), .speechBefore = {EC_WORD_OUR, EC_WORD_MUSIC, EC_WORD_WILL, EC_WORD_PLAY, EC_WORD_ALL, EC_WORD_NIGHT}, .speechWin = {EC_WORD_NIGHTTIME, EC_WORD_IS, EC_WORD_WHEN, EC_WORD_I, EC_WORD_PLAY, EC_WORD_BEST}, .speechLose = {EC_WORD_LET_S, EC_WORD_PARTY, EC_WORD_UNTIL, EC_WORD_THE, EC_MOVE(MORNING_SUN), EC_WORD_EXCL}, @@ -1514,23 +1514,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [189] = { .facilityClass = FACILITY_CLASS_GUITARIST, - .trainerName = _("HA"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_TRENDY, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, -1}, + .trainerName = _("HAL"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_TRENDY, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, 0xFFFF}, .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_HIP_AND, EC_WORD_HAPPENING, EC_WORD_OH_YEAH, EC_WORD_EXCL}, .speechLose = {EC_WORD_I_AM, EC_WORD_ALWAYS, EC_WORD_TRENDY, EC_WORD_THANK_YOU, EC_WORD_VERY, EC_WORD_MUCH}, .monSets = gBattleFrontierTrainerMons_Hal }, [190] = { .facilityClass = FACILITY_CLASS_BIRD_KEEPER, - .trainerName = _("GAG"), + .trainerName = _("GAGE"), .speechBefore = {EC_WORD_HERE_IT_IS, EC_WORD_A, EC_WORD_FLYING, EC_WORD_TYPE, EC_WORD_HIDDEN, EC_WORD_MOVE}, .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_FLYING, EC_WORD_TYPE, EC_WORD_VICTORY, EC_WORD_EXCL}, - .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_JUST, EC_MOVE(FLY), EC_WORD_AWAY, -1}, + .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_JUST, EC_MOVE(FLY), EC_WORD_AWAY, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Gage }, [191] = { .facilityClass = FACILITY_CLASS_BIRD_KEEPER, - .trainerName = _("ARNOL"), + .trainerName = _("ARNOLD"), .speechBefore = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_WEIRD, EC_WORD_FROM, EC_WORD_A, EC_WORD_DREAM}, .speechWin = {EC_WORD_YOUR, EC_MOVE(SCARY_FACE), EC_WORD_WAS, EC_WORD_IN, EC_WORD_MY, EC_WORD_DREAM}, .speechLose = {EC_WORD_MY, EC_WORD_INCREDIBLE, EC_WORD_DREAM, EC_WORD_WAS, EC_WORD_SO, EC_WORD_WEIRD}, @@ -1538,7 +1538,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [192] = { .facilityClass = FACILITY_CLASS_SAILOR, - .trainerName = _("JARRET"), + .trainerName = _("JARRETT"), .speechBefore = {EC_WORD_COME_ON, EC_WORD_LET_S, EC_WORD_DANCE, EC_WORD_LIKE, EC_WORD_IT_S, EC_WORD_YESTERDAY}, .speechWin = {EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_HOW, EC_WORD_I, EC_WORD_DANCE, EC_WORD_QUES}, .speechLose = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_APPRECIATE, EC_WORD_HOW, EC_WORD_I, EC_WORD_DANCE}, @@ -1546,7 +1546,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [193] = { .facilityClass = FACILITY_CLASS_SAILOR, - .trainerName = _("GARET"), + .trainerName = _("GARETT"), .speechBefore = {EC_WORD_MY, EC_WORD_GIRL, EC_WORD_GIVES, EC_WORD_ME, EC_WORD_A_LITTLE, EC_MOVE2(SWEET_KISS)}, .speechWin = {EC_WORD_MY, EC_WORD_GIRL, EC_WORD_FRIEND, EC_WORD_IS, EC_WORD_MY, EC_WORD_TREASURE}, .speechLose = {EC_WORD_A, EC_WORD_TREASURE, EC_WORD_ISN_T, EC_WORD_ALWAYS, EC_WORD_ABOUT, EC_WORD_MONEY}, @@ -1554,7 +1554,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [194] = { .facilityClass = FACILITY_CLASS_HIKER, - .trainerName = _("EMANUE"), + .trainerName = _("EMANUEL"), .speechBefore = {EC_WORD_SMARTNESS, EC_WORD_ALONE, EC_WORD_WON_T, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_WIN}, .speechWin = {EC_WORD_I_AM, EC_WORD_NOT_VERY, EC_WORD_SMART, EC_WORD_BUT, EC_WORD_I, EC_WORD_WON}, .speechLose = {EC_WORD_HOW, EC_WORD_DID, EC_WORD_YOU, EC_MOVE2(FAKE_OUT), EC_WORD_ME, EC_WORD_QUES}, @@ -1562,15 +1562,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [195] = { .facilityClass = FACILITY_CLASS_HIKER, - .trainerName = _("GUSTAV"), - .speechBefore = {EC_MOVE(CHARGE), EC_WORD_EXCL, -1, EC_MOVE(CHARGE), EC_WORD_EXCL_EXCL, -1}, - .speechWin = {EC_WORD_SURRENDER, EC_WORD_QUES, -1, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES}, + .trainerName = _("GUSTAVO"), + .speechBefore = {EC_MOVE(CHARGE), EC_WORD_EXCL, 0xFFFF, EC_MOVE(CHARGE), EC_WORD_EXCL_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_SURRENDER, EC_WORD_QUES, 0xFFFF, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES}, .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_SURRENDER, EC_WORD_YET}, .monSets = gBattleFrontierTrainerMons_Gustavo }, [196] = { .facilityClass = FACILITY_CLASS_KINDLER, - .trainerName = _("KAMERO"), + .trainerName = _("KAMERON"), .speechBefore = {EC_WORD_TAKE_THAT, EC_WORD_EXCL, EC_WORD_IT_S, EC_WORD_MY, EC_WORD_FIERY, EC_MOVE2(TRICK)}, .speechWin = {EC_WORD_DID, EC_WORD_MY, EC_WORD_FIERY, EC_MOVE2(TRICK), EC_MOVE(ASTONISH), EC_WORD_QUES}, .speechLose = {EC_WORD_YOU, EC_WORD_DIDN_T, EC_WORD_FALL, EC_WORD_FOR, EC_WORD_MY, EC_MOVE2(TRICK)}, @@ -1578,31 +1578,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [197] = { .facilityClass = FACILITY_CLASS_KINDLER, - .trainerName = _("ALFRED"), + .trainerName = _("ALFREDO"), .speechBefore = {EC_WORD_A, EC_WORD_FIERY, EC_WORD_GOURMET, EC_WORD_AM, EC_WORD_I, EC_WORD_EXCL}, .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_TASTY, EC_WORD_GOURMET, EC_WORD_VICTORY, EC_WORD_EXCL}, - .speechLose = {EC_WORD_WHAT, EC_WORD_A, EC_WORD_DISASTER, EC_WORD_THAT_WAS, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_WHAT, EC_WORD_A, EC_WORD_DISASTER, EC_WORD_THAT_WAS, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Alfredo }, [198] = { .facilityClass = FACILITY_CLASS_GENTLEMAN, - .trainerName = _("RUBE"), + .trainerName = _("RUBEN"), .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_TO, EC_WORD_GET, EC_WORD_GOING}, .speechWin = {EC_WORD_GET, EC_WORD_GOING, EC_WORD_EXCL, EC_WORD_THIS, EC_WORD_IS, EC_WORD_GOOD_BYE}, - .speechLose = {EC_WORD_I_VE, EC_WORD_GOT, EC_WORD_TO, EC_WORD_GET, EC_WORD_GOING, -1}, + .speechLose = {EC_WORD_I_VE, EC_WORD_GOT, EC_WORD_TO, EC_WORD_GET, EC_WORD_GOING, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Ruben }, [199] = { .facilityClass = FACILITY_CLASS_GENTLEMAN, - .trainerName = _("LAMA"), - .speechBefore = {EC_WORD_A, EC_MOVE2(PRESENT), EC_WORD_FOR, EC_WORD_ME, EC_WORD_QUES, -1}, + .trainerName = _("LAMAR"), + .speechBefore = {EC_WORD_A, EC_MOVE2(PRESENT), EC_WORD_FOR, EC_WORD_ME, EC_WORD_QUES, 0xFFFF}, .speechWin = {EC_WORD_MMM, EC_WORD_THIS, EC_WORD_IS, EC_WORD_QUITE, EC_WORD_TASTY, EC_WORD_ELLIPSIS}, - .speechLose = {EC_WORD_OH, EC_WORD_IT_S, EC_WORD_A, EC_WORD_GAME, EC_WORD_IS_IT_QUES, -1}, + .speechLose = {EC_WORD_OH, EC_WORD_IT_S, EC_WORD_A, EC_WORD_GAME, EC_WORD_IS_IT_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Lamar }, [200] = { .facilityClass = FACILITY_CLASS_YOUNGSTER, - .trainerName = _("JAXO"), + .trainerName = _("JAXON"), .speechBefore = {EC_WORD_A, EC_WORD_SHELL_ARMOR, EC_WORD_IS, EC_WORD_WHAT, EC_WORD_I, EC_WORD_WANT}, .speechWin = {EC_WORD_MY, EC_WORD_FATHER, EC_WORD_AND, EC_WORD_MOTHER, EC_WORD_WON_T, EC_WORD_ACCEPT}, .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_WORD_SHELL_ARMOR, EC_WORD_EXCL}, @@ -1610,7 +1610,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [201] = { .facilityClass = FACILITY_CLASS_YOUNGSTER, - .trainerName = _("LOGA"), + .trainerName = _("LOGAN"), .speechBefore = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_WILL, EC_WORD_STUDY, EC_WORD_FOR, EC_WORD_SCHOOL}, .speechWin = {EC_WORD_ME, EC_WORD_STUDY, EC_WORD_QUES, EC_WORD_NOT_VERY, EC_WORD_LIKELY_TO, EC_WORD_SEE}, .speechLose = {EC_WORD_NO, EC_WORD_THANKS, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_SLEEP}, @@ -1618,7 +1618,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [202] = { .facilityClass = FACILITY_CLASS_LASS, - .trainerName = _("EMILE"), + .trainerName = _("EMILEE"), .speechBefore = {EC_WORD_IS, EC_WORD_THIS, EC_WORD_KIND, EC_WORD_OF, EC_WORD_BATTLE, EC_WORD_OK_QUES}, .speechWin = {EC_WORD_LET_S, EC_WORD_GO, EC_WORD_FOR, EC_WORD_AN, EC_MOVE(ICY_WIND), EC_MOVE2(SURF)}, .speechLose = {EC_WORD_HOW, EC_WORD_ABOUT, EC_WORD_A, EC_MOVE(ROCK_SLIDE), EC_WORD_SHOW, EC_WORD_QUES}, @@ -1626,7 +1626,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [203] = { .facilityClass = FACILITY_CLASS_LASS, - .trainerName = _("JOSI"), + .trainerName = _("JOSIE"), .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_FASHION, EC_WORD_CONTEST, EC_WORD_IS, EC_WORD_PRETTY}, .speechWin = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_MODE, EC_WORD_FASHION, EC_WORD_THINGS}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_TOTALLY, EC_WORD_LACKING, EC_WORD_IN, EC_WORD_FASHION, EC_WORD_SENSE}, @@ -1634,7 +1634,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [204] = { .facilityClass = FACILITY_CLASS_CAMPER, - .trainerName = _("ARMAND"), + .trainerName = _("ARMANDO"), .speechBefore = {EC_WORD_I, EC_WORD_NEED, EC_WORD_MORE, EC_WORD_GRASS, EC_WORD_TYPE, EC_WORD_POKEMON}, .speechWin = {EC_WORD_TRADE, EC_WORD_ME, EC_WORD_A, EC_WORD_GRASS, EC_WORD_POKEMON, EC_WORD_PLEASE}, .speechLose = {EC_WORD_THERE, EC_WORD_AREN_T, EC_WORD_ENOUGH, EC_WORD_GRASS, EC_WORD_TYPE, EC_WORD_POKEMON}, @@ -1642,23 +1642,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [205] = { .facilityClass = FACILITY_CLASS_CAMPER, - .trainerName = _("SKYLE"), + .trainerName = _("SKYLER"), .speechBefore = {EC_MOVE2(INGRAIN), EC_WORD_IS, EC_WORD_MY, EC_WORD_CHOICE, EC_WORD_BATTLE, EC_WORD_MOVE}, .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MOVE, EC_WORD_ME, EC_WORD_NOW, EC_WORD_EXCL}, - .speechLose = {EC_WORD_YOU, EC_MOVE(CUT), EC_WORD_ME, EC_WORD_DOWN, EC_WORD_ELLIPSIS, -1}, + .speechLose = {EC_WORD_YOU, EC_MOVE(CUT), EC_WORD_ME, EC_WORD_DOWN, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Skyler }, [206] = { .facilityClass = FACILITY_CLASS_PICNICKER, - .trainerName = _("RUT"), + .trainerName = _("RUTH"), .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_ENJOY, EC_WORD_THIS, EC_WORD_BATTLE}, - .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MUCH, EC_WORD_TOO, EC_WORD_EASY, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MUCH, EC_WORD_TOO, EC_WORD_EASY, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_PLEASE, EC_WORD_STOP, EC_WORD_I, EC_WORD_DON_T, EC_WORD_ENJOY, EC_WORD_THIS}, .monSets = gBattleFrontierTrainerMons_Ruth }, [207] = { .facilityClass = FACILITY_CLASS_PICNICKER, - .trainerName = _("MELOD"), + .trainerName = _("MELODY"), .speechBefore = {EC_WORD_I, EC_MOVE2(WISH), EC_WORD_SUNDAY, EC_WORD_IS, EC_WORD_A, EC_MOVE2(SUNNY_DAY)}, .speechWin = {EC_WORD_SUNDAY, EC_WORD_SEEMS, EC_WORD_FOREVER, EC_WORD_TO, EC_WORD_COME, EC_WORD_ELLIPSIS}, .speechLose = {EC_WORD_THE, EC_WORD_FORECAST, EC_WORD_SAYS, EC_WORD_IT, EC_WORD_WILL, EC_MOVE(HAIL)}, @@ -1666,15 +1666,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [208] = { .facilityClass = FACILITY_CLASS_SWIMMER_M, - .trainerName = _("PEDR"), + .trainerName = _("PEDRO"), .speechBefore = {EC_WORD_A, EC_WORD_SWIFT_SWIM, EC_WORD_WILL, EC_WORD_DO, EC_WORD_YOU, EC_WORD_GOOD}, .speechWin = {EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_I, EC_WORD_SINK, EC_WORD_AN, EC_WORD_OPPONENT}, - .speechLose = {EC_WORD_UH_OH, EC_WORD_EXCL, -1, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_EXCL}, + .speechLose = {EC_WORD_UH_OH, EC_WORD_EXCL, 0xFFFF, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Pedro }, [209] = { .facilityClass = FACILITY_CLASS_SWIMMER_M, - .trainerName = _("ERIC"), + .trainerName = _("ERICK"), .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_MOVE2(TACKLE), EC_WORD_YOU, EC_WORD_DOWN, EC_WORD_EXCL}, .speechWin = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_RUN_AWAY, EC_WORD_YOU, EC_WORD_LOSER, EC_WORD_EXCL}, .speechLose = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_THINK, EC_WORD_YOU, EC_WORD_WOULD, EC_MOVE(COUNTER)}, @@ -1682,7 +1682,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [210] = { .facilityClass = FACILITY_CLASS_SWIMMER_F, - .trainerName = _("ELAIN"), + .trainerName = _("ELAINE"), .speechBefore = {EC_WORD_MY, EC_WORD_HEROINE, EC_WORD_ADVENTURE, EC_WORD_ISN_T, EC_WORD_GOING, EC_WORD_WELL}, .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I, EC_WORD_NEED}, .speechLose = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_HEROINE}, @@ -1690,15 +1690,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [211] = { .facilityClass = FACILITY_CLASS_SWIMMER_F, - .trainerName = _("JOYC"), + .trainerName = _("JOYCE"), .speechBefore = {EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_GO, EC_WORD_AHAHA, EC_WORD_EXCL}, .speechWin = {EC_WORD_LALALA, EC_WORD_NO, EC_WORD_LOSING, EC_WORD_FOR, EC_WORD_ME, EC_WORD_EXCL}, - .speechLose = {EC_WORD_LALALA, EC_WORD_ELLIPSIS, -1, EC_WORD_HUH_QUES, -1, -1}, + .speechLose = {EC_WORD_LALALA, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_HUH_QUES, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Joyce }, [212] = { .facilityClass = FACILITY_CLASS_POKEFAN_M, - .trainerName = _("TOD"), + .trainerName = _("TODD"), .speechBefore = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_LIGHTNINGROD, EC_WORD_FOR, EC_WORD_MY, EC_WORD_POWER}, .speechWin = {EC_WORD_THAT_S, EC_WORD_ALL, EC_WORD_YOU, EC_WORD_COULD, EC_MOVE(ABSORB), EC_WORD_QUES}, .speechLose = {EC_WORD_YOU, EC_MOVE2(REFLECT), EC_WORD_MY, EC_WORD_POWER, EC_WORD_BACK, EC_WORD_QUES}, @@ -1706,23 +1706,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [213] = { .facilityClass = FACILITY_CLASS_POKEFAN_M, - .trainerName = _("GAVI"), - .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(BIDE), EC_WORD_MY, EC_WORD_TIME, -1}, - .speechWin = {EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES, -1}, + .trainerName = _("GAVIN"), + .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(BIDE), EC_WORD_MY, EC_WORD_TIME, 0xFFFF}, + .speechWin = {EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES, 0xFFFF}, .speechLose = {EC_WORD_MY, EC_WORD_MISTAKE, EC_WORD_WAS, EC_WORD_TOO, EC_WORD_EXPENSIVE, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Gavin }, [214] = { .facilityClass = FACILITY_CLASS_POKEFAN_F, - .trainerName = _("MALOR"), + .trainerName = _("MALORY"), .speechBefore = {EC_WORD_PROMISE, EC_WORD_TO, EC_WORD_SHOW, EC_WORD_ME, EC_WORD_CUTE, EC_WORD_POKEMON}, - .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, -1, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, + .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, .speechLose = {EC_WORD_TCH, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_VERY, EC_WORD_NICE}, .monSets = gBattleFrontierTrainerMons_Malory }, [215] = { .facilityClass = FACILITY_CLASS_POKEFAN_F, - .trainerName = _("ESTHE"), + .trainerName = _("ESTHER"), .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_NICE, EC_MOVE2(PRESENT), EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_PLEASE, EC_WORD_GET, EC_WORD_ME, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_GAME}, .speechLose = {EC_WORD_MESSAGE, EC_WORD_CARDS, EC_WORD_MAKE, EC_WORD_A, EC_WORD_WEAK, EC_MOVE2(PRESENT)}, @@ -1730,15 +1730,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [216] = { .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, - .trainerName = _("OSCA"), + .trainerName = _("OSCAR"), .speechBefore = {EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_YOUR, EC_WORD_POWER, EC_WORD_IN, EC_WORD_FULL}, .speechWin = {EC_WORD_THAT_WAS, EC_WORD_NOT, EC_WORD_YOUR, EC_WORD_FULL, EC_WORD_POWER, EC_WORD_EXCL}, - .speechLose = {EC_WORD_NOT, EC_WORD_FUNNY, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_TOO_STRONG, -1}, + .speechLose = {EC_WORD_NOT, EC_WORD_FUNNY, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_TOO_STRONG, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Oscar }, [217] = { .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, - .trainerName = _("WILSO"), + .trainerName = _("WILSON"), .speechBefore = {EC_WORD_WORK, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_ME, EC_WORD_AN, EC_WORD_EARLY_BIRD}, .speechWin = {EC_WORD_ALL, EC_WORD_WORK, EC_WORD_AND, EC_WORD_NO, EC_WORD_PLAY, EC_WORD_ELLIPSIS}, .speechLose = {EC_MOVE(ENDURE), EC_WORD_IS, EC_WORD_ALL, EC_WORD_I, EC_WORD_CAN, EC_WORD_DO}, @@ -1746,7 +1746,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [218] = { .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, - .trainerName = _("CLAR"), + .trainerName = _("CLARE"), .speechBefore = {EC_WORD_YAY, EC_WORD_EXCL, EC_WORD_A, EC_WORD_TOUGH, EC_WORD_TRAINER, EC_WORD_EXCL}, .speechWin = {EC_WORD_AWW, EC_WORD_EXCL, EC_WORD_A, EC_WORD_WIMPY, EC_WORD_TRAINER, EC_WORD_EXCL}, .speechLose = {EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_TRAINER, EC_WORD_EXCL}, @@ -1754,7 +1754,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [219] = { .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, - .trainerName = _("TES"), + .trainerName = _("TESS"), .speechBefore = {EC_WORD_WANT, EC_WORD_SOME, EC_POKEMON(GULPIN), EC_WORD_DESIGN, EC_WORD_SWEETS, EC_WORD_QUES}, .speechWin = {EC_WORD_THEY_RE, EC_WORD_A, EC_WORD_SECRET, EC_WORD_POKEMON, EC_WORD_GOURMET, EC_WORD_ITEM}, .speechLose = {EC_WORD_THEY_RE, EC_WORD_TASTY, EC_WORD_EXCL, EC_WORD_REFRESHING, EC_WORD_TOO, EC_WORD_EXCL}, @@ -1762,7 +1762,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [220] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_M, - .trainerName = _("LEO"), + .trainerName = _("LEON"), .speechBefore = {EC_WORD_I_AM, EC_WORD_BETTER, EC_WORD_THAN, EC_WORD_ANY, EC_WORD_OTHER, EC_WORD_TRAINER}, .speechWin = {EC_WORD_I, EC_WORD_DID, EC_WORD_IT, EC_MOVE2(JUMP_KICK), EC_WORD_FOR, EC_WORD_JOY}, .speechLose = {EC_WORD_BACK, EC_WORD_HOME, EC_WORD_I, EC_WORD_WILL, EC_WORD_GO, EC_WORD_ELLIPSIS}, @@ -1770,15 +1770,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [221] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_M, - .trainerName = _("ALONZ"), + .trainerName = _("ALONZO"), .speechBefore = {EC_WORD_I_VE, EC_WORD_NOT, EC_WORD_LOST, EC_WORD_ONCE, EC_WORD_YET, EC_WORD_EXCL}, - .speechWin = {EC_WORD_YOUR, EC_WORD_SAD, EC_WORD_LOOK, EC_WORD_BECOMES, EC_WORD_YOU, -1}, - .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_BELIEVE, EC_WORD_THIS, EC_WORD_ELLIPSIS, -1}, + .speechWin = {EC_WORD_YOUR, EC_WORD_SAD, EC_WORD_LOOK, EC_WORD_BECOMES, EC_WORD_YOU, 0xFFFF}, + .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_BELIEVE, EC_WORD_THIS, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Alonzo }, [222] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_M, - .trainerName = _("VINC"), + .trainerName = _("VINCE"), .speechBefore = {EC_WORD_THE, EC_WORD_TOP, EC_WORD_TRAINER, EC_WORD_THAT_S, EC_WORD_ME, EC_WORD_EXCL}, .speechWin = {EC_WORD_THE, EC_WORD_TOP, EC_WORD_RANK, EC_WORD_BELONGS_TO, EC_WORD_ME, EC_WORD_EXCL}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_APPEAL, EC_WORD_THIS, EC_MOVE(OUTRAGE), EC_WORD_EXCL}, @@ -1786,7 +1786,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [223] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_M, - .trainerName = _("BRYO"), + .trainerName = _("BRYON"), .speechBefore = {EC_WORD_MY, EC_MOVE2(BARRAGE), EC_WORD_WILL, EC_MOVE2(SLAM), EC_WORD_YOU, EC_WORD_EXCL}, .speechWin = {EC_WORD_YOU, EC_WORD_DIDN_T, EC_WORD_COUNT_ON, EC_WORD_ANY, EC_WORD_LESS, EC_WORD_QUES}, .speechLose = {EC_WORD_I, EC_WORD_JUST, EC_WORD_DON_T, EC_WORD_GET, EC_WORD_IT, EC_WORD_ELLIPSIS}, @@ -1794,7 +1794,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [224] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_F, - .trainerName = _("AV"), + .trainerName = _("AVA"), .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_TREASURE, EC_WORD_OF, EC_WORD_THIS, EC_WORD_WORLD}, .speechWin = {EC_WORD_MY, EC_WORD_WORLD, EC_WORD_IS, EC_WORD_FULL, EC_WORD_OF, EC_WORD_WONDER}, .speechLose = {EC_WORD_WHY, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_SO, EC_WORD_TERRIBLE, EC_WORD_QUES}, @@ -1802,7 +1802,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [225] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_F, - .trainerName = _("MIRIA"), + .trainerName = _("MIRIAM"), .speechBefore = {EC_WORD_OH, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_WITH, EC_WORD_A, EC_MOVE(SCARY_FACE)}, .speechWin = {EC_WORD_AHAHA, EC_WORD_YOU, EC_WORD_ONLY, EC_WORD_LOOK, EC_WORD_SCARY, EC_WORD_EXCL}, .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_ARE, EC_WORD_SCARY}, @@ -1810,15 +1810,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [226] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_F, - .trainerName = _("CARRI"), + .trainerName = _("CARRIE"), .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_WORD_SHOW, EC_WORD_YOU, EC_WORD_GUTSY, EC_WORD_EXCL}, - .speechWin = {EC_WORD_IT_S, EC_WORD_ALL, EC_WORD_ABOUT, EC_WORD_GUTS, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_IT_S, EC_WORD_ALL, EC_WORD_ABOUT, EC_WORD_GUTS, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_ELLIPSIS, EC_MOVE(SELF_DESTRUCT), EC_WORD_MODE, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Carrie }, [227] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_F, - .trainerName = _("GILLIA"), + .trainerName = _("GILLIAN"), .speechBefore = {EC_WORD_I, EC_WORD_SEEK, EC_WORD_A, EC_WORD_TRULY, EC_WORD_GREAT, EC_WORD_BATTLE}, .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_A_LOT, EC_WORD_BETTER, EC_WORD_BATTLE, EC_WORD_ELLIPSIS}, .speechLose = {EC_WORD_THAT_WAS, EC_WORD_A_LITTLE, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_TAKE}, @@ -1826,15 +1826,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [228] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, - .trainerName = _("TYLE"), - .speechBefore = {EC_WORD_YO, EC_WORD_EXCL, -1, EC_WORD_LET_S, EC_WORD_GO, EC_WORD_EXCL_EXCL}, - .speechWin = {EC_WORD_YO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_WON, EC_WORD_YO}, - .speechLose = {EC_WORD_YO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_LOST, EC_WORD_YO}, + .trainerName = _("TYLER"), + .speechBefore = {EC_WORD_YO, EC_WORD_EXCL, 0xFFFF, EC_WORD_LET_S, EC_WORD_GO, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_WORD_YO, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_WON, EC_WORD_YO}, + .speechLose = {EC_WORD_YO, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_LOST, EC_WORD_YO}, .monSets = gBattleFrontierTrainerMons_Tyler }, [229] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, - .trainerName = _("CHA"), + .trainerName = _("CHAZ"), .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_HAVE, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_POWER}, .speechWin = {EC_WORD_THEY, EC_WORD_HAVE, EC_WORD_MORE, EC_WORD_POWER, EC_WORD_NOW, EC_WORD_EXCL}, .speechLose = {EC_WORD_YEAH, EC_MOVE2(TAKE_DOWN), EC_WORD_THEIR, EC_WORD_POWER, EC_WORD_A_TINY_BIT, EC_WORD_PLEASE}, @@ -1842,7 +1842,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [230] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, - .trainerName = _("NELSO"), + .trainerName = _("NELSON"), .speechBefore = {EC_WORD_WELL_THEN, EC_WORD_WILL, EC_WORD_THIS, EC_WORD_POKEMON, EC_WORD_WORK, EC_WORD_QUES}, .speechWin = {EC_WORD_I, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_IT, EC_WORD_WAS, EC_WORD_TOO_STRONG}, .speechLose = {EC_WORD_IT, EC_WORD_DIDN_T, EC_WORD_MATCH_UP, EC_WORD_WELL, EC_WORD_I, EC_WORD_THINK}, @@ -1850,7 +1850,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [231] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, - .trainerName = _("SHANI"), + .trainerName = _("SHANIA"), .speechBefore = {EC_WORD_ALL, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ABSOLUTELY, EC_WORD_ADORE, EC_WORD_ME}, .speechWin = {EC_WORD_HAPPINESS, EC_WORD_IS, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_WITH, EC_WORD_CUTE_CHARM}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_SO, EC_WORD_MEAN, EC_WORD_TO, EC_WORD_CUTE, EC_WORD_POKEMON}, @@ -1858,7 +1858,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [232] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, - .trainerName = _("STELL"), + .trainerName = _("STELLA"), .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOUR, EC_WORD_POKEMON}, .speechWin = {EC_WORD_WELL, EC_WORD_AREN_T, EC_WORD_THEY, EC_WORD_BORING, EC_WORD_QUES, EC_WORD_AHAHA}, .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SOMETHING, EC_WORD_ELSE, EC_WORD_ALL_RIGHT}, @@ -1866,15 +1866,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [233] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, - .trainerName = _("DORIN"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AND, EC_WORD_STRONG, EC_WORD_EXCL, -1}, + .trainerName = _("DORINE"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AND, EC_WORD_STRONG, EC_WORD_EXCL, 0xFFFF}, .speechWin = {EC_WORD_SEE, EC_WORD_QUES, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_GOOD, EC_WORD_QUES}, .speechLose = {EC_WORD_THIS, EC_WORD_ISN_T, EC_WORD_WORKING, EC_WORD_OUT, EC_WORD_AT, EC_WORD_ALL}, .monSets = gBattleFrontierTrainerMons_Dorine }, [234] = { .facilityClass = FACILITY_CLASS_DRAGON_TAMER, - .trainerName = _("MADDO"), + .trainerName = _("MADDOX"), .speechBefore = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_MY, EC_WORD_NO_1, EC_WORD_CHOICE}, .speechWin = {EC_WORD_IT_S, EC_WORD_NO, EC_WORD_SECRET, EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_WIN}, .speechLose = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_LOSE, EC_WORD_EXCL}, @@ -1882,15 +1882,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [235] = { .facilityClass = FACILITY_CLASS_DRAGON_TAMER, - .trainerName = _("DAVI"), - .speechBefore = {EC_WORD_LET_S, EC_WORD_HEAR, EC_WORD_YOU, EC_MOVE2(ROAR), EC_WORD_EXCL, -1}, - .speechWin = {EC_WORD_WROOOAAR_EXCL, -1, -1, EC_WORD_VICTORY, EC_WORD_EXCL_EXCL, -1}, - .speechLose = {EC_WORD_WROOOAAR_EXCL, -1, -1, EC_WORD_WHY, EC_WORD_QUES_EXCL, -1}, + .trainerName = _("DAVIN"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_HEAR, EC_WORD_YOU, EC_MOVE2(ROAR), EC_WORD_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_WROOOAAR_EXCL, 0xFFFF, 0xFFFF, EC_WORD_VICTORY, EC_WORD_EXCL_EXCL, 0xFFFF}, + .speechLose = {EC_WORD_WROOOAAR_EXCL, 0xFFFF, 0xFFFF, EC_WORD_WHY, EC_WORD_QUES_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Davin }, [236] = { .facilityClass = FACILITY_CLASS_DRAGON_TAMER, - .trainerName = _("TREVO"), + .trainerName = _("TREVON"), .speechBefore = {EC_WORD_I_AM, EC_WORD_LIVING, EC_WORD_ONLY, EC_WORD_WITH, EC_WORD_DRAGON, EC_WORD_POKEMON}, .speechWin = {EC_WORD_THE, EC_WORD_WAY, EC_WORD_I_AM, EC_WORD_LIVING, EC_WORD_IS, EC_WORD_PERFECT}, .speechLose = {EC_WORD_YOU_VE, EC_WORD_DESTROYED, EC_WORD_THE, EC_WORD_WAY, EC_WORD_I_AM, EC_WORD_LIVING}, @@ -1898,7 +1898,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [237] = { .facilityClass = FACILITY_CLASS_BLACK_BELT, - .trainerName = _("MATE"), + .trainerName = _("MATEO"), .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_BE, EC_WORD_OVER, EC_WORD_SOON, EC_WORD_ENOUGH}, .speechWin = {EC_WORD_WELL, EC_WORD_THAT, EC_WORD_DIDN_T, EC_WORD_TAKE, EC_WORD_VERY, EC_WORD_MUCH}, .speechLose = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_LOSE, EC_WORD_SO, EC_WORD_SOON, EC_WORD_EXCL}, @@ -1906,7 +1906,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [238] = { .facilityClass = FACILITY_CLASS_BLACK_BELT, - .trainerName = _("BRE"), + .trainerName = _("BRET"), .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_ROCK_SOLID, EC_WORD_POKEMON, EC_WORD_THE, EC_WORD_BEST}, .speechWin = {EC_WORD_TOUGHNESS, EC_WORD_IS, EC_WORD_THE, EC_WORD_WAY, EC_WORD_TO, EC_WORD_GO}, .speechLose = {EC_WORD_I, EC_WORD_ALSO, EC_WORD_HAVE, EC_WORD_A, EC_WORD_PLUSH_DOLL, EC_WORD_COLLECTION}, @@ -1914,23 +1914,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [239] = { .facilityClass = FACILITY_CLASS_BLACK_BELT, - .trainerName = _("RAU"), - .speechBefore = {EC_WORD_I, EC_WORD_REJECT, EC_WORD_EVERY, EC_WORD_WEAK, EC_WORD_TRAINER, -1}, + .trainerName = _("RAUL"), + .speechBefore = {EC_WORD_I, EC_WORD_REJECT, EC_WORD_EVERY, EC_WORD_WEAK, EC_WORD_TRAINER, 0xFFFF}, .speechWin = {EC_WORD_HUMPH, EC_WORD_EXCL, EC_WORD_ANOTHER, EC_WORD_WEAK, EC_WORD_TRAINER, EC_WORD_ELLIPSIS}, .speechLose = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NOTHING, EC_WORD_WEAK, EC_WORD_ABOUT, EC_WORD_YOU}, .monSets = gBattleFrontierTrainerMons_Raul }, [240] = { .facilityClass = FACILITY_CLASS_BATTLE_GIRL, - .trainerName = _("KA"), - .speechBefore = {EC_WORD_AND, EC_WORD_YET, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_QUES, -1}, + .trainerName = _("KAY"), + .speechBefore = {EC_WORD_AND, EC_WORD_YET, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_QUES, 0xFFFF}, .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_TIRED, EC_WORD_ELLIPSIS}, .speechLose = {EC_WORD_GOOD, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_AT, EC_WORD_LAST, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Kay }, [241] = { .facilityClass = FACILITY_CLASS_BATTLE_GIRL, - .trainerName = _("ELEN"), + .trainerName = _("ELENA"), .speechBefore = {EC_WORD_A, EC_WORD_BATTLE, EC_WORD_GIRL, EC_WORD_THAT_S, EC_WORD_ME, EC_WORD_EXCL}, .speechWin = {EC_WORD_ISN_T, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_GIRL, EC_WORD_AWESOME, EC_WORD_QUES}, .speechLose = {EC_WORD_YOU, EC_WORD_DISLIKE, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_GIRL, EC_WORD_QUES}, @@ -1938,23 +1938,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [242] = { .facilityClass = FACILITY_CLASS_BATTLE_GIRL, - .trainerName = _("ALAN"), + .trainerName = _("ALANA"), .speechBefore = {EC_WORD_EAT, EC_WORD_MY, EC_WORD_INVINCIBLE, EC_WORD_ATTACK, EC_WORD_YOU, EC_WORD_EXCL}, - .speechWin = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_LEARN, -1}, + .speechWin = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_LEARN, 0xFFFF}, .speechLose = {EC_WORD_SO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_MY, EC_WORD_INVINCIBLE, EC_WORD_ATTACK}, .monSets = gBattleFrontierTrainerMons_Alana }, [243] = { .facilityClass = FACILITY_CLASS_EXPERT_M, - .trainerName = _("ALEXA"), + .trainerName = _("ALEXAS"), .speechBefore = {EC_WORD_GOOD, EC_WORD_TO, EC_WORD_MEET_YOU, EC_WORD_YOUNG, EC_WORD_TRAINER, EC_WORD_EXCL}, - .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, -1, EC_WORD_GIVE, EC_WORD_IT, EC_WORD_UP}, + .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, 0xFFFF, EC_WORD_GIVE, EC_WORD_IT, EC_WORD_UP}, .speechLose = {EC_WORD_YOU, EC_WORD_ARE, EC_WORD_A, EC_WORD_STRONG, EC_WORD_TRAINER, EC_WORD_KID}, .monSets = gBattleFrontierTrainerMons_Alexas }, [244] = { .facilityClass = FACILITY_CLASS_EXPERT_M, - .trainerName = _("WESTO"), + .trainerName = _("WESTON"), .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_PLAY, EC_WORD_DOWN, EC_WORD_ALL_RIGHT, EC_WORD_QUES}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_FAR, EC_WORD_TOO, EC_WORD_EASY, EC_WORD_TO, EC_WORD_ATTACK}, .speechLose = {EC_WORD_WELL, EC_WORD_WELL, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_ELLIPSIS}, @@ -1962,39 +1962,39 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [245] = { .facilityClass = FACILITY_CLASS_EXPERT_M, - .trainerName = _("JASPE"), + .trainerName = _("JASPER"), .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_OLD, EC_WORD_I_AM, EC_WORD_SKILLED, EC_WORD_EXCL}, - .speechWin = {EC_WORD_SKILLED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_SKILLED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_I_AM, EC_WORD_SHOCKED, EC_WORD_EXCL, EC_WORD_DOWN, EC_WORD_I, EC_WORD_GO}, .monSets = gBattleFrontierTrainerMons_Jasper }, [246] = { .facilityClass = FACILITY_CLASS_EXPERT_F, - .trainerName = _("NADI"), + .trainerName = _("NADIA"), .speechBefore = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, EC_WORD_DOWN, EC_WORD_EXCL}, - .speechWin = {EC_WORD_HAH, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_BEAT, EC_WORD_YOU}, - .speechLose = {EC_WORD_I_AM, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_DOWNCAST, EC_WORD_ELLIPSIS, -1}, + .speechWin = {EC_WORD_HAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_BEAT, EC_WORD_YOU}, + .speechLose = {EC_WORD_I_AM, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_DOWNCAST, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Nadia }, [247] = { .facilityClass = FACILITY_CLASS_EXPERT_F, - .trainerName = _("MIRAND"), - .speechBefore = {EC_WORD_WELL, EC_WORD_WELL, -1, EC_WORD_LET_S, EC_WORD_START, -1}, + .trainerName = _("MIRANDA"), + .speechBefore = {EC_WORD_WELL, EC_WORD_WELL, 0xFFFF, EC_WORD_LET_S, EC_WORD_START, 0xFFFF}, .speechWin = {EC_WORD_WHAT, EC_WORD_QUES, EC_WORD_DONE, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES}, .speechLose = {EC_WORD_WELL, EC_WORD_I, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_I_AM, EC_WORD_TOO_WEAK}, .monSets = gBattleFrontierTrainerMons_Miranda }, [248] = { .facilityClass = FACILITY_CLASS_EXPERT_F, - .trainerName = _("EMM"), - .speechBefore = {EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_HEARING, EC_WORD_ABOUT, EC_WORD_YOU, -1}, - .speechWin = {EC_WORD_I, EC_WORD_THINK, EC_WORD_I_VE, EC_WORD_MISHEARD, EC_WORD_THINGS, -1}, + .trainerName = _("EMMA"), + .speechBefore = {EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_HEARING, EC_WORD_ABOUT, EC_WORD_YOU, 0xFFFF}, + .speechWin = {EC_WORD_I, EC_WORD_THINK, EC_WORD_I_VE, EC_WORD_MISHEARD, EC_WORD_THINGS, 0xFFFF}, .speechLose = {EC_WORD_WHAT, EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_HEARING, EC_WORD_IS, EC_WORD_RIGHT}, .monSets = gBattleFrontierTrainerMons_Emma }, [249] = { .facilityClass = FACILITY_CLASS_PSYCHIC_M, - .trainerName = _("ROLAND"), + .trainerName = _("ROLANDO"), .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_SUPER, EC_WORD_POKEMON, EC_WORD_HERO, EC_WORD_EXCL}, .speechWin = {EC_WORD_WAS, EC_WORD_THAT, EC_WORD_ENOUGH, EC_WORD_FOR, EC_WORD_YOU, EC_WORD_QUES}, .speechLose = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_BEAT, EC_WORD_A, EC_WORD_HERO}, @@ -2002,31 +2002,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [250] = { .facilityClass = FACILITY_CLASS_PSYCHIC_M, - .trainerName = _("STANL"), + .trainerName = _("STANLY"), .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_BE, EC_WORD_AN, EC_WORD_EASY, EC_WORD_MATCH}, - .speechWin = {EC_WORD_IT, EC_WORD_REALLY, EC_WORD_WAS, EC_WORD_EASY, -1, -1}, - .speechLose = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_HAPPY, EC_WORD_NOW, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_IT, EC_WORD_REALLY, EC_WORD_WAS, EC_WORD_EASY, 0xFFFF, 0xFFFF}, + .speechLose = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_HAPPY, EC_WORD_NOW, EC_WORD_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Stanly }, [251] = { .facilityClass = FACILITY_CLASS_PSYCHIC_M, - .trainerName = _("DARI"), + .trainerName = _("DARIO"), .speechBefore = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_SAYS, EC_WORD_I, EC_WORD_WILL, EC_WORD_WIN}, - .speechWin = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_HAS, EC_WORD_BEEN, EC_WORD_PERFECT, -1}, + .speechWin = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_HAS, EC_WORD_BEEN, EC_WORD_PERFECT, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_SEE, EC_WORD_THIS, EC_MOVE(REVERSAL), EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Dario }, [252] = { .facilityClass = FACILITY_CLASS_PSYCHIC_F, - .trainerName = _("KARLE"), + .trainerName = _("KARLEE"), .speechBefore = {EC_WORD_SOMETHING, EC_WORD_GOOD, EC_WORD_WILL, EC_WORD_COME, EC_WORD_OF, EC_WORD_THIS}, - .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_FANTASTIC, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_FANTASTIC, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_THAT, EC_WORD_SOMETHING, EC_WORD_GOOD, EC_WORD_WENT, EC_WORD_TO, EC_WORD_YOU}, .monSets = gBattleFrontierTrainerMons_Karlee }, [253] = { .facilityClass = FACILITY_CLASS_PSYCHIC_F, - .trainerName = _("JAYLI"), + .trainerName = _("JAYLIN"), .speechBefore = {EC_WORD_EVERY, EC_WORD_TRAINER, EC_WORD_HAS, EC_WORD_BEEN, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_IT_S, EC_WORD_MAKING, EC_WORD_ME, EC_MOVE(YAWN), EC_WORD_THAT, EC_WORD_BATTLE}, .speechLose = {EC_WORD_I, EC_WORD_SLEPT, EC_WORD_AND, EC_WORD_SO, EC_WORD_I, EC_WORD_LOST}, @@ -2034,7 +2034,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [254] = { .facilityClass = FACILITY_CLASS_PSYCHIC_F, - .trainerName = _("INGRI"), + .trainerName = _("INGRID"), .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_VERY, EC_WORD_MEAN, EC_WORD_TRAINER}, .speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_A, EC_WORD_GOOD, EC_WORD_MATCH, EC_WORD_QUES}, .speechLose = {EC_WORD_I, EC_WORD_LOST, EC_WORD_CAUSE, EC_WORD_YOU_RE, EC_WORD_MEAN, EC_WORD_ELLIPSIS}, @@ -2042,15 +2042,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [255] = { .facilityClass = FACILITY_CLASS_HEX_MANIAC, - .trainerName = _("DELILA"), - .speechBefore = {EC_WORD_DON_T, EC_MOVE(GRUDGE), EC_WORD_ME, EC_WORD_IF_I_WIN, EC_WORD_OK_QUES, -1}, + .trainerName = _("DELILAH"), + .speechBefore = {EC_WORD_DON_T, EC_MOVE(GRUDGE), EC_WORD_ME, EC_WORD_IF_I_WIN, EC_WORD_OK_QUES, 0xFFFF}, .speechWin = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOU, EC_WORD_ANGRY}, .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GRUDGE), EC_WORD_WITH, EC_WORD_YOU}, .monSets = gBattleFrontierTrainerMons_Delilah }, [256] = { .facilityClass = FACILITY_CLASS_HEX_MANIAC, - .trainerName = _("CARL"), + .trainerName = _("CARLY"), .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_WORD_SCATTER, EC_WORD_SOME, EC_MOVE2(POISON_POWDER), EC_WORD_ABOUT}, .speechWin = {EC_WORD_IT_S, EC_WORD_SCARY, EC_WORD_HOW, EC_WORD_MY, EC_WORD_STRATEGY, EC_WORD_WORKS}, .speechLose = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_YOU, EC_WORD_AND, EC_WORD_YOUR, EC_WORD_POKEMON}, @@ -2058,23 +2058,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [257] = { .facilityClass = FACILITY_CLASS_HEX_MANIAC, - .trainerName = _("LEXI"), + .trainerName = _("LEXIE"), .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_SCARY, EC_WORD_POKEMON, EC_WORD_QUES}, - .speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_SCARY, EC_WORD_EH_QUES, -1, -1}, + .speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_SCARY, EC_WORD_EH_QUES, 0xFFFF, 0xFFFF}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_SCARY, EC_WORD_THAN, EC_WORD_MY, EC_WORD_POKEMON}, .monSets = gBattleFrontierTrainerMons_Lexie }, [258] = { .facilityClass = FACILITY_CLASS_POKEMANIAC, - .trainerName = _("MILLE"), - .speechBefore = {EC_WORD_HELLO, EC_WORD_QUES, -1, EC_WORD_HELLO, EC_WORD_QUES_EXCL, -1}, + .trainerName = _("MILLER"), + .speechBefore = {EC_WORD_HELLO, EC_WORD_QUES, 0xFFFF, EC_WORD_HELLO, EC_WORD_QUES_EXCL, 0xFFFF}, .speechWin = {EC_WORD_HELLO, EC_WORD_MOTHER, EC_WORD_EXCL, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL}, - .speechLose = {EC_WORD_MY, EC_WORD_PHONE, EC_WORD_ISN_T, EC_WORD_WORKING, EC_WORD_ELLIPSIS, -1}, + .speechLose = {EC_WORD_MY, EC_WORD_PHONE, EC_WORD_ISN_T, EC_WORD_WORKING, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Miller }, [259] = { .facilityClass = FACILITY_CLASS_POKEMANIAC, - .trainerName = _("MAR"), + .trainerName = _("MARV"), .speechBefore = {EC_WORD_YOU, EC_WORD_CAN, EC_WORD_LOSE, EC_WORD_YOUR, EC_MOVE(SWAGGER), EC_WORD_NOW}, .speechWin = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_MOVE(SWAGGER), EC_WORD_LEFT, EC_WORD_EH_QUES}, .speechLose = {EC_WORD_GO, EC_WORD_ON, EC_MOVE(SWAGGER), EC_WORD_ALL, EC_WORD_YOU, EC_WORD_WANT}, @@ -2082,7 +2082,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [260] = { .facilityClass = FACILITY_CLASS_POKEMANIAC, - .trainerName = _("LAYTO"), + .trainerName = _("LAYTON"), .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_TOTALLY, EC_WORD_COOL, EC_WORD_EXCL}, .speechWin = {EC_WORD_YOU, EC_WORD_CAN, EC_WORD_LOOK, EC_WORD_UP, EC_WORD_TO, EC_WORD_ME}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_NO, EC_WORD_REALLY, EC_WORD_EXCL}, @@ -2090,7 +2090,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [261] = { .facilityClass = FACILITY_CLASS_GENTLEMAN, - .trainerName = _("BROOK"), + .trainerName = _("BROOKS"), .speechBefore = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_WORD_HIGH, EC_WORD_LEVEL, EC_WORD_BATTLE}, .speechWin = {EC_WORD_THAT_WAS, EC_WORD_HIGH, EC_WORD_LEVEL, EC_WORD_AND, EC_WORD_EXCITING, EC_WORD_TOO}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_TOO, EC_WORD_HIGH, EC_WORD_IN, EC_WORD_LEVEL, EC_WORD_ELLIPSIS}, @@ -2098,39 +2098,39 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [262] = { .facilityClass = FACILITY_CLASS_GENTLEMAN, - .trainerName = _("GREGOR"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_THAT, EC_WORD_OLD, EC_WORD_YET, -1}, + .trainerName = _("GREGORY"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_THAT, EC_WORD_OLD, EC_WORD_YET, 0xFFFF}, .speechWin = {EC_WORD_WHO, EC_WORD_SAYS, EC_WORD_I_AM, EC_WORD_TOO, EC_WORD_OLD, EC_WORD_QUES}, .speechLose = {EC_WORD_PLEASE, EC_WORD_I_AM, EC_WORD_REALLY, EC_WORD_NOT, EC_WORD_THAT, EC_WORD_OLD}, .monSets = gBattleFrontierTrainerMons_Gregory }, [263] = { .facilityClass = FACILITY_CLASS_GENTLEMAN, - .trainerName = _("REES"), - .speechBefore = {EC_WORD_I_VE, EC_WORD_A, EC_WORD_COUPLE, EC_WORD_THINGS, -1, -1}, - .speechWin = {EC_WORD_DON_T, EC_WORD_DIET, EC_WORD_PLAY, EC_WORD_SPORTS, EC_WORD_INSTEAD, -1}, + .trainerName = _("REESE"), + .speechBefore = {EC_WORD_I_VE, EC_WORD_A, EC_WORD_COUPLE, EC_WORD_THINGS, 0xFFFF, 0xFFFF}, + .speechWin = {EC_WORD_DON_T, EC_WORD_DIET, EC_WORD_PLAY, EC_WORD_SPORTS, EC_WORD_INSTEAD, 0xFFFF}, .speechLose = {EC_WORD_INSTEAD, EC_WORD_OF, EC_WORD_TELEVISION, EC_WORD_GET, EC_WORD_A, EC_WORD_BOOK}, .monSets = gBattleFrontierTrainerMons_Reese }, [264] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, - .trainerName = _("MASO"), - .speechBefore = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_THIS, EC_WORD_SCARY, -1}, - .speechWin = {EC_WORD_THANK_YOU, EC_WORD_ELLIPSIS, -1, EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_NOW}, - .speechLose = {EC_WORD_I_AM, EC_WORD_DISAPPOINTED, EC_WORD_ELLIPSIS, -1, -1, -1}, + .trainerName = _("MASON"), + .speechBefore = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_THIS, EC_WORD_SCARY, 0xFFFF}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_NOW}, + .speechLose = {EC_WORD_I_AM, EC_WORD_DISAPPOINTED, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Mason }, [265] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, - .trainerName = _("TOB"), - .speechBefore = {EC_WORD_LISTEN, EC_WORD_UP, -1, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_WIN}, + .trainerName = _("TOBY"), + .speechBefore = {EC_WORD_LISTEN, EC_WORD_UP, 0xFFFF, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_WIN}, .speechWin = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_OR, EC_WORD_WHAT, EC_WORD_QUES}, .speechLose = {EC_WORD_I, EC_WORD_CAN, EC_WORD_BEAT, EC_WORD_YOU, EC_WORD_AT, EC_WORD_SMARTNESS}, .monSets = gBattleFrontierTrainerMons_Toby }, [266] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, - .trainerName = _("DOROTH"), + .trainerName = _("DOROTHY"), .speechBefore = {EC_WORD_THE, EC_WORD_SPORTS, EC_WORD_WORLD, EC_WORD_SHOULD, EC_WORD_ACCEPT, EC_WORD_POKEMON}, .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_WORD_THAT, EC_WORD_WIN, EC_WORD_WAS, EC_WORD_REFRESHING}, .speechLose = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_WORD_THAT, EC_WORD_LOSS, EC_WORD_WAS, EC_WORD_REFRESHING}, @@ -2138,31 +2138,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [267] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, - .trainerName = _("PIPE"), + .trainerName = _("PIPER"), .speechBefore = {EC_WORD_COME_ON, EC_WORD_YOU, EC_WORD_NEED, EC_WORD_A, EC_WORD_SPEED_BOOST, EC_WORD_QUES}, .speechWin = {EC_WORD_YOU, EC_WORD_NEED, EC_WORD_TO, EC_WORD_SHOW, EC_WORD_MORE, EC_WORD_GUTS}, - .speechLose = {EC_WORD_OH, EC_WORD_YOU, EC_WORD_EXCL, -1, -1, -1}, + .speechLose = {EC_WORD_OH, EC_WORD_YOU, EC_WORD_EXCL, 0xFFFF, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Piper }, [268] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, - .trainerName = _("FIN"), - .speechBefore = {EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_TRAINER, EC_WORD_BATTLE, EC_WORD_ELLIPSIS, -1}, - .speechWin = {EC_WORD_WON_T, EC_WORD_THIS, EC_WORD_EVER, EC_WORD_END, EC_WORD_QUES, -1}, + .trainerName = _("FINN"), + .speechBefore = {EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_TRAINER, EC_WORD_BATTLE, EC_WORD_ELLIPSIS, 0xFFFF}, + .speechWin = {EC_WORD_WON_T, EC_WORD_THIS, EC_WORD_EVER, EC_WORD_END, EC_WORD_QUES, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_GET, EC_WORD_TO, EC_MOVE2(REST), EC_WORD_A_LITTLE}, .monSets = gBattleFrontierTrainerMons_Finn }, [269] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, - .trainerName = _("SAMI"), + .trainerName = _("SAMIR"), .speechBefore = {EC_WORD_I, EC_MOVE2(DIVE), EC_WORD_BELOW, EC_WORD_THE, EC_MOVE2(SURF), EC_WORD_EXCL}, .speechWin = {EC_WORD_YAHOO, EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(DIVE), EC_WORD_YOU, EC_WORD_EXCL}, - .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_SINK, EC_WORD_ELLIPSIS, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_SINK, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Samir }, [270] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, - .trainerName = _("FION"), + .trainerName = _("FIONA"), .speechBefore = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_LIMBER, EC_WORD_UP, EC_WORD_BEFORE, EC_WORD_QUES}, .speechWin = {EC_WORD_YOU, EC_WORD_NEED, EC_WORD_TO, EC_WORD_BE, EC_WORD_MORE, EC_WORD_READY}, .speechLose = {EC_WORD_BEING, EC_WORD_LIMBER, EC_WORD_DIDN_T, EC_WORD_WORK, EC_WORD_FOR, EC_WORD_ME}, @@ -2170,7 +2170,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [271] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, - .trainerName = _("GLORI"), + .trainerName = _("GLORIA"), .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_ATTACK, EC_WORD_WITH, EC_WORD_SUCTION_CUPS}, .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_FOR, EC_WORD_YOU}, .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_GET, EC_WORD_HOW, EC_WORD_SUCTION_CUPS, EC_WORD_WORK}, @@ -2178,15 +2178,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [272] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, - .trainerName = _("NIC"), - .speechBefore = {EC_WORD_LIKE, EC_WORD_A, EC_MOVE(SONIC_BOOM), EC_WORD_I_VE_ARRIVED, -1, -1}, + .trainerName = _("NICO"), + .speechBefore = {EC_WORD_LIKE, EC_WORD_A, EC_MOVE(SONIC_BOOM), EC_WORD_I_VE_ARRIVED, 0xFFFF, 0xFFFF}, .speechWin = {EC_WORD_SORRY, EC_WORD_TO, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_SO, EC_WORD_DOWNCAST}, .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_WITH, EC_WORD_A, EC_MOVE2(SUPERSONIC), EC_WORD_SPEED_BOOST}, .monSets = gBattleFrontierTrainerMons_Nico }, [273] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, - .trainerName = _("JEREM"), + .trainerName = _("JEREMY"), .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_MASTER, EC_WORD_THAT_S, EC_WORD_MY, EC_WORD_DREAM}, .speechWin = {EC_WORD_MY, EC_WORD_DREAM, EC_WORD_ISN_T, EC_WORD_FAR, EC_WORD_OFF, EC_WORD_EXCL}, .speechLose = {EC_WORD_WHAT, EC_WORD_I, EC_WORD_DREAM, EC_WORD_ISN_T, EC_WORD_HAPPENING, EC_WORD_ELLIPSIS}, @@ -2194,7 +2194,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [274] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, - .trainerName = _("CAITLI"), + .trainerName = _("CAITLIN"), .speechBefore = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_THINK, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_QUES}, .speechWin = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_MORE, EC_WORD_TO_ME, EC_WORD_THAN, EC_WORD_CUTENESS}, .speechLose = {EC_WORD_MY, EC_WORD_CUTE_CHARM, EC_WORD_DOESN_T, EC_MOVE2(ATTRACT), EC_WORD_YOU, EC_WORD_QUES}, @@ -2202,7 +2202,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [275] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, - .trainerName = _("REEN"), + .trainerName = _("REENA"), .speechBefore = {EC_WORD_I_AM, EC_WORD_ALWAYS, EC_WORD_HAPPY, EC_WORD_HAPPY, EC_WORD_HAPPY, EC_WORD_EXCL}, .speechWin = {EC_WORD_OH, EC_WORD_YAY, EC_WORD_EXCL, EC_WORD_YAHOO, EC_WORD_FOR, EC_WORD_ME}, .speechLose = {EC_WORD_YAHOO, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_YOU}, @@ -2210,7 +2210,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [276] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("AVER"), + .trainerName = _("AVERY"), .speechBefore = {EC_WORD_I_VE, EC_WORD_GOT, EC_WORD_A_LOT, EC_WORD_OF, EC_WORD_BUG, EC_WORD_POKEMON}, .speechWin = {EC_WORD_MY, EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_ALL, EC_WORD_UNBELIEVABLE}, .speechLose = {EC_WORD_MY, EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_ALL, EC_WORD_UPSIDE_DOWN}, @@ -2218,15 +2218,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [277] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("LIA"), + .trainerName = _("LIAM"), .speechBefore = {EC_WORD_WE, EC_WORD_REALLY, EC_WORD_DISLIKE, EC_WORD_FIRE, EC_WORD_AND, EC_WORD_FLYING}, - .speechWin = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_BAD, EC_WORD_HEY_QUES, -1}, + .speechWin = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_BAD, EC_WORD_HEY_QUES, 0xFFFF}, .speechLose = {EC_WORD_YOU, EC_WORD_KNOW, EC_WORD_WHAT, EC_WORD_WE, EC_WORD_DISLIKE, EC_WORD_HEY_QUES}, .monSets = gBattleFrontierTrainerMons_Liam }, [278] = { .facilityClass = FACILITY_CLASS_FISHERMAN, - .trainerName = _("THE"), + .trainerName = _("THEO"), .speechBefore = {EC_WORD_FISHING, EC_WORD_IS, EC_WORD_MY, EC_WORD_CHOICE, EC_WORD_IN, EC_WORD_LIFE}, .speechWin = {EC_WORD_WATER, EC_WORD_POKEMON, EC_MOVE2(ATTRACT), EC_WORD_ME, EC_WORD_WITHOUT, EC_WORD_END}, .speechLose = {EC_WORD_DON_T, EC_WORD_COUNT_ON, EC_WORD_THAT, EC_WORD_HAPPENING, EC_WORD_ANOTHER, EC_WORD_TIME}, @@ -2234,7 +2234,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [279] = { .facilityClass = FACILITY_CLASS_FISHERMAN, - .trainerName = _("BAILE"), + .trainerName = _("BAILEY"), .speechBefore = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_I, EC_WORD_BATTLE, EC_WORD_EASY}, .speechWin = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_I, EC_MOVE2(SWALLOW), EC_WORD_JOY}, .speechLose = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_I, EC_MOVE2(SWALLOW), EC_MOVE2(FRUSTRATION)}, @@ -2242,7 +2242,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [280] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("HUG"), + .trainerName = _("HUGO"), .speechBefore = {EC_WORD_I, EC_WORD_TRY, EC_WORD_THE, EC_WORD_BEST, EC_WORD_I, EC_WORD_CAN}, .speechWin = {EC_WORD_I, EC_WORD_CAN_WIN, EC_WORD_IF, EC_WORD_I, EC_WORD_TRY, EC_WORD_ENOUGH}, .speechLose = {EC_WORD_I, EC_WORD_DID, EC_WORD_TRY, EC_WORD_DIDN_T, EC_WORD_I, EC_WORD_QUES}, @@ -2250,7 +2250,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [281] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("BRYC"), + .trainerName = _("BRYCE"), .speechBefore = {EC_WORD_I_WAS, EC_WORD_ON, EC_WORD_VACATION, EC_WORD_UNTIL, EC_WORD_ONLY, EC_WORD_YESTERDAY}, .speechWin = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_LOST, EC_WORD_MY, EC_WORD_SKILL, EC_WORD_YET}, .speechLose = {EC_WORD_THAT_S, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_NEED, EC_WORD_SLEEP}, @@ -2258,7 +2258,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [282] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("GIDEO"), + .trainerName = _("GIDEON"), .speechBefore = {EC_WORD_WHAT_S_UP_QUES, EC_WORD_YOU, EC_WORD_THINK, EC_WORD_I_AM, EC_WORD_SCARY, EC_WORD_QUES}, .speechWin = {EC_WORD_I_AM, EC_WORD_COOL, EC_WORD_BUT, EC_WORD_NOT, EC_WORD_SCARY, EC_WORD_EXCL}, .speechLose = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_FABULOUS, EC_WORD_FASHION, EC_WORD_SENSE}, @@ -2266,31 +2266,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [283] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("TRISTO"), + .trainerName = _("TRISTON"), .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_RATHER, EC_WORD_LOOK, EC_WORD_AT, EC_WORD_POKEMON}, .speechWin = {EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES_EXCL}, - .speechLose = {EC_WORD_SEE, EC_WORD_QUES, -1, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_LOSE}, + .speechLose = {EC_WORD_SEE, EC_WORD_QUES, 0xFFFF, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_LOSE}, .monSets = gBattleFrontierTrainerMons_Triston }, [284] = { .facilityClass = FACILITY_CLASS_GUITARIST, - .trainerName = _("CHARLE"), + .trainerName = _("CHARLES"), .speechBefore = {EC_WORD_IT_S, EC_WORD_HOPELESS, EC_WORD_TO, EC_MOVE2(STRUGGLE), EC_WORD_WITH, EC_WORD_ME}, - .speechWin = {EC_MOVE(SUBMISSION), EC_WORD_WAS, EC_WORD_YOUR, EC_WORD_ONLY, EC_WORD_CHOICE, -1}, + .speechWin = {EC_MOVE(SUBMISSION), EC_WORD_WAS, EC_WORD_YOUR, EC_WORD_ONLY, EC_WORD_CHOICE, 0xFFFF}, .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_DOWN, EC_WORD_DOWN, EC_WORD_DOWN, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Charles }, [285] = { .facilityClass = FACILITY_CLASS_GUITARIST, - .trainerName = _("RAYMON"), + .trainerName = _("RAYMOND"), .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_HEAR, EC_WORD_MY, EC_WORD_SONG, EC_WORD_QUES}, - .speechWin = {EC_WORD_SATISFIED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_SATISFIED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_SATISFIED, EC_WORD_IS, EC_WORD_WHAT, EC_WORD_I, EC_WORD_CAN_T, EC_WORD_BE}, .monSets = gBattleFrontierTrainerMons_Raymond }, [286] = { .facilityClass = FACILITY_CLASS_BIRD_KEEPER, - .trainerName = _("DIR"), + .trainerName = _("DIRK"), .speechBefore = {EC_WORD_FLYING, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_ABOVE, EC_WORD_THE, EC_MOVE2(REST)}, .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T_WIN, EC_WORD_EXCL, EC_WORD_FLYING, EC_WORD_POKEMON, EC_WORD_RULE}, .speechLose = {EC_WORD_AREN_T, EC_WORD_THERE, EC_WORD_MORE, EC_WORD_FLYING, EC_WORD_POKEMON, EC_WORD_QUES}, @@ -2298,7 +2298,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [287] = { .facilityClass = FACILITY_CLASS_BIRD_KEEPER, - .trainerName = _("HAROL"), + .trainerName = _("HAROLD"), .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_APPEAL, EC_WORD_TO, EC_WORD_YOU, EC_WORD_QUES}, .speechWin = {EC_WORD_YOU, EC_WORD_DO, EC_WORD_LIKE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_QUES}, .speechLose = {EC_WORD_SO, EC_WORD_YOU, EC_WORD_DISLIKE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_QUES}, @@ -2306,7 +2306,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [288] = { .facilityClass = FACILITY_CLASS_SAILOR, - .trainerName = _("OMA"), + .trainerName = _("OMAR"), .speechBefore = {EC_WORD_LET_ME_WIN, EC_WORD_IN, EC_MOVE(RETURN), EC_WORD_FOR, EC_WORD_A, EC_MOVE2(PRESENT)}, .speechWin = {EC_WORD_HERE, EC_WORD_YOU, EC_WORD_ARE, EC_WORD_SOME, EC_MOVE2(TOXIC), EC_WORD_SWEETS}, .speechLose = {EC_WORD_YOUR, EC_MOVE2(PRESENT), EC_WORD_QUES, EC_WORD_WHAT, EC_WORD_FOR, EC_WORD_QUES_EXCL}, @@ -2314,7 +2314,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [289] = { .facilityClass = FACILITY_CLASS_SAILOR, - .trainerName = _("PETE"), + .trainerName = _("PETER"), .speechBefore = {EC_WORD_I, EC_WORD_BRAG, EC_WORD_ABOUT, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_OK_QUES}, .speechWin = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_LISTEN, EC_WORD_TO_ME, EC_WORD_BRAG}, .speechLose = {EC_WORD_I_AM, EC_WORD_DISAPPOINTED, EC_WORD_YOU, EC_WORD_WON_T, EC_WORD_LISTEN, EC_WORD_TO_ME}, @@ -2322,7 +2322,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [290] = { .facilityClass = FACILITY_CLASS_HIKER, - .trainerName = _("DE"), + .trainerName = _("DEV"), .speechBefore = {EC_WORD_COME_ON, EC_WORD_LET_S, EC_WORD_GET, EC_WORD_A, EC_WORD_MOVE, EC_WORD_ON}, .speechWin = {EC_WORD_I, EC_WORD_GET, EC_WORD_TO, EC_WORD_NAP, EC_WORD_AFTER, EC_WORD_THAT}, .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_NAP, EC_WORD_AFTER, EC_WORD_THAT}, @@ -2330,7 +2330,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [291] = { .facilityClass = FACILITY_CLASS_HIKER, - .trainerName = _("CORE"), + .trainerName = _("COREY"), .speechBefore = {EC_WORD_LET_S, EC_WORD_TEACH, EC_WORD_YOU, EC_WORD_HOW, EC_WORD_TOUGH, EC_WORD_I_AM}, .speechWin = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_ME, EC_WORD_MAKE, EC_WORD_A, EC_MOVE(BRICK_BREAK)}, .speechLose = {EC_WORD_MY, EC_MOVE2(FRUSTRATION), EC_WORD_IS, EC_WORD_CLOSE, EC_WORD_TO, EC_MOVE2(ERUPTION)}, @@ -2338,7 +2338,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [292] = { .facilityClass = FACILITY_CLASS_KINDLER, - .trainerName = _("ANDR"), + .trainerName = _("ANDRE"), .speechBefore = {EC_WORD_NOW, EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_WORD_PERFECT, EC_WORD_FLAME_BODY}, .speechWin = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_FIERY, EC_WORD_DANCE, EC_WORD_EXCL}, .speechLose = {EC_WORD_YOU, EC_WORD_WANT, EC_WORD_AN, EC_MOVE2(EXPLOSION), EC_WORD_HERE, EC_WORD_QUES}, @@ -2346,15 +2346,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [293] = { .facilityClass = FACILITY_CLASS_KINDLER, - .trainerName = _("FERRI"), + .trainerName = _("FERRIS"), .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_IN, EC_WORD_THE, EC_WORD_OLD, EC_WORD_CLASS}, - .speechWin = {EC_WORD_NO_1, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_NO_1, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_NO_1, EC_WORD_ANY, EC_WORD_MORE, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Ferris }, [294] = { .facilityClass = FACILITY_CLASS_PARASOL_LADY, - .trainerName = _("ALIVI"), + .trainerName = _("ALIVIA"), .speechBefore = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_GIDDY, EC_WORD_SO, EC_WORD_SHOULD, EC_WORD_YOU}, .speechWin = {EC_WORD_IT, EC_WORD_WAS, EC_WORD_ALL, EC_WORD_TOGETHER, EC_WORD_TOO, EC_WORD_EASY}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GIDDY, EC_WORD_UP, EC_WORD_AND, EC_WORD_AWAY}, @@ -2362,39 +2362,39 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [295] = { .facilityClass = FACILITY_CLASS_PARASOL_LADY, - .trainerName = _("PAIG"), - .speechBefore = {EC_WORD_LET_S, EC_WORD_ENJOY, EC_WORD_OUR, EC_WORD_BATTLE, EC_WORD_TOGETHER, -1}, - .speechWin = {EC_WORD_THAT_S_IT_EXCL, -1, -1, EC_WORD_THANK_YOU, EC_WORD_VERY, EC_WORD_MUCH}, - .speechLose = {EC_WORD_THAT_S_IT_EXCL, -1, -1, EC_WORD_DO, EC_WORD_GO, EC_WORD_ON}, + .trainerName = _("PAIGE"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_ENJOY, EC_WORD_OUR, EC_WORD_BATTLE, EC_WORD_TOGETHER, 0xFFFF}, + .speechWin = {EC_WORD_THAT_S_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_VERY, EC_WORD_MUCH}, + .speechLose = {EC_WORD_THAT_S_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_DO, EC_WORD_GO, EC_WORD_ON}, .monSets = gBattleFrontierTrainerMons_Paige }, [296] = { .facilityClass = FACILITY_CLASS_BEAUTY, - .trainerName = _("ANY"), + .trainerName = _("ANYA"), .speechBefore = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_OH, EC_WORD_SO, EC_WORD_PRETTY, EC_WORD_FASHION}, - .speechWin = {EC_WORD_FASHION, EC_WORD_SHOULD, EC_WORD_MATCH, EC_WORD_THE, EC_WORD_PERSON, -1}, - .speechLose = {EC_WORD_PRETTY, EC_WORD_COULD, EC_WORD_BE, EC_WORD_GOOD, -1, -1}, + .speechWin = {EC_WORD_FASHION, EC_WORD_SHOULD, EC_WORD_MATCH, EC_WORD_THE, EC_WORD_PERSON, 0xFFFF}, + .speechLose = {EC_WORD_PRETTY, EC_WORD_COULD, EC_WORD_BE, EC_WORD_GOOD, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Anya }, [297] = { .facilityClass = FACILITY_CLASS_BEAUTY, - .trainerName = _("DAW"), - .speechBefore = {EC_WORD_I, EC_WORD_GO, EC_WORD_ALL, EC_WORD_OUT, EC_WORD_EXCL, -1}, - .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_A, EC_WORD_BABY, EC_WORD_EXCL, -1}, + .trainerName = _("DAWN"), + .speechBefore = {EC_WORD_I, EC_WORD_GO, EC_WORD_ALL, EC_WORD_OUT, EC_WORD_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_A, EC_WORD_BABY, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_YOU, EC_WORD_WON, EC_WORD_EXCL, EC_WORD_MOVE, EC_WORD_ON, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Dawn }, [298] = { .facilityClass = FACILITY_CLASS_AROMA_LADY, - .trainerName = _("ABB"), + .trainerName = _("ABBY"), .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_THAT_S, EC_WORD_REFRESHING}, - .speechWin = {EC_WORD_VICTORY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), EC_WORD_EXCL, -1}, - .speechLose = {EC_WORD_WHAT, EC_WORD_AN, EC_WORD_AWFUL, EC_WORD_STENCH, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_VICTORY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), EC_WORD_EXCL, 0xFFFF}, + .speechLose = {EC_WORD_WHAT, EC_WORD_AN, EC_WORD_AWFUL, EC_WORD_STENCH, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Abby }, [299] = { .facilityClass = FACILITY_CLASS_AROMA_LADY, - .trainerName = _("GRETE"), + .trainerName = _("GRETEL"), .speechBefore = {EC_WORD_I, EC_WORD_CAUSE, EC_MOVE(OUTRAGE), EC_WORD_AS, EC_WORD_A, EC_WORD_TRAINER}, .speechWin = {EC_WORD_IT_S, EC_WORD_ONLY, EC_WORD_NATURAL, EC_WORD_SEE_YA, EC_WORD_BYE_BYE, EC_WORD_EXCL}, .speechLose = {EC_WORD_IT_S, EC_WORD_HARD, EC_WORD_TO, EC_WORD_BELIEVE, EC_WORD_BUT, EC_WORD_CONGRATS}, diff --git a/src/frontier_util.c b/src/frontier_util.c index 5af7b3db7..f29248089 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -48,8 +48,6 @@ struct FrontierBrainMon u16 moves[4]; }; -extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; - extern void sub_81B8558(void); // This file's functions. -- cgit v1.2.3 From 3909b6408c0125fe311d49a3029a2806993615f7 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Thu, 29 Nov 2018 19:24:28 +0800 Subject: Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325 Some of the INVALID_ are likely erroneously placed, due to lack of documentation --- src/alloc.c | 210 ++++++++++++++++++++++++++++++ src/apprentice.c | 12 +- src/bard_music.c | 2 +- src/battle_ai_script_commands.c | 24 ++-- src/battle_ai_switch_items.c | 8 +- src/battle_anim.c | 48 +++---- src/battle_anim_80A5C6C.c | 4 +- src/battle_anim_80A9C70.c | 10 +- src/battle_anim_sound_tasks.c | 4 +- src/battle_anim_utility_funcs.c | 4 +- src/battle_arena.c | 2 +- src/battle_controller_link_opponent.c | 4 +- src/battle_controller_link_partner.c | 4 +- src/battle_controller_opponent.c | 4 +- src/battle_controller_player.c | 8 +- src/battle_controller_player_partner.c | 6 +- src/battle_controller_recorded_opponent.c | 4 +- src/battle_controller_recorded_player.c | 4 +- src/battle_controller_wally.c | 2 +- src/battle_controllers.c | 2 +- src/battle_dome.c | 96 +++++++------- src/battle_factory.c | 4 +- src/battle_factory_screen.c | 2 +- src/battle_gfx_sfx_util.c | 4 +- src/battle_interface.c | 28 ++-- src/battle_main.c | 26 ++-- src/battle_message.c | 4 +- src/battle_pike.c | 6 +- src/battle_pyramid.c | 4 +- src/battle_pyramid_bag.c | 38 +++--- src/battle_records.c | 2 +- src/battle_script_commands.c | 52 ++++---- src/battle_setup.c | 20 +-- src/battle_tent.c | 2 +- src/battle_tower.c | 10 +- src/battle_transition.c | 14 +- src/battle_tv.c | 20 +-- src/battle_util.c | 20 +-- src/battle_util2.c | 2 +- src/berry_blender.c | 6 +- src/berry_fix_program.c | 2 +- src/berry_tag_screen.c | 2 +- src/bg.c | 36 ++--- src/blit.c | 6 +- src/braille_puzzles.c | 2 +- src/cable_club.c | 6 +- src/contest.c | 18 +-- src/contest_effect.c | 28 ++-- src/credits.c | 2 +- src/data2b.c | 2 +- src/daycare.c | 16 +-- src/decompress.c | 2 +- src/decoration.c | 16 +-- src/dewford_trend.c | 2 +- src/diploma.c | 2 +- src/easy_chat.c | 2 +- src/egg_hatch.c | 2 +- src/event_object_movement.c | 54 ++++---- src/evolution_scene.c | 6 +- src/field_control_avatar.c | 6 +- src/field_door.c | 2 +- src/field_effect.c | 22 ++-- src/field_message_box.c | 2 +- src/field_player_avatar.c | 2 +- src/field_region_map.c | 2 +- src/field_specials.c | 22 ++-- src/fieldmap.c | 4 +- src/fldeff_cut.c | 4 +- src/fldeff_groundshake.c | 4 +- src/fossil_specials.c | 4 +- src/frontier_util.c | 14 +- src/ground.c | 2 +- src/hall_of_fame.c | 44 +++---- src/intro.c | 2 +- src/intro_credits_graphics.c | 2 +- src/item.c | 2 +- src/item_icon.c | 4 +- src/item_menu.c | 38 +++--- src/item_menu_icons.c | 8 +- src/learn_move.c | 20 +-- src/librfu_rfu.c | 2 +- src/librfu_stwi.c | 2 +- src/link.c | 6 +- src/link_rfu.c | 36 ++--- src/list_menu.c | 8 +- src/load_save.c | 2 +- src/mail.c | 2 +- src/mail_data.c | 18 +-- src/main.c | 2 +- src/malloc.c | 210 ------------------------------ src/mauville_old_man.c | 6 +- src/menu.c | 30 ++--- src/mossdeep_gym.c | 2 +- src/naming_screen.c | 4 +- src/overworld.c | 8 +- src/palette.c | 2 +- src/player_pc.c | 2 +- src/pokeblock.c | 12 +- src/pokeblock_feed.c | 2 +- src/pokedex.c | 38 +++--- src/pokedex_cry_screen.c | 2 +- src/pokemon.c | 48 +++---- src/pokemon_animation.c | 20 +-- src/pokemon_icon.c | 6 +- src/pokemon_size_record.c | 2 +- src/pokemon_storage_system.c | 4 +- src/pokemon_summary_screen.c | 60 ++++----- src/rayquaza_scene.c | 2 +- src/record_mixing.c | 6 +- src/recorded_battle.c | 4 +- src/region_map.c | 2 +- src/reset_rtc_screen.c | 2 +- src/reset_save_heap.c | 2 +- src/rock.c | 2 +- src/rom_8011DC0.c | 18 +-- src/rom_8034C54.c | 8 +- src/rom_81520A8.c | 2 +- src/rotating_gate.c | 4 +- src/rtc.c | 10 +- src/safari_zone.c | 6 +- src/save.c | 50 +++---- src/save_location.c | 8 +- src/scanline_effect.c | 8 +- src/scrcmd.c | 4 +- src/script.c | 12 +- src/script_menu.c | 28 ++-- src/script_movement.c | 8 +- src/script_pokemon_util_80F87D8.c | 4 +- src/secret_base.c | 8 +- src/shop.c | 22 ++-- src/slot_machine.c | 12 +- src/smokescreen.c | 2 +- src/sound.c | 4 +- src/sprite.c | 64 ++++----- src/task.c | 4 +- src/text.c | 4 +- src/trader.c | 2 +- src/trainer_pokemon_sprites.c | 42 +++--- src/tv.c | 112 ++++++++-------- src/unk_pokedex_area_screen_helper.c | 2 +- src/use_pokeblock.c | 2 +- src/walda_phrase.c | 2 +- src/wild_encounter.c | 16 +-- src/window.c | 40 +++--- 144 files changed, 1103 insertions(+), 1103 deletions(-) create mode 100644 src/alloc.c delete mode 100644 src/malloc.c (limited to 'src') diff --git a/src/alloc.c b/src/alloc.c new file mode 100644 index 000000000..2944bc1c6 --- /dev/null +++ b/src/alloc.c @@ -0,0 +1,210 @@ +#include "global.h" + +static void *sHeapStart; +static u32 sHeapSize; +static u32 malloc_c_unused_0300000c; // needed to align dma3_manager.o(.bss) + +#define MALLOC_SYSTEM_ID 0xA3A3 + +struct MemBlock { + // Whether this block is currently allocated. + bool16 flag; + + // Magic number used for error checking. Should equal MALLOC_SYSTEM_ID. + u16 magic; + + // Size of the block (not including this header struct). + u32 size; + + // Previous block pointer. Equals sHeapStart if this is the first block. + struct MemBlock *prev; + + // Next block pointer. Equals sHeapStart if this is the last block. + struct MemBlock *next; + + // Data in the memory block. (Arrays of length 0 are a GNU extension.) + u8 data[0]; +}; + +void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next, u32 size) +{ + struct MemBlock *header = (struct MemBlock *)block; + + header->flag = FALSE; + header->magic = MALLOC_SYSTEM_ID; + header->size = size; + header->prev = prev; + header->next = next; +} + +void PutFirstMemBlockHeader(void *block, u32 size) +{ + PutMemBlockHeader(block, (struct MemBlock *)block, (struct MemBlock *)block, size - sizeof(struct MemBlock)); +} + +void *AllocInternal(void *heapStart, u32 size) +{ + struct MemBlock *pos = (struct MemBlock *)heapStart; + struct MemBlock *head = pos; + struct MemBlock *splitBlock; + u32 foundBlockSize; + + // Alignment + if (size & 3) + size = 4 * ((size / 4) + 1); + + for (;;) { + // Loop through the blocks looking for unused block that's big enough. + + if (!pos->flag) { + foundBlockSize = pos->size; + + if (foundBlockSize >= size) { + if (foundBlockSize - size < 2 * sizeof(struct MemBlock)) { + // The block isn't much bigger than the requested size, + // so just use it. + pos->flag = TRUE; + } else { + // The block is significantly bigger than the requested + // size, so split the rest into a separate block. + foundBlockSize -= sizeof(struct MemBlock); + foundBlockSize -= size; + + splitBlock = (struct MemBlock *)(pos->data + size); + + pos->flag = TRUE; + pos->size = size; + + PutMemBlockHeader(splitBlock, pos, pos->next, foundBlockSize); + + pos->next = splitBlock; + + if (splitBlock->next != head) + splitBlock->next->prev = splitBlock; + } + + return pos->data; + } + } + + if (pos->next == head) + return NULL; + + pos = pos->next; + } +} + +void FreeInternal(void *heapStart, void *pointer) +{ + if (pointer) { + struct MemBlock *head = (struct MemBlock *)heapStart; + struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock)); + block->flag = FALSE; + + // If the freed block isn't the last one, merge with the next block + // if it's not in use. + if (block->next != head) { + if (!block->next->flag) { + block->size += sizeof(struct MemBlock) + block->next->size; + block->next->magic = 0; + block->next = block->next->next; + if (block->next != head) + block->next->prev = block; + } + } + + // If the freed block isn't the first one, merge with the previous block + // if it's not in use. + if (block != head) { + if (!block->prev->flag) { + block->prev->next = block->next; + + if (block->next != head) + block->next->prev = block->prev; + + block->magic = 0; + block->prev->size += sizeof(struct MemBlock) + block->size; + } + } + } +} + +void *AllocZeroedInternal(void *heapStart, u32 size) +{ + void *mem = AllocInternal(heapStart, size); + + if (mem != NULL) { + if (size & 3) + size = 4 * ((size / 4) + 1); + + CpuFill32(0, mem, size); + } + + return mem; +} + +bool32 CheckMemBlockInternal(void *heapStart, void *pointer) +{ + struct MemBlock *head = (struct MemBlock *)heapStart; + struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock)); + + if (block->magic != MALLOC_SYSTEM_ID) + return FALSE; + + if (block->next->magic != MALLOC_SYSTEM_ID) + return FALSE; + + if (block->next != head && block->next->prev != block) + return FALSE; + + if (block->prev->magic != MALLOC_SYSTEM_ID) + return FALSE; + + if (block->prev != head && block->prev->next != block) + return FALSE; + + if (block->next != head && block->next != (struct MemBlock *)(block->data + block->size)) + return FALSE; + + return TRUE; +} + +void InitHeap(void *heapStart, u32 heapSize) +{ + sHeapStart = heapStart; + sHeapSize = heapSize; + PutFirstMemBlockHeader(heapStart, heapSize); +} + +void *Alloc(u32 size) +{ + AllocInternal(sHeapStart, size); +} + +void *AllocZeroed(u32 size) +{ + AllocZeroedInternal(sHeapStart, size); +} + +void Free(void *pointer) +{ + FreeInternal(sHeapStart, pointer); +} + +bool32 CheckMemBlock(void *pointer) +{ + return CheckMemBlockInternal(sHeapStart, pointer); +} + +bool32 CheckHeap() +{ + struct MemBlock *pos = (struct MemBlock *)sHeapStart; + + do { + if (!CheckMemBlockInternal(sHeapStart, pos->data)) + return FALSE; + pos = pos->next; + } while (pos != (struct MemBlock *)sHeapStart); + + return TRUE; +} diff --git a/src/apprentice.c b/src/apprentice.c index 499f85094..faed3756c 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -9,7 +9,7 @@ #include "item.h" #include "item_menu.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "new_game.h" #include "party_menu.h" @@ -1079,7 +1079,7 @@ void ResetApprenticeStruct(struct Apprentice *apprentice) u8 i; for (i = 0; i < 6; i++) - apprentice->easyChatWords[i] |= 0xFFFF; + apprentice->easyChatWords[i] |= INVALID_U16; apprentice->playerName[0] = EOS; apprentice->id = 16; @@ -1093,7 +1093,7 @@ void ResetAllApprenticeData(void) for (i = 0; i < 4; i++) { for (j = 0; j < 6; j++) - gSaveBlock2Ptr->apprentices[i].easyChatWords[j] |= 0xFFFF; + gSaveBlock2Ptr->apprentices[i].easyChatWords[j] |= INVALID_U16; gSaveBlock2Ptr->apprentices[i].id = 16; gSaveBlock2Ptr->apprentices[i].playerName[0] = EOS; gSaveBlock2Ptr->apprentices[i].lvlMode = 0; @@ -1290,7 +1290,7 @@ static u16 sub_819FF98(u8 arg0) else level = 60; - for (j = 0; learnset[j] != 0xFFFF; j++) + for (j = 0; learnset[j] != INVALID_U16; j++) { if ((learnset[j] & 0xFE00) > (level << 9)) break; @@ -1393,7 +1393,7 @@ static void GetLatestLearnedMoves(u16 species, u16 *moves) level = 60; learnset = gLevelUpLearnsets[species]; - for (i = 0; learnset[i] != 0xFFFF; i++) + for (i = 0; learnset[i] != INVALID_U16; i++) { if ((learnset[i] & 0xFE00) > (level << 9)) break; @@ -2236,7 +2236,7 @@ static void sub_81A1370(void) } r10 = 0xFFFF; - r9 = -1; + r9 = INVALID_S32; for (i = 1; i < 4; i++) { if (GetTrainerId(gSaveBlock2Ptr->apprentices[i].playerId) == GetTrainerId(gSaveBlock2Ptr->playerTrainerId) diff --git a/src/bard_music.c b/src/bard_music.c index 6c2578071..4c28233c2 100644 --- a/src/bard_music.c +++ b/src/bard_music.c @@ -54,7 +54,7 @@ void GetWordPhonemes(struct BardSong *song, u16 word) for (i = 0; i < 6; i ++) { sound = &song->sound[i]; - if (sound->var00 != 0xFF) + if (sound->var00 != INVALID_U8) { song->phonemes[i].length = sound->var01 + gBardSoundLengthTable[sound->var00]; song->phonemes[i].pitch = CalcWordPitch(word + 30, i); diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 3e7064eb5..e6c089b1b 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -276,7 +276,7 @@ static const u16 sDiscouragedPowerfulMoveEffects[] = EFFECT_SUPERPOWER, EFFECT_ERUPTION, EFFECT_OVERHEAT, - 0xFFFF + INVALID_U16 }; // code @@ -463,8 +463,8 @@ static u8 ChooseMoveOrAction_Doubles(void) { if (i == sBattler_AI || gBattleMons[i].hp == 0) { - actionOrMoveIndex[i] = -1; - bestMovePointsForTarget[i] = -1; + actionOrMoveIndex[i] = INVALID_U8; + bestMovePointsForTarget[i] = INVALID_S16 ; } else { @@ -530,7 +530,7 @@ static u8 ChooseMoveOrAction_Doubles(void) // Don't use a move against ally if it has less than 100 points. if (i == (sBattler_AI ^ BIT_FLANK) && bestMovePointsForTarget[i] < 100) { - bestMovePointsForTarget[i] = -1; + bestMovePointsForTarget[i] = INVALID_S16; mostViableMovesScores[0] = mostViableMovesScores[0]; // Needed to match. } } @@ -1003,7 +1003,7 @@ static void BattleAICmd_if_in_bytes(void) { const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != 0xFF) + while (*ptr != INVALID_U8) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1019,7 +1019,7 @@ static void BattleAICmd_if_not_in_bytes(void) { const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != 0xFF) + while (*ptr != INVALID_U8) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1035,7 +1035,7 @@ static void BattleAICmd_if_in_hwords(void) { const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != 0xFFFF) + while (*ptr != INVALID_U16) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1051,7 +1051,7 @@ static void BattleAICmd_if_not_in_hwords(void) { const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != 0xFFFF) + while (*ptr != INVALID_U16) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1167,14 +1167,14 @@ static void BattleAICmd_get_how_powerful_move_is(void) s32 i, checkedMove; s32 moveDmgs[4]; - for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++) + for (i = 0; sDiscouragedPowerfulMoveEffects[i] != INVALID_U16; i++) { if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect == sDiscouragedPowerfulMoveEffects[i]) break; } if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power > 1 - && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF) + && sDiscouragedPowerfulMoveEffects[i] == INVALID_U16) { gDynamicBasePower = 0; *(&gBattleStruct->dynamicMoveType) = 0; @@ -1184,14 +1184,14 @@ static void BattleAICmd_get_how_powerful_move_is(void) for (checkedMove = 0; checkedMove < 4; checkedMove++) { - for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++) + for (i = 0; sDiscouragedPowerfulMoveEffects[i] != INVALID_U16; i++) { if (gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].effect == sDiscouragedPowerfulMoveEffects[i]) break; } if (gBattleMons[sBattler_AI].moves[checkedMove] != MOVE_NONE - && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF + && sDiscouragedPowerfulMoveEffects[i] == INVALID_U16 && gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].power > 1) { gCurrentMove = gBattleMons[sBattler_AI].moves[checkedMove]; diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index ad25b483c..d6a8e1336 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -126,7 +126,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) return FALSE; if (gLastLandedMoves[gActiveBattler] == 0) return FALSE; - if (gLastLandedMoves[gActiveBattler] == 0xFFFF) + if (gLastLandedMoves[gActiveBattler] == INVALID_U16) return FALSE; if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0) return FALSE; @@ -221,7 +221,7 @@ static bool8 ShouldSwitchIfNaturalCure(void) if (gBattleMons[gActiveBattler].hp < gBattleMons[gActiveBattler].maxHP / 2) return FALSE; - if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == 0xFFFF) && Random() & 1) + if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == INVALID_U16) && Random() & 1) { *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); @@ -331,9 +331,9 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) if (gLastLandedMoves[gActiveBattler] == 0) return FALSE; - if (gLastLandedMoves[gActiveBattler] == 0xFFFF) + if (gLastLandedMoves[gActiveBattler] == INVALID_U16) return FALSE; - if (gLastHitBy[gActiveBattler] == 0xFF) + if (gLastHitBy[gActiveBattler] == INVALID_U8) return FALSE; if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0) return FALSE; diff --git a/src/battle_anim.c b/src/battle_anim.c index e8720fcfb..68ffed834 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1452,14 +1452,14 @@ void ClearBattleAnimationVars(void) // Clear index array. for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) - sAnimSpriteIndexArray[i] |= 0xFFFF; + sAnimSpriteIndexArray[i] |= INVALID_U16; // Clear anim args. for (i = 0; i < ANIM_ARGS_COUNT; i++) gBattleAnimArgs[i] = 0; - sMonAnimTaskIdArray[0] = 0xFF; - sMonAnimTaskIdArray[1] = 0xFF; + sMonAnimTaskIdArray[0] = INVALID_U8; + sMonAnimTaskIdArray[1] = INVALID_U8; gAnimMoveTurn = 0; sAnimBackgroundFadeState = 0; sAnimMoveIndex = 0; @@ -1505,19 +1505,19 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo for (i = 0; i < ANIM_ARGS_COUNT; i++) gBattleAnimArgs[i] = 0; - sMonAnimTaskIdArray[0] = 0xFF; - sMonAnimTaskIdArray[1] = 0xFF; + sMonAnimTaskIdArray[0] = INVALID_U8; + sMonAnimTaskIdArray[1] = INVALID_U8; sBattleAnimScriptPtr = animsTable[tableId]; gAnimScriptActive = TRUE; gAnimFramesToWait = 0; gAnimScriptCallback = RunAnimScriptCommand; for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) - sAnimSpriteIndexArray[i] |= 0xFFFF; + sAnimSpriteIndexArray[i] |= INVALID_U16; if (isMoveAnim) { - for (i = 0; gMovesWithQuietBGM[i] != 0xFFFF; i++) + for (i = 0; gMovesWithQuietBGM[i] != INVALID_U16; i++) { if (tableId == gMovesWithQuietBGM[i]) { @@ -1558,7 +1558,7 @@ static void AddSpriteIndex(u16 index) for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) { - if (sAnimSpriteIndexArray[i] == 0xFFFF) + if (sAnimSpriteIndexArray[i] == INVALID_U16) { sAnimSpriteIndexArray[i] = index; return; @@ -1574,7 +1574,7 @@ static void ClearSpriteIndex(u16 index) { if (sAnimSpriteIndexArray[i] == index) { - sAnimSpriteIndexArray[i] |= 0xFFFF; + sAnimSpriteIndexArray[i] |= INVALID_U16; return; } } @@ -1712,7 +1712,7 @@ static void ScriptCmd_delay(void) sBattleAnimScriptPtr++; gAnimFramesToWait = sBattleAnimScriptPtr[0]; if (gAnimFramesToWait == 0) - gAnimFramesToWait = -1; + gAnimFramesToWait = INVALID_S8; sBattleAnimScriptPtr++; gAnimScriptCallback = WaitAnimFrameCount; } @@ -1746,7 +1746,7 @@ static void ScriptCmd_end(void) // Keep waiting as long as there are animations to be done. if (gAnimVisualTaskCount != 0 || gAnimSoundTaskCount != 0 - || sMonAnimTaskIdArray[0] != 0xFF || sMonAnimTaskIdArray[1] != 0xFF) + || sMonAnimTaskIdArray[0] != INVALID_U8 || sMonAnimTaskIdArray[1] != INVALID_U8) { sSoundAnimFramesToWait = 0; gAnimFramesToWait = 1; @@ -1773,11 +1773,11 @@ static void ScriptCmd_end(void) for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) { - if (sAnimSpriteIndexArray[i] != 0xFFFF) + if (sAnimSpriteIndexArray[i] != INVALID_U16) { FreeSpriteTilesByTag(gBattleAnimPicTable[sAnimSpriteIndexArray[i]].tag); FreeSpritePaletteByTag(gBattleAnimPicTable[sAnimSpriteIndexArray[i]].tag); - sAnimSpriteIndexArray[i] |= 0xFFFF; // set terminator. + sAnimSpriteIndexArray[i] |= INVALID_U16; // set terminator. } } @@ -2122,9 +2122,9 @@ static void ScriptCmd_clearmonbg(void) else battlerId = gBattleAnimTarget; - if (sMonAnimTaskIdArray[0] != 0xFF) + if (sMonAnimTaskIdArray[0] != INVALID_U8) gSprites[gBattlerSpriteIds[battlerId]].invisible = FALSE; - if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != 0xFF) + if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != INVALID_U8) gSprites[gBattlerSpriteIds[battlerId ^ BIT_FLANK]].invisible = FALSE; else animBattlerId = 0; @@ -2148,17 +2148,17 @@ static void sub_80A4980(u8 taskId) else to_BG2 = TRUE; - if (sMonAnimTaskIdArray[0] != 0xFF) + if (sMonAnimTaskIdArray[0] != INVALID_U8) { sub_80A477C(to_BG2); DestroyTask(sMonAnimTaskIdArray[0]); - sMonAnimTaskIdArray[0] = 0xFF; + sMonAnimTaskIdArray[0] = INVALID_U8; } if (gTasks[taskId].data[0] > 1) { sub_80A477C(to_BG2 ^ 1); DestroyTask(sMonAnimTaskIdArray[1]); - sMonAnimTaskIdArray[1] = 0xFF; + sMonAnimTaskIdArray[1] = INVALID_U8; } DestroyTask(taskId); } @@ -2421,7 +2421,7 @@ static void Task_FadeToBg(u8 taskId) { s16 bgId = gTasks[taskId].tBackgroundId; - if (bgId == -1) + if (bgId == INVALID_S16) LoadDefaultBg(); else LoadMoveBg(bgId); @@ -2477,7 +2477,7 @@ static void ScriptCmd_restorebg(void) sBattleAnimScriptPtr++; taskId = CreateTask(Task_FadeToBg, 5); - gTasks[taskId].tBackgroundId = -1; + gTasks[taskId].tBackgroundId = INVALID_S16; sAnimBackgroundFadeState = 1; } @@ -3001,7 +3001,7 @@ static void ScriptCmd_invisible(void) u8 spriteId; spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]); - if (spriteId != 0xFF) + if (spriteId != INVALID_U8) gSprites[spriteId].invisible = TRUE; sBattleAnimScriptPtr += 2; @@ -3012,7 +3012,7 @@ static void ScriptCmd_visible(void) u8 spriteId; spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]); - if (spriteId != 0xFF) + if (spriteId != INVALID_U8) gSprites[spriteId].invisible = FALSE; sBattleAnimScriptPtr += 2; @@ -3039,7 +3039,7 @@ static void ScriptCmd_doublebattle_2D(void) r4 = sub_80A8364(gBattleAnimTarget); spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); } - if (spriteId != 0xFF) + if (spriteId != INVALID_U8) { gSprites[spriteId].invisible = FALSE; if (r4 == 2) @@ -3075,7 +3075,7 @@ static void ScriptCmd_doublebattle_2E(void) spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); } - if (spriteId != 0xFF && r4 == 2) + if (spriteId != INVALID_U8 && r4 == 2) gSprites[spriteId].oam.priority = 2; } } diff --git a/src/battle_anim_80A5C6C.c b/src/battle_anim_80A5C6C.c index 2ac6cca90..1a2c279ec 100644 --- a/src/battle_anim_80A5C6C.c +++ b/src/battle_anim_80A5C6C.c @@ -7,7 +7,7 @@ #include "decompress.h" #include "dma3.h" #include "gpu_regs.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "pokemon_icon.h" #include "sprite.h" @@ -1590,7 +1590,7 @@ s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 whichBattler) } } } - return -1; + return INVALID_S16; } void obj_delete_but_dont_free_vram(struct Sprite *sprite) diff --git a/src/battle_anim_80A9C70.c b/src/battle_anim_80A9C70.c index f1245a032..c329a134d 100644 --- a/src/battle_anim_80A9C70.c +++ b/src/battle_anim_80A9C70.c @@ -183,7 +183,7 @@ void sub_80A9EF4(u8 taskId) SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); spriteId = CreateSprite(&gUnknown_0853EF48, x, y, 4); - if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == 0xFFFF) + if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == INVALID_U16) gSprites[spriteId].invisible = TRUE; SetSubspriteTables(&gSprites[spriteId], gUnknown_0853EF40); gTasks[taskId].data[15] = spriteId; @@ -315,10 +315,10 @@ void AnimTask_StatsChange(u8 taskId) CASE(MINUS2, STAT_ACC): goesDown = TRUE; animStatId = 2; sharply = TRUE; break; CASE(MINUS2, STAT_EVASION): goesDown = TRUE; animStatId = 4; sharply = TRUE; break; - case STAT_ANIM_MULTIPLE_PLUS1: goesDown = FALSE; animStatId = 0xFF; sharply = FALSE; break; - case STAT_ANIM_MULTIPLE_PLUS2: goesDown = FALSE; animStatId = 0xFF; sharply = TRUE; break; - case STAT_ANIM_MULTIPLE_MINUS1: goesDown = TRUE; animStatId = 0xFF; sharply = FALSE; break; - case STAT_ANIM_MULTIPLE_MINUS2: goesDown = TRUE; animStatId = 0xFF; sharply = TRUE; break; + case STAT_ANIM_MULTIPLE_PLUS1: goesDown = FALSE; animStatId = INVALID_U8; sharply = FALSE; break; + case STAT_ANIM_MULTIPLE_PLUS2: goesDown = FALSE; animStatId = INVALID_U8; sharply = TRUE; break; + case STAT_ANIM_MULTIPLE_MINUS1: goesDown = TRUE; animStatId = INVALID_U8; sharply = FALSE; break; + case STAT_ANIM_MULTIPLE_MINUS2: goesDown = TRUE; animStatId = INVALID_U8; sharply = TRUE; break; default: DestroyAnimVisualTask(taskId); diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index 07fb604b8..36738d36e 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -214,7 +214,7 @@ void sub_8158E9C(u8 taskId) if (species != SPECIES_NONE) { - if (gBattleAnimArgs[1] == 0xFF) + if (gBattleAnimArgs[1] == INVALID_U8) PlayCry3(species, pan, 9); else PlayCry3(species, pan, 7); @@ -238,7 +238,7 @@ static void sub_8158FF4(u8 taskId) } else { - if (gTasks[taskId].data[0] == 0xFF) + if (gTasks[taskId].data[0] == INVALID_U8) { if (!IsCryPlaying()) { diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 6dfebe77f..5ed30ddc0 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -3,7 +3,7 @@ #include "contest.h" #include "gpu_regs.h" #include "graphics.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "sound.h" #include "sprite.h" @@ -82,7 +82,7 @@ void sub_8116664(u8 taskId) animBattlers[1] = gBattleAnimTarget; break; case 5: - animBattlers[0] = 0xFF; + animBattlers[0] = INVALID_U8; break; case 6: selectedPalettes = 0; diff --git a/src/battle_arena.c b/src/battle_arena.c index cd2c976da..591fc82b9 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -449,7 +449,7 @@ static const union AnimCmd *const sSpriteAnimTable_8611F4C[] = static const struct SpriteTemplate sSpriteTemplate_JudgmentIcon = { .tileTag = 0x3E8, - .paletteTag = 0xFFFF, + .paletteTag = INVALID_U16, .oam = &sOamData_8611F24, .anims = sSpriteAnimTable_8611F4C, .images = NULL, diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 8cbc62aab..d65c61884 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -212,7 +212,7 @@ static void sub_8064470(void) static void sub_80644D8(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; LinkOpponentBufferExecCompleted(); @@ -395,7 +395,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 0cd15f39e..8bbbcbfd1 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -203,7 +203,7 @@ static void sub_814AF54(void) static void sub_814AFBC(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; LinkPartnerBufferExecCompleted(); @@ -279,7 +279,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index c057e8575..0aeb24c32 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -220,7 +220,7 @@ static void sub_805F240(void) static void sub_805F2A8(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; OpponentBufferExecCompleted(); @@ -389,7 +389,7 @@ static void CompleteOnHealthbarDone(void) { s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 2bd5ef365..3053e6c37 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -635,7 +635,7 @@ u32 sub_8057FBC(void) // unused PlaySE(SE_SELECT); gBattle_BG0_X = 0; gBattle_BG0_Y = 0x140; - var = 0xFF; + var = INVALID_U8; } if (gMain.newKeys & DPAD_LEFT && gMoveSelectionCursor[gActiveBattler] & 1) { @@ -936,7 +936,7 @@ static void sub_80588B4(void) static void sub_8058924(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; PlayerBufferExecCompleted(); @@ -1119,7 +1119,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } @@ -1221,7 +1221,7 @@ static void sub_8059400(u8 taskId) newExpPoints = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]); - if (newExpPoints == -1) // The bar has been filled with given exp points. + if (newExpPoints == INVALID_S16) // The bar has been filled with given exp points. { u8 level; s32 currExp; diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 02dd1383b..775b7676f 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -218,7 +218,7 @@ static void sub_81BAE98(void) static void sub_81BAF00(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; PlayerPartnerBufferExecCompleted(); @@ -294,7 +294,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } @@ -397,7 +397,7 @@ static void sub_81BB4E4(u8 taskId) r4 = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]); - if (r4 == -1) + if (r4 == INVALID_S16) { u8 level; s32 currExp; diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 0cf3634dc..842facd44 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -213,7 +213,7 @@ static void sub_81865C8(void) static void sub_8186630(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; RecordedOpponentBufferExecCompleted(); @@ -377,7 +377,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 4d7fdc01e..60bec78b1 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -202,7 +202,7 @@ static void sub_81899F0(void) static void sub_8189A58(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; RecordedPlayerBufferExecCompleted(); @@ -360,7 +360,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 5d87c4f90..9078ef577 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -348,7 +348,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controllers.c b/src/battle_controllers.c index a6d6e9294..e24549d82 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -51,7 +51,7 @@ void SetUpBattleVarsAndBirchZigzagoon(void) for (i = 0; i < MAX_BATTLERS_COUNT; i++) { gBattlerControllerFuncs[i] = nullsub_21; - gBattlerPositions[i] = 0xFF; + gBattlerPositions[i] = INVALID_U8; gActionSelectionCursor[i] = 0; gMoveSelectionCursor[i] = 0; } diff --git a/src/battle_dome.c b/src/battle_dome.c index 0f5721fb9..f03de7505 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -8,7 +8,7 @@ #include "event_data.h" #include "overworld.h" #include "util.h" -#include "malloc.h" +#include "alloc.h" #include "string_util.h" #include "random.h" #include "task.h" @@ -3032,7 +3032,7 @@ static s32 GetTypeEffectivenessPoints(s32 move, s32 targetSpecies, s32 arg2) s32 i = 0; s32 typePower = TYPE_x1; - if (move == MOVE_NONE || move == 0xFFFF || gBattleMoves[move].power == 0) + if (move == MOVE_NONE || move == INVALID_U16 || gBattleMoves[move].power == 0) return 0; defType1 = gBaseStats[targetSpecies].type1; @@ -3434,14 +3434,14 @@ static s32 TournamentIdOfOpponent(s32 roundId, s32 trainerId) if (j != val) return gUnknown_0860D14C[j]; else - return 0xFF; + return INVALID_U8; } else { if (!gSaveBlock2Ptr->frontier.domeTrainers[sIdToOpponentId[i][roundId]].isEliminated) return sIdToOpponentId[i][roundId]; else - return 0xFF; + return INVALID_U8; } } @@ -3562,7 +3562,7 @@ static void sub_8190400(u8 taskId) SetVBlankCallback(VblankCb0_BattleDome); sBattleDomeStruct = AllocZeroed(sizeof(*sBattleDomeStruct)); for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) - sBattleDomeStruct->arr[i] |= 0xFF; + sBattleDomeStruct->arr[i] |= INVALID_U8; LoadMonIconPalettes(); i = CreateTask(sub_8190CD4, 0); gTasks[i].data[0] = 0; @@ -3624,7 +3624,7 @@ static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite) { if (sprite->pos1.y >= 192) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3644,7 +3644,7 @@ static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite) { if (sprite->pos1.y <= -32) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3664,7 +3664,7 @@ static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite) { if (sprite->pos1.x >= 272) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3684,7 +3684,7 @@ static void SpriteCb_TrainerIconCardScrollRight(struct Sprite *sprite) { if (sprite->pos1.x <= -32) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3714,7 +3714,7 @@ static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite) { if (sprite->pos1.y >= 176) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; sub_80D2EF8(sprite); } } @@ -3736,7 +3736,7 @@ static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite) { if (sprite->pos1.y <= -16) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; sub_80D2EF8(sprite); } } @@ -3758,7 +3758,7 @@ static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite) { if (sprite->pos1.x >= 256) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; sub_80D2EF8(sprite); } } @@ -3780,7 +3780,7 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite) { if (sprite->pos1.x <= -16) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; sub_80D2EF8(sprite); } } @@ -4005,7 +4005,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4016,7 +4016,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4029,7 +4029,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4040,7 +4040,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4121,7 +4121,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4132,7 +4132,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4145,7 +4145,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4156,7 +4156,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4204,7 +4204,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4215,7 +4215,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4228,7 +4228,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4239,7 +4239,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4287,7 +4287,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4298,7 +4298,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4311,7 +4311,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4322,7 +4322,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4368,7 +4368,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4379,7 +4379,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4392,7 +4392,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4403,7 +4403,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4451,7 +4451,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4462,7 +4462,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4475,7 +4475,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4486,7 +4486,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4556,12 +4556,12 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) FreeAndDestroyTrainerPicSprite(sBattleDomeStruct->arr[i]); } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) sub_80D2EF8(&gSprites[sBattleDomeStruct->arr[i]]); } } @@ -4569,12 +4569,12 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) FreeAndDestroyTrainerPicSprite(sBattleDomeStruct->arr[i]); } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) sub_80D2EF8(&gSprites[sBattleDomeStruct->arr[i]]); } } @@ -5483,13 +5483,13 @@ static u8 sub_8193BDC(u8 taskId) } else { - if (gMain.newKeys == DPAD_UP && gUnknown_0860CBF1[spriteId][roundId][0] != 0xFF) + if (gMain.newKeys == DPAD_UP && gUnknown_0860CBF1[spriteId][roundId][0] != INVALID_U8) arrId = 0; - else if (gMain.newKeys == DPAD_DOWN && gUnknown_0860CBF1[spriteId][roundId][1] != 0xFF) + else if (gMain.newKeys == DPAD_DOWN && gUnknown_0860CBF1[spriteId][roundId][1] != INVALID_U8) arrId = 1; - else if (gMain.newKeys == DPAD_LEFT && gUnknown_0860CBF1[spriteId][roundId][2] != 0xFF) + else if (gMain.newKeys == DPAD_LEFT && gUnknown_0860CBF1[spriteId][roundId][2] != INVALID_U8) arrId = 2; - else if (gMain.newKeys == DPAD_RIGHT && gUnknown_0860CBF1[spriteId][roundId][3] != 0xFF) + else if (gMain.newKeys == DPAD_RIGHT && gUnknown_0860CBF1[spriteId][roundId][3] != INVALID_U8) arrId = 3; } @@ -6314,21 +6314,21 @@ static void DecideRoundWinners(u8 roundId) tournamentId1 = i; tournamentId2 = TournamentIdOfOpponent(roundId, gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId); // Frontier Brain always wins, check tournamentId1. - if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId2 != 0xFF) + if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId2 != INVALID_U8) { gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].isEliminated = 1; gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].eliminatedAt = roundId; gSaveBlock2Ptr->frontier.field_EC0[tournamentId2] = GetWinningMove(tournamentId1, tournamentId2, roundId); } // Frontier Brain always wins, check tournamentId2. - else if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId1 != 0xFF) + else if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId1 != INVALID_U8) { gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].isEliminated = 1; gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].eliminatedAt = roundId; gSaveBlock2Ptr->frontier.field_EC0[tournamentId1] = GetWinningMove(tournamentId2, tournamentId1, roundId); } // Decide which one of two trainers wins! - else if (tournamentId2 != 0xFF) + else if (tournamentId2 != INVALID_U8) { // BUG: points1 and points2 are not cleared at the beginning of the loop resulting in not fair results. diff --git a/src/battle_factory.c b/src/battle_factory.c index 1d7fbafc9..dd82da746 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -202,9 +202,9 @@ static void sub_81A5E94(void) gUnknown_03001288 = FALSE; for (i = 0; i < 6; i++) - gSaveBlock2Ptr->frontier.field_E70[i].monId |= 0xFFFF; + gSaveBlock2Ptr->frontier.field_E70[i].monId |= INVALID_U16; for (i = 0; i < 3; i++) - gUnknown_03006298[i] |= 0xFFFF; + gUnknown_03006298[i] |= INVALID_U16; saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); gTrainerBattleOpponent_A = 0; diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 42a9b579c..60b233daf 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -10,7 +10,7 @@ #include "palette.h" #include "task.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "bg.h" #include "gpu_regs.h" #include "string_util.h" diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 6f9d2db80..88dbb5360 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -6,7 +6,7 @@ #include "constants/battle_anim.h" #include "battle_interface.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "graphics.h" #include "random.h" #include "util.h" @@ -122,7 +122,7 @@ void FreeBattleSpritesData(void) u16 ChooseMoveAndTargetInBattlePalace(void) { s32 i, var1, var2; - s32 chosenMoveId = -1; + s32 chosenMoveId = INVALID_S32; struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]); u8 unusableMovesBits = CheckMoveLimitations(gActiveBattler, 0, 0xFF); s32 percent = Random() % 100; diff --git a/src/battle_interface.c b/src/battle_interface.c index c7eb11293..fd6d2a0ab 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -589,17 +589,17 @@ static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2) for (; i > -1; i--) { - array[i] = 0xFF; + array[i] = INVALID_U8; } - if (arrayPtr[3] == 0xFF) + if (arrayPtr[3] == INVALID_U8) arrayPtr[3] = 0; if (arg2 == 0) { for (i = 0, j = 0; i < 4; i++) { - if (array[j] == 0xFF) + if (array[j] == INVALID_U8) { arg1[j] &= 0xFC00; arg1[j] |= 0x1E; @@ -622,7 +622,7 @@ static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2) { for (i = 0; i < 4; i++) { - if (array[i] == 0xFF) + if (array[i] == INVALID_U8) { arg1[i] &= 0xFC00; arg1[i] |= 0x1E; @@ -1580,7 +1580,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (i = 0; i < PARTY_SIZE; i++) { - if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg + if (partyInfo[i].hp == INVALID_U16) // empty slot or an egg { gSprites[ballIconSpritesIds[i]].oam.tileNum += 1; gSprites[ballIconSpritesIds[i]].data[7] = 1; @@ -1599,7 +1599,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (i = 0, var = 5, j = 0; j < PARTY_SIZE; j++) { - if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg + if (partyInfo[j].hp == INVALID_U16) // empty slot or an egg { gSprites[ballIconSpritesIds[var]].oam.tileNum += 1; gSprites[ballIconSpritesIds[var]].data[7] = 1; @@ -1628,7 +1628,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (var = 5, i = 0; i < PARTY_SIZE; i++) { - if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg + if (partyInfo[i].hp == INVALID_U16) // empty slot or an egg { gSprites[ballIconSpritesIds[var]].oam.tileNum += 1; gSprites[ballIconSpritesIds[var]].data[7] = 1; @@ -1648,7 +1648,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (var = 0, i = 0, j = 0; j < PARTY_SIZE; j++) { - if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg + if (partyInfo[j].hp == INVALID_U16) // empty slot or an egg { gSprites[ballIconSpritesIds[i]].oam.tileNum += 1; gSprites[ballIconSpritesIds[i]].data[7] = 1; @@ -1765,7 +1765,7 @@ static void sub_8073E64(u8 taskId) s32 i; u8 battlerId = gTasks[taskId].tBattler; - if (--gTasks[taskId].tData15 == -1) + if (--gTasks[taskId].tData15 == INVALID_S16) { u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; @@ -1808,7 +1808,7 @@ static void sub_8073F98(u8 taskId) { SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].tData15) | ((16 - gTasks[taskId].tData15) << 8)); } - else if (gTasks[taskId].tData15 == -1) + else if (gTasks[taskId].tData15 == INVALID_S16) { u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; @@ -2289,7 +2289,7 @@ s32 MoveBattleBar(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 unused) if (whichBar == EXP_BAR || (whichBar == HEALTH_BAR && !gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars)) MoveBattleBarGraphically(battlerId, whichBar); - if (currentBarValue == -1) + if (currentBarValue == INVALID_S32) gBattleSpritesDataPtr->battleBars[battlerId].currValue = 0; return currentBarValue; @@ -2376,12 +2376,12 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c if (maxValue < scale) { if (newValue == Q_24_8_TO_INT(*currValue) && (*currValue & 0xFF) == 0) - return -1; + return INVALID_S32; } else { if (newValue == *currValue) // we're done, the bar's value has been updated - return -1; + return INVALID_S32; } if (maxValue < scale) // handle cases of max var having less pixels than the whole bar @@ -2403,7 +2403,7 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c *currValue -= toAdd; ret = Q_24_8_TO_INT(*currValue); // try round up - if ((*currValue & 0xFF) > 0) + if ((*currValue & INVALID_U8) > 0) ret++; if (ret <= newValue) { diff --git a/src/battle_main.c b/src/battle_main.c index de0becd2a..19e85f1cf 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -23,7 +23,7 @@ #include "link_rfu.h" #include "load_save.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "m4a.h" #include "palette.h" #include "party_menu.h" @@ -500,7 +500,7 @@ const struct TrainerMoney gTrainerMoneyTable[] = {TRAINER_CLASS_HIKER, 10}, {TRAINER_CLASS_YOUNG_COUPLE, 8}, {TRAINER_CLASS_WINSTRATE, 10}, - {0xFF, 5}, + {INVALID_U8, 5}, }; #include "data/text/abilities.h" @@ -2251,7 +2251,7 @@ static void sub_8038F34(void) ShowBg(0); ShowBg(1); ShowBg(2); - gBattleCommunication[1] = 0xFF; + gBattleCommunication[1] = INVALID_U8; gBattleCommunication[MULTIUSE_STATE]++; break; case 1: @@ -2993,7 +2993,7 @@ static void BattleStartClearSetData(void) gLastLandedMoves[i] = 0; gLastHitByType[i] = 0; gLastResultingMoves[i] = 0; - gLastHitBy[i] = 0xFF; + gLastHitBy[i] = INVALID_U8; gLockedMoves[i] = 0; gLastPrintedMoves[i] = 0; gBattleResources->flags->flags[i] = 0; @@ -3161,7 +3161,7 @@ void SwitchInClearSetData(void) gLastHitByType[gActiveBattler] = 0; gLastResultingMoves[gActiveBattler] = 0; gLastPrintedMoves[gActiveBattler] = 0; - gLastHitBy[gActiveBattler] = 0xFF; + gLastHitBy[gActiveBattler] = INVALID_U8; *(gBattleStruct->lastTakenMove + gActiveBattler * 2 + 0) = 0; *(gBattleStruct->lastTakenMove + gActiveBattler * 2 + 1) = 0; @@ -3192,7 +3192,7 @@ void SwitchInClearSetData(void) gBattleResources->flags->flags[gActiveBattler] = 0; gCurrentMove = 0; - gBattleStruct->field_DA = 0xFF; + gBattleStruct->field_DA = INVALID_U8; ClearBattlerMoveHistory(gActiveBattler); ClearBattlerAbilityHistory(gActiveBattler); @@ -3253,7 +3253,7 @@ void FaintClearSetData(void) gLastHitByType[gActiveBattler] = 0; gLastResultingMoves[gActiveBattler] = 0; gLastPrintedMoves[gActiveBattler] = 0; - gLastHitBy[gActiveBattler] = 0xFF; + gLastHitBy[gActiveBattler] = INVALID_U8; *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 0) = 0; *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 1) = 0; @@ -3440,7 +3440,7 @@ static void BattleIntroDrawPartySummaryScreens(void) if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatus[i].hp = 0xFFFF; + hpStatus[i].hp = INVALID_U16; hpStatus[i].status = 0; } else @@ -3458,7 +3458,7 @@ static void BattleIntroDrawPartySummaryScreens(void) if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatus[i].hp = 0xFFFF; + hpStatus[i].hp = INVALID_U16; hpStatus[i].status = 0; } else @@ -3484,7 +3484,7 @@ static void BattleIntroDrawPartySummaryScreens(void) if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatus[i].hp = 0xFFFF; + hpStatus[i].hp = INVALID_U16; hpStatus[i].status = 0; } else @@ -3991,7 +3991,7 @@ void BattleTurnPassed(void) return; } - if (gBattleResults.battleTurnCounter < 0xFF) + if (gBattleResults.battleTurnCounter < INVALID_U8) { gBattleResults.battleTurnCounter++; gBattleStruct->field_DA++; @@ -4375,7 +4375,7 @@ static void HandleTurnActionSelectionState(void) return; default: sub_818603C(2); - if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == 0xFFFF) + if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == INVALID_U16) { gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; RecordedBattle_ClearBattlerAction(gActiveBattler, 1); @@ -5740,7 +5740,7 @@ static void HandleAction_ThrowPokeblock(void) gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBattlerAttacker][1] - 1; gLastUsedItem = gBattleBufferB[gBattlerAttacker][2]; - if (gBattleResults.pokeblockThrows < 0xFF) + if (gBattleResults.pokeblockThrows < INVALID_U8) gBattleResults.pokeblockThrows++; if (gBattleStruct->safariPkblThrowCounter < 3) gBattleStruct->safariPkblThrowCounter++; diff --git a/src/battle_message.c b/src/battle_message.c index 47c4cbe1d..c483740f6 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1156,7 +1156,7 @@ const u16 gCaughtMonStringIds[] = const u16 gTrappingMoves[] = { - MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, 0xFFFF + MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, INVALID_U16 }; const u8 gText_PkmnIsEvolving[] = _("What?\n{STR_VAR_1} is evolving!"); @@ -2967,7 +2967,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) printerTemplate.bgColor = textInfo[windowId].bgColor; printerTemplate.shadowColor = textInfo[windowId].shadowColor; - if (printerTemplate.x == 0xFF) + if (printerTemplate.x == INVALID_U8) { u32 width = sub_80397C4(gBattleScripting.windowsType, windowId); s32 alignX = GetStringCenterAlignXOffsetWithLetterSpacing(printerTemplate.fontId, printerTemplate.currentChar, width, printerTemplate.letterSpacing); diff --git a/src/battle_pike.c b/src/battle_pike.c index 38d3e7d4a..590fd3d74 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -9,7 +9,7 @@ #include "task.h" #include "battle_tower.h" #include "party_menu.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "script.h" #include "battle_setup.h" @@ -1228,7 +1228,7 @@ static void sub_81A7E60(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) static bool8 sub_81A7EC4(void) { - if (FindTaskIdByFunc(sub_81A7D54) == 0xFF) + if (FindTaskIdByFunc(sub_81A7D54) == INVALID_U8) return TRUE; else return FALSE; @@ -1448,7 +1448,7 @@ static void sub_81A84B4(void) u8 i; for (i = 0; i < 14; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF; + gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16; } static void sub_81A84EC(void) diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 23343ba20..36c757c93 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -21,7 +21,7 @@ #include "main.h" #include "load_save.h" #include "script.h" -#include "malloc.h" +#include "alloc.h" #include "overworld.h" #include "event_scripts.h" #include "constants/battle_frontier.h" @@ -1541,7 +1541,7 @@ void sub_81AA1D8(void) u8 var0, var1; for (i = 0; i < 8; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF; + gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16; id = sub_81AA9E4(); sub_81AA33C(&var0, &var1); diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 2225a3e55..8b3a509b9 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -17,7 +17,7 @@ #include "list_menu.h" #include "mail.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "menu_helpers.h" #include "overworld.h" @@ -388,11 +388,11 @@ void sub_81C4F98(u8 a0, void (*callback)(void)) gPyramidBagCursorData.callback = callback; gPyramidBagResources->callback2 = NULL; - gPyramidBagResources->unk814 = 0xFF; - gPyramidBagResources->scrollIndicatorsTaskId = 0xFF; + gPyramidBagResources->unk814 = INVALID_U8; + gPyramidBagResources->scrollIndicatorsTaskId = INVALID_U8; - memset(gPyramidBagResources->itemsSpriteIds, 0xFF, sizeof(gPyramidBagResources->itemsSpriteIds)); - memset(gPyramidBagResources->windowIds, 0xFF, sizeof(gPyramidBagResources->windowIds)); + memset(gPyramidBagResources->itemsSpriteIds, INVALID_U8, sizeof(gPyramidBagResources->itemsSpriteIds)); + memset(gPyramidBagResources->windowIds, INVALID_U8, sizeof(gPyramidBagResources->windowIds)); SetMainCallback2(sub_81C504C); } @@ -604,7 +604,7 @@ static void PyramidBagMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen PlaySE(SE_SELECT); sub_81C6F20(); } - if (gPyramidBagResources->unk814 == 0xFF) + if (gPyramidBagResources->unk814 == INVALID_U8) { sub_81C6FF8(gPyramidBagResources->unk815 ^ 1); if (itemIndex != LIST_B_PRESSED) @@ -622,7 +622,7 @@ static void PrintItemQuantity(u8 windowId, s32 itemIndex, u8 y) if (itemIndex == LIST_B_PRESSED) return; - if (gPyramidBagResources->unk814 != 0xFF) + if (gPyramidBagResources->unk814 != INVALID_U8) { if (gPyramidBagResources->unk814 == (u8)(itemIndex)) sub_81C5AB8(y, 1); @@ -657,16 +657,16 @@ static void PrintItemDescription(s32 listMenuId) static void AddScrollArrow(void) { - if (gPyramidBagResources->scrollIndicatorsTaskId == 0xFF) + if (gPyramidBagResources->scrollIndicatorsTaskId == INVALID_U8) gPyramidBagResources->scrollIndicatorsTaskId = AddScrollIndicatorArrowPairParameterized(2, 172, 12, 148, gPyramidBagResources->listMenuCount - gPyramidBagResources->listMenuMaxShown, 0xB5E, 0xB5E, &gPyramidBagCursorData.scrollPosition); } static void RemoveScrollArrow(void) { - if (gPyramidBagResources->scrollIndicatorsTaskId != 0xFF) + if (gPyramidBagResources->scrollIndicatorsTaskId != INVALID_U8) { RemoveScrollIndicatorArrowPair(gPyramidBagResources->scrollIndicatorsTaskId); - gPyramidBagResources->scrollIndicatorsTaskId = 0xFF; + gPyramidBagResources->scrollIndicatorsTaskId = INVALID_U8; } } @@ -803,7 +803,7 @@ static void sub_81C5A98(u8 listMenuTaskId, u8 arg1) static void sub_81C5AB8(u8 y, u8 arg1) { - if (arg1 == 0xFF) + if (arg1 == INVALID_U8) FillWindowPixelRect(0, 0, 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else PrintOnWindow_Font1(0, gText_SelectorArrow2, 0, y, 0, 0, 0, arg1); @@ -1323,7 +1323,7 @@ static void PerformItemSwap(u8 taskId) else { MovePyramidBagItemSlotInList(data[1], var); - gPyramidBagResources->unk814 = 0xFF; + gPyramidBagResources->unk814 = INVALID_U8; sub_81C7028(TRUE); DestroyListMenuTask(data[0], scrollOffset, selectedRow); if (data[1] < var) @@ -1340,7 +1340,7 @@ static void sub_81C6A14(u8 taskId) u16 *scrollOffset = &gPyramidBagCursorData.scrollPosition; u16 *selectedRow = &gPyramidBagCursorData.cursorPosition; - gPyramidBagResources->unk814 = 0xFF; + gPyramidBagResources->unk814 = INVALID_U8; sub_81C7028(TRUE); DestroyListMenuTask(data[0], scrollOffset, selectedRow); if (data[1] < *scrollOffset + *selectedRow) @@ -1427,7 +1427,7 @@ static u8 sub_81C6D08(u8 windowArrayId) static u8 sub_81C6D24(u8 windowArrayId) { u8 *windowId = &gPyramidBagResources->windowIds[windowArrayId]; - if (*windowId == 0xFF) + if (*windowId == INVALID_U8) { *windowId = AddWindow(&gUnknown_0861F350[windowArrayId]); SetWindowBorderStyle(*windowId, FALSE, 1, 0xE); @@ -1439,13 +1439,13 @@ static u8 sub_81C6D24(u8 windowArrayId) static void sub_81C6D6C(u8 windowArrayId) { u8 *windowId = &gPyramidBagResources->windowIds[windowArrayId]; - if (*windowId != 0xFF) + if (*windowId != INVALID_U8) { sub_8198070(*windowId, FALSE); ClearWindowTilemap(*windowId); RemoveWindow(*windowId); schedule_bg_copy_tilemap_to_vram(1); - *windowId = 0xFF; + *windowId = INVALID_U8; } } @@ -1473,13 +1473,13 @@ static void sub_81C6E1C(void) static void sub_81C6E38(u8 itemSpriteArrayId) { u8 *spriteId = &gPyramidBagResources->itemsSpriteIds[itemSpriteArrayId]; - if (*spriteId != 0xFF) + if (*spriteId != INVALID_U8) { FreeSpriteTilesByTag(ITEM_IMAGE_TAG + itemSpriteArrayId); FreeSpritePaletteByTag(ITEM_IMAGE_TAG + itemSpriteArrayId); FreeSpriteOamMatrix(&gSprites[*spriteId]); DestroySprite(&gSprites[*spriteId]); - *spriteId = 0xFF; + *spriteId = INVALID_U8; } } @@ -1524,7 +1524,7 @@ static void ShowItemImage(u16 itemId, u8 itemSpriteArrayId) { u8 itemSpriteId; u8 *spriteId = &gPyramidBagResources->itemsSpriteIds[itemSpriteArrayId + 1]; - if (*spriteId == 0xFF) + if (*spriteId == INVALID_U8) { FreeSpriteTilesByTag(ITEM_IMAGE_TAG + 1 + itemSpriteArrayId); FreeSpritePaletteByTag(ITEM_IMAGE_TAG + 1 + itemSpriteArrayId); diff --git a/src/battle_records.c b/src/battle_records.c index f64b5f494..f9c40d8de 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -18,7 +18,7 @@ #include "international_string_util.h" #include "sound.h" #include "constants/songs.h" -#include "malloc.h" +#include "alloc.h" #include "gpu_regs.h" #include "constants/game_stat.h" diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6a7ca1725..53f8defa5 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -763,8 +763,8 @@ static const struct SpriteTemplate sSpriteTemplate_MonIconOnLvlUpBox = static const u16 sProtectSuccessRates[] = {USHRT_MAX, USHRT_MAX / 2, USHRT_MAX / 4, USHRT_MAX / 8}; #define MIMIC_FORBIDDEN_END 0xFFFE -#define METRONOME_FORBIDDEN_END 0xFFFF -#define ASSIST_FORBIDDEN_END 0xFFFF +#define METRONOME_FORBIDDEN_END INVALID_U16 +#define ASSIST_FORBIDDEN_END INVALID_U16 static const u16 sMovesForbiddenToCopy[] = { @@ -822,7 +822,7 @@ static const u16 sWeightToDamageTable[] = 500, 60, 1000, 80, 2000, 100, - 0xFFFF, 0xFFFF + INVALID_U16, INVALID_U16 }; static const u16 sPickupItems[] = @@ -1976,7 +1976,7 @@ static void atk0C_datahpupdate(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); if (gSpecialStatuses[gActiveBattler].dmg == 0) - gSpecialStatuses[gActiveBattler].dmg = 0xFFFF; + gSpecialStatuses[gActiveBattler].dmg = INVALID_U16; } gBattlescriptCurrInstr += 2; } @@ -2579,7 +2579,7 @@ void SetMoveEffect(bool8 primary, u8 certain) u16 PayDay = gPaydayMoney; gPaydayMoney += (gBattleMons[gBattlerAttacker].level * 5); if (PayDay > gPaydayMoney) - gPaydayMoney = 0xFFFF; + gPaydayMoney = INVALID_U16; } BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; @@ -4520,7 +4520,7 @@ static void atk49_moveend(void) u8 arg1, arg2; u16 originallyUsedMove; - if (gChosenMove == 0xFFFF) + if (gChosenMove == INVALID_U16) originallyUsedMove = 0; else originallyUsedMove = gChosenMove; @@ -4593,7 +4593,7 @@ static void atk49_moveend(void) break; case ATK49_CHOICE_MOVE: // update choice band move if (!(gHitMarker & HITMARKER_OBEYS) || holdEffectAtk != HOLD_EFFECT_CHOICE_BAND - || gChosenMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != 0xFFFF)) + || gChosenMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != INVALID_U16)) goto LOOP; if (gChosenMove == MOVE_BATON_PASS && !(gMoveResultFlags & MOVE_RESULT_FAILED)) { @@ -4708,8 +4708,8 @@ static void atk49_moveend(void) } else { - gLastMoves[gBattlerAttacker] = 0xFFFF; - gLastResultingMoves[gBattlerAttacker] = 0xFFFF; + gLastMoves[gBattlerAttacker] = INVALID_U16; + gLastResultingMoves[gBattlerAttacker] = INVALID_U16; } if (!(gHitMarker & HITMARKER_FAINTED(gBattlerTarget))) @@ -4717,7 +4717,7 @@ static void atk49_moveend(void) if (gHitMarker & HITMARKER_OBEYS && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { - if (gChosenMove == 0xFFFF) + if (gChosenMove == INVALID_U16) { gLastLandedMoves[gBattlerTarget] = gChosenMove; } @@ -4729,7 +4729,7 @@ static void atk49_moveend(void) } else { - gLastLandedMoves[gBattlerTarget] = 0xFFFF; + gLastLandedMoves[gBattlerTarget] = INVALID_U16; } } gBattleScripting.atk49_state++; @@ -5662,7 +5662,7 @@ static void atk59_handlelearnnewmove(void) { gBattlescriptCurrInstr = jumpPtr2; } - else if (ret == 0xFFFF) + else if (ret == INVALID_U16) { gBattlescriptCurrInstr += 10; } @@ -6015,7 +6015,7 @@ static void atk61_drawpartystatussummary(void) if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatuses[i].hp = 0xFFFF; + hpStatuses[i].hp = INVALID_U16; hpStatuses[i].status = 0; } else @@ -6930,7 +6930,7 @@ static void atk7C_trymirrormove(void) move = *(i * 2 + gBattlerAttacker * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 0) | (*(i * 2 + gBattlerAttacker * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 1) << 8); - if (move != 0 && move != 0xFFFF) + if (move != 0 && move != INVALID_U16) { movesArray[validMovesCount] = move; validMovesCount++; @@ -6941,7 +6941,7 @@ static void atk7C_trymirrormove(void) move = *(gBattleStruct->lastTakenMove + gBattlerAttacker * 2 + 0) | (*(gBattleStruct->lastTakenMove + gBattlerAttacker * 2 + 1) << 8); - if (move != 0 && move != 0xFFFF) + if (move != 0 && move != INVALID_U16) { gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); gCurrentMove = move; @@ -7094,7 +7094,7 @@ bool8 UproarWakeUpCheck(u8 battlerId) gBattleScripting.battler = i; - if (gBattlerTarget == 0xFF) + if (gBattlerTarget == INVALID_U8) gBattlerTarget = i; else if (gBattlerTarget == i) gBattleCommunication[MULTISTRING_CHOOSER] = 0; @@ -8008,7 +8008,7 @@ static void atk9A_setfocusenergy(void) static void atk9B_transformdataexecution(void) { - gChosenMove = 0xFFFF; + gChosenMove = INVALID_U16; gBattlescriptCurrInstr++; if (gBattleMons[gBattlerTarget].status2 & STATUS2_TRANSFORMED || gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE) @@ -8088,12 +8088,12 @@ static bool8 IsMoveUncopyableByMimic(u16 move) static void atk9D_mimicattackcopy(void) { - gChosenMove = 0xFFFF; + gChosenMove = INVALID_U16; if (IsMoveUncopyableByMimic(gLastMoves[gBattlerTarget]) || gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED || gLastMoves[gBattlerTarget] == 0 - || gLastMoves[gBattlerTarget] == 0xFFFF) + || gLastMoves[gBattlerTarget] == INVALID_U16) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -8296,7 +8296,7 @@ static void atkA5_painsplitdmgcalc(void) storeLoc[3] = (painSplitHp & 0xFF000000) >> 24; gBattleMoveDamage = gBattleMons[gBattlerAttacker].hp - hpDiff; - gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF; + gSpecialStatuses[gBattlerTarget].dmg = INVALID_U16; gBattlescriptCurrInstr += 5; } @@ -8309,7 +8309,7 @@ static void atkA5_painsplitdmgcalc(void) static void atkA6_settypetorandomresistance(void) // conversion 2 { if (gLastLandedMoves[gBattlerAttacker] == 0 - || gLastLandedMoves[gBattlerAttacker] == 0xFFFF) + || gLastLandedMoves[gBattlerAttacker] == INVALID_U16) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -8376,12 +8376,12 @@ static void atkA7_setalwayshitflag(void) static void atkA8_copymovepermanently(void) // sketch { - gChosenMove = 0xFFFF; + gChosenMove = INVALID_U16; if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED) && gLastPrintedMoves[gBattlerTarget] != MOVE_STRUGGLE && gLastPrintedMoves[gBattlerTarget] != 0 - && gLastPrintedMoves[gBattlerTarget] != 0xFFFF + && gLastPrintedMoves[gBattlerTarget] != INVALID_U16 && gLastPrintedMoves[gBattlerTarget] != MOVE_SKETCH) { s32 i; @@ -8550,7 +8550,7 @@ static void atkAC_remaininghptopower(void) static void atkAD_tryspiteppreduce(void) { if (gLastMoves[gBattlerTarget] != 0 - && gLastMoves[gBattlerTarget] != 0xFFFF) + && gLastMoves[gBattlerTarget] != INVALID_U16) { s32 i; @@ -9671,13 +9671,13 @@ static void atkDC_trysetgrudge(void) static void atkDD_weightdamagecalculation(void) { s32 i; - for (i = 0; sWeightToDamageTable[i] != 0xFFFF; i += 2) + for (i = 0; sWeightToDamageTable[i] != INVALID_U16; i += 2) { if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1)) break; } - if (sWeightToDamageTable[i] != 0xFFFF) + if (sWeightToDamageTable[i] != INVALID_U16) gDynamicBasePower = sWeightToDamageTable[i + 1]; else gDynamicBasePower = 120; diff --git a/src/battle_setup.c b/src/battle_setup.c index 4243d2f3f..0b5cd9e21 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1530,7 +1530,7 @@ static s32 FirstBattleTrainerIdToRematchTableId(const struct RematchTrainer *tab return i; } - return -1; + return INVALID_S32; } static s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId) @@ -1548,7 +1548,7 @@ static s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 tra } } - return -1; + return INVALID_S32; } static bool32 sub_80B1D94(s32 rematchTableId) @@ -1640,7 +1640,7 @@ static bool8 IsFirstTrainerIdReadyForRematch(const struct RematchTrainer *table, { s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == -1) + if (tableId == INVALID_S32) return FALSE; if (tableId >= 100) return FALSE; @@ -1654,7 +1654,7 @@ static bool8 IsTrainerReadyForRematch_(const struct RematchTrainer *table, u16 t { s32 tableId = TrainerIdToRematchTableId(table, trainerId); - if (tableId == -1) + if (tableId == INVALID_S32) return FALSE; if (tableId >= 100) return FALSE; @@ -1670,7 +1670,7 @@ static u16 GetRematchTrainerIdFromTable(const struct RematchTrainer *table, u16 s32 i; s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == -1) + if (tableId == INVALID_S32) return FALSE; trainerEntry = &table[tableId]; @@ -1691,7 +1691,7 @@ static u16 GetLastBeatenRematchTrainerIdFromTable(const struct RematchTrainer *t s32 i; s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == -1) + if (tableId == INVALID_S32) return FALSE; trainerEntry = &table[tableId]; @@ -1710,7 +1710,7 @@ static void ClearTrainerWantRematchState(const struct RematchTrainer *table, u16 { s32 tableId = TrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId != -1) + if (tableId != INVALID_S32) gSaveBlock1Ptr->trainerRematches[tableId] = 0; } @@ -1724,7 +1724,7 @@ static u32 GetTrainerMatchCallFlag(u32 trainerId) return FLAG_MATCH_CALL_REGISTERED + i; } - return 0xFFFF; + return INVALID_U16; } static void RegisterTrainerInMatchCall(void) @@ -1732,7 +1732,7 @@ static void RegisterTrainerInMatchCall(void) if (FlagGet(FLAG_HAS_MATCH_CALL)) { u32 matchCallFlagId = GetTrainerMatchCallFlag(gTrainerBattleOpponent_A); - if (matchCallFlagId != 0xFFFF) + if (matchCallFlagId != INVALID_U16) FlagSet(matchCallFlagId); } } @@ -1741,7 +1741,7 @@ static bool8 WasSecondRematchWon(const struct RematchTrainer *table, u16 firstBa { s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == -1) + if (tableId == INVALID_S32) return FALSE; if (!HasTrainerBeenFought(table[tableId].trainerIds[1])) return FALSE; diff --git a/src/battle_tent.c b/src/battle_tent.c index c7e70912c..836b2b6de 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -364,7 +364,7 @@ static void sub_81BA040(void) } while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum); gTrainerBattleOpponent_A = trainerId; - while (gFacilityTrainers[gTrainerBattleOpponent_A].monSets[setsCount] != 0xFFFF) + while (gFacilityTrainers[gTrainerBattleOpponent_A].monSets[setsCount] != INVALID_U16) setsCount++; if (setsCount > 8) break; diff --git a/src/battle_tower.c b/src/battle_tower.c index f9dfcabd1..c74cfd9a0 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -973,7 +973,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount) // Attempt to fill the trainer's party with random Pokemon until 3 have been // successfully chosen. The trainer's party may not have duplicate pokemon species // or duplicate held items. - for (bfMonCount = 0; monSets[bfMonCount] != 0xFFFF; bfMonCount++) + for (bfMonCount = 0; monSets[bfMonCount] != INVALID_U16; bfMonCount++) ; i = 0; otID = Random32(); @@ -1081,11 +1081,11 @@ u16 RandomizeFacilityTrainerMonSet(u16 trainerId) u8 bfMonCount = 0; u32 monSetId = monSets[bfMonCount]; - while (monSetId != 0xFFFF) + while (monSetId != INVALID_U16) { bfMonCount++; monSetId = monSets[bfMonCount]; - if (monSetId == 0xFFFF) + if (monSetId == INVALID_U16) break; } @@ -2641,11 +2641,11 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount) bfMonCount = 0; monSetId = monSets[bfMonCount]; - while (monSetId != 0xFFFF) + while (monSetId != INVALID_U16) { bfMonCount++; monSetId = monSets[bfMonCount]; - if (monSetId == 0xFFFF) + if (monSetId == INVALID_U16) break; } diff --git a/src/battle_transition.c b/src/battle_transition.c index 94b9e78f9..f15514f50 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -7,7 +7,7 @@ #include "field_effect.h" #include "gpu_regs.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "overworld.h" #include "palette.h" #include "random.h" @@ -749,7 +749,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_85C8E60[] = static const struct SpriteTemplate gUnknown_085C8E68 = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 4105, .oam = &gEventObjectBaseOam_32x32, .anims = sSpriteAnimTable_85C8E3C, @@ -798,7 +798,7 @@ static const union AnimCmd *const sSpriteAnimTable_85C8EA0[] = static const struct SpriteTemplate sSpriteTemplate_85C8EA4 = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 4106, .oam = &gOamData_85C8E80, .anims = sSpriteAnimTable_85C8EA0, @@ -809,7 +809,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EA4 = static const struct SpriteTemplate sSpriteTemplate_85C8EBC = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 4106, .oam = &gOamData_85C8E80, .anims = sSpriteAnimTable_85C8EA0, @@ -998,7 +998,7 @@ static bool8 Transition_Phase1(struct Task *task) static bool8 Transition_WaitForPhase1(struct Task *task) { - if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == 0xFF) + if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == INVALID_U8) { task->tState++; return TRUE; @@ -1019,7 +1019,7 @@ static bool8 Transition_Phase2(struct Task *task) static bool8 Transition_WaitForPhase2(struct Task *task) { task->tTransitionDone = FALSE; - if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == 0xFF) + if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == INVALID_U8) task->tTransitionDone = TRUE; return FALSE; } @@ -3605,7 +3605,7 @@ static void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) static bool8 IsPhase1Done(void) { - if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF) + if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == INVALID_U8) return TRUE; else return FALSE; diff --git a/src/battle_tv.c b/src/battle_tv.c index 535046fd1..edd506708 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -26,9 +26,9 @@ static const u16 sVariableDmgMoves[] = MOVE_WATER_SPOUT, MOVE_DREAM_EATER, MOVE_WEATHER_BALL, MOVE_SNORE, MOVE_PAIN_SPLIT, MOVE_GUILLOTINE, MOVE_FRUSTRATION, MOVE_RETURN, MOVE_ENDEAVOR, - MOVE_PRESENT, MOVE_REVENGE, 0xFFFF, + MOVE_PRESENT, MOVE_REVENGE, INVALID_U16, // those are handled by the function itself - MOVE_MAGNITUDE, MOVE_PSYWAVE, 0xFFFF + MOVE_MAGNITUDE, MOVE_PSYWAVE, INVALID_U16 }; static const u16 sUnknown_0860A4E0[] = @@ -199,7 +199,7 @@ static const u16 sUnknown_0860A8A4[] = STRINGID_PKMNAFFLICTEDBYCURSE, STRINGID_PKMNSAPPEDBYLEECHSEED, STRINGID_PKMNLOCKEDINNIGHTMARE, STRINGID_PKMNHURTBY, STRINGID_PKMNHURTBYBURN, STRINGID_PKMNHURTBYPOISON, STRINGID_PKMNHURTBYSPIKES, STRINGID_ATTACKERFAINTED, STRINGID_TARGETFAINTED, - STRINGID_PKMNHITWITHRECOIL, STRINGID_PKMNCRASHED, 0xFFFF + STRINGID_PKMNHITWITHRECOIL, STRINGID_PKMNCRASHED, INVALID_U16 }; // code @@ -625,9 +625,9 @@ static bool8 sub_817E0B8(u16 stringId) if (sUnknown_0860A8A4[i] == stringId) break; i++; - } while (sUnknown_0860A8A4[i] != 0xFFFF); + } while (sUnknown_0860A8A4[i] != INVALID_U16); - if (sUnknown_0860A8A4[i] == 0xFFFF) + if (sUnknown_0860A8A4[i] == INVALID_U16) return TRUE; else return FALSE; @@ -1164,7 +1164,7 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3) break; } i += 2; - } while (ptr[i] != 0xFFFF); + } while (ptr[i] != INVALID_U16); break; case 19: tvPtr->side[arg2 ^ 1].faintCause = 0; @@ -1415,9 +1415,9 @@ static void TrySetBattleSeminarShow(void) if (currMoveSaved == sVariableDmgMoves[i]) break; i++; - } while (sVariableDmgMoves[i] != 0xFFFF); + } while (sVariableDmgMoves[i] != INVALID_U16); - if (sVariableDmgMoves[i] != 0xFFFF) + if (sVariableDmgMoves[i] != INVALID_U16) return; dmgByMove[gMoveSelectionCursor[gBattlerAttacker]] = gBattleMoveDamage; @@ -1490,9 +1490,9 @@ static bool8 ShouldCalculateDamage(u16 moveId, s32 *dmg, u16 *powerOverride) if (moveId == sVariableDmgMoves[i]) break; i++; - } while (sVariableDmgMoves[i] != 0xFFFF); + } while (sVariableDmgMoves[i] != INVALID_U16); - if (sVariableDmgMoves[i] != 0xFFFF) + if (sVariableDmgMoves[i] != INVALID_U16) { *dmg = 0; return FALSE; diff --git a/src/battle_util.c b/src/battle_util.c index 251a545c9..12ca6bc9c 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -29,7 +29,7 @@ extern u8 weather_get_current(void); static const u16 sSoundMovesTable[] = { MOVE_GROWL, MOVE_ROAR, MOVE_SING, MOVE_SUPERSONIC, MOVE_SCREECH, MOVE_SNORE, - MOVE_UPROAR, MOVE_METAL_SOUND, MOVE_GRASS_WHISTLE, MOVE_HYPER_VOICE, 0xFFFF + MOVE_UPROAR, MOVE_METAL_SOUND, MOVE_GRASS_WHISTLE, MOVE_HYPER_VOICE, INVALID_U16 }; u8 GetBattlerForBattleScript(u8 caseId) @@ -382,7 +382,7 @@ u8 TrySetCantSelectMoveBattleScript(void) gPotentialItemEffectBattler = gActiveBattler; - if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != move) + if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != INVALID_U16 && *choicedMove != move) { gCurrentMove = *choicedMove; gLastUsedItem = gBattleMons[gActiveBattler].item; @@ -442,7 +442,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check) unusableMoves |= gBitTable[i]; if (gDisableStructs[battlerId].encoreTimer && gDisableStructs[battlerId].encoredMove != gBattleMons[battlerId].moves[i]) unusableMoves |= gBitTable[i]; - if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != gBattleMons[battlerId].moves[i]) + if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != INVALID_U16 && *choicedMove != gBattleMons[battlerId].moves[i]) unusableMoves |= gBitTable[i]; } return unusableMoves; @@ -451,7 +451,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check) bool8 AreAllMovesUnusable(void) { u8 unusable; - unusable = CheckMoveLimitations(gActiveBattler, 0, 0xFF); + unusable = CheckMoveLimitations(gActiveBattler, 0, INVALID_U8); if (unusable == 0xF) // All moves are unusable. { @@ -1137,7 +1137,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void) gBattlerTarget = gActiveBattler; gBattlerAttacker = gWishFutureKnock.futureSightAttacker[gActiveBattler]; gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBattler]; - gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF; + gSpecialStatuses[gBattlerTarget].dmg = INVALID_U16; BattleScriptExecute(BattleScript_MonTookFutureAttack); if (gWishFutureKnock.futureSightCounter[gActiveBattler] == 0 @@ -1996,12 +1996,12 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA case ABILITYEFFECT_MOVES_BLOCK: // 2 if (gLastUsedAbility == ABILITY_SOUNDPROOF) { - for (i = 0; sSoundMovesTable[i] != 0xFFFF; i++) + for (i = 0; sSoundMovesTable[i] != INVALID_U16; i++) { if (sSoundMovesTable[i] == move) break; } - if (sSoundMovesTable[i] != 0xFFFF) + if (sSoundMovesTable[i] != INVALID_U16) { if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS) gHitMarker |= HITMARKER_NO_PPDEDUCT; @@ -2527,7 +2527,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA break; } - if (effect && caseID < ABILITYEFFECT_CHECK_OTHER_SIDE && gLastUsedAbility != 0xFF) + if (effect && caseID < ABILITYEFFECT_CHECK_OTHER_SIDE && gLastUsedAbility != INVALID_U8) RecordAbilityBattle(battler, gLastUsedAbility); } @@ -3213,7 +3213,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) case HOLD_EFFECT_SHELL_BELL: if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && gSpecialStatuses[gBattlerTarget].dmg != 0 - && gSpecialStatuses[gBattlerTarget].dmg != 0xFFFF + && gSpecialStatuses[gBattlerTarget].dmg != INVALID_U16 && gBattlerAttacker != gBattlerTarget && gBattleMons[gBattlerAttacker].hp != gBattleMons[gBattlerAttacker].maxHP && gBattleMons[gBattlerAttacker].hp != 0) @@ -3394,7 +3394,7 @@ u8 IsMonDisobedient(void) calc = (gBattleMons[gBattlerAttacker].level + obedienceLevel) * rnd >> 8; if (calc < obedienceLevel) { - calc = CheckMoveLimitations(gBattlerAttacker, gBitTable[gCurrMovePos], 0xFF); + calc = CheckMoveLimitations(gBattlerAttacker, gBitTable[gCurrMovePos], INVALID_U8); if (calc == 0xF) // all moves cannot be used { gBattleCommunication[MULTISTRING_CHOOSER] = Random() & 3; diff --git a/src/battle_util2.c b/src/battle_util2.c index 5881abf25..a9891814c 100644 --- a/src/battle_util2.c +++ b/src/battle_util2.c @@ -1,7 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_controllers.h" -#include "malloc.h" +#include "alloc.h" #include "pokemon.h" #include "event_data.h" #include "constants/abilities.h" diff --git a/src/berry_blender.c b/src/berry_blender.c index 7320e905f..e977bdbeb 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -12,7 +12,7 @@ #include "bg.h" #include "palette.h" #include "decompress.h" -#include "malloc.h" +#include "alloc.h" #include "gpu_regs.h" #include "text.h" #include "text_window.h" @@ -1455,7 +1455,7 @@ static void sub_808074C(void) for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - sBerryBlenderData->field_96[i] = 0xFF; + sBerryBlenderData->field_96[i] = INVALID_U8; sBerryBlenderData->field_8E[i] = sUnknown_083399D0[sBerryBlenderData->playersNo - 2][i]; } for (j = 0; j < BLENDER_MAX_PLAYERS; j++) @@ -1479,7 +1479,7 @@ static void Blender_PrintPlayerNames(void) for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - if (sBerryBlenderData->field_8E[i] != 0xFF) + if (sBerryBlenderData->field_8E[i] != INVALID_U8) { sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]] = sBerryBlenderData->syncArrowSprite2Ids[i]; StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]]], i); diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index a90906d05..d87509e10 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -1,7 +1,7 @@ #include "global.h" #include "gpu_regs.h" #include "multiboot.h" -#include "malloc.h" +#include "alloc.h" #include "bg.h" #include "graphics.h" #include "main.h" diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 39927ab99..22f99a426 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -21,7 +21,7 @@ #include "string_util.h" #include "strings.h" #include "bg.h" -#include "malloc.h" +#include "alloc.h" #include "scanline_effect.h" #include "gpu_regs.h" #include "graphics.h" diff --git a/src/bg.c b/src/bg.c index a41075ad7..fd6ffca6e 100644 --- a/src/bg.c +++ b/src/bg.c @@ -87,37 +87,37 @@ void SetBgControlAttributes(u8 bg, u8 charBaseIndex, u8 mapBaseIndex, u8 screenS { if (IsInvalidBg(bg) == FALSE) { - if (charBaseIndex != 0xFF) + if (charBaseIndex != INVALID_U8) { sGpuBgConfigs.configs[bg].charBaseIndex = charBaseIndex & 0x3; } - if (mapBaseIndex != 0xFF) + if (mapBaseIndex != INVALID_U8) { sGpuBgConfigs.configs[bg].mapBaseIndex = mapBaseIndex & 0x1F; } - if (screenSize != 0xFF) + if (screenSize != INVALID_U8) { sGpuBgConfigs.configs[bg].screenSize = screenSize & 0x3; } - if (paletteMode != 0xFF) + if (paletteMode != INVALID_U8) { sGpuBgConfigs.configs[bg].paletteMode = paletteMode; } - if (priority != 0xFF) + if (priority != INVALID_U8) { sGpuBgConfigs.configs[bg].priority = priority & 0x3; } - if (mosaic != 0xFF) + if (mosaic != INVALID_U8) { sGpuBgConfigs.configs[bg].mosaic = mosaic & 0x1; } - if (wraparound != 0xFF) + if (wraparound != INVALID_U8) { sGpuBgConfigs.configs[bg].wraparound = wraparound; } @@ -154,7 +154,7 @@ u16 GetBgControlAttribute(u8 bg, u8 attributeId) } } - return 0xFF; + return INVALID_U8; } u8 LoadBgVram(u8 bg, const void *src, u16 size, u16 destOffset, u8 mode) @@ -379,7 +379,7 @@ u16 LoadBgTiles(u8 bg, const void* src, u16 size, u16 destOffset) cursor = LoadBgVram(bg, src, size, tileOffset, DISPCNT_MODE_1); - if (cursor == 0xFF) + if (cursor == INVALID_U8) { return -1; } @@ -400,7 +400,7 @@ u16 LoadBgTilemap(u8 bg, const void *src, u16 size, u16 destOffset) cursor = LoadBgVram(bg, src, size, destOffset * 2, DISPCNT_MODE_2); - if (cursor == 0xFF) + if (cursor == INVALID_U8) { return -1; } @@ -480,25 +480,25 @@ void SetBgAttribute(u8 bg, u8 attributeId, u8 value) switch (attributeId) { case 1: - SetBgControlAttributes(bg, value, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF); + SetBgControlAttributes(bg, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8); break; case 2: - SetBgControlAttributes(bg, 0xFF, value, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF); + SetBgControlAttributes(bg, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8); break; case 3: - SetBgControlAttributes(bg, 0xFF, 0xFF, value, 0xFF, 0xFF, 0xFF, 0xFF); + SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8); break; case 4: - SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, value, 0xFF, 0xFF, 0xFF); + SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8); break; case 7: - SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, value, 0xFF, 0xFF); + SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8); break; case 5: - SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, value, 0xFF); + SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8); break; case 6: - SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, value); + SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value); break; } } @@ -1284,7 +1284,7 @@ u32 GetBgType(u8 bg) break; } - return 0xFFFF; + return INVALID_U16; } bool32 IsInvalidBg32(u8 bg) diff --git a/src/blit.c b/src/blit.c index b4d5f7de5..2ba0e489c 100644 --- a/src/blit.c +++ b/src/blit.c @@ -3,7 +3,7 @@ void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height) { - BlitBitmapRect4Bit(src, dst, srcX, srcY, dstX, dstY, width, height, 0xFF); + BlitBitmapRect4Bit(src, dst, srcX, srcY, dstX, dstY, width, height, INVALID_U8); } void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height, u8 colorKey) @@ -33,7 +33,7 @@ void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 sr multiplierSrcY = (src->width + (src->width & 7)) >> 3; multiplierDstY = (dst->width + (dst->width & 7)) >> 3; - if (colorKey == 0xFF) + if (colorKey == INVALID_U8) { for (loopSrcY = srcY, loopDstY = dstY; loopSrcY < yEnd; loopSrcY++, loopDstY++) { @@ -132,7 +132,7 @@ void BlitBitmapRect4BitTo8Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, multiplierSrcY = (src->width + (src->width & 7)) >> 3; multiplierDstY = (dst->width + (dst->width & 7)) >> 3; - if (colorKey == 0xFF) + if (colorKey == INVALID_U8) { for (loopSrcY = srcY, loopDstY = dstY; loopSrcY < yEnd; loopSrcY++, loopDstY++) { diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index b17ffad33..6a2e42c4e 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -465,7 +465,7 @@ bool8 ShouldDoBrailleRegicePuzzle(void) } varValue = VarGet(0x403B); - if (varValue != 0xFFFF || VarGet(0x403C) != varValue || VarGet(0x403D) != 0xF) + if (varValue != INVALID_U16 || VarGet(0x403C) != varValue || VarGet(0x403D) != 0xF) return FALSE; if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 21) diff --git a/src/cable_club.c b/src/cable_club.c index 56154d5bf..649534711 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -70,7 +70,7 @@ static void sub_80B3220(u8 taskId); static void sub_80B236C(u8 arg0, u8 arg1) { - if (FindTaskIdByFunc(sub_80B2634) == 0xFF) + if (FindTaskIdByFunc(sub_80B2634) == INVALID_U8) { u8 taskId1; @@ -604,7 +604,7 @@ void sub_80B2EA8(void) { u32 taskId = FindTaskIdByFunc(sub_80B2EE4); - if (taskId == 0xFF) + if (taskId == INVALID_U8) { taskId = CreateTask(sub_80B2EE4, 80); gTasks[taskId].data[0] = 0; @@ -702,7 +702,7 @@ void sub_80B3028(void) u8 sub_80B3050(void) { if (FuncIsActiveTask(sub_80B3144) != FALSE) - return 0xFF; + return INVALID_U8; switch (gSpecialVar_0x8004) { diff --git a/src/contest.c b/src/contest.c index 0c3a041b0..716ed5dfc 100644 --- a/src/contest.c +++ b/src/contest.c @@ -1,7 +1,7 @@ #include "global.h" #include "gpu_regs.h" #include "bg.h" -#include "malloc.h" +#include "alloc.h" #include "constants/items.h" #include "constants/event_objects.h" #include "constants/moves.h" @@ -324,7 +324,7 @@ void sub_80D787C(void) *gContestResources->field_0 = (struct Contest){}; for (i = 0; i < 4; i++) { - gContestResources->field_0->unk19206[i] = 0xFF; + gContestResources->field_0->unk19206[i] = INVALID_U8; } for (i = 0; i < 4; i++) { @@ -344,7 +344,7 @@ void sub_80D787C(void) sub_80DCE58(0); for (i = 0; i < 4; i++) { - gContestResources->field_4[i].nextTurnOrder = 0xFF; + gContestResources->field_4[i].nextTurnOrder = INVALID_U8; gContestResources->field_0->unk19218[i] = gUnknown_02039F26[i]; } sub_80DD590(); @@ -2097,7 +2097,7 @@ void sub_80DAB8C(u8 contestType, u8 rank) opponents[opponentsCount++] = i; } } - opponents[opponentsCount] = 0xFF; + opponents[opponentsCount] = INVALID_U8; // Choose three random opponents from the list for (i = 0; i < 3; i++) @@ -2106,7 +2106,7 @@ void sub_80DAB8C(u8 contestType, u8 rank) s32 j; gContestMons[i] = gContestOpponents[opponents[rnd]]; - for (j = rnd; opponents[j] != 0xFF; j++) + for (j = rnd; opponents[j] != INVALID_U8; j++) opponents[j] = opponents[j + 1]; opponentsCount--; } @@ -2151,7 +2151,7 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame) else if (contestType == CONTEST_CATEGORY_TOUGH && gContestOpponents[i].aiPool_Tough) opponents[opponentsCount++] = i; } - opponents[opponentsCount] = 0xFF; + opponents[opponentsCount] = INVALID_U8; for (i = 0; i < 4 - gUnknown_02039F30; i++) { u16 rnd = sub_80F903C() % opponentsCount; @@ -2160,7 +2160,7 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame) gContestMons[gUnknown_02039F30 + i] = gContestOpponents[opponents[rnd]]; sub_80DF9D4(gContestMons[gUnknown_02039F30 + i].trainerName); sub_80DF9E0(gContestMons[gUnknown_02039F30 + i].nickname, GAME_LANGUAGE); - for (j = rnd; opponents[j] != 0xFF; j++) + for (j = rnd; opponents[j] != INVALID_U8; j++) opponents[j] = opponents[j + 1]; opponentsCount--; } @@ -2591,7 +2591,7 @@ void prints_contest_move_description(u16 a) ContestBG_FillBoxWithIncrementingTile(0, categoryTile, 0x0b, 0x1f, 0x05, 0x01, 0x11, 0x01); ContestBG_FillBoxWithIncrementingTile(0, categoryTile + 0x10, 0x0b, 0x20, 0x05, 0x01, 0x11, 0x01); - if (gContestEffects[gContestMoves[a].effect].appeal == 0xFF) + if (gContestEffects[gContestMoves[a].effect].appeal == INVALID_U8) numHearts = 0; else numHearts = gContestEffects[gContestMoves[a].effect].appeal / 10; @@ -2600,7 +2600,7 @@ void prints_contest_move_description(u16 a) ContestBG_FillBoxWithTile(0, 0x5035, 0x15, 0x1f, 0x08, 0x01, 0x11); ContestBG_FillBoxWithTile(0, 0x5012, 0x15, 0x1f, numHearts, 0x01, 0x11); - if (gContestEffects[gContestMoves[a].effect].jam == 0xFF) + if (gContestEffects[gContestMoves[a].effect].jam == INVALID_U8) numHearts = 0; else numHearts = gContestEffects[gContestMoves[a].effect].jam / 10; diff --git a/src/contest_effect.c b/src/contest_effect.c index 760d74d69..6f1c19fe2 100644 --- a/src/contest_effect.c +++ b/src/contest_effect.c @@ -144,7 +144,7 @@ static void ContestEffect_StartleFrontMon(void) break; } shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = 0xFF; + shared192D0.jamQueue[1] = INVALID_U8; idx = WasAtLeastOneOpponentJammed(); } if (idx == 0) @@ -168,7 +168,7 @@ static void ContestEffect_StartlePrevMons(void) shared192D0.jamQueue[j++] = i; } - shared192D0.jamQueue[j] = 0xFF; + shared192D0.jamQueue[j] = INVALID_U8; idx = WasAtLeastOneOpponentJammed(); } if (idx == 0) @@ -211,7 +211,7 @@ static void ContestEffect_StartlePrevMons2(void) u8 rval, jam; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = 0xFF; + shared192D0.jamQueue[1] = INVALID_U8; rval = Random() % 10; if (rval == 0) @@ -288,7 +288,7 @@ static void ContestEffect_StartleMonWithJudgesAttention(void) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = 0xFF; + shared192D0.jamQueue[1] = INVALID_U8; if (WasAtLeastOneOpponentJammed()) numStartled++; } @@ -393,7 +393,7 @@ static void ContestEffect_MakeFollowingMonsNervous(void) s16 oddsMod[4]; s16 odds[4]; - memset(contestantIds, 0xFF, ARRAY_COUNT(contestantIds)); + memset(contestantIds, INVALID_U8, ARRAY_COUNT(contestantIds)); for (i = 0, numAfter = 0; i < 4; i++) { if (shared192D0.turnOrder[shared192D0.contestant] < shared192D0.turnOrder[i] && @@ -431,7 +431,7 @@ static void ContestEffect_MakeFollowingMonsNervous(void) } if (odds[0] != 0) { - for (i = 0; contestantIds[i] != 0xFF; i++) + for (i = 0; contestantIds[i] != INVALID_U8; i++) { if (Random() % 100 < odds[i] + oddsMod[contestantIds[i]]) { @@ -504,7 +504,7 @@ static void ContestEffect_BadlyStartlesMonsInGoodCondition(void) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = 0xFF; + shared192D0.jamQueue[1] = INVALID_U8; if (WasAtLeastOneOpponentJammed()) numHit++; } @@ -755,7 +755,7 @@ static void ContestEffect_NextAppealEarlier(void) for (i = 0; i < 4; i++) turnOrder[i] = sContestantStatus[i].nextTurnOrder; - turnOrder[shared192D0.contestant] = 0xFF; + turnOrder[shared192D0.contestant] = INVALID_U8; for (i = 0; i < 4; i++) { @@ -797,7 +797,7 @@ static void ContestEffect_NextAppealLater(void) for (i = 0; i < 4; i++) turnOrder[i] = sContestantStatus[i].nextTurnOrder; - turnOrder[shared192D0.contestant] = 0xFF; + turnOrder[shared192D0.contestant] = INVALID_U8; for (i = 3; i > -1; i--) { @@ -855,12 +855,12 @@ static void ContestEffect_ScrambleNextTurnOrder(void) for (j = 0; j < 4; j++) { - if (unselectedContestants[j] != 0xFF) + if (unselectedContestants[j] != INVALID_U8) { if (rval == 0) { turnOrder[j] = i; - unselectedContestants[j] = 0xFF; + unselectedContestants[j] = INVALID_U8; break; } else @@ -906,7 +906,7 @@ static void ContestEffect_BadlyStartleMonsWithGoodAppeals(void) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = 0xFF; + shared192D0.jamQueue[1] = INVALID_U8; if (WasAtLeastOneOpponentJammed()) numJammed++; } @@ -974,7 +974,7 @@ static void JamByMoveCategory(u8 category) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = 0xFF; + shared192D0.jamQueue[1] = INVALID_U8; if (WasAtLeastOneOpponentJammed()) numJammed++; } @@ -1013,7 +1013,7 @@ static bool8 WasAtLeastOneOpponentJammed(void) s16 jamBuffer[4] = {0}; int i; - for (i = 0; shared192D0.jamQueue[i] != 0xFF; i++) + for (i = 0; shared192D0.jamQueue[i] != INVALID_U8; i++) { u8 contestant = shared192D0.jamQueue[i]; if (CanUnnerveContestant(contestant)) diff --git a/src/credits.c b/src/credits.c index df17ec70b..02b01c072 100644 --- a/src/credits.c +++ b/src/credits.c @@ -3,7 +3,7 @@ #include "main.h" #include "task.h" #include "bg.h" -#include "malloc.h" +#include "alloc.h" #include "window.h" #include "text.h" #include "menu.h" diff --git a/src/data2b.c b/src/data2b.c index 022903375..bb1baa266 100644 --- a/src/data2b.c +++ b/src/data2b.c @@ -1,7 +1,7 @@ #include "global.h" #include "data2.h" #include "graphics.h" -#include "malloc.h" +#include "alloc.h" #include "constants/species.h" const u16 gUnknown_082FF1D8[] = INCBIN_U16("graphics/link/minigame_digits.gbapal"); diff --git a/src/daycare.c b/src/daycare.c index 2356b36f5..227451f48 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -251,7 +251,7 @@ static void ApplyDaycareExperience(struct Pokemon *mon) while ((learnedMove = MonTryLearningNewMove(mon, firstMove)) != 0) { firstMove = FALSE; - if (learnedMove == 0xFFFF) + if (learnedMove == INVALID_U16) { // Mon already knows 4 moves. DeleteFirstMoveAndGiveMoveToMon(mon, gMoveToLearn); @@ -535,7 +535,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv) s32 i, j; u8 temp[NUM_STATS]; - ivs[selectedIv] = 0xff; + ivs[selectedIv] = INVALID_U8; for (i = 0; i < NUM_STATS; i++) { temp[i] = ivs[i]; @@ -544,7 +544,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv) j = 0; for (i = 0; i < NUM_STATS; i++) { - if (temp[i] != 0xff) + if (temp[i] != INVALID_U8) ivs[j++] = temp[i]; } } @@ -684,7 +684,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { if (sHatchedEggFatherMoves[i] == sHatchedEggEggMoves[j]) { - if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xffff) + if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == INVALID_U16) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]); break; } @@ -703,7 +703,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { if (sHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01_FOCUS_PUNCH + j) && CanMonLearnTMHM(egg, j)) { - if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xffff) + if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == INVALID_U16) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]); } } @@ -728,7 +728,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { if (sHatchedEggLevelUpMoves[j] != MOVE_NONE && sHatchedEggFinalMoves[i] == sHatchedEggLevelUpMoves[j]) { - if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == 0xffff) + if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == INVALID_U16) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFinalMoves[i]); break; } @@ -773,7 +773,7 @@ static void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *dayca if (motherItem == ITEM_LIGHT_BALL || fatherItem == ITEM_LIGHT_BALL) { - if (GiveMoveToMon(mon, MOVE_VOLT_TACKLE) == 0xFFFF) + if (GiveMoveToMon(mon, MOVE_VOLT_TACKLE) == INVALID_U16) DeleteFirstMoveAndGiveMoveToMon(mon, MOVE_VOLT_TACKLE); } } @@ -909,7 +909,7 @@ static bool8 _DoEggActions_CheckHatch(struct DayCare *daycare) } // try to trigger poke sex - if (daycare->offspringPersonality == 0 && validEggs == 2 && (daycare->mons[1].steps & 0xFF) == 0xFF) + if (daycare->offspringPersonality == 0 && validEggs == 2 && (daycare->mons[1].steps & 0xFF) == INVALID_U8) { u8 loveScore = GetDaycareCompatibilityScore(daycare); if (loveScore > (Random() * 100u) / USHRT_MAX) diff --git a/src/decompress.c b/src/decompress.c index da1df436b..287a03e55 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -2,7 +2,7 @@ #include "decompress.h" #include "constants/species.h" #include "text.h" -#include "malloc.h" +#include "alloc.h" #include "pokemon.h" EWRAM_DATA ALIGNED(4) u8 gDecompressionBuffer[0x4000] = {0}; diff --git a/src/decoration.c b/src/decoration.c index eb85b4f5c..11fd59286 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1,7 +1,7 @@ #include "global.h" #include "constants/decorations.h" #include "decompress.h" -#include "malloc.h" +#include "alloc.h" #include "text.h" #include "string_util.h" #include "international_string_util.h" @@ -312,7 +312,7 @@ const struct SpriteFrameImage sDecorSelectorSpriteFrameImages = { }; const struct SpriteTemplate sDecorSelectorSpriteTemplate = { - 0xffff, + INVALID_U16, OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG, &sDecorSelectorOam, sDecorSelectorAnims, @@ -409,7 +409,7 @@ const struct SpriteFrameImage Unknown_085A73FC = { }; const struct SpriteTemplate gUnknown_085A7404 = { - 0xFFFF, + INVALID_U16, OVERWORLD_PLACE_DECOR_PLAYER_PAL_TAG, &Unknown_085A73E8, Unknown_085A73F8, @@ -881,7 +881,7 @@ void sub_81274A0(u8 a0, s32 a1, u8 a2) void sub_8127500(void) { - if (sDecorPCBuffer->unk_522 == 0xFF) + if (sDecorPCBuffer->unk_522 == INVALID_U8) { sDecorPCBuffer->unk_522 = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0x3c, 0x0c, 0x94, sDecorPCBuffer->unk_520 - sDecorPCBuffer->unk_521, 0x6e, 0x6e, &sSecretBasePCSelectDecorPageNo); } @@ -889,10 +889,10 @@ void sub_8127500(void) void sub_8127554(void) { - if (sDecorPCBuffer->unk_522 != 0xFF) + if (sDecorPCBuffer->unk_522 != INVALID_U8) { RemoveScrollIndicatorArrowPair(sDecorPCBuffer->unk_522); - sDecorPCBuffer->unk_522 = 0xFF; + sDecorPCBuffer->unk_522 = INVALID_U8; } } @@ -910,7 +910,7 @@ void sub_812759C(u8 taskId) sub_81269D4(3); sub_8127718(sCurDecorationCategory); sDecorPCBuffer = calloc(1, sizeof(struct DecorPCBuffer)); - sDecorPCBuffer->unk_522 = 0xFF; + sDecorPCBuffer->unk_522 = INVALID_U8; sub_8127284(); sub_81272C8(); sub_81272F8(); @@ -1188,7 +1188,7 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor) v0 = 0; } v1 = sub_8127B54(gDecorations[decor].id, i * decWidth + j); - if (v1 != 0xFFFF) + if (v1 != INVALID_U16) { MapGridSetMetatileEntryAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | flags | v1); } diff --git a/src/dewford_trend.c b/src/dewford_trend.c index 3050ebecf..cad5ef9c2 100644 --- a/src/dewford_trend.c +++ b/src/dewford_trend.c @@ -3,7 +3,7 @@ #include "easy_chat.h" #include "event_data.h" #include "link.h" -#include "malloc.h" +#include "alloc.h" #include "random.h" #include "text.h" #include "tv.h" diff --git a/src/diploma.c b/src/diploma.c index f8556eb7d..b3d5a48fa 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -5,7 +5,7 @@ #include "gpu_regs.h" #include "scanline_effect.h" #include "task.h" -#include "malloc.h" +#include "alloc.h" #include "decompress.h" #include "bg.h" #include "window.h" diff --git a/src/easy_chat.c b/src/easy_chat.c index e4233fb7f..25ef069e4 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -1,7 +1,7 @@ // Includes #include "global.h" -#include "malloc.h" +#include "alloc.h" #include "constants/songs.h" #include "sound.h" #include "overworld.h" diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 4b7ee9a61..77296c707 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -17,7 +17,7 @@ #include "menu.h" #include "trig.h" #include "random.h" -#include "malloc.h" +#include "alloc.h" #include "dma3.h" #include "gpu_regs.h" #include "bg.h" diff --git a/src/event_object_movement.c b/src/event_object_movement.c index e509c7738..0606364cd 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -9,7 +9,7 @@ #include "field_effect_helpers.h" #include "field_player_avatar.h" #include "fieldmap.h" -#include "malloc.h" +#include "alloc.h" #include "mauville_old_man.h" #include "metatile_behavior.h" #include "overworld.h" @@ -129,7 +129,7 @@ static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *); const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0}; -const struct SpriteTemplate gCameraSpriteTemplate = {0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject}; +const struct SpriteTemplate gCameraSpriteTemplate = {0, INVALID_U16, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject}; void (*const gCameraObjectFuncs[])(struct Sprite *) = { CameraObject_0, @@ -1093,10 +1093,10 @@ const u8 gUnknown_0850DC3F[][4] = { static void ClearEventObject(struct EventObject *eventObject) { *eventObject = (struct EventObject){}; - eventObject->localId = 0xFF; - eventObject->mapNum = 0xFF; - eventObject->mapGroup = 0xFF; - eventObject->movementActionId = 0xFF; + eventObject->localId = INVALID_U8; + eventObject->mapNum = INVALID_U8; + eventObject->mapGroup = INVALID_U8; + eventObject->movementActionId = INVALID_U8; } static void ClearAllEventObjects(void) @@ -1537,7 +1537,7 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl { eventObject->invisible = TRUE; } - *(u16 *)&spriteTemplate->paletteTag = 0xFFFF; + *(u16 *)&spriteTemplate->paletteTag = INVALID_U16; spriteId = CreateSprite(spriteTemplate, 0, 0, 0); if (spriteId == MAX_SPRITES) { @@ -1666,7 +1666,7 @@ u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x spriteTemplate = malloc(sizeof(struct SpriteTemplate)); MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables); - if (spriteTemplate->paletteTag != 0xFFFF) + if (spriteTemplate->paletteTag != INVALID_U16) { LoadEventObjectPalette(spriteTemplate->paletteTag); } @@ -1692,7 +1692,7 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, UpdateEventObjectSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables); - *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; + *(u16 *)&spriteTemplate.paletteTag = INVALID_U16; x += 7; y += 7; sub_80930E0(&x, &y, 8, 16); @@ -1849,7 +1849,7 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) spriteFrameImage.size = graphicsInfo->size; MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObject->graphicsId, eventObject->movementType, &spriteTemplate, &subspriteTables); spriteTemplate.images = &spriteFrameImage; - *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; + *(u16 *)&spriteTemplate.paletteTag = INVALID_U16; paletteSlot = graphicsInfo->paletteSlot; if (paletteSlot == 0) { @@ -1864,7 +1864,7 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) paletteSlot -= 16; sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot); } - *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; + *(u16 *)&spriteTemplate.paletteTag = INVALID_U16; spriteId = CreateSprite(&spriteTemplate, 0, 0, 0); if (spriteId != MAX_SPRITES) { @@ -2146,9 +2146,9 @@ void Unused_LoadEventObjectPaletteSet(u16 *paletteTags) static u8 sub_808E8F4(const struct SpritePalette *spritePalette) { - if (IndexOfSpritePaletteTag(spritePalette->tag) != 0xFF) + if (IndexOfSpritePaletteTag(spritePalette->tag) != INVALID_U8) { - return 0xFF; + return INVALID_U8; } return LoadSpritePalette(spritePalette); } @@ -2181,7 +2181,7 @@ static u8 FindEventObjectPaletteIndexByTag(u16 tag) return i; } } - return 0xFF; + return INVALID_U8; } void LoadPlayerObjectReflectionPalette(u16 tag, u8 slot) @@ -2513,7 +2513,7 @@ u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup) if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - return 0xFF; + return INVALID_U8; } return gEventObjects[eventObjectId].trainerType; } @@ -2529,7 +2529,7 @@ u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup) if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - return 0xFF; + return INVALID_U8; } return gEventObjects[eventObjectId].trainerRange_berryTreeId; } @@ -4374,7 +4374,7 @@ bool8 MovementType_CopyPlayer_Step0(struct EventObject *eventObject, struct Spri bool8 MovementType_CopyPlayer_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == INVALID_U8 || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } @@ -4553,7 +4553,7 @@ movement_type_def(MovementType_CopyPlayerInGrass, gMovementTypeFuncs_CopyPlayerI bool8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == INVALID_U8 || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } @@ -4699,7 +4699,7 @@ static void ClearEventObjectMovement(struct EventObject *eventObject, struct Spr eventObject->singleMovementActive = 0; eventObject->heldMovementActive = FALSE; eventObject->heldMovementFinished = FALSE; - eventObject->movementActionId = 0xFF; + eventObject->movementActionId = INVALID_U8; sprite->data[1] = 0; } @@ -5105,7 +5105,7 @@ bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject) bool8 EventObjectIsHeldMovementActive(struct EventObject *eventObject) { - if (eventObject->heldMovementActive && eventObject->movementActionId != 0xFF) + if (eventObject->heldMovementActive && eventObject->movementActionId != INVALID_U8) return TRUE; return FALSE; @@ -5138,7 +5138,7 @@ void EventObjectClearHeldMovementIfActive(struct EventObject *eventObject) void EventObjectClearHeldMovement(struct EventObject *eventObject) { - eventObject->movementActionId = 0xFF; + eventObject->movementActionId = INVALID_U8; eventObject->heldMovementActive = FALSE; eventObject->heldMovementFinished = FALSE; gSprites[eventObject->spriteId].data[1] = 0; @@ -5167,7 +5167,7 @@ u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject) if (eventObject->heldMovementActive) return eventObject->movementActionId; - return 0xFF; + return INVALID_U8; } void UpdateEventObjectCurrentMovement(struct EventObject *eventObject, struct Sprite *sprite, bool8 (*callback)(struct EventObject *, struct Sprite *)) @@ -5279,7 +5279,7 @@ static bool8 EventObjectExecSingleMovementAction(struct EventObject *eventObject { if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) { - eventObject->movementActionId = 0xFF; + eventObject->movementActionId = INVALID_U8; sprite->data[2] = 0; return TRUE; } @@ -5706,7 +5706,7 @@ u8 sub_80940C4(struct EventObject *eventObject, struct Sprite *sprite, u8 callba eventObject->triggerGroundEffectsOnMove = TRUE; eventObject->disableCoveringGroundEffects = TRUE; } - else if (result == 0xFF) + else if (result == INVALID_U8) { ShiftStillEventObjectCoords(eventObject); eventObject->triggerGroundEffectsOnStop = TRUE; @@ -5728,7 +5728,7 @@ u8 sub_809419C(struct EventObject *eventObject, struct Sprite *sprite) bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_8094188(eventObject, sprite) == 0xFF) + if (sub_8094188(eventObject, sprite) == INVALID_U8) { return TRUE; } @@ -5737,7 +5737,7 @@ bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite) bool8 sub_80941C8(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_809419C(eventObject, sprite) == 0xFF) + if (sub_809419C(eventObject, sprite) == INVALID_U8) { return TRUE; } @@ -9122,7 +9122,7 @@ void CreateLevitateMovementTask(struct EventObject *eventObject) StoreWordInTwoHalfwords(&task->data[0], (u32)eventObject); eventObject->warpArrowSpriteId = taskId; - task->data[3] = 0xFFFF; + task->data[3] = INVALID_U16; } static void ApplyLevitateMovement(u8 taskId) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 0d2072a15..25d85a855 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -2,7 +2,7 @@ #include "evolution_scene.h" #include "evolution_graphics.h" #include "sprite.h" -#include "malloc.h" +#include "alloc.h" #include "task.h" #include "palette.h" #include "main.h" @@ -748,7 +748,7 @@ static void Task_EvolutionScene(u8 taskID) GetMonData(mon, MON_DATA_NICKNAME, text); StringCopy10(gBattleTextBuff1, text); - if (var == 0xFFFF) // no place to learn it + if (var == INVALID_U16) // no place to learn it gTasks[taskID].tState = 22; else if (var == 0xFFFE) // it already knows that move break; @@ -1105,7 +1105,7 @@ static void Task_TradeEvolutionScene(u8 taskID) GetMonData(mon, MON_DATA_NICKNAME, text); StringCopy10(gBattleTextBuff1, text); - if (var == 0xFFFF) + if (var == INVALID_U16) gTasks[taskID].tState = 20; else if (var == 0xFFFE) break; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index c52f5190f..1dce3169e 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -266,7 +266,7 @@ const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatil else eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) + if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8) return NULL; for (i = 0; i < 4; i++) @@ -287,14 +287,14 @@ static const u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8 const u8 *script; eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height); - if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) + if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8) { if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE) return NULL; // Look for an event object on the other side of the counter. eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) + if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8) return NULL; } diff --git a/src/field_door.c b/src/field_door.c index c197aca14..a1fe5bb97 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -695,7 +695,7 @@ static void DrawClosedDoorTiles(const struct DoorGraphics *gfx, u32 x, u32 y) static void DrawDoor(const struct DoorGraphics *gfx, const struct DoorAnimFrame *frame, u32 x, u32 y) { - if (frame->offset == 0xFFFF) + if (frame->offset == INVALID_U16) { DrawClosedDoorTiles(gfx, x, y); if (sub_808A964()) diff --git a/src/field_effect.c b/src/field_effect.c index 935501130..91d61ef2f 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -305,7 +305,7 @@ const union AnimCmd *const gNewGameBirchImageAnimTable[] = { }; const struct SpriteTemplate gNewGameBirchObjectTemplate = { - .tileTag = 0xffff, + .tileTag = INVALID_U16, .paletteTag = 4102, .oam = &gNewGameBirchOamAttributes, .anims = gNewGameBirchImageAnimTable, @@ -383,7 +383,7 @@ const union AnimCmd *const gSpriteAnimTable_855C300[] = { }; const struct SpriteTemplate gSpriteTemplate_855C304 = { - .tileTag = 0xffff, + .tileTag = INVALID_U16, .paletteTag = 4103, .oam = &gOamData_855C218, .anims = gSpriteAnimTable_855C2F8, @@ -393,7 +393,7 @@ const struct SpriteTemplate gSpriteTemplate_855C304 = { }; const struct SpriteTemplate gSpriteTemplate_855C31C = { - .tileTag = 0xffff, + .tileTag = INVALID_U16, .paletteTag = 4100, .oam = &gOamData_855C220, .anims = gSpriteAnimTable_855C2F8, @@ -403,7 +403,7 @@ const struct SpriteTemplate gSpriteTemplate_855C31C = { }; const struct SpriteTemplate gSpriteTemplate_855C334 = { - .tileTag = 0xffff, + .tileTag = INVALID_U16, .paletteTag = 4112, .oam = &gOamData_855C220, .anims = gSpriteAnimTable_855C300, @@ -413,7 +413,7 @@ const struct SpriteTemplate gSpriteTemplate_855C334 = { }; const struct SpriteTemplate gSpriteTemplate_855C34C = { - .tileTag = 0xffff, + .tileTag = INVALID_U16, .paletteTag = 4112, .oam = &gOamData_855C26C, .anims = gSpriteAnimTable_855C300, @@ -618,7 +618,7 @@ u32 FieldEffectScript_ReadWord(u8 **script) void FieldEffectScript_LoadTiles(u8 **script) { struct SpriteSheet *sheet = (struct SpriteSheet *)FieldEffectScript_ReadWord(script); - if (GetSpriteTileStartByTag(sheet->tag) == 0xFFFF) + if (GetSpriteTileStartByTag(sheet->tag) == INVALID_U16) LoadSpriteSheet(sheet); (*script) += 4; } @@ -665,7 +665,7 @@ void FieldEffectFreeTilesIfUnused(u16 tileStart) u8 i; u16 tag = GetSpriteTileTagByTileStart(tileStart); - if (tag != 0xFFFF) + if (tag != INVALID_U16) { for (i = 0; i < MAX_SPRITES; i++) if (gSprites[i].inUse && gSprites[i].usingSheet && tileStart == gSprites[i].sheetTileStart) @@ -679,7 +679,7 @@ void FieldEffectFreePaletteIfUnused(u8 paletteNum) u8 i; u16 tag = GetSpritePaletteTagByPaletteNum(paletteNum); - if (tag != 0xFFFF) + if (tag != INVALID_U16) { for (i = 0; i < MAX_SPRITES; i++) if (gSprites[i].inUse && gSprites[i].oam.paletteNum == paletteNum) @@ -761,7 +761,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority) { s32 spriteId = CreateMonPicSprite_HandleDeoxys(species, 0, 0x8000, 1, x, y, 0, gMonPaletteTable[species].tag); PreservePaletteInWeather(IndexOfSpritePaletteTag(gMonPaletteTable[species].tag) + 0x10); - if (spriteId == 0xFFFF) + if (spriteId == INVALID_U16) return MAX_SPRITES; else return spriteId; @@ -772,7 +772,7 @@ u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subprio const struct CompressedSpritePalette *spritePalette = GetMonSpritePalStructFromOtIdPersonality(species, d, g); u16 spriteId = CreateMonPicSprite_HandleDeoxys(species, d, g, 1, x, y, 0, spritePalette->tag); PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10); - if (spriteId == 0xFFFF) + if (spriteId == INVALID_U16) return MAX_SPRITES; else return spriteId; @@ -3591,7 +3591,7 @@ const union AnimCmd *const gSpriteAnimTable_855C5DC[] = { }; const struct SpriteTemplate gUnknown_0855C5EC = { - .tileTag = 0xffff, + .tileTag = INVALID_U16, .paletteTag = 4378, .oam = &gOamData_855C218, .anims = gSpriteAnimTable_855C5DC, diff --git a/src/field_message_box.c b/src/field_message_box.c index 46da9e9e5..0725ca8c7 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -53,7 +53,7 @@ void task_add_textbox(void) void task_del_textbox(void) { u8 taskId = FindTaskIdByFunc(sub_8098154); - if (taskId != 0xFF) + if (taskId != INVALID_U8) DestroyTask(taskId); } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index a5aa23e32..7da89fe83 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1389,7 +1389,7 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) u8 eventObjectId; struct EventObject *eventObject; - playerEventObjTemplate.localId = 0xFF; + playerEventObjTemplate.localId = INVALID_U8; playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); playerEventObjTemplate.x = x - 7; playerEventObjTemplate.y = y - 7; diff --git a/src/field_region_map.c b/src/field_region_map.c index 40f48e668..d49ce3a4e 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -3,7 +3,7 @@ #include "gpu_regs.h" #include "international_string_util.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "palette.h" #include "region_map.h" diff --git a/src/field_specials.c b/src/field_specials.c index 4da751b27..629f2d0de 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -20,7 +20,7 @@ #include "link.h" #include "list_menu.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "match_call.h" #include "menu.h" #include "overworld.h" @@ -1957,12 +1957,12 @@ void sub_8139D98(void) bool32 warp0_in_pokecenter(void) { - static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, 0xffff }; + static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, INVALID_U16 }; int i; u16 map = (gLastUsedWarp.mapGroup << 8) + gLastUsedWarp.mapNum; - for (i = 0; gUnknown_085B2C2A[i] != 0xFFFF; i++) + for (i = 0; gUnknown_085B2C2A[i] != INVALID_U16; i++) { if (gUnknown_085B2C2A[i] == map) return TRUE; @@ -2946,10 +2946,10 @@ void sub_813AA44(void) static void sub_813AA60(u16 a0, u16 a1) { - static const u16 gUnknown_085B312C[] = { 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, 0xffff }; - static const u16 gUnknown_085B3142[] = { 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xffff }; - static const u16 gUnknown_085B314E[] = { 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 0xffff }; - static const u16 gUnknown_085B315C[] = { 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xffff }; + static const u16 gUnknown_085B312C[] = { 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, INVALID_U16 }; + static const u16 gUnknown_085B3142[] = { 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, INVALID_U16 }; + static const u16 gUnknown_085B314E[] = { 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, INVALID_U16 }; + static const u16 gUnknown_085B315C[] = { 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, INVALID_U16 }; static const u8 *const gUnknown_085B3170[] = { BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA, @@ -3004,7 +3004,7 @@ static void sub_813AA60(u16 a0, u16 a1) { case 3: AddTextPrinterParameterized2(0, 1, gUnknown_085B3170[a1], 0, NULL, 2, 1, 3); - if (gUnknown_085B312C[a1] == 0xFFFF) + if (gUnknown_085B312C[a1] == INVALID_U16) { sub_813ABD4(gUnknown_085B312C[a1]); } @@ -3017,7 +3017,7 @@ static void sub_813AA60(u16 a0, u16 a1) break; case 4: AddTextPrinterParameterized2(0, 1, gUnknown_085B319C[a1], 0, NULL, 2, 1, 3); - if (gUnknown_085B3142[a1] == 0xFFFF) + if (gUnknown_085B3142[a1] == INVALID_U16) { sub_813ABD4(gUnknown_085B3142[a1]); } @@ -3841,13 +3841,13 @@ bool32 sub_813B9C0(void) MAP_TRADE_CENTER, MAP_RECORD_CORNER, MAP_DOUBLE_BATTLE_COLOSSEUM, - 0xffff + INVALID_U16 }; int i; u16 map = (gSaveBlock1Ptr->location.mapGroup << 8) + gSaveBlock1Ptr->location.mapNum; - for (i = 0; gUnknown_085B3444[i] != 0xFFFF; i++) + for (i = 0; gUnknown_085B3444[i] != INVALID_U16; i++) { if (gUnknown_085B3444[i] == map) { diff --git a/src/fieldmap.c b/src/fieldmap.c index 0d8a706b1..aef17d49d 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -496,7 +496,7 @@ u16 GetBehaviorByMetatileId(u16 metatile) } else { - return 0xff; + return INVALID_U8; } } @@ -922,7 +922,7 @@ void sub_8088B94(int x, int y, int a2) bool8 sub_8088BF0(u16* a0, u16 a1, u8 a2) { - if (a2 == 0xFF) + if (a2 == INVALID_U8) return FALSE; if (a2 == 0) diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 230a95e0b..2cffd5d41 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -6,7 +6,7 @@ #include "field_player_avatar.h" #include "fieldmap.h" #include "fldeff_cut.h" -#include "malloc.h" +#include "alloc.h" #include "metatile_behavior.h" #include "overworld.h" #include "party_menu.h" @@ -164,7 +164,7 @@ const struct SpritePalette gFieldEffectObjectPaletteInfo6 = {gFieldEffectObjectP static const struct SpriteTemplate sSpriteTemplate_CutGrass = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0x1000, .oam = &sOamData_CutGrass, .anims = sSpriteAnimTable_CutGrass, diff --git a/src/fldeff_groundshake.c b/src/fldeff_groundshake.c index e9a46bb86..3bbc489c1 100644 --- a/src/fldeff_groundshake.c +++ b/src/fldeff_groundshake.c @@ -2,7 +2,7 @@ #include "event_data.h" #include "event_object_movement.h" #include "field_camera.h" -#include "malloc.h" +#include "alloc.h" #include "random.h" #include "roulette_util.h" #include "script.h" @@ -236,7 +236,7 @@ static void sub_81BE968(void) u8 taskId; taskId = FindTaskIdByFunc(sub_81BE9C0); - if(taskId != 0xFF) + if(taskId != INVALID_U8) gTasks[taskId].data[0]++; } diff --git a/src/fossil_specials.c b/src/fossil_specials.c index 8164a3a78..8f6e38e91 100644 --- a/src/fossil_specials.c +++ b/src/fossil_specials.c @@ -8,7 +8,7 @@ #include "fieldmap.h" #include "global.fieldmap.h" #include "gpu_regs.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "random.h" #include "script.h" @@ -302,7 +302,7 @@ static void sub_81BED50(u8 taskId) case 4: UnsetBgTilemapBuffer(0); anotherTaskId = FindTaskIdByFunc(sub_81BEBB4); - if (anotherTaskId != 0xFF) + if (anotherTaskId != INVALID_U8) DestroyTask(anotherTaskId); sUnknown_0203CF14[1] = sUnknown_0203CF14[0] = 0; sub_81BEB90(); diff --git a/src/frontier_util.c b/src/frontier_util.c index 5af7b3db7..e799f96c8 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -24,7 +24,7 @@ #include "data2.h" #include "record_mixing.h" #include "strings.h" -#include "malloc.h" +#include "alloc.h" #include "save.h" #include "load_save.h" #include "battle_dome.h" @@ -681,7 +681,7 @@ static const u8 sFacilityToBrainEventObjGfx[][2] = const u16 gFrontierBannedSpecies[] = { SPECIES_MEW, SPECIES_MEWTWO, SPECIES_HO_OH, SPECIES_LUGIA, SPECIES_CELEBI, - SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, 0xFFFF + SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, INVALID_U16 }; static const u8 *const gUnknown_08611CB0[][2] = @@ -1829,7 +1829,7 @@ void sub_81A3ACC(void) s32 i; for (i = 0; i < 20; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF; + gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16; } static void sub_81A3B00(void) @@ -1974,10 +1974,10 @@ static void AppendIfValid(u16 species, u16 heldItem, u16 hp, u8 lvlMode, u8 monL if (species == SPECIES_EGG || species == SPECIES_NONE) return; - for (i = 0; gFrontierBannedSpecies[i] != 0xFFFF && gFrontierBannedSpecies[i] != species; i++) + for (i = 0; gFrontierBannedSpecies[i] != INVALID_U16 && gFrontierBannedSpecies[i] != species; i++) ; - if (gFrontierBannedSpecies[i] != 0xFFFF) + if (gFrontierBannedSpecies[i] != INVALID_U16) return; if (lvlMode == FRONTIER_LVL_50 && monLevel > 50) return; @@ -2060,7 +2060,7 @@ static void sub_81A3FD4(void) s32 i; s32 caughtBannedMons = 0; s32 species = gFrontierBannedSpecies[0]; - for (i = 0; species != 0xFFFF; i++, species = gFrontierBannedSpecies[i]) + for (i = 0; species != INVALID_U16; i++, species = gFrontierBannedSpecies[i]) { if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT)) caughtBannedMons++; @@ -2068,7 +2068,7 @@ static void sub_81A3FD4(void) gStringVar1[0] = EOS; gSpecialVar_0x8004 = 1; count = 0; - for (i = 0; gFrontierBannedSpecies[i] != 0xFFFF; i++) + for (i = 0; gFrontierBannedSpecies[i] != INVALID_U16; i++) count = sub_81A3DD0(gFrontierBannedSpecies[i], count, caughtBannedMons); if (count == 0) diff --git a/src/ground.c b/src/ground.c index 6cb7b8557..abfeb3f3e 100644 --- a/src/ground.c +++ b/src/ground.c @@ -588,7 +588,7 @@ void sub_81152DC(u8 taskId) break; default: task->data[9] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); - if (task->data[9] == 0xFF) + if (task->data[9] == INVALID_U8) { DestroyAnimVisualTask(taskId); } diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 315990256..b75243b84 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -6,7 +6,7 @@ #include "pokemon.h" #include "text.h" #include "text_window.h" -#include "malloc.h" +#include "alloc.h" #include "gpu_regs.h" #include "graphics.h" #include "main.h" @@ -467,11 +467,11 @@ static void Task_Hof_InitMonData(u8 taskId) sUnknown_0203BCD4 = 0; gTasks[taskId].tDisplayedMonId = 0; - gTasks[taskId].tPlayerSpriteID = 0xFF; + gTasks[taskId].tPlayerSpriteID = INVALID_U8; for (i = 0; i < PARTY_SIZE; i++) { - gTasks[taskId].tMonSpriteId(i) = 0xFF; + gTasks[taskId].tMonSpriteId(i) = INVALID_U8; } if (gTasks[taskId].tDontSaveData) @@ -522,7 +522,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId) static void Task_Hof_TrySaveData(u8 taskId) { gGameContinueCallback = CB2_DoHallOfFameScreenDontSaveData; - if (TrySavingData(SAVE_HALL_OF_FAME) == 0xFF && gDamagedSaveSectors != 0) + if (TrySavingData(SAVE_HALL_OF_FAME) == INVALID_U8 && gDamagedSaveSectors != 0) { UnsetBgTilemapBuffer(1); UnsetBgTilemapBuffer(3); @@ -645,7 +645,7 @@ static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskId) BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0, RGB_BLACK); for (i = 0; i < PARTY_SIZE; i++) { - if (gTasks[taskId].tMonSpriteId(i) != 0xFF) + if (gTasks[taskId].tMonSpriteId(i) != INVALID_U8) gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 0; } @@ -668,7 +668,7 @@ static void sub_8173DC0(u8 taskId) u16 i; for (i = 0; i < PARTY_SIZE; i++) { - if (gTasks[taskId].tMonSpriteId(i) != 0xFF) + if (gTasks[taskId].tMonSpriteId(i) != INVALID_U8) gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 1; } BeginNormalPaletteFade(sUnknown_0203BCD4, 0, 12, 12, RGB(16, 29, 24)); @@ -752,7 +752,7 @@ static void Task_Hof_HandleExit(u8 taskId) for (i = 0; i < PARTY_SIZE; i++) { u8 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != 0xFF) + if (spriteId != INVALID_U8) { FreeOamMatrix(gSprites[spriteId].oam.matrixNum); FreeAndDestroyMonPicSprite(spriteId); @@ -847,7 +847,7 @@ void CB2_DoHallOfFamePC(void) for (i = 0; i < PARTY_SIZE; i++) { - gTasks[taskId].tMonSpriteId(i) = 0xFF; + gTasks[taskId].tMonSpriteId(i) = INVALID_U8; } sHofMonPtr = AllocZeroed(0x2000); @@ -937,7 +937,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId) } else { - gTasks[taskId].tMonSpriteId(i) = 0xFF; + gTasks[taskId].tMonSpriteId(i) = INVALID_U8; } } @@ -967,7 +967,7 @@ static void Task_HofPC_PrintMonInfo(u8 taskId) for (i = 0; i < PARTY_SIZE; i++) { u16 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != 0xFF) + if (spriteId != INVALID_U8) gSprites[spriteId].oam.priority = 1; } @@ -999,10 +999,10 @@ static void Task_HofPC_HandleInput(u8 taskId) for (i = 0; i < 6; i++) { u8 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != 0xFF) + if (spriteId != INVALID_U8) { FreeAndDestroyMonPicSprite(spriteId); - gTasks[taskId].tMonSpriteId(i) = 0xFF; + gTasks[taskId].tMonSpriteId(i) = INVALID_U8; } } if (gTasks[taskId].tCurrPageNo != 0) @@ -1060,10 +1060,10 @@ static void Task_HofPC_HandleExit(u8 taskId) for (i = 0; i < PARTY_SIZE; i++) { u16 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != 0xFF) + if (spriteId != INVALID_U8) { FreeAndDestroyMonPicSprite(spriteId); - gTasks[taskId].tMonSpriteId(i) = 0xFF; + gTasks[taskId].tMonSpriteId(i) = INVALID_U8; } } @@ -1130,7 +1130,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u { stringPtr = StringCopy(text, gText_Number); dexNumber = SpeciesToPokedexNum(currMon->species); - if (dexNumber != 0xFFFF) + if (dexNumber != INVALID_U16) { stringPtr[0] = (dexNumber / 100) + CHAR_0; stringPtr++; @@ -1417,7 +1417,7 @@ void sub_8175280(void) gSpecialVar_0x8004 = 180; taskId = CreateTask(sub_8175364, 0); - if (taskId != 0xFF) + if (taskId != INVALID_U8) { gTasks[taskId].data[1] = gSpecialVar_0x8004; gSpecialVar_0x8005 = taskId; @@ -1428,7 +1428,7 @@ static void sub_81752C0(void) { u8 taskId; - if ((taskId = FindTaskIdByFunc(sub_8175364)) != 0xFF) + if ((taskId = FindTaskIdByFunc(sub_8175364)) != INVALID_U8) DestroyTask(taskId); sub_8152254(); @@ -1473,7 +1473,7 @@ static void sub_8175364(u8 taskId) { DestroyTask(taskId); gSpecialVar_0x8004 = var; - gSpecialVar_0x8005 = 0xFFFF; + gSpecialVar_0x8005 = INVALID_U16; } LoadCompressedObjectPic(sHallOfFame_ConfettiSpriteSheet); LoadCompressedObjectPalette(sHallOfFame_ConfettiSpritePalette); @@ -1483,7 +1483,7 @@ static void sub_8175364(u8 taskId) if (data[1] != 0 && data[1] % 3 == 0) { var = sub_81524C4(&sOamData_85E53FC, 0x3E9, 0x3E9, Random() % 240, -(Random() % 8), Random() % 0x11, var); - if (var != 0xFF) + if (var != INVALID_U8) { sub_8152438(var, sub_81752F4); if ((Random() & 3) == 0) @@ -1496,12 +1496,12 @@ static void sub_8175364(u8 taskId) if (data[1] != 0) data[1]--; else if (data[15] == 0) - data[0] = 0xFF; + data[0] = INVALID_U8; break; - case 0xFF: + case INVALID_U8: sub_81752C0(); gSpecialVar_0x8004 = var; - gSpecialVar_0x8005 = 0xFFFF; + gSpecialVar_0x8005 = INVALID_U16; break; } } diff --git a/src/intro.c b/src/intro.c index 5a0e13869..44d1c086d 100644 --- a/src/intro.c +++ b/src/intro.c @@ -5,7 +5,7 @@ #include "task.h" #include "title_screen.h" #include "libgcnmultiboot.h" -#include "malloc.h" +#include "alloc.h" #include "gpu_regs.h" #include "link.h" #include "multiboot_pokemon_colosseum.h" diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index 20a360901..1b4e9e15a 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -58,7 +58,7 @@ static void sub_817B7C4(struct Sprite *sprite); static void nullsub_66(struct Sprite *sprite); static const struct SpriteTemplate gUnknown_085F504C = { - 2000, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C + 2000, INVALID_U16, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C }; static const struct CompressedSpriteSheet gUnknown_085F5064[] = { diff --git a/src/item.c b/src/item.c index 6d2dbd561..e2583ddb1 100644 --- a/src/item.c +++ b/src/item.c @@ -4,7 +4,7 @@ #include "string_util.h" #include "text.h" #include "event_data.h" -#include "malloc.h" +#include "alloc.h" #include "secret_base.h" #include "item_menu.h" #include "strings.h" diff --git a/src/item_icon.c b/src/item_icon.c index 41c6589f5..2af938ff8 100644 --- a/src/item_icon.c +++ b/src/item_icon.c @@ -2,7 +2,7 @@ #include "decompress.h" #include "graphics.h" #include "item_icon.h" -#include "malloc.h" +#include "alloc.h" #include "sprite.h" #include "constants/items.h" @@ -161,7 +161,7 @@ u8 AddCustomItemIconSprite(struct SpriteTemplate *customSpriteTemplate, u16 tile const void *GetItemIconPicOrPalette(u16 itemId, u8 which) { - if (itemId == 0xFFFF) + if (itemId == INVALID_U16) itemId = ITEM_FIELD_ARROW; else if (itemId >= ITEMS_COUNT) itemId = 0; diff --git a/src/item_menu.c b/src/item_menu.c index 1744a1bfa..5b18b06ec 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -23,7 +23,7 @@ #include "link.h" #include "mail.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "map_name_popup.h" #include "menu.h" #include "money.h" @@ -532,11 +532,11 @@ void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2) if (temp <= 1) gUnknown_0203CE54->unk81B = 1; gUnknown_0203CE54->unk0 = 0; - gUnknown_0203CE54->unk81A = 0xFF; + gUnknown_0203CE54->unk81A = INVALID_U8; gUnknown_0203CE54->unk81E = -1; gUnknown_0203CE54->unk81F = -1; - memset(gUnknown_0203CE54->unk804, 0xFF, sizeof(gUnknown_0203CE54->unk804)); - memset(gUnknown_0203CE54->unk810, 0xFF, 10); + memset(gUnknown_0203CE54->unk804, INVALID_U8, sizeof(gUnknown_0203CE54->unk804)); + memset(gUnknown_0203CE54->unk810, INVALID_U8, 10); SetMainCallback2(CB2_Bag); } } @@ -819,7 +819,7 @@ void bag_menu_change_item_callback(s32 a, bool8 b, struct ListMenu *unused) PlaySE(SE_SELECT); ShakeBagVisual(); } - if (gUnknown_0203CE54->unk81A == 0xFF) + if (gUnknown_0203CE54->unk81A == INVALID_U8) { RemoveBagItemIconSprite(1 ^ gUnknown_0203CE54->unk81B_1); if (a != -2) @@ -840,7 +840,7 @@ void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a) int offset; if (item_index_in_pocket != -2) { - if (gUnknown_0203CE54->unk81A != 0xFF) + if (gUnknown_0203CE54->unk81A != INVALID_U8) { if (gUnknown_0203CE54->unk81A == (u8)item_index_in_pocket) bag_menu_print_cursor(a, 2); @@ -897,7 +897,7 @@ void bag_menu_print_cursor_(u8 a, u8 b) void bag_menu_print_cursor(u8 a, u8 b) { - if (b == 0xFF) + if (b == INVALID_U8) FillWindowPixelRect(0, 0, 0, a, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else bag_menu_print(0, 1, gText_SelectorArrow2, 0, a, 0, 0, 0, b); @@ -906,32 +906,32 @@ void bag_menu_print_cursor(u8 a, u8 b) void bag_menu_add_pocket_scroll_arrow_indicators_maybe(void) { - if (gUnknown_0203CE54->unk81E == 0xFF) + if (gUnknown_0203CE54->unk81E == INVALID_U8) gUnknown_0203CE54->unk81E = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xAC, 12, 0x94, gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - gUnknown_0203CE54->unk82E[gUnknown_0203CE58.pocket], 0x6E, 0x6E, &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]); } void sub_81AB824(void) { - if (gUnknown_0203CE54->unk81E != 0xFF) + if (gUnknown_0203CE54->unk81E != INVALID_U8) { RemoveScrollIndicatorArrowPair(gUnknown_0203CE54->unk81E); - gUnknown_0203CE54->unk81E = 0xFF; + gUnknown_0203CE54->unk81E = INVALID_U8; } sub_81AB89C(); } void bag_menu_add_list_scroll_arrow_indicators_maybe(void) { - if (gUnknown_0203CE54->unk81B != 1 && gUnknown_0203CE54->unk81F == 0xFF) + if (gUnknown_0203CE54->unk81B != 1 && gUnknown_0203CE54->unk81F == INVALID_U8) gUnknown_0203CE54->unk81F = AddScrollIndicatorArrowPair(&gUnknown_08614094, &gUnknown_0203CE58.unk6); } void sub_81AB89C(void) { - if (gUnknown_0203CE54->unk81F != 0xFF) + if (gUnknown_0203CE54->unk81F != INVALID_U8) { RemoveScrollIndicatorArrowPair(gUnknown_0203CE54->unk81F); - gUnknown_0203CE54->unk81F = 0xFF; + gUnknown_0203CE54->unk81F = INVALID_U8; } } @@ -2303,7 +2303,7 @@ u8 sub_81AE124(u8 a) u8 bag_menu_add_window(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr == 0xFF) + if (*ptr == INVALID_U8) { *ptr = AddWindow(&gUnknown_086141AC[a]); SetWindowBorderStyle(*ptr, 0, 1, 14); @@ -2315,20 +2315,20 @@ u8 bag_menu_add_window(u8 a) void bag_menu_remove_window(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr != 0xFF) + if (*ptr != INVALID_U8) { sub_8198070(*ptr, 0); ClearWindowTilemap(*ptr); RemoveWindow(*ptr); schedule_bg_copy_tilemap_to_vram(1); - *ptr = 0xFF; + *ptr = INVALID_U8; } } u8 AddItemMessageWindow(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr == 0xFF) + if (*ptr == INVALID_U8) *ptr = AddWindow(&gUnknown_086141AC[a]); return *ptr; } @@ -2336,13 +2336,13 @@ u8 AddItemMessageWindow(u8 a) void bag_menu_RemoveBagItem_message_window(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr != 0xFF) + if (*ptr != INVALID_U8) { sub_8197DF8(*ptr, 0); ClearWindowTilemap(*ptr); RemoveWindow(*ptr); schedule_bg_copy_tilemap_to_vram(1); - *ptr = 0xFF; + *ptr = INVALID_U8; } } diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 85b42b9b3..67add5926 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -301,7 +301,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_857FC74[] = static const struct SpriteTemplate gUnknown_0857FC7C = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0x7544, .oam = &sOamData_857FBD0, .anims = sSpriteAnimTable_857FBE0, @@ -410,13 +410,13 @@ static const struct SpriteTemplate gUnknown_0857FE10 = void RemoveBagSprite(u8 id) { u8 *spriteId = &gUnknown_0203CE54->unk804[id]; - if (*spriteId != 0xFF) + if (*spriteId != INVALID_U8) { FreeSpriteTilesByTag(id + 100); FreeSpritePaletteByTag(id + 100); FreeSpriteOamMatrix(&gSprites[*spriteId]); DestroySprite(&gSprites[*spriteId]); - *spriteId = 0xFF; + *spriteId = INVALID_U8; } } @@ -516,7 +516,7 @@ static void SpriteCB_SwitchPocketRotatingBallContinue(struct Sprite *sprite) void AddBagItemIconSprite(u16 itemId, u8 id) { u8 *spriteId = &gUnknown_0203CE54->unk804[id + 2]; - if (*spriteId == 0xFF) + if (*spriteId == INVALID_U8) { u8 iconSpriteId; diff --git a/src/learn_move.c b/src/learn_move.c index 7717a5193..cb8bb66ff 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -9,7 +9,7 @@ #include "gpu_regs.h" #include "learn_move.h" #include "list_menu.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "menu_helpers.h" #include "overworld.h" @@ -381,7 +381,7 @@ static void LearnMoveMain(void) if (selection == 0) { - if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != 0xFFFF) + if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != INVALID_U16) { sub_816084C(gText_PkmnLearnedMove4); gSpecialVar_0x8004 = 1; @@ -727,12 +727,12 @@ static void CreateHearts(void) static void AddScrollArrows(void) { - if (sLearnMoveStruct->scrollArrowTaskId2 == 0xFF) + if (sLearnMoveStruct->scrollArrowTaskId2 == INVALID_U8) { sLearnMoveStruct->scrollArrowTaskId2 = AddScrollIndicatorArrowPair(&gUnknown_085CEBC0, &sLearnMoveStruct->scrollOffset); } - if (sLearnMoveStruct->scrollArrowTaskId1 == 0xFF) + if (sLearnMoveStruct->scrollArrowTaskId1 == INVALID_U8) { gTempScrollArrowTemplate = gUnknown_085CEBD0; gTempScrollArrowTemplate.fullyDownThreshold = sLearnMoveStruct->numMenuChoices - sLearnMoveStruct->numToShowAtOnce; @@ -742,16 +742,16 @@ static void AddScrollArrows(void) static void RemoveScrollArrows(void) { - if (sLearnMoveStruct->scrollArrowTaskId2 != 0xFF) + if (sLearnMoveStruct->scrollArrowTaskId2 != INVALID_U8) { RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId2); - sLearnMoveStruct->scrollArrowTaskId2 = 0xFF; + sLearnMoveStruct->scrollArrowTaskId2 = INVALID_U8; } - if (sLearnMoveStruct->scrollArrowTaskId1 != 0xFF) + if (sLearnMoveStruct->scrollArrowTaskId1 != INVALID_U8) { RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId1); - sLearnMoveStruct->scrollArrowTaskId1 = 0xFF; + sLearnMoveStruct->scrollArrowTaskId1 = INVALID_U8; } } @@ -792,7 +792,7 @@ void ShowHideHearts(s32 item) { numHearts = (u8)(gContestEffects[gContestMoves[item].effect].appeal / 10); - if (numHearts == 0xFF) + if (numHearts == INVALID_U8) { numHearts = 0; } @@ -812,7 +812,7 @@ void ShowHideHearts(s32 item) numHearts = (u8)(gContestEffects[gContestMoves[item].effect].jam / 10); - if (numHearts == 0xFF) + if (numHearts == INVALID_U8) { numHearts = 0; } diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c index c5aa25c10..2f706fcc8 100644 --- a/src/librfu_rfu.c +++ b/src/librfu_rfu.c @@ -64,7 +64,7 @@ v12 = (u16*)((u32)&sub_82E53F4 & ~1); v13 = (u16*)gUnknown_03007898->unk_8; - for (i = 47; i != 0xFFFF; i--) + for (i = 47; i != INVALID_U16; i--) { *v13 = *v12; ++v12; diff --git a/src/librfu_stwi.c b/src/librfu_stwi.c index 556b79bf8..81363ae0d 100644 --- a/src/librfu_stwi.c +++ b/src/librfu_stwi.c @@ -116,7 +116,7 @@ u16 STWI_read_status(u8 index) case 3: return gRfuState->activeCommand; default: - return 0xFFFF; + return INVALID_U16; } } diff --git a/src/link.c b/src/link.c index 687a6c07b..e4bd5053c 100644 --- a/src/link.c +++ b/src/link.c @@ -2,7 +2,7 @@ // Includes #include "global.h" #include "m4a.h" -#include "malloc.h" +#include "alloc.h" #include "reset_save_heap.h" #include "save.h" #include "bg.h" @@ -2250,7 +2250,7 @@ static bool8 DoHandshake(void) u16 minRecv; playerCount = 0; - minRecv = 0xFFFF; + minRecv = INVALID_U16; if (gLink.handshakeAsMaster == TRUE) { REG_SIOMLT_SEND = MASTER_HANDSHAKE; @@ -2274,7 +2274,7 @@ static bool8 DoHandshake(void) } else { - if (gLink.tempRecvBuffer[i] != 0xFFFF) + if (gLink.tempRecvBuffer[i] != INVALID_U16) { playerCount = 0; } diff --git a/src/link_rfu.c b/src/link_rfu.c index 308ad615c..fe5676770 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -1,4 +1,5 @@ #include "global.h" +#include "alloc.h" #include "battle.h" #include "berry_blender.h" #include "decompress.h" @@ -7,7 +8,6 @@ #include "librfu.h" #include "link.h" #include "link_rfu.h" -#include "malloc.h" #include "overworld.h" #include "random.h" #include "palette.h" @@ -276,7 +276,7 @@ const struct { { gBlockSendBuffer, 40 } }; const u16 gUnknown_082ED6E0[] = { - 0x0002, 0x7f7d, 0x0000, 0xffff + 0x0002, 0x7f7d, 0x0000, INVALID_U16 }; const char sUnref_082ED6E8[][15] = { @@ -436,7 +436,7 @@ u8 sub_800C054(u8 r5, u16 r7, u16 r8, const u16 *r6) } for (i = 0, buffer = r6; i < 16; i++) { - if (*buffer++ == 0xFFFF) + if (*buffer++ == INVALID_U16) { break; } @@ -754,7 +754,7 @@ void sub_800C54C(u32 a0) switch (gUnknown_03004140.unk_04) { case 23: - r2 = sub_800BEC0() == 0x8001 ? 0x44 : 0xFF; + r2 = sub_800BEC0() == 0x8001 ? 0x44 : INVALID_U8; gUnknown_03004140.unk_04 = gUnknown_03004140.unk_05 = 0; sub_800D30C(r2, 0); break; @@ -1168,7 +1168,7 @@ static void sub_800C7B4(u16 r8, u16 r6) gUnknown_03004140.unk_00 &= ~gUnknown_03004140.unk_14; if (gUnknown_03004140.unk_07) { - if (gUnknown_03007890->unk_00 == 0xFF) + if (gUnknown_03007890->unk_00 == INVALID_U8) { if (gUnknown_03004140.unk_07 == 8) { @@ -1183,7 +1183,7 @@ static void sub_800C7B4(u16 r8, u16 r6) } } } - if (gUnknown_03007890->unk_00 == 0xFF) + if (gUnknown_03007890->unk_00 == INVALID_U8) { if (gUnknown_03004140.unk_04 == 0) { @@ -1198,7 +1198,7 @@ static void sub_800C7B4(u16 r8, u16 r6) break; case 38: sub_800D20C(); - if (gUnknown_03007890->unk_00 != 0xFF) + if (gUnknown_03007890->unk_00 != INVALID_U8) { sub_800D30C(0x50, 0x00); } @@ -1241,7 +1241,7 @@ static void sub_800C7B4(u16 r8, u16 r6) sub_800D610(); } } - if (r8 == 0xFF) + if (r8 == INVALID_U8) { sub_800D30C(0xf2, 0x00); sub_800D610(); @@ -1322,7 +1322,7 @@ static void sub_800CF34(void) if (gUnknown_03007880[i]->unk_61 == 1) { r5 = 0x02; - for (ptr = gUnknown_03004140.unk_20; *ptr != 0xFFFF; ptr++) + for (ptr = gUnknown_03004140.unk_20; *ptr != INVALID_U16; ptr++) { if (gUnknown_03007890->unk_14[i].unk_04 == *ptr) { @@ -1469,7 +1469,7 @@ static u8 sub_800D294(void) for (i = 0; i < gUnknown_03007890->unk_08; i++) { - for (ptr = gUnknown_03004140.unk_20; *ptr != 0xffff; ptr++) + for (ptr = gUnknown_03004140.unk_20; *ptr != INVALID_U16; ptr++) { if (gUnknown_03007890->unk_14[i].unk_04 == *ptr) { @@ -2242,12 +2242,12 @@ void sub_800E084(void) void sub_800E0E8(void) { - if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == 0xFFFF) + if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == INVALID_U16) { LoadCompressedObjectPic(&sWirelessStatusIndicatorSpriteSheet); } LoadSpritePalette(&sWirelessStatusIndicatorSpritePalette); - gWirelessStatusIndicatorSpriteId = 0xFF; + gWirelessStatusIndicatorSpriteId = INVALID_U8; } u8 sub_800E124(void) @@ -2277,7 +2277,7 @@ void sub_800E15C(struct Sprite *sprite, s32 signalStrengthAnimNum) void sub_800E174(void) { - if (gWirelessStatusIndicatorSpriteId != 0xFF && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234) + if (gWirelessStatusIndicatorSpriteId != INVALID_U8 && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234) { struct Sprite *sprite = &gSprites[gWirelessStatusIndicatorSpriteId]; u8 signalStrength = 255; @@ -2461,7 +2461,7 @@ void sub_800E604(void) u8 unk_ee_bak = gUnknown_03005000.unk_ee; CpuFill16(0, &gUnknown_03005000, sizeof gUnknown_03005000); gUnknown_03005000.unk_ee = unk_ee_bak; - gUnknown_03005000.unk_0c = 0xFF; + gUnknown_03005000.unk_0c = INVALID_U8; if (gUnknown_03005000.unk_ee != 4) { gUnknown_03005000.unk_ee = 0; @@ -3077,7 +3077,7 @@ bool32 sub_800F1E0(void) { if (gUnknown_03005000.unk_14[i][1]) { - if (gUnknown_03005000.unk_cee[i] != 0xff && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7)) + if (gUnknown_03005000.unk_cee[i] != INVALID_U8 && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7)) { if (++gUnknown_03005000.unk_cea[i] > 4) sub_8011170(0x8100); @@ -3778,7 +3778,7 @@ bool32 sub_8010454(u32 a0) s32 i; for (i = 0; gUnknown_082ED6E0[i] != a0; i++) { - if (gUnknown_082ED6E0[i] == 0xffff) + if (gUnknown_082ED6E0[i] == INVALID_U16) return FALSE; } return TRUE; @@ -3881,7 +3881,7 @@ bool32 sub_80105EC(void) bool32 sub_801064C(u16 a0, const u8 *a1) { u8 r1 = sub_8011CE4(a1, a0); - if (r1 == 0xFF) + if (r1 == INVALID_U8) return TRUE; if (gUnknown_03005000.unk_cd1[r1] == 9) return TRUE; @@ -3906,7 +3906,7 @@ void sub_80106D4(void) u32 sub_8010714(u16 a0, const u8 *a1) { u8 r0 = sub_8011CE4(a1, a0); - if (r0 == 0xff) + if (r0 == INVALID_U8) return 2; if (gUnknown_03007880[r0]->unk_0 == 0) return 1; diff --git a/src/list_menu.c b/src/list_menu.c index 6907a75a3..e066d1e9c 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -8,7 +8,7 @@ #include "trig.h" #include "decompress.h" #include "palette.h" -#include "malloc.h" +#include "alloc.h" #include "strings.h" #include "sound.h" #include "constants/songs.h" @@ -392,7 +392,7 @@ u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenu s32 i; u8 taskId = ListMenuInitInternal(listMenuTemplate, scrollOffset, selectedRow); - for (i = 0; rect[i].palNum != 0xFF; i++) + for (i = 0; rect[i].palNum != INVALID_U8; i++) { PutWindowRectTilemapOverridePalette(listMenuTemplate->windowId, rect[i].x, @@ -465,7 +465,7 @@ s32 ListMenuHandleInputGetItemId(u8 listTaskId) } } -#define TASK_NONE 0xFF +#define TASK_NONE INVALID_U8 void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow) { @@ -1143,7 +1143,7 @@ static void Task_ScrollIndicatorArrowPair(u8 taskId) struct ScrollIndicatorPair *data = (void*) gTasks[taskId].data; u16 currItem = (*data->scrollOffset); - if (currItem == data->fullyUpThreshold && currItem != 0xFFFF) + if (currItem == data->fullyUpThreshold && currItem != INVALID_U16) gSprites[data->topSpriteId].invisible = TRUE; else gSprites[data->topSpriteId].invisible = FALSE; diff --git a/src/load_save.c b/src/load_save.c index 960a98981..8ecf89959 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -4,7 +4,7 @@ #include "main.h" #include "pokemon.h" #include "random.h" -#include "malloc.h" +#include "alloc.h" #include "item.h" #include "overworld.h" #include "decoration_inventory.h" diff --git a/src/mail.c b/src/mail.c index 513900746..7b096ed00 100644 --- a/src/mail.c +++ b/src/mail.c @@ -17,7 +17,7 @@ #include "bg.h" #include "pokemon_icon.h" #include "constants/species.h" -#include "malloc.h" +#include "alloc.h" #include "easy_chat.h" extern const u16 gMailPalette_Orange[]; diff --git a/src/mail_data.c b/src/mail_data.c index 809dcc2a8..cf75636b3 100644 --- a/src/mail_data.c +++ b/src/mail_data.c @@ -20,7 +20,7 @@ void ClearMailStruct(struct MailStruct *mail) s32 i; for (i = 0; i < MAIL_WORDS_COUNT; i++) - mail->words[i] = 0xFFFF; + mail->words[i] = INVALID_U16; for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++) mail->playerName[i] = EOS; @@ -35,7 +35,7 @@ void ClearMailStruct(struct MailStruct *mail) bool8 MonHasMail(struct Pokemon *mon) { u16 heldItem = GetMonData(mon, MON_DATA_HELD_ITEM); - if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != 0xFF) + if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != INVALID_U8) return TRUE; else return FALSE; @@ -56,7 +56,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId) if (gSaveBlock1Ptr->mail[id].itemId == 0) { for (i = 0; i < MAIL_WORDS_COUNT; i++) - gSaveBlock1Ptr->mail[id].words[i] = 0xFFFF; + gSaveBlock1Ptr->mail[id].words[i] = INVALID_U16; for (i = 0; i < PLAYER_NAME_LENGTH + 1 - 1; i++) gSaveBlock1Ptr->mail[id].playerName[i] = gSaveBlock2Ptr->playerName[i]; @@ -76,7 +76,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId) } } - return 0xFF; + return INVALID_U8; } u16 SpeciesToMailSpecies(u16 species, u32 personality) @@ -113,8 +113,8 @@ u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail) u16 itemId = mail->itemId; u8 mailId = GiveMailToMon(mon, itemId); - if (mailId == 0xFF) - return 0xFF; + if (mailId == INVALID_U8) + return INVALID_U8; gSaveBlock1Ptr->mail[mailId] = *mail; @@ -142,7 +142,7 @@ void TakeMailFromMon(struct Pokemon *mon) { mailId = GetMonData(mon, MON_DATA_MAIL); gSaveBlock1Ptr->mail[mailId].itemId = ITEM_NONE; - mailId = 0xFF; + mailId = INVALID_U8; heldItem[0] = ITEM_NONE; heldItem[1] = ITEM_NONE << 8; SetMonData(mon, MON_DATA_MAIL, &mailId); @@ -163,7 +163,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon) newHeldItem[0] = ITEM_NONE; newHeldItem[1] = ITEM_NONE << 8; - newMailId = 0xFF; + newMailId = INVALID_U8; for (i = PARTY_SIZE; i < MAIL_COUNT; i++) { @@ -177,7 +177,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon) } } - return 0xFF; + return INVALID_U8; } bool8 ItemIsMail(u16 itemId) diff --git a/src/main.c b/src/main.c index d069ab3bc..c4962286c 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,6 @@ #include "global.h" #include "crt0.h" -#include "malloc.h" +#include "alloc.h" #include "link.h" #include "link_rfu.h" #include "librfu.h" diff --git a/src/malloc.c b/src/malloc.c deleted file mode 100644 index 1d64351c3..000000000 --- a/src/malloc.c +++ /dev/null @@ -1,210 +0,0 @@ -#include "global.h" - -static void *sHeapStart; -static u32 sHeapSize; -static u32 malloc_c_unused_0300000c; // needed to align dma3_manager.o(.bss) - -#define MALLOC_SYSTEM_ID 0xA3A3 - -struct MemBlock { - // Whether this block is currently allocated. - bool16 flag; - - // Magic number used for error checking. Should equal MALLOC_SYSTEM_ID. - u16 magic; - - // Size of the block (not including this header struct). - u32 size; - - // Previous block pointer. Equals sHeapStart if this is the first block. - struct MemBlock *prev; - - // Next block pointer. Equals sHeapStart if this is the last block. - struct MemBlock *next; - - // Data in the memory block. (Arrays of length 0 are a GNU extension.) - u8 data[0]; -}; - -void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next, u32 size) -{ - struct MemBlock *header = (struct MemBlock *)block; - - header->flag = FALSE; - header->magic = MALLOC_SYSTEM_ID; - header->size = size; - header->prev = prev; - header->next = next; -} - -void PutFirstMemBlockHeader(void *block, u32 size) -{ - PutMemBlockHeader(block, (struct MemBlock *)block, (struct MemBlock *)block, size - sizeof(struct MemBlock)); -} - -void *AllocInternal(void *heapStart, u32 size) -{ - struct MemBlock *pos = (struct MemBlock *)heapStart; - struct MemBlock *head = pos; - struct MemBlock *splitBlock; - u32 foundBlockSize; - - // Alignment - if (size & 3) - size = 4 * ((size / 4) + 1); - - for (;;) { - // Loop through the blocks looking for unused block that's big enough. - - if (!pos->flag) { - foundBlockSize = pos->size; - - if (foundBlockSize >= size) { - if (foundBlockSize - size < 2 * sizeof(struct MemBlock)) { - // The block isn't much bigger than the requested size, - // so just use it. - pos->flag = TRUE; - } else { - // The block is significantly bigger than the requested - // size, so split the rest into a separate block. - foundBlockSize -= sizeof(struct MemBlock); - foundBlockSize -= size; - - splitBlock = (struct MemBlock *)(pos->data + size); - - pos->flag = TRUE; - pos->size = size; - - PutMemBlockHeader(splitBlock, pos, pos->next, foundBlockSize); - - pos->next = splitBlock; - - if (splitBlock->next != head) - splitBlock->next->prev = splitBlock; - } - - return pos->data; - } - } - - if (pos->next == head) - return NULL; - - pos = pos->next; - } -} - -void FreeInternal(void *heapStart, void *pointer) -{ - if (pointer) { - struct MemBlock *head = (struct MemBlock *)heapStart; - struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock)); - block->flag = FALSE; - - // If the freed block isn't the last one, merge with the next block - // if it's not in use. - if (block->next != head) { - if (!block->next->flag) { - block->size += sizeof(struct MemBlock) + block->next->size; - block->next->magic = 0; - block->next = block->next->next; - if (block->next != head) - block->next->prev = block; - } - } - - // If the freed block isn't the first one, merge with the previous block - // if it's not in use. - if (block != head) { - if (!block->prev->flag) { - block->prev->next = block->next; - - if (block->next != head) - block->next->prev = block->prev; - - block->magic = 0; - block->prev->size += sizeof(struct MemBlock) + block->size; - } - } - } -} - -void *AllocZeroedInternal(void *heapStart, u32 size) -{ - void *mem = AllocInternal(heapStart, size); - - if (mem != NULL) { - if (size & 3) - size = 4 * ((size / 4) + 1); - - CpuFill32(0, mem, size); - } - - return mem; -} - -bool32 CheckMemBlockInternal(void *heapStart, void *pointer) -{ - struct MemBlock *head = (struct MemBlock *)heapStart; - struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock)); - - if (block->magic != MALLOC_SYSTEM_ID) - return FALSE; - - if (block->next->magic != MALLOC_SYSTEM_ID) - return FALSE; - - if (block->next != head && block->next->prev != block) - return FALSE; - - if (block->prev->magic != MALLOC_SYSTEM_ID) - return FALSE; - - if (block->prev != head && block->prev->next != block) - return FALSE; - - if (block->next != head && block->next != (struct MemBlock *)(block->data + block->size)) - return FALSE; - - return TRUE; -} - -void InitHeap(void *heapStart, u32 heapSize) -{ - sHeapStart = heapStart; - sHeapSize = heapSize; - PutFirstMemBlockHeader(heapStart, heapSize); -} - -void *Alloc(u32 size) -{ - AllocInternal(sHeapStart, size); -} - -void *AllocZeroed(u32 size) -{ - AllocZeroedInternal(sHeapStart, size); -} - -void Free(void *pointer) -{ - FreeInternal(sHeapStart, pointer); -} - -bool32 CheckMemBlock(void *pointer) -{ - return CheckMemBlockInternal(sHeapStart, pointer); -} - -bool32 CheckHeap() -{ - struct MemBlock *pos = (struct MemBlock *)sHeapStart; - - do { - if (!CheckMemBlockInternal(sHeapStart, pos->data)) - return FALSE; - pos = pos->next; - } while (pos != (struct MemBlock *)sHeapStart); - - return TRUE; -} diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 110ec068e..2fd60cd5b 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -250,7 +250,7 @@ void ScrSpecial_HipsterTeachWord(void) { u16 var = sub_811F01C(); - if (var == 0xFFFF) + if (var == INVALID_U16) { gSpecialVar_Result = FALSE; } @@ -283,7 +283,7 @@ void ScrSpecial_GenerateGiddyLine(void) if (giddy->taleCounter == 0) InitGiddyTaleList(); - if (giddy->randomWords[giddy->taleCounter] != 0xFFFF) // is not the last element of the array? + if (giddy->randomWords[giddy->taleCounter] != INVALID_U16) // is not the last element of the array? { u8 *stringPtr; u32 adjective = Random(); @@ -348,7 +348,7 @@ static void InitGiddyTaleList(void) r1 = Random() % 10; if (r1 < 3 && r7 < 8) { - giddy->randomWords[i] = 0xFFFF; + giddy->randomWords[i] = INVALID_U16; r7++; } else diff --git a/src/menu.c b/src/menu.c index dde0e0a1a..e1dd136d1 100644 --- a/src/menu.c +++ b/src/menu.c @@ -7,7 +7,7 @@ #include "main.h" #include "sound.h" #include "menu_helpers.h" -#include "malloc.h" +#include "alloc.h" #include "task.h" #include "dma3.h" #include "string_util.h" @@ -140,8 +140,8 @@ extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId); void sub_81971D0(void) { InitWindows(gUnknown_0860F098); - gStartMenuWindowId = 0xFF; - gUnknown_0203CD8D = 0xFF; + gStartMenuWindowId = INVALID_U8; + gUnknown_0203CD8D = INVALID_U8; } void sub_81971F4(void) @@ -486,7 +486,7 @@ u8 GetPlayerTextSpeedDelay(void) u8 sub_81979C4(u8 a1) { - if (gStartMenuWindowId == 0xFF) + if (gStartMenuWindowId == INVALID_U8) gStartMenuWindowId = sub_8198AA4(0, 0x16, 1, 7, (a1 * 2) + 2, 0xF, 0x139); return gStartMenuWindowId; } @@ -498,10 +498,10 @@ u8 GetStartMenuWindowId(void) void RemoveStartMenuWindow(void) { - if (gStartMenuWindowId != 0xFF) + if (gStartMenuWindowId != INVALID_U8) { RemoveWindow(gStartMenuWindowId); - gStartMenuWindowId = 0xFF; + gStartMenuWindowId = INVALID_U8; } } @@ -517,7 +517,7 @@ u16 sub_8197A38(void) u8 AddMapNamePopUpWindow(void) { - if (gUnknown_0203CD8D == 0xFF) + if (gUnknown_0203CD8D == INVALID_U8) gUnknown_0203CD8D = sub_8198AA4(0, 1, 1, 10, 3, 14, 0x107); return gUnknown_0203CD8D; } @@ -529,10 +529,10 @@ u8 GetMapNamePopUpWindowId(void) void RemoveMapNamePopUpWindow(void) { - if (gUnknown_0203CD8D != 0xFF) + if (gUnknown_0203CD8D != INVALID_U8) { RemoveWindow(gUnknown_0203CD8D); - gUnknown_0203CD8D = 0xFF; + gUnknown_0203CD8D = INVALID_U8; } } @@ -808,7 +808,7 @@ void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram) { u16 width = 0; - if (gUnknown_0203CDA0 != 0xFF) + if (gUnknown_0203CDA0 != INVALID_U8) { PutWindowTilemap(gUnknown_0203CDA0); FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF); @@ -830,7 +830,7 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo u8 color[3]; u16 width = 0; - if (gUnknown_0203CDA0 != 0xFF) + if (gUnknown_0203CDA0 != INVALID_U8) { if (a3 != 0) { @@ -865,13 +865,13 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo void sub_81982D8(void) { - if (gUnknown_0203CDA0 != 0xFF) + if (gUnknown_0203CDA0 != INVALID_U8) CopyWindowToVram(gUnknown_0203CDA0, 3); } void sub_81982F0(void) { - if (gUnknown_0203CDA0 != 0xFF) + if (gUnknown_0203CDA0 != INVALID_U8) { FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF); CopyWindowToVram(gUnknown_0203CDA0, 3); @@ -880,13 +880,13 @@ void sub_81982F0(void) void sub_8198314(void) { - if (gUnknown_0203CDA0 != 0xFF) + if (gUnknown_0203CDA0 != INVALID_U8) { FillWindowPixelBuffer(gUnknown_0203CDA0, 0); ClearWindowTilemap(gUnknown_0203CDA0); CopyWindowToVram(gUnknown_0203CDA0, 3); RemoveWindow(gUnknown_0203CDA0); - gUnknown_0203CDA0 = 0xFF; + gUnknown_0203CDA0 = INVALID_U8; } } diff --git a/src/mossdeep_gym.c b/src/mossdeep_gym.c index cd377ad83..07920fe4c 100644 --- a/src/mossdeep_gym.c +++ b/src/mossdeep_gym.c @@ -1,7 +1,7 @@ #include "global.h" #include "event_object_movement.h" #include "fieldmap.h" -#include "malloc.h" +#include "alloc.h" #include "mossdeep_gym.h" #include "script_movement.h" #include "constants/event_object_movement_constants.h" diff --git a/src/naming_screen.c b/src/naming_screen.c index 9902df04c..12ff4240f 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1,6 +1,6 @@ #include "global.h" #include "naming_screen.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "task.h" #include "sprite.h" @@ -2141,7 +2141,7 @@ static const struct SpriteTemplate sSpriteTemplate_Underscore = static const struct SpriteTemplate gUnknown_0858C180 = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0x0000, .oam = &gOamData_858BFEC, .anims = gSpriteAnimTable_858C0BC, diff --git a/src/overworld.c b/src/overworld.c index 3193ec0d3..13c36819f 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -27,7 +27,7 @@ #include "link_rfu.h" #include "load_save.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "m4a.h" #include "map_name_popup.h" #include "menu.h" @@ -1110,7 +1110,7 @@ static bool16 IsInflitratedSpaceCenter(struct WarpData *warp) u16 GetLocationMusic(struct WarpData *warp) { if (NoMusicInSotopolisWithLegendaries(warp) == TRUE) - return 0xFFFF; + return INVALID_U16; else if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE) return MUS_OOAME; else if (IsInflitratedSpaceCenter(warp) == TRUE) @@ -1171,7 +1171,7 @@ void Overworld_PlaySpecialMapMusic(void) { u16 music = GetCurrLocationDefaultMusic(); - if (music != MUS_OOAME && music != 0xFFFF) + if (music != MUS_OOAME && music != INVALID_U16) { if (gSaveBlock1Ptr->savedMusic) music = gSaveBlock1Ptr->savedMusic; @@ -1201,7 +1201,7 @@ static void sub_8085810(void) { u16 newMusic = GetWarpDestinationMusic(); u16 currentMusic = GetCurrentMapMusic(); - if (newMusic != MUS_OOAME && newMusic != 0xFFFF) + if (newMusic != MUS_OOAME && newMusic != INVALID_U16) { if (currentMusic == MUS_DEEPDEEP || currentMusic == MUS_NAMINORI) return; diff --git a/src/palette.c b/src/palette.c index 1e92f4bba..3c7485d05 100644 --- a/src/palette.c +++ b/src/palette.c @@ -63,7 +63,7 @@ static EWRAM_DATA u32 sPlttBufferTransferPending = 0; EWRAM_DATA u8 gPaletteDecompressionBuffer[PLTT_DECOMP_BUFFER_SIZE] = {0}; static const struct PaletteStructTemplate gDummyPaletteStructTemplate = { - .uid = 0xFFFF, + .uid = INVALID_U16, .pst_field_B_5 = 1 }; diff --git a/src/player_pc.c b/src/player_pc.c index 59ba36350..f42d59147 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -15,7 +15,7 @@ #include "list_menu.h" #include "mail.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "menu_helpers.h" #include "overworld.h" diff --git a/src/pokeblock.c b/src/pokeblock.c index 01343c6eb..41d6dcc8f 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -13,7 +13,7 @@ #include "lilycove_lady.h" #include "list_menu.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "menu_helpers.h" #include "overworld.h" @@ -435,7 +435,7 @@ void OpenPokeblockCase(u8 caseId, void (*callback)(void)) sPokeblockMenu = Alloc(sizeof(*sPokeblockMenu)); sPokeblockMenu->caseId = caseId; sPokeblockMenu->callbackOnUse = NULL; - sPokeblockMenu->unkTaskId = 0xFF; + sPokeblockMenu->unkTaskId = INVALID_U8; sPokeblockMenu->isSwapping = FALSE; sSavedPokeblockData.callback = callback; @@ -901,7 +901,7 @@ static void sub_8136344(void) static void sub_81363BC(void) { - if (sPokeblockMenu->unkTaskId == 0xFF) + if (sPokeblockMenu->unkTaskId == INVALID_U8) { sPokeblockMenu->unkTaskId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xB0, 8, 0x98, sPokeblockMenu->itemsNo - sPokeblockMenu->maxShowed, 0x456, 0x456, &sSavedPokeblockData.lastItemPage); @@ -910,10 +910,10 @@ static void sub_81363BC(void) static void sub_8136418(void) { - if (sPokeblockMenu->unkTaskId != 0xFF) + if (sPokeblockMenu->unkTaskId != INVALID_U8) { RemoveScrollIndicatorArrowPair(sPokeblockMenu->unkTaskId); - sPokeblockMenu->unkTaskId = 0xFF; + sPokeblockMenu->unkTaskId = INVALID_U8; } } @@ -1016,7 +1016,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId) break; case LIST_B_PRESSED: PlaySE(SE_SELECT); - gSpecialVar_Result = 0xFFFF; + gSpecialVar_Result = INVALID_U16; gSpecialVar_ItemId = 0; FadePaletteAndSetTaskToClosePokeblockCase(taskId); break; diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 0a8f1b8c2..91dbd1c99 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -7,7 +7,7 @@ #include "gpu_regs.h" #include "graphics.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "menu_helpers.h" #include "m4a.h" diff --git a/src/pokedex.c b/src/pokedex.c index 7578f9687..4e28c8a14 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -8,7 +8,7 @@ #include "graphics.h" #include "international_string_util.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "m4a.h" #include "overworld.h" @@ -1271,7 +1271,7 @@ static void ResetPokedexView(struct PokedexView *pokedexView) pokedexView->seenCount = 0; pokedexView->ownCount = 0; for (i = 0; i <= 3; i++) - pokedexView->unk61E[i] |= 0xFFFF; + pokedexView->unk61E[i] |= INVALID_U16; pokedexView->unk628 = 0; pokedexView->unk62A = 0; pokedexView->unk62C = 0; @@ -2459,7 +2459,7 @@ u32 sub_80BDACC(u16 num, s16 x, s16 y) return spriteId; } } - return 0xFFFF; + return INVALID_U16; } static void CreateInterfaceSprites(u8 a) @@ -2717,8 +2717,8 @@ void sub_80BE4E0(struct Sprite *sprite) sprite->pos2.y = gSineTable[(u8)sprite->data[5]] * 76 / 256; var = 0x10000 / gSineTable[sprite->data[5] + 0x40]; - if (var > 0xFFFF) - var = 0xFFFF; + if (var > INVALID_U16) + var = INVALID_U16; SetOamMatrix(sprite->data[1] + 1, 0x100, 0, 0, var); sprite->oam.matrixNum = data1 + 1; @@ -4627,12 +4627,12 @@ u32 sub_80C0E68(u16 a) u16 sub_80C0E9C(u16 num, s16 x, s16 y, u16 paletteSlot) { num = NationalPokedexNumToSpecies(num); - return CreateMonPicSprite_HandleDeoxys(num, 8, sub_80C0E68(num), TRUE, x, y, paletteSlot, 0xFFFF); + return CreateMonPicSprite_HandleDeoxys(num, 8, sub_80C0E68(num), TRUE, x, y, paletteSlot, INVALID_U16); } u16 sub_80C0EF8(u16 species, s16 x, s16 y, s8 paletteSlot) { - return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, 0xFFFF); + return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, INVALID_U16); } int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 type2) @@ -4655,7 +4655,7 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 sPokedexView->pokemonListCount = resultsCount; // Search by name - if (abcGroup != 0xFF) + if (abcGroup != INVALID_U8) { for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { @@ -4674,7 +4674,7 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 } // Search by body color - if (bodyColor != 0xFF) + if (bodyColor != INVALID_U8) { for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { @@ -4690,15 +4690,15 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 } // Search by type - if (type1 != 0xFF || type2 != 0xFF) + if (type1 != INVALID_U8 || type2 != INVALID_U8) { - if (type1 == 0xFF) + if (type1 == INVALID_U8) { type1 = type2; - type2 = 0xFF; + type2 = INVALID_U8; } - if (type2 == 0xFF) + if (type2 == INVALID_U8) { for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { @@ -4987,7 +4987,7 @@ void sub_80C170C(u8 taskId) return; } - if ((gMain.newKeys & DPAD_LEFT) && r6[gTasks[taskId].data[1]][0] != 0xFF) + if ((gMain.newKeys & DPAD_LEFT) && r6[gTasks[taskId].data[1]][0] != INVALID_U8) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][0]; @@ -4995,7 +4995,7 @@ void sub_80C170C(u8 taskId) CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_RIGHT) && r6[gTasks[taskId].data[1]][1] != 0xFF) + if ((gMain.newKeys & DPAD_RIGHT) && r6[gTasks[taskId].data[1]][1] != INVALID_U8) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][1]; @@ -5003,7 +5003,7 @@ void sub_80C170C(u8 taskId) CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_UP) && r6[gTasks[taskId].data[1]][2] != 0xFF) + if ((gMain.newKeys & DPAD_UP) && r6[gTasks[taskId].data[1]][2] != INVALID_U8) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][2]; @@ -5011,7 +5011,7 @@ void sub_80C170C(u8 taskId) CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_DOWN) && r6[gTasks[taskId].data[1]][3] != 0xFF) + if ((gMain.newKeys & DPAD_DOWN) && r6[gTasks[taskId].data[1]][3] != INVALID_U8) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][3]; @@ -5475,12 +5475,12 @@ u8 sub_80C2318(u8 taskId, u8 b) return gUnknown_0856EFAE[r2]; case 0: if (r2 == 0) - return 0xFF; + return INVALID_U8; else return r2; case 1: if (r2 == 0) - return 0xFF; + return INVALID_U8; else return r2 - 1; case 2: diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c index f3eeeed07..4a9227b99 100755 --- a/src/pokedex_cry_screen.c +++ b/src/pokedex_cry_screen.c @@ -2,7 +2,7 @@ #include "bg.h" #include "m4a.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "pokedex_cry_screen.h" #include "sound.h" diff --git a/src/pokemon.c b/src/pokemon.c index f528ce331..1f8d5339b 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -12,7 +12,7 @@ #include "item.h" #include "link.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "m4a.h" #include "pokedex.h" #include "pokeblock.h" @@ -2300,7 +2300,7 @@ static const u8 sHoldEffectToType[][2] = const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = { { // B_POSITION_PLAYER_LEFT - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2309,7 +2309,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = .callback = sub_8039BB4, }, { // B_POSITION_OPPONENT_LEFT - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACA8, .anims = NULL, @@ -2318,7 +2318,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = .callback = oac_poke_opponent, }, { // B_POSITION_PLAYER_RIGHT - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2327,7 +2327,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = .callback = sub_8039BB4, }, { // B_POSITION_OPPONENT_RIGHT - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACA8, .anims = NULL, @@ -2340,7 +2340,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = static const struct SpriteTemplate gUnknown_08329DF8[] = { { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2349,7 +2349,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2358,7 +2358,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2367,7 +2367,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2376,7 +2376,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2385,7 +2385,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2394,7 +2394,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2403,7 +2403,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2450,7 +2450,7 @@ static const s8 gUnknown_08329ECE[][3] = static const u16 sHMMoves[] = { MOVE_CUT, MOVE_FLY, MOVE_SURF, MOVE_STRENGTH, MOVE_FLASH, - MOVE_ROCK_SMASH, MOVE_WATERFALL, MOVE_DIVE, 0xFFFF + MOVE_ROCK_SMASH, MOVE_WATERFALL, MOVE_DIVE, INVALID_U16 }; static const struct SpeciesItem sAlteringCaveWildMonHeldItems[] = @@ -2485,8 +2485,8 @@ static const struct OamData sOamData_8329F20 = static const struct SpriteTemplate gUnknown_08329F28 = { - .tileTag = 0xFFFF, - .paletteTag = 0xFFFF, + .tileTag = INVALID_U16, + .paletteTag = INVALID_U16, .oam = &sOamData_8329F20, .anims = gDummySpriteAnimTable, .images = NULL, @@ -3286,7 +3286,7 @@ u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move) if (existingMove == move) return -2; } - return -1; + return INVALID_U16; } u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move) @@ -3303,7 +3303,7 @@ u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move) } } - return -1; + return INVALID_U16; } void SetMonMoveSlot(struct Pokemon *mon, u16 move, u8 slot) @@ -3341,7 +3341,7 @@ void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon) move = (gLevelUpLearnsets[species][i] & 0x1FF); - if (GiveMoveToBoxMon(boxMon, move) == 0xFFFF) + if (GiveMoveToBoxMon(boxMon, move) == INVALID_U16) DeleteFirstMoveAndGiveMoveToBoxMon(boxMon, move); } } @@ -6495,7 +6495,7 @@ u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves) { u16 moveLevel; - if (gLevelUpLearnsets[species][i] == 0xFFFF) + if (gLevelUpLearnsets[species][i] == INVALID_U16) break; moveLevel = gLevelUpLearnsets[species][i] & 0xFE00; @@ -6524,7 +6524,7 @@ u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves) u8 numMoves = 0; int i; - for (i = 0; i < 20 && gLevelUpLearnsets[species][i] != 0xFFFF; i++) + for (i = 0; i < 20 && gLevelUpLearnsets[species][i] != INVALID_U16; i++) moves[numMoves++] = gLevelUpLearnsets[species][i] & 0x1FF; return numMoves; @@ -6549,7 +6549,7 @@ u8 GetNumberOfRelearnableMoves(struct Pokemon *mon) { u16 moveLevel; - if (gLevelUpLearnsets[species][i] == 0xFFFF) + if (gLevelUpLearnsets[species][i] == INVALID_U16) break; moveLevel = gLevelUpLearnsets[species][i] & 0xFE00; @@ -6584,7 +6584,7 @@ u16 SpeciesToPokedexNum(u16 species) species = SpeciesToHoennPokedexNum(species); if (species <= 202) return species; - return 0xFFFF; + return INVALID_U16; } } @@ -6747,7 +6747,7 @@ const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u bool32 IsHMMove2(u16 move) { int i = 0; - while (sHMMoves[i] != 0xFFFF) + while (sHMMoves[i] != INVALID_U16) { if (sHMMoves[i++] == move) return TRUE; diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 989bce37d..c9a4f5c91 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -588,7 +588,7 @@ static const u8 sUnknown_0860AA64[][2] = {0, 2}, {1, 2}, {0, 2}, - {0, 0xFF} + {0, INVALID_U8} }; static const u8 sUnknown_0860AA80[][2] = @@ -1666,7 +1666,7 @@ static void sub_818031C(struct Sprite *sprite) else amplitude = 0; - if (var5 == 0xFF) + if (var5 == INVALID_U8) { sprite->callback = SpriteCB_SetDummyOnAnimEnd; sprite->pos2.y = 0; @@ -2570,7 +2570,7 @@ static void pokemonanimfunc_2C(struct Sprite *sprite) sprite->data[4] = 0; } - if (sUnknown_0860AA64[sprite->data[6]][1] == 0xFF) + if (sUnknown_0860AA64[sprite->data[6]][1] == INVALID_U8) { sprite->callback = SpriteCB_SetDummyOnAnimEnd; } @@ -4157,17 +4157,17 @@ static void sub_8183574(struct Sprite *sprite) u8 var9 = sprite->data[6]; u8 var5 = sUnknown_0860AA80[sprite->data[5]][0]; u8 var2 = var5; - if (var5 != 0xFF) + if (var5 != INVALID_U8) var5 = sprite->data[7]; else - var5 = 0xFF; // needed to match + var5 = INVALID_U8; // needed to match var6 = sUnknown_0860AA80[sprite->data[5]][1]; var7 = 0; if (var2 != 0xFE) var7 = (var6 - var9) * var5 / var6; - if (var5 == 0xFF) + if (var5 == INVALID_U8) { sprite->callback = SpriteCB_SetDummyOnAnimEnd; sprite->pos2.y = 0; @@ -5278,7 +5278,7 @@ static const struct YellowBlendStruct sUnknown_0860ADCC[] = {0, 1}, {1, 1}, {0, 1}, - {0, 0xFF} + {0, INVALID_U8} }; static const struct YellowBlendStruct sUnknown_0860AE1C[] = @@ -5296,7 +5296,7 @@ static const struct YellowBlendStruct sUnknown_0860AE1C[] = {0, 2}, {1, 2}, {0, 2}, - {0, 0xFF} + {0, INVALID_U8} }; static const struct YellowBlendStruct sUnknown_0860AE54[] = @@ -5310,7 +5310,7 @@ static const struct YellowBlendStruct sUnknown_0860AE54[] = {0, 20}, {1, 1}, {0, 1}, - {0, 0xFF} + {0, INVALID_U8} }; static const struct YellowBlendStruct *const sUnknown_0860AE7C[] = @@ -5324,7 +5324,7 @@ static void BackAnimBlendYellow(struct Sprite *sprite) { const struct YellowBlendStruct *array = sUnknown_0860AE7C[sprite->data[3]]; sub_8184770(sprite); - if (array[sprite->data[6]].field_1 == 0xFF) + if (array[sprite->data[6]].field_1 == INVALID_U8) { sprite->pos2.x = 0; sprite->callback = SpriteCB_SetDummyOnAnimEnd; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 994cc520e..5926f9513 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1153,14 +1153,14 @@ void SafeLoadMonIconPalette(u16 species) if (species > SPECIES_EGG) species = 260; palIndex = gMonIconPaletteIndices[species]; - if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF) + if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8) LoadSpritePalette(&gMonIconPaletteTable[palIndex]); } void LoadMonIconPalette(u16 species) { u8 palIndex = gMonIconPaletteIndices[species]; - if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF) + if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8) LoadSpritePalette(&gMonIconPaletteTable[palIndex]); } @@ -1287,7 +1287,7 @@ static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *iconTemplate, s16 x, struct SpriteTemplate spriteTemplate = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = iconTemplate->paletteTag, .oam = iconTemplate->oam, .anims = iconTemplate->anims, diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index 2d9a2f08f..f90a6b8c2 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -109,7 +109,7 @@ static void FormatMonSizeRecord(u8 *string, u32 size) static u8 CompareMonSize(u16 species, u16 *sizeRecord) { - if (gSpecialVar_Result == 0xFF) + if (gSpecialVar_Result == INVALID_U8) { return 0; } diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 465b97da2..30e16da28 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -134,7 +134,7 @@ s16 GetFirstFreeBoxSpot(u8 boxId) return i; } - return -1; // all spots are taken + return INVALID_S16; // all spots are taken } u8 CountPartyNonEggMons(void) @@ -426,7 +426,7 @@ s16 StorageSystemGetNextMonIndex(struct BoxPokemon *box, s8 startIdx, u8 stopIdx return i; } } - return -1; + return INVALID_S16; } void ResetPokemonStorageSystem(void) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index f152e70a4..bef127cce 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -19,7 +19,7 @@ #include "item.h" #include "link.h" #include "m4a.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "menu_helpers.h" #include "mon_markings.h" @@ -1152,7 +1152,7 @@ static bool8 SummaryScreen_LoadGraphics(void) break; case 17: pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &pssData->unk40F0); - if (pssData->spriteIds[0] != 0xFF) + if (pssData->spriteIds[0] != INVALID_U8) { pssData->unk40F0 = 0; gMain.state++; @@ -1509,7 +1509,7 @@ static void sub_81C0604(u8 taskId, s8 a) r4_2 = sub_81C08F8(a); } - if (r4_2 != -1) + if (r4_2 != INVALID_S8) { PlaySE(SE_SELECT); if (pssData->summary.unk7 != 0) @@ -1564,7 +1564,7 @@ static void sub_81C0704(u8 taskId) break; case 8: pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &data[1]); - if (pssData->spriteIds[0] == 0xFF) + if (pssData->spriteIds[0] == INVALID_U8) return; gSprites[pssData->spriteIds[0]].data[2] = 1; sub_81C0E24(); @@ -1601,9 +1601,9 @@ static s8 sub_81C08F8(s8 a) if (pssData->currPageIndex == PSS_PAGE_INFO) { if (a == -1 && pssData->curMonIndex == 0) - return -1; + return INVALID_S8; else if (a == 1 && pssData->curMonIndex >= pssData->maxMonIndex) - return -1; + return INVALID_S8; else return pssData->curMonIndex + a; } @@ -1615,7 +1615,7 @@ static s8 sub_81C08F8(s8 a) { index += a; if (index < 0 || index > pssData->maxMonIndex) - return -1; + return INVALID_S8; } while (GetMonData(&mon[index], MON_DATA_IS_EGG) != 0); return index; } @@ -1643,7 +1643,7 @@ static s8 sub_81C09B4(s8 a) r5 += a; if (r5 < 0 || r5 >= 6) - return -1; + return INVALID_S8; b = c[r5]; if (sub_81C0A50(&mon[b]) == TRUE) return b; @@ -2341,7 +2341,7 @@ static void sub_81C1DA4(u16 a, s16 b) else { u8 taskId = FindTaskIdByFunc(sub_81C1E20); - if (taskId == 0xFF) + if (taskId == INVALID_U8) { taskId = CreateTask(sub_81C1E20, 8); } @@ -2392,7 +2392,7 @@ static void sub_81C1EFC(u16 a, s16 b, u16 move) else { u8 taskId = FindTaskIdByFunc(sub_81C1F80); - if (taskId == 0xFF) + if (taskId == INVALID_U8) taskId = CreateTask(sub_81C1F80, 8); gTasks[taskId].data[0] = b; gTasks[taskId].data[1] = a; @@ -2580,12 +2580,12 @@ static void sub_81C240C(u16 move) { effectValue = gContestEffects[gContestMoves[move].effect].appeal; - if (effectValue != 0xFF) + if (effectValue != INVALID_U8) effectValue /= 10; for (i = 0; i < 8; i++) { - if (effectValue != 0xFF && i < effectValue) + if (effectValue != INVALID_U8 && i < effectValue) { tilemap[(i / 4 * 32) + (i & 3) + 0x1E6] = 0x103A; } @@ -2597,12 +2597,12 @@ static void sub_81C240C(u16 move) effectValue = gContestEffects[gContestMoves[move].effect].jam; - if (effectValue != 0xFF) + if (effectValue != INVALID_U8) effectValue /= 10; for (i = 0; i < 8; i++) { - if (effectValue != 0xFF && i < effectValue) + if (effectValue != INVALID_U8 && i < effectValue) { tilemap[(i / 4 * 32) + (i & 3) + 0x226] = 0x103C; } @@ -2634,7 +2634,7 @@ static void sub_81C2554(void) } for (i = 0; i < 8; i++) { - pssData->windowIds[i] = 0xFF; + pssData->windowIds[i] = INVALID_U8; } } @@ -2661,7 +2661,7 @@ static void sub_81C2628(void) struct Pokemon *mon = &pssData->currentMon; struct PokeSummary *summary = &pssData->summary; u16 dexNum = SpeciesToPokedexNum(summary->species); - if (dexNum != 0xFFFF) + if (dexNum != INVALID_U16) { StringCopy(gStringVar1, &gText_UnkCtrlF908Clear01[0]); ConvertIntToDecimalStringN(gStringVar2, dexNum, 2, 3); @@ -2895,7 +2895,7 @@ static void sub_81C2C38(u8 a) static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 templateId) { u8 *windowIdPtr = &(pssData->windowIds[templateId]); - if (*windowIdPtr == 0xFF) + if (*windowIdPtr == INVALID_U8) { *windowIdPtr = AddWindow(&template[templateId]); FillWindowPixelBuffer(*windowIdPtr, 0); @@ -2906,11 +2906,11 @@ static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 te static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex) { u8 *windowIdPtr = &(pssData->windowIds[windowIndex]); - if (*windowIdPtr != 0xFF) + if (*windowIdPtr != INVALID_U8) { ClearWindowTilemap(*windowIdPtr); RemoveWindow(*windowIdPtr); - *windowIdPtr = 0xFF; + *windowIdPtr = INVALID_U8; } } @@ -2919,7 +2919,7 @@ static void sub_81C2D9C(u8 pageIndex) u16 i; for (i = 0; i < 8; i++) { - if (pssData->windowIds[i] != 0xFF) + if (pssData->windowIds[i] != INVALID_U8) FillWindowPixelBuffer(pssData->windowIds[i], 0); } gUnknown_0861CE54[pageIndex](); @@ -3651,16 +3651,16 @@ static void sub_81C4190(void) for (i = 0; i < 28; i++) { - pssData->spriteIds[i] = 0xFF; + pssData->spriteIds[i] = INVALID_U8; } } static void DestroySpriteInArray(u8 spriteArrayId) { - if (pssData->spriteIds[spriteArrayId] != 0xFF) + if (pssData->spriteIds[spriteArrayId] != INVALID_U8) { DestroySprite(&gSprites[pssData->spriteIds[spriteArrayId]]); - pssData->spriteIds[spriteArrayId] = 0xFF; + pssData->spriteIds[spriteArrayId] = INVALID_U8; } } @@ -3675,7 +3675,7 @@ static void sub_81C424C(void) for (i = 3; i < 28; i++) { - if (pssData->spriteIds[i] != 0xFF) + if (pssData->spriteIds[i] != INVALID_U8) sub_81C4204(i, TRUE); } } @@ -3704,7 +3704,7 @@ static void sub_81C42C8(void) for (i = 3; i < 8; i++) { - if (pssData->spriteIds[i] == 0xFF) + if (pssData->spriteIds[i] == INVALID_U8) pssData->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2); sub_81C4204(i, TRUE); @@ -3851,13 +3851,13 @@ static u8 sub_81C45F4(struct Pokemon *mon, s16 *a1) } } (*a1)++; - return -1; + return INVALID_S8; case 1: pal = GetMonSpritePalStructFromOtIdPersonality(summary->species2, summary->OTID, summary->pid); LoadCompressedObjectPalette(pal); SetMultiuseSpriteTemplateToPokemon(pal->tag, 1); (*a1)++; - return -1; + return INVALID_S8; } } @@ -3921,10 +3921,10 @@ void SummaryScreen_SetUnknownTaskId(u8 a0) void SummaryScreen_DestroyUnknownTask(void) { - if (sUnknownTaskId != 0xFF) + if (sUnknownTaskId != INVALID_U8) { DestroyTask(sUnknownTaskId); - sUnknownTaskId = 0xFF; + sUnknownTaskId = INVALID_U8; } } @@ -3994,7 +3994,7 @@ static void CreateSetStatusSprite(void) u8 *spriteId = &pssData->spriteIds[2]; u8 anim; - if (*spriteId == 0xFF) + if (*spriteId == INVALID_U8) { *spriteId = CreateSprite(&sSpriteTemplate_StatusCondition, 64, 152, 0); } diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c index 4783f73c0..d0f65c4b0 100644 --- a/src/rayquaza_scene.c +++ b/src/rayquaza_scene.c @@ -5,7 +5,7 @@ #include "graphics.h" #include "bg.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "scanline_effect.h" #include "menu.h" diff --git a/src/record_mixing.c b/src/record_mixing.c index df4a1a720..4a4941294 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -1,5 +1,5 @@ #include "global.h" -#include "malloc.h" +#include "alloc.h" #include "random.h" #include "constants/items.h" #include "text.h" @@ -1763,7 +1763,7 @@ static void sub_80E8880(struct RankingHall1P *arg0, struct RankingHall1P *arg1) for (i = 0; i < 3; i++) { s32 highestWinStreak = 0; - s32 highestId = -1; + s32 highestId = INVALID_S32; for (j = 0; j < 6; j++) { if (arg1[j].winStreak > highestWinStreak) @@ -1788,7 +1788,7 @@ static void sub_80E88CC(struct RankingHall2P *arg0, struct RankingHall2P *arg1) for (i = 0; i < 3; i++) { s32 highestWinStreak = 0; - s32 highestId = -1; + s32 highestId = INVALID_S32; for (j = 0; j < 6; j++) { if (arg1[j].winStreak > highestWinStreak) diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 5d79cb789..3fc08ff3f 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -9,7 +9,7 @@ #include "string_util.h" #include "palette.h" #include "save.h" -#include "malloc.h" +#include "alloc.h" #include "util.h" #include "task.h" #include "text.h" @@ -221,7 +221,7 @@ u8 RecordedBattle_GetBattlerAction(u8 battlerId) ResetPaletteFadeControl(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); SetMainCallback2(CB2_QuitRecordedBattle); - return -1; + return INVALID_U8; } else { diff --git a/src/region_map.c b/src/region_map.c index 262a7d020..d7b53d631 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -2,7 +2,7 @@ #include "main.h" #include "text.h" #include "menu.h" -#include "malloc.h" +#include "alloc.h" #include "gpu_regs.h" #include "palette.h" #include "party_menu.h" diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index 34444cbf4..da94c5c46 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -160,7 +160,7 @@ static const union AnimCmd *const sSpriteAnimTable_85104E4[] = static const struct SpriteTemplate sSpriteTemplate_85104F0 = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0x1000, .oam = &sOamData_08510464, .anims = sSpriteAnimTable_85104E4, diff --git a/src/reset_save_heap.c b/src/reset_save_heap.c index 1d90448b2..d7c93a75c 100644 --- a/src/reset_save_heap.c +++ b/src/reset_save_heap.c @@ -6,7 +6,7 @@ #include "save.h" #include "new_game.h" #include "overworld.h" -#include "malloc.h" +#include "alloc.h" void sub_81700F8(void) { diff --git a/src/rock.c b/src/rock.c index 3b8e505d8..b50ecc155 100644 --- a/src/rock.c +++ b/src/rock.c @@ -738,7 +738,7 @@ void sub_811131C(struct Sprite *sprite) if (TranslateAnimArc(sprite)) { u8 taskId = FindTaskIdByFunc(sub_81110A4); - if (taskId != 0xFF) + if (taskId != INVALID_U8) gTasks[taskId].data[11]--; DestroySprite(sprite); diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index a197598de..ef82cbf0a 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -7,7 +7,7 @@ #include "link.h" #include "link_rfu.h" #include "librfu.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "list_menu.h" #include "menu_helpers.h" @@ -961,7 +961,7 @@ u8 sub_80132D4(struct UnkStruct_Main0 *arg0) if (var == 1) { id = sub_80176E4(&data->field_0->arr[i], data->field_4->arr); - if (id != 0xFF) + if (id != INVALID_U8) { data->field_0->arr[i].unk = data->field_4->arr[id].unk0; data->field_0->arr[i].field_18 = var; @@ -1382,7 +1382,7 @@ void sub_8013C7C(u8 taskId) case 3: if (sub_8013E44() == 1) PlaySE(SE_PC_LOGIN); - if (gTasks[taskId].data[15] == 0xFF) + if (gTasks[taskId].data[15] == INVALID_U8) data->state = 10; break; case 10: @@ -1401,14 +1401,14 @@ void sub_8013C7C(u8 taskId) bool32 sub_8013D88(u32 arg0, u32 id) { - if (id == 0xFF) + if (id == INVALID_U8) return TRUE; if (id <= ARRAY_COUNT(gUnknown_082F04D8)) // UB: <= may access data outside the array { const u8 *bytes = gUnknown_082F04D8[id]; - while ((*(bytes) != 0xFF)) + while ((*(bytes) != INVALID_U8)) { if ((*bytes) == arg0) return TRUE; @@ -1454,7 +1454,7 @@ u8 sub_8013E44(void) if (data->field_0->arr[i].field_1A_0 != 0) { id = sub_80176E4(&data->field_0->arr[i], data->field_4->arr); - if (id != 0xFF) + if (id != INVALID_U8) { if (data->field_0->arr[i].field_1A_0 == 1) { @@ -1500,7 +1500,7 @@ u8 sub_8013E44(void) for (id = 0; id < 4; id++) { - if (sub_8017734(data->field_0->arr, &data->field_4->arr[id].unk0, 16) != 0xFF) + if (sub_8017734(data->field_0->arr, &data->field_4->arr[id].unk0, 16) != INVALID_U8) ret = 1; } @@ -2178,7 +2178,7 @@ void sub_8014F48(u8 taskId) break; case 0: id = ListMenuHandleInputGetItemId(data->listTaskId); - if (gMain.newKeys & A_BUTTON && id != -1) + if (gMain.newKeys & A_BUTTON && id != INVALID_S32) { // this unused variable along with the assignment is needed to match u32 unusedVar; @@ -2732,7 +2732,7 @@ void sub_80156E0(u8 taskId) break; case 6: var5 = sub_8017178(&data->textState, &data->field_1B, &data->field_1C, &gUnknown_082F021C, &gUnknown_082F0244); - if (var5 != -1) + if (var5 != INVALID_S32) { if (gReceivedRemoteLinkPlayers == 0) { diff --git a/src/rom_8034C54.c b/src/rom_8034C54.c index be6d6614a..47d9eaf70 100644 --- a/src/rom_8034C54.c +++ b/src/rom_8034C54.c @@ -1,6 +1,6 @@ #include "global.h" #include "rom_8034C54.h" -#include "malloc.h" +#include "alloc.h" #include "decompress.h" #include "main.h" @@ -255,7 +255,7 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2) u32 r5 = arg0->field_14; gUnknown_03000DD4 = arg0->firstOamId; gUnknown_03000DD8 = 0; - gUnknown_03000DDC = -1; + gUnknown_03000DDC = INVALID_S32; while (r5 != 0) { @@ -263,12 +263,12 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2) arg1 -= (r4 * r5); r5 /= 10; - if (r4 != 0 || gUnknown_03000DDC != -1 || r5 == 0) + if (r4 != 0 || gUnknown_03000DDC != INVALID_S32 || r5 == 0) { gMain.oamBuffer[gUnknown_03000DD4].tileNum = (r4 * arg0->field_9) + arg0->tileStart; gMain.oamBuffer[gUnknown_03000DD4].affineMode = 0; - if (gUnknown_03000DDC == -1) + if (gUnknown_03000DDC == INVALID_S32) gUnknown_03000DDC = gUnknown_03000DD8; } else diff --git a/src/rom_81520A8.c b/src/rom_81520A8.c index f6d14d49c..f06823594 100644 --- a/src/rom_81520A8.c +++ b/src/rom_81520A8.c @@ -1,6 +1,6 @@ #include "global.h" #include "rom_81520A8.h" -#include "malloc.h" +#include "alloc.h" #include "main.h" #include "rom_8034C54.h" diff --git a/src/rotating_gate.c b/src/rotating_gate.c index f617321af..395ced06e 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -461,7 +461,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_RotatingGate[] = static const struct SpriteTemplate sSpriteTemplate_RotatingGateLarge = { .tileTag = ROTATING_GATE_TILE_TAG, - .paletteTag = 0xFFFF, + .paletteTag = INVALID_U16, .oam = &sOamData_RotatingGateLarge, .anims = sSpriteAnimTable_RotatingGateLarge, .images = NULL, @@ -472,7 +472,7 @@ static const struct SpriteTemplate sSpriteTemplate_RotatingGateLarge = static const struct SpriteTemplate sSpriteTemplate_RotatingGateRegular = { .tileTag = ROTATING_GATE_TILE_TAG, - .paletteTag = 0xFFFF, + .paletteTag = INVALID_U16, .oam = &sOamData_RotatingGateRegular, .anims = sSpriteAnimTable_RotatingGateRegular, .images = NULL, diff --git a/src/rtc.c b/src/rtc.c index 3f413d0e3..7553d7629 100644 --- a/src/rtc.c +++ b/src/rtc.c @@ -46,12 +46,12 @@ void RtcRestoreInterrupts(void) u32 ConvertBcdToBinary(u8 bcd) { if (bcd > 0x9F) - return 0xFF; + return INVALID_U8; if ((bcd & 0xF) <= 9) return (10 * ((bcd >> 4) & 0xF)) + (bcd & 0xF); else - return 0xFF; + return INVALID_U8; } bool8 IsLeapYear(u32 year) @@ -166,17 +166,17 @@ u16 RtcCheckInfo(struct SiiRtcInfo *rtc) year = ConvertBcdToBinary(rtc->year); - if (year == 0xFF) + if (year == INVALID_U8) errorFlags |= RTC_ERR_INVALID_YEAR; month = ConvertBcdToBinary(rtc->month); - if (month == 0xFF || month == 0 || month > 12) + if (month == INVALID_U8 || month == 0 || month > 12) errorFlags |= RTC_ERR_INVALID_MONTH; value = ConvertBcdToBinary(rtc->day); - if (value == 0xFF) + if (value == INVALID_U8) errorFlags |= RTC_ERR_INVALID_DAY; if (month == MONTH_FEB) diff --git a/src/safari_zone.c b/src/safari_zone.c index accf94981..69914b565 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -185,7 +185,7 @@ struct Pokeblock *SafariZoneGetPokeblockInFront(void) { GetPokeblockFeederInFront(); - if (gSpecialVar_Result == 0xFFFF) + if (gSpecialVar_Result == INVALID_U16) return NULL; else return &sPokeblockFeeders[gSpecialVar_Result].pokeblock; @@ -195,7 +195,7 @@ struct Pokeblock *SafariZoneGetActivePokeblock(void) { GetPokeblockFeederWithinRange(); - if (gSpecialVar_Result == 0xFFFF) + if (gSpecialVar_Result == INVALID_U16) return NULL; else return &sPokeblockFeeders[gSpecialVar_Result].pokeblock; @@ -245,7 +245,7 @@ bool8 GetInFrontFeederPokeblockAndSteps(void) { GetPokeblockFeederInFront(); - if (gSpecialVar_Result == 0xFFFF) + if (gSpecialVar_Result == INVALID_U16) { return FALSE; } diff --git a/src/save.c b/src/save.c index 4ae516fc9..de103864b 100644 --- a/src/save.c +++ b/src/save.c @@ -160,7 +160,7 @@ static u8 save_write_to_flash(u16 a1, const struct SaveSectionLocation *location if (gDamagedSaveSectors != 0) // skip the damaged sector. { - retVal = 0xFF; + retVal = INVALID_U8; gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; } @@ -220,7 +220,7 @@ static u8 TryWriteSector(u8 sector, u8 *data) if (ProgramFlashSectorAndVerify(sector, data) != 0) // is damaged? { SetDamagedSectorBits(ENABLE, sector); // set damaged sector bits. - return 0xFF; + return INVALID_U8; } else { @@ -263,14 +263,14 @@ static u8 sub_81529D4(u16 a1, const struct SaveSectionLocation *location) gUnknown_03006208++; if (gDamagedSaveSectors) { - retVal = 0xFF; + retVal = INVALID_U8; gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; } } else { - retVal = 0xFF; + retVal = INVALID_U8; } return retVal; @@ -284,7 +284,7 @@ static u8 sub_8152A34(u16 a1, const struct SaveSectionLocation *location) if (gDamagedSaveSectors) { - retVal = 0xFF; + retVal = INVALID_U8; gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; } @@ -329,15 +329,15 @@ static u8 ClearSaveData_2(u16 a1, const struct SaveSectionLocation *location) { if (ProgramFlashByte(sector, i, ((u8 *)gFastSaveSection)[i])) { - status = 0xFF; + status = INVALID_U8; break; } } - if (status == 0xFF) + if (status == INVALID_U8) { SetDamagedSectorBits(ENABLE, sector); - return 0xFF; + return INVALID_U8; } else { @@ -347,15 +347,15 @@ static u8 ClearSaveData_2(u16 a1, const struct SaveSectionLocation *location) { if (ProgramFlashByte(sector, 0xFF9 + i, ((u8 *)gFastSaveSection)[0xFF9 + i])) { - status = 0xFF; + status = INVALID_U8; break; } } - if (status == 0xFF) + if (status == INVALID_U8) { SetDamagedSectorBits(ENABLE, sector); - return 0xFF; + return INVALID_U8; } else { @@ -379,7 +379,7 @@ static u8 sav12_xor_get(u16 a1, const struct SaveSectionLocation *location) SetDamagedSectorBits(ENABLE, sector); gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; - return 0xFF; + return INVALID_U8; } else { @@ -402,7 +402,7 @@ static u8 sub_8152CAC(u16 a1, const struct SaveSectionLocation *location) SetDamagedSectorBits(ENABLE, sector); gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; - return 0xFF; + return INVALID_U8; } else { @@ -425,7 +425,7 @@ static u8 sub_8152D44(u16 a1, const struct SaveSectionLocation *location) SetDamagedSectorBits(ENABLE, sector); gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; - return 0xFF; + return INVALID_U8; } else { @@ -440,7 +440,7 @@ static u8 sub_8152DD0(u16 a1, const struct SaveSectionLocation *location) gFastSaveSection = &gSaveDataBuffer; if (a1 != 0xFFFF) { - retVal = 0xFF; + retVal = INVALID_U8; } else { @@ -715,8 +715,8 @@ u8 TrySavingData(u8 saveType) { if (gFlashMemoryPresent != TRUE) { - gUnknown_03006294 = 0xFF; - return 0xFF; + gUnknown_03006294 = INVALID_U8; + return INVALID_U8; } HandleSavingData(saveType); @@ -728,8 +728,8 @@ u8 TrySavingData(u8 saveType) else { DoSaveFailedScreen(saveType); - gUnknown_03006294 = 0xFF; - return 0xFF; + gUnknown_03006294 = INVALID_U8; + return INVALID_U8; } } @@ -748,7 +748,7 @@ bool8 sub_81533AC(void) // trade.s save u8 retVal = sub_81529D4(SECTOR_SAVE_SLOT_LENGTH, gRamSaveSectionLocations); if (gDamagedSaveSectors) DoSaveFailedScreen(0); - if (retVal == 0xFF) + if (retVal == INVALID_U8) return TRUE; else return FALSE; @@ -808,7 +808,7 @@ u8 Save_LoadGameData(u8 a1) if (gFlashMemoryPresent != TRUE) { gSaveFileStatus = 4; - return 0xFF; + return INVALID_U8; } UpdateSaveAddresses(); @@ -861,10 +861,10 @@ u32 TryCopySpecialSaveSection(u8 sector, u8* dst) u8* savData; if (sector != SECTOR_ID_TRAINER_HILL && sector != SECTOR_ID_RECORDED_BATTLE) - return 0xFF; + return INVALID_U8; ReadFlash(sector, 0, (u8 *)&gSaveDataBuffer, sizeof(struct SaveSection)); if (*(u32*)(&gSaveDataBuffer.data[0]) != 0xB39D) - return 0xFF; + return INVALID_U8; // copies whole save section except u32 counter i = 0; size = 0xFFB; @@ -882,7 +882,7 @@ u32 sub_8153634(u8 sector, u8* src) void* savDataBuffer; if (sector != 30 && sector != 31) - return 0xFF; + return INVALID_U8; savDataBuffer = &gSaveDataBuffer; *(u32*)(savDataBuffer) = 0xB39D; @@ -894,7 +894,7 @@ u32 sub_8153634(u8 sector, u8* src) for (; i <= size; i++) savData[i] = src[i]; if (ProgramFlashSectorAndVerify(sector, savDataBuffer) != 0) - return 0xFF; + return INVALID_U8; return 1; } diff --git a/src/save_location.c b/src/save_location.c index d49afa736..f7d3aa60b 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -12,7 +12,7 @@ static bool32 IsCurMapInLocationList(const u16 *list) s32 i; u16 locSum = (gSaveBlock1Ptr->location.mapGroup << 8) + (gSaveBlock1Ptr->location.mapNum); - for (i = 0; list[i] != 0xFFFF; i++) + for (i = 0; list[i] != INVALID_U16; i++) { if (list[i] == locSum) return TRUE; @@ -61,7 +61,7 @@ static const u16 sSaveLocationPokeCenterList[] = MAP_TRADE_CENTER, MAP_RECORD_CORNER, MAP_DOUBLE_BATTLE_COLOSSEUM, - 0xFFFF, + INVALID_U16, }; static bool32 IsCurMapPokeCenter(void) @@ -72,7 +72,7 @@ static bool32 IsCurMapPokeCenter(void) static const u16 sSaveLocationReloadLocList[] = // There's only 1 location, and it's presumed its for the save reload feature for battle tower. { MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, - 0xFFFF, + INVALID_U16, }; static bool32 IsCurMapReloadLocation(void) @@ -83,7 +83,7 @@ static bool32 IsCurMapReloadLocation(void) // Nulled out list. Unknown what this would have been. static const u16 sUnknown_0861440E[] = { - 0xFFFF, + INVALID_U16, }; static bool32 sub_81AFCEC(void) diff --git a/src/scanline_effect.c b/src/scanline_effect.c index a9ae9427b..2e264ee29 100644 --- a/src/scanline_effect.c +++ b/src/scanline_effect.c @@ -22,10 +22,10 @@ void ScanlineEffect_Stop(void) { gScanlineEffect.state = 0; DmaStop(0); - if (gScanlineEffect.waveTaskId != 0xFF) + if (gScanlineEffect.waveTaskId != INVALID_U8) { DestroyTask(gScanlineEffect.waveTaskId); - gScanlineEffect.waveTaskId = 0xFF; + gScanlineEffect.waveTaskId = INVALID_U8; } } @@ -40,7 +40,7 @@ void ScanlineEffect_Clear(void) gScanlineEffect.state = 0; gScanlineEffect.unused16 = 0; gScanlineEffect.unused17 = 0; - gScanlineEffect.waveTaskId = 0xFF; + gScanlineEffect.waveTaskId = INVALID_U8; } void ScanlineEffect_SetParams(struct ScanlineEffectParams params) @@ -132,7 +132,7 @@ static void TaskFunc_UpdateWavePerFrame(u8 taskId) if (sShouldStopWaveTask) { DestroyTask(taskId); - gScanlineEffect.waveTaskId = 0xFF; + gScanlineEffect.waveTaskId = INVALID_U8; } else { diff --git a/src/scrcmd.c b/src/scrcmd.c index 310387337..4217f7237 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -790,7 +790,7 @@ bool8 ScrCmd_warphole(struct ScriptContext *ctx) u16 y; PlayerGetDestCoords(&x, &y); - if (mapGroup == 0xFF && mapNum == 0xFF) + if (mapGroup == INVALID_U8 && mapNum == INVALID_U8) SetFixedHoleWarpAsDestination(x - 7, y - 7); else Overworld_SetWarpDestination(mapGroup, mapNum, -1, x - 7, y - 7); @@ -1491,7 +1491,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) if (width > 0x1C) width = 0x1C; - for (i = 0, height = 4; gStringVar4[i] != 0xFF;) + for (i = 0, height = 4; gStringVar4[i] != INVALID_U8;) { if (gStringVar4[i++] == 0xFE) height += 3; diff --git a/src/script.c b/src/script.c index c61ae7183..4e133a188 100644 --- a/src/script.c +++ b/src/script.c @@ -391,11 +391,11 @@ bool32 sub_80991F8(void) struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data; if (scriptData->magic != RAM_SCRIPT_MAGIC) return FALSE; - if (scriptData->mapGroup != 0xFF) + if (scriptData->mapGroup != INVALID_U8) return FALSE; - if (scriptData->mapNum != 0xFF) + if (scriptData->mapNum != INVALID_U8) return FALSE; - if (scriptData->objectId != 0xFF) + if (scriptData->objectId != INVALID_U8) return FALSE; if (CalculateRamScriptChecksum() != gSaveBlock1Ptr->ramScript.checksum) return FALSE; @@ -409,11 +409,11 @@ u8 *sub_8099244(void) return NULL; if (scriptData->magic != RAM_SCRIPT_MAGIC) return NULL; - if (scriptData->mapGroup != 0xFF) + if (scriptData->mapGroup != INVALID_U8) return NULL; - if (scriptData->mapNum != 0xFF) + if (scriptData->mapNum != INVALID_U8) return NULL; - if (scriptData->objectId != 0xFF) + if (scriptData->objectId != INVALID_U8) return NULL; if (CalculateRamScriptChecksum() != gSaveBlock1Ptr->ramScript.checksum) { diff --git a/src/script_menu.c b/src/script_menu.c index 2aa546288..fcb2d17a2 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1040,7 +1040,7 @@ bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress) } else { - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = INVALID_U8; DrawMultichoiceMenu(left, top, multichoiceId, ignoreBPress, 0); return TRUE; } @@ -1054,7 +1054,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, bool8 } else { - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = INVALID_U8; DrawMultichoiceMenu(left, top, multichoiceId, ignoreBPress, defaultChoice); return TRUE; } @@ -1201,7 +1201,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top) } else { - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = INVALID_U8; DisplayYesNoMenu(); taskId = CreateTask(Task_HandleYesNoInput, 0x50); return TRUE; @@ -1211,7 +1211,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top) // unused bool8 IsScriptActive(void) { - if (gSpecialVar_Result == 0xFF) + if (gSpecialVar_Result == INVALID_U8) return FALSE; else return TRUE; @@ -1261,7 +1261,7 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPr int i; u8 newWidth; - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = INVALID_U8; width = 0; for (i = 0; i < gMultichoiceLists[multichoiceId].count; i++) @@ -1320,7 +1320,7 @@ bool8 ScrSpecial_CreatePCMenu(void) } else { - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = INVALID_U8; CreatePCMenu(); return TRUE; } @@ -1389,7 +1389,7 @@ bool8 sub_80E2548(void) } else { - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = INVALID_U8; sub_80E2578(); return TRUE; } @@ -1407,7 +1407,7 @@ static void sub_80E2578(void) for (i = 0; i < ARRAY_COUNT(gUnknown_03001124); i++) { - gUnknown_03001124[i] |= 0xFF; + gUnknown_03001124[i] |= INVALID_U8; } GetFontAttribute(1, FONTATTR_MAX_LETTER_WIDTH); @@ -1508,7 +1508,7 @@ static void sub_80E2578(void) for (j = 0; j < ARRAY_COUNT(gUnknown_0858BB80); j++) { u8 test = gUnknown_03001124[j]; - if (test != 0xFF) + if (test != INVALID_U8) { pixelWidth = display_text_and_get_width(gUnknown_0858BB80[test], pixelWidth); } @@ -1520,7 +1520,7 @@ static void sub_80E2578(void) for (temp = 0, i = 0; i < ARRAY_COUNT(gUnknown_0858BB80); i++) { - if (gUnknown_03001124[i] != 0xFF) + if (gUnknown_03001124[i] != INVALID_U8) { AddTextPrinterParameterized(windowId, 1, gUnknown_0858BB80[gUnknown_03001124[i]], 8, temp * 16 + 1, TEXT_SPEED_FF, NULL); temp++; @@ -1575,7 +1575,7 @@ bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y) u8 taskId; u8 spriteId; - if (FindTaskIdByFunc(Task_PokemonPicWindow) != 0xFF) + if (FindTaskIdByFunc(Task_PokemonPicWindow) != INVALID_U8) { return FALSE; } @@ -1599,7 +1599,7 @@ bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void) { u8 taskId = FindTaskIdByFunc(Task_PokemonPicWindow); - if (taskId == 0xFF) + if (taskId == INVALID_U8) return NULL; gTasks[taskId].tState++; return IsPicboxClosed; @@ -1607,7 +1607,7 @@ bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void) static bool8 IsPicboxClosed(void) { - if (FindTaskIdByFunc(Task_PokemonPicWindow) == 0xFF) + if (FindTaskIdByFunc(Task_PokemonPicWindow) == INVALID_U8) return TRUE; else return FALSE; @@ -1672,7 +1672,7 @@ bool16 sp106_CreateStartMenu(void) return FALSE; } - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = INVALID_U8; CreateStartMenu(); return TRUE; } diff --git a/src/script_movement.c b/src/script_movement.c index 9fee9e060..54e6f9995 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -50,7 +50,7 @@ void sub_80D338C(void) u8 taskId; taskId = sub_80D33F4(); - if (taskId != 0xFF) + if (taskId != INVALID_U8) { UnfreezeObjects(taskId); DestroyTask(taskId); @@ -65,7 +65,7 @@ static void sub_80D33AC(u8 priority) taskId = CreateTask(sub_80D3660, priority); for (i = 1; i < 16; i++) - gTasks[taskId].data[i] = 0xFFFF; + gTasks[taskId].data[i] = INVALID_U16; } static u8 sub_80D33F4(void) @@ -188,7 +188,7 @@ static void UnfreezeObjects(u8 taskId) pEventObjId = (u8 *)&gTasks[taskId].data[1]; for (i = 0; i < 16; i++, pEventObjId++) { - if (*pEventObjId != 0xFF) + if (*pEventObjId != INVALID_U8) UnfreezeEventObject(&gEventObjects[*pEventObjId]); } } @@ -201,7 +201,7 @@ static void sub_80D3660(u8 taskId) for (i = 0; i < 16; i++) { sub_80D3508(taskId, i, &var); - if (var != 0xFF) + if (var != INVALID_U8) sub_80A2490(taskId, i, var, sub_80D35CC(i)); } } diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index 7fc61f953..77c1a88e0 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -318,7 +318,7 @@ void ShowContestEntryMonPic(void) u8 taskId; u8 left, top; - if (FindTaskIdByFunc(sub_80F8EE8) == 0xFF) + if (FindTaskIdByFunc(sub_80F8EE8) == INVALID_U8) { AllocateMonSpritesGfx(); left = 10; @@ -361,7 +361,7 @@ void ShowContestEntryMonPic(void) void sub_80F8EB8(void) { u8 taskId = FindTaskIdByFunc(sub_80F8EE8); - if (taskId != 0xFF) + if (taskId != INVALID_U8) { gTasks[taskId].data[0]++; FreeMonSpritesGfx(); diff --git a/src/secret_base.c b/src/secret_base.c index 8436d8520..78e6bd7d0 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -3,7 +3,7 @@ #include "global.h" #include "constants/bg_event_constants.h" #include "constants/decorations.h" -#include "malloc.h" +#include "alloc.h" #include "main.h" #include "task.h" #include "palette.h" @@ -1385,7 +1385,7 @@ s16 sub_80EA990(u8 secretBaseRecordId) return i; } } - return -1; + return INVALID_S16; } u8 sub_80EA9D8(void) @@ -1427,7 +1427,7 @@ u8 sub_80EAA64(struct SecretBaseRecord *base, u32 version, u32 language) secretBaseRecordId = sub_80EA990(base->secretBaseId); if (secretBaseRecordId != 0) { - if (secretBaseRecordId != -1) + if (secretBaseRecordId != INVALID_S16) { if (gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_0 == 1) { @@ -1757,7 +1757,7 @@ void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx) gSaveBlock1Ptr->secretBases[i].sbr_field_1_6 = 0; } } - if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != 0xFFFF) + if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != INVALID_U16) { gSaveBlock1Ptr->secretBases[0].sbr_field_e ++; } diff --git a/src/shop.c b/src/shop.c index a0eddee01..c0359bda0 100755 --- a/src/shop.c +++ b/src/shop.c @@ -17,7 +17,7 @@ #include "item_menu.h" #include "list_menu.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "menu_helpers.h" #include "money.h" @@ -446,9 +446,9 @@ static void CB2_InitBuyMenu(void) ResetTasks(); clear_scheduled_bg_copies_to_vram(); gShopDataPtr = AllocZeroed(sizeof(struct ShopData)); - gShopDataPtr->scrollIndicatorsTaskId = 0xFF; - gShopDataPtr->itemSpriteIds[0] = -1; - gShopDataPtr->itemSpriteIds[1] = -1; + gShopDataPtr->scrollIndicatorsTaskId = INVALID_U8; + gShopDataPtr->itemSpriteIds[0] = INVALID_U8; + gShopDataPtr->itemSpriteIds[1] = INVALID_U8; BuyMenuBuildListMenuTemplate(); BuyMenuInitBgs(); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); @@ -580,7 +580,7 @@ static void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y) static void BuyMenuAddScrollIndicatorArrows(void) { - if (gShopDataPtr->scrollIndicatorsTaskId == 0xFF && gMartInfo.itemCount + 1 > 8) + if (gShopDataPtr->scrollIndicatorsTaskId == INVALID_U8 && gMartInfo.itemCount + 1 > 8) { gShopDataPtr->scrollIndicatorsTaskId = AddScrollIndicatorArrowPairParameterized( SCROLL_ARROW_UP, @@ -596,10 +596,10 @@ static void BuyMenuAddScrollIndicatorArrows(void) static void BuyMenuRemoveScrollIndicatorArrows(void) { - if (gShopDataPtr->scrollIndicatorsTaskId != 0xFF) + if (gShopDataPtr->scrollIndicatorsTaskId != INVALID_U8) { RemoveScrollIndicatorArrowPair(gShopDataPtr->scrollIndicatorsTaskId); - gShopDataPtr->scrollIndicatorsTaskId = 0xFF; + gShopDataPtr->scrollIndicatorsTaskId = INVALID_U8; } } @@ -613,10 +613,10 @@ static void BuyMenuAddItemIcon(u16 item, u8 iconSlot) { u8 spriteId; u8 *spriteIdPtr = &gShopDataPtr->itemSpriteIds[iconSlot]; - if (*spriteIdPtr != 0xFF) + if (*spriteIdPtr != INVALID_U8) return; - if (gMartInfo.martType == MART_TYPE_0 || item == 0xFFFF) + if (gMartInfo.martType == MART_TYPE_0 || item == INVALID_U16) { spriteId = AddItemIconSprite(iconSlot + 2110, iconSlot + 2110, item); if (spriteId != MAX_SPRITES) @@ -637,13 +637,13 @@ static void BuyMenuAddItemIcon(u16 item, u8 iconSlot) static void BuyMenuRemoveItemIcon(u16 item, u8 iconSlot) { u8 *spriteIdPtr = &gShopDataPtr->itemSpriteIds[iconSlot]; - if (*spriteIdPtr == 0xFF) + if (*spriteIdPtr == INVALID_U8) return; FreeSpriteTilesByTag(iconSlot + 2110); FreeSpritePaletteByTag(iconSlot + 2110); DestroySprite(&gSprites[*spriteIdPtr]); - *spriteIdPtr = 0xFF; + *spriteIdPtr = INVALID_U8; } static void BuyMenuInitBgs(void) diff --git a/src/slot_machine.c b/src/slot_machine.c index 01ef6d85c..97fe0b146 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -14,7 +14,7 @@ #include "util.h" #include "text.h" #include "menu.h" -#include "malloc.h" +#include "alloc.h" #include "bg.h" #include "gpu_regs.h" #include "coins.h" @@ -1637,7 +1637,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) /*static */bool8 sub_8102A44(void) { - if (FindTaskIdByFunc(sub_8102A64) == 0xff) + if (FindTaskIdByFunc(sub_8102A64) == INVALID_U8) return TRUE; else return FALSE; @@ -2672,7 +2672,7 @@ s16 sub_8102D5C(s16 a0) /*static */bool8 sub_810432C(void) { - if (FindTaskIdByFunc(sub_810434C) == 0xFF) + if (FindTaskIdByFunc(sub_810434C) == INVALID_U8) return TRUE; return FALSE; } @@ -3007,7 +3007,7 @@ s16 sub_8102D5C(s16 a0) /*static */bool8 sub_8104AEC(void) { - if (FindTaskIdByFunc(sub_8104B0C) == 0xFF) + if (FindTaskIdByFunc(sub_8104B0C) == INVALID_U8) return TRUE; else return FALSE; @@ -3108,7 +3108,7 @@ s16 sub_8102D5C(s16 a0) task = gTasks + sSlotMachine->unk3D; task->data[1] = arg0; - for (i = 0; gUnknown_083ED048[arg0][i].unk00 != 0xFF; i++) + for (i = 0; gUnknown_083ED048[arg0][i].unk00 != INVALID_U8; i++) { u8 spriteId; spriteId = sub_8105BB4( @@ -3138,7 +3138,7 @@ s16 sub_8102D5C(s16 a0) { u8 i; struct Task *task = gTasks + sSlotMachine->unk3D; - if ((u16)task->data[1] != 0xFFFF) + if ((u16)task->data[1] != INVALID_U16) gUnknown_083ED064[task->data[1]](); for (i = 4; i < 16; i++) { diff --git a/src/smokescreen.c b/src/smokescreen.c index 9b37cd234..1119e9e90 100644 --- a/src/smokescreen.c +++ b/src/smokescreen.c @@ -12,7 +12,7 @@ u8 sub_807521C(s16 x, s16 y, u8 a3) u8 spriteId1, spriteId2, spriteId3, spriteId4; struct Sprite *mainSprite; - if (GetSpriteTileStartByTag(gUnknown_0831C620.tag) == 0xFFFF) + if (GetSpriteTileStartByTag(gUnknown_0831C620.tag) == INVALID_U16) { LoadCompressedObjectPicUsingHeap(&gUnknown_0831C620); LoadCompressedObjectPaletteUsingHeap(&gUnknown_0831C628); diff --git a/src/sound.c b/src/sound.c index ba3f659cc..7798700c3 100644 --- a/src/sound.c +++ b/src/sound.c @@ -247,7 +247,7 @@ void FadeInNewBGM(u16 songNum, u8 speed) { if (gDisableMusic) songNum = 0; - if (songNum == 0xFFFF) + if (songNum == INVALID_U16) songNum = 0; m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlayInfo_BGM); @@ -544,7 +544,7 @@ void PlayBGM(u16 songNum) { if (gDisableMusic) songNum = 0; - if (songNum == 0xFFFF) + if (songNum == INVALID_U16) songNum = 0; m4aSongNumStart(songNum); } diff --git a/src/sprite.c b/src/sprite.c index 4087dd8c4..3f0223dee 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -108,7 +108,7 @@ typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *); 0 \ } -#define ANIM_END 0xFFFF +#define ANIM_END INVALID_U16 #define AFFINE_ANIM_END 0x7FFF // forward declarations @@ -204,7 +204,7 @@ const union AffineAnimCmd * const gDummySpriteAffineAnimTable[] = { &sDummyAffin const struct SpriteTemplate gDummySpriteTemplate = { .tileTag = 0, - .paletteTag = 0xFFFF, + .paletteTag = INVALID_U16, .oam = &gDummyOamData, .anims = gDummySpriteAnimTable, .images = NULL, @@ -572,12 +572,12 @@ u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y, CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); - if (template->tileTag == 0xFFFF) + if (template->tileTag == INVALID_U16) { s16 tileNum; sprite->images = template->images; tileNum = AllocSpriteTiles((u8)(sprite->images->size / TILE_SIZE_4BPP)); - if (tileNum == -1) + if (tileNum == INVALID_S16) { ResetSprite(sprite); return MAX_SPRITES; @@ -595,7 +595,7 @@ u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y, if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK) InitSpriteAffineAnim(sprite); - if (template->paletteTag != 0xFFFF) + if (template->paletteTag != INVALID_U16) sprite->oam.paletteNum = IndexOfSpritePaletteTag(template->paletteTag); return index; @@ -740,7 +740,7 @@ s16 AllocSpriteTiles(u16 tileCount) i++; if (i == TOTAL_OBJ_TILE_COUNT) - return -1; + return INVALID_S16; } start = i; @@ -751,7 +751,7 @@ s16 AllocSpriteTiles(u16 tileCount) i++; if (i == TOTAL_OBJ_TILE_COUNT) - return -1; + return INVALID_S16; if (!SPRITE_TILE_IS_ALLOCATED(i)) numTilesFound++; @@ -877,7 +877,7 @@ void ResetAllSprites(void) void FreeSpriteTiles(struct Sprite *sprite) { - if (sprite->template->tileTag != 0xFFFF) + if (sprite->template->tileTag != INVALID_U16) FreeSpriteTilesByTag(sprite->template->tileTag); } @@ -923,7 +923,7 @@ void BeginAnim(struct Sprite *sprite) sprite->animLoopCounter = 0; imageValue = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue; - if (imageValue != -1) + if (imageValue != INVALID_S16) { sprite->animBeginning = FALSE; duration = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration; @@ -1441,7 +1441,7 @@ u8 AllocOamMatrix(void) bit <<= 1; } - return 0xFF; + return INVALID_U8; } void FreeOamMatrix(u8 matrixNum) @@ -1462,7 +1462,7 @@ void FreeOamMatrix(u8 matrixNum) void InitSpriteAffineAnim(struct Sprite *sprite) { u8 matrixNum = AllocOamMatrix(); - if (matrixNum != 0xFF) + if (matrixNum != INVALID_U8) { CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); sprite->oam.matrixNum = matrixNum; @@ -1508,7 +1508,7 @@ void LoadSpriteSheets(const struct SpriteSheet *sheets) void FreeSpriteTilesByTag(u16 tag) { u8 index = IndexOfSpriteTileTag(tag); - if (index != 0xFF) + if (index != INVALID_U8) { u16 i; u16 *rangeStarts; @@ -1523,7 +1523,7 @@ void FreeSpriteTilesByTag(u16 tag) for (i = start; i < start + count; i++) FREE_SPRITE_TILE(i); - sSpriteTileRangeTags[index] = 0xFFFF; + sSpriteTileRangeTags[index] = INVALID_U16; } } @@ -1533,7 +1533,7 @@ void FreeSpriteTileRanges(void) for (i = 0; i < MAX_SPRITES; i++) { - sSpriteTileRangeTags[i] = 0xFFFF; + sSpriteTileRangeTags[i] = INVALID_U16; SET_SPRITE_TILE_RANGE(i, 0, 0); } } @@ -1541,8 +1541,8 @@ void FreeSpriteTileRanges(void) u16 GetSpriteTileStartByTag(u16 tag) { u8 index = IndexOfSpriteTileTag(tag); - if (index == 0xFF) - return 0xFFFF; + if (index == INVALID_U8) + return INVALID_U16; return sSpriteTileRanges[index * 2]; } @@ -1554,7 +1554,7 @@ u8 IndexOfSpriteTileTag(u16 tag) if (sSpriteTileRangeTags[i] == tag) return i; - return 0xFF; + return INVALID_U8; } u16 GetSpriteTileTagByTileStart(u16 start) @@ -1563,16 +1563,16 @@ u16 GetSpriteTileTagByTileStart(u16 start) for (i = 0; i < MAX_SPRITES; i++) { - if (sSpriteTileRangeTags[i] != 0xFFFF && sSpriteTileRanges[i * 2] == start) + if (sSpriteTileRangeTags[i] != INVALID_U16 && sSpriteTileRanges[i * 2] == start) return sSpriteTileRangeTags[i]; } - return 0xFFFF; + return INVALID_U16; } void AllocSpriteTileRange(u16 tag, u16 start, u16 count) { - u8 freeIndex = IndexOfSpriteTileTag(0xFFFF); + u8 freeIndex = IndexOfSpriteTileTag(INVALID_U16); sSpriteTileRangeTags[freeIndex] = tag; SET_SPRITE_TILE_RANGE(freeIndex, start, count); } @@ -1582,21 +1582,21 @@ void FreeAllSpritePalettes(void) u8 i; gReservedSpritePaletteCount = 0; for (i = 0; i < 16; i++) - sSpritePaletteTags[i] = 0xFFFF; + sSpritePaletteTags[i] = INVALID_U16; } u8 LoadSpritePalette(const struct SpritePalette *palette) { u8 index = IndexOfSpritePaletteTag(palette->tag); - if (index != 0xFF) + if (index != INVALID_U8) return index; - index = IndexOfSpritePaletteTag(0xFFFF); + index = IndexOfSpritePaletteTag(INVALID_U16); - if (index == 0xFF) + if (index == INVALID_U8) { - return 0xFF; + return INVALID_U8; } else { @@ -1610,7 +1610,7 @@ void LoadSpritePalettes(const struct SpritePalette *palettes) { u8 i; for (i = 0; palettes[i].data != NULL; i++) - if (LoadSpritePalette(&palettes[i]) == 0xFF) + if (LoadSpritePalette(&palettes[i]) == INVALID_U8) break; } @@ -1621,10 +1621,10 @@ void DoLoadSpritePalette(const u16 *src, u16 paletteOffset) u8 AllocSpritePalette(u16 tag) { - u8 index = IndexOfSpritePaletteTag(0xFFFF); - if (index == 0xFF) + u8 index = IndexOfSpritePaletteTag(INVALID_U16); + if (index == INVALID_U8) { - return 0xFF; + return INVALID_U8; } else { @@ -1640,7 +1640,7 @@ u8 IndexOfSpritePaletteTag(u16 tag) if (sSpritePaletteTags[i] == tag) return i; - return 0xFF; + return INVALID_U8; } u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum) @@ -1651,8 +1651,8 @@ u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum) void FreeSpritePaletteByTag(u16 tag) { u8 index = IndexOfSpritePaletteTag(tag); - if (index != 0xFF) - sSpritePaletteTags[index] = 0xFFFF; + if (index != INVALID_U8) + sSpritePaletteTags[index] = INVALID_U16; } void SetSubspriteTables(struct Sprite *sprite, const struct SubspriteTable *subspriteTables) diff --git a/src/task.c b/src/task.c index f067e21b4..2a77b8a9b 100644 --- a/src/task.c +++ b/src/task.c @@ -19,7 +19,7 @@ void ResetTasks(void) gTasks[i].func = TaskDummy; gTasks[i].prev = i; gTasks[i].next = i + 1; - gTasks[i].priority = -1; + gTasks[i].priority = INVALID_S8; memset(gTasks[i].data, 0, sizeof(gTasks[i].data)); } @@ -186,7 +186,7 @@ u8 FindTaskIdByFunc(TaskFunc func) if (gTasks[i].isActive == TRUE && gTasks[i].func == func) return (u8)i; - return -1; + return INVALID_U8; } u8 GetTaskCount(void) diff --git a/src/text.c b/src/text.c index 07c15596e..44895722d 100644 --- a/src/text.c +++ b/src/text.c @@ -1877,7 +1877,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) if (func == NULL) return 0; - if (letterSpacing == -1) + if (letterSpacing == INVALID_S16) localLetterSpacing = GetFontAttribute(fontId, FONTATTR_LETTER_SPACING); else localLetterSpacing = letterSpacing; @@ -1953,7 +1953,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) func = GetFontWidthFunc(*++str); if (func == NULL) return 0; - if (letterSpacing == -1) + if (letterSpacing == INVALID_S16) localLetterSpacing = GetFontAttribute(*str, FONTATTR_LETTER_SPACING); break; case 0x11: diff --git a/src/trader.c b/src/trader.c index e23efb4ce..afb0cca48 100644 --- a/src/trader.c +++ b/src/trader.c @@ -155,7 +155,7 @@ void ScrSpecial_IsDecorationFull(void) { gSpecialVar_Result = FALSE; if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category - && GetFirstEmptyDecorSlot(gDecorations[gSpecialVar_0x8004].category) == -1) + && GetFirstEmptyDecorSlot(gDecorations[gSpecialVar_0x8004].category) == INVALID_S8) { sub_8127250(gStringVar2, gDecorations[gSpecialVar_0x8004].category); gSpecialVar_Result = TRUE; diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index 040310901..fd97623fe 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -1,7 +1,7 @@ #include "global.h" #include "sprite.h" #include "window.h" -#include "malloc.h" +#include "alloc.h" #include "constants/species.h" #include "palette.h" #include "decompress.h" @@ -107,9 +107,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 { if (!isTrainer) { - if (paletteTag == 0xFFFF) + if (paletteTag == INVALID_U16) { - sCreatingSpriteTemplate.paletteTag |= 0xFFFF; + sCreatingSpriteTemplate.paletteTag |= INVALID_U16; LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20); } else @@ -120,9 +120,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 } else { - if (paletteTag == 0xFFFF) + if (paletteTag == INVALID_U16) { - sCreatingSpriteTemplate.paletteTag |= 0xFFFF; + sCreatingSpriteTemplate.paletteTag |= INVALID_U16; LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, 0x100 + paletteSlot * 0x10, 0x20); } else @@ -166,30 +166,30 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront } if (i == PICS_COUNT) { - return 0xFFFF; + return INVALID_U16; } framePics = Alloc(4 * 0x800); if (!framePics) { - return 0xFFFF; + return INVALID_U16; } images = Alloc(4 * sizeof(struct SpriteFrameImage)); if (!images) { Free(framePics); - return 0xFFFF; + return INVALID_U16; } if (DecompressPic(species, personality, isFrontPic, framePics, isTrainer, ignoreDeoxys)) { // debug trap? - return 0xFFFF; + return INVALID_U16; } for (j = 0; j < 4; j ++) { images[j].data = framePics + 0x800 * j; images[j].size = 0x800; } - sCreatingSpriteTemplate.tileTag = 0xFFFF; + sCreatingSpriteTemplate.tileTag = INVALID_U16; sCreatingSpriteTemplate.oam = &gUnknown_0860B064; AssignSpriteAnimsTable(isTrainer); sCreatingSpriteTemplate.images = images; @@ -197,7 +197,7 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront sCreatingSpriteTemplate.callback = DummyPicSpriteCallback; LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, isTrainer); spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0); - if (paletteTag == 0xFFFF) + if (paletteTag == INVALID_U16) { gSprites[spriteId].oam.paletteNum = paletteSlot; } @@ -232,12 +232,12 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1 } if (i == PICS_COUNT) { - return 0xFFFF; + return INVALID_U16; } framePics = Alloc(4 * 0x800); if (!framePics) { - return 0xFFFF; + return INVALID_U16; } if (flags & 0x80) { @@ -252,19 +252,19 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1 if (!images) { Free(framePics); - return 0xFFFF; + return INVALID_U16; } if (DecompressPic(species, personality, flags, framePics, FALSE, FALSE)) { // debug trap? - return 0xFFFF; + return INVALID_U16; } for (j = 0; j < 4; j ++) { images[j].data = framePics + 0x800 * j; images[j].size = 0x800; } - sCreatingSpriteTemplate.tileTag = 0xFFFF; + sCreatingSpriteTemplate.tileTag = INVALID_U16; sCreatingSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species]; sCreatingSpriteTemplate.images = images; if (flags2 == 0x01) @@ -285,7 +285,7 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1 sCreatingSpriteTemplate.callback = DummyPicSpriteCallback; LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, FALSE); spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0); - if (paletteTag == 0xFFFF) + if (paletteTag == INVALID_U16) { gSprites[spriteId].oam.paletteNum = paletteSlot; } @@ -312,11 +312,11 @@ static u16 FreeAndDestroyPicSpriteInternal(u16 spriteId) } if (i == PICS_COUNT) { - return 0xFFFF; + return INVALID_U16; } framePics = sSpritePics[i].frames; images = sSpritePics[i].images; - if (sSpritePics[i].paletteTag != 0xFFFF) + if (sSpritePics[i].paletteTag != INVALID_U16) { FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum)); } @@ -331,7 +331,7 @@ static u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic, { if (DecompressPic_HandleDeoxys(species, personality, isFrontPic, (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE)) { - return 0xFFFF; + return INVALID_U16; } LoadPicPaletteBySlot(species, otId, personality, paletteSlot, isTrainer); return 0; @@ -349,7 +349,7 @@ static u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic, Free(framePics); return 0; } - return 0xFFFF; + return INVALID_U16; } static u16 CreateMonPicSprite(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 ignoreDeoxys) diff --git a/src/tv.c b/src/tv.c index d3d1e797b..0c5c3f564 100644 --- a/src/tv.c +++ b/src/tv.c @@ -30,7 +30,7 @@ #include "text.h" #include "script_menu.h" #include "naming_screen.h" -#include "malloc.h" +#include "alloc.h" #include "region_map.h" #include "constants/region_map_sections.h" #include "decoration.h" @@ -799,7 +799,7 @@ u8 special_0x44(void) j --; } } while (j != selIdx); - return 0xFF; + return INVALID_U8; } u8 FindAnyTVShowOnTheAir(void) @@ -807,9 +807,9 @@ u8 FindAnyTVShowOnTheAir(void) u8 response; response = special_0x44(); - if (response == 0xFF) + if (response == INVALID_U8) { - return 0xFF; + return INVALID_U8; } if (gSaveBlock1Ptr->outbreakPokemonSpecies != SPECIES_NONE && gSaveBlock1Ptr->tvShows[response].common.kind == TVSHOW_MASS_OUTBREAK) { @@ -833,7 +833,7 @@ void UpdateTVScreensOnMap(int width, int height) { SetTVMetatilesOnMap(width, height, 0x3); } - else if (FlagGet(FLAG_SYS_TV_START) && (FindAnyTVShowOnTheAir() != 0xff || FindAnyTVNewsOnTheAir() != 0xff || IsTVShowInSearchOfTrainersAiring())) + else if (FlagGet(FLAG_SYS_TV_START) && (FindAnyTVShowOnTheAir() != INVALID_U8 || FindAnyTVNewsOnTheAir() != INVALID_U8 || IsTVShowInSearchOfTrainersAiring())) { FlagClear(FLAG_SYS_TV_WATCH); SetTVMetatilesOnMap(width, height, 0x3); @@ -887,7 +887,7 @@ u8 FindFirstActiveTVShowThatIsNotAMassOutbreak(void) return i; } } - return 0xFF; + return INVALID_U8; } u8 special_0x4a(void) @@ -932,7 +932,7 @@ void GabbyAndTyBeforeInterview(void) gSaveBlock1Ptr->gabbyAndTyData.mon1 = gBattleResults.playerMon1Species; gSaveBlock1Ptr->gabbyAndTyData.mon2 = gBattleResults.playerMon2Species; gSaveBlock1Ptr->gabbyAndTyData.lastMove = gBattleResults.lastUsedMovePlayer; - if (gSaveBlock1Ptr->gabbyAndTyData.battleNum != 0xFF) + if (gSaveBlock1Ptr->gabbyAndTyData.battleNum != INVALID_U8) { gSaveBlock1Ptr->gabbyAndTyData.battleNum ++; } @@ -1007,7 +1007,7 @@ bool8 IsTVShowInSearchOfTrainersAiring(void) bool8 GabbyAndTyGetLastQuote(void) { - if (gSaveBlock1Ptr->gabbyAndTyData.quote[0] == 0xFFFF) + if (gSaveBlock1Ptr->gabbyAndTyData.quote[0] == INVALID_U16) { return FALSE; } @@ -1125,7 +1125,7 @@ void PutPokemonTodayCaughtOnAir(void) if (!rbernoulli(1, 1) && StringCompare(gSpeciesNames[gBattleResults.caughtMonSpecies], gBattleResults.caughtMonNick)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_CAUGHT, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_CAUGHT, FALSE) != TRUE) { for (i = 0; i < 11; i ++) { @@ -1206,7 +1206,7 @@ void PutPokemonTodayFailedOnTheAir(void) if (ct > 2 && (gBattleOutcome == B_OUTCOME_MON_FLED || gBattleOutcome == B_OUTCOME_WON)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_FAILED, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_FAILED, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->pokemonTodayFailed.kind = TVSHOW_POKEMON_TODAY_FAILED; @@ -1282,7 +1282,7 @@ void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlaye u8 name[32]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_BATTLE_UPDATE); if (gSpecialVar_Result != 1) @@ -1329,7 +1329,7 @@ bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unus u8 name[32]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot == -1) + if (sCurTVShowSlot == INVALID_S8) { return FALSE; } @@ -1396,7 +1396,7 @@ void ContestLiveUpdates_BeforeInterview_1(u8 a0) DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24); sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show = &gSaveBlock1Ptr->tvShows[24]; show->contestLiveUpdates.round1Rank = a0; @@ -1410,7 +1410,7 @@ void ContestLiveUpdates_BeforeInterview_2(u8 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show->contestLiveUpdates.round2Rank = a0; } @@ -1422,7 +1422,7 @@ void ContestLiveUpdates_BeforeInterview_3(u8 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show->contestLiveUpdates.appealFlags1 = a0; } @@ -1434,7 +1434,7 @@ void ContestLiveUpdates_BeforeInterview_4(u16 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show->contestLiveUpdates.move = a0; } @@ -1446,7 +1446,7 @@ void ContestLiveUpdates_BeforeInterview_5(u8 a0, u8 a1) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show->contestLiveUpdates.winningSpecies = gContestMons[a1].species; StringCopy(show->contestLiveUpdates.winningTrainerName, gContestMons[a1].trainerName); @@ -1507,7 +1507,7 @@ void BravoTrainerPokemonProfile_BeforeInterview1(u16 a0) show = &gSaveBlock1Ptr->tvShows[24]; InterviewBefore_BravoTrainerPkmnProfile(); sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24); show->bravoTrainer.move = a0; @@ -1521,7 +1521,7 @@ void BravoTrainerPokemonProfile_BeforeInterview2(u8 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show->bravoTrainer.contestResult = a0; show->bravoTrainer.contestCategory = gSpecialVar_ContestCategory; @@ -1577,7 +1577,7 @@ void SaveRecordedItemPurchasesForTVShow(void) && !rbernoulli(1, 3)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SMART_SHOPPER, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SMART_SHOPPER, FALSE) != TRUE) { TV_SortPurchasesByQuantity(); if (gMartPurchaseHistory[0].quantity >= 20) @@ -1742,7 +1742,7 @@ static void sub_80ED718(void) if (!rbernoulli(1, 200)) { sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { outbreakIdx = Random() % ARRAY_COUNT(sPokeOutbreakSpeciesList); show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; @@ -1843,7 +1843,7 @@ void sub_80ED950(bool8 flag) PutFishingAdviceShowOnTheAir(); } sPokemonAnglerAttemptCounters &= 0xFF; - if (sPokemonAnglerAttemptCounters != 0xFF) + if (sPokemonAnglerAttemptCounters != INVALID_U8) { sPokemonAnglerAttemptCounters += 0x01; } @@ -1855,7 +1855,7 @@ void sub_80ED950(bool8 flag) PutFishingAdviceShowOnTheAir(); } sPokemonAnglerAttemptCounters &= 0xFF00; - if (sPokemonAnglerAttemptCounters >> 8 != 0xFF) + if (sPokemonAnglerAttemptCounters >> 8 != INVALID_U8) { sPokemonAnglerAttemptCounters += 0x0100; } @@ -1867,7 +1867,7 @@ void PutFishingAdviceShowOnTheAir(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FISHING_ADVICE, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FISHING_ADVICE, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->pokemonAngler.kind = TVSHOW_FISHING_ADVICE; @@ -1910,7 +1910,7 @@ void sub_80EDA80(void) if (!rbernoulli(1, 1)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_WORLD_OF_MASTERS, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_WORLD_OF_MASTERS, FALSE) != TRUE) { show2 = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show2->worldOfMasters.kind = TVSHOW_WORLD_OF_MASTERS; @@ -1936,7 +1936,7 @@ void sub_80EDB44(void) HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TODAYS_RIVAL_TRAINER, TRUE); sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->rivalTrainer.kind = TVSHOW_TODAYS_RIVAL_TRAINER; @@ -1984,7 +1984,7 @@ void sub_80EDC60(const u16 *words) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREND_WATCHER, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREND_WATCHER, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->trendWatcher.kind = TVSHOW_TREND_WATCHER; @@ -2003,7 +2003,7 @@ void sub_80EDCE8(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREASURE_INVESTIGATORS, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREASURE_INVESTIGATORS, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->treasureInvestigators.kind = TVSHOW_TREASURE_INVESTIGATORS; @@ -2024,7 +2024,7 @@ void sub_80EDD78(u16 nCoinsPaidOut) u16 nCoinsWon; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FIND_THAT_GAMER, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FIND_THAT_GAMER, FALSE) != TRUE) { flag = FALSE; switch (sFindThatGamerWhichGame) @@ -2207,7 +2207,7 @@ void TV_PutSecretBaseVisitOnTheAir(void) HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SECRET_BASE_VISIT, TRUE); sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->secretBaseVisit.kind = TVSHOW_SECRET_BASE_VISIT; @@ -2227,7 +2227,7 @@ void sub_80EE184(void) u16 balls; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BREAKING_NEWS, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BREAKING_NEWS, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->breakingNews.kind = TVSHOW_BREAKING_NEWS; @@ -2298,7 +2298,7 @@ void sub_80EE2CC(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_LOTTO_WINNER, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_LOTTO_WINNER, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->lottoWinner.kind = TVSHOW_LOTTO_WINNER; @@ -2318,7 +2318,7 @@ void sub_80EE35C(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u1 u8 j; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BATTLE_SEMINAR, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BATTLE_SEMINAR, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->battleSeminar.kind = TVSHOW_BATTLE_SEMINAR; @@ -2347,7 +2347,7 @@ void sub_80EE44C(u8 nMonsCaught, u8 nPkblkUsed) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SAFARI_FAN_CLUB, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SAFARI_FAN_CLUB, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->safariFanClub.kind = TVSHOW_SAFARI_FAN_CLUB; @@ -2365,7 +2365,7 @@ void sub_80EE4DC(struct Pokemon *pokemon, u8 ribbonMonDataIdx) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_CUTIES, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_CUTIES, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->cuties.kind = TVSHOW_CUTIES; @@ -2440,7 +2440,7 @@ void sub_80EE72C(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TRAINER_FAN_CLUB, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TRAINER_FAN_CLUB, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->trainerFanClub.kind = TVSHOW_TRAINER_FAN_CLUB; @@ -2456,7 +2456,7 @@ void sub_80EE72C(void) bool8 sub_80EE7C0(void) { sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot == -1) + if (sCurTVShowSlot == INVALID_S8) { return TRUE; } @@ -2493,7 +2493,7 @@ bool8 sub_80EE818(void) } } sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot == -1) + if (sCurTVShowSlot == INVALID_S8) { return FALSE; } @@ -2557,7 +2557,7 @@ void sub_80EEA70(void) if (HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SECRET_BASE_SECRETS, FALSE) != TRUE) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->secretBaseSecrets.kind = TVSHOW_SECRET_BASE_SECRETS; @@ -2608,7 +2608,7 @@ static void sub_80EEBF4(u8 actionIdx) HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_NUMBER_ONE, TRUE); sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->numberOne.kind = TVSHOW_NUMBER_ONE; @@ -2665,7 +2665,7 @@ static void sub_80EED88(void) if (FlagGet(FLAG_SYS_GAME_CLEAR)) { sCurTVShowSlot = sub_80EEE30(gSaveBlock1Ptr->pokeNews); - if (sCurTVShowSlot != -1 && rbernoulli(1, 100) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && rbernoulli(1, 100) != TRUE) { newsKind = (Random() % 4) + POKENEWS_SLATEPORT; if (sub_80EF0E4(newsKind) != TRUE) @@ -2689,7 +2689,7 @@ s8 sub_80EEE30(PokeNews *pokeNews) return i; } } - return -1; + return INVALID_S8; } void ClearPokemonNews(void) @@ -2742,7 +2742,7 @@ u8 FindAnyTVNewsOnTheAir(void) return i; } } - return -1; + return INVALID_U8; } void DoPokeNews(void) @@ -2751,7 +2751,7 @@ void DoPokeNews(void) u16 n; i = FindAnyTVNewsOnTheAir(); - if (i == 0xFF) + if (i == INVALID_U8) { gSpecialVar_Result = FALSE; } @@ -3252,7 +3252,7 @@ static void sub_80EFA88(void) { sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); gSpecialVar_0x8006 = sCurTVShowSlot; - if (sCurTVShowSlot == -1) + if (sCurTVShowSlot == INVALID_S8) { gSpecialVar_Result = TRUE; } @@ -3273,7 +3273,7 @@ s8 FindEmptyTVSlotWithinFirstFiveShowsOfArray(TVShow *shows) return i; } } - return -1; + return INVALID_S8; } s8 FindEmptyTVSlotBeyondFirstFiveShowsOfArray(TVShow *shows) @@ -3287,7 +3287,7 @@ s8 FindEmptyTVSlotBeyondFirstFiveShowsOfArray(TVShow *shows) return i; } } - return -1; + return INVALID_S8; } bool8 TV_BernoulliTrial(u16 ratio) @@ -3310,7 +3310,7 @@ void TV_FanClubLetter_RandomWordToStringVar3(TVShow *show) { i = 0; } - if (show->fanclubLetter.words[i] != 0xFFFF) + if (show->fanclubLetter.words[i] != INVALID_U16) { break; } @@ -3677,7 +3677,7 @@ static void sub_80F0358(TVShow player1[25], TVShow player2[25], TVShow player3[2 sRecordMixingPartnersWithoutShowsToShare = i; } sTVShowMixingCurSlot = sub_80F06D0(argslist[i][0]); - if (sTVShowMixingCurSlot == -1) + if (sTVShowMixingCurSlot == INVALID_S8) { sRecordMixingPartnersWithoutShowsToShare ++; if (sRecordMixingPartnersWithoutShowsToShare == sTVShowMixingNumPlayers) @@ -3690,7 +3690,7 @@ static void sub_80F0358(TVShow player1[25], TVShow player2[25], TVShow player3[2 for (j = 0; j < sTVShowMixingNumPlayers - 1; j ++) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(argslist[(i + j + 1) % sTVShowMixingNumPlayers][0]); - if (sCurTVShowSlot != -1 + if (sCurTVShowSlot != INVALID_S8 && sub_80F049C(&argslist[(i + j + 1) % sTVShowMixingNumPlayers][0], &argslist[i][0], (i + j + 1) % sTVShowMixingNumPlayers) == 1) { break; @@ -3801,7 +3801,7 @@ static s8 sub_80F06D0(TVShow *tvShows) return i; } } - return -1; + return INVALID_S8; } #ifdef NONMATCHING @@ -4486,12 +4486,12 @@ static void sub_80F0D60(PokeNews player1[16], PokeNews player2[16], PokeNews pla for (j = 0; j < sTVShowNewsMixingNumPlayers; j ++) { sTVShowMixingCurSlot = sub_80F0ECC(*argslist[j], i); - if (sTVShowMixingCurSlot != -1) + if (sTVShowMixingCurSlot != INVALID_S8) { for (k = 0; k < sTVShowNewsMixingNumPlayers - 1; k++) { sCurTVShowSlot = sub_80EEE30(*argslist[(j + k + 1) % sTVShowNewsMixingNumPlayers]); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { sub_80F0E58(argslist[(j + k + 1) % sTVShowNewsMixingNumPlayers], argslist[j]); } @@ -4538,7 +4538,7 @@ static s8 sub_80F0ECC(PokeNews *pokeNews, u8 idx) { if (pokeNews[idx].kind == POKENEWS_NONE) { - return -1; + return INVALID_S8; } return idx; } @@ -7425,7 +7425,7 @@ static void DoTVShowSecretBaseSecrets(void) } break; default: - for (i = 0; i < 0xFFFF; i ++) + for (i = 0; i < INVALID_U16; i ++) { sTVSecretBaseSecretsRandomValues[1] = Random() % bitCount; if (sTVSecretBaseSecretsRandomValues[1] != sTVSecretBaseSecretsRandomValues[0]) @@ -7447,7 +7447,7 @@ static void DoTVShowSecretBaseSecrets(void) } else { - for (i = 0; i < 0xFFFF; i ++) + for (i = 0; i < INVALID_U16; i ++) { sTVSecretBaseSecretsRandomValues[2] = Random() % bitCount; if (sTVSecretBaseSecretsRandomValues[2] != sTVSecretBaseSecretsRandomValues[0] && sTVSecretBaseSecretsRandomValues[2] != sTVSecretBaseSecretsRandomValues[1]) diff --git a/src/unk_pokedex_area_screen_helper.c b/src/unk_pokedex_area_screen_helper.c index 6b88069bb..67fd52cb5 100644 --- a/src/unk_pokedex_area_screen_helper.c +++ b/src/unk_pokedex_area_screen_helper.c @@ -2,7 +2,7 @@ #include "main.h" #include "menu.h" #include "bg.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "unk_pokedex_area_screen_helper.h" diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 72c33100f..762019ecd 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -1,7 +1,7 @@ #include "global.h" #include "main.h" #include "pokeblock.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "pokenav.h" #include "scanline_effect.h" diff --git a/src/walda_phrase.c b/src/walda_phrase.c index ff2ee7399..44da22f31 100644 --- a/src/walda_phrase.c +++ b/src/walda_phrase.c @@ -176,7 +176,7 @@ static void sub_81D9C90(u8 *array, s32 arg1, s32 arg2) s32 i, j; u8 var1, var2; - for (i = arg2 - 1; i != -1; i--) + for (i = arg2 - 1; i != INVALID_S32; i--) { var1 = (array[0] & 0x80) >> 7; diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 9b3c70ad7..8fb7d08d6 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -4825,7 +4825,7 @@ static u16 GetCurrentMapWildMonHeaderId(void) for (i = 0; ; i++) { const struct WildPokemonHeader *wildHeader = &gWildMonHeaders[i]; - if (wildHeader->mapGroup == 0xFF) + if (wildHeader->mapGroup == INVALID_U8) break; if (gWildMonHeaders[i].mapGroup == gSaveBlock1Ptr->location.mapGroup && @@ -4845,7 +4845,7 @@ static u16 GetCurrentMapWildMonHeaderId(void) } } - return -1; + return INVALID_S16; } static u8 PickWildMonNature(void) @@ -5079,7 +5079,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi return FALSE; headerId = GetCurrentMapWildMonHeaderId(); - if (headerId == 0xFFFF) // invalid + if (headerId == INVALID_U16) { if (gMapHeader.mapLayoutId == 0x166) { @@ -5190,7 +5190,7 @@ void RockSmashWildEncounter(void) { u16 headerId = GetCurrentMapWildMonHeaderId(); - if (headerId != 0xFFFF) + if (headerId != INVALID_U16) { const struct WildPokemonInfo *wildPokemonInfo = gWildMonHeaders[headerId].rockSmashMonsInfo; @@ -5222,7 +5222,7 @@ bool8 SweetScentWildEncounter(void) PlayerGetDestCoords(&x, &y); headerId = GetCurrentMapWildMonHeaderId(); - if (headerId == 0xFFFF) // invalid + if (headerId == INVALID_U16) { if (gMapHeader.mapLayoutId == 0x166) { @@ -5292,7 +5292,7 @@ bool8 DoesCurrentMapHaveFishingMons(void) { u16 headerId = GetCurrentMapWildMonHeaderId(); - if (headerId != 0xFFFF && gWildMonHeaders[headerId].fishingMonsInfo != NULL) + if (headerId != INVALID_U16 && gWildMonHeaders[headerId].fishingMonsInfo != NULL) return TRUE; else return FALSE; @@ -5326,7 +5326,7 @@ u16 GetLocalWildMon(bool8 *isWaterMon) *isWaterMon = FALSE; headerId = GetCurrentMapWildMonHeaderId(); - if (headerId == 0xFFFF) + if (headerId == INVALID_U16) return SPECIES_NONE; landMonsInfo = gWildMonHeaders[headerId].landMonsInfo; waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo; @@ -5358,7 +5358,7 @@ u16 GetLocalWaterMon(void) { u16 headerId = GetCurrentMapWildMonHeaderId(); - if (headerId != 0xFFFF) + if (headerId != INVALID_U16) { const struct WildPokemonInfo *waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo; diff --git a/src/window.c b/src/window.c index 8efd1c281..d5b996df1 100644 --- a/src/window.c +++ b/src/window.c @@ -1,6 +1,6 @@ #include "global.h" #include "window.h" -#include "malloc.h" +#include "alloc.h" #include "bg.h" #include "blit.h" @@ -52,12 +52,12 @@ bool16 InitWindows(const struct WindowTemplate *templates) gWindows[i].tileData = NULL; } - for (i = 0, allocatedBaseBlock = 0, bgLayer = templates[i].bg; bgLayer != 0xFF && i < 0x20; ++i, bgLayer = templates[i].bg) + for (i = 0, allocatedBaseBlock = 0, bgLayer = templates[i].bg; bgLayer != INVALID_U8 && i < 0x20; ++i, bgLayer = templates[i].bg) { if (gUnneededFireRedVariable == 1) { allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, templates[i].width * templates[i].height, 0); - if (allocatedBaseBlock == -1) + if (allocatedBaseBlock == INVALID_S32) return FALSE; } @@ -65,7 +65,7 @@ bool16 InitWindows(const struct WindowTemplate *templates) { attrib = GetBgAttribute(bgLayer, 0x8); - if (attrib != 0xFFFF) + if (attrib != INVALID_U16) { allocatedTilemapBuffer = AllocZeroed(attrib); @@ -121,12 +121,12 @@ u16 AddWindow(const struct WindowTemplate *template) for (win = 0; win < WINDOWS_MAX; ++win) { - if ((bgLayer = gWindows[win].window.bg) == 0xFF) + if ((bgLayer = gWindows[win].window.bg) == INVALID_U8) break; } if (win == WINDOWS_MAX) - return 0xFF; + return INVALID_U8; bgLayer = template->bg; allocatedBaseBlock = 0; @@ -135,20 +135,20 @@ u16 AddWindow(const struct WindowTemplate *template) { allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, template->width * template->height, 0); - if (allocatedBaseBlock == -1) - return 0xFF; + if (allocatedBaseBlock == INVALID_S32) + return INVALID_U8; } if (gUnknown_03002F70[bgLayer] == NULL) { attrib = GetBgAttribute(bgLayer, 0x8); - if (attrib != 0xFFFF) + if (attrib != INVALID_U16) { allocatedTilemapBuffer = AllocZeroed(attrib); if (allocatedTilemapBuffer == NULL) - return 0xFF; + return INVALID_U8; for (i = 0; i < attrib; ++i) allocatedTilemapBuffer[i] = 0; @@ -167,7 +167,7 @@ u16 AddWindow(const struct WindowTemplate *template) Free(gUnknown_03002F70[bgLayer]); gUnknown_03002F70[bgLayer] = allocatedTilemapBuffer; } - return 0xFF; + return INVALID_U8; } gWindows[win].tileData = allocatedTilemapBuffer; @@ -190,12 +190,12 @@ int AddWindowWithoutTileMap(const struct WindowTemplate *template) for (win = 0; win < WINDOWS_MAX; ++win) { - if (gWindows[win].window.bg == 0xFF) + if (gWindows[win].window.bg == INVALID_U8) break; } if (win == WINDOWS_MAX) - return 0xFF; + return INVALID_U8; bgLayer = template->bg; allocatedBaseBlock = 0; @@ -204,8 +204,8 @@ int AddWindowWithoutTileMap(const struct WindowTemplate *template) { allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, template->width * template->height, 0); - if (allocatedBaseBlock == -1) - return 0xFF; + if (allocatedBaseBlock == INVALID_S32) + return INVALID_U8; } gWindows[win].window = *template; @@ -609,21 +609,21 @@ u16 AddWindow8Bit(struct WindowTemplate *template) for (windowId = 0; windowId < 32; windowId++) { - if (gWindows[windowId].window.bg == 0xFF) + if (gWindows[windowId].window.bg == INVALID_U8) break; } if (windowId == WINDOWS_MAX) - return 0xFF; + return INVALID_U8; bgLayer = template->bg; if (gUnknown_03002F70[bgLayer] == 0) { u16 attribute = GetBgAttribute(bgLayer, 8); - if (attribute != 0xFFFF) + if (attribute != INVALID_U16) { s32 i; memAddress = Alloc(attribute); if (memAddress == NULL) - return 0xFF; + return INVALID_U8; for (i = 0; i < attribute; i++) // if we're going to zero out the memory anyway, why not call AllocZeroed? memAddress[i] = 0; gUnknown_03002F70[bgLayer] = memAddress; @@ -638,7 +638,7 @@ u16 AddWindow8Bit(struct WindowTemplate *template) Free(gUnknown_03002F70[bgLayer]); gUnknown_03002F70[bgLayer] = NULL; } - return 0xFF; + return INVALID_U8; } else { -- cgit v1.2.3 From f9ff7316d5c7277eb7482e30121388cd65f4ecfc Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Wed, 5 Dec 2018 22:31:01 +0800 Subject: Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs --- src/apprentice.c | 328 +- src/bard_music.c | 2 +- src/battle_ai_script_commands.c | 24 +- src/battle_ai_switch_items.c | 8 +- src/battle_anim.c | 144 +- src/battle_anim_80A5C6C.c | 2 +- src/battle_anim_80A9C70.c | 10 +- src/battle_anim_sound_tasks.c | 90 +- src/battle_anim_utility_funcs.c | 2 +- src/battle_arena.c | 2 +- src/battle_controller_link_opponent.c | 4 +- src/battle_controller_link_partner.c | 4 +- src/battle_controller_opponent.c | 4 +- src/battle_controller_player.c | 8 +- src/battle_controller_player_partner.c | 6 +- src/battle_controller_recorded_opponent.c | 4 +- src/battle_controller_recorded_player.c | 4 +- src/battle_controller_wally.c | 2 +- src/battle_controllers.c | 2 +- src/battle_dome.c | 1306 +- src/battle_factory.c | 4 +- src/battle_gfx_sfx_util.c | 2 +- src/battle_interface.c | 448 +- src/battle_main.c | 172 +- src/battle_message.c | 1148 +- src/battle_pike.c | 4 +- src/battle_pyramid.c | 2 +- src/battle_pyramid_bag.c | 36 +- src/battle_script_commands.c | 234 +- src/battle_setup.c | 20 +- src/battle_tent.c | 2 +- src/battle_tower.c | 10 +- src/battle_transition.c | 48 +- src/battle_tv.c | 614 +- src/battle_util.c | 20 +- src/berry_blender.c | 4 +- src/bg.c | 36 +- src/blit.c | 6 +- src/braille_puzzles.c | 2 +- src/cable_club.c | 6 +- src/contest.c | 16 +- src/contest_effect.c | 28 +- src/data/contest_moves.h | 6000 +++--- .../event_object_graphics_info_pointers.h | 492 +- .../field_event_obj/movement_action_func_tables.h | 1216 +- src/data/graphics/items.h | 2 +- src/data/pokemon_graphics/back_pic_coordinates.h | 2642 ++- src/data/pokemon_graphics/enemy_mon_elevation.h | 826 +- src/data/pokemon_graphics/front_pic_coordinates.h | 2642 ++- src/data/text/item_descriptions.h | 2 +- src/data/text/move_descriptions.h | 1418 +- src/data/trainer_parties.h | 19750 +++++++++---------- src/daycare.c | 16 +- src/decompress.c | 594 +- src/decoration.c | 14 +- src/event_object_movement.c | 826 +- src/evolution_scene.c | 4 +- src/field_control_avatar.c | 6 +- src/field_door.c | 2 +- src/field_effect.c | 22 +- src/field_effect_helpers.c | 18 +- src/field_message_box.c | 2 +- src/field_player_avatar.c | 2 +- src/field_specials.c | 52 +- src/fieldmap.c | 4 +- src/fldeff_cut.c | 2 +- src/fldeff_groundshake.c | 2 +- src/fossil_specials.c | 198 +- src/frontier_util.c | 12 +- src/gpu_regs.c | 210 +- src/ground.c | 2 +- src/hall_of_fame.c | 42 +- src/intro.c | 4 +- src/intro_credits_graphics.c | 2 +- src/item.c | 268 +- src/item_icon.c | 2 +- src/item_menu.c | 36 +- src/item_menu_icons.c | 8 +- src/landmark.c | 4 +- src/learn_move.c | 18 +- src/librfu_rfu.c | 2 +- src/librfu_stwi.c | 2 +- src/link.c | 4 +- src/link_rfu.c | 34 +- src/list_menu.c | 38 +- src/mail_data.c | 18 +- src/main_menu.c | 38 +- src/mauville_old_man.c | 6 +- src/menu.c | 488 +- src/metatile_behavior.c | 480 +- src/naming_screen.c | 2 +- src/new_game.c | 16 +- src/overworld.c | 60 +- src/palette.c | 2 +- src/pokeblock.c | 10 +- src/pokeblock_feed.c | 50 +- src/pokedex.c | 749 +- src/pokedex_area_screen.c | 2 +- src/pokemon.c | 60 +- src/pokemon_animation.c | 178 +- src/pokemon_icon.c | 6 +- src/pokemon_size_record.c | 2 +- src/pokemon_storage_system.c | 4 +- src/pokemon_summary_screen.c | 58 +- src/rayquaza_scene.c | 14 +- src/record_mixing.c | 4 +- src/recorded_battle.c | 2 +- src/reset_rtc_screen.c | 2 +- src/rock.c | 2 +- src/rom_8011DC0.c | 16 +- src/rom_8034C54.c | 6 +- src/rotating_gate.c | 4 +- src/rtc.c | 10 +- src/safari_zone.c | 6 +- src/save.c | 50 +- src/save_location.c | 8 +- src/scanline_effect.c | 8 +- src/scrcmd.c | 10 +- src/script.c | 12 +- src/script_menu.c | 28 +- src/script_movement.c | 8 +- src/script_pokemon_util_80F87D8.c | 4 +- src/secret_base.c | 6 +- src/shop.c | 20 +- src/slot_machine.c | 146 +- src/smokescreen.c | 2 +- src/sound.c | 4 +- src/sprite.c | 64 +- src/strings.c | 36 +- src/task.c | 4 +- src/text.c | 4 +- src/title_screen.c | 16 +- src/trader.c | 2 +- src/trainer_pokemon_sprites.c | 40 +- src/trainer_see.c | 22 +- src/tv.c | 110 +- src/walda_phrase.c | 2 +- src/wild_encounter.c | 6444 +++--- src/window.c | 38 +- 139 files changed, 27722 insertions(+), 23921 deletions(-) (limited to 'src') diff --git a/src/apprentice.c b/src/apprentice.c index faed3756c..ec8fea27b 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -1079,7 +1079,7 @@ void ResetApprenticeStruct(struct Apprentice *apprentice) u8 i; for (i = 0; i < 6; i++) - apprentice->easyChatWords[i] |= INVALID_U16; + apprentice->easyChatWords[i] |= 0xFFFF; apprentice->playerName[0] = EOS; apprentice->id = 16; @@ -1093,7 +1093,7 @@ void ResetAllApprenticeData(void) for (i = 0; i < 4; i++) { for (j = 0; j < 6; j++) - gSaveBlock2Ptr->apprentices[i].easyChatWords[j] |= INVALID_U16; + gSaveBlock2Ptr->apprentices[i].easyChatWords[j] |= 0xFFFF; gSaveBlock2Ptr->apprentices[i].id = 16; gSaveBlock2Ptr->apprentices[i].playerName[0] = EOS; gSaveBlock2Ptr->apprentices[i].lvlMode = 0; @@ -1290,7 +1290,7 @@ static u16 sub_819FF98(u8 arg0) else level = 60; - for (j = 0; learnset[j] != INVALID_U16; j++) + for (j = 0; learnset[j] != 0xFFFF; j++) { if ((learnset[j] & 0xFE00) > (level << 9)) break; @@ -1393,7 +1393,7 @@ static void GetLatestLearnedMoves(u16 species, u16 *moves) level = 60; learnset = gLevelUpLearnsets[species]; - for (i = 0; learnset[i] != INVALID_U16; i++) + for (i = 0; learnset[i] != 0xFFFF; i++) { if ((learnset[i] & 0xFE00) > (level << 9)) break; @@ -2047,172 +2047,172 @@ NAKED static void sub_81A1224(void) { asm_unified("\n\ - push {r4-r7,lr}\n\ - mov r7, r9\n\ - mov r6, r8\n\ - push {r6,r7}\n\ - ldr r1, =gSaveBlock2Ptr\n\ - ldr r3, [r1]\n\ - adds r0, r3, 0\n\ - adds r0, 0xB1\n\ - ldrb r0, [r0]\n\ - lsls r0, 26\n\ - lsrs r0, 28\n\ - adds r7, r1, 0\n\ - cmp r0, 0x2\n\ - bhi _081A1242\n\ - b _081A1362\n\ + push {r4-r7,lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6,r7}\n\ + ldr r1, =gSaveBlock2Ptr\n\ + ldr r3, [r1]\n\ + adds r0, r3, 0\n\ + adds r0, 0xB1\n\ + ldrb r0, [r0]\n\ + lsls r0, 26\n\ + lsrs r0, 28\n\ + adds r7, r1, 0\n\ + cmp r0, 0x2\n\ + bhi _081A1242\n\ + b _081A1362\n\ _081A1242:\n\ - movs r5, 0\n\ - movs r2, 0\n\ - adds r0, r3, 0\n\ - adds r0, 0xB8\n\ - ldrb r0, [r0]\n\ - lsls r0, 30\n\ - ldr r1, =gSpecialVar_0x8005\n\ - mov r12, r1\n\ - ldr r1, =gSpecialVar_Result\n\ - mov r8, r1\n\ - cmp r0, 0\n\ - beq _081A127C\n\ - adds r3, r7, 0\n\ + movs r5, 0\n\ + movs r2, 0\n\ + adds r0, r3, 0\n\ + adds r0, 0xB8\n\ + ldrb r0, [r0]\n\ + lsls r0, 30\n\ + ldr r1, =gSpecialVar_0x8005\n\ + mov r12, r1\n\ + ldr r1, =gSpecialVar_Result\n\ + mov r8, r1\n\ + cmp r0, 0\n\ + beq _081A127C\n\ + adds r3, r7, 0\n\ _081A125C:\n\ - adds r0, r5, 0x1\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - adds r0, r2, 0x1\n\ - lsls r0, 24\n\ - lsrs r2, r0, 24\n\ - cmp r2, 0x8\n\ - bhi _081A127C\n\ - ldr r0, [r3]\n\ - lsls r1, r2, 2\n\ - adds r0, r1\n\ - adds r0, 0xB8\n\ - ldrb r0, [r0]\n\ - lsls r0, 30\n\ - cmp r0, 0\n\ - bne _081A125C\n\ + adds r0, r5, 0x1\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + adds r0, r2, 0x1\n\ + lsls r0, 24\n\ + lsrs r2, r0, 24\n\ + cmp r2, 0x8\n\ + bhi _081A127C\n\ + ldr r0, [r3]\n\ + lsls r1, r2, 2\n\ + adds r0, r1\n\ + adds r0, 0xB8\n\ + ldrb r0, [r0]\n\ + lsls r0, 30\n\ + cmp r0, 0\n\ + bne _081A125C\n\ _081A127C:\n\ - movs r4, 0\n\ - cmp r4, r5\n\ - bcs _081A1322\n\ - ldr r0, [r7]\n\ - adds r0, 0xB1\n\ - ldrb r0, [r0]\n\ - lsls r0, 26\n\ - lsrs r0, 28\n\ - subs r0, 0x3\n\ - cmp r4, r0\n\ - bge _081A1322\n\ - adds r6, r7, 0\n\ - mov r9, r4\n\ + movs r4, 0\n\ + cmp r4, r5\n\ + bcs _081A1322\n\ + ldr r0, [r7]\n\ + adds r0, 0xB1\n\ + ldrb r0, [r0]\n\ + lsls r0, 26\n\ + lsrs r0, 28\n\ + subs r0, 0x3\n\ + cmp r4, r0\n\ + bge _081A1322\n\ + adds r6, r7, 0\n\ + mov r9, r4\n\ _081A1296:\n\ - ldr r3, [r6]\n\ - lsls r0, r4, 2\n\ - adds r2, r3, r0\n\ - adds r0, r2, 0\n\ - adds r0, 0xB8\n\ - ldrb r1, [r0]\n\ - lsls r0, r1, 30\n\ - lsrs r0, 30\n\ - cmp r0, 0x1\n\ - bne _081A1308\n\ - lsrs r0, r1, 6\n\ - cmp r0, 0\n\ - beq _081A1308\n\ - adds r0, r2, 0\n\ - adds r0, 0xBA\n\ - ldrh r0, [r0]\n\ - mov r2, r12\n\ - ldrh r2, [r2]\n\ - cmp r0, r2\n\ - bne _081A1308\n\ - adds r0, r3, 0\n\ - adds r0, 0xB1\n\ - ldrb r0, [r0]\n\ - lsls r0, 26\n\ - lsrs r0, 28\n\ - subs r0, 0x3\n\ - lsls r0, 2\n\ - adds r0, r3, r0\n\ - adds r0, 0xB8\n\ - ldrb r2, [r0]\n\ - movs r1, 0x3F\n\ - ands r1, r2\n\ - strb r1, [r0]\n\ - ldr r1, [r6]\n\ - adds r0, r1, 0\n\ - adds r0, 0xB1\n\ - ldrb r0, [r0]\n\ - lsls r0, 26\n\ - lsrs r0, 28\n\ - subs r0, 0x3\n\ - lsls r0, 2\n\ - adds r1, r0\n\ - mov r2, r12\n\ - ldrh r0, [r2]\n\ - adds r1, 0xBA\n\ - strh r0, [r1]\n\ - mov r1, r9\n\ - mov r0, r8\n\ - strh r1, [r0]\n\ - b _081A1362\n\ - .pool\n\ + ldr r3, [r6]\n\ + lsls r0, r4, 2\n\ + adds r2, r3, r0\n\ + adds r0, r2, 0\n\ + adds r0, 0xB8\n\ + ldrb r1, [r0]\n\ + lsls r0, r1, 30\n\ + lsrs r0, 30\n\ + cmp r0, 0x1\n\ + bne _081A1308\n\ + lsrs r0, r1, 6\n\ + cmp r0, 0\n\ + beq _081A1308\n\ + adds r0, r2, 0\n\ + adds r0, 0xBA\n\ + ldrh r0, [r0]\n\ + mov r2, r12\n\ + ldrh r2, [r2]\n\ + cmp r0, r2\n\ + bne _081A1308\n\ + adds r0, r3, 0\n\ + adds r0, 0xB1\n\ + ldrb r0, [r0]\n\ + lsls r0, 26\n\ + lsrs r0, 28\n\ + subs r0, 0x3\n\ + lsls r0, 2\n\ + adds r0, r3, r0\n\ + adds r0, 0xB8\n\ + ldrb r2, [r0]\n\ + movs r1, 0x3F\n\ + ands r1, r2\n\ + strb r1, [r0]\n\ + ldr r1, [r6]\n\ + adds r0, r1, 0\n\ + adds r0, 0xB1\n\ + ldrb r0, [r0]\n\ + lsls r0, 26\n\ + lsrs r0, 28\n\ + subs r0, 0x3\n\ + lsls r0, 2\n\ + adds r1, r0\n\ + mov r2, r12\n\ + ldrh r0, [r2]\n\ + adds r1, 0xBA\n\ + strh r0, [r1]\n\ + mov r1, r9\n\ + mov r0, r8\n\ + strh r1, [r0]\n\ + b _081A1362\n\ + .pool\n\ _081A1308:\n\ - adds r0, r4, 0x1\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ - cmp r4, r5\n\ - bcs _081A1322\n\ - ldr r0, [r6]\n\ - adds r0, 0xB1\n\ - ldrb r0, [r0]\n\ - lsls r0, 26\n\ - lsrs r0, 28\n\ - subs r0, 0x3\n\ - cmp r4, r0\n\ - blt _081A1296\n\ + adds r0, r4, 0x1\n\ + lsls r0, 24\n\ + lsrs r4, r0, 24\n\ + cmp r4, r5\n\ + bcs _081A1322\n\ + ldr r0, [r6]\n\ + adds r0, 0xB1\n\ + ldrb r0, [r0]\n\ + lsls r0, 26\n\ + lsrs r0, 28\n\ + subs r0, 0x3\n\ + cmp r4, r0\n\ + blt _081A1296\n\ _081A1322:\n\ - ldr r2, [r7]\n\ - adds r0, r2, 0\n\ - adds r0, 0xB1\n\ - ldrb r0, [r0]\n\ - lsls r0, 26\n\ - lsrs r0, 28\n\ - subs r0, 0x3\n\ - lsls r0, 2\n\ - adds r2, r0\n\ - adds r2, 0xB8\n\ - ldrb r1, [r2]\n\ - movs r0, 0x3F\n\ - ands r0, r1\n\ - movs r1, 0x40\n\ - orrs r0, r1\n\ - strb r0, [r2]\n\ - ldr r1, [r7]\n\ - adds r0, r1, 0\n\ - adds r0, 0xB1\n\ - ldrb r0, [r0]\n\ - lsls r0, 26\n\ - lsrs r0, 28\n\ - subs r0, 0x3\n\ - lsls r0, 2\n\ - adds r1, r0\n\ - mov r2, r12\n\ - ldrh r0, [r2]\n\ - adds r1, 0xBA\n\ - strh r0, [r1]\n\ - movs r0, 0x1\n\ - mov r1, r8\n\ - strh r0, [r1]\n\ + ldr r2, [r7]\n\ + adds r0, r2, 0\n\ + adds r0, 0xB1\n\ + ldrb r0, [r0]\n\ + lsls r0, 26\n\ + lsrs r0, 28\n\ + subs r0, 0x3\n\ + lsls r0, 2\n\ + adds r2, r0\n\ + adds r2, 0xB8\n\ + ldrb r1, [r2]\n\ + movs r0, 0x3F\n\ + ands r0, r1\n\ + movs r1, 0x40\n\ + orrs r0, r1\n\ + strb r0, [r2]\n\ + ldr r1, [r7]\n\ + adds r0, r1, 0\n\ + adds r0, 0xB1\n\ + ldrb r0, [r0]\n\ + lsls r0, 26\n\ + lsrs r0, 28\n\ + subs r0, 0x3\n\ + lsls r0, 2\n\ + adds r1, r0\n\ + mov r2, r12\n\ + ldrh r0, [r2]\n\ + adds r1, 0xBA\n\ + strh r0, [r1]\n\ + movs r0, 0x1\n\ + mov r1, r8\n\ + strh r0, [r1]\n\ _081A1362:\n\ - pop {r3,r4}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ + pop {r3,r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ "); } #endif // NONMATCHING @@ -2236,7 +2236,7 @@ static void sub_81A1370(void) } r10 = 0xFFFF; - r9 = INVALID_S32; + r9 = -1; for (i = 1; i < 4; i++) { if (GetTrainerId(gSaveBlock2Ptr->apprentices[i].playerId) == GetTrainerId(gSaveBlock2Ptr->playerTrainerId) diff --git a/src/bard_music.c b/src/bard_music.c index 4c28233c2..6c2578071 100644 --- a/src/bard_music.c +++ b/src/bard_music.c @@ -54,7 +54,7 @@ void GetWordPhonemes(struct BardSong *song, u16 word) for (i = 0; i < 6; i ++) { sound = &song->sound[i]; - if (sound->var00 != INVALID_U8) + if (sound->var00 != 0xFF) { song->phonemes[i].length = sound->var01 + gBardSoundLengthTable[sound->var00]; song->phonemes[i].pitch = CalcWordPitch(word + 30, i); diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index e6c089b1b..687d81419 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -276,7 +276,7 @@ static const u16 sDiscouragedPowerfulMoveEffects[] = EFFECT_SUPERPOWER, EFFECT_ERUPTION, EFFECT_OVERHEAT, - INVALID_U16 + 0xFFFF }; // code @@ -463,8 +463,8 @@ static u8 ChooseMoveOrAction_Doubles(void) { if (i == sBattler_AI || gBattleMons[i].hp == 0) { - actionOrMoveIndex[i] = INVALID_U8; - bestMovePointsForTarget[i] = INVALID_S16 ; + actionOrMoveIndex[i] = 0xFF; + bestMovePointsForTarget[i] = -1 ; } else { @@ -530,7 +530,7 @@ static u8 ChooseMoveOrAction_Doubles(void) // Don't use a move against ally if it has less than 100 points. if (i == (sBattler_AI ^ BIT_FLANK) && bestMovePointsForTarget[i] < 100) { - bestMovePointsForTarget[i] = INVALID_S16; + bestMovePointsForTarget[i] = -1; mostViableMovesScores[0] = mostViableMovesScores[0]; // Needed to match. } } @@ -1003,7 +1003,7 @@ static void BattleAICmd_if_in_bytes(void) { const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != INVALID_U8) + while (*ptr != 0xFF) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1019,7 +1019,7 @@ static void BattleAICmd_if_not_in_bytes(void) { const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != INVALID_U8) + while (*ptr != 0xFF) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1035,7 +1035,7 @@ static void BattleAICmd_if_in_hwords(void) { const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != INVALID_U16) + while (*ptr != 0xFFFF) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1051,7 +1051,7 @@ static void BattleAICmd_if_not_in_hwords(void) { const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != INVALID_U16) + while (*ptr != 0xFFFF) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1167,14 +1167,14 @@ static void BattleAICmd_get_how_powerful_move_is(void) s32 i, checkedMove; s32 moveDmgs[4]; - for (i = 0; sDiscouragedPowerfulMoveEffects[i] != INVALID_U16; i++) + for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++) { if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect == sDiscouragedPowerfulMoveEffects[i]) break; } if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power > 1 - && sDiscouragedPowerfulMoveEffects[i] == INVALID_U16) + && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF) { gDynamicBasePower = 0; *(&gBattleStruct->dynamicMoveType) = 0; @@ -1184,14 +1184,14 @@ static void BattleAICmd_get_how_powerful_move_is(void) for (checkedMove = 0; checkedMove < 4; checkedMove++) { - for (i = 0; sDiscouragedPowerfulMoveEffects[i] != INVALID_U16; i++) + for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++) { if (gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].effect == sDiscouragedPowerfulMoveEffects[i]) break; } if (gBattleMons[sBattler_AI].moves[checkedMove] != MOVE_NONE - && sDiscouragedPowerfulMoveEffects[i] == INVALID_U16 + && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF && gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].power > 1) { gCurrentMove = gBattleMons[sBattler_AI].moves[checkedMove]; diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index d6a8e1336..ad25b483c 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -126,7 +126,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) return FALSE; if (gLastLandedMoves[gActiveBattler] == 0) return FALSE; - if (gLastLandedMoves[gActiveBattler] == INVALID_U16) + if (gLastLandedMoves[gActiveBattler] == 0xFFFF) return FALSE; if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0) return FALSE; @@ -221,7 +221,7 @@ static bool8 ShouldSwitchIfNaturalCure(void) if (gBattleMons[gActiveBattler].hp < gBattleMons[gActiveBattler].maxHP / 2) return FALSE; - if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == INVALID_U16) && Random() & 1) + if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == 0xFFFF) && Random() & 1) { *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); @@ -331,9 +331,9 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) if (gLastLandedMoves[gActiveBattler] == 0) return FALSE; - if (gLastLandedMoves[gActiveBattler] == INVALID_U16) + if (gLastLandedMoves[gActiveBattler] == 0xFFFF) return FALSE; - if (gLastHitBy[gActiveBattler] == INVALID_U8) + if (gLastHitBy[gActiveBattler] == 0xFF) return FALSE; if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0) return FALSE; diff --git a/src/battle_anim.c b/src/battle_anim.c index 68ffed834..95c6f7b3c 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1386,54 +1386,54 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] = static void (* const sScriptCmdTable[])(void) = { - ScriptCmd_loadspritegfx, - ScriptCmd_unloadspritegfx, - ScriptCmd_createsprite, - ScriptCmd_createvisualtask, - ScriptCmd_delay, - ScriptCmd_waitforvisualfinish, - ScriptCmd_hang1, - ScriptCmd_hang2, - ScriptCmd_end, - ScriptCmd_playse, - ScriptCmd_monbg, - ScriptCmd_clearmonbg, - ScriptCmd_setalpha, - ScriptCmd_blendoff, - ScriptCmd_call, - ScriptCmd_return, - ScriptCmd_setarg, - ScriptCmd_choosetwoturnanim, - ScriptCmd_jumpifmoveturn, - ScriptCmd_goto, - ScriptCmd_fadetobg, - ScriptCmd_restorebg, - ScriptCmd_waitbgfadeout, - ScriptCmd_waitbgfadein, - ScriptCmd_changebg, - ScriptCmd_playsewithpan, - ScriptCmd_setpan, - ScriptCmd_panse_1B, - ScriptCmd_loopsewithpan, - ScriptCmd_waitplaysewithpan, - ScriptCmd_setbldcnt, - ScriptCmd_createsoundtask, - ScriptCmd_waitsound, - ScriptCmd_jumpargeq, - ScriptCmd_monbg_22, - ScriptCmd_clearmonbg_23, - ScriptCmd_jumpifcontest, - ScriptCmd_fadetobgfromset, - ScriptCmd_panse_26, - ScriptCmd_panse_27, - ScriptCmd_monbgprio_28, - ScriptCmd_monbgprio_29, - ScriptCmd_monbgprio_2A, - ScriptCmd_invisible, - ScriptCmd_visible, - ScriptCmd_doublebattle_2D, - ScriptCmd_doublebattle_2E, - ScriptCmd_stopsound + ScriptCmd_loadspritegfx, + ScriptCmd_unloadspritegfx, + ScriptCmd_createsprite, + ScriptCmd_createvisualtask, + ScriptCmd_delay, + ScriptCmd_waitforvisualfinish, + ScriptCmd_hang1, + ScriptCmd_hang2, + ScriptCmd_end, + ScriptCmd_playse, + ScriptCmd_monbg, + ScriptCmd_clearmonbg, + ScriptCmd_setalpha, + ScriptCmd_blendoff, + ScriptCmd_call, + ScriptCmd_return, + ScriptCmd_setarg, + ScriptCmd_choosetwoturnanim, + ScriptCmd_jumpifmoveturn, + ScriptCmd_goto, + ScriptCmd_fadetobg, + ScriptCmd_restorebg, + ScriptCmd_waitbgfadeout, + ScriptCmd_waitbgfadein, + ScriptCmd_changebg, + ScriptCmd_playsewithpan, + ScriptCmd_setpan, + ScriptCmd_panse_1B, + ScriptCmd_loopsewithpan, + ScriptCmd_waitplaysewithpan, + ScriptCmd_setbldcnt, + ScriptCmd_createsoundtask, + ScriptCmd_waitsound, + ScriptCmd_jumpargeq, + ScriptCmd_monbg_22, + ScriptCmd_clearmonbg_23, + ScriptCmd_jumpifcontest, + ScriptCmd_fadetobgfromset, + ScriptCmd_panse_26, + ScriptCmd_panse_27, + ScriptCmd_monbgprio_28, + ScriptCmd_monbgprio_29, + ScriptCmd_monbgprio_2A, + ScriptCmd_invisible, + ScriptCmd_visible, + ScriptCmd_doublebattle_2D, + ScriptCmd_doublebattle_2E, + ScriptCmd_stopsound }; // code @@ -1452,14 +1452,14 @@ void ClearBattleAnimationVars(void) // Clear index array. for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) - sAnimSpriteIndexArray[i] |= INVALID_U16; + sAnimSpriteIndexArray[i] |= 0xFFFF; // Clear anim args. for (i = 0; i < ANIM_ARGS_COUNT; i++) gBattleAnimArgs[i] = 0; - sMonAnimTaskIdArray[0] = INVALID_U8; - sMonAnimTaskIdArray[1] = INVALID_U8; + sMonAnimTaskIdArray[0] = 0xFF; + sMonAnimTaskIdArray[1] = 0xFF; gAnimMoveTurn = 0; sAnimBackgroundFadeState = 0; sAnimMoveIndex = 0; @@ -1505,19 +1505,19 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo for (i = 0; i < ANIM_ARGS_COUNT; i++) gBattleAnimArgs[i] = 0; - sMonAnimTaskIdArray[0] = INVALID_U8; - sMonAnimTaskIdArray[1] = INVALID_U8; + sMonAnimTaskIdArray[0] = 0xFF; + sMonAnimTaskIdArray[1] = 0xFF; sBattleAnimScriptPtr = animsTable[tableId]; gAnimScriptActive = TRUE; gAnimFramesToWait = 0; gAnimScriptCallback = RunAnimScriptCommand; for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) - sAnimSpriteIndexArray[i] |= INVALID_U16; + sAnimSpriteIndexArray[i] |= 0xFFFF; if (isMoveAnim) { - for (i = 0; gMovesWithQuietBGM[i] != INVALID_U16; i++) + for (i = 0; gMovesWithQuietBGM[i] != 0xFFFF; i++) { if (tableId == gMovesWithQuietBGM[i]) { @@ -1558,7 +1558,7 @@ static void AddSpriteIndex(u16 index) for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) { - if (sAnimSpriteIndexArray[i] == INVALID_U16) + if (sAnimSpriteIndexArray[i] == 0xFFFF) { sAnimSpriteIndexArray[i] = index; return; @@ -1574,7 +1574,7 @@ static void ClearSpriteIndex(u16 index) { if (sAnimSpriteIndexArray[i] == index) { - sAnimSpriteIndexArray[i] |= INVALID_U16; + sAnimSpriteIndexArray[i] |= 0xFFFF; return; } } @@ -1712,7 +1712,7 @@ static void ScriptCmd_delay(void) sBattleAnimScriptPtr++; gAnimFramesToWait = sBattleAnimScriptPtr[0]; if (gAnimFramesToWait == 0) - gAnimFramesToWait = INVALID_S8; + gAnimFramesToWait = -1; sBattleAnimScriptPtr++; gAnimScriptCallback = WaitAnimFrameCount; } @@ -1746,7 +1746,7 @@ static void ScriptCmd_end(void) // Keep waiting as long as there are animations to be done. if (gAnimVisualTaskCount != 0 || gAnimSoundTaskCount != 0 - || sMonAnimTaskIdArray[0] != INVALID_U8 || sMonAnimTaskIdArray[1] != INVALID_U8) + || sMonAnimTaskIdArray[0] != 0xFF || sMonAnimTaskIdArray[1] != 0xFF) { sSoundAnimFramesToWait = 0; gAnimFramesToWait = 1; @@ -1773,11 +1773,11 @@ static void ScriptCmd_end(void) for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) { - if (sAnimSpriteIndexArray[i] != INVALID_U16) + if (sAnimSpriteIndexArray[i] != 0xFFFF) { FreeSpriteTilesByTag(gBattleAnimPicTable[sAnimSpriteIndexArray[i]].tag); FreeSpritePaletteByTag(gBattleAnimPicTable[sAnimSpriteIndexArray[i]].tag); - sAnimSpriteIndexArray[i] |= INVALID_U16; // set terminator. + sAnimSpriteIndexArray[i] |= 0xFFFF; // set terminator. } } @@ -2122,9 +2122,9 @@ static void ScriptCmd_clearmonbg(void) else battlerId = gBattleAnimTarget; - if (sMonAnimTaskIdArray[0] != INVALID_U8) + if (sMonAnimTaskIdArray[0] != 0xFF) gSprites[gBattlerSpriteIds[battlerId]].invisible = FALSE; - if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != INVALID_U8) + if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != 0xFF) gSprites[gBattlerSpriteIds[battlerId ^ BIT_FLANK]].invisible = FALSE; else animBattlerId = 0; @@ -2148,17 +2148,17 @@ static void sub_80A4980(u8 taskId) else to_BG2 = TRUE; - if (sMonAnimTaskIdArray[0] != INVALID_U8) + if (sMonAnimTaskIdArray[0] != 0xFF) { sub_80A477C(to_BG2); DestroyTask(sMonAnimTaskIdArray[0]); - sMonAnimTaskIdArray[0] = INVALID_U8; + sMonAnimTaskIdArray[0] = 0xFF; } if (gTasks[taskId].data[0] > 1) { sub_80A477C(to_BG2 ^ 1); DestroyTask(sMonAnimTaskIdArray[1]); - sMonAnimTaskIdArray[1] = INVALID_U8; + sMonAnimTaskIdArray[1] = 0xFF; } DestroyTask(taskId); } @@ -2421,7 +2421,7 @@ static void Task_FadeToBg(u8 taskId) { s16 bgId = gTasks[taskId].tBackgroundId; - if (bgId == INVALID_S16) + if (bgId == -1) LoadDefaultBg(); else LoadMoveBg(bgId); @@ -2477,7 +2477,7 @@ static void ScriptCmd_restorebg(void) sBattleAnimScriptPtr++; taskId = CreateTask(Task_FadeToBg, 5); - gTasks[taskId].tBackgroundId = INVALID_S16; + gTasks[taskId].tBackgroundId = -1; sAnimBackgroundFadeState = 1; } @@ -3001,7 +3001,7 @@ static void ScriptCmd_invisible(void) u8 spriteId; spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]); - if (spriteId != INVALID_U8) + if (spriteId != 0xFF) gSprites[spriteId].invisible = TRUE; sBattleAnimScriptPtr += 2; @@ -3012,7 +3012,7 @@ static void ScriptCmd_visible(void) u8 spriteId; spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]); - if (spriteId != INVALID_U8) + if (spriteId != 0xFF) gSprites[spriteId].invisible = FALSE; sBattleAnimScriptPtr += 2; @@ -3039,7 +3039,7 @@ static void ScriptCmd_doublebattle_2D(void) r4 = sub_80A8364(gBattleAnimTarget); spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); } - if (spriteId != INVALID_U8) + if (spriteId != 0xFF) { gSprites[spriteId].invisible = FALSE; if (r4 == 2) @@ -3075,7 +3075,7 @@ static void ScriptCmd_doublebattle_2E(void) spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); } - if (spriteId != INVALID_U8 && r4 == 2) + if (spriteId != 0xFF && r4 == 2) gSprites[spriteId].oam.priority = 2; } } diff --git a/src/battle_anim_80A5C6C.c b/src/battle_anim_80A5C6C.c index 1a2c279ec..8ba1a8222 100644 --- a/src/battle_anim_80A5C6C.c +++ b/src/battle_anim_80A5C6C.c @@ -1590,7 +1590,7 @@ s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 whichBattler) } } } - return INVALID_S16; + return -1; } void obj_delete_but_dont_free_vram(struct Sprite *sprite) diff --git a/src/battle_anim_80A9C70.c b/src/battle_anim_80A9C70.c index c329a134d..f1245a032 100644 --- a/src/battle_anim_80A9C70.c +++ b/src/battle_anim_80A9C70.c @@ -183,7 +183,7 @@ void sub_80A9EF4(u8 taskId) SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); spriteId = CreateSprite(&gUnknown_0853EF48, x, y, 4); - if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == INVALID_U16) + if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == 0xFFFF) gSprites[spriteId].invisible = TRUE; SetSubspriteTables(&gSprites[spriteId], gUnknown_0853EF40); gTasks[taskId].data[15] = spriteId; @@ -315,10 +315,10 @@ void AnimTask_StatsChange(u8 taskId) CASE(MINUS2, STAT_ACC): goesDown = TRUE; animStatId = 2; sharply = TRUE; break; CASE(MINUS2, STAT_EVASION): goesDown = TRUE; animStatId = 4; sharply = TRUE; break; - case STAT_ANIM_MULTIPLE_PLUS1: goesDown = FALSE; animStatId = INVALID_U8; sharply = FALSE; break; - case STAT_ANIM_MULTIPLE_PLUS2: goesDown = FALSE; animStatId = INVALID_U8; sharply = TRUE; break; - case STAT_ANIM_MULTIPLE_MINUS1: goesDown = TRUE; animStatId = INVALID_U8; sharply = FALSE; break; - case STAT_ANIM_MULTIPLE_MINUS2: goesDown = TRUE; animStatId = INVALID_U8; sharply = TRUE; break; + case STAT_ANIM_MULTIPLE_PLUS1: goesDown = FALSE; animStatId = 0xFF; sharply = FALSE; break; + case STAT_ANIM_MULTIPLE_PLUS2: goesDown = FALSE; animStatId = 0xFF; sharply = TRUE; break; + case STAT_ANIM_MULTIPLE_MINUS1: goesDown = TRUE; animStatId = 0xFF; sharply = FALSE; break; + case STAT_ANIM_MULTIPLE_MINUS2: goesDown = TRUE; animStatId = 0xFF; sharply = TRUE; break; default: DestroyAnimVisualTask(taskId); diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index 36738d36e..e5f0cd165 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -214,7 +214,7 @@ void sub_8158E9C(u8 taskId) if (species != SPECIES_NONE) { - if (gBattleAnimArgs[1] == INVALID_U8) + if (gBattleAnimArgs[1] == 0xFF) PlayCry3(species, pan, 9); else PlayCry3(species, pan, 7); @@ -238,7 +238,7 @@ static void sub_8158FF4(u8 taskId) } else { - if (gTasks[taskId].data[0] == INVALID_U8) + if (gTasks[taskId].data[0] == 0xFF) { if (!IsCryPlaying()) { @@ -389,50 +389,50 @@ void sub_8159308(u8 taskId) NAKED void sub_8159308(u8 taskId) { - asm_unified(" push {r4,r5,lr}\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - adds r5, r0, 0\n\ - ldr r1, =gTasks\n\ - lsls r0, r5, 2\n\ - adds r0, r5\n\ - lsls r0, 3\n\ - adds r4, r0, r1\n\ - ldrh r2, [r4, 0xE]\n\ - ldrh r0, [r4, 0x1C]\n\ - adds r1, r0, 0x1\n\ - strh r1, [r4, 0x1C]\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - movs r3, 0x12\n\ - ldrsh r1, [r4, r3]\n\ - cmp r0, r1\n\ - bne _08159342\n\ - movs r0, 0\n\ - strh r0, [r4, 0x1C]\n\ - ldrh r1, [r4, 0x1E]\n\ - adds r0, r2, r1\n\ - strh r0, [r4, 0x1E]\n\ - movs r2, 0x1E\n\ - ldrsh r0, [r4, r2]\n\ - bl KeepPanInRange\n\ - strh r0, [r4, 0x1E]\n\ + asm_unified(" push {r4,r5,lr}\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + adds r5, r0, 0\n\ + ldr r1, =gTasks\n\ + lsls r0, r5, 2\n\ + adds r0, r5\n\ + lsls r0, 3\n\ + adds r4, r0, r1\n\ + ldrh r2, [r4, 0xE]\n\ + ldrh r0, [r4, 0x1C]\n\ + adds r1, r0, 0x1\n\ + strh r1, [r4, 0x1C]\n\ + lsls r0, 16\n\ + asrs r0, 16\n\ + movs r3, 0x12\n\ + ldrsh r1, [r4, r3]\n\ + cmp r0, r1\n\ + bne _08159342\n\ + movs r0, 0\n\ + strh r0, [r4, 0x1C]\n\ + ldrh r1, [r4, 0x1E]\n\ + adds r0, r2, r1\n\ + strh r0, [r4, 0x1E]\n\ + movs r2, 0x1E\n\ + ldrsh r0, [r4, r2]\n\ + bl KeepPanInRange\n\ + strh r0, [r4, 0x1E]\n\ _08159342:\n\ - ldr r1, =gUnknown_02038440\n\ - ldrh r0, [r4, 0x1E]\n\ - strb r0, [r1]\n\ - movs r3, 0x1E\n\ - ldrsh r1, [r4, r3]\n\ - movs r2, 0xC\n\ - ldrsh r0, [r4, r2]\n\ - cmp r1, r0\n\ - bne _0815935A\n\ - adds r0, r5, 0\n\ - bl DestroyAnimVisualTask\n\ + ldr r1, =gUnknown_02038440\n\ + ldrh r0, [r4, 0x1E]\n\ + strb r0, [r1]\n\ + movs r3, 0x1E\n\ + ldrsh r1, [r4, r3]\n\ + movs r2, 0xC\n\ + ldrsh r0, [r4, r2]\n\ + cmp r1, r0\n\ + bne _0815935A\n\ + adds r0, r5, 0\n\ + bl DestroyAnimVisualTask\n\ _0815935A:\n\ - pop {r4,r5}\n\ - pop {r0}\n\ - bx r0\n\ - .pool"); + pop {r4,r5}\n\ + pop {r0}\n\ + bx r0\n\ + .pool"); } #endif diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 5ed30ddc0..c3d0fe90f 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -82,7 +82,7 @@ void sub_8116664(u8 taskId) animBattlers[1] = gBattleAnimTarget; break; case 5: - animBattlers[0] = INVALID_U8; + animBattlers[0] = 0xFF; break; case 6: selectedPalettes = 0; diff --git a/src/battle_arena.c b/src/battle_arena.c index 591fc82b9..cd2c976da 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -449,7 +449,7 @@ static const union AnimCmd *const sSpriteAnimTable_8611F4C[] = static const struct SpriteTemplate sSpriteTemplate_JudgmentIcon = { .tileTag = 0x3E8, - .paletteTag = INVALID_U16, + .paletteTag = 0xFFFF, .oam = &sOamData_8611F24, .anims = sSpriteAnimTable_8611F4C, .images = NULL, diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index d65c61884..8cbc62aab 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -212,7 +212,7 @@ static void sub_8064470(void) static void sub_80644D8(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; LinkOpponentBufferExecCompleted(); @@ -395,7 +395,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 8bbbcbfd1..0cd15f39e 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -203,7 +203,7 @@ static void sub_814AF54(void) static void sub_814AFBC(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; LinkPartnerBufferExecCompleted(); @@ -279,7 +279,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 0aeb24c32..c057e8575 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -220,7 +220,7 @@ static void sub_805F240(void) static void sub_805F2A8(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; OpponentBufferExecCompleted(); @@ -389,7 +389,7 @@ static void CompleteOnHealthbarDone(void) { s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 3053e6c37..2bd5ef365 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -635,7 +635,7 @@ u32 sub_8057FBC(void) // unused PlaySE(SE_SELECT); gBattle_BG0_X = 0; gBattle_BG0_Y = 0x140; - var = INVALID_U8; + var = 0xFF; } if (gMain.newKeys & DPAD_LEFT && gMoveSelectionCursor[gActiveBattler] & 1) { @@ -936,7 +936,7 @@ static void sub_80588B4(void) static void sub_8058924(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; PlayerBufferExecCompleted(); @@ -1119,7 +1119,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } @@ -1221,7 +1221,7 @@ static void sub_8059400(u8 taskId) newExpPoints = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]); - if (newExpPoints == INVALID_S16) // The bar has been filled with given exp points. + if (newExpPoints == -1) // The bar has been filled with given exp points. { u8 level; s32 currExp; diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 775b7676f..02dd1383b 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -218,7 +218,7 @@ static void sub_81BAE98(void) static void sub_81BAF00(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; PlayerPartnerBufferExecCompleted(); @@ -294,7 +294,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } @@ -397,7 +397,7 @@ static void sub_81BB4E4(u8 taskId) r4 = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]); - if (r4 == INVALID_S16) + if (r4 == -1) { u8 level; s32 currExp; diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 842facd44..0cf3634dc 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -213,7 +213,7 @@ static void sub_81865C8(void) static void sub_8186630(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; RecordedOpponentBufferExecCompleted(); @@ -377,7 +377,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 60bec78b1..4d7fdc01e 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -202,7 +202,7 @@ static void sub_81899F0(void) static void sub_8189A58(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; RecordedPlayerBufferExecCompleted(); @@ -360,7 +360,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 9078ef577..5d87c4f90 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -348,7 +348,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controllers.c b/src/battle_controllers.c index e24549d82..a6d6e9294 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -51,7 +51,7 @@ void SetUpBattleVarsAndBirchZigzagoon(void) for (i = 0; i < MAX_BATTLERS_COUNT; i++) { gBattlerControllerFuncs[i] = nullsub_21; - gBattlerPositions[i] = INVALID_U8; + gBattlerPositions[i] = 0xFF; gActionSelectionCursor[i] = 0; gMoveSelectionCursor[i] = 0; } diff --git a/src/battle_dome.c b/src/battle_dome.c index f03de7505..29b41c5db 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -256,361 +256,361 @@ static EWRAM_DATA u8 *sTilemapBuffer = NULL; // Const rom data. static const u8 sMovePointsForDomeTrainers[MOVES_COUNT][DOME_TOURNAMENT_TRAINERS_COUNT] = { - [MOVE_NONE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_POUND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_KARATE_CHOP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_DOUBLE_SLAP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_COMET_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_MEGA_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_PAY_DAY] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_FIRE_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_ICE_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_THUNDER_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SCRATCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_VICE_GRIP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_GUILLOTINE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_RAZOR_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SWORDS_DANCE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0}, - [MOVE_CUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_GUST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_WING_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_WHIRLWIND] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FLY] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BIND] = {0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SLAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_VINE_WHIP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_STOMP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_DOUBLE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_MEGA_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_JUMP_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ROLLING_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SAND_ATTACK] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_HEADBUTT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_HORN_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FURY_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_HORN_DRILL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_TACKLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BODY_SLAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_WRAP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_TAKE_DOWN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_THRASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_DOUBLE_EDGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_TAIL_WHIP] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_POISON_STING] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_TWINEEDLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_PIN_MISSILE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_LEER] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_BITE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_GROWL] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ROAR] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SING] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SUPERSONIC] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SONIC_BOOM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_DISABLE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ACID] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_EMBER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_FLAMETHROWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, - [MOVE_MIST] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_WATER_GUN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_HYDRO_PUMP] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0}, - [MOVE_SURF] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0}, - [MOVE_ICE_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, - [MOVE_BLIZZARD] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1}, - [MOVE_PSYBEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_BUBBLE_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_AURORA_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_HYPER_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0}, - [MOVE_PECK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_DRILL_PECK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SUBMISSION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_LOW_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_COUNTER] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0}, - [MOVE_SEISMIC_TOSS] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_STRENGTH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ABSORB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_MEGA_DRAIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_LEECH_SEED] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_GROWTH] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_RAZOR_LEAF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SOLAR_BEAM] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0}, - [MOVE_POISON_POWDER] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_STUN_SPORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SLEEP_POWDER] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_PETAL_DANCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_STRING_SHOT] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_DRAGON_RAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FIRE_SPIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_THUNDER_SHOCK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_THUNDERBOLT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, - [MOVE_THUNDER_WAVE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_THUNDER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1}, - [MOVE_ROCK_THROW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_EARTHQUAKE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0}, - [MOVE_FISSURE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0}, - [MOVE_DIG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_TOXIC] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_CONFUSION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_PSYCHIC] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, - [MOVE_HYPNOSIS] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_MEDITATE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_AGILITY] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_QUICK_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_RAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_TELEPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_NIGHT_SHADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_MIMIC] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SCREECH] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_DOUBLE_TEAM] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_RECOVER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_HARDEN] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_MINIMIZE] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SMOKESCREEN] = {0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_CONFUSE_RAY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_WITHDRAW] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_DEFENSE_CURL] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BARRIER] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_LIGHT_SCREEN] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_HAZE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_REFLECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_FOCUS_ENERGY] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BIDE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_METRONOME] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, - [MOVE_MIRROR_MOVE] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, - [MOVE_SELF_DESTRUCT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0}, - [MOVE_EGG_BOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0}, - [MOVE_LICK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SMOG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SLUDGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_BONE_CLUB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_FIRE_BLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1}, - [MOVE_WATERFALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_CLAMP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SWIFT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SKULL_BASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, - [MOVE_SPIKE_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_CONSTRICT] = {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_AMNESIA] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_KINESIS] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SOFT_BOILED] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_HI_JUMP_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_GLARE] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_DREAM_EATER] = {1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0}, - [MOVE_POISON_GAS] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BARRAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_LEECH_LIFE] = {0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_LOVELY_KISS] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SKY_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1}, - [MOVE_TRANSFORM] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BUBBLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_DIZZY_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SPORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FLASH] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_PSYWAVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SPLASH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ACID_ARMOR] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_CRABHAMMER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0}, - [MOVE_EXPLOSION] = {0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0}, - [MOVE_FURY_SWIPES] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BONEMERANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_REST] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ROCK_SLIDE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_HYPER_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SHARPEN] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_CONVERSION] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_TRI_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SUPER_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SLASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SUBSTITUTE] = {0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_STRUGGLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_SKETCH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0}, - [MOVE_TRIPLE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_THIEF] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SPIDER_WEB] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_MIND_READER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_NIGHTMARE] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FLAME_WHEEL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SNORE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_CURSE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_FLAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_CONVERSION_2] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_AEROBLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, - [MOVE_COTTON_SPORE] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_REVERSAL] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SPITE] = {0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_POWDER_SNOW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_PROTECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0}, - [MOVE_MACH_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SCARY_FACE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_FAINT_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SWEET_KISS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BELLY_DRUM] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SLUDGE_BOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1}, - [MOVE_MUD_SLAP] = {0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_OCTAZOOKA] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SPIKES] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ZAP_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1}, - [MOVE_FORESIGHT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_DESTINY_BOND] = {0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_PERISH_SONG] = {0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_ICY_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_DETECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_BONE_RUSH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_LOCK_ON] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_OUTRAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1}, - [MOVE_SANDSTORM] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_GIGA_DRAIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_ENDURE] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_CHARM] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ROLLOUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_FALSE_SWIPE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SWAGGER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_MILK_DRINK] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SPARK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_FURY_CUTTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_STEEL_WING] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_MEAN_LOOK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_ATTRACT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SLEEP_TALK] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, - [MOVE_HEAL_BELL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_RETURN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_PRESENT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0}, - [MOVE_FRUSTRATION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SAFEGUARD] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_PAIN_SPLIT] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SACRED_FIRE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1}, - [MOVE_MAGNITUDE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_DYNAMIC_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1}, - [MOVE_MEGAHORN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0}, - [MOVE_DRAGON_BREATH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_BATON_PASS] = {1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ENCORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_PURSUIT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_RAPID_SPIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SWEET_SCENT] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_IRON_TAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1}, - [MOVE_METAL_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_VITAL_THROW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_MORNING_SUN] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_SYNTHESIS] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_MOONLIGHT] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_HIDDEN_POWER] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_CROSS_CHOP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0}, - [MOVE_TWISTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_RAIN_DANCE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_SUNNY_DAY] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_CRUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_MIRROR_COAT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_PSYCH_UP] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_EXTREME_SPEED] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_ANCIENT_POWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1}, - [MOVE_SHADOW_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_FUTURE_SIGHT] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ROCK_SMASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_WHIRLPOOL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_BEAT_UP] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FAKE_OUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_UPROAR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_STOCKPILE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SPIT_UP] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, - [MOVE_SWALLOW] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_HEAT_WAVE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1}, - [MOVE_HAIL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_TORMENT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FLATTER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_WILL_O_WISP] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_MEMENTO] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FACADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FOCUS_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, - [MOVE_SMELLING_SALT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FOLLOW_ME] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_NATURE_POWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_CHARGE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_TAUNT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_HELPING_HAND] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_TRICK] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ROLE_PLAY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_WISH] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ASSIST] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0}, - [MOVE_INGRAIN] = {1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SUPERPOWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0}, - [MOVE_MAGIC_COAT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0}, - [MOVE_RECYCLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_REVENGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0}, - [MOVE_BRICK_BREAK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_YAWN] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_KNOCK_OFF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_ENDEAVOR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_ERUPTION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0}, - [MOVE_SKILL_SWAP] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_IMPRISON] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0}, - [MOVE_REFRESH] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_GRUDGE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_SNATCH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0}, - [MOVE_SECRET_POWER] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_DIVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ARM_THRUST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_CAMOUFLAGE] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_TAIL_GLOW] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_LUSTER_PURGE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1}, - [MOVE_MIST_BALL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1}, - [MOVE_FEATHER_DANCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_TEETER_DANCE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_BLAZE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_MUD_SPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ICE_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_NEEDLE_ARM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SLACK_OFF] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_HYPER_VOICE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, - [MOVE_POISON_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_CRUSH_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_BLAST_BURN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, - [MOVE_HYDRO_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, - [MOVE_METEOR_MASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1}, - [MOVE_ASTONISH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_WEATHER_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_AROMATHERAPY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_FAKE_TEARS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_AIR_CUTTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_OVERHEAT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1}, - [MOVE_ODOR_SLEUTH] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ROCK_TOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SILVER_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1}, - [MOVE_METAL_SOUND] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_GRASS_WHISTLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_TICKLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_COSMIC_POWER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_WATER_SPOUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0}, - [MOVE_SIGNAL_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SHADOW_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_EXTRASENSORY] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SKY_UPPERCUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SAND_TOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SHEER_COLD] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0}, - [MOVE_MUDDY_WATER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1}, - [MOVE_BULLET_SEED] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_AERIAL_ACE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ICICLE_SPEAR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_IRON_DEFENSE] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BLOCK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_HOWL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_DRAGON_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FRENZY_PLANT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, - [MOVE_BULK_UP] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BOUNCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1}, - [MOVE_MUD_SHOT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_POISON_TAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_COVET] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_VOLT_TACKLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0}, - [MOVE_MAGICAL_LEAF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_WATER_SPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_CALM_MIND] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_LEAF_BLADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_DRAGON_DANCE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ROCK_BLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SHOCK_WAVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_WATER_PULSE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_DOOM_DESIRE] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, - [MOVE_PSYCHO_BOOST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1}, + [MOVE_NONE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_POUND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_KARATE_CHOP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_DOUBLE_SLAP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_COMET_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_MEGA_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_PAY_DAY] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_FIRE_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_ICE_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_THUNDER_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SCRATCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_VICE_GRIP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_GUILLOTINE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_RAZOR_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SWORDS_DANCE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0}, + [MOVE_CUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_GUST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_WING_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_WHIRLWIND] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FLY] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BIND] = {0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SLAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_VINE_WHIP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_STOMP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_DOUBLE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_MEGA_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_JUMP_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ROLLING_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SAND_ATTACK] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_HEADBUTT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_HORN_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FURY_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_HORN_DRILL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_TACKLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BODY_SLAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_WRAP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_TAKE_DOWN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_THRASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_DOUBLE_EDGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_TAIL_WHIP] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_POISON_STING] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_TWINEEDLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_PIN_MISSILE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_LEER] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_BITE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_GROWL] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ROAR] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SING] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SUPERSONIC] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SONIC_BOOM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_DISABLE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ACID] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_EMBER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_FLAMETHROWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, + [MOVE_MIST] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_WATER_GUN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_HYDRO_PUMP] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0}, + [MOVE_SURF] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0}, + [MOVE_ICE_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, + [MOVE_BLIZZARD] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1}, + [MOVE_PSYBEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_BUBBLE_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_AURORA_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_HYPER_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0}, + [MOVE_PECK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_DRILL_PECK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SUBMISSION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_LOW_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_COUNTER] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0}, + [MOVE_SEISMIC_TOSS] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_STRENGTH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ABSORB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_MEGA_DRAIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_LEECH_SEED] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_GROWTH] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_RAZOR_LEAF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SOLAR_BEAM] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0}, + [MOVE_POISON_POWDER] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_STUN_SPORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SLEEP_POWDER] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_PETAL_DANCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_STRING_SHOT] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_DRAGON_RAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FIRE_SPIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_THUNDER_SHOCK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_THUNDERBOLT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, + [MOVE_THUNDER_WAVE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_THUNDER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1}, + [MOVE_ROCK_THROW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_EARTHQUAKE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0}, + [MOVE_FISSURE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0}, + [MOVE_DIG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_TOXIC] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_CONFUSION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_PSYCHIC] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, + [MOVE_HYPNOSIS] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_MEDITATE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_AGILITY] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_QUICK_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_RAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_TELEPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_NIGHT_SHADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_MIMIC] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SCREECH] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_DOUBLE_TEAM] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_RECOVER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_HARDEN] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_MINIMIZE] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SMOKESCREEN] = {0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_CONFUSE_RAY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_WITHDRAW] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_DEFENSE_CURL] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BARRIER] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_LIGHT_SCREEN] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_HAZE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_REFLECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_FOCUS_ENERGY] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BIDE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_METRONOME] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, + [MOVE_MIRROR_MOVE] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, + [MOVE_SELF_DESTRUCT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0}, + [MOVE_EGG_BOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0}, + [MOVE_LICK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SMOG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SLUDGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_BONE_CLUB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_FIRE_BLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1}, + [MOVE_WATERFALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_CLAMP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SWIFT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SKULL_BASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, + [MOVE_SPIKE_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_CONSTRICT] = {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_AMNESIA] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_KINESIS] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SOFT_BOILED] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_HI_JUMP_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_GLARE] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_DREAM_EATER] = {1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0}, + [MOVE_POISON_GAS] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BARRAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_LEECH_LIFE] = {0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_LOVELY_KISS] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SKY_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1}, + [MOVE_TRANSFORM] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BUBBLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_DIZZY_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SPORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FLASH] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_PSYWAVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SPLASH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ACID_ARMOR] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_CRABHAMMER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0}, + [MOVE_EXPLOSION] = {0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0}, + [MOVE_FURY_SWIPES] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BONEMERANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_REST] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ROCK_SLIDE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_HYPER_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SHARPEN] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_CONVERSION] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_TRI_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SUPER_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SLASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SUBSTITUTE] = {0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_STRUGGLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_SKETCH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0}, + [MOVE_TRIPLE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_THIEF] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SPIDER_WEB] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_MIND_READER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_NIGHTMARE] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FLAME_WHEEL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SNORE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_CURSE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_FLAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_CONVERSION_2] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_AEROBLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, + [MOVE_COTTON_SPORE] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_REVERSAL] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SPITE] = {0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_POWDER_SNOW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_PROTECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0}, + [MOVE_MACH_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SCARY_FACE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_FAINT_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SWEET_KISS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BELLY_DRUM] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SLUDGE_BOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1}, + [MOVE_MUD_SLAP] = {0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_OCTAZOOKA] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SPIKES] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ZAP_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1}, + [MOVE_FORESIGHT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_DESTINY_BOND] = {0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_PERISH_SONG] = {0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_ICY_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_DETECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_BONE_RUSH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_LOCK_ON] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_OUTRAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1}, + [MOVE_SANDSTORM] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_GIGA_DRAIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_ENDURE] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_CHARM] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ROLLOUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_FALSE_SWIPE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SWAGGER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_MILK_DRINK] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SPARK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_FURY_CUTTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_STEEL_WING] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_MEAN_LOOK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_ATTRACT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SLEEP_TALK] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, + [MOVE_HEAL_BELL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_RETURN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_PRESENT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0}, + [MOVE_FRUSTRATION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SAFEGUARD] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_PAIN_SPLIT] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SACRED_FIRE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1}, + [MOVE_MAGNITUDE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_DYNAMIC_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1}, + [MOVE_MEGAHORN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0}, + [MOVE_DRAGON_BREATH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_BATON_PASS] = {1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ENCORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_PURSUIT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_RAPID_SPIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SWEET_SCENT] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_IRON_TAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1}, + [MOVE_METAL_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_VITAL_THROW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_MORNING_SUN] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_SYNTHESIS] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_MOONLIGHT] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_HIDDEN_POWER] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_CROSS_CHOP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0}, + [MOVE_TWISTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_RAIN_DANCE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_SUNNY_DAY] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_CRUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_MIRROR_COAT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_PSYCH_UP] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_EXTREME_SPEED] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_ANCIENT_POWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1}, + [MOVE_SHADOW_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_FUTURE_SIGHT] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ROCK_SMASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_WHIRLPOOL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_BEAT_UP] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FAKE_OUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_UPROAR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_STOCKPILE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SPIT_UP] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, + [MOVE_SWALLOW] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_HEAT_WAVE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1}, + [MOVE_HAIL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_TORMENT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FLATTER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_WILL_O_WISP] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_MEMENTO] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FACADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FOCUS_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, + [MOVE_SMELLING_SALT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FOLLOW_ME] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_NATURE_POWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_CHARGE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_TAUNT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_HELPING_HAND] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_TRICK] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ROLE_PLAY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_WISH] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ASSIST] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0}, + [MOVE_INGRAIN] = {1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SUPERPOWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0}, + [MOVE_MAGIC_COAT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0}, + [MOVE_RECYCLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_REVENGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0}, + [MOVE_BRICK_BREAK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_YAWN] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_KNOCK_OFF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_ENDEAVOR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_ERUPTION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0}, + [MOVE_SKILL_SWAP] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_IMPRISON] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0}, + [MOVE_REFRESH] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_GRUDGE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_SNATCH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0}, + [MOVE_SECRET_POWER] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_DIVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ARM_THRUST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_CAMOUFLAGE] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_TAIL_GLOW] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_LUSTER_PURGE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1}, + [MOVE_MIST_BALL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1}, + [MOVE_FEATHER_DANCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_TEETER_DANCE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_BLAZE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_MUD_SPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ICE_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_NEEDLE_ARM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SLACK_OFF] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_HYPER_VOICE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, + [MOVE_POISON_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_CRUSH_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_BLAST_BURN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, + [MOVE_HYDRO_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, + [MOVE_METEOR_MASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1}, + [MOVE_ASTONISH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_WEATHER_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_AROMATHERAPY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_FAKE_TEARS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_AIR_CUTTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_OVERHEAT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1}, + [MOVE_ODOR_SLEUTH] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ROCK_TOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SILVER_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1}, + [MOVE_METAL_SOUND] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_GRASS_WHISTLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_TICKLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_COSMIC_POWER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_WATER_SPOUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0}, + [MOVE_SIGNAL_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SHADOW_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_EXTRASENSORY] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SKY_UPPERCUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SAND_TOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SHEER_COLD] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0}, + [MOVE_MUDDY_WATER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1}, + [MOVE_BULLET_SEED] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_AERIAL_ACE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ICICLE_SPEAR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_IRON_DEFENSE] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BLOCK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_HOWL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_DRAGON_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FRENZY_PLANT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, + [MOVE_BULK_UP] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BOUNCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1}, + [MOVE_MUD_SHOT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_POISON_TAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_COVET] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_VOLT_TACKLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0}, + [MOVE_MAGICAL_LEAF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_WATER_SPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_CALM_MIND] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_LEAF_BLADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_DRAGON_DANCE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ROCK_BLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SHOCK_WAVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_WATER_PULSE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_DOOM_DESIRE] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, + [MOVE_PSYCHO_BOOST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1}, }; static const u8 gUnknown_0860C988[][DOME_TOURNAMENT_TRAINERS_COUNT] = @@ -3032,7 +3032,7 @@ static s32 GetTypeEffectivenessPoints(s32 move, s32 targetSpecies, s32 arg2) s32 i = 0; s32 typePower = TYPE_x1; - if (move == MOVE_NONE || move == INVALID_U16 || gBattleMoves[move].power == 0) + if (move == MOVE_NONE || move == 0xFFFF || gBattleMoves[move].power == 0) return 0; defType1 = gBaseStats[targetSpecies].type1; @@ -3148,239 +3148,239 @@ NAKED static s32 GetTypeEffectivenessPoints(s32 move, s32 species, s32 arg2) { asm_unified("\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x8\n\ - adds r3, r0, 0\n\ - adds r4, r1, 0\n\ - str r2, [sp]\n\ - movs r6, 0\n\ - movs r2, 0x14\n\ - cmp r3, 0\n\ - beq _0818FFF0\n\ - ldr r0, =0x0000ffff\n\ - cmp r3, r0\n\ - beq _0818FFF0\n\ - ldr r0, =gBattleMoves\n\ - lsls r1, r3, 1\n\ - adds r1, r3\n\ - lsls r1, 2\n\ - adds r3, r1, r0\n\ - ldrb r0, [r3, 0x1]\n\ - cmp r0, 0\n\ - bne _0818FFFC\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x8\n\ + adds r3, r0, 0\n\ + adds r4, r1, 0\n\ + str r2, [sp]\n\ + movs r6, 0\n\ + movs r2, 0x14\n\ + cmp r3, 0\n\ + beq _0818FFF0\n\ + ldr r0, =0x0000ffff\n\ + cmp r3, r0\n\ + beq _0818FFF0\n\ + ldr r0, =gBattleMoves\n\ + lsls r1, r3, 1\n\ + adds r1, r3\n\ + lsls r1, 2\n\ + adds r3, r1, r0\n\ + ldrb r0, [r3, 0x1]\n\ + cmp r0, 0\n\ + bne _0818FFFC\n\ _0818FFF0:\n\ - movs r0, 0\n\ - b _08190156\n\ - .pool\n\ + movs r0, 0\n\ + b _08190156\n\ + .pool\n\ _0818FFFC:\n\ - ldr r1, =gBaseStats\n\ - lsls r0, r4, 3\n\ - subs r0, r4\n\ - lsls r0, 2\n\ - adds r0, r1\n\ - ldrb r1, [r0, 0x6]\n\ - mov r10, r1\n\ - ldrb r1, [r0, 0x7]\n\ - mov r9, r1\n\ - ldrb r0, [r0, 0x16]\n\ - mov r8, r0\n\ - ldrb r3, [r3, 0x2]\n\ - str r3, [sp, 0x4]\n\ - cmp r0, 0x1A\n\ - bne _0819002C\n\ - cmp r3, 0x4\n\ - bne _0819002C\n\ - ldr r0, [sp]\n\ - cmp r0, 0x1\n\ - bne _081900AA\n\ - movs r2, 0x8\n\ - b _081900A4\n\ - .pool\n\ + ldr r1, =gBaseStats\n\ + lsls r0, r4, 3\n\ + subs r0, r4\n\ + lsls r0, 2\n\ + adds r0, r1\n\ + ldrb r1, [r0, 0x6]\n\ + mov r10, r1\n\ + ldrb r1, [r0, 0x7]\n\ + mov r9, r1\n\ + ldrb r0, [r0, 0x16]\n\ + mov r8, r0\n\ + ldrb r3, [r3, 0x2]\n\ + str r3, [sp, 0x4]\n\ + cmp r0, 0x1A\n\ + bne _0819002C\n\ + cmp r3, 0x4\n\ + bne _0819002C\n\ + ldr r0, [sp]\n\ + cmp r0, 0x1\n\ + bne _081900AA\n\ + movs r2, 0x8\n\ + b _081900A4\n\ + .pool\n\ _0819002C:\n\ - ldr r0, =gTypeEffectiveness\n\ - adds r1, r6, r0\n\ - ldrb r0, [r1]\n\ - ldr r7, =gTypeEffectiveness\n\ - cmp r0, 0xFF\n\ - beq _081900A4\n\ - adds r4, r1, 0\n\ + ldr r0, =gTypeEffectiveness\n\ + adds r1, r6, r0\n\ + ldrb r0, [r1]\n\ + ldr r7, =gTypeEffectiveness\n\ + cmp r0, 0xFF\n\ + beq _081900A4\n\ + adds r4, r1, 0\n\ _0819003A:\n\ - ldrb r0, [r4]\n\ - cmp r0, 0xFE\n\ - beq _08190096\n\ - ldrb r0, [r4]\n\ - ldr r1, [sp, 0x4]\n\ - cmp r0, r1\n\ - bne _08190096\n\ - ldrb r0, [r4, 0x1]\n\ - adds r5, r6, 0x1\n\ - cmp r0, r10\n\ - bne _0819006C\n\ - adds r1, r6, 0x2\n\ - mov r0, r8\n\ - cmp r0, 0x19\n\ - bne _0819005E\n\ - ldrb r0, [r4, 0x2]\n\ - cmp r0, 0x28\n\ - bne _0819006C\n\ + ldrb r0, [r4]\n\ + cmp r0, 0xFE\n\ + beq _08190096\n\ + ldrb r0, [r4]\n\ + ldr r1, [sp, 0x4]\n\ + cmp r0, r1\n\ + bne _08190096\n\ + ldrb r0, [r4, 0x1]\n\ + adds r5, r6, 0x1\n\ + cmp r0, r10\n\ + bne _0819006C\n\ + adds r1, r6, 0x2\n\ + mov r0, r8\n\ + cmp r0, 0x19\n\ + bne _0819005E\n\ + ldrb r0, [r4, 0x2]\n\ + cmp r0, 0x28\n\ + bne _0819006C\n\ _0819005E:\n\ - adds r0, r1, r7\n\ - ldrb r0, [r0]\n\ - muls r0, r2\n\ - movs r1, 0xA\n\ - bl __divsi3\n\ - adds r2, r0, 0\n\ + adds r0, r1, r7\n\ + ldrb r0, [r0]\n\ + muls r0, r2\n\ + movs r1, 0xA\n\ + bl __divsi3\n\ + adds r2, r0, 0\n\ _0819006C:\n\ - adds r0, r5, r7\n\ - ldrb r0, [r0]\n\ - cmp r0, r9\n\ - bne _08190096\n\ - cmp r10, r9\n\ - beq _08190096\n\ - adds r1, r6, 0x2\n\ - mov r0, r8\n\ - cmp r0, 0x19\n\ - bne _08190088\n\ - adds r0, r1, r7\n\ - ldrb r0, [r0]\n\ - cmp r0, 0x28\n\ - bne _08190096\n\ + adds r0, r5, r7\n\ + ldrb r0, [r0]\n\ + cmp r0, r9\n\ + bne _08190096\n\ + cmp r10, r9\n\ + beq _08190096\n\ + adds r1, r6, 0x2\n\ + mov r0, r8\n\ + cmp r0, 0x19\n\ + bne _08190088\n\ + adds r0, r1, r7\n\ + ldrb r0, [r0]\n\ + cmp r0, 0x28\n\ + bne _08190096\n\ _08190088:\n\ - adds r0, r1, r7\n\ - ldrb r0, [r0]\n\ - muls r0, r2\n\ - movs r1, 0xA\n\ - bl __divsi3\n\ - adds r2, r0, 0\n\ + adds r0, r1, r7\n\ + ldrb r0, [r0]\n\ + muls r0, r2\n\ + movs r1, 0xA\n\ + bl __divsi3\n\ + adds r2, r0, 0\n\ _08190096:\n\ - adds r4, 0x3\n\ - adds r6, 0x3\n\ - ldr r1, =gTypeEffectiveness\n\ - adds r0, r6, r1\n\ - ldrb r0, [r0]\n\ - cmp r0, 0xFF\n\ - bne _0819003A\n\ + adds r4, 0x3\n\ + adds r6, 0x3\n\ + ldr r1, =gTypeEffectiveness\n\ + adds r0, r6, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, 0xFF\n\ + bne _0819003A\n\ _081900A4:\n\ - ldr r0, [sp]\n\ - cmp r0, 0x1\n\ - beq _081900E0\n\ + ldr r0, [sp]\n\ + cmp r0, 0x1\n\ + beq _081900E0\n\ _081900AA:\n\ - ldr r1, [sp]\n\ - cmp r1, 0x1\n\ - bgt _081900BC\n\ - cmp r1, 0\n\ - beq _081900C4\n\ - b _08190154\n\ - .pool\n\ + ldr r1, [sp]\n\ + cmp r1, 0x1\n\ + bgt _081900BC\n\ + cmp r1, 0\n\ + beq _081900C4\n\ + b _08190154\n\ + .pool\n\ _081900BC:\n\ - ldr r0, [sp]\n\ - cmp r0, 0x2\n\ - beq _08190114\n\ - b _08190154\n\ + ldr r0, [sp]\n\ + cmp r0, 0x2\n\ + beq _08190114\n\ + b _08190154\n\ _081900C4:\n\ - cmp r2, 0xA\n\ - beq _08190146\n\ - cmp r2, 0xA\n\ - ble _08190146\n\ - cmp r2, 0x28\n\ - beq _0819014A\n\ - cmp r2, 0x28\n\ - bgt _081900DA\n\ - cmp r2, 0x14\n\ - beq _08190104\n\ - b _08190146\n\ + cmp r2, 0xA\n\ + beq _08190146\n\ + cmp r2, 0xA\n\ + ble _08190146\n\ + cmp r2, 0x28\n\ + beq _0819014A\n\ + cmp r2, 0x28\n\ + bgt _081900DA\n\ + cmp r2, 0x14\n\ + beq _08190104\n\ + b _08190146\n\ _081900DA:\n\ - cmp r2, 0x50\n\ - bne _08190146\n\ - b _08190100\n\ + cmp r2, 0x50\n\ + bne _08190146\n\ + b _08190100\n\ _081900E0:\n\ - cmp r2, 0xA\n\ - beq _08190104\n\ - cmp r2, 0xA\n\ - bgt _081900F2\n\ - cmp r2, 0\n\ - beq _08190100\n\ - cmp r2, 0x5\n\ - beq _0819014A\n\ - b _08190146\n\ + cmp r2, 0xA\n\ + beq _08190104\n\ + cmp r2, 0xA\n\ + bgt _081900F2\n\ + cmp r2, 0\n\ + beq _08190100\n\ + cmp r2, 0x5\n\ + beq _0819014A\n\ + b _08190146\n\ _081900F2:\n\ - cmp r2, 0x28\n\ - beq _08190108\n\ - cmp r2, 0x28\n\ - ble _08190146\n\ - cmp r2, 0x50\n\ - beq _0819010E\n\ - b _08190146\n\ + cmp r2, 0x28\n\ + beq _08190108\n\ + cmp r2, 0x28\n\ + ble _08190146\n\ + cmp r2, 0x50\n\ + beq _0819010E\n\ + b _08190146\n\ _08190100:\n\ - movs r2, 0x8\n\ - b _08190154\n\ + movs r2, 0x8\n\ + b _08190154\n\ _08190104:\n\ - movs r2, 0x2\n\ - b _08190154\n\ + movs r2, 0x2\n\ + b _08190154\n\ _08190108:\n\ - movs r2, 0x2\n\ - negs r2, r2\n\ - b _08190154\n\ + movs r2, 0x2\n\ + negs r2, r2\n\ + b _08190154\n\ _0819010E:\n\ - movs r2, 0x4\n\ - negs r2, r2\n\ - b _08190154\n\ + movs r2, 0x4\n\ + negs r2, r2\n\ + b _08190154\n\ _08190114:\n\ - cmp r2, 0xA\n\ - beq _08190146\n\ - cmp r2, 0xA\n\ - bgt _08190126\n\ - cmp r2, 0\n\ - beq _0819013A\n\ - cmp r2, 0x5\n\ - beq _08190140\n\ - b _08190146\n\ + cmp r2, 0xA\n\ + beq _08190146\n\ + cmp r2, 0xA\n\ + bgt _08190126\n\ + cmp r2, 0\n\ + beq _0819013A\n\ + cmp r2, 0x5\n\ + beq _08190140\n\ + b _08190146\n\ _08190126:\n\ - cmp r2, 0x28\n\ - beq _0819014E\n\ - cmp r2, 0x28\n\ - bgt _08190134\n\ - cmp r2, 0x14\n\ - beq _0819014A\n\ - b _08190146\n\ + cmp r2, 0x28\n\ + beq _0819014E\n\ + cmp r2, 0x28\n\ + bgt _08190134\n\ + cmp r2, 0x14\n\ + beq _0819014A\n\ + b _08190146\n\ _08190134:\n\ - cmp r2, 0x50\n\ - beq _08190152\n\ - b _08190146\n\ + cmp r2, 0x50\n\ + beq _08190152\n\ + b _08190146\n\ _0819013A:\n\ - movs r2, 0x10\n\ - negs r2, r2\n\ - b _08190154\n\ + movs r2, 0x10\n\ + negs r2, r2\n\ + b _08190154\n\ _08190140:\n\ - movs r2, 0x8\n\ - negs r2, r2\n\ - b _08190154\n\ + movs r2, 0x8\n\ + negs r2, r2\n\ + b _08190154\n\ _08190146:\n\ - movs r2, 0\n\ - b _08190154\n\ + movs r2, 0\n\ + b _08190154\n\ _0819014A:\n\ - movs r2, 0x4\n\ - b _08190154\n\ + movs r2, 0x4\n\ + b _08190154\n\ _0819014E:\n\ - movs r2, 0xC\n\ - b _08190154\n\ + movs r2, 0xC\n\ + b _08190154\n\ _08190152:\n\ - movs r2, 0x14\n\ + movs r2, 0x14\n\ _08190154:\n\ - adds r0, r2, 0\n\ + adds r0, r2, 0\n\ _08190156:\n\ - add sp, 0x8\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1\n\ + add sp, 0x8\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r1}\n\ + bx r1\n\ "); } #endif // NONMATCHING @@ -3434,14 +3434,14 @@ static s32 TournamentIdOfOpponent(s32 roundId, s32 trainerId) if (j != val) return gUnknown_0860D14C[j]; else - return INVALID_U8; + return 0xFF; } else { if (!gSaveBlock2Ptr->frontier.domeTrainers[sIdToOpponentId[i][roundId]].isEliminated) return sIdToOpponentId[i][roundId]; else - return INVALID_U8; + return 0xFF; } } @@ -3562,7 +3562,7 @@ static void sub_8190400(u8 taskId) SetVBlankCallback(VblankCb0_BattleDome); sBattleDomeStruct = AllocZeroed(sizeof(*sBattleDomeStruct)); for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) - sBattleDomeStruct->arr[i] |= INVALID_U8; + sBattleDomeStruct->arr[i] |= 0xFF; LoadMonIconPalettes(); i = CreateTask(sub_8190CD4, 0); gTasks[i].data[0] = 0; @@ -3624,7 +3624,7 @@ static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite) { if (sprite->pos1.y >= 192) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3644,7 +3644,7 @@ static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite) { if (sprite->pos1.y <= -32) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3664,7 +3664,7 @@ static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite) { if (sprite->pos1.x >= 272) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3684,7 +3684,7 @@ static void SpriteCb_TrainerIconCardScrollRight(struct Sprite *sprite) { if (sprite->pos1.x <= -32) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3714,7 +3714,7 @@ static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite) { if (sprite->pos1.y >= 176) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; sub_80D2EF8(sprite); } } @@ -3736,7 +3736,7 @@ static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite) { if (sprite->pos1.y <= -16) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; sub_80D2EF8(sprite); } } @@ -3758,7 +3758,7 @@ static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite) { if (sprite->pos1.x >= 256) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; sub_80D2EF8(sprite); } } @@ -3780,7 +3780,7 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite) { if (sprite->pos1.x <= -16) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; sub_80D2EF8(sprite); } } @@ -4005,7 +4005,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4016,7 +4016,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4029,7 +4029,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4040,7 +4040,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4121,7 +4121,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4132,7 +4132,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4145,7 +4145,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4156,7 +4156,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4204,7 +4204,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4215,7 +4215,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4228,7 +4228,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4239,7 +4239,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4287,7 +4287,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4298,7 +4298,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4311,7 +4311,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4322,7 +4322,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4368,7 +4368,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4379,7 +4379,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4392,7 +4392,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4403,7 +4403,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4451,7 +4451,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4462,7 +4462,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4475,7 +4475,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4486,7 +4486,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4556,12 +4556,12 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) FreeAndDestroyTrainerPicSprite(sBattleDomeStruct->arr[i]); } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) sub_80D2EF8(&gSprites[sBattleDomeStruct->arr[i]]); } } @@ -4569,12 +4569,12 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) FreeAndDestroyTrainerPicSprite(sBattleDomeStruct->arr[i]); } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) sub_80D2EF8(&gSprites[sBattleDomeStruct->arr[i]]); } } @@ -5483,13 +5483,13 @@ static u8 sub_8193BDC(u8 taskId) } else { - if (gMain.newKeys == DPAD_UP && gUnknown_0860CBF1[spriteId][roundId][0] != INVALID_U8) + if (gMain.newKeys == DPAD_UP && gUnknown_0860CBF1[spriteId][roundId][0] != 0xFF) arrId = 0; - else if (gMain.newKeys == DPAD_DOWN && gUnknown_0860CBF1[spriteId][roundId][1] != INVALID_U8) + else if (gMain.newKeys == DPAD_DOWN && gUnknown_0860CBF1[spriteId][roundId][1] != 0xFF) arrId = 1; - else if (gMain.newKeys == DPAD_LEFT && gUnknown_0860CBF1[spriteId][roundId][2] != INVALID_U8) + else if (gMain.newKeys == DPAD_LEFT && gUnknown_0860CBF1[spriteId][roundId][2] != 0xFF) arrId = 2; - else if (gMain.newKeys == DPAD_RIGHT && gUnknown_0860CBF1[spriteId][roundId][3] != INVALID_U8) + else if (gMain.newKeys == DPAD_RIGHT && gUnknown_0860CBF1[spriteId][roundId][3] != 0xFF) arrId = 3; } @@ -6204,58 +6204,58 @@ static void sub_8194F58(void) monLevel = 50; for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) - { - monTypesBits = 0; - statSums[i] = 0; - ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId); - for (j = 0; j < 3; j++) - { - CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species, - monLevel, ivs, - gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].evSpread, - gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].nature, - statValues); - - statSums[i] += statValues[STAT_ATK]; - statSums[i] += statValues[STAT_DEF]; - statSums[i] += statValues[STAT_SPATK]; - statSums[i] += statValues[STAT_SPDEF]; - statSums[i] += statValues[STAT_SPEED]; - statSums[i] += statValues[STAT_HP]; - monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type1]; - monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type2]; - } - - // Because GF hates temporary vars, trainerId acts like monTypesCount here. - for (trainerId = 0, j = 0; j < 32; j++) - { - if (monTypesBits & 1) - trainerId++; - monTypesBits >>= 1; - } - statSums[i] += (trainerId * monLevel) / 20; - } - - for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT - 1; i++) - { - for (j = i + 1; j < DOME_TOURNAMENT_TRAINERS_COUNT; j++) - { - if (statSums[i] < statSums[j]) - { - SwapDomeTrainers(i, j, statSums); - } - else if (statSums[i] == statSums[j]) - { + { + monTypesBits = 0; + statSums[i] = 0; + ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId); + for (j = 0; j < 3; j++) + { + CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species, + monLevel, ivs, + gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].evSpread, + gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].nature, + statValues); + + statSums[i] += statValues[STAT_ATK]; + statSums[i] += statValues[STAT_DEF]; + statSums[i] += statValues[STAT_SPATK]; + statSums[i] += statValues[STAT_SPDEF]; + statSums[i] += statValues[STAT_SPEED]; + statSums[i] += statValues[STAT_HP]; + monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type1]; + monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type2]; + } + + // Because GF hates temporary vars, trainerId acts like monTypesCount here. + for (trainerId = 0, j = 0; j < 32; j++) + { + if (monTypesBits & 1) + trainerId++; + monTypesBits >>= 1; + } + statSums[i] += (trainerId * monLevel) / 20; + } + + for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT - 1; i++) + { + for (j = i + 1; j < DOME_TOURNAMENT_TRAINERS_COUNT; j++) + { + if (statSums[i] < statSums[j]) + { + SwapDomeTrainers(i, j, statSums); + } + else if (statSums[i] == statSums[j]) + { if (gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId > gSaveBlock2Ptr->frontier.domeTrainers[j].trainerId) SwapDomeTrainers(i, j, statSums); - } - } - } + } + } + } - Free(statSums); - Free(statValues); + Free(statSums); + Free(statValues); - for (i = 0; i < 4; i++) + for (i = 0; i < 4; i++) DecideRoundWinners(i); gSaveBlock2Ptr->frontier.lvlMode = lvlMode; @@ -6314,21 +6314,21 @@ static void DecideRoundWinners(u8 roundId) tournamentId1 = i; tournamentId2 = TournamentIdOfOpponent(roundId, gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId); // Frontier Brain always wins, check tournamentId1. - if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId2 != INVALID_U8) + if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId2 != 0xFF) { gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].isEliminated = 1; gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].eliminatedAt = roundId; gSaveBlock2Ptr->frontier.field_EC0[tournamentId2] = GetWinningMove(tournamentId1, tournamentId2, roundId); } // Frontier Brain always wins, check tournamentId2. - else if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId1 != INVALID_U8) + else if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId1 != 0xFF) { gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].isEliminated = 1; gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].eliminatedAt = roundId; gSaveBlock2Ptr->frontier.field_EC0[tournamentId1] = GetWinningMove(tournamentId2, tournamentId1, roundId); } // Decide which one of two trainers wins! - else if (tournamentId2 != INVALID_U8) + else if (tournamentId2 != 0xFF) { // BUG: points1 and points2 are not cleared at the beginning of the loop resulting in not fair results. diff --git a/src/battle_factory.c b/src/battle_factory.c index dd82da746..1d7fbafc9 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -202,9 +202,9 @@ static void sub_81A5E94(void) gUnknown_03001288 = FALSE; for (i = 0; i < 6; i++) - gSaveBlock2Ptr->frontier.field_E70[i].monId |= INVALID_U16; + gSaveBlock2Ptr->frontier.field_E70[i].monId |= 0xFFFF; for (i = 0; i < 3; i++) - gUnknown_03006298[i] |= INVALID_U16; + gUnknown_03006298[i] |= 0xFFFF; saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); gTrainerBattleOpponent_A = 0; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 88dbb5360..8d7ed2dce 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -122,7 +122,7 @@ void FreeBattleSpritesData(void) u16 ChooseMoveAndTargetInBattlePalace(void) { s32 i, var1, var2; - s32 chosenMoveId = INVALID_S32; + s32 chosenMoveId = -1; struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]); u8 unusableMovesBits = CheckMoveLimitations(gActiveBattler, 0, 0xFF); s32 percent = Random() % 100; diff --git a/src/battle_interface.c b/src/battle_interface.c index fd6d2a0ab..9fd8e116a 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -543,11 +543,11 @@ enum static const u16 sStatusIconColors[] = { - RGB(24, 12, 24), // PAL_STATUS_PSN - RGB(23, 23, 3), // PAL_STATUS_PAR - RGB(20, 20, 17), // PAL_STATUS_SLP - RGB(17, 22, 28), // PAL_STATUS_FRZ - RGB(28, 14, 10) // PAL_STATUS_BRN + [PAL_STATUS_PSN] = RGB(24, 12, 24), + [PAL_STATUS_PAR] = RGB(23, 23, 3), + [PAL_STATUS_SLP] = RGB(20, 20, 17), + [PAL_STATUS_FRZ] = RGB(17, 22, 28), + [PAL_STATUS_BRN] = RGB(28, 14, 10), }; static const struct WindowTemplate sHealthboxWindowTemplate = {0, 0, 0, 8, 2, 0, 0}; // width = 8, height = 2 @@ -589,17 +589,17 @@ static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2) for (; i > -1; i--) { - array[i] = INVALID_U8; + array[i] = 0xFF; } - if (arrayPtr[3] == INVALID_U8) + if (arrayPtr[3] == 0xFF) arrayPtr[3] = 0; if (arg2 == 0) { for (i = 0, j = 0; i < 4; i++) { - if (array[j] == INVALID_U8) + if (array[j] == 0xFF) { arg1[j] &= 0xFC00; arg1[j] |= 0x1E; @@ -622,7 +622,7 @@ static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2) { for (i = 0; i < 4; i++) { - if (array[i] == INVALID_U8) + if (array[i] == 0xFF) { arg1[i] &= 0xFC00; arg1[i] |= 0x1E; @@ -647,225 +647,225 @@ NAKED static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2) { asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x4\n\ - adds r7, r1, 0\n\ - lsls r0, 16\n\ - lsrs r5, r0, 16\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - mov r10, r2\n\ - movs r3, 0\n\ - movs r2, 0\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x4\n\ + adds r7, r1, 0\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + lsls r2, 24\n\ + lsrs r2, 24\n\ + mov r10, r2\n\ + movs r3, 0\n\ + movs r2, 0\n\ _08072324:\n\ - lsls r0, r3, 24\n\ - asrs r0, 24\n\ - mov r3, sp\n\ - adds r1, r3, r0\n\ - strb r2, [r1]\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r3, r0, 24\n\ - asrs r0, 24\n\ - cmp r0, 0x3\n\ - ble _08072324\n\ - movs r3, 0x3\n\ - movs r0, 0x1\n\ - negs r0, r0\n\ - mov r9, r0\n\ - mov r8, sp\n\ + lsls r0, r3, 24\n\ + asrs r0, 24\n\ + mov r3, sp\n\ + adds r1, r3, r0\n\ + strb r2, [r1]\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r3, r0, 24\n\ + asrs r0, 24\n\ + cmp r0, 0x3\n\ + ble _08072324\n\ + movs r3, 0x3\n\ + movs r0, 0x1\n\ + negs r0, r0\n\ + mov r9, r0\n\ + mov r8, sp\n\ _08072344:\n\ - lsls r0, r5, 16\n\ - asrs r6, r0, 16\n\ - cmp r6, 0\n\ - ble _08072372\n\ - lsls r4, r3, 24\n\ - asrs r4, 24\n\ - mov r1, sp\n\ - adds r5, r1, r4\n\ - adds r0, r6, 0\n\ - movs r1, 0xA\n\ - bl __modsi3\n\ - strb r0, [r5]\n\ - adds r0, r6, 0\n\ - movs r1, 0xA\n\ - bl __divsi3\n\ - lsls r0, 16\n\ - lsrs r5, r0, 16\n\ - subs r4, 0x1\n\ - lsls r4, 24\n\ - lsrs r3, r4, 24\n\ - b _08072344\n\ + lsls r0, r5, 16\n\ + asrs r6, r0, 16\n\ + cmp r6, 0\n\ + ble _08072372\n\ + lsls r4, r3, 24\n\ + asrs r4, 24\n\ + mov r1, sp\n\ + adds r5, r1, r4\n\ + adds r0, r6, 0\n\ + movs r1, 0xA\n\ + bl __modsi3\n\ + strb r0, [r5]\n\ + adds r0, r6, 0\n\ + movs r1, 0xA\n\ + bl __divsi3\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + subs r4, 0x1\n\ + lsls r4, 24\n\ + lsrs r3, r4, 24\n\ + b _08072344\n\ _08072372:\n\ - lsls r1, r3, 24\n\ - asrs r0, r1, 24\n\ - cmp r0, r9\n\ - ble _08072396\n\ - movs r4, 0xFF\n\ - movs r3, 0x1\n\ - negs r3, r3\n\ + lsls r1, r3, 24\n\ + asrs r0, r1, 24\n\ + cmp r0, r9\n\ + ble _08072396\n\ + movs r4, 0xFF\n\ + movs r3, 0x1\n\ + negs r3, r3\n\ _08072380:\n\ - asrs r2, r1, 24\n\ - mov r5, sp\n\ - adds r1, r5, r2\n\ - ldrb r0, [r1]\n\ - orrs r0, r4\n\ - strb r0, [r1]\n\ - subs r2, 0x1\n\ - lsls r1, r2, 24\n\ - asrs r0, r1, 24\n\ - cmp r0, r3\n\ - bgt _08072380\n\ + asrs r2, r1, 24\n\ + mov r5, sp\n\ + adds r1, r5, r2\n\ + ldrb r0, [r1]\n\ + orrs r0, r4\n\ + strb r0, [r1]\n\ + subs r2, 0x1\n\ + lsls r1, r2, 24\n\ + asrs r0, r1, 24\n\ + cmp r0, r3\n\ + bgt _08072380\n\ _08072396:\n\ - mov r1, r8\n\ - ldrb r0, [r1, 0x3]\n\ - cmp r0, 0xFF\n\ - bne _080723A2\n\ - movs r0, 0\n\ - strb r0, [r1, 0x3]\n\ + mov r1, r8\n\ + ldrb r0, [r1, 0x3]\n\ + cmp r0, 0xFF\n\ + bne _080723A2\n\ + movs r0, 0\n\ + strb r0, [r1, 0x3]\n\ _080723A2:\n\ - mov r2, r10\n\ - cmp r2, 0\n\ - bne _08072432\n\ - movs r3, 0\n\ - movs r1, 0\n\ - movs r6, 0xFC\n\ - lsls r6, 8\n\ - movs r5, 0x1E\n\ - mov r12, r5\n\ + mov r2, r10\n\ + cmp r2, 0\n\ + bne _08072432\n\ + movs r3, 0\n\ + movs r1, 0\n\ + movs r6, 0xFC\n\ + lsls r6, 8\n\ + movs r5, 0x1E\n\ + mov r12, r5\n\ _080723B4:\n\ - lsls r1, 24\n\ - asrs r2, r1, 24\n\ - mov r0, sp\n\ - adds r5, r0, r2\n\ - ldrb r0, [r5]\n\ - mov r8, r1\n\ - cmp r0, 0xFF\n\ - bne _080723EA\n\ - lsls r1, r2, 1\n\ - adds r1, r7\n\ - ldrh r2, [r1]\n\ - adds r0, r6, 0\n\ - ands r0, r2\n\ - mov r2, r12\n\ - orrs r0, r2\n\ - strh r0, [r1]\n\ - lsls r3, 24\n\ - asrs r1, r3, 23\n\ - adds r1, r7\n\ - adds r1, 0x40\n\ - ldrh r2, [r1]\n\ - adds r0, r6, 0\n\ - ands r0, r2\n\ - mov r5, r12\n\ - orrs r0, r5\n\ - strh r0, [r1]\n\ - b _0807241A\n\ + lsls r1, 24\n\ + asrs r2, r1, 24\n\ + mov r0, sp\n\ + adds r5, r0, r2\n\ + ldrb r0, [r5]\n\ + mov r8, r1\n\ + cmp r0, 0xFF\n\ + bne _080723EA\n\ + lsls r1, r2, 1\n\ + adds r1, r7\n\ + ldrh r2, [r1]\n\ + adds r0, r6, 0\n\ + ands r0, r2\n\ + mov r2, r12\n\ + orrs r0, r2\n\ + strh r0, [r1]\n\ + lsls r3, 24\n\ + asrs r1, r3, 23\n\ + adds r1, r7\n\ + adds r1, 0x40\n\ + ldrh r2, [r1]\n\ + adds r0, r6, 0\n\ + ands r0, r2\n\ + mov r5, r12\n\ + orrs r0, r5\n\ + strh r0, [r1]\n\ + b _0807241A\n\ _080723EA:\n\ - lsls r2, 1\n\ - adds r2, r7\n\ - ldrh r0, [r2]\n\ - adds r1, r6, 0\n\ - ands r1, r0\n\ - ldrb r0, [r5]\n\ - adds r0, 0x14\n\ - orrs r1, r0\n\ - strh r1, [r2]\n\ - lsls r4, r3, 24\n\ - asrs r3, r4, 24\n\ - lsls r2, r3, 1\n\ - adds r2, r7\n\ - adds r2, 0x40\n\ - ldrh r0, [r2]\n\ - adds r1, r6, 0\n\ - ands r1, r0\n\ - mov r5, sp\n\ - adds r0, r5, r3\n\ - ldrb r0, [r0]\n\ - adds r0, 0x34\n\ - orrs r1, r0\n\ - strh r1, [r2]\n\ - adds r3, r4, 0\n\ + lsls r2, 1\n\ + adds r2, r7\n\ + ldrh r0, [r2]\n\ + adds r1, r6, 0\n\ + ands r1, r0\n\ + ldrb r0, [r5]\n\ + adds r0, 0x14\n\ + orrs r1, r0\n\ + strh r1, [r2]\n\ + lsls r4, r3, 24\n\ + asrs r3, r4, 24\n\ + lsls r2, r3, 1\n\ + adds r2, r7\n\ + adds r2, 0x40\n\ + ldrh r0, [r2]\n\ + adds r1, r6, 0\n\ + ands r1, r0\n\ + mov r5, sp\n\ + adds r0, r5, r3\n\ + ldrb r0, [r0]\n\ + adds r0, 0x34\n\ + orrs r1, r0\n\ + strh r1, [r2]\n\ + adds r3, r4, 0\n\ _0807241A:\n\ - movs r0, 0x80\n\ - lsls r0, 17\n\ - add r0, r8\n\ - lsrs r1, r0, 24\n\ - movs r2, 0x80\n\ - lsls r2, 17\n\ - adds r0, r3, r2\n\ - lsrs r3, r0, 24\n\ - asrs r0, 24\n\ - cmp r0, 0x3\n\ - ble _080723B4\n\ - b _08072496\n\ + movs r0, 0x80\n\ + lsls r0, 17\n\ + add r0, r8\n\ + lsrs r1, r0, 24\n\ + movs r2, 0x80\n\ + lsls r2, 17\n\ + adds r0, r3, r2\n\ + lsrs r3, r0, 24\n\ + asrs r0, 24\n\ + cmp r0, 0x3\n\ + ble _080723B4\n\ + b _08072496\n\ _08072432:\n\ - movs r3, 0\n\ - movs r4, 0xFC\n\ - lsls r4, 8\n\ - movs r6, 0x1E\n\ + movs r3, 0\n\ + movs r4, 0xFC\n\ + lsls r4, 8\n\ + movs r6, 0x1E\n\ _0807243A:\n\ - lsls r1, r3, 24\n\ - asrs r2, r1, 24\n\ - mov r3, sp\n\ - adds r5, r3, r2\n\ - ldrb r0, [r5]\n\ - adds r3, r1, 0\n\ - cmp r0, 0xFF\n\ - bne _08072466\n\ - lsls r1, r2, 1\n\ - adds r1, r7\n\ - ldrh r2, [r1]\n\ - adds r0, r4, 0\n\ - ands r0, r2\n\ - orrs r0, r6\n\ - strh r0, [r1]\n\ - adds r1, 0x40\n\ - ldrh r2, [r1]\n\ - adds r0, r4, 0\n\ - ands r0, r2\n\ - orrs r0, r6\n\ - strh r0, [r1]\n\ - b _08072488\n\ + lsls r1, r3, 24\n\ + asrs r2, r1, 24\n\ + mov r3, sp\n\ + adds r5, r3, r2\n\ + ldrb r0, [r5]\n\ + adds r3, r1, 0\n\ + cmp r0, 0xFF\n\ + bne _08072466\n\ + lsls r1, r2, 1\n\ + adds r1, r7\n\ + ldrh r2, [r1]\n\ + adds r0, r4, 0\n\ + ands r0, r2\n\ + orrs r0, r6\n\ + strh r0, [r1]\n\ + adds r1, 0x40\n\ + ldrh r2, [r1]\n\ + adds r0, r4, 0\n\ + ands r0, r2\n\ + orrs r0, r6\n\ + strh r0, [r1]\n\ + b _08072488\n\ _08072466:\n\ - lsls r2, 1\n\ - adds r2, r7\n\ - ldrh r0, [r2]\n\ - adds r1, r4, 0\n\ - ands r1, r0\n\ - ldrb r0, [r5]\n\ - adds r0, 0x14\n\ - orrs r1, r0\n\ - strh r1, [r2]\n\ - adds r2, 0x40\n\ - ldrh r0, [r2]\n\ - adds r1, r4, 0\n\ - ands r1, r0\n\ - ldrb r0, [r5]\n\ - adds r0, 0x34\n\ - orrs r1, r0\n\ - strh r1, [r2]\n\ + lsls r2, 1\n\ + adds r2, r7\n\ + ldrh r0, [r2]\n\ + adds r1, r4, 0\n\ + ands r1, r0\n\ + ldrb r0, [r5]\n\ + adds r0, 0x14\n\ + orrs r1, r0\n\ + strh r1, [r2]\n\ + adds r2, 0x40\n\ + ldrh r0, [r2]\n\ + adds r1, r4, 0\n\ + ands r1, r0\n\ + ldrb r0, [r5]\n\ + adds r0, 0x34\n\ + orrs r1, r0\n\ + strh r1, [r2]\n\ _08072488:\n\ - movs r5, 0x80\n\ - lsls r5, 17\n\ - adds r0, r3, r5\n\ - lsrs r3, r0, 24\n\ - asrs r0, 24\n\ - cmp r0, 0x3\n\ - ble _0807243A\n\ + movs r5, 0x80\n\ + lsls r5, 17\n\ + adds r0, r3, r5\n\ + lsrs r3, r0, 24\n\ + asrs r0, 24\n\ + cmp r0, 0x3\n\ + ble _0807243A\n\ _08072496:\n\ - add sp, 0x4\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ + add sp, 0x4\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ .syntax divided"); } @@ -1580,7 +1580,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (i = 0; i < PARTY_SIZE; i++) { - if (partyInfo[i].hp == INVALID_U16) // empty slot or an egg + if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg { gSprites[ballIconSpritesIds[i]].oam.tileNum += 1; gSprites[ballIconSpritesIds[i]].data[7] = 1; @@ -1599,7 +1599,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (i = 0, var = 5, j = 0; j < PARTY_SIZE; j++) { - if (partyInfo[j].hp == INVALID_U16) // empty slot or an egg + if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg { gSprites[ballIconSpritesIds[var]].oam.tileNum += 1; gSprites[ballIconSpritesIds[var]].data[7] = 1; @@ -1628,7 +1628,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (var = 5, i = 0; i < PARTY_SIZE; i++) { - if (partyInfo[i].hp == INVALID_U16) // empty slot or an egg + if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg { gSprites[ballIconSpritesIds[var]].oam.tileNum += 1; gSprites[ballIconSpritesIds[var]].data[7] = 1; @@ -1648,7 +1648,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (var = 0, i = 0, j = 0; j < PARTY_SIZE; j++) { - if (partyInfo[j].hp == INVALID_U16) // empty slot or an egg + if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg { gSprites[ballIconSpritesIds[i]].oam.tileNum += 1; gSprites[ballIconSpritesIds[i]].data[7] = 1; @@ -1765,7 +1765,7 @@ static void sub_8073E64(u8 taskId) s32 i; u8 battlerId = gTasks[taskId].tBattler; - if (--gTasks[taskId].tData15 == INVALID_S16) + if (--gTasks[taskId].tData15 == -1) { u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; @@ -1808,7 +1808,7 @@ static void sub_8073F98(u8 taskId) { SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].tData15) | ((16 - gTasks[taskId].tData15) << 8)); } - else if (gTasks[taskId].tData15 == INVALID_S16) + else if (gTasks[taskId].tData15 == -1) { u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; @@ -2289,7 +2289,7 @@ s32 MoveBattleBar(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 unused) if (whichBar == EXP_BAR || (whichBar == HEALTH_BAR && !gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars)) MoveBattleBarGraphically(battlerId, whichBar); - if (currentBarValue == INVALID_S32) + if (currentBarValue == -1) gBattleSpritesDataPtr->battleBars[battlerId].currValue = 0; return currentBarValue; @@ -2376,12 +2376,12 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c if (maxValue < scale) { if (newValue == Q_24_8_TO_INT(*currValue) && (*currValue & 0xFF) == 0) - return INVALID_S32; + return -1; } else { if (newValue == *currValue) // we're done, the bar's value has been updated - return INVALID_S32; + return -1; } if (maxValue < scale) // handle cases of max var having less pixels than the whole bar @@ -2403,7 +2403,7 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c *currValue -= toAdd; ret = Q_24_8_TO_INT(*currValue); // try round up - if ((*currValue & INVALID_U8) > 0) + if ((*currValue & 0xFF) > 0) ret++; if (ret <= newValue) { diff --git a/src/battle_main.c b/src/battle_main.c index 19e85f1cf..9410946f6 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -500,7 +500,7 @@ const struct TrainerMoney gTrainerMoneyTable[] = {TRAINER_CLASS_HIKER, 10}, {TRAINER_CLASS_YOUNG_COUPLE, 8}, {TRAINER_CLASS_WINSTRATE, 10}, - {INVALID_U8, 5}, + {0xFF, 5}, }; #include "data/text/abilities.h" @@ -2251,7 +2251,7 @@ static void sub_8038F34(void) ShowBg(0); ShowBg(1); ShowBg(2); - gBattleCommunication[1] = INVALID_U8; + gBattleCommunication[1] = 0xFF; gBattleCommunication[MULTIUSE_STATE]++; break; case 1: @@ -2993,7 +2993,7 @@ static void BattleStartClearSetData(void) gLastLandedMoves[i] = 0; gLastHitByType[i] = 0; gLastResultingMoves[i] = 0; - gLastHitBy[i] = INVALID_U8; + gLastHitBy[i] = 0xFF; gLockedMoves[i] = 0; gLastPrintedMoves[i] = 0; gBattleResources->flags->flags[i] = 0; @@ -3161,7 +3161,7 @@ void SwitchInClearSetData(void) gLastHitByType[gActiveBattler] = 0; gLastResultingMoves[gActiveBattler] = 0; gLastPrintedMoves[gActiveBattler] = 0; - gLastHitBy[gActiveBattler] = INVALID_U8; + gLastHitBy[gActiveBattler] = 0xFF; *(gBattleStruct->lastTakenMove + gActiveBattler * 2 + 0) = 0; *(gBattleStruct->lastTakenMove + gActiveBattler * 2 + 1) = 0; @@ -3192,7 +3192,7 @@ void SwitchInClearSetData(void) gBattleResources->flags->flags[gActiveBattler] = 0; gCurrentMove = 0; - gBattleStruct->field_DA = INVALID_U8; + gBattleStruct->field_DA = 0xFF; ClearBattlerMoveHistory(gActiveBattler); ClearBattlerAbilityHistory(gActiveBattler); @@ -3253,7 +3253,7 @@ void FaintClearSetData(void) gLastHitByType[gActiveBattler] = 0; gLastResultingMoves[gActiveBattler] = 0; gLastPrintedMoves[gActiveBattler] = 0; - gLastHitBy[gActiveBattler] = INVALID_U8; + gLastHitBy[gActiveBattler] = 0xFF; *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 0) = 0; *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 1) = 0; @@ -3440,7 +3440,7 @@ static void BattleIntroDrawPartySummaryScreens(void) if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatus[i].hp = INVALID_U16; + hpStatus[i].hp = 0xFFFF; hpStatus[i].status = 0; } else @@ -3458,7 +3458,7 @@ static void BattleIntroDrawPartySummaryScreens(void) if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatus[i].hp = INVALID_U16; + hpStatus[i].hp = 0xFFFF; hpStatus[i].status = 0; } else @@ -3484,7 +3484,7 @@ static void BattleIntroDrawPartySummaryScreens(void) if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatus[i].hp = INVALID_U16; + hpStatus[i].hp = 0xFFFF; hpStatus[i].status = 0; } else @@ -3610,85 +3610,85 @@ NAKED static void BattleIntroOpponent1SendsOutMonAnimation(void) { asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - ldr r0, =gBattleTypeFlags\n\ - ldr r2, [r0]\n\ - movs r0, 0x80\n\ - lsls r0, 17\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - beq _0803B298\n\ - movs r0, 0x80\n\ - lsls r0, 18\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - beq _0803B298\n\ - movs r1, 0x80\n\ - lsls r1, 24\n\ - ands r1, r2\n\ - negs r0, r1\n\ - orrs r0, r1\n\ - lsrs r5, r0, 31\n\ - b _0803B29A\n\ - .pool\n\ + push {r4-r6,lr}\n\ + ldr r0, =gBattleTypeFlags\n\ + ldr r2, [r0]\n\ + movs r0, 0x80\n\ + lsls r0, 17\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0803B298\n\ + movs r0, 0x80\n\ + lsls r0, 18\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0803B298\n\ + movs r1, 0x80\n\ + lsls r1, 24\n\ + ands r1, r2\n\ + negs r0, r1\n\ + orrs r0, r1\n\ + lsrs r5, r0, 31\n\ + b _0803B29A\n\ + .pool\n\ _0803B288:\n\ - ldr r1, =gBattleMainFunc\n\ - ldr r0, =BattleIntroOpponent2SendsOutMonAnimation\n\ - b _0803B2F0\n\ - .pool\n\ + ldr r1, =gBattleMainFunc\n\ + ldr r0, =BattleIntroOpponent2SendsOutMonAnimation\n\ + b _0803B2F0\n\ + .pool\n\ _0803B298:\n\ - movs r5, 0x1\n\ + movs r5, 0x1\n\ _0803B29A:\n\ - ldr r0, =gBattleControllerExecFlags\n\ - ldr r2, [r0]\n\ - cmp r2, 0\n\ - bne _0803B2F2\n\ - ldr r0, =gActiveBattler\n\ - strb r2, [r0]\n\ - ldr r1, =gBattlersCount\n\ - adds r4, r0, 0\n\ - ldrb r1, [r1]\n\ - cmp r2, r1\n\ - bcs _0803B2EC\n\ - adds r6, r4, 0\n\ + ldr r0, =gBattleControllerExecFlags\n\ + ldr r2, [r0]\n\ + cmp r2, 0\n\ + bne _0803B2F2\n\ + ldr r0, =gActiveBattler\n\ + strb r2, [r0]\n\ + ldr r1, =gBattlersCount\n\ + adds r4, r0, 0\n\ + ldrb r1, [r1]\n\ + cmp r2, r1\n\ + bcs _0803B2EC\n\ + adds r6, r4, 0\n\ _0803B2B2:\n\ - ldrb r0, [r4]\n\ - bl GetBattlerPosition\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, r5\n\ - bne _0803B2D8\n\ - movs r0, 0\n\ - bl BtlController_EmitIntroTrainerBallThrow\n\ - ldrb r0, [r4]\n\ - bl MarkBattlerForControllerExec\n\ - ldr r0, =gBattleTypeFlags\n\ - ldr r0, [r0]\n\ - ldr r1, =0x00008040\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0803B288\n\ + ldrb r0, [r4]\n\ + bl GetBattlerPosition\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + cmp r0, r5\n\ + bne _0803B2D8\n\ + movs r0, 0\n\ + bl BtlController_EmitIntroTrainerBallThrow\n\ + ldrb r0, [r4]\n\ + bl MarkBattlerForControllerExec\n\ + ldr r0, =gBattleTypeFlags\n\ + ldr r0, [r0]\n\ + ldr r1, =0x00008040\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0803B288\n\ _0803B2D8:\n\ - ldrb r0, [r6]\n\ - adds r0, 0x1\n\ - strb r0, [r6]\n\ - ldr r1, =gBattlersCount\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - ldr r4, =gActiveBattler\n\ - ldrb r1, [r1]\n\ - cmp r0, r1\n\ - bcc _0803B2B2\n\ + ldrb r0, [r6]\n\ + adds r0, 0x1\n\ + strb r0, [r6]\n\ + ldr r1, =gBattlersCount\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + ldr r4, =gActiveBattler\n\ + ldrb r1, [r1]\n\ + cmp r0, r1\n\ + bcc _0803B2B2\n\ _0803B2EC:\n\ - ldr r1, =gBattleMainFunc\n\ - ldr r0, =BattleIntroRecordMonsToDex\n\ + ldr r1, =gBattleMainFunc\n\ + ldr r0, =BattleIntroRecordMonsToDex\n\ _0803B2F0:\n\ - str r0, [r1]\n\ + str r0, [r1]\n\ _0803B2F2:\n\ - pop {r4-r6}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ + pop {r4-r6}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ .syntax divided"); } #endif // NONMATCHING @@ -3991,7 +3991,7 @@ void BattleTurnPassed(void) return; } - if (gBattleResults.battleTurnCounter < INVALID_U8) + if (gBattleResults.battleTurnCounter < 0xFF) { gBattleResults.battleTurnCounter++; gBattleStruct->field_DA++; @@ -4375,7 +4375,7 @@ static void HandleTurnActionSelectionState(void) return; default: sub_818603C(2); - if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == INVALID_U16) + if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == 0xFFFF) { gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; RecordedBattle_ClearBattlerAction(gActiveBattler, 1); @@ -4591,10 +4591,10 @@ static void sub_803CDF8(void) void SwapTurnOrder(u8 id1, u8 id2) { - u32 temp; + u32 temp; - SWAP(gActionsByTurnOrder[id1], gActionsByTurnOrder[id2], temp); - SWAP(gBattlerByTurnOrder[id1], gBattlerByTurnOrder[id2], temp); + SWAP(gActionsByTurnOrder[id1], gActionsByTurnOrder[id2], temp); + SWAP(gBattlerByTurnOrder[id1], gBattlerByTurnOrder[id2], temp); } u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) @@ -5740,7 +5740,7 @@ static void HandleAction_ThrowPokeblock(void) gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBattlerAttacker][1] - 1; gLastUsedItem = gBattleBufferB[gBattlerAttacker][2]; - if (gBattleResults.pokeblockThrows < INVALID_U8) + if (gBattleResults.pokeblockThrows < 0xFF) gBattleResults.pokeblockThrows++; if (gBattleStruct->safariPkblThrowCounter < 3) gBattleStruct->safariPkblThrowCounter++; diff --git a/src/battle_message.c b/src/battle_message.c index c483740f6..c5acf75c0 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1156,7 +1156,7 @@ const u16 gCaughtMonStringIds[] = const u16 gTrappingMoves[] = { - MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, INVALID_U16 + MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, 0xFFFF }; const u8 gText_PkmnIsEvolving[] = _("What?\n{STR_VAR_1} is evolving!"); @@ -1299,14 +1299,14 @@ static const u8 sText_RefCommenceBattle[] = _("REFEREE: {B_PLAYER_MON1_NAME} VS const u8 * const gRefereeStringsTable[] = { sText_RefIfNothingIsDecided, - sText_RefThatsIt, - sText_RefJudgeMind, - sText_RefJudgeSkill, - sText_RefJudgeBody, - sText_RefJudgement1, - sText_RefJudgement2, - sText_RefJudgement3, - sText_RefCommenceBattle, + sText_RefThatsIt, + sText_RefJudgeMind, + sText_RefJudgeSkill, + sText_RefJudgeBody, + sText_RefJudgement1, + sText_RefJudgement2, + sText_RefJudgement3, + sText_RefCommenceBattle, }; static const u8 sText_QuestionForfeitMatch[] = _("Would you like to forfeit the match\nand quit now?"); @@ -1368,574 +1368,574 @@ static const u8 sDummyWeirdStatusString[] = {EOS, EOS, EOS, EOS, EOS, EOS, EOS, static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = { // The corresponding WindowTemplate is gStandardBattleWindowTemplates[] within src/battle_bg.c - { // 0 Standard battle message - .fillValue = 0xFF, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 1, - .fgColor = 1, - .bgColor = 15, - .shadowColor = 6, - }, - { // 1 "What will (pokemon) do?" - .fillValue = 0xFF, - .fontId = 1, - .x = 1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 15, - .shadowColor = 6, - }, - { // 2 "Fight/Pokemon/Bag/Run" - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 3 Top left move - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 4 Top right move - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 5 Bottom left move - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 6 Bottom right move - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 7 "PP" - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 12, - .bgColor = 14, - .shadowColor = 11, - }, - { // 8 - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 9 PP remaining - .fillValue = 0xEE, - .fontId = 1, - .x = 2, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 12, - .bgColor = 14, - .shadowColor = 11, - }, - { // 10 "type" - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 11 "switch which?" - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 12 "gText_BattleYesNoChoice" - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 13 - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 14 - .fillValue = 0x0, - .fontId = 1, - .x = 32, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 0, - .shadowColor = 2, - }, - { // 15 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 16 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 17 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 18 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 19 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 20 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 21 - .fillValue = 0x0, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 0, - .shadowColor = 6, - }, - { // 22 - .fillValue = 0x0, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 0, - .shadowColor = 6, - }, - { // 23 - .fillValue = 0x0, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 0, - .shadowColor = 6, - }, + { // 0 Standard battle message + .fillValue = 0xFF, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 1, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 1 "What will (pokemon) do?" + .fillValue = 0xFF, + .fontId = 1, + .x = 1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 2 "Fight/Pokemon/Bag/Run" + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 3 Top left move + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 4 Top right move + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 5 Bottom left move + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 6 Bottom right move + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 7 "PP" + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 8 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 9 PP remaining + .fillValue = 0xEE, + .fontId = 1, + .x = 2, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 10 "type" + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 11 "switch which?" + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 12 "gText_BattleYesNoChoice" + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 13 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 14 + .fillValue = 0x0, + .fontId = 1, + .x = 32, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 2, + }, + { // 15 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 16 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 17 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 18 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 19 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 20 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 21 + .fillValue = 0x0, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 6, + }, + { // 22 + .fillValue = 0x0, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 6, + }, + { // 23 + .fillValue = 0x0, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 6, + }, }; static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = { - { // 0 - .fillValue = 0xFF, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 1, - .fgColor = 1, - .bgColor = 15, - .shadowColor = 6, - }, - { // 1 - .fillValue = 0xFF, - .fontId = 1, - .x = 1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 15, - .shadowColor = 6, - }, - { // 2 - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 3 - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 4 - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 5 - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 6 - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 7 - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 12, - .bgColor = 14, - .shadowColor = 11, - }, - { // 8 - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 9 - .fillValue = 0xEE, - .fontId = 1, - .x = 2, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 12, - .bgColor = 14, - .shadowColor = 11, - }, - { // 10 - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 11 - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 12 - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 13 - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 14 - .fillValue = 0x0, - .fontId = 1, - .x = 32, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 0, - .shadowColor = 2, - }, - { // 15 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 14, - .shadowColor = 15, - }, - { // 16 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 17 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 18 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 19 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 20 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 21 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 22 - .fillValue = 0x11, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 1, - .fgColor = 2, - .bgColor = 1, - .shadowColor = 3, - }, + { // 0 + .fillValue = 0xFF, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 1, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 1 + .fillValue = 0xFF, + .fontId = 1, + .x = 1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 2 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 3 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 4 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 5 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 6 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 7 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 8 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 9 + .fillValue = 0xEE, + .fontId = 1, + .x = 2, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 10 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 11 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 12 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 13 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 14 + .fillValue = 0x0, + .fontId = 1, + .x = 32, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 2, + }, + { // 15 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 14, + .shadowColor = 15, + }, + { // 16 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 17 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 18 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 19 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 20 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 21 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 22 + .fillValue = 0x11, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 1, + .fgColor = 2, + .bgColor = 1, + .shadowColor = 3, + }, }; static const struct BattleWindowText *const sBattleTextOnWindowsInfo[] = @@ -2967,7 +2967,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) printerTemplate.bgColor = textInfo[windowId].bgColor; printerTemplate.shadowColor = textInfo[windowId].shadowColor; - if (printerTemplate.x == INVALID_U8) + if (printerTemplate.x == 0xFF) { u32 width = sub_80397C4(gBattleScripting.windowsType, windowId); s32 alignX = GetStringCenterAlignXOffsetWithLetterSpacing(printerTemplate.fontId, printerTemplate.currentChar, width, printerTemplate.letterSpacing); diff --git a/src/battle_pike.c b/src/battle_pike.c index 590fd3d74..d86677e48 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -1228,7 +1228,7 @@ static void sub_81A7E60(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) static bool8 sub_81A7EC4(void) { - if (FindTaskIdByFunc(sub_81A7D54) == INVALID_U8) + if (FindTaskIdByFunc(sub_81A7D54) == 0xFF) return TRUE; else return FALSE; @@ -1448,7 +1448,7 @@ static void sub_81A84B4(void) u8 i; for (i = 0; i < 14; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16; + gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF; } static void sub_81A84EC(void) diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 36c757c93..f27af2615 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -1541,7 +1541,7 @@ void sub_81AA1D8(void) u8 var0, var1; for (i = 0; i < 8; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16; + gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF; id = sub_81AA9E4(); sub_81AA33C(&var0, &var1); diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 8b3a509b9..8a6348522 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -388,11 +388,11 @@ void sub_81C4F98(u8 a0, void (*callback)(void)) gPyramidBagCursorData.callback = callback; gPyramidBagResources->callback2 = NULL; - gPyramidBagResources->unk814 = INVALID_U8; - gPyramidBagResources->scrollIndicatorsTaskId = INVALID_U8; + gPyramidBagResources->unk814 = 0xFF; + gPyramidBagResources->scrollIndicatorsTaskId = 0xFF; - memset(gPyramidBagResources->itemsSpriteIds, INVALID_U8, sizeof(gPyramidBagResources->itemsSpriteIds)); - memset(gPyramidBagResources->windowIds, INVALID_U8, sizeof(gPyramidBagResources->windowIds)); + memset(gPyramidBagResources->itemsSpriteIds, 0xFF, sizeof(gPyramidBagResources->itemsSpriteIds)); + memset(gPyramidBagResources->windowIds, 0xFF, sizeof(gPyramidBagResources->windowIds)); SetMainCallback2(sub_81C504C); } @@ -604,7 +604,7 @@ static void PyramidBagMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen PlaySE(SE_SELECT); sub_81C6F20(); } - if (gPyramidBagResources->unk814 == INVALID_U8) + if (gPyramidBagResources->unk814 == 0xFF) { sub_81C6FF8(gPyramidBagResources->unk815 ^ 1); if (itemIndex != LIST_B_PRESSED) @@ -622,7 +622,7 @@ static void PrintItemQuantity(u8 windowId, s32 itemIndex, u8 y) if (itemIndex == LIST_B_PRESSED) return; - if (gPyramidBagResources->unk814 != INVALID_U8) + if (gPyramidBagResources->unk814 != 0xFF) { if (gPyramidBagResources->unk814 == (u8)(itemIndex)) sub_81C5AB8(y, 1); @@ -657,16 +657,16 @@ static void PrintItemDescription(s32 listMenuId) static void AddScrollArrow(void) { - if (gPyramidBagResources->scrollIndicatorsTaskId == INVALID_U8) + if (gPyramidBagResources->scrollIndicatorsTaskId == 0xFF) gPyramidBagResources->scrollIndicatorsTaskId = AddScrollIndicatorArrowPairParameterized(2, 172, 12, 148, gPyramidBagResources->listMenuCount - gPyramidBagResources->listMenuMaxShown, 0xB5E, 0xB5E, &gPyramidBagCursorData.scrollPosition); } static void RemoveScrollArrow(void) { - if (gPyramidBagResources->scrollIndicatorsTaskId != INVALID_U8) + if (gPyramidBagResources->scrollIndicatorsTaskId != 0xFF) { RemoveScrollIndicatorArrowPair(gPyramidBagResources->scrollIndicatorsTaskId); - gPyramidBagResources->scrollIndicatorsTaskId = INVALID_U8; + gPyramidBagResources->scrollIndicatorsTaskId = 0xFF; } } @@ -803,7 +803,7 @@ static void sub_81C5A98(u8 listMenuTaskId, u8 arg1) static void sub_81C5AB8(u8 y, u8 arg1) { - if (arg1 == INVALID_U8) + if (arg1 == 0xFF) FillWindowPixelRect(0, 0, 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else PrintOnWindow_Font1(0, gText_SelectorArrow2, 0, y, 0, 0, 0, arg1); @@ -1323,7 +1323,7 @@ static void PerformItemSwap(u8 taskId) else { MovePyramidBagItemSlotInList(data[1], var); - gPyramidBagResources->unk814 = INVALID_U8; + gPyramidBagResources->unk814 = 0xFF; sub_81C7028(TRUE); DestroyListMenuTask(data[0], scrollOffset, selectedRow); if (data[1] < var) @@ -1340,7 +1340,7 @@ static void sub_81C6A14(u8 taskId) u16 *scrollOffset = &gPyramidBagCursorData.scrollPosition; u16 *selectedRow = &gPyramidBagCursorData.cursorPosition; - gPyramidBagResources->unk814 = INVALID_U8; + gPyramidBagResources->unk814 = 0xFF; sub_81C7028(TRUE); DestroyListMenuTask(data[0], scrollOffset, selectedRow); if (data[1] < *scrollOffset + *selectedRow) @@ -1427,7 +1427,7 @@ static u8 sub_81C6D08(u8 windowArrayId) static u8 sub_81C6D24(u8 windowArrayId) { u8 *windowId = &gPyramidBagResources->windowIds[windowArrayId]; - if (*windowId == INVALID_U8) + if (*windowId == 0xFF) { *windowId = AddWindow(&gUnknown_0861F350[windowArrayId]); SetWindowBorderStyle(*windowId, FALSE, 1, 0xE); @@ -1439,13 +1439,13 @@ static u8 sub_81C6D24(u8 windowArrayId) static void sub_81C6D6C(u8 windowArrayId) { u8 *windowId = &gPyramidBagResources->windowIds[windowArrayId]; - if (*windowId != INVALID_U8) + if (*windowId != 0xFF) { sub_8198070(*windowId, FALSE); ClearWindowTilemap(*windowId); RemoveWindow(*windowId); schedule_bg_copy_tilemap_to_vram(1); - *windowId = INVALID_U8; + *windowId = 0xFF; } } @@ -1473,13 +1473,13 @@ static void sub_81C6E1C(void) static void sub_81C6E38(u8 itemSpriteArrayId) { u8 *spriteId = &gPyramidBagResources->itemsSpriteIds[itemSpriteArrayId]; - if (*spriteId != INVALID_U8) + if (*spriteId != 0xFF) { FreeSpriteTilesByTag(ITEM_IMAGE_TAG + itemSpriteArrayId); FreeSpritePaletteByTag(ITEM_IMAGE_TAG + itemSpriteArrayId); FreeSpriteOamMatrix(&gSprites[*spriteId]); DestroySprite(&gSprites[*spriteId]); - *spriteId = INVALID_U8; + *spriteId = 0xFF; } } @@ -1524,7 +1524,7 @@ static void ShowItemImage(u16 itemId, u8 itemSpriteArrayId) { u8 itemSpriteId; u8 *spriteId = &gPyramidBagResources->itemsSpriteIds[itemSpriteArrayId + 1]; - if (*spriteId == INVALID_U8) + if (*spriteId == 0xFF) { FreeSpriteTilesByTag(ITEM_IMAGE_TAG + 1 + itemSpriteArrayId); FreeSpritePaletteByTag(ITEM_IMAGE_TAG + 1 + itemSpriteArrayId); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 53f8defa5..610d0050e 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -677,45 +677,45 @@ static const u32 sStatusFlagsForMoveEffects[] = static const u8* const sMoveEffectBS_Ptrs[] = { - BattleScript_MoveEffectSleep, // 0 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SLEEP - BattleScript_MoveEffectPoison, // MOVE_EFFECT_POISON - BattleScript_MoveEffectBurn, // MOVE_EFFECT_BURN - BattleScript_MoveEffectFreeze, // MOVE_EFFECT_FREEZE - BattleScript_MoveEffectParalysis, // MOVE_EFFECT_PARALYSIS - BattleScript_MoveEffectToxic, // MOVE_EFFECT_TOXIC - BattleScript_MoveEffectConfusion, // MOVE_EFFECT_CONFUSION - BattleScript_MoveEffectSleep, // MOVE_EFFECT_FLINCH - BattleScript_MoveEffectSleep, // MOVE_EFFECT_TRI_ATTACK - BattleScript_MoveEffectUproar, // MOVE_EFFECT_UPROAR - BattleScript_MoveEffectPayDay, // MOVE_EFFECT_PAYDAY - BattleScript_MoveEffectSleep, // MOVE_EFFECT_CHARGING - BattleScript_MoveEffectWrap, // MOVE_EFFECT_WRAP - BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_25 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RECHARGE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAGE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_STEAL_ITEM - BattleScript_MoveEffectSleep, // MOVE_EFFECT_PREVENT_ESCAPE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_NIGHTMARE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ALL_STATS_UP - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAPIDSPIN - BattleScript_MoveEffectSleep, // MOVE_EFFECT_REMOVE_PARALYSIS - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_DEF_DOWN - BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_33 + BattleScript_MoveEffectSleep, // 0 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SLEEP + BattleScript_MoveEffectPoison, // MOVE_EFFECT_POISON + BattleScript_MoveEffectBurn, // MOVE_EFFECT_BURN + BattleScript_MoveEffectFreeze, // MOVE_EFFECT_FREEZE + BattleScript_MoveEffectParalysis, // MOVE_EFFECT_PARALYSIS + BattleScript_MoveEffectToxic, // MOVE_EFFECT_TOXIC + BattleScript_MoveEffectConfusion, // MOVE_EFFECT_CONFUSION + BattleScript_MoveEffectSleep, // MOVE_EFFECT_FLINCH + BattleScript_MoveEffectSleep, // MOVE_EFFECT_TRI_ATTACK + BattleScript_MoveEffectUproar, // MOVE_EFFECT_UPROAR + BattleScript_MoveEffectPayDay, // MOVE_EFFECT_PAYDAY + BattleScript_MoveEffectSleep, // MOVE_EFFECT_CHARGING + BattleScript_MoveEffectWrap, // MOVE_EFFECT_WRAP + BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_25 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_RECHARGE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAGE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_STEAL_ITEM + BattleScript_MoveEffectSleep, // MOVE_EFFECT_PREVENT_ESCAPE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_NIGHTMARE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ALL_STATS_UP + BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAPIDSPIN + BattleScript_MoveEffectSleep, // MOVE_EFFECT_REMOVE_PARALYSIS + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_DEF_DOWN + BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_33 }; static const struct WindowTemplate sUnusedWinTemplate = {0, 1, 3, 7, 0xF, 0x1F, 0x3F}; @@ -763,8 +763,8 @@ static const struct SpriteTemplate sSpriteTemplate_MonIconOnLvlUpBox = static const u16 sProtectSuccessRates[] = {USHRT_MAX, USHRT_MAX / 2, USHRT_MAX / 4, USHRT_MAX / 8}; #define MIMIC_FORBIDDEN_END 0xFFFE -#define METRONOME_FORBIDDEN_END INVALID_U16 -#define ASSIST_FORBIDDEN_END INVALID_U16 +#define METRONOME_FORBIDDEN_END 0xFFFF +#define ASSIST_FORBIDDEN_END 0xFFFF static const u16 sMovesForbiddenToCopy[] = { @@ -822,44 +822,44 @@ static const u16 sWeightToDamageTable[] = 500, 60, 1000, 80, 2000, 100, - INVALID_U16, INVALID_U16 + 0xFFFF, 0xFFFF }; static const u16 sPickupItems[] = { ITEM_POTION, - ITEM_ANTIDOTE, - ITEM_SUPER_POTION, - ITEM_GREAT_BALL, - ITEM_REPEL, - ITEM_ESCAPE_ROPE, - ITEM_X_ATTACK, - ITEM_FULL_HEAL, - ITEM_ULTRA_BALL, - ITEM_HYPER_POTION, - ITEM_RARE_CANDY, - ITEM_PROTEIN, - ITEM_REVIVE, - ITEM_HP_UP, - ITEM_FULL_RESTORE, - ITEM_MAX_REVIVE, - ITEM_PP_UP, - ITEM_MAX_ELIXIR, + ITEM_ANTIDOTE, + ITEM_SUPER_POTION, + ITEM_GREAT_BALL, + ITEM_REPEL, + ITEM_ESCAPE_ROPE, + ITEM_X_ATTACK, + ITEM_FULL_HEAL, + ITEM_ULTRA_BALL, + ITEM_HYPER_POTION, + ITEM_RARE_CANDY, + ITEM_PROTEIN, + ITEM_REVIVE, + ITEM_HP_UP, + ITEM_FULL_RESTORE, + ITEM_MAX_REVIVE, + ITEM_PP_UP, + ITEM_MAX_ELIXIR, }; static const u16 sRarePickupItems[] = { ITEM_HYPER_POTION, - ITEM_NUGGET, - ITEM_KINGS_ROCK, - ITEM_FULL_RESTORE, - ITEM_ETHER, - ITEM_WHITE_HERB, - ITEM_TM44_REST, - ITEM_ELIXIR, - ITEM_TM01_FOCUS_PUNCH, - ITEM_LEFTOVERS, - ITEM_TM26_EARTHQUAKE, + ITEM_NUGGET, + ITEM_KINGS_ROCK, + ITEM_FULL_RESTORE, + ITEM_ETHER, + ITEM_WHITE_HERB, + ITEM_TM44_REST, + ITEM_ELIXIR, + ITEM_TM01_FOCUS_PUNCH, + ITEM_LEFTOVERS, + ITEM_TM26_EARTHQUAKE, }; static const u8 sPickupProbabilities[] = @@ -917,10 +917,10 @@ const ALIGNED(4) u8 gUnknown_0831C494[][4] = static const u8 sUnknown_0831C4F8[] = { - 0x03, 0x00, 0x01, 0x00, 0x00, 0x01, 0x03, 0x00, - 0x01, 0x02, 0x02, 0x00, 0x03, 0x01, 0x03, 0x01, - 0x02, 0x03, 0x03, 0x02, 0x01, 0x00, 0x02, 0x02, - 0x03, 0x00, 0x00, 0x00 + 0x03, 0x00, 0x01, 0x00, 0x00, 0x01, 0x03, 0x00, + 0x01, 0x02, 0x02, 0x00, 0x03, 0x01, 0x03, 0x01, + 0x02, 0x03, 0x03, 0x02, 0x01, 0x00, 0x02, 0x02, + 0x03, 0x00, 0x00, 0x00 }; static void atk00_attackcanceler(void) @@ -1976,7 +1976,7 @@ static void atk0C_datahpupdate(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); if (gSpecialStatuses[gActiveBattler].dmg == 0) - gSpecialStatuses[gActiveBattler].dmg = INVALID_U16; + gSpecialStatuses[gActiveBattler].dmg = 0xFFFF; } gBattlescriptCurrInstr += 2; } @@ -2579,7 +2579,7 @@ void SetMoveEffect(bool8 primary, u8 certain) u16 PayDay = gPaydayMoney; gPaydayMoney += (gBattleMons[gBattlerAttacker].level * 5); if (PayDay > gPaydayMoney) - gPaydayMoney = INVALID_U16; + gPaydayMoney = 0xFFFF; } BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; @@ -3403,8 +3403,8 @@ static void atk23_getexp(void) PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBattlerId, gBattleStruct->expGetterMonId) - // buffer 'gained' or 'gained a boosted' - PREPARE_STRING_BUFFER(gBattleTextBuff2, i) + // buffer 'gained' or 'gained a boosted' + PREPARE_STRING_BUFFER(gBattleTextBuff2, i) PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage) @@ -4490,24 +4490,24 @@ static void atk48_playstatchangeanimation(void) enum { - ATK49_RAGE, - ATK49_DEFROST, - ATK49_SYNCHRONIZE_TARGET, - ATK49_MOVE_END_ABILITIES, - ATK49_STATUS_IMMUNITY_ABILITIES, - ATK49_SYNCHRONIZE_ATTACKER, - ATK49_CHOICE_MOVE, - ATK49_CHANGED_ITEMS, - ATK49_ATTACKER_INVISIBLE, - ATK49_ATTACKER_VISIBLE, - ATK49_TARGET_VISIBLE, - ATK49_ITEM_EFFECTS_ALL, - ATK49_KINGSROCK_SHELLBELL, - ATK49_SUBSTITUTE, - ATK49_UPDATE_LAST_MOVES, - ATK49_MIRROR_MOVE, - ATK49_NEXT_TARGET, - ATK49_COUNT, + ATK49_RAGE, + ATK49_DEFROST, + ATK49_SYNCHRONIZE_TARGET, + ATK49_MOVE_END_ABILITIES, + ATK49_STATUS_IMMUNITY_ABILITIES, + ATK49_SYNCHRONIZE_ATTACKER, + ATK49_CHOICE_MOVE, + ATK49_CHANGED_ITEMS, + ATK49_ATTACKER_INVISIBLE, + ATK49_ATTACKER_VISIBLE, + ATK49_TARGET_VISIBLE, + ATK49_ITEM_EFFECTS_ALL, + ATK49_KINGSROCK_SHELLBELL, + ATK49_SUBSTITUTE, + ATK49_UPDATE_LAST_MOVES, + ATK49_MIRROR_MOVE, + ATK49_NEXT_TARGET, + ATK49_COUNT, }; static void atk49_moveend(void) @@ -4520,7 +4520,7 @@ static void atk49_moveend(void) u8 arg1, arg2; u16 originallyUsedMove; - if (gChosenMove == INVALID_U16) + if (gChosenMove == 0xFFFF) originallyUsedMove = 0; else originallyUsedMove = gChosenMove; @@ -4593,7 +4593,7 @@ static void atk49_moveend(void) break; case ATK49_CHOICE_MOVE: // update choice band move if (!(gHitMarker & HITMARKER_OBEYS) || holdEffectAtk != HOLD_EFFECT_CHOICE_BAND - || gChosenMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != INVALID_U16)) + || gChosenMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != 0xFFFF)) goto LOOP; if (gChosenMove == MOVE_BATON_PASS && !(gMoveResultFlags & MOVE_RESULT_FAILED)) { @@ -4708,8 +4708,8 @@ static void atk49_moveend(void) } else { - gLastMoves[gBattlerAttacker] = INVALID_U16; - gLastResultingMoves[gBattlerAttacker] = INVALID_U16; + gLastMoves[gBattlerAttacker] = 0xFFFF; + gLastResultingMoves[gBattlerAttacker] = 0xFFFF; } if (!(gHitMarker & HITMARKER_FAINTED(gBattlerTarget))) @@ -4717,7 +4717,7 @@ static void atk49_moveend(void) if (gHitMarker & HITMARKER_OBEYS && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { - if (gChosenMove == INVALID_U16) + if (gChosenMove == 0xFFFF) { gLastLandedMoves[gBattlerTarget] = gChosenMove; } @@ -4729,7 +4729,7 @@ static void atk49_moveend(void) } else { - gLastLandedMoves[gBattlerTarget] = INVALID_U16; + gLastLandedMoves[gBattlerTarget] = 0xFFFF; } } gBattleScripting.atk49_state++; @@ -5560,7 +5560,7 @@ static void atk52_switchineffects(void) gDisableStructs[gActiveBattler].truantUnknownBit = 0; if (!AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gActiveBattler, 0, 0, 0) - && !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE)) + && !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE)) { gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED); @@ -5662,7 +5662,7 @@ static void atk59_handlelearnnewmove(void) { gBattlescriptCurrInstr = jumpPtr2; } - else if (ret == INVALID_U16) + else if (ret == 0xFFFF) { gBattlescriptCurrInstr += 10; } @@ -6015,7 +6015,7 @@ static void atk61_drawpartystatussummary(void) if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatuses[i].hp = INVALID_U16; + hpStatuses[i].hp = 0xFFFF; hpStatuses[i].status = 0; } else @@ -6930,7 +6930,7 @@ static void atk7C_trymirrormove(void) move = *(i * 2 + gBattlerAttacker * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 0) | (*(i * 2 + gBattlerAttacker * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 1) << 8); - if (move != 0 && move != INVALID_U16) + if (move != 0 && move != 0xFFFF) { movesArray[validMovesCount] = move; validMovesCount++; @@ -6941,7 +6941,7 @@ static void atk7C_trymirrormove(void) move = *(gBattleStruct->lastTakenMove + gBattlerAttacker * 2 + 0) | (*(gBattleStruct->lastTakenMove + gBattlerAttacker * 2 + 1) << 8); - if (move != 0 && move != INVALID_U16) + if (move != 0 && move != 0xFFFF) { gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); gCurrentMove = move; @@ -7094,7 +7094,7 @@ bool8 UproarWakeUpCheck(u8 battlerId) gBattleScripting.battler = i; - if (gBattlerTarget == INVALID_U8) + if (gBattlerTarget == 0xFF) gBattlerTarget = i; else if (gBattlerTarget == i) gBattleCommunication[MULTISTRING_CHOOSER] = 0; @@ -8008,7 +8008,7 @@ static void atk9A_setfocusenergy(void) static void atk9B_transformdataexecution(void) { - gChosenMove = INVALID_U16; + gChosenMove = 0xFFFF; gBattlescriptCurrInstr++; if (gBattleMons[gBattlerTarget].status2 & STATUS2_TRANSFORMED || gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE) @@ -8088,12 +8088,12 @@ static bool8 IsMoveUncopyableByMimic(u16 move) static void atk9D_mimicattackcopy(void) { - gChosenMove = INVALID_U16; + gChosenMove = 0xFFFF; if (IsMoveUncopyableByMimic(gLastMoves[gBattlerTarget]) || gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED || gLastMoves[gBattlerTarget] == 0 - || gLastMoves[gBattlerTarget] == INVALID_U16) + || gLastMoves[gBattlerTarget] == 0xFFFF) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -8296,7 +8296,7 @@ static void atkA5_painsplitdmgcalc(void) storeLoc[3] = (painSplitHp & 0xFF000000) >> 24; gBattleMoveDamage = gBattleMons[gBattlerAttacker].hp - hpDiff; - gSpecialStatuses[gBattlerTarget].dmg = INVALID_U16; + gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF; gBattlescriptCurrInstr += 5; } @@ -8309,7 +8309,7 @@ static void atkA5_painsplitdmgcalc(void) static void atkA6_settypetorandomresistance(void) // conversion 2 { if (gLastLandedMoves[gBattlerAttacker] == 0 - || gLastLandedMoves[gBattlerAttacker] == INVALID_U16) + || gLastLandedMoves[gBattlerAttacker] == 0xFFFF) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -8376,12 +8376,12 @@ static void atkA7_setalwayshitflag(void) static void atkA8_copymovepermanently(void) // sketch { - gChosenMove = INVALID_U16; + gChosenMove = 0xFFFF; if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED) && gLastPrintedMoves[gBattlerTarget] != MOVE_STRUGGLE && gLastPrintedMoves[gBattlerTarget] != 0 - && gLastPrintedMoves[gBattlerTarget] != INVALID_U16 + && gLastPrintedMoves[gBattlerTarget] != 0xFFFF && gLastPrintedMoves[gBattlerTarget] != MOVE_SKETCH) { s32 i; @@ -8550,7 +8550,7 @@ static void atkAC_remaininghptopower(void) static void atkAD_tryspiteppreduce(void) { if (gLastMoves[gBattlerTarget] != 0 - && gLastMoves[gBattlerTarget] != INVALID_U16) + && gLastMoves[gBattlerTarget] != 0xFFFF) { s32 i; @@ -9671,13 +9671,13 @@ static void atkDC_trysetgrudge(void) static void atkDD_weightdamagecalculation(void) { s32 i; - for (i = 0; sWeightToDamageTable[i] != INVALID_U16; i += 2) + for (i = 0; sWeightToDamageTable[i] != 0xFFFF; i += 2) { if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1)) break; } - if (sWeightToDamageTable[i] != INVALID_U16) + if (sWeightToDamageTable[i] != 0xFFFF) gDynamicBasePower = sWeightToDamageTable[i + 1]; else gDynamicBasePower = 120; diff --git a/src/battle_setup.c b/src/battle_setup.c index 0b5cd9e21..4243d2f3f 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1530,7 +1530,7 @@ static s32 FirstBattleTrainerIdToRematchTableId(const struct RematchTrainer *tab return i; } - return INVALID_S32; + return -1; } static s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId) @@ -1548,7 +1548,7 @@ static s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 tra } } - return INVALID_S32; + return -1; } static bool32 sub_80B1D94(s32 rematchTableId) @@ -1640,7 +1640,7 @@ static bool8 IsFirstTrainerIdReadyForRematch(const struct RematchTrainer *table, { s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == INVALID_S32) + if (tableId == -1) return FALSE; if (tableId >= 100) return FALSE; @@ -1654,7 +1654,7 @@ static bool8 IsTrainerReadyForRematch_(const struct RematchTrainer *table, u16 t { s32 tableId = TrainerIdToRematchTableId(table, trainerId); - if (tableId == INVALID_S32) + if (tableId == -1) return FALSE; if (tableId >= 100) return FALSE; @@ -1670,7 +1670,7 @@ static u16 GetRematchTrainerIdFromTable(const struct RematchTrainer *table, u16 s32 i; s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == INVALID_S32) + if (tableId == -1) return FALSE; trainerEntry = &table[tableId]; @@ -1691,7 +1691,7 @@ static u16 GetLastBeatenRematchTrainerIdFromTable(const struct RematchTrainer *t s32 i; s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == INVALID_S32) + if (tableId == -1) return FALSE; trainerEntry = &table[tableId]; @@ -1710,7 +1710,7 @@ static void ClearTrainerWantRematchState(const struct RematchTrainer *table, u16 { s32 tableId = TrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId != INVALID_S32) + if (tableId != -1) gSaveBlock1Ptr->trainerRematches[tableId] = 0; } @@ -1724,7 +1724,7 @@ static u32 GetTrainerMatchCallFlag(u32 trainerId) return FLAG_MATCH_CALL_REGISTERED + i; } - return INVALID_U16; + return 0xFFFF; } static void RegisterTrainerInMatchCall(void) @@ -1732,7 +1732,7 @@ static void RegisterTrainerInMatchCall(void) if (FlagGet(FLAG_HAS_MATCH_CALL)) { u32 matchCallFlagId = GetTrainerMatchCallFlag(gTrainerBattleOpponent_A); - if (matchCallFlagId != INVALID_U16) + if (matchCallFlagId != 0xFFFF) FlagSet(matchCallFlagId); } } @@ -1741,7 +1741,7 @@ static bool8 WasSecondRematchWon(const struct RematchTrainer *table, u16 firstBa { s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == INVALID_S32) + if (tableId == -1) return FALSE; if (!HasTrainerBeenFought(table[tableId].trainerIds[1])) return FALSE; diff --git a/src/battle_tent.c b/src/battle_tent.c index 836b2b6de..c7e70912c 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -364,7 +364,7 @@ static void sub_81BA040(void) } while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum); gTrainerBattleOpponent_A = trainerId; - while (gFacilityTrainers[gTrainerBattleOpponent_A].monSets[setsCount] != INVALID_U16) + while (gFacilityTrainers[gTrainerBattleOpponent_A].monSets[setsCount] != 0xFFFF) setsCount++; if (setsCount > 8) break; diff --git a/src/battle_tower.c b/src/battle_tower.c index c74cfd9a0..f9dfcabd1 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -973,7 +973,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount) // Attempt to fill the trainer's party with random Pokemon until 3 have been // successfully chosen. The trainer's party may not have duplicate pokemon species // or duplicate held items. - for (bfMonCount = 0; monSets[bfMonCount] != INVALID_U16; bfMonCount++) + for (bfMonCount = 0; monSets[bfMonCount] != 0xFFFF; bfMonCount++) ; i = 0; otID = Random32(); @@ -1081,11 +1081,11 @@ u16 RandomizeFacilityTrainerMonSet(u16 trainerId) u8 bfMonCount = 0; u32 monSetId = monSets[bfMonCount]; - while (monSetId != INVALID_U16) + while (monSetId != 0xFFFF) { bfMonCount++; monSetId = monSets[bfMonCount]; - if (monSetId == INVALID_U16) + if (monSetId == 0xFFFF) break; } @@ -2641,11 +2641,11 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount) bfMonCount = 0; monSetId = monSets[bfMonCount]; - while (monSetId != INVALID_U16) + while (monSetId != 0xFFFF) { bfMonCount++; monSetId = monSets[bfMonCount]; - if (monSetId == INVALID_U16) + if (monSetId == 0xFFFF) break; } diff --git a/src/battle_transition.c b/src/battle_transition.c index f15514f50..f74102467 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -612,32 +612,32 @@ static const s16 gUnknown_085C8CF2[] = {4, 517, -1}; static const s16 *const gUnknown_085C8CF8[] = { - gUnknown_085C8C90, - gUnknown_085C8CA4, - gUnknown_085C8C98, - gUnknown_085C8C9E, - gUnknown_085C8CEA, - gUnknown_085C8CE4, - gUnknown_085C8CF2, - gUnknown_085C8CDE + gUnknown_085C8C90, + gUnknown_085C8CA4, + gUnknown_085C8C98, + gUnknown_085C8C9E, + gUnknown_085C8CEA, + gUnknown_085C8CE4, + gUnknown_085C8CF2, + gUnknown_085C8CDE }; static const s16 *const gUnknown_085C8D18[] = { - gUnknown_085C8CBC, - gUnknown_085C8CB0, - gUnknown_085C8CB6, - gUnknown_085C8CAA, - gUnknown_085C8CCA, - gUnknown_085C8CD8, - gUnknown_085C8CC4, - gUnknown_085C8CD2 + gUnknown_085C8CBC, + gUnknown_085C8CB0, + gUnknown_085C8CB6, + gUnknown_085C8CAA, + gUnknown_085C8CCA, + gUnknown_085C8CD8, + gUnknown_085C8CC4, + gUnknown_085C8CD2 }; static const s16 *const *const gUnknown_085C8D38[] = { - gUnknown_085C8CF8, - gUnknown_085C8D18 + gUnknown_085C8CF8, + gUnknown_085C8D18 }; static const TransitionStateFunc sPhase2_Groudon_Funcs[] = @@ -749,7 +749,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_85C8E60[] = static const struct SpriteTemplate gUnknown_085C8E68 = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4105, .oam = &gEventObjectBaseOam_32x32, .anims = sSpriteAnimTable_85C8E3C, @@ -798,7 +798,7 @@ static const union AnimCmd *const sSpriteAnimTable_85C8EA0[] = static const struct SpriteTemplate sSpriteTemplate_85C8EA4 = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4106, .oam = &gOamData_85C8E80, .anims = sSpriteAnimTable_85C8EA0, @@ -809,7 +809,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EA4 = static const struct SpriteTemplate sSpriteTemplate_85C8EBC = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4106, .oam = &gOamData_85C8E80, .anims = sSpriteAnimTable_85C8EA0, @@ -998,7 +998,7 @@ static bool8 Transition_Phase1(struct Task *task) static bool8 Transition_WaitForPhase1(struct Task *task) { - if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == INVALID_U8) + if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == 0xFF) { task->tState++; return TRUE; @@ -1019,7 +1019,7 @@ static bool8 Transition_Phase2(struct Task *task) static bool8 Transition_WaitForPhase2(struct Task *task) { task->tTransitionDone = FALSE; - if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == INVALID_U8) + if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == 0xFF) task->tTransitionDone = TRUE; return FALSE; } @@ -3605,7 +3605,7 @@ static void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) static bool8 IsPhase1Done(void) { - if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == INVALID_U8) + if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF) return TRUE; else return FALSE; diff --git a/src/battle_tv.c b/src/battle_tv.c index edd506708..487b6baac 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -26,9 +26,9 @@ static const u16 sVariableDmgMoves[] = MOVE_WATER_SPOUT, MOVE_DREAM_EATER, MOVE_WEATHER_BALL, MOVE_SNORE, MOVE_PAIN_SPLIT, MOVE_GUILLOTINE, MOVE_FRUSTRATION, MOVE_RETURN, MOVE_ENDEAVOR, - MOVE_PRESENT, MOVE_REVENGE, INVALID_U16, + MOVE_PRESENT, MOVE_REVENGE, 0xFFFF, // those are handled by the function itself - MOVE_MAGNITUDE, MOVE_PSYWAVE, INVALID_U16 + MOVE_MAGNITUDE, MOVE_PSYWAVE, 0xFFFF }; static const u16 sUnknown_0860A4E0[] = @@ -199,7 +199,7 @@ static const u16 sUnknown_0860A8A4[] = STRINGID_PKMNAFFLICTEDBYCURSE, STRINGID_PKMNSAPPEDBYLEECHSEED, STRINGID_PKMNLOCKEDINNIGHTMARE, STRINGID_PKMNHURTBY, STRINGID_PKMNHURTBYBURN, STRINGID_PKMNHURTBYPOISON, STRINGID_PKMNHURTBYSPIKES, STRINGID_ATTACKERFAINTED, STRINGID_TARGETFAINTED, - STRINGID_PKMNHITWITHRECOIL, STRINGID_PKMNCRASHED, INVALID_U16 + STRINGID_PKMNHITWITHRECOIL, STRINGID_PKMNCRASHED, 0xFFFF }; // code @@ -625,9 +625,9 @@ static bool8 sub_817E0B8(u16 stringId) if (sUnknown_0860A8A4[i] == stringId) break; i++; - } while (sUnknown_0860A8A4[i] != INVALID_U16); + } while (sUnknown_0860A8A4[i] != 0xFFFF); - if (sUnknown_0860A8A4[i] == INVALID_U16) + if (sUnknown_0860A8A4[i] == 0xFFFF) return TRUE; else return FALSE; @@ -815,324 +815,324 @@ void TryPutLinkBattleTvShowOnAir(void) { asm_unified( "push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x20\n\ - movs r0, 0\n\ - str r0, [sp]\n\ - movs r1, 0\n\ - str r1, [sp, 0x4]\n\ - movs r2, 0\n\ - str r2, [sp, 0x8]\n\ - ldr r3, =0x00007fff\n\ - str r3, [sp, 0xC]\n\ - movs r4, 0\n\ - str r4, [sp, 0x10]\n\ - movs r7, 0\n\ - str r7, [sp, 0x14]\n\ - mov r8, r0\n\ - ldr r0, =gBattleStruct\n\ - ldr r1, [r0]\n\ - adds r0, r1, 0\n\ - adds r0, 0xB3\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - beq _0817E42A\n\ - b _0817E670\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x20\n\ + movs r0, 0\n\ + str r0, [sp]\n\ + movs r1, 0\n\ + str r1, [sp, 0x4]\n\ + movs r2, 0\n\ + str r2, [sp, 0x8]\n\ + ldr r3, =0x00007fff\n\ + str r3, [sp, 0xC]\n\ + movs r4, 0\n\ + str r4, [sp, 0x10]\n\ + movs r7, 0\n\ + str r7, [sp, 0x14]\n\ + mov r8, r0\n\ + ldr r0, =gBattleStruct\n\ + ldr r1, [r0]\n\ + adds r0, r1, 0\n\ + adds r0, 0xB3\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + beq _0817E42A\n\ + b _0817E670\n\ _0817E42A:\n\ - movs r2, 0xD2\n\ - lsls r2, 1\n\ - adds r2, r1\n\ - mov r10, r2\n\ - movs r6, 0\n\ + movs r2, 0xD2\n\ + lsls r2, 1\n\ + adds r2, r1\n\ + mov r10, r2\n\ + movs r6, 0\n\ _0817E434:\n\ - movs r0, 0x64\n\ - adds r4, r6, 0\n\ - muls r4, r0\n\ - ldr r0, =gPlayerParty\n\ - adds r0, r4, r0\n\ - movs r1, 0xB\n\ - movs r2, 0\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - beq _0817E454\n\ - mov r0, r8\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r8, r0\n\ + movs r0, 0x64\n\ + adds r4, r6, 0\n\ + muls r4, r0\n\ + ldr r0, =gPlayerParty\n\ + adds r0, r4, r0\n\ + movs r1, 0xB\n\ + movs r2, 0\n\ + bl GetMonData\n\ + cmp r0, 0\n\ + beq _0817E454\n\ + mov r0, r8\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r8, r0\n\ _0817E454:\n\ - ldr r5, =gEnemyParty\n\ - adds r0, r4, r5\n\ - movs r1, 0xB\n\ - movs r2, 0\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - beq _0817E46A\n\ - adds r0, r7, 0x1\n\ - lsls r0, 24\n\ - lsrs r7, r0, 24\n\ + ldr r5, =gEnemyParty\n\ + adds r0, r4, r5\n\ + movs r1, 0xB\n\ + movs r2, 0\n\ + bl GetMonData\n\ + cmp r0, 0\n\ + beq _0817E46A\n\ + adds r0, r7, 0x1\n\ + lsls r0, 24\n\ + lsrs r7, r0, 24\n\ _0817E46A:\n\ - adds r6, 0x1\n\ - cmp r6, 0x5\n\ - ble _0817E434\n\ - ldr r0, =gBattleTypeFlags\n\ - ldr r0, [r0]\n\ - movs r1, 0x2\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0817E47E\n\ - b _0817E670\n\ + adds r6, 0x1\n\ + cmp r6, 0x5\n\ + ble _0817E434\n\ + ldr r0, =gBattleTypeFlags\n\ + ldr r0, [r0]\n\ + movs r1, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0817E47E\n\ + b _0817E670\n\ _0817E47E:\n\ - cmp r8, r7\n\ - beq _0817E484\n\ - b _0817E670\n\ + cmp r8, r7\n\ + beq _0817E484\n\ + b _0817E670\n\ _0817E484:\n\ - movs r6, 0\n\ - lsls r3, r6, 1\n\ - str r3, [sp, 0x18]\n\ - movs r4, 0x64\n\ - mov r8, r4\n\ + movs r6, 0\n\ + lsls r3, r6, 1\n\ + str r3, [sp, 0x18]\n\ + movs r4, 0x64\n\ + mov r8, r4\n\ _0817E48E:\n\ - mov r1, r8\n\ - muls r1, r6\n\ - ldr r0, =gPlayerParty\n\ - adds r4, r1, r0\n\ - adds r0, r4, 0\n\ - movs r1, 0xB\n\ - movs r2, 0\n\ - bl GetMonData\n\ - lsls r0, 16\n\ - lsrs r7, r0, 16\n\ - adds r0, r6, 0x1\n\ - mov r9, r0\n\ - cmp r7, 0\n\ - beq _0817E4EE\n\ - adds r0, r4, 0\n\ - movs r1, 0x2D\n\ - movs r2, 0\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - bne _0817E4EE\n\ - movs r4, 0\n\ - lsls r0, r6, 3\n\ - mov r2, r10\n\ - adds r1, r0, r2\n\ - movs r3, 0x3\n\ + mov r1, r8\n\ + muls r1, r6\n\ + ldr r0, =gPlayerParty\n\ + adds r4, r1, r0\n\ + adds r0, r4, 0\n\ + movs r1, 0xB\n\ + movs r2, 0\n\ + bl GetMonData\n\ + lsls r0, 16\n\ + lsrs r7, r0, 16\n\ + adds r0, r6, 0x1\n\ + mov r9, r0\n\ + cmp r7, 0\n\ + beq _0817E4EE\n\ + adds r0, r4, 0\n\ + movs r1, 0x2D\n\ + movs r2, 0\n\ + bl GetMonData\n\ + cmp r0, 0\n\ + bne _0817E4EE\n\ + movs r4, 0\n\ + lsls r0, r6, 3\n\ + mov r2, r10\n\ + adds r1, r0, r2\n\ + movs r3, 0x3\n\ _0817E4C4:\n\ - lsls r0, r4, 16\n\ - asrs r0, 16\n\ - ldrh r4, [r1]\n\ - adds r0, r4\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - adds r1, 0x2\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _0817E4C4\n\ - ldr r1, [sp, 0x8]\n\ - lsls r0, r1, 16\n\ - lsls r1, r4, 16\n\ - cmp r0, r1\n\ - bge _0817E4EE\n\ - lsls r0, r6, 24\n\ - lsrs r0, 24\n\ - str r0, [sp, 0x10]\n\ - lsrs r1, 16\n\ - str r1, [sp, 0x8]\n\ - str r7, [sp]\n\ + lsls r0, r4, 16\n\ + asrs r0, 16\n\ + ldrh r4, [r1]\n\ + adds r0, r4\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + adds r1, 0x2\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _0817E4C4\n\ + ldr r1, [sp, 0x8]\n\ + lsls r0, r1, 16\n\ + lsls r1, r4, 16\n\ + cmp r0, r1\n\ + bge _0817E4EE\n\ + lsls r0, r6, 24\n\ + lsrs r0, 24\n\ + str r0, [sp, 0x10]\n\ + lsrs r1, 16\n\ + str r1, [sp, 0x8]\n\ + str r7, [sp]\n\ _0817E4EE:\n\ - mov r0, r8\n\ - muls r0, r6\n\ - ldr r2, =gEnemyParty\n\ - adds r4, r0, r2\n\ - adds r0, r4, 0\n\ - movs r1, 0xB\n\ - movs r2, 0\n\ - bl GetMonData\n\ - lsls r0, 16\n\ - lsrs r7, r0, 16\n\ - ldr r3, [sp, 0x8]\n\ - lsls r3, 16\n\ - str r3, [sp, 0x1C]\n\ - cmp r7, 0\n\ - beq _0817E5A0\n\ - adds r0, r4, 0\n\ - movs r1, 0x2D\n\ - movs r2, 0\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - bne _0817E5A0\n\ - movs r4, 0\n\ - ldr r0, [sp, 0xC]\n\ - lsls r2, r0, 16\n\ - movs r3, 0x1\n\ - lsls r1, r3, 1\n\ - adds r1, 0x1\n\ - lsls r1, 4\n\ - lsls r0, r6, 3\n\ - adds r0, r1\n\ - mov r3, r10\n\ - adds r1, r0, r3\n\ - movs r3, 0x3\n\ + mov r0, r8\n\ + muls r0, r6\n\ + ldr r2, =gEnemyParty\n\ + adds r4, r0, r2\n\ + adds r0, r4, 0\n\ + movs r1, 0xB\n\ + movs r2, 0\n\ + bl GetMonData\n\ + lsls r0, 16\n\ + lsrs r7, r0, 16\n\ + ldr r3, [sp, 0x8]\n\ + lsls r3, 16\n\ + str r3, [sp, 0x1C]\n\ + cmp r7, 0\n\ + beq _0817E5A0\n\ + adds r0, r4, 0\n\ + movs r1, 0x2D\n\ + movs r2, 0\n\ + bl GetMonData\n\ + cmp r0, 0\n\ + bne _0817E5A0\n\ + movs r4, 0\n\ + ldr r0, [sp, 0xC]\n\ + lsls r2, r0, 16\n\ + movs r3, 0x1\n\ + lsls r1, r3, 1\n\ + adds r1, 0x1\n\ + lsls r1, 4\n\ + lsls r0, r6, 3\n\ + adds r0, r1\n\ + mov r3, r10\n\ + adds r1, r0, r3\n\ + movs r3, 0x3\n\ _0817E534:\n\ - lsls r0, r4, 16\n\ - asrs r0, 16\n\ - ldrh r4, [r1]\n\ - adds r0, r4\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - adds r1, 0x2\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _0817E534\n\ - asrs r1, r2, 16\n\ - lsls r5, r4, 16\n\ - asrs r0, r5, 16\n\ - cmp r1, r0\n\ - bne _0817E590\n\ - mov r0, r8\n\ - muls r0, r6\n\ - ldr r1, =gEnemyParty\n\ - adds r0, r1\n\ - movs r1, 0x19\n\ - movs r2, 0\n\ - bl GetMonData\n\ - adds r4, r0, 0\n\ - ldr r2, [sp, 0x14]\n\ - mov r0, r8\n\ - muls r0, r2\n\ - ldr r3, =gEnemyParty\n\ - adds r0, r3\n\ - movs r1, 0x19\n\ - movs r2, 0\n\ - bl GetMonData\n\ - cmp r4, r0\n\ - bls _0817E5A0\n\ - b _0817E594\n\ - .pool\n\ + lsls r0, r4, 16\n\ + asrs r0, 16\n\ + ldrh r4, [r1]\n\ + adds r0, r4\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + adds r1, 0x2\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _0817E534\n\ + asrs r1, r2, 16\n\ + lsls r5, r4, 16\n\ + asrs r0, r5, 16\n\ + cmp r1, r0\n\ + bne _0817E590\n\ + mov r0, r8\n\ + muls r0, r6\n\ + ldr r1, =gEnemyParty\n\ + adds r0, r1\n\ + movs r1, 0x19\n\ + movs r2, 0\n\ + bl GetMonData\n\ + adds r4, r0, 0\n\ + ldr r2, [sp, 0x14]\n\ + mov r0, r8\n\ + muls r0, r2\n\ + ldr r3, =gEnemyParty\n\ + adds r0, r3\n\ + movs r1, 0x19\n\ + movs r2, 0\n\ + bl GetMonData\n\ + cmp r4, r0\n\ + bls _0817E5A0\n\ + b _0817E594\n\ + .pool\n\ _0817E590:\n\ - cmp r1, r0\n\ - ble _0817E5A0\n\ + cmp r1, r0\n\ + ble _0817E5A0\n\ _0817E594:\n\ - lsls r0, r6, 24\n\ - lsrs r0, 24\n\ - str r0, [sp, 0x14]\n\ - lsrs r5, 16\n\ - str r5, [sp, 0xC]\n\ - str r7, [sp, 0x4]\n\ + lsls r0, r6, 24\n\ + lsrs r0, 24\n\ + str r0, [sp, 0x14]\n\ + lsrs r5, 16\n\ + str r5, [sp, 0xC]\n\ + str r7, [sp, 0x4]\n\ _0817E5A0:\n\ - mov r6, r9\n\ - cmp r6, 0x5\n\ - bgt _0817E5A8\n\ - b _0817E48E\n\ + mov r6, r9\n\ + cmp r6, 0x5\n\ + bgt _0817E5A8\n\ + b _0817E48E\n\ _0817E5A8:\n\ - movs r4, 0\n\ - movs r6, 0\n\ - movs r3, 0\n\ - ldr r5, =gPlayerParty\n\ - ldr r7, [sp, 0x10]\n\ - lsls r0, r7, 3\n\ - mov r1, r10\n\ - adds r2, r0, r1\n\ + movs r4, 0\n\ + movs r6, 0\n\ + movs r3, 0\n\ + ldr r5, =gPlayerParty\n\ + ldr r7, [sp, 0x10]\n\ + lsls r0, r7, 3\n\ + mov r1, r10\n\ + adds r2, r0, r1\n\ _0817E5B8:\n\ - lsls r0, r4, 16\n\ - asrs r0, 16\n\ - movs r7, 0\n\ - ldrsh r1, [r2, r7]\n\ - cmp r0, r1\n\ - bge _0817E5C8\n\ - ldrh r4, [r2]\n\ - adds r6, r3, 0\n\ + lsls r0, r4, 16\n\ + asrs r0, 16\n\ + movs r7, 0\n\ + ldrsh r1, [r2, r7]\n\ + cmp r0, r1\n\ + bge _0817E5C8\n\ + ldrh r4, [r2]\n\ + adds r6, r3, 0\n\ _0817E5C8:\n\ - adds r2, 0x2\n\ - adds r3, 0x1\n\ - cmp r3, 0x3\n\ - ble _0817E5B8\n\ - movs r0, 0x64\n\ - ldr r1, [sp, 0x10]\n\ - muls r0, r1\n\ - adds r0, r5\n\ - adds r1, r6, 0\n\ - adds r1, 0xD\n\ - movs r2, 0\n\ - bl GetMonData\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - ldr r2, [sp, 0x1C]\n\ - cmp r2, 0\n\ - beq _0817E670\n\ - cmp r4, 0\n\ - beq _0817E670\n\ - ldr r0, =gBattleTypeFlags\n\ - ldr r0, [r0]\n\ - movs r1, 0x40\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0817E65C\n\ - ldr r3, [sp, 0x10]\n\ - cmp r3, 0x2\n\ - bhi _0817E620\n\ - ldr r0, =gBattleScripting\n\ - adds r0, 0x25\n\ - ldrb r0, [r0]\n\ - bl GetLinkTrainerFlankId\n\ - lsls r0, 16\n\ - cmp r0, 0\n\ - beq _0817E630\n\ - b _0817E670\n\ - .pool\n\ + adds r2, 0x2\n\ + adds r3, 0x1\n\ + cmp r3, 0x3\n\ + ble _0817E5B8\n\ + movs r0, 0x64\n\ + ldr r1, [sp, 0x10]\n\ + muls r0, r1\n\ + adds r0, r5\n\ + adds r1, r6, 0\n\ + adds r1, 0xD\n\ + movs r2, 0\n\ + bl GetMonData\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + ldr r2, [sp, 0x1C]\n\ + cmp r2, 0\n\ + beq _0817E670\n\ + cmp r4, 0\n\ + beq _0817E670\n\ + ldr r0, =gBattleTypeFlags\n\ + ldr r0, [r0]\n\ + movs r1, 0x40\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0817E65C\n\ + ldr r3, [sp, 0x10]\n\ + cmp r3, 0x2\n\ + bhi _0817E620\n\ + ldr r0, =gBattleScripting\n\ + adds r0, 0x25\n\ + ldrb r0, [r0]\n\ + bl GetLinkTrainerFlankId\n\ + lsls r0, 16\n\ + cmp r0, 0\n\ + beq _0817E630\n\ + b _0817E670\n\ + .pool\n\ _0817E620:\n\ - ldr r0, =gBattleScripting\n\ - adds r0, 0x25\n\ - ldrb r0, [r0]\n\ - bl GetLinkTrainerFlankId\n\ - lsls r0, 16\n\ - cmp r0, 0\n\ - beq _0817E670\n\ + ldr r0, =gBattleScripting\n\ + adds r0, 0x25\n\ + ldrb r0, [r0]\n\ + bl GetLinkTrainerFlankId\n\ + lsls r0, 16\n\ + cmp r0, 0\n\ + beq _0817E670\n\ _0817E630:\n\ - movs r3, 0\n\ - ldr r7, [sp, 0x14]\n\ - cmp r7, 0x2\n\ - bls _0817E63A\n\ - movs r3, 0x1\n\ + movs r3, 0\n\ + ldr r7, [sp, 0x14]\n\ + cmp r7, 0x2\n\ + bls _0817E63A\n\ + movs r3, 0x1\n\ _0817E63A:\n\ - lsls r0, r3, 24\n\ - lsrs r0, 24\n\ - ldr r1, =gBattleScripting\n\ - adds r1, 0x25\n\ - ldrb r1, [r1]\n\ - bl sub_806EF84\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - adds r1, r4, 0\n\ - ldr r2, [sp]\n\ - ldr r3, [sp, 0x4]\n\ - bl PutBattleUpdateOnTheAir\n\ - b _0817E670\n\ - .pool\n\ + lsls r0, r3, 24\n\ + lsrs r0, 24\n\ + ldr r1, =gBattleScripting\n\ + adds r1, 0x25\n\ + ldrb r1, [r1]\n\ + bl sub_806EF84\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + adds r1, r4, 0\n\ + ldr r2, [sp]\n\ + ldr r3, [sp, 0x4]\n\ + bl PutBattleUpdateOnTheAir\n\ + b _0817E670\n\ + .pool\n\ _0817E65C:\n\ - ldr r0, =gBattleScripting\n\ - adds r0, 0x25\n\ - ldrb r1, [r0]\n\ - movs r0, 0x1\n\ - eors r0, r1\n\ - adds r1, r4, 0\n\ - ldr r2, [sp]\n\ - ldr r3, [sp, 0x4]\n\ - bl PutBattleUpdateOnTheAir\n\ + ldr r0, =gBattleScripting\n\ + adds r0, 0x25\n\ + ldrb r1, [r0]\n\ + movs r0, 0x1\n\ + eors r0, r1\n\ + adds r1, r4, 0\n\ + ldr r2, [sp]\n\ + ldr r3, [sp, 0x4]\n\ + bl PutBattleUpdateOnTheAir\n\ _0817E670:\n\ - add sp, 0x20\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool"); + add sp, 0x20\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool"); } #endif @@ -1164,7 +1164,7 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3) break; } i += 2; - } while (ptr[i] != INVALID_U16); + } while (ptr[i] != 0xFFFF); break; case 19: tvPtr->side[arg2 ^ 1].faintCause = 0; @@ -1415,9 +1415,9 @@ static void TrySetBattleSeminarShow(void) if (currMoveSaved == sVariableDmgMoves[i]) break; i++; - } while (sVariableDmgMoves[i] != INVALID_U16); + } while (sVariableDmgMoves[i] != 0xFFFF); - if (sVariableDmgMoves[i] != INVALID_U16) + if (sVariableDmgMoves[i] != 0xFFFF) return; dmgByMove[gMoveSelectionCursor[gBattlerAttacker]] = gBattleMoveDamage; @@ -1490,9 +1490,9 @@ static bool8 ShouldCalculateDamage(u16 moveId, s32 *dmg, u16 *powerOverride) if (moveId == sVariableDmgMoves[i]) break; i++; - } while (sVariableDmgMoves[i] != INVALID_U16); + } while (sVariableDmgMoves[i] != 0xFFFF); - if (sVariableDmgMoves[i] != INVALID_U16) + if (sVariableDmgMoves[i] != 0xFFFF) { *dmg = 0; return FALSE; diff --git a/src/battle_util.c b/src/battle_util.c index 12ca6bc9c..251a545c9 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -29,7 +29,7 @@ extern u8 weather_get_current(void); static const u16 sSoundMovesTable[] = { MOVE_GROWL, MOVE_ROAR, MOVE_SING, MOVE_SUPERSONIC, MOVE_SCREECH, MOVE_SNORE, - MOVE_UPROAR, MOVE_METAL_SOUND, MOVE_GRASS_WHISTLE, MOVE_HYPER_VOICE, INVALID_U16 + MOVE_UPROAR, MOVE_METAL_SOUND, MOVE_GRASS_WHISTLE, MOVE_HYPER_VOICE, 0xFFFF }; u8 GetBattlerForBattleScript(u8 caseId) @@ -382,7 +382,7 @@ u8 TrySetCantSelectMoveBattleScript(void) gPotentialItemEffectBattler = gActiveBattler; - if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != INVALID_U16 && *choicedMove != move) + if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != move) { gCurrentMove = *choicedMove; gLastUsedItem = gBattleMons[gActiveBattler].item; @@ -442,7 +442,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check) unusableMoves |= gBitTable[i]; if (gDisableStructs[battlerId].encoreTimer && gDisableStructs[battlerId].encoredMove != gBattleMons[battlerId].moves[i]) unusableMoves |= gBitTable[i]; - if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != INVALID_U16 && *choicedMove != gBattleMons[battlerId].moves[i]) + if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != gBattleMons[battlerId].moves[i]) unusableMoves |= gBitTable[i]; } return unusableMoves; @@ -451,7 +451,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check) bool8 AreAllMovesUnusable(void) { u8 unusable; - unusable = CheckMoveLimitations(gActiveBattler, 0, INVALID_U8); + unusable = CheckMoveLimitations(gActiveBattler, 0, 0xFF); if (unusable == 0xF) // All moves are unusable. { @@ -1137,7 +1137,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void) gBattlerTarget = gActiveBattler; gBattlerAttacker = gWishFutureKnock.futureSightAttacker[gActiveBattler]; gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBattler]; - gSpecialStatuses[gBattlerTarget].dmg = INVALID_U16; + gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF; BattleScriptExecute(BattleScript_MonTookFutureAttack); if (gWishFutureKnock.futureSightCounter[gActiveBattler] == 0 @@ -1996,12 +1996,12 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA case ABILITYEFFECT_MOVES_BLOCK: // 2 if (gLastUsedAbility == ABILITY_SOUNDPROOF) { - for (i = 0; sSoundMovesTable[i] != INVALID_U16; i++) + for (i = 0; sSoundMovesTable[i] != 0xFFFF; i++) { if (sSoundMovesTable[i] == move) break; } - if (sSoundMovesTable[i] != INVALID_U16) + if (sSoundMovesTable[i] != 0xFFFF) { if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS) gHitMarker |= HITMARKER_NO_PPDEDUCT; @@ -2527,7 +2527,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA break; } - if (effect && caseID < ABILITYEFFECT_CHECK_OTHER_SIDE && gLastUsedAbility != INVALID_U8) + if (effect && caseID < ABILITYEFFECT_CHECK_OTHER_SIDE && gLastUsedAbility != 0xFF) RecordAbilityBattle(battler, gLastUsedAbility); } @@ -3213,7 +3213,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) case HOLD_EFFECT_SHELL_BELL: if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && gSpecialStatuses[gBattlerTarget].dmg != 0 - && gSpecialStatuses[gBattlerTarget].dmg != INVALID_U16 + && gSpecialStatuses[gBattlerTarget].dmg != 0xFFFF && gBattlerAttacker != gBattlerTarget && gBattleMons[gBattlerAttacker].hp != gBattleMons[gBattlerAttacker].maxHP && gBattleMons[gBattlerAttacker].hp != 0) @@ -3394,7 +3394,7 @@ u8 IsMonDisobedient(void) calc = (gBattleMons[gBattlerAttacker].level + obedienceLevel) * rnd >> 8; if (calc < obedienceLevel) { - calc = CheckMoveLimitations(gBattlerAttacker, gBitTable[gCurrMovePos], INVALID_U8); + calc = CheckMoveLimitations(gBattlerAttacker, gBitTable[gCurrMovePos], 0xFF); if (calc == 0xF) // all moves cannot be used { gBattleCommunication[MULTISTRING_CHOOSER] = Random() & 3; diff --git a/src/berry_blender.c b/src/berry_blender.c index e977bdbeb..87d76bb07 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1455,7 +1455,7 @@ static void sub_808074C(void) for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - sBerryBlenderData->field_96[i] = INVALID_U8; + sBerryBlenderData->field_96[i] = 0xFF; sBerryBlenderData->field_8E[i] = sUnknown_083399D0[sBerryBlenderData->playersNo - 2][i]; } for (j = 0; j < BLENDER_MAX_PLAYERS; j++) @@ -1479,7 +1479,7 @@ static void Blender_PrintPlayerNames(void) for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - if (sBerryBlenderData->field_8E[i] != INVALID_U8) + if (sBerryBlenderData->field_8E[i] != 0xFF) { sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]] = sBerryBlenderData->syncArrowSprite2Ids[i]; StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]]], i); diff --git a/src/bg.c b/src/bg.c index fd6ffca6e..a41075ad7 100644 --- a/src/bg.c +++ b/src/bg.c @@ -87,37 +87,37 @@ void SetBgControlAttributes(u8 bg, u8 charBaseIndex, u8 mapBaseIndex, u8 screenS { if (IsInvalidBg(bg) == FALSE) { - if (charBaseIndex != INVALID_U8) + if (charBaseIndex != 0xFF) { sGpuBgConfigs.configs[bg].charBaseIndex = charBaseIndex & 0x3; } - if (mapBaseIndex != INVALID_U8) + if (mapBaseIndex != 0xFF) { sGpuBgConfigs.configs[bg].mapBaseIndex = mapBaseIndex & 0x1F; } - if (screenSize != INVALID_U8) + if (screenSize != 0xFF) { sGpuBgConfigs.configs[bg].screenSize = screenSize & 0x3; } - if (paletteMode != INVALID_U8) + if (paletteMode != 0xFF) { sGpuBgConfigs.configs[bg].paletteMode = paletteMode; } - if (priority != INVALID_U8) + if (priority != 0xFF) { sGpuBgConfigs.configs[bg].priority = priority & 0x3; } - if (mosaic != INVALID_U8) + if (mosaic != 0xFF) { sGpuBgConfigs.configs[bg].mosaic = mosaic & 0x1; } - if (wraparound != INVALID_U8) + if (wraparound != 0xFF) { sGpuBgConfigs.configs[bg].wraparound = wraparound; } @@ -154,7 +154,7 @@ u16 GetBgControlAttribute(u8 bg, u8 attributeId) } } - return INVALID_U8; + return 0xFF; } u8 LoadBgVram(u8 bg, const void *src, u16 size, u16 destOffset, u8 mode) @@ -379,7 +379,7 @@ u16 LoadBgTiles(u8 bg, const void* src, u16 size, u16 destOffset) cursor = LoadBgVram(bg, src, size, tileOffset, DISPCNT_MODE_1); - if (cursor == INVALID_U8) + if (cursor == 0xFF) { return -1; } @@ -400,7 +400,7 @@ u16 LoadBgTilemap(u8 bg, const void *src, u16 size, u16 destOffset) cursor = LoadBgVram(bg, src, size, destOffset * 2, DISPCNT_MODE_2); - if (cursor == INVALID_U8) + if (cursor == 0xFF) { return -1; } @@ -480,25 +480,25 @@ void SetBgAttribute(u8 bg, u8 attributeId, u8 value) switch (attributeId) { case 1: - SetBgControlAttributes(bg, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8); + SetBgControlAttributes(bg, value, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF); break; case 2: - SetBgControlAttributes(bg, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8); + SetBgControlAttributes(bg, 0xFF, value, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF); break; case 3: - SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8); + SetBgControlAttributes(bg, 0xFF, 0xFF, value, 0xFF, 0xFF, 0xFF, 0xFF); break; case 4: - SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8); + SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, value, 0xFF, 0xFF, 0xFF); break; case 7: - SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8); + SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, value, 0xFF, 0xFF); break; case 5: - SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8); + SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, value, 0xFF); break; case 6: - SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value); + SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, value); break; } } @@ -1284,7 +1284,7 @@ u32 GetBgType(u8 bg) break; } - return INVALID_U16; + return 0xFFFF; } bool32 IsInvalidBg32(u8 bg) diff --git a/src/blit.c b/src/blit.c index 2ba0e489c..b4d5f7de5 100644 --- a/src/blit.c +++ b/src/blit.c @@ -3,7 +3,7 @@ void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height) { - BlitBitmapRect4Bit(src, dst, srcX, srcY, dstX, dstY, width, height, INVALID_U8); + BlitBitmapRect4Bit(src, dst, srcX, srcY, dstX, dstY, width, height, 0xFF); } void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height, u8 colorKey) @@ -33,7 +33,7 @@ void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 sr multiplierSrcY = (src->width + (src->width & 7)) >> 3; multiplierDstY = (dst->width + (dst->width & 7)) >> 3; - if (colorKey == INVALID_U8) + if (colorKey == 0xFF) { for (loopSrcY = srcY, loopDstY = dstY; loopSrcY < yEnd; loopSrcY++, loopDstY++) { @@ -132,7 +132,7 @@ void BlitBitmapRect4BitTo8Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, multiplierSrcY = (src->width + (src->width & 7)) >> 3; multiplierDstY = (dst->width + (dst->width & 7)) >> 3; - if (colorKey == INVALID_U8) + if (colorKey == 0xFF) { for (loopSrcY = srcY, loopDstY = dstY; loopSrcY < yEnd; loopSrcY++, loopDstY++) { diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 6a2e42c4e..b17ffad33 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -465,7 +465,7 @@ bool8 ShouldDoBrailleRegicePuzzle(void) } varValue = VarGet(0x403B); - if (varValue != INVALID_U16 || VarGet(0x403C) != varValue || VarGet(0x403D) != 0xF) + if (varValue != 0xFFFF || VarGet(0x403C) != varValue || VarGet(0x403D) != 0xF) return FALSE; if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 21) diff --git a/src/cable_club.c b/src/cable_club.c index 649534711..56154d5bf 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -70,7 +70,7 @@ static void sub_80B3220(u8 taskId); static void sub_80B236C(u8 arg0, u8 arg1) { - if (FindTaskIdByFunc(sub_80B2634) == INVALID_U8) + if (FindTaskIdByFunc(sub_80B2634) == 0xFF) { u8 taskId1; @@ -604,7 +604,7 @@ void sub_80B2EA8(void) { u32 taskId = FindTaskIdByFunc(sub_80B2EE4); - if (taskId == INVALID_U8) + if (taskId == 0xFF) { taskId = CreateTask(sub_80B2EE4, 80); gTasks[taskId].data[0] = 0; @@ -702,7 +702,7 @@ void sub_80B3028(void) u8 sub_80B3050(void) { if (FuncIsActiveTask(sub_80B3144) != FALSE) - return INVALID_U8; + return 0xFF; switch (gSpecialVar_0x8004) { diff --git a/src/contest.c b/src/contest.c index 716ed5dfc..0c4397f30 100644 --- a/src/contest.c +++ b/src/contest.c @@ -324,7 +324,7 @@ void sub_80D787C(void) *gContestResources->field_0 = (struct Contest){}; for (i = 0; i < 4; i++) { - gContestResources->field_0->unk19206[i] = INVALID_U8; + gContestResources->field_0->unk19206[i] = 0xFF; } for (i = 0; i < 4; i++) { @@ -344,7 +344,7 @@ void sub_80D787C(void) sub_80DCE58(0); for (i = 0; i < 4; i++) { - gContestResources->field_4[i].nextTurnOrder = INVALID_U8; + gContestResources->field_4[i].nextTurnOrder = 0xFF; gContestResources->field_0->unk19218[i] = gUnknown_02039F26[i]; } sub_80DD590(); @@ -2097,7 +2097,7 @@ void sub_80DAB8C(u8 contestType, u8 rank) opponents[opponentsCount++] = i; } } - opponents[opponentsCount] = INVALID_U8; + opponents[opponentsCount] = 0xFF; // Choose three random opponents from the list for (i = 0; i < 3; i++) @@ -2106,7 +2106,7 @@ void sub_80DAB8C(u8 contestType, u8 rank) s32 j; gContestMons[i] = gContestOpponents[opponents[rnd]]; - for (j = rnd; opponents[j] != INVALID_U8; j++) + for (j = rnd; opponents[j] != 0xFF; j++) opponents[j] = opponents[j + 1]; opponentsCount--; } @@ -2151,7 +2151,7 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame) else if (contestType == CONTEST_CATEGORY_TOUGH && gContestOpponents[i].aiPool_Tough) opponents[opponentsCount++] = i; } - opponents[opponentsCount] = INVALID_U8; + opponents[opponentsCount] = 0xFF; for (i = 0; i < 4 - gUnknown_02039F30; i++) { u16 rnd = sub_80F903C() % opponentsCount; @@ -2160,7 +2160,7 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame) gContestMons[gUnknown_02039F30 + i] = gContestOpponents[opponents[rnd]]; sub_80DF9D4(gContestMons[gUnknown_02039F30 + i].trainerName); sub_80DF9E0(gContestMons[gUnknown_02039F30 + i].nickname, GAME_LANGUAGE); - for (j = rnd; opponents[j] != INVALID_U8; j++) + for (j = rnd; opponents[j] != 0xFF; j++) opponents[j] = opponents[j + 1]; opponentsCount--; } @@ -2591,7 +2591,7 @@ void prints_contest_move_description(u16 a) ContestBG_FillBoxWithIncrementingTile(0, categoryTile, 0x0b, 0x1f, 0x05, 0x01, 0x11, 0x01); ContestBG_FillBoxWithIncrementingTile(0, categoryTile + 0x10, 0x0b, 0x20, 0x05, 0x01, 0x11, 0x01); - if (gContestEffects[gContestMoves[a].effect].appeal == INVALID_U8) + if (gContestEffects[gContestMoves[a].effect].appeal == 0xFF) numHearts = 0; else numHearts = gContestEffects[gContestMoves[a].effect].appeal / 10; @@ -2600,7 +2600,7 @@ void prints_contest_move_description(u16 a) ContestBG_FillBoxWithTile(0, 0x5035, 0x15, 0x1f, 0x08, 0x01, 0x11); ContestBG_FillBoxWithTile(0, 0x5012, 0x15, 0x1f, numHearts, 0x01, 0x11); - if (gContestEffects[gContestMoves[a].effect].jam == INVALID_U8) + if (gContestEffects[gContestMoves[a].effect].jam == 0xFF) numHearts = 0; else numHearts = gContestEffects[gContestMoves[a].effect].jam / 10; diff --git a/src/contest_effect.c b/src/contest_effect.c index 6f1c19fe2..760d74d69 100644 --- a/src/contest_effect.c +++ b/src/contest_effect.c @@ -144,7 +144,7 @@ static void ContestEffect_StartleFrontMon(void) break; } shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = INVALID_U8; + shared192D0.jamQueue[1] = 0xFF; idx = WasAtLeastOneOpponentJammed(); } if (idx == 0) @@ -168,7 +168,7 @@ static void ContestEffect_StartlePrevMons(void) shared192D0.jamQueue[j++] = i; } - shared192D0.jamQueue[j] = INVALID_U8; + shared192D0.jamQueue[j] = 0xFF; idx = WasAtLeastOneOpponentJammed(); } if (idx == 0) @@ -211,7 +211,7 @@ static void ContestEffect_StartlePrevMons2(void) u8 rval, jam; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = INVALID_U8; + shared192D0.jamQueue[1] = 0xFF; rval = Random() % 10; if (rval == 0) @@ -288,7 +288,7 @@ static void ContestEffect_StartleMonWithJudgesAttention(void) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = INVALID_U8; + shared192D0.jamQueue[1] = 0xFF; if (WasAtLeastOneOpponentJammed()) numStartled++; } @@ -393,7 +393,7 @@ static void ContestEffect_MakeFollowingMonsNervous(void) s16 oddsMod[4]; s16 odds[4]; - memset(contestantIds, INVALID_U8, ARRAY_COUNT(contestantIds)); + memset(contestantIds, 0xFF, ARRAY_COUNT(contestantIds)); for (i = 0, numAfter = 0; i < 4; i++) { if (shared192D0.turnOrder[shared192D0.contestant] < shared192D0.turnOrder[i] && @@ -431,7 +431,7 @@ static void ContestEffect_MakeFollowingMonsNervous(void) } if (odds[0] != 0) { - for (i = 0; contestantIds[i] != INVALID_U8; i++) + for (i = 0; contestantIds[i] != 0xFF; i++) { if (Random() % 100 < odds[i] + oddsMod[contestantIds[i]]) { @@ -504,7 +504,7 @@ static void ContestEffect_BadlyStartlesMonsInGoodCondition(void) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = INVALID_U8; + shared192D0.jamQueue[1] = 0xFF; if (WasAtLeastOneOpponentJammed()) numHit++; } @@ -755,7 +755,7 @@ static void ContestEffect_NextAppealEarlier(void) for (i = 0; i < 4; i++) turnOrder[i] = sContestantStatus[i].nextTurnOrder; - turnOrder[shared192D0.contestant] = INVALID_U8; + turnOrder[shared192D0.contestant] = 0xFF; for (i = 0; i < 4; i++) { @@ -797,7 +797,7 @@ static void ContestEffect_NextAppealLater(void) for (i = 0; i < 4; i++) turnOrder[i] = sContestantStatus[i].nextTurnOrder; - turnOrder[shared192D0.contestant] = INVALID_U8; + turnOrder[shared192D0.contestant] = 0xFF; for (i = 3; i > -1; i--) { @@ -855,12 +855,12 @@ static void ContestEffect_ScrambleNextTurnOrder(void) for (j = 0; j < 4; j++) { - if (unselectedContestants[j] != INVALID_U8) + if (unselectedContestants[j] != 0xFF) { if (rval == 0) { turnOrder[j] = i; - unselectedContestants[j] = INVALID_U8; + unselectedContestants[j] = 0xFF; break; } else @@ -906,7 +906,7 @@ static void ContestEffect_BadlyStartleMonsWithGoodAppeals(void) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = INVALID_U8; + shared192D0.jamQueue[1] = 0xFF; if (WasAtLeastOneOpponentJammed()) numJammed++; } @@ -974,7 +974,7 @@ static void JamByMoveCategory(u8 category) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = INVALID_U8; + shared192D0.jamQueue[1] = 0xFF; if (WasAtLeastOneOpponentJammed()) numJammed++; } @@ -1013,7 +1013,7 @@ static bool8 WasAtLeastOneOpponentJammed(void) s16 jamBuffer[4] = {0}; int i; - for (i = 0; shared192D0.jamQueue[i] != INVALID_U8; i++) + for (i = 0; shared192D0.jamQueue[i] != 0xFF; i++) { u8 contestant = shared192D0.jamQueue[i]; if (CanUnnerveContestant(contestant)) diff --git a/src/data/contest_moves.h b/src/data/contest_moves.h index ae560c833..5460ac806 100644 --- a/src/data/contest_moves.h +++ b/src/data/contest_moves.h @@ -1,2889 +1,3129 @@ const struct ContestMove gContestMoves[MOVES_COUNT] = { - [MOVE_NONE] = {0}, - - [MOVE_POUND] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_POUND, - .comboMoves = {0}, - }, - - [MOVE_KARATE_CHOP] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_DOUBLE_SLAP] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_POUND}, - }, - - [MOVE_COMET_PUNCH] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MEGA_PUNCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, - }, - - [MOVE_PAY_DAY] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FIRE_PUNCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_FIRE_PUNCH, - .comboMoves = {COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_ICE_PUNCH}, - }, - - [MOVE_ICE_PUNCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_ICE_PUNCH, - .comboMoves = {COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_FIRE_PUNCH}, - }, - - [MOVE_THUNDER_PUNCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_THUNDER_PUNCH, - .comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_FIRE_PUNCH, COMBO_STARTER_ICE_PUNCH}, - }, - - [MOVE_SCRATCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SCRATCH, - .comboMoves = {COMBO_STARTER_LEER}, - }, - - [MOVE_VICE_GRIP] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_VICE_GRIP, - .comboMoves = {0}, - }, - - [MOVE_GUILLOTINE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_VICE_GRIP}, - }, - - [MOVE_RAZOR_WIND] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SWORDS_DANCE] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_SWORDS_DANCE, - .comboMoves = {0}, - }, - - [MOVE_CUT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_GUST] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WING_ATTACK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WHIRLWIND] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FLY] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BIND] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_VICE_GRIP}, - }, - - [MOVE_SLAM] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_POUND}, - }, - - [MOVE_VINE_WHIP] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_STOMP] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0,{0, COMBO_STARTER_LEER}, - }, - - [MOVE_DOUBLE_KICK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MEGA_KICK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, - }, - - [MOVE_JUMP_KICK] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MIND_READER}, - }, - - [MOVE_ROLLING_KICK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SAND_ATTACK] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_SAND_ATTACK, - .comboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_SANDSTORM}, - }, - - [MOVE_HEADBUTT] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_HORN_ATTACK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_HORN_ATTACK, - .comboMoves = {COMBO_STARTER_LEER}, - }, - - [MOVE_FURY_ATTACK] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HORN_ATTACK, COMBO_STARTER_PECK}, - }, - - [MOVE_HORN_DRILL] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HORN_ATTACK}, - }, - - [MOVE_TACKLE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_LEER, COMBO_STARTER_HARDEN}, - }, - - [MOVE_BODY_SLAM] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WRAP] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TAKE_DOWN] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN}, - }, - - [MOVE_THRASH] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAGE}, - }, - - [MOVE_DOUBLE_EDGE] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN}, - }, - - [MOVE_TAIL_WHIP] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARM}, - }, - - [MOVE_POISON_STING] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TWINEEDLE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_PIN_MISSILE] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_LEER] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_LEER, - .comboMoves = {COMBO_STARTER_RAGE, COMBO_STARTER_SCARY_FACE}, - }, - - [MOVE_BITE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LEER, COMBO_STARTER_SCARY_FACE}, - }, - - [MOVE_GROWL] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARM}, - }, - - [MOVE_ROAR] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SING] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_SING, - .comboMoves = {0}, - }, - - [MOVE_SUPERSONIC] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SONIC_BOOM] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DISABLE] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ACID] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_EMBER] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_FLAMETHROWER] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_MIST] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WATER_GUN] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_WATER_SPORT, COMBO_STARTER_MUD_SPORT}, - }, - - [MOVE_HYDRO_PUMP] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_SURF] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_SURF, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_DIVE}, - }, - - [MOVE_ICE_BEAM] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BLIZZARD] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_POWDER_SNOW, COMBO_STARTER_HAIL}, - }, - - [MOVE_PSYBEAM] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_BUBBLE_BEAM] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_AURORA_BEAM] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_HYPER_BEAM] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_PECK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_PECK, - .comboMoves = {0}, - }, - - [MOVE_DRILL_PECK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_PECK}, - }, - - [MOVE_SUBMISSION] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MIND_READER}, - }, - - [MOVE_LOW_KICK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_COUNTER] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_TAUNT}, - }, - - [MOVE_SEISMIC_TOSS] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FAKE_OUT}, - }, - - [MOVE_STRENGTH] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ABSORB] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_MEGA_DRAIN] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_LEECH_SEED] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_GROWTH] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_GROWTH, - .comboMoves = {0}, - }, - - [MOVE_RAZOR_LEAF] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_SOLAR_BEAM] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_GROWTH}, - }, - - [MOVE_POISON_POWDER] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWEET_SCENT}, - }, - - [MOVE_STUN_SPORE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWEET_SCENT}, - }, - - [MOVE_SLEEP_POWDER] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWEET_SCENT}, - }, - - [MOVE_PETAL_DANCE] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_STRING_SHOT] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_STRING_SHOT, - .comboMoves = {0}, - }, - - [MOVE_DRAGON_RAGE] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_DRAGON_RAGE, - .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE}, - }, - - [MOVE_FIRE_SPIN] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_THUNDER_SHOCK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_THUNDERBOLT] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_THUNDER_WAVE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_THUNDER] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON}, - }, - - [MOVE_ROCK_THROW] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_ROCK_THROW, - .comboMoves = {0}, - }, - - [MOVE_EARTHQUAKE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_EARTHQUAKE, - .comboMoves = {0}, - }, - - [MOVE_FISSURE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_EARTHQUAKE}, - }, - - [MOVE_DIG] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TOXIC] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_CONFUSION] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_CONFUSION, - .comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_PSYCHIC] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_PSYCHIC, - .comboMoves = {COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_HYPNOSIS] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_HYPNOSIS, - .comboMoves = {0}, - }, - - [MOVE_MEDITATE] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_AGILITY] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DOUBLE_TEAM}, - }, - - [MOVE_QUICK_ATTACK] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DOUBLE_TEAM}, - }, - - [MOVE_RAGE] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_RAGE, - .comboMoves = {0}, - }, - - [MOVE_TELEPORT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DOUBLE_TEAM, COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION}, - }, - - [MOVE_NIGHT_SHADE] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MIMIC] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SCREECH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DOUBLE_TEAM] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_DOUBLE_TEAM, - .comboMoves = {0}, - }, - - [MOVE_RECOVER] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_HARDEN] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_HARDEN, - .comboMoves = {0}, - }, - - [MOVE_MINIMIZE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SMOKESCREEN] = - { - .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SMOG}, - }, - - [MOVE_CONFUSE_RAY] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WITHDRAW] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_DEFENSE_CURL] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_DEFENSE_CURL, - .comboMoves = {0}, - }, - - [MOVE_BARRIER] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_LIGHT_SCREEN] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_HAZE] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_REFLECT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_FOCUS_ENERGY] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_FOCUS_ENERGY, - .comboMoves = {0}, - }, - - [MOVE_BIDE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_METRONOME] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MIRROR_MOVE] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SELF_DESTRUCT] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_EGG_BOMB] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SOFT_BOILED}, - }, - - [MOVE_LICK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SMOG] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SMOG, - .comboMoves = {0}, - }, - - [MOVE_SLUDGE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SLUDGE, - .comboMoves = {COMBO_STARTER_SLUDGE_BOMB}, - }, - - [MOVE_BONE_CLUB] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_BONE_CLUB, - .comboMoves = {COMBO_STARTER_BONEMERANG, COMBO_STARTER_BONE_RUSH}, - }, - - [MOVE_FIRE_BLAST] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_WATERFALL] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_CLAMP] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_SWIFT] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SKULL_BASH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SPIKE_CANNON] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_CONSTRICT] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_AMNESIA] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_KINESIS] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_KINESIS, - .comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_CONFUSION}, - }, - - [MOVE_SOFT_BOILED] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_SOFT_BOILED, - .comboMoves = {0}, - }, - - [MOVE_HI_JUMP_KICK] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MIND_READER}, - }, - - [MOVE_GLARE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LEER}, - }, - - [MOVE_DREAM_EATER] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HYPNOSIS, COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_POISON_GAS] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BARRAGE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_LEECH_LIFE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_LOVELY_KISS] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SKY_ATTACK] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TRANSFORM] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BUBBLE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_DIZZY_PUNCH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SPORE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FLASH] = - { - .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_PSYWAVE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_SPLASH] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ACID_ARMOR] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_CRABHAMMER] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_EXPLOSION] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FURY_SWIPES] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SCRATCH}, - }, - - [MOVE_BONEMERANG] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_BONEMERANG, - .comboMoves = {COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONE_RUSH}, - }, - - [MOVE_REST] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_REST, - .comboMoves = {COMBO_STARTER_BELLY_DRUM, COMBO_STARTER_CHARM, COMBO_STARTER_YAWN}, - }, - - [MOVE_ROCK_SLIDE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ROCK_THROW}, - }, - - [MOVE_HYPER_FANG] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SHARPEN] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_CONVERSION] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TRI_ATTACK] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LOCK_ON}, - }, - - [MOVE_SUPER_FANG] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SCARY_FACE}, - }, - - [MOVE_SLASH] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWORDS_DANCE, COMBO_STARTER_SCRATCH}, - }, - - [MOVE_SUBSTITUTE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_STRUGGLE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SKETCH] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TRIPLE_KICK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_THIEF] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SPIDER_WEB] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_STRING_SHOT}, - }, - - [MOVE_MIND_READER] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_MIND_READER, - .comboMoves = {0}, - }, - - [MOVE_NIGHTMARE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HYPNOSIS}, - }, - - [MOVE_FLAME_WHEEL] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_SNORE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_REST}, - }, - - [MOVE_CURSE] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_CURSE, - .comboMoves = {0}, - }, - - [MOVE_FLAIL] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ENDURE}, - }, - - [MOVE_CONVERSION_2] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_AEROBLAST] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_COTTON_SPORE] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_REVERSAL] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ENDURE}, - }, - - [MOVE_SPITE] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CURSE}, - }, - - [MOVE_POWDER_SNOW] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_POWDER_SNOW, - .comboMoves = {COMBO_STARTER_HAIL}, - }, - - [MOVE_PROTECT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HARDEN}, - }, - - [MOVE_MACH_PUNCH] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SCARY_FACE] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SCARY_FACE, - .comboMoves = {COMBO_STARTER_RAGE, COMBO_STARTER_LEER}, - }, - - [MOVE_FAINT_ATTACK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FAKE_OUT, COMBO_STARTER_LEER, COMBO_STARTER_POUND}, - }, - - [MOVE_SWEET_KISS] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARM}, - }, - - [MOVE_BELLY_DRUM] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_BELLY_DRUM, - .comboMoves = {0}, - }, - - [MOVE_SLUDGE_BOMB] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SLUDGE_BOMB, - .comboMoves = {COMBO_STARTER_SLUDGE}, - }, - - [MOVE_MUD_SLAP] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_MUD_SLAP, - .comboMoves = {COMBO_STARTER_SAND_ATTACK, COMBO_STARTER_MUD_SPORT, COMBO_STARTER_SANDSTORM}, - }, - - [MOVE_OCTAZOOKA] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON}, - }, - - [MOVE_SPIKES] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ZAP_CANNON] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LOCK_ON}, - }, - - [MOVE_FORESIGHT] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DESTINY_BOND] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_CURSE, COMBO_STARTER_ENDURE}, - }, - - [MOVE_PERISH_SONG] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_SING}, - }, - - [MOVE_ICY_WIND] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DETECT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_TAUNT}, - }, - - [MOVE_BONE_RUSH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_BONE_RUSH, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONEMERANG}, - }, - - [MOVE_LOCK_ON] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_LOCK_ON, - .comboMoves = {0}, - }, - - [MOVE_OUTRAGE] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SANDSTORM] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SANDSTORM, - .comboMoves = {0}, - }, - - [MOVE_GIGA_DRAIN] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_ENDURE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_ENDURE, - .comboMoves = {0}, - }, - - [MOVE_CHARM] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_CHARM, - .comboMoves = {0}, - }, - - [MOVE_ROLLOUT] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_HARDEN}, - }, - - [MOVE_FALSE_SWIPE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_SWAGGER] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MILK_DRINK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SPARK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_FURY_CUTTER] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_STEEL_WING] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MEAN_LOOK] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_MEAN_LOOK, - .comboMoves = {COMBO_STARTER_CURSE}, - }, - - [MOVE_ATTRACT] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SLEEP_TALK] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_REST}, - }, - - [MOVE_HEAL_BELL] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_RETURN] = - { - .effect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_PRESENT] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FRUSTRATION] = - { - .effect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SAFEGUARD] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_PAIN_SPLIT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ENDURE}, - }, - - [MOVE_SACRED_FIRE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_MAGNITUDE] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DYNAMIC_PUNCH] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, - }, - - [MOVE_MEGAHORN] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DRAGON_BREATH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_DRAGON_BREATH, - .comboMoves = {COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE}, - }, - - [MOVE_BATON_PASS] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ENCORE] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_PURSUIT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_RAPID_SPIN] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SWEET_SCENT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_SWEET_SCENT, - .comboMoves = {0}, - }, - - [MOVE_IRON_TAIL] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_METAL_CLAW] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_METAL_SOUND}, - }, - - [MOVE_VITAL_THROW] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FAKE_OUT}, - }, - - [MOVE_MORNING_SUN] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_SYNTHESIS] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_MOONLIGHT] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_HIDDEN_POWER] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_CROSS_CHOP] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_TWISTER] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_RAIN_DANCE] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_RAIN_DANCE, - .comboMoves = {0}, - }, - - [MOVE_SUNNY_DAY] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_SUNNY_DAY, - .comboMoves = {0}, - }, - - [MOVE_CRUNCH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SCARY_FACE}, - }, - - [MOVE_MIRROR_COAT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_TAUNT}, - }, - - [MOVE_PSYCH_UP] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_EXTREME_SPEED] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ANCIENT_POWER] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SHADOW_BALL] = - { - .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FUTURE_SIGHT] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_ROCK_SMASH] = - { - .effect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WHIRLPOOL] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_BEAT_UP] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FAKE_OUT] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_FAKE_OUT, - .comboMoves = {0}, - }, - - [MOVE_UPROAR] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_STOCKPILE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_STOCKPILE, - .comboMoves = {0}, - }, - - [MOVE_SPIT_UP] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_STOCKPILE}, - }, - - [MOVE_SWALLOW] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_STOCKPILE}, - }, - - [MOVE_HEAT_WAVE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_HAIL] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_HAIL, - .comboMoves = {0}, - }, - - [MOVE_TORMENT] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FLATTER] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARM}, - }, - - [MOVE_WILL_O_WISP] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_MEMENTO] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FACADE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FOCUS_PUNCH] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_SMELLING_SALT] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FOLLOW_ME] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_NATURE_POWER] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_CHARGE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_CHARGE, - .comboMoves = {0}, - }, - - [MOVE_TAUNT] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_TAUNT, - .comboMoves = {0}, - }, - - [MOVE_HELPING_HAND] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TRICK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ROLE_PLAY] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WISH] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ASSIST] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_INGRAIN] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SUPERPOWER] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LOCK_ON}, - }, - - [MOVE_MAGIC_COAT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_RECYCLE] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_REVENGE] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BRICK_BREAK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_YAWN] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_YAWN, - .comboMoves = {0}, - }, - - [MOVE_KNOCK_OFF] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FAKE_OUT}, - }, - - [MOVE_ENDEAVOR] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ENDURE}, - }, - - [MOVE_ERUPTION] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ENDURE, COMBO_STARTER_EARTHQUAKE, COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_SKILL_SWAP] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_IMPRISON] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_REFRESH] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_WATER_SPORT, COMBO_STARTER_SING}, - }, - - [MOVE_GRUDGE] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CURSE}, - }, - - [MOVE_SNATCH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SECRET_POWER] = - { - .effect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DIVE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_DIVE, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SURF}, - }, - - [MOVE_ARM_THRUST] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_FAKE_OUT}, - }, - - [MOVE_CAMOUFLAGE] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TAIL_GLOW] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_LUSTER_PURGE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_MIST_BALL] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_FEATHER_DANCE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TEETER_DANCE] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BLAZE_KICK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_MUD_SPORT] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_MUD_SPORT, - .comboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_WATER_SPORT}, - }, - - [MOVE_ICE_BALL] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_NEEDLE_ARM] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SLACK_OFF] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_YAWN}, - }, - - [MOVE_HYPER_VOICE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_POISON_FANG] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_CRUSH_CLAW] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_BLAST_BURN] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_HYDRO_CANNON] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_METEOR_MASH] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ASTONISH] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WEATHER_BALL] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_HAIL, COMBO_STARTER_SANDSTORM}, - }, - - [MOVE_AROMATHERAPY] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FAKE_TEARS] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_AIR_CUTTER] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_OVERHEAT] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_ODOR_SLEUTH] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ROCK_TOMB] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ROCK_THROW}, - }, - - [MOVE_SILVER_WIND] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_METAL_SOUND] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_METAL_SOUND, - .comboMoves = {0}, - }, - - [MOVE_GRASS_WHISTLE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TICKLE] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_COSMIC_POWER] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WATER_SPOUT] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_SIGNAL_BEAM] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SHADOW_PUNCH] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_EXTRASENSORY] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SKY_UPPERCUT] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_SAND_TOMB] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SANDSTORM}, - }, - - [MOVE_SHEER_COLD] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MUDDY_WATER] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_BULLET_SEED] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_AERIAL_ACE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ICICLE_SPEAR] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_IRON_DEFENSE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BLOCK] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_HOWL] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DRAGON_CLAW] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE}, - }, - - [MOVE_FRENZY_PLANT] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_BULK_UP] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BOUNCE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MUD_SHOT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_POISON_TAIL] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_COVET] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_VOLT_TACKLE] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_MAGICAL_LEAF] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_WATER_SPORT] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_WATER_SPORT, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_MUD_SPORT}, - }, - - [MOVE_CALM_MIND] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_CALM_MIND, - .comboMoves = {0}, - }, - - [MOVE_LEAF_BLADE] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DRAGON_DANCE] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_DRAGON_DANCE, - .comboMoves = {COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_BREATH}, - }, - - [MOVE_ROCK_BLAST] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SHOCK_WAVE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_WATER_PULSE] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_DOOM_DESIRE] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_PSYCHO_BOOST] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, + [MOVE_NONE] = {0}, + + [MOVE_POUND] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_POUND, + .comboMoves = {0}, + }, + + [MOVE_KARATE_CHOP] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + }, + + [MOVE_DOUBLE_SLAP] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_POUND}, + }, + + [MOVE_COMET_PUNCH] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MEGA_PUNCH] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, + }, + + [MOVE_PAY_DAY] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FIRE_PUNCH] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_FIRE_PUNCH, + .comboMoves = {COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_ICE_PUNCH}, + }, + + [MOVE_ICE_PUNCH] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_ICE_PUNCH, + .comboMoves = {COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_FIRE_PUNCH}, + }, + + [MOVE_THUNDER_PUNCH] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_THUNDER_PUNCH, + .comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_FIRE_PUNCH, COMBO_STARTER_ICE_PUNCH}, + }, + + [MOVE_SCRATCH] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_SCRATCH, + .comboMoves = {COMBO_STARTER_LEER}, + }, + + [MOVE_VICE_GRIP] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_VICE_GRIP, + .comboMoves = {0}, + }, + + [MOVE_GUILLOTINE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_VICE_GRIP}, + }, + + [MOVE_RAZOR_WIND] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SWORDS_DANCE] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_SWORDS_DANCE, + .comboMoves = {0}, + }, + + [MOVE_CUT] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, + }, + + [MOVE_GUST] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WING_ATTACK] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WHIRLWIND] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FLY] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BIND] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_VICE_GRIP}, + }, + + [MOVE_SLAM] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_POUND}, + }, + + [MOVE_VINE_WHIP] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_STOMP] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0,{0, COMBO_STARTER_LEER}, + }, + + [MOVE_DOUBLE_KICK] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MEGA_KICK] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, + }, + + [MOVE_JUMP_KICK] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_MIND_READER}, + }, + + [MOVE_ROLLING_KICK] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SAND_ATTACK] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_SAND_ATTACK, + .comboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_SANDSTORM}, + }, + + [MOVE_HEADBUTT] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + }, + + [MOVE_HORN_ATTACK] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_HORN_ATTACK, + .comboMoves = {COMBO_STARTER_LEER}, + }, + + [MOVE_FURY_ATTACK] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_HORN_ATTACK, COMBO_STARTER_PECK}, + }, + + [MOVE_HORN_DRILL] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_HORN_ATTACK}, + }, + + [MOVE_TACKLE] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_LEER, COMBO_STARTER_HARDEN}, + }, + + [MOVE_BODY_SLAM] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WRAP] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TAKE_DOWN] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN}, + }, + + [MOVE_THRASH] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAGE}, + }, + + [MOVE_DOUBLE_EDGE] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN}, + }, + + [MOVE_TAIL_WHIP] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARM}, + }, + + [MOVE_POISON_STING] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TWINEEDLE] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_PIN_MISSILE] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_LEER] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_LEER, + .comboMoves = {COMBO_STARTER_RAGE, COMBO_STARTER_SCARY_FACE}, + }, + + [MOVE_BITE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_LEER, COMBO_STARTER_SCARY_FACE}, + }, + + [MOVE_GROWL] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARM}, + }, + + [MOVE_ROAR] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SING] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_SING, + .comboMoves = {0}, + }, + + [MOVE_SUPERSONIC] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SONIC_BOOM] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DISABLE] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ACID] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_EMBER] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_FLAMETHROWER] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_MIST] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WATER_GUN] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_WATER_SPORT, COMBO_STARTER_MUD_SPORT}, + }, + + [MOVE_HYDRO_PUMP] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_SURF] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_SURF, + .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_DIVE}, + }, + + [MOVE_ICE_BEAM] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BLIZZARD] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_POWDER_SNOW, COMBO_STARTER_HAIL}, + }, + + [MOVE_PSYBEAM] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_BUBBLE_BEAM] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_AURORA_BEAM] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_HYPER_BEAM] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_PECK] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_PECK, + .comboMoves = {0}, + }, + + [MOVE_DRILL_PECK] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_PECK}, + }, + + [MOVE_SUBMISSION] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_MIND_READER}, + }, + + [MOVE_LOW_KICK] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_COUNTER] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_TAUNT}, + }, + + [MOVE_SEISMIC_TOSS] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FAKE_OUT}, + }, + + [MOVE_STRENGTH] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ABSORB] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_MEGA_DRAIN] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_LEECH_SEED] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_GROWTH] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_GROWTH, + .comboMoves = {0}, + }, + + [MOVE_RAZOR_LEAF] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_SOLAR_BEAM] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_GROWTH}, + }, + + [MOVE_POISON_POWDER] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWEET_SCENT}, + }, + + [MOVE_STUN_SPORE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWEET_SCENT}, + }, + + [MOVE_SLEEP_POWDER] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWEET_SCENT}, + }, + + [MOVE_PETAL_DANCE] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_STRING_SHOT] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_STRING_SHOT, + .comboMoves = {0}, + }, + + [MOVE_DRAGON_RAGE] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_DRAGON_RAGE, + .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE}, + }, + + [MOVE_FIRE_SPIN] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_THUNDER_SHOCK] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARGE}, + }, + + [MOVE_THUNDERBOLT] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARGE}, + }, + + [MOVE_THUNDER_WAVE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARGE}, + }, + + [MOVE_THUNDER] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON}, + }, + + [MOVE_ROCK_THROW] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_ROCK_THROW, + .comboMoves = {0}, + }, + + [MOVE_EARTHQUAKE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_EARTHQUAKE, + .comboMoves = {0}, + }, + + [MOVE_FISSURE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_EARTHQUAKE}, + }, + + [MOVE_DIG] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TOXIC] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_CONFUSION] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_CONFUSION, + .comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_PSYCHIC] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_PSYCHIC, + .comboMoves = {COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_HYPNOSIS] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_HYPNOSIS, + .comboMoves = {0}, + }, + + [MOVE_MEDITATE] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_AGILITY] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_DOUBLE_TEAM}, + }, + + [MOVE_QUICK_ATTACK] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_DOUBLE_TEAM}, + }, + + [MOVE_RAGE] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_RAGE, + .comboMoves = {0}, + }, + + [MOVE_TELEPORT] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_DOUBLE_TEAM, COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION}, + }, + + [MOVE_NIGHT_SHADE] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MIMIC] = + { + .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SCREECH] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DOUBLE_TEAM] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_DOUBLE_TEAM, + .comboMoves = {0}, + }, + + [MOVE_RECOVER] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_HARDEN] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_HARDEN, + .comboMoves = {0}, + }, + + [MOVE_MINIMIZE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SMOKESCREEN] = + { + .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SMOG}, + }, + + [MOVE_CONFUSE_RAY] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WITHDRAW] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_DEFENSE_CURL] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_DEFENSE_CURL, + .comboMoves = {0}, + }, + + [MOVE_BARRIER] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_LIGHT_SCREEN] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_HAZE] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_REFLECT] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_FOCUS_ENERGY] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_FOCUS_ENERGY, + .comboMoves = {0}, + }, + + [MOVE_BIDE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_METRONOME] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MIRROR_MOVE] = + { + .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SELF_DESTRUCT] = + { + .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_EGG_BOMB] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SOFT_BOILED}, + }, + + [MOVE_LICK] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SMOG] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_SMOG, + .comboMoves = {0}, + }, + + [MOVE_SLUDGE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_SLUDGE, + .comboMoves = {COMBO_STARTER_SLUDGE_BOMB}, + }, + + [MOVE_BONE_CLUB] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_BONE_CLUB, + .comboMoves = {COMBO_STARTER_BONEMERANG, COMBO_STARTER_BONE_RUSH}, + }, + + [MOVE_FIRE_BLAST] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_WATERFALL] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_CLAMP] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_SWIFT] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SKULL_BASH] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SPIKE_CANNON] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_CONSTRICT] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_AMNESIA] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_KINESIS] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_KINESIS, + .comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_CONFUSION}, + }, + + [MOVE_SOFT_BOILED] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_SOFT_BOILED, + .comboMoves = {0}, + }, + + [MOVE_HI_JUMP_KICK] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_MIND_READER}, + }, + + [MOVE_GLARE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_LEER}, + }, + + [MOVE_DREAM_EATER] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_HYPNOSIS, COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_POISON_GAS] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BARRAGE] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_LEECH_LIFE] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_LOVELY_KISS] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SKY_ATTACK] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TRANSFORM] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BUBBLE] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_DIZZY_PUNCH] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SPORE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FLASH] = + { + .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_PSYWAVE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_SPLASH] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ACID_ARMOR] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_CRABHAMMER] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SWORDS_DANCE}, + }, + + [MOVE_EXPLOSION] = + { + .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FURY_SWIPES] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SCRATCH}, + }, + + [MOVE_BONEMERANG] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_BONEMERANG, + .comboMoves = {COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONE_RUSH}, + }, + + [MOVE_REST] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_REST, + .comboMoves = {COMBO_STARTER_BELLY_DRUM, COMBO_STARTER_CHARM, COMBO_STARTER_YAWN}, + }, + + [MOVE_ROCK_SLIDE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_ROCK_THROW}, + }, + + [MOVE_HYPER_FANG] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SHARPEN] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_CONVERSION] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TRI_ATTACK] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_LOCK_ON}, + }, + + [MOVE_SUPER_FANG] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SCARY_FACE}, + }, + + [MOVE_SLASH] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWORDS_DANCE, COMBO_STARTER_SCRATCH}, + }, + + [MOVE_SUBSTITUTE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_STRUGGLE] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SKETCH] = + { + .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TRIPLE_KICK] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + }, + + [MOVE_THIEF] = + { + .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SPIDER_WEB] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_STRING_SHOT}, + }, + + [MOVE_MIND_READER] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_MIND_READER, + .comboMoves = {0}, + }, + + [MOVE_NIGHTMARE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_HYPNOSIS}, + }, + + [MOVE_FLAME_WHEEL] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_SNORE] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_REST}, + }, + + [MOVE_CURSE] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_CURSE, + .comboMoves = {0}, + }, + + [MOVE_FLAIL] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_ENDURE}, + }, + + [MOVE_CONVERSION_2] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_AEROBLAST] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_COTTON_SPORE] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_REVERSAL] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_ENDURE}, + }, + + [MOVE_SPITE] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CURSE}, + }, + + [MOVE_POWDER_SNOW] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_POWDER_SNOW, + .comboMoves = {COMBO_STARTER_HAIL}, + }, + + [MOVE_PROTECT] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_HARDEN}, + }, + + [MOVE_MACH_PUNCH] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SCARY_FACE] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_SCARY_FACE, + .comboMoves = {COMBO_STARTER_RAGE, COMBO_STARTER_LEER}, + }, + + [MOVE_FAINT_ATTACK] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FAKE_OUT, COMBO_STARTER_LEER, COMBO_STARTER_POUND}, + }, + + [MOVE_SWEET_KISS] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARM}, + }, + + [MOVE_BELLY_DRUM] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_BELLY_DRUM, + .comboMoves = {0}, + }, + + [MOVE_SLUDGE_BOMB] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_SLUDGE_BOMB, + .comboMoves = {COMBO_STARTER_SLUDGE}, + }, + + [MOVE_MUD_SLAP] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_MUD_SLAP, + .comboMoves = {COMBO_STARTER_SAND_ATTACK, COMBO_STARTER_MUD_SPORT, COMBO_STARTER_SANDSTORM}, + }, + + [MOVE_OCTAZOOKA] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON}, + }, + + [MOVE_SPIKES] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ZAP_CANNON] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_LOCK_ON}, + }, + + [MOVE_FORESIGHT] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DESTINY_BOND] = + { + .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_CURSE, COMBO_STARTER_ENDURE}, + }, + + [MOVE_PERISH_SONG] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_SING}, + }, + + [MOVE_ICY_WIND] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DETECT] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_TAUNT}, + }, + + [MOVE_BONE_RUSH] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_BONE_RUSH, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONEMERANG}, + }, + + [MOVE_LOCK_ON] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_LOCK_ON, + .comboMoves = {0}, + }, + + [MOVE_OUTRAGE] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SANDSTORM] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_SANDSTORM, + .comboMoves = {0}, + }, + + [MOVE_GIGA_DRAIN] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_ENDURE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_ENDURE, + .comboMoves = {0}, + }, + + [MOVE_CHARM] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_CHARM, + .comboMoves = {0}, + }, + + [MOVE_ROLLOUT] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_HARDEN}, + }, + + [MOVE_FALSE_SWIPE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, + }, + + [MOVE_SWAGGER] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MILK_DRINK] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SPARK] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARGE}, + }, + + [MOVE_FURY_CUTTER] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, + }, + + [MOVE_STEEL_WING] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MEAN_LOOK] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_MEAN_LOOK, + .comboMoves = {COMBO_STARTER_CURSE}, + }, + + [MOVE_ATTRACT] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SLEEP_TALK] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_REST}, + }, + + [MOVE_HEAL_BELL] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_RETURN] = + { + .effect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_PRESENT] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FRUSTRATION] = + { + .effect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SAFEGUARD] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_PAIN_SPLIT] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_ENDURE}, + }, + + [MOVE_SACRED_FIRE] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_MAGNITUDE] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DYNAMIC_PUNCH] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, + }, + + [MOVE_MEGAHORN] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DRAGON_BREATH] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_DRAGON_BREATH, + .comboMoves = {COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE}, + }, + + [MOVE_BATON_PASS] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ENCORE] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_PURSUIT] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_RAPID_SPIN] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SWEET_SCENT] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_SWEET_SCENT, + .comboMoves = {0}, + }, + + [MOVE_IRON_TAIL] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_METAL_CLAW] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_METAL_SOUND}, + }, + + [MOVE_VITAL_THROW] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FAKE_OUT}, + }, + + [MOVE_MORNING_SUN] = + { + .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_SYNTHESIS] = + { + .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_MOONLIGHT] = + { + .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_HIDDEN_POWER] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_CROSS_CHOP] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + }, + + [MOVE_TWISTER] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_RAIN_DANCE] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_RAIN_DANCE, + .comboMoves = {0}, + }, + + [MOVE_SUNNY_DAY] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_SUNNY_DAY, + .comboMoves = {0}, + }, + + [MOVE_CRUNCH] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SCARY_FACE}, + }, + + [MOVE_MIRROR_COAT] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_TAUNT}, + }, + + [MOVE_PSYCH_UP] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_EXTREME_SPEED] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ANCIENT_POWER] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SHADOW_BALL] = + { + .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FUTURE_SIGHT] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_ROCK_SMASH] = + { + .effect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WHIRLPOOL] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_BEAT_UP] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FAKE_OUT] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_FAKE_OUT, + .comboMoves = {0}, + }, + + [MOVE_UPROAR] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_STOCKPILE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_STOCKPILE, + .comboMoves = {0}, + }, + + [MOVE_SPIT_UP] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_STOCKPILE}, + }, + + [MOVE_SWALLOW] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_STOCKPILE}, + }, + + [MOVE_HEAT_WAVE] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_HAIL] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_HAIL, + .comboMoves = {0}, + }, + + [MOVE_TORMENT] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FLATTER] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARM}, + }, + + [MOVE_WILL_O_WISP] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_MEMENTO] = + { + .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FACADE] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FOCUS_PUNCH] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + }, + + [MOVE_SMELLING_SALT] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FOLLOW_ME] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_NATURE_POWER] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_CHARGE] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_CHARGE, + .comboMoves = {0}, + }, + + [MOVE_TAUNT] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_TAUNT, + .comboMoves = {0}, + }, + + [MOVE_HELPING_HAND] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TRICK] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ROLE_PLAY] = + { + .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WISH] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ASSIST] = + { + .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_INGRAIN] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SUPERPOWER] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_LOCK_ON}, + }, + + [MOVE_MAGIC_COAT] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_RECYCLE] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_REVENGE] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BRICK_BREAK] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + }, + + [MOVE_YAWN] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_YAWN, + .comboMoves = {0}, + }, + + [MOVE_KNOCK_OFF] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FAKE_OUT}, + }, + + [MOVE_ENDEAVOR] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_ENDURE}, + }, + + [MOVE_ERUPTION] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_ENDURE, COMBO_STARTER_EARTHQUAKE, COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_SKILL_SWAP] = + { + .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_IMPRISON] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_REFRESH] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_WATER_SPORT, COMBO_STARTER_SING}, + }, + + [MOVE_GRUDGE] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CURSE}, + }, + + [MOVE_SNATCH] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SECRET_POWER] = + { + .effect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DIVE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_DIVE, + .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SURF}, + }, + + [MOVE_ARM_THRUST] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_FAKE_OUT}, + }, + + [MOVE_CAMOUFLAGE] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TAIL_GLOW] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_LUSTER_PURGE] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_MIST_BALL] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_FEATHER_DANCE] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TEETER_DANCE] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BLAZE_KICK] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_MUD_SPORT] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_MUD_SPORT, + .comboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_WATER_SPORT}, + }, + + [MOVE_ICE_BALL] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_NEEDLE_ARM] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SLACK_OFF] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_YAWN}, + }, + + [MOVE_HYPER_VOICE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_POISON_FANG] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_CRUSH_CLAW] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, + }, + + [MOVE_BLAST_BURN] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_HYDRO_CANNON] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_METEOR_MASH] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ASTONISH] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WEATHER_BALL] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_HAIL, COMBO_STARTER_SANDSTORM}, + }, + + [MOVE_AROMATHERAPY] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FAKE_TEARS] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_AIR_CUTTER] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_OVERHEAT] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_ODOR_SLEUTH] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ROCK_TOMB] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_ROCK_THROW}, + }, + + [MOVE_SILVER_WIND] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_METAL_SOUND] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_METAL_SOUND, + .comboMoves = {0}, + }, + + [MOVE_GRASS_WHISTLE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TICKLE] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_COSMIC_POWER] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WATER_SPOUT] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_SIGNAL_BEAM] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SHADOW_PUNCH] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_EXTRASENSORY] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SKY_UPPERCUT] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + }, + + [MOVE_SAND_TOMB] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SANDSTORM}, + }, + + [MOVE_SHEER_COLD] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MUDDY_WATER] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_BULLET_SEED] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_AERIAL_ACE] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ICICLE_SPEAR] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_IRON_DEFENSE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BLOCK] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_HOWL] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DRAGON_CLAW] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE}, + }, + + [MOVE_FRENZY_PLANT] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_BULK_UP] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BOUNCE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MUD_SHOT] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_POISON_TAIL] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_COVET] = + { + .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_VOLT_TACKLE] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARGE}, + }, + + [MOVE_MAGICAL_LEAF] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_WATER_SPORT] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_WATER_SPORT, + .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_MUD_SPORT}, + }, + + [MOVE_CALM_MIND] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_CALM_MIND, + .comboMoves = {0}, + }, + + [MOVE_LEAF_BLADE] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DRAGON_DANCE] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_DRAGON_DANCE, + .comboMoves = {COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_BREATH}, + }, + + [MOVE_ROCK_BLAST] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SHOCK_WAVE] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARGE}, + }, + + [MOVE_WATER_PULSE] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_DOOM_DESIRE] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_PSYCHO_BOOST] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, }; const struct ContestEffect gContestEffects[] = { - {0, 40, 0}, // CONTEST_EFFECT_HIGHLY_APPEALING - {0, 60, 0}, // CONTEST_EFFECT_USER_MORE_EASILY_STARTLED - {0, 80, 0}, // CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES - {0, 30, 0}, // CONTEST_EFFECT_REPETITION_NOT_BORING - {1, 20, 0}, // CONTEST_EFFECT_AVOID_STARTLE_ONCE - {1, 10, 0}, // CONTEST_EFFECT_AVOID_STARTLE - {1, 30, 0}, // CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY - {1, 30, 0}, // CONTEST_EFFECT_USER_LESS_EASILY_STARTLED - {2, 30, 20}, // CONTEST_EFFECT_STARTLE_FRONT_MON - {3, 30, 10}, // CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS - {2, 20, 30}, // CONTEST_EFFECT_STARTLE_PREV_MON - {3, 20, 20}, // CONTEST_EFFECT_STARTLE_PREV_MONS - {2, 10, 40}, // CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON - {3, 10, 30}, // CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS - {2, 30, 20}, // CONTEST_EFFECT_STARTLE_PREV_MON_2 - {3, 30, 10}, // CONTEST_EFFECT_STARTLE_PREV_MONS_2 - {4, 30, 0}, // CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION - {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION - {3, 40, 40}, // CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN - {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL - {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL - {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL - {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL - {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL - {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL - {4, 20, 0}, // CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS - {4, 20, 0}, // CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS - {4, 30, 0}, // CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS - {3, 30, 10}, // CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION - {5, 20, 0}, // CONTEST_EFFECT_BETTER_IF_FIRST - {5, 20, 0}, // CONTEST_EFFECT_BETTER_IF_LAST - {5, 10, 0}, // CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES - {5, 10, 0}, // CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE - {5, 10, 0}, // CONTEST_EFFECT_BETTER_WHEN_LATER - {5, 10, 0}, // CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING - {5, 20, 0}, // CONTEST_EFFECT_BETTER_IF_SAME_TYPE - {5, 20, 0}, // CONTEST_EFFECT_BETTER_IF_DIFF_TYPE - {5, 30, 0}, // CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL - {5, 10, 0}, // CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS - {5, 10, 0}, // CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION - {6, 30, 0}, // CONTEST_EFFECT_NEXT_APPEAL_EARLIER - {6, 30, 0}, // CONTEST_EFFECT_NEXT_APPEAL_LATER - {6, 30, 0}, // CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER - {6, 30, 0}, // CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER - {5, 10, 0}, // CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST - {3, 20, 10}, // CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS - {5, 10, 0}, // CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED - {4, 30, 0} // CONTEST_EFFECT_DONT_EXCITE_AUDIENCE + [CONTEST_EFFECT_HIGHLY_APPEALING] = + { + .effectType = 0, + .appeal = 40, + .jam = 0, + }, + [CONTEST_EFFECT_USER_MORE_EASILY_STARTLED] = + { + .effectType = 0, + .appeal = 60, + .jam = 0, + }, + [CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES] = + { + .effectType = 0, + .appeal = 80, + .jam = 0, + }, + [CONTEST_EFFECT_REPETITION_NOT_BORING] = + { + .effectType = 0, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_AVOID_STARTLE_ONCE] = + { + .effectType = 1, + .appeal = 20, + .jam = 0, + }, + [CONTEST_EFFECT_AVOID_STARTLE] = + { + .effectType = 1, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY] = + { + .effectType = 1, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_USER_LESS_EASILY_STARTLED] = + { + .effectType = 1, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_STARTLE_FRONT_MON] = + { + .effectType = 2, + .appeal = 30, + .jam = 20, + }, + [CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS] = + { + .effectType = 3, + .appeal = 30, + .jam = 10, + }, + [CONTEST_EFFECT_STARTLE_PREV_MON] = + { + .effectType = 2, + .appeal = 20, + .jam = 30, + }, + [CONTEST_EFFECT_STARTLE_PREV_MONS] = + { + .effectType = 3, + .appeal = 20, + .jam = 20, + }, + [CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON] = + { + .effectType = 2, + .appeal = 10, + .jam = 40, + }, + [CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS] = + { + .effectType = 3, + .appeal = 10, + .jam = 30, + }, + [CONTEST_EFFECT_STARTLE_PREV_MON_2] = + { + .effectType = 2, + .appeal = 30, + .jam = 20, + }, + [CONTEST_EFFECT_STARTLE_PREV_MONS_2] = + { + .effectType = 3, + .appeal = 30, + .jam = 10, + }, + [CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION] = + { + .effectType = 4, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN] = + { + .effectType = 3, + .appeal = 40, + .jam = 40, + }, + [CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS] = + { + .effectType = 4, + .appeal = 20, + .jam = 0, + }, + [CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS] = + { + .effectType = 4, + .appeal = 20, + .jam = 0, + }, + [CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS] = + { + .effectType = 4, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION] = + { + .effectType = 3, + .appeal = 30, + .jam = 10, + }, + [CONTEST_EFFECT_BETTER_IF_FIRST] = + { + .effectType = 5, + .appeal = 20, + .jam = 0, + }, + [CONTEST_EFFECT_BETTER_IF_LAST] = + { + .effectType = 5, + .appeal = 20, + .jam = 0, + }, + [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_BETTER_WHEN_LATER] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_BETTER_IF_SAME_TYPE] = + { + .effectType = 5, + .appeal = 20, + .jam = 0, + }, + [CONTEST_EFFECT_BETTER_IF_DIFF_TYPE] = + { + .effectType = 5, + .appeal = 20, + .jam = 0, + }, + [CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL] = + { + .effectType = 5, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_NEXT_APPEAL_EARLIER] = + { + .effectType = 6, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_NEXT_APPEAL_LATER] = + { + .effectType = 6, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER] = + { + .effectType = 6, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER] = + { + .effectType = 6, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_DONT_EXCITE_AUDIENCE] = + { + .effectType = 4, + .appeal = 30, + .jam = 0, + }, }; // A lookup table with TRUE for each combo starter ID and FALSE for ID 0, diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h index f57e294c3..2f504737a 100755 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h @@ -247,253 +247,253 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldM const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = { - &gEventObjectGraphicsInfo_BrendanNormal, - &gEventObjectGraphicsInfo_BrendanMachBike, - &gEventObjectGraphicsInfo_BrendanSurfing, - &gEventObjectGraphicsInfo_BrendanFieldMove, - &gEventObjectGraphicsInfo_QuintyPlump, - &gEventObjectGraphicsInfo_NinjaBoy, - &gEventObjectGraphicsInfo_Twin, - &gEventObjectGraphicsInfo_Boy1, - &gEventObjectGraphicsInfo_Girl1, - &gEventObjectGraphicsInfo_Boy2, - &gEventObjectGraphicsInfo_Girl2, - &gEventObjectGraphicsInfo_LittleBoy, - &gEventObjectGraphicsInfo_LittleGirl, - &gEventObjectGraphicsInfo_Boy3, - &gEventObjectGraphicsInfo_Girl3, - &gEventObjectGraphicsInfo_RichBoy, - &gEventObjectGraphicsInfo_Woman1, - &gEventObjectGraphicsInfo_FatMan, - &gEventObjectGraphicsInfo_PokefanF, - &gEventObjectGraphicsInfo_Man1, - &gEventObjectGraphicsInfo_Woman2, - &gEventObjectGraphicsInfo_ExpertM, - &gEventObjectGraphicsInfo_ExpertF, - &gEventObjectGraphicsInfo_Man2, - &gEventObjectGraphicsInfo_Woman3, - &gEventObjectGraphicsInfo_PokefanM, - &gEventObjectGraphicsInfo_Woman4, - &gEventObjectGraphicsInfo_Cook, - &gEventObjectGraphicsInfo_LinkReceptionist, - &gEventObjectGraphicsInfo_OldMan, - &gEventObjectGraphicsInfo_OldWoman, - &gEventObjectGraphicsInfo_Camper, - &gEventObjectGraphicsInfo_Picnicker, - &gEventObjectGraphicsInfo_Man3, - &gEventObjectGraphicsInfo_Woman5, - &gEventObjectGraphicsInfo_Youngster, - &gEventObjectGraphicsInfo_BugCatcher, - &gEventObjectGraphicsInfo_PsychicM, - &gEventObjectGraphicsInfo_SchoolKidM, - &gEventObjectGraphicsInfo_Maniac, - &gEventObjectGraphicsInfo_HexManiac, - &gEventObjectGraphicsInfo_Rayquaza1, - &gEventObjectGraphicsInfo_SwimmerM, - &gEventObjectGraphicsInfo_SwimmerF, - &gEventObjectGraphicsInfo_BlackBelt, - &gEventObjectGraphicsInfo_Beauty, - &gEventObjectGraphicsInfo_Scientist1, - &gEventObjectGraphicsInfo_Lass, - &gEventObjectGraphicsInfo_Gentleman, - &gEventObjectGraphicsInfo_Sailor, - &gEventObjectGraphicsInfo_Fisherman, - &gEventObjectGraphicsInfo_RunningTriathleteM, - &gEventObjectGraphicsInfo_RunningTriathleteF, - &gEventObjectGraphicsInfo_TuberF, - &gEventObjectGraphicsInfo_TuberM, - &gEventObjectGraphicsInfo_Hiker, - &gEventObjectGraphicsInfo_CyclingTriathleteM, - &gEventObjectGraphicsInfo_CyclingTriathleteF, - &gEventObjectGraphicsInfo_Nurse, - &gEventObjectGraphicsInfo_ItemBall, - &gEventObjectGraphicsInfo_BerryTree, - &gEventObjectGraphicsInfo_BerryTreeEarlyStages, - &gEventObjectGraphicsInfo_BerryTreeLateStages, - &gEventObjectGraphicsInfo_BrendanAcroBike, - &gEventObjectGraphicsInfo_ProfBirch, - &gEventObjectGraphicsInfo_Man4, - &gEventObjectGraphicsInfo_Man5, - &gEventObjectGraphicsInfo_ReporterM, - &gEventObjectGraphicsInfo_ReporterF, - &gEventObjectGraphicsInfo_Bard, - &gEventObjectGraphicsInfo_Anabel, - &gEventObjectGraphicsInfo_Tucker, - &gEventObjectGraphicsInfo_Greta, - &gEventObjectGraphicsInfo_Spenser, - &gEventObjectGraphicsInfo_Noland, - &gEventObjectGraphicsInfo_Lucy, - &gEventObjectGraphicsInfo_UnusedNatuDoll, - &gEventObjectGraphicsInfo_UnusedMagnemiteDoll, - &gEventObjectGraphicsInfo_UnusedSquirtleDoll, - &gEventObjectGraphicsInfo_UnusedWooperDoll, - &gEventObjectGraphicsInfo_UnusedPikachuDoll, - &gEventObjectGraphicsInfo_UnusedPorygon2Doll, - &gEventObjectGraphicsInfo_CuttableTree, - &gEventObjectGraphicsInfo_MartEmployee, - &gEventObjectGraphicsInfo_RooftopSaleWoman, - &gEventObjectGraphicsInfo_Teala, - &gEventObjectGraphicsInfo_BreakableRock, - &gEventObjectGraphicsInfo_PushableBoulder, - &gEventObjectGraphicsInfo_MrBrineysBoat, - &gEventObjectGraphicsInfo_MayNormal, - &gEventObjectGraphicsInfo_MayMachBike, - &gEventObjectGraphicsInfo_MayAcroBike, - &gEventObjectGraphicsInfo_MaySurfing, - &gEventObjectGraphicsInfo_MayFieldMove, - &gEventObjectGraphicsInfo_Truck, - &gEventObjectGraphicsInfo_VigorothCarryingBox, - &gEventObjectGraphicsInfo_VigorothFacingAway, - &gEventObjectGraphicsInfo_BirchsBag, - &gEventObjectGraphicsInfo_EnemyZigzagoon, - &gEventObjectGraphicsInfo_Artist, - &gEventObjectGraphicsInfo_RivalBrendanNormal, - &gEventObjectGraphicsInfo_RivalBrendanMachBike, - &gEventObjectGraphicsInfo_RivalBrendanAcroBike, - &gEventObjectGraphicsInfo_RivalBrendanSurfing, - &gEventObjectGraphicsInfo_RivalBrendanFieldMove, - &gEventObjectGraphicsInfo_RivalMayNormal, - &gEventObjectGraphicsInfo_RivalMayMachBike, - &gEventObjectGraphicsInfo_RivalMayAcroBike, - &gEventObjectGraphicsInfo_RivalMaySurfing, - &gEventObjectGraphicsInfo_RivalMayFieldMove, - &gEventObjectGraphicsInfo_Cameraman, - &gEventObjectGraphicsInfo_BrendanUnderwater, - &gEventObjectGraphicsInfo_MayUnderwater, - &gEventObjectGraphicsInfo_MovingBox, - &gEventObjectGraphicsInfo_CableCar, - &gEventObjectGraphicsInfo_Scientist2, - &gEventObjectGraphicsInfo_DevonEmployee, - &gEventObjectGraphicsInfo_AquaMemberM, - &gEventObjectGraphicsInfo_AquaMemberF, - &gEventObjectGraphicsInfo_MagmaMemberM, - &gEventObjectGraphicsInfo_MagmaMemberF, - &gEventObjectGraphicsInfo_Sidney, - &gEventObjectGraphicsInfo_Phoebe, - &gEventObjectGraphicsInfo_Glacia, - &gEventObjectGraphicsInfo_Drake, - &gEventObjectGraphicsInfo_Roxanne, - &gEventObjectGraphicsInfo_Brawly, - &gEventObjectGraphicsInfo_Wattson, - &gEventObjectGraphicsInfo_Flannery, - &gEventObjectGraphicsInfo_Norman, - &gEventObjectGraphicsInfo_Winona, - &gEventObjectGraphicsInfo_Liza, - &gEventObjectGraphicsInfo_Tate, - &gEventObjectGraphicsInfo_Wallace, - &gEventObjectGraphicsInfo_Steven, - &gEventObjectGraphicsInfo_Wally, - &gEventObjectGraphicsInfo_RubySapphireLittleBoy, - &gEventObjectGraphicsInfo_BrendanFishing, - &gEventObjectGraphicsInfo_MayFishing, - &gEventObjectGraphicsInfo_HotSpringsOldWoman, - &gEventObjectGraphicsInfo_SSTidal, - &gEventObjectGraphicsInfo_SubmarineShadow, - &gEventObjectGraphicsInfo_PichuDoll, - &gEventObjectGraphicsInfo_PikachuDoll, - &gEventObjectGraphicsInfo_MarillDoll, - &gEventObjectGraphicsInfo_TogepiDoll, - &gEventObjectGraphicsInfo_CyndaquilDoll, - &gEventObjectGraphicsInfo_ChikoritaDoll, - &gEventObjectGraphicsInfo_TotodileDoll, - &gEventObjectGraphicsInfo_JigglypuffDoll, - &gEventObjectGraphicsInfo_MeowthDoll, - &gEventObjectGraphicsInfo_ClefairyDoll, - &gEventObjectGraphicsInfo_DittoDoll, - &gEventObjectGraphicsInfo_SmoochumDoll, - &gEventObjectGraphicsInfo_TreeckoDoll, - &gEventObjectGraphicsInfo_TorchicDoll, - &gEventObjectGraphicsInfo_MudkipDoll, - &gEventObjectGraphicsInfo_DuskullDoll, - &gEventObjectGraphicsInfo_WynautDoll, - &gEventObjectGraphicsInfo_BaltoyDoll, - &gEventObjectGraphicsInfo_KecleonDoll, - &gEventObjectGraphicsInfo_AzurillDoll, - &gEventObjectGraphicsInfo_SkittyDoll, - &gEventObjectGraphicsInfo_SwabluDoll, - &gEventObjectGraphicsInfo_GulpinDoll, - &gEventObjectGraphicsInfo_LotadDoll, - &gEventObjectGraphicsInfo_SeedotDoll, - &gEventObjectGraphicsInfo_PikaCushion, - &gEventObjectGraphicsInfo_RoundCushion, - &gEventObjectGraphicsInfo_KissCushion, - &gEventObjectGraphicsInfo_ZigzagCushion, - &gEventObjectGraphicsInfo_SpinCushion, - &gEventObjectGraphicsInfo_DiamondCushion, - &gEventObjectGraphicsInfo_BallCushion, - &gEventObjectGraphicsInfo_GrassCushion, - &gEventObjectGraphicsInfo_FireCushion, - &gEventObjectGraphicsInfo_WaterCushion, - &gEventObjectGraphicsInfo_BigSnorlaxDoll, - &gEventObjectGraphicsInfo_BigRhydonDoll, - &gEventObjectGraphicsInfo_BigLaprasDoll, - &gEventObjectGraphicsInfo_BigVenusaurDoll, - &gEventObjectGraphicsInfo_BigCharizardDoll, - &gEventObjectGraphicsInfo_BigBlastoiseDoll, - &gEventObjectGraphicsInfo_BigWailmerDoll, - &gEventObjectGraphicsInfo_BigRegirockDoll, - &gEventObjectGraphicsInfo_BigRegiceDoll, - &gEventObjectGraphicsInfo_BigRegisteelDoll, - &gEventObjectGraphicsInfo_Latias, - &gEventObjectGraphicsInfo_Latios, - &gEventObjectGraphicsInfo_GameboyKid, - &gEventObjectGraphicsInfo_ContestJudge, - &gEventObjectGraphicsInfo_BrendanWatering, - &gEventObjectGraphicsInfo_MayWatering, - &gEventObjectGraphicsInfo_BrendanDecorating, - &gEventObjectGraphicsInfo_MayDecorating, - &gEventObjectGraphicsInfo_Archie, - &gEventObjectGraphicsInfo_Maxie, - &gEventObjectGraphicsInfo_Kyogre1, - &gEventObjectGraphicsInfo_Groudon1, - &gEventObjectGraphicsInfo_Fossil, - &gEventObjectGraphicsInfo_Regirock, - &gEventObjectGraphicsInfo_Regice, - &gEventObjectGraphicsInfo_Registeel, - &gEventObjectGraphicsInfo_Skitty, - &gEventObjectGraphicsInfo_Kecleon1, - &gEventObjectGraphicsInfo_Kyogre2, - &gEventObjectGraphicsInfo_Groudon2, - &gEventObjectGraphicsInfo_Rayquaza2, - &gEventObjectGraphicsInfo_Zigzagoon, - &gEventObjectGraphicsInfo_Pikachu, - &gEventObjectGraphicsInfo_Azumarill, - &gEventObjectGraphicsInfo_Wingull, - &gEventObjectGraphicsInfo_Kecleon2, - &gEventObjectGraphicsInfo_TuberMSwimming, - &gEventObjectGraphicsInfo_Azurill, - &gEventObjectGraphicsInfo_Mom, - &gEventObjectGraphicsInfo_LinkBrendan, - &gEventObjectGraphicsInfo_LinkMay, - &gEventObjectGraphicsInfo_Juan, - &gEventObjectGraphicsInfo_Scott, - &gEventObjectGraphicsInfo_Poochyena, - &gEventObjectGraphicsInfo_Kyogre3, - &gEventObjectGraphicsInfo_Groudon3, - &gEventObjectGraphicsInfo_MysteryEventDeliveryman, - &gEventObjectGraphicsInfo_Statue, - &gEventObjectGraphicsInfo_Kirlia, - &gEventObjectGraphicsInfo_Dusclops, - &gEventObjectGraphicsInfo_UnionRoomAttendant, - &gEventObjectGraphicsInfo_Sudowoodo, - &gEventObjectGraphicsInfo_Mew, - &gEventObjectGraphicsInfo_Red, - &gEventObjectGraphicsInfo_Leaf, - &gEventObjectGraphicsInfo_Deoxys, - &gEventObjectGraphicsInfo_BirthIslandStone, - &gEventObjectGraphicsInfo_Brandon, - &gEventObjectGraphicsInfo_RubySapphireBrendan, - &gEventObjectGraphicsInfo_RubySapphireMay, - &gEventObjectGraphicsInfo_Lugia, - &gEventObjectGraphicsInfo_HoOh, + &gEventObjectGraphicsInfo_BrendanNormal, + &gEventObjectGraphicsInfo_BrendanMachBike, + &gEventObjectGraphicsInfo_BrendanSurfing, + &gEventObjectGraphicsInfo_BrendanFieldMove, + &gEventObjectGraphicsInfo_QuintyPlump, + &gEventObjectGraphicsInfo_NinjaBoy, + &gEventObjectGraphicsInfo_Twin, + &gEventObjectGraphicsInfo_Boy1, + &gEventObjectGraphicsInfo_Girl1, + &gEventObjectGraphicsInfo_Boy2, + &gEventObjectGraphicsInfo_Girl2, + &gEventObjectGraphicsInfo_LittleBoy, + &gEventObjectGraphicsInfo_LittleGirl, + &gEventObjectGraphicsInfo_Boy3, + &gEventObjectGraphicsInfo_Girl3, + &gEventObjectGraphicsInfo_RichBoy, + &gEventObjectGraphicsInfo_Woman1, + &gEventObjectGraphicsInfo_FatMan, + &gEventObjectGraphicsInfo_PokefanF, + &gEventObjectGraphicsInfo_Man1, + &gEventObjectGraphicsInfo_Woman2, + &gEventObjectGraphicsInfo_ExpertM, + &gEventObjectGraphicsInfo_ExpertF, + &gEventObjectGraphicsInfo_Man2, + &gEventObjectGraphicsInfo_Woman3, + &gEventObjectGraphicsInfo_PokefanM, + &gEventObjectGraphicsInfo_Woman4, + &gEventObjectGraphicsInfo_Cook, + &gEventObjectGraphicsInfo_LinkReceptionist, + &gEventObjectGraphicsInfo_OldMan, + &gEventObjectGraphicsInfo_OldWoman, + &gEventObjectGraphicsInfo_Camper, + &gEventObjectGraphicsInfo_Picnicker, + &gEventObjectGraphicsInfo_Man3, + &gEventObjectGraphicsInfo_Woman5, + &gEventObjectGraphicsInfo_Youngster, + &gEventObjectGraphicsInfo_BugCatcher, + &gEventObjectGraphicsInfo_PsychicM, + &gEventObjectGraphicsInfo_SchoolKidM, + &gEventObjectGraphicsInfo_Maniac, + &gEventObjectGraphicsInfo_HexManiac, + &gEventObjectGraphicsInfo_Rayquaza1, + &gEventObjectGraphicsInfo_SwimmerM, + &gEventObjectGraphicsInfo_SwimmerF, + &gEventObjectGraphicsInfo_BlackBelt, + &gEventObjectGraphicsInfo_Beauty, + &gEventObjectGraphicsInfo_Scientist1, + &gEventObjectGraphicsInfo_Lass, + &gEventObjectGraphicsInfo_Gentleman, + &gEventObjectGraphicsInfo_Sailor, + &gEventObjectGraphicsInfo_Fisherman, + &gEventObjectGraphicsInfo_RunningTriathleteM, + &gEventObjectGraphicsInfo_RunningTriathleteF, + &gEventObjectGraphicsInfo_TuberF, + &gEventObjectGraphicsInfo_TuberM, + &gEventObjectGraphicsInfo_Hiker, + &gEventObjectGraphicsInfo_CyclingTriathleteM, + &gEventObjectGraphicsInfo_CyclingTriathleteF, + &gEventObjectGraphicsInfo_Nurse, + &gEventObjectGraphicsInfo_ItemBall, + &gEventObjectGraphicsInfo_BerryTree, + &gEventObjectGraphicsInfo_BerryTreeEarlyStages, + &gEventObjectGraphicsInfo_BerryTreeLateStages, + &gEventObjectGraphicsInfo_BrendanAcroBike, + &gEventObjectGraphicsInfo_ProfBirch, + &gEventObjectGraphicsInfo_Man4, + &gEventObjectGraphicsInfo_Man5, + &gEventObjectGraphicsInfo_ReporterM, + &gEventObjectGraphicsInfo_ReporterF, + &gEventObjectGraphicsInfo_Bard, + &gEventObjectGraphicsInfo_Anabel, + &gEventObjectGraphicsInfo_Tucker, + &gEventObjectGraphicsInfo_Greta, + &gEventObjectGraphicsInfo_Spenser, + &gEventObjectGraphicsInfo_Noland, + &gEventObjectGraphicsInfo_Lucy, + &gEventObjectGraphicsInfo_UnusedNatuDoll, + &gEventObjectGraphicsInfo_UnusedMagnemiteDoll, + &gEventObjectGraphicsInfo_UnusedSquirtleDoll, + &gEventObjectGraphicsInfo_UnusedWooperDoll, + &gEventObjectGraphicsInfo_UnusedPikachuDoll, + &gEventObjectGraphicsInfo_UnusedPorygon2Doll, + &gEventObjectGraphicsInfo_CuttableTree, + &gEventObjectGraphicsInfo_MartEmployee, + &gEventObjectGraphicsInfo_RooftopSaleWoman, + &gEventObjectGraphicsInfo_Teala, + &gEventObjectGraphicsInfo_BreakableRock, + &gEventObjectGraphicsInfo_PushableBoulder, + &gEventObjectGraphicsInfo_MrBrineysBoat, + &gEventObjectGraphicsInfo_MayNormal, + &gEventObjectGraphicsInfo_MayMachBike, + &gEventObjectGraphicsInfo_MayAcroBike, + &gEventObjectGraphicsInfo_MaySurfing, + &gEventObjectGraphicsInfo_MayFieldMove, + &gEventObjectGraphicsInfo_Truck, + &gEventObjectGraphicsInfo_VigorothCarryingBox, + &gEventObjectGraphicsInfo_VigorothFacingAway, + &gEventObjectGraphicsInfo_BirchsBag, + &gEventObjectGraphicsInfo_EnemyZigzagoon, + &gEventObjectGraphicsInfo_Artist, + &gEventObjectGraphicsInfo_RivalBrendanNormal, + &gEventObjectGraphicsInfo_RivalBrendanMachBike, + &gEventObjectGraphicsInfo_RivalBrendanAcroBike, + &gEventObjectGraphicsInfo_RivalBrendanSurfing, + &gEventObjectGraphicsInfo_RivalBrendanFieldMove, + &gEventObjectGraphicsInfo_RivalMayNormal, + &gEventObjectGraphicsInfo_RivalMayMachBike, + &gEventObjectGraphicsInfo_RivalMayAcroBike, + &gEventObjectGraphicsInfo_RivalMaySurfing, + &gEventObjectGraphicsInfo_RivalMayFieldMove, + &gEventObjectGraphicsInfo_Cameraman, + &gEventObjectGraphicsInfo_BrendanUnderwater, + &gEventObjectGraphicsInfo_MayUnderwater, + &gEventObjectGraphicsInfo_MovingBox, + &gEventObjectGraphicsInfo_CableCar, + &gEventObjectGraphicsInfo_Scientist2, + &gEventObjectGraphicsInfo_DevonEmployee, + &gEventObjectGraphicsInfo_AquaMemberM, + &gEventObjectGraphicsInfo_AquaMemberF, + &gEventObjectGraphicsInfo_MagmaMemberM, + &gEventObjectGraphicsInfo_MagmaMemberF, + &gEventObjectGraphicsInfo_Sidney, + &gEventObjectGraphicsInfo_Phoebe, + &gEventObjectGraphicsInfo_Glacia, + &gEventObjectGraphicsInfo_Drake, + &gEventObjectGraphicsInfo_Roxanne, + &gEventObjectGraphicsInfo_Brawly, + &gEventObjectGraphicsInfo_Wattson, + &gEventObjectGraphicsInfo_Flannery, + &gEventObjectGraphicsInfo_Norman, + &gEventObjectGraphicsInfo_Winona, + &gEventObjectGraphicsInfo_Liza, + &gEventObjectGraphicsInfo_Tate, + &gEventObjectGraphicsInfo_Wallace, + &gEventObjectGraphicsInfo_Steven, + &gEventObjectGraphicsInfo_Wally, + &gEventObjectGraphicsInfo_RubySapphireLittleBoy, + &gEventObjectGraphicsInfo_BrendanFishing, + &gEventObjectGraphicsInfo_MayFishing, + &gEventObjectGraphicsInfo_HotSpringsOldWoman, + &gEventObjectGraphicsInfo_SSTidal, + &gEventObjectGraphicsInfo_SubmarineShadow, + &gEventObjectGraphicsInfo_PichuDoll, + &gEventObjectGraphicsInfo_PikachuDoll, + &gEventObjectGraphicsInfo_MarillDoll, + &gEventObjectGraphicsInfo_TogepiDoll, + &gEventObjectGraphicsInfo_CyndaquilDoll, + &gEventObjectGraphicsInfo_ChikoritaDoll, + &gEventObjectGraphicsInfo_TotodileDoll, + &gEventObjectGraphicsInfo_JigglypuffDoll, + &gEventObjectGraphicsInfo_MeowthDoll, + &gEventObjectGraphicsInfo_ClefairyDoll, + &gEventObjectGraphicsInfo_DittoDoll, + &gEventObjectGraphicsInfo_SmoochumDoll, + &gEventObjectGraphicsInfo_TreeckoDoll, + &gEventObjectGraphicsInfo_TorchicDoll, + &gEventObjectGraphicsInfo_MudkipDoll, + &gEventObjectGraphicsInfo_DuskullDoll, + &gEventObjectGraphicsInfo_WynautDoll, + &gEventObjectGraphicsInfo_BaltoyDoll, + &gEventObjectGraphicsInfo_KecleonDoll, + &gEventObjectGraphicsInfo_AzurillDoll, + &gEventObjectGraphicsInfo_SkittyDoll, + &gEventObjectGraphicsInfo_SwabluDoll, + &gEventObjectGraphicsInfo_GulpinDoll, + &gEventObjectGraphicsInfo_LotadDoll, + &gEventObjectGraphicsInfo_SeedotDoll, + &gEventObjectGraphicsInfo_PikaCushion, + &gEventObjectGraphicsInfo_RoundCushion, + &gEventObjectGraphicsInfo_KissCushion, + &gEventObjectGraphicsInfo_ZigzagCushion, + &gEventObjectGraphicsInfo_SpinCushion, + &gEventObjectGraphicsInfo_DiamondCushion, + &gEventObjectGraphicsInfo_BallCushion, + &gEventObjectGraphicsInfo_GrassCushion, + &gEventObjectGraphicsInfo_FireCushion, + &gEventObjectGraphicsInfo_WaterCushion, + &gEventObjectGraphicsInfo_BigSnorlaxDoll, + &gEventObjectGraphicsInfo_BigRhydonDoll, + &gEventObjectGraphicsInfo_BigLaprasDoll, + &gEventObjectGraphicsInfo_BigVenusaurDoll, + &gEventObjectGraphicsInfo_BigCharizardDoll, + &gEventObjectGraphicsInfo_BigBlastoiseDoll, + &gEventObjectGraphicsInfo_BigWailmerDoll, + &gEventObjectGraphicsInfo_BigRegirockDoll, + &gEventObjectGraphicsInfo_BigRegiceDoll, + &gEventObjectGraphicsInfo_BigRegisteelDoll, + &gEventObjectGraphicsInfo_Latias, + &gEventObjectGraphicsInfo_Latios, + &gEventObjectGraphicsInfo_GameboyKid, + &gEventObjectGraphicsInfo_ContestJudge, + &gEventObjectGraphicsInfo_BrendanWatering, + &gEventObjectGraphicsInfo_MayWatering, + &gEventObjectGraphicsInfo_BrendanDecorating, + &gEventObjectGraphicsInfo_MayDecorating, + &gEventObjectGraphicsInfo_Archie, + &gEventObjectGraphicsInfo_Maxie, + &gEventObjectGraphicsInfo_Kyogre1, + &gEventObjectGraphicsInfo_Groudon1, + &gEventObjectGraphicsInfo_Fossil, + &gEventObjectGraphicsInfo_Regirock, + &gEventObjectGraphicsInfo_Regice, + &gEventObjectGraphicsInfo_Registeel, + &gEventObjectGraphicsInfo_Skitty, + &gEventObjectGraphicsInfo_Kecleon1, + &gEventObjectGraphicsInfo_Kyogre2, + &gEventObjectGraphicsInfo_Groudon2, + &gEventObjectGraphicsInfo_Rayquaza2, + &gEventObjectGraphicsInfo_Zigzagoon, + &gEventObjectGraphicsInfo_Pikachu, + &gEventObjectGraphicsInfo_Azumarill, + &gEventObjectGraphicsInfo_Wingull, + &gEventObjectGraphicsInfo_Kecleon2, + &gEventObjectGraphicsInfo_TuberMSwimming, + &gEventObjectGraphicsInfo_Azurill, + &gEventObjectGraphicsInfo_Mom, + &gEventObjectGraphicsInfo_LinkBrendan, + &gEventObjectGraphicsInfo_LinkMay, + &gEventObjectGraphicsInfo_Juan, + &gEventObjectGraphicsInfo_Scott, + &gEventObjectGraphicsInfo_Poochyena, + &gEventObjectGraphicsInfo_Kyogre3, + &gEventObjectGraphicsInfo_Groudon3, + &gEventObjectGraphicsInfo_MysteryEventDeliveryman, + &gEventObjectGraphicsInfo_Statue, + &gEventObjectGraphicsInfo_Kirlia, + &gEventObjectGraphicsInfo_Dusclops, + &gEventObjectGraphicsInfo_UnionRoomAttendant, + &gEventObjectGraphicsInfo_Sudowoodo, + &gEventObjectGraphicsInfo_Mew, + &gEventObjectGraphicsInfo_Red, + &gEventObjectGraphicsInfo_Leaf, + &gEventObjectGraphicsInfo_Deoxys, + &gEventObjectGraphicsInfo_BirthIslandStone, + &gEventObjectGraphicsInfo_Brandon, + &gEventObjectGraphicsInfo_RubySapphireBrendan, + &gEventObjectGraphicsInfo_RubySapphireMay, + &gEventObjectGraphicsInfo_Lugia, + &gEventObjectGraphicsInfo_HoOh, }; const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = { - &gEventObjectGraphicsInfo_Bard, - &gEventObjectGraphicsInfo_Hipster, - &gEventObjectGraphicsInfo_Trader, - &gEventObjectGraphicsInfo_Storyteller, - &gEventObjectGraphicsInfo_Giddy, - &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, - &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, + &gEventObjectGraphicsInfo_Bard, + &gEventObjectGraphicsInfo_Hipster, + &gEventObjectGraphicsInfo_Trader, + &gEventObjectGraphicsInfo_Storyteller, + &gEventObjectGraphicsInfo_Giddy, + &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, + &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, }; diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/field_event_obj/movement_action_func_tables.h index fb9f4b2cd..712988f5e 100755 --- a/src/data/field_event_obj/movement_action_func_tables.h +++ b/src/data/field_event_obj/movement_action_func_tables.h @@ -422,1092 +422,1092 @@ u8 (*const gMovementActionFuncs_FlyUp[])(struct EventObject *, struct Sprite *); u8 (*const gMovementActionFuncs_FlyDown[])(struct EventObject *, struct Sprite *); u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) = { - gMovementActionFuncs_FaceDown, // MOVEMENT_ACTION_FACE_DOWN - gMovementActionFuncs_FaceUp, // MOVEMENT_ACTION_FACE_UP - gMovementActionFuncs_FaceLeft, // MOVEMENT_ACTION_FACE_LEFT - gMovementActionFuncs_FaceRight, // MOVEMENT_ACTION_FACE_RIGHT - gMovementActionFuncs_WalkSlowDown, // MOVEMENT_ACTION_WALK_SLOW_DOWN - gMovementActionFuncs_WalkSlowUp, // MOVEMENT_ACTION_WALK_SLOW_UP - gMovementActionFuncs_WalkSlowLeft, // MOVEMENT_ACTION_WALK_SLOW_LEFT - gMovementActionFuncs_WalkSlowRight, // MOVEMENT_ACTION_WALK_SLOW_RIGHT - gMovementActionFuncs_WalkNormalDown, // MOVEMENT_ACTION_WALK_NORMAL_DOWN - gMovementActionFuncs_WalkNormalUp, // MOVEMENT_ACTION_WALK_NORMAL_UP - gMovementActionFuncs_WalkNormalLeft, // MOVEMENT_ACTION_WALK_NORMAL_LEFT - gMovementActionFuncs_WalkNormalRight, // MOVEMENT_ACTION_WALK_NORMAL_RIGHT - gMovementActionFuncs_Jump2Down, // MOVEMENT_ACTION_JUMP_2_DOWN - gMovementActionFuncs_Jump2Up, // MOVEMENT_ACTION_JUMP_2_UP - gMovementActionFuncs_Jump2Left, // MOVEMENT_ACTION_JUMP_2_LEFT - gMovementActionFuncs_Jump2Right, // MOVEMENT_ACTION_JUMP_2_RIGHT - gMovementActionFuncs_Delay1, // MOVEMENT_ACTION_DELAY_1 - gMovementActionFuncs_Delay2, // MOVEMENT_ACTION_DELAY_2 - gMovementActionFuncs_Delay4, // MOVEMENT_ACTION_DELAY_4 - gMovementActionFuncs_Delay8, // MOVEMENT_ACTION_DELAY_8 - gMovementActionFuncs_Delay16, // MOVEMENT_ACTION_DELAY_16 - gMovementActionFuncs_WalkFastDown, // MOVEMENT_ACTION_WALK_FAST_DOWN - gMovementActionFuncs_WalkFastUp, // MOVEMENT_ACTION_WALK_FAST_UP - gMovementActionFuncs_WalkFastLeft, // MOVEMENT_ACTION_WALK_FAST_LEFT - gMovementActionFuncs_WalkFastRight, // MOVEMENT_ACTION_WALK_FAST_RIGHT - gMovementActionFuncs_WalkInPlaceSlowDown, // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN - gMovementActionFuncs_WalkInPlaceSlowUp, // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP - gMovementActionFuncs_WalkInPlaceSlowLeft, // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT - gMovementActionFuncs_WalkInPlaceSlowRight, // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT - gMovementActionFuncs_WalkInPlaceNormalDown, // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN - gMovementActionFuncs_WalkInPlaceNormalUp, // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP - gMovementActionFuncs_WalkInPlaceNormalLeft, // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT - gMovementActionFuncs_WalkInPlaceNormalRight, // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT - gMovementActionFuncs_WalkInPlaceFastDown, // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN - gMovementActionFuncs_WalkInPlaceFastUp, // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP - gMovementActionFuncs_WalkInPlaceFastLeft, // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT - gMovementActionFuncs_WalkInPlaceFastRight, // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT - gMovementActionFuncs_WalkInPlaceFastestDown, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN - gMovementActionFuncs_WalkInPlaceFastestUp, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP - gMovementActionFuncs_WalkInPlaceFastestLeft, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT - gMovementActionFuncs_WalkInPlaceFastestRight, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT - gMovementActionFuncs_RideWaterCurrentDown, // MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN - gMovementActionFuncs_RideWaterCurrentUp, // MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP - gMovementActionFuncs_RideWaterCurrentLeft, // MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT - gMovementActionFuncs_RideWaterCurrentRight, // MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT - gMovementActionFuncs_WalkFastestDown, // MOVEMENT_ACTION_WALK_FASTEST_DOWN - gMovementActionFuncs_WalkFastestUp, // MOVEMENT_ACTION_WALK_FASTEST_UP - gMovementActionFuncs_WalkFastestLeft, // MOVEMENT_ACTION_WALK_FASTEST_LEFT - gMovementActionFuncs_WalkFastestRight, // MOVEMENT_ACTION_WALK_FASTEST_RIGHT - gMovementActionFuncs_SlideDown, // MOVEMENT_ACTION_SLIDE_DOWN - gMovementActionFuncs_SlideUp, // MOVEMENT_ACTION_SLIDE_UP - gMovementActionFuncs_SlideLeft, // MOVEMENT_ACTION_SLIDE_LEFT - gMovementActionFuncs_SlideRight, // MOVEMENT_ACTION_SLIDE_RIGHT - gMovementActionFuncs_PlayerRunDown, // MOVEMENT_ACTION_PLAYER_RUN_DOWN - gMovementActionFuncs_PlayerRunUp, // MOVEMENT_ACTION_PLAYER_RUN_UP - gMovementActionFuncs_PlayerRunLeft, // MOVEMENT_ACTION_PLAYER_RUN_LEFT - gMovementActionFuncs_PlayerRunRight, // MOVEMENT_ACTION_PLAYER_RUN_RIGHT - gMovementActionFuncs_StartAnimInDirection, // MOVEMENT_ACTION_START_ANIM_IN_DIRECTION - gMovementActionFuncs_JumpSpecialDown, // MOVEMENT_ACTION_JUMP_SPECIAL_DOWN - gMovementActionFuncs_JumpSpecialUp, // MOVEMENT_ACTION_JUMP_SPECIAL_UP - gMovementActionFuncs_JumpSpecialLeft, // MOVEMENT_ACTION_JUMP_SPECIAL_LEFT - gMovementActionFuncs_JumpSpecialRight, // MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT - gMovementActionFuncs_FacePlayer, // MOVEMENT_ACTION_FACE_PLAYER - gMovementActionFuncs_FaceAwayPlayer, // MOVEMENT_ACTION_FACE_AWAY_PLAYER - gMovementActionFuncs_LockFacingDirection, // MOVEMENT_ACTION_LOCK_FACING_DIRECTION - gMovementActionFuncs_UnlockFacingDirection, // MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION - gMovementActionFuncs_JumpDown, // MOVEMENT_ACTION_JUMP_DOWN - gMovementActionFuncs_JumpUp, // MOVEMENT_ACTION_JUMP_UP - gMovementActionFuncs_JumpLeft, // MOVEMENT_ACTION_JUMP_LEFT - gMovementActionFuncs_JumpRight, // MOVEMENT_ACTION_JUMP_RIGHT - gMovementActionFuncs_JumpInPlaceDown, // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN - gMovementActionFuncs_JumpInPlaceUp, // MOVEMENT_ACTION_JUMP_IN_PLACE_UP - gMovementActionFuncs_JumpInPlaceLeft, // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT - gMovementActionFuncs_JumpInPlaceRight, // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT - gMovementActionFuncs_JumpInPlaceDownUp, // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP - gMovementActionFuncs_JumpInPlaceUpDown, // MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN - gMovementActionFuncs_JumpInPlaceLeftRight, // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT - gMovementActionFuncs_JumpInPlaceRightLeft, // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT - gMovementActionFuncs_FaceOriginalDirection, // MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION - gMovementActionFuncs_NurseJoyBowDown, // MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN - gMovementActionFuncs_EnableJumpLandingGroundEffect, // MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT - gMovementActionFuncs_DisableJumpLandingGroundEffect, // MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT - gMovementActionFuncs_DisableAnimation, // MOVEMENT_ACTION_DISABLE_ANIMATION - gMovementActionFuncs_RestoreAnimation, // MOVEMENT_ACTION_RESTORE_ANIMATION - gMovementActionFuncs_SetInvisible, // MOVEMENT_ACTION_SET_INVISIBLE - gMovementActionFuncs_SetVisible, // MOVEMENT_ACTION_SET_VISIBLE - gMovementActionFuncs_EmoteExclamationMark, // MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK - gMovementActionFuncs_EmoteQuestionMark, // MOVEMENT_ACTION_EMOTE_QUESTION_MARK - gMovementActionFuncs_EmoteHeart, // MOVEMENT_ACTION_EMOTE_HEART - gMovementActionFuncs_RevealTrainer, // MOVEMENT_ACTION_REVEAL_TRAINER - gMovementActionFuncs_RockSmashBreak, // MOVEMENT_ACTION_ROCK_SMASH_BREAK - gMovementActionFuncs_CutTree, // MOVEMENT_ACTION_CUT_TREE - gMovementActionFuncs_SetFixedPriority, // MOVEMENT_ACTION_SET_FIXED_PRIORITY - gMovementActionFuncs_ClearFixedPriority, // MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY - gMovementActionFuncs_InitAffineAnim, // MOVEMENT_ACTION_INIT_AFFINE_ANIM - gMovementActionFuncs_ClearAffineAnim, // MOVEMENT_ACTION_CLEAR_AFFINE_ANIM - gMovementActionFuncs_Unknown1, // MOVEMENT_ACTION_UNKNOWN1 - gMovementActionFuncs_Unknown2, // MOVEMENT_ACTION_UNKNOWN2 - gMovementActionFuncs_WalkDownStartAffine, // MOVEMENT_ACTION_WALK_DOWN_START_AFFINE - gMovementActionFuncs_WalkDownAffine, // MOVEMENT_ACTION_WALK_DOWN_AFFINE - gMovementActionFuncs_AcroWheelieFaceDown, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN - gMovementActionFuncs_AcroWheelieFaceUp, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP - gMovementActionFuncs_AcroWheelieFaceLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT - gMovementActionFuncs_AcroWheelieFaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT - gMovementActionFuncs_AcroPopWheelieDown, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN - gMovementActionFuncs_AcroPopWheelieUp, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP - gMovementActionFuncs_AcroPopWheelieLeft, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT - gMovementActionFuncs_AcroPopWheelieRight, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT - gMovementActionFuncs_AcroEndWheelieFaceDown, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN - gMovementActionFuncs_AcroEndWheelieFaceUp, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP - gMovementActionFuncs_AcroEndWheelieFaceLeft, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT - gMovementActionFuncs_AcroEndWheelieFaceRight, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT - gMovementActionFuncs_AcroWheelieHopFaceDown, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN - gMovementActionFuncs_AcroWheelieHopFaceUp, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP - gMovementActionFuncs_AcroWheelieHopFaceLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT - gMovementActionFuncs_AcroWheelieHopFaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT - gMovementActionFuncs_AcroWheelieHopDown, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN - gMovementActionFuncs_AcroWheelieHopUp, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP - gMovementActionFuncs_AcroWheelieHopLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT - gMovementActionFuncs_AcroWheelieHopRight, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT - gMovementActionFuncs_AcroWheelieJumpDown, // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN - gMovementActionFuncs_AcroWheelieJumpUp, // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP - gMovementActionFuncs_AcroWheelieJumpLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT - gMovementActionFuncs_AcroWheelieJumpRight, // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT - gMovementActionFuncs_AcroWheelieInPlaceDown, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN - gMovementActionFuncs_AcroWheelieInPlaceUp, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP - gMovementActionFuncs_AcroWheelieInPlaceLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT - gMovementActionFuncs_AcroWheelieInPlaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT - gMovementActionFuncs_AcroPopWheelieMoveDown, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN - gMovementActionFuncs_AcroPopWheelieMoveUp, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP - gMovementActionFuncs_AcroPopWheelieMoveLeft, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT - gMovementActionFuncs_AcroPopWheelieMoveRight, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT - gMovementActionFuncs_AcroWheelieMoveDown, // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN - gMovementActionFuncs_AcroWheelieMoveUp, // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP - gMovementActionFuncs_AcroWheelieMoveLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT - gMovementActionFuncs_AcroWheelieMoveRight, // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT - gMovementActionFuncs_AcroEndWheelieMoveDown, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN - gMovementActionFuncs_AcroEndWheelieMoveUp, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP - gMovementActionFuncs_AcroEndWheelieMoveLeft, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT - gMovementActionFuncs_AcroEndWheelieMoveRight, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT - gMovementActionFuncs_WalkNormalDiagonalUpLeft, // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT - gMovementActionFuncs_WalkNormalDiagonalUpRight, // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT - gMovementActionFuncs_WalkNormalDiagonalDownLeft, // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT - gMovementActionFuncs_WalkNormalDiagonalDownRight, // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT - gMovementActionFuncs_WalkSlowDiagonalUpLeft, // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT - gMovementActionFuncs_WalkSlowDiagonalUpRight, // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT - gMovementActionFuncs_WalkSlowDiagonalDownLeft, // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT - gMovementActionFuncs_WalkSlowDiagonalDownRight, // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT - gMovementActionFuncs_StoreAndLockAnim, // MOVEMENT_ACTION_STORE_AND_LOCK_ANIM - gMovementActionFuncs_FreeAndUnlockAnim, // MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM - gMovementActionFuncs_WalkLeftAffine, // MOVEMENT_ACTION_WALK_LEFT_AFFINE - gMovementActionFuncs_WalkRightAffine, // MOVEMENT_ACTION_WALK_RIGHT_AFFINE - gMovementActionFuncs_Levitate, // MOVEMENT_ACTION_LEVITATE - gMovementActionFuncs_StopLevitate, // MOVEMENT_ACTION_STOP_LEVITATE - gMovementActionFuncs_DestroyExtraTaskIfAtTop, // MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP - gMovementActionFuncs_Figure8, // MOVEMENT_ACTION_FIGURE_8 - gMovementActionFuncs_FlyUp, // MOVEMENT_ACTION_FLY_UP - gMovementActionFuncs_FlyDown, // MOVEMENT_ACTION_FLY_DOWN + [MOVEMENT_ACTION_FACE_DOWN] = gMovementActionFuncs_FaceDown, + [MOVEMENT_ACTION_FACE_UP] = gMovementActionFuncs_FaceUp, + [MOVEMENT_ACTION_FACE_LEFT] = gMovementActionFuncs_FaceLeft, + [MOVEMENT_ACTION_FACE_RIGHT] = gMovementActionFuncs_FaceRight, + [MOVEMENT_ACTION_WALK_SLOW_DOWN] = gMovementActionFuncs_WalkSlowDown, + [MOVEMENT_ACTION_WALK_SLOW_UP] = gMovementActionFuncs_WalkSlowUp, + [MOVEMENT_ACTION_WALK_SLOW_LEFT] = gMovementActionFuncs_WalkSlowLeft, + [MOVEMENT_ACTION_WALK_SLOW_RIGHT] = gMovementActionFuncs_WalkSlowRight, + [MOVEMENT_ACTION_WALK_NORMAL_DOWN] = gMovementActionFuncs_WalkNormalDown, + [MOVEMENT_ACTION_WALK_NORMAL_UP] = gMovementActionFuncs_WalkNormalUp, + [MOVEMENT_ACTION_WALK_NORMAL_LEFT] = gMovementActionFuncs_WalkNormalLeft, + [MOVEMENT_ACTION_WALK_NORMAL_RIGHT] = gMovementActionFuncs_WalkNormalRight, + [MOVEMENT_ACTION_JUMP_2_DOWN] = gMovementActionFuncs_Jump2Down, + [MOVEMENT_ACTION_JUMP_2_UP] = gMovementActionFuncs_Jump2Up, + [MOVEMENT_ACTION_JUMP_2_LEFT] = gMovementActionFuncs_Jump2Left, + [MOVEMENT_ACTION_JUMP_2_RIGHT] = gMovementActionFuncs_Jump2Right, + [MOVEMENT_ACTION_DELAY_1] = gMovementActionFuncs_Delay1, + [MOVEMENT_ACTION_DELAY_2] = gMovementActionFuncs_Delay2, + [MOVEMENT_ACTION_DELAY_4] = gMovementActionFuncs_Delay4, + [MOVEMENT_ACTION_DELAY_8] = gMovementActionFuncs_Delay8, + [MOVEMENT_ACTION_DELAY_16] = gMovementActionFuncs_Delay16, + [MOVEMENT_ACTION_WALK_FAST_DOWN] = gMovementActionFuncs_WalkFastDown, + [MOVEMENT_ACTION_WALK_FAST_UP] = gMovementActionFuncs_WalkFastUp, + [MOVEMENT_ACTION_WALK_FAST_LEFT] = gMovementActionFuncs_WalkFastLeft, + [MOVEMENT_ACTION_WALK_FAST_RIGHT] = gMovementActionFuncs_WalkFastRight, + [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN] = gMovementActionFuncs_WalkInPlaceSlowDown, + [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP] = gMovementActionFuncs_WalkInPlaceSlowUp, + [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT] = gMovementActionFuncs_WalkInPlaceSlowLeft, + [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT] = gMovementActionFuncs_WalkInPlaceSlowRight, + [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN] = gMovementActionFuncs_WalkInPlaceNormalDown, + [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP] = gMovementActionFuncs_WalkInPlaceNormalUp, + [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT] = gMovementActionFuncs_WalkInPlaceNormalLeft, + [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT] = gMovementActionFuncs_WalkInPlaceNormalRight, + [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN] = gMovementActionFuncs_WalkInPlaceFastDown, + [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP] = gMovementActionFuncs_WalkInPlaceFastUp, + [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT] = gMovementActionFuncs_WalkInPlaceFastLeft, + [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT] = gMovementActionFuncs_WalkInPlaceFastRight, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN] = gMovementActionFuncs_WalkInPlaceFastestDown, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP] = gMovementActionFuncs_WalkInPlaceFastestUp, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT] = gMovementActionFuncs_WalkInPlaceFastestLeft, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT] = gMovementActionFuncs_WalkInPlaceFastestRight, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN] = gMovementActionFuncs_RideWaterCurrentDown, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP] = gMovementActionFuncs_RideWaterCurrentUp, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT] = gMovementActionFuncs_RideWaterCurrentLeft, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT] = gMovementActionFuncs_RideWaterCurrentRight, + [MOVEMENT_ACTION_WALK_FASTEST_DOWN] = gMovementActionFuncs_WalkFastestDown, + [MOVEMENT_ACTION_WALK_FASTEST_UP] = gMovementActionFuncs_WalkFastestUp, + [MOVEMENT_ACTION_WALK_FASTEST_LEFT] = gMovementActionFuncs_WalkFastestLeft, + [MOVEMENT_ACTION_WALK_FASTEST_RIGHT] = gMovementActionFuncs_WalkFastestRight, + [MOVEMENT_ACTION_SLIDE_DOWN] = gMovementActionFuncs_SlideDown, + [MOVEMENT_ACTION_SLIDE_UP] = gMovementActionFuncs_SlideUp, + [MOVEMENT_ACTION_SLIDE_LEFT] = gMovementActionFuncs_SlideLeft, + [MOVEMENT_ACTION_SLIDE_RIGHT] = gMovementActionFuncs_SlideRight, + [MOVEMENT_ACTION_PLAYER_RUN_DOWN] = gMovementActionFuncs_PlayerRunDown, + [MOVEMENT_ACTION_PLAYER_RUN_UP] = gMovementActionFuncs_PlayerRunUp, + [MOVEMENT_ACTION_PLAYER_RUN_LEFT] = gMovementActionFuncs_PlayerRunLeft, + [MOVEMENT_ACTION_PLAYER_RUN_RIGHT] = gMovementActionFuncs_PlayerRunRight, + [MOVEMENT_ACTION_START_ANIM_IN_DIRECTION] = gMovementActionFuncs_StartAnimInDirection, + [MOVEMENT_ACTION_JUMP_SPECIAL_DOWN] = gMovementActionFuncs_JumpSpecialDown, + [MOVEMENT_ACTION_JUMP_SPECIAL_UP] = gMovementActionFuncs_JumpSpecialUp, + [MOVEMENT_ACTION_JUMP_SPECIAL_LEFT] = gMovementActionFuncs_JumpSpecialLeft, + [MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT] = gMovementActionFuncs_JumpSpecialRight, + [MOVEMENT_ACTION_FACE_PLAYER] = gMovementActionFuncs_FacePlayer, + [MOVEMENT_ACTION_FACE_AWAY_PLAYER] = gMovementActionFuncs_FaceAwayPlayer, + [MOVEMENT_ACTION_LOCK_FACING_DIRECTION] = gMovementActionFuncs_LockFacingDirection, + [MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION] = gMovementActionFuncs_UnlockFacingDirection, + [MOVEMENT_ACTION_JUMP_DOWN] = gMovementActionFuncs_JumpDown, + [MOVEMENT_ACTION_JUMP_UP] = gMovementActionFuncs_JumpUp, + [MOVEMENT_ACTION_JUMP_LEFT] = gMovementActionFuncs_JumpLeft, + [MOVEMENT_ACTION_JUMP_RIGHT] = gMovementActionFuncs_JumpRight, + [MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN] = gMovementActionFuncs_JumpInPlaceDown, + [MOVEMENT_ACTION_JUMP_IN_PLACE_UP] = gMovementActionFuncs_JumpInPlaceUp, + [MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT] = gMovementActionFuncs_JumpInPlaceLeft, + [MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT] = gMovementActionFuncs_JumpInPlaceRight, + [MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP] = gMovementActionFuncs_JumpInPlaceDownUp, + [MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN] = gMovementActionFuncs_JumpInPlaceUpDown, + [MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT] = gMovementActionFuncs_JumpInPlaceLeftRight, + [MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT] = gMovementActionFuncs_JumpInPlaceRightLeft, + [MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION] = gMovementActionFuncs_FaceOriginalDirection, + [MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN] = gMovementActionFuncs_NurseJoyBowDown, + [MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT] = gMovementActionFuncs_EnableJumpLandingGroundEffect, + [MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT] = gMovementActionFuncs_DisableJumpLandingGroundEffect, + [MOVEMENT_ACTION_DISABLE_ANIMATION] = gMovementActionFuncs_DisableAnimation, + [MOVEMENT_ACTION_RESTORE_ANIMATION] = gMovementActionFuncs_RestoreAnimation, + [MOVEMENT_ACTION_SET_INVISIBLE] = gMovementActionFuncs_SetInvisible, + [MOVEMENT_ACTION_SET_VISIBLE] = gMovementActionFuncs_SetVisible, + [MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK] = gMovementActionFuncs_EmoteExclamationMark, + [MOVEMENT_ACTION_EMOTE_QUESTION_MARK] = gMovementActionFuncs_EmoteQuestionMark, + [MOVEMENT_ACTION_EMOTE_HEART] = gMovementActionFuncs_EmoteHeart, + [MOVEMENT_ACTION_REVEAL_TRAINER] = gMovementActionFuncs_RevealTrainer, + [MOVEMENT_ACTION_ROCK_SMASH_BREAK] = gMovementActionFuncs_RockSmashBreak, + [MOVEMENT_ACTION_CUT_TREE] = gMovementActionFuncs_CutTree, + [MOVEMENT_ACTION_SET_FIXED_PRIORITY] = gMovementActionFuncs_SetFixedPriority, + [MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY] = gMovementActionFuncs_ClearFixedPriority, + [MOVEMENT_ACTION_INIT_AFFINE_ANIM] = gMovementActionFuncs_InitAffineAnim, + [MOVEMENT_ACTION_CLEAR_AFFINE_ANIM] = gMovementActionFuncs_ClearAffineAnim, + [MOVEMENT_ACTION_UNKNOWN1] = gMovementActionFuncs_Unknown1, + [MOVEMENT_ACTION_UNKNOWN2] = gMovementActionFuncs_Unknown2, + [MOVEMENT_ACTION_WALK_DOWN_START_AFFINE] = gMovementActionFuncs_WalkDownStartAffine, + [MOVEMENT_ACTION_WALK_DOWN_AFFINE] = gMovementActionFuncs_WalkDownAffine, + [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN] = gMovementActionFuncs_AcroWheelieFaceDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP] = gMovementActionFuncs_AcroWheelieFaceUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT] = gMovementActionFuncs_AcroWheelieFaceLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT] = gMovementActionFuncs_AcroWheelieFaceRight, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN] = gMovementActionFuncs_AcroPopWheelieDown, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP] = gMovementActionFuncs_AcroPopWheelieUp, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT] = gMovementActionFuncs_AcroPopWheelieLeft, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT] = gMovementActionFuncs_AcroPopWheelieRight, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN] = gMovementActionFuncs_AcroEndWheelieFaceDown, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP] = gMovementActionFuncs_AcroEndWheelieFaceUp, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT] = gMovementActionFuncs_AcroEndWheelieFaceLeft, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT] = gMovementActionFuncs_AcroEndWheelieFaceRight, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN] = gMovementActionFuncs_AcroWheelieHopFaceDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP] = gMovementActionFuncs_AcroWheelieHopFaceUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT] = gMovementActionFuncs_AcroWheelieHopFaceLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT] = gMovementActionFuncs_AcroWheelieHopFaceRight, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN] = gMovementActionFuncs_AcroWheelieHopDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP] = gMovementActionFuncs_AcroWheelieHopUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT] = gMovementActionFuncs_AcroWheelieHopLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT] = gMovementActionFuncs_AcroWheelieHopRight, + [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN] = gMovementActionFuncs_AcroWheelieJumpDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP] = gMovementActionFuncs_AcroWheelieJumpUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT] = gMovementActionFuncs_AcroWheelieJumpLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT] = gMovementActionFuncs_AcroWheelieJumpRight, + [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN] = gMovementActionFuncs_AcroWheelieInPlaceDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP] = gMovementActionFuncs_AcroWheelieInPlaceUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT] = gMovementActionFuncs_AcroWheelieInPlaceLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT] = gMovementActionFuncs_AcroWheelieInPlaceRight, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN] = gMovementActionFuncs_AcroPopWheelieMoveDown, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP] = gMovementActionFuncs_AcroPopWheelieMoveUp, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT] = gMovementActionFuncs_AcroPopWheelieMoveLeft, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT] = gMovementActionFuncs_AcroPopWheelieMoveRight, + [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN] = gMovementActionFuncs_AcroWheelieMoveDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP] = gMovementActionFuncs_AcroWheelieMoveUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT] = gMovementActionFuncs_AcroWheelieMoveLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT] = gMovementActionFuncs_AcroWheelieMoveRight, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN] = gMovementActionFuncs_AcroEndWheelieMoveDown, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP] = gMovementActionFuncs_AcroEndWheelieMoveUp, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT] = gMovementActionFuncs_AcroEndWheelieMoveLeft, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT] = gMovementActionFuncs_AcroEndWheelieMoveRight, + [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT] = gMovementActionFuncs_WalkNormalDiagonalUpLeft, + [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT] = gMovementActionFuncs_WalkNormalDiagonalUpRight, + [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT] = gMovementActionFuncs_WalkNormalDiagonalDownLeft, + [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT] = gMovementActionFuncs_WalkNormalDiagonalDownRight, + [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT] = gMovementActionFuncs_WalkSlowDiagonalUpLeft, + [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT] = gMovementActionFuncs_WalkSlowDiagonalUpRight, + [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT] = gMovementActionFuncs_WalkSlowDiagonalDownLeft, + [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT] = gMovementActionFuncs_WalkSlowDiagonalDownRight, + [MOVEMENT_ACTION_STORE_AND_LOCK_ANIM] = gMovementActionFuncs_StoreAndLockAnim, + [MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM] = gMovementActionFuncs_FreeAndUnlockAnim, + [MOVEMENT_ACTION_WALK_LEFT_AFFINE] = gMovementActionFuncs_WalkLeftAffine, + [MOVEMENT_ACTION_WALK_RIGHT_AFFINE] = gMovementActionFuncs_WalkRightAffine, + [MOVEMENT_ACTION_LEVITATE] = gMovementActionFuncs_Levitate, + [MOVEMENT_ACTION_STOP_LEVITATE] = gMovementActionFuncs_StopLevitate, + [MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP] = gMovementActionFuncs_DestroyExtraTaskIfAtTop, + [MOVEMENT_ACTION_FIGURE_8] = gMovementActionFuncs_Figure8, + [MOVEMENT_ACTION_FLY_UP] = gMovementActionFuncs_FlyUp, + [MOVEMENT_ACTION_FLY_DOWN] = gMovementActionFuncs_FlyDown, }; u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_FaceDown_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_FaceDown_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_FaceUp_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_FaceUp_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_FaceLeft_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_FaceLeft_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_FaceRight_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_FaceRight_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gUnknown_0850DEE8[])(u8) = { - GetMoveDirectionAnimNum, - GetMoveDirectionFastAnimNum, - GetMoveDirectionFastAnimNum, - GetMoveDirectionFasterAnimNum, - GetMoveDirectionFastestAnimNum, + GetMoveDirectionAnimNum, + GetMoveDirectionFastAnimNum, + GetMoveDirectionFastAnimNum, + GetMoveDirectionFasterAnimNum, + GetMoveDirectionFastestAnimNum, }; u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowDiagonalUpLeft_Step0, - MovementAction_WalkSlowDiagonalUpLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowDiagonalUpLeft_Step0, + MovementAction_WalkSlowDiagonalUpLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowDiagonalUpRight_Step0, - MovementAction_WalkSlowDiagonalUpRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowDiagonalUpRight_Step0, + MovementAction_WalkSlowDiagonalUpRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowDiagonalDownLeft_Step0, - MovementAction_WalkSlowDiagonalDownLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowDiagonalDownLeft_Step0, + MovementAction_WalkSlowDiagonalDownLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowDiagonalDownRight_Step0, - MovementAction_WalkSlowDiagonalDownRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowDiagonalDownRight_Step0, + MovementAction_WalkSlowDiagonalDownRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowDown_Step0, - MovementAction_WalkSlowDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowDown_Step0, + MovementAction_WalkSlowDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowUp_Step0, - MovementAction_WalkSlowUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowUp_Step0, + MovementAction_WalkSlowUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowLeft_Step0, - MovementAction_WalkSlowLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowLeft_Step0, + MovementAction_WalkSlowLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowRight_Step0, - MovementAction_WalkSlowRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowRight_Step0, + MovementAction_WalkSlowRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalDiagonalUpLeft_Step0, - MovementAction_WalkNormalDiagonalUpLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalDiagonalUpLeft_Step0, + MovementAction_WalkNormalDiagonalUpLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalDiagonalUpRight_Step0, - MovementAction_WalkNormalDiagonalUpRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalDiagonalUpRight_Step0, + MovementAction_WalkNormalDiagonalUpRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalDiagonalDownLeft_Step0, - MovementAction_WalkNormalDiagonalDownLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalDiagonalDownLeft_Step0, + MovementAction_WalkNormalDiagonalDownLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalDiagonalDownRight_Step0, - MovementAction_WalkNormalDiagonalDownRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalDiagonalDownRight_Step0, + MovementAction_WalkNormalDiagonalDownRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalDown_Step0, - MovementAction_WalkNormalDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalDown_Step0, + MovementAction_WalkNormalDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalUp_Step0, - MovementAction_WalkNormalUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalUp_Step0, + MovementAction_WalkNormalUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalLeft_Step0, - MovementAction_WalkNormalLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalLeft_Step0, + MovementAction_WalkNormalLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalRight_Step0, - MovementAction_WalkNormalRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalRight_Step0, + MovementAction_WalkNormalRight_Step1, + MovementAction_PauseSpriteAnim, }; const s16 gUnknown_0850DFBC[] = {0, 1, 1}; const s16 gUnknown_0850DFC2[] = {0, 0, 1}; u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *) = { - MovementAction_Jump2Down_Step0, - MovementAction_Jump2Down_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_Jump2Down_Step0, + MovementAction_Jump2Down_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *) = { - MovementAction_Jump2Up_Step0, - MovementAction_Jump2Up_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_Jump2Up_Step0, + MovementAction_Jump2Up_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *) = { - MovementAction_Jump2Left_Step0, - MovementAction_Jump2Left_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_Jump2Left_Step0, + MovementAction_Jump2Left_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *) = { - MovementAction_Jump2Right_Step0, - MovementAction_Jump2Right_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_Jump2Right_Step0, + MovementAction_Jump2Right_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *) = { - MovementAction_Delay1_Step0, - MovementAction_Delay_Step1, - MovementAction_Finish, + MovementAction_Delay1_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *) = { - MovementAction_Delay2_Step0, - MovementAction_Delay_Step1, - MovementAction_Finish, + MovementAction_Delay2_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *) = { - MovementAction_Delay4_Step0, - MovementAction_Delay_Step1, - MovementAction_Finish, + MovementAction_Delay4_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *) = { - MovementAction_Delay8_Step0, - MovementAction_Delay_Step1, - MovementAction_Finish, + MovementAction_Delay8_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *) = { - MovementAction_Delay16_Step0, - MovementAction_Delay_Step1, - MovementAction_Finish, + MovementAction_Delay16_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastDown_Step0, - MovementAction_WalkFastDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastDown_Step0, + MovementAction_WalkFastDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastUp_Step0, - MovementAction_WalkFastUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastUp_Step0, + MovementAction_WalkFastUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastLeft_Step0, - MovementAction_WalkFastLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastLeft_Step0, + MovementAction_WalkFastLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastRight_Step0, - MovementAction_WalkFastRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastRight_Step0, + MovementAction_WalkFastRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceSlowDown_Step0, - MovementAction_WalkInPlaceSlow_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceSlowDown_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceSlowUp_Step0, - MovementAction_WalkInPlaceSlow_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceSlowUp_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceSlowLeft_Step0, - MovementAction_WalkInPlaceSlow_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceSlowLeft_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceSlowRight_Step0, - MovementAction_WalkInPlaceSlow_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceSlowRight_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceNormalDown_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceNormalDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceNormalUp_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceNormalUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceNormalLeft_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceNormalLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceNormalRight_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceNormalRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastDown_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastUp_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastLeft_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastRight_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestDown_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastestDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestUp_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastestUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestLeft_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastestLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestRight_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastestRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_RideWaterCurrentDown_Step0, - MovementAction_RideWaterCurrentDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_RideWaterCurrentDown_Step0, + MovementAction_RideWaterCurrentDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_RideWaterCurrentUp_Step0, - MovementAction_RideWaterCurrentUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_RideWaterCurrentUp_Step0, + MovementAction_RideWaterCurrentUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_RideWaterCurrentLeft_Step0, - MovementAction_RideWaterCurrentLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_RideWaterCurrentLeft_Step0, + MovementAction_RideWaterCurrentLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_RideWaterCurrentRight_Step0, - MovementAction_RideWaterCurrentRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_RideWaterCurrentRight_Step0, + MovementAction_RideWaterCurrentRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastestDown_Step0, - MovementAction_WalkFastestDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastestDown_Step0, + MovementAction_WalkFastestDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastestUp_Step0, - MovementAction_WalkFastestUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastestUp_Step0, + MovementAction_WalkFastestUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastestLeft_Step0, - MovementAction_WalkFastestLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastestLeft_Step0, + MovementAction_WalkFastestLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastestRight_Step0, - MovementAction_WalkFastestRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastestRight_Step0, + MovementAction_WalkFastestRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_SlideDown_Step0, - MovementAction_SlideDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_SlideDown_Step0, + MovementAction_SlideDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_SlideUp_Step0, - MovementAction_SlideUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_SlideUp_Step0, + MovementAction_SlideUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_SlideLeft_Step0, - MovementAction_SlideLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_SlideLeft_Step0, + MovementAction_SlideLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_SlideRight_Step0, - MovementAction_SlideRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_SlideRight_Step0, + MovementAction_SlideRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_PlayerRunDown_Step0, - MovementAction_PlayerRunDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_PlayerRunDown_Step0, + MovementAction_PlayerRunDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_PlayerRunUp_Step0, - MovementAction_PlayerRunUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_PlayerRunUp_Step0, + MovementAction_PlayerRunUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_PlayerRunLeft_Step0, - MovementAction_PlayerRunLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_PlayerRunLeft_Step0, + MovementAction_PlayerRunLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_PlayerRunRight_Step0, - MovementAction_PlayerRunRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_PlayerRunRight_Step0, + MovementAction_PlayerRunRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *) = { - MovementAction_StartAnimInDirection_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_StartAnimInDirection_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpSpecialDown_Step0, - MovementAction_JumpSpecialDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpSpecialDown_Step0, + MovementAction_JumpSpecialDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpSpecialUp_Step0, - MovementAction_JumpSpecialUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpSpecialUp_Step0, + MovementAction_JumpSpecialUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpSpecialLeft_Step0, - MovementAction_JumpSpecialLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpSpecialLeft_Step0, + MovementAction_JumpSpecialLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpSpecialRight_Step0, - MovementAction_JumpSpecialRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpSpecialRight_Step0, + MovementAction_JumpSpecialRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *) = { - MovementAction_FacePlayer_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_FacePlayer_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *) = { - MovementAction_FaceAwayPlayer_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_FaceAwayPlayer_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *) = { - MovementAction_LockFacingDirection_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_LockFacingDirection_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *) = { - MovementAction_UnlockFacingDirection_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_UnlockFacingDirection_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpDown_Step0, - MovementAction_JumpDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpDown_Step0, + MovementAction_JumpDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpUp_Step0, - MovementAction_JumpUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpUp_Step0, + MovementAction_JumpUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpLeft_Step0, - MovementAction_JumpLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpLeft_Step0, + MovementAction_JumpLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpRight_Step0, - MovementAction_JumpRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpRight_Step0, + MovementAction_JumpRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceDown_Step0, - MovementAction_JumpInPlaceDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceDown_Step0, + MovementAction_JumpInPlaceDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceUp_Step0, - MovementAction_JumpInPlaceUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceUp_Step0, + MovementAction_JumpInPlaceUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceLeft_Step0, - MovementAction_JumpInPlaceLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceLeft_Step0, + MovementAction_JumpInPlaceLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceRight_Step0, - MovementAction_JumpInPlaceRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceRight_Step0, + MovementAction_JumpInPlaceRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceDownUp_Step0, - MovementAction_JumpInPlaceDownUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceDownUp_Step0, + MovementAction_JumpInPlaceDownUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceUpDown_Step0, - MovementAction_JumpInPlaceUpDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceUpDown_Step0, + MovementAction_JumpInPlaceUpDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceLeftRight_Step0, - MovementAction_JumpInPlaceLeftRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceLeftRight_Step0, + MovementAction_JumpInPlaceLeftRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceRightLeft_Step0, - MovementAction_JumpInPlaceRightLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceRightLeft_Step0, + MovementAction_JumpInPlaceRightLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *) = { - MovementAction_FaceOriginalDirection_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_FaceOriginalDirection_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_NurseJoyBowDown_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_NurseJoyBowDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { - MovementAction_EnableJumpLandingGroundEffect_Step0, - MovementAction_Finish, + MovementAction_EnableJumpLandingGroundEffect_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { - MovementAction_DisableJumpLandingGroundEffect_Step0, - MovementAction_Finish, + MovementAction_DisableJumpLandingGroundEffect_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *) = { - MovementAction_DisableAnimation_Step0, - MovementAction_Finish, + MovementAction_DisableAnimation_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *) = { - MovementAction_RestoreAnimation_Step0, - MovementAction_Finish, + MovementAction_RestoreAnimation_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *) = { - MovementAction_SetInvisible_Step0, - MovementAction_Finish, + MovementAction_SetInvisible_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *) = { - MovementAction_SetVisible_Step0, - MovementAction_Finish, + MovementAction_SetVisible_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *) = { - MovementAction_EmoteExclamationMark_Step0, - MovementAction_Finish, + MovementAction_EmoteExclamationMark_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *) = { - MovementAction_EmoteQuestionMark_Step0, - MovementAction_Finish, + MovementAction_EmoteQuestionMark_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *) = { - MovementAction_EmoteHeart_Step0, - MovementAction_Finish, + MovementAction_EmoteHeart_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *) = { - MovementAction_RevealTrainer_Step0, - MovementAction_RevealTrainer_Step1, - MovementAction_Finish, + MovementAction_RevealTrainer_Step0, + MovementAction_RevealTrainer_Step1, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *) = { - MovementAction_RockSmashBreak_Step0, - MovementAction_RockSmashBreak_Step1, - MovementAction_RockSmashBreak_Step2, - MovementAction_Finish, + MovementAction_RockSmashBreak_Step0, + MovementAction_RockSmashBreak_Step1, + MovementAction_RockSmashBreak_Step2, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *) = { - MovementAction_CutTree_Step0, - MovementAction_CutTree_Step1, - MovementAction_CutTree_Step2, - MovementAction_Finish, + MovementAction_CutTree_Step0, + MovementAction_CutTree_Step1, + MovementAction_CutTree_Step2, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *) = { - MovementAction_SetFixedPriority_Step0, - MovementAction_Finish, + MovementAction_SetFixedPriority_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *) = { - MovementAction_ClearFixedPriority_Step0, - MovementAction_Finish, + MovementAction_ClearFixedPriority_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *) = { - MovementAction_InitAffineAnim_Step0, - MovementAction_Finish, + MovementAction_InitAffineAnim_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *) = { - MovementAction_ClearAffineAnim_Step0, - MovementAction_Finish, + MovementAction_ClearAffineAnim_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_Unknown1[])(struct EventObject *, struct Sprite *) = { - MovementAction_Unknown1_Step0, - MovementAction_Finish, + MovementAction_Unknown1_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_Unknown2[])(struct EventObject *, struct Sprite *) = { - MovementAction_Unknown2_Step0, - MovementAction_Finish, + MovementAction_Unknown2_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkDownStartAffine_Step0, - MovementAction_WalkDownStartAffine_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkDownStartAffine_Step0, + MovementAction_WalkDownStartAffine_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkDownAffine_Step0, - MovementAction_WalkDownAffine_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkDownAffine_Step0, + MovementAction_WalkDownAffine_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkLeftAffine_Step0, - MovementAction_WalkLeftAffine_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkLeftAffine_Step0, + MovementAction_WalkLeftAffine_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkRightAffine_Step0, - MovementAction_WalkRightAffine_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkRightAffine_Step0, + MovementAction_WalkRightAffine_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieFaceDown_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieFaceDown_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieFaceUp_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieFaceUp_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieFaceLeft_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieFaceLeft_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieFaceRight_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieFaceRight_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieDown_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieUp_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieUp_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieLeft_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieLeft_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieRight_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieRight_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieFaceDown_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieFaceDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieFaceUp_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieFaceUp_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieFaceLeft_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieFaceLeft_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieFaceRight_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieFaceRight_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroUnusedAcroActionDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_UnusedAcroActionDown_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_UnusedAcroActionDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroUnusedAcroActionUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_UnusedAcroActionUp_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_UnusedAcroActionUp_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroUnusedAcroActionLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_UnusedAcroActionLeft_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_UnusedAcroActionLeft_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroUnusedAcroActionRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_UnusedAcroActionRight_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_UnusedAcroActionRight_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_Figure8[])(struct EventObject *, struct Sprite *) = { - MovementAction_Figure8_Step0, - MovementAction_Figure8_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_Figure8_Step0, + MovementAction_Figure8_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopFaceDown_Step0, - MovementAction_AcroWheelieHopFaceDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopFaceDown_Step0, + MovementAction_AcroWheelieHopFaceDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopFaceUp_Step0, - MovementAction_AcroWheelieHopFaceUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopFaceUp_Step0, + MovementAction_AcroWheelieHopFaceUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopFaceLeft_Step0, - MovementAction_AcroWheelieHopFaceLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopFaceLeft_Step0, + MovementAction_AcroWheelieHopFaceLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopFaceRight_Step0, - MovementAction_AcroWheelieHopFaceRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopFaceRight_Step0, + MovementAction_AcroWheelieHopFaceRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopDown_Step0, - MovementAction_AcroWheelieHopDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopDown_Step0, + MovementAction_AcroWheelieHopDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopUp_Step0, - MovementAction_AcroWheelieHopUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopUp_Step0, + MovementAction_AcroWheelieHopUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopLeft_Step0, - MovementAction_AcroWheelieHopLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopLeft_Step0, + MovementAction_AcroWheelieHopLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopRight_Step0, - MovementAction_AcroWheelieHopRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopRight_Step0, + MovementAction_AcroWheelieHopRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieJumpDown_Step0, - MovementAction_AcroWheelieJumpDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieJumpDown_Step0, + MovementAction_AcroWheelieJumpDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieJumpUp_Step0, - MovementAction_AcroWheelieJumpUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieJumpUp_Step0, + MovementAction_AcroWheelieJumpUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieJumpLeft_Step0, - MovementAction_AcroWheelieJumpLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieJumpLeft_Step0, + MovementAction_AcroWheelieJumpLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieJumpRight_Step0, - MovementAction_AcroWheelieJumpRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieJumpRight_Step0, + MovementAction_AcroWheelieJumpRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieInPlaceDown_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieInPlaceDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieInPlaceUp_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieInPlaceUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieInPlaceLeft_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieInPlaceLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieInPlaceRight_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieInPlaceRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieMoveDown_Step0, - MovementAction_AcroPopWheelieMoveDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieMoveDown_Step0, + MovementAction_AcroPopWheelieMoveDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieMoveUp_Step0, - MovementAction_AcroPopWheelieMoveUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieMoveUp_Step0, + MovementAction_AcroPopWheelieMoveUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieMoveLeft_Step0, - MovementAction_AcroPopWheelieMoveLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieMoveLeft_Step0, + MovementAction_AcroPopWheelieMoveLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieMoveRight_Step0, - MovementAction_AcroPopWheelieMoveRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieMoveRight_Step0, + MovementAction_AcroPopWheelieMoveRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieMoveDown_Step0, - MovementAction_AcroWheelieMoveDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieMoveDown_Step0, + MovementAction_AcroWheelieMoveDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieMoveUp_Step0, - MovementAction_AcroWheelieMoveUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieMoveUp_Step0, + MovementAction_AcroWheelieMoveUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieMoveLeft_Step0, - MovementAction_AcroWheelieMoveLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieMoveLeft_Step0, + MovementAction_AcroWheelieMoveLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieMoveRight_Step0, - MovementAction_AcroWheelieMoveRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieMoveRight_Step0, + MovementAction_AcroWheelieMoveRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieMoveDown_Step0, - MovementAction_AcroEndWheelieMoveDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieMoveDown_Step0, + MovementAction_AcroEndWheelieMoveDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieMoveUp_Step0, - MovementAction_AcroEndWheelieMoveUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieMoveUp_Step0, + MovementAction_AcroEndWheelieMoveUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieMoveLeft_Step0, - MovementAction_AcroEndWheelieMoveLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieMoveLeft_Step0, + MovementAction_AcroEndWheelieMoveLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieMoveRight_Step0, - MovementAction_AcroEndWheelieMoveRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieMoveRight_Step0, + MovementAction_AcroEndWheelieMoveRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_Levitate[])(struct EventObject *, struct Sprite *) = { - MovementAction_Levitate_Step0, - MovementAction_Finish, + MovementAction_Levitate_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_StopLevitate[])(struct EventObject *, struct Sprite *) = { - MovementAction_StopLevitate_Step0, - MovementAction_Finish, + MovementAction_StopLevitate_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct EventObject *, struct Sprite *) = { - MovementAction_DestroyExtraTaskIfAtTop_Step0, - MovementAction_Finish, + MovementAction_DestroyExtraTaskIfAtTop_Step0, + MovementAction_Finish, }; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 0f91c2250..0c4a6e21b 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -134,7 +134,7 @@ const u32 gItemIconPalette_GreenShard[] = INCBIN_U32("graphics/items/icon_palett const u32 gItemIcon_HPUp[] = INCBIN_U32("graphics/items/icons/hp_up.4bpp.lz"); const u32 gItemIconPalette_HPUp[] = INCBIN_U32("graphics/items/icon_palettes/hp_up.gbapal.lz"); -const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz"); +const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz"); const u32 gItemIconPalette_Protein[] = INCBIN_U32("graphics/items/icon_palettes/protein.gbapal.lz"); const u32 gItemIconPalette_Iron[] = INCBIN_U32("graphics/items/icon_palettes/iron.gbapal.lz"); const u32 gItemIconPalette_Carbos[] = INCBIN_U32("graphics/items/icon_palettes/carbos.gbapal.lz"); diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index ab64c6f20..cdb28f8c3 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1,444 +1,2206 @@ +#include "constants/species.h" + const struct MonCoords gMonBackPicCoords[] = { - [SPECIES_NONE] = {0x88, 0x00}, - [SPECIES_BULBASAUR] = {0x64, 0x10}, - [SPECIES_IVYSAUR] = {0x66, 0x09}, - [SPECIES_VENUSAUR] = {0x87, 0x07}, - [SPECIES_CHARMANDER] = {0x65, 0x0e}, - [SPECIES_CHARMELEON] = {0x66, 0x09}, - [SPECIES_CHARIZARD] = {0x87, 0x04}, - [SPECIES_SQUIRTLE] = {0x65, 0x0e}, - [SPECIES_WARTORTLE] = {0x76, 0x0a}, - [SPECIES_BLASTOISE] = {0x86, 0x08}, - [SPECIES_CATERPIE] = {0x55, 0x0f}, - [SPECIES_METAPOD] = {0x65, 0x0c}, - [SPECIES_BUTTERFREE] = {0x87, 0x06}, - [SPECIES_WEEDLE] = {0x56, 0x0b}, - [SPECIES_KAKUNA] = {0x46, 0x0a}, - [SPECIES_BEEDRILL] = {0x86, 0x09}, - [SPECIES_PIDGEY] = {0x66, 0x08}, - [SPECIES_PIDGEOTTO] = {0x85, 0x0c}, - [SPECIES_PIDGEOT] = {0x78, 0x02}, - [SPECIES_RATTATA] = {0x65, 0x0d}, - [SPECIES_RATICATE] = {0x75, 0x0d}, - [SPECIES_SPEAROW] = {0x65, 0x0c}, - [SPECIES_FEAROW] = {0x87, 0x05}, - [SPECIES_EKANS] = {0x66, 0x09}, - [SPECIES_ARBOK] = {0x77, 0x04}, - [SPECIES_PIKACHU] = {0x77, 0x07}, - [SPECIES_RAICHU] = {0x66, 0x08}, - [SPECIES_SANDSHREW] = {0x65, 0x0d}, - [SPECIES_SANDSLASH] = {0x86, 0x09}, - [SPECIES_NIDORAN_F] = {0x55, 0x0c}, - [SPECIES_NIDORINA] = {0x86, 0x0a}, - [SPECIES_NIDOQUEEN] = {0x77, 0x06}, - [SPECIES_NIDORAN_M] = {0x56, 0x08}, - [SPECIES_NIDORINO] = {0x86, 0x09}, - [SPECIES_NIDOKING] = {0x88, 0x03}, - [SPECIES_CLEFAIRY] = {0x65, 0x0d}, - [SPECIES_CLEFABLE] = {0x76, 0x0a}, - [SPECIES_VULPIX] = {0x76, 0x09}, - [SPECIES_NINETALES] = {0x77, 0x05}, - [SPECIES_JIGGLYPUFF] = {0x65, 0x0d}, - [SPECIES_WIGGLYTUFF] = {0x66, 0x08}, - [SPECIES_ZUBAT] = {0x76, 0x0b}, - [SPECIES_GOLBAT] = {0x87, 0x06}, - [SPECIES_ODDISH] = {0x56, 0x0b}, - [SPECIES_GLOOM] = {0x66, 0x0a}, - [SPECIES_VILEPLUME] = {0x87, 0x07}, - [SPECIES_PARAS] = {0x63, 0x14}, - [SPECIES_PARASECT] = {0x87, 0x07}, - [SPECIES_VENONAT] = {0x77, 0x06}, - [SPECIES_VENOMOTH] = {0x77, 0x04}, - [SPECIES_DIGLETT] = {0x54, 0x10}, - [SPECIES_DUGTRIO] = {0x66, 0x0b}, - [SPECIES_MEOWTH] = {0x65, 0x0c}, - [SPECIES_PERSIAN] = {0x87, 0x07}, - [SPECIES_PSYDUCK] = {0x67, 0x07}, - [SPECIES_GOLDUCK] = {0x77, 0x05}, - [SPECIES_MANKEY] = {0x76, 0x0b}, - [SPECIES_PRIMEAPE] = {0x77, 0x07}, - [SPECIES_GROWLITHE] = {0x66, 0x08}, - [SPECIES_ARCANINE] = {0x87, 0x06}, - [SPECIES_POLIWAG] = {0x74, 0x10}, - [SPECIES_POLIWHIRL] = {0x65, 0x0c}, - [SPECIES_POLIWRATH] = {0x86, 0x0b}, - [SPECIES_ABRA] = {0x66, 0x0b}, - [SPECIES_KADABRA] = {0x76, 0x08}, - [SPECIES_ALAKAZAM] = {0x67, 0x05}, - [SPECIES_MACHOP] = {0x65, 0x0c}, - [SPECIES_MACHOKE] = {0x76, 0x09}, - [SPECIES_MACHAMP] = {0x67, 0x04}, - [SPECIES_BELLSPROUT] = {0x66, 0x0a}, - [SPECIES_WEEPINBELL] = {0x66, 0x09}, - [SPECIES_VICTREEBEL] = {0x87, 0x06}, - [SPECIES_TENTACOOL] = {0x56, 0x0a}, - [SPECIES_TENTACRUEL] = {0x86, 0x0b}, - [SPECIES_GEODUDE] = {0x66, 0x0b}, - [SPECIES_GRAVELER] = {0x75, 0x0c}, - [SPECIES_GOLEM] = {0x84, 0x10}, - [SPECIES_PONYTA] = {0x66, 0x09}, - [SPECIES_RAPIDASH] = {0x87, 0x05}, - [SPECIES_SLOWPOKE] = {0x85, 0x0e}, - [SPECIES_SLOWBRO] = {0x86, 0x0a}, - [SPECIES_MAGNEMITE] = {0x43, 0x14}, - [SPECIES_MAGNETON] = {0x66, 0x0a}, - [SPECIES_FARFETCHD] = {0x66, 0x0a}, - [SPECIES_DODUO] = {0x66, 0x08}, - [SPECIES_DODRIO] = {0x88, 0x01}, - [SPECIES_SEEL] = {0x66, 0x0a}, - [SPECIES_DEWGONG] = {0x77, 0x05}, - [SPECIES_GRIMER] = {0x75, 0x0c}, - [SPECIES_MUK] = {0x87, 0x05}, - [SPECIES_SHELLDER] = {0x76, 0x0b}, - [SPECIES_CLOYSTER] = {0x87, 0x06}, - [SPECIES_GASTLY] = {0x85, 0x0e}, - [SPECIES_HAUNTER] = {0x76, 0x08}, - [SPECIES_GENGAR] = {0x76, 0x09}, - [SPECIES_ONIX] = {0x78, 0x00}, - [SPECIES_DROWZEE] = {0x65, 0x0d}, - [SPECIES_HYPNO] = {0x66, 0x09}, - [SPECIES_KRABBY] = {0x66, 0x0a}, - [SPECIES_KINGLER] = {0x77, 0x04}, - [SPECIES_VOLTORB] = {0x55, 0x0e}, - [SPECIES_ELECTRODE] = {0x65, 0x0d}, - [SPECIES_EXEGGCUTE] = {0x65, 0x0d}, - [SPECIES_EXEGGUTOR] = {0x87, 0x04}, - [SPECIES_CUBONE] = {0x66, 0x0a}, - [SPECIES_MAROWAK] = {0x66, 0x08}, - [SPECIES_HITMONLEE] = {0x65, 0x0c}, - [SPECIES_HITMONCHAN] = {0x65, 0x0c}, - [SPECIES_LICKITUNG] = {0x65, 0x0e}, - [SPECIES_KOFFING] = {0x66, 0x09}, - [SPECIES_WEEZING] = {0x77, 0x06}, - [SPECIES_RHYHORN] = {0x85, 0x0c}, - [SPECIES_RHYDON] = {0x88, 0x03}, - [SPECIES_CHANSEY] = {0x86, 0x0b}, - [SPECIES_TANGELA] = {0x85, 0x0e}, - [SPECIES_KANGASKHAN] = {0x77, 0x05}, - [SPECIES_HORSEA] = {0x66, 0x09}, - [SPECIES_SEADRA] = {0x66, 0x08}, - [SPECIES_GOLDEEN] = {0x66, 0x08}, - [SPECIES_SEAKING] = {0x76, 0x0b}, - [SPECIES_STARYU] = {0x65, 0x0d}, - [SPECIES_STARMIE] = {0x85, 0x0e}, - [SPECIES_MR_MIME] = {0x85, 0x0d}, - [SPECIES_SCYTHER] = {0x77, 0x07}, - [SPECIES_JYNX] = {0x86, 0x0a}, - [SPECIES_ELECTABUZZ] = {0x66, 0x08}, - [SPECIES_MAGMAR] = {0x66, 0x08}, - [SPECIES_PINSIR] = {0x66, 0x09}, - [SPECIES_TAUROS] = {0x85, 0x0d}, - [SPECIES_MAGIKARP] = {0x76, 0x09}, - [SPECIES_GYARADOS] = {0x78, 0x00}, - [SPECIES_LAPRAS] = {0x77, 0x04}, - [SPECIES_DITTO] = {0x54, 0x11}, - [SPECIES_EEVEE] = {0x66, 0x0a}, - [SPECIES_VAPOREON] = {0x66, 0x0a}, - [SPECIES_JOLTEON] = {0x87, 0x06}, - [SPECIES_FLAREON] = {0x67, 0x05}, - [SPECIES_PORYGON] = {0x65, 0x0d}, - [SPECIES_OMANYTE] = {0x66, 0x0a}, - [SPECIES_OMASTAR] = {0x66, 0x08}, - [SPECIES_KABUTO] = {0x65, 0x0d}, - [SPECIES_KABUTOPS] = {0x77, 0x05}, - [SPECIES_AERODACTYL] = {0x86, 0x08}, - [SPECIES_SNORLAX] = {0x86, 0x0b}, - [SPECIES_ARTICUNO] = {0x65, 0x0c}, - [SPECIES_ZAPDOS] = {0x76, 0x0b}, - [SPECIES_MOLTRES] = {0x87, 0x04}, - [SPECIES_DRATINI] = {0x66, 0x09}, - [SPECIES_DRAGONAIR] = {0x78, 0x00}, - [SPECIES_DRAGONITE] = {0x87, 0x06}, - [SPECIES_MEWTWO] = {0x78, 0x01}, - [SPECIES_MEW] = {0x66, 0x08}, - [SPECIES_CHIKORITA] = {0x56, 0x0a}, - [SPECIES_BAYLEEF] = {0x66, 0x08}, - [SPECIES_MEGANIUM] = {0x78, 0x00}, - [SPECIES_CYNDAQUIL] = {0x76, 0x09}, - [SPECIES_QUILAVA] = {0x87, 0x04}, - [SPECIES_TYPHLOSION] = {0x87, 0x04}, - [SPECIES_TOTODILE] = {0x66, 0x0b}, - [SPECIES_CROCONAW] = {0x67, 0x07}, - [SPECIES_FERALIGATR] = {0x88, 0x01}, - [SPECIES_SENTRET] = {0x67, 0x05}, - [SPECIES_FURRET] = {0x66, 0x08}, - [SPECIES_HOOTHOOT] = {0x66, 0x08}, - [SPECIES_NOCTOWL] = {0x68, 0x03}, - [SPECIES_LEDYBA] = {0x76, 0x0b}, - [SPECIES_LEDIAN] = {0x77, 0x07}, - [SPECIES_SPINARAK] = {0x73, 0x15}, - [SPECIES_ARIADOS] = {0x86, 0x0b}, - [SPECIES_CROBAT] = {0x87, 0x05}, - [SPECIES_CHINCHOU] = {0x86, 0x08}, - [SPECIES_LANTURN] = {0x86, 0x08}, - [SPECIES_PICHU] = {0x66, 0x0b}, - [SPECIES_CLEFFA] = {0x65, 0x0f}, - [SPECIES_IGGLYBUFF] = {0x66, 0x0b}, - [SPECIES_TOGEPI] = {0x54, 0x10}, - [SPECIES_TOGETIC] = {0x66, 0x08}, - [SPECIES_NATU] = {0x54, 0x11}, - [SPECIES_XATU] = {0x76, 0x08}, - [SPECIES_MAREEP] = {0x66, 0x09}, - [SPECIES_FLAAFFY] = {0x66, 0x09}, - [SPECIES_AMPHAROS] = {0x88, 0x01}, - [SPECIES_BELLOSSOM] = {0x66, 0x0b}, - [SPECIES_MARILL] = {0x75, 0x0c}, - [SPECIES_AZUMARILL] = {0x86, 0x08}, - [SPECIES_SUDOWOODO] = {0x66, 0x08}, - [SPECIES_POLITOED] = {0x66, 0x09}, - [SPECIES_HOPPIP] = {0x66, 0x0b}, - [SPECIES_SKIPLOOM] = {0x65, 0x0d}, - [SPECIES_JUMPLUFF] = {0x87, 0x04}, - [SPECIES_AIPOM] = {0x66, 0x09}, - [SPECIES_SUNKERN] = {0x56, 0x0a}, - [SPECIES_SUNFLORA] = {0x66, 0x08}, - [SPECIES_YANMA] = {0x77, 0x04}, - [SPECIES_WOOPER] = {0x85, 0x0f}, - [SPECIES_QUAGSIRE] = {0x76, 0x08}, - [SPECIES_ESPEON] = {0x76, 0x0b}, - [SPECIES_UMBREON] = {0x87, 0x04}, - [SPECIES_MURKROW] = {0x66, 0x09}, - [SPECIES_SLOWKING] = {0x66, 0x08}, - [SPECIES_MISDREAVUS] = {0x66, 0x0a}, - [SPECIES_UNOWN] = {0x36, 0x08}, - [SPECIES_WOBBUFFET] = {0x75, 0x0c}, - [SPECIES_GIRAFARIG] = {0x87, 0x05}, - [SPECIES_PINECO] = {0x65, 0x0f}, - [SPECIES_FORRETRESS] = {0x84, 0x10}, - [SPECIES_DUNSPARCE] = {0x85, 0x0f}, - [SPECIES_GLIGAR] = {0x87, 0x05}, - [SPECIES_STEELIX] = {0x88, 0x00}, - [SPECIES_SNUBBULL] = {0x76, 0x0a}, - [SPECIES_GRANBULL] = {0x87, 0x05}, - [SPECIES_QWILFISH] = {0x77, 0x07}, - [SPECIES_SCIZOR] = {0x77, 0x04}, - [SPECIES_SHUCKLE] = {0x56, 0x0b}, - [SPECIES_HERACROSS] = {0x77, 0x04}, - [SPECIES_SNEASEL] = {0x66, 0x08}, - [SPECIES_TEDDIURSA] = {0x66, 0x08}, - [SPECIES_URSARING] = {0x88, 0x03}, - [SPECIES_SLUGMA] = {0x66, 0x08}, - [SPECIES_MAGCARGO] = {0x76, 0x09}, - [SPECIES_SWINUB] = {0x63, 0x15}, - [SPECIES_PILOSWINE] = {0x75, 0x0d}, - [SPECIES_CORSOLA] = {0x65, 0x0c}, - [SPECIES_REMORAID] = {0x75, 0x0d}, - [SPECIES_OCTILLERY] = {0x66, 0x0a}, - [SPECIES_DELIBIRD] = {0x67, 0x06}, - [SPECIES_MANTINE] = {0x87, 0x07}, - [SPECIES_SKARMORY] = {0x87, 0x04}, - [SPECIES_HOUNDOUR] = {0x55, 0x0c}, - [SPECIES_HOUNDOOM] = {0x87, 0x07}, - [SPECIES_KINGDRA] = {0x87, 0x06}, - [SPECIES_PHANPY] = {0x65, 0x0e}, - [SPECIES_DONPHAN] = {0x85, 0x0d}, - [SPECIES_PORYGON2] = {0x76, 0x0a}, - [SPECIES_STANTLER] = {0x78, 0x03}, - [SPECIES_SMEARGLE] = {0x76, 0x0a}, - [SPECIES_TYROGUE] = {0x66, 0x08}, - [SPECIES_HITMONTOP] = {0x87, 0x05}, - [SPECIES_SMOOCHUM] = {0x56, 0x09}, - [SPECIES_ELEKID] = {0x66, 0x08}, - [SPECIES_MAGBY] = {0x66, 0x0b}, - [SPECIES_MILTANK] = {0x87, 0x07}, - [SPECIES_BLISSEY] = {0x85, 0x0d}, - [SPECIES_RAIKOU] = {0x86, 0x0a}, - [SPECIES_ENTEI] = {0x87, 0x06}, - [SPECIES_SUICUNE] = {0x88, 0x03}, - [SPECIES_LARVITAR] = {0x66, 0x08}, - [SPECIES_PUPITAR] = {0x67, 0x05}, - [SPECIES_TYRANITAR] = {0x88, 0x00}, - [SPECIES_LUGIA] = {0x88, 0x01}, - [SPECIES_HO_OH] = {0x88, 0x01}, - [SPECIES_CELEBI] = {0x66, 0x08}, - [SPECIES_OLD_UNOWN_B] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_C] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_D] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_E] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_F] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_G] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_H] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_I] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_J] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_K] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_L] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_M] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_N] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_O] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_P] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_Q] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_R] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_S] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_T] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_U] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_V] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_W] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_X] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_Y] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_Z] = {0x88, 0x02}, - [SPECIES_TREECKO] = {0x87, 0x06}, - [SPECIES_GROVYLE] = {0x86, 0x08}, - [SPECIES_SCEPTILE] = {0x88, 0x01}, - [SPECIES_TORCHIC] = {0x67, 0x05}, - [SPECIES_COMBUSKEN] = {0x88, 0x00}, - [SPECIES_BLAZIKEN] = {0x88, 0x00}, - [SPECIES_MUDKIP] = {0x77, 0x05}, - [SPECIES_MARSHTOMP] = {0x87, 0x04}, - [SPECIES_SWAMPERT] = {0x87, 0x05}, - [SPECIES_POOCHYENA] = {0x76, 0x09}, - [SPECIES_MIGHTYENA] = {0x87, 0x04}, - [SPECIES_ZIGZAGOON] = {0x76, 0x0b}, - [SPECIES_LINOONE] = {0x85, 0x0f}, - [SPECIES_WURMPLE] = {0x76, 0x0b}, - [SPECIES_SILCOON] = {0x83, 0x15}, - [SPECIES_BEAUTIFLY] = {0x88, 0x00}, - [SPECIES_CASCOON] = {0x73, 0x14}, - [SPECIES_DUSTOX] = {0x83, 0x14}, - [SPECIES_LOTAD] = {0x75, 0x0f}, - [SPECIES_LOMBRE] = {0x86, 0x08}, - [SPECIES_LUDICOLO] = {0x86, 0x0a}, - [SPECIES_SEEDOT] = {0x86, 0x09}, - [SPECIES_NUZLEAF] = {0x76, 0x0a}, - [SPECIES_SHIFTRY] = {0x86, 0x08}, - [SPECIES_NINCADA] = {0x83, 0x14}, - [SPECIES_NINJASK] = {0x86, 0x08}, - [SPECIES_SHEDINJA] = {0x77, 0x06}, - [SPECIES_TAILLOW] = {0x64, 0x11}, - [SPECIES_SWELLOW] = {0x86, 0x08}, - [SPECIES_SHROOMISH] = {0x85, 0x0d}, - [SPECIES_BRELOOM] = {0x87, 0x04}, - [SPECIES_SPINDA] = {0x77, 0x04}, - [SPECIES_WINGULL] = {0x85, 0x0e}, - [SPECIES_PELIPPER] = {0x87, 0x06}, - [SPECIES_SURSKIT] = {0x86, 0x0b}, - [SPECIES_MASQUERAIN] = {0x88, 0x00}, - [SPECIES_WAILMER] = {0x83, 0x15}, - [SPECIES_WAILORD] = {0x83, 0x16}, - [SPECIES_SKITTY] = {0x86, 0x0a}, - [SPECIES_DELCATTY] = {0x86, 0x08}, - [SPECIES_KECLEON] = {0x87, 0x06}, - [SPECIES_BALTOY] = {0x86, 0x08}, - [SPECIES_CLAYDOL] = {0x87, 0x07}, - [SPECIES_NOSEPASS] = {0x85, 0x0c}, - [SPECIES_TORKOAL] = {0x86, 0x0a}, - [SPECIES_SABLEYE] = {0x76, 0x08}, - [SPECIES_BARBOACH] = {0x66, 0x0a}, - [SPECIES_WHISCASH] = {0x86, 0x0a}, - [SPECIES_LUVDISC] = {0x46, 0x0a}, - [SPECIES_CORPHISH] = {0x77, 0x07}, - [SPECIES_CRAWDAUNT] = {0x87, 0x05}, - [SPECIES_FEEBAS] = {0x67, 0x07}, - [SPECIES_MILOTIC] = {0x68, 0x02}, - [SPECIES_CARVANHA] = {0x87, 0x07}, - [SPECIES_SHARPEDO] = {0x88, 0x02}, - [SPECIES_TRAPINCH] = {0x75, 0x0e}, - [SPECIES_VIBRAVA] = {0x74, 0x11}, - [SPECIES_FLYGON] = {0x88, 0x02}, - [SPECIES_MAKUHITA] = {0x76, 0x0b}, - [SPECIES_HARIYAMA] = {0x87, 0x07}, - [SPECIES_ELECTRIKE] = {0x84, 0x10}, - [SPECIES_MANECTRIC] = {0x87, 0x04}, - [SPECIES_NUMEL] = {0x86, 0x0b}, - [SPECIES_CAMERUPT] = {0x84, 0x13}, - [SPECIES_SPHEAL] = {0x64, 0x12}, - [SPECIES_SEALEO] = {0x86, 0x0a}, - [SPECIES_WALREIN] = {0x87, 0x06}, - [SPECIES_CACNEA] = {0x85, 0x0f}, - [SPECIES_CACTURNE] = {0x87, 0x07}, - [SPECIES_SNORUNT] = {0x76, 0x0a}, - [SPECIES_GLALIE] = {0x85, 0x0c}, - [SPECIES_LUNATONE] = {0x87, 0x05}, - [SPECIES_SOLROCK] = {0x87, 0x05}, - [SPECIES_AZURILL] = {0x86, 0x0a}, - [SPECIES_SPOINK] = {0x56, 0x0b}, - [SPECIES_GRUMPIG] = {0x87, 0x04}, - [SPECIES_PLUSLE] = {0x76, 0x08}, - [SPECIES_MINUN] = {0x76, 0x08}, - [SPECIES_MAWILE] = {0x87, 0x04}, - [SPECIES_MEDITITE] = {0x76, 0x0b}, - [SPECIES_MEDICHAM] = {0x68, 0x03}, - [SPECIES_SWABLU] = {0x86, 0x09}, - [SPECIES_ALTARIA] = {0x87, 0x06}, - [SPECIES_WYNAUT] = {0x77, 0x07}, - [SPECIES_DUSKULL] = {0x66, 0x0b}, - [SPECIES_DUSCLOPS] = {0x86, 0x08}, - [SPECIES_ROSELIA] = {0x86, 0x08}, - [SPECIES_SLAKOTH] = {0x85, 0x0f}, - [SPECIES_VIGOROTH] = {0x86, 0x0a}, - [SPECIES_SLAKING] = {0x86, 0x08}, - [SPECIES_GULPIN] = {0x66, 0x0b}, - [SPECIES_SWALOT] = {0x77, 0x06}, - [SPECIES_TROPIUS] = {0x87, 0x07}, - [SPECIES_WHISMUR] = {0x85, 0x0d}, - [SPECIES_LOUDRED] = {0x86, 0x09}, - [SPECIES_EXPLOUD] = {0x88, 0x03}, - [SPECIES_CLAMPERL] = {0x85, 0x0d}, - [SPECIES_HUNTAIL] = {0x68, 0x02}, - [SPECIES_GOREBYSS] = {0x77, 0x05}, - [SPECIES_ABSOL] = {0x78, 0x03}, - [SPECIES_SHUPPET] = {0x77, 0x06}, - [SPECIES_BANETTE] = {0x65, 0x0c}, - [SPECIES_SEVIPER] = {0x88, 0x03}, - [SPECIES_ZANGOOSE] = {0x88, 0x01}, - [SPECIES_RELICANTH] = {0x86, 0x0a}, - [SPECIES_ARON] = {0x54, 0x11}, - [SPECIES_LAIRON] = {0x84, 0x11}, - [SPECIES_AGGRON] = {0x87, 0x07}, - [SPECIES_CASTFORM] = {0x45, 0x0d}, - [SPECIES_VOLBEAT] = {0x76, 0x08}, - [SPECIES_ILLUMISE] = {0x67, 0x06}, - [SPECIES_LILEEP] = {0x86, 0x09}, - [SPECIES_CRADILY] = {0x77, 0x04}, - [SPECIES_ANORITH] = {0x83, 0x17}, - [SPECIES_ARMALDO] = {0x77, 0x05}, - [SPECIES_RALTS] = {0x45, 0x0d}, - [SPECIES_KIRLIA] = {0x57, 0x06}, - [SPECIES_GARDEVOIR] = {0x77, 0x04}, - [SPECIES_BAGON] = {0x66, 0x08}, - [SPECIES_SHELGON] = {0x85, 0x0d}, - [SPECIES_SALAMENCE] = {0x77, 0x06}, - [SPECIES_BELDUM] = {0x66, 0x0a}, - [SPECIES_METANG] = {0x84, 0x10}, - [SPECIES_METAGROSS] = {0x83, 0x14}, - [SPECIES_REGIROCK] = {0x86, 0x0a}, - [SPECIES_REGICE] = {0x85, 0x0e}, - [SPECIES_REGISTEEL] = {0x85, 0x0e}, - [SPECIES_KYOGRE] = {0x84, 0x13}, - [SPECIES_GROUDON] = {0x87, 0x07}, - [SPECIES_RAYQUAZA] = {0x78, 0x00}, - [SPECIES_LATIAS] = {0x88, 0x02}, - [SPECIES_LATIOS] = {0x88, 0x03}, - [SPECIES_JIRACHI] = {0x87, 0x05}, - [SPECIES_DEOXYS] = {0x86, 0x09}, - [SPECIES_CHIMECHO] = {0x47, 0x07}, - [SPECIES_EGG] = {0x36, 0x0a}, - [SPECIES_UNOWN_B] = {0x56, 0x09}, - [SPECIES_UNOWN_C] = {0x67, 0x06}, - [SPECIES_UNOWN_D] = {0x56, 0x08}, - [SPECIES_UNOWN_E] = {0x56, 0x0a}, - [SPECIES_UNOWN_F] = {0x66, 0x0a}, - [SPECIES_UNOWN_G] = {0x57, 0x05}, - [SPECIES_UNOWN_H] = {0x66, 0x08}, - [SPECIES_UNOWN_I] = {0x37, 0x07}, - [SPECIES_UNOWN_J] = {0x46, 0x09}, - [SPECIES_UNOWN_K] = {0x57, 0x07}, - [SPECIES_UNOWN_L] = {0x46, 0x0a}, - [SPECIES_UNOWN_M] = {0x65, 0x0d}, - [SPECIES_UNOWN_N] = {0x65, 0x0d}, - [SPECIES_UNOWN_O] = {0x66, 0x08}, - [SPECIES_UNOWN_P] = {0x46, 0x0a}, - [SPECIES_UNOWN_Q] = {0x55, 0x0f}, - [SPECIES_UNOWN_R] = {0x45, 0x0c}, - [SPECIES_UNOWN_S] = {0x57, 0x04}, - [SPECIES_UNOWN_T] = {0x45, 0x0d}, - [SPECIES_UNOWN_U] = {0x65, 0x0d}, - [SPECIES_UNOWN_V] = {0x56, 0x0b}, - [SPECIES_UNOWN_W] = {0x55, 0x0d}, - [SPECIES_UNOWN_X] = {0x55, 0x0f}, - [SPECIES_UNOWN_Y] = {0x46, 0x0a}, - [SPECIES_UNOWN_Z] = {0x46, 0x0a}, - [SPECIES_UNOWN_EMARK] = {0x37, 0x06}, - [SPECIES_UNOWN_QMARK] = {0x47, 0x06}, + [SPECIES_NONE] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_BULBASAUR] = + { + .coords = 0x64, + .y_offset = 0x10, + }, + [SPECIES_IVYSAUR] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_VENUSAUR] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_CHARMANDER] = + { + .coords = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_CHARMELEON] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_CHARIZARD] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_SQUIRTLE] = + { + .coords = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_WARTORTLE] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_BLASTOISE] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_CATERPIE] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_METAPOD] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_BUTTERFREE] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_WEEDLE] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_KAKUNA] = + { + .coords = 0x46, + .y_offset = 0x0a, + }, + [SPECIES_BEEDRILL] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_PIDGEY] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_PIDGEOTTO] = + { + .coords = 0x85, + .y_offset = 0x0c, + }, + [SPECIES_PIDGEOT] = + { + .coords = 0x78, + .y_offset = 0x02, + }, + [SPECIES_RATTATA] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_RATICATE] = + { + .coords = 0x75, + .y_offset = 0x0d, + }, + [SPECIES_SPEAROW] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_FEAROW] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_EKANS] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_ARBOK] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_PIKACHU] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_RAICHU] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_SANDSHREW] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_SANDSLASH] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_NIDORAN_F] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_NIDORINA] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_NIDOQUEEN] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_NIDORAN_M] = + { + .coords = 0x56, + .y_offset = 0x08, + }, + [SPECIES_NIDORINO] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_NIDOKING] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_CLEFAIRY] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_CLEFABLE] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_VULPIX] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_NINETALES] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_JIGGLYPUFF] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_WIGGLYTUFF] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_ZUBAT] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_GOLBAT] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_ODDISH] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_GLOOM] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_VILEPLUME] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_PARAS] = + { + .coords = 0x63, + .y_offset = 0x14, + }, + [SPECIES_PARASECT] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_VENONAT] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_VENOMOTH] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_DIGLETT] = + { + .coords = 0x54, + .y_offset = 0x10, + }, + [SPECIES_DUGTRIO] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_MEOWTH] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_PERSIAN] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_PSYDUCK] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_GOLDUCK] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_MANKEY] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_PRIMEAPE] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_GROWLITHE] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_ARCANINE] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_POLIWAG] = + { + .coords = 0x74, + .y_offset = 0x10, + }, + [SPECIES_POLIWHIRL] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_POLIWRATH] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_ABRA] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_KADABRA] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_ALAKAZAM] = + { + .coords = 0x67, + .y_offset = 0x05, + }, + [SPECIES_MACHOP] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_MACHOKE] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_MACHAMP] = + { + .coords = 0x67, + .y_offset = 0x04, + }, + [SPECIES_BELLSPROUT] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_WEEPINBELL] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_VICTREEBEL] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_TENTACOOL] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_TENTACRUEL] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_GEODUDE] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_GRAVELER] = + { + .coords = 0x75, + .y_offset = 0x0c, + }, + [SPECIES_GOLEM] = + { + .coords = 0x84, + .y_offset = 0x10, + }, + [SPECIES_PONYTA] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_RAPIDASH] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_SLOWPOKE] = + { + .coords = 0x85, + .y_offset = 0x0e, + }, + [SPECIES_SLOWBRO] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_MAGNEMITE] = + { + .coords = 0x43, + .y_offset = 0x14, + }, + [SPECIES_MAGNETON] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_FARFETCHD] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_DODUO] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_DODRIO] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SEEL] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_DEWGONG] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_GRIMER] = + { + .coords = 0x75, + .y_offset = 0x0c, + }, + [SPECIES_MUK] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_SHELLDER] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_CLOYSTER] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_GASTLY] = + { + .coords = 0x85, + .y_offset = 0x0e, + }, + [SPECIES_HAUNTER] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_GENGAR] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_ONIX] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_DROWZEE] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_HYPNO] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_KRABBY] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_KINGLER] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_VOLTORB] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_ELECTRODE] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_EXEGGCUTE] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_EXEGGUTOR] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_CUBONE] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_MAROWAK] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_HITMONLEE] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_HITMONCHAN] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_LICKITUNG] = + { + .coords = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_KOFFING] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_WEEZING] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_RHYHORN] = + { + .coords = 0x85, + .y_offset = 0x0c, + }, + [SPECIES_RHYDON] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_CHANSEY] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_TANGELA] = + { + .coords = 0x85, + .y_offset = 0x0e, + }, + [SPECIES_KANGASKHAN] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_HORSEA] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_SEADRA] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_GOLDEEN] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_SEAKING] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_STARYU] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_STARMIE] = + { + .coords = 0x85, + .y_offset = 0x0e, + }, + [SPECIES_MR_MIME] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_SCYTHER] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_JYNX] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_ELECTABUZZ] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_MAGMAR] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_PINSIR] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_TAUROS] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_MAGIKARP] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_GYARADOS] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_LAPRAS] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_DITTO] = + { + .coords = 0x54, + .y_offset = 0x11, + }, + [SPECIES_EEVEE] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_VAPOREON] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_JOLTEON] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_FLAREON] = + { + .coords = 0x67, + .y_offset = 0x05, + }, + [SPECIES_PORYGON] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_OMANYTE] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_OMASTAR] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_KABUTO] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_KABUTOPS] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_AERODACTYL] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_SNORLAX] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_ARTICUNO] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_ZAPDOS] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_MOLTRES] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_DRATINI] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_DRAGONAIR] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_DRAGONITE] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_MEWTWO] = + { + .coords = 0x78, + .y_offset = 0x01, + }, + [SPECIES_MEW] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_CHIKORITA] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_BAYLEEF] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_MEGANIUM] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_CYNDAQUIL] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_QUILAVA] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_TYPHLOSION] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_TOTODILE] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_CROCONAW] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_FERALIGATR] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SENTRET] = + { + .coords = 0x67, + .y_offset = 0x05, + }, + [SPECIES_FURRET] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_HOOTHOOT] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_NOCTOWL] = + { + .coords = 0x68, + .y_offset = 0x03, + }, + [SPECIES_LEDYBA] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_LEDIAN] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_SPINARAK] = + { + .coords = 0x73, + .y_offset = 0x15, + }, + [SPECIES_ARIADOS] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_CROBAT] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_CHINCHOU] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_LANTURN] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_PICHU] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_CLEFFA] = + { + .coords = 0x65, + .y_offset = 0x0f, + }, + [SPECIES_IGGLYBUFF] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_TOGEPI] = + { + .coords = 0x54, + .y_offset = 0x10, + }, + [SPECIES_TOGETIC] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_NATU] = + { + .coords = 0x54, + .y_offset = 0x11, + }, + [SPECIES_XATU] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_MAREEP] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_FLAAFFY] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_AMPHAROS] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_BELLOSSOM] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_MARILL] = + { + .coords = 0x75, + .y_offset = 0x0c, + }, + [SPECIES_AZUMARILL] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_SUDOWOODO] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_POLITOED] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_HOPPIP] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_SKIPLOOM] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_JUMPLUFF] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_AIPOM] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_SUNKERN] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_SUNFLORA] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_YANMA] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_WOOPER] = + { + .coords = 0x85, + .y_offset = 0x0f, + }, + [SPECIES_QUAGSIRE] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_ESPEON] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_UMBREON] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_MURKROW] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_SLOWKING] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_MISDREAVUS] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN] = + { + .coords = 0x36, + .y_offset = 0x08, + }, + [SPECIES_WOBBUFFET] = + { + .coords = 0x75, + .y_offset = 0x0c, + }, + [SPECIES_GIRAFARIG] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_PINECO] = + { + .coords = 0x65, + .y_offset = 0x0f, + }, + [SPECIES_FORRETRESS] = + { + .coords = 0x84, + .y_offset = 0x10, + }, + [SPECIES_DUNSPARCE] = + { + .coords = 0x85, + .y_offset = 0x0f, + }, + [SPECIES_GLIGAR] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_STEELIX] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SNUBBULL] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_GRANBULL] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_QWILFISH] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_SCIZOR] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_SHUCKLE] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_HERACROSS] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_SNEASEL] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_TEDDIURSA] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_URSARING] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_SLUGMA] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_MAGCARGO] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_SWINUB] = + { + .coords = 0x63, + .y_offset = 0x15, + }, + [SPECIES_PILOSWINE] = + { + .coords = 0x75, + .y_offset = 0x0d, + }, + [SPECIES_CORSOLA] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_REMORAID] = + { + .coords = 0x75, + .y_offset = 0x0d, + }, + [SPECIES_OCTILLERY] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_DELIBIRD] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_MANTINE] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_SKARMORY] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_HOUNDOUR] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_HOUNDOOM] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_KINGDRA] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_PHANPY] = + { + .coords = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_DONPHAN] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_PORYGON2] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_STANTLER] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_SMEARGLE] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_TYROGUE] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_HITMONTOP] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_SMOOCHUM] = + { + .coords = 0x56, + .y_offset = 0x09, + }, + [SPECIES_ELEKID] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_MAGBY] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_MILTANK] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_BLISSEY] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_RAIKOU] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_ENTEI] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_SUICUNE] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_LARVITAR] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_PUPITAR] = + { + .coords = 0x67, + .y_offset = 0x05, + }, + [SPECIES_TYRANITAR] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_LUGIA] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_HO_OH] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_CELEBI] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_OLD_UNOWN_B] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_C] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_D] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_E] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_F] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_G] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_H] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_I] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_J] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_K] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_L] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_M] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_N] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_O] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_P] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_Q] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_R] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_S] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_T] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_U] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_V] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_W] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_X] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_Y] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_Z] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_TREECKO] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_GROVYLE] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_SCEPTILE] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_TORCHIC] = + { + .coords = 0x67, + .y_offset = 0x05, + }, + [SPECIES_COMBUSKEN] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_BLAZIKEN] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_MUDKIP] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_MARSHTOMP] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_SWAMPERT] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_POOCHYENA] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_MIGHTYENA] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_ZIGZAGOON] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_LINOONE] = + { + .coords = 0x85, + .y_offset = 0x0f, + }, + [SPECIES_WURMPLE] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_SILCOON] = + { + .coords = 0x83, + .y_offset = 0x15, + }, + [SPECIES_BEAUTIFLY] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CASCOON] = + { + .coords = 0x73, + .y_offset = 0x14, + }, + [SPECIES_DUSTOX] = + { + .coords = 0x83, + .y_offset = 0x14, + }, + [SPECIES_LOTAD] = + { + .coords = 0x75, + .y_offset = 0x0f, + }, + [SPECIES_LOMBRE] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_LUDICOLO] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_SEEDOT] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_NUZLEAF] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_SHIFTRY] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_NINCADA] = + { + .coords = 0x83, + .y_offset = 0x14, + }, + [SPECIES_NINJASK] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_SHEDINJA] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_TAILLOW] = + { + .coords = 0x64, + .y_offset = 0x11, + }, + [SPECIES_SWELLOW] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_SHROOMISH] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_BRELOOM] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_SPINDA] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_WINGULL] = + { + .coords = 0x85, + .y_offset = 0x0e, + }, + [SPECIES_PELIPPER] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_SURSKIT] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_MASQUERAIN] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_WAILMER] = + { + .coords = 0x83, + .y_offset = 0x15, + }, + [SPECIES_WAILORD] = + { + .coords = 0x83, + .y_offset = 0x16, + }, + [SPECIES_SKITTY] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_DELCATTY] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_KECLEON] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_BALTOY] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_CLAYDOL] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_NOSEPASS] = + { + .coords = 0x85, + .y_offset = 0x0c, + }, + [SPECIES_TORKOAL] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_SABLEYE] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_BARBOACH] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_WHISCASH] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_LUVDISC] = + { + .coords = 0x46, + .y_offset = 0x0a, + }, + [SPECIES_CORPHISH] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_CRAWDAUNT] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_FEEBAS] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_MILOTIC] = + { + .coords = 0x68, + .y_offset = 0x02, + }, + [SPECIES_CARVANHA] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_SHARPEDO] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_TRAPINCH] = + { + .coords = 0x75, + .y_offset = 0x0e, + }, + [SPECIES_VIBRAVA] = + { + .coords = 0x74, + .y_offset = 0x11, + }, + [SPECIES_FLYGON] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_MAKUHITA] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_HARIYAMA] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_ELECTRIKE] = + { + .coords = 0x84, + .y_offset = 0x10, + }, + [SPECIES_MANECTRIC] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_NUMEL] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_CAMERUPT] = + { + .coords = 0x84, + .y_offset = 0x13, + }, + [SPECIES_SPHEAL] = + { + .coords = 0x64, + .y_offset = 0x12, + }, + [SPECIES_SEALEO] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_WALREIN] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_CACNEA] = + { + .coords = 0x85, + .y_offset = 0x0f, + }, + [SPECIES_CACTURNE] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_SNORUNT] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_GLALIE] = + { + .coords = 0x85, + .y_offset = 0x0c, + }, + [SPECIES_LUNATONE] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_SOLROCK] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_AZURILL] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_SPOINK] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_GRUMPIG] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_PLUSLE] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_MINUN] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_MAWILE] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_MEDITITE] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_MEDICHAM] = + { + .coords = 0x68, + .y_offset = 0x03, + }, + [SPECIES_SWABLU] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_ALTARIA] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_WYNAUT] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_DUSKULL] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_DUSCLOPS] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_ROSELIA] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_SLAKOTH] = + { + .coords = 0x85, + .y_offset = 0x0f, + }, + [SPECIES_VIGOROTH] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_SLAKING] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_GULPIN] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_SWALOT] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_TROPIUS] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_WHISMUR] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_LOUDRED] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_EXPLOUD] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_CLAMPERL] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_HUNTAIL] = + { + .coords = 0x68, + .y_offset = 0x02, + }, + [SPECIES_GOREBYSS] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_ABSOL] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_SHUPPET] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_BANETTE] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_SEVIPER] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_ZANGOOSE] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_RELICANTH] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_ARON] = + { + .coords = 0x54, + .y_offset = 0x11, + }, + [SPECIES_LAIRON] = + { + .coords = 0x84, + .y_offset = 0x11, + }, + [SPECIES_AGGRON] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_CASTFORM] = + { + .coords = 0x45, + .y_offset = 0x0d, + }, + [SPECIES_VOLBEAT] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_ILLUMISE] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_LILEEP] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_CRADILY] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_ANORITH] = + { + .coords = 0x83, + .y_offset = 0x17, + }, + [SPECIES_ARMALDO] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_RALTS] = + { + .coords = 0x45, + .y_offset = 0x0d, + }, + [SPECIES_KIRLIA] = + { + .coords = 0x57, + .y_offset = 0x06, + }, + [SPECIES_GARDEVOIR] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_BAGON] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_SHELGON] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_SALAMENCE] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_BELDUM] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_METANG] = + { + .coords = 0x84, + .y_offset = 0x10, + }, + [SPECIES_METAGROSS] = + { + .coords = 0x83, + .y_offset = 0x14, + }, + [SPECIES_REGIROCK] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_REGICE] = + { + .coords = 0x85, + .y_offset = 0x0e, + }, + [SPECIES_REGISTEEL] = + { + .coords = 0x85, + .y_offset = 0x0e, + }, + [SPECIES_KYOGRE] = + { + .coords = 0x84, + .y_offset = 0x13, + }, + [SPECIES_GROUDON] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_RAYQUAZA] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_LATIAS] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_LATIOS] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_JIRACHI] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_DEOXYS] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_CHIMECHO] = + { + .coords = 0x47, + .y_offset = 0x07, + }, + [SPECIES_EGG] = + { + .coords = 0x36, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN_B] = + { + .coords = 0x56, + .y_offset = 0x09, + }, + [SPECIES_UNOWN_C] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_UNOWN_D] = + { + .coords = 0x56, + .y_offset = 0x08, + }, + [SPECIES_UNOWN_E] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN_F] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN_G] = + { + .coords = 0x57, + .y_offset = 0x05, + }, + [SPECIES_UNOWN_H] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_UNOWN_I] = + { + .coords = 0x37, + .y_offset = 0x07, + }, + [SPECIES_UNOWN_J] = + { + .coords = 0x46, + .y_offset = 0x09, + }, + [SPECIES_UNOWN_K] = + { + .coords = 0x57, + .y_offset = 0x07, + }, + [SPECIES_UNOWN_L] = + { + .coords = 0x46, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN_M] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_UNOWN_N] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_UNOWN_O] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_UNOWN_P] = + { + .coords = 0x46, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN_Q] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_UNOWN_R] = + { + .coords = 0x45, + .y_offset = 0x0c, + }, + [SPECIES_UNOWN_S] = + { + .coords = 0x57, + .y_offset = 0x04, + }, + [SPECIES_UNOWN_T] = + { + .coords = 0x45, + .y_offset = 0x0d, + }, + [SPECIES_UNOWN_U] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_UNOWN_V] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_UNOWN_W] = + { + .coords = 0x55, + .y_offset = 0x0d, + }, + [SPECIES_UNOWN_X] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_UNOWN_Y] = + { + .coords = 0x46, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN_Z] = + { + .coords = 0x46, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN_EMARK] = + { + .coords = 0x37, + .y_offset = 0x06, + }, + [SPECIES_UNOWN_QMARK] = + { + .coords = 0x47, + .y_offset = 0x06, + }, }; diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 80e2a415a..61fd943a2 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -1,417 +1,419 @@ +#include "constants/species.h" + // This determines how much higher above the usual position the enemy Pokémon // is during battle. Species that float or fly have nonzero values. const u8 gEnemyMonElevation[] = { - 0, // 0 - 0, // SPECIES_BULBASAUR - 0, // SPECIES_IVYSAUR - 0, // SPECIES_VENUSAUR - 0, // SPECIES_CHARMANDER - 0, // SPECIES_CHARMELEON - 0, // SPECIES_CHARIZARD - 0, // SPECIES_SQUIRTLE - 0, // SPECIES_WARTORTLE - 0, // SPECIES_BLASTOISE - 0, // SPECIES_CATERPIE - 0, // SPECIES_METAPOD - 8, // SPECIES_BUTTERFREE - 0, // SPECIES_WEEDLE - 0, // SPECIES_KAKUNA - 8, // SPECIES_BEEDRILL - 16, // SPECIES_PIDGEY - 0, // SPECIES_PIDGEOTTO - 4, // SPECIES_PIDGEOT - 0, // SPECIES_RATTATA - 0, // SPECIES_RATICATE - 0, // SPECIES_SPEAROW - 6, // SPECIES_FEAROW - 0, // SPECIES_EKANS - 0, // SPECIES_ARBOK - 0, // SPECIES_PIKACHU - 0, // SPECIES_RAICHU - 0, // SPECIES_SANDSHREW - 0, // SPECIES_SANDSLASH - 0, // SPECIES_NIDORAN_F - 0, // SPECIES_NIDORINA - 0, // SPECIES_NIDOQUEEN - 0, // SPECIES_NIDORAN_M - 0, // SPECIES_NIDORINO - 0, // SPECIES_NIDOKING - 0, // SPECIES_CLEFAIRY - 0, // SPECIES_CLEFABLE - 0, // SPECIES_VULPIX - 0, // SPECIES_NINETALES - 0, // SPECIES_JIGGLYPUFF - 0, // SPECIES_WIGGLYTUFF - 8, // SPECIES_ZUBAT - 8, // SPECIES_GOLBAT - 0, // SPECIES_ODDISH - 0, // SPECIES_GLOOM - 0, // SPECIES_VILEPLUME - 0, // SPECIES_PARAS - 0, // SPECIES_PARASECT - 0, // SPECIES_VENONAT - 8, // SPECIES_VENOMOTH - 0, // SPECIES_DIGLETT - 0, // SPECIES_DUGTRIO - 0, // SPECIES_MEOWTH - 0, // SPECIES_PERSIAN - 0, // SPECIES_PSYDUCK - 0, // SPECIES_GOLDUCK - 0, // SPECIES_MANKEY - 0, // SPECIES_PRIMEAPE - 0, // SPECIES_GROWLITHE - 0, // SPECIES_ARCANINE - 0, // SPECIES_POLIWAG - 0, // SPECIES_POLIWHIRL - 0, // SPECIES_POLIWRATH - 0, // SPECIES_ABRA - 0, // SPECIES_KADABRA - 0, // SPECIES_ALAKAZAM - 0, // SPECIES_MACHOP - 0, // SPECIES_MACHOKE - 0, // SPECIES_MACHAMP - 0, // SPECIES_BELLSPROUT - 0, // SPECIES_WEEPINBELL - 0, // SPECIES_VICTREEBEL - 0, // SPECIES_TENTACOOL - 0, // SPECIES_TENTACRUEL - 16, // SPECIES_GEODUDE - 0, // SPECIES_GRAVELER - 0, // SPECIES_GOLEM - 0, // SPECIES_PONYTA - 0, // SPECIES_RAPIDASH - 0, // SPECIES_SLOWPOKE - 0, // SPECIES_SLOWBRO - 16, // SPECIES_MAGNEMITE - 8, // SPECIES_MAGNETON - 0, // SPECIES_FARFETCHD - 0, // SPECIES_DODUO - 0, // SPECIES_DODRIO - 0, // SPECIES_SEEL - 0, // SPECIES_DEWGONG - 0, // SPECIES_GRIMER - 0, // SPECIES_MUK - 0, // SPECIES_SHELLDER - 0, // SPECIES_CLOYSTER - 4, // SPECIES_GASTLY - 4, // SPECIES_HAUNTER - 0, // SPECIES_GENGAR - 0, // SPECIES_ONIX - 0, // SPECIES_DROWZEE - 0, // SPECIES_HYPNO - 0, // SPECIES_KRABBY - 0, // SPECIES_KINGLER - 10, // SPECIES_VOLTORB - 12, // SPECIES_ELECTRODE - 0, // SPECIES_EXEGGCUTE - 0, // SPECIES_EXEGGUTOR - 0, // SPECIES_CUBONE - 0, // SPECIES_MAROWAK - 0, // SPECIES_HITMONLEE - 0, // SPECIES_HITMONCHAN - 0, // SPECIES_LICKITUNG - 8, // SPECIES_KOFFING - 6, // SPECIES_WEEZING - 0, // SPECIES_RHYHORN - 0, // SPECIES_RHYDON - 0, // SPECIES_CHANSEY - 0, // SPECIES_TANGELA - 0, // SPECIES_KANGASKHAN - 0, // SPECIES_HORSEA - 0, // SPECIES_SEADRA - 0, // SPECIES_GOLDEEN - 0, // SPECIES_SEAKING - 0, // SPECIES_STARYU - 0, // SPECIES_STARMIE - 0, // SPECIES_MR_MIME - 0, // SPECIES_SCYTHER - 0, // SPECIES_JYNX - 0, // SPECIES_ELECTABUZZ - 0, // SPECIES_MAGMAR - 0, // SPECIES_PINSIR - 0, // SPECIES_TAUROS - 0, // SPECIES_MAGIKARP - 0, // SPECIES_GYARADOS - 0, // SPECIES_LAPRAS - 0, // SPECIES_DITTO - 0, // SPECIES_EEVEE - 0, // SPECIES_VAPOREON - 0, // SPECIES_JOLTEON - 0, // SPECIES_FLAREON - 0, // SPECIES_PORYGON - 0, // SPECIES_OMANYTE - 0, // SPECIES_OMASTAR - 0, // SPECIES_KABUTO - 0, // SPECIES_KABUTOPS - 7, // SPECIES_AERODACTYL - 0, // SPECIES_SNORLAX - 6, // SPECIES_ARTICUNO - 8, // SPECIES_ZAPDOS - 5, // SPECIES_MOLTRES - 0, // SPECIES_DRATINI - 0, // SPECIES_DRAGONAIR - 6, // SPECIES_DRAGONITE - 0, // SPECIES_MEWTWO - 8, // SPECIES_MEW - 0, // SPECIES_CHIKORITA - 0, // SPECIES_BAYLEEF - 0, // SPECIES_MEGANIUM - 0, // SPECIES_CYNDAQUIL - 0, // SPECIES_QUILAVA - 0, // SPECIES_TYPHLOSION - 0, // SPECIES_TOTODILE - 0, // SPECIES_CROCONAW - 0, // SPECIES_FERALIGATR - 0, // SPECIES_SENTRET - 0, // SPECIES_FURRET - 0, // SPECIES_HOOTHOOT - 0, // SPECIES_NOCTOWL - 0, // SPECIES_LEDYBA - 8, // SPECIES_LEDIAN - 0, // SPECIES_SPINARAK - 0, // SPECIES_ARIADOS - 6, // SPECIES_CROBAT - 0, // SPECIES_CHINCHOU - 0, // SPECIES_LANTURN - 0, // SPECIES_PICHU - 0, // SPECIES_CLEFFA - 0, // SPECIES_IGGLYBUFF - 0, // SPECIES_TOGEPI - 0, // SPECIES_TOGETIC - 0, // SPECIES_NATU - 0, // SPECIES_XATU - 0, // SPECIES_MAREEP - 0, // SPECIES_FLAAFFY - 0, // SPECIES_AMPHAROS - 0, // SPECIES_BELLOSSOM - 0, // SPECIES_MARILL - 0, // SPECIES_AZUMARILL - 0, // SPECIES_SUDOWOODO - 0, // SPECIES_POLITOED - 11, // SPECIES_HOPPIP - 12, // SPECIES_SKIPLOOM - 9, // SPECIES_JUMPLUFF - 0, // SPECIES_AIPOM - 0, // SPECIES_SUNKERN - 0, // SPECIES_SUNFLORA - 8, // SPECIES_YANMA - 0, // SPECIES_WOOPER - 0, // SPECIES_QUAGSIRE - 0, // SPECIES_ESPEON - 0, // SPECIES_UMBREON - 0, // SPECIES_MURKROW - 0, // SPECIES_SLOWKING - 8, // SPECIES_MISDREAVUS - 8, // SPECIES_UNOWN - 0, // SPECIES_WOBBUFFET - 0, // SPECIES_GIRAFARIG - 0, // SPECIES_PINECO - 0, // SPECIES_FORRETRESS - 0, // SPECIES_DUNSPARCE - 6, // SPECIES_GLIGAR - 0, // SPECIES_STEELIX - 0, // SPECIES_SNUBBULL - 0, // SPECIES_GRANBULL - 0, // SPECIES_QWILFISH - 0, // SPECIES_SCIZOR - 0, // SPECIES_SHUCKLE - 0, // SPECIES_HERACROSS - 0, // SPECIES_SNEASEL - 0, // SPECIES_TEDDIURSA - 0, // SPECIES_URSARING - 0, // SPECIES_SLUGMA - 0, // SPECIES_MAGCARGO - 0, // SPECIES_SWINUB - 0, // SPECIES_PILOSWINE - 0, // SPECIES_CORSOLA - 0, // SPECIES_REMORAID - 0, // SPECIES_OCTILLERY - 0, // SPECIES_DELIBIRD - 0, // SPECIES_MANTINE - 0, // SPECIES_SKARMORY - 0, // SPECIES_HOUNDOUR - 0, // SPECIES_HOUNDOOM - 0, // SPECIES_KINGDRA - 0, // SPECIES_PHANPY - 0, // SPECIES_DONPHAN - 0, // SPECIES_PORYGON2 - 0, // SPECIES_STANTLER - 0, // SPECIES_SMEARGLE - 0, // SPECIES_TYROGUE - 0, // SPECIES_HITMONTOP - 0, // SPECIES_SMOOCHUM - 0, // SPECIES_ELEKID - 0, // SPECIES_MAGBY - 0, // SPECIES_MILTANK - 0, // SPECIES_BLISSEY - 0, // SPECIES_RAIKOU - 0, // SPECIES_ENTEI - 0, // SPECIES_SUICUNE - 0, // SPECIES_LARVITAR - 0, // SPECIES_PUPITAR - 0, // SPECIES_TYRANITAR - 6, // SPECIES_LUGIA - 6, // SPECIES_HO_OH - 15, // SPECIES_CELEBI - 0, // 252 - 0, // 253 - 0, // 254 - 0, // 255 - 0, // 256 - 0, // 257 - 0, // 258 - 0, // 259 - 0, // 260 - 0, // 261 - 0, // 262 - 0, // 263 - 0, // 264 - 0, // 265 - 0, // 266 - 0, // 267 - 0, // 268 - 0, // 269 - 0, // 270 - 0, // 271 - 0, // 272 - 0, // 273 - 0, // 274 - 0, // 275 - 0, // 276 - 0, // SPECIES_TREECKO - 0, // SPECIES_GROVYLE - 0, // SPECIES_SCEPTILE - 0, // SPECIES_TORCHIC - 0, // SPECIES_COMBUSKEN - 0, // SPECIES_BLAZIKEN - 0, // SPECIES_MUDKIP - 0, // SPECIES_MARSHTOMP - 0, // SPECIES_SWAMPERT - 0, // SPECIES_POOCHYENA - 0, // SPECIES_MIGHTYENA - 0, // SPECIES_ZIGZAGOON - 0, // SPECIES_LINOONE - 0, // SPECIES_WURMPLE - 0, // SPECIES_SILCOON - 8, // SPECIES_BEAUTIFLY - 0, // SPECIES_CASCOON - 10, // SPECIES_DUSTOX - 0, // SPECIES_LOTAD - 0, // SPECIES_LOMBRE - 0, // SPECIES_LUDICOLO - 0, // SPECIES_SEEDOT - 0, // SPECIES_NUZLEAF - 0, // SPECIES_SHIFTRY - 0, // SPECIES_NINCADA - 10, // SPECIES_NINJASK - 8, // SPECIES_SHEDINJA - 0, // SPECIES_TAILLOW - 0, // SPECIES_SWELLOW - 0, // SPECIES_SHROOMISH - 0, // SPECIES_BRELOOM - 0, // SPECIES_SPINDA - 16, // SPECIES_WINGULL - 8, // SPECIES_PELIPPER - 0, // SPECIES_SURSKIT - 10, // SPECIES_MASQUERAIN - 0, // SPECIES_WAILMER - 0, // SPECIES_WAILORD - 0, // SPECIES_SKITTY - 0, // SPECIES_DELCATTY - 0, // SPECIES_KECLEON - 4, // SPECIES_BALTOY - 10, // SPECIES_CLAYDOL - 0, // SPECIES_NOSEPASS - 0, // SPECIES_TORKOAL - 0, // SPECIES_SABLEYE - 0, // SPECIES_BARBOACH - 0, // SPECIES_WHISCASH - 0, // SPECIES_LUVDISC - 0, // SPECIES_CORPHISH - 0, // SPECIES_CRAWDAUNT - 0, // SPECIES_FEEBAS - 0, // SPECIES_MILOTIC - 0, // SPECIES_CARVANHA - 0, // SPECIES_SHARPEDO - 0, // SPECIES_TRAPINCH - 0, // SPECIES_VIBRAVA - 7, // SPECIES_FLYGON - 0, // SPECIES_MAKUHITA - 0, // SPECIES_HARIYAMA - 0, // SPECIES_ELECTRIKE - 0, // SPECIES_MANECTRIC - 0, // SPECIES_NUMEL - 0, // SPECIES_CAMERUPT - 0, // SPECIES_SPHEAL - 0, // SPECIES_SEALEO - 0, // SPECIES_WALREIN - 0, // SPECIES_CACNEA - 0, // SPECIES_CACTURNE - 0, // SPECIES_SNORUNT - 12, // SPECIES_GLALIE - 13, // SPECIES_LUNATONE - 4, // SPECIES_SOLROCK - 0, // SPECIES_AZURILL - 0, // SPECIES_SPOINK - 0, // SPECIES_GRUMPIG - 0, // SPECIES_PLUSLE - 0, // SPECIES_MINUN - 0, // SPECIES_MAWILE - 0, // SPECIES_MEDITITE - 0, // SPECIES_MEDICHAM - 12, // SPECIES_SWABLU - 8, // SPECIES_ALTARIA - 0, // SPECIES_WYNAUT - 9, // SPECIES_DUSKULL - 0, // SPECIES_DUSCLOPS - 0, // SPECIES_ROSELIA - 0, // SPECIES_SLAKOTH - 0, // SPECIES_VIGOROTH - 0, // SPECIES_SLAKING - 0, // SPECIES_GULPIN - 0, // SPECIES_SWALOT - 0, // SPECIES_TROPIUS - 0, // SPECIES_WHISMUR - 0, // SPECIES_LOUDRED - 0, // SPECIES_EXPLOUD - 0, // SPECIES_CLAMPERL - 0, // SPECIES_HUNTAIL - 0, // SPECIES_GOREBYSS - 0, // SPECIES_ABSOL - 12, // SPECIES_SHUPPET - 8, // SPECIES_BANETTE - 0, // SPECIES_SEVIPER - 0, // SPECIES_ZANGOOSE - 0, // SPECIES_RELICANTH - 0, // SPECIES_ARON - 0, // SPECIES_LAIRON - 0, // SPECIES_AGGRON - 16, // SPECIES_CASTFORM - 0, // SPECIES_VOLBEAT - 0, // SPECIES_ILLUMISE - 0, // SPECIES_LILEEP - 0, // SPECIES_CRADILY - 0, // SPECIES_ANORITH - 0, // SPECIES_ARMALDO - 0, // SPECIES_RALTS - 0, // SPECIES_KIRLIA - 0, // SPECIES_GARDEVOIR - 0, // SPECIES_BAGON - 0, // SPECIES_SHELGON - 0, // SPECIES_SALAMENCE - 8, // SPECIES_BELDUM - 0, // SPECIES_METANG - 0, // SPECIES_METAGROSS - 0, // SPECIES_REGIROCK - 0, // SPECIES_REGICE - 0, // SPECIES_REGISTEEL - 0, // SPECIES_KYOGRE - 0, // SPECIES_GROUDON - 6, // SPECIES_RAYQUAZA - 6, // SPECIES_LATIAS - 6, // SPECIES_LATIOS - 12, // SPECIES_JIRACHI - 8, // SPECIES_DEOXYS - 12, // SPECIES_CHIMECHO + [SPECIES_NONE] = 0, + [SPECIES_BULBASAUR] = 0, + [SPECIES_IVYSAUR] = 0, + [SPECIES_VENUSAUR] = 0, + [SPECIES_CHARMANDER] = 0, + [SPECIES_CHARMELEON] = 0, + [SPECIES_CHARIZARD] = 0, + [SPECIES_SQUIRTLE] = 0, + [SPECIES_WARTORTLE] = 0, + [SPECIES_BLASTOISE] = 0, + [SPECIES_CATERPIE] = 0, + [SPECIES_METAPOD] = 0, + [SPECIES_BUTTERFREE] = 8, + [SPECIES_WEEDLE] = 0, + [SPECIES_KAKUNA] = 0, + [SPECIES_BEEDRILL] = 8, + [SPECIES_PIDGEY] = 16, + [SPECIES_PIDGEOTTO] = 0, + [SPECIES_PIDGEOT] = 4, + [SPECIES_RATTATA] = 0, + [SPECIES_RATICATE] = 0, + [SPECIES_SPEAROW] = 0, + [SPECIES_FEAROW] = 6, + [SPECIES_EKANS] = 0, + [SPECIES_ARBOK] = 0, + [SPECIES_PIKACHU] = 0, + [SPECIES_RAICHU] = 0, + [SPECIES_SANDSHREW] = 0, + [SPECIES_SANDSLASH] = 0, + [SPECIES_NIDORAN_F] = 0, + [SPECIES_NIDORINA] = 0, + [SPECIES_NIDOQUEEN] = 0, + [SPECIES_NIDORAN_M] = 0, + [SPECIES_NIDORINO] = 0, + [SPECIES_NIDOKING] = 0, + [SPECIES_CLEFAIRY] = 0, + [SPECIES_CLEFABLE] = 0, + [SPECIES_VULPIX] = 0, + [SPECIES_NINETALES] = 0, + [SPECIES_JIGGLYPUFF] = 0, + [SPECIES_WIGGLYTUFF] = 0, + [SPECIES_ZUBAT] = 8, + [SPECIES_GOLBAT] = 8, + [SPECIES_ODDISH] = 0, + [SPECIES_GLOOM] = 0, + [SPECIES_VILEPLUME] = 0, + [SPECIES_PARAS] = 0, + [SPECIES_PARASECT] = 0, + [SPECIES_VENONAT] = 0, + [SPECIES_VENOMOTH] = 8, + [SPECIES_DIGLETT] = 0, + [SPECIES_DUGTRIO] = 0, + [SPECIES_MEOWTH] = 0, + [SPECIES_PERSIAN] = 0, + [SPECIES_PSYDUCK] = 0, + [SPECIES_GOLDUCK] = 0, + [SPECIES_MANKEY] = 0, + [SPECIES_PRIMEAPE] = 0, + [SPECIES_GROWLITHE] = 0, + [SPECIES_ARCANINE] = 0, + [SPECIES_POLIWAG] = 0, + [SPECIES_POLIWHIRL] = 0, + [SPECIES_POLIWRATH] = 0, + [SPECIES_ABRA] = 0, + [SPECIES_KADABRA] = 0, + [SPECIES_ALAKAZAM] = 0, + [SPECIES_MACHOP] = 0, + [SPECIES_MACHOKE] = 0, + [SPECIES_MACHAMP] = 0, + [SPECIES_BELLSPROUT] = 0, + [SPECIES_WEEPINBELL] = 0, + [SPECIES_VICTREEBEL] = 0, + [SPECIES_TENTACOOL] = 0, + [SPECIES_TENTACRUEL] = 0, + [SPECIES_GEODUDE] = 16, + [SPECIES_GRAVELER] = 0, + [SPECIES_GOLEM] = 0, + [SPECIES_PONYTA] = 0, + [SPECIES_RAPIDASH] = 0, + [SPECIES_SLOWPOKE] = 0, + [SPECIES_SLOWBRO] = 0, + [SPECIES_MAGNEMITE] = 16, + [SPECIES_MAGNETON] = 8, + [SPECIES_FARFETCHD] = 0, + [SPECIES_DODUO] = 0, + [SPECIES_DODRIO] = 0, + [SPECIES_SEEL] = 0, + [SPECIES_DEWGONG] = 0, + [SPECIES_GRIMER] = 0, + [SPECIES_MUK] = 0, + [SPECIES_SHELLDER] = 0, + [SPECIES_CLOYSTER] = 0, + [SPECIES_GASTLY] = 4, + [SPECIES_HAUNTER] = 4, + [SPECIES_GENGAR] = 0, + [SPECIES_ONIX] = 0, + [SPECIES_DROWZEE] = 0, + [SPECIES_HYPNO] = 0, + [SPECIES_KRABBY] = 0, + [SPECIES_KINGLER] = 0, + [SPECIES_VOLTORB] = 10, + [SPECIES_ELECTRODE] = 12, + [SPECIES_EXEGGCUTE] = 0, + [SPECIES_EXEGGUTOR] = 0, + [SPECIES_CUBONE] = 0, + [SPECIES_MAROWAK] = 0, + [SPECIES_HITMONLEE] = 0, + [SPECIES_HITMONCHAN] = 0, + [SPECIES_LICKITUNG] = 0, + [SPECIES_KOFFING] = 8, + [SPECIES_WEEZING] = 6, + [SPECIES_RHYHORN] = 0, + [SPECIES_RHYDON] = 0, + [SPECIES_CHANSEY] = 0, + [SPECIES_TANGELA] = 0, + [SPECIES_KANGASKHAN] = 0, + [SPECIES_HORSEA] = 0, + [SPECIES_SEADRA] = 0, + [SPECIES_GOLDEEN] = 0, + [SPECIES_SEAKING] = 0, + [SPECIES_STARYU] = 0, + [SPECIES_STARMIE] = 0, + [SPECIES_MR_MIME] = 0, + [SPECIES_SCYTHER] = 0, + [SPECIES_JYNX] = 0, + [SPECIES_ELECTABUZZ] = 0, + [SPECIES_MAGMAR] = 0, + [SPECIES_PINSIR] = 0, + [SPECIES_TAUROS] = 0, + [SPECIES_MAGIKARP] = 0, + [SPECIES_GYARADOS] = 0, + [SPECIES_LAPRAS] = 0, + [SPECIES_DITTO] = 0, + [SPECIES_EEVEE] = 0, + [SPECIES_VAPOREON] = 0, + [SPECIES_JOLTEON] = 0, + [SPECIES_FLAREON] = 0, + [SPECIES_PORYGON] = 0, + [SPECIES_OMANYTE] = 0, + [SPECIES_OMASTAR] = 0, + [SPECIES_KABUTO] = 0, + [SPECIES_KABUTOPS] = 0, + [SPECIES_AERODACTYL] = 7, + [SPECIES_SNORLAX] = 0, + [SPECIES_ARTICUNO] = 6, + [SPECIES_ZAPDOS] = 8, + [SPECIES_MOLTRES] = 5, + [SPECIES_DRATINI] = 0, + [SPECIES_DRAGONAIR] = 0, + [SPECIES_DRAGONITE] = 6, + [SPECIES_MEWTWO] = 0, + [SPECIES_MEW] = 8, + [SPECIES_CHIKORITA] = 0, + [SPECIES_BAYLEEF] = 0, + [SPECIES_MEGANIUM] = 0, + [SPECIES_CYNDAQUIL] = 0, + [SPECIES_QUILAVA] = 0, + [SPECIES_TYPHLOSION] = 0, + [SPECIES_TOTODILE] = 0, + [SPECIES_CROCONAW] = 0, + [SPECIES_FERALIGATR] = 0, + [SPECIES_SENTRET] = 0, + [SPECIES_FURRET] = 0, + [SPECIES_HOOTHOOT] = 0, + [SPECIES_NOCTOWL] = 0, + [SPECIES_LEDYBA] = 0, + [SPECIES_LEDIAN] = 8, + [SPECIES_SPINARAK] = 0, + [SPECIES_ARIADOS] = 0, + [SPECIES_CROBAT] = 6, + [SPECIES_CHINCHOU] = 0, + [SPECIES_LANTURN] = 0, + [SPECIES_PICHU] = 0, + [SPECIES_CLEFFA] = 0, + [SPECIES_IGGLYBUFF] = 0, + [SPECIES_TOGEPI] = 0, + [SPECIES_TOGETIC] = 0, + [SPECIES_NATU] = 0, + [SPECIES_XATU] = 0, + [SPECIES_MAREEP] = 0, + [SPECIES_FLAAFFY] = 0, + [SPECIES_AMPHAROS] = 0, + [SPECIES_BELLOSSOM] = 0, + [SPECIES_MARILL] = 0, + [SPECIES_AZUMARILL] = 0, + [SPECIES_SUDOWOODO] = 0, + [SPECIES_POLITOED] = 0, + [SPECIES_HOPPIP] = 11, + [SPECIES_SKIPLOOM] = 12, + [SPECIES_JUMPLUFF] = 9, + [SPECIES_AIPOM] = 0, + [SPECIES_SUNKERN] = 0, + [SPECIES_SUNFLORA] = 0, + [SPECIES_YANMA] = 8, + [SPECIES_WOOPER] = 0, + [SPECIES_QUAGSIRE] = 0, + [SPECIES_ESPEON] = 0, + [SPECIES_UMBREON] = 0, + [SPECIES_MURKROW] = 0, + [SPECIES_SLOWKING] = 0, + [SPECIES_MISDREAVUS] = 8, + [SPECIES_UNOWN] = 8, + [SPECIES_WOBBUFFET] = 0, + [SPECIES_GIRAFARIG] = 0, + [SPECIES_PINECO] = 0, + [SPECIES_FORRETRESS] = 0, + [SPECIES_DUNSPARCE] = 0, + [SPECIES_GLIGAR] = 6, + [SPECIES_STEELIX] = 0, + [SPECIES_SNUBBULL] = 0, + [SPECIES_GRANBULL] = 0, + [SPECIES_QWILFISH] = 0, + [SPECIES_SCIZOR] = 0, + [SPECIES_SHUCKLE] = 0, + [SPECIES_HERACROSS] = 0, + [SPECIES_SNEASEL] = 0, + [SPECIES_TEDDIURSA] = 0, + [SPECIES_URSARING] = 0, + [SPECIES_SLUGMA] = 0, + [SPECIES_MAGCARGO] = 0, + [SPECIES_SWINUB] = 0, + [SPECIES_PILOSWINE] = 0, + [SPECIES_CORSOLA] = 0, + [SPECIES_REMORAID] = 0, + [SPECIES_OCTILLERY] = 0, + [SPECIES_DELIBIRD] = 0, + [SPECIES_MANTINE] = 0, + [SPECIES_SKARMORY] = 0, + [SPECIES_HOUNDOUR] = 0, + [SPECIES_HOUNDOOM] = 0, + [SPECIES_KINGDRA] = 0, + [SPECIES_PHANPY] = 0, + [SPECIES_DONPHAN] = 0, + [SPECIES_PORYGON2] = 0, + [SPECIES_STANTLER] = 0, + [SPECIES_SMEARGLE] = 0, + [SPECIES_TYROGUE] = 0, + [SPECIES_HITMONTOP] = 0, + [SPECIES_SMOOCHUM] = 0, + [SPECIES_ELEKID] = 0, + [SPECIES_MAGBY] = 0, + [SPECIES_MILTANK] = 0, + [SPECIES_BLISSEY] = 0, + [SPECIES_RAIKOU] = 0, + [SPECIES_ENTEI] = 0, + [SPECIES_SUICUNE] = 0, + [SPECIES_LARVITAR] = 0, + [SPECIES_PUPITAR] = 0, + [SPECIES_TYRANITAR] = 0, + [SPECIES_LUGIA] = 6, + [SPECIES_HO_OH] = 6, + [SPECIES_CELEBI] = 15, + [252] = 0, + [253] = 0, + [254] = 0, + [255] = 0, + [256] = 0, + [257] = 0, + [258] = 0, + [259] = 0, + [260] = 0, + [261] = 0, + [262] = 0, + [263] = 0, + [264] = 0, + [265] = 0, + [266] = 0, + [267] = 0, + [268] = 0, + [269] = 0, + [270] = 0, + [271] = 0, + [272] = 0, + [273] = 0, + [274] = 0, + [275] = 0, + [276] = 0, + [SPECIES_TREECKO] = 0, + [SPECIES_GROVYLE] = 0, + [SPECIES_SCEPTILE] = 0, + [SPECIES_TORCHIC] = 0, + [SPECIES_COMBUSKEN] = 0, + [SPECIES_BLAZIKEN] = 0, + [SPECIES_MUDKIP] = 0, + [SPECIES_MARSHTOMP] = 0, + [SPECIES_SWAMPERT] = 0, + [SPECIES_POOCHYENA] = 0, + [SPECIES_MIGHTYENA] = 0, + [SPECIES_ZIGZAGOON] = 0, + [SPECIES_LINOONE] = 0, + [SPECIES_WURMPLE] = 0, + [SPECIES_SILCOON] = 0, + [SPECIES_BEAUTIFLY] = 8, + [SPECIES_CASCOON] = 0, + [SPECIES_DUSTOX] = 10, + [SPECIES_LOTAD] = 0, + [SPECIES_LOMBRE] = 0, + [SPECIES_LUDICOLO] = 0, + [SPECIES_SEEDOT] = 0, + [SPECIES_NUZLEAF] = 0, + [SPECIES_SHIFTRY] = 0, + [SPECIES_NINCADA] = 0, + [SPECIES_NINJASK] = 10, + [SPECIES_SHEDINJA] = 8, + [SPECIES_TAILLOW] = 0, + [SPECIES_SWELLOW] = 0, + [SPECIES_SHROOMISH] = 0, + [SPECIES_BRELOOM] = 0, + [SPECIES_SPINDA] = 0, + [SPECIES_WINGULL] = 16, + [SPECIES_PELIPPER] = 8, + [SPECIES_SURSKIT] = 0, + [SPECIES_MASQUERAIN] = 10, + [SPECIES_WAILMER] = 0, + [SPECIES_WAILORD] = 0, + [SPECIES_SKITTY] = 0, + [SPECIES_DELCATTY] = 0, + [SPECIES_KECLEON] = 0, + [SPECIES_BALTOY] = 4, + [SPECIES_CLAYDOL] = 10, + [SPECIES_NOSEPASS] = 0, + [SPECIES_TORKOAL] = 0, + [SPECIES_SABLEYE] = 0, + [SPECIES_BARBOACH] = 0, + [SPECIES_WHISCASH] = 0, + [SPECIES_LUVDISC] = 0, + [SPECIES_CORPHISH] = 0, + [SPECIES_CRAWDAUNT] = 0, + [SPECIES_FEEBAS] = 0, + [SPECIES_MILOTIC] = 0, + [SPECIES_CARVANHA] = 0, + [SPECIES_SHARPEDO] = 0, + [SPECIES_TRAPINCH] = 0, + [SPECIES_VIBRAVA] = 0, + [SPECIES_FLYGON] = 7, + [SPECIES_MAKUHITA] = 0, + [SPECIES_HARIYAMA] = 0, + [SPECIES_ELECTRIKE] = 0, + [SPECIES_MANECTRIC] = 0, + [SPECIES_NUMEL] = 0, + [SPECIES_CAMERUPT] = 0, + [SPECIES_SPHEAL] = 0, + [SPECIES_SEALEO] = 0, + [SPECIES_WALREIN] = 0, + [SPECIES_CACNEA] = 0, + [SPECIES_CACTURNE] = 0, + [SPECIES_SNORUNT] = 0, + [SPECIES_GLALIE] = 12, + [SPECIES_LUNATONE] = 13, + [SPECIES_SOLROCK] = 4, + [SPECIES_AZURILL] = 0, + [SPECIES_SPOINK] = 0, + [SPECIES_GRUMPIG] = 0, + [SPECIES_PLUSLE] = 0, + [SPECIES_MINUN] = 0, + [SPECIES_MAWILE] = 0, + [SPECIES_MEDITITE] = 0, + [SPECIES_MEDICHAM] = 0, + [SPECIES_SWABLU] = 12, + [SPECIES_ALTARIA] = 8, + [SPECIES_WYNAUT] = 0, + [SPECIES_DUSKULL] = 9, + [SPECIES_DUSCLOPS] = 0, + [SPECIES_ROSELIA] = 0, + [SPECIES_SLAKOTH] = 0, + [SPECIES_VIGOROTH] = 0, + [SPECIES_SLAKING] = 0, + [SPECIES_GULPIN] = 0, + [SPECIES_SWALOT] = 0, + [SPECIES_TROPIUS] = 0, + [SPECIES_WHISMUR] = 0, + [SPECIES_LOUDRED] = 0, + [SPECIES_EXPLOUD] = 0, + [SPECIES_CLAMPERL] = 0, + [SPECIES_HUNTAIL] = 0, + [SPECIES_GOREBYSS] = 0, + [SPECIES_ABSOL] = 0, + [SPECIES_SHUPPET] = 12, + [SPECIES_BANETTE] = 8, + [SPECIES_SEVIPER] = 0, + [SPECIES_ZANGOOSE] = 0, + [SPECIES_RELICANTH] = 0, + [SPECIES_ARON] = 0, + [SPECIES_LAIRON] = 0, + [SPECIES_AGGRON] = 0, + [SPECIES_CASTFORM] = 16, + [SPECIES_VOLBEAT] = 0, + [SPECIES_ILLUMISE] = 0, + [SPECIES_LILEEP] = 0, + [SPECIES_CRADILY] = 0, + [SPECIES_ANORITH] = 0, + [SPECIES_ARMALDO] = 0, + [SPECIES_RALTS] = 0, + [SPECIES_KIRLIA] = 0, + [SPECIES_GARDEVOIR] = 0, + [SPECIES_BAGON] = 0, + [SPECIES_SHELGON] = 0, + [SPECIES_SALAMENCE] = 0, + [SPECIES_BELDUM] = 8, + [SPECIES_METANG] = 0, + [SPECIES_METAGROSS] = 0, + [SPECIES_REGIROCK] = 0, + [SPECIES_REGICE] = 0, + [SPECIES_REGISTEEL] = 0, + [SPECIES_KYOGRE] = 0, + [SPECIES_GROUDON] = 0, + [SPECIES_RAYQUAZA] = 6, + [SPECIES_LATIAS] = 6, + [SPECIES_LATIOS] = 6, + [SPECIES_JIRACHI] = 12, + [SPECIES_DEOXYS] = 8, + [SPECIES_CHIMECHO] = 12, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 923df2cde..a01f0360f 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -1,443 +1,2205 @@ +#include "constants/species.h" + const struct MonCoords gMonFrontPicCoords[] = { - {0x88, 0x00}, // SPECIES_NONE - {0x45, 0x0e}, // SPECIES_BULBASAUR - {0x56, 0x0a}, // SPECIES_IVYSAUR - {0x88, 0x03}, // SPECIES_VENUSAUR - {0x55, 0x0c}, // SPECIES_CHARMANDER - {0x66, 0x09}, // SPECIES_CHARMELEON - {0x88, 0x01}, // SPECIES_CHARIZARD - {0x65, 0x0d}, // SPECIES_SQUIRTLE - {0x66, 0x08}, // SPECIES_WARTORTLE - {0x88, 0x00}, // SPECIES_BLASTOISE - {0x45, 0x10}, // SPECIES_CATERPIE - {0x54, 0x14}, // SPECIES_METAPOD - {0x76, 0x09}, // SPECIES_BUTTERFREE - {0x54, 0x12}, // SPECIES_WEEDLE - {0x45, 0x0e}, // SPECIES_KAKUNA - {0x86, 0x09}, // SPECIES_BEEDRILL - {0x65, 0x0d}, // SPECIES_PIDGEY - {0x67, 0x0b}, // SPECIES_PIDGEOTTO - {0x88, 0x01}, // SPECIES_PIDGEOT - {0x44, 0x10}, // SPECIES_RATTATA - {0x66, 0x0b}, // SPECIES_RATICATE - {0x45, 0x0f}, // SPECIES_SPEAROW - {0x78, 0x00}, // SPECIES_FEAROW - {0x65, 0x0c}, // SPECIES_EKANS - {0x88, 0x02}, // SPECIES_ARBOK - {0x67, 0x09}, // SPECIES_PIKACHU - {0x67, 0x04}, // SPECIES_RAICHU - {0x55, 0x0e}, // SPECIES_SANDSHREW - {0x76, 0x09}, // SPECIES_SANDSLASH - {0x45, 0x0f}, // SPECIES_NIDORAN_F - {0x66, 0x0b}, // SPECIES_NIDORINA - {0x78, 0x03}, // SPECIES_NIDOQUEEN - {0x55, 0x0c}, // SPECIES_NIDORAN_M - {0x66, 0x09}, // SPECIES_NIDORINO - {0x78, 0x02}, // SPECIES_NIDOKING - {0x55, 0x10}, // SPECIES_CLEFAIRY - {0x66, 0x08}, // SPECIES_CLEFABLE - {0x65, 0x0c}, // SPECIES_VULPIX - {0x88, 0x03}, // SPECIES_NINETALES - {0x45, 0x10}, // SPECIES_JIGGLYPUFF - {0x67, 0x08}, // SPECIES_WIGGLYTUFF - {0x67, 0x06}, // SPECIES_ZUBAT - {0x88, 0x03}, // SPECIES_GOLBAT - {0x45, 0x0f}, // SPECIES_ODDISH - {0x66, 0x0a}, // SPECIES_GLOOM - {0x77, 0x06}, // SPECIES_VILEPLUME - {0x55, 0x0f}, // SPECIES_PARAS - {0x86, 0x08}, // SPECIES_PARASECT - {0x66, 0x08}, // SPECIES_VENONAT - {0x88, 0x02}, // SPECIES_VENOMOTH - {0x54, 0x12}, // SPECIES_DIGLETT - {0x75, 0x0d}, // SPECIES_DUGTRIO - {0x55, 0x0c}, // SPECIES_MEOWTH - {0x77, 0x07}, // SPECIES_PERSIAN - {0x56, 0x09}, // SPECIES_PSYDUCK - {0x78, 0x02}, // SPECIES_GOLDUCK - {0x65, 0x0e}, // SPECIES_MANKEY - {0x77, 0x07}, // SPECIES_PRIMEAPE - {0x66, 0x0b}, // SPECIES_GROWLITHE - {0x88, 0x02}, // SPECIES_ARCANINE - {0x74, 0x13}, // SPECIES_POLIWAG - {0x76, 0x0a}, // SPECIES_POLIWHIRL - {0x76, 0x08}, // SPECIES_POLIWRATH - {0x66, 0x0b}, // SPECIES_ABRA - {0x77, 0x05}, // SPECIES_KADABRA - {0x87, 0x04}, // SPECIES_ALAKAZAM - {0x56, 0x0b}, // SPECIES_MACHOP - {0x67, 0x06}, // SPECIES_MACHOKE - {0x88, 0x01}, // SPECIES_MACHAMP - {0x65, 0x0f}, // SPECIES_BELLSPROUT - {0x66, 0x0b}, // SPECIES_WEEPINBELL - {0x77, 0x05}, // SPECIES_VICTREEBEL - {0x46, 0x09}, // SPECIES_TENTACOOL - {0x87, 0x04}, // SPECIES_TENTACRUEL - {0x54, 0x12}, // SPECIES_GEODUDE - {0x87, 0x04}, // SPECIES_GRAVELER - {0x77, 0x05}, // SPECIES_GOLEM - {0x66, 0x08}, // SPECIES_PONYTA - {0x88, 0x01}, // SPECIES_RAPIDASH - {0x66, 0x0b}, // SPECIES_SLOWPOKE - {0x86, 0x08}, // SPECIES_SLOWBRO - {0x43, 0x15}, // SPECIES_MAGNEMITE - {0x76, 0x08}, // SPECIES_MAGNETON - {0x66, 0x09}, // SPECIES_FARFETCHD - {0x57, 0x05}, // SPECIES_DODUO - {0x88, 0x00}, // SPECIES_DODRIO - {0x76, 0x0a}, // SPECIES_SEEL - {0x87, 0x07}, // SPECIES_DEWGONG - {0x65, 0x0c}, // SPECIES_GRIMER - {0x87, 0x04}, // SPECIES_MUK - {0x55, 0x10}, // SPECIES_SHELLDER - {0x87, 0x05}, // SPECIES_CLOYSTER - {0x77, 0x06}, // SPECIES_GASTLY - {0x77, 0x05}, // SPECIES_HAUNTER - {0x77, 0x05}, // SPECIES_GENGAR - {0x78, 0x02}, // SPECIES_ONIX - {0x77, 0x07}, // SPECIES_DROWZEE - {0x77, 0x04}, // SPECIES_HYPNO - {0x65, 0x0d}, // SPECIES_KRABBY - {0x88, 0x03}, // SPECIES_KINGLER - {0x44, 0x13}, // SPECIES_VOLTORB - {0x55, 0x0e}, // SPECIES_ELECTRODE - {0x87, 0x07}, // SPECIES_EXEGGCUTE - {0x88, 0x00}, // SPECIES_EXEGGUTOR - {0x55, 0x0f}, // SPECIES_CUBONE - {0x76, 0x0b}, // SPECIES_MAROWAK - {0x87, 0x04}, // SPECIES_HITMONLEE - {0x67, 0x04}, // SPECIES_HITMONCHAN - {0x86, 0x08}, // SPECIES_LICKITUNG - {0x66, 0x08}, // SPECIES_KOFFING - {0x88, 0x02}, // SPECIES_WEEZING - {0x76, 0x09}, // SPECIES_RHYHORN - {0x88, 0x02}, // SPECIES_RHYDON - {0x76, 0x09}, // SPECIES_CHANSEY - {0x67, 0x07}, // SPECIES_TANGELA - {0x88, 0x00}, // SPECIES_KANGASKHAN - {0x45, 0x0f}, // SPECIES_HORSEA - {0x67, 0x07}, // SPECIES_SEADRA - {0x66, 0x0a}, // SPECIES_GOLDEEN - {0x77, 0x04}, // SPECIES_SEAKING - {0x66, 0x0a}, // SPECIES_STARYU - {0x77, 0x06}, // SPECIES_STARMIE - {0x66, 0x08}, // SPECIES_MR_MIME - {0x88, 0x00}, // SPECIES_SCYTHER - {0x77, 0x04}, // SPECIES_JYNX - {0x78, 0x02}, // SPECIES_ELECTABUZZ - {0x77, 0x04}, // SPECIES_MAGMAR - {0x77, 0x04}, // SPECIES_PINSIR - {0x78, 0x00}, // SPECIES_TAUROS - {0x67, 0x06}, // SPECIES_MAGIKARP - {0x88, 0x08}, // SPECIES_GYARADOS - {0x85, 0x0d}, // SPECIES_LAPRAS - {0x54, 0x11}, // SPECIES_DITTO - {0x56, 0x09}, // SPECIES_EEVEE - {0x67, 0x06}, // SPECIES_VAPOREON - {0x76, 0x09}, // SPECIES_JOLTEON - {0x66, 0x0a}, // SPECIES_FLAREON - {0x55, 0x0d}, // SPECIES_PORYGON - {0x45, 0x0f}, // SPECIES_OMANYTE - {0x67, 0x07}, // SPECIES_OMASTAR - {0x54, 0x11}, // SPECIES_KABUTO - {0x88, 0x03}, // SPECIES_KABUTOPS - {0x88, 0x01}, // SPECIES_AERODACTYL - {0x87, 0x05}, // SPECIES_SNORLAX - {0x88, 0x03}, // SPECIES_ARTICUNO - {0x87, 0x04}, // SPECIES_ZAPDOS - {0x88, 0x00}, // SPECIES_MOLTRES - {0x75, 0x0e}, // SPECIES_DRATINI - {0x87, 0x06}, // SPECIES_DRAGONAIR - {0x88, 0x00}, // SPECIES_DRAGONITE - {0x88, 0x00}, // SPECIES_MEWTWO - {0x55, 0x0d}, // SPECIES_MEW - {0x75, 0x0d}, // SPECIES_CHIKORITA - {0x77, 0x04}, // SPECIES_BAYLEEF - {0x88, 0x00}, // SPECIES_MEGANIUM - {0x55, 0x0e}, // SPECIES_CYNDAQUIL - {0x76, 0x08}, // SPECIES_QUILAVA - {0x78, 0x00}, // SPECIES_TYPHLOSION - {0x55, 0x0f}, // SPECIES_TOTODILE - {0x67, 0x06}, // SPECIES_CROCONAW - {0x88, 0x00}, // SPECIES_FERALIGATR - {0x47, 0x04}, // SPECIES_SENTRET - {0x67, 0x07}, // SPECIES_FURRET - {0x55, 0x0d}, // SPECIES_HOOTHOOT - {0x58, 0x03}, // SPECIES_NOCTOWL - {0x56, 0x0c}, // SPECIES_LEDYBA - {0x67, 0x04}, // SPECIES_LEDIAN - {0x54, 0x13}, // SPECIES_SPINARAK - {0x87, 0x05}, // SPECIES_ARIADOS - {0x88, 0x00}, // SPECIES_CROBAT - {0x75, 0x10}, // SPECIES_CHINCHOU - {0x87, 0x0b}, // SPECIES_LANTURN - {0x45, 0x0c}, // SPECIES_PICHU - {0x44, 0x14}, // SPECIES_CLEFFA - {0x44, 0x12}, // SPECIES_IGGLYBUFF - {0x34, 0x14}, // SPECIES_TOGEPI - {0x46, 0x09}, // SPECIES_TOGETIC - {0x44, 0x14}, // SPECIES_NATU - {0x47, 0x07}, // SPECIES_XATU - {0x55, 0x10}, // SPECIES_MAREEP - {0x56, 0x0a}, // SPECIES_FLAAFFY - {0x77, 0x05}, // SPECIES_AMPHAROS - {0x45, 0x0e}, // SPECIES_BELLOSSOM - {0x65, 0x0e}, // SPECIES_MARILL - {0x76, 0x09}, // SPECIES_AZUMARILL - {0x67, 0x06}, // SPECIES_SUDOWOODO - {0x67, 0x06}, // SPECIES_POLITOED - {0x66, 0x0a}, // SPECIES_HOPPIP - {0x55, 0x0f}, // SPECIES_SKIPLOOM - {0x77, 0x07}, // SPECIES_JUMPLUFF - {0x58, 0x03}, // SPECIES_AIPOM - {0x44, 0x10}, // SPECIES_SUNKERN - {0x56, 0x08}, // SPECIES_SUNFLORA - {0x86, 0x0a}, // SPECIES_YANMA - {0x54, 0x10}, // SPECIES_WOOPER - {0x77, 0x07}, // SPECIES_QUAGSIRE - {0x66, 0x08}, // SPECIES_ESPEON - {0x67, 0x08}, // SPECIES_UMBREON - {0x66, 0x0b}, // SPECIES_MURKROW - {0x58, 0x01}, // SPECIES_SLOWKING - {0x55, 0x0c}, // SPECIES_MISDREAVUS - {0x35, 0x0f}, // SPECIES_UNOWN - {0x77, 0x06}, // SPECIES_WOBBUFFET - {0x88, 0x03}, // SPECIES_GIRAFARIG - {0x56, 0x0a}, // SPECIES_PINECO - {0x76, 0x09}, // SPECIES_FORRETRESS - {0x74, 0x11}, // SPECIES_DUNSPARCE - {0x78, 0x03}, // SPECIES_GLIGAR - {0x88, 0x00}, // SPECIES_STEELIX - {0x55, 0x0d}, // SPECIES_SNUBBULL - {0x57, 0x06}, // SPECIES_GRANBULL - {0x56, 0x0a}, // SPECIES_QWILFISH - {0x88, 0x00}, // SPECIES_SCIZOR - {0x66, 0x09}, // SPECIES_SHUCKLE - {0x88, 0x03}, // SPECIES_HERACROSS - {0x67, 0x05}, // SPECIES_SNEASEL - {0x45, 0x0d}, // SPECIES_TEDDIURSA - {0x78, 0x01}, // SPECIES_URSARING - {0x45, 0x0d}, // SPECIES_SLUGMA - {0x57, 0x0d}, // SPECIES_MAGCARGO - {0x43, 0x14}, // SPECIES_SWINUB - {0x66, 0x08}, // SPECIES_PILOSWINE - {0x65, 0x0c}, // SPECIES_CORSOLA - {0x55, 0x0e}, // SPECIES_REMORAID - {0x66, 0x0a}, // SPECIES_OCTILLERY - {0x56, 0x08}, // SPECIES_DELIBIRD - {0x88, 0x01}, // SPECIES_MANTINE - {0x88, 0x00}, // SPECIES_SKARMORY - {0x56, 0x0b}, // SPECIES_HOUNDOUR - {0x77, 0x05}, // SPECIES_HOUNDOOM - {0x78, 0x04}, // SPECIES_KINGDRA - {0x54, 0x10}, // SPECIES_PHANPY - {0x86, 0x08}, // SPECIES_DONPHAN - {0x55, 0x0f}, // SPECIES_PORYGON2 - {0x88, 0x00}, // SPECIES_STANTLER - {0x77, 0x06}, // SPECIES_SMEARGLE - {0x46, 0x09}, // SPECIES_TYROGUE - {0x67, 0x05}, // SPECIES_HITMONTOP - {0x35, 0x0f}, // SPECIES_SMOOCHUM - {0x76, 0x0a}, // SPECIES_ELEKID - {0x45, 0x0d}, // SPECIES_MAGBY - {0x77, 0x04}, // SPECIES_MILTANK - {0x77, 0x06}, // SPECIES_BLISSEY - {0x88, 0x00}, // SPECIES_RAIKOU - {0x88, 0x00}, // SPECIES_ENTEI - {0x88, 0x00}, // SPECIES_SUICUNE - {0x46, 0x09}, // SPECIES_LARVITAR - {0x56, 0x09}, // SPECIES_PUPITAR - {0x88, 0x00}, // SPECIES_TYRANITAR - {0x88, 0x00}, // SPECIES_LUGIA - {0x88, 0x00}, // SPECIES_HO_OH - {0x55, 0x0e}, // SPECIES_CELEBI - {0x87, 0x04}, // SPECIES_OLD_UNOWN_B - {0x87, 0x04}, // SPECIES_OLD_UNOWN_C - {0x87, 0x04}, // SPECIES_OLD_UNOWN_D - {0x87, 0x04}, // SPECIES_OLD_UNOWN_E - {0x87, 0x04}, // SPECIES_OLD_UNOWN_F - {0x87, 0x04}, // SPECIES_OLD_UNOWN_G - {0x87, 0x04}, // SPECIES_OLD_UNOWN_H - {0x87, 0x04}, // SPECIES_OLD_UNOWN_I - {0x87, 0x04}, // SPECIES_OLD_UNOWN_J - {0x87, 0x04}, // SPECIES_OLD_UNOWN_K - {0x87, 0x04}, // SPECIES_OLD_UNOWN_L - {0x87, 0x04}, // SPECIES_OLD_UNOWN_M - {0x87, 0x04}, // SPECIES_OLD_UNOWN_N - {0x87, 0x04}, // SPECIES_OLD_UNOWN_O - {0x87, 0x04}, // SPECIES_OLD_UNOWN_P - {0x87, 0x04}, // SPECIES_OLD_UNOWN_Q - {0x87, 0x04}, // SPECIES_OLD_UNOWN_R - {0x87, 0x04}, // SPECIES_OLD_UNOWN_S - {0x87, 0x04}, // SPECIES_OLD_UNOWN_T - {0x87, 0x04}, // SPECIES_OLD_UNOWN_U - {0x87, 0x04}, // SPECIES_OLD_UNOWN_V - {0x87, 0x04}, // SPECIES_OLD_UNOWN_W - {0x87, 0x04}, // SPECIES_OLD_UNOWN_X - {0x87, 0x04}, // SPECIES_OLD_UNOWN_Y - {0x87, 0x04}, // SPECIES_OLD_UNOWN_Z - {0x66, 0x08}, // SPECIES_TREECKO - {0x87, 0x04}, // SPECIES_GROVYLE - {0x88, 0x00}, // SPECIES_SCEPTILE - {0x56, 0x08}, // SPECIES_TORCHIC - {0x88, 0x01}, // SPECIES_COMBUSKEN - {0x88, 0x00}, // SPECIES_BLAZIKEN - {0x56, 0x0c}, // SPECIES_MUDKIP - {0x67, 0x06}, // SPECIES_MARSHTOMP - {0x88, 0x00}, // SPECIES_SWAMPERT - {0x55, 0x0c}, // SPECIES_POOCHYENA - {0x87, 0x04}, // SPECIES_MIGHTYENA - {0x85, 0x0f}, // SPECIES_ZIGZAGOON - {0x78, 0x03}, // SPECIES_LINOONE - {0x45, 0x0e}, // SPECIES_WURMPLE - {0x75, 0x11}, // SPECIES_SILCOON - {0x86, 0x09}, // SPECIES_BEAUTIFLY - {0x74, 0x10}, // SPECIES_CASCOON - {0x86, 0x0f}, // SPECIES_DUSTOX - {0x65, 0x0e}, // SPECIES_LOTAD - {0x66, 0x09}, // SPECIES_LOMBRE - {0x88, 0x00}, // SPECIES_LUDICOLO - {0x46, 0x10}, // SPECIES_SEEDOT - {0x56, 0x08}, // SPECIES_NUZLEAF - {0x88, 0x02}, // SPECIES_SHIFTRY - {0x74, 0x12}, // SPECIES_NINCADA - {0x86, 0x0a}, // SPECIES_NINJASK - {0x66, 0x0a}, // SPECIES_SHEDINJA - {0x64, 0x10}, // SPECIES_TAILLOW - {0x87, 0x06}, // SPECIES_SWELLOW - {0x54, 0x10}, // SPECIES_SHROOMISH - {0x77, 0x04}, // SPECIES_BRELOOM - {0x68, 0x08}, // SPECIES_SPINDA - {0x84, 0x18}, // SPECIES_WINGULL - {0x77, 0x04}, // SPECIES_PELIPPER - {0x65, 0x0f}, // SPECIES_SURSKIT - {0x88, 0x01}, // SPECIES_MASQUERAIN - {0x75, 0x0f}, // SPECIES_WAILMER - {0x87, 0x0a}, // SPECIES_WAILORD - {0x66, 0x0b}, // SPECIES_SKITTY - {0x66, 0x08}, // SPECIES_DELCATTY - {0x67, 0x07}, // SPECIES_KECLEON - {0x55, 0x10}, // SPECIES_BALTOY - {0x78, 0x06}, // SPECIES_CLAYDOL - {0x56, 0x0c}, // SPECIES_NOSEPASS - {0x88, 0x02}, // SPECIES_TORKOAL - {0x66, 0x09}, // SPECIES_SABLEYE - {0x46, 0x0b}, // SPECIES_BARBOACH - {0x76, 0x09}, // SPECIES_WHISCASH - {0x46, 0x18}, // SPECIES_LUVDISC - {0x66, 0x0c}, // SPECIES_CORPHISH - {0x88, 0x01}, // SPECIES_CRAWDAUNT - {0x46, 0x0d}, // SPECIES_FEEBAS - {0x88, 0x00}, // SPECIES_MILOTIC - {0x67, 0x06}, // SPECIES_CARVANHA - {0x78, 0x03}, // SPECIES_SHARPEDO - {0x54, 0x10}, // SPECIES_TRAPINCH - {0x86, 0x0c}, // SPECIES_VIBRAVA - {0x88, 0x01}, // SPECIES_FLYGON - {0x65, 0x0c}, // SPECIES_MAKUHITA - {0x88, 0x01}, // SPECIES_HARIYAMA - {0x64, 0x12}, // SPECIES_ELECTRIKE - {0x67, 0x04}, // SPECIES_MANECTRIC - {0x65, 0x0f}, // SPECIES_NUMEL - {0x87, 0x09}, // SPECIES_CAMERUPT - {0x65, 0x10}, // SPECIES_SPHEAL - {0x86, 0x0a}, // SPECIES_SEALEO - {0x88, 0x01}, // SPECIES_WALREIN - {0x74, 0x10}, // SPECIES_CACNEA - {0x88, 0x00}, // SPECIES_CACTURNE - {0x56, 0x0b}, // SPECIES_SNORUNT - {0x76, 0x0a}, // SPECIES_GLALIE - {0x66, 0x09}, // SPECIES_LUNATONE - {0x88, 0x01}, // SPECIES_SOLROCK - {0x55, 0x0f}, // SPECIES_AZURILL - {0x46, 0x09}, // SPECIES_SPOINK - {0x77, 0x05}, // SPECIES_GRUMPIG - {0x56, 0x0e}, // SPECIES_PLUSLE - {0x66, 0x0c}, // SPECIES_MINUN - {0x76, 0x08}, // SPECIES_MAWILE - {0x65, 0x0c}, // SPECIES_MEDITITE - {0x68, 0x01}, // SPECIES_MEDICHAM - {0x76, 0x11}, // SPECIES_SWABLU - {0x88, 0x02}, // SPECIES_ALTARIA - {0x55, 0x0c}, // SPECIES_WYNAUT - {0x66, 0x0a}, // SPECIES_DUSKULL - {0x77, 0x05}, // SPECIES_DUSCLOPS - {0x76, 0x08}, // SPECIES_ROSELIA - {0x74, 0x12}, // SPECIES_SLAKOTH - {0x78, 0x00}, // SPECIES_VIGOROTH - {0x86, 0x08}, // SPECIES_SLAKING - {0x55, 0x12}, // SPECIES_GULPIN - {0x66, 0x08}, // SPECIES_SWALOT - {0x88, 0x00}, // SPECIES_TROPIUS - {0x55, 0x0e}, // SPECIES_WHISMUR - {0x78, 0x03}, // SPECIES_LOUDRED - {0x88, 0x01}, // SPECIES_EXPLOUD - {0x55, 0x0e}, // SPECIES_CLAMPERL - {0x78, 0x03}, // SPECIES_HUNTAIL - {0x86, 0x0b}, // SPECIES_GOREBYSS - {0x68, 0x00}, // SPECIES_ABSOL - {0x56, 0x0e}, // SPECIES_SHUPPET - {0x55, 0x0c}, // SPECIES_BANETTE - {0x77, 0x08}, // SPECIES_SEVIPER - {0x87, 0x05}, // SPECIES_ZANGOOSE - {0x77, 0x0b}, // SPECIES_RELICANTH - {0x43, 0x14}, // SPECIES_ARON - {0x75, 0x0d}, // SPECIES_LAIRON - {0x88, 0x00}, // SPECIES_AGGRON - {0x34, 0x11}, // SPECIES_CASTFORM - {0x66, 0x08}, // SPECIES_VOLBEAT - {0x56, 0x08}, // SPECIES_ILLUMISE - {0x67, 0x07}, // SPECIES_LILEEP - {0x78, 0x00}, // SPECIES_CRADILY - {0x66, 0x08}, // SPECIES_ANORITH - {0x88, 0x00}, // SPECIES_ARMALDO - {0x35, 0x0f}, // SPECIES_RALTS - {0x47, 0x06}, // SPECIES_KIRLIA - {0x78, 0x01}, // SPECIES_GARDEVOIR - {0x56, 0x0b}, // SPECIES_BAGON - {0x66, 0x09}, // SPECIES_SHELGON - {0x87, 0x04}, // SPECIES_SALAMENCE - {0x55, 0x0f}, // SPECIES_BELDUM - {0x87, 0x07}, // SPECIES_METANG - {0x87, 0x06}, // SPECIES_METAGROSS - {0x78, 0x04}, // SPECIES_REGIROCK - {0x88, 0x02}, // SPECIES_REGICE - {0x88, 0x03}, // SPECIES_REGISTEEL - {0x87, 0x04}, // SPECIES_KYOGRE - {0x88, 0x01}, // SPECIES_GROUDON - {0x88, 0x00}, // SPECIES_RAYQUAZA - {0x88, 0x01}, // SPECIES_LATIAS - {0x88, 0x02}, // SPECIES_LATIOS - {0x66, 0x0d}, // SPECIES_JIRACHI - {0x88, 0x01}, // SPECIES_DEOXYS - {0x37, 0x06}, // SPECIES_CHIMECHO - {0x33, 0x14}, // SPECIES_EGG - {0x34, 0x10}, // SPECIES_UNOWN_B - {0x44, 0x10}, // SPECIES_UNOWN_C - {0x44, 0x10}, // SPECIES_UNOWN_D - {0x44, 0x11}, // SPECIES_UNOWN_E - {0x44, 0x11}, // SPECIES_UNOWN_F - {0x35, 0x0e}, // SPECIES_UNOWN_G - {0x44, 0x10}, // SPECIES_UNOWN_H - {0x34, 0x10}, // SPECIES_UNOWN_I - {0x34, 0x11}, // SPECIES_UNOWN_J - {0x44, 0x11}, // SPECIES_UNOWN_K - {0x34, 0x13}, // SPECIES_UNOWN_L - {0x44, 0x13}, // SPECIES_UNOWN_M - {0x43, 0x14}, // SPECIES_UNOWN_N - {0x44, 0x10}, // SPECIES_UNOWN_O - {0x34, 0x13}, // SPECIES_UNOWN_P - {0x43, 0x15}, // SPECIES_UNOWN_Q - {0x34, 0x13}, // SPECIES_UNOWN_R - {0x45, 0x0c}, // SPECIES_UNOWN_S - {0x34, 0x12}, // SPECIES_UNOWN_T - {0x44, 0x12}, // SPECIES_UNOWN_U - {0x44, 0x12}, // SPECIES_UNOWN_V - {0x44, 0x13}, // SPECIES_UNOWN_W - {0x33, 0x15}, // SPECIES_UNOWN_X - {0x34, 0x11}, // SPECIES_UNOWN_Y - {0x34, 0x10}, // SPECIES_UNOWN_Z - {0x35, 0x0f}, // SPECIES_UNOWN_EMARK - {0x35, 0x0d}, // SPECIES_UNOWN_QMARK + [SPECIES_NONE] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_BULBASAUR] = + { + .coords = 0x45, + .y_offset = 0x0e, + }, + [SPECIES_IVYSAUR] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_VENUSAUR] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_CHARMANDER] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_CHARMELEON] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_CHARIZARD] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SQUIRTLE] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_WARTORTLE] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_BLASTOISE] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CATERPIE] = + { + .coords = 0x45, + .y_offset = 0x10, + }, + [SPECIES_METAPOD] = + { + .coords = 0x54, + .y_offset = 0x14, + }, + [SPECIES_BUTTERFREE] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_WEEDLE] = + { + .coords = 0x54, + .y_offset = 0x12, + }, + [SPECIES_KAKUNA] = + { + .coords = 0x45, + .y_offset = 0x0e, + }, + [SPECIES_BEEDRILL] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_PIDGEY] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_PIDGEOTTO] = + { + .coords = 0x67, + .y_offset = 0x0b, + }, + [SPECIES_PIDGEOT] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_RATTATA] = + { + .coords = 0x44, + .y_offset = 0x10, + }, + [SPECIES_RATICATE] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_SPEAROW] = + { + .coords = 0x45, + .y_offset = 0x0f, + }, + [SPECIES_FEAROW] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_EKANS] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_ARBOK] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_PIKACHU] = + { + .coords = 0x67, + .y_offset = 0x09, + }, + [SPECIES_RAICHU] = + { + .coords = 0x67, + .y_offset = 0x04, + }, + [SPECIES_SANDSHREW] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_SANDSLASH] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_NIDORAN_F] = + { + .coords = 0x45, + .y_offset = 0x0f, + }, + [SPECIES_NIDORINA] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_NIDOQUEEN] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_NIDORAN_M] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_NIDORINO] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_NIDOKING] = + { + .coords = 0x78, + .y_offset = 0x02, + }, + [SPECIES_CLEFAIRY] = + { + .coords = 0x55, + .y_offset = 0x10, + }, + [SPECIES_CLEFABLE] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_VULPIX] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_NINETALES] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_JIGGLYPUFF] = + { + .coords = 0x45, + .y_offset = 0x10, + }, + [SPECIES_WIGGLYTUFF] = + { + .coords = 0x67, + .y_offset = 0x08, + }, + [SPECIES_ZUBAT] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_GOLBAT] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_ODDISH] = + { + .coords = 0x45, + .y_offset = 0x0f, + }, + [SPECIES_GLOOM] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_VILEPLUME] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_PARAS] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_PARASECT] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_VENONAT] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_VENOMOTH] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_DIGLETT] = + { + .coords = 0x54, + .y_offset = 0x12, + }, + [SPECIES_DUGTRIO] = + { + .coords = 0x75, + .y_offset = 0x0d, + }, + [SPECIES_MEOWTH] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_PERSIAN] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_PSYDUCK] = + { + .coords = 0x56, + .y_offset = 0x09, + }, + [SPECIES_GOLDUCK] = + { + .coords = 0x78, + .y_offset = 0x02, + }, + [SPECIES_MANKEY] = + { + .coords = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_PRIMEAPE] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_GROWLITHE] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_ARCANINE] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_POLIWAG] = + { + .coords = 0x74, + .y_offset = 0x13, + }, + [SPECIES_POLIWHIRL] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_POLIWRATH] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_ABRA] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_KADABRA] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_ALAKAZAM] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_MACHOP] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_MACHOKE] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_MACHAMP] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_BELLSPROUT] = + { + .coords = 0x65, + .y_offset = 0x0f, + }, + [SPECIES_WEEPINBELL] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_VICTREEBEL] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_TENTACOOL] = + { + .coords = 0x46, + .y_offset = 0x09, + }, + [SPECIES_TENTACRUEL] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_GEODUDE] = + { + .coords = 0x54, + .y_offset = 0x12, + }, + [SPECIES_GRAVELER] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_GOLEM] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_PONYTA] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_RAPIDASH] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SLOWPOKE] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_SLOWBRO] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_MAGNEMITE] = + { + .coords = 0x43, + .y_offset = 0x15, + }, + [SPECIES_MAGNETON] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_FARFETCHD] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_DODUO] = + { + .coords = 0x57, + .y_offset = 0x05, + }, + [SPECIES_DODRIO] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SEEL] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_DEWGONG] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_GRIMER] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_MUK] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_SHELLDER] = + { + .coords = 0x55, + .y_offset = 0x10, + }, + [SPECIES_CLOYSTER] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_GASTLY] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_HAUNTER] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_GENGAR] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_ONIX] = + { + .coords = 0x78, + .y_offset = 0x02, + }, + [SPECIES_DROWZEE] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_HYPNO] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_KRABBY] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_KINGLER] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_VOLTORB] = + { + .coords = 0x44, + .y_offset = 0x13, + }, + [SPECIES_ELECTRODE] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_EXEGGCUTE] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_EXEGGUTOR] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CUBONE] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_MAROWAK] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_HITMONLEE] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_HITMONCHAN] = + { + .coords = 0x67, + .y_offset = 0x04, + }, + [SPECIES_LICKITUNG] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_KOFFING] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_WEEZING] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_RHYHORN] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_RHYDON] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_CHANSEY] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_TANGELA] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_KANGASKHAN] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_HORSEA] = + { + .coords = 0x45, + .y_offset = 0x0f, + }, + [SPECIES_SEADRA] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_GOLDEEN] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_SEAKING] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_STARYU] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_STARMIE] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_MR_MIME] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_SCYTHER] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_JYNX] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_ELECTABUZZ] = + { + .coords = 0x78, + .y_offset = 0x02, + }, + [SPECIES_MAGMAR] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_PINSIR] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_TAUROS] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_MAGIKARP] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_GYARADOS] = + { + .coords = 0x88, + .y_offset = 0x08, + }, + [SPECIES_LAPRAS] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_DITTO] = + { + .coords = 0x54, + .y_offset = 0x11, + }, + [SPECIES_EEVEE] = + { + .coords = 0x56, + .y_offset = 0x09, + }, + [SPECIES_VAPOREON] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_JOLTEON] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_FLAREON] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_PORYGON] = + { + .coords = 0x55, + .y_offset = 0x0d, + }, + [SPECIES_OMANYTE] = + { + .coords = 0x45, + .y_offset = 0x0f, + }, + [SPECIES_OMASTAR] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_KABUTO] = + { + .coords = 0x54, + .y_offset = 0x11, + }, + [SPECIES_KABUTOPS] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_AERODACTYL] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SNORLAX] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_ARTICUNO] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_ZAPDOS] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_MOLTRES] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_DRATINI] = + { + .coords = 0x75, + .y_offset = 0x0e, + }, + [SPECIES_DRAGONAIR] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_DRAGONITE] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_MEWTWO] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_MEW] = + { + .coords = 0x55, + .y_offset = 0x0d, + }, + [SPECIES_CHIKORITA] = + { + .coords = 0x75, + .y_offset = 0x0d, + }, + [SPECIES_BAYLEEF] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_MEGANIUM] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CYNDAQUIL] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_QUILAVA] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_TYPHLOSION] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_TOTODILE] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_CROCONAW] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_FERALIGATR] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SENTRET] = + { + .coords = 0x47, + .y_offset = 0x04, + }, + [SPECIES_FURRET] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_HOOTHOOT] = + { + .coords = 0x55, + .y_offset = 0x0d, + }, + [SPECIES_NOCTOWL] = + { + .coords = 0x58, + .y_offset = 0x03, + }, + [SPECIES_LEDYBA] = + { + .coords = 0x56, + .y_offset = 0x0c, + }, + [SPECIES_LEDIAN] = + { + .coords = 0x67, + .y_offset = 0x04, + }, + [SPECIES_SPINARAK] = + { + .coords = 0x54, + .y_offset = 0x13, + }, + [SPECIES_ARIADOS] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_CROBAT] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CHINCHOU] = + { + .coords = 0x75, + .y_offset = 0x10, + }, + [SPECIES_LANTURN] = + { + .coords = 0x87, + .y_offset = 0x0b, + }, + [SPECIES_PICHU] = + { + .coords = 0x45, + .y_offset = 0x0c, + }, + [SPECIES_CLEFFA] = + { + .coords = 0x44, + .y_offset = 0x14, + }, + [SPECIES_IGGLYBUFF] = + { + .coords = 0x44, + .y_offset = 0x12, + }, + [SPECIES_TOGEPI] = + { + .coords = 0x34, + .y_offset = 0x14, + }, + [SPECIES_TOGETIC] = + { + .coords = 0x46, + .y_offset = 0x09, + }, + [SPECIES_NATU] = + { + .coords = 0x44, + .y_offset = 0x14, + }, + [SPECIES_XATU] = + { + .coords = 0x47, + .y_offset = 0x07, + }, + [SPECIES_MAREEP] = + { + .coords = 0x55, + .y_offset = 0x10, + }, + [SPECIES_FLAAFFY] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_AMPHAROS] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_BELLOSSOM] = + { + .coords = 0x45, + .y_offset = 0x0e, + }, + [SPECIES_MARILL] = + { + .coords = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_AZUMARILL] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_SUDOWOODO] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_POLITOED] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_HOPPIP] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_SKIPLOOM] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_JUMPLUFF] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_AIPOM] = + { + .coords = 0x58, + .y_offset = 0x03, + }, + [SPECIES_SUNKERN] = + { + .coords = 0x44, + .y_offset = 0x10, + }, + [SPECIES_SUNFLORA] = + { + .coords = 0x56, + .y_offset = 0x08, + }, + [SPECIES_YANMA] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_WOOPER] = + { + .coords = 0x54, + .y_offset = 0x10, + }, + [SPECIES_QUAGSIRE] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_ESPEON] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_UMBREON] = + { + .coords = 0x67, + .y_offset = 0x08, + }, + [SPECIES_MURKROW] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_SLOWKING] = + { + .coords = 0x58, + .y_offset = 0x01, + }, + [SPECIES_MISDREAVUS] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_UNOWN] = + { + .coords = 0x35, + .y_offset = 0x0f, + }, + [SPECIES_WOBBUFFET] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_GIRAFARIG] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_PINECO] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_FORRETRESS] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_DUNSPARCE] = + { + .coords = 0x74, + .y_offset = 0x11, + }, + [SPECIES_GLIGAR] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_STEELIX] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SNUBBULL] = + { + .coords = 0x55, + .y_offset = 0x0d, + }, + [SPECIES_GRANBULL] = + { + .coords = 0x57, + .y_offset = 0x06, + }, + [SPECIES_QWILFISH] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_SCIZOR] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SHUCKLE] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_HERACROSS] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_SNEASEL] = + { + .coords = 0x67, + .y_offset = 0x05, + }, + [SPECIES_TEDDIURSA] = + { + .coords = 0x45, + .y_offset = 0x0d, + }, + [SPECIES_URSARING] = + { + .coords = 0x78, + .y_offset = 0x01, + }, + [SPECIES_SLUGMA] = + { + .coords = 0x45, + .y_offset = 0x0d, + }, + [SPECIES_MAGCARGO] = + { + .coords = 0x57, + .y_offset = 0x0d, + }, + [SPECIES_SWINUB] = + { + .coords = 0x43, + .y_offset = 0x14, + }, + [SPECIES_PILOSWINE] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_CORSOLA] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_REMORAID] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_OCTILLERY] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_DELIBIRD] = + { + .coords = 0x56, + .y_offset = 0x08, + }, + [SPECIES_MANTINE] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SKARMORY] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_HOUNDOUR] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_HOUNDOOM] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_KINGDRA] = + { + .coords = 0x78, + .y_offset = 0x04, + }, + [SPECIES_PHANPY] = + { + .coords = 0x54, + .y_offset = 0x10, + }, + [SPECIES_DONPHAN] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_PORYGON2] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_STANTLER] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SMEARGLE] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_TYROGUE] = + { + .coords = 0x46, + .y_offset = 0x09, + }, + [SPECIES_HITMONTOP] = + { + .coords = 0x67, + .y_offset = 0x05, + }, + [SPECIES_SMOOCHUM] = + { + .coords = 0x35, + .y_offset = 0x0f, + }, + [SPECIES_ELEKID] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_MAGBY] = + { + .coords = 0x45, + .y_offset = 0x0d, + }, + [SPECIES_MILTANK] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_BLISSEY] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_RAIKOU] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_ENTEI] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SUICUNE] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_LARVITAR] = + { + .coords = 0x46, + .y_offset = 0x09, + }, + [SPECIES_PUPITAR] = + { + .coords = 0x56, + .y_offset = 0x09, + }, + [SPECIES_TYRANITAR] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_LUGIA] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_HO_OH] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CELEBI] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_OLD_UNOWN_B] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_C] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_D] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_E] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_F] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_G] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_H] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_I] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_J] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_K] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_L] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_M] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_N] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_O] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_P] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_Q] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_R] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_S] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_T] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_U] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_V] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_W] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_X] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_Y] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_Z] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_TREECKO] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_GROVYLE] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_SCEPTILE] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_TORCHIC] = + { + .coords = 0x56, + .y_offset = 0x08, + }, + [SPECIES_COMBUSKEN] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_BLAZIKEN] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_MUDKIP] = + { + .coords = 0x56, + .y_offset = 0x0c, + }, + [SPECIES_MARSHTOMP] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_SWAMPERT] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_POOCHYENA] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_MIGHTYENA] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_ZIGZAGOON] = + { + .coords = 0x85, + .y_offset = 0x0f, + }, + [SPECIES_LINOONE] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_WURMPLE] = + { + .coords = 0x45, + .y_offset = 0x0e, + }, + [SPECIES_SILCOON] = + { + .coords = 0x75, + .y_offset = 0x11, + }, + [SPECIES_BEAUTIFLY] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_CASCOON] = + { + .coords = 0x74, + .y_offset = 0x10, + }, + [SPECIES_DUSTOX] = + { + .coords = 0x86, + .y_offset = 0x0f, + }, + [SPECIES_LOTAD] = + { + .coords = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_LOMBRE] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_LUDICOLO] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SEEDOT] = + { + .coords = 0x46, + .y_offset = 0x10, + }, + [SPECIES_NUZLEAF] = + { + .coords = 0x56, + .y_offset = 0x08, + }, + [SPECIES_SHIFTRY] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_NINCADA] = + { + .coords = 0x74, + .y_offset = 0x12, + }, + [SPECIES_NINJASK] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_SHEDINJA] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_TAILLOW] = + { + .coords = 0x64, + .y_offset = 0x10, + }, + [SPECIES_SWELLOW] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_SHROOMISH] = + { + .coords = 0x54, + .y_offset = 0x10, + }, + [SPECIES_BRELOOM] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_SPINDA] = + { + .coords = 0x68, + .y_offset = 0x08, + }, + [SPECIES_WINGULL] = + { + .coords = 0x84, + .y_offset = 0x18, + }, + [SPECIES_PELIPPER] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_SURSKIT] = + { + .coords = 0x65, + .y_offset = 0x0f, + }, + [SPECIES_MASQUERAIN] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_WAILMER] = + { + .coords = 0x75, + .y_offset = 0x0f, + }, + [SPECIES_WAILORD] = + { + .coords = 0x87, + .y_offset = 0x0a, + }, + [SPECIES_SKITTY] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_DELCATTY] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_KECLEON] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_BALTOY] = + { + .coords = 0x55, + .y_offset = 0x10, + }, + [SPECIES_CLAYDOL] = + { + .coords = 0x78, + .y_offset = 0x06, + }, + [SPECIES_NOSEPASS] = + { + .coords = 0x56, + .y_offset = 0x0c, + }, + [SPECIES_TORKOAL] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_SABLEYE] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_BARBOACH] = + { + .coords = 0x46, + .y_offset = 0x0b, + }, + [SPECIES_WHISCASH] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_LUVDISC] = + { + .coords = 0x46, + .y_offset = 0x18, + }, + [SPECIES_CORPHISH] = + { + .coords = 0x66, + .y_offset = 0x0c, + }, + [SPECIES_CRAWDAUNT] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_FEEBAS] = + { + .coords = 0x46, + .y_offset = 0x0d, + }, + [SPECIES_MILOTIC] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CARVANHA] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_SHARPEDO] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_TRAPINCH] = + { + .coords = 0x54, + .y_offset = 0x10, + }, + [SPECIES_VIBRAVA] = + { + .coords = 0x86, + .y_offset = 0x0c, + }, + [SPECIES_FLYGON] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_MAKUHITA] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_HARIYAMA] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_ELECTRIKE] = + { + .coords = 0x64, + .y_offset = 0x12, + }, + [SPECIES_MANECTRIC] = + { + .coords = 0x67, + .y_offset = 0x04, + }, + [SPECIES_NUMEL] = + { + .coords = 0x65, + .y_offset = 0x0f, + }, + [SPECIES_CAMERUPT] = + { + .coords = 0x87, + .y_offset = 0x09, + }, + [SPECIES_SPHEAL] = + { + .coords = 0x65, + .y_offset = 0x10, + }, + [SPECIES_SEALEO] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_WALREIN] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_CACNEA] = + { + .coords = 0x74, + .y_offset = 0x10, + }, + [SPECIES_CACTURNE] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SNORUNT] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_GLALIE] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_LUNATONE] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_SOLROCK] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_AZURILL] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_SPOINK] = + { + .coords = 0x46, + .y_offset = 0x09, + }, + [SPECIES_GRUMPIG] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_PLUSLE] = + { + .coords = 0x56, + .y_offset = 0x0e, + }, + [SPECIES_MINUN] = + { + .coords = 0x66, + .y_offset = 0x0c, + }, + [SPECIES_MAWILE] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_MEDITITE] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_MEDICHAM] = + { + .coords = 0x68, + .y_offset = 0x01, + }, + [SPECIES_SWABLU] = + { + .coords = 0x76, + .y_offset = 0x11, + }, + [SPECIES_ALTARIA] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_WYNAUT] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_DUSKULL] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_DUSCLOPS] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_ROSELIA] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_SLAKOTH] = + { + .coords = 0x74, + .y_offset = 0x12, + }, + [SPECIES_VIGOROTH] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_SLAKING] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_GULPIN] = + { + .coords = 0x55, + .y_offset = 0x12, + }, + [SPECIES_SWALOT] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_TROPIUS] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_WHISMUR] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_LOUDRED] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_EXPLOUD] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_CLAMPERL] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_HUNTAIL] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_GOREBYSS] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_ABSOL] = + { + .coords = 0x68, + .y_offset = 0x00, + }, + [SPECIES_SHUPPET] = + { + .coords = 0x56, + .y_offset = 0x0e, + }, + [SPECIES_BANETTE] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_SEVIPER] = + { + .coords = 0x77, + .y_offset = 0x08, + }, + [SPECIES_ZANGOOSE] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_RELICANTH] = + { + .coords = 0x77, + .y_offset = 0x0b, + }, + [SPECIES_ARON] = + { + .coords = 0x43, + .y_offset = 0x14, + }, + [SPECIES_LAIRON] = + { + .coords = 0x75, + .y_offset = 0x0d, + }, + [SPECIES_AGGRON] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CASTFORM] = + { + .coords = 0x34, + .y_offset = 0x11, + }, + [SPECIES_VOLBEAT] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_ILLUMISE] = + { + .coords = 0x56, + .y_offset = 0x08, + }, + [SPECIES_LILEEP] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_CRADILY] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_ANORITH] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_ARMALDO] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_RALTS] = + { + .coords = 0x35, + .y_offset = 0x0f, + }, + [SPECIES_KIRLIA] = + { + .coords = 0x47, + .y_offset = 0x06, + }, + [SPECIES_GARDEVOIR] = + { + .coords = 0x78, + .y_offset = 0x01, + }, + [SPECIES_BAGON] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_SHELGON] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_SALAMENCE] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_BELDUM] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_METANG] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_METAGROSS] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_REGIROCK] = + { + .coords = 0x78, + .y_offset = 0x04, + }, + [SPECIES_REGICE] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_REGISTEEL] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_KYOGRE] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_GROUDON] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_RAYQUAZA] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_LATIAS] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_LATIOS] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_JIRACHI] = + { + .coords = 0x66, + .y_offset = 0x0d, + }, + [SPECIES_DEOXYS] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_CHIMECHO] = + { + .coords = 0x37, + .y_offset = 0x06, + }, + [SPECIES_EGG] = + { + .coords = 0x33, + .y_offset = 0x14, + }, + [SPECIES_UNOWN_B] = + { + .coords = 0x34, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_C] = + { + .coords = 0x44, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_D] = + { + .coords = 0x44, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_E] = + { + .coords = 0x44, + .y_offset = 0x11, + }, + [SPECIES_UNOWN_F] = + { + .coords = 0x44, + .y_offset = 0x11, + }, + [SPECIES_UNOWN_G] = + { + .coords = 0x35, + .y_offset = 0x0e, + }, + [SPECIES_UNOWN_H] = + { + .coords = 0x44, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_I] = + { + .coords = 0x34, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_J] = + { + .coords = 0x34, + .y_offset = 0x11, + }, + [SPECIES_UNOWN_K] = + { + .coords = 0x44, + .y_offset = 0x11, + }, + [SPECIES_UNOWN_L] = + { + .coords = 0x34, + .y_offset = 0x13, + }, + [SPECIES_UNOWN_M] = + { + .coords = 0x44, + .y_offset = 0x13, + }, + [SPECIES_UNOWN_N] = + { + .coords = 0x43, + .y_offset = 0x14, + }, + [SPECIES_UNOWN_O] = + { + .coords = 0x44, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_P] = + { + .coords = 0x34, + .y_offset = 0x13, + }, + [SPECIES_UNOWN_Q] = + { + .coords = 0x43, + .y_offset = 0x15, + }, + [SPECIES_UNOWN_R] = + { + .coords = 0x34, + .y_offset = 0x13, + }, + [SPECIES_UNOWN_S] = + { + .coords = 0x45, + .y_offset = 0x0c, + }, + [SPECIES_UNOWN_T] = + { + .coords = 0x34, + .y_offset = 0x12, + }, + [SPECIES_UNOWN_U] = + { + .coords = 0x44, + .y_offset = 0x12, + }, + [SPECIES_UNOWN_V] = + { + .coords = 0x44, + .y_offset = 0x12, + }, + [SPECIES_UNOWN_W] = + { + .coords = 0x44, + .y_offset = 0x13, + }, + [SPECIES_UNOWN_X] = + { + .coords = 0x33, + .y_offset = 0x15, + }, + [SPECIES_UNOWN_Y] = + { + .coords = 0x34, + .y_offset = 0x11, + }, + [SPECIES_UNOWN_Z] = + { + .coords = 0x34, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_EMARK] = + { + .coords = 0x35, + .y_offset = 0x0f, + }, + [SPECIES_UNOWN_QMARK] = + { + .coords = 0x35, + .y_offset = 0x0d, + }, }; diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index ff0b680dd..8de5183ec 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -7,7 +7,7 @@ const u8 gPokeBallItemDescription[] = _("A tool used for\ncatching wild\nPOKéMO const u8 gSafariBallItemDescription[] = _("A special BALL that\nis used only in the\nSAFARI ZONE."); const u8 gNetBallItemDescription[] = _("A BALL that works\nwell on WATER- and\nBUG-type POKéMON."); const u8 gDiveBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\non the ocean floor."); -const u8 gNestBallItemDescription[] = _("A BALL that works\nbetter on weaker\nPOKéMON."); +const u8 gNestBallItemDescription[] = _("A BALL that works\nbetter on weaker\nPOKéMON."); const u8 gRepeatBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\ncaught before."); const u8 gTimerBallItemDescription[] = _("A BALL that gains\npower in battles\ntaking many turns."); const u8 gLuxuryBallItemDescription[] = _("A cozy BALL that\nmakes POKéMON\nmore friendly."); diff --git a/src/data/text/move_descriptions.h b/src/data/text/move_descriptions.h index 3642f66b1..5818186fe 100644 --- a/src/data/text/move_descriptions.h +++ b/src/data/text/move_descriptions.h @@ -1,1421 +1,1421 @@ static const u8 sNullDescription[] = _( - ""); + ""); static const u8 sPoundDescription[] = _( - "Pounds the foe with\n" - "forelegs or tail."); + "Pounds the foe with\n" + "forelegs or tail."); static const u8 sKarateChopDescription[] = _( - "A chopping attack with a\n" - "high critical-hit ratio."); + "A chopping attack with a\n" + "high critical-hit ratio."); static const u8 sDoubleSlapDescription[] = _( - "Repeatedly slaps the foe\n" - "2 to 5 times."); + "Repeatedly slaps the foe\n" + "2 to 5 times."); static const u8 sCometPunchDescription[] = _( - "Repeatedly punches the foe\n" - "2 to 5 times."); + "Repeatedly punches the foe\n" + "2 to 5 times."); static const u8 sMegaPunchDescription[] = _( - "A strong punch thrown with\n" - "incredible power."); + "A strong punch thrown with\n" + "incredible power."); static const u8 sPayDayDescription[] = _( - "Throws coins at the foe.\n" - "Money is recovered after."); + "Throws coins at the foe.\n" + "Money is recovered after."); static const u8 sFirePunchDescription[] = _( - "A fiery punch that may burn\n" - "the foe."); + "A fiery punch that may burn\n" + "the foe."); static const u8 sIcePunchDescription[] = _( - "An icy punch that may\n" - "freeze the foe."); + "An icy punch that may\n" + "freeze the foe."); static const u8 sThunderPunchDescription[] = _( - "An electrified punch that\n" - "may paralyze the foe."); + "An electrified punch that\n" + "may paralyze the foe."); static const u8 sScratchDescription[] = _( - "Scratches the foe with\n" - "sharp claws."); + "Scratches the foe with\n" + "sharp claws."); static const u8 sViceGripDescription[] = _( - "Grips the foe with large and\n" - "powerful pincers."); + "Grips the foe with large and\n" + "powerful pincers."); static const u8 sGuillotineDescription[] = _( - "A powerful pincer attack\n" - "that may cause fainting."); + "A powerful pincer attack\n" + "that may cause fainting."); static const u8 sRazorWindDescription[] = _( - "A 2-turn move that strikes\n" - "the foe on the 2nd turn."); + "A 2-turn move that strikes\n" + "the foe on the 2nd turn."); static const u8 sSwordsDanceDescription[] = _( - "A fighting dance that\n" - "sharply raises ATTACK."); + "A fighting dance that\n" + "sharply raises ATTACK."); static const u8 sCutDescription[] = _( - "Cuts the foe with sharp\n" - "scythes, claws, etc."); + "Cuts the foe with sharp\n" + "scythes, claws, etc."); static const u8 sGustDescription[] = _( - "Strikes the foe with a gust\n" - "of wind whipped up by wings."); + "Strikes the foe with a gust\n" + "of wind whipped up by wings."); static const u8 sWingAttackDescription[] = _( - "Strikes the foe with wings\n" - "spread wide."); + "Strikes the foe with wings\n" + "spread wide."); static const u8 sWhirlwindDescription[] = _( - "Blows away the foe with\n" - "wind and ends the battle."); + "Blows away the foe with\n" + "wind and ends the battle."); static const u8 sFlyDescription[] = _( - "Flies up on the first turn,\n" - "then strikes the next turn."); + "Flies up on the first turn,\n" + "then strikes the next turn."); static const u8 sBindDescription[] = _( - "Binds and squeezes the foe\n" - "for 2 to 5 turns."); + "Binds and squeezes the foe\n" + "for 2 to 5 turns."); static const u8 sSlamDescription[] = _( - "Slams the foe with a long\n" - "tail, vine, etc."); + "Slams the foe with a long\n" + "tail, vine, etc."); static const u8 sVineWhipDescription[] = _( - "Strikes the foe with\n" - "slender, whiplike vines."); + "Strikes the foe with\n" + "slender, whiplike vines."); static const u8 sStompDescription[] = _( - "Stomps the enemy with a big\n" - "foot. May cause flinching."); + "Stomps the enemy with a big\n" + "foot. May cause flinching."); static const u8 sDoubleKickDescription[] = _( - "A double-kicking attack\n" - "that strikes the foe twice."); + "A double-kicking attack\n" + "that strikes the foe twice."); static const u8 sMegaKickDescription[] = _( - "An extremely powerful kick\n" - "with intense force."); + "An extremely powerful kick\n" + "with intense force."); static const u8 sJumpKickDescription[] = _( - "A strong jumping kick. May\n" - "miss and hurt the kicker."); + "A strong jumping kick. May\n" + "miss and hurt the kicker."); static const u8 sRollingKickDescription[] = _( - "A fast kick delivered from\n" - "a rapid spin."); + "A fast kick delivered from\n" + "a rapid spin."); static const u8 sSandAttackDescription[] = _( - "Reduces the foe’s accuracy\n" - "by hurling sand in its face."); + "Reduces the foe’s accuracy\n" + "by hurling sand in its face."); static const u8 sHeadbuttDescription[] = _( - "A ramming attack that may\n" - "cause flinching."); + "A ramming attack that may\n" + "cause flinching."); static const u8 sHornAttackDescription[] = _( - "Jabs the foe with sharp\n" - "horns."); + "Jabs the foe with sharp\n" + "horns."); static const u8 sFuryAttackDescription[] = _( - "Jabs the foe 2 to 5 times\n" - "with sharp horns, etc."); + "Jabs the foe 2 to 5 times\n" + "with sharp horns, etc."); static const u8 sHornDrillDescription[] = _( - "A one-hit KO attack that\n" - "uses a horn like a drill."); + "A one-hit KO attack that\n" + "uses a horn like a drill."); static const u8 sTackleDescription[] = _( - "Charges the foe with a full-\n" - "body tackle."); + "Charges the foe with a full-\n" + "body tackle."); static const u8 sBodySlamDescription[] = _( - "A full-body slam that may\n" - "cause paralysis."); + "A full-body slam that may\n" + "cause paralysis."); static const u8 sWrapDescription[] = _( - "Wraps and squeezes the foe\n" - "2 to 5 times with vines, etc."); + "Wraps and squeezes the foe\n" + "2 to 5 times with vines, etc."); static const u8 sTakeDownDescription[] = _( - "A reckless charge attack\n" - "that also hurts the user."); + "A reckless charge attack\n" + "that also hurts the user."); static const u8 sThrashDescription[] = _( - "A rampage of 2 to 3 turns\n" - "that confuses the user."); + "A rampage of 2 to 3 turns\n" + "that confuses the user."); static const u8 sDoubleEdgeDescription[] = _( - "A life-risking tackle that\n" - "also hurts the user."); + "A life-risking tackle that\n" + "also hurts the user."); static const u8 sTailWhipDescription[] = _( - "Wags the tail to lower the\n" - "foe’s DEFENSE."); + "Wags the tail to lower the\n" + "foe’s DEFENSE."); static const u8 sPoisonStingDescription[] = _( - "A toxic attack with barbs,\n" - "etc., that may poison."); + "A toxic attack with barbs,\n" + "etc., that may poison."); static const u8 sTwineedleDescription[] = _( - "Stingers on the forelegs\n" - "jab the foe twice."); + "Stingers on the forelegs\n" + "jab the foe twice."); static const u8 sPinMissileDescription[] = _( - "Sharp pins are fired to\n" - "strike 2 to 5 times."); + "Sharp pins are fired to\n" + "strike 2 to 5 times."); static const u8 sLeerDescription[] = _( - "Frightens the foe with a\n" - "leer to lower DEFENSE."); + "Frightens the foe with a\n" + "leer to lower DEFENSE."); static const u8 sBiteDescription[] = _( - "Bites with vicious fangs.\n" - "May cause flinching."); + "Bites with vicious fangs.\n" + "May cause flinching."); static const u8 sGrowlDescription[] = _( - "Growls cutely to reduce the\n" - "foe’s ATTACK."); + "Growls cutely to reduce the\n" + "foe’s ATTACK."); static const u8 sRoarDescription[] = _( - "Makes the foe flee to end\n" - "the battle."); + "Makes the foe flee to end\n" + "the battle."); static const u8 sSingDescription[] = _( - "A soothing song lulls the\n" - "foe into a deep slumber."); + "A soothing song lulls the\n" + "foe into a deep slumber."); static const u8 sSupersonicDescription[] = _( - "Emits bizarre sound waves\n" - "that may confuse the foe."); + "Emits bizarre sound waves\n" + "that may confuse the foe."); static const u8 sSonicBoomDescription[] = _( - "Launches shock waves that\n" - "always inflict 20 HP damage."); + "Launches shock waves that\n" + "always inflict 20 HP damage."); static const u8 sDisableDescription[] = _( - "Psychically disables one of\n" - "the foe’s moves."); + "Psychically disables one of\n" + "the foe’s moves."); static const u8 sAcidDescription[] = _( - "Sprays a hide-melting acid.\n" - "May lower DEFENSE."); + "Sprays a hide-melting acid.\n" + "May lower DEFENSE."); static const u8 sEmberDescription[] = _( - "A weak fire attack that may\n" - "inflict a burn."); + "A weak fire attack that may\n" + "inflict a burn."); static const u8 sFlamethrowerDescription[] = _( - "A powerful fire attack that\n" - "may inflict a burn."); + "A powerful fire attack that\n" + "may inflict a burn."); static const u8 sMistDescription[] = _( - "Creates a mist that stops\n" - "reduction of abilities."); + "Creates a mist that stops\n" + "reduction of abilities."); static const u8 sWaterGunDescription[] = _( - "Squirts water to attack\n" - "the foe."); + "Squirts water to attack\n" + "the foe."); static const u8 sHydroPumpDescription[] = _( - "Blasts water at high power\n" - "to strike the foe."); + "Blasts water at high power\n" + "to strike the foe."); static const u8 sSurfDescription[] = _( - "Creates a huge wave, then\n" - "crashes it down on the foe."); + "Creates a huge wave, then\n" + "crashes it down on the foe."); static const u8 sIceBeamDescription[] = _( - "Blasts the foe with an icy\n" - "beam that may freeze it."); + "Blasts the foe with an icy\n" + "beam that may freeze it."); static const u8 sBlizzardDescription[] = _( - "Hits the foe with an icy\n" - "storm that may freeze it."); + "Hits the foe with an icy\n" + "storm that may freeze it."); static const u8 sPsybeamDescription[] = _( - "Fires a peculiar ray that\n" - "may confuse the foe."); + "Fires a peculiar ray that\n" + "may confuse the foe."); static const u8 sBubbleBeamDescription[] = _( - "Forcefully sprays bubbles\n" - "that may lower SPEED."); + "Forcefully sprays bubbles\n" + "that may lower SPEED."); static const u8 sAuroraBeamDescription[] = _( - "Fires a rainbow-colored\n" - "beam that may lower ATTACK."); + "Fires a rainbow-colored\n" + "beam that may lower ATTACK."); static const u8 sHyperBeamDescription[] = _( - "Powerful, but leaves the\n" - "user immobile the next turn."); + "Powerful, but leaves the\n" + "user immobile the next turn."); static const u8 sPeckDescription[] = _( - "Attacks the foe with a\n" - "jabbing beak, etc."); + "Attacks the foe with a\n" + "jabbing beak, etc."); static const u8 sDrillPeckDescription[] = _( - "A corkscrewing attack with\n" - "the beak acting as a drill."); + "A corkscrewing attack with\n" + "the beak acting as a drill."); static const u8 sSubmissionDescription[] = _( - "A reckless body slam that\n" - "also hurts the user."); + "A reckless body slam that\n" + "also hurts the user."); static const u8 sLowKickDescription[] = _( - "A kick that inflicts more\n" - "damage on heavier foes."); + "A kick that inflicts more\n" + "damage on heavier foes."); static const u8 sCounterDescription[] = _( - "Retaliates any physical hit\n" - "with double the power."); + "Retaliates any physical hit\n" + "with double the power."); static const u8 sSeismicTossDescription[] = _( - "Inflicts damage identical\n" - "to the user’s level."); + "Inflicts damage identical\n" + "to the user’s level."); static const u8 sStrengthDescription[] = _( - "Builds enormous power,\n" - "then slams the foe."); + "Builds enormous power,\n" + "then slams the foe."); static const u8 sAbsorbDescription[] = _( - "An attack that absorbs\n" - "half the damage inflicted."); + "An attack that absorbs\n" + "half the damage inflicted."); static const u8 sMegaDrainDescription[] = _( - "An attack that absorbs\n" - "half the damage inflicted."); + "An attack that absorbs\n" + "half the damage inflicted."); static const u8 sLeechSeedDescription[] = _( - "Plants a seed on the foe to\n" - "steal HP on every turn."); + "Plants a seed on the foe to\n" + "steal HP on every turn."); static const u8 sGrowthDescription[] = _( - "Forces the body to grow\n" - "and heightens SP. ATK."); + "Forces the body to grow\n" + "and heightens SP. ATK."); static const u8 sRazorLeafDescription[] = _( - "Cuts the enemy with leaves.\n" - "High critical-hit ratio."); + "Cuts the enemy with leaves.\n" + "High critical-hit ratio."); static const u8 sSolarBeamDescription[] = _( - "Absorbs light in one turn,\n" - "then attacks next turn."); + "Absorbs light in one turn,\n" + "then attacks next turn."); static const u8 sPoisonPowderDescription[] = _( - "Scatters a toxic powder\n" - "that may poison the foe."); + "Scatters a toxic powder\n" + "that may poison the foe."); static const u8 sStunSporeDescription[] = _( - "Scatters a powder that may\n" - "paralyze the foe."); + "Scatters a powder that may\n" + "paralyze the foe."); static const u8 sSleepPowderDescription[] = _( - "Scatters a powder that may\n" - "cause the foe to sleep."); + "Scatters a powder that may\n" + "cause the foe to sleep."); static const u8 sPetalDanceDescription[] = _( - "A rampage of 2 to 3 turns\n" - "that confuses the user."); + "A rampage of 2 to 3 turns\n" + "that confuses the user."); static const u8 sStringShotDescription[] = _( - "Binds the foe with string\n" - "to reduce its SPEED."); + "Binds the foe with string\n" + "to reduce its SPEED."); static const u8 sDragonRageDescription[] = _( - "Launches shock waves that\n" - "always inflict 40 HP damage."); + "Launches shock waves that\n" + "always inflict 40 HP damage."); static const u8 sFireSpinDescription[] = _( - "Traps the foe in a ring of\n" - "fire for 2 to 5 turns."); + "Traps the foe in a ring of\n" + "fire for 2 to 5 turns."); static const u8 sThunderShockDescription[] = _( - "An electrical attack that\n" - "may paralyze the foe."); + "An electrical attack that\n" + "may paralyze the foe."); static const u8 sThunderboltDescription[] = _( - "A strong electrical attack\n" - "that may paralyze the foe."); + "A strong electrical attack\n" + "that may paralyze the foe."); static const u8 sThunderWaveDescription[] = _( - "A weak jolt of electricity\n" - "that paralyzes the foe."); + "A weak jolt of electricity\n" + "that paralyzes the foe."); static const u8 sThunderDescription[] = _( - "A lightning attack that may\n" - "cause paralysis."); + "A lightning attack that may\n" + "cause paralysis."); static const u8 sRockThrowDescription[] = _( - "Throws small rocks to\n" - "strike the foe."); + "Throws small rocks to\n" + "strike the foe."); static const u8 sEarthquakeDescription[] = _( - "A powerful quake, but has\n" - "no effect on flying foes."); + "A powerful quake, but has\n" + "no effect on flying foes."); static const u8 sFissureDescription[] = _( - "A one-hit KO move that\n" - "drops the foe in a fissure."); + "A one-hit KO move that\n" + "drops the foe in a fissure."); static const u8 sDigDescription[] = _( - "Digs underground the first\n" - "turn and strikes next turn."); + "Digs underground the first\n" + "turn and strikes next turn."); static const u8 sToxicDescription[] = _( - "Poisons the foe with an\n" - "intensifying toxin."); + "Poisons the foe with an\n" + "intensifying toxin."); static const u8 sConfusionDescription[] = _( - "A psychic attack that may\n" - "cause confusion."); + "A psychic attack that may\n" + "cause confusion."); static const u8 sPsychicDescription[] = _( - "A powerful psychic attack\n" - "that may lower SP. DEF."); + "A powerful psychic attack\n" + "that may lower SP. DEF."); static const u8 sHypnosisDescription[] = _( - "A hypnotizing move that\n" - "may induce sleep."); + "A hypnotizing move that\n" + "may induce sleep."); static const u8 sMeditateDescription[] = _( - "Meditates in a peaceful\n" - "fashion to raise ATTACK."); + "Meditates in a peaceful\n" + "fashion to raise ATTACK."); static const u8 sAgilityDescription[] = _( - "Relaxes the body to sharply\n" - "boost SPEED."); + "Relaxes the body to sharply\n" + "boost SPEED."); static const u8 sQuickAttackDescription[] = _( - "An extremely fast attack\n" - "that always strikes first."); + "An extremely fast attack\n" + "that always strikes first."); static const u8 sRageDescription[] = _( - "Raises the user’s ATTACK\n" - "every time it is hit."); + "Raises the user’s ATTACK\n" + "every time it is hit."); static const u8 sTeleportDescription[] = _( - "A psychic move for fleeing\n" - "from battle instantly."); + "A psychic move for fleeing\n" + "from battle instantly."); static const u8 sNightShadeDescription[] = _( - "Inflicts damage identical\n" - "to the user’s level."); + "Inflicts damage identical\n" + "to the user’s level."); static const u8 sMimicDescription[] = _( - "Copies a move used by the\n" - "foe during one battle."); + "Copies a move used by the\n" + "foe during one battle."); static const u8 sScreechDescription[] = _( - "Emits a screech to sharply\n" - "reduce the foe’s DEFENSE."); + "Emits a screech to sharply\n" + "reduce the foe’s DEFENSE."); static const u8 sDoubleTeamDescription[] = _( - "Creates illusory copies to\n" - "raise evasiveness."); + "Creates illusory copies to\n" + "raise evasiveness."); static const u8 sRecoverDescription[] = _( - "Recovers up to half the\n" - "user’s maximum HP."); + "Recovers up to half the\n" + "user’s maximum HP."); static const u8 sHardenDescription[] = _( - "Stiffens the body’s \n" - "muscles to raise DEFENSE."); + "Stiffens the body’s \n" + "muscles to raise DEFENSE."); static const u8 sMinimizeDescription[] = _( - "Minimizes the user’s size\n" - "to raise evasiveness."); + "Minimizes the user’s size\n" + "to raise evasiveness."); static const u8 sSmokescreenDescription[] = _( - "Lowers the foe’s accuracy\n" - "using smoke, ink, etc."); + "Lowers the foe’s accuracy\n" + "using smoke, ink, etc."); static const u8 sConfuseRayDescription[] = _( - "A sinister ray that\n" - "confuses the foe."); + "A sinister ray that\n" + "confuses the foe."); static const u8 sWithdrawDescription[] = _( - "Withdraws the body into its\n" - "hard shell to raise DEFENSE."); + "Withdraws the body into its\n" + "hard shell to raise DEFENSE."); static const u8 sDefenseCurlDescription[] = _( - "Curls up to conceal weak\n" - "spots and raise DEFENSE."); + "Curls up to conceal weak\n" + "spots and raise DEFENSE."); static const u8 sBarrierDescription[] = _( - "Creates a barrier that\n" - "sharply raises DEFENSE."); + "Creates a barrier that\n" + "sharply raises DEFENSE."); static const u8 sLightScreenDescription[] = _( - "Creates a wall of light that\n" - "lowers SP. ATK damage."); + "Creates a wall of light that\n" + "lowers SP. ATK damage."); static const u8 sHazeDescription[] = _( - "Creates a black haze that\n" - "eliminates all stat changes."); + "Creates a black haze that\n" + "eliminates all stat changes."); static const u8 sReflectDescription[] = _( - "Creates a wall of light that\n" - "weakens physical attacks."); + "Creates a wall of light that\n" + "weakens physical attacks."); static const u8 sFocusEnergyDescription[] = _( - "Focuses power to raise the\n" - "critical-hit ratio."); + "Focuses power to raise the\n" + "critical-hit ratio."); static const u8 sBideDescription[] = _( - "Endures attack for 2\n" - "turns to retaliate double."); + "Endures attack for 2\n" + "turns to retaliate double."); static const u8 sMetronomeDescription[] = _( - "Waggles a finger to use any\n" - "POKéMON move at random."); + "Waggles a finger to use any\n" + "POKéMON move at random."); static const u8 sMirrorMoveDescription[] = _( - "Counters the foe’s attack\n" - "with the same move."); + "Counters the foe’s attack\n" + "with the same move."); static const u8 sSelfDestructDescription[] = _( - "Inflicts severe damage but\n" - "makes the user faint."); + "Inflicts severe damage but\n" + "makes the user faint."); static const u8 sEggBombDescription[] = _( - "An egg is forcibly hurled at\n" - "the foe."); + "An egg is forcibly hurled at\n" + "the foe."); static const u8 sLickDescription[] = _( - "Licks with a long tongue to\n" - "injure. May also paralyze."); + "Licks with a long tongue to\n" + "injure. May also paralyze."); static const u8 sSmogDescription[] = _( - "An exhaust-gas attack\n" - "that may also poison."); + "An exhaust-gas attack\n" + "that may also poison."); static const u8 sSludgeDescription[] = _( - "Sludge is hurled to inflict\n" - "damage. May also poison."); + "Sludge is hurled to inflict\n" + "damage. May also poison."); static const u8 sBoneClubDescription[] = _( - "Clubs the foe with a bone.\n" - "May cause flinching."); + "Clubs the foe with a bone.\n" + "May cause flinching."); static const u8 sFireBlastDescription[] = _( - "Incinerates everything it\n" - "strikes. May cause a burn."); + "Incinerates everything it\n" + "strikes. May cause a burn."); static const u8 sWaterfallDescription[] = _( - "Charges the foe with speed\n" - "to climb waterfalls."); + "Charges the foe with speed\n" + "to climb waterfalls."); static const u8 sClampDescription[] = _( - "Traps and squeezes the\n" - "foe for 2 to 5 turns."); + "Traps and squeezes the\n" + "foe for 2 to 5 turns."); static const u8 sSwiftDescription[] = _( - "Sprays star-shaped rays\n" - "that never miss."); + "Sprays star-shaped rays\n" + "that never miss."); static const u8 sSkullBashDescription[] = _( - "Tucks in the head, then\n" - "attacks on the next turn."); + "Tucks in the head, then\n" + "attacks on the next turn."); static const u8 sSpikeCannonDescription[] = _( - "Launches sharp spikes that\n" - "strike 2 to 5 times."); + "Launches sharp spikes that\n" + "strike 2 to 5 times."); static const u8 sConstrictDescription[] = _( - "Constricts to inflict pain.\n" - "May lower SPEED."); + "Constricts to inflict pain.\n" + "May lower SPEED."); static const u8 sAmnesiaDescription[] = _( - "Forgets about something\n" - "and sharply raises SP. DEF."); + "Forgets about something\n" + "and sharply raises SP. DEF."); static const u8 sKinesisDescription[] = _( - "Distracts the foe.\n" - "May lower accuracy."); + "Distracts the foe.\n" + "May lower accuracy."); static const u8 sSoftBoiledDescription[] = _( - "Recovers up to half the\n" - "user’s maximum HP."); + "Recovers up to half the\n" + "user’s maximum HP."); static const u8 sHiJumpKickDescription[] = _( - "A jumping knee kick. If it\n" - "misses, the user is hurt."); + "A jumping knee kick. If it\n" + "misses, the user is hurt."); static const u8 sGlareDescription[] = _( - "Intimidates and frightens\n" - "the foe into paralysis."); + "Intimidates and frightens\n" + "the foe into paralysis."); static const u8 sDreamEaterDescription[] = _( - "Takes one half the damage\n" - "inflicted on a sleeping foe."); + "Takes one half the damage\n" + "inflicted on a sleeping foe."); static const u8 sPoisonGasDescription[] = _( - "Envelops the foe in a toxic\n" - "gas that may poison."); + "Envelops the foe in a toxic\n" + "gas that may poison."); static const u8 sBarrageDescription[] = _( - "Hurls round objects at the\n" - "foe 2 to 5 times."); + "Hurls round objects at the\n" + "foe 2 to 5 times."); static const u8 sLeechLifeDescription[] = _( - "An attack that steals half\n" - "the damage inflicted."); + "An attack that steals half\n" + "the damage inflicted."); static const u8 sLovelyKissDescription[] = _( - "Demands a kiss with a scary\n" - "face that induces sleep."); + "Demands a kiss with a scary\n" + "face that induces sleep."); static const u8 sSkyAttackDescription[] = _( - "Searches out weak spots,\n" - "then strikes the next turn."); + "Searches out weak spots,\n" + "then strikes the next turn."); static const u8 sTransformDescription[] = _( - "Alters the user’s cells to\n" - "become a copy of the foe."); + "Alters the user’s cells to\n" + "become a copy of the foe."); static const u8 sBubbleDescription[] = _( - "An attack using bubbles.\n" - "May lower the foe’s SPEED."); + "An attack using bubbles.\n" + "May lower the foe’s SPEED."); static const u8 sDizzyPunchDescription[] = _( - "A rhythmic punch that may\n" - "confuse the foe."); + "A rhythmic punch that may\n" + "confuse the foe."); static const u8 sSporeDescription[] = _( - "Scatters a cloud of spores\n" - "that always induce sleep."); + "Scatters a cloud of spores\n" + "that always induce sleep."); static const u8 sFlashDescription[] = _( - "Looses a powerful blast of\n" - "light that cuts accuracy."); + "Looses a powerful blast of\n" + "light that cuts accuracy."); static const u8 sPsywaveDescription[] = _( - "Attacks with a psychic\n" - "wave of varying intensity."); + "Attacks with a psychic\n" + "wave of varying intensity."); static const u8 sSplashDescription[] = _( - "It’s just a splash...\n" - "Has no effect whatsoever."); + "It’s just a splash...\n" + "Has no effect whatsoever."); static const u8 sAcidArmorDescription[] = _( - "Liquifies the user’s body\n" - "to sharply raise DEFENSE."); + "Liquifies the user’s body\n" + "to sharply raise DEFENSE."); static const u8 sCrabhammerDescription[] = _( - "Hammers with a pincer. Has a\n" - "high critical-hit ratio."); + "Hammers with a pincer. Has a\n" + "high critical-hit ratio."); static const u8 sExplosionDescription[] = _( - "Inflicts severe damage but\n" - "makes the user faint."); + "Inflicts severe damage but\n" + "makes the user faint."); static const u8 sFurySwipesDescription[] = _( - "Rakes the foe with sharp\n" - "claws, etc., 2 to 5 times."); + "Rakes the foe with sharp\n" + "claws, etc., 2 to 5 times."); static const u8 sBonemerangDescription[] = _( - "Throws a bone boomerang\n" - "that strikes twice."); + "Throws a bone boomerang\n" + "that strikes twice."); static const u8 sRestDescription[] = _( - "The user sleeps for 2 turns,\n" - "restoring HP and status."); + "The user sleeps for 2 turns,\n" + "restoring HP and status."); static const u8 sRockSlideDescription[] = _( - "Large boulders are hurled.\n" - "May cause flinching."); + "Large boulders are hurled.\n" + "May cause flinching."); static const u8 sHyperFangDescription[] = _( - "Attacks with sharp fangs.\n" - "May cause flinching."); + "Attacks with sharp fangs.\n" + "May cause flinching."); static const u8 sSharpenDescription[] = _( - "Reduces the polygon count\n" - "and raises ATTACK."); + "Reduces the polygon count\n" + "and raises ATTACK."); static const u8 sConversionDescription[] = _( - "Changes the user’s type\n" - "into a known move’s type."); + "Changes the user’s type\n" + "into a known move’s type."); static const u8 sTriAttackDescription[] = _( - "Fires three types of beams\n" - "at the same time."); + "Fires three types of beams\n" + "at the same time."); static const u8 sSuperFangDescription[] = _( - "Attacks with sharp fangs\n" - "and cuts half the foe’s HP."); + "Attacks with sharp fangs\n" + "and cuts half the foe’s HP."); static const u8 sSlashDescription[] = _( - "Slashes with claws, etc. Has\n" - "a high critical-hit ratio."); + "Slashes with claws, etc. Has\n" + "a high critical-hit ratio."); static const u8 sSubstituteDescription[] = _( - "Creates a decoy using 1/4\n" - "of the user’s maximum HP."); + "Creates a decoy using 1/4\n" + "of the user’s maximum HP."); static const u8 sStruggleDescription[] = _( - "Used only if all PP are gone.\n" - "Also hurts the user a little."); + "Used only if all PP are gone.\n" + "Also hurts the user a little."); static const u8 sSketchDescription[] = _( - "Copies the foe’s last move\n" - "permanently."); + "Copies the foe’s last move\n" + "permanently."); static const u8 sTripleKickDescription[] = _( - "Kicks the foe 3 times in a\n" - "row with rising intensity."); + "Kicks the foe 3 times in a\n" + "row with rising intensity."); static const u8 sThiefDescription[] = _( - "While attacking, it may\n" - "steal the foe’s held item."); + "While attacking, it may\n" + "steal the foe’s held item."); static const u8 sSpiderWebDescription[] = _( - "Ensnares the foe to stop it\n" - "from fleeing or switching."); + "Ensnares the foe to stop it\n" + "from fleeing or switching."); static const u8 sMindReaderDescription[] = _( - "Senses the foe’s action to\n" - "ensure the next move’s hit."); + "Senses the foe’s action to\n" + "ensure the next move’s hit."); static const u8 sNightmareDescription[] = _( - "Inflicts 1/4 damage on a\n" - "sleeping foe every turn."); + "Inflicts 1/4 damage on a\n" + "sleeping foe every turn."); static const u8 sFlameWheelDescription[] = _( - "A fiery charge attack that\n" - "may inflict a burn."); + "A fiery charge attack that\n" + "may inflict a burn."); static const u8 sSnoreDescription[] = _( - "A loud attack that can be\n" - "used only while asleep."); + "A loud attack that can be\n" + "used only while asleep."); static const u8 sCurseDescription[] = _( - "A move that functions\n" - "differently for GHOSTS."); + "A move that functions\n" + "differently for GHOSTS."); static const u8 sFlailDescription[] = _( - "Inflicts more damage when\n" - "the user’s HP is down."); + "Inflicts more damage when\n" + "the user’s HP is down."); static const u8 sConversion2Description[] = _( - "Makes the user resistant\n" - "to the last attack’s type."); + "Makes the user resistant\n" + "to the last attack’s type."); static const u8 sAeroblastDescription[] = _( - "Launches a vacuumed blast.\n" - "High critical-hit ratio."); + "Launches a vacuumed blast.\n" + "High critical-hit ratio."); static const u8 sCottonSporeDescription[] = _( - "Spores cling to the foe,\n" - "sharply reducing SPEED."); + "Spores cling to the foe,\n" + "sharply reducing SPEED."); static const u8 sReversalDescription[] = _( - "Inflicts more damage when\n" - "the user’s HP is down."); + "Inflicts more damage when\n" + "the user’s HP is down."); static const u8 sSpiteDescription[] = _( - "Spitefully cuts the PP\n" - "of the foe’s last move."); + "Spitefully cuts the PP\n" + "of the foe’s last move."); static const u8 sPowderSnowDescription[] = _( - "Blasts the foe with a snowy\n" - "gust. May cause freezing."); + "Blasts the foe with a snowy\n" + "gust. May cause freezing."); static const u8 sProtectDescription[] = _( - "Evades attack, but may fail\n" - "if used in succession."); + "Evades attack, but may fail\n" + "if used in succession."); static const u8 sMachPunchDescription[] = _( - "A punch is thrown at wicked\n" - "speed to strike first."); + "A punch is thrown at wicked\n" + "speed to strike first."); static const u8 sScaryFaceDescription[] = _( - "Frightens with a scary face\n" - "to sharply reduce SPEED."); + "Frightens with a scary face\n" + "to sharply reduce SPEED."); static const u8 sFaintAttackDescription[] = _( - "Draws the foe close, then\n" - "strikes without fail."); + "Draws the foe close, then\n" + "strikes without fail."); static const u8 sSweetKissDescription[] = _( - "Demands a kiss with a cute\n" - "look. May cause confusion."); + "Demands a kiss with a cute\n" + "look. May cause confusion."); static const u8 sBellyDrumDescription[] = _( - "Maximizes ATTACK while\n" - "sacrificing HP."); + "Maximizes ATTACK while\n" + "sacrificing HP."); static const u8 sSludgeBombDescription[] = _( - "Sludge is hurled to inflict\n" - "damage. May also poison."); + "Sludge is hurled to inflict\n" + "damage. May also poison."); static const u8 sMudSlapDescription[] = _( - "Hurls mud in the foe’s face\n" - "to reduce its accuracy."); + "Hurls mud in the foe’s face\n" + "to reduce its accuracy."); static const u8 sOctazookaDescription[] = _( - "Fires a lump of ink to\n" - "damage and cut accuracy."); + "Fires a lump of ink to\n" + "damage and cut accuracy."); static const u8 sSpikesDescription[] = _( - "Sets spikes that hurt a \n" - "foe switching in."); + "Sets spikes that hurt a \n" + "foe switching in."); static const u8 sZapCannonDescription[] = _( - "Powerful and sure to cause\n" - "paralysis, but inaccurate."); + "Powerful and sure to cause\n" + "paralysis, but inaccurate."); static const u8 sForesightDescription[] = _( - "Negates the foe’s efforts\n" - "to heighten evasiveness."); + "Negates the foe’s efforts\n" + "to heighten evasiveness."); static const u8 sDestinyBondDescription[] = _( - "If the user faints, the foe\n" - "is also made to faint."); + "If the user faints, the foe\n" + "is also made to faint."); static const u8 sPerishSongDescription[] = _( - "Any POKéMON hearing this\n" - "song faints in 3 turns."); + "Any POKéMON hearing this\n" + "song faints in 3 turns."); static const u8 sIcyWindDescription[] = _( - "A chilling attack that\n" - "lowers the foe’s SPEED."); + "A chilling attack that\n" + "lowers the foe’s SPEED."); static const u8 sDetectDescription[] = _( - "Evades attack, but may fail\n" - "if used in succession."); + "Evades attack, but may fail\n" + "if used in succession."); static const u8 sBoneRushDescription[] = _( - "Strikes the foe with a bone\n" - "in hand 2 to 5 times."); + "Strikes the foe with a bone\n" + "in hand 2 to 5 times."); static const u8 sLockOnDescription[] = _( - "Locks on to the foe to\n" - "ensure the next move hits."); + "Locks on to the foe to\n" + "ensure the next move hits."); static const u8 sOutrageDescription[] = _( - "A rampage of 2 to 3 turns\n" - "that confuses the user."); + "A rampage of 2 to 3 turns\n" + "that confuses the user."); static const u8 sSandstormDescription[] = _( - "Causes a sandstorm that\n" - "rages for several turns."); + "Causes a sandstorm that\n" + "rages for several turns."); static const u8 sGigaDrainDescription[] = _( - "An attack that steals half\n" - "the damage inflicted."); + "An attack that steals half\n" + "the damage inflicted."); static const u8 sEndureDescription[] = _( - "Endures any attack for\n" - "1 turn, leaving at least 1HP."); + "Endures any attack for\n" + "1 turn, leaving at least 1HP."); static const u8 sCharmDescription[] = _( - "Charms the foe and sharply\n" - "reduces its ATTACK."); + "Charms the foe and sharply\n" + "reduces its ATTACK."); static const u8 sRolloutDescription[] = _( - "An attack lasting 5 turns\n" - "with rising intensity."); + "An attack lasting 5 turns\n" + "with rising intensity."); static const u8 sFalseSwipeDescription[] = _( - "An attack that leaves the\n" - "foe with at least 1 HP."); + "An attack that leaves the\n" + "foe with at least 1 HP."); static const u8 sSwaggerDescription[] = _( - "Confuses the foe, but also\n" - "sharply raises ATTACK."); + "Confuses the foe, but also\n" + "sharply raises ATTACK."); static const u8 sMilkDrinkDescription[] = _( - "Recovers up to half the\n" - "user’s maximum HP."); + "Recovers up to half the\n" + "user’s maximum HP."); static const u8 sSparkDescription[] = _( - "An electrified tackle that\n" - "may paralyze the foe."); + "An electrified tackle that\n" + "may paralyze the foe."); static const u8 sFuryCutterDescription[] = _( - "An attack that intensifies\n" - "on each successive hit."); + "An attack that intensifies\n" + "on each successive hit."); static const u8 sSteelWingDescription[] = _( - "Strikes the foe with hard\n" - "wings spread wide."); + "Strikes the foe with hard\n" + "wings spread wide."); static const u8 sMeanLookDescription[] = _( - "Fixes the foe with a mean\n" - "look that prevents escape."); + "Fixes the foe with a mean\n" + "look that prevents escape."); static const u8 sAttractDescription[] = _( - "Makes the opposite gender\n" - "less likely to attack."); + "Makes the opposite gender\n" + "less likely to attack."); static const u8 sSleepTalkDescription[] = _( - "Uses an available move\n" - "randomly while asleep."); + "Uses an available move\n" + "randomly while asleep."); static const u8 sHealBellDescription[] = _( - "Chimes soothingly to heal\n" - "all status abnormalities."); + "Chimes soothingly to heal\n" + "all status abnormalities."); static const u8 sReturnDescription[] = _( - "An attack that increases\n" - "in power with friendship."); + "An attack that increases\n" + "in power with friendship."); static const u8 sPresentDescription[] = _( - "A gift in the form of a\n" - "bomb. May restore HP."); + "A gift in the form of a\n" + "bomb. May restore HP."); static const u8 sFrustrationDescription[] = _( - "An attack that is stronger\n" - "if the TRAINER is disliked."); + "An attack that is stronger\n" + "if the TRAINER is disliked."); static const u8 sSafeguardDescription[] = _( - "A mystical force prevents\n" - "all status problems."); + "A mystical force prevents\n" + "all status problems."); static const u8 sPainSplitDescription[] = _( - "Adds the user and foe’s HP,\n" - "then shares them equally."); + "Adds the user and foe’s HP,\n" + "then shares them equally."); static const u8 sSacredFireDescription[] = _( - "A mystical fire attack that\n" - "may inflict a burn."); + "A mystical fire attack that\n" + "may inflict a burn."); static const u8 sMagnitudeDescription[] = _( - "A ground-shaking attack\n" - "of random intensity."); + "A ground-shaking attack\n" + "of random intensity."); static const u8 sDynamicPunchDescription[] = _( - "Powerful and sure to cause\n" - "confusion, but inaccurate."); + "Powerful and sure to cause\n" + "confusion, but inaccurate."); static const u8 sMegahornDescription[] = _( - "A brutal ramming attack\n" - "using out-thrust horns."); + "A brutal ramming attack\n" + "using out-thrust horns."); static const u8 sDragonBreathDescription[] = _( - "Strikes the foe with an\n" - "incredible blast of breath."); + "Strikes the foe with an\n" + "incredible blast of breath."); static const u8 sBatonPassDescription[] = _( - "Switches out the user while\n" - "keeping effects in play."); + "Switches out the user while\n" + "keeping effects in play."); static const u8 sEncoreDescription[] = _( - "Makes the foe repeat its\n" - "last move over 2 to 6 turns."); + "Makes the foe repeat its\n" + "last move over 2 to 6 turns."); static const u8 sPursuitDescription[] = _( - "Inflicts bad damage if used\n" - "on a foe switching out."); + "Inflicts bad damage if used\n" + "on a foe switching out."); static const u8 sRapidSpinDescription[] = _( - "Spins the body at high\n" - "speed to strike the foe."); + "Spins the body at high\n" + "speed to strike the foe."); static const u8 sSweetScentDescription[] = _( - "Allures the foe to reduce\n" - "evasiveness."); + "Allures the foe to reduce\n" + "evasiveness."); static const u8 sIronTailDescription[] = _( - "Attacks with a rock-hard\n" - "tail. May lower DEFENSE."); + "Attacks with a rock-hard\n" + "tail. May lower DEFENSE."); static const u8 sMetalClawDescription[] = _( - "A claw attack that may\n" - "raise the user’s ATTACK."); + "A claw attack that may\n" + "raise the user’s ATTACK."); static const u8 sVitalThrowDescription[] = _( - "Makes the user’s move last,\n" - "but it never misses."); + "Makes the user’s move last,\n" + "but it never misses."); static const u8 sMorningSunDescription[] = _( - "Restores HP. The amount\n" - "varies with the weather."); + "Restores HP. The amount\n" + "varies with the weather."); static const u8 sSynthesisDescription[] = _( - "Restores HP. The amount\n" - "varies with the weather."); + "Restores HP. The amount\n" + "varies with the weather."); static const u8 sMoonlightDescription[] = _( - "Restores HP. The amount\n" - "varies with the weather."); + "Restores HP. The amount\n" + "varies with the weather."); static const u8 sHiddenPowerDescription[] = _( - "The effectiveness varies\n" - "with the user."); + "The effectiveness varies\n" + "with the user."); static const u8 sCrossChopDescription[] = _( - "A double-chopping attack.\n" - "High critical-hit ratio."); + "A double-chopping attack.\n" + "High critical-hit ratio."); static const u8 sTwisterDescription[] = _( - "Whips up a vicious twister\n" - "to tear at the foe."); + "Whips up a vicious twister\n" + "to tear at the foe."); static const u8 sRainDanceDescription[] = _( - "Boosts the power of WATER-\n" - "type moves for 5 turns."); + "Boosts the power of WATER-\n" + "type moves for 5 turns."); static const u8 sSunnyDayDescription[] = _( - "Boosts the power of FIRE-\n" - "type moves for 5 turns."); + "Boosts the power of FIRE-\n" + "type moves for 5 turns."); static const u8 sCrunchDescription[] = _( - "Crunches with sharp fangs.\n" - "May lower SP. DEF."); + "Crunches with sharp fangs.\n" + "May lower SP. DEF."); static const u8 sMirrorCoatDescription[] = _( - "Counters the foe’s special\n" - "attack at double the power."); + "Counters the foe’s special\n" + "attack at double the power."); static const u8 sPsychUpDescription[] = _( - "Copies the foe’s effect(s)\n" - "and gives to the user."); + "Copies the foe’s effect(s)\n" + "and gives to the user."); static const u8 sExtremeSpeedDescription[] = _( - "An extremely fast and\n" - "powerful attack."); + "An extremely fast and\n" + "powerful attack."); static const u8 sAncientPowerDescription[] = _( - "An attack that may raise\n" - "all stats."); + "An attack that may raise\n" + "all stats."); static const u8 sShadowBallDescription[] = _( - "Hurls a black blob that may\n" - "lower the foe’s SP. DEF."); + "Hurls a black blob that may\n" + "lower the foe’s SP. DEF."); static const u8 sFutureSightDescription[] = _( - "Heightens inner power to\n" - "strike 2 turns later."); + "Heightens inner power to\n" + "strike 2 turns later."); static const u8 sRockSmashDescription[] = _( - "A rock-crushing attack\n" - "that may lower DEFENSE."); + "A rock-crushing attack\n" + "that may lower DEFENSE."); static const u8 sWhirlpoolDescription[] = _( - "Traps and hurts the foe in\n" - "a whirlpool for 2 to 5 turns."); + "Traps and hurts the foe in\n" + "a whirlpool for 2 to 5 turns."); static const u8 sBeatUpDescription[] = _( - "Summons party POKéMON to\n" - "join in the attack."); + "Summons party POKéMON to\n" + "join in the attack."); static const u8 sFakeOutDescription[] = _( - "A 1st-turn, 1st-strike move\n" - "that causes flinching."); + "A 1st-turn, 1st-strike move\n" + "that causes flinching."); static const u8 sUproarDescription[] = _( - "Causes an uproar for 2 to 5\n" - "turns and prevents sleep."); + "Causes an uproar for 2 to 5\n" + "turns and prevents sleep."); static const u8 sStockpileDescription[] = _( - "Charges up power for up to\n" - "3 turns."); + "Charges up power for up to\n" + "3 turns."); static const u8 sSpitUpDescription[] = _( - "Releases stockpiled power\n" - "(the more the better)."); + "Releases stockpiled power\n" + "(the more the better)."); static const u8 sSwallowDescription[] = _( - "Absorbs stockpiled power\n" - "and restores HP."); + "Absorbs stockpiled power\n" + "and restores HP."); static const u8 sHeatWaveDescription[] = _( - "Exhales a hot breath on the\n" - "foe. May inflict a burn."); + "Exhales a hot breath on the\n" + "foe. May inflict a burn."); static const u8 sHailDescription[] = _( - "Summons a hailstorm that\n" - "strikes every turn."); + "Summons a hailstorm that\n" + "strikes every turn."); static const u8 sTormentDescription[] = _( - "Torments the foe and stops\n" - "successive use of a move."); + "Torments the foe and stops\n" + "successive use of a move."); static const u8 sFlatterDescription[] = _( - "Confuses the foe, but\n" - "raises its SP. ATK."); + "Confuses the foe, but\n" + "raises its SP. ATK."); static const u8 sWillOWispDescription[] = _( - "Inflicts a burn on the foe\n" - "with intense fire."); + "Inflicts a burn on the foe\n" + "with intense fire."); static const u8 sMementoDescription[] = _( - "The user faints and lowers\n" - "the foe’s abilities."); + "The user faints and lowers\n" + "the foe’s abilities."); static const u8 sFacadeDescription[] = _( - "Boosts ATTACK when burned,\n" - "paralyzed, or poisoned."); + "Boosts ATTACK when burned,\n" + "paralyzed, or poisoned."); static const u8 sFocusPunchDescription[] = _( - "A powerful loyalty attack.\n" - "The user flinches if hit."); + "A powerful loyalty attack.\n" + "The user flinches if hit."); static const u8 sSmellingSaltDescription[] = _( - "Powerful against paralyzed\n" - "foes, but also heals them."); + "Powerful against paralyzed\n" + "foes, but also heals them."); static const u8 sFollowMeDescription[] = _( - "Draws attention to make\n" - "foes attack only the user."); + "Draws attention to make\n" + "foes attack only the user."); static const u8 sNaturePowerDescription[] = _( - "The type of attack varies\n" - "depending on the location."); + "The type of attack varies\n" + "depending on the location."); static const u8 sChargeDescription[] = _( - "Charges power to boost the\n" - "electric move used next."); + "Charges power to boost the\n" + "electric move used next."); static const u8 sTauntDescription[] = _( - "Taunts the foe into only\n" - "using attack moves."); + "Taunts the foe into only\n" + "using attack moves."); static const u8 sHelpingHandDescription[] = _( - "Boosts the power of the\n" - "recipient’s moves."); + "Boosts the power of the\n" + "recipient’s moves."); static const u8 sTrickDescription[] = _( - "Tricks the foe into trading\n" - "held items."); + "Tricks the foe into trading\n" + "held items."); static const u8 sRolePlayDescription[] = _( - "Mimics the target and\n" - "copies its special ability."); + "Mimics the target and\n" + "copies its special ability."); static const u8 sWishDescription[] = _( - "A wish that restores HP.\n" - "It takes time to work."); + "A wish that restores HP.\n" + "It takes time to work."); static const u8 sAssistDescription[] = _( - "Attacks randomly with one\n" - "of the partner’s moves."); + "Attacks randomly with one\n" + "of the partner’s moves."); static const u8 sIngrainDescription[] = _( - "Lays roots that restore HP.\n" - "The user can’t switch out."); + "Lays roots that restore HP.\n" + "The user can’t switch out."); static const u8 sSuperpowerDescription[] = _( - "Boosts strength sharply,\n" - "but lowers abilities."); + "Boosts strength sharply,\n" + "but lowers abilities."); static const u8 sMagicCoatDescription[] = _( - "Reflects special effects\n" - "back to the attacker."); + "Reflects special effects\n" + "back to the attacker."); static const u8 sRecycleDescription[] = _( - "Recycles a used item for\n" - "one more use."); + "Recycles a used item for\n" + "one more use."); static const u8 sRevengeDescription[] = _( - "An attack that gains power\n" - "if injured by the foe."); + "An attack that gains power\n" + "if injured by the foe."); static const u8 sBrickBreakDescription[] = _( - "Destroys barriers such as\n" - "REFLECT and causes damage."); + "Destroys barriers such as\n" + "REFLECT and causes damage."); static const u8 sYawnDescription[] = _( - "Lulls the foe into yawning,\n" - "then sleeping next turn."); + "Lulls the foe into yawning,\n" + "then sleeping next turn."); static const u8 sKnockOffDescription[] = _( - "Knocks down the foe’s held\n" - "item to prevent its use."); + "Knocks down the foe’s held\n" + "item to prevent its use."); static const u8 sEndeavorDescription[] = _( - "Gains power if the user’s HP\n" - "is lower than the foe’s HP."); + "Gains power if the user’s HP\n" + "is lower than the foe’s HP."); static const u8 sEruptionDescription[] = _( - "The higher the user’s HP,\n" - "the more damage caused."); + "The higher the user’s HP,\n" + "the more damage caused."); static const u8 sSkillSwapDescription[] = _( - "The user swaps special\n" - "abilities with the target."); + "The user swaps special\n" + "abilities with the target."); static const u8 sImprisonDescription[] = _( - "Prevents foes from using\n" - "moves known by the user."); + "Prevents foes from using\n" + "moves known by the user."); static const u8 sRefreshDescription[] = _( - "Heals poisoning, paralysis,\n" - "or a burn."); + "Heals poisoning, paralysis,\n" + "or a burn."); static const u8 sGrudgeDescription[] = _( - "If the user faints, deletes\n" - "all PP of foe’s last move."); + "If the user faints, deletes\n" + "all PP of foe’s last move."); static const u8 sSnatchDescription[] = _( - "Steals the effects of the\n" - "move the target uses next."); + "Steals the effects of the\n" + "move the target uses next."); static const u8 sSecretPowerDescription[] = _( - "An attack with effects\n" - "that vary by location."); + "An attack with effects\n" + "that vary by location."); static const u8 sDiveDescription[] = _( - "Dives underwater the first\n" - "turn and strikes next turn."); + "Dives underwater the first\n" + "turn and strikes next turn."); static const u8 sArmThrustDescription[] = _( - "Straight-arm punches that\n" - "strike the foe 2 to 5 times."); + "Straight-arm punches that\n" + "strike the foe 2 to 5 times."); static const u8 sCamouflageDescription[] = _( - "Alters the POKéMON’s type\n" - "depending on the location."); + "Alters the POKéMON’s type\n" + "depending on the location."); static const u8 sTailGlowDescription[] = _( - "Flashes a light that sharply\n" - "raises SP. ATK."); + "Flashes a light that sharply\n" + "raises SP. ATK."); static const u8 sLusterPurgeDescription[] = _( - "Attacks with a burst of\n" - "light. May lower SP. DEF."); + "Attacks with a burst of\n" + "light. May lower SP. DEF."); static const u8 sMistBallDescription[] = _( - "Attacks with a flurry of\n" - "down. May lower SP. ATK."); + "Attacks with a flurry of\n" + "down. May lower SP. ATK."); static const u8 sFeatherDanceDescription[] = _( - "Envelops the foe with down\n" - "to sharply reduce ATTACK."); + "Envelops the foe with down\n" + "to sharply reduce ATTACK."); static const u8 sTeeterDanceDescription[] = _( - "Confuses all POKéMON on\n" - "the scene."); + "Confuses all POKéMON on\n" + "the scene."); static const u8 sBlazeKickDescription[] = _( - "A kick with a high critical-\n" - "hit ratio. May cause a burn."); + "A kick with a high critical-\n" + "hit ratio. May cause a burn."); static const u8 sMudSportDescription[] = _( - "Covers the user in mud to\n" - "raise electrical resistance."); + "Covers the user in mud to\n" + "raise electrical resistance."); static const u8 sIceBallDescription[] = _( - "A 5-turn attack that gains\n" - "power on successive hits."); + "A 5-turn attack that gains\n" + "power on successive hits."); static const u8 sNeedleArmDescription[] = _( - "Attacks with thorny arms.\n" - "May cause flinching."); + "Attacks with thorny arms.\n" + "May cause flinching."); static const u8 sSlackOffDescription[] = _( - "Slacks off and restores\n" - "half the maximum HP."); + "Slacks off and restores\n" + "half the maximum HP."); static const u8 sHyperVoiceDescription[] = _( - "A loud attack that uses\n" - "sound waves to injure."); + "A loud attack that uses\n" + "sound waves to injure."); static const u8 sPoisonFangDescription[] = _( - "A sharp-fanged attack.\n" - "May badly poison the foe."); + "A sharp-fanged attack.\n" + "May badly poison the foe."); static const u8 sCrushClawDescription[] = _( - "Tears at the foe with sharp\n" - "claws. May lower DEFENSE."); + "Tears at the foe with sharp\n" + "claws. May lower DEFENSE."); static const u8 sBlastBurnDescription[] = _( - "Powerful, but leaves the\n" - "user immobile the next turn."); + "Powerful, but leaves the\n" + "user immobile the next turn."); static const u8 sHydroCannonDescription[] = _( - "Powerful, but leaves the\n" - "user immobile the next turn."); + "Powerful, but leaves the\n" + "user immobile the next turn."); static const u8 sMeteorMashDescription[] = _( - "Fires a meteor-like punch.\n" - "May raise ATTACK."); + "Fires a meteor-like punch.\n" + "May raise ATTACK."); static const u8 sAstonishDescription[] = _( - "An attack that may shock\n" - "the foe into flinching."); + "An attack that may shock\n" + "the foe into flinching."); static const u8 sWeatherBallDescription[] = _( - "The move’s type and power\n" - "change with the weather."); + "The move’s type and power\n" + "change with the weather."); static const u8 sAromatherapyDescription[] = _( - "Heals all status problems\n" - "with a soothing scent."); + "Heals all status problems\n" + "with a soothing scent."); static const u8 sFakeTearsDescription[] = _( - "Feigns crying to sharply\n" - "lower the foe’s SP. DEF."); + "Feigns crying to sharply\n" + "lower the foe’s SP. DEF."); static const u8 sAirCutterDescription[] = _( - "Hacks with razorlike wind.\n" - "High critical-hit ratio."); + "Hacks with razorlike wind.\n" + "High critical-hit ratio."); static const u8 sOverheatDescription[] = _( - "Allows a full-power attack,\n" - "but sharply lowers SP. ATK."); + "Allows a full-power attack,\n" + "but sharply lowers SP. ATK."); static const u8 sOdorSleuthDescription[] = _( - "Negates the foe’s efforts\n" - "to heighten evasiveness."); + "Negates the foe’s efforts\n" + "to heighten evasiveness."); static const u8 sRockTombDescription[] = _( - "Stops the foe from moving\n" - "with rocks and cuts SPEED."); + "Stops the foe from moving\n" + "with rocks and cuts SPEED."); static const u8 sSilverWindDescription[] = _( - "A powdery attack that may\n" - "raise abilities."); + "A powdery attack that may\n" + "raise abilities."); static const u8 sMetalSoundDescription[] = _( - "Emits a horrible screech\n" - "that sharply lowers SP. DEF."); + "Emits a horrible screech\n" + "that sharply lowers SP. DEF."); static const u8 sGrassWhistleDescription[] = _( - "Lulls the foe into sleep\n" - "with a pleasant melody."); + "Lulls the foe into sleep\n" + "with a pleasant melody."); static const u8 sTickleDescription[] = _( - "Makes the foe laugh to\n" - "lower ATTACK and DEFENSE."); + "Makes the foe laugh to\n" + "lower ATTACK and DEFENSE."); static const u8 sCosmicPowerDescription[] = _( - "Raises DEFENSE and SP. DEF\n" - "with a mystic power."); + "Raises DEFENSE and SP. DEF\n" + "with a mystic power."); static const u8 sWaterSpoutDescription[] = _( - "Inflicts more damage if the\n" - "user’s HP is high."); + "Inflicts more damage if the\n" + "user’s HP is high."); static const u8 sSignalBeamDescription[] = _( - "A strange beam attack that\n" - "may confuse the foe."); + "A strange beam attack that\n" + "may confuse the foe."); static const u8 sShadowPunchDescription[] = _( - "An unavoidable punch that\n" - "is thrown from shadows."); + "An unavoidable punch that\n" + "is thrown from shadows."); static const u8 sExtrasensoryDescription[] = _( - "Attacks with a peculiar\n" - "power. May cause flinching."); + "Attacks with a peculiar\n" + "power. May cause flinching."); static const u8 sSkyUppercutDescription[] = _( - "An uppercut thrown as if\n" - "leaping into the sky."); + "An uppercut thrown as if\n" + "leaping into the sky."); static const u8 sSandTombDescription[] = _( - "Traps and hurts the foe in\n" - "quicksand for 2 to 5 turns."); + "Traps and hurts the foe in\n" + "quicksand for 2 to 5 turns."); static const u8 sSheerColdDescription[] = _( - "A chilling attack that\n" - "causes fainting if it hits."); + "A chilling attack that\n" + "causes fainting if it hits."); static const u8 sMuddyWaterDescription[] = _( - "Attacks with muddy water.\n" - "May lower accuracy."); + "Attacks with muddy water.\n" + "May lower accuracy."); static const u8 sBulletSeedDescription[] = _( - "Shoots 2 to 5 seeds in a row\n" - "to strike the foe."); + "Shoots 2 to 5 seeds in a row\n" + "to strike the foe."); static const u8 sAerialAceDescription[] = _( - "An extremely speedy and\n" - "unavoidable attack."); + "An extremely speedy and\n" + "unavoidable attack."); static const u8 sIcicleSpearDescription[] = _( - "Attacks the foe by firing\n" - "2 to 5 icicles in a row."); + "Attacks the foe by firing\n" + "2 to 5 icicles in a row."); static const u8 sIronDefenseDescription[] = _( - "Hardens the body’s surface\n" - "to sharply raise DEFENSE."); + "Hardens the body’s surface\n" + "to sharply raise DEFENSE."); static const u8 sBlockDescription[] = _( - "Blocks the foe’s way to\n" - "prevent escape."); + "Blocks the foe’s way to\n" + "prevent escape."); static const u8 sHowlDescription[] = _( - "Howls to raise the spirit\n" - "and boosts ATTACK."); + "Howls to raise the spirit\n" + "and boosts ATTACK."); static const u8 sDragonClawDescription[] = _( - "Slashes the foe with sharp\n" - "claws."); + "Slashes the foe with sharp\n" + "claws."); static const u8 sFrenzyPlantDescription[] = _( - "Powerful, but leaves the\n" - "user immobile the next turn."); + "Powerful, but leaves the\n" + "user immobile the next turn."); static const u8 sBulkUpDescription[] = _( - "Bulks up the body to boost\n" - "both ATTACK and DEFENSE."); + "Bulks up the body to boost\n" + "both ATTACK and DEFENSE."); static const u8 sBounceDescription[] = _( - "Bounces up, then down the\n" - "next turn. May paralyze."); + "Bounces up, then down the\n" + "next turn. May paralyze."); static const u8 sMudShotDescription[] = _( - "Hurls mud at the foe and\n" - "reduces SPEED."); + "Hurls mud at the foe and\n" + "reduces SPEED."); static const u8 sPoisonTailDescription[] = _( - "Has a high critical-hit\n" - "ratio. May also poison."); + "Has a high critical-hit\n" + "ratio. May also poison."); static const u8 sCovetDescription[] = _( - "Cutely begs to obtain an\n" - "item held by the foe."); + "Cutely begs to obtain an\n" + "item held by the foe."); static const u8 sVoltTackleDescription[] = _( - "A life-risking tackle that\n" - "slightly hurts the user."); + "A life-risking tackle that\n" + "slightly hurts the user."); static const u8 sMagicalLeafDescription[] = _( - "Attacks with a strange leaf\n" - "that cannot be evaded."); + "Attacks with a strange leaf\n" + "that cannot be evaded."); static const u8 sWaterSportDescription[] = _( - "The user becomes soaked to\n" - "raise resistance to fire."); + "The user becomes soaked to\n" + "raise resistance to fire."); static const u8 sCalmMindDescription[] = _( - "Raises SP. ATK and SP. DEF\n" - "by focusing the mind."); + "Raises SP. ATK and SP. DEF\n" + "by focusing the mind."); static const u8 sLeafBladeDescription[] = _( - "Slashes with a sharp leaf.\n" - "High critical-hit ratio."); + "Slashes with a sharp leaf.\n" + "High critical-hit ratio."); static const u8 sDragonDanceDescription[] = _( - "A mystical dance that ups\n" - "ATTACK and SPEED."); + "A mystical dance that ups\n" + "ATTACK and SPEED."); static const u8 sRockBlastDescription[] = _( - "Hurls boulders at the foe\n" - "2 to 5 times in a row."); + "Hurls boulders at the foe\n" + "2 to 5 times in a row."); static const u8 sShockWaveDescription[] = _( - "A fast and unavoidable\n" - "electric attack."); + "A fast and unavoidable\n" + "electric attack."); static const u8 sWaterPulseDescription[] = _( - "Attacks with ultrasonic\n" - "waves. May confuse the foe."); + "Attacks with ultrasonic\n" + "waves. May confuse the foe."); static const u8 sDoomDesireDescription[] = _( - "Summons strong sunlight to\n" - "attack 2 turns later."); + "Summons strong sunlight to\n" + "attack 2 turns later."); static const u8 sPsychoBoostDescription[] = _( - "Allows a full-power attack,\n" - "but sharply lowers SP. ATK."); + "Allows a full-power attack,\n" + "but sharply lowers SP. ATK."); // MOVE_NONE is ignored in this table. Make sure to always subtract 1 before getting the right pointer. const u8 *const gMoveDescriptionPointers[MOVES_COUNT - 1] = diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index 20a6ec75d..b4438e5b3 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -1,12436 +1,12436 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer1[] = { - { - .iv = 0, - .lvl = 21, - .species = SPECIES_GEODUDE, - } + { + .iv = 0, + .lvl = 21, + .species = SPECIES_GEODUDE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt1[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt2[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_ZUBAT, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt3[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt4[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt5[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt6[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt7[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle1[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_SKITTY, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_LOTAD, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_SEEDOT, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_TAILLOW, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_SKITTY, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_LOTAD, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_SEEDOT, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_TAILLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt8[] = { - { - .iv = 0, - .lvl = 9, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 9, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marcel[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_SHIFTRY, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_SHIFTRY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alberto[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_PELIPPER, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_XATU, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_PELIPPER, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_XATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ed[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_ZANGOOSE, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_SEVIPER, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_ZANGOOSE, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_SEVIPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt9[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Declan[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_GYARADOS, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt10[] = { - { - .iv = 0, - .lvl = 11, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 11, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt11[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_ZUBAT, - }, - { - .iv = 0, - .lvl = 27, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt12[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 0, - .lvl = 27, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt13[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_ZUBAT, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt14[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt15[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ZUBAT, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt16[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt17[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt18[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt19[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt20[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt21[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt22[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fredrick[] = { - { - .iv = 100, - .lvl = 30, - .species = SPECIES_MAKUHITA, - }, - { - .iv = 100, - .lvl = 30, - .species = SPECIES_MACHOKE, - } + { + .iv = 100, + .lvl = 30, + .species = SPECIES_MAKUHITA, + }, + { + .iv = 100, + .lvl = 30, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matt[] = { - { - .iv = 50, - .lvl = 34, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 50, - .lvl = 34, - .species = SPECIES_GOLBAT, - } + { + .iv = 50, + .lvl = 34, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 50, + .lvl = 34, + .species = SPECIES_GOLBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Zander[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_HARIYAMA, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly1[] = { - { - .iv = 50, - .lvl = 28, - .species = SPECIES_CARVANHA, - }, - { - .iv = 50, - .lvl = 28, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 50, + .lvl = 28, + .species = SPECIES_CARVANHA, + }, + { + .iv = 50, + .lvl = 28, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly2[] = { - { - .iv = 100, - .lvl = 37, - .species = SPECIES_SHARPEDO, - }, - { - .iv = 100, - .lvl = 37, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 100, + .lvl = 37, + .species = SPECIES_SHARPEDO, + }, + { + .iv = 100, + .lvl = 37, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie[] = { - { - .iv = 150, - .lvl = 41, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 150, - .lvl = 41, - .species = SPECIES_CROBAT, - }, - { - .iv = 150, - .lvl = 43, - .species = SPECIES_SHARPEDO, - } + { + .iv = 150, + .lvl = 41, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 150, + .lvl = 41, + .species = SPECIES_CROBAT, + }, + { + .iv = 150, + .lvl = 43, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leah[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_SPOINK, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_SPOINK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisy[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ROSELIA, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose1[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ROSELIA, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ROSELIA, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ROSELIA, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Felix[] = { - { - .iv = 0, - .lvl = 43, - .species = SPECIES_MEDICHAM, - .moves = MOVE_PSYCHIC, MOVE_NONE, MOVE_NONE, MOVE_NONE - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_CLAYDOL, - .moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 43, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_NONE, MOVE_NONE, MOVE_NONE + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_CLAYDOL, + .moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Violet[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_ROSELIA, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_GLOOM, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_ROSELIA, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GLOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose2[] = { - { - .iv = 10, - .lvl = 26, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 10, - .lvl = 26, - .species = SPECIES_ROSELIA, - } + { + .iv = 10, + .lvl = 26, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose3[] = { - { - .iv = 20, - .lvl = 28, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_GLOOM, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_ROSELIA, - } + { + .iv = 20, + .lvl = 28, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_GLOOM, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose4[] = { - { - .iv = 30, - .lvl = 31, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_GLOOM, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_ROSELIA, - } + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_GLOOM, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose5[] = { - { - .iv = 40, - .lvl = 34, - .species = SPECIES_BRELOOM, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_GLOOM, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_ROSELIA, - } + { + .iv = 40, + .lvl = 34, + .species = SPECIES_BRELOOM, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_GLOOM, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty1[] = { - { - .iv = 50, - .lvl = 23, - .species = SPECIES_SANDSLASH, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - } + { + .iv = 50, + .lvl = 23, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Chip[] = { - { - .iv = 50, - .lvl = 27, - .species = SPECIES_BALTOY, - .moves = MOVE_PSYBEAM, MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_ANCIENT_POWER - }, - { - .iv = 50, - .lvl = 27, - .species = SPECIES_SANDSHREW, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - }, - { - .iv = 50, - .lvl = 27, - .species = SPECIES_SANDSLASH, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - } + { + .iv = 50, + .lvl = 27, + .species = SPECIES_BALTOY, + .moves = MOVE_PSYBEAM, MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_ANCIENT_POWER + }, + { + .iv = 50, + .lvl = 27, + .species = SPECIES_SANDSHREW, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + }, + { + .iv = 50, + .lvl = 27, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Foster[] = { - { - .iv = 100, - .lvl = 25, - .species = SPECIES_SANDSHREW, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - }, - { - .iv = 100, - .lvl = 25, - .species = SPECIES_SANDSLASH, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - } + { + .iv = 100, + .lvl = 25, + .species = SPECIES_SANDSHREW, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + }, + { + .iv = 100, + .lvl = 25, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty2[] = { - { - .iv = 60, - .lvl = 27, - .species = SPECIES_SANDSLASH, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - } + { + .iv = 60, + .lvl = 27, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty3[] = { - { - .iv = 70, - .lvl = 30, - .species = SPECIES_SANDSLASH, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - } + { + .iv = 70, + .lvl = 30, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty4[] = { - { - .iv = 80, - .lvl = 33, - .species = SPECIES_SANDSLASH, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - } + { + .iv = 80, + .lvl = 33, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty5[] = { - { - .iv = 90, - .lvl = 36, - .species = SPECIES_SANDSLASH, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - } + { + .iv = 90, + .lvl = 36, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy1[] = { - { - .iv = 50, - .lvl = 17, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 50, - .lvl = 17, - .species = SPECIES_WHISMUR, - } + { + .iv = 50, + .lvl = 17, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 50, + .lvl = 17, + .species = SPECIES_WHISMUR, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy2[] = { - { - .iv = 100, - .lvl = 27, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 100, - .lvl = 27, - .species = SPECIES_LOUDRED, - } + { + .iv = 100, + .lvl = 27, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy3[] = { - { - .iv = 150, - .lvl = 30, - .species = SPECIES_MAGNETON, - }, - { - .iv = 150, - .lvl = 30, - .species = SPECIES_LOUDRED, - } + { + .iv = 150, + .lvl = 30, + .species = SPECIES_MAGNETON, + }, + { + .iv = 150, + .lvl = 30, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy4[] = { - { - .iv = 200, - .lvl = 33, - .species = SPECIES_MAGNETON, - }, - { - .iv = 200, - .lvl = 33, - .species = SPECIES_LOUDRED, - } + { + .iv = 200, + .lvl = 33, + .species = SPECIES_MAGNETON, + }, + { + .iv = 200, + .lvl = 33, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy5[] = { - { - .iv = 250, - .lvl = 36, - .species = SPECIES_MAGNETON, - }, - { - .iv = 250, - .lvl = 36, - .species = SPECIES_LOUDRED, - } + { + .iv = 250, + .lvl = 36, + .species = SPECIES_MAGNETON, + }, + { + .iv = 250, + .lvl = 36, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_GabbyAndTy6[] = { - { - .iv = 250, - .lvl = 39, - .species = SPECIES_MAGNETON, - .moves = MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND, MOVE_THUNDERBOLT - }, - { - .iv = 250, - .lvl = 39, - .species = SPECIES_EXPLOUD, - .moves = MOVE_ASTONISH, MOVE_STOMP, MOVE_SUPERSONIC, MOVE_HYPER_VOICE - } + { + .iv = 250, + .lvl = 39, + .species = SPECIES_MAGNETON, + .moves = MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND, MOVE_THUNDERBOLT + }, + { + .iv = 250, + .lvl = 39, + .species = SPECIES_EXPLOUD, + .moves = MOVE_ASTONISH, MOVE_STOMP, MOVE_SUPERSONIC, MOVE_HYPER_VOICE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola1[] = { - { - .iv = 10, - .lvl = 12, - .species = SPECIES_AZURILL, - }, - { - .iv = 10, - .lvl = 12, - .species = SPECIES_AZURILL, - } + { + .iv = 10, + .lvl = 12, + .species = SPECIES_AZURILL, + }, + { + .iv = 10, + .lvl = 12, + .species = SPECIES_AZURILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Austina[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gwen[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola2[] = { - { - .iv = 10, - .lvl = 26, - .species = SPECIES_MARILL, - }, - { - .iv = 10, - .lvl = 26, - .species = SPECIES_MARILL, - } + { + .iv = 10, + .lvl = 26, + .species = SPECIES_MARILL, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_MARILL, - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_MARILL, - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_MARILL, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola4[] = { - { - .iv = 30, - .lvl = 32, - .species = SPECIES_MARILL, - }, - { - .iv = 30, - .lvl = 32, - .species = SPECIES_MARILL, - } + { + .iv = 30, + .lvl = 32, + .species = SPECIES_MARILL, + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola5[] = { - { - .iv = 40, - .lvl = 35, - .species = SPECIES_AZUMARILL, - }, - { - .iv = 40, - .lvl = 35, - .species = SPECIES_AZUMARILL, - } + { + .iv = 40, + .lvl = 35, + .species = SPECIES_AZUMARILL, + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_AZUMARILL, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky1[] = { - { - .iv = 10, - .lvl = 13, - .species = SPECIES_ZIGZAGOON, - .moves = MOVE_SAND_ATTACK, MOVE_HEADBUTT, MOVE_TAIL_WHIP, MOVE_SURF - } + { + .iv = 10, + .lvl = 13, + .species = SPECIES_ZIGZAGOON, + .moves = MOVE_SAND_ATTACK, MOVE_HEADBUTT, MOVE_TAIL_WHIP, MOVE_SURF + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Simon[] = { - { - .iv = 0, - .lvl = 12, - .species = SPECIES_AZURILL, - }, - { - .iv = 0, - .lvl = 12, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 12, + .species = SPECIES_AZURILL, + }, + { + .iv = 0, + .lvl = 12, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlie[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky2[] = { - { - .iv = 10, - .lvl = 27, - .species = SPECIES_LINOONE, - .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF - } + { + .iv = 10, + .lvl = 27, + .species = SPECIES_LINOONE, + .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky3[] = { - { - .iv = 20, - .lvl = 30, - .species = SPECIES_LINOONE, - .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF - } + { + .iv = 20, + .lvl = 30, + .species = SPECIES_LINOONE, + .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky4[] = { - { - .iv = 30, - .lvl = 33, - .species = SPECIES_LINOONE, - .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF - } + { + .iv = 30, + .lvl = 33, + .species = SPECIES_LINOONE, + .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky5[] = { - { - .iv = 40, - .lvl = 36, - .species = SPECIES_LINOONE, - .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF - } + { + .iv = 40, + .lvl = 36, + .species = SPECIES_LINOONE, + .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Randall[] = { - { - .iv = 255, - .lvl = 26, - .species = SPECIES_SWELLOW, - .heldItem = ITEM_NONE, - .moves = MOVE_QUICK_ATTACK, MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_NONE - } + { + .iv = 255, + .lvl = 26, + .species = SPECIES_SWELLOW, + .heldItem = ITEM_NONE, + .moves = MOVE_QUICK_ATTACK, MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_NONE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Parker[] = { - { - .iv = 255, - .lvl = 26, - .species = SPECIES_SPINDA, - .heldItem = ITEM_NONE, - .moves = MOVE_TEETER_DANCE, MOVE_DIZZY_PUNCH, MOVE_FOCUS_PUNCH, MOVE_NONE - } + { + .iv = 255, + .lvl = 26, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_DIZZY_PUNCH, MOVE_FOCUS_PUNCH, MOVE_NONE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_George[] = { - { - .iv = 255, - .lvl = 26, - .species = SPECIES_SLAKOTH, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SLACK_OFF, MOVE_COUNTER, MOVE_SHADOW_BALL, MOVE_NONE - } + { + .iv = 255, + .lvl = 26, + .species = SPECIES_SLAKOTH, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SLACK_OFF, MOVE_COUNTER, MOVE_SHADOW_BALL, MOVE_NONE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Berke[] = { - { - .iv = 255, - .lvl = 26, - .species = SPECIES_VIGOROTH, - .heldItem = ITEM_NONE, - .moves = MOVE_FOCUS_ENERGY, MOVE_SLASH, MOVE_NONE, MOVE_NONE - } + { + .iv = 255, + .lvl = 26, + .species = SPECIES_VIGOROTH, + .heldItem = ITEM_NONE, + .moves = MOVE_FOCUS_ENERGY, MOVE_SLASH, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Braxton[] = { - { - .iv = 100, - .lvl = 28, - .species = SPECIES_SWELLOW, - .moves = MOVE_FOCUS_ENERGY, MOVE_QUICK_ATTACK, MOVE_WING_ATTACK, MOVE_ENDEAVOR - }, - { - .iv = 100, - .lvl = 28, - .species = SPECIES_TRAPINCH, - .moves = MOVE_BITE, MOVE_DIG, MOVE_FAINT_ATTACK, MOVE_SAND_TOMB - }, - { - .iv = 100, - .lvl = 28, - .species = SPECIES_WAILMER, - .moves = MOVE_ROLLOUT, MOVE_WHIRLPOOL, MOVE_ASTONISH, MOVE_WATER_PULSE - }, - { - .iv = 100, - .lvl = 28, - .species = SPECIES_MAGNETON, - .moves = MOVE_THUNDERBOLT, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM - }, - { - .iv = 100, - .lvl = 28, - .species = SPECIES_SHIFTRY, - .moves = MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SWAGGER - } + { + .iv = 100, + .lvl = 28, + .species = SPECIES_SWELLOW, + .moves = MOVE_FOCUS_ENERGY, MOVE_QUICK_ATTACK, MOVE_WING_ATTACK, MOVE_ENDEAVOR + }, + { + .iv = 100, + .lvl = 28, + .species = SPECIES_TRAPINCH, + .moves = MOVE_BITE, MOVE_DIG, MOVE_FAINT_ATTACK, MOVE_SAND_TOMB + }, + { + .iv = 100, + .lvl = 28, + .species = SPECIES_WAILMER, + .moves = MOVE_ROLLOUT, MOVE_WHIRLPOOL, MOVE_ASTONISH, MOVE_WATER_PULSE + }, + { + .iv = 100, + .lvl = 28, + .species = SPECIES_MAGNETON, + .moves = MOVE_THUNDERBOLT, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM + }, + { + .iv = 100, + .lvl = 28, + .species = SPECIES_SHIFTRY, + .moves = MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SWAGGER + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vincent[] = { - { - .iv = 100, - .lvl = 44, - .species = SPECIES_SABLEYE, - }, - { - .iv = 100, - .lvl = 44, - .species = SPECIES_MEDICHAM, - }, - { - .iv = 100, - .lvl = 44, - .species = SPECIES_SHARPEDO, - } + { + .iv = 100, + .lvl = 44, + .species = SPECIES_SABLEYE, + }, + { + .iv = 100, + .lvl = 44, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 100, + .lvl = 44, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leroy[] = { - { - .iv = 100, - .lvl = 46, - .species = SPECIES_MAWILE, - }, - { - .iv = 100, - .lvl = 46, - .species = SPECIES_STARMIE, - } + { + .iv = 100, + .lvl = 46, + .species = SPECIES_MAWILE, + }, + { + .iv = 100, + .lvl = 46, + .species = SPECIES_STARMIE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton1[] = { - { - .iv = 100, - .lvl = 17, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_WAILMER, - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_MAKUHITA, - } + { + .iv = 100, + .lvl = 17, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_WAILMER, + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edgar[] = { - { - .iv = 100, - .lvl = 43, - .species = SPECIES_CACTURNE, - }, - { - .iv = 100, - .lvl = 43, - .species = SPECIES_PELIPPER, - } + { + .iv = 100, + .lvl = 43, + .species = SPECIES_CACTURNE, + }, + { + .iv = 100, + .lvl = 43, + .species = SPECIES_PELIPPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Albert[] = { - { - .iv = 100, - .lvl = 43, - .species = SPECIES_MAGNETON, - }, - { - .iv = 100, - .lvl = 43, - .species = SPECIES_MUK, - } + { + .iv = 100, + .lvl = 43, + .species = SPECIES_MAGNETON, + }, + { + .iv = 100, + .lvl = 43, + .species = SPECIES_MUK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samuel[] = { - { - .iv = 100, - .lvl = 42, - .species = SPECIES_SWELLOW, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_MAWILE, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_KADABRA, - } + { + .iv = 100, + .lvl = 42, + .species = SPECIES_SWELLOW, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_MAWILE, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_KADABRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vito[] = { - { - .iv = 100, - .lvl = 42, - .species = SPECIES_DODRIO, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_KADABRA, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_ELECTRODE, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_SHIFTRY, - } + { + .iv = 100, + .lvl = 42, + .species = SPECIES_DODRIO, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_KADABRA, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_ELECTRODE, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_SHIFTRY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Owen[] = { - { - .iv = 100, - .lvl = 42, - .species = SPECIES_KECLEON, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_GRAVELER, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_WAILORD, - } + { + .iv = 100, + .lvl = 42, + .species = SPECIES_KECLEON, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_GRAVELER, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_WAILORD, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton2[] = { - { - .iv = 110, - .lvl = 26, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 110, - .lvl = 26, - .species = SPECIES_WAILMER, - }, - { - .iv = 110, - .lvl = 26, - .species = SPECIES_MAKUHITA, - } + { + .iv = 110, + .lvl = 26, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 110, + .lvl = 26, + .species = SPECIES_WAILMER, + }, + { + .iv = 110, + .lvl = 26, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton3[] = { - { - .iv = 120, - .lvl = 29, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 120, - .lvl = 29, - .species = SPECIES_WAILMER, - }, - { - .iv = 120, - .lvl = 29, - .species = SPECIES_MAKUHITA, - } + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_WAILMER, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton4[] = { - { - .iv = 130, - .lvl = 32, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 130, - .lvl = 32, - .species = SPECIES_WAILMER, - }, - { - .iv = 130, - .lvl = 32, - .species = SPECIES_MAKUHITA, - } + { + .iv = 130, + .lvl = 32, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 130, + .lvl = 32, + .species = SPECIES_WAILMER, + }, + { + .iv = 130, + .lvl = 32, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton5[] = { - { - .iv = 140, - .lvl = 35, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 140, - .lvl = 35, - .species = SPECIES_WAILMER, - }, - { - .iv = 140, - .lvl = 35, - .species = SPECIES_HARIYAMA, - } + { + .iv = 140, + .lvl = 35, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 140, + .lvl = 35, + .species = SPECIES_WAILMER, + }, + { + .iv = 140, + .lvl = 35, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Warren[] = { - { - .iv = 100, - .lvl = 33, - .species = SPECIES_GRAVELER, - }, - { - .iv = 100, - .lvl = 33, - .species = SPECIES_LUDICOLO, - } + { + .iv = 100, + .lvl = 33, + .species = SPECIES_GRAVELER, + }, + { + .iv = 100, + .lvl = 33, + .species = SPECIES_LUDICOLO, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Mary[] = { - { - .iv = 255, - .lvl = 26, - .species = SPECIES_DELCATTY, - .heldItem = ITEM_NONE, - .moves = MOVE_FAINT_ATTACK, MOVE_SHOCK_WAVE, MOVE_NONE, MOVE_NONE - } + { + .iv = 255, + .lvl = 26, + .species = SPECIES_DELCATTY, + .heldItem = ITEM_NONE, + .moves = MOVE_FAINT_ATTACK, MOVE_SHOCK_WAVE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Alexia[] = { - { - .iv = 255, - .lvl = 26, - .species = SPECIES_WIGGLYTUFF, - .heldItem = ITEM_NONE, - .moves = MOVE_DEFENSE_CURL, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_NONE - } + { + .iv = 255, + .lvl = 26, + .species = SPECIES_WIGGLYTUFF, + .heldItem = ITEM_NONE, + .moves = MOVE_DEFENSE_CURL, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_NONE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Jody[] = { - { - .iv = 255, - .lvl = 26, - .species = SPECIES_ZANGOOSE, - .heldItem = ITEM_NONE, - .moves = MOVE_SWORDS_DANCE, MOVE_SLASH, MOVE_NONE, MOVE_NONE - } + { + .iv = 255, + .lvl = 26, + .species = SPECIES_ZANGOOSE, + .heldItem = ITEM_NONE, + .moves = MOVE_SWORDS_DANCE, MOVE_SLASH, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Wendy[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_MAWILE, - .moves = MOVE_BATON_PASS, MOVE_FAINT_ATTACK, MOVE_FAKE_TEARS, MOVE_BITE - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_ROSELIA, - .moves = MOVE_MEGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_LEECH_SEED - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_PELIPPER, - .moves = MOVE_FLY, MOVE_WATER_GUN, MOVE_MIST, MOVE_PROTECT - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_MAWILE, + .moves = MOVE_BATON_PASS, MOVE_FAINT_ATTACK, MOVE_FAKE_TEARS, MOVE_BITE + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_ROSELIA, + .moves = MOVE_MEGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_LEECH_SEED + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_PELIPPER, + .moves = MOVE_FLY, MOVE_WATER_GUN, MOVE_MIST, MOVE_PROTECT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Keira[] = { - { - .iv = 100, - .lvl = 45, - .species = SPECIES_LAIRON, - }, - { - .iv = 100, - .lvl = 45, - .species = SPECIES_MANECTRIC, - } + { + .iv = 100, + .lvl = 45, + .species = SPECIES_LAIRON, + }, + { + .iv = 100, + .lvl = 45, + .species = SPECIES_MANECTRIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke1[] = { - { - .iv = 100, - .lvl = 17, - .species = SPECIES_WINGULL, - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_NUMEL, - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_ROSELIA, - } + { + .iv = 100, + .lvl = 17, + .species = SPECIES_WINGULL, + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_NUMEL, + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jennifer[] = { - { - .iv = 200, - .lvl = 30, - .species = SPECIES_SABLEYE, - } + { + .iv = 200, + .lvl = 30, + .species = SPECIES_SABLEYE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hope[] = { - { - .iv = 100, - .lvl = 45, - .species = SPECIES_ROSELIA, - } + { + .iv = 100, + .lvl = 45, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shannon[] = { - { - .iv = 100, - .lvl = 45, - .species = SPECIES_CLAYDOL, - } + { + .iv = 100, + .lvl = 45, + .species = SPECIES_CLAYDOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Michelle[] = { - { - .iv = 100, - .lvl = 42, - .species = SPECIES_TORKOAL, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_MEDICHAM, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_LUDICOLO, - } + { + .iv = 100, + .lvl = 42, + .species = SPECIES_TORKOAL, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_LUDICOLO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Caroline[] = { - { - .iv = 100, - .lvl = 43, - .species = SPECIES_SKARMORY, - }, - { - .iv = 100, - .lvl = 43, - .species = SPECIES_SABLEYE, - } + { + .iv = 100, + .lvl = 43, + .species = SPECIES_SKARMORY, + }, + { + .iv = 100, + .lvl = 43, + .species = SPECIES_SABLEYE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julie[] = { - { - .iv = 100, - .lvl = 42, - .species = SPECIES_SANDSLASH, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_NINETALES, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_TROPIUS, - } + { + .iv = 100, + .lvl = 42, + .species = SPECIES_SANDSLASH, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_NINETALES, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_TROPIUS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke2[] = { - { - .iv = 110, - .lvl = 26, - .species = SPECIES_WINGULL, - }, - { - .iv = 110, - .lvl = 26, - .species = SPECIES_NUMEL, - }, - { - .iv = 110, - .lvl = 26, - .species = SPECIES_ROSELIA, - } + { + .iv = 110, + .lvl = 26, + .species = SPECIES_WINGULL, + }, + { + .iv = 110, + .lvl = 26, + .species = SPECIES_NUMEL, + }, + { + .iv = 110, + .lvl = 26, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke3[] = { - { - .iv = 120, - .lvl = 29, - .species = SPECIES_PELIPPER, - }, - { - .iv = 120, - .lvl = 29, - .species = SPECIES_NUMEL, - }, - { - .iv = 120, - .lvl = 29, - .species = SPECIES_ROSELIA, - } + { + .iv = 120, + .lvl = 29, + .species = SPECIES_PELIPPER, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_NUMEL, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke4[] = { - { - .iv = 130, - .lvl = 32, - .species = SPECIES_PELIPPER, - }, - { - .iv = 130, - .lvl = 32, - .species = SPECIES_NUMEL, - }, - { - .iv = 130, - .lvl = 32, - .species = SPECIES_ROSELIA, - } + { + .iv = 130, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 130, + .lvl = 32, + .species = SPECIES_NUMEL, + }, + { + .iv = 130, + .lvl = 32, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke5[] = { - { - .iv = 140, - .lvl = 34, - .species = SPECIES_PELIPPER, - }, - { - .iv = 140, - .lvl = 34, - .species = SPECIES_CAMERUPT, - }, - { - .iv = 140, - .lvl = 34, - .species = SPECIES_ROSELIA, - } + { + .iv = 140, + .lvl = 34, + .species = SPECIES_PELIPPER, + }, + { + .iv = 140, + .lvl = 34, + .species = SPECIES_CAMERUPT, + }, + { + .iv = 140, + .lvl = 34, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Patricia[] = { - { - .iv = 0, - .lvl = 41, - .species = SPECIES_BANETTE, - }, - { - .iv = 0, - .lvl = 41, - .species = SPECIES_LUNATONE, - } + { + .iv = 0, + .lvl = 41, + .species = SPECIES_BANETTE, + }, + { + .iv = 0, + .lvl = 41, + .species = SPECIES_LUNATONE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kindra[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_DUSKULL, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_SHUPPET, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_DUSKULL, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_SHUPPET, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tammy[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_DUSKULL, - }, - { - .iv = 0, - .lvl = 29, - .species = SPECIES_SHUPPET, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_DUSKULL, + }, + { + .iv = 0, + .lvl = 29, + .species = SPECIES_SHUPPET, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie1[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_SABLEYE, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SABLEYE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tasha[] = { - { - .iv = 50, - .lvl = 32, - .species = SPECIES_SHUPPET, - } + { + .iv = 50, + .lvl = 32, + .species = SPECIES_SHUPPET, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie2[] = { - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SABLEYE, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SPOINK, - } + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SABLEYE, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SPOINK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie3[] = { - { - .iv = 20, - .lvl = 35, - .species = SPECIES_SPOINK, - }, - { - .iv = 20, - .lvl = 35, - .species = SPECIES_SABLEYE, - } + { + .iv = 20, + .lvl = 35, + .species = SPECIES_SPOINK, + }, + { + .iv = 20, + .lvl = 35, + .species = SPECIES_SABLEYE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie4[] = { - { - .iv = 30, - .lvl = 40, - .species = SPECIES_SPOINK, - }, - { - .iv = 30, - .lvl = 40, - .species = SPECIES_SABLEYE, - } + { + .iv = 30, + .lvl = 40, + .species = SPECIES_SPOINK, + }, + { + .iv = 30, + .lvl = 40, + .species = SPECIES_SABLEYE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie5[] = { - { - .iv = 40, - .lvl = 42, - .species = SPECIES_DUSKULL, - }, - { - .iv = 40, - .lvl = 42, - .species = SPECIES_SABLEYE, - }, - { - .iv = 40, - .lvl = 42, - .species = SPECIES_GRUMPIG, - } + { + .iv = 40, + .lvl = 42, + .species = SPECIES_DUSKULL, + }, + { + .iv = 40, + .lvl = 42, + .species = SPECIES_SABLEYE, + }, + { + .iv = 40, + .lvl = 42, + .species = SPECIES_GRUMPIG, + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy1[] = { - { - .iv = 0, - .lvl = 7, - .species = SPECIES_ZIGZAGOON, - .heldItem = ITEM_NUGGET - } + { + .iv = 0, + .lvl = 7, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Daphne[] = { - { - .iv = 100, - .lvl = 39, - .species = SPECIES_LUVDISC, - .heldItem = ITEM_NUGGET, - .moves = MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL, MOVE_WATER_PULSE - }, - { - .iv = 100, - .lvl = 39, - .species = SPECIES_LUVDISC, - .heldItem = ITEM_NUGGET, - .moves = MOVE_ATTRACT, MOVE_SAFEGUARD, MOVE_TAKE_DOWN, MOVE_WATER_PULSE - } + { + .iv = 100, + .lvl = 39, + .species = SPECIES_LUVDISC, + .heldItem = ITEM_NUGGET, + .moves = MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL, MOVE_WATER_PULSE + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_LUVDISC, + .heldItem = ITEM_NUGGET, + .moves = MOVE_ATTRACT, MOVE_SAFEGUARD, MOVE_TAKE_DOWN, MOVE_WATER_PULSE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt23[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Cindy2[] = { - { - .iv = 0, - .lvl = 11, - .species = SPECIES_ZIGZAGOON, - .heldItem = ITEM_NUGGET, - .moves = MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 11, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET, + .moves = MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Brianna[] = { - { - .iv = 150, - .lvl = 40, - .species = SPECIES_SEAKING, - .heldItem = ITEM_NUGGET - } + { + .iv = 150, + .lvl = 40, + .species = SPECIES_SEAKING, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Naomi[] = { - { - .iv = 100, - .lvl = 45, - .species = SPECIES_ROSELIA, - .heldItem = ITEM_NUGGET - } + { + .iv = 100, + .lvl = 45, + .species = SPECIES_ROSELIA, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy3[] = { - { - .iv = 10, - .lvl = 27, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET - } + { + .iv = 10, + .lvl = 27, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy4[] = { - { - .iv = 20, - .lvl = 30, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET - } + { + .iv = 20, + .lvl = 30, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy5[] = { - { - .iv = 30, - .lvl = 33, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET - } + { + .iv = 30, + .lvl = 33, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Cindy6[] = { - { - .iv = 40, - .lvl = 36, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET, - .moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK - } + { + .iv = 40, + .lvl = 36, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET, + .moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melissa[] = { - { - .iv = 0, - .lvl = 21, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 21, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sheila[] = { - { - .iv = 0, - .lvl = 21, - .species = SPECIES_SHROOMISH, - } + { + .iv = 0, + .lvl = 21, + .species = SPECIES_SHROOMISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shirley[] = { - { - .iv = 0, - .lvl = 21, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 21, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica1[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_KECLEON, - .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK - }, - { - .iv = 0, - .lvl = 29, - .species = SPECIES_SEVIPER, - .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_KECLEON, + .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK + }, + { + .iv = 0, + .lvl = 29, + .species = SPECIES_SEVIPER, + .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Connie[] = { - { - .iv = 100, - .lvl = 40, - .species = SPECIES_GOLDEEN, - } + { + .iv = 100, + .lvl = 40, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bridget[] = { - { - .iv = 150, - .lvl = 40, - .species = SPECIES_AZUMARILL, - } + { + .iv = 150, + .lvl = 40, + .species = SPECIES_AZUMARILL, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Olivia[] = { - { - .iv = 100, - .lvl = 35, - .species = SPECIES_CLAMPERL, - .moves = MOVE_IRON_DEFENSE, MOVE_WHIRLPOOL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE - }, - { - .iv = 100, - .lvl = 37, - .species = SPECIES_CORPHISH, - .moves = MOVE_TAUNT, MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_NONE - }, - { - .iv = 100, - .lvl = 39, - .species = SPECIES_LOMBRE, - .moves = MOVE_UPROAR, MOVE_FURY_SWIPES, MOVE_FAKE_OUT, MOVE_WATER_PULSE - } + { + .iv = 100, + .lvl = 35, + .species = SPECIES_CLAMPERL, + .moves = MOVE_IRON_DEFENSE, MOVE_WHIRLPOOL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE + }, + { + .iv = 100, + .lvl = 37, + .species = SPECIES_CORPHISH, + .moves = MOVE_TAUNT, MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_NONE + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_LOMBRE, + .moves = MOVE_UPROAR, MOVE_FURY_SWIPES, MOVE_FAKE_OUT, MOVE_WATER_PULSE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiffany[] = { - { - .iv = 100, - .lvl = 39, - .species = SPECIES_CARVANHA, - }, - { - .iv = 100, - .lvl = 39, - .species = SPECIES_SHARPEDO, - } + { + .iv = 100, + .lvl = 39, + .species = SPECIES_CARVANHA, + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica2[] = { - { - .iv = 10, - .lvl = 35, - .species = SPECIES_KECLEON, - .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK - }, - { - .iv = 10, - .lvl = 35, - .species = SPECIES_SEVIPER, - .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH - } + { + .iv = 10, + .lvl = 35, + .species = SPECIES_KECLEON, + .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK + }, + { + .iv = 10, + .lvl = 35, + .species = SPECIES_SEVIPER, + .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica3[] = { - { - .iv = 20, - .lvl = 38, - .species = SPECIES_KECLEON, - .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK - }, - { - .iv = 20, - .lvl = 38, - .species = SPECIES_SEVIPER, - .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH - } + { + .iv = 20, + .lvl = 38, + .species = SPECIES_KECLEON, + .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK + }, + { + .iv = 20, + .lvl = 38, + .species = SPECIES_SEVIPER, + .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica4[] = { - { - .iv = 30, - .lvl = 41, - .species = SPECIES_KECLEON, - .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK - }, - { - .iv = 30, - .lvl = 41, - .species = SPECIES_SEVIPER, - .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH - } + { + .iv = 30, + .lvl = 41, + .species = SPECIES_KECLEON, + .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_SEVIPER, + .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica5[] = { - { - .iv = 40, - .lvl = 44, - .species = SPECIES_KECLEON, - .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK - }, - { - .iv = 40, - .lvl = 44, - .species = SPECIES_SEVIPER, - .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH - } + { + .iv = 40, + .lvl = 44, + .species = SPECIES_KECLEON, + .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK + }, + { + .iv = 40, + .lvl = 44, + .species = SPECIES_SEVIPER, + .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Winston1[] = { - { - .iv = 0, - .lvl = 7, - .species = SPECIES_ZIGZAGOON, - .heldItem = ITEM_NUGGET - } + { + .iv = 0, + .lvl = 7, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mollie[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WHISCASH, - }, - { - .iv = 200, - .lvl = 33, - .species = SPECIES_MEDITITE, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WHISCASH, + }, + { + .iv = 200, + .lvl = 33, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Garret[] = { - { - .iv = 0, - .lvl = 45, - .species = SPECIES_AZUMARILL, - .heldItem = ITEM_NUGGET - } + { + .iv = 0, + .lvl = 45, + .species = SPECIES_AZUMARILL, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Winston2[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Winston3[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Winston4[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Winston5[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET, - .moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET, + .moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve1[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_ARON, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_ARON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia1[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_WAILMER, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_HORSEA, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_HORSEA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mark[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_RHYHORN, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_RHYHORN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt24[] = { - { - .iv = 0, - .lvl = 20, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 20, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve2[] = { - { - .iv = 10, - .lvl = 27, - .species = SPECIES_LAIRON, - } + { + .iv = 10, + .lvl = 27, + .species = SPECIES_LAIRON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_LAIRON, - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_RHYHORN, - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_LAIRON, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_RHYHORN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve4[] = { - { - .iv = 30, - .lvl = 32, - .species = SPECIES_LAIRON, - }, - { - .iv = 30, - .lvl = 32, - .species = SPECIES_RHYHORN, - } + { + .iv = 30, + .lvl = 32, + .species = SPECIES_LAIRON, + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_RHYHORN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve5[] = { - { - .iv = 40, - .lvl = 35, - .species = SPECIES_AGGRON, - }, - { - .iv = 40, - .lvl = 35, - .species = SPECIES_RHYDON, - } + { + .iv = 40, + .lvl = 35, + .species = SPECIES_AGGRON, + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_RHYDON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Luis[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dominik[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_TENTACOOL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Douglas[] = { - { - .iv = 10, - .lvl = 24, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 10, - .lvl = 24, - .species = SPECIES_TENTACOOL, - } + { + .iv = 10, + .lvl = 24, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darrin[] = { - { - .iv = 10, - .lvl = 24, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 10, - .lvl = 24, - .species = SPECIES_WINGULL, - }, - { - .iv = 10, - .lvl = 24, - .species = SPECIES_TENTACOOL, - } + { + .iv = 10, + .lvl = 24, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony1[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerome[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matthew[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_David[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spencer[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WINGULL, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roland[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolen[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Stan[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_HORSEA, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_HORSEA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barry[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_GYARADOS, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dean[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_CARVANHA, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_CARVANHA, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rodney[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_GYARADOS, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Richard[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_PELIPPER, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_PELIPPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Herman[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Santiago[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_TENTACRUEL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACRUEL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gilbert[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_SHARPEDO, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Franklin[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_SEALEO, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SEALEO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kevin[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_SPHEAL, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SPHEAL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jack[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_GYARADOS, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dudley[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chad[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony2[] = { - { - .iv = 10, - .lvl = 30, - .species = SPECIES_SHARPEDO, - } + { + .iv = 10, + .lvl = 30, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony3[] = { - { - .iv = 20, - .lvl = 33, - .species = SPECIES_SHARPEDO, - } + { + .iv = 20, + .lvl = 33, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony4[] = { - { - .iv = 30, - .lvl = 34, - .species = SPECIES_STARYU, - }, - { - .iv = 30, - .lvl = 36, - .species = SPECIES_SHARPEDO, - } + { + .iv = 30, + .lvl = 34, + .species = SPECIES_STARYU, + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony5[] = { - { - .iv = 40, - .lvl = 37, - .species = SPECIES_STARMIE, - }, - { - .iv = 40, - .lvl = 39, - .species = SPECIES_SHARPEDO, - } + { + .iv = 40, + .lvl = 37, + .species = SPECIES_STARMIE, + }, + { + .iv = 40, + .lvl = 39, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takao[] = { - { - .iv = 127, - .lvl = 13, - .species = SPECIES_MACHOP, - } + { + .iv = 127, + .lvl = 13, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hitoshi[] = { - { - .iv = 50, - .lvl = 32, - .species = SPECIES_MACHOP, - }, - { - .iv = 200, - .lvl = 32, - .species = SPECIES_MACHOKE, - } + { + .iv = 50, + .lvl = 32, + .species = SPECIES_MACHOP, + }, + { + .iv = 200, + .lvl = 32, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kiyo[] = { - { - .iv = 100, - .lvl = 34, - .species = SPECIES_HARIYAMA, - } + { + .iv = 100, + .lvl = 34, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koichi[] = { - { - .iv = 100, - .lvl = 24, - .species = SPECIES_MACHOP, - }, - { - .iv = 150, - .lvl = 28, - .species = SPECIES_MACHOKE, - } + { + .iv = 100, + .lvl = 24, + .species = SPECIES_MACHOP, + }, + { + .iv = 150, + .lvl = 28, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob1[] = { - { - .iv = 100, - .lvl = 19, - .species = SPECIES_MACHOP, - } + { + .iv = 100, + .lvl = 19, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob2[] = { - { - .iv = 110, - .lvl = 27, - .species = SPECIES_MACHOKE, - } + { + .iv = 110, + .lvl = 27, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob3[] = { - { - .iv = 120, - .lvl = 29, - .species = SPECIES_MACHOP, - }, - { - .iv = 120, - .lvl = 29, - .species = SPECIES_MACHOKE, - } + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MACHOP, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob4[] = { - { - .iv = 130, - .lvl = 31, - .species = SPECIES_MACHOP, - }, - { - .iv = 130, - .lvl = 31, - .species = SPECIES_MACHOKE, - }, - { - .iv = 130, - .lvl = 31, - .species = SPECIES_MACHOKE, - } + { + .iv = 130, + .lvl = 31, + .species = SPECIES_MACHOP, + }, + { + .iv = 130, + .lvl = 31, + .species = SPECIES_MACHOKE, + }, + { + .iv = 130, + .lvl = 31, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Nob5[] = { - { - .iv = 140, - .lvl = 33, - .species = SPECIES_MACHOP, - .heldItem = ITEM_NONE - }, - { - .iv = 140, - .lvl = 33, - .species = SPECIES_MACHOKE, - .heldItem = ITEM_NONE - }, - { - .iv = 140, - .lvl = 33, - .species = SPECIES_MACHOKE, - .heldItem = ITEM_NONE - }, - { - .iv = 140, - .lvl = 33, - .species = SPECIES_MACHAMP, - .heldItem = ITEM_BLACK_BELT - } + { + .iv = 140, + .lvl = 33, + .species = SPECIES_MACHOP, + .heldItem = ITEM_NONE + }, + { + .iv = 140, + .lvl = 33, + .species = SPECIES_MACHOKE, + .heldItem = ITEM_NONE + }, + { + .iv = 140, + .lvl = 33, + .species = SPECIES_MACHOKE, + .heldItem = ITEM_NONE + }, + { + .iv = 140, + .lvl = 33, + .species = SPECIES_MACHAMP, + .heldItem = ITEM_BLACK_BELT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yuji[] = { - { - .iv = 100, - .lvl = 26, - .species = SPECIES_MAKUHITA, - }, - { - .iv = 100, - .lvl = 26, - .species = SPECIES_MACHOKE, - } + { + .iv = 100, + .lvl = 26, + .species = SPECIES_MAKUHITA, + }, + { + .iv = 100, + .lvl = 26, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisuke[] = { - { - .iv = 100, - .lvl = 19, - .species = SPECIES_MACHOP, - } + { + .iv = 100, + .lvl = 19, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Atsushi[] = { - { - .iv = 100, - .lvl = 32, - .species = SPECIES_HARIYAMA, - } + { + .iv = 100, + .lvl = 32, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Kirk[] = { - { - .iv = 100, - .lvl = 17, - .species = SPECIES_ELECTRIKE, - .moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_LEER - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_VOLTORB, - .moves = MOVE_CHARGE, MOVE_SHOCK_WAVE, MOVE_SCREECH, MOVE_NONE - } + { + .iv = 100, + .lvl = 17, + .species = SPECIES_ELECTRIKE, + .moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_LEER + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_VOLTORB, + .moves = MOVE_CHARGE, MOVE_SHOCK_WAVE, MOVE_SCREECH, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt25[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt26[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shawn[] = { - { - .iv = 100, - .lvl = 17, - .species = SPECIES_VOLTORB, - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 100, + .lvl = 17, + .species = SPECIES_VOLTORB, + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando1[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_LOUDRED, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton1[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 0, - .lvl = 15, - .species = SPECIES_WHISMUR, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 0, + .lvl = 15, + .species = SPECIES_WHISMUR, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton2[] = { - { - .iv = 10, - .lvl = 25, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_WHISMUR, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 10, + .lvl = 25, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_WHISMUR, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton3[] = { - { - .iv = 20, - .lvl = 28, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_LOUDRED, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 20, + .lvl = 28, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_LOUDRED, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton4[] = { - { - .iv = 30, - .lvl = 31, - .species = SPECIES_MAGNETON, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_LOUDRED, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_MAGNETON, - } + { + .iv = 30, + .lvl = 31, + .species = SPECIES_MAGNETON, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_LOUDRED, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_MAGNETON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton5[] = { - { - .iv = 40, - .lvl = 34, - .species = SPECIES_MAGNETON, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_EXPLOUD, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_MAGNETON, - } + { + .iv = 40, + .lvl = 34, + .species = SPECIES_MAGNETON, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_EXPLOUD, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_MAGNETON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cole[] = { - { - .iv = 100, - .lvl = 23, - .species = SPECIES_NUMEL, - } + { + .iv = 100, + .lvl = 23, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeff[] = { - { - .iv = 100, - .lvl = 22, - .species = SPECIES_SLUGMA, - }, - { - .iv = 100, - .lvl = 22, - .species = SPECIES_SLUGMA, - } + { + .iv = 100, + .lvl = 22, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 22, + .species = SPECIES_SLUGMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Axle[] = { - { - .iv = 100, - .lvl = 23, - .species = SPECIES_NUMEL, - } + { + .iv = 100, + .lvl = 23, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jace[] = { - { - .iv = 100, - .lvl = 23, - .species = SPECIES_SLUGMA, - } + { + .iv = 100, + .lvl = 23, + .species = SPECIES_SLUGMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Keegan[] = { - { - .iv = 120, - .lvl = 23, - .species = SPECIES_SLUGMA, - } + { + .iv = 120, + .lvl = 23, + .species = SPECIES_SLUGMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie1[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SLUGMA, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_WINGULL, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SLUGMA, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie2[] = { - { - .iv = 10, - .lvl = 26, - .species = SPECIES_SLUGMA, - }, - { - .iv = 10, - .lvl = 26, - .species = SPECIES_WINGULL, - } + { + .iv = 10, + .lvl = 26, + .species = SPECIES_SLUGMA, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_SLUGMA, - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_PELIPPER, - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_SLUGMA, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_PELIPPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie4[] = { - { - .iv = 30, - .lvl = 32, - .species = SPECIES_SLUGMA, - }, - { - .iv = 30, - .lvl = 32, - .species = SPECIES_PELIPPER, - } + { + .iv = 30, + .lvl = 32, + .species = SPECIES_SLUGMA, + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_PELIPPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie5[] = { - { - .iv = 40, - .lvl = 35, - .species = SPECIES_MAGCARGO, - }, - { - .iv = 40, - .lvl = 35, - .species = SPECIES_PELIPPER, - } + { + .iv = 40, + .lvl = 35, + .species = SPECIES_MAGCARGO, + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_PELIPPER, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Drew[] = { - { - .iv = 0, - .lvl = 23, - .species = SPECIES_SANDSHREW, - .moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH - } + { + .iv = 0, + .lvl = 23, + .species = SPECIES_SANDSHREW, + .moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Beau[] = { - { - .iv = 0, - .lvl = 21, - .species = SPECIES_BALTOY, - .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB - }, - { - .iv = 0, - .lvl = 21, - .species = SPECIES_SANDSHREW, - .moves = MOVE_POISON_STING, MOVE_SAND_ATTACK, MOVE_SCRATCH, MOVE_DIG - }, - { - .iv = 0, - .lvl = 21, - .species = SPECIES_BALTOY, - .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB - } + { + .iv = 0, + .lvl = 21, + .species = SPECIES_BALTOY, + .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB + }, + { + .iv = 0, + .lvl = 21, + .species = SPECIES_SANDSHREW, + .moves = MOVE_POISON_STING, MOVE_SAND_ATTACK, MOVE_SCRATCH, MOVE_DIG + }, + { + .iv = 0, + .lvl = 21, + .species = SPECIES_BALTOY, + .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Larry[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shane[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Justin[] = { - { - .iv = 0, - .lvl = 24, - .species = SPECIES_KECLEON, - } + { + .iv = 0, + .lvl = 24, + .species = SPECIES_KECLEON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan1[] = { - { - .iv = 0, - .lvl = 20, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 20, - .species = SPECIES_TAILLOW, - } + { + .iv = 0, + .lvl = 20, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 20, + .species = SPECIES_TAILLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Autumn[] = { - { - .iv = 0, - .lvl = 21, - .species = SPECIES_SHROOMISH, - } + { + .iv = 0, + .lvl = 21, + .species = SPECIES_SHROOMISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Travis[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SANDSHREW, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SANDSHREW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan2[] = { - { - .iv = 10, - .lvl = 26, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 10, - .lvl = 26, - .species = SPECIES_TAILLOW, - } + { + .iv = 10, + .lvl = 26, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_TAILLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_LINOONE, - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_SWELLOW, - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_LINOONE, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_SWELLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan4[] = { - { - .iv = 30, - .lvl = 31, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_SWELLOW, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_LINOONE, - } + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SWELLOW, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_LINOONE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan5[] = { - { - .iv = 40, - .lvl = 34, - .species = SPECIES_SWELLOW, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_SANDSLASH, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_LINOONE, - } + { + .iv = 40, + .lvl = 34, + .species = SPECIES_SWELLOW, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_SANDSLASH, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_LINOONE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brent[] = { - { - .iv = 100, - .lvl = 26, - .species = SPECIES_SURSKIT, - } + { + .iv = 100, + .lvl = 26, + .species = SPECIES_SURSKIT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donald[] = { - { - .iv = 100, - .lvl = 24, - .species = SPECIES_WURMPLE, - }, - { - .iv = 100, - .lvl = 24, - .species = SPECIES_SILCOON, - }, - { - .iv = 100, - .lvl = 24, - .species = SPECIES_BEAUTIFLY, - } + { + .iv = 100, + .lvl = 24, + .species = SPECIES_WURMPLE, + }, + { + .iv = 100, + .lvl = 24, + .species = SPECIES_SILCOON, + }, + { + .iv = 100, + .lvl = 24, + .species = SPECIES_BEAUTIFLY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Taylor[] = { - { - .iv = 100, - .lvl = 27, - .species = SPECIES_WURMPLE, - }, - { - .iv = 100, - .lvl = 27, - .species = SPECIES_CASCOON, - }, - { - .iv = 100, - .lvl = 27, - .species = SPECIES_DUSTOX, - } + { + .iv = 100, + .lvl = 27, + .species = SPECIES_WURMPLE, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_CASCOON, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_DUSTOX, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey1[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_SURSKIT, - }, - { - .iv = 0, - .lvl = 27, - .species = SPECIES_SURSKIT, - }, - { - .iv = 0, - .lvl = 27, - .species = SPECIES_SURSKIT, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_SURSKIT, + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_SURSKIT, + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_SURSKIT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Derek[] = { - { - .iv = 150, - .lvl = 16, - .species = SPECIES_DUSTOX, - }, - { - .iv = 150, - .lvl = 16, - .species = SPECIES_BEAUTIFLY, - } + { + .iv = 150, + .lvl = 16, + .species = SPECIES_DUSTOX, + }, + { + .iv = 150, + .lvl = 16, + .species = SPECIES_BEAUTIFLY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey2[] = { - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SURSKIT, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SURSKIT, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SURSKIT, - } + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SURSKIT, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SURSKIT, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SURSKIT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey3[] = { - { - .iv = 20, - .lvl = 34, - .species = SPECIES_SURSKIT, - }, - { - .iv = 20, - .lvl = 34, - .species = SPECIES_SURSKIT, - }, - { - .iv = 20, - .lvl = 34, - .species = SPECIES_MASQUERAIN, - } + { + .iv = 20, + .lvl = 34, + .species = SPECIES_SURSKIT, + }, + { + .iv = 20, + .lvl = 34, + .species = SPECIES_SURSKIT, + }, + { + .iv = 20, + .lvl = 34, + .species = SPECIES_MASQUERAIN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey4[] = { - { - .iv = 30, - .lvl = 36, - .species = SPECIES_SURSKIT, - }, - { - .iv = 30, - .lvl = 36, - .species = SPECIES_WURMPLE, - }, - { - .iv = 30, - .lvl = 36, - .species = SPECIES_SURSKIT, - }, - { - .iv = 30, - .lvl = 36, - .species = SPECIES_MASQUERAIN, - } + { + .iv = 30, + .lvl = 36, + .species = SPECIES_SURSKIT, + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_WURMPLE, + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_SURSKIT, + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_MASQUERAIN, + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Jeffrey5[] = { - { - .iv = 40, - .lvl = 38, - .species = SPECIES_SURSKIT, - .heldItem = ITEM_NONE - }, - { - .iv = 40, - .lvl = 38, - .species = SPECIES_DUSTOX, - .heldItem = ITEM_NONE - }, - { - .iv = 40, - .lvl = 38, - .species = SPECIES_SURSKIT, - .heldItem = ITEM_NONE - }, - { - .iv = 40, - .lvl = 38, - .species = SPECIES_MASQUERAIN, - .heldItem = ITEM_SILVER_POWDER - }, - { - .iv = 40, - .lvl = 38, - .species = SPECIES_BEAUTIFLY, - .heldItem = ITEM_NONE - } + { + .iv = 40, + .lvl = 38, + .species = SPECIES_SURSKIT, + .heldItem = ITEM_NONE + }, + { + .iv = 40, + .lvl = 38, + .species = SPECIES_DUSTOX, + .heldItem = ITEM_NONE + }, + { + .iv = 40, + .lvl = 38, + .species = SPECIES_SURSKIT, + .heldItem = ITEM_NONE + }, + { + .iv = 40, + .lvl = 38, + .species = SPECIES_MASQUERAIN, + .heldItem = ITEM_SILVER_POWDER + }, + { + .iv = 40, + .lvl = 38, + .species = SPECIES_BEAUTIFLY, + .heldItem = ITEM_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Edward[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_ABRA, - .moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_ABRA, + .moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Preston[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_KIRLIA, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_KIRLIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Virgil[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_RALTS, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_RALTS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Blake[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_GIRAFARIG, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_GIRAFARIG, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_William[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_RALTS, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_RALTS, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_KIRLIA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_RALTS, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_RALTS, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_KIRLIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joshua[] = { - { - .iv = 0, - .lvl = 41, - .species = SPECIES_KADABRA, - }, - { - .iv = 0, - .lvl = 41, - .species = SPECIES_SOLROCK, - } + { + .iv = 0, + .lvl = 41, + .species = SPECIES_KADABRA, + }, + { + .iv = 0, + .lvl = 41, + .species = SPECIES_SOLROCK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron1[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_SOLROCK, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_SOLROCK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron2[] = { - { - .iv = 10, - .lvl = 33, - .species = SPECIES_KADABRA, - }, - { - .iv = 10, - .lvl = 33, - .species = SPECIES_SOLROCK, - } + { + .iv = 10, + .lvl = 33, + .species = SPECIES_KADABRA, + }, + { + .iv = 10, + .lvl = 33, + .species = SPECIES_SOLROCK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron3[] = { - { - .iv = 20, - .lvl = 38, - .species = SPECIES_KADABRA, - }, - { - .iv = 20, - .lvl = 38, - .species = SPECIES_SOLROCK, - } + { + .iv = 20, + .lvl = 38, + .species = SPECIES_KADABRA, + }, + { + .iv = 20, + .lvl = 38, + .species = SPECIES_SOLROCK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron4[] = { - { - .iv = 30, - .lvl = 41, - .species = SPECIES_KADABRA, - }, - { - .iv = 30, - .lvl = 41, - .species = SPECIES_SOLROCK, - } + { + .iv = 30, + .lvl = 41, + .species = SPECIES_KADABRA, + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_SOLROCK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron5[] = { - { - .iv = 40, - .lvl = 45, - .species = SPECIES_SOLROCK, - }, - { - .iv = 40, - .lvl = 45, - .species = SPECIES_ALAKAZAM, - } + { + .iv = 40, + .lvl = 45, + .species = SPECIES_SOLROCK, + }, + { + .iv = 40, + .lvl = 45, + .species = SPECIES_ALAKAZAM, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Jaclyn[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_ABRA, - .moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_ABRA, + .moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hannah[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_KIRLIA, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_KIRLIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samantha[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_XATU, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_XATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maura[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_KADABRA, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_KADABRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kayla[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_WOBBUFFET, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_NATU, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_KADABRA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_WOBBUFFET, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_NATU, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_KADABRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexis[] = { - { - .iv = 0, - .lvl = 41, - .species = SPECIES_KIRLIA, - }, - { - .iv = 0, - .lvl = 41, - .species = SPECIES_XATU, - } + { + .iv = 0, + .lvl = 41, + .species = SPECIES_KIRLIA, + }, + { + .iv = 0, + .lvl = 41, + .species = SPECIES_XATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki1[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_KADABRA, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_LUNATONE, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_KADABRA, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_LUNATONE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki2[] = { - { - .iv = 10, - .lvl = 34, - .species = SPECIES_KADABRA, - }, - { - .iv = 10, - .lvl = 34, - .species = SPECIES_LUNATONE, - } + { + .iv = 10, + .lvl = 34, + .species = SPECIES_KADABRA, + }, + { + .iv = 10, + .lvl = 34, + .species = SPECIES_LUNATONE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki3[] = { - { - .iv = 20, - .lvl = 37, - .species = SPECIES_KADABRA, - }, - { - .iv = 20, - .lvl = 37, - .species = SPECIES_LUNATONE, - } + { + .iv = 20, + .lvl = 37, + .species = SPECIES_KADABRA, + }, + { + .iv = 20, + .lvl = 37, + .species = SPECIES_LUNATONE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki4[] = { - { - .iv = 30, - .lvl = 40, - .species = SPECIES_KADABRA, - }, - { - .iv = 30, - .lvl = 40, - .species = SPECIES_LUNATONE, - } + { + .iv = 30, + .lvl = 40, + .species = SPECIES_KADABRA, + }, + { + .iv = 30, + .lvl = 40, + .species = SPECIES_LUNATONE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki5[] = { - { - .iv = 40, - .lvl = 43, - .species = SPECIES_LUNATONE, - }, - { - .iv = 40, - .lvl = 43, - .species = SPECIES_ALAKAZAM, - } + { + .iv = 40, + .lvl = 43, + .species = SPECIES_LUNATONE, + }, + { + .iv = 40, + .lvl = 43, + .species = SPECIES_ALAKAZAM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter1[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_MANECTRIC, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_MANECTRIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Micah[] = { - { - .iv = 0, - .lvl = 44, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 0, - .lvl = 44, - .species = SPECIES_MANECTRIC, - } + { + .iv = 0, + .lvl = 44, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 0, + .lvl = 44, + .species = SPECIES_MANECTRIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thomas[] = { - { - .iv = 0, - .lvl = 45, - .species = SPECIES_ZANGOOSE, - } + { + .iv = 0, + .lvl = 45, + .species = SPECIES_ZANGOOSE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter2[] = { - { - .iv = 10, - .lvl = 34, - .species = SPECIES_MANECTRIC, - } + { + .iv = 10, + .lvl = 34, + .species = SPECIES_MANECTRIC, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter3[] = { - { - .iv = 20, - .lvl = 36, - .species = SPECIES_LINOONE, - .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES - }, - { - .iv = 20, - .lvl = 36, - .species = SPECIES_MANECTRIC, - .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR - } + { + .iv = 20, + .lvl = 36, + .species = SPECIES_LINOONE, + .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES + }, + { + .iv = 20, + .lvl = 36, + .species = SPECIES_MANECTRIC, + .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter4[] = { - { - .iv = 30, - .lvl = 39, - .species = SPECIES_LINOONE, - .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES - }, - { - .iv = 30, - .lvl = 39, - .species = SPECIES_MANECTRIC, - .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_NONE - } + { + .iv = 30, + .lvl = 39, + .species = SPECIES_LINOONE, + .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES + }, + { + .iv = 30, + .lvl = 39, + .species = SPECIES_MANECTRIC, + .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter5[] = { - { - .iv = 40, - .lvl = 41, - .species = SPECIES_LINOONE, - .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES - }, - { - .iv = 40, - .lvl = 41, - .species = SPECIES_GOLDUCK, - .moves = MOVE_FURY_SWIPES, MOVE_DISABLE, MOVE_CONFUSION, MOVE_PSYCH_UP - }, - { - .iv = 40, - .lvl = 41, - .species = SPECIES_MANECTRIC, - .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR - } + { + .iv = 40, + .lvl = 41, + .species = SPECIES_LINOONE, + .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES + }, + { + .iv = 40, + .lvl = 41, + .species = SPECIES_GOLDUCK, + .moves = MOVE_FURY_SWIPES, MOVE_DISABLE, MOVE_CONFUSION, MOVE_PSYCH_UP + }, + { + .iv = 40, + .lvl = 41, + .species = SPECIES_MANECTRIC, + .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Sidney[] = { - { - .iv = 250, - .lvl = 46, - .species = SPECIES_MIGHTYENA, - .heldItem = ITEM_NONE, - .moves = MOVE_ROAR, MOVE_DOUBLE_EDGE, MOVE_SAND_ATTACK, MOVE_CRUNCH - }, - { - .iv = 250, - .lvl = 48, - .species = SPECIES_SHIFTRY, - .heldItem = ITEM_NONE, - .moves = MOVE_TORMENT, MOVE_DOUBLE_TEAM, MOVE_SWAGGER, MOVE_EXTRASENSORY - }, - { - .iv = 250, - .lvl = 46, - .species = SPECIES_CACTURNE, - .heldItem = ITEM_NONE, - .moves = MOVE_LEECH_SEED, MOVE_FAINT_ATTACK, MOVE_NEEDLE_ARM, MOVE_COTTON_SPORE - }, - { - .iv = 250, - .lvl = 48, - .species = SPECIES_CRAWDAUNT, - .heldItem = ITEM_NONE, - .moves = MOVE_SURF, MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_FACADE - }, - { - .iv = 255, - .lvl = 49, - .species = SPECIES_ABSOL, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_SLASH - } + { + .iv = 250, + .lvl = 46, + .species = SPECIES_MIGHTYENA, + .heldItem = ITEM_NONE, + .moves = MOVE_ROAR, MOVE_DOUBLE_EDGE, MOVE_SAND_ATTACK, MOVE_CRUNCH + }, + { + .iv = 250, + .lvl = 48, + .species = SPECIES_SHIFTRY, + .heldItem = ITEM_NONE, + .moves = MOVE_TORMENT, MOVE_DOUBLE_TEAM, MOVE_SWAGGER, MOVE_EXTRASENSORY + }, + { + .iv = 250, + .lvl = 46, + .species = SPECIES_CACTURNE, + .heldItem = ITEM_NONE, + .moves = MOVE_LEECH_SEED, MOVE_FAINT_ATTACK, MOVE_NEEDLE_ARM, MOVE_COTTON_SPORE + }, + { + .iv = 250, + .lvl = 48, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_FACADE + }, + { + .iv = 255, + .lvl = 49, + .species = SPECIES_ABSOL, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_SLASH + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Phoebe[] = { - { - .iv = 250, - .lvl = 48, - .species = SPECIES_DUSCLOPS, - .heldItem = ITEM_NONE, - .moves = MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_CURSE, MOVE_PROTECT - }, - { - .iv = 250, - .lvl = 49, - .species = SPECIES_BANETTE, - .heldItem = ITEM_NONE, - .moves = MOVE_SHADOW_BALL, MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_FAINT_ATTACK - }, - { - .iv = 250, - .lvl = 50, - .species = SPECIES_SABLEYE, - .heldItem = ITEM_NONE, - .moves = MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_NIGHT_SHADE, MOVE_FAINT_ATTACK - }, - { - .iv = 250, - .lvl = 49, - .species = SPECIES_BANETTE, - .heldItem = ITEM_NONE, - .moves = MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FACADE - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_DUSCLOPS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SHADOW_BALL, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE - } + { + .iv = 250, + .lvl = 48, + .species = SPECIES_DUSCLOPS, + .heldItem = ITEM_NONE, + .moves = MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_CURSE, MOVE_PROTECT + }, + { + .iv = 250, + .lvl = 49, + .species = SPECIES_BANETTE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHADOW_BALL, MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_FAINT_ATTACK + }, + { + .iv = 250, + .lvl = 50, + .species = SPECIES_SABLEYE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_NIGHT_SHADE, MOVE_FAINT_ATTACK + }, + { + .iv = 250, + .lvl = 49, + .species = SPECIES_BANETTE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FACADE + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_DUSCLOPS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SHADOW_BALL, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Glacia[] = { - { - .iv = 250, - .lvl = 50, - .species = SPECIES_SEALEO, - .heldItem = ITEM_NONE, - .moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_HAIL, MOVE_ICE_BALL - }, - { - .iv = 250, - .lvl = 50, - .species = SPECIES_GLALIE, - .heldItem = ITEM_NONE, - .moves = MOVE_LIGHT_SCREEN, MOVE_CRUNCH, MOVE_ICY_WIND, MOVE_ICE_BEAM - }, - { - .iv = 250, - .lvl = 52, - .species = SPECIES_SEALEO, - .heldItem = ITEM_NONE, - .moves = MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_HAIL, MOVE_BLIZZARD - }, - { - .iv = 250, - .lvl = 52, - .species = SPECIES_GLALIE, - .heldItem = ITEM_NONE, - .moves = MOVE_SHADOW_BALL, MOVE_EXPLOSION, MOVE_HAIL, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_WALREIN, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SURF, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_SHEER_COLD - } + { + .iv = 250, + .lvl = 50, + .species = SPECIES_SEALEO, + .heldItem = ITEM_NONE, + .moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_HAIL, MOVE_ICE_BALL + }, + { + .iv = 250, + .lvl = 50, + .species = SPECIES_GLALIE, + .heldItem = ITEM_NONE, + .moves = MOVE_LIGHT_SCREEN, MOVE_CRUNCH, MOVE_ICY_WIND, MOVE_ICE_BEAM + }, + { + .iv = 250, + .lvl = 52, + .species = SPECIES_SEALEO, + .heldItem = ITEM_NONE, + .moves = MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_HAIL, MOVE_BLIZZARD + }, + { + .iv = 250, + .lvl = 52, + .species = SPECIES_GLALIE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHADOW_BALL, MOVE_EXPLOSION, MOVE_HAIL, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_WALREIN, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SURF, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_SHEER_COLD + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Drake[] = { - { - .iv = 250, - .lvl = 52, - .species = SPECIES_SHELGON, - .heldItem = ITEM_NONE, - .moves = MOVE_ROCK_TOMB, MOVE_DRAGON_CLAW, MOVE_PROTECT, MOVE_DOUBLE_EDGE - }, - { - .iv = 250, - .lvl = 54, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_NONE, - .moves = MOVE_DOUBLE_EDGE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE - }, - { - .iv = 250, - .lvl = 53, - .species = SPECIES_KINGDRA, - .heldItem = ITEM_NONE, - .moves = MOVE_SMOKESCREEN, MOVE_DRAGON_DANCE, MOVE_SURF, MOVE_BODY_SLAM - }, - { - .iv = 250, - .lvl = 53, - .species = SPECIES_FLYGON, - .heldItem = ITEM_NONE, - .moves = MOVE_FLAMETHROWER, MOVE_CRUNCH, MOVE_DRAGON_BREATH, MOVE_EARTHQUAKE - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_SALAMENCE, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_ROCK_SLIDE, MOVE_CRUNCH - } + { + .iv = 250, + .lvl = 52, + .species = SPECIES_SHELGON, + .heldItem = ITEM_NONE, + .moves = MOVE_ROCK_TOMB, MOVE_DRAGON_CLAW, MOVE_PROTECT, MOVE_DOUBLE_EDGE + }, + { + .iv = 250, + .lvl = 54, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_NONE, + .moves = MOVE_DOUBLE_EDGE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE + }, + { + .iv = 250, + .lvl = 53, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_NONE, + .moves = MOVE_SMOKESCREEN, MOVE_DRAGON_DANCE, MOVE_SURF, MOVE_BODY_SLAM + }, + { + .iv = 250, + .lvl = 53, + .species = SPECIES_FLYGON, + .heldItem = ITEM_NONE, + .moves = MOVE_FLAMETHROWER, MOVE_CRUNCH, MOVE_DRAGON_BREATH, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_SALAMENCE, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_ROCK_SLIDE, MOVE_CRUNCH + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne1[] = { - { - .iv = 100, - .lvl = 12, - .species = SPECIES_GEODUDE, - .heldItem = ITEM_NONE, - .moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB - }, - { - .iv = 100, - .lvl = 12, - .species = SPECIES_GEODUDE, - .heldItem = ITEM_NONE, - .moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB - }, - { - .iv = 200, - .lvl = 15, - .species = SPECIES_NOSEPASS, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_BLOCK, MOVE_HARDEN, MOVE_TACKLE, MOVE_ROCK_TOMB - } + { + .iv = 100, + .lvl = 12, + .species = SPECIES_GEODUDE, + .heldItem = ITEM_NONE, + .moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB + }, + { + .iv = 100, + .lvl = 12, + .species = SPECIES_GEODUDE, + .heldItem = ITEM_NONE, + .moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB + }, + { + .iv = 200, + .lvl = 15, + .species = SPECIES_NOSEPASS, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_BLOCK, MOVE_HARDEN, MOVE_TACKLE, MOVE_ROCK_TOMB + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Brawly1[] = { - { - .iv = 100, - .lvl = 16, - .species = SPECIES_MACHOP, - .heldItem = ITEM_NONE, - .moves = MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SEISMIC_TOSS, MOVE_BULK_UP - }, - { - .iv = 100, - .lvl = 16, - .species = SPECIES_MEDITITE, - .heldItem = ITEM_NONE, - .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_BULK_UP - }, - { - .iv = 200, - .lvl = 19, - .species = SPECIES_MAKUHITA, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_ARM_THRUST, MOVE_VITAL_THROW, MOVE_REVERSAL, MOVE_BULK_UP - } + { + .iv = 100, + .lvl = 16, + .species = SPECIES_MACHOP, + .heldItem = ITEM_NONE, + .moves = MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SEISMIC_TOSS, MOVE_BULK_UP + }, + { + .iv = 100, + .lvl = 16, + .species = SPECIES_MEDITITE, + .heldItem = ITEM_NONE, + .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_BULK_UP + }, + { + .iv = 200, + .lvl = 19, + .species = SPECIES_MAKUHITA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_ARM_THRUST, MOVE_VITAL_THROW, MOVE_REVERSAL, MOVE_BULK_UP + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Wattson1[] = { - { - .iv = 200, - .lvl = 20, - .species = SPECIES_VOLTORB, - .heldItem = ITEM_NONE, - .moves = MOVE_ROLLOUT, MOVE_SPARK, MOVE_SELF_DESTRUCT, MOVE_SHOCK_WAVE - }, - { - .iv = 200, - .lvl = 20, - .species = SPECIES_ELECTRIKE, - .heldItem = ITEM_NONE, - .moves = MOVE_SHOCK_WAVE, MOVE_LEER, MOVE_QUICK_ATTACK, MOVE_HOWL - }, - { - .iv = 220, - .lvl = 22, - .species = SPECIES_MAGNETON, - .heldItem = ITEM_NONE, - .moves = MOVE_SUPERSONIC, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM - }, - { - .iv = 250, - .lvl = 24, - .species = SPECIES_MANECTRIC, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE, MOVE_HOWL - } + { + .iv = 200, + .lvl = 20, + .species = SPECIES_VOLTORB, + .heldItem = ITEM_NONE, + .moves = MOVE_ROLLOUT, MOVE_SPARK, MOVE_SELF_DESTRUCT, MOVE_SHOCK_WAVE + }, + { + .iv = 200, + .lvl = 20, + .species = SPECIES_ELECTRIKE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHOCK_WAVE, MOVE_LEER, MOVE_QUICK_ATTACK, MOVE_HOWL + }, + { + .iv = 220, + .lvl = 22, + .species = SPECIES_MAGNETON, + .heldItem = ITEM_NONE, + .moves = MOVE_SUPERSONIC, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM + }, + { + .iv = 250, + .lvl = 24, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE, MOVE_HOWL + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Flannery1[] = { - { - .iv = 200, - .lvl = 24, - .species = SPECIES_NUMEL, - .heldItem = ITEM_NONE, - .moves = MOVE_OVERHEAT, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY - }, - { - .iv = 200, - .lvl = 24, - .species = SPECIES_SLUGMA, - .heldItem = ITEM_NONE, - .moves = MOVE_OVERHEAT, MOVE_SMOG, MOVE_LIGHT_SCREEN, MOVE_SUNNY_DAY - }, - { - .iv = 250, - .lvl = 26, - .species = SPECIES_CAMERUPT, - .heldItem = ITEM_NONE, - .moves = MOVE_OVERHEAT, MOVE_TACKLE, MOVE_SUNNY_DAY, MOVE_ATTRACT - }, - { - .iv = 250, - .lvl = 29, - .species = SPECIES_TORKOAL, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_BODY_SLAM, MOVE_ATTRACT - } + { + .iv = 200, + .lvl = 24, + .species = SPECIES_NUMEL, + .heldItem = ITEM_NONE, + .moves = MOVE_OVERHEAT, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY + }, + { + .iv = 200, + .lvl = 24, + .species = SPECIES_SLUGMA, + .heldItem = ITEM_NONE, + .moves = MOVE_OVERHEAT, MOVE_SMOG, MOVE_LIGHT_SCREEN, MOVE_SUNNY_DAY + }, + { + .iv = 250, + .lvl = 26, + .species = SPECIES_CAMERUPT, + .heldItem = ITEM_NONE, + .moves = MOVE_OVERHEAT, MOVE_TACKLE, MOVE_SUNNY_DAY, MOVE_ATTRACT + }, + { + .iv = 250, + .lvl = 29, + .species = SPECIES_TORKOAL, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_BODY_SLAM, MOVE_ATTRACT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Norman1[] = { - { - .iv = 200, - .lvl = 27, - .species = SPECIES_SPINDA, - .heldItem = ITEM_NONE, - .moves = MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FACADE, MOVE_ENCORE - }, - { - .iv = 200, - .lvl = 27, - .species = SPECIES_VIGOROTH, - .heldItem = ITEM_NONE, - .moves = MOVE_SLASH, MOVE_FACADE, MOVE_ENCORE, MOVE_FAINT_ATTACK - }, - { - .iv = 200, - .lvl = 29, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NONE, - .moves = MOVE_SLASH, MOVE_BELLY_DRUM, MOVE_FACADE, MOVE_HEADBUTT - }, - { - .iv = 250, - .lvl = 31, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_COUNTER, MOVE_YAWN, MOVE_FACADE, MOVE_FAINT_ATTACK - } + { + .iv = 200, + .lvl = 27, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FACADE, MOVE_ENCORE + }, + { + .iv = 200, + .lvl = 27, + .species = SPECIES_VIGOROTH, + .heldItem = ITEM_NONE, + .moves = MOVE_SLASH, MOVE_FACADE, MOVE_ENCORE, MOVE_FAINT_ATTACK + }, + { + .iv = 200, + .lvl = 29, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NONE, + .moves = MOVE_SLASH, MOVE_BELLY_DRUM, MOVE_FACADE, MOVE_HEADBUTT + }, + { + .iv = 250, + .lvl = 31, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_COUNTER, MOVE_YAWN, MOVE_FACADE, MOVE_FAINT_ATTACK + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Winona1[] = { - { - .iv = 210, - .lvl = 29, - .species = SPECIES_SWABLU, - .heldItem = ITEM_NONE, - .moves = MOVE_PERISH_SONG, MOVE_MIRROR_MOVE, MOVE_SAFEGUARD, MOVE_AERIAL_ACE - }, - { - .iv = 210, - .lvl = 29, - .species = SPECIES_TROPIUS, - .heldItem = ITEM_NONE, - .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_SYNTHESIS - }, - { - .iv = 210, - .lvl = 30, - .species = SPECIES_PELIPPER, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE - }, - { - .iv = 220, - .lvl = 31, - .species = SPECIES_SKARMORY, - .heldItem = ITEM_NONE, - .moves = MOVE_SAND_ATTACK, MOVE_FURY_ATTACK, MOVE_STEEL_WING, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 33, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE - } + { + .iv = 210, + .lvl = 29, + .species = SPECIES_SWABLU, + .heldItem = ITEM_NONE, + .moves = MOVE_PERISH_SONG, MOVE_MIRROR_MOVE, MOVE_SAFEGUARD, MOVE_AERIAL_ACE + }, + { + .iv = 210, + .lvl = 29, + .species = SPECIES_TROPIUS, + .heldItem = ITEM_NONE, + .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_SYNTHESIS + }, + { + .iv = 210, + .lvl = 30, + .species = SPECIES_PELIPPER, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE + }, + { + .iv = 220, + .lvl = 31, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_SAND_ATTACK, MOVE_FURY_ATTACK, MOVE_STEEL_WING, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 33, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza1[] = { - { - .iv = 250, - .lvl = 41, - .species = SPECIES_CLAYDOL, - .heldItem = ITEM_NONE, - .moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN - }, - { - .iv = 250, - .lvl = 41, - .species = SPECIES_XATU, - .heldItem = ITEM_NONE, - .moves = MOVE_PSYCHIC, MOVE_SUNNY_DAY, MOVE_CONFUSE_RAY, MOVE_CALM_MIND - }, - { - .iv = 250, - .lvl = 42, - .species = SPECIES_LUNATONE, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_CALM_MIND - }, - { - .iv = 250, - .lvl = 42, - .species = SPECIES_SOLROCK, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER - } + { + .iv = 250, + .lvl = 41, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN + }, + { + .iv = 250, + .lvl = 41, + .species = SPECIES_XATU, + .heldItem = ITEM_NONE, + .moves = MOVE_PSYCHIC, MOVE_SUNNY_DAY, MOVE_CONFUSE_RAY, MOVE_CALM_MIND + }, + { + .iv = 250, + .lvl = 42, + .species = SPECIES_LUNATONE, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_CALM_MIND + }, + { + .iv = 250, + .lvl = 42, + .species = SPECIES_SOLROCK, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Juan1[] = { - { - .iv = 200, - .lvl = 41, - .species = SPECIES_LUVDISC, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL - }, - { - .iv = 200, - .lvl = 41, - .species = SPECIES_WHISCASH, - .heldItem = ITEM_NONE, - .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_AMNESIA, MOVE_EARTHQUAKE - }, - { - .iv = 200, - .lvl = 43, - .species = SPECIES_SEALEO, - .heldItem = ITEM_NONE, - .moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_AURORA_BEAM, MOVE_WATER_PULSE - }, - { - .iv = 200, - .lvl = 43, - .species = SPECIES_CRAWDAUNT, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_PULSE, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_LEER - }, - { - .iv = 250, - .lvl = 46, - .species = SPECIES_KINGDRA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST - } + { + .iv = 200, + .lvl = 41, + .species = SPECIES_LUVDISC, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL + }, + { + .iv = 200, + .lvl = 41, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_AMNESIA, MOVE_EARTHQUAKE + }, + { + .iv = 200, + .lvl = 43, + .species = SPECIES_SEALEO, + .heldItem = ITEM_NONE, + .moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_AURORA_BEAM, MOVE_WATER_PULSE + }, + { + .iv = 200, + .lvl = 43, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_LEER + }, + { + .iv = 250, + .lvl = 46, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry1[] = { - { - .iv = 10, - .lvl = 9, - .species = SPECIES_RALTS, - } + { + .iv = 10, + .lvl = 9, + .species = SPECIES_RALTS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ted[] = { - { - .iv = 10, - .lvl = 17, - .species = SPECIES_RALTS, - } + { + .iv = 10, + .lvl = 17, + .species = SPECIES_RALTS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paul[] = { - { - .iv = 10, - .lvl = 15, - .species = SPECIES_NUMEL, - }, - { - .iv = 10, - .lvl = 15, - .species = SPECIES_ODDISH, - }, - { - .iv = 10, - .lvl = 15, - .species = SPECIES_WINGULL, - } + { + .iv = 10, + .lvl = 15, + .species = SPECIES_NUMEL, + }, + { + .iv = 10, + .lvl = 15, + .species = SPECIES_ODDISH, + }, + { + .iv = 10, + .lvl = 15, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry2[] = { - { - .iv = 20, - .lvl = 26, - .species = SPECIES_RALTS, - }, - { - .iv = 20, - .lvl = 26, - .species = SPECIES_MEDITITE, - } + { + .iv = 20, + .lvl = 26, + .species = SPECIES_RALTS, + }, + { + .iv = 20, + .lvl = 26, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry3[] = { - { - .iv = 30, - .lvl = 29, - .species = SPECIES_KIRLIA, - }, - { - .iv = 30, - .lvl = 29, - .species = SPECIES_MEDITITE, - } + { + .iv = 30, + .lvl = 29, + .species = SPECIES_KIRLIA, + }, + { + .iv = 30, + .lvl = 29, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry4[] = { - { - .iv = 40, - .lvl = 32, - .species = SPECIES_KIRLIA, - }, - { - .iv = 40, - .lvl = 32, - .species = SPECIES_MEDICHAM, - } + { + .iv = 40, + .lvl = 32, + .species = SPECIES_KIRLIA, + }, + { + .iv = 40, + .lvl = 32, + .species = SPECIES_MEDICHAM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry5[] = { - { - .iv = 50, - .lvl = 34, - .species = SPECIES_KIRLIA, - }, - { - .iv = 50, - .lvl = 34, - .species = SPECIES_BANETTE, - }, - { - .iv = 50, - .lvl = 34, - .species = SPECIES_MEDICHAM, - } + { + .iv = 50, + .lvl = 34, + .species = SPECIES_KIRLIA, + }, + { + .iv = 50, + .lvl = 34, + .species = SPECIES_BANETTE, + }, + { + .iv = 50, + .lvl = 34, + .species = SPECIES_MEDICHAM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen1[] = { - { - .iv = 10, - .lvl = 9, - .species = SPECIES_SHROOMISH, - } + { + .iv = 10, + .lvl = 9, + .species = SPECIES_SHROOMISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Georgia[] = { - { - .iv = 10, - .lvl = 16, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 10, - .lvl = 16, - .species = SPECIES_BEAUTIFLY, - } + { + .iv = 10, + .lvl = 16, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 10, + .lvl = 16, + .species = SPECIES_BEAUTIFLY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen2[] = { - { - .iv = 20, - .lvl = 26, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 20, - .lvl = 26, - .species = SPECIES_WHISMUR, - } + { + .iv = 20, + .lvl = 26, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 20, + .lvl = 26, + .species = SPECIES_WHISMUR, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen3[] = { - { - .iv = 30, - .lvl = 29, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 30, - .lvl = 29, - .species = SPECIES_LOUDRED, - } + { + .iv = 30, + .lvl = 29, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 30, + .lvl = 29, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen4[] = { - { - .iv = 40, - .lvl = 32, - .species = SPECIES_BRELOOM, - }, - { - .iv = 40, - .lvl = 32, - .species = SPECIES_LOUDRED, - } + { + .iv = 40, + .lvl = 32, + .species = SPECIES_BRELOOM, + }, + { + .iv = 40, + .lvl = 32, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen5[] = { - { - .iv = 50, - .lvl = 35, - .species = SPECIES_BRELOOM, - }, - { - .iv = 50, - .lvl = 35, - .species = SPECIES_EXPLOUD, - } + { + .iv = 50, + .lvl = 35, + .species = SPECIES_BRELOOM, + }, + { + .iv = 50, + .lvl = 35, + .species = SPECIES_EXPLOUD, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_KateAndJoy[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_SPINDA, - .moves = MOVE_HYPNOSIS, MOVE_PSYBEAM, MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE - }, - { - .iv = 0, - .lvl = 32, - .species = SPECIES_SLAKING, - .moves = MOVE_FOCUS_PUNCH, MOVE_YAWN, MOVE_SLACK_OFF, MOVE_FAINT_ATTACK - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_SPINDA, + .moves = MOVE_HYPNOSIS, MOVE_PSYBEAM, MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE + }, + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SLAKING, + .moves = MOVE_FOCUS_PUNCH, MOVE_YAWN, MOVE_SLACK_OFF, MOVE_FAINT_ATTACK + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg1[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_ZIGZAGOON, - .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_MAKUHITA, - .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_ZIGZAGOON, + .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_MAKUHITA, + .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg2[] = { - { - .iv = 10, - .lvl = 28, - .species = SPECIES_ZIGZAGOON, - .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH - }, - { - .iv = 10, - .lvl = 30, - .species = SPECIES_MAKUHITA, - .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE - } + { + .iv = 10, + .lvl = 28, + .species = SPECIES_ZIGZAGOON, + .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH + }, + { + .iv = 10, + .lvl = 30, + .species = SPECIES_MAKUHITA, + .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg3[] = { - { - .iv = 20, - .lvl = 31, - .species = SPECIES_ZIGZAGOON, - .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_MAKUHITA, - .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE - } + { + .iv = 20, + .lvl = 31, + .species = SPECIES_ZIGZAGOON, + .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_MAKUHITA, + .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg4[] = { - { - .iv = 30, - .lvl = 34, - .species = SPECIES_LINOONE, - .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH - }, - { - .iv = 30, - .lvl = 36, - .species = SPECIES_MAKUHITA, - .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE - } + { + .iv = 30, + .lvl = 34, + .species = SPECIES_LINOONE, + .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_MAKUHITA, + .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg5[] = { - { - .iv = 40, - .lvl = 36, - .species = SPECIES_LINOONE, - .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH - }, - { - .iv = 40, - .lvl = 38, - .species = SPECIES_HARIYAMA, - .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE - } + { + .iv = 40, + .lvl = 36, + .species = SPECIES_LINOONE, + .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH + }, + { + .iv = 40, + .lvl = 38, + .species = SPECIES_HARIYAMA, + .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Victor[] = { - { - .iv = 25, - .lvl = 16, - .species = SPECIES_TAILLOW, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 25, - .lvl = 16, - .species = SPECIES_ZIGZAGOON, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 25, + .lvl = 16, + .species = SPECIES_TAILLOW, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 25, + .lvl = 16, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel1[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Colton[] = { - { - .iv = 0, - .lvl = 22, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - }, - { - .iv = 0, - .lvl = 36, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - }, - { - .iv = 0, - .lvl = 40, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - }, - { - .iv = 0, - .lvl = 12, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - }, - { - .iv = 0, - .lvl = 42, - .species = SPECIES_DELCATTY, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - } + { + .iv = 0, + .lvl = 22, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + }, + { + .iv = 0, + .lvl = 36, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + }, + { + .iv = 0, + .lvl = 40, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + }, + { + .iv = 0, + .lvl = 12, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + }, + { + .iv = 0, + .lvl = 42, + .species = SPECIES_DELCATTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel2[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel3[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel4[] = { - { - .iv = 0, - .lvl = 35, - .species = SPECIES_DELCATTY, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 0, + .lvl = 35, + .species = SPECIES_DELCATTY, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel5[] = { - { - .iv = 0, - .lvl = 38, - .species = SPECIES_DELCATTY, - .heldItem = ITEM_SITRUS_BERRY - } + { + .iv = 0, + .lvl = 38, + .species = SPECIES_DELCATTY, + .heldItem = ITEM_SITRUS_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Victoria[] = { - { - .iv = 50, - .lvl = 17, - .species = SPECIES_ROSELIA, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 50, + .lvl = 17, + .species = SPECIES_ROSELIA, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Vanessa[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_PIKACHU, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_PIKACHU, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Bethany[] = { - { - .iv = 100, - .lvl = 35, - .species = SPECIES_AZURILL, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 100, - .lvl = 37, - .species = SPECIES_MARILL, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 100, - .lvl = 39, - .species = SPECIES_AZUMARILL, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 100, + .lvl = 35, + .species = SPECIES_AZURILL, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 100, + .lvl = 37, + .species = SPECIES_MARILL, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_AZUMARILL, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel1[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_PLUSLE, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_MINUN, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_MINUN, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel2[] = { - { - .iv = 10, - .lvl = 26, - .species = SPECIES_PLUSLE, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 10, - .lvl = 26, - .species = SPECIES_MINUN, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 10, + .lvl = 26, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_MINUN, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_PLUSLE, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_MINUN, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_MINUN, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel4[] = { - { - .iv = 30, - .lvl = 32, - .species = SPECIES_PLUSLE, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 30, - .lvl = 32, - .species = SPECIES_MINUN, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 30, + .lvl = 32, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_MINUN, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel5[] = { - { - .iv = 40, - .lvl = 35, - .species = SPECIES_PLUSLE, - .heldItem = ITEM_SITRUS_BERRY - }, - { - .iv = 40, - .lvl = 35, - .species = SPECIES_MINUN, - .heldItem = ITEM_SITRUS_BERRY - } + { + .iv = 40, + .lvl = 35, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_SITRUS_BERRY + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_MINUN, + .heldItem = ITEM_SITRUS_BERRY + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timothy1[] = { - { - .iv = 200, - .lvl = 27, - .species = SPECIES_HARIYAMA, - } + { + .iv = 200, + .lvl = 27, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy2[] = { - { - .iv = 210, - .lvl = 33, - .species = SPECIES_HARIYAMA, - .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG - } + { + .iv = 210, + .lvl = 33, + .species = SPECIES_HARIYAMA, + .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy3[] = { - { - .iv = 220, - .lvl = 36, - .species = SPECIES_HARIYAMA, - .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG - } + { + .iv = 220, + .lvl = 36, + .species = SPECIES_HARIYAMA, + .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy4[] = { - { - .iv = 230, - .lvl = 39, - .species = SPECIES_HARIYAMA, - .moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG - } + { + .iv = 230, + .lvl = 39, + .species = SPECIES_HARIYAMA, + .moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy5[] = { - { - .iv = 240, - .lvl = 42, - .species = SPECIES_HARIYAMA, - .moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG - } + { + .iv = 240, + .lvl = 42, + .species = SPECIES_HARIYAMA, + .moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Vicky[] = { - { - .iv = 200, - .lvl = 18, - .species = SPECIES_MEDITITE, - .moves = MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_CONFUSION, MOVE_DETECT - } + { + .iv = 200, + .lvl = 18, + .species = SPECIES_MEDITITE, + .moves = MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_CONFUSION, MOVE_DETECT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby1[] = { - { - .iv = 200, - .lvl = 21, - .species = SPECIES_MEDITITE, - }, - { - .iv = 200, - .lvl = 21, - .species = SPECIES_MAKUHITA, - } + { + .iv = 200, + .lvl = 21, + .species = SPECIES_MEDITITE, + }, + { + .iv = 200, + .lvl = 21, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby2[] = { - { - .iv = 210, - .lvl = 30, - .species = SPECIES_MEDITITE, - }, - { - .iv = 210, - .lvl = 30, - .species = SPECIES_MAKUHITA, - } + { + .iv = 210, + .lvl = 30, + .species = SPECIES_MEDITITE, + }, + { + .iv = 210, + .lvl = 30, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby3[] = { - { - .iv = 220, - .lvl = 33, - .species = SPECIES_MEDICHAM, - }, - { - .iv = 220, - .lvl = 33, - .species = SPECIES_HARIYAMA, - } + { + .iv = 220, + .lvl = 33, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 220, + .lvl = 33, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby4[] = { - { - .iv = 230, - .lvl = 36, - .species = SPECIES_MEDICHAM, - }, - { - .iv = 230, - .lvl = 36, - .species = SPECIES_HARIYAMA, - } + { + .iv = 230, + .lvl = 36, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 230, + .lvl = 36, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby5[] = { - { - .iv = 240, - .lvl = 39, - .species = SPECIES_MEDICHAM, - }, - { - .iv = 240, - .lvl = 39, - .species = SPECIES_HARIYAMA, - } + { + .iv = 240, + .lvl = 39, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 240, + .lvl = 39, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Billy[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 7, - .species = SPECIES_SEEDOT, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 7, + .species = SPECIES_SEEDOT, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Josh[] = { - { - .iv = 100, - .lvl = 10, - .species = SPECIES_GEODUDE, - .moves = MOVE_TACKLE, MOVE_NONE, MOVE_NONE, MOVE_NONE - } + { + .iv = 100, + .lvl = 10, + .species = SPECIES_GEODUDE, + .moves = MOVE_TACKLE, MOVE_NONE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tommy[] = { - { - .iv = 110, - .lvl = 8, - .species = SPECIES_GEODUDE, - }, - { - .iv = 120, - .lvl = 8, - .species = SPECIES_GEODUDE, - } + { + .iv = 110, + .lvl = 8, + .species = SPECIES_GEODUDE, + }, + { + .iv = 120, + .lvl = 8, + .species = SPECIES_GEODUDE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joey[] = { - { - .iv = 0, - .lvl = 9, - .species = SPECIES_MACHOP, - } + { + .iv = 0, + .lvl = 9, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Ben[] = { - { - .iv = 150, - .lvl = 17, - .species = SPECIES_ZIGZAGOON, - .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_GROWL, MOVE_THUNDERBOLT - }, - { - .iv = 150, - .lvl = 17, - .species = SPECIES_GULPIN, - .moves = MOVE_AMNESIA, MOVE_SLUDGE, MOVE_YAWN, MOVE_POUND - } + { + .iv = 150, + .lvl = 17, + .species = SPECIES_ZIGZAGOON, + .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_GROWL, MOVE_THUNDERBOLT + }, + { + .iv = 150, + .lvl = 17, + .species = SPECIES_GULPIN, + .moves = MOVE_AMNESIA, MOVE_SLUDGE, MOVE_YAWN, MOVE_POUND + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Quincy[] = { - { - .iv = 100, - .lvl = 43, - .species = SPECIES_SLAKING, - .moves = MOVE_ATTRACT, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER - }, - { - .iv = 100, - .lvl = 43, - .species = SPECIES_DUSCLOPS, - .moves = MOVE_SKILL_SWAP, MOVE_PROTECT, MOVE_WILL_O_WISP, MOVE_TOXIC - } + { + .iv = 100, + .lvl = 43, + .species = SPECIES_SLAKING, + .moves = MOVE_ATTRACT, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER + }, + { + .iv = 100, + .lvl = 43, + .species = SPECIES_DUSCLOPS, + .moves = MOVE_SKILL_SWAP, MOVE_PROTECT, MOVE_WILL_O_WISP, MOVE_TOXIC + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Katelynn[] = { - { - .iv = 100, - .lvl = 43, - .species = SPECIES_GARDEVOIR, - .moves = MOVE_SKILL_SWAP, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_CALM_MIND - }, - { - .iv = 100, - .lvl = 43, - .species = SPECIES_SLAKING, - .moves = MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK - } + { + .iv = 100, + .lvl = 43, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_SKILL_SWAP, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_CALM_MIND + }, + { + .iv = 100, + .lvl = 43, + .species = SPECIES_SLAKING, + .moves = MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jaylen[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_TRAPINCH, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_TRAPINCH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dillon[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_ARON, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_ARON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin2[] = { - { - .iv = 10, - .lvl = 27, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 10, + .lvl = 27, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin3[] = { - { - .iv = 20, - .lvl = 28, - .species = SPECIES_SWELLOW, - }, - { - .iv = 20, - .lvl = 30, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 20, + .lvl = 28, + .species = SPECIES_SWELLOW, + }, + { + .iv = 20, + .lvl = 30, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin4[] = { - { - .iv = 30, - .lvl = 31, - .species = SPECIES_SWELLOW, - }, - { - .iv = 30, - .lvl = 29, - .species = SPECIES_LINOONE, - }, - { - .iv = 30, - .lvl = 33, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SWELLOW, + }, + { + .iv = 30, + .lvl = 29, + .species = SPECIES_LINOONE, + }, + { + .iv = 30, + .lvl = 33, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin5[] = { - { - .iv = 40, - .lvl = 34, - .species = SPECIES_SWELLOW, - }, - { - .iv = 40, - .lvl = 32, - .species = SPECIES_LINOONE, - }, - { - .iv = 40, - .lvl = 36, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 40, + .lvl = 34, + .species = SPECIES_SWELLOW, + }, + { + .iv = 40, + .lvl = 32, + .species = SPECIES_LINOONE, + }, + { + .iv = 40, + .lvl = 36, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eddie[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 16, - .species = SPECIES_ZIGZAGOON, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 16, + .species = SPECIES_ZIGZAGOON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allen[] = { - { - .iv = 0, - .lvl = 4, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 3, - .species = SPECIES_TAILLOW, - } + { + .iv = 0, + .lvl = 4, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 3, + .species = SPECIES_TAILLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timmy[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_ARON, - }, - { - .iv = 0, - .lvl = 13, - .species = SPECIES_ELECTRIKE, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_ARON, + }, + { + .iv = 0, + .lvl = 13, + .species = SPECIES_ELECTRIKE, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Wallace[] = { - { - .iv = 255, - .lvl = 57, - .species = SPECIES_WAILORD, - .heldItem = ITEM_NONE, - .moves = MOVE_RAIN_DANCE, MOVE_WATER_SPOUT, MOVE_DOUBLE_EDGE, MOVE_BLIZZARD - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_TENTACRUEL, - .heldItem = ITEM_NONE, - .moves = MOVE_TOXIC, MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 56, - .species = SPECIES_LUDICOLO, - .heldItem = ITEM_NONE, - .moves = MOVE_GIGA_DRAIN, MOVE_SURF, MOVE_LEECH_SEED, MOVE_DOUBLE_TEAM - }, - { - .iv = 255, - .lvl = 56, - .species = SPECIES_WHISCASH, - .heldItem = ITEM_NONE, - .moves = MOVE_EARTHQUAKE, MOVE_SURF, MOVE_AMNESIA, MOVE_HYPER_BEAM - }, - { - .iv = 255, - .lvl = 56, - .species = SPECIES_GYARADOS, - .heldItem = ITEM_NONE, - .moves = MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF - }, - { - .iv = 255, - .lvl = 58, - .species = SPECIES_MILOTIC, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_RECOVER, MOVE_SURF, MOVE_ICE_BEAM, MOVE_TOXIC - } + { + .iv = 255, + .lvl = 57, + .species = SPECIES_WAILORD, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_SPOUT, MOVE_DOUBLE_EDGE, MOVE_BLIZZARD + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_TENTACRUEL, + .heldItem = ITEM_NONE, + .moves = MOVE_TOXIC, MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 56, + .species = SPECIES_LUDICOLO, + .heldItem = ITEM_NONE, + .moves = MOVE_GIGA_DRAIN, MOVE_SURF, MOVE_LEECH_SEED, MOVE_DOUBLE_TEAM + }, + { + .iv = 255, + .lvl = 56, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_SURF, MOVE_AMNESIA, MOVE_HYPER_BEAM + }, + { + .iv = 255, + .lvl = 56, + .species = SPECIES_GYARADOS, + .heldItem = ITEM_NONE, + .moves = MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_MILOTIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_RECOVER, MOVE_SURF, MOVE_ICE_BEAM, MOVE_TOXIC + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrew[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 10, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 15, - .species = SPECIES_MAGIKARP, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 10, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MAGIKARP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ivan[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 6, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 7, - .species = SPECIES_MAGIKARP, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 6, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 7, + .species = SPECIES_MAGIKARP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Claude[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_GOLDEEN, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_BARBOACH, - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_GOLDEEN, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_BARBOACH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot1[] = { - { - .iv = 0, - .lvl = 10, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 7, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 10, - .species = SPECIES_MAGIKARP, - } + { + .iv = 0, + .lvl = 10, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 7, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 10, + .species = SPECIES_MAGIKARP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ned[] = { - { - .iv = 10, - .lvl = 11, - .species = SPECIES_TENTACOOL, - } + { + .iv = 10, + .lvl = 11, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dale[] = { - { - .iv = 0, - .lvl = 11, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_WAILMER, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 11, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolan[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_BARBOACH, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_BARBOACH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barny[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wade[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_TENTACOOL, - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carter[] = { - { - .iv = 10, - .lvl = 25, - .species = SPECIES_WAILMER, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 10, + .lvl = 25, + .species = SPECIES_WAILMER, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot2[] = { - { - .iv = 10, - .lvl = 24, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 10, - .lvl = 27, - .species = SPECIES_GYARADOS, - }, - { - .iv = 10, - .lvl = 27, - .species = SPECIES_GYARADOS, - } + { + .iv = 10, + .lvl = 24, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 10, + .lvl = 27, + .species = SPECIES_GYARADOS, + }, + { + .iv = 10, + .lvl = 27, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_GYARADOS, - }, - { - .iv = 20, - .lvl = 26, - .species = SPECIES_CARVANHA, - }, - { - .iv = 20, - .lvl = 26, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_GYARADOS, - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_GYARADOS, + }, + { + .iv = 20, + .lvl = 26, + .species = SPECIES_CARVANHA, + }, + { + .iv = 20, + .lvl = 26, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot4[] = { - { - .iv = 30, - .lvl = 31, - .species = SPECIES_GYARADOS, - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_CARVANHA, - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_TENTACRUEL, - }, - { - .iv = 31, - .lvl = 31, - .species = SPECIES_GYARADOS, - } + { + .iv = 30, + .lvl = 31, + .species = SPECIES_GYARADOS, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_CARVANHA, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_TENTACRUEL, + }, + { + .iv = 31, + .lvl = 31, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot5[] = { - { - .iv = 40, - .lvl = 33, - .species = SPECIES_GYARADOS, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_SHARPEDO, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_GYARADOS, - }, - { - .iv = 40, - .lvl = 35, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GYARADOS, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_SHARPEDO, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GYARADOS, + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ronald[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 21, - .species = SPECIES_GYARADOS, - }, - { - .iv = 0, - .lvl = 23, - .species = SPECIES_GYARADOS, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_GYARADOS, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_GYARADOS, - }, - { - .iv = 0, - .lvl = 35, - .species = SPECIES_GYARADOS, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 21, + .species = SPECIES_GYARADOS, + }, + { + .iv = 0, + .lvl = 23, + .species = SPECIES_GYARADOS, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GYARADOS, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_GYARADOS, + }, + { + .iv = 0, + .lvl = 35, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacob[] = { - { - .iv = 20, - .lvl = 6, - .species = SPECIES_VOLTORB, - }, - { - .iv = 20, - .lvl = 6, - .species = SPECIES_VOLTORB, - }, - { - .iv = 200, - .lvl = 14, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 20, + .lvl = 6, + .species = SPECIES_VOLTORB, + }, + { + .iv = 20, + .lvl = 6, + .species = SPECIES_VOLTORB, + }, + { + .iv = 200, + .lvl = 14, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anthony[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin1[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin2[] = { - { - .iv = 10, - .lvl = 30, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 10, + .lvl = 30, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin3[] = { - { - .iv = 20, - .lvl = 33, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 20, + .lvl = 33, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin4[] = { - { - .iv = 30, - .lvl = 36, - .species = SPECIES_MAGNETON, - } + { + .iv = 30, + .lvl = 36, + .species = SPECIES_MAGNETON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin5[] = { - { - .iv = 40, - .lvl = 39, - .species = SPECIES_MAGNETON, - } + { + .iv = 40, + .lvl = 39, + .species = SPECIES_MAGNETON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail1[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jasmine[] = { - { - .iv = 80, - .lvl = 14, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 80, - .lvl = 14, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 0, - .lvl = 6, - .species = SPECIES_VOLTORB, - } + { + .iv = 80, + .lvl = 14, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 80, + .lvl = 14, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 0, + .lvl = 6, + .species = SPECIES_VOLTORB, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail2[] = { - { - .iv = 10, - .lvl = 28, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 10, + .lvl = 28, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail3[] = { - { - .iv = 20, - .lvl = 31, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 20, + .lvl = 31, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail4[] = { - { - .iv = 30, - .lvl = 34, - .species = SPECIES_MAGNETON, - } + { + .iv = 30, + .lvl = 34, + .species = SPECIES_MAGNETON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail5[] = { - { - .iv = 40, - .lvl = 37, - .species = SPECIES_MAGNETON, - } + { + .iv = 40, + .lvl = 37, + .species = SPECIES_MAGNETON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan1[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_DODUO, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_DODUO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan2[] = { - { - .iv = 10, - .lvl = 28, - .species = SPECIES_DODUO, - } + { + .iv = 10, + .lvl = 28, + .species = SPECIES_DODUO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan3[] = { - { - .iv = 20, - .lvl = 31, - .species = SPECIES_DODUO, - } + { + .iv = 20, + .lvl = 31, + .species = SPECIES_DODUO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan4[] = { - { - .iv = 30, - .lvl = 34, - .species = SPECIES_DODRIO, - } + { + .iv = 30, + .lvl = 34, + .species = SPECIES_DODRIO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan5[] = { - { - .iv = 40, - .lvl = 37, - .species = SPECIES_DODRIO, - } + { + .iv = 40, + .lvl = 37, + .species = SPECIES_DODRIO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria1[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_DODUO, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_DODUO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria2[] = { - { - .iv = 10, - .lvl = 28, - .species = SPECIES_DODUO, - } + { + .iv = 10, + .lvl = 28, + .species = SPECIES_DODUO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria3[] = { - { - .iv = 20, - .lvl = 31, - .species = SPECIES_DODUO, - } + { + .iv = 20, + .lvl = 31, + .species = SPECIES_DODUO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria4[] = { - { - .iv = 30, - .lvl = 34, - .species = SPECIES_DODRIO, - } + { + .iv = 30, + .lvl = 34, + .species = SPECIES_DODRIO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria5[] = { - { - .iv = 40, - .lvl = 37, - .species = SPECIES_DODRIO, - } + { + .iv = 40, + .lvl = 37, + .species = SPECIES_DODRIO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Camden[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_STARYU, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_STARYU, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Demetrius[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_ELECTRIKE, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_ELECTRIKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah1[] = { - { - .iv = 0, - .lvl = 35, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 35, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo1[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_STARYU, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_STARYU, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chase[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_WINGULL, - }, - { - .iv = 80, - .lvl = 34, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_WINGULL, + }, + { + .iv = 80, + .lvl = 34, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah2[] = { - { - .iv = 10, - .lvl = 39, - .species = SPECIES_STARYU, - } + { + .iv = 10, + .lvl = 39, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah3[] = { - { - .iv = 20, - .lvl = 42, - .species = SPECIES_STARYU, - } + { + .iv = 20, + .lvl = 42, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah4[] = { - { - .iv = 30, - .lvl = 45, - .species = SPECIES_STARMIE, - } + { + .iv = 30, + .lvl = 45, + .species = SPECIES_STARMIE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah5[] = { - { - .iv = 40, - .lvl = 48, - .species = SPECIES_STARMIE, - } + { + .iv = 40, + .lvl = 48, + .species = SPECIES_STARMIE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isobel[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donny[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_WINGULL, - }, - { - .iv = 160, - .lvl = 34, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_WINGULL, + }, + { + .iv = 160, + .lvl = 34, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Talia[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn1[] = { - { - .iv = 0, - .lvl = 35, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 35, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allison[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_WINGULL, - }, - { - .iv = 240, - .lvl = 33, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_WINGULL, + }, + { + .iv = 240, + .lvl = 33, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn2[] = { - { - .iv = 10, - .lvl = 39, - .species = SPECIES_STARYU, - } + { + .iv = 10, + .lvl = 39, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn3[] = { - { - .iv = 20, - .lvl = 42, - .species = SPECIES_STARYU, - } + { + .iv = 20, + .lvl = 42, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn4[] = { - { - .iv = 30, - .lvl = 45, - .species = SPECIES_STARMIE, - } + { + .iv = 30, + .lvl = 45, + .species = SPECIES_STARMIE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn5[] = { - { - .iv = 40, - .lvl = 48, - .species = SPECIES_STARMIE, - } + { + .iv = 40, + .lvl = 48, + .species = SPECIES_STARMIE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas1[] = { - { - .iv = 100, - .lvl = 37, - .species = SPECIES_ALTARIA, - }, - { - .iv = 100, - .lvl = 37, - .species = SPECIES_ALTARIA, - } + { + .iv = 100, + .lvl = 37, + .species = SPECIES_ALTARIA, + }, + { + .iv = 100, + .lvl = 37, + .species = SPECIES_ALTARIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas2[] = { - { - .iv = 110, - .lvl = 41, - .species = SPECIES_ALTARIA, - }, - { - .iv = 110, - .lvl = 41, - .species = SPECIES_ALTARIA, - } + { + .iv = 110, + .lvl = 41, + .species = SPECIES_ALTARIA, + }, + { + .iv = 110, + .lvl = 41, + .species = SPECIES_ALTARIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas3[] = { - { - .iv = 120, - .lvl = 44, - .species = SPECIES_ALTARIA, - }, - { - .iv = 120, - .lvl = 44, - .species = SPECIES_ALTARIA, - } + { + .iv = 120, + .lvl = 44, + .species = SPECIES_ALTARIA, + }, + { + .iv = 120, + .lvl = 44, + .species = SPECIES_ALTARIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas4[] = { - { - .iv = 130, - .lvl = 46, - .species = SPECIES_BAGON, - }, - { - .iv = 130, - .lvl = 46, - .species = SPECIES_ALTARIA, - }, - { - .iv = 130, - .lvl = 46, - .species = SPECIES_ALTARIA, - } + { + .iv = 130, + .lvl = 46, + .species = SPECIES_BAGON, + }, + { + .iv = 130, + .lvl = 46, + .species = SPECIES_ALTARIA, + }, + { + .iv = 130, + .lvl = 46, + .species = SPECIES_ALTARIA, + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Nicolas5[] = { - { - .iv = 140, - .lvl = 49, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_NONE - }, - { - .iv = 140, - .lvl = 49, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_NONE - }, - { - .iv = 140, - .lvl = 49, - .species = SPECIES_SHELGON, - .heldItem = ITEM_DRAGON_FANG - } + { + .iv = 140, + .lvl = 49, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_NONE + }, + { + .iv = 140, + .lvl = 49, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_NONE + }, + { + .iv = 140, + .lvl = 49, + .species = SPECIES_SHELGON, + .heldItem = ITEM_DRAGON_FANG + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Aaron[] = { - { - .iv = 255, - .lvl = 34, - .species = SPECIES_BAGON, - .moves = MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_FOCUS_ENERGY, MOVE_EMBER - } + { + .iv = 255, + .lvl = 34, + .species = SPECIES_BAGON, + .moves = MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_FOCUS_ENERGY, MOVE_EMBER + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Perry[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_WINGULL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hugh[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_TROPIUS, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_TROPIUS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phil[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_SWELLOW, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_SWELLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jared[] = { - { - .iv = 100, - .lvl = 27, - .species = SPECIES_DODUO, - }, - { - .iv = 100, - .lvl = 27, - .species = SPECIES_SKARMORY, - }, - { - .iv = 100, - .lvl = 27, - .species = SPECIES_TROPIUS, - } + { + .iv = 100, + .lvl = 27, + .species = SPECIES_DODUO, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_SKARMORY, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_TROPIUS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Humberto[] = { - { - .iv = 250, - .lvl = 30, - .species = SPECIES_SKARMORY, - } + { + .iv = 250, + .lvl = 30, + .species = SPECIES_SKARMORY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Presley[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_TROPIUS, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_XATU, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TROPIUS, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_XATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwardo[] = { - { - .iv = 150, - .lvl = 29, - .species = SPECIES_DODUO, - }, - { - .iv = 150, - .lvl = 29, - .species = SPECIES_PELIPPER, - } + { + .iv = 150, + .lvl = 29, + .species = SPECIES_DODUO, + }, + { + .iv = 150, + .lvl = 29, + .species = SPECIES_PELIPPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Colin[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_NATU, - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert1[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_SWABLU, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benny[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_SWELLOW, - }, - { - .iv = 0, - .lvl = 36, - .species = SPECIES_PELIPPER, - }, - { - .iv = 0, - .lvl = 36, - .species = SPECIES_XATU, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_SWELLOW, + }, + { + .iv = 0, + .lvl = 36, + .species = SPECIES_PELIPPER, + }, + { + .iv = 0, + .lvl = 36, + .species = SPECIES_XATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chester[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_TAILLOW, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_SWELLOW, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_TAILLOW, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_SWELLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert2[] = { - { - .iv = 10, - .lvl = 32, - .species = SPECIES_NATU, - }, - { - .iv = 10, - .lvl = 32, - .species = SPECIES_SWABLU, - } + { + .iv = 10, + .lvl = 32, + .species = SPECIES_NATU, + }, + { + .iv = 10, + .lvl = 32, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert3[] = { - { - .iv = 20, - .lvl = 35, - .species = SPECIES_NATU, - }, - { - .iv = 20, - .lvl = 35, - .species = SPECIES_ALTARIA, - } + { + .iv = 20, + .lvl = 35, + .species = SPECIES_NATU, + }, + { + .iv = 20, + .lvl = 35, + .species = SPECIES_ALTARIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert4[] = { - { - .iv = 30, - .lvl = 38, - .species = SPECIES_NATU, - }, - { - .iv = 30, - .lvl = 38, - .species = SPECIES_ALTARIA, - } + { + .iv = 30, + .lvl = 38, + .species = SPECIES_NATU, + }, + { + .iv = 30, + .lvl = 38, + .species = SPECIES_ALTARIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert5[] = { - { - .iv = 40, - .lvl = 41, - .species = SPECIES_ALTARIA, - }, - { - .iv = 40, - .lvl = 41, - .species = SPECIES_XATU, - } + { + .iv = 40, + .lvl = 41, + .species = SPECIES_ALTARIA, + }, + { + .iv = 40, + .lvl = 41, + .species = SPECIES_XATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alex[] = { - { - .iv = 150, - .lvl = 33, - .species = SPECIES_NATU, - }, - { - .iv = 150, - .lvl = 33, - .species = SPECIES_SWELLOW, - } + { + .iv = 150, + .lvl = 33, + .species = SPECIES_NATU, + }, + { + .iv = 150, + .lvl = 33, + .species = SPECIES_SWELLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beck[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_TROPIUS, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_TROPIUS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yasu[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_NINJASK, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takashi[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_NINJASK, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_KOFFING, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_NINJASK, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_KOFFING, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Dianne[] = { - { - .iv = 0, - .lvl = 43, - .species = SPECIES_CLAYDOL, - .heldItem = ITEM_NONE, - .moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_LANTURN, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 43, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_LANTURN, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jani[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao1[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lung[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_KOFFING, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_NINJASK, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_KOFFING, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao2[] = { - { - .iv = 0, - .lvl = 24, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - }, - { - .iv = 0, - .lvl = 24, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - }, - { - .iv = 0, - .lvl = 24, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_KOFFING, - .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 24, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao3[] = { - { - .iv = 20, - .lvl = 27, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - }, - { - .iv = 20, - .lvl = 27, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - }, - { - .iv = 20, - .lvl = 27, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_KOFFING, - .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE - } + { + .iv = 20, + .lvl = 27, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 20, + .lvl = 27, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 20, + .lvl = 27, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao4[] = { - { - .iv = 30, - .lvl = 30, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - }, - { - .iv = 30, - .lvl = 32, - .species = SPECIES_KOFFING, - .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE - } + { + .iv = 30, + .lvl = 30, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Lao5[] = { - { - .iv = 40, - .lvl = 33, - .species = SPECIES_KOFFING, - .heldItem = ITEM_NONE, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_KOFFING, - .heldItem = ITEM_NONE, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_KOFFING, - .heldItem = ITEM_NONE, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - }, - { - .iv = 40, - .lvl = 35, - .species = SPECIES_WEEZING, - .heldItem = ITEM_SMOKE_BALL, - .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE - } + { + .iv = 40, + .lvl = 33, + .species = SPECIES_KOFFING, + .heldItem = ITEM_NONE, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_KOFFING, + .heldItem = ITEM_NONE, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_KOFFING, + .heldItem = ITEM_NONE, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_WEEZING, + .heldItem = ITEM_SMOKE_BALL, + .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jocelyn[] = { - { - .iv = 127, - .lvl = 13, - .species = SPECIES_MEDITITE, - } + { + .iv = 127, + .lvl = 13, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laura[] = { - { - .iv = 150, - .lvl = 13, - .species = SPECIES_MEDITITE, - } + { + .iv = 150, + .lvl = 13, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy1[] = { - { - .iv = 100, - .lvl = 18, - .species = SPECIES_MEDITITE, - }, - { - .iv = 100, - .lvl = 18, - .species = SPECIES_MAKUHITA, - } + { + .iv = 100, + .lvl = 18, + .species = SPECIES_MEDITITE, + }, + { + .iv = 100, + .lvl = 18, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cora[] = { - { - .iv = 100, - .lvl = 27, - .species = SPECIES_MEDITITE, - } + { + .iv = 100, + .lvl = 27, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paula[] = { - { - .iv = 100, - .lvl = 27, - .species = SPECIES_BRELOOM, - } + { + .iv = 100, + .lvl = 27, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy2[] = { - { - .iv = 110, - .lvl = 26, - .species = SPECIES_MEDITITE, - }, - { - .iv = 110, - .lvl = 26, - .species = SPECIES_MAKUHITA, - } + { + .iv = 110, + .lvl = 26, + .species = SPECIES_MEDITITE, + }, + { + .iv = 110, + .lvl = 26, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy3[] = { - { - .iv = 120, - .lvl = 29, - .species = SPECIES_MEDITITE, - }, - { - .iv = 120, - .lvl = 29, - .species = SPECIES_MAKUHITA, - } + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MEDITITE, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy4[] = { - { - .iv = 130, - .lvl = 32, - .species = SPECIES_MEDICHAM, - }, - { - .iv = 130, - .lvl = 32, - .species = SPECIES_HARIYAMA, - } + { + .iv = 130, + .lvl = 32, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 130, + .lvl = 32, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy5[] = { - { - .iv = 140, - .lvl = 35, - .species = SPECIES_MEDICHAM, - }, - { - .iv = 140, - .lvl = 35, - .species = SPECIES_HARIYAMA, - } + { + .iv = 140, + .lvl = 35, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 140, + .lvl = 35, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline1[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_NUMEL, - .moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_NUMEL, + .moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarissa[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_ROSELIA, - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_ROSELIA, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Angelica[] = { - { - .iv = 50, - .lvl = 30, - .species = SPECIES_CASTFORM, - .moves = MOVE_RAIN_DANCE, MOVE_WEATHER_BALL, MOVE_THUNDER, MOVE_WATER_PULSE - } + { + .iv = 50, + .lvl = 30, + .species = SPECIES_CASTFORM, + .moves = MOVE_RAIN_DANCE, MOVE_WEATHER_BALL, MOVE_THUNDER, MOVE_WATER_PULSE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline2[] = { - { - .iv = 10, - .lvl = 29, - .species = SPECIES_NUMEL, - .moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY - } + { + .iv = 10, + .lvl = 29, + .species = SPECIES_NUMEL, + .moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline3[] = { - { - .iv = 20, - .lvl = 32, - .species = SPECIES_NUMEL, - .moves = MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY - } + { + .iv = 20, + .lvl = 32, + .species = SPECIES_NUMEL, + .moves = MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline4[] = { - { - .iv = 30, - .lvl = 34, - .species = SPECIES_ROSELIA, - .moves = MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_SUNNY_DAY - }, - { - .iv = 30, - .lvl = 34, - .species = SPECIES_NUMEL, - .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY - } + { + .iv = 30, + .lvl = 34, + .species = SPECIES_ROSELIA, + .moves = MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_SUNNY_DAY + }, + { + .iv = 30, + .lvl = 34, + .species = SPECIES_NUMEL, + .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline5[] = { - { - .iv = 40, - .lvl = 37, - .species = SPECIES_ROSELIA, - .moves = MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_CAMERUPT, - .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY - } + { + .iv = 40, + .lvl = 37, + .species = SPECIES_ROSELIA, + .moves = MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_CAMERUPT, + .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beverly[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Imani[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kyla[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Denise[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beth[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tara[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_HORSEA, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_HORSEA, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Missy[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alice[] = { - { - .iv = 0, - .lvl = 24, - .species = SPECIES_GOLDEEN, - }, - { - .iv = 0, - .lvl = 24, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 24, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 24, + .species = SPECIES_GOLDEEN, + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny1[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grace[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tanya[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_LUVDISC, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_LUVDISC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sharon[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_SEAKING, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SEAKING, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nikki[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_MARILL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_SPHEAL, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_MARILL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SPHEAL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenda[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katie[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_GOLDEEN, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_SPHEAL, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_GOLDEEN, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SPHEAL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Susie[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_LUVDISC, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_LUVDISC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kara[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_SEAKING, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SEAKING, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dana[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_AZUMARILL, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_AZUMARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sienna[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_LUVDISC, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_LUVDISC, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LUVDISC, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LUVDISC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Debra[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_SEAKING, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SEAKING, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Linda[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_HORSEA, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_SEADRA, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_HORSEA, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SEADRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kaylee[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_LANTURN, - }, - { - .iv = 0, - .lvl = 34, - .species = SPECIES_PELIPPER, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_LANTURN, + }, + { + .iv = 0, + .lvl = 34, + .species = SPECIES_PELIPPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laurel[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_LUVDISC, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_LUVDISC, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LUVDISC, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LUVDISC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carlee[] = { - { - .iv = 0, - .lvl = 35, - .species = SPECIES_SEAKING, - } + { + .iv = 0, + .lvl = 35, + .species = SPECIES_SEAKING, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny2[] = { - { - .iv = 0, - .lvl = 38, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 38, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny3[] = { - { - .iv = 0, - .lvl = 41, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 41, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny4[] = { - { - .iv = 0, - .lvl = 43, - .species = SPECIES_STARYU, - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 43, + .species = SPECIES_STARYU, + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny5[] = { - { - .iv = 0, - .lvl = 45, - .species = SPECIES_LUVDISC, - }, - { - .iv = 0, - .lvl = 45, - .species = SPECIES_WAILMER, - }, - { - .iv = 0, - .lvl = 45, - .species = SPECIES_STARMIE, - } + { + .iv = 0, + .lvl = 45, + .species = SPECIES_LUVDISC, + }, + { + .iv = 0, + .lvl = 45, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 45, + .species = SPECIES_STARMIE, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Heidi[] = { - { - .iv = 0, - .lvl = 22, - .species = SPECIES_SANDSHREW, - .moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH - }, - { - .iv = 0, - .lvl = 22, - .species = SPECIES_BALTOY, - .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB - } + { + .iv = 0, + .lvl = 22, + .species = SPECIES_SANDSHREW, + .moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_BALTOY, + .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Becky[] = { - { - .iv = 0, - .lvl = 22, - .species = SPECIES_SANDSHREW, - .moves = MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH, MOVE_DIG - }, - { - .iv = 0, - .lvl = 22, - .species = SPECIES_MARILL, - .moves = MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_TAIL_WHIP, MOVE_DEFENSE_CURL - } + { + .iv = 0, + .lvl = 22, + .species = SPECIES_SANDSHREW, + .moves = MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH, MOVE_DIG + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_MARILL, + .moves = MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_TAIL_WHIP, MOVE_DEFENSE_CURL + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carol[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_TAILLOW, - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_LOMBRE, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_TAILLOW, + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_LOMBRE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nancy[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_MARILL, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_LOMBRE, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_MARILL, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_LOMBRE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Martha[] = { - { - .iv = 0, - .lvl = 23, - .species = SPECIES_SKITTY, - }, - { - .iv = 0, - .lvl = 23, - .species = SPECIES_SWABLU, - } + { + .iv = 0, + .lvl = 23, + .species = SPECIES_SKITTY, + }, + { + .iv = 0, + .lvl = 23, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana1[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 19, - .species = SPECIES_ODDISH, - }, - { - .iv = 0, - .lvl = 19, - .species = SPECIES_SWABLU, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 19, + .species = SPECIES_ODDISH, + }, + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Cedric[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_WOBBUFFET, - .moves = MOVE_DESTINY_BOND, MOVE_SAFEGUARD, MOVE_COUNTER, MOVE_MIRROR_COAT - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_WOBBUFFET, + .moves = MOVE_DESTINY_BOND, MOVE_SAFEGUARD, MOVE_COUNTER, MOVE_MIRROR_COAT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Irene[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana2[] = { - { - .iv = 10, - .lvl = 25, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_GLOOM, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_SWABLU, - } + { + .iv = 10, + .lvl = 25, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_GLOOM, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana3[] = { - { - .iv = 20, - .lvl = 28, - .species = SPECIES_BRELOOM, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_GLOOM, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_SWABLU, - } + { + .iv = 20, + .lvl = 28, + .species = SPECIES_BRELOOM, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_GLOOM, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana4[] = { - { - .iv = 30, - .lvl = 31, - .species = SPECIES_BRELOOM, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_GLOOM, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_SWABLU, - } + { + .iv = 30, + .lvl = 31, + .species = SPECIES_BRELOOM, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_GLOOM, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana5[] = { - { - .iv = 40, - .lvl = 40, - .species = SPECIES_BRELOOM, - }, - { - .iv = 40, - .lvl = 40, - .species = SPECIES_VILEPLUME, - }, - { - .iv = 40, - .lvl = 40, - .species = SPECIES_ALTARIA, - } + { + .iv = 40, + .lvl = 40, + .species = SPECIES_BRELOOM, + }, + { + .iv = 40, + .lvl = 40, + .species = SPECIES_VILEPLUME, + }, + { + .iv = 40, + .lvl = 40, + .species = SPECIES_ALTARIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv1[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_PLUSLE, - }, - { - .iv = 0, - .lvl = 15, - .species = SPECIES_MINUN, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_PLUSLE, + }, + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MINUN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv2[] = { - { - .iv = 10, - .lvl = 27, - .species = SPECIES_PLUSLE, - }, - { - .iv = 10, - .lvl = 27, - .species = SPECIES_MINUN, - } + { + .iv = 10, + .lvl = 27, + .species = SPECIES_PLUSLE, + }, + { + .iv = 10, + .lvl = 27, + .species = SPECIES_MINUN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_GinaAndMia1[] = { - { - .iv = 0, - .lvl = 6, - .species = SPECIES_SEEDOT, - }, - { - .iv = 0, - .lvl = 6, - .species = SPECIES_LOTAD, - } + { + .iv = 0, + .lvl = 6, + .species = SPECIES_SEEDOT, + }, + { + .iv = 0, + .lvl = 6, + .species = SPECIES_LOTAD, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_MiuAndYuki[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_BEAUTIFLY, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_DUSTOX, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_BEAUTIFLY, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_DUSTOX, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv3[] = { - { - .iv = 0, - .lvl = 9, - .species = SPECIES_PLUSLE, - }, - { - .iv = 0, - .lvl = 9, - .species = SPECIES_MINUN, - } + { + .iv = 0, + .lvl = 9, + .species = SPECIES_PLUSLE, + }, + { + .iv = 0, + .lvl = 9, + .species = SPECIES_MINUN, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_GinaAndMia2[] = { - { - .iv = 0, - .lvl = 10, - .species = SPECIES_DUSKULL, - .moves = MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_NONE, MOVE_NONE - }, - { - .iv = 0, - .lvl = 10, - .species = SPECIES_SHROOMISH, - .moves = MOVE_ABSORB, MOVE_LEECH_SEED, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 10, + .species = SPECIES_DUSKULL, + .moves = MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_NONE, MOVE_NONE + }, + { + .iv = 0, + .lvl = 10, + .species = SPECIES_SHROOMISH, + .moves = MOVE_ABSORB, MOVE_LEECH_SEED, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv4[] = { - { - .iv = 20, - .lvl = 30, - .species = SPECIES_PLUSLE, - }, - { - .iv = 20, - .lvl = 30, - .species = SPECIES_MINUN, - } + { + .iv = 20, + .lvl = 30, + .species = SPECIES_PLUSLE, + }, + { + .iv = 20, + .lvl = 30, + .species = SPECIES_MINUN, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv5[] = { - { - .iv = 30, - .lvl = 33, - .species = SPECIES_PLUSLE, - .moves = MOVE_SPARK, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND - }, - { - .iv = 30, - .lvl = 33, - .species = SPECIES_MINUN, - .moves = MOVE_SPARK, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND - } + { + .iv = 30, + .lvl = 33, + .species = SPECIES_PLUSLE, + .moves = MOVE_SPARK, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND + }, + { + .iv = 30, + .lvl = 33, + .species = SPECIES_MINUN, + .moves = MOVE_SPARK, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv6[] = { - { - .iv = 40, - .lvl = 36, - .species = SPECIES_PLUSLE, - .moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND - }, - { - .iv = 40, - .lvl = 36, - .species = SPECIES_MINUN, - .moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND - } + { + .iv = 40, + .lvl = 36, + .species = SPECIES_PLUSLE, + .moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND + }, + { + .iv = 40, + .lvl = 36, + .species = SPECIES_MINUN, + .moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Huey[] = { - { - .iv = 10, - .lvl = 12, - .species = SPECIES_WINGULL, - }, - { - .iv = 10, - .lvl = 12, - .species = SPECIES_MACHOP, - } + { + .iv = 10, + .lvl = 12, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 12, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edmond[] = { - { - .iv = 0, - .lvl = 13, - .species = SPECIES_WINGULL, - } + { + .iv = 0, + .lvl = 13, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest1[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_MACHOKE, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dwayne[] = { - { - .iv = 0, - .lvl = 11, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_MACHOP, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_TENTACOOL, - } + { + .iv = 0, + .lvl = 11, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_MACHOP, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phillip[] = { - { - .iv = 0, - .lvl = 44, - .species = SPECIES_TENTACRUEL, - }, - { - .iv = 0, - .lvl = 44, - .species = SPECIES_MACHOKE, - } + { + .iv = 0, + .lvl = 44, + .species = SPECIES_TENTACRUEL, + }, + { + .iv = 0, + .lvl = 44, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonard[] = { - { - .iv = 0, - .lvl = 43, - .species = SPECIES_MACHOP, - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_PELIPPER, - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_MACHOKE, - } + { + .iv = 0, + .lvl = 43, + .species = SPECIES_MACHOP, + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_PELIPPER, + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Duncan[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_SPHEAL, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_MACHOKE, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_SPHEAL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest2[] = { - { - .iv = 10, - .lvl = 36, - .species = SPECIES_WINGULL, - }, - { - .iv = 10, - .lvl = 36, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 10, - .lvl = 36, - .species = SPECIES_MACHOKE, - } + { + .iv = 10, + .lvl = 36, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 36, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 10, + .lvl = 36, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest3[] = { - { - .iv = 20, - .lvl = 39, - .species = SPECIES_PELIPPER, - }, - { - .iv = 20, - .lvl = 39, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 20, - .lvl = 39, - .species = SPECIES_MACHOKE, - } + { + .iv = 20, + .lvl = 39, + .species = SPECIES_PELIPPER, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest4[] = { - { - .iv = 30, - .lvl = 42, - .species = SPECIES_PELIPPER, - }, - { - .iv = 30, - .lvl = 42, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 30, - .lvl = 42, - .species = SPECIES_MACHOKE, - } + { + .iv = 30, + .lvl = 42, + .species = SPECIES_PELIPPER, + }, + { + .iv = 30, + .lvl = 42, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 30, + .lvl = 42, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest5[] = { - { - .iv = 40, - .lvl = 45, - .species = SPECIES_PELIPPER, - }, - { - .iv = 40, - .lvl = 45, - .species = SPECIES_MACHOKE, - }, - { - .iv = 40, - .lvl = 45, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 40, + .lvl = 45, + .species = SPECIES_PELIPPER, + }, + { + .iv = 40, + .lvl = 45, + .species = SPECIES_MACHOKE, + }, + { + .iv = 40, + .lvl = 45, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eli[] = { - { - .iv = 100, - .lvl = 23, - .species = SPECIES_NUMEL, - } + { + .iv = 100, + .lvl = 23, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Annika[] = { - { - .iv = 100, - .lvl = 39, - .species = SPECIES_FEEBAS, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT - }, - { - .iv = 100, - .lvl = 39, - .species = SPECIES_FEEBAS, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT - } + { + .iv = 100, + .lvl = 39, + .species = SPECIES_FEEBAS, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_FEEBAS, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jazmyn[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_ABSOL, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_ABSOL, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Jonas[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_KOFFING, - .moves = MOVE_TOXIC, MOVE_THUNDER, MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_KOFFING, + .moves = MOVE_TOXIC, MOVE_THUNDER, MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Kayley[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_CASTFORM, - .moves = MOVE_SUNNY_DAY, MOVE_WEATHER_BALL, MOVE_FLAMETHROWER, MOVE_SOLAR_BEAM - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_CASTFORM, + .moves = MOVE_SUNNY_DAY, MOVE_WEATHER_BALL, MOVE_FLAMETHROWER, MOVE_SOLAR_BEAM + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Auron[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_MACHAMP, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_MACHAMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kelvin[] = { - { - .iv = 150, - .lvl = 33, - .species = SPECIES_MACHOKE, - }, - { - .iv = 150, - .lvl = 33, - .species = SPECIES_SPHEAL, - } + { + .iv = 150, + .lvl = 33, + .species = SPECIES_MACHOKE, + }, + { + .iv = 150, + .lvl = 33, + .species = SPECIES_SPHEAL, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Marley[] = { - { - .iv = 255, - .lvl = 34, - .species = SPECIES_MANECTRIC, - .heldItem = ITEM_NONE, - .moves = MOVE_BITE, MOVE_ROAR, MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT - } + { + .iv = 255, + .lvl = 34, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_NONE, + .moves = MOVE_BITE, MOVE_ROAR, MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reyna[] = { - { - .iv = 50, - .lvl = 33, - .species = SPECIES_MEDITITE, - }, - { - .iv = 200, - .lvl = 33, - .species = SPECIES_HARIYAMA, - } + { + .iv = 50, + .lvl = 33, + .species = SPECIES_MEDITITE, + }, + { + .iv = 200, + .lvl = 33, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hudson[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Conor[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_CHINCHOU, - }, - { - .iv = 200, - .lvl = 33, - .species = SPECIES_HARIYAMA, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_CHINCHOU, + }, + { + .iv = 200, + .lvl = 33, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin1[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_LOMBRE, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_LOMBRE, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hector[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_ZANGOOSE, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SEVIPER, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ZANGOOSE, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SEVIPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha1[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_CAMERUPT, - }, - { - .iv = 100, - .lvl = 38, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 100, - .lvl = 40, - .species = SPECIES_GOLBAT, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_CAMERUPT, + }, + { + .iv = 100, + .lvl = 38, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 100, + .lvl = 40, + .species = SPECIES_GOLBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin2[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_LOMBRE, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_LOMBRE, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin3[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_LOMBRE, - }, - { - .iv = 0, - .lvl = 29, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 0, + .lvl = 29, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin4[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_LOMBRE, - }, - { - .iv = 0, - .lvl = 32, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_LOMBRE, + }, + { + .iv = 0, + .lvl = 32, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin5[] = { - { - .iv = 0, - .lvl = 35, - .species = SPECIES_LUDICOLO, - }, - { - .iv = 0, - .lvl = 35, - .species = SPECIES_SHIFTRY, - } + { + .iv = 0, + .lvl = 35, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 0, + .lvl = 35, + .species = SPECIES_SHIFTRY, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally1[] = { - { - .iv = 150, - .lvl = 44, - .species = SPECIES_ALTARIA, - .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - }, - { - .iv = 150, - .lvl = 43, - .species = SPECIES_DELCATTY, - .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK - }, - { - .iv = 150, - .lvl = 44, - .species = SPECIES_ROSELIA, - .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC - }, - { - .iv = 150, - .lvl = 41, - .species = SPECIES_MAGNETON, - .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH - }, - { - .iv = 250, - .lvl = 45, - .species = SPECIES_GARDEVOIR, - .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT - } + { + .iv = 150, + .lvl = 44, + .species = SPECIES_ALTARIA, + .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE + }, + { + .iv = 150, + .lvl = 43, + .species = SPECIES_DELCATTY, + .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK + }, + { + .iv = 150, + .lvl = 44, + .species = SPECIES_ROSELIA, + .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC + }, + { + .iv = 150, + .lvl = 41, + .species = SPECIES_MAGNETON, + .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH + }, + { + .iv = 250, + .lvl = 45, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_TREECKO, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_TREECKO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan2[] = { - { - .iv = 50, - .lvl = 18, - .species = SPECIES_SLUGMA, - }, - { - .iv = 50, - .lvl = 18, - .species = SPECIES_WINGULL, - }, - { - .iv = 100, - .lvl = 20, - .species = SPECIES_GROVYLE, - } + { + .iv = 50, + .lvl = 18, + .species = SPECIES_SLUGMA, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_WINGULL, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_GROVYLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan3[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_SLUGMA, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_PELIPPER, - }, - { - .iv = 150, - .lvl = 31, - .species = SPECIES_GROVYLE, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_PELIPPER, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_GROVYLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan4[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_TORCHIC, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_TORCHIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan5[] = { - { - .iv = 50, - .lvl = 18, - .species = SPECIES_WINGULL, - }, - { - .iv = 50, - .lvl = 18, - .species = SPECIES_LOMBRE, - }, - { - .iv = 100, - .lvl = 20, - .species = SPECIES_COMBUSKEN, - } + { + .iv = 50, + .lvl = 18, + .species = SPECIES_WINGULL, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_LOMBRE, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_COMBUSKEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan6[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_PELIPPER, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_LOMBRE, - }, - { - .iv = 150, - .lvl = 31, - .species = SPECIES_COMBUSKEN, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_PELIPPER, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_COMBUSKEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan7[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_MUDKIP, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_MUDKIP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan8[] = { - { - .iv = 50, - .lvl = 18, - .species = SPECIES_LOMBRE, - }, - { - .iv = 50, - .lvl = 18, - .species = SPECIES_SLUGMA, - }, - { - .iv = 100, - .lvl = 20, - .species = SPECIES_MARSHTOMP, - } + { + .iv = 50, + .lvl = 18, + .species = SPECIES_LOMBRE, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_MARSHTOMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan9[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_LOMBRE, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_SLUGMA, - }, - { - .iv = 150, - .lvl = 31, - .species = SPECIES_MARSHTOMP, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_SLUGMA, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_MARSHTOMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_TREECKO, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_TREECKO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May2[] = { - { - .iv = 50, - .lvl = 18, - .species = SPECIES_WINGULL, - }, - { - .iv = 50, - .lvl = 18, - .species = SPECIES_SLUGMA, - }, - { - .iv = 100, - .lvl = 20, - .species = SPECIES_GROVYLE, - } + { + .iv = 50, + .lvl = 18, + .species = SPECIES_WINGULL, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_GROVYLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May3[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_SLUGMA, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_LOMBRE, - }, - { - .iv = 150, - .lvl = 31, - .species = SPECIES_GROVYLE, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_GROVYLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May4[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_TORCHIC, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_TORCHIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May5[] = { - { - .iv = 50, - .lvl = 18, - .species = SPECIES_WINGULL, - }, - { - .iv = 50, - .lvl = 18, - .species = SPECIES_LOMBRE, - }, - { - .iv = 100, - .lvl = 20, - .species = SPECIES_COMBUSKEN, - } + { + .iv = 50, + .lvl = 18, + .species = SPECIES_WINGULL, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_LOMBRE, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_COMBUSKEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May6[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_PELIPPER, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_LOMBRE, - }, - { - .iv = 150, - .lvl = 31, - .species = SPECIES_COMBUSKEN, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_PELIPPER, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_COMBUSKEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May7[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_MUDKIP, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_MUDKIP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May8[] = { - { - .iv = 50, - .lvl = 18, - .species = SPECIES_LOMBRE, - }, - { - .iv = 50, - .lvl = 18, - .species = SPECIES_SLUGMA, - }, - { - .iv = 100, - .lvl = 20, - .species = SPECIES_MARSHTOMP, - } + { + .iv = 50, + .lvl = 18, + .species = SPECIES_LOMBRE, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_MARSHTOMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May9[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_LOMBRE, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_SLUGMA, - }, - { - .iv = 150, - .lvl = 31, - .species = SPECIES_MARSHTOMP, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_SLUGMA, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_MARSHTOMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac1[] = { - { - .iv = 0, - .lvl = 11, - .species = SPECIES_WHISMUR, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_ARON, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_TAILLOW, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_MAKUHITA, - } + { + .iv = 0, + .lvl = 11, + .species = SPECIES_WHISMUR, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_ARON, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_TAILLOW, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Davis[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_PINSIR, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_PINSIR, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Mitchell[] = { - { - .iv = 0, - .lvl = 43, - .species = SPECIES_LUNATONE, - .moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_PSYCHIC - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_SOLROCK, - .moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_SHADOW_BALL - } + { + .iv = 0, + .lvl = 43, + .species = SPECIES_LUNATONE, + .moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_PSYCHIC + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_SOLROCK, + .moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_SHADOW_BALL + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac2[] = { - { - .iv = 10, - .lvl = 22, - .species = SPECIES_LOUDRED, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_LINOONE, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_ARON, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_SWELLOW, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_MAKUHITA, - } + { + .iv = 10, + .lvl = 22, + .species = SPECIES_LOUDRED, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_LINOONE, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_ARON, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_SWELLOW, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac3[] = { - { - .iv = 20, - .lvl = 25, - .species = SPECIES_LOUDRED, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_LINOONE, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_ARON, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_SWELLOW, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_HARIYAMA, - } + { + .iv = 20, + .lvl = 25, + .species = SPECIES_LOUDRED, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_LINOONE, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_ARON, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_SWELLOW, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac4[] = { - { - .iv = 30, - .lvl = 28, - .species = SPECIES_LOUDRED, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_LINOONE, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_ARON, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_SWELLOW, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_HARIYAMA, - } + { + .iv = 30, + .lvl = 28, + .species = SPECIES_LOUDRED, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_LINOONE, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_ARON, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_SWELLOW, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac5[] = { - { - .iv = 40, - .lvl = 31, - .species = SPECIES_LOUDRED, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_LINOONE, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_LAIRON, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_SWELLOW, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_HARIYAMA, - } + { + .iv = 40, + .lvl = 31, + .species = SPECIES_LOUDRED, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_LINOONE, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_LAIRON, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_SWELLOW, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia1[] = { - { - .iv = 0, - .lvl = 11, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_MARILL, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_ROSELIA, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_SKITTY, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 11, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_MARILL, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_ROSELIA, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_SKITTY, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Halle[] = { - { - .iv = 0, - .lvl = 43, - .species = SPECIES_SABLEYE, - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_ABSOL, - } + { + .iv = 0, + .lvl = 43, + .species = SPECIES_SABLEYE, + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_ABSOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Garrison[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_SANDSLASH, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_SANDSLASH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia2[] = { - { - .iv = 10, - .lvl = 22, - .species = SPECIES_WINGULL, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_MARILL, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_ROSELIA, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_SKITTY, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_GOLDEEN, - } + { + .iv = 10, + .lvl = 22, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_MARILL, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_ROSELIA, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_SKITTY, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia3[] = { - { - .iv = 20, - .lvl = 25, - .species = SPECIES_PELIPPER, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_BRELOOM, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_MARILL, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_ROSELIA, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_DELCATTY, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_GOLDEEN, - } + { + .iv = 20, + .lvl = 25, + .species = SPECIES_PELIPPER, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_BRELOOM, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_MARILL, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_ROSELIA, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_DELCATTY, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia4[] = { - { - .iv = 30, - .lvl = 28, - .species = SPECIES_PELIPPER, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_BRELOOM, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_MARILL, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_ROSELIA, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_DELCATTY, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_GOLDEEN, - } + { + .iv = 30, + .lvl = 28, + .species = SPECIES_PELIPPER, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_BRELOOM, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_MARILL, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_ROSELIA, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_DELCATTY, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia5[] = { - { - .iv = 40, - .lvl = 31, - .species = SPECIES_PELIPPER, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_BRELOOM, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_AZUMARILL, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_ROSELIA, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_DELCATTY, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_SEAKING, - } + { + .iv = 40, + .lvl = 31, + .species = SPECIES_PELIPPER, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_BRELOOM, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_AZUMARILL, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_ROSELIA, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_DELCATTY, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_SEAKING, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson1[] = { - { - .iv = 50, - .lvl = 27, - .species = SPECIES_BRELOOM, - } + { + .iv = 50, + .lvl = 27, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lorenzo[] = { - { - .iv = 50, - .lvl = 28, - .species = SPECIES_SEEDOT, - }, - { - .iv = 50, - .lvl = 28, - .species = SPECIES_NUZLEAF, - }, - { - .iv = 50, - .lvl = 28, - .species = SPECIES_LOMBRE, - } + { + .iv = 50, + .lvl = 28, + .species = SPECIES_SEEDOT, + }, + { + .iv = 50, + .lvl = 28, + .species = SPECIES_NUZLEAF, + }, + { + .iv = 50, + .lvl = 28, + .species = SPECIES_LOMBRE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sebastian[] = { - { - .iv = 50, - .lvl = 39, - .species = SPECIES_CACTURNE, - } + { + .iv = 50, + .lvl = 39, + .species = SPECIES_CACTURNE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson2[] = { - { - .iv = 60, - .lvl = 31, - .species = SPECIES_BRELOOM, - } + { + .iv = 60, + .lvl = 31, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson3[] = { - { - .iv = 70, - .lvl = 34, - .species = SPECIES_BRELOOM, - } + { + .iv = 70, + .lvl = 34, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson4[] = { - { - .iv = 80, - .lvl = 37, - .species = SPECIES_BRELOOM, - } + { + .iv = 80, + .lvl = 37, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson5[] = { - { - .iv = 90, - .lvl = 39, - .species = SPECIES_KECLEON, - }, - { - .iv = 90, - .lvl = 39, - .species = SPECIES_BRELOOM, - } + { + .iv = 90, + .lvl = 39, + .species = SPECIES_KECLEON, + }, + { + .iv = 90, + .lvl = 39, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine1[] = { - { - .iv = 50, - .lvl = 26, - .species = SPECIES_GLOOM, - }, - { - .iv = 50, - .lvl = 26, - .species = SPECIES_ROSELIA, - } + { + .iv = 50, + .lvl = 26, + .species = SPECIES_GLOOM, + }, + { + .iv = 50, + .lvl = 26, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenna[] = { - { - .iv = 50, - .lvl = 28, - .species = SPECIES_LOTAD, - }, - { - .iv = 50, - .lvl = 28, - .species = SPECIES_LOMBRE, - }, - { - .iv = 50, - .lvl = 28, - .species = SPECIES_NUZLEAF, - } + { + .iv = 50, + .lvl = 28, + .species = SPECIES_LOTAD, + }, + { + .iv = 50, + .lvl = 28, + .species = SPECIES_LOMBRE, + }, + { + .iv = 50, + .lvl = 28, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophia[] = { - { - .iv = 50, - .lvl = 38, - .species = SPECIES_SWABLU, - }, - { - .iv = 50, - .lvl = 38, - .species = SPECIES_ROSELIA, - } + { + .iv = 50, + .lvl = 38, + .species = SPECIES_SWABLU, + }, + { + .iv = 50, + .lvl = 38, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine2[] = { - { - .iv = 60, - .lvl = 30, - .species = SPECIES_GLOOM, - }, - { - .iv = 60, - .lvl = 30, - .species = SPECIES_ROSELIA, - } + { + .iv = 60, + .lvl = 30, + .species = SPECIES_GLOOM, + }, + { + .iv = 60, + .lvl = 30, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine3[] = { - { - .iv = 70, - .lvl = 33, - .species = SPECIES_GLOOM, - }, - { - .iv = 70, - .lvl = 33, - .species = SPECIES_ROSELIA, - } + { + .iv = 70, + .lvl = 33, + .species = SPECIES_GLOOM, + }, + { + .iv = 70, + .lvl = 33, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine4[] = { - { - .iv = 80, - .lvl = 36, - .species = SPECIES_GLOOM, - }, - { - .iv = 80, - .lvl = 36, - .species = SPECIES_ROSELIA, - } + { + .iv = 80, + .lvl = 36, + .species = SPECIES_GLOOM, + }, + { + .iv = 80, + .lvl = 36, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine5[] = { - { - .iv = 90, - .lvl = 39, - .species = SPECIES_BELLOSSOM, - }, - { - .iv = 90, - .lvl = 39, - .species = SPECIES_ROSELIA, - } + { + .iv = 90, + .lvl = 39, + .species = SPECIES_BELLOSSOM, + }, + { + .iv = 90, + .lvl = 39, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julio[] = { - { - .iv = 0, - .lvl = 21, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 0, + .lvl = 21, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt27[] = { - { - .iv = 50, - .lvl = 35, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 50, - .lvl = 35, - .species = SPECIES_GOLBAT, - } + { + .iv = 50, + .lvl = 35, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 50, + .lvl = 35, + .species = SPECIES_GOLBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt28[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_WAILMER, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt29[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_WAILMER, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt30[] = { - { - .iv = 50, - .lvl = 22, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 50, - .lvl = 22, - .species = SPECIES_NUMEL, - } + { + .iv = 50, + .lvl = 22, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 50, + .lvl = 22, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marc[] = { - { - .iv = 120, - .lvl = 8, - .species = SPECIES_GEODUDE, - }, - { - .iv = 130, - .lvl = 8, - .species = SPECIES_GEODUDE, - } + { + .iv = 120, + .lvl = 8, + .species = SPECIES_GEODUDE, + }, + { + .iv = 130, + .lvl = 8, + .species = SPECIES_GEODUDE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenden[] = { - { - .iv = 100, - .lvl = 13, - .species = SPECIES_MACHOP, - } + { + .iv = 100, + .lvl = 13, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lilith[] = { - { - .iv = 150, - .lvl = 13, - .species = SPECIES_MEDITITE, - } + { + .iv = 150, + .lvl = 13, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristian[] = { - { - .iv = 200, - .lvl = 13, - .species = SPECIES_MAKUHITA, - } + { + .iv = 200, + .lvl = 13, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sylvia[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_MEDITITE, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonardo[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Athena[] = { - { - .iv = 100, - .lvl = 32, - .species = SPECIES_MANECTRIC, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_NONE - }, - { - .iv = 100, - .lvl = 32, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NONE, - .moves = MOVE_SURF, MOVE_THIEF, MOVE_NONE, MOVE_NONE - } + { + .iv = 100, + .lvl = 32, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_NONE + }, + { + .iv = 100, + .lvl = 32, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_THIEF, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Harrison[] = { - { - .iv = 0, - .lvl = 35, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 0, + .lvl = 35, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt31[] = { - { - .iv = 0, - .lvl = 20, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 20, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarence[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_SHARPEDO, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Terry[] = { - { - .iv = 0, - .lvl = 37, - .species = SPECIES_GIRAFARIG, - } + { + .iv = 0, + .lvl = 37, + .species = SPECIES_GIRAFARIG, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nate[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_SPOINK, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_SPOINK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kathleen[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_KADABRA, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_KADABRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clifford[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_GIRAFARIG, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_GIRAFARIG, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicholas[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_WOBBUFFET, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_WOBBUFFET, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt32[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_ZUBAT, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt33[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_BALTOY, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_BALTOY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt34[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt35[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt36[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_BALTOY, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_BALTOY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Macey[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_NATU, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_NATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan10[] = { - { - .iv = 25, - .lvl = 13, - .species = SPECIES_LOTAD, - }, - { - .iv = 50, - .lvl = 15, - .species = SPECIES_TORCHIC, - } + { + .iv = 25, + .lvl = 13, + .species = SPECIES_LOTAD, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_TORCHIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan11[] = { - { - .iv = 25, - .lvl = 13, - .species = SPECIES_WINGULL, - }, - { - .iv = 50, - .lvl = 15, - .species = SPECIES_TREECKO, - } + { + .iv = 25, + .lvl = 13, + .species = SPECIES_WINGULL, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_TREECKO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paxton[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_SWELLOW, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_BRELOOM, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SWELLOW, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isabella[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt37[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_ZUBAT, - }, - { - .iv = 0, - .lvl = 27, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha2[] = { - { - .iv = 50, - .lvl = 18, - .species = SPECIES_NUMEL, - }, - { - .iv = 50, - .lvl = 20, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 50, - .lvl = 22, - .species = SPECIES_NUMEL, - }, - { - .iv = 50, - .lvl = 22, - .species = SPECIES_ZUBAT, - } + { + .iv = 50, + .lvl = 18, + .species = SPECIES_NUMEL, + }, + { + .iv = 50, + .lvl = 20, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 50, + .lvl = 22, + .species = SPECIES_NUMEL, + }, + { + .iv = 50, + .lvl = 22, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonathan[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_KECLEON, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_LOUDRED, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_KECLEON, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan12[] = { - { - .iv = 25, - .lvl = 13, - .species = SPECIES_SLUGMA, - }, - { - .iv = 50, - .lvl = 15, - .species = SPECIES_MUDKIP, - } + { + .iv = 25, + .lvl = 13, + .species = SPECIES_SLUGMA, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_MUDKIP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May10[] = { - { - .iv = 25, - .lvl = 13, - .species = SPECIES_WINGULL, - }, - { - .iv = 50, - .lvl = 15, - .species = SPECIES_TREECKO, - } + { + .iv = 25, + .lvl = 13, + .species = SPECIES_WINGULL, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_TREECKO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie1[] = { - { - .iv = 150, - .lvl = 37, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 150, - .lvl = 38, - .species = SPECIES_CROBAT, - }, - { - .iv = 150, - .lvl = 39, - .species = SPECIES_CAMERUPT, - } + { + .iv = 150, + .lvl = 37, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 150, + .lvl = 38, + .species = SPECIES_CROBAT, + }, + { + .iv = 150, + .lvl = 39, + .species = SPECIES_CAMERUPT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie2[] = { - { - .iv = 150, - .lvl = 24, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 150, - .lvl = 24, - .species = SPECIES_ZUBAT, - }, - { - .iv = 150, - .lvl = 25, - .species = SPECIES_CAMERUPT, - } + { + .iv = 150, + .lvl = 24, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 150, + .lvl = 24, + .species = SPECIES_ZUBAT, + }, + { + .iv = 150, + .lvl = 25, + .species = SPECIES_CAMERUPT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiana[] = { - { - .iv = 0, - .lvl = 4, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 4, - .species = SPECIES_SHROOMISH, - } + { + .iv = 0, + .lvl = 4, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 4, + .species = SPECIES_SHROOMISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley1[] = { - { - .iv = 0, - .lvl = 6, - .species = SPECIES_LOTAD, - }, - { - .iv = 0, - .lvl = 6, - .species = SPECIES_SHROOMISH, - } + { + .iv = 0, + .lvl = 6, + .species = SPECIES_LOTAD, + }, + { + .iv = 0, + .lvl = 6, + .species = SPECIES_SHROOMISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Janice[] = { - { - .iv = 0, - .lvl = 9, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 9, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vivi[] = { - { - .iv = 100, - .lvl = 15, - .species = SPECIES_MARILL, - }, - { - .iv = 100, - .lvl = 15, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 100, - .lvl = 15, - .species = SPECIES_NUMEL, - } + { + .iv = 100, + .lvl = 15, + .species = SPECIES_MARILL, + }, + { + .iv = 100, + .lvl = 15, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 100, + .lvl = 15, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley2[] = { - { - .iv = 10, - .lvl = 26, - .species = SPECIES_LOMBRE, - }, - { - .iv = 10, - .lvl = 26, - .species = SPECIES_SHROOMISH, - } + { + .iv = 10, + .lvl = 26, + .species = SPECIES_LOMBRE, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_SHROOMISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_LOMBRE, - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_BRELOOM, - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley4[] = { - { - .iv = 30, - .lvl = 32, - .species = SPECIES_LOMBRE, - }, - { - .iv = 30, - .lvl = 32, - .species = SPECIES_BRELOOM, - } + { + .iv = 30, + .lvl = 32, + .species = SPECIES_LOMBRE, + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley5[] = { - { - .iv = 40, - .lvl = 34, - .species = SPECIES_SWELLOW, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_LOMBRE, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_BRELOOM, - } + { + .iv = 40, + .lvl = 34, + .species = SPECIES_SWELLOW, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_LOMBRE, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sally[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_ODDISH, - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_ODDISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robin[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_SKITTY, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_SKITTY, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrea[] = { - { - .iv = 100, - .lvl = 40, - .species = SPECIES_LUVDISC, - } + { + .iv = 100, + .lvl = 40, + .species = SPECIES_LUVDISC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Crissy[] = { - { - .iv = 100, - .lvl = 39, - .species = SPECIES_GOLDEEN, - }, - { - .iv = 100, - .lvl = 39, - .species = SPECIES_WAILMER, - } + { + .iv = 100, + .lvl = 39, + .species = SPECIES_GOLDEEN, + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rick[] = { - { - .iv = 0, - .lvl = 4, - .species = SPECIES_WURMPLE, - }, - { - .iv = 0, - .lvl = 4, - .species = SPECIES_WURMPLE, - } + { + .iv = 0, + .lvl = 4, + .species = SPECIES_WURMPLE, + }, + { + .iv = 0, + .lvl = 4, + .species = SPECIES_WURMPLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lyle[] = { - { - .iv = 0, - .lvl = 3, - .species = SPECIES_WURMPLE, - }, - { - .iv = 0, - .lvl = 3, - .species = SPECIES_WURMPLE, - }, - { - .iv = 0, - .lvl = 3, - .species = SPECIES_WURMPLE, - }, - { - .iv = 0, - .lvl = 3, - .species = SPECIES_WURMPLE, - } + { + .iv = 0, + .lvl = 3, + .species = SPECIES_WURMPLE, + }, + { + .iv = 0, + .lvl = 3, + .species = SPECIES_WURMPLE, + }, + { + .iv = 0, + .lvl = 3, + .species = SPECIES_WURMPLE, + }, + { + .iv = 0, + .lvl = 3, + .species = SPECIES_WURMPLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jose[] = { - { - .iv = 50, - .lvl = 8, - .species = SPECIES_WURMPLE, - }, - { - .iv = 50, - .lvl = 8, - .species = SPECIES_NINCADA, - } + { + .iv = 50, + .lvl = 8, + .species = SPECIES_WURMPLE, + }, + { + .iv = 50, + .lvl = 8, + .species = SPECIES_NINCADA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Doug[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_NINCADA, - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_NINJASK, - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NINCADA, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greg[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_VOLBEAT, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_ILLUMISE, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_ILLUMISE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kent[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_NINJASK, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_James1[] = { - { - .iv = 0, - .lvl = 6, - .species = SPECIES_NINCADA, - }, - { - .iv = 0, - .lvl = 6, - .species = SPECIES_NINCADA, - } + { + .iv = 0, + .lvl = 6, + .species = SPECIES_NINCADA, + }, + { + .iv = 0, + .lvl = 6, + .species = SPECIES_NINCADA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_James2[] = { - { - .iv = 10, - .lvl = 27, - .species = SPECIES_NINJASK, - } + { + .iv = 10, + .lvl = 27, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_James3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_DUSTOX, - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_NINJASK, - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_DUSTOX, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_James4[] = { - { - .iv = 30, - .lvl = 31, - .species = SPECIES_SURSKIT, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_DUSTOX, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_NINJASK, - } + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SURSKIT, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_DUSTOX, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_James5[] = { - { - .iv = 40, - .lvl = 33, - .species = SPECIES_SURSKIT, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_NINJASK, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_DUSTOX, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_NINJASK, - } + { + .iv = 40, + .lvl = 33, + .species = SPECIES_SURSKIT, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_NINJASK, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_DUSTOX, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brice[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_NUMEL, - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_MACHOP, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_NUMEL, + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent1[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 16, - .species = SPECIES_GEODUDE, - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 16, + .species = SPECIES_GEODUDE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lenny[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_MACHOP, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucas1[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alan[] = { - { - .iv = 0, - .lvl = 22, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 22, - .species = SPECIES_NOSEPASS, - }, - { - .iv = 0, - .lvl = 22, - .species = SPECIES_GRAVELER, - } + { + .iv = 0, + .lvl = 22, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_NOSEPASS, + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_GRAVELER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clark[] = { - { - .iv = 0, - .lvl = 8, - .species = SPECIES_GEODUDE, - } + { + .iv = 0, + .lvl = 8, + .species = SPECIES_GEODUDE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eric[] = { - { - .iv = 0, - .lvl = 20, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 20, - .species = SPECIES_BALTOY, - } + { + .iv = 0, + .lvl = 20, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 20, + .species = SPECIES_BALTOY, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Lucas2[] = { - { - .iv = 0, - .lvl = 9, - .species = SPECIES_WAILMER, - .moves = MOVE_SPLASH, MOVE_WATER_GUN, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 9, + .species = SPECIES_WAILMER, + .moves = MOVE_SPLASH, MOVE_WATER_GUN, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Mike1[] = { - { - .iv = 0, - .lvl = 10, - .species = SPECIES_PELIPPER, - .moves = MOVE_GUST, MOVE_GROWL, MOVE_NONE, MOVE_NONE - }, - { - .iv = 0, - .lvl = 10, - .species = SPECIES_POOCHYENA, - .moves = MOVE_BITE, MOVE_SCARY_FACE, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 10, + .species = SPECIES_PELIPPER, + .moves = MOVE_GUST, MOVE_GROWL, MOVE_NONE, MOVE_NONE + }, + { + .iv = 0, + .lvl = 10, + .species = SPECIES_POOCHYENA, + .moves = MOVE_BITE, MOVE_SCARY_FACE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mike2[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 16, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 16, - .species = SPECIES_MACHOP, - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 16, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 16, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent2[] = { - { - .iv = 10, - .lvl = 24, - .species = SPECIES_GEODUDE, - }, - { - .iv = 10, - .lvl = 24, - .species = SPECIES_GEODUDE, - }, - { - .iv = 10, - .lvl = 24, - .species = SPECIES_GEODUDE, - }, - { - .iv = 10, - .lvl = 24, - .species = SPECIES_GRAVELER, - } + { + .iv = 10, + .lvl = 24, + .species = SPECIES_GEODUDE, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_GEODUDE, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_GEODUDE, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_GRAVELER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent3[] = { - { - .iv = 20, - .lvl = 27, - .species = SPECIES_GEODUDE, - }, - { - .iv = 20, - .lvl = 27, - .species = SPECIES_GEODUDE, - }, - { - .iv = 20, - .lvl = 27, - .species = SPECIES_GRAVELER, - }, - { - .iv = 20, - .lvl = 27, - .species = SPECIES_GRAVELER, - } + { + .iv = 20, + .lvl = 27, + .species = SPECIES_GEODUDE, + }, + { + .iv = 20, + .lvl = 27, + .species = SPECIES_GEODUDE, + }, + { + .iv = 20, + .lvl = 27, + .species = SPECIES_GRAVELER, + }, + { + .iv = 20, + .lvl = 27, + .species = SPECIES_GRAVELER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent4[] = { - { - .iv = 30, - .lvl = 30, - .species = SPECIES_GEODUDE, - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_GRAVELER, - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_GRAVELER, - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_GRAVELER, - } + { + .iv = 30, + .lvl = 30, + .species = SPECIES_GEODUDE, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_GRAVELER, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_GRAVELER, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_GRAVELER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent5[] = { - { - .iv = 40, - .lvl = 33, - .species = SPECIES_GRAVELER, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_GRAVELER, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_GRAVELER, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_GOLEM, - } + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GRAVELER, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GRAVELER, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GRAVELER, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GOLEM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_DezAndLuke[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_DELCATTY, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_MANECTRIC, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_DELCATTY, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_MANECTRIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_LeaAndJed[] = { - { - .iv = 0, - .lvl = 45, - .species = SPECIES_LUVDISC, - }, - { - .iv = 0, - .lvl = 45, - .species = SPECIES_LUVDISC, - } + { + .iv = 0, + .lvl = 45, + .species = SPECIES_LUVDISC, + }, + { + .iv = 0, + .lvl = 45, + .species = SPECIES_LUVDISC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan1[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_VOLBEAT, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_ILLUMISE, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_ILLUMISE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan2[] = { - { - .iv = 10, - .lvl = 30, - .species = SPECIES_VOLBEAT, - }, - { - .iv = 10, - .lvl = 30, - .species = SPECIES_ILLUMISE, - } + { + .iv = 10, + .lvl = 30, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 10, + .lvl = 30, + .species = SPECIES_ILLUMISE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan3[] = { - { - .iv = 20, - .lvl = 33, - .species = SPECIES_VOLBEAT, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_ILLUMISE, - } + { + .iv = 20, + .lvl = 33, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_ILLUMISE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan4[] = { - { - .iv = 30, - .lvl = 36, - .species = SPECIES_VOLBEAT, - }, - { - .iv = 30, - .lvl = 36, - .species = SPECIES_ILLUMISE, - } + { + .iv = 30, + .lvl = 36, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_ILLUMISE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan5[] = { - { - .iv = 40, - .lvl = 39, - .species = SPECIES_VOLBEAT, - }, - { - .iv = 40, - .lvl = 39, - .species = SPECIES_ILLUMISE, - } + { + .iv = 40, + .lvl = 39, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 40, + .lvl = 39, + .species = SPECIES_ILLUMISE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johanna[] = { - { - .iv = 0, - .lvl = 13, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 13, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Gerald[] = { - { - .iv = 100, - .lvl = 23, - .species = SPECIES_KECLEON, - .moves = MOVE_FLAMETHROWER, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK, MOVE_BIND - } + { + .iv = 100, + .lvl = 23, + .species = SPECIES_KECLEON, + .moves = MOVE_FLAMETHROWER, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK, MOVE_BIND + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Vivian[] = { - { - .iv = 100, - .lvl = 17, - .species = SPECIES_MEDITITE, - .moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_THUNDER_PUNCH - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_MEDITITE, - .moves = MOVE_THUNDER_PUNCH, MOVE_DETECT, MOVE_CONFUSION, MOVE_MEDITATE - } + { + .iv = 100, + .lvl = 17, + .species = SPECIES_MEDITITE, + .moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_THUNDER_PUNCH + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_MEDITITE, + .moves = MOVE_THUNDER_PUNCH, MOVE_DETECT, MOVE_CONFUSION, MOVE_MEDITATE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Danielle[] = { - { - .iv = 100, - .lvl = 23, - .species = SPECIES_MEDITITE, - .moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_FIRE_PUNCH - } + { + .iv = 100, + .lvl = 23, + .species = SPECIES_MEDITITE, + .moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_FIRE_PUNCH + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Hideo[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_KOFFING, - .moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_KOFFING, - .moves = MOVE_TACKLE, MOVE_POISON_GAS, MOVE_SLUDGE, MOVE_SMOKESCREEN - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_POISON_GAS, MOVE_SLUDGE, MOVE_SMOKESCREEN + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Keigo[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_NINJASK, - .moves = MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM, MOVE_FURY_CUTTER, MOVE_SWORDS_DANCE - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NINJASK, + .moves = MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM, MOVE_FURY_CUTTER, MOVE_SWORDS_DANCE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Riley[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_NINCADA, - .moves = MOVE_LEECH_LIFE, MOVE_FURY_SWIPES, MOVE_MIND_READER, MOVE_DIG - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_KOFFING, - .moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NINCADA, + .moves = MOVE_LEECH_LIFE, MOVE_FURY_SWIPES, MOVE_MIND_READER, MOVE_DIG + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Flint[] = { - { - .iv = 150, - .lvl = 29, - .species = SPECIES_SWELLOW, - }, - { - .iv = 150, - .lvl = 29, - .species = SPECIES_XATU, - } + { + .iv = 150, + .lvl = 29, + .species = SPECIES_SWELLOW, + }, + { + .iv = 150, + .lvl = 29, + .species = SPECIES_XATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ashley[] = { - { - .iv = 100, - .lvl = 27, - .species = SPECIES_SWABLU, - }, - { - .iv = 100, - .lvl = 27, - .species = SPECIES_SWABLU, - }, - { - .iv = 100, - .lvl = 27, - .species = SPECIES_SWABLU, - } + { + .iv = 100, + .lvl = 27, + .species = SPECIES_SWABLU, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_SWABLU, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wally2[] = { - { - .iv = 30, - .lvl = 16, - .species = SPECIES_RALTS, - } + { + .iv = 30, + .lvl = 16, + .species = SPECIES_RALTS, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally3[] = { - { - .iv = 150, - .lvl = 47, - .species = SPECIES_ALTARIA, - .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - }, - { - .iv = 150, - .lvl = 46, - .species = SPECIES_DELCATTY, - .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK - }, - { - .iv = 150, - .lvl = 47, - .species = SPECIES_ROSELIA, - .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC - }, - { - .iv = 150, - .lvl = 44, - .species = SPECIES_MAGNETON, - .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH - }, - { - .iv = 250, - .lvl = 48, - .species = SPECIES_GARDEVOIR, - .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT - } + { + .iv = 150, + .lvl = 47, + .species = SPECIES_ALTARIA, + .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE + }, + { + .iv = 150, + .lvl = 46, + .species = SPECIES_DELCATTY, + .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK + }, + { + .iv = 150, + .lvl = 47, + .species = SPECIES_ROSELIA, + .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC + }, + { + .iv = 150, + .lvl = 44, + .species = SPECIES_MAGNETON, + .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH + }, + { + .iv = 250, + .lvl = 48, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally4[] = { - { - .iv = 150, - .lvl = 50, - .species = SPECIES_ALTARIA, - .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - }, - { - .iv = 150, - .lvl = 49, - .species = SPECIES_DELCATTY, - .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK - }, - { - .iv = 150, - .lvl = 50, - .species = SPECIES_ROSELIA, - .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC - }, - { - .iv = 150, - .lvl = 47, - .species = SPECIES_MAGNETON, - .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH - }, - { - .iv = 250, - .lvl = 51, - .species = SPECIES_GARDEVOIR, - .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT - } + { + .iv = 150, + .lvl = 50, + .species = SPECIES_ALTARIA, + .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE + }, + { + .iv = 150, + .lvl = 49, + .species = SPECIES_DELCATTY, + .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK + }, + { + .iv = 150, + .lvl = 50, + .species = SPECIES_ROSELIA, + .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC + }, + { + .iv = 150, + .lvl = 47, + .species = SPECIES_MAGNETON, + .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH + }, + { + .iv = 250, + .lvl = 51, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally5[] = { - { - .iv = 150, - .lvl = 53, - .species = SPECIES_ALTARIA, - .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - }, - { - .iv = 150, - .lvl = 52, - .species = SPECIES_DELCATTY, - .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK - }, - { - .iv = 150, - .lvl = 53, - .species = SPECIES_ROSELIA, - .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC - }, - { - .iv = 150, - .lvl = 50, - .species = SPECIES_MAGNETON, - .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH - }, - { - .iv = 250, - .lvl = 54, - .species = SPECIES_GARDEVOIR, - .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT - } + { + .iv = 150, + .lvl = 53, + .species = SPECIES_ALTARIA, + .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE + }, + { + .iv = 150, + .lvl = 52, + .species = SPECIES_DELCATTY, + .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK + }, + { + .iv = 150, + .lvl = 53, + .species = SPECIES_ROSELIA, + .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC + }, + { + .iv = 150, + .lvl = 50, + .species = SPECIES_MAGNETON, + .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH + }, + { + .iv = 250, + .lvl = 54, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally6[] = { - { - .iv = 150, - .lvl = 56, - .species = SPECIES_ALTARIA, - .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - }, - { - .iv = 150, - .lvl = 55, - .species = SPECIES_DELCATTY, - .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK - }, - { - .iv = 150, - .lvl = 56, - .species = SPECIES_ROSELIA, - .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC - }, - { - .iv = 150, - .lvl = 53, - .species = SPECIES_MAGNETON, - .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH - }, - { - .iv = 250, - .lvl = 57, - .species = SPECIES_GARDEVOIR, - .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT - } + { + .iv = 150, + .lvl = 56, + .species = SPECIES_ALTARIA, + .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE + }, + { + .iv = 150, + .lvl = 55, + .species = SPECIES_DELCATTY, + .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK + }, + { + .iv = 150, + .lvl = 56, + .species = SPECIES_ROSELIA, + .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC + }, + { + .iv = 150, + .lvl = 53, + .species = SPECIES_MAGNETON, + .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH + }, + { + .iv = 250, + .lvl = 57, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan13[] = { - { - .iv = 150, - .lvl = 31, - .species = SPECIES_TROPIUS, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_SLUGMA, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_PELIPPER, - }, - { - .iv = 200, - .lvl = 34, - .species = SPECIES_GROVYLE, - } + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_SLUGMA, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_GROVYLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan14[] = { - { - .iv = 150, - .lvl = 31, - .species = SPECIES_TROPIUS, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_PELIPPER, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_LUDICOLO, - }, - { - .iv = 200, - .lvl = 34, - .species = SPECIES_COMBUSKEN, - } + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_COMBUSKEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan15[] = { - { - .iv = 150, - .lvl = 31, - .species = SPECIES_TROPIUS, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_LUDICOLO, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_SLUGMA, - }, - { - .iv = 200, - .lvl = 34, - .species = SPECIES_MARSHTOMP, - } + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_SLUGMA, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_MARSHTOMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May11[] = { - { - .iv = 150, - .lvl = 31, - .species = SPECIES_TROPIUS, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_SLUGMA, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_PELIPPER, - }, - { - .iv = 200, - .lvl = 34, - .species = SPECIES_GROVYLE, - } + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_SLUGMA, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_GROVYLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May12[] = { - { - .iv = 150, - .lvl = 31, - .species = SPECIES_TROPIUS, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_PELIPPER, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_LUDICOLO, - }, - { - .iv = 200, - .lvl = 34, - .species = SPECIES_COMBUSKEN, - } + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_COMBUSKEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May13[] = { - { - .iv = 150, - .lvl = 31, - .species = SPECIES_TROPIUS, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_LUDICOLO, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_SLUGMA, - }, - { - .iv = 200, - .lvl = 34, - .species = SPECIES_MARSHTOMP, - } + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_SLUGMA, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_MARSHTOMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonah[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_WAILMER, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 32, - .species = SPECIES_SHARPEDO, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Henry[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_CARVANHA, - }, - { - .iv = 0, - .lvl = 34, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_CARVANHA, + }, + { + .iv = 0, + .lvl = 34, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roger[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 35, - .species = SPECIES_GYARADOS, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 35, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexa[] = { - { - .iv = 100, - .lvl = 34, - .species = SPECIES_GLOOM, - }, - { - .iv = 100, - .lvl = 34, - .species = SPECIES_AZUMARILL, - } + { + .iv = 100, + .lvl = 34, + .species = SPECIES_GLOOM, + }, + { + .iv = 100, + .lvl = 34, + .species = SPECIES_AZUMARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ruben[] = { - { - .iv = 100, - .lvl = 34, - .species = SPECIES_SHIFTRY, - }, - { - .iv = 100, - .lvl = 34, - .species = SPECIES_NOSEPASS, - } + { + .iv = 100, + .lvl = 34, + .species = SPECIES_SHIFTRY, + }, + { + .iv = 100, + .lvl = 34, + .species = SPECIES_NOSEPASS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji1[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_MACHOKE, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wayne[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 36, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 36, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aidan[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_SWELLOW, - }, - { - .iv = 0, - .lvl = 32, - .species = SPECIES_SKARMORY, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SWELLOW, + }, + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SKARMORY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reed[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_SPHEAL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_SHARPEDO, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SPHEAL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tisha[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_CHINCHOU, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_CHINCHOU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_ToriAndTia[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_SPINDA, - }, - { - .iv = 0, - .lvl = 19, - .species = SPECIES_SPINDA, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SPINDA, + }, + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SPINDA, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_KimAndIris[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_SWABLU, - .moves = MOVE_SING, MOVE_FURY_ATTACK, MOVE_SAFEGUARD, MOVE_AERIAL_ACE - }, - { - .iv = 0, - .lvl = 35, - .species = SPECIES_NUMEL, - .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_REST, MOVE_EARTHQUAKE - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SWABLU, + .moves = MOVE_SING, MOVE_FURY_ATTACK, MOVE_SAFEGUARD, MOVE_AERIAL_ACE + }, + { + .iv = 0, + .lvl = 35, + .species = SPECIES_NUMEL, + .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_REST, MOVE_EARTHQUAKE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_TyraAndIvy[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_ROSELIA, - .moves = MOVE_GROWTH, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_LEECH_SEED - }, - { - .iv = 0, - .lvl = 20, - .species = SPECIES_GRAVELER, - .moves = MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_MUD_SPORT, MOVE_ROCK_THROW - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ROSELIA, + .moves = MOVE_GROWTH, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_LEECH_SEED + }, + { + .iv = 0, + .lvl = 20, + .species = SPECIES_GRAVELER, + .moves = MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_MUD_SPORT, MOVE_ROCK_THROW + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_MelAndPaul[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_DUSTOX, - .moves = MOVE_GUST, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_PROTECT - }, - { - .iv = 0, - .lvl = 27, - .species = SPECIES_BEAUTIFLY, - .moves = MOVE_GUST, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_STUN_SPORE - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_DUSTOX, + .moves = MOVE_GUST, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_PROTECT + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_BEAUTIFLY, + .moves = MOVE_GUST, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_STUN_SPORE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay1[] = { - { - .iv = 200, - .lvl = 39, - .species = SPECIES_MEDICHAM, - .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT - }, - { - .iv = 200, - .lvl = 39, - .species = SPECIES_HARIYAMA, - .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM - } + { + .iv = 200, + .lvl = 39, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT + }, + { + .iv = 200, + .lvl = 39, + .species = SPECIES_HARIYAMA, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay2[] = { - { - .iv = 210, - .lvl = 43, - .species = SPECIES_MEDICHAM, - .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT - }, - { - .iv = 210, - .lvl = 43, - .species = SPECIES_HARIYAMA, - .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM - } + { + .iv = 210, + .lvl = 43, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT + }, + { + .iv = 210, + .lvl = 43, + .species = SPECIES_HARIYAMA, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay3[] = { - { - .iv = 220, - .lvl = 46, - .species = SPECIES_MEDICHAM, - .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT - }, - { - .iv = 220, - .lvl = 46, - .species = SPECIES_HARIYAMA, - .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM - } + { + .iv = 220, + .lvl = 46, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT + }, + { + .iv = 220, + .lvl = 46, + .species = SPECIES_HARIYAMA, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay4[] = { - { - .iv = 230, - .lvl = 49, - .species = SPECIES_MEDICHAM, - .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT - }, - { - .iv = 230, - .lvl = 49, - .species = SPECIES_HARIYAMA, - .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM - } + { + .iv = 230, + .lvl = 49, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT + }, + { + .iv = 230, + .lvl = 49, + .species = SPECIES_HARIYAMA, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay5[] = { - { - .iv = 240, - .lvl = 52, - .species = SPECIES_MEDICHAM, - .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT - }, - { - .iv = 240, - .lvl = 52, - .species = SPECIES_HARIYAMA, - .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM - } + { + .iv = 240, + .lvl = 52, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT + }, + { + .iv = 240, + .lvl = 52, + .species = SPECIES_HARIYAMA, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_ReliAndIan[] = { - { - .iv = 0, - .lvl = 35, - .species = SPECIES_AZUMARILL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WINGULL, - } + { + .iv = 0, + .lvl = 35, + .species = SPECIES_AZUMARILL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy1[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_CHINCHOU, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_CHINCHOU, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy2[] = { - { - .iv = 0, - .lvl = 42, - .species = SPECIES_CHINCHOU, - }, - { - .iv = 0, - .lvl = 40, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 42, + .species = SPECIES_CHINCHOU, + }, + { + .iv = 0, + .lvl = 40, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy3[] = { - { - .iv = 0, - .lvl = 45, - .species = SPECIES_LANTURN, - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 45, + .species = SPECIES_LANTURN, + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy4[] = { - { - .iv = 0, - .lvl = 48, - .species = SPECIES_LANTURN, - }, - { - .iv = 0, - .lvl = 46, - .species = SPECIES_SHARPEDO, - } + { + .iv = 0, + .lvl = 48, + .species = SPECIES_LANTURN, + }, + { + .iv = 0, + .lvl = 46, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy5[] = { - { - .iv = 0, - .lvl = 51, - .species = SPECIES_LANTURN, - }, - { - .iv = 0, - .lvl = 49, - .species = SPECIES_SHARPEDO, - } + { + .iv = 0, + .lvl = 51, + .species = SPECIES_LANTURN, + }, + { + .iv = 0, + .lvl = 49, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_LisaAndRay[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_GOLDEEN, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_TENTACOOL, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_GOLDEEN, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chris[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 20, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_FEEBAS, - }, - { - .iv = 0, - .lvl = 23, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 20, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_FEEBAS, + }, + { + .iv = 0, + .lvl = 23, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Dawson[] = { - { - .iv = 0, - .lvl = 8, - .species = SPECIES_ZIGZAGOON, - .heldItem = ITEM_NUGGET - }, - { - .iv = 0, - .lvl = 8, - .species = SPECIES_POOCHYENA, - .heldItem = ITEM_NONE - } + { + .iv = 0, + .lvl = 8, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET + }, + { + .iv = 0, + .lvl = 8, + .species = SPECIES_POOCHYENA, + .heldItem = ITEM_NONE + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Sarah[] = { - { - .iv = 0, - .lvl = 8, - .species = SPECIES_LOTAD, - .heldItem = ITEM_NONE - }, - { - .iv = 0, - .lvl = 8, - .species = SPECIES_ZIGZAGOON, - .heldItem = ITEM_NUGGET - } + { + .iv = 0, + .lvl = 8, + .species = SPECIES_LOTAD, + .heldItem = ITEM_NONE + }, + { + .iv = 0, + .lvl = 8, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darian[] = { - { - .iv = 0, - .lvl = 9, - .species = SPECIES_MAGIKARP, - } + { + .iv = 0, + .lvl = 9, + .species = SPECIES_MAGIKARP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hailey[] = { - { - .iv = 0, - .lvl = 13, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 13, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chandler[] = { - { - .iv = 0, - .lvl = 12, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 12, - .species = SPECIES_TENTACOOL, - } + { + .iv = 0, + .lvl = 12, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 12, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Kaleb[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_MINUN, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_PLUSLE, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_MINUN, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joseph[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_VOLTORB, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_VOLTORB, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alyssa[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marcos[] = { - { - .iv = 100, - .lvl = 15, - .species = SPECIES_VOLTORB, - } + { + .iv = 100, + .lvl = 15, + .species = SPECIES_VOLTORB, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rhett[] = { - { - .iv = 100, - .lvl = 15, - .species = SPECIES_MAKUHITA, - } + { + .iv = 100, + .lvl = 15, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tyron[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_SANDSHREW, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SANDSHREW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Celina[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_ROSELIA, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bianca[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SHROOMISH, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SHROOMISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hayden[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophie[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_MARILL, - }, - { - .iv = 0, - .lvl = 19, - .species = SPECIES_LOMBRE, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_MARILL, + }, + { + .iv = 0, + .lvl = 19, + .species = SPECIES_LOMBRE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Coby[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_SKARMORY, - }, - { - .iv = 0, - .lvl = 19, - .species = SPECIES_SWELLOW, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_SKARMORY, + }, + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SWELLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lawrence[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_BALTOY, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SANDSHREW, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_BALTOY, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SANDSHREW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wyatt[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_ARON, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_ARON, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ARON, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ARON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Angelina[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_LOMBRE, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_LOMBRE, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kai[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_BARBOACH, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_BARBOACH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlotte[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Deandre[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ARON, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ELECTRIKE, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ARON, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ELECTRIKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt38[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt39[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt40[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt41[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_BALTOY, - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_BALTOY, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt42[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_BALTOY, - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_BALTOY, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt43[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt44[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt45[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt46[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt47[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt48[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_BALTOY, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_BALTOY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt49[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt50[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt51[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt52[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt53[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_BALTOY, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_BALTOY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha3[] = { - { - .iv = 75, - .lvl = 26, - .species = SPECIES_NUMEL, - }, - { - .iv = 75, - .lvl = 28, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 75, - .lvl = 30, - .species = SPECIES_ZUBAT, - }, - { - .iv = 75, - .lvl = 33, - .species = SPECIES_CAMERUPT, - } + { + .iv = 75, + .lvl = 26, + .species = SPECIES_NUMEL, + }, + { + .iv = 75, + .lvl = 28, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 75, + .lvl = 30, + .species = SPECIES_ZUBAT, + }, + { + .iv = 75, + .lvl = 33, + .species = SPECIES_CAMERUPT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darcy[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_PELIPPER, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_CAMERUPT, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_PELIPPER, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_CAMERUPT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie3[] = { - { - .iv = 150, - .lvl = 42, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 150, - .lvl = 43, - .species = SPECIES_CROBAT, - }, - { - .iv = 150, - .lvl = 44, - .species = SPECIES_CAMERUPT, - } + { + .iv = 150, + .lvl = 42, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 150, + .lvl = 43, + .species = SPECIES_CROBAT, + }, + { + .iv = 150, + .lvl = 44, + .species = SPECIES_CAMERUPT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pete[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_TENTACOOL, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isabelle[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres1[] = { - { - .iv = 50, - .lvl = 25, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 50, - .lvl = 25, - .species = SPECIES_SANDSHREW, - } + { + .iv = 50, + .lvl = 25, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 50, + .lvl = 25, + .species = SPECIES_SANDSHREW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Josue[] = { - { - .iv = 50, - .lvl = 25, - .species = SPECIES_TAILLOW, - }, - { - .iv = 50, - .lvl = 25, - .species = SPECIES_WINGULL, - } + { + .iv = 50, + .lvl = 25, + .species = SPECIES_TAILLOW, + }, + { + .iv = 50, + .lvl = 25, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Camron[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory1[] = { - { - .iv = 0, - .lvl = 24, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 24, - .species = SPECIES_MACHOP, - }, - { - .iv = 0, - .lvl = 24, - .species = SPECIES_TENTACOOL, - } + { + .iv = 0, + .lvl = 24, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_MACHOP, + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carolina[] = { - { - .iv = 50, - .lvl = 24, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 50, - .lvl = 24, - .species = SPECIES_SWELLOW, - }, - { - .iv = 50, - .lvl = 24, - .species = SPECIES_MANECTRIC, - } + { + .iv = 50, + .lvl = 24, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 50, + .lvl = 24, + .species = SPECIES_SWELLOW, + }, + { + .iv = 50, + .lvl = 24, + .species = SPECIES_MANECTRIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elijah[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_SKARMORY, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_SKARMORY, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_SKARMORY, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_SKARMORY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Celia[] = { - { - .iv = 0, - .lvl = 22, - .species = SPECIES_MARILL, - }, - { - .iv = 0, - .lvl = 22, - .species = SPECIES_LOMBRE, - } + { + .iv = 0, + .lvl = 22, + .species = SPECIES_MARILL, + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_LOMBRE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bryan[] = { - { - .iv = 0, - .lvl = 22, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 0, - .lvl = 22, - .species = SPECIES_SANDSLASH, - } + { + .iv = 0, + .lvl = 22, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_SANDSLASH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Branden[] = { - { - .iv = 0, - .lvl = 22, - .species = SPECIES_TAILLOW, - }, - { - .iv = 0, - .lvl = 22, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 22, + .species = SPECIES_TAILLOW, + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bryant[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_NUMEL, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SLUGMA, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NUMEL, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SLUGMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shayla[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_ROSELIA, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kyra[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_DODUO, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_DODRIO, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_DODUO, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_DODRIO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jaiden[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_NINJASK, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_GULPIN, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_NINJASK, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GULPIN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alix[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_KADABRA, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_KIRLIA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_KADABRA, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_KIRLIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Helene[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MEDITITE, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MAKUHITA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MEDITITE, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marlene[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_MEDITITE, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SPOINK, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_MEDITITE, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SPOINK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Devan[] = { - { - .iv = 0, - .lvl = 8, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 8, - .species = SPECIES_GEODUDE, - } + { + .iv = 0, + .lvl = 8, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 8, + .species = SPECIES_GEODUDE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johnson[] = { - { - .iv = 0, - .lvl = 8, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 8, - .species = SPECIES_LOTAD, - } + { + .iv = 0, + .lvl = 8, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 8, + .species = SPECIES_LOTAD, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melina[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_DODUO, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_DODUO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandi[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_RALTS, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_RALTS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aisha[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_MEDITITE, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Makayla[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_ROSELIA, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_MEDICHAM, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_ROSELIA, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_MEDICHAM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fabian[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MANECTRIC, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MANECTRIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dayton[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_SLUGMA, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_SLUGMA, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rachel[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Leonel[] = { - { - .iv = 100, - .lvl = 30, - .species = SPECIES_MANECTRIC, - .moves = MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_NONE - } + { + .iv = 100, + .lvl = 30, + .species = SPECIES_MANECTRIC, + .moves = MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Callie[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_MEDITITE, - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_MAKUHITA, - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_MEDITITE, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cale[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_DUSTOX, - }, - { - .iv = 0, - .lvl = 29, - .species = SPECIES_BEAUTIFLY, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_DUSTOX, + }, + { + .iv = 0, + .lvl = 29, + .species = SPECIES_BEAUTIFLY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Myles[] = { - { - .iv = 10, - .lvl = 25, - .species = SPECIES_MAKUHITA, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_WINGULL, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_TROPIUS, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_NUMEL, - } + { + .iv = 10, + .lvl = 25, + .species = SPECIES_MAKUHITA, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_TROPIUS, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pat[] = { - { - .iv = 10, - .lvl = 25, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_MARILL, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_GULPIN, - } + { + .iv = 10, + .lvl = 25, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_MARILL, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_GULPIN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin1[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_LOUDRED, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_VIGOROTH, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOUDRED, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_VIGOROTH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May14[] = { - { - .iv = 25, - .lvl = 13, - .species = SPECIES_LOTAD, - }, - { - .iv = 50, - .lvl = 15, - .species = SPECIES_TORCHIC, - } + { + .iv = 25, + .lvl = 13, + .species = SPECIES_LOTAD, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_TORCHIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May15[] = { - { - .iv = 25, - .lvl = 13, - .species = SPECIES_TORKOAL, - }, - { - .iv = 50, - .lvl = 15, - .species = SPECIES_MUDKIP, - } + { + .iv = 25, + .lvl = 13, + .species = SPECIES_TORKOAL, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_MUDKIP, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne2[] = { - { - .iv = 255, - .lvl = 32, - .species = SPECIES_GOLEM, - .heldItem = ITEM_NONE, - .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION - }, - { - .iv = 255, - .lvl = 35, - .species = SPECIES_KABUTO, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 35, - .species = SPECIES_ONIX, - .heldItem = ITEM_NONE, - .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 37, - .species = SPECIES_NOSEPASS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE - } + { + .iv = 255, + .lvl = 32, + .species = SPECIES_GOLEM, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION + }, + { + .iv = 255, + .lvl = 35, + .species = SPECIES_KABUTO, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 35, + .species = SPECIES_ONIX, + .heldItem = ITEM_NONE, + .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 37, + .species = SPECIES_NOSEPASS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne3[] = { - { - .iv = 255, - .lvl = 37, - .species = SPECIES_OMANYTE, - .heldItem = ITEM_NONE, - .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF - }, - { - .iv = 255, - .lvl = 37, - .species = SPECIES_GOLEM, - .heldItem = ITEM_NONE, - .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION - }, - { - .iv = 255, - .lvl = 40, - .species = SPECIES_KABUTOPS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 40, - .species = SPECIES_ONIX, - .heldItem = ITEM_NONE, - .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 42, - .species = SPECIES_NOSEPASS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE - } + { + .iv = 255, + .lvl = 37, + .species = SPECIES_OMANYTE, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF + }, + { + .iv = 255, + .lvl = 37, + .species = SPECIES_GOLEM, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION + }, + { + .iv = 255, + .lvl = 40, + .species = SPECIES_KABUTOPS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 40, + .species = SPECIES_ONIX, + .heldItem = ITEM_NONE, + .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 42, + .species = SPECIES_NOSEPASS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne4[] = { - { - .iv = 255, - .lvl = 42, - .species = SPECIES_OMASTAR, - .heldItem = ITEM_NONE, - .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF - }, - { - .iv = 255, - .lvl = 42, - .species = SPECIES_GOLEM, - .heldItem = ITEM_NONE, - .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_KABUTOPS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_ONIX, - .heldItem = ITEM_NONE, - .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 47, - .species = SPECIES_NOSEPASS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE - } + { + .iv = 255, + .lvl = 42, + .species = SPECIES_OMASTAR, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF + }, + { + .iv = 255, + .lvl = 42, + .species = SPECIES_GOLEM, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_KABUTOPS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_ONIX, + .heldItem = ITEM_NONE, + .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 47, + .species = SPECIES_NOSEPASS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne5[] = { - { - .iv = 255, - .lvl = 47, - .species = SPECIES_AERODACTYL, - .heldItem = ITEM_NONE, - .moves = MOVE_ROCK_SLIDE, MOVE_HYPER_BEAM, MOVE_SUPERSONIC, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 47, - .species = SPECIES_GOLEM, - .heldItem = ITEM_NONE, - .moves = MOVE_FOCUS_PUNCH, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION - }, - { - .iv = 255, - .lvl = 47, - .species = SPECIES_OMASTAR, - .heldItem = ITEM_NONE, - .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_KABUTOPS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_STEELIX, - .heldItem = ITEM_NONE, - .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 52, - .species = SPECIES_NOSEPASS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE - } + { + .iv = 255, + .lvl = 47, + .species = SPECIES_AERODACTYL, + .heldItem = ITEM_NONE, + .moves = MOVE_ROCK_SLIDE, MOVE_HYPER_BEAM, MOVE_SUPERSONIC, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 47, + .species = SPECIES_GOLEM, + .heldItem = ITEM_NONE, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION + }, + { + .iv = 255, + .lvl = 47, + .species = SPECIES_OMASTAR, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_KABUTOPS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_STEELIX, + .heldItem = ITEM_NONE, + .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 52, + .species = SPECIES_NOSEPASS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Brawly2[] = { - { - .iv = 255, - .lvl = 33, - .species = SPECIES_MACHAMP, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP - }, - { - .iv = 255, - .lvl = 33, - .species = SPECIES_MEDITITE, - .heldItem = ITEM_NONE, - .moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH - }, - { - .iv = 255, - .lvl = 35, - .species = SPECIES_HITMONTOP, - .heldItem = ITEM_NONE, - .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK - }, - { - .iv = 255, - .lvl = 37, - .species = SPECIES_HARIYAMA, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 33, + .species = SPECIES_MACHAMP, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP + }, + { + .iv = 255, + .lvl = 33, + .species = SPECIES_MEDITITE, + .heldItem = ITEM_NONE, + .moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 35, + .species = SPECIES_HITMONTOP, + .heldItem = ITEM_NONE, + .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK + }, + { + .iv = 255, + .lvl = 37, + .species = SPECIES_HARIYAMA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Brawly3[] = { - { - .iv = 255, - .lvl = 38, - .species = SPECIES_MACHAMP, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP - }, - { - .iv = 255, - .lvl = 38, - .species = SPECIES_MEDICHAM, - .heldItem = ITEM_NONE, - .moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH - }, - { - .iv = 255, - .lvl = 40, - .species = SPECIES_HITMONTOP, - .heldItem = ITEM_NONE, - .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK - }, - { - .iv = 255, - .lvl = 42, - .species = SPECIES_HARIYAMA, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 38, + .species = SPECIES_MACHAMP, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP + }, + { + .iv = 255, + .lvl = 38, + .species = SPECIES_MEDICHAM, + .heldItem = ITEM_NONE, + .moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 40, + .species = SPECIES_HITMONTOP, + .heldItem = ITEM_NONE, + .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK + }, + { + .iv = 255, + .lvl = 42, + .species = SPECIES_HARIYAMA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Brawly4[] = { - { - .iv = 255, - .lvl = 40, - .species = SPECIES_HITMONCHAN, - .heldItem = ITEM_NONE, - .moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_MACHAMP, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_MEDICHAM, - .heldItem = ITEM_NONE, - .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_HITMONTOP, - .heldItem = ITEM_NONE, - .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK - }, - { - .iv = 255, - .lvl = 47, - .species = SPECIES_HARIYAMA, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 40, + .species = SPECIES_HITMONCHAN, + .heldItem = ITEM_NONE, + .moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_MACHAMP, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_MEDICHAM, + .heldItem = ITEM_NONE, + .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_HITMONTOP, + .heldItem = ITEM_NONE, + .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK + }, + { + .iv = 255, + .lvl = 47, + .species = SPECIES_HARIYAMA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Brawly5[] = { - { - .iv = 255, - .lvl = 46, - .species = SPECIES_HITMONLEE, - .heldItem = ITEM_NONE, - .moves = MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_BULK_UP - }, - { - .iv = 255, - .lvl = 46, - .species = SPECIES_HITMONCHAN, - .heldItem = ITEM_NONE, - .moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_MACHAMP, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_MEDICHAM, - .heldItem = ITEM_NONE, - .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_HITMONTOP, - .heldItem = ITEM_NONE, - .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK - }, - { - .iv = 255, - .lvl = 52, - .species = SPECIES_HARIYAMA, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 46, + .species = SPECIES_HITMONLEE, + .heldItem = ITEM_NONE, + .moves = MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_BULK_UP + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_HITMONCHAN, + .heldItem = ITEM_NONE, + .moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_MACHAMP, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_MEDICHAM, + .heldItem = ITEM_NONE, + .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_HITMONTOP, + .heldItem = ITEM_NONE, + .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK + }, + { + .iv = 255, + .lvl = 52, + .species = SPECIES_HARIYAMA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Wattson2[] = { - { - .iv = 255, - .lvl = 36, - .species = SPECIES_MAREEP, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 36, - .species = SPECIES_ELECTRODE, - .heldItem = ITEM_NONE, - .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 38, - .species = SPECIES_MAGNETON, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 40, - .species = SPECIES_MANECTRIC, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT - } + { + .iv = 255, + .lvl = 36, + .species = SPECIES_MAREEP, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 36, + .species = SPECIES_ELECTRODE, + .heldItem = ITEM_NONE, + .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 38, + .species = SPECIES_MAGNETON, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 40, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Wattson3[] = { - { - .iv = 255, - .lvl = 39, - .species = SPECIES_PIKACHU, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_SHOCK_WAVE - }, - { - .iv = 255, - .lvl = 41, - .species = SPECIES_FLAAFFY, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 41, - .species = SPECIES_ELECTRODE, - .heldItem = ITEM_NONE, - .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_MAGNETON, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_MANECTRIC, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT - } + { + .iv = 255, + .lvl = 39, + .species = SPECIES_PIKACHU, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_SHOCK_WAVE + }, + { + .iv = 255, + .lvl = 41, + .species = SPECIES_FLAAFFY, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 41, + .species = SPECIES_ELECTRODE, + .heldItem = ITEM_NONE, + .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_MAGNETON, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Wattson4[] = { - { - .iv = 255, - .lvl = 44, - .species = SPECIES_RAICHU, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 46, - .species = SPECIES_AMPHAROS, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 46, - .species = SPECIES_ELECTRODE, - .heldItem = ITEM_NONE, - .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_MAGNETON, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_MANECTRIC, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT - } + { + .iv = 255, + .lvl = 44, + .species = SPECIES_RAICHU, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_AMPHAROS, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_ELECTRODE, + .heldItem = ITEM_NONE, + .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_MAGNETON, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Wattson5[] = { - { - .iv = 255, - .lvl = 50, - .species = SPECIES_ELECTABUZZ, - .heldItem = ITEM_NONE, - .moves = MOVE_SWIFT, MOVE_FOCUS_PUNCH, MOVE_THUNDER_PUNCH, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_RAICHU, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_AMPHAROS, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_ELECTRODE, - .heldItem = ITEM_NONE, - .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_MAGNETON, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_MANECTRIC, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT - } + { + .iv = 255, + .lvl = 50, + .species = SPECIES_ELECTABUZZ, + .heldItem = ITEM_NONE, + .moves = MOVE_SWIFT, MOVE_FOCUS_PUNCH, MOVE_THUNDER_PUNCH, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_RAICHU, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_AMPHAROS, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_ELECTRODE, + .heldItem = ITEM_NONE, + .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_MAGNETON, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Flannery2[] = { - { - .iv = 255, - .lvl = 38, - .species = SPECIES_MAGCARGO, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 36, - .species = SPECIES_PONYTA, - .heldItem = ITEM_NONE, - .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE - }, - { - .iv = 255, - .lvl = 38, - .species = SPECIES_CAMERUPT, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT - }, - { - .iv = 255, - .lvl = 40, - .species = SPECIES_TORKOAL, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT - } + { + .iv = 255, + .lvl = 38, + .species = SPECIES_MAGCARGO, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 36, + .species = SPECIES_PONYTA, + .heldItem = ITEM_NONE, + .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE + }, + { + .iv = 255, + .lvl = 38, + .species = SPECIES_CAMERUPT, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT + }, + { + .iv = 255, + .lvl = 40, + .species = SPECIES_TORKOAL, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Flannery3[] = { - { - .iv = 255, - .lvl = 41, - .species = SPECIES_GROWLITHE, - .heldItem = ITEM_NONE, - .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_SUNNY_DAY - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_MAGCARGO, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 41, - .species = SPECIES_PONYTA, - .heldItem = ITEM_NONE, - .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_CAMERUPT, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_TORKOAL, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT - } + { + .iv = 255, + .lvl = 41, + .species = SPECIES_GROWLITHE, + .heldItem = ITEM_NONE, + .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_SUNNY_DAY + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_MAGCARGO, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 41, + .species = SPECIES_PONYTA, + .heldItem = ITEM_NONE, + .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_CAMERUPT, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_TORKOAL, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Flannery4[] = { - { - .iv = 255, - .lvl = 46, - .species = SPECIES_HOUNDOUR, - .heldItem = ITEM_NONE, - .moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY - }, - { - .iv = 255, - .lvl = 46, - .species = SPECIES_GROWLITHE, - .heldItem = ITEM_NONE, - .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_MAGCARGO, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 46, - .species = SPECIES_RAPIDASH, - .heldItem = ITEM_NONE, - .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_CAMERUPT, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_TORKOAL, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT - } + { + .iv = 255, + .lvl = 46, + .species = SPECIES_HOUNDOUR, + .heldItem = ITEM_NONE, + .moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_GROWLITHE, + .heldItem = ITEM_NONE, + .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_MAGCARGO, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_RAPIDASH, + .heldItem = ITEM_NONE, + .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_CAMERUPT, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_TORKOAL, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Flannery5[] = { - { - .iv = 255, - .lvl = 51, - .species = SPECIES_ARCANINE, - .heldItem = ITEM_NONE, - .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_MAGCARGO, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_HOUNDOOM, - .heldItem = ITEM_NONE, - .moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_RAPIDASH, - .heldItem = ITEM_NONE, - .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_CAMERUPT, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_TORKOAL, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT - } + { + .iv = 255, + .lvl = 51, + .species = SPECIES_ARCANINE, + .heldItem = ITEM_NONE, + .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_MAGCARGO, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_HOUNDOOM, + .heldItem = ITEM_NONE, + .moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_RAPIDASH, + .heldItem = ITEM_NONE, + .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_CAMERUPT, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_TORKOAL, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Norman2[] = { - { - .iv = 255, - .lvl = 42, - .species = SPECIES_CHANSEY, - .heldItem = ITEM_NONE, - .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH - }, - { - .iv = 255, - .lvl = 42, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_SPINDA, - .heldItem = ITEM_NONE, - .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL - } + { + .iv = 255, + .lvl = 42, + .species = SPECIES_CHANSEY, + .heldItem = ITEM_NONE, + .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 42, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Norman3[] = { - { - .iv = 255, - .lvl = 47, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST - }, - { - .iv = 255, - .lvl = 47, - .species = SPECIES_CHANSEY, - .heldItem = ITEM_NONE, - .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_KANGASKHAN, - .heldItem = ITEM_NONE, - .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_SPINDA, - .heldItem = ITEM_NONE, - .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL - } + { + .iv = 255, + .lvl = 47, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST + }, + { + .iv = 255, + .lvl = 47, + .species = SPECIES_CHANSEY, + .heldItem = ITEM_NONE, + .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_KANGASKHAN, + .heldItem = ITEM_NONE, + .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Norman4[] = { - { - .iv = 255, - .lvl = 52, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST - }, - { - .iv = 255, - .lvl = 52, - .species = SPECIES_BLISSEY, - .heldItem = ITEM_NONE, - .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_KANGASKHAN, - .heldItem = ITEM_NONE, - .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_SPINDA, - .heldItem = ITEM_NONE, - .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL - } + { + .iv = 255, + .lvl = 52, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST + }, + { + .iv = 255, + .lvl = 52, + .species = SPECIES_BLISSEY, + .heldItem = ITEM_NONE, + .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_KANGASKHAN, + .heldItem = ITEM_NONE, + .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Norman5[] = { - { - .iv = 255, - .lvl = 57, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST - }, - { - .iv = 255, - .lvl = 57, - .species = SPECIES_BLISSEY, - .heldItem = ITEM_NONE, - .moves = MOVE_PROTECT, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_KANGASKHAN, - .heldItem = ITEM_NONE, - .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL - }, - { - .iv = 255, - .lvl = 57, - .species = SPECIES_TAUROS, - .heldItem = ITEM_NONE, - .moves = MOVE_TAKE_DOWN, MOVE_PROTECT, MOVE_FIRE_BLAST, MOVE_EARTHQUAKE - }, - { - .iv = 255, - .lvl = 58, - .species = SPECIES_SPINDA, - .heldItem = ITEM_NONE, - .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS - }, - { - .iv = 255, - .lvl = 60, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL - } + { + .iv = 255, + .lvl = 57, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST + }, + { + .iv = 255, + .lvl = 57, + .species = SPECIES_BLISSEY, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_KANGASKHAN, + .heldItem = ITEM_NONE, + .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL + }, + { + .iv = 255, + .lvl = 57, + .species = SPECIES_TAUROS, + .heldItem = ITEM_NONE, + .moves = MOVE_TAKE_DOWN, MOVE_PROTECT, MOVE_FIRE_BLAST, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS + }, + { + .iv = 255, + .lvl = 60, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Winona2[] = { - { - .iv = 255, - .lvl = 40, - .species = SPECIES_DRATINI, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 38, - .species = SPECIES_TROPIUS, - .heldItem = ITEM_NONE, - .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE - }, - { - .iv = 255, - .lvl = 41, - .species = SPECIES_PELIPPER, - .heldItem = ITEM_NONE, - .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_SKARMORY, - .heldItem = ITEM_NONE, - .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 40, + .species = SPECIES_DRATINI, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 38, + .species = SPECIES_TROPIUS, + .heldItem = ITEM_NONE, + .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 41, + .species = SPECIES_PELIPPER, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Winona3[] = { - { - .iv = 255, - .lvl = 43, - .species = SPECIES_HOOTHOOT, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_TROPIUS, - .heldItem = ITEM_NONE, - .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_DRAGONAIR, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 46, - .species = SPECIES_PELIPPER, - .heldItem = ITEM_NONE, - .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_SKARMORY, - .heldItem = ITEM_NONE, - .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 43, + .species = SPECIES_HOOTHOOT, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_TROPIUS, + .heldItem = ITEM_NONE, + .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_DRAGONAIR, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_PELIPPER, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Winona4[] = { - { - .iv = 255, - .lvl = 48, - .species = SPECIES_NOCTOWL, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER - }, - { - .iv = 255, - .lvl = 49, - .species = SPECIES_TROPIUS, - .heldItem = ITEM_NONE, - .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_DRAGONAIR, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_PELIPPER, - .heldItem = ITEM_NONE, - .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_SKARMORY, - .heldItem = ITEM_NONE, - .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 48, + .species = SPECIES_NOCTOWL, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER + }, + { + .iv = 255, + .lvl = 49, + .species = SPECIES_TROPIUS, + .heldItem = ITEM_NONE, + .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_DRAGONAIR, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_PELIPPER, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Winona5[] = { - { - .iv = 255, - .lvl = 53, - .species = SPECIES_NOCTOWL, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER - }, - { - .iv = 255, - .lvl = 54, - .species = SPECIES_TROPIUS, - .heldItem = ITEM_NONE, - .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_PELIPPER, - .heldItem = ITEM_NONE, - .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_DRAGONITE, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 58, - .species = SPECIES_SKARMORY, - .heldItem = ITEM_NONE, - .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 60, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_SKY_ATTACK, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 53, + .species = SPECIES_NOCTOWL, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER + }, + { + .iv = 255, + .lvl = 54, + .species = SPECIES_TROPIUS, + .heldItem = ITEM_NONE, + .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_PELIPPER, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_DRAGONITE, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 60, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_SKY_ATTACK, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza2[] = { - { - .iv = 255, - .lvl = 48, - .species = SPECIES_SLOWPOKE, - .heldItem = ITEM_NONE, - .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 49, - .species = SPECIES_CLAYDOL, - .heldItem = ITEM_NONE, - .moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 49, - .species = SPECIES_XATU, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_LUNATONE, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_SOLROCK, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER - } + { + .iv = 255, + .lvl = 48, + .species = SPECIES_SLOWPOKE, + .heldItem = ITEM_NONE, + .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 49, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 49, + .species = SPECIES_XATU, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_LUNATONE, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_SOLROCK, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER + } }; const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza3[] = { - { - .iv = 255, - .lvl = 53, - .species = SPECIES_DROWZEE, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_SLOWPOKE, - .heldItem = ITEM_NONE, - .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 54, - .species = SPECIES_CLAYDOL, - .heldItem = ITEM_NONE, - .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 54, - .species = SPECIES_XATU, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_LUNATONE, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_SOLROCK, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER - } + { + .iv = 255, + .lvl = 53, + .species = SPECIES_DROWZEE, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_SLOWPOKE, + .heldItem = ITEM_NONE, + .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 54, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 54, + .species = SPECIES_XATU, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_LUNATONE, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_SOLROCK, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER + } }; const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza4[] = { - { - .iv = 255, - .lvl = 58, - .species = SPECIES_HYPNO, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 59, - .species = SPECIES_CLAYDOL, - .heldItem = ITEM_NONE, - .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 58, - .species = SPECIES_SLOWPOKE, - .heldItem = ITEM_NONE, - .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 59, - .species = SPECIES_XATU, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 60, - .species = SPECIES_LUNATONE, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 60, - .species = SPECIES_SOLROCK, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER - } + { + .iv = 255, + .lvl = 58, + .species = SPECIES_HYPNO, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 59, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_SLOWPOKE, + .heldItem = ITEM_NONE, + .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 59, + .species = SPECIES_XATU, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 60, + .species = SPECIES_LUNATONE, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 60, + .species = SPECIES_SOLROCK, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER + } }; const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza5[] = { - { - .iv = 255, - .lvl = 63, - .species = SPECIES_HYPNO, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 64, - .species = SPECIES_CLAYDOL, - .heldItem = ITEM_NONE, - .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 63, - .species = SPECIES_SLOWKING, - .heldItem = ITEM_NONE, - .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 64, - .species = SPECIES_XATU, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 65, - .species = SPECIES_LUNATONE, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 65, - .species = SPECIES_SOLROCK, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER - } + { + .iv = 255, + .lvl = 63, + .species = SPECIES_HYPNO, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 64, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 63, + .species = SPECIES_SLOWKING, + .heldItem = ITEM_NONE, + .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 64, + .species = SPECIES_XATU, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 65, + .species = SPECIES_LUNATONE, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 65, + .species = SPECIES_SOLROCK, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Juan2[] = { - { - .iv = 255, - .lvl = 46, - .species = SPECIES_POLIWAG, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP - }, - { - .iv = 255, - .lvl = 46, - .species = SPECIES_WHISCASH, - .heldItem = ITEM_NONE, - .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_WALREIN, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_CRAWDAUNT, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_REST, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_DOUBLE_TEAM - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_KINGDRA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST - } + { + .iv = 255, + .lvl = 46, + .species = SPECIES_POLIWAG, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_WALREIN, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_REST, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_DOUBLE_TEAM + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Juan3[] = { - { - .iv = 255, - .lvl = 50, - .species = SPECIES_POLIWHIRL, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_WHISCASH, - .heldItem = ITEM_NONE, - .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_WALREIN, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_CRAWDAUNT, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM - }, - { - .iv = 255, - .lvl = 56, - .species = SPECIES_KINGDRA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST - } + { + .iv = 255, + .lvl = 50, + .species = SPECIES_POLIWHIRL, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_WALREIN, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM + }, + { + .iv = 255, + .lvl = 56, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Juan4[] = { - { - .iv = 255, - .lvl = 56, - .species = SPECIES_LAPRAS, - .heldItem = ITEM_NONE, - .moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY - }, - { - .iv = 255, - .lvl = 58, - .species = SPECIES_WHISCASH, - .heldItem = ITEM_NONE, - .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE - }, - { - .iv = 255, - .lvl = 56, - .species = SPECIES_POLIWHIRL, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP - }, - { - .iv = 255, - .lvl = 58, - .species = SPECIES_WALREIN, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 58, - .species = SPECIES_CRAWDAUNT, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM - }, - { - .iv = 255, - .lvl = 61, - .species = SPECIES_KINGDRA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST - } + { + .iv = 255, + .lvl = 56, + .species = SPECIES_LAPRAS, + .heldItem = ITEM_NONE, + .moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE + }, + { + .iv = 255, + .lvl = 56, + .species = SPECIES_POLIWHIRL, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_WALREIN, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM + }, + { + .iv = 255, + .lvl = 61, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Juan5[] = { - { - .iv = 255, - .lvl = 61, - .species = SPECIES_LAPRAS, - .heldItem = ITEM_NONE, - .moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY - }, - { - .iv = 255, - .lvl = 63, - .species = SPECIES_WHISCASH, - .heldItem = ITEM_NONE, - .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE - }, - { - .iv = 255, - .lvl = 61, - .species = SPECIES_POLITOED, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_HYDRO_PUMP, MOVE_PERISH_SONG - }, - { - .iv = 255, - .lvl = 63, - .species = SPECIES_WALREIN, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_SHEER_COLD - }, - { - .iv = 255, - .lvl = 63, - .species = SPECIES_CRAWDAUNT, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM - }, - { - .iv = 255, - .lvl = 66, - .species = SPECIES_KINGDRA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST - } + { + .iv = 255, + .lvl = 61, + .species = SPECIES_LAPRAS, + .heldItem = ITEM_NONE, + .moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY + }, + { + .iv = 255, + .lvl = 63, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE + }, + { + .iv = 255, + .lvl = 61, + .species = SPECIES_POLITOED, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_HYDRO_PUMP, MOVE_PERISH_SONG + }, + { + .iv = 255, + .lvl = 63, + .species = SPECIES_WALREIN, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_SHEER_COLD + }, + { + .iv = 255, + .lvl = 63, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM + }, + { + .iv = 255, + .lvl = 66, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Angelo[] = { - { - .iv = 100, - .lvl = 17, - .species = SPECIES_ILLUMISE, - .heldItem = ITEM_NONE, - .moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CHARM, MOVE_NONE - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_VOLBEAT, - .heldItem = ITEM_NONE, - .moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CONFUSE_RAY, MOVE_NONE - } + { + .iv = 100, + .lvl = 17, + .species = SPECIES_ILLUMISE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CHARM, MOVE_NONE + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_VOLBEAT, + .heldItem = ITEM_NONE, + .moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CONFUSE_RAY, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darius[] = { - { - .iv = 200, - .lvl = 30, - .species = SPECIES_TROPIUS, - } + { + .iv = 200, + .lvl = 30, + .species = SPECIES_TROPIUS, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Steven[] = { - { - .iv = 255, - .lvl = 77, - .species = SPECIES_SKARMORY, - .heldItem = ITEM_NONE, - .moves = MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_SPIKES, MOVE_STEEL_WING - }, - { - .iv = 255, - .lvl = 75, - .species = SPECIES_CLAYDOL, - .heldItem = ITEM_NONE, - .moves = MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE - }, - { - .iv = 255, - .lvl = 76, - .species = SPECIES_AGGRON, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_EARTHQUAKE, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW - }, - { - .iv = 255, - .lvl = 76, - .species = SPECIES_CRADILY, - .heldItem = ITEM_NONE, - .moves = MOVE_GIGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_INGRAIN, MOVE_CONFUSE_RAY - }, - { - .iv = 255, - .lvl = 76, - .species = SPECIES_ARMALDO, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_PULSE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_SLASH - }, - { - .iv = 255, - .lvl = 78, - .species = SPECIES_METAGROSS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_METEOR_MASH, MOVE_SHADOW_BALL - } + { + .iv = 255, + .lvl = 77, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_SPIKES, MOVE_STEEL_WING + }, + { + .iv = 255, + .lvl = 75, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 76, + .species = SPECIES_AGGRON, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_EARTHQUAKE, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW + }, + { + .iv = 255, + .lvl = 76, + .species = SPECIES_CRADILY, + .heldItem = ITEM_NONE, + .moves = MOVE_GIGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_INGRAIN, MOVE_CONFUSE_RAY + }, + { + .iv = 255, + .lvl = 76, + .species = SPECIES_ARMALDO, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_SLASH + }, + { + .iv = 255, + .lvl = 78, + .species = SPECIES_METAGROSS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_METEOR_MASH, MOVE_SHADOW_BALL + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anabel[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BELDUM, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tucker[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BELDUM, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spenser[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BELDUM, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greta[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BELDUM, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Noland[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BELDUM, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucy[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BELDUM, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BELDUM, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres2[] = { - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SANDSHREW, - } + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SANDSHREW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres3[] = { - { - .iv = 20, - .lvl = 33, - .species = SPECIES_NOSEPASS, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_SANDSHREW, - } + { + .iv = 20, + .lvl = 33, + .species = SPECIES_NOSEPASS, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_SANDSHREW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres4[] = { - { - .iv = 30, - .lvl = 35, - .species = SPECIES_NOSEPASS, - }, - { - .iv = 30, - .lvl = 35, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 30, - .lvl = 35, - .species = SPECIES_SANDSHREW, - } + { + .iv = 30, + .lvl = 35, + .species = SPECIES_NOSEPASS, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_SANDSHREW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres5[] = { - { - .iv = 40, - .lvl = 37, - .species = SPECIES_NOSEPASS, - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_SANDSLASH, - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_SANDSLASH, - } + { + .iv = 40, + .lvl = 37, + .species = SPECIES_NOSEPASS, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_SANDSLASH, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_SANDSLASH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory2[] = { - { - .iv = 10, - .lvl = 30, - .species = SPECIES_WINGULL, - }, - { - .iv = 10, - .lvl = 30, - .species = SPECIES_MACHOP, - }, - { - .iv = 10, - .lvl = 30, - .species = SPECIES_TENTACOOL, - } + { + .iv = 10, + .lvl = 30, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 30, + .species = SPECIES_MACHOP, + }, + { + .iv = 10, + .lvl = 30, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory3[] = { - { - .iv = 20, - .lvl = 32, - .species = SPECIES_PELIPPER, - }, - { - .iv = 20, - .lvl = 32, - .species = SPECIES_MACHOP, - }, - { - .iv = 20, - .lvl = 32, - .species = SPECIES_TENTACOOL, - } + { + .iv = 20, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 20, + .lvl = 32, + .species = SPECIES_MACHOP, + }, + { + .iv = 20, + .lvl = 32, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory4[] = { - { - .iv = 30, - .lvl = 34, - .species = SPECIES_PELIPPER, - }, - { - .iv = 30, - .lvl = 34, - .species = SPECIES_MACHOP, - }, - { - .iv = 30, - .lvl = 34, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 30, + .lvl = 34, + .species = SPECIES_PELIPPER, + }, + { + .iv = 30, + .lvl = 34, + .species = SPECIES_MACHOP, + }, + { + .iv = 30, + .lvl = 34, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory5[] = { - { - .iv = 40, - .lvl = 36, - .species = SPECIES_PELIPPER, - }, - { - .iv = 40, - .lvl = 36, - .species = SPECIES_MACHOKE, - }, - { - .iv = 40, - .lvl = 36, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 40, + .lvl = 36, + .species = SPECIES_PELIPPER, + }, + { + .iv = 40, + .lvl = 36, + .species = SPECIES_MACHOKE, + }, + { + .iv = 40, + .lvl = 36, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo2[] = { - { - .iv = 10, - .lvl = 37, - .species = SPECIES_STARYU, - }, - { - .iv = 10, - .lvl = 37, - .species = SPECIES_STARYU, - } + { + .iv = 10, + .lvl = 37, + .species = SPECIES_STARYU, + }, + { + .iv = 10, + .lvl = 37, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo3[] = { - { - .iv = 20, - .lvl = 39, - .species = SPECIES_WINGULL, - }, - { - .iv = 20, - .lvl = 39, - .species = SPECIES_STARYU, - }, - { - .iv = 20, - .lvl = 39, - .species = SPECIES_STARYU, - } + { + .iv = 20, + .lvl = 39, + .species = SPECIES_WINGULL, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_STARYU, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo4[] = { - { - .iv = 30, - .lvl = 41, - .species = SPECIES_PELIPPER, - }, - { - .iv = 30, - .lvl = 41, - .species = SPECIES_STARYU, - }, - { - .iv = 30, - .lvl = 41, - .species = SPECIES_STARYU, - } + { + .iv = 30, + .lvl = 41, + .species = SPECIES_PELIPPER, + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_STARYU, + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo5[] = { - { - .iv = 40, - .lvl = 43, - .species = SPECIES_PELIPPER, - }, - { - .iv = 40, - .lvl = 43, - .species = SPECIES_STARMIE, - }, - { - .iv = 40, - .lvl = 43, - .species = SPECIES_STARMIE, - } + { + .iv = 40, + .lvl = 43, + .species = SPECIES_PELIPPER, + }, + { + .iv = 40, + .lvl = 43, + .species = SPECIES_STARMIE, + }, + { + .iv = 40, + .lvl = 43, + .species = SPECIES_STARMIE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji2[] = { - { - .iv = 10, - .lvl = 37, - .species = SPECIES_MACHOKE, - }, - { - .iv = 10, - .lvl = 37, - .species = SPECIES_MACHOKE, - } + { + .iv = 10, + .lvl = 37, + .species = SPECIES_MACHOKE, + }, + { + .iv = 10, + .lvl = 37, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji3[] = { - { - .iv = 20, - .lvl = 39, - .species = SPECIES_MAKUHITA, - }, - { - .iv = 20, - .lvl = 39, - .species = SPECIES_MACHOKE, - }, - { - .iv = 20, - .lvl = 39, - .species = SPECIES_MACHOKE, - } + { + .iv = 20, + .lvl = 39, + .species = SPECIES_MAKUHITA, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_MACHOKE, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji4[] = { - { - .iv = 30, - .lvl = 41, - .species = SPECIES_HARIYAMA, - }, - { - .iv = 30, - .lvl = 41, - .species = SPECIES_MACHOKE, - }, - { - .iv = 30, - .lvl = 41, - .species = SPECIES_MACHOKE, - } + { + .iv = 30, + .lvl = 41, + .species = SPECIES_HARIYAMA, + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_MACHOKE, + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji5[] = { - { - .iv = 40, - .lvl = 43, - .species = SPECIES_HARIYAMA, - }, - { - .iv = 40, - .lvl = 43, - .species = SPECIES_MACHAMP, - }, - { - .iv = 40, - .lvl = 43, - .species = SPECIES_MACHAMP, - } + { + .iv = 40, + .lvl = 43, + .species = SPECIES_HARIYAMA, + }, + { + .iv = 40, + .lvl = 43, + .species = SPECIES_MACHAMP, + }, + { + .iv = 40, + .lvl = 43, + .species = SPECIES_MACHAMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin2[] = { - { - .iv = 110, - .lvl = 35, - .species = SPECIES_LOUDRED, - }, - { - .iv = 110, - .lvl = 35, - .species = SPECIES_VIGOROTH, - } + { + .iv = 110, + .lvl = 35, + .species = SPECIES_LOUDRED, + }, + { + .iv = 110, + .lvl = 35, + .species = SPECIES_VIGOROTH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin3[] = { - { - .iv = 120, - .lvl = 37, - .species = SPECIES_SPINDA, - }, - { - .iv = 120, - .lvl = 37, - .species = SPECIES_LOUDRED, - }, - { - .iv = 120, - .lvl = 37, - .species = SPECIES_VIGOROTH, - } + { + .iv = 120, + .lvl = 37, + .species = SPECIES_SPINDA, + }, + { + .iv = 120, + .lvl = 37, + .species = SPECIES_LOUDRED, + }, + { + .iv = 120, + .lvl = 37, + .species = SPECIES_VIGOROTH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin4[] = { - { - .iv = 130, - .lvl = 39, - .species = SPECIES_SPINDA, - }, - { - .iv = 130, - .lvl = 39, - .species = SPECIES_LOUDRED, - }, - { - .iv = 100, - .lvl = 39, - .species = SPECIES_VIGOROTH, - } + { + .iv = 130, + .lvl = 39, + .species = SPECIES_SPINDA, + }, + { + .iv = 130, + .lvl = 39, + .species = SPECIES_LOUDRED, + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_VIGOROTH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin5[] = { - { - .iv = 140, - .lvl = 41, - .species = SPECIES_SPINDA, - }, - { - .iv = 140, - .lvl = 41, - .species = SPECIES_EXPLOUD, - }, - { - .iv = 140, - .lvl = 41, - .species = SPECIES_SLAKING, - } + { + .iv = 140, + .lvl = 41, + .species = SPECIES_SPINDA, + }, + { + .iv = 140, + .lvl = 41, + .species = SPECIES_EXPLOUD, + }, + { + .iv = 140, + .lvl = 41, + .species = SPECIES_SLAKING, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando2[] = { - { - .iv = 10, - .lvl = 35, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 10, - .lvl = 35, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 10, - .lvl = 35, - .species = SPECIES_LOUDRED, - } + { + .iv = 10, + .lvl = 35, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 10, + .lvl = 35, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 10, + .lvl = 35, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando3[] = { - { - .iv = 20, - .lvl = 37, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 20, - .lvl = 37, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 20, - .lvl = 37, - .species = SPECIES_LOUDRED, - } + { + .iv = 20, + .lvl = 37, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 20, + .lvl = 37, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 20, + .lvl = 37, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando4[] = { - { - .iv = 30, - .lvl = 39, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 30, - .lvl = 39, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 30, - .lvl = 39, - .species = SPECIES_LOUDRED, - } + { + .iv = 30, + .lvl = 39, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 30, + .lvl = 39, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 30, + .lvl = 39, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando5[] = { - { - .iv = 40, - .lvl = 41, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 40, - .lvl = 41, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 40, - .lvl = 41, - .species = SPECIES_EXPLOUD, - } + { + .iv = 40, + .lvl = 41, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 40, + .lvl = 41, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 40, + .lvl = 41, + .species = SPECIES_EXPLOUD, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer2[] = { - { - .iv = 10, - .lvl = 26, - .species = SPECIES_GEODUDE, - }, - { - .iv = 10, - .lvl = 26, - .species = SPECIES_NUMEL, - } + { + .iv = 10, + .lvl = 26, + .species = SPECIES_GEODUDE, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer3[] = { - { - .iv = 20, - .lvl = 28, - .species = SPECIES_MACHOP, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_NUMEL, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_GRAVELER, - } + { + .iv = 20, + .lvl = 28, + .species = SPECIES_MACHOP, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_NUMEL, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_GRAVELER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer4[] = { - { - .iv = 30, - .lvl = 30, - .species = SPECIES_MACHOP, - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_NUMEL, - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_GRAVELER, - } + { + .iv = 30, + .lvl = 30, + .species = SPECIES_MACHOP, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_NUMEL, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_GRAVELER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer5[] = { - { - .iv = 40, - .lvl = 33, - .species = SPECIES_MACHOKE, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_CAMERUPT, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_GOLEM, - } + { + .iv = 40, + .lvl = 33, + .species = SPECIES_MACHOKE, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_CAMERUPT, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GOLEM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle2[] = { - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SKITTY, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_LOTAD, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SEEDOT, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_TAILLOW, - } + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SKITTY, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_LOTAD, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SEEDOT, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_TAILLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle3[] = { - { - .iv = 20, - .lvl = 33, - .species = SPECIES_SKITTY, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_LINOONE, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_LOMBRE, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_NUZLEAF, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_TAILLOW, - } + { + .iv = 20, + .lvl = 33, + .species = SPECIES_SKITTY, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_LINOONE, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_LOMBRE, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_NUZLEAF, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_TAILLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle4[] = { - { - .iv = 30, - .lvl = 35, - .species = SPECIES_DELCATTY, - }, - { - .iv = 30, - .lvl = 35, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 30, - .lvl = 35, - .species = SPECIES_LINOONE, - }, - { - .iv = 30, - .lvl = 35, - .species = SPECIES_LOMBRE, - }, - { - .iv = 30, - .lvl = 35, - .species = SPECIES_NUZLEAF, - }, - { - .iv = 30, - .lvl = 35, - .species = SPECIES_SWELLOW, - } + { + .iv = 30, + .lvl = 35, + .species = SPECIES_DELCATTY, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_LINOONE, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_LOMBRE, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_NUZLEAF, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_SWELLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle5[] = { - { - .iv = 40, - .lvl = 37, - .species = SPECIES_DELCATTY, - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_LINOONE, - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_LUDICOLO, - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_SHIFTRY, - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_SWELLOW, - } + { + .iv = 40, + .lvl = 37, + .species = SPECIES_DELCATTY, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_LINOONE, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_SHIFTRY, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_SWELLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia2[] = { - { - .iv = 10, - .lvl = 34, - .species = SPECIES_WAILMER, - }, - { - .iv = 10, - .lvl = 34, - .species = SPECIES_HORSEA, - } + { + .iv = 10, + .lvl = 34, + .species = SPECIES_WAILMER, + }, + { + .iv = 10, + .lvl = 34, + .species = SPECIES_HORSEA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia3[] = { - { - .iv = 20, - .lvl = 36, - .species = SPECIES_LUVDISC, - }, - { - .iv = 20, - .lvl = 36, - .species = SPECIES_WAILMER, - }, - { - .iv = 20, - .lvl = 36, - .species = SPECIES_SEADRA, - } + { + .iv = 20, + .lvl = 36, + .species = SPECIES_LUVDISC, + }, + { + .iv = 20, + .lvl = 36, + .species = SPECIES_WAILMER, + }, + { + .iv = 20, + .lvl = 36, + .species = SPECIES_SEADRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia4[] = { - { - .iv = 30, - .lvl = 38, - .species = SPECIES_LUVDISC, - }, - { - .iv = 30, - .lvl = 38, - .species = SPECIES_WAILMER, - }, - { - .iv = 30, - .lvl = 38, - .species = SPECIES_SEADRA, - } + { + .iv = 30, + .lvl = 38, + .species = SPECIES_LUVDISC, + }, + { + .iv = 30, + .lvl = 38, + .species = SPECIES_WAILMER, + }, + { + .iv = 30, + .lvl = 38, + .species = SPECIES_SEADRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia5[] = { - { - .iv = 40, - .lvl = 40, - .species = SPECIES_LUVDISC, - }, - { - .iv = 40, - .lvl = 40, - .species = SPECIES_WAILORD, - }, - { - .iv = 40, - .lvl = 40, - .species = SPECIES_KINGDRA, - } + { + .iv = 40, + .lvl = 40, + .species = SPECIES_LUVDISC, + }, + { + .iv = 40, + .lvl = 40, + .species = SPECIES_WAILORD, + }, + { + .iv = 40, + .lvl = 40, + .species = SPECIES_KINGDRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mariela[] = { - { - .iv = 0, - .lvl = 41, - .species = SPECIES_CHIMECHO, - } + { + .iv = 0, + .lvl = 41, + .species = SPECIES_CHIMECHO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alvaro[] = { - { - .iv = 0, - .lvl = 41, - .species = SPECIES_BANETTE, - }, - { - .iv = 0, - .lvl = 41, - .species = SPECIES_KADABRA, - } + { + .iv = 0, + .lvl = 41, + .species = SPECIES_BANETTE, + }, + { + .iv = 0, + .lvl = 41, + .species = SPECIES_KADABRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Everett[] = { - { - .iv = 0, - .lvl = 41, - .species = SPECIES_WOBBUFFET, - } + { + .iv = 0, + .lvl = 41, + .species = SPECIES_WOBBUFFET, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Red[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_CHARMANDER, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_CHARMANDER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leaf[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BULBASAUR, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BULBASAUR, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan16[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_GROUDON, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_GROUDON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May16[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_KYOGRE, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_KYOGRE, + } }; diff --git a/src/daycare.c b/src/daycare.c index 227451f48..5b166d3de 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -251,7 +251,7 @@ static void ApplyDaycareExperience(struct Pokemon *mon) while ((learnedMove = MonTryLearningNewMove(mon, firstMove)) != 0) { firstMove = FALSE; - if (learnedMove == INVALID_U16) + if (learnedMove == 0xFFFF) { // Mon already knows 4 moves. DeleteFirstMoveAndGiveMoveToMon(mon, gMoveToLearn); @@ -535,7 +535,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv) s32 i, j; u8 temp[NUM_STATS]; - ivs[selectedIv] = INVALID_U8; + ivs[selectedIv] = 0xFF; for (i = 0; i < NUM_STATS; i++) { temp[i] = ivs[i]; @@ -544,7 +544,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv) j = 0; for (i = 0; i < NUM_STATS; i++) { - if (temp[i] != INVALID_U8) + if (temp[i] != 0xFF) ivs[j++] = temp[i]; } } @@ -684,7 +684,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { if (sHatchedEggFatherMoves[i] == sHatchedEggEggMoves[j]) { - if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == INVALID_U16) + if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]); break; } @@ -703,7 +703,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { if (sHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01_FOCUS_PUNCH + j) && CanMonLearnTMHM(egg, j)) { - if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == INVALID_U16) + if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]); } } @@ -728,7 +728,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { if (sHatchedEggLevelUpMoves[j] != MOVE_NONE && sHatchedEggFinalMoves[i] == sHatchedEggLevelUpMoves[j]) { - if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == INVALID_U16) + if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == 0xFFFF) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFinalMoves[i]); break; } @@ -773,7 +773,7 @@ static void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *dayca if (motherItem == ITEM_LIGHT_BALL || fatherItem == ITEM_LIGHT_BALL) { - if (GiveMoveToMon(mon, MOVE_VOLT_TACKLE) == INVALID_U16) + if (GiveMoveToMon(mon, MOVE_VOLT_TACKLE) == 0xFFFF) DeleteFirstMoveAndGiveMoveToMon(mon, MOVE_VOLT_TACKLE); } } @@ -909,7 +909,7 @@ static bool8 _DoEggActions_CheckHatch(struct DayCare *daycare) } // try to trigger poke sex - if (daycare->offspringPersonality == 0 && validEggs == 2 && (daycare->mons[1].steps & 0xFF) == INVALID_U8) + if (daycare->offspringPersonality == 0 && validEggs == 2 && (daycare->mons[1].steps & 0xFF) == 0xFF) { u8 loveScore = GetDaycareCompatibilityScore(daycare); if (loveScore > (Random() * 100u) / USHRT_MAX) diff --git a/src/decompress.c b/src/decompress.c index 287a03e55..24d23209f 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -122,346 +122,346 @@ void sub_803471C() { asm(".syntax unified\n\ push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x24\n\ - mov r9, r0\n\ - str r1, [sp]\n\ - str r2, [sp, 0x4]\n\ - adds r5, r3, 0\n\ - movs r0, 0x1\n\ - mov r1, r9\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0803473C\n\ - b _080348D4\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x24\n\ + mov r9, r0\n\ + str r1, [sp]\n\ + str r2, [sp, 0x4]\n\ + adds r5, r3, 0\n\ + movs r0, 0x1\n\ + mov r1, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0803473C\n\ + b _080348D4\n\ _0803473C:\n\ - asrs r0, r1, 1\n\ - adds r0, 0x4\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - str r0, [sp, 0x8]\n\ - movs r0, 0\n\ - ldr r2, [sp]\n\ - cmp r0, r2\n\ - blt _08034750\n\ - b _08034964\n\ + asrs r0, r1, 1\n\ + adds r0, 0x4\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + str r0, [sp, 0x8]\n\ + movs r0, 0\n\ + ldr r2, [sp]\n\ + cmp r0, r2\n\ + blt _08034750\n\ + b _08034964\n\ _08034750:\n\ - movs r4, 0x8\n\ - subs r1, r4, r1\n\ - str r1, [sp, 0x10]\n\ + movs r4, 0x8\n\ + subs r1, r4, r1\n\ + str r1, [sp, 0x10]\n\ _08034756:\n\ - movs r7, 0\n\ - adds r0, 0x1\n\ - str r0, [sp, 0x14]\n\ - ldr r0, [sp, 0x10]\n\ - cmp r7, r0\n\ - bge _080347D2\n\ - ldr r1, [sp, 0x8]\n\ - lsls r1, 8\n\ - str r1, [sp, 0x18]\n\ - movs r2, 0\n\ - mov r10, r2\n\ - mov r0, r9\n\ - movs r4, 0x8\n\ - subs r0, r4, r0\n\ - str r0, [sp, 0xC]\n\ + movs r7, 0\n\ + adds r0, 0x1\n\ + str r0, [sp, 0x14]\n\ + ldr r0, [sp, 0x10]\n\ + cmp r7, r0\n\ + bge _080347D2\n\ + ldr r1, [sp, 0x8]\n\ + lsls r1, 8\n\ + str r1, [sp, 0x18]\n\ + movs r2, 0\n\ + mov r10, r2\n\ + mov r0, r9\n\ + movs r4, 0x8\n\ + subs r0, r4, r0\n\ + str r0, [sp, 0xC]\n\ _08034774:\n\ - movs r3, 0\n\ - asrs r0, r7, 1\n\ - adds r1, r7, 0\n\ - movs r2, 0x1\n\ - ands r1, r2\n\ - str r1, [sp, 0x20]\n\ - lsls r0, 8\n\ - mov r8, r0\n\ - mov r12, r5\n\ + movs r3, 0\n\ + asrs r0, r7, 1\n\ + adds r1, r7, 0\n\ + movs r2, 0x1\n\ + ands r1, r2\n\ + str r1, [sp, 0x20]\n\ + lsls r0, 8\n\ + mov r8, r0\n\ + mov r12, r5\n\ _08034786:\n\ - lsls r1, r3, 5\n\ - ldr r4, [sp, 0x18]\n\ - adds r0, r5, r4\n\ - adds r0, r1\n\ - mov r1, r8\n\ - adds r2, r0, r1\n\ - mov r1, r12\n\ - add r1, r8\n\ - movs r6, 0xF\n\ + lsls r1, r3, 5\n\ + ldr r4, [sp, 0x18]\n\ + adds r0, r5, r4\n\ + adds r0, r1\n\ + mov r1, r8\n\ + adds r2, r0, r1\n\ + mov r1, r12\n\ + add r1, r8\n\ + movs r6, 0xF\n\ _08034798:\n\ - ldr r4, [sp, 0x20]\n\ - cmp r4, 0\n\ - bne _080347A8\n\ - strb r4, [r1]\n\ - add r4, sp, 0x20\n\ - ldrb r4, [r4]\n\ - strb r4, [r2, 0x10]\n\ - b _080347B6\n\ + ldr r4, [sp, 0x20]\n\ + cmp r4, 0\n\ + bne _080347A8\n\ + strb r4, [r1]\n\ + add r4, sp, 0x20\n\ + ldrb r4, [r4]\n\ + strb r4, [r2, 0x10]\n\ + b _080347B6\n\ _080347A8:\n\ - mov r0, r10\n\ - strb r0, [r1, 0x10]\n\ - movs r4, 0x80\n\ - lsls r4, 1\n\ - adds r4, r2, r4\n\ - str r4, [sp, 0x1C]\n\ - strb r0, [r4]\n\ + mov r0, r10\n\ + strb r0, [r1, 0x10]\n\ + movs r4, 0x80\n\ + lsls r4, 1\n\ + adds r4, r2, r4\n\ + str r4, [sp, 0x1C]\n\ + strb r0, [r4]\n\ _080347B6:\n\ - adds r2, 0x1\n\ - adds r1, 0x1\n\ - subs r6, 0x1\n\ - cmp r6, 0\n\ - bge _08034798\n\ - movs r0, 0x20\n\ - add r12, r0\n\ - adds r3, 0x1\n\ - cmp r3, 0x7\n\ - ble _08034786\n\ - adds r7, 0x1\n\ - ldr r1, [sp, 0xC]\n\ - cmp r7, r1\n\ - blt _08034774\n\ + adds r2, 0x1\n\ + adds r1, 0x1\n\ + subs r6, 0x1\n\ + cmp r6, 0\n\ + bge _08034798\n\ + movs r0, 0x20\n\ + add r12, r0\n\ + adds r3, 0x1\n\ + cmp r3, 0x7\n\ + ble _08034786\n\ + adds r7, 0x1\n\ + ldr r1, [sp, 0xC]\n\ + cmp r7, r1\n\ + blt _08034774\n\ _080347D2:\n\ - movs r7, 0\n\ - movs r2, 0\n\ + movs r7, 0\n\ + movs r2, 0\n\ _080347D6:\n\ - movs r6, 0\n\ - adds r4, r7, 0x1\n\ - mov r8, r4\n\ - lsls r4, r7, 5\n\ + movs r6, 0\n\ + adds r4, r7, 0x1\n\ + mov r8, r4\n\ + lsls r4, r7, 5\n\ _080347DE:\n\ - adds r0, r6, 0x1\n\ - mov r10, r0\n\ - lsls r1, r6, 8\n\ - adds r0, r1, 0\n\ - adds r0, 0xC0\n\ - adds r0, r5, r0\n\ - adds r0, r4\n\ - adds r1, r5, r1\n\ - adds r1, r4\n\ - movs r3, 0x1F\n\ + adds r0, r6, 0x1\n\ + mov r10, r0\n\ + lsls r1, r6, 8\n\ + adds r0, r1, 0\n\ + adds r0, 0xC0\n\ + adds r0, r5, r0\n\ + adds r0, r4\n\ + adds r1, r5, r1\n\ + adds r1, r4\n\ + movs r3, 0x1F\n\ _080347F2:\n\ - strb r2, [r1]\n\ - strb r2, [r0]\n\ - adds r0, 0x1\n\ - adds r1, 0x1\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _080347F2\n\ - mov r6, r10\n\ - cmp r6, 0x7\n\ - ble _080347DE\n\ - mov r7, r8\n\ - cmp r7, 0x1\n\ - ble _080347D6\n\ - mov r1, r9\n\ - cmp r1, 0x5\n\ - bne _08034818\n\ - movs r2, 0x90\n\ - lsls r2, 1\n\ - adds r5, r2\n\ + strb r2, [r1]\n\ + strb r2, [r0]\n\ + adds r0, 0x1\n\ + adds r1, 0x1\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _080347F2\n\ + mov r6, r10\n\ + cmp r6, 0x7\n\ + ble _080347DE\n\ + mov r7, r8\n\ + cmp r7, 0x1\n\ + ble _080347D6\n\ + mov r1, r9\n\ + cmp r1, 0x5\n\ + bne _08034818\n\ + movs r2, 0x90\n\ + lsls r2, 1\n\ + adds r5, r2\n\ _08034818:\n\ - movs r7, 0\n\ - cmp r7, r9\n\ - bge _080348AE\n\ + movs r7, 0\n\ + cmp r7, r9\n\ + bge _080348AE\n\ _0803481E:\n\ - movs r3, 0\n\ - adds r7, 0x1\n\ - mov r8, r7\n\ - cmp r3, r9\n\ - bge _0803488E\n\ + movs r3, 0\n\ + adds r7, 0x1\n\ + mov r8, r7\n\ + cmp r3, r9\n\ + bge _0803488E\n\ _08034828:\n\ - adds r3, 0x1\n\ - mov r10, r3\n\ - ldr r4, [sp, 0x4]\n\ - adds r4, 0x20\n\ - adds r7, r5, 0\n\ - adds r7, 0x20\n\ - movs r0, 0x12\n\ - adds r0, r5\n\ - mov r12, r0\n\ - ldr r2, [sp, 0x4]\n\ - adds r3, r5, 0\n\ - movs r6, 0x3\n\ + adds r3, 0x1\n\ + mov r10, r3\n\ + ldr r4, [sp, 0x4]\n\ + adds r4, 0x20\n\ + adds r7, r5, 0\n\ + adds r7, 0x20\n\ + movs r0, 0x12\n\ + adds r0, r5\n\ + mov r12, r0\n\ + ldr r2, [sp, 0x4]\n\ + adds r3, r5, 0\n\ + movs r6, 0x3\n\ _08034840:\n\ - ldrb r0, [r2]\n\ - mov r1, r12\n\ - strb r0, [r1]\n\ - ldrb r0, [r2, 0x1]\n\ - strb r0, [r1, 0x1]\n\ - ldrb r0, [r2, 0x2]\n\ - strb r0, [r1, 0x1E]\n\ - ldrb r0, [r2, 0x3]\n\ - strb r0, [r1, 0x1F]\n\ - movs r0, 0x81\n\ - lsls r0, 1\n\ - adds r1, r3, r0\n\ - ldrb r0, [r2, 0x10]\n\ - strb r0, [r1]\n\ - ldr r0, =0x00000103\n\ - adds r1, r3, r0\n\ - ldrb r0, [r2, 0x11]\n\ - strb r0, [r1]\n\ - movs r0, 0x90\n\ - lsls r0, 1\n\ - adds r1, r3, r0\n\ - ldrb r0, [r2, 0x12]\n\ - strb r0, [r1]\n\ - ldr r0, =0x00000121\n\ - adds r1, r3, r0\n\ - ldrb r0, [r2, 0x13]\n\ - strb r0, [r1]\n\ - movs r1, 0x4\n\ - add r12, r1\n\ - adds r2, 0x4\n\ - adds r3, 0x4\n\ - subs r6, 0x1\n\ - cmp r6, 0\n\ - bge _08034840\n\ - str r4, [sp, 0x4]\n\ - adds r5, r7, 0\n\ - mov r3, r10\n\ - cmp r3, r9\n\ - blt _08034828\n\ + ldrb r0, [r2]\n\ + mov r1, r12\n\ + strb r0, [r1]\n\ + ldrb r0, [r2, 0x1]\n\ + strb r0, [r1, 0x1]\n\ + ldrb r0, [r2, 0x2]\n\ + strb r0, [r1, 0x1E]\n\ + ldrb r0, [r2, 0x3]\n\ + strb r0, [r1, 0x1F]\n\ + movs r0, 0x81\n\ + lsls r0, 1\n\ + adds r1, r3, r0\n\ + ldrb r0, [r2, 0x10]\n\ + strb r0, [r1]\n\ + ldr r0, =0x00000103\n\ + adds r1, r3, r0\n\ + ldrb r0, [r2, 0x11]\n\ + strb r0, [r1]\n\ + movs r0, 0x90\n\ + lsls r0, 1\n\ + adds r1, r3, r0\n\ + ldrb r0, [r2, 0x12]\n\ + strb r0, [r1]\n\ + ldr r0, =0x00000121\n\ + adds r1, r3, r0\n\ + ldrb r0, [r2, 0x13]\n\ + strb r0, [r1]\n\ + movs r1, 0x4\n\ + add r12, r1\n\ + adds r2, 0x4\n\ + adds r3, 0x4\n\ + subs r6, 0x1\n\ + cmp r6, 0\n\ + bge _08034840\n\ + str r4, [sp, 0x4]\n\ + adds r5, r7, 0\n\ + mov r3, r10\n\ + cmp r3, r9\n\ + blt _08034828\n\ _0803488E:\n\ - mov r2, r9\n\ - cmp r2, 0x7\n\ - bne _080348A0\n\ - adds r5, 0x20\n\ - b _080348A8\n\ - .pool\n\ + mov r2, r9\n\ + cmp r2, 0x7\n\ + bne _080348A0\n\ + adds r5, 0x20\n\ + b _080348A8\n\ + .pool\n\ _080348A0:\n\ - mov r4, r9\n\ - cmp r4, 0x5\n\ - bne _080348A8\n\ - adds r5, 0x60\n\ + mov r4, r9\n\ + cmp r4, 0x5\n\ + bne _080348A8\n\ + adds r5, 0x60\n\ _080348A8:\n\ - mov r7, r8\n\ - cmp r7, r9\n\ - blt _0803481E\n\ + mov r7, r8\n\ + cmp r7, r9\n\ + blt _0803481E\n\ _080348AE:\n\ - mov r0, r9\n\ - cmp r0, 0x7\n\ - bne _080348BC\n\ - movs r1, 0x80\n\ - lsls r1, 1\n\ - adds r5, r1\n\ - b _080348C8\n\ + mov r0, r9\n\ + cmp r0, 0x7\n\ + bne _080348BC\n\ + movs r1, 0x80\n\ + lsls r1, 1\n\ + adds r5, r1\n\ + b _080348C8\n\ _080348BC:\n\ - mov r2, r9\n\ - cmp r2, 0x5\n\ - bne _080348C8\n\ - movs r4, 0xF0\n\ - lsls r4, 1\n\ - adds r5, r4\n\ + mov r2, r9\n\ + cmp r2, 0x5\n\ + bne _080348C8\n\ + movs r4, 0xF0\n\ + lsls r4, 1\n\ + adds r5, r4\n\ _080348C8:\n\ - ldr r0, [sp, 0x14]\n\ - ldr r1, [sp]\n\ - cmp r0, r1\n\ - bge _080348D2\n\ - b _08034756\n\ + ldr r0, [sp, 0x14]\n\ + ldr r1, [sp]\n\ + cmp r0, r1\n\ + bge _080348D2\n\ + b _08034756\n\ _080348D2:\n\ - b _08034964\n\ + b _08034964\n\ _080348D4:\n\ - movs r6, 0\n\ - ldr r2, [sp]\n\ - cmp r6, r2\n\ - bge _08034964\n\ + movs r6, 0\n\ + ldr r2, [sp]\n\ + cmp r6, r2\n\ + bge _08034964\n\ _080348DC:\n\ - adds r6, 0x1\n\ - mov r10, r6\n\ - mov r4, r9\n\ - cmp r4, 0x6\n\ - bne _080348F4\n\ - movs r0, 0\n\ - movs r3, 0xFF\n\ + adds r6, 0x1\n\ + mov r10, r6\n\ + mov r4, r9\n\ + cmp r4, 0x6\n\ + bne _080348F4\n\ + movs r0, 0\n\ + movs r3, 0xFF\n\ _080348EA:\n\ - strb r0, [r5]\n\ - adds r5, 0x1\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _080348EA\n\ + strb r0, [r5]\n\ + adds r5, 0x1\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _080348EA\n\ _080348F4:\n\ - movs r7, 0\n\ - cmp r7, r9\n\ - bge _08034948\n\ + movs r7, 0\n\ + cmp r7, r9\n\ + bge _08034948\n\ _080348FA:\n\ - adds r7, 0x1\n\ - mov r8, r7\n\ - mov r1, r9\n\ - lsls r0, r1, 5\n\ - cmp r1, 0x6\n\ - bne _08034914\n\ - movs r1, 0\n\ - movs r3, 0x1F\n\ + adds r7, 0x1\n\ + mov r8, r7\n\ + mov r1, r9\n\ + lsls r0, r1, 5\n\ + cmp r1, 0x6\n\ + bne _08034914\n\ + movs r1, 0\n\ + movs r3, 0x1F\n\ _0803490A:\n\ - strb r1, [r5]\n\ - adds r5, 0x1\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _0803490A\n\ + strb r1, [r5]\n\ + adds r5, 0x1\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _0803490A\n\ _08034914:\n\ - adds r1, r0, 0\n\ - cmp r1, 0\n\ - ble _0803492E\n\ - adds r3, r1, 0\n\ + adds r1, r0, 0\n\ + cmp r1, 0\n\ + ble _0803492E\n\ + adds r3, r1, 0\n\ _0803491C:\n\ - ldr r2, [sp, 0x4]\n\ - ldrb r0, [r2]\n\ - strb r0, [r5]\n\ - adds r2, 0x1\n\ - str r2, [sp, 0x4]\n\ - adds r5, 0x1\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bne _0803491C\n\ + ldr r2, [sp, 0x4]\n\ + ldrb r0, [r2]\n\ + strb r0, [r5]\n\ + adds r2, 0x1\n\ + str r2, [sp, 0x4]\n\ + adds r5, 0x1\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bne _0803491C\n\ _0803492E:\n\ - mov r4, r9\n\ - cmp r4, 0x6\n\ - bne _08034942\n\ - movs r0, 0\n\ - movs r3, 0x1F\n\ + mov r4, r9\n\ + cmp r4, 0x6\n\ + bne _08034942\n\ + movs r0, 0\n\ + movs r3, 0x1F\n\ _08034938:\n\ - strb r0, [r5]\n\ - adds r5, 0x1\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _08034938\n\ + strb r0, [r5]\n\ + adds r5, 0x1\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _08034938\n\ _08034942:\n\ - mov r7, r8\n\ - cmp r7, r9\n\ - blt _080348FA\n\ + mov r7, r8\n\ + cmp r7, r9\n\ + blt _080348FA\n\ _08034948:\n\ - mov r0, r9\n\ - cmp r0, 0x6\n\ - bne _0803495C\n\ - movs r0, 0\n\ - movs r3, 0xFF\n\ + mov r0, r9\n\ + cmp r0, 0x6\n\ + bne _0803495C\n\ + movs r0, 0\n\ + movs r3, 0xFF\n\ _08034952:\n\ - strb r0, [r5]\n\ - adds r5, 0x1\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _08034952\n\ + strb r0, [r5]\n\ + adds r5, 0x1\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _08034952\n\ _0803495C:\n\ - mov r6, r10\n\ - ldr r1, [sp]\n\ - cmp r6, r1\n\ - blt _080348DC\n\ + mov r6, r10\n\ + ldr r1, [sp]\n\ + cmp r6, r1\n\ + blt _080348DC\n\ _08034964:\n\ - add sp, 0x24\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ + add sp, 0x24\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ .syntax divided"); } u32 GetDecompressedDataSize(const u32 *ptr) { - const u8 *ptr8 = (const u8 *)ptr; + const u8 *ptr8 = (const u8 *)ptr; return (ptr8[3] << 16) | (ptr8[2] << 8) | (ptr8[1]); } diff --git a/src/decoration.c b/src/decoration.c index 11fd59286..b45dec334 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -312,7 +312,7 @@ const struct SpriteFrameImage sDecorSelectorSpriteFrameImages = { }; const struct SpriteTemplate sDecorSelectorSpriteTemplate = { - INVALID_U16, + 0xFFFF, OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG, &sDecorSelectorOam, sDecorSelectorAnims, @@ -409,7 +409,7 @@ const struct SpriteFrameImage Unknown_085A73FC = { }; const struct SpriteTemplate gUnknown_085A7404 = { - INVALID_U16, + 0xFFFF, OVERWORLD_PLACE_DECOR_PLAYER_PAL_TAG, &Unknown_085A73E8, Unknown_085A73F8, @@ -881,7 +881,7 @@ void sub_81274A0(u8 a0, s32 a1, u8 a2) void sub_8127500(void) { - if (sDecorPCBuffer->unk_522 == INVALID_U8) + if (sDecorPCBuffer->unk_522 == 0xFF) { sDecorPCBuffer->unk_522 = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0x3c, 0x0c, 0x94, sDecorPCBuffer->unk_520 - sDecorPCBuffer->unk_521, 0x6e, 0x6e, &sSecretBasePCSelectDecorPageNo); } @@ -889,10 +889,10 @@ void sub_8127500(void) void sub_8127554(void) { - if (sDecorPCBuffer->unk_522 != INVALID_U8) + if (sDecorPCBuffer->unk_522 != 0xFF) { RemoveScrollIndicatorArrowPair(sDecorPCBuffer->unk_522); - sDecorPCBuffer->unk_522 = INVALID_U8; + sDecorPCBuffer->unk_522 = 0xFF; } } @@ -910,7 +910,7 @@ void sub_812759C(u8 taskId) sub_81269D4(3); sub_8127718(sCurDecorationCategory); sDecorPCBuffer = calloc(1, sizeof(struct DecorPCBuffer)); - sDecorPCBuffer->unk_522 = INVALID_U8; + sDecorPCBuffer->unk_522 = 0xFF; sub_8127284(); sub_81272C8(); sub_81272F8(); @@ -1188,7 +1188,7 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor) v0 = 0; } v1 = sub_8127B54(gDecorations[decor].id, i * decWidth + j); - if (v1 != INVALID_U16) + if (v1 != 0xFFFF) { MapGridSetMetatileEntryAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | flags | v1); } diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 0606364cd..ef125e564 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -129,7 +129,7 @@ static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *); const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0}; -const struct SpriteTemplate gCameraSpriteTemplate = {0, INVALID_U16, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject}; +const struct SpriteTemplate gCameraSpriteTemplate = {0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject}; void (*const gCameraObjectFuncs[])(struct Sprite *) = { CameraObject_0, @@ -142,255 +142,255 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = { // movement type callbacks static void (*const sMovementTypeCallbacks[])(struct Sprite *) = { - MovementType_None, // MOVEMENT_TYPE_NONE - MovementType_LookAround, // MOVEMENT_TYPE_LOOK_AROUND - MovementType_WanderAround, // MOVEMENT_TYPE_WANDER_AROUND - MovementType_WanderUpAndDown, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN - MovementType_WanderUpAndDown, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP - MovementType_WanderLeftAndRight, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT - MovementType_WanderLeftAndRight, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT - MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_UP - MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_DOWN - MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_LEFT - MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_RIGHT - MovementType_Player, // MOVEMENT_TYPE_PLAYER - MovementType_BerryTreeGrowth, // MOVEMENT_TYPE_BERRY_TREE_GROWTH - MovementType_FaceDownAndUp, // MOVEMENT_TYPE_FACE_DOWN_AND_UP - MovementType_FaceLeftAndRight, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT - MovementType_FaceUpAndLeft, // MOVEMENT_TYPE_FACE_UP_AND_LEFT - MovementType_FaceUpAndRight, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT - MovementType_FaceDownAndLeft, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT - MovementType_FaceDownAndRight, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT - MovementType_FaceDownUpAndLeft, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT - MovementType_FaceDownUpAndRight, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT - MovementType_FaceUpRightAndLeft, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT - MovementType_FaceDownRightAndLeft, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT - MovementType_RotateCounterclockwise, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE - MovementType_RotateClockwise, // MOVEMENT_TYPE_ROTATE_CLOCKWISE - MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_UP_AND_DOWN - MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_DOWN_AND_UP - MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT - MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT - MovementType_WalkSequenceUpRightLeftDown, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN - MovementType_WalkSequenceRightLeftDownUp, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP - MovementType_WalkSequenceDownUpRightLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT - MovementType_WalkSequenceLeftDownUpRight, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT - MovementType_WalkSequenceUpLeftRightDown, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN - MovementType_WalkSequenceLeftRightDownUp, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP - MovementType_WalkSequenceDownUpLeftRight, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT - MovementType_WalkSequenceRightDownUpLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT - MovementType_WalkSequenceLeftUpDownRight, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT - MovementType_WalkSequenceUpDownRightLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT - MovementType_WalkSequenceRightLeftUpDown, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN - MovementType_WalkSequenceDownRightLeftUp, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP - MovementType_WalkSequenceRightUpDownLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT - MovementType_WalkSequenceUpDownLeftRight, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT - MovementType_WalkSequenceLeftRightUpDown, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN - MovementType_WalkSequenceDownLeftRightUp, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP - MovementType_WalkSequenceUpLeftDownRight, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT - MovementType_WalkSequenceDownRightUpLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT - MovementType_WalkSequenceLeftDownRightUp, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP - MovementType_WalkSequenceRightUpLeftDown, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN - MovementType_WalkSequenceUpRightDownLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT - MovementType_WalkSequenceDownLeftUpRight, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT - MovementType_WalkSequenceLeftUpRightDown, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN - MovementType_WalkSequenceRightDownLeftUp, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP - MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER - MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE - MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE - MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE - MovementType_TreeDisguise, // MOVEMENT_TYPE_TREE_DISGUISE - MovementType_MountainDisguise, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE - MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS - MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS - MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS - MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS - MovementType_Hidden, // MOVEMENT_TYPE_HIDDEN - MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN - MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_UP - MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT - MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT - MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN - MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_UP - MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT - MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT - MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN - MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_UP - MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT - MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT - MovementType_Invisible, // MOVEMENT_TYPE_INVISIBLE - MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN - MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP - MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT - MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT + [MOVEMENT_TYPE_NONE] = MovementType_None, + [MOVEMENT_TYPE_LOOK_AROUND] = MovementType_LookAround, + [MOVEMENT_TYPE_WANDER_AROUND] = MovementType_WanderAround, + [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = MovementType_WanderUpAndDown, + [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = MovementType_WanderUpAndDown, + [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = MovementType_WanderLeftAndRight, + [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = MovementType_WanderLeftAndRight, + [MOVEMENT_TYPE_FACE_UP] = MovementType_FaceDirection, + [MOVEMENT_TYPE_FACE_DOWN] = MovementType_FaceDirection, + [MOVEMENT_TYPE_FACE_LEFT] = MovementType_FaceDirection, + [MOVEMENT_TYPE_FACE_RIGHT] = MovementType_FaceDirection, + [MOVEMENT_TYPE_PLAYER] = MovementType_Player, + [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = MovementType_BerryTreeGrowth, + [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = MovementType_FaceDownAndUp, + [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = MovementType_FaceLeftAndRight, + [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = MovementType_FaceUpAndLeft, + [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = MovementType_FaceUpAndRight, + [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = MovementType_FaceDownAndLeft, + [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = MovementType_FaceDownAndRight, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = MovementType_FaceDownUpAndLeft, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = MovementType_FaceDownUpAndRight, + [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = MovementType_FaceUpRightAndLeft, + [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = MovementType_FaceDownRightAndLeft, + [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = MovementType_RotateCounterclockwise, + [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = MovementType_RotateClockwise, + [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = MovementType_WalkBackAndForth, + [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = MovementType_WalkBackAndForth, + [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = MovementType_WalkBackAndForth, + [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = MovementType_WalkBackAndForth, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = MovementType_WalkSequenceUpRightLeftDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = MovementType_WalkSequenceRightLeftDownUp, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = MovementType_WalkSequenceDownUpRightLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = MovementType_WalkSequenceLeftDownUpRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = MovementType_WalkSequenceUpLeftRightDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = MovementType_WalkSequenceLeftRightDownUp, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = MovementType_WalkSequenceDownUpLeftRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = MovementType_WalkSequenceRightDownUpLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = MovementType_WalkSequenceLeftUpDownRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = MovementType_WalkSequenceUpDownRightLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = MovementType_WalkSequenceRightLeftUpDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = MovementType_WalkSequenceDownRightLeftUp, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = MovementType_WalkSequenceRightUpDownLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = MovementType_WalkSequenceUpDownLeftRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = MovementType_WalkSequenceLeftRightUpDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = MovementType_WalkSequenceDownLeftRightUp, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = MovementType_WalkSequenceUpLeftDownRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = MovementType_WalkSequenceDownRightUpLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = MovementType_WalkSequenceLeftDownRightUp, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = MovementType_WalkSequenceRightUpLeftDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = MovementType_WalkSequenceUpRightDownLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = MovementType_WalkSequenceDownLeftUpRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = MovementType_WalkSequenceLeftUpRightDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = MovementType_WalkSequenceRightDownLeftUp, + [MOVEMENT_TYPE_COPY_PLAYER] = MovementType_CopyPlayer, + [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = MovementType_CopyPlayer, + [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = MovementType_CopyPlayer, + [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = MovementType_CopyPlayer, + [MOVEMENT_TYPE_TREE_DISGUISE] = MovementType_TreeDisguise, + [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = MovementType_MountainDisguise, + [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = MovementType_CopyPlayerInGrass, + [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = MovementType_CopyPlayerInGrass, + [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = MovementType_CopyPlayerInGrass, + [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = MovementType_CopyPlayerInGrass, + [MOVEMENT_TYPE_HIDDEN] = MovementType_Hidden, + [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = MovementType_WalkInPlace, + [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = MovementType_WalkInPlace, + [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = MovementType_WalkInPlace, + [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = MovementType_WalkInPlace, + [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = MovementType_JogInPlace, + [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = MovementType_JogInPlace, + [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = MovementType_JogInPlace, + [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = MovementType_JogInPlace, + [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = MovementType_RunInPlace, + [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = MovementType_RunInPlace, + [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = MovementType_RunInPlace, + [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = MovementType_RunInPlace, + [MOVEMENT_TYPE_INVISIBLE] = MovementType_Invisible, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = MovementType_WalkSlowlyInPlace, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = MovementType_WalkSlowlyInPlace, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = MovementType_WalkSlowlyInPlace, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = MovementType_WalkSlowlyInPlace, }; const u8 gRangedMovementTypes[] = { - 0, // MOVEMENT_TYPE_NONE - 0, // MOVEMENT_TYPE_LOOK_AROUND - 1, // MOVEMENT_TYPE_WANDER_AROUND - 1, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN - 1, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP - 1, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT - 1, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT - 0, // MOVEMENT_TYPE_FACE_UP - 0, // MOVEMENT_TYPE_FACE_DOWN - 0, // MOVEMENT_TYPE_FACE_LEFT - 0, // MOVEMENT_TYPE_FACE_RIGHT - 0, // MOVEMENT_TYPE_PLAYER - 0, // MOVEMENT_TYPE_BERRY_TREE_GROWTH - 0, // MOVEMENT_TYPE_FACE_DOWN_AND_UP - 0, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT - 0, // MOVEMENT_TYPE_FACE_UP_AND_LEFT - 0, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT - 0, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT - 0, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT - 0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT - 0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT - 0, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT - 0, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT - 0, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE - 0, // MOVEMENT_TYPE_ROTATE_CLOCKWISE - 1, // MOVEMENT_TYPE_WALK_UP_AND_DOWN - 1, // MOVEMENT_TYPE_WALK_DOWN_AND_UP - 1, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT - 1, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP - 1, // MOVEMENT_TYPE_COPY_PLAYER - 1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE - 1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE - 1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE - 0, // MOVEMENT_TYPE_TREE_DISGUISE - 0, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE - 1, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS - 1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS - 1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS - 1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS - 0, // MOVEMENT_TYPE_HIDDEN - 0, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN - 0, // MOVEMENT_TYPE_WALK_IN_PLACE_UP - 0, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT - 0, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT - 0, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN - 0, // MOVEMENT_TYPE_JOG_IN_PLACE_UP - 0, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT - 0, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT - 0, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN - 0, // MOVEMENT_TYPE_RUN_IN_PLACE_UP - 0, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT - 0, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT - 0, // MOVEMENT_TYPE_INVISIBLE - 0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN - 0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP - 0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT - 0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT + [MOVEMENT_TYPE_NONE] = 0, + [MOVEMENT_TYPE_LOOK_AROUND] = 0, + [MOVEMENT_TYPE_WANDER_AROUND] = 1, + [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = 1, + [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = 1, + [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = 1, + [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = 1, + [MOVEMENT_TYPE_FACE_UP] = 0, + [MOVEMENT_TYPE_FACE_DOWN] = 0, + [MOVEMENT_TYPE_FACE_LEFT] = 0, + [MOVEMENT_TYPE_FACE_RIGHT] = 0, + [MOVEMENT_TYPE_PLAYER] = 0, + [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = 0, + [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = 0, + [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = 0, + [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = 0, + [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = 0, + [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = 0, + [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = 0, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = 0, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = 0, + [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = 0, + [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = 0, + [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = 0, + [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = 0, + [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = 1, + [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = 1, + [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = 1, + [MOVEMENT_TYPE_COPY_PLAYER] = 1, + [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = 1, + [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = 1, + [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = 1, + [MOVEMENT_TYPE_TREE_DISGUISE] = 0, + [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = 0, + [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = 1, + [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = 1, + [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = 1, + [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = 1, + [MOVEMENT_TYPE_HIDDEN] = 0, + [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = 0, + [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = 0, + [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = 0, + [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = 0, + [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = 0, + [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = 0, + [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = 0, + [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = 0, + [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = 0, + [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = 0, + [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = 0, + [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = 0, + [MOVEMENT_TYPE_INVISIBLE] = 0, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = 0, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = 0, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = 0, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = 0, }; const u8 gInitialMovementTypeFacingDirections[] = { - DIR_SOUTH, // MOVEMENT_TYPE_NONE - DIR_SOUTH, // MOVEMENT_TYPE_LOOK_AROUND - DIR_SOUTH, // MOVEMENT_TYPE_WANDER_AROUND - DIR_NORTH, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN - DIR_SOUTH, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP - DIR_WEST, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT - DIR_EAST, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT - DIR_NORTH, // MOVEMENT_TYPE_FACE_UP - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN - DIR_WEST, // MOVEMENT_TYPE_FACE_LEFT - DIR_EAST, // MOVEMENT_TYPE_FACE_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_PLAYER - DIR_SOUTH, // MOVEMENT_TYPE_BERRY_TREE_GROWTH - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_UP - DIR_WEST, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT - DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_LEFT - DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT - DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE - DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_CLOCKWISE - DIR_NORTH, // MOVEMENT_TYPE_WALK_UP_AND_DOWN - DIR_SOUTH, // MOVEMENT_TYPE_WALK_DOWN_AND_UP - DIR_WEST, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT - DIR_EAST, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP - DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER - DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE - DIR_WEST, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE - DIR_EAST, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE - DIR_SOUTH, // MOVEMENT_TYPE_TREE_DISGUISE - DIR_SOUTH, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE - DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS - DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS - DIR_WEST, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS - DIR_EAST, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS - DIR_SOUTH, // MOVEMENT_TYPE_HIDDEN - DIR_SOUTH, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN - DIR_NORTH, // MOVEMENT_TYPE_WALK_IN_PLACE_UP - DIR_WEST, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT - DIR_EAST, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN - DIR_NORTH, // MOVEMENT_TYPE_JOG_IN_PLACE_UP - DIR_WEST, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT - DIR_EAST, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN - DIR_NORTH, // MOVEMENT_TYPE_RUN_IN_PLACE_UP - DIR_WEST, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT - DIR_EAST, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_INVISIBLE - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN - DIR_NORTH, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP - DIR_WEST, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT - DIR_EAST, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT + [MOVEMENT_TYPE_NONE] = DIR_SOUTH, + [MOVEMENT_TYPE_LOOK_AROUND] = DIR_SOUTH, + [MOVEMENT_TYPE_WANDER_AROUND] = DIR_SOUTH, + [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = DIR_NORTH, + [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = DIR_SOUTH, + [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = DIR_WEST, + [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = DIR_EAST, + [MOVEMENT_TYPE_FACE_UP] = DIR_NORTH, + [MOVEMENT_TYPE_FACE_DOWN] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_LEFT] = DIR_WEST, + [MOVEMENT_TYPE_FACE_RIGHT] = DIR_EAST, + [MOVEMENT_TYPE_PLAYER] = DIR_SOUTH, + [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = DIR_WEST, + [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = DIR_NORTH, + [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = DIR_NORTH, + [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = DIR_NORTH, + [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = DIR_SOUTH, + [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = DIR_SOUTH, + [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = DIR_WEST, + [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = DIR_EAST, + [MOVEMENT_TYPE_COPY_PLAYER] = DIR_NORTH, + [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = DIR_SOUTH, + [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = DIR_WEST, + [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = DIR_EAST, + [MOVEMENT_TYPE_TREE_DISGUISE] = DIR_SOUTH, + [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = DIR_SOUTH, + [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = DIR_NORTH, + [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = DIR_SOUTH, + [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = DIR_WEST, + [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = DIR_EAST, + [MOVEMENT_TYPE_HIDDEN] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = DIR_WEST, + [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = DIR_EAST, + [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = DIR_SOUTH, + [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = DIR_NORTH, + [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = DIR_WEST, + [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = DIR_EAST, + [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = DIR_SOUTH, + [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = DIR_NORTH, + [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = DIR_WEST, + [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = DIR_EAST, + [MOVEMENT_TYPE_INVISIBLE] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = DIR_EAST, }; #define EVENT_OBJ_PAL_TAG_0 0x1103 @@ -668,181 +668,181 @@ const s16 gMovementDelaysShort[] = {32, 48, 64, 80}; #include "data/field_event_obj/movement_type_func_tables.h" const u8 gFaceDirectionAnimNums[] = { - 0, // DIR_NONE - 0, // DIR_SOUTH - 1, // DIR_NORTH - 2, // DIR_WEST - 3, // DIR_EAST - 0, // DIR_SOUTHWEST - 0, // DIR_SOUTHEAST - 1, // DIR_NORTHWEST - 1, // DIR_NORTHEAST + [DIR_NONE] = 0, + [DIR_SOUTH] = 0, + [DIR_NORTH] = 1, + [DIR_WEST] = 2, + [DIR_EAST] = 3, + [DIR_SOUTHWEST] = 0, + [DIR_SOUTHEAST] = 0, + [DIR_NORTHWEST] = 1, + [DIR_NORTHEAST] = 1, }; const u8 gMoveDirectionAnimNums[] = { - 4, // DIR_NONE - 4, // DIR_SOUTH - 5, // DIR_NORTH - 6, // DIR_WEST - 7, // DIR_EAST - 4, // DIR_SOUTHWEST - 4, // DIR_SOUTHEAST - 5, // DIR_NORTHWEST - 5, // DIR_NORTHEAST + [DIR_NONE] = 4, + [DIR_SOUTH] = 4, + [DIR_NORTH] = 5, + [DIR_WEST] = 6, + [DIR_EAST] = 7, + [DIR_SOUTHWEST] = 4, + [DIR_SOUTHEAST] = 4, + [DIR_NORTHWEST] = 5, + [DIR_NORTHEAST] = 5, }; const u8 gMoveDirectionFastAnimNums[] = { - 8, // DIR_NONE - 8, // DIR_SOUTH - 9, // DIR_NORTH - 10, // DIR_WEST - 11, // DIR_EAST - 8, // DIR_SOUTHWEST - 8, // DIR_SOUTHEAST - 9, // DIR_NORTHWEST - 9, // DIR_NORTHEAST + [DIR_NONE] = 8, + [DIR_SOUTH] = 8, + [DIR_NORTH] = 9, + [DIR_WEST] = 10, + [DIR_EAST] = 11, + [DIR_SOUTHWEST] = 8, + [DIR_SOUTHEAST] = 8, + [DIR_NORTHWEST] = 9, + [DIR_NORTHEAST] = 9, }; const u8 gMoveDirectionFasterAnimNums[] = { - 12, // DIR_NONE - 12, // DIR_SOUTH - 13, // DIR_NORTH - 14, // DIR_WEST - 15, // DIR_EAST - 12, // DIR_SOUTHWEST - 12, // DIR_SOUTHEAST - 13, // DIR_NORTHWEST - 13, // DIR_NORTHEAST + [DIR_NONE] = 12, + [DIR_SOUTH] = 12, + [DIR_NORTH] = 13, + [DIR_WEST] = 14, + [DIR_EAST] = 15, + [DIR_SOUTHWEST] = 12, + [DIR_SOUTHEAST] = 12, + [DIR_NORTHWEST] = 13, + [DIR_NORTHEAST] = 13, }; const u8 gMoveDirectionFastestAnimNums[] = { - 16, // DIR_NONE - 16, // DIR_SOUTH - 17, // DIR_NORTH - 18, // DIR_WEST - 19, // DIR_EAST - 16, // DIR_SOUTHWEST - 16, // DIR_SOUTHEAST - 17, // DIR_NORTHWEST - 17, // DIR_NORTHEAST + [DIR_NONE] = 16, + [DIR_SOUTH] = 16, + [DIR_NORTH] = 17, + [DIR_WEST] = 18, + [DIR_EAST] = 19, + [DIR_SOUTHWEST] = 16, + [DIR_SOUTHEAST] = 16, + [DIR_NORTHWEST] = 17, + [DIR_NORTHEAST] = 17, }; const u8 gJumpSpecialDirectionAnimNums[] = { // used for jumping onto surf mon - 20, // DIR_NONE - 20, // DIR_SOUTH - 21, // DIR_NORTH - 22, // DIR_WEST - 23, // DIR_EAST - 20, // DIR_SOUTHWEST - 20, // DIR_SOUTHEAST - 21, // DIR_NORTHWEST - 21, // DIR_NORTHEAST + [DIR_NONE] = 20, + [DIR_SOUTH] = 20, + [DIR_NORTH] = 21, + [DIR_WEST] = 22, + [DIR_EAST] = 23, + [DIR_SOUTHWEST] = 20, + [DIR_SOUTHEAST] = 20, + [DIR_NORTHWEST] = 21, + [DIR_NORTHEAST] = 21, }; const u8 gAcroWheelieDirectionAnimNums[] = { - 20, // DIR_NONE - 20, // DIR_SOUTH - 21, // DIR_NORTH - 22, // DIR_WEST - 23, // DIR_EAST - 20, // DIR_SOUTHWEST - 20, // DIR_SOUTHEAST - 21, // DIR_NORTHWEST - 21, // DIR_NORTHEAST + [DIR_NONE] = 20, + [DIR_SOUTH] = 20, + [DIR_NORTH] = 21, + [DIR_WEST] = 22, + [DIR_EAST] = 23, + [DIR_SOUTHWEST] = 20, + [DIR_SOUTHEAST] = 20, + [DIR_NORTHWEST] = 21, + [DIR_NORTHEAST] = 21, }; const u8 gUnrefAnimNums_08375633[] = { - 24, // DIR_NONE - 24, // DIR_SOUTH - 25, // DIR_NORTH - 26, // DIR_WEST - 27, // DIR_EAST - 24, // DIR_SOUTHWEST - 24, // DIR_SOUTHEAST - 25, // DIR_NORTHWEST - 25, // DIR_NORTHEAST + [DIR_NONE] = 24, + [DIR_SOUTH] = 24, + [DIR_NORTH] = 25, + [DIR_WEST] = 26, + [DIR_EAST] = 27, + [DIR_SOUTHWEST] = 24, + [DIR_SOUTHEAST] = 24, + [DIR_NORTHWEST] = 25, + [DIR_NORTHEAST] = 25, }; const u8 gAcroEndWheelieDirectionAnimNums[] = { - 28, // DIR_NONE - 28, // DIR_SOUTH - 29, // DIR_NORTH - 30, // DIR_WEST - 31, // DIR_EAST - 28, // DIR_SOUTHWEST - 28, // DIR_SOUTHEAST - 29, // DIR_NORTHWEST - 29, // DIR_NORTHEAST + [DIR_NONE] = 28, + [DIR_SOUTH] = 28, + [DIR_NORTH] = 29, + [DIR_WEST] = 30, + [DIR_EAST] = 31, + [DIR_SOUTHWEST] = 28, + [DIR_SOUTHEAST] = 28, + [DIR_NORTHWEST] = 29, + [DIR_NORTHEAST] = 29, }; const u8 gAcroUnusedActionDirectionAnimNums[] = { - 32, // DIR_NONE - 32, // DIR_SOUTH - 33, // DIR_NORTH - 34, // DIR_WEST - 35, // DIR_EAST - 32, // DIR_SOUTHWEST - 32, // DIR_SOUTHEAST - 33, // DIR_NORTHWEST - 33, // DIR_NORTHEAST + [DIR_NONE] = 32, + [DIR_SOUTH] = 32, + [DIR_NORTH] = 33, + [DIR_WEST] = 34, + [DIR_EAST] = 35, + [DIR_SOUTHWEST] = 32, + [DIR_SOUTHEAST] = 32, + [DIR_NORTHWEST] = 33, + [DIR_NORTHEAST] = 33, }; const u8 gAcroWheeliePedalDirectionAnimNums[] = { - 36, // DIR_NONE - 36, // DIR_SOUTH - 37, // DIR_NORTH - 38, // DIR_WEST - 39, // DIR_EAST - 36, // DIR_SOUTHWEST - 36, // DIR_SOUTHEAST - 37, // DIR_NORTHWEST - 37, // DIR_NORTHEAST + [DIR_NONE] = 36, + [DIR_SOUTH] = 36, + [DIR_NORTH] = 37, + [DIR_WEST] = 38, + [DIR_EAST] = 39, + [DIR_SOUTHWEST] = 36, + [DIR_SOUTHEAST] = 36, + [DIR_NORTHWEST] = 37, + [DIR_NORTHEAST] = 37, }; const u8 gFishingDirectionAnimNums[] = { - 0, // DIR_NONE - 0, // DIR_SOUTH - 1, // DIR_NORTH - 2, // DIR_WEST - 3, // DIR_EAST - 0, // DIR_SOUTHWEST - 0, // DIR_SOUTHEAST - 1, // DIR_NORTHWEST - 1, // DIR_NORTHEAST + [DIR_NONE] = 0, + [DIR_SOUTH] = 0, + [DIR_NORTH] = 1, + [DIR_WEST] = 2, + [DIR_EAST] = 3, + [DIR_SOUTHWEST] = 0, + [DIR_SOUTHEAST] = 0, + [DIR_NORTHWEST] = 1, + [DIR_NORTHEAST] = 1, }; const u8 gFishingNoCatchDirectionAnimNums[] = { - 4, // DIR_NONE - 4, // DIR_SOUTH - 5, // DIR_NORTH - 6, // DIR_WEST - 7, // DIR_EAST - 4, // DIR_SOUTHWEST - 4, // DIR_SOUTHEAST - 5, // DIR_NORTHWEST - 5, // DIR_NORTHEAST + [DIR_NONE] = 4, + [DIR_SOUTH] = 4, + [DIR_NORTH] = 5, + [DIR_WEST] = 6, + [DIR_EAST] = 7, + [DIR_SOUTHWEST] = 4, + [DIR_SOUTHEAST] = 4, + [DIR_NORTHWEST] = 5, + [DIR_NORTHEAST] = 5, }; const u8 gFishingBiteDirectionAnimNums[] = { - 8, // DIR_NONE - 8, // DIR_SOUTH - 9, // DIR_NORTH - 10, // DIR_WEST - 11, // DIR_EAST - 8, // DIR_SOUTHWEST - 8, // DIR_SOUTHEAST - 9, // DIR_NORTHWEST - 9, // DIR_NORTHEAST + [DIR_NONE] = 8, + [DIR_SOUTH] = 8, + [DIR_NORTH] = 9, + [DIR_WEST] = 10, + [DIR_EAST] = 11, + [DIR_SOUTHWEST] = 8, + [DIR_SOUTHEAST] = 8, + [DIR_NORTHWEST] = 9, + [DIR_NORTHEAST] = 9, }; const u8 gRunningDirectionAnimNums[] = { - 20, // DIR_NONE - 20, // DIR_SOUTH - 21, // DIR_NORTH - 22, // DIR_WEST - 23, // DIR_EAST - 20, // DIR_SOUTHWEST - 20, // DIR_SOUTHEAST - 21, // DIR_NORTHWEST - 21, // DIR_NORTHEAST + [DIR_NONE] = 20, + [DIR_SOUTH] = 20, + [DIR_NORTH] = 21, + [DIR_WEST] = 22, + [DIR_EAST] = 23, + [DIR_SOUTHWEST] = 20, + [DIR_SOUTHEAST] = 20, + [DIR_NORTHWEST] = 21, + [DIR_NORTHEAST] = 21, }; const u8 gTrainerFacingDirectionMovementTypes[] = { - MOVEMENT_TYPE_FACE_DOWN, // DIR_NONE - MOVEMENT_TYPE_FACE_DOWN, // DIR_SOUTH - MOVEMENT_TYPE_FACE_UP, // DIR_NORTH - MOVEMENT_TYPE_FACE_LEFT, // DIR_WEST - MOVEMENT_TYPE_FACE_RIGHT, // DIR_EAST - MOVEMENT_TYPE_FACE_DOWN, // DIR_SOUTHWEST - MOVEMENT_TYPE_FACE_DOWN, // DIR_SOUTHEAST - MOVEMENT_TYPE_FACE_UP, // DIR_NORTHWEST - MOVEMENT_TYPE_FACE_UP, // DIR_NORTHEAST + [DIR_NONE] = MOVEMENT_TYPE_FACE_DOWN, + [DIR_SOUTH] = MOVEMENT_TYPE_FACE_DOWN, + [DIR_NORTH] = MOVEMENT_TYPE_FACE_UP, + [DIR_WEST] = MOVEMENT_TYPE_FACE_LEFT, + [DIR_EAST] = MOVEMENT_TYPE_FACE_RIGHT, + [DIR_SOUTHWEST] = MOVEMENT_TYPE_FACE_DOWN, + [DIR_SOUTHEAST] = MOVEMENT_TYPE_FACE_DOWN, + [DIR_NORTHWEST] = MOVEMENT_TYPE_FACE_UP, + [DIR_NORTHEAST] = MOVEMENT_TYPE_FACE_UP, }; bool8 (*const gOppositeDirectionBlockedMetatileFuncs[])(u8) = { @@ -1093,10 +1093,10 @@ const u8 gUnknown_0850DC3F[][4] = { static void ClearEventObject(struct EventObject *eventObject) { *eventObject = (struct EventObject){}; - eventObject->localId = INVALID_U8; - eventObject->mapNum = INVALID_U8; - eventObject->mapGroup = INVALID_U8; - eventObject->movementActionId = INVALID_U8; + eventObject->localId = 0xFF; + eventObject->mapNum = 0xFF; + eventObject->mapGroup = 0xFF; + eventObject->movementActionId = 0xFF; } static void ClearAllEventObjects(void) @@ -1537,7 +1537,7 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl { eventObject->invisible = TRUE; } - *(u16 *)&spriteTemplate->paletteTag = INVALID_U16; + *(u16 *)&spriteTemplate->paletteTag = 0xFFFF; spriteId = CreateSprite(spriteTemplate, 0, 0, 0); if (spriteId == MAX_SPRITES) { @@ -1666,7 +1666,7 @@ u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x spriteTemplate = malloc(sizeof(struct SpriteTemplate)); MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables); - if (spriteTemplate->paletteTag != INVALID_U16) + if (spriteTemplate->paletteTag != 0xFFFF) { LoadEventObjectPalette(spriteTemplate->paletteTag); } @@ -1692,7 +1692,7 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, UpdateEventObjectSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables); - *(u16 *)&spriteTemplate.paletteTag = INVALID_U16; + *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; x += 7; y += 7; sub_80930E0(&x, &y, 8, 16); @@ -1849,7 +1849,7 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) spriteFrameImage.size = graphicsInfo->size; MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObject->graphicsId, eventObject->movementType, &spriteTemplate, &subspriteTables); spriteTemplate.images = &spriteFrameImage; - *(u16 *)&spriteTemplate.paletteTag = INVALID_U16; + *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; paletteSlot = graphicsInfo->paletteSlot; if (paletteSlot == 0) { @@ -1864,7 +1864,7 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) paletteSlot -= 16; sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot); } - *(u16 *)&spriteTemplate.paletteTag = INVALID_U16; + *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; spriteId = CreateSprite(&spriteTemplate, 0, 0, 0); if (spriteId != MAX_SPRITES) { @@ -2146,9 +2146,9 @@ void Unused_LoadEventObjectPaletteSet(u16 *paletteTags) static u8 sub_808E8F4(const struct SpritePalette *spritePalette) { - if (IndexOfSpritePaletteTag(spritePalette->tag) != INVALID_U8) + if (IndexOfSpritePaletteTag(spritePalette->tag) != 0xFF) { - return INVALID_U8; + return 0xFF; } return LoadSpritePalette(spritePalette); } @@ -2181,7 +2181,7 @@ static u8 FindEventObjectPaletteIndexByTag(u16 tag) return i; } } - return INVALID_U8; + return 0xFF; } void LoadPlayerObjectReflectionPalette(u16 tag, u8 slot) @@ -2513,7 +2513,7 @@ u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup) if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - return INVALID_U8; + return 0xFF; } return gEventObjects[eventObjectId].trainerType; } @@ -2529,7 +2529,7 @@ u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup) if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - return INVALID_U8; + return 0xFF; } return gEventObjects[eventObjectId].trainerRange_berryTreeId; } @@ -4374,7 +4374,7 @@ bool8 MovementType_CopyPlayer_Step0(struct EventObject *eventObject, struct Spri bool8 MovementType_CopyPlayer_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == INVALID_U8 || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } @@ -4553,7 +4553,7 @@ movement_type_def(MovementType_CopyPlayerInGrass, gMovementTypeFuncs_CopyPlayerI bool8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == INVALID_U8 || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } @@ -4699,7 +4699,7 @@ static void ClearEventObjectMovement(struct EventObject *eventObject, struct Spr eventObject->singleMovementActive = 0; eventObject->heldMovementActive = FALSE; eventObject->heldMovementFinished = FALSE; - eventObject->movementActionId = INVALID_U8; + eventObject->movementActionId = 0xFF; sprite->data[1] = 0; } @@ -5105,7 +5105,7 @@ bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject) bool8 EventObjectIsHeldMovementActive(struct EventObject *eventObject) { - if (eventObject->heldMovementActive && eventObject->movementActionId != INVALID_U8) + if (eventObject->heldMovementActive && eventObject->movementActionId != 0xFF) return TRUE; return FALSE; @@ -5138,7 +5138,7 @@ void EventObjectClearHeldMovementIfActive(struct EventObject *eventObject) void EventObjectClearHeldMovement(struct EventObject *eventObject) { - eventObject->movementActionId = INVALID_U8; + eventObject->movementActionId = 0xFF; eventObject->heldMovementActive = FALSE; eventObject->heldMovementFinished = FALSE; gSprites[eventObject->spriteId].data[1] = 0; @@ -5167,7 +5167,7 @@ u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject) if (eventObject->heldMovementActive) return eventObject->movementActionId; - return INVALID_U8; + return 0xFF; } void UpdateEventObjectCurrentMovement(struct EventObject *eventObject, struct Sprite *sprite, bool8 (*callback)(struct EventObject *, struct Sprite *)) @@ -5279,7 +5279,7 @@ static bool8 EventObjectExecSingleMovementAction(struct EventObject *eventObject { if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) { - eventObject->movementActionId = INVALID_U8; + eventObject->movementActionId = 0xFF; sprite->data[2] = 0; return TRUE; } @@ -5706,7 +5706,7 @@ u8 sub_80940C4(struct EventObject *eventObject, struct Sprite *sprite, u8 callba eventObject->triggerGroundEffectsOnMove = TRUE; eventObject->disableCoveringGroundEffects = TRUE; } - else if (result == INVALID_U8) + else if (result == 0xFF) { ShiftStillEventObjectCoords(eventObject); eventObject->triggerGroundEffectsOnStop = TRUE; @@ -5728,7 +5728,7 @@ u8 sub_809419C(struct EventObject *eventObject, struct Sprite *sprite) bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_8094188(eventObject, sprite) == INVALID_U8) + if (sub_8094188(eventObject, sprite) == 0xFF) { return TRUE; } @@ -5737,7 +5737,7 @@ bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite) bool8 sub_80941C8(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_809419C(eventObject, sprite) == INVALID_U8) + if (sub_809419C(eventObject, sprite) == 0xFF) { return TRUE; } @@ -9122,7 +9122,7 @@ void CreateLevitateMovementTask(struct EventObject *eventObject) StoreWordInTwoHalfwords(&task->data[0], (u32)eventObject); eventObject->warpArrowSpriteId = taskId; - task->data[3] = INVALID_U16; + task->data[3] = 0xFFFF; } static void ApplyLevitateMovement(u8 taskId) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 25d85a855..1070c69e9 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -748,7 +748,7 @@ static void Task_EvolutionScene(u8 taskID) GetMonData(mon, MON_DATA_NICKNAME, text); StringCopy10(gBattleTextBuff1, text); - if (var == INVALID_U16) // no place to learn it + if (var == 0xFFFF) // no place to learn it gTasks[taskID].tState = 22; else if (var == 0xFFFE) // it already knows that move break; @@ -1105,7 +1105,7 @@ static void Task_TradeEvolutionScene(u8 taskID) GetMonData(mon, MON_DATA_NICKNAME, text); StringCopy10(gBattleTextBuff1, text); - if (var == INVALID_U16) + if (var == 0xFFFF) gTasks[taskID].tState = 20; else if (var == 0xFFFE) break; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 1dce3169e..c52f5190f 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -266,7 +266,7 @@ const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatil else eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8) + if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) return NULL; for (i = 0; i < 4; i++) @@ -287,14 +287,14 @@ static const u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8 const u8 *script; eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height); - if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8) + if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) { if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE) return NULL; // Look for an event object on the other side of the counter. eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8) + if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) return NULL; } diff --git a/src/field_door.c b/src/field_door.c index a1fe5bb97..c197aca14 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -695,7 +695,7 @@ static void DrawClosedDoorTiles(const struct DoorGraphics *gfx, u32 x, u32 y) static void DrawDoor(const struct DoorGraphics *gfx, const struct DoorAnimFrame *frame, u32 x, u32 y) { - if (frame->offset == INVALID_U16) + if (frame->offset == 0xFFFF) { DrawClosedDoorTiles(gfx, x, y); if (sub_808A964()) diff --git a/src/field_effect.c b/src/field_effect.c index 91d61ef2f..40e15c733 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -305,7 +305,7 @@ const union AnimCmd *const gNewGameBirchImageAnimTable[] = { }; const struct SpriteTemplate gNewGameBirchObjectTemplate = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4102, .oam = &gNewGameBirchOamAttributes, .anims = gNewGameBirchImageAnimTable, @@ -383,7 +383,7 @@ const union AnimCmd *const gSpriteAnimTable_855C300[] = { }; const struct SpriteTemplate gSpriteTemplate_855C304 = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4103, .oam = &gOamData_855C218, .anims = gSpriteAnimTable_855C2F8, @@ -393,7 +393,7 @@ const struct SpriteTemplate gSpriteTemplate_855C304 = { }; const struct SpriteTemplate gSpriteTemplate_855C31C = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4100, .oam = &gOamData_855C220, .anims = gSpriteAnimTable_855C2F8, @@ -403,7 +403,7 @@ const struct SpriteTemplate gSpriteTemplate_855C31C = { }; const struct SpriteTemplate gSpriteTemplate_855C334 = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4112, .oam = &gOamData_855C220, .anims = gSpriteAnimTable_855C300, @@ -413,7 +413,7 @@ const struct SpriteTemplate gSpriteTemplate_855C334 = { }; const struct SpriteTemplate gSpriteTemplate_855C34C = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4112, .oam = &gOamData_855C26C, .anims = gSpriteAnimTable_855C300, @@ -618,7 +618,7 @@ u32 FieldEffectScript_ReadWord(u8 **script) void FieldEffectScript_LoadTiles(u8 **script) { struct SpriteSheet *sheet = (struct SpriteSheet *)FieldEffectScript_ReadWord(script); - if (GetSpriteTileStartByTag(sheet->tag) == INVALID_U16) + if (GetSpriteTileStartByTag(sheet->tag) == 0xFFFF) LoadSpriteSheet(sheet); (*script) += 4; } @@ -665,7 +665,7 @@ void FieldEffectFreeTilesIfUnused(u16 tileStart) u8 i; u16 tag = GetSpriteTileTagByTileStart(tileStart); - if (tag != INVALID_U16) + if (tag != 0xFFFF) { for (i = 0; i < MAX_SPRITES; i++) if (gSprites[i].inUse && gSprites[i].usingSheet && tileStart == gSprites[i].sheetTileStart) @@ -679,7 +679,7 @@ void FieldEffectFreePaletteIfUnused(u8 paletteNum) u8 i; u16 tag = GetSpritePaletteTagByPaletteNum(paletteNum); - if (tag != INVALID_U16) + if (tag != 0xFFFF) { for (i = 0; i < MAX_SPRITES; i++) if (gSprites[i].inUse && gSprites[i].oam.paletteNum == paletteNum) @@ -761,7 +761,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority) { s32 spriteId = CreateMonPicSprite_HandleDeoxys(species, 0, 0x8000, 1, x, y, 0, gMonPaletteTable[species].tag); PreservePaletteInWeather(IndexOfSpritePaletteTag(gMonPaletteTable[species].tag) + 0x10); - if (spriteId == INVALID_U16) + if (spriteId == 0xFFFF) return MAX_SPRITES; else return spriteId; @@ -772,7 +772,7 @@ u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subprio const struct CompressedSpritePalette *spritePalette = GetMonSpritePalStructFromOtIdPersonality(species, d, g); u16 spriteId = CreateMonPicSprite_HandleDeoxys(species, d, g, 1, x, y, 0, spritePalette->tag); PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10); - if (spriteId == INVALID_U16) + if (spriteId == 0xFFFF) return MAX_SPRITES; else return spriteId; @@ -3591,7 +3591,7 @@ const union AnimCmd *const gSpriteAnimTable_855C5DC[] = { }; const struct SpriteTemplate gUnknown_0855C5EC = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4378, .oam = &gOamData_855C218, .anims = gSpriteAnimTable_855C5DC, diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index a68a72c76..3046eccd5 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -1007,15 +1007,15 @@ void UpdateSurfBlobFieldEffect(struct Sprite *sprite) static void SynchroniseSurfAnim(struct EventObject *eventObject, struct Sprite *sprite) { u8 surfBlobDirectionAnims[] = { - 0, // DIR_NONE - 0, // DIR_SOUTH - 1, // DIR_NORTH - 2, // DIR_WEST - 3, // DIR_EAST - 0, - 0, - 1, - 1, + [DIR_NONE] = 0, + [DIR_SOUTH] = 0, + [DIR_NORTH] = 1, + [DIR_WEST] = 2, + [DIR_EAST] = 3, + [DIR_SOUTHWEST] = 0, + [DIR_SOUTHEAST] = 0, + [DIR_NORTHWEST] = 1, + [DIR_NORTHEAST] = 1, }; if (sub_8155640(sprite) == 0) diff --git a/src/field_message_box.c b/src/field_message_box.c index 0725ca8c7..46da9e9e5 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -53,7 +53,7 @@ void task_add_textbox(void) void task_del_textbox(void) { u8 taskId = FindTaskIdByFunc(sub_8098154); - if (taskId != INVALID_U8) + if (taskId != 0xFF) DestroyTask(taskId); } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 7da89fe83..a5aa23e32 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1389,7 +1389,7 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) u8 eventObjectId; struct EventObject *eventObject; - playerEventObjTemplate.localId = INVALID_U8; + playerEventObjTemplate.localId = 0xFF; playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); playerEventObjTemplate.x = x - 7; playerEventObjTemplate.y = y - 7; diff --git a/src/field_specials.c b/src/field_specials.c index 629f2d0de..b47df09fc 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1691,22 +1691,22 @@ const struct WindowTemplate gUnknown_085B2BAC = { }; const u8 *const gElevatorFloorsTable[] = { - gText_B4F, - gText_B3F, - gText_B2F, - gText_B1F, - gText_1F, - gText_2F, - gText_3F, - gText_4F, - gText_5F, - gText_6F, - gText_7F, - gText_8F, - gText_9F, - gText_10F, - gText_11F, - gText_Rooftop + gText_B4F, + gText_B3F, + gText_B2F, + gText_B1F, + gText_1F, + gText_2F, + gText_3F, + gText_4F, + gText_5F, + gText_6F, + gText_7F, + gText_8F, + gText_9F, + gText_10F, + gText_11F, + gText_Rooftop }; const u16 gUnknown_085B2BF4[][3] = @@ -1957,12 +1957,12 @@ void sub_8139D98(void) bool32 warp0_in_pokecenter(void) { - static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, INVALID_U16 }; + static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, 0xFFFF }; int i; u16 map = (gLastUsedWarp.mapGroup << 8) + gLastUsedWarp.mapNum; - for (i = 0; gUnknown_085B2C2A[i] != INVALID_U16; i++) + for (i = 0; gUnknown_085B2C2A[i] != 0xFFFF; i++) { if (gUnknown_085B2C2A[i] == map) return TRUE; @@ -2946,10 +2946,10 @@ void sub_813AA44(void) static void sub_813AA60(u16 a0, u16 a1) { - static const u16 gUnknown_085B312C[] = { 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, INVALID_U16 }; - static const u16 gUnknown_085B3142[] = { 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, INVALID_U16 }; - static const u16 gUnknown_085B314E[] = { 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, INVALID_U16 }; - static const u16 gUnknown_085B315C[] = { 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, INVALID_U16 }; + static const u16 gUnknown_085B312C[] = { 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, 0xFFFF }; + static const u16 gUnknown_085B3142[] = { 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xFFFF }; + static const u16 gUnknown_085B314E[] = { 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 0xFFFF }; + static const u16 gUnknown_085B315C[] = { 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xFFFF }; static const u8 *const gUnknown_085B3170[] = { BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA, @@ -3004,7 +3004,7 @@ static void sub_813AA60(u16 a0, u16 a1) { case 3: AddTextPrinterParameterized2(0, 1, gUnknown_085B3170[a1], 0, NULL, 2, 1, 3); - if (gUnknown_085B312C[a1] == INVALID_U16) + if (gUnknown_085B312C[a1] == 0xFFFF) { sub_813ABD4(gUnknown_085B312C[a1]); } @@ -3017,7 +3017,7 @@ static void sub_813AA60(u16 a0, u16 a1) break; case 4: AddTextPrinterParameterized2(0, 1, gUnknown_085B319C[a1], 0, NULL, 2, 1, 3); - if (gUnknown_085B3142[a1] == INVALID_U16) + if (gUnknown_085B3142[a1] == 0xFFFF) { sub_813ABD4(gUnknown_085B3142[a1]); } @@ -3841,13 +3841,13 @@ bool32 sub_813B9C0(void) MAP_TRADE_CENTER, MAP_RECORD_CORNER, MAP_DOUBLE_BATTLE_COLOSSEUM, - INVALID_U16 + 0xFFFF }; int i; u16 map = (gSaveBlock1Ptr->location.mapGroup << 8) + gSaveBlock1Ptr->location.mapNum; - for (i = 0; gUnknown_085B3444[i] != INVALID_U16; i++) + for (i = 0; gUnknown_085B3444[i] != 0xFFFF; i++) { if (gUnknown_085B3444[i] == map) { diff --git a/src/fieldmap.c b/src/fieldmap.c index aef17d49d..7e1fc03eb 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -496,7 +496,7 @@ u16 GetBehaviorByMetatileId(u16 metatile) } else { - return INVALID_U8; + return 0xFF; } } @@ -922,7 +922,7 @@ void sub_8088B94(int x, int y, int a2) bool8 sub_8088BF0(u16* a0, u16 a1, u8 a2) { - if (a2 == INVALID_U8) + if (a2 == 0xFF) return FALSE; if (a2 == 0) diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 2cffd5d41..6a310efd2 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -164,7 +164,7 @@ const struct SpritePalette gFieldEffectObjectPaletteInfo6 = {gFieldEffectObjectP static const struct SpriteTemplate sSpriteTemplate_CutGrass = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0x1000, .oam = &sOamData_CutGrass, .anims = sSpriteAnimTable_CutGrass, diff --git a/src/fldeff_groundshake.c b/src/fldeff_groundshake.c index 3bbc489c1..b9af24fb1 100644 --- a/src/fldeff_groundshake.c +++ b/src/fldeff_groundshake.c @@ -236,7 +236,7 @@ static void sub_81BE968(void) u8 taskId; taskId = FindTaskIdByFunc(sub_81BE9C0); - if(taskId != INVALID_U8) + if(taskId != 0xFF) gTasks[taskId].data[0]++; } diff --git a/src/fossil_specials.c b/src/fossil_specials.c index 8f6e38e91..dfdb999a9 100644 --- a/src/fossil_specials.c +++ b/src/fossil_specials.c @@ -302,7 +302,7 @@ static void sub_81BED50(u8 taskId) case 4: UnsetBgTilemapBuffer(0); anotherTaskId = FindTaskIdByFunc(sub_81BEBB4); - if (anotherTaskId != INVALID_U8) + if (anotherTaskId != 0xFF) DestroyTask(anotherTaskId); sUnknown_0203CF14[1] = sUnknown_0203CF14[0] = 0; sub_81BEB90(); @@ -458,104 +458,104 @@ static void sub_81BF2B8(u8* a, u16 b, u8 c, u8 d, u8 e) { asm_unified("\n\ push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x8\n\ - str r0, [sp]\n\ - mov r10, r1\n\ - adds r6, r2, 0\n\ - mov r8, r3\n\ - ldr r0, [sp, 0x28]\n\ - mov r9, r0\n\ - lsls r1, 16\n\ - lsrs r1, 16\n\ - mov r10, r1\n\ - lsls r6, 24\n\ - lsrs r6, 24\n\ - mov r0, r8\n\ - lsls r0, 24\n\ - mov r8, r0\n\ - lsrs r7, r0, 24\n\ - mov r1, r9\n\ - lsls r1, 24\n\ - lsrs r1, 24\n\ - mov r9, r1\n\ - mov r0, r10\n\ - adds r1, r7, 0\n\ - bl __divsi3\n\ - adds r5, r0, 0\n\ - lsls r5, 24\n\ - lsrs r4, r5, 24\n\ - ldr r3, =gUnknown_030012A8\n\ - strh r4, [r3]\n\ - mov r0, r10\n\ - adds r1, r7, 0\n\ - str r3, [sp, 0x4]\n\ - bl __modsi3\n\ - lsls r0, 24\n\ - lsrs r2, r0, 24\n\ - ldr r3, [sp, 0x4]\n\ - strh r2, [r3, 0x2]\n\ - movs r1, 0x7\n\ - ands r4, r1\n\ - ands r2, r1\n\ - strh r4, [r3, 0x4]\n\ - strh r2, [r3, 0x6]\n\ - lsrs r0, 27\n\ - lsrs r5, 27\n\ - strh r0, [r3, 0x8]\n\ - strh r5, [r3, 0xA]\n\ - mov r1, r8\n\ - lsrs r1, 27\n\ - lsls r1, 6\n\ - mov r8, r1\n\ - mov r1, r8\n\ - muls r1, r5\n\ - lsls r0, 6\n\ - adds r1, r0\n\ - lsls r1, 16\n\ - lsrs r1, 16\n\ - strh r1, [r3, 0xC]\n\ - lsls r4, 3\n\ - adds r4, r2\n\ - adds r1, r4\n\ - lsls r4, r1, 16\n\ - lsrs r4, 17\n\ - strh r1, [r3, 0xE]\n\ - movs r1, 0x1\n\ - mov r0, r10\n\ - ands r1, r0\n\ - movs r2, 0x1\n\ - eors r1, r2\n\ - lsls r0, r1, 2\n\ - lsls r6, r0\n\ - eors r1, r2\n\ - lsls r1, 2\n\ - movs r0, 0xF\n\ - lsls r0, r1\n\ - orrs r6, r0\n\ - lsls r6, 24\n\ - lsrs r6, 24\n\ - mov r1, r9\n\ - lsls r1, 5\n\ - mov r9, r1\n\ - add r9, r4\n\ - ldr r1, [sp]\n\ - add r1, r9\n\ - ldrb r0, [r1]\n\ - ands r6, r0\n\ - strb r6, [r1]\n\ - add sp, 0x8\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x8\n\ + str r0, [sp]\n\ + mov r10, r1\n\ + adds r6, r2, 0\n\ + mov r8, r3\n\ + ldr r0, [sp, 0x28]\n\ + mov r9, r0\n\ + lsls r1, 16\n\ + lsrs r1, 16\n\ + mov r10, r1\n\ + lsls r6, 24\n\ + lsrs r6, 24\n\ + mov r0, r8\n\ + lsls r0, 24\n\ + mov r8, r0\n\ + lsrs r7, r0, 24\n\ + mov r1, r9\n\ + lsls r1, 24\n\ + lsrs r1, 24\n\ + mov r9, r1\n\ + mov r0, r10\n\ + adds r1, r7, 0\n\ + bl __divsi3\n\ + adds r5, r0, 0\n\ + lsls r5, 24\n\ + lsrs r4, r5, 24\n\ + ldr r3, =gUnknown_030012A8\n\ + strh r4, [r3]\n\ + mov r0, r10\n\ + adds r1, r7, 0\n\ + str r3, [sp, 0x4]\n\ + bl __modsi3\n\ + lsls r0, 24\n\ + lsrs r2, r0, 24\n\ + ldr r3, [sp, 0x4]\n\ + strh r2, [r3, 0x2]\n\ + movs r1, 0x7\n\ + ands r4, r1\n\ + ands r2, r1\n\ + strh r4, [r3, 0x4]\n\ + strh r2, [r3, 0x6]\n\ + lsrs r0, 27\n\ + lsrs r5, 27\n\ + strh r0, [r3, 0x8]\n\ + strh r5, [r3, 0xA]\n\ + mov r1, r8\n\ + lsrs r1, 27\n\ + lsls r1, 6\n\ + mov r8, r1\n\ + mov r1, r8\n\ + muls r1, r5\n\ + lsls r0, 6\n\ + adds r1, r0\n\ + lsls r1, 16\n\ + lsrs r1, 16\n\ + strh r1, [r3, 0xC]\n\ + lsls r4, 3\n\ + adds r4, r2\n\ + adds r1, r4\n\ + lsls r4, r1, 16\n\ + lsrs r4, 17\n\ + strh r1, [r3, 0xE]\n\ + movs r1, 0x1\n\ + mov r0, r10\n\ + ands r1, r0\n\ + movs r2, 0x1\n\ + eors r1, r2\n\ + lsls r0, r1, 2\n\ + lsls r6, r0\n\ + eors r1, r2\n\ + lsls r1, 2\n\ + movs r0, 0xF\n\ + lsls r0, r1\n\ + orrs r6, r0\n\ + lsls r6, 24\n\ + lsrs r6, 24\n\ + mov r1, r9\n\ + lsls r1, 5\n\ + mov r9, r1\n\ + add r9, r4\n\ + ldr r1, [sp]\n\ + add r1, r9\n\ + ldrb r0, [r1]\n\ + ands r6, r0\n\ + strb r6, [r1]\n\ + add sp, 0x8\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ "); } #endif // NONMATCHING diff --git a/src/frontier_util.c b/src/frontier_util.c index e799f96c8..528cce699 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -681,7 +681,7 @@ static const u8 sFacilityToBrainEventObjGfx[][2] = const u16 gFrontierBannedSpecies[] = { SPECIES_MEW, SPECIES_MEWTWO, SPECIES_HO_OH, SPECIES_LUGIA, SPECIES_CELEBI, - SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, INVALID_U16 + SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, 0xFFFF }; static const u8 *const gUnknown_08611CB0[][2] = @@ -1829,7 +1829,7 @@ void sub_81A3ACC(void) s32 i; for (i = 0; i < 20; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16; + gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF; } static void sub_81A3B00(void) @@ -1974,10 +1974,10 @@ static void AppendIfValid(u16 species, u16 heldItem, u16 hp, u8 lvlMode, u8 monL if (species == SPECIES_EGG || species == SPECIES_NONE) return; - for (i = 0; gFrontierBannedSpecies[i] != INVALID_U16 && gFrontierBannedSpecies[i] != species; i++) + for (i = 0; gFrontierBannedSpecies[i] != 0xFFFF && gFrontierBannedSpecies[i] != species; i++) ; - if (gFrontierBannedSpecies[i] != INVALID_U16) + if (gFrontierBannedSpecies[i] != 0xFFFF) return; if (lvlMode == FRONTIER_LVL_50 && monLevel > 50) return; @@ -2060,7 +2060,7 @@ static void sub_81A3FD4(void) s32 i; s32 caughtBannedMons = 0; s32 species = gFrontierBannedSpecies[0]; - for (i = 0; species != INVALID_U16; i++, species = gFrontierBannedSpecies[i]) + for (i = 0; species != 0xFFFF; i++, species = gFrontierBannedSpecies[i]) { if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT)) caughtBannedMons++; @@ -2068,7 +2068,7 @@ static void sub_81A3FD4(void) gStringVar1[0] = EOS; gSpecialVar_0x8004 = 1; count = 0; - for (i = 0; gFrontierBannedSpecies[i] != INVALID_U16; i++) + for (i = 0; gFrontierBannedSpecies[i] != 0xFFFF; i++) count = sub_81A3DD0(gFrontierBannedSpecies[i], count, caughtBannedMons); if (count == 0) diff --git a/src/gpu_regs.c b/src/gpu_regs.c index 805f23b48..2d48b304a 100644 --- a/src/gpu_regs.c +++ b/src/gpu_regs.c @@ -20,166 +20,166 @@ static void UpdateRegDispstatIntrBits(u16 regIE); void InitGpuRegManager(void) { - s32 i; + s32 i; - for (i = 0; i < GPU_REG_BUF_SIZE; i++) + for (i = 0; i < GPU_REG_BUF_SIZE; i++) { - sGpuRegBuffer[i] = 0; - sGpuRegWaitingList[i] = EMPTY_SLOT; - } + sGpuRegBuffer[i] = 0; + sGpuRegWaitingList[i] = EMPTY_SLOT; + } - sGpuRegBufferLocked = FALSE; - sShouldSyncRegIE = FALSE; - sRegIE = 0; + sGpuRegBufferLocked = FALSE; + sShouldSyncRegIE = FALSE; + sRegIE = 0; } static void CopyBufferedValueToGpuReg(u8 regOffset) { - if (regOffset == REG_OFFSET_DISPSTAT) + if (regOffset == REG_OFFSET_DISPSTAT) { - REG_DISPSTAT &= ~(DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR); - REG_DISPSTAT |= GPU_REG_BUF(REG_OFFSET_DISPSTAT); - } - else + REG_DISPSTAT &= ~(DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR); + REG_DISPSTAT |= GPU_REG_BUF(REG_OFFSET_DISPSTAT); + } + else { - GPU_REG(regOffset) = GPU_REG_BUF(regOffset); - } + GPU_REG(regOffset) = GPU_REG_BUF(regOffset); + } } void CopyBufferedValuesToGpuRegs(void) { - if (!sGpuRegBufferLocked) + if (!sGpuRegBufferLocked) { - s32 i; + s32 i; - for (i = 0; i < GPU_REG_BUF_SIZE; i++) + for (i = 0; i < GPU_REG_BUF_SIZE; i++) { - u8 regOffset = sGpuRegWaitingList[i]; - if (regOffset == EMPTY_SLOT) - return; - CopyBufferedValueToGpuReg(regOffset); - sGpuRegWaitingList[i] = EMPTY_SLOT; - } - } + u8 regOffset = sGpuRegWaitingList[i]; + if (regOffset == EMPTY_SLOT) + return; + CopyBufferedValueToGpuReg(regOffset); + sGpuRegWaitingList[i] = EMPTY_SLOT; + } + } } void SetGpuReg(u8 regOffset, u16 value) { - if (regOffset < GPU_REG_BUF_SIZE) - { - u16 vcount; - - GPU_REG_BUF(regOffset) = value; - vcount = REG_VCOUNT & 0xFF; - - if ((vcount >= 161 && vcount <= 225) - || (REG_DISPCNT & DISPCNT_FORCED_BLANK)) { - CopyBufferedValueToGpuReg(regOffset); - } else { - s32 i; - - sGpuRegBufferLocked = TRUE; - - for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) { - if (sGpuRegWaitingList[i] == regOffset) { - sGpuRegBufferLocked = FALSE; - return; - } - } - - sGpuRegWaitingList[i] = regOffset; - sGpuRegBufferLocked = FALSE; - } - } + if (regOffset < GPU_REG_BUF_SIZE) + { + u16 vcount; + + GPU_REG_BUF(regOffset) = value; + vcount = REG_VCOUNT & 0xFF; + + if ((vcount >= 161 && vcount <= 225) + || (REG_DISPCNT & DISPCNT_FORCED_BLANK)) { + CopyBufferedValueToGpuReg(regOffset); + } else { + s32 i; + + sGpuRegBufferLocked = TRUE; + + for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) { + if (sGpuRegWaitingList[i] == regOffset) { + sGpuRegBufferLocked = FALSE; + return; + } + } + + sGpuRegWaitingList[i] = regOffset; + sGpuRegBufferLocked = FALSE; + } + } } void SetGpuReg_ForcedBlank(u8 regOffset, u16 value) { - if (regOffset < GPU_REG_BUF_SIZE) - { - GPU_REG_BUF(regOffset) = value; - - if (REG_DISPCNT & DISPCNT_FORCED_BLANK) { - CopyBufferedValueToGpuReg(regOffset); - } else { - s32 i; - - sGpuRegBufferLocked = TRUE; - - for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) { - if (sGpuRegWaitingList[i] == regOffset) { - sGpuRegBufferLocked = FALSE; - return; - } - } - - sGpuRegWaitingList[i] = regOffset; - sGpuRegBufferLocked = FALSE; - } - } + if (regOffset < GPU_REG_BUF_SIZE) + { + GPU_REG_BUF(regOffset) = value; + + if (REG_DISPCNT & DISPCNT_FORCED_BLANK) { + CopyBufferedValueToGpuReg(regOffset); + } else { + s32 i; + + sGpuRegBufferLocked = TRUE; + + for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) { + if (sGpuRegWaitingList[i] == regOffset) { + sGpuRegBufferLocked = FALSE; + return; + } + } + + sGpuRegWaitingList[i] = regOffset; + sGpuRegBufferLocked = FALSE; + } + } } u16 GetGpuReg(u8 regOffset) { - if (regOffset == REG_OFFSET_DISPSTAT) - return REG_DISPSTAT; + if (regOffset == REG_OFFSET_DISPSTAT) + return REG_DISPSTAT; - if (regOffset == REG_OFFSET_VCOUNT) - return REG_VCOUNT; + if (regOffset == REG_OFFSET_VCOUNT) + return REG_VCOUNT; - return GPU_REG_BUF(regOffset); + return GPU_REG_BUF(regOffset); } void SetGpuRegBits(u8 regOffset, u16 mask) { - u16 regValue = GPU_REG_BUF(regOffset); - SetGpuReg(regOffset, regValue | mask); + u16 regValue = GPU_REG_BUF(regOffset); + SetGpuReg(regOffset, regValue | mask); } void ClearGpuRegBits(u8 regOffset, u16 mask) { - u16 regValue = GPU_REG_BUF(regOffset); - SetGpuReg(regOffset, regValue & ~mask); + u16 regValue = GPU_REG_BUF(regOffset); + SetGpuReg(regOffset, regValue & ~mask); } static void SyncRegIE(void) { - if (sShouldSyncRegIE) { - u16 temp = REG_IME; - REG_IME = 0; - REG_IE = sRegIE; - REG_IME = temp; - sShouldSyncRegIE = FALSE; - } + if (sShouldSyncRegIE) { + u16 temp = REG_IME; + REG_IME = 0; + REG_IE = sRegIE; + REG_IME = temp; + sShouldSyncRegIE = FALSE; + } } void EnableInterrupts(u16 mask) { - sRegIE |= mask; - sShouldSyncRegIE = TRUE; - SyncRegIE(); - UpdateRegDispstatIntrBits(sRegIE); + sRegIE |= mask; + sShouldSyncRegIE = TRUE; + SyncRegIE(); + UpdateRegDispstatIntrBits(sRegIE); } void DisableInterrupts(u16 mask) { - sRegIE &= ~mask; - sShouldSyncRegIE = TRUE; - SyncRegIE(); - UpdateRegDispstatIntrBits(sRegIE); + sRegIE &= ~mask; + sShouldSyncRegIE = TRUE; + SyncRegIE(); + UpdateRegDispstatIntrBits(sRegIE); } static void UpdateRegDispstatIntrBits(u16 regIE) { - u16 oldValue = GetGpuReg(REG_OFFSET_DISPSTAT) & (DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR); - u16 newValue = 0; + u16 oldValue = GetGpuReg(REG_OFFSET_DISPSTAT) & (DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR); + u16 newValue = 0; - if (regIE & INTR_FLAG_VBLANK) - newValue |= DISPSTAT_VBLANK_INTR; + if (regIE & INTR_FLAG_VBLANK) + newValue |= DISPSTAT_VBLANK_INTR; - if (regIE & INTR_FLAG_HBLANK) - newValue |= DISPSTAT_HBLANK_INTR; + if (regIE & INTR_FLAG_HBLANK) + newValue |= DISPSTAT_HBLANK_INTR; - if (oldValue != newValue) - SetGpuReg(REG_OFFSET_DISPSTAT, newValue); + if (oldValue != newValue) + SetGpuReg(REG_OFFSET_DISPSTAT, newValue); } diff --git a/src/ground.c b/src/ground.c index abfeb3f3e..6cb7b8557 100644 --- a/src/ground.c +++ b/src/ground.c @@ -588,7 +588,7 @@ void sub_81152DC(u8 taskId) break; default: task->data[9] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); - if (task->data[9] == INVALID_U8) + if (task->data[9] == 0xFF) { DestroyAnimVisualTask(taskId); } diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index b75243b84..ad5673036 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -467,11 +467,11 @@ static void Task_Hof_InitMonData(u8 taskId) sUnknown_0203BCD4 = 0; gTasks[taskId].tDisplayedMonId = 0; - gTasks[taskId].tPlayerSpriteID = INVALID_U8; + gTasks[taskId].tPlayerSpriteID = 0xFF; for (i = 0; i < PARTY_SIZE; i++) { - gTasks[taskId].tMonSpriteId(i) = INVALID_U8; + gTasks[taskId].tMonSpriteId(i) = 0xFF; } if (gTasks[taskId].tDontSaveData) @@ -522,7 +522,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId) static void Task_Hof_TrySaveData(u8 taskId) { gGameContinueCallback = CB2_DoHallOfFameScreenDontSaveData; - if (TrySavingData(SAVE_HALL_OF_FAME) == INVALID_U8 && gDamagedSaveSectors != 0) + if (TrySavingData(SAVE_HALL_OF_FAME) == 0xFF && gDamagedSaveSectors != 0) { UnsetBgTilemapBuffer(1); UnsetBgTilemapBuffer(3); @@ -645,7 +645,7 @@ static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskId) BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0, RGB_BLACK); for (i = 0; i < PARTY_SIZE; i++) { - if (gTasks[taskId].tMonSpriteId(i) != INVALID_U8) + if (gTasks[taskId].tMonSpriteId(i) != 0xFF) gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 0; } @@ -668,7 +668,7 @@ static void sub_8173DC0(u8 taskId) u16 i; for (i = 0; i < PARTY_SIZE; i++) { - if (gTasks[taskId].tMonSpriteId(i) != INVALID_U8) + if (gTasks[taskId].tMonSpriteId(i) != 0xFF) gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 1; } BeginNormalPaletteFade(sUnknown_0203BCD4, 0, 12, 12, RGB(16, 29, 24)); @@ -752,7 +752,7 @@ static void Task_Hof_HandleExit(u8 taskId) for (i = 0; i < PARTY_SIZE; i++) { u8 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != INVALID_U8) + if (spriteId != 0xFF) { FreeOamMatrix(gSprites[spriteId].oam.matrixNum); FreeAndDestroyMonPicSprite(spriteId); @@ -847,7 +847,7 @@ void CB2_DoHallOfFamePC(void) for (i = 0; i < PARTY_SIZE; i++) { - gTasks[taskId].tMonSpriteId(i) = INVALID_U8; + gTasks[taskId].tMonSpriteId(i) = 0xFF; } sHofMonPtr = AllocZeroed(0x2000); @@ -937,7 +937,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId) } else { - gTasks[taskId].tMonSpriteId(i) = INVALID_U8; + gTasks[taskId].tMonSpriteId(i) = 0xFF; } } @@ -967,7 +967,7 @@ static void Task_HofPC_PrintMonInfo(u8 taskId) for (i = 0; i < PARTY_SIZE; i++) { u16 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != INVALID_U8) + if (spriteId != 0xFF) gSprites[spriteId].oam.priority = 1; } @@ -999,10 +999,10 @@ static void Task_HofPC_HandleInput(u8 taskId) for (i = 0; i < 6; i++) { u8 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != INVALID_U8) + if (spriteId != 0xFF) { FreeAndDestroyMonPicSprite(spriteId); - gTasks[taskId].tMonSpriteId(i) = INVALID_U8; + gTasks[taskId].tMonSpriteId(i) = 0xFF; } } if (gTasks[taskId].tCurrPageNo != 0) @@ -1060,10 +1060,10 @@ static void Task_HofPC_HandleExit(u8 taskId) for (i = 0; i < PARTY_SIZE; i++) { u16 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != INVALID_U8) + if (spriteId != 0xFF) { FreeAndDestroyMonPicSprite(spriteId); - gTasks[taskId].tMonSpriteId(i) = INVALID_U8; + gTasks[taskId].tMonSpriteId(i) = 0xFF; } } @@ -1130,7 +1130,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u { stringPtr = StringCopy(text, gText_Number); dexNumber = SpeciesToPokedexNum(currMon->species); - if (dexNumber != INVALID_U16) + if (dexNumber != 0xFFFF) { stringPtr[0] = (dexNumber / 100) + CHAR_0; stringPtr++; @@ -1417,7 +1417,7 @@ void sub_8175280(void) gSpecialVar_0x8004 = 180; taskId = CreateTask(sub_8175364, 0); - if (taskId != INVALID_U8) + if (taskId != 0xFF) { gTasks[taskId].data[1] = gSpecialVar_0x8004; gSpecialVar_0x8005 = taskId; @@ -1428,7 +1428,7 @@ static void sub_81752C0(void) { u8 taskId; - if ((taskId = FindTaskIdByFunc(sub_8175364)) != INVALID_U8) + if ((taskId = FindTaskIdByFunc(sub_8175364)) != 0xFF) DestroyTask(taskId); sub_8152254(); @@ -1473,7 +1473,7 @@ static void sub_8175364(u8 taskId) { DestroyTask(taskId); gSpecialVar_0x8004 = var; - gSpecialVar_0x8005 = INVALID_U16; + gSpecialVar_0x8005 = 0xFFFF; } LoadCompressedObjectPic(sHallOfFame_ConfettiSpriteSheet); LoadCompressedObjectPalette(sHallOfFame_ConfettiSpritePalette); @@ -1483,7 +1483,7 @@ static void sub_8175364(u8 taskId) if (data[1] != 0 && data[1] % 3 == 0) { var = sub_81524C4(&sOamData_85E53FC, 0x3E9, 0x3E9, Random() % 240, -(Random() % 8), Random() % 0x11, var); - if (var != INVALID_U8) + if (var != 0xFF) { sub_8152438(var, sub_81752F4); if ((Random() & 3) == 0) @@ -1496,12 +1496,12 @@ static void sub_8175364(u8 taskId) if (data[1] != 0) data[1]--; else if (data[15] == 0) - data[0] = INVALID_U8; + data[0] = 0xFF; break; - case INVALID_U8: + case 0xFF: sub_81752C0(); gSpecialVar_0x8004 = var; - gSpecialVar_0x8005 = INVALID_U16; + gSpecialVar_0x8005 = 0xFFFF; break; } } diff --git a/src/intro.c b/src/intro.c index 44d1c086d..94692e6ec 100644 --- a/src/intro.c +++ b/src/intro.c @@ -62,10 +62,10 @@ static const u32 gIntro3MiscTiles[] = INCBIN_U32("graphics/intro/intro3_misc.4bp static const u16 gIntro1FlygonPalette[] = INCBIN_U16("graphics/intro/intro1_flygon.gbapal"); static const u32 gIntro1EonTiles_Unused[] = INCBIN_U32("graphics/intro/intro1_eon.4bpp.lz"); static const u8 sUnknownBytes[] = { - 0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x02, 0x0D, + 0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x02, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x02, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x02, 0x0D, 0x0E, 0x0F, 0x10, - 0x11, 0x12, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x00 + 0x11, 0x12, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x00 }; static const struct CompressedSpriteSheet gUnknown_085E4A74[] = { diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index 1b4e9e15a..20a360901 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -58,7 +58,7 @@ static void sub_817B7C4(struct Sprite *sprite); static void nullsub_66(struct Sprite *sprite); static const struct SpriteTemplate gUnknown_085F504C = { - 2000, INVALID_U16, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C + 2000, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C }; static const struct CompressedSpriteSheet gUnknown_085F5064[] = { diff --git a/src/item.c b/src/item.c index e2583ddb1..6a1f1955a 100644 --- a/src/item.c +++ b/src/item.c @@ -244,152 +244,152 @@ NAKED bool8 CheckBagHasSpace(u16 itemId, u16 count) { asm_unified("push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x4\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - mov r8, r0\n\ - lsls r1, 16\n\ - lsrs r5, r1, 16\n\ - bl ItemId_GetPocket\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _080D6906\n\ - bl InBattlePyramid\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - bne _080D6838\n\ - ldr r0, =0x00004004\n\ - bl FlagGet\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0x1\n\ - bne _080D684C\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x4\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + mov r8, r0\n\ + lsls r1, 16\n\ + lsrs r5, r1, 16\n\ + bl ItemId_GetPocket\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _080D6906\n\ + bl InBattlePyramid\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + bne _080D6838\n\ + ldr r0, =0x00004004\n\ + bl FlagGet\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + cmp r0, 0x1\n\ + bne _080D684C\n\ _080D6838:\n\ - mov r0, r8\n\ - adds r1, r5, 0\n\ - bl CheckPyramidBagHasSpace\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - b _080D6916\n\ - .pool\n\ + mov r0, r8\n\ + adds r1, r5, 0\n\ + bl CheckPyramidBagHasSpace\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + b _080D6916\n\ + .pool\n\ _080D684C:\n\ - mov r0, r8\n\ - bl ItemId_GetPocket\n\ - subs r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r2, r0, 24\n\ - ldr r7, =0x000003e7\n\ - cmp r2, 0x3\n\ - beq _080D6860\n\ - movs r7, 0x63\n\ + mov r0, r8\n\ + bl ItemId_GetPocket\n\ + subs r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r2, r0, 24\n\ + ldr r7, =0x000003e7\n\ + cmp r2, 0x3\n\ + beq _080D6860\n\ + movs r7, 0x63\n\ _080D6860:\n\ - movs r6, 0\n\ - ldr r1, =gBagPockets\n\ - lsls r4, r2, 3\n\ - adds r0, r4, r1\n\ - mov r9, r4\n\ - ldrb r0, [r0, 0x4]\n\ - cmp r6, r0\n\ - bcs _080D68BC\n\ - subs r0, r2, 0x2\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r10, r0\n\ + movs r6, 0\n\ + ldr r1, =gBagPockets\n\ + lsls r4, r2, 3\n\ + adds r0, r4, r1\n\ + mov r9, r4\n\ + ldrb r0, [r0, 0x4]\n\ + cmp r6, r0\n\ + bcs _080D68BC\n\ + subs r0, r2, 0x2\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r10, r0\n\ _080D6878:\n\ - adds r0, r4, r1\n\ - ldr r1, [r0]\n\ - lsls r0, r6, 2\n\ - adds r1, r0, r1\n\ - ldrh r0, [r1]\n\ - cmp r0, r8\n\ - bne _080D68AC\n\ - adds r0, r1, 0x2\n\ - str r2, [sp]\n\ - bl GetBagItemQuantity\n\ - lsls r0, 16\n\ - lsrs r1, r0, 16\n\ - adds r0, r1, r5\n\ - ldr r2, [sp]\n\ - cmp r0, r7\n\ - ble _080D6914\n\ - mov r0, r10\n\ - cmp r0, 0x1\n\ - bls _080D6906\n\ - subs r0, r7, r1\n\ - subs r0, r5, r0\n\ - lsls r0, 16\n\ - lsrs r5, r0, 16\n\ - cmp r5, 0\n\ - beq _080D6914\n\ + adds r0, r4, r1\n\ + ldr r1, [r0]\n\ + lsls r0, r6, 2\n\ + adds r1, r0, r1\n\ + ldrh r0, [r1]\n\ + cmp r0, r8\n\ + bne _080D68AC\n\ + adds r0, r1, 0x2\n\ + str r2, [sp]\n\ + bl GetBagItemQuantity\n\ + lsls r0, 16\n\ + lsrs r1, r0, 16\n\ + adds r0, r1, r5\n\ + ldr r2, [sp]\n\ + cmp r0, r7\n\ + ble _080D6914\n\ + mov r0, r10\n\ + cmp r0, 0x1\n\ + bls _080D6906\n\ + subs r0, r7, r1\n\ + subs r0, r5, r0\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + cmp r5, 0\n\ + beq _080D6914\n\ _080D68AC:\n\ - adds r0, r6, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - ldr r1, =gBagPockets\n\ - adds r0, r4, r1\n\ - ldrb r0, [r0, 0x4]\n\ - cmp r6, r0\n\ - bcc _080D6878\n\ + adds r0, r6, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + ldr r1, =gBagPockets\n\ + adds r0, r4, r1\n\ + ldrb r0, [r0, 0x4]\n\ + cmp r6, r0\n\ + bcc _080D6878\n\ _080D68BC:\n\ - cmp r5, 0\n\ - beq _080D6914\n\ - movs r6, 0\n\ - ldr r3, =gBagPockets\n\ - mov r1, r9\n\ - adds r0, r1, r3\n\ - ldrb r0, [r0, 0x4]\n\ - cmp r6, r0\n\ - bcs _080D6902\n\ - adds r4, r3, 0\n\ - subs r0, r2, 0x2\n\ - lsls r0, 24\n\ - lsrs r2, r0, 24\n\ + cmp r5, 0\n\ + beq _080D6914\n\ + movs r6, 0\n\ + ldr r3, =gBagPockets\n\ + mov r1, r9\n\ + adds r0, r1, r3\n\ + ldrb r0, [r0, 0x4]\n\ + cmp r6, r0\n\ + bcs _080D6902\n\ + adds r4, r3, 0\n\ + subs r0, r2, 0x2\n\ + lsls r0, 24\n\ + lsrs r2, r0, 24\n\ _080D68D6:\n\ - adds r0, r1, r4\n\ - ldr r1, [r0]\n\ - lsls r0, r6, 2\n\ - adds r0, r1\n\ - ldrh r0, [r0]\n\ - cmp r0, 0\n\ - bne _080D68F2\n\ - cmp r5, r7\n\ - bls _080D6914\n\ - cmp r2, 0x1\n\ - bls _080D6906\n\ - subs r0, r5, r7\n\ - lsls r0, 16\n\ - lsrs r5, r0, 16\n\ + adds r0, r1, r4\n\ + ldr r1, [r0]\n\ + lsls r0, r6, 2\n\ + adds r0, r1\n\ + ldrh r0, [r0]\n\ + cmp r0, 0\n\ + bne _080D68F2\n\ + cmp r5, r7\n\ + bls _080D6914\n\ + cmp r2, 0x1\n\ + bls _080D6906\n\ + subs r0, r5, r7\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ _080D68F2:\n\ - adds r0, r6, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - mov r1, r9\n\ - adds r0, r1, r3\n\ - ldrb r0, [r0, 0x4]\n\ - cmp r6, r0\n\ - bcc _080D68D6\n\ + adds r0, r6, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + mov r1, r9\n\ + adds r0, r1, r3\n\ + ldrb r0, [r0, 0x4]\n\ + cmp r6, r0\n\ + bcc _080D68D6\n\ _080D6902:\n\ - cmp r5, 0\n\ - beq _080D6914\n\ + cmp r5, 0\n\ + beq _080D6914\n\ _080D6906:\n\ - movs r0, 0\n\ - b _080D6916\n\ - .pool\n\ + movs r0, 0\n\ + b _080D6916\n\ + .pool\n\ _080D6914:\n\ - movs r0, 0x1\n\ + movs r0, 0x1\n\ _080D6916:\n\ - add sp, 0x4\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1"); + add sp, 0x4\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r1}\n\ + bx r1"); } #endif // NONMATCHING diff --git a/src/item_icon.c b/src/item_icon.c index 2af938ff8..d037782bd 100644 --- a/src/item_icon.c +++ b/src/item_icon.c @@ -161,7 +161,7 @@ u8 AddCustomItemIconSprite(struct SpriteTemplate *customSpriteTemplate, u16 tile const void *GetItemIconPicOrPalette(u16 itemId, u8 which) { - if (itemId == INVALID_U16) + if (itemId == 0xFFFF) itemId = ITEM_FIELD_ARROW; else if (itemId >= ITEMS_COUNT) itemId = 0; diff --git a/src/item_menu.c b/src/item_menu.c index 5b18b06ec..2c75a80f2 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -532,11 +532,11 @@ void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2) if (temp <= 1) gUnknown_0203CE54->unk81B = 1; gUnknown_0203CE54->unk0 = 0; - gUnknown_0203CE54->unk81A = INVALID_U8; + gUnknown_0203CE54->unk81A = 0xFF; gUnknown_0203CE54->unk81E = -1; gUnknown_0203CE54->unk81F = -1; - memset(gUnknown_0203CE54->unk804, INVALID_U8, sizeof(gUnknown_0203CE54->unk804)); - memset(gUnknown_0203CE54->unk810, INVALID_U8, 10); + memset(gUnknown_0203CE54->unk804, 0xFF, sizeof(gUnknown_0203CE54->unk804)); + memset(gUnknown_0203CE54->unk810, 0xFF, 10); SetMainCallback2(CB2_Bag); } } @@ -819,7 +819,7 @@ void bag_menu_change_item_callback(s32 a, bool8 b, struct ListMenu *unused) PlaySE(SE_SELECT); ShakeBagVisual(); } - if (gUnknown_0203CE54->unk81A == INVALID_U8) + if (gUnknown_0203CE54->unk81A == 0xFF) { RemoveBagItemIconSprite(1 ^ gUnknown_0203CE54->unk81B_1); if (a != -2) @@ -840,7 +840,7 @@ void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a) int offset; if (item_index_in_pocket != -2) { - if (gUnknown_0203CE54->unk81A != INVALID_U8) + if (gUnknown_0203CE54->unk81A != 0xFF) { if (gUnknown_0203CE54->unk81A == (u8)item_index_in_pocket) bag_menu_print_cursor(a, 2); @@ -897,7 +897,7 @@ void bag_menu_print_cursor_(u8 a, u8 b) void bag_menu_print_cursor(u8 a, u8 b) { - if (b == INVALID_U8) + if (b == 0xFF) FillWindowPixelRect(0, 0, 0, a, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else bag_menu_print(0, 1, gText_SelectorArrow2, 0, a, 0, 0, 0, b); @@ -906,32 +906,32 @@ void bag_menu_print_cursor(u8 a, u8 b) void bag_menu_add_pocket_scroll_arrow_indicators_maybe(void) { - if (gUnknown_0203CE54->unk81E == INVALID_U8) + if (gUnknown_0203CE54->unk81E == 0xFF) gUnknown_0203CE54->unk81E = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xAC, 12, 0x94, gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - gUnknown_0203CE54->unk82E[gUnknown_0203CE58.pocket], 0x6E, 0x6E, &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]); } void sub_81AB824(void) { - if (gUnknown_0203CE54->unk81E != INVALID_U8) + if (gUnknown_0203CE54->unk81E != 0xFF) { RemoveScrollIndicatorArrowPair(gUnknown_0203CE54->unk81E); - gUnknown_0203CE54->unk81E = INVALID_U8; + gUnknown_0203CE54->unk81E = 0xFF; } sub_81AB89C(); } void bag_menu_add_list_scroll_arrow_indicators_maybe(void) { - if (gUnknown_0203CE54->unk81B != 1 && gUnknown_0203CE54->unk81F == INVALID_U8) + if (gUnknown_0203CE54->unk81B != 1 && gUnknown_0203CE54->unk81F == 0xFF) gUnknown_0203CE54->unk81F = AddScrollIndicatorArrowPair(&gUnknown_08614094, &gUnknown_0203CE58.unk6); } void sub_81AB89C(void) { - if (gUnknown_0203CE54->unk81F != INVALID_U8) + if (gUnknown_0203CE54->unk81F != 0xFF) { RemoveScrollIndicatorArrowPair(gUnknown_0203CE54->unk81F); - gUnknown_0203CE54->unk81F = INVALID_U8; + gUnknown_0203CE54->unk81F = 0xFF; } } @@ -2303,7 +2303,7 @@ u8 sub_81AE124(u8 a) u8 bag_menu_add_window(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr == INVALID_U8) + if (*ptr == 0xFF) { *ptr = AddWindow(&gUnknown_086141AC[a]); SetWindowBorderStyle(*ptr, 0, 1, 14); @@ -2315,20 +2315,20 @@ u8 bag_menu_add_window(u8 a) void bag_menu_remove_window(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr != INVALID_U8) + if (*ptr != 0xFF) { sub_8198070(*ptr, 0); ClearWindowTilemap(*ptr); RemoveWindow(*ptr); schedule_bg_copy_tilemap_to_vram(1); - *ptr = INVALID_U8; + *ptr = 0xFF; } } u8 AddItemMessageWindow(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr == INVALID_U8) + if (*ptr == 0xFF) *ptr = AddWindow(&gUnknown_086141AC[a]); return *ptr; } @@ -2336,13 +2336,13 @@ u8 AddItemMessageWindow(u8 a) void bag_menu_RemoveBagItem_message_window(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr != INVALID_U8) + if (*ptr != 0xFF) { sub_8197DF8(*ptr, 0); ClearWindowTilemap(*ptr); RemoveWindow(*ptr); schedule_bg_copy_tilemap_to_vram(1); - *ptr = INVALID_U8; + *ptr = 0xFF; } } diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 67add5926..85b42b9b3 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -301,7 +301,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_857FC74[] = static const struct SpriteTemplate gUnknown_0857FC7C = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0x7544, .oam = &sOamData_857FBD0, .anims = sSpriteAnimTable_857FBE0, @@ -410,13 +410,13 @@ static const struct SpriteTemplate gUnknown_0857FE10 = void RemoveBagSprite(u8 id) { u8 *spriteId = &gUnknown_0203CE54->unk804[id]; - if (*spriteId != INVALID_U8) + if (*spriteId != 0xFF) { FreeSpriteTilesByTag(id + 100); FreeSpritePaletteByTag(id + 100); FreeSpriteOamMatrix(&gSprites[*spriteId]); DestroySprite(&gSprites[*spriteId]); - *spriteId = INVALID_U8; + *spriteId = 0xFF; } } @@ -516,7 +516,7 @@ static void SpriteCB_SwitchPocketRotatingBallContinue(struct Sprite *sprite) void AddBagItemIconSprite(u16 itemId, u8 id) { u8 *spriteId = &gUnknown_0203CE54->unk804[id + 2]; - if (*spriteId == INVALID_U8) + if (*spriteId == 0xFF) { u8 iconSpriteId; diff --git a/src/landmark.c b/src/landmark.c index 4eade159a..0f8ee1a75 100644 --- a/src/landmark.c +++ b/src/landmark.c @@ -338,8 +338,8 @@ static const struct Landmark *const Landmarks_MtChimney_2[] = static const struct LandmarkList gLandmarkLists[] = { - {MAPSEC_ROUTE_103, 2, Landmarks_Route103_2}, - {MAPSEC_ROUTE_104, 0, Landmarks_Route104_0}, + {MAPSEC_ROUTE_103, 2, Landmarks_Route103_2}, + {MAPSEC_ROUTE_104, 0, Landmarks_Route104_0}, {MAPSEC_ROUTE_104, 1, Landmarks_Route104_1}, {MAPSEC_ROUTE_105, 0, Landmarks_Route105_0}, {MAPSEC_ROUTE_106, 1, Landmarks_Route106_1}, diff --git a/src/learn_move.c b/src/learn_move.c index cb8bb66ff..4e02cedd3 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -381,7 +381,7 @@ static void LearnMoveMain(void) if (selection == 0) { - if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != INVALID_U16) + if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != 0xFFFF) { sub_816084C(gText_PkmnLearnedMove4); gSpecialVar_0x8004 = 1; @@ -727,12 +727,12 @@ static void CreateHearts(void) static void AddScrollArrows(void) { - if (sLearnMoveStruct->scrollArrowTaskId2 == INVALID_U8) + if (sLearnMoveStruct->scrollArrowTaskId2 == 0xFF) { sLearnMoveStruct->scrollArrowTaskId2 = AddScrollIndicatorArrowPair(&gUnknown_085CEBC0, &sLearnMoveStruct->scrollOffset); } - if (sLearnMoveStruct->scrollArrowTaskId1 == INVALID_U8) + if (sLearnMoveStruct->scrollArrowTaskId1 == 0xFF) { gTempScrollArrowTemplate = gUnknown_085CEBD0; gTempScrollArrowTemplate.fullyDownThreshold = sLearnMoveStruct->numMenuChoices - sLearnMoveStruct->numToShowAtOnce; @@ -742,16 +742,16 @@ static void AddScrollArrows(void) static void RemoveScrollArrows(void) { - if (sLearnMoveStruct->scrollArrowTaskId2 != INVALID_U8) + if (sLearnMoveStruct->scrollArrowTaskId2 != 0xFF) { RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId2); - sLearnMoveStruct->scrollArrowTaskId2 = INVALID_U8; + sLearnMoveStruct->scrollArrowTaskId2 = 0xFF; } - if (sLearnMoveStruct->scrollArrowTaskId1 != INVALID_U8) + if (sLearnMoveStruct->scrollArrowTaskId1 != 0xFF) { RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId1); - sLearnMoveStruct->scrollArrowTaskId1 = INVALID_U8; + sLearnMoveStruct->scrollArrowTaskId1 = 0xFF; } } @@ -792,7 +792,7 @@ void ShowHideHearts(s32 item) { numHearts = (u8)(gContestEffects[gContestMoves[item].effect].appeal / 10); - if (numHearts == INVALID_U8) + if (numHearts == 0xFF) { numHearts = 0; } @@ -812,7 +812,7 @@ void ShowHideHearts(s32 item) numHearts = (u8)(gContestEffects[gContestMoves[item].effect].jam / 10); - if (numHearts == INVALID_U8) + if (numHearts == 0xFF) { numHearts = 0; } diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c index 2f706fcc8..c5aa25c10 100644 --- a/src/librfu_rfu.c +++ b/src/librfu_rfu.c @@ -64,7 +64,7 @@ v12 = (u16*)((u32)&sub_82E53F4 & ~1); v13 = (u16*)gUnknown_03007898->unk_8; - for (i = 47; i != INVALID_U16; i--) + for (i = 47; i != 0xFFFF; i--) { *v13 = *v12; ++v12; diff --git a/src/librfu_stwi.c b/src/librfu_stwi.c index 81363ae0d..556b79bf8 100644 --- a/src/librfu_stwi.c +++ b/src/librfu_stwi.c @@ -116,7 +116,7 @@ u16 STWI_read_status(u8 index) case 3: return gRfuState->activeCommand; default: - return INVALID_U16; + return 0xFFFF; } } diff --git a/src/link.c b/src/link.c index e4bd5053c..79df699ef 100644 --- a/src/link.c +++ b/src/link.c @@ -2250,7 +2250,7 @@ static bool8 DoHandshake(void) u16 minRecv; playerCount = 0; - minRecv = INVALID_U16; + minRecv = 0xFFFF; if (gLink.handshakeAsMaster == TRUE) { REG_SIOMLT_SEND = MASTER_HANDSHAKE; @@ -2274,7 +2274,7 @@ static bool8 DoHandshake(void) } else { - if (gLink.tempRecvBuffer[i] != INVALID_U16) + if (gLink.tempRecvBuffer[i] != 0xFFFF) { playerCount = 0; } diff --git a/src/link_rfu.c b/src/link_rfu.c index fe5676770..2c6e22475 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -276,7 +276,7 @@ const struct { { gBlockSendBuffer, 40 } }; const u16 gUnknown_082ED6E0[] = { - 0x0002, 0x7f7d, 0x0000, INVALID_U16 + 0x0002, 0x7f7d, 0x0000, 0xFFFF }; const char sUnref_082ED6E8[][15] = { @@ -436,7 +436,7 @@ u8 sub_800C054(u8 r5, u16 r7, u16 r8, const u16 *r6) } for (i = 0, buffer = r6; i < 16; i++) { - if (*buffer++ == INVALID_U16) + if (*buffer++ == 0xFFFF) { break; } @@ -754,7 +754,7 @@ void sub_800C54C(u32 a0) switch (gUnknown_03004140.unk_04) { case 23: - r2 = sub_800BEC0() == 0x8001 ? 0x44 : INVALID_U8; + r2 = sub_800BEC0() == 0x8001 ? 0x44 : 0xFF; gUnknown_03004140.unk_04 = gUnknown_03004140.unk_05 = 0; sub_800D30C(r2, 0); break; @@ -1168,7 +1168,7 @@ static void sub_800C7B4(u16 r8, u16 r6) gUnknown_03004140.unk_00 &= ~gUnknown_03004140.unk_14; if (gUnknown_03004140.unk_07) { - if (gUnknown_03007890->unk_00 == INVALID_U8) + if (gUnknown_03007890->unk_00 == 0xFF) { if (gUnknown_03004140.unk_07 == 8) { @@ -1183,7 +1183,7 @@ static void sub_800C7B4(u16 r8, u16 r6) } } } - if (gUnknown_03007890->unk_00 == INVALID_U8) + if (gUnknown_03007890->unk_00 == 0xFF) { if (gUnknown_03004140.unk_04 == 0) { @@ -1198,7 +1198,7 @@ static void sub_800C7B4(u16 r8, u16 r6) break; case 38: sub_800D20C(); - if (gUnknown_03007890->unk_00 != INVALID_U8) + if (gUnknown_03007890->unk_00 != 0xFF) { sub_800D30C(0x50, 0x00); } @@ -1241,7 +1241,7 @@ static void sub_800C7B4(u16 r8, u16 r6) sub_800D610(); } } - if (r8 == INVALID_U8) + if (r8 == 0xFF) { sub_800D30C(0xf2, 0x00); sub_800D610(); @@ -1322,7 +1322,7 @@ static void sub_800CF34(void) if (gUnknown_03007880[i]->unk_61 == 1) { r5 = 0x02; - for (ptr = gUnknown_03004140.unk_20; *ptr != INVALID_U16; ptr++) + for (ptr = gUnknown_03004140.unk_20; *ptr != 0xFFFF; ptr++) { if (gUnknown_03007890->unk_14[i].unk_04 == *ptr) { @@ -1469,7 +1469,7 @@ static u8 sub_800D294(void) for (i = 0; i < gUnknown_03007890->unk_08; i++) { - for (ptr = gUnknown_03004140.unk_20; *ptr != INVALID_U16; ptr++) + for (ptr = gUnknown_03004140.unk_20; *ptr != 0xFFFF; ptr++) { if (gUnknown_03007890->unk_14[i].unk_04 == *ptr) { @@ -2242,12 +2242,12 @@ void sub_800E084(void) void sub_800E0E8(void) { - if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == INVALID_U16) + if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == 0xFFFF) { LoadCompressedObjectPic(&sWirelessStatusIndicatorSpriteSheet); } LoadSpritePalette(&sWirelessStatusIndicatorSpritePalette); - gWirelessStatusIndicatorSpriteId = INVALID_U8; + gWirelessStatusIndicatorSpriteId = 0xFF; } u8 sub_800E124(void) @@ -2277,7 +2277,7 @@ void sub_800E15C(struct Sprite *sprite, s32 signalStrengthAnimNum) void sub_800E174(void) { - if (gWirelessStatusIndicatorSpriteId != INVALID_U8 && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234) + if (gWirelessStatusIndicatorSpriteId != 0xFF && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234) { struct Sprite *sprite = &gSprites[gWirelessStatusIndicatorSpriteId]; u8 signalStrength = 255; @@ -2461,7 +2461,7 @@ void sub_800E604(void) u8 unk_ee_bak = gUnknown_03005000.unk_ee; CpuFill16(0, &gUnknown_03005000, sizeof gUnknown_03005000); gUnknown_03005000.unk_ee = unk_ee_bak; - gUnknown_03005000.unk_0c = INVALID_U8; + gUnknown_03005000.unk_0c = 0xFF; if (gUnknown_03005000.unk_ee != 4) { gUnknown_03005000.unk_ee = 0; @@ -3077,7 +3077,7 @@ bool32 sub_800F1E0(void) { if (gUnknown_03005000.unk_14[i][1]) { - if (gUnknown_03005000.unk_cee[i] != INVALID_U8 && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7)) + if (gUnknown_03005000.unk_cee[i] != 0xFF && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7)) { if (++gUnknown_03005000.unk_cea[i] > 4) sub_8011170(0x8100); @@ -3778,7 +3778,7 @@ bool32 sub_8010454(u32 a0) s32 i; for (i = 0; gUnknown_082ED6E0[i] != a0; i++) { - if (gUnknown_082ED6E0[i] == INVALID_U16) + if (gUnknown_082ED6E0[i] == 0xFFFF) return FALSE; } return TRUE; @@ -3881,7 +3881,7 @@ bool32 sub_80105EC(void) bool32 sub_801064C(u16 a0, const u8 *a1) { u8 r1 = sub_8011CE4(a1, a0); - if (r1 == INVALID_U8) + if (r1 == 0xFF) return TRUE; if (gUnknown_03005000.unk_cd1[r1] == 9) return TRUE; @@ -3906,7 +3906,7 @@ void sub_80106D4(void) u32 sub_8010714(u16 a0, const u8 *a1) { u8 r0 = sub_8011CE4(a1, a0); - if (r0 == INVALID_U8) + if (r0 == 0xFF) return 2; if (gUnknown_03007880[r0]->unk_0 == 0) return 1; diff --git a/src/list_menu.c b/src/list_menu.c index e066d1e9c..caf4b798d 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -392,7 +392,7 @@ u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenu s32 i; u8 taskId = ListMenuInitInternal(listMenuTemplate, scrollOffset, selectedRow); - for (i = 0; rect[i].palNum != INVALID_U8; i++) + for (i = 0; rect[i].palNum != 0xFF; i++) { PutWindowRectTilemapOverridePalette(listMenuTemplate->windowId, rect[i].x, @@ -465,7 +465,7 @@ s32 ListMenuHandleInputGetItemId(u8 listTaskId) } } -#define TASK_NONE INVALID_U8 +#define TASK_NONE 0xFF void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow) { @@ -953,52 +953,52 @@ void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value) case 0: case 1: data->field_4 = (void*)(value); - break; + break; case 2: data->field_C = value; - break; + break; case 3: data->field_E = value; - break; + break; case 4: data->field_10 = value; - break; + break; case 5: data->field_11 = value; - break; + break; case 6: data->field_12 = value; - break; + break; case 7: data->field_13 = value; - break; + break; case 8: data->field_14_0 = value; - break; + break; case 9: data->field_14_1 = value; - break; + break; case 10: data->field_15_0 = value; - break; + break; case 11: data->field_15_1 = value; - break; + break; case 12: data->field_16_0 = value; - break; + break; case 13: data->field_16_1 = value; - break; + break; case 14: data->field_16_2 = value; - break; + break; case 15: data->field_17_0 = value; - break; + break; case 16: data->field_17_1 = value; - break; + break; } } @@ -1143,7 +1143,7 @@ static void Task_ScrollIndicatorArrowPair(u8 taskId) struct ScrollIndicatorPair *data = (void*) gTasks[taskId].data; u16 currItem = (*data->scrollOffset); - if (currItem == data->fullyUpThreshold && currItem != INVALID_U16) + if (currItem == data->fullyUpThreshold && currItem != 0xFFFF) gSprites[data->topSpriteId].invisible = TRUE; else gSprites[data->topSpriteId].invisible = FALSE; diff --git a/src/mail_data.c b/src/mail_data.c index cf75636b3..809dcc2a8 100644 --- a/src/mail_data.c +++ b/src/mail_data.c @@ -20,7 +20,7 @@ void ClearMailStruct(struct MailStruct *mail) s32 i; for (i = 0; i < MAIL_WORDS_COUNT; i++) - mail->words[i] = INVALID_U16; + mail->words[i] = 0xFFFF; for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++) mail->playerName[i] = EOS; @@ -35,7 +35,7 @@ void ClearMailStruct(struct MailStruct *mail) bool8 MonHasMail(struct Pokemon *mon) { u16 heldItem = GetMonData(mon, MON_DATA_HELD_ITEM); - if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != INVALID_U8) + if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != 0xFF) return TRUE; else return FALSE; @@ -56,7 +56,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId) if (gSaveBlock1Ptr->mail[id].itemId == 0) { for (i = 0; i < MAIL_WORDS_COUNT; i++) - gSaveBlock1Ptr->mail[id].words[i] = INVALID_U16; + gSaveBlock1Ptr->mail[id].words[i] = 0xFFFF; for (i = 0; i < PLAYER_NAME_LENGTH + 1 - 1; i++) gSaveBlock1Ptr->mail[id].playerName[i] = gSaveBlock2Ptr->playerName[i]; @@ -76,7 +76,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId) } } - return INVALID_U8; + return 0xFF; } u16 SpeciesToMailSpecies(u16 species, u32 personality) @@ -113,8 +113,8 @@ u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail) u16 itemId = mail->itemId; u8 mailId = GiveMailToMon(mon, itemId); - if (mailId == INVALID_U8) - return INVALID_U8; + if (mailId == 0xFF) + return 0xFF; gSaveBlock1Ptr->mail[mailId] = *mail; @@ -142,7 +142,7 @@ void TakeMailFromMon(struct Pokemon *mon) { mailId = GetMonData(mon, MON_DATA_MAIL); gSaveBlock1Ptr->mail[mailId].itemId = ITEM_NONE; - mailId = INVALID_U8; + mailId = 0xFF; heldItem[0] = ITEM_NONE; heldItem[1] = ITEM_NONE << 8; SetMonData(mon, MON_DATA_MAIL, &mailId); @@ -163,7 +163,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon) newHeldItem[0] = ITEM_NONE; newHeldItem[1] = ITEM_NONE << 8; - newMailId = INVALID_U8; + newMailId = 0xFF; for (i = PARTY_SIZE; i < MAIL_COUNT; i++) { @@ -177,7 +177,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon) } } - return INVALID_U8; + return 0xFF; } bool8 ItemIsMail(u16 itemId) diff --git a/src/main_menu.c b/src/main_menu.c index ee777d106..e11f783eb 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -335,25 +335,25 @@ static const struct MenuAction sMenuActions_Gender[] = { static const u8 *const gMalePresetNames[] = { gText_DefaultNameStu, - gText_DefaultNameMilton, - gText_DefaultNameTom, - gText_DefaultNameKenny, - gText_DefaultNameReid, - gText_DefaultNameJude, - gText_DefaultNameJaxson, - gText_DefaultNameEaston, - gText_DefaultNameWalker, - gText_DefaultNameTeru, - gText_DefaultNameJohnny, - gText_DefaultNameBrett, - gText_DefaultNameSeth, - gText_DefaultNameTerry, - gText_DefaultNameCasey, - gText_DefaultNameDarren, - gText_DefaultNameLandon, - gText_DefaultNameCollin, - gText_DefaultNameStanley, - gText_DefaultNameQuincy + gText_DefaultNameMilton, + gText_DefaultNameTom, + gText_DefaultNameKenny, + gText_DefaultNameReid, + gText_DefaultNameJude, + gText_DefaultNameJaxson, + gText_DefaultNameEaston, + gText_DefaultNameWalker, + gText_DefaultNameTeru, + gText_DefaultNameJohnny, + gText_DefaultNameBrett, + gText_DefaultNameSeth, + gText_DefaultNameTerry, + gText_DefaultNameCasey, + gText_DefaultNameDarren, + gText_DefaultNameLandon, + gText_DefaultNameCollin, + gText_DefaultNameStanley, + gText_DefaultNameQuincy }; static const u8 *const gFemalePresetNames[] = { diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 2fd60cd5b..110ec068e 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -250,7 +250,7 @@ void ScrSpecial_HipsterTeachWord(void) { u16 var = sub_811F01C(); - if (var == INVALID_U16) + if (var == 0xFFFF) { gSpecialVar_Result = FALSE; } @@ -283,7 +283,7 @@ void ScrSpecial_GenerateGiddyLine(void) if (giddy->taleCounter == 0) InitGiddyTaleList(); - if (giddy->randomWords[giddy->taleCounter] != INVALID_U16) // is not the last element of the array? + if (giddy->randomWords[giddy->taleCounter] != 0xFFFF) // is not the last element of the array? { u8 *stringPtr; u32 adjective = Random(); @@ -348,7 +348,7 @@ static void InitGiddyTaleList(void) r1 = Random() % 10; if (r1 < 3 && r7 < 8) { - giddy->randomWords[i] = INVALID_U16; + giddy->randomWords[i] = 0xFFFF; r7++; } else diff --git a/src/menu.c b/src/menu.c index e1dd136d1..61096138a 100644 --- a/src/menu.c +++ b/src/menu.c @@ -140,8 +140,8 @@ extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId); void sub_81971D0(void) { InitWindows(gUnknown_0860F098); - gStartMenuWindowId = INVALID_U8; - gUnknown_0203CD8D = INVALID_U8; + gStartMenuWindowId = 0xFF; + gUnknown_0203CD8D = 0xFF; } void sub_81971F4(void) @@ -486,7 +486,7 @@ u8 GetPlayerTextSpeedDelay(void) u8 sub_81979C4(u8 a1) { - if (gStartMenuWindowId == INVALID_U8) + if (gStartMenuWindowId == 0xFF) gStartMenuWindowId = sub_8198AA4(0, 0x16, 1, 7, (a1 * 2) + 2, 0xF, 0x139); return gStartMenuWindowId; } @@ -498,10 +498,10 @@ u8 GetStartMenuWindowId(void) void RemoveStartMenuWindow(void) { - if (gStartMenuWindowId != INVALID_U8) + if (gStartMenuWindowId != 0xFF) { RemoveWindow(gStartMenuWindowId); - gStartMenuWindowId = INVALID_U8; + gStartMenuWindowId = 0xFF; } } @@ -517,7 +517,7 @@ u16 sub_8197A38(void) u8 AddMapNamePopUpWindow(void) { - if (gUnknown_0203CD8D == INVALID_U8) + if (gUnknown_0203CD8D == 0xFF) gUnknown_0203CD8D = sub_8198AA4(0, 1, 1, 10, 3, 14, 0x107); return gUnknown_0203CD8D; } @@ -529,10 +529,10 @@ u8 GetMapNamePopUpWindowId(void) void RemoveMapNamePopUpWindow(void) { - if (gUnknown_0203CD8D != INVALID_U8) + if (gUnknown_0203CD8D != 0xFF) { RemoveWindow(gUnknown_0203CD8D); - gUnknown_0203CD8D = INVALID_U8; + gUnknown_0203CD8D = 0xFF; } } @@ -808,7 +808,7 @@ void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram) { u16 width = 0; - if (gUnknown_0203CDA0 != INVALID_U8) + if (gUnknown_0203CDA0 != 0xFF) { PutWindowTilemap(gUnknown_0203CDA0); FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF); @@ -830,7 +830,7 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo u8 color[3]; u16 width = 0; - if (gUnknown_0203CDA0 != INVALID_U8) + if (gUnknown_0203CDA0 != 0xFF) { if (a3 != 0) { @@ -865,13 +865,13 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo void sub_81982D8(void) { - if (gUnknown_0203CDA0 != INVALID_U8) + if (gUnknown_0203CDA0 != 0xFF) CopyWindowToVram(gUnknown_0203CDA0, 3); } void sub_81982F0(void) { - if (gUnknown_0203CDA0 != INVALID_U8) + if (gUnknown_0203CDA0 != 0xFF) { FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF); CopyWindowToVram(gUnknown_0203CDA0, 3); @@ -880,13 +880,13 @@ void sub_81982F0(void) void sub_8198314(void) { - if (gUnknown_0203CDA0 != INVALID_U8) + if (gUnknown_0203CDA0 != 0xFF) { FillWindowPixelBuffer(gUnknown_0203CDA0, 0); ClearWindowTilemap(gUnknown_0203CDA0); CopyWindowToVram(gUnknown_0203CDA0, 3); RemoveWindow(gUnknown_0203CDA0); - gUnknown_0203CDA0 = INVALID_U8; + gUnknown_0203CDA0 = 0xFF; } } @@ -2096,253 +2096,253 @@ void sub_819A080(struct UnkStruct_819A080 *a0, struct UnkStruct_819A080 *a1, u16 NAKED void sub_819A080(struct UnkStruct_819A080 *a0, struct UnkStruct_819A080 *a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7) { - asm("push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, #0x28\n\ - str r0, [sp]\n\ - str r1, [sp, #0x4]\n\ - ldr r0, [sp, #0x48]\n\ - ldr r4, [sp, #0x4C]\n\ - ldr r1, [sp, #0x50]\n\ - ldr r5, [sp, #0x54]\n\ - lsl r2, #16\n\ - lsr r2, #16\n\ - str r2, [sp, #0x8]\n\ - lsl r3, #16\n\ - lsr r3, #16\n\ - lsl r0, #16\n\ - lsr r0, #16\n\ - str r0, [sp, #0xC]\n\ - lsl r4, #16\n\ - lsr r4, #16\n\ - lsl r1, #16\n\ - lsr r1, #16\n\ - lsl r5, #16\n\ - lsr r5, #16\n\ - ldr r2, [sp, #0x4]\n\ - ldrh r0, [r2, #0x4]\n\ - ldr r2, [sp, #0xC]\n\ - sub r0, r2\n\ - ldr r2, [sp, #0x8]\n\ - add r2, r1, r2\n\ - str r2, [sp, #0x10]\n\ - cmp r0, r1\n\ - bge _0819A0CC\n\ - ldr r1, [sp, #0x8]\n\ - add r0, r1\n\ - str r0, [sp, #0x10]\n\ + asm("push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, #0x28\n\ + str r0, [sp]\n\ + str r1, [sp, #0x4]\n\ + ldr r0, [sp, #0x48]\n\ + ldr r4, [sp, #0x4C]\n\ + ldr r1, [sp, #0x50]\n\ + ldr r5, [sp, #0x54]\n\ + lsl r2, #16\n\ + lsr r2, #16\n\ + str r2, [sp, #0x8]\n\ + lsl r3, #16\n\ + lsr r3, #16\n\ + lsl r0, #16\n\ + lsr r0, #16\n\ + str r0, [sp, #0xC]\n\ + lsl r4, #16\n\ + lsr r4, #16\n\ + lsl r1, #16\n\ + lsr r1, #16\n\ + lsl r5, #16\n\ + lsr r5, #16\n\ + ldr r2, [sp, #0x4]\n\ + ldrh r0, [r2, #0x4]\n\ + ldr r2, [sp, #0xC]\n\ + sub r0, r2\n\ + ldr r2, [sp, #0x8]\n\ + add r2, r1, r2\n\ + str r2, [sp, #0x10]\n\ + cmp r0, r1\n\ + bge _0819A0CC\n\ + ldr r1, [sp, #0x8]\n\ + add r0, r1\n\ + str r0, [sp, #0x10]\n\ _0819A0CC:\n\ - ldr r2, [sp, #0x4]\n\ - ldrh r1, [r2, #0x6]\n\ - sub r0, r1, r4\n\ - cmp r0, r5\n\ - bge _0819A0DE\n\ - add r0, r3, r1\n\ - sub r0, r4\n\ - str r0, [sp, #0x14]\n\ - b _0819A0E2\n\ + ldr r2, [sp, #0x4]\n\ + ldrh r1, [r2, #0x6]\n\ + sub r0, r1, r4\n\ + cmp r0, r5\n\ + bge _0819A0DE\n\ + add r0, r3, r1\n\ + sub r0, r4\n\ + str r0, [sp, #0x14]\n\ + b _0819A0E2\n\ _0819A0DE:\n\ - add r5, r3, r5\n\ - str r5, [sp, #0x14]\n\ + add r5, r3, r5\n\ + str r5, [sp, #0x14]\n\ _0819A0E2:\n\ - ldr r0, [sp]\n\ - ldrh r1, [r0, #0x4]\n\ - mov r2, #0x7\n\ - add r0, r1, #0\n\ - and r0, r2\n\ - add r1, r0\n\ - asr r1, #3\n\ - str r1, [sp, #0x18]\n\ - ldr r0, [sp, #0x4]\n\ - ldrh r1, [r0, #0x4]\n\ - add r0, r1, #0\n\ - and r0, r2\n\ - add r1, r0\n\ - asr r1, #3\n\ - str r1, [sp, #0x1C]\n\ - mov r12, r3\n\ - mov r8, r4\n\ - ldr r1, [sp, #0x14]\n\ - cmp r12, r1\n\ - blt _0819A10C\n\ - b _0819A24A\n\ + ldr r0, [sp]\n\ + ldrh r1, [r0, #0x4]\n\ + mov r2, #0x7\n\ + add r0, r1, #0\n\ + and r0, r2\n\ + add r1, r0\n\ + asr r1, #3\n\ + str r1, [sp, #0x18]\n\ + ldr r0, [sp, #0x4]\n\ + ldrh r1, [r0, #0x4]\n\ + add r0, r1, #0\n\ + and r0, r2\n\ + add r1, r0\n\ + asr r1, #3\n\ + str r1, [sp, #0x1C]\n\ + mov r12, r3\n\ + mov r8, r4\n\ + ldr r1, [sp, #0x14]\n\ + cmp r12, r1\n\ + blt _0819A10C\n\ + b _0819A24A\n\ _0819A10C:\n\ - ldr r5, [sp, #0x8]\n\ - ldr r6, [sp, #0xC]\n\ - mov r2, r12\n\ - add r2, #0x1\n\ - str r2, [sp, #0x20]\n\ - mov r0, r8\n\ - add r0, #0x1\n\ - str r0, [sp, #0x24]\n\ - ldr r1, [sp, #0x10]\n\ - cmp r5, r1\n\ - blt _0819A124\n\ - b _0819A23A\n\ + ldr r5, [sp, #0x8]\n\ + ldr r6, [sp, #0xC]\n\ + mov r2, r12\n\ + add r2, #0x1\n\ + str r2, [sp, #0x20]\n\ + mov r0, r8\n\ + add r0, #0x1\n\ + str r0, [sp, #0x24]\n\ + ldr r1, [sp, #0x10]\n\ + cmp r5, r1\n\ + blt _0819A124\n\ + b _0819A23A\n\ _0819A124:\n\ - mov r7, #0x1\n\ - mov r2, #0xF0\n\ - mov r10, r2\n\ - mov r0, #0xF\n\ - mov r9, r0\n\ + mov r7, #0x1\n\ + mov r2, #0xF0\n\ + mov r10, r2\n\ + mov r0, #0xF\n\ + mov r9, r0\n\ _0819A12E:\n\ - asr r0, r5, #1\n\ - mov r1, #0x3\n\ - and r0, r1\n\ - ldr r2, [sp]\n\ - ldr r1, [r2]\n\ - add r1, r0\n\ - asr r0, r5, #3\n\ - lsl r0, #5\n\ - add r1, r0\n\ - mov r2, r12\n\ - asr r0, r2, #3\n\ - ldr r2, [sp, #0x18]\n\ - mul r0, r2\n\ - lsl r0, #5\n\ - add r1, r0\n\ - mov r2, r12\n\ - lsl r0, r2, #29\n\ - lsr r0, #27\n\ - add r3, r1, r0\n\ - asr r0, r6, #1\n\ - mov r1, #0x3\n\ - and r0, r1\n\ - ldr r2, [sp, #0x4]\n\ - ldr r1, [r2]\n\ - add r1, r0\n\ - asr r0, r6, #3\n\ - lsl r0, #5\n\ - add r1, r0\n\ - mov r2, r8\n\ - asr r0, r2, #3\n\ - ldr r2, [sp, #0x1C]\n\ - mul r0, r2\n\ - lsl r0, #5\n\ - add r1, r0\n\ - mov r2, r8\n\ - lsl r0, r2, #29\n\ - lsr r0, #27\n\ - add r4, r1, r0\n\ - add r0, r4, #0\n\ - and r0, r7\n\ - cmp r0, #0\n\ - beq _0819A1DA\n\ - sub r4, #0x1\n\ - add r0, r6, #0\n\ - and r0, r7\n\ - cmp r0, #0\n\ - beq _0819A1B2\n\ - ldrh r0, [r4]\n\ - ldr r2, =0x00000fff\n\ - and r2, r0\n\ - add r0, r5, #0\n\ - and r0, r7\n\ - cmp r0, #0\n\ - beq _0819A1A8\n\ - ldrb r1, [r3]\n\ - mov r0, r10\n\ - and r0, r1\n\ - lsl r0, #8\n\ - b _0819A22A\n\ - .pool\n\ + asr r0, r5, #1\n\ + mov r1, #0x3\n\ + and r0, r1\n\ + ldr r2, [sp]\n\ + ldr r1, [r2]\n\ + add r1, r0\n\ + asr r0, r5, #3\n\ + lsl r0, #5\n\ + add r1, r0\n\ + mov r2, r12\n\ + asr r0, r2, #3\n\ + ldr r2, [sp, #0x18]\n\ + mul r0, r2\n\ + lsl r0, #5\n\ + add r1, r0\n\ + mov r2, r12\n\ + lsl r0, r2, #29\n\ + lsr r0, #27\n\ + add r3, r1, r0\n\ + asr r0, r6, #1\n\ + mov r1, #0x3\n\ + and r0, r1\n\ + ldr r2, [sp, #0x4]\n\ + ldr r1, [r2]\n\ + add r1, r0\n\ + asr r0, r6, #3\n\ + lsl r0, #5\n\ + add r1, r0\n\ + mov r2, r8\n\ + asr r0, r2, #3\n\ + ldr r2, [sp, #0x1C]\n\ + mul r0, r2\n\ + lsl r0, #5\n\ + add r1, r0\n\ + mov r2, r8\n\ + lsl r0, r2, #29\n\ + lsr r0, #27\n\ + add r4, r1, r0\n\ + add r0, r4, #0\n\ + and r0, r7\n\ + cmp r0, #0\n\ + beq _0819A1DA\n\ + sub r4, #0x1\n\ + add r0, r6, #0\n\ + and r0, r7\n\ + cmp r0, #0\n\ + beq _0819A1B2\n\ + ldrh r0, [r4]\n\ + ldr r2, =0x00000fff\n\ + and r2, r0\n\ + add r0, r5, #0\n\ + and r0, r7\n\ + cmp r0, #0\n\ + beq _0819A1A8\n\ + ldrb r1, [r3]\n\ + mov r0, r10\n\ + and r0, r1\n\ + lsl r0, #8\n\ + b _0819A22A\n\ + .pool\n\ _0819A1A8:\n\ - ldrb r1, [r3]\n\ - mov r0, r9\n\ - and r0, r1\n\ - lsl r0, #12\n\ - b _0819A22A\n\ + ldrb r1, [r3]\n\ + mov r0, r9\n\ + and r0, r1\n\ + lsl r0, #12\n\ + b _0819A22A\n\ _0819A1B2:\n\ - ldrh r0, [r4]\n\ - ldr r2, =0x0000f0ff\n\ - and r2, r0\n\ - add r0, r5, #0\n\ - and r0, r7\n\ - cmp r0, #0\n\ - beq _0819A1D0\n\ - ldrb r1, [r3]\n\ - mov r0, r10\n\ - and r0, r1\n\ - lsl r0, #4\n\ - b _0819A22A\n\ - .pool\n\ + ldrh r0, [r4]\n\ + ldr r2, =0x0000f0ff\n\ + and r2, r0\n\ + add r0, r5, #0\n\ + and r0, r7\n\ + cmp r0, #0\n\ + beq _0819A1D0\n\ + ldrb r1, [r3]\n\ + mov r0, r10\n\ + and r0, r1\n\ + lsl r0, #4\n\ + b _0819A22A\n\ + .pool\n\ _0819A1D0:\n\ - ldrb r1, [r3]\n\ - mov r0, r9\n\ - and r0, r1\n\ - lsl r0, #8\n\ - b _0819A22A\n\ + ldrb r1, [r3]\n\ + mov r0, r9\n\ + and r0, r1\n\ + lsl r0, #8\n\ + b _0819A22A\n\ _0819A1DA:\n\ - add r0, r6, #0\n\ - and r0, r7\n\ - cmp r0, #0\n\ - beq _0819A206\n\ - ldrh r0, [r4]\n\ - ldr r2, =0x0000ff0f\n\ - and r2, r0\n\ - add r0, r5, #0\n\ - and r0, r7\n\ - cmp r0, #0\n\ - beq _0819A1FC\n\ - ldrb r1, [r3]\n\ - mov r0, r10\n\ - b _0819A228\n\ - .pool\n\ + add r0, r6, #0\n\ + and r0, r7\n\ + cmp r0, #0\n\ + beq _0819A206\n\ + ldrh r0, [r4]\n\ + ldr r2, =0x0000ff0f\n\ + and r2, r0\n\ + add r0, r5, #0\n\ + and r0, r7\n\ + cmp r0, #0\n\ + beq _0819A1FC\n\ + ldrb r1, [r3]\n\ + mov r0, r10\n\ + b _0819A228\n\ + .pool\n\ _0819A1FC:\n\ - ldrb r1, [r3]\n\ - mov r0, r9\n\ - and r0, r1\n\ - lsl r0, #4\n\ - b _0819A22A\n\ + ldrb r1, [r3]\n\ + mov r0, r9\n\ + and r0, r1\n\ + lsl r0, #4\n\ + b _0819A22A\n\ _0819A206:\n\ - ldrh r0, [r4]\n\ - ldr r2, =0x0000fff0\n\ - and r2, r0\n\ - add r0, r5, #0\n\ - and r0, r7\n\ - cmp r0, #0\n\ - beq _0819A224\n\ - ldrb r1, [r3]\n\ - mov r0, r10\n\ - and r0, r1\n\ - lsr r0, #4\n\ - b _0819A22A\n\ - .pool\n\ + ldrh r0, [r4]\n\ + ldr r2, =0x0000fff0\n\ + and r2, r0\n\ + add r0, r5, #0\n\ + and r0, r7\n\ + cmp r0, #0\n\ + beq _0819A224\n\ + ldrb r1, [r3]\n\ + mov r0, r10\n\ + and r0, r1\n\ + lsr r0, #4\n\ + b _0819A22A\n\ + .pool\n\ _0819A224:\n\ - ldrb r1, [r3]\n\ - mov r0, r9\n\ + ldrb r1, [r3]\n\ + mov r0, r9\n\ _0819A228:\n\ - and r0, r1\n\ + and r0, r1\n\ _0819A22A:\n\ - orr r2, r0\n\ - strh r2, [r4]\n\ - add r5, #0x1\n\ - add r6, #0x1\n\ - ldr r0, [sp, #0x10]\n\ - cmp r5, r0\n\ - bge _0819A23A\n\ - b _0819A12E\n\ + orr r2, r0\n\ + strh r2, [r4]\n\ + add r5, #0x1\n\ + add r6, #0x1\n\ + ldr r0, [sp, #0x10]\n\ + cmp r5, r0\n\ + bge _0819A23A\n\ + b _0819A12E\n\ _0819A23A:\n\ - ldr r1, [sp, #0x20]\n\ - mov r12, r1\n\ - ldr r2, [sp, #0x24]\n\ - mov r8, r2\n\ - ldr r0, [sp, #0x14]\n\ - cmp r12, r0\n\ - bge _0819A24A\n\ - b _0819A10C\n\ + ldr r1, [sp, #0x20]\n\ + mov r12, r1\n\ + ldr r2, [sp, #0x24]\n\ + mov r8, r2\n\ + ldr r0, [sp, #0x14]\n\ + cmp r12, r0\n\ + bge _0819A24A\n\ + b _0819A10C\n\ _0819A24A:\n\ - add sp, #0x28\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n"); + add sp, #0x28\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n"); } #endif diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 2bae89ecf..8a2c3ad91 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -10,246 +10,246 @@ // wonder what the third flag is supposed to do static const u8 sTileBitAttributes[] = { - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_NORMAL - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_WALL - TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_TALL_GRASS - TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_LONG_GRASS - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_04 - TILE_ATTRIBUTES(FALSE, FALSE, TRUE), // MB_UNUSED_05 - TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_DEEP_SAND - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SHORT_GRASS - TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_UNUSED_CAVE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_LONG_GRASS_SOUTH_EDGE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_NO_RUNNING - TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_INDOOR_ENCOUNTER - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_MOUNTAIN_TOP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_BATTLE_PYRAMID_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_MOSSDEEP_GYM_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_MT_PYRE_HOLE - TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_POND_WATER - TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_SEMI_DEEP_WATER - TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_DEEP_WATER - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_WATERFALL - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_SOOTOPOLIS_DEEP_WATER - TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_OCEAN_WATER - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PUDDLE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SHALLOW_WATER - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_SOOTOPOLIS_DEEP_WATER - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_NO_SURFACING - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_SOOTOPOLIS_DEEP_WATER_2 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_STAIRS_OUTSIDE_ABANDONED_SHIP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SHOAL_CAVE_ENTRANCE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1D - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1E - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1F - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ICE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SAND - TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_SEAWEED - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UNUSED_23 - TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_ASHGRASS - TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_FOOTPRINTS - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_THIN_ICE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_CRACKED_ICE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_HOT_SPRINGS - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_LAVARIDGE_GYM_B1F_WARP - TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_SEAWEED_NO_SURFACING - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_REFLECTION_UNDER_BRIDGE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2C - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2D - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2E - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2F - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_EAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_WEST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_NORTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_SOUTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_NORTHEAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_NORTHWEST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_SOUTHEAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_SOUTHWEST - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_EAST - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_WEST - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_NORTH - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_SOUTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_JUMP_NORTHEAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_JUMP_NORTHWEST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_JUMP_SOUTHEAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_JUMP_SOUTHWEST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_WALK_EAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_WALK_WEST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_WALK_NORTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_WALK_SOUTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SLIDE_EAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SLIDE_WEST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SLIDE_NORTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SLIDE_SOUTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_TRICK_HOUSE_PUZZLE_8_FLOOR - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UNUSED_49 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UNUSED_4A - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4B - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4C - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4D - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4E - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4F - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_EASTWARD_CURRENT - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_WESTWARD_CURRENT - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_NORTHWARD_CURRENT - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_SOUTHWARD_CURRENT - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_54 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_55 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_56 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_57 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_58 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_59 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5A - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5B - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5C - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5D - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5E - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5F - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_NON_ANIMATED_DOOR - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_LADDER - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_EAST_ARROW_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_WEST_ARROW_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_NORTH_ARROW_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SOUTH_ARROW_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_CRACKED_FLOOR_HOLE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_AQUA_HIDEOUT_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_LAVARIDGE_GYM_1F_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ANIMATED_DOOR - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UP_ESCALATOR - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_DOWN_ESCALATOR - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_WATER_DOOR - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_WATER_SOUTH_ARROW_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_DEEP_SOUTH_WARP - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_UNUSED_6F - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_WARP_OR_BRIDGE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UNUSED_71 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_NORTH_BRIDGE_1 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_NORTH_BRIDGE_2 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PACIFIDLOG_VERTICAL_LOG_1 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PACIFIDLOG_VERTICAL_LOG_2 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PACIFIDLOG_HORIZONTAL_LOG_1 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PACIFIDLOG_HORIZONTAL_LOG_2 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_FORTREE_BRIDGE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_79 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_SOUTH_BRIDGE_1 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_SOUTH_BRIDGE_2 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_NORTH_BRIDGE_3 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_NORTH_BRIDGE_4 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UNUSED_7E - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE110_BRIDGE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_COUNTER - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_81 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_82 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PC - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CABLE_BOX_RESULTS_1 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_REGION_MAP - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TELEVISION - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_POKEBLOCK_FEEDER - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_88 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SLOT_MACHINE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_ROULETTE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CLOSED_SOOTOPOLIS_DOOR - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRICK_HOUSE_PUZZLE_DOOR - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PETALBURG_GYM_DOOR - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_RUNNING_SHOES_INSTRUCTION - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_QUESTIONNAIRE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_RED_CAVE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_RED_CAVE_OPEN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BROWN_CAVE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_YELLOW_CAVE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_LEFT - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_SHRUB - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_SHRUB_OPEN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BLUE_CAVE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_RIGHT - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_9E - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_9F - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BERRY_TREE_SOIL - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A1 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A2 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A3 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A4 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A5 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A6 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A7 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A8 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A9 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AA - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AB - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AC - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AD - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AF - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_PC - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_REGISTER_PC - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_UNUSED - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_BLOCK_DECORATION - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_DECORATION - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_LARGE_MAT_EDGE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_B6 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_NORTH_WALL - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_BALLOON - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_IMPASSABLE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_GLITTER_MAT - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_JUMP_MAT - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_SPIN_MAT - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_SOUND_MAT - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_BREAKABLE_DOOR - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SAND_ORNAMENT - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_SOUTH_AND_NORTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_WEST_AND_EAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_HOLE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_LARGE_MAT_CENTER - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_TV_SHIELD - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PLAYER_ROOM_PC_ON - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_C6 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_POSTER - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_C8 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_C9 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CA - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CB - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CC - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CD - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CF - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_MUDDY_SLOPE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_BUMPY_SLOPE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_CRACKED_FLOOR - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ISOLATED_VERTICAL_RAIL - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ISOLATED_HORIZONTAL_RAIL - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_VERTICAL_RAIL - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_HORIZONTAL_RAIL - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D7 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D8 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D9 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DA - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DB - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DC - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DD - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DF - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PICTURE_BOOK_SHELF - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BOOKSHELF - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_POKEMON_CENTER_BOOKSHELF - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_VASE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRASH_CAN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SHOP_SHELF - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BLUEPRINT - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CABLE_BOX_RESULTS_2 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_WIRELESS_BOX_RESULTS - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRAINER_HILL_TIMER - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNKNOWN_CLOSED_DOOR - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EB - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EC - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_ED - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EF + [MB_NORMAL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_WALL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_TALL_GRASS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE), + [MB_LONG_GRASS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE), + [MB_UNUSED_04] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_05] = TILE_ATTRIBUTES(FALSE, FALSE, TRUE), + [MB_DEEP_SAND] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE), + [MB_SHORT_GRASS] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_CAVE] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE), + [MB_LONG_GRASS_SOUTH_EDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_NO_RUNNING] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_INDOOR_ENCOUNTER] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE), + [MB_MOUNTAIN_TOP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_BATTLE_PYRAMID_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_MOSSDEEP_GYM_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_MT_PYRE_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_POND_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE), + [MB_SEMI_DEEP_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE), + [MB_DEEP_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE), + [MB_WATERFALL] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_SOOTOPOLIS_DEEP_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_OCEAN_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE), + [MB_PUDDLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SHALLOW_WATER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_SOOTOPOLIS_DEEP_WATER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_NO_SURFACING] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_UNUSED_SOOTOPOLIS_DEEP_WATER_2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_STAIRS_OUTSIDE_ABANDONED_SHIP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SHOAL_CAVE_ENTRANCE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_1D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_1E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_1F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_ICE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SAND] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SEAWEED] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE), + [MB_UNUSED_23] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ASHGRASS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE), + [MB_FOOTPRINTS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE), + [MB_THIN_ICE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_CRACKED_ICE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_HOT_SPRINGS] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_LAVARIDGE_GYM_B1F_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SEAWEED_NO_SURFACING] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE), + [MB_REFLECTION_UNDER_BRIDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_2C] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_2D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_2E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_2F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_IMPASSABLE_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_WEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_SOUTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_NORTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_NORTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_SOUTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_SOUTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_JUMP_EAST] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_JUMP_WEST] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_JUMP_NORTH] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_JUMP_SOUTH] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_JUMP_NORTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_JUMP_NORTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_JUMP_SOUTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_JUMP_SOUTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_WALK_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_WALK_WEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_WALK_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_WALK_SOUTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SLIDE_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SLIDE_WEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SLIDE_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SLIDE_SOUTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_TRICK_HOUSE_PUZZLE_8_FLOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_49] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_4A] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_4B] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_4C] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_4D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_4E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_4F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_EASTWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_WESTWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_NORTHWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_SOUTHWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_UNUSED_54] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_55] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_56] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_57] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_58] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_59] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_5A] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_5B] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_5C] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_5D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_5E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_5F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_NON_ANIMATED_DOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_LADDER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_EAST_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_WEST_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_NORTH_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SOUTH_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_CRACKED_FLOOR_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_AQUA_HIDEOUT_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_LAVARIDGE_GYM_1F_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ANIMATED_DOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UP_ESCALATOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_DOWN_ESCALATOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_WATER_DOOR] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_WATER_SOUTH_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_DEEP_SOUTH_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_6F] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_WARP_OR_BRIDGE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_71] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ROUTE120_NORTH_BRIDGE_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ROUTE120_NORTH_BRIDGE_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_PACIFIDLOG_VERTICAL_LOG_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_PACIFIDLOG_VERTICAL_LOG_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_PACIFIDLOG_HORIZONTAL_LOG_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_PACIFIDLOG_HORIZONTAL_LOG_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_FORTREE_BRIDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_79] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_ROUTE120_SOUTH_BRIDGE_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ROUTE120_SOUTH_BRIDGE_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ROUTE120_NORTH_BRIDGE_3] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ROUTE120_NORTH_BRIDGE_4] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_7E] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ROUTE110_BRIDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_COUNTER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_81] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_82] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_PC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_CABLE_BOX_RESULTS_1] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_REGION_MAP] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_TELEVISION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_POKEBLOCK_FEEDER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_88] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SLOT_MACHINE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_ROULETTE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_CLOSED_SOOTOPOLIS_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_TRICK_HOUSE_PUZZLE_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_PETALBURG_GYM_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_RUNNING_SHOES_INSTRUCTION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_QUESTIONNAIRE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_RED_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_RED_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_BROWN_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_YELLOW_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_TREE_LEFT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_SHRUB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_SHRUB_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_BLUE_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_TREE_RIGHT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_9E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_9F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_BERRY_TREE_SOIL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A1] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A3] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A4] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A5] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A7] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A8] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A9] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_AA] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_AB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_AC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_AD] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_AE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_AF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_PC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_REGISTER_PC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_UNUSED] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_BLOCK_DECORATION] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_DECORATION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_LARGE_MAT_EDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_B6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_NORTH_WALL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_BALLOON] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_IMPASSABLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_GLITTER_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_JUMP_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_SPIN_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_SOUND_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_BREAKABLE_DOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_SAND_ORNAMENT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_IMPASSABLE_SOUTH_AND_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_WEST_AND_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_LARGE_MAT_CENTER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_TV_SHIELD] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_PLAYER_ROOM_PC_ON] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_C6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_POSTER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_C8] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_C9] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_CA] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_CB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_CC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_CD] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_CE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_CF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_MUDDY_SLOPE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_BUMPY_SLOPE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_CRACKED_FLOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ISOLATED_VERTICAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ISOLATED_HORIZONTAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_VERTICAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_HORIZONTAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_D7] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_D8] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_D9] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_DA] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_DB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_DC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_DD] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_DE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_DF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_PICTURE_BOOK_SHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_BOOKSHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_POKEMON_CENTER_BOOKSHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_VASE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_TRASH_CAN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SHOP_SHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_BLUEPRINT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_CABLE_BOX_RESULTS_2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_WIRELESS_BOX_RESULTS] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_TRAINER_HILL_TIMER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNKNOWN_CLOSED_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_EB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_EC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_ED] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_EE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_EF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), }; bool8 MetatileBehavior_IsATile(u8 metatileBehavior) diff --git a/src/naming_screen.c b/src/naming_screen.c index 12ff4240f..0a0bd3b7d 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -2141,7 +2141,7 @@ static const struct SpriteTemplate sSpriteTemplate_Underscore = static const struct SpriteTemplate gUnknown_0858C180 = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0x0000, .oam = &gOamData_858BFEC, .anims = gSpriteAnimTable_858C0BC, diff --git a/src/new_game.c b/src/new_game.c index 18b128624..4804b28f3 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -205,14 +205,14 @@ void NewGameInitData(void) ScriptContext2_RunNewScript(EventScript_2715DE); ResetMiniGamesResults(); copy_strings_to_sav1(); - SetLilycoveLady(); - ResetAllApprenticeData(); - ClearRankingHallRecords(); - sub_8195E10(); - sub_801AFD8(); - sub_800E5AC(); - sub_81D54BC(); - ResetContestLinkResults(); + SetLilycoveLady(); + ResetAllApprenticeData(); + ClearRankingHallRecords(); + sub_8195E10(); + sub_801AFD8(); + sub_800E5AC(); + sub_81D54BC(); + ResetContestLinkResults(); } static void ResetMiniGamesResults(void) diff --git a/src/overworld.c b/src/overworld.c index 13c36819f..12e02a9b5 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -296,15 +296,51 @@ static const u8 sUnusedData[] = const struct UCoords32 gDirectionToVectors[] = { - { 0, 0}, // DIR_NONE - { 0, 1}, // DIR_SOUTH - { 0, -1}, // DIR_NORTH - {-1, 0}, // DIR_WEST - { 1, 0}, // DIR_EAST - {-1, 1}, // DIR_SOUTHWEST - { 1, 1}, // DIR_SOUTHEAST - {-1, -1}, // DIR_NORTHWEST - { 1, -1}, // DIR_NORTHEAST + [DIR_NONE] = + { + .x = 0, + .y = 0, + }, + [DIR_SOUTH] = + { + .x = 0, + .y = 1, + }, + [DIR_NORTH] = + { + .x = 0, + .y = -1, + }, + [DIR_WEST] = + { + .x = -1, + .y = 0, + }, + [DIR_EAST] = + { + .x = 1, + .y = 0, + }, + [DIR_SOUTHWEST] = + { + .x = -1, + .y = 1, + }, + [DIR_SOUTHEAST] = + { + .x = 1, + .y = 1, + }, + [DIR_NORTHWEST] = + { + .x = -1, + .y = -1, + }, + [DIR_NORTHEAST] = + { + .x = 1, + .y = -1, + }, }; static const struct BgTemplate gUnknown_08339DAC[] = @@ -1110,7 +1146,7 @@ static bool16 IsInflitratedSpaceCenter(struct WarpData *warp) u16 GetLocationMusic(struct WarpData *warp) { if (NoMusicInSotopolisWithLegendaries(warp) == TRUE) - return INVALID_U16; + return 0xFFFF; else if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE) return MUS_OOAME; else if (IsInflitratedSpaceCenter(warp) == TRUE) @@ -1171,7 +1207,7 @@ void Overworld_PlaySpecialMapMusic(void) { u16 music = GetCurrLocationDefaultMusic(); - if (music != MUS_OOAME && music != INVALID_U16) + if (music != MUS_OOAME && music != 0xFFFF) { if (gSaveBlock1Ptr->savedMusic) music = gSaveBlock1Ptr->savedMusic; @@ -1201,7 +1237,7 @@ static void sub_8085810(void) { u16 newMusic = GetWarpDestinationMusic(); u16 currentMusic = GetCurrentMapMusic(); - if (newMusic != MUS_OOAME && newMusic != INVALID_U16) + if (newMusic != MUS_OOAME && newMusic != 0xFFFF) { if (currentMusic == MUS_DEEPDEEP || currentMusic == MUS_NAMINORI) return; diff --git a/src/palette.c b/src/palette.c index 3c7485d05..1e92f4bba 100644 --- a/src/palette.c +++ b/src/palette.c @@ -63,7 +63,7 @@ static EWRAM_DATA u32 sPlttBufferTransferPending = 0; EWRAM_DATA u8 gPaletteDecompressionBuffer[PLTT_DECOMP_BUFFER_SIZE] = {0}; static const struct PaletteStructTemplate gDummyPaletteStructTemplate = { - .uid = INVALID_U16, + .uid = 0xFFFF, .pst_field_B_5 = 1 }; diff --git a/src/pokeblock.c b/src/pokeblock.c index 41d6dcc8f..1418588b8 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -435,7 +435,7 @@ void OpenPokeblockCase(u8 caseId, void (*callback)(void)) sPokeblockMenu = Alloc(sizeof(*sPokeblockMenu)); sPokeblockMenu->caseId = caseId; sPokeblockMenu->callbackOnUse = NULL; - sPokeblockMenu->unkTaskId = INVALID_U8; + sPokeblockMenu->unkTaskId = 0xFF; sPokeblockMenu->isSwapping = FALSE; sSavedPokeblockData.callback = callback; @@ -901,7 +901,7 @@ static void sub_8136344(void) static void sub_81363BC(void) { - if (sPokeblockMenu->unkTaskId == INVALID_U8) + if (sPokeblockMenu->unkTaskId == 0xFF) { sPokeblockMenu->unkTaskId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xB0, 8, 0x98, sPokeblockMenu->itemsNo - sPokeblockMenu->maxShowed, 0x456, 0x456, &sSavedPokeblockData.lastItemPage); @@ -910,10 +910,10 @@ static void sub_81363BC(void) static void sub_8136418(void) { - if (sPokeblockMenu->unkTaskId != INVALID_U8) + if (sPokeblockMenu->unkTaskId != 0xFF) { RemoveScrollIndicatorArrowPair(sPokeblockMenu->unkTaskId); - sPokeblockMenu->unkTaskId = INVALID_U8; + sPokeblockMenu->unkTaskId = 0xFF; } } @@ -1016,7 +1016,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId) break; case LIST_B_PRESSED: PlaySE(SE_SELECT); - gSpecialVar_Result = INVALID_U16; + gSpecialVar_Result = 0xFFFF; gSpecialVar_ItemId = 0; FadePaletteAndSetTaskToClosePokeblockCase(taskId); break; diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 91dbd1c99..2271d7adf 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -88,31 +88,31 @@ EWRAM_DATA static struct CompressedSpritePalette sPokeblockSpritePal = {0}; // const rom data static const u8 sNatureToMonPokeblockAnim[][2] = { - { 0, 0 }, // HARDY - { 3, 0 }, // LONELY - { 4, 1 }, // BRAVE - { 5, 0 }, // ADAMANT - { 10, 0 }, // NAUGHTY - { 13, 0 }, // BOLD - { 15, 0 }, // DOCILE - { 16, 2 }, // RELAXED - { 18, 0 }, // IMPISH - { 19, 0 }, // LAX - { 20, 0 }, // TIMID - { 25, 0 }, // HASTY - { 27, 3 }, // SERIOUS - { 28, 0 }, // JOLLY - { 29, 0 }, // NAIVE - { 33, 4 }, // MODEST - { 36, 0 }, // MILD - { 37, 0 }, // QUIET - { 39, 0 }, // BASHFUL - { 42, 0 }, // RASH - { 45, 0 }, // CALM - { 46, 5 }, // GENTLE - { 47, 6 }, // SASSY - { 48, 0 }, // CAREFUL - { 53, 0 }, // QUIRKY + [NATURE_HARDY] = { 0, 0 }, + [NATURE_LONELY] = { 3, 0 }, + [NATURE_BRAVE] = { 4, 1 }, + [NATURE_ADAMANT] = { 5, 0 }, + [NATURE_NAUGHTY] = { 10, 0 }, + [NATURE_BOLD] = { 13, 0 }, + [NATURE_DOCILE] = { 15, 0 }, + [NATURE_RELAXED] = { 16, 2 }, + [NATURE_IMPISH] = { 18, 0 }, + [NATURE_LAX] = { 19, 0 }, + [NATURE_TIMID] = { 20, 0 }, + [NATURE_HASTY] = { 25, 0 }, + [NATURE_SERIOUS] = { 27, 3 }, + [NATURE_JOLLY] = { 28, 0 }, + [NATURE_NAIVE] = { 29, 0 }, + [NATURE_MODEST] = { 33, 4 }, + [NATURE_MILD] = { 36, 0 }, + [NATURE_QUIET] = { 37, 0 }, + [NATURE_BASHFUL] = { 39, 0 }, + [NATURE_RASH] = { 42, 0 }, + [NATURE_CALM] = { 45, 0 }, + [NATURE_GENTLE] = { 46, 5 }, + [NATURE_SASSY] = { 47, 6 }, + [NATURE_CAREFUL] = { 48, 0 }, + [NATURE_QUIRKY] = { 53, 0 }, }; static const s16 sMonPokeblockAnims[][10] = diff --git a/src/pokedex.c b/src/pokedex.c index 4e28c8a14..0a12ae57e 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1271,7 +1271,7 @@ static void ResetPokedexView(struct PokedexView *pokedexView) pokedexView->seenCount = 0; pokedexView->ownCount = 0; for (i = 0; i <= 3; i++) - pokedexView->unk61E[i] |= INVALID_U16; + pokedexView->unk61E[i] |= 0xFFFF; pokedexView->unk628 = 0; pokedexView->unk62A = 0; pokedexView->unk62C = 0; @@ -2459,7 +2459,7 @@ u32 sub_80BDACC(u16 num, s16 x, s16 y) return spriteId; } } - return INVALID_U16; + return 0xFFFF; } static void CreateInterfaceSprites(u8 a) @@ -2717,8 +2717,8 @@ void sub_80BE4E0(struct Sprite *sprite) sprite->pos2.y = gSineTable[(u8)sprite->data[5]] * 76 / 256; var = 0x10000 / gSineTable[sprite->data[5] + 0x40]; - if (var > INVALID_U16) - var = INVALID_U16; + if (var > 0xFFFF) + var = 0xFFFF; SetOamMatrix(sprite->data[1] + 1, 0x100, 0, 0, var); sprite->oam.matrixNum = data1 + 1; @@ -3558,61 +3558,61 @@ void sub_80BFD0C(u8 a, u16 unused) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ - mov r7, r8\n\ - push {r7}\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r8, r0\n\ - movs r0, 0x1\n\ - bl GetBgTilemapBuffer\n\ - adds r7, r0, 0\n\ - movs r1, 0\n\ + mov r7, r8\n\ + push {r7}\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r8, r0\n\ + movs r0, 0x1\n\ + bl GetBgTilemapBuffer\n\ + adds r7, r0, 0\n\ + movs r1, 0\n\ _080BFD22:\n\ - lsls r0, r1, 3\n\ - subs r0, r1\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - movs r3, 0x80\n\ - lsls r3, 7\n\ - cmp r1, r8\n\ - bne _080BFD38\n\ - movs r3, 0x80\n\ - lsls r3, 6\n\ + lsls r0, r1, 3\n\ + subs r0, r1\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + movs r3, 0x80\n\ + lsls r3, 7\n\ + cmp r1, r8\n\ + bne _080BFD38\n\ + movs r3, 0x80\n\ + lsls r3, 6\n\ _080BFD38:\n\ - movs r2, 0\n\ - adds r6, r1, 0x1\n\ - ldr r4, =0x00000fff\n\ + movs r2, 0\n\ + adds r6, r1, 0x1\n\ + ldr r4, =0x00000fff\n\ _080BFD3E:\n\ - adds r1, r5, r2\n\ - lsls r1, 1\n\ - adds r1, r7\n\ - ldrh r0, [r1]\n\ - ands r0, r4\n\ - orrs r0, r3\n\ - strh r0, [r1]\n\ - adds r1, 0x40\n\ - ldrh r0, [r1]\n\ - ands r0, r4\n\ - orrs r0, r3\n\ - strh r0, [r1]\n\ - adds r0, r2, 0x1\n\ - lsls r0, 24\n\ - lsrs r2, r0, 24\n\ - cmp r2, 0x6\n\ - bls _080BFD3E\n\ - lsls r0, r6, 24\n\ - lsrs r1, r0, 24\n\ - cmp r1, 0x3\n\ - bls _080BFD22\n\ - movs r0, 0x1\n\ - bl CopyBgTilemapBufferToVram\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ + adds r1, r5, r2\n\ + lsls r1, 1\n\ + adds r1, r7\n\ + ldrh r0, [r1]\n\ + ands r0, r4\n\ + orrs r0, r3\n\ + strh r0, [r1]\n\ + adds r1, 0x40\n\ + ldrh r0, [r1]\n\ + ands r0, r4\n\ + orrs r0, r3\n\ + strh r0, [r1]\n\ + adds r0, r2, 0x1\n\ + lsls r0, 24\n\ + lsrs r2, r0, 24\n\ + cmp r2, 0x6\n\ + bls _080BFD3E\n\ + lsls r0, r6, 24\n\ + lsrs r1, r0, 24\n\ + cmp r1, 0x3\n\ + bls _080BFD22\n\ + movs r0, 0x1\n\ + bl CopyBgTilemapBufferToVram\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ .syntax divided\n"); } #endif @@ -3648,66 +3648,66 @@ void sub_80BFD7C(u8 a, u16 b) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ - mov r7, r8\n\ - push {r7}\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r8, r0\n\ - movs r0, 0x1\n\ - bl GetBgTilemapBuffer\n\ - adds r7, r0, 0\n\ - movs r1, 0\n\ + mov r7, r8\n\ + push {r7}\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r8, r0\n\ + movs r0, 0x1\n\ + bl GetBgTilemapBuffer\n\ + adds r7, r0, 0\n\ + movs r1, 0\n\ _080BFD92:\n\ - lsls r0, r1, 3\n\ - subs r0, r1\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - cmp r1, r8\n\ - beq _080BFDA4\n\ - cmp r1, 0x3\n\ - bne _080BFDAA\n\ + lsls r0, r1, 3\n\ + subs r0, r1\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + cmp r1, r8\n\ + beq _080BFDA4\n\ + cmp r1, 0x3\n\ + bne _080BFDAA\n\ _080BFDA4:\n\ - movs r3, 0x80\n\ - lsls r3, 6\n\ - b _080BFDAE\n\ + movs r3, 0x80\n\ + lsls r3, 6\n\ + b _080BFDAE\n\ _080BFDAA:\n\ - movs r3, 0x80\n\ - lsls r3, 7\n\ + movs r3, 0x80\n\ + lsls r3, 7\n\ _080BFDAE:\n\ - movs r2, 0\n\ - adds r5, r1, 0x1\n\ - ldr r4, =0x00000fff\n\ + movs r2, 0\n\ + adds r5, r1, 0x1\n\ + ldr r4, =0x00000fff\n\ _080BFDB4:\n\ - adds r1, r6, r2\n\ - lsls r1, 1\n\ - adds r1, r7\n\ - ldrh r0, [r1]\n\ - ands r0, r4\n\ - orrs r0, r3\n\ - strh r0, [r1]\n\ - adds r1, 0x40\n\ - ldrh r0, [r1]\n\ - ands r0, r4\n\ - orrs r0, r3\n\ - strh r0, [r1]\n\ - adds r0, r2, 0x1\n\ - lsls r0, 24\n\ - lsrs r2, r0, 24\n\ - cmp r2, 0x6\n\ - bls _080BFDB4\n\ - lsls r0, r5, 24\n\ - lsrs r1, r0, 24\n\ - cmp r1, 0x3\n\ - bls _080BFD92\n\ - movs r0, 0x1\n\ - bl CopyBgTilemapBufferToVram\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ + adds r1, r6, r2\n\ + lsls r1, 1\n\ + adds r1, r7\n\ + ldrh r0, [r1]\n\ + ands r0, r4\n\ + orrs r0, r3\n\ + strh r0, [r1]\n\ + adds r1, 0x40\n\ + ldrh r0, [r1]\n\ + ands r0, r4\n\ + orrs r0, r3\n\ + strh r0, [r1]\n\ + adds r0, r2, 0x1\n\ + lsls r0, 24\n\ + lsrs r2, r0, 24\n\ + cmp r2, 0x6\n\ + bls _080BFDB4\n\ + lsls r0, r5, 24\n\ + lsrs r1, r0, 24\n\ + cmp r1, 0x3\n\ + bls _080BFD92\n\ + movs r0, 0x1\n\ + bl CopyBgTilemapBufferToVram\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ .syntax divided\n"); } #endif @@ -4012,216 +4012,216 @@ void sub_80C0460(u16 weight, u8 left, u8 top) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x14\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - lsls r1, 24\n\ - lsrs r1, 24\n\ - mov r10, r1\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - str r2, [sp, 0x10]\n\ - ldr r5, =0x000186a0\n\ - muls r0, r5\n\ - ldr r1, =0x000011b8\n\ - bl __divsi3\n\ - adds r7, r0, 0\n\ - movs r1, 0xA\n\ - bl __umodsi3\n\ - cmp r0, 0x4\n\ - bls _080C0494\n\ - adds r7, 0xA\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x14\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + lsls r1, 24\n\ + lsrs r1, 24\n\ + mov r10, r1\n\ + lsls r2, 24\n\ + lsrs r2, 24\n\ + str r2, [sp, 0x10]\n\ + ldr r5, =0x000186a0\n\ + muls r0, r5\n\ + ldr r1, =0x000011b8\n\ + bl __divsi3\n\ + adds r7, r0, 0\n\ + movs r1, 0xA\n\ + bl __umodsi3\n\ + cmp r0, 0x4\n\ + bls _080C0494\n\ + adds r7, 0xA\n\ _080C0494:\n\ - movs r0, 0\n\ - mov r8, r0\n\ - mov r4, sp\n\ - adds r0, r7, 0\n\ - adds r1, r5, 0\n\ - bl __udivsi3\n\ - adds r0, 0xA1\n\ - strb r0, [r4]\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0xA1\n\ - bne _080C04C0\n\ - movs r6, 0x1\n\ - mov r1, sp\n\ - movs r0, 0x77\n\ - strb r0, [r1]\n\ - b _080C04C6\n\ - .pool\n\ + movs r0, 0\n\ + mov r8, r0\n\ + mov r4, sp\n\ + adds r0, r7, 0\n\ + adds r1, r5, 0\n\ + bl __udivsi3\n\ + adds r0, 0xA1\n\ + strb r0, [r4]\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + cmp r0, 0xA1\n\ + bne _080C04C0\n\ + movs r6, 0x1\n\ + mov r1, sp\n\ + movs r0, 0x77\n\ + strb r0, [r1]\n\ + b _080C04C6\n\ + .pool\n\ _080C04C0:\n\ - movs r1, 0x1\n\ - mov r8, r1\n\ - movs r6, 0x1\n\ + movs r1, 0x1\n\ + mov r8, r1\n\ + movs r6, 0x1\n\ _080C04C6:\n\ - ldr r1, =0x000186a0\n\ - adds r0, r7, 0\n\ - bl __umodsi3\n\ - adds r7, r0, 0\n\ - mov r4, sp\n\ - adds r4, 0x1\n\ - ldr r1, =0x00002710\n\ - bl __udivsi3\n\ - adds r0, 0xA1\n\ - strb r0, [r4]\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0xA1\n\ - bne _080C0504\n\ - mov r2, r8\n\ - cmp r2, 0\n\ - bne _080C0504\n\ - adds r1, r6, 0\n\ - adds r0, r1, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - add r1, sp\n\ - movs r0, 0x77\n\ - strb r0, [r1]\n\ - b _080C050E\n\ - .pool\n\ + ldr r1, =0x000186a0\n\ + adds r0, r7, 0\n\ + bl __umodsi3\n\ + adds r7, r0, 0\n\ + mov r4, sp\n\ + adds r4, 0x1\n\ + ldr r1, =0x00002710\n\ + bl __udivsi3\n\ + adds r0, 0xA1\n\ + strb r0, [r4]\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + cmp r0, 0xA1\n\ + bne _080C0504\n\ + mov r2, r8\n\ + cmp r2, 0\n\ + bne _080C0504\n\ + adds r1, r6, 0\n\ + adds r0, r1, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + add r1, sp\n\ + movs r0, 0x77\n\ + strb r0, [r1]\n\ + b _080C050E\n\ + .pool\n\ _080C0504:\n\ - movs r3, 0x1\n\ - mov r8, r3\n\ - adds r0, r6, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ + movs r3, 0x1\n\ + mov r8, r3\n\ + adds r0, r6, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ _080C050E:\n\ - ldr r1, =0x00002710\n\ - adds r0, r7, 0\n\ - bl __umodsi3\n\ - adds r7, r0, 0\n\ - mov r0, sp\n\ - adds r4, r0, r6\n\ - movs r1, 0xFA\n\ - lsls r1, 2\n\ - adds r0, r7, 0\n\ - bl __udivsi3\n\ - adds r0, 0xA1\n\ - strb r0, [r4]\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0xA1\n\ - bne _080C054C\n\ - mov r1, r8\n\ - cmp r1, 0\n\ - bne _080C054C\n\ - adds r1, r6, 0\n\ - adds r0, r1, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - add r1, sp\n\ - movs r0, 0x77\n\ - strb r0, [r1]\n\ - b _080C0552\n\ - .pool\n\ + ldr r1, =0x00002710\n\ + adds r0, r7, 0\n\ + bl __umodsi3\n\ + adds r7, r0, 0\n\ + mov r0, sp\n\ + adds r4, r0, r6\n\ + movs r1, 0xFA\n\ + lsls r1, 2\n\ + adds r0, r7, 0\n\ + bl __udivsi3\n\ + adds r0, 0xA1\n\ + strb r0, [r4]\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + cmp r0, 0xA1\n\ + bne _080C054C\n\ + mov r1, r8\n\ + cmp r1, 0\n\ + bne _080C054C\n\ + adds r1, r6, 0\n\ + adds r0, r1, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + add r1, sp\n\ + movs r0, 0x77\n\ + strb r0, [r1]\n\ + b _080C0552\n\ + .pool\n\ _080C054C:\n\ - adds r0, r6, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ + adds r0, r6, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ _080C0552:\n\ - movs r1, 0xFA\n\ - lsls r1, 2\n\ - adds r0, r7, 0\n\ - bl __umodsi3\n\ - adds r7, r0, 0\n\ - adds r1, r6, 0\n\ - adds r0, r1, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - adds r5, r6, 0\n\ - mov r2, sp\n\ - adds r4, r2, r1\n\ - adds r0, r7, 0\n\ - movs r1, 0x64\n\ - bl __udivsi3\n\ - adds r0, 0xA1\n\ - movs r3, 0\n\ - mov r9, r3\n\ - strb r0, [r4]\n\ - adds r0, r7, 0\n\ - movs r1, 0x64\n\ - bl __umodsi3\n\ - adds r7, r0, 0\n\ - adds r0, r5, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - adds r1, r6, 0\n\ - mov r2, sp\n\ - adds r0, r2, r5\n\ - movs r3, 0xAD\n\ - mov r8, r3\n\ - mov r2, r8\n\ - strb r2, [r0]\n\ - adds r0, r1, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - adds r5, r6, 0\n\ - mov r3, sp\n\ - adds r4, r3, r1\n\ - adds r0, r7, 0\n\ - movs r1, 0xA\n\ - bl __udivsi3\n\ - adds r0, 0xA1\n\ - strb r0, [r4]\n\ - adds r0, r5, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - adds r1, r6, 0\n\ - mov r2, sp\n\ - adds r0, r2, r5\n\ - mov r3, r9\n\ - strb r3, [r0]\n\ - adds r0, r1, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - adds r2, r6, 0\n\ - add r1, sp\n\ - movs r0, 0xE0\n\ - strb r0, [r1]\n\ - adds r0, r2, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - adds r3, r6, 0\n\ - mov r0, sp\n\ - adds r1, r0, r2\n\ - movs r0, 0xD6\n\ - strb r0, [r1]\n\ - adds r0, r3, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - adds r2, r6, 0\n\ - mov r0, sp\n\ - adds r1, r0, r3\n\ - movs r0, 0xE7\n\ - strb r0, [r1]\n\ - adds r0, r2, 0x1\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r3, sp\n\ - adds r1, r3, r2\n\ - mov r2, r8\n\ - strb r2, [r1]\n\ - adds r1, r3, r0\n\ - movs r0, 0xFF\n\ - strb r0, [r1]\n\ - mov r0, sp\n\ - mov r1, r10\n\ - ldr r2, [sp, 0x10]\n\ - bl sub_80BE8DC\n\ - add sp, 0x14\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ + movs r1, 0xFA\n\ + lsls r1, 2\n\ + adds r0, r7, 0\n\ + bl __umodsi3\n\ + adds r7, r0, 0\n\ + adds r1, r6, 0\n\ + adds r0, r1, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + adds r5, r6, 0\n\ + mov r2, sp\n\ + adds r4, r2, r1\n\ + adds r0, r7, 0\n\ + movs r1, 0x64\n\ + bl __udivsi3\n\ + adds r0, 0xA1\n\ + movs r3, 0\n\ + mov r9, r3\n\ + strb r0, [r4]\n\ + adds r0, r7, 0\n\ + movs r1, 0x64\n\ + bl __umodsi3\n\ + adds r7, r0, 0\n\ + adds r0, r5, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + adds r1, r6, 0\n\ + mov r2, sp\n\ + adds r0, r2, r5\n\ + movs r3, 0xAD\n\ + mov r8, r3\n\ + mov r2, r8\n\ + strb r2, [r0]\n\ + adds r0, r1, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + adds r5, r6, 0\n\ + mov r3, sp\n\ + adds r4, r3, r1\n\ + adds r0, r7, 0\n\ + movs r1, 0xA\n\ + bl __udivsi3\n\ + adds r0, 0xA1\n\ + strb r0, [r4]\n\ + adds r0, r5, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + adds r1, r6, 0\n\ + mov r2, sp\n\ + adds r0, r2, r5\n\ + mov r3, r9\n\ + strb r3, [r0]\n\ + adds r0, r1, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + adds r2, r6, 0\n\ + add r1, sp\n\ + movs r0, 0xE0\n\ + strb r0, [r1]\n\ + adds r0, r2, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + adds r3, r6, 0\n\ + mov r0, sp\n\ + adds r1, r0, r2\n\ + movs r0, 0xD6\n\ + strb r0, [r1]\n\ + adds r0, r3, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + adds r2, r6, 0\n\ + mov r0, sp\n\ + adds r1, r0, r3\n\ + movs r0, 0xE7\n\ + strb r0, [r1]\n\ + adds r0, r2, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r3, sp\n\ + adds r1, r3, r2\n\ + mov r2, r8\n\ + strb r2, [r1]\n\ + adds r1, r3, r0\n\ + movs r0, 0xFF\n\ + strb r0, [r1]\n\ + mov r0, sp\n\ + mov r1, r10\n\ + ldr r2, [sp, 0x10]\n\ + bl sub_80BE8DC\n\ + add sp, 0x14\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ .syntax divided\n"); } #endif @@ -4627,12 +4627,12 @@ u32 sub_80C0E68(u16 a) u16 sub_80C0E9C(u16 num, s16 x, s16 y, u16 paletteSlot) { num = NationalPokedexNumToSpecies(num); - return CreateMonPicSprite_HandleDeoxys(num, 8, sub_80C0E68(num), TRUE, x, y, paletteSlot, INVALID_U16); + return CreateMonPicSprite_HandleDeoxys(num, 8, sub_80C0E68(num), TRUE, x, y, paletteSlot, 0xFFFF); } u16 sub_80C0EF8(u16 species, s16 x, s16 y, s8 paletteSlot) { - return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, INVALID_U16); + return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, 0xFFFF); } int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 type2) @@ -4655,7 +4655,7 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 sPokedexView->pokemonListCount = resultsCount; // Search by name - if (abcGroup != INVALID_U8) + if (abcGroup != 0xFF) { for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { @@ -4674,7 +4674,7 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 } // Search by body color - if (bodyColor != INVALID_U8) + if (bodyColor != 0xFF) { for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { @@ -4690,15 +4690,15 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 } // Search by type - if (type1 != INVALID_U8 || type2 != INVALID_U8) + if (type1 != 0xFF || type2 != 0xFF) { - if (type1 == INVALID_U8) + if (type1 == 0xFF) { type1 = type2; - type2 = INVALID_U8; + type2 = 0xFF; } - if (type2 == INVALID_U8) + if (type2 == 0xFF) { for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { @@ -4744,7 +4744,6 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 sPokedexView->pokedexList[i].dexNum = 0xFFFF; sPokedexView->pokedexList[i].seen = FALSE; sPokedexView->pokedexList[i].owned = FALSE; - } } @@ -4987,7 +4986,7 @@ void sub_80C170C(u8 taskId) return; } - if ((gMain.newKeys & DPAD_LEFT) && r6[gTasks[taskId].data[1]][0] != INVALID_U8) + if ((gMain.newKeys & DPAD_LEFT) && r6[gTasks[taskId].data[1]][0] != 0xFF) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][0]; @@ -4995,7 +4994,7 @@ void sub_80C170C(u8 taskId) CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_RIGHT) && r6[gTasks[taskId].data[1]][1] != INVALID_U8) + if ((gMain.newKeys & DPAD_RIGHT) && r6[gTasks[taskId].data[1]][1] != 0xFF) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][1]; @@ -5003,7 +5002,7 @@ void sub_80C170C(u8 taskId) CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_UP) && r6[gTasks[taskId].data[1]][2] != INVALID_U8) + if ((gMain.newKeys & DPAD_UP) && r6[gTasks[taskId].data[1]][2] != 0xFF) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][2]; @@ -5011,7 +5010,7 @@ void sub_80C170C(u8 taskId) CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_DOWN) && r6[gTasks[taskId].data[1]][3] != INVALID_U8) + if ((gMain.newKeys & DPAD_DOWN) && r6[gTasks[taskId].data[1]][3] != 0xFF) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][3]; @@ -5215,54 +5214,54 @@ void sub_80C1D98(u8 a, u8 b, u8 c, u8 d) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ - mov r7, r8\n\ - push {r7}\n\ - adds r4, r3, 0\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - lsls r1, 24\n\ - lsrs r1, 24\n\ - mov r8, r1\n\ - lsls r2, 24\n\ - lsrs r5, r2, 24\n\ - lsls r4, 24\n\ - lsrs r4, 24\n\ - movs r0, 0x3\n\ - bl GetBgTilemapBuffer\n\ - adds r2, r0, 0\n\ - movs r3, 0\n\ - cmp r3, r4\n\ - bcs _080C1DEC\n\ - lsls r0, r5, 6\n\ - adds r7, r0, r2\n\ - ldr r5, =0x00000fff\n\ - lsls r2, r6, 12\n\ + mov r7, r8\n\ + push {r7}\n\ + adds r4, r3, 0\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + lsls r1, 24\n\ + lsrs r1, 24\n\ + mov r8, r1\n\ + lsls r2, 24\n\ + lsrs r5, r2, 24\n\ + lsls r4, 24\n\ + lsrs r4, 24\n\ + movs r0, 0x3\n\ + bl GetBgTilemapBuffer\n\ + adds r2, r0, 0\n\ + movs r3, 0\n\ + cmp r3, r4\n\ + bcs _080C1DEC\n\ + lsls r0, r5, 6\n\ + adds r7, r0, r2\n\ + ldr r5, =0x00000fff\n\ + lsls r2, r6, 12\n\ _080C1DC8:\n\ - mov r0, r8\n\ - adds r1, r0, r3\n\ - lsls r1, 1\n\ - adds r1, r7\n\ - ldrh r0, [r1]\n\ - ands r0, r5\n\ - orrs r0, r2\n\ - strh r0, [r1]\n\ - adds r1, 0x40\n\ - ldrh r0, [r1]\n\ - ands r0, r5\n\ - orrs r0, r2\n\ - strh r0, [r1]\n\ - adds r0, r3, 0x1\n\ - lsls r0, 16\n\ - lsrs r3, r0, 16\n\ - cmp r3, r4\n\ - bcc _080C1DC8\n\ + mov r0, r8\n\ + adds r1, r0, r3\n\ + lsls r1, 1\n\ + adds r1, r7\n\ + ldrh r0, [r1]\n\ + ands r0, r5\n\ + orrs r0, r2\n\ + strh r0, [r1]\n\ + adds r1, 0x40\n\ + ldrh r0, [r1]\n\ + ands r0, r5\n\ + orrs r0, r2\n\ + strh r0, [r1]\n\ + adds r0, r3, 0x1\n\ + lsls r0, 16\n\ + lsrs r3, r0, 16\n\ + cmp r3, r4\n\ + bcc _080C1DC8\n\ _080C1DEC:\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ .syntax divided\n"); } #endif @@ -5475,12 +5474,12 @@ u8 sub_80C2318(u8 taskId, u8 b) return gUnknown_0856EFAE[r2]; case 0: if (r2 == 0) - return INVALID_U8; + return 0xFF; else return r2; case 1: if (r2 == 0) - return INVALID_U8; + return 0xFF; else return r2 - 1; case 2: diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c index 843812723..30a127c71 100755 --- a/src/pokedex_area_screen.c +++ b/src/pokedex_area_screen.c @@ -4,7 +4,7 @@ #include "gpu_regs.h" #include "graphics.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "overworld.h" #include "palette.h" diff --git a/src/pokemon.c b/src/pokemon.c index 1f8d5339b..dbef22338 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2300,7 +2300,7 @@ static const u8 sHoldEffectToType[][2] = const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = { { // B_POSITION_PLAYER_LEFT - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2309,7 +2309,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = .callback = sub_8039BB4, }, { // B_POSITION_OPPONENT_LEFT - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACA8, .anims = NULL, @@ -2318,7 +2318,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = .callback = oac_poke_opponent, }, { // B_POSITION_PLAYER_RIGHT - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2327,7 +2327,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = .callback = sub_8039BB4, }, { // B_POSITION_OPPONENT_RIGHT - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACA8, .anims = NULL, @@ -2340,7 +2340,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = static const struct SpriteTemplate gUnknown_08329DF8[] = { { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2349,7 +2349,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2358,7 +2358,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2367,7 +2367,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2376,7 +2376,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2385,7 +2385,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2394,7 +2394,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2403,7 +2403,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2450,20 +2450,20 @@ static const s8 gUnknown_08329ECE[][3] = static const u16 sHMMoves[] = { MOVE_CUT, MOVE_FLY, MOVE_SURF, MOVE_STRENGTH, MOVE_FLASH, - MOVE_ROCK_SMASH, MOVE_WATERFALL, MOVE_DIVE, INVALID_U16 + MOVE_ROCK_SMASH, MOVE_WATERFALL, MOVE_DIVE, 0xFFFF }; static const struct SpeciesItem sAlteringCaveWildMonHeldItems[] = { {SPECIES_NONE, ITEM_NONE}, {SPECIES_MAREEP, ITEM_GANLON_BERRY}, - {SPECIES_PINECO, ITEM_APICOT_BERRY}, - {SPECIES_HOUNDOUR, ITEM_BIG_MUSHROOM}, - {SPECIES_TEDDIURSA, ITEM_PETAYA_BERRY}, - {SPECIES_AIPOM, ITEM_BERRY_JUICE}, - {SPECIES_SHUCKLE, ITEM_BERRY_JUICE}, - {SPECIES_STANTLER, ITEM_PETAYA_BERRY}, - {SPECIES_SMEARGLE, ITEM_SALAC_BERRY}, + {SPECIES_PINECO, ITEM_APICOT_BERRY}, + {SPECIES_HOUNDOUR, ITEM_BIG_MUSHROOM}, + {SPECIES_TEDDIURSA, ITEM_PETAYA_BERRY}, + {SPECIES_AIPOM, ITEM_BERRY_JUICE}, + {SPECIES_SHUCKLE, ITEM_BERRY_JUICE}, + {SPECIES_STANTLER, ITEM_PETAYA_BERRY}, + {SPECIES_SMEARGLE, ITEM_SALAC_BERRY}, }; static const struct OamData sOamData_8329F20 = @@ -2485,8 +2485,8 @@ static const struct OamData sOamData_8329F20 = static const struct SpriteTemplate gUnknown_08329F28 = { - .tileTag = INVALID_U16, - .paletteTag = INVALID_U16, + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, .oam = &sOamData_8329F20, .anims = gDummySpriteAnimTable, .images = NULL, @@ -3286,7 +3286,7 @@ u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move) if (existingMove == move) return -2; } - return INVALID_U16; + return 0xFFFF; } u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move) @@ -3303,7 +3303,7 @@ u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move) } } - return INVALID_U16; + return 0xFFFF; } void SetMonMoveSlot(struct Pokemon *mon, u16 move, u8 slot) @@ -3341,7 +3341,7 @@ void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon) move = (gLevelUpLearnsets[species][i] & 0x1FF); - if (GiveMoveToBoxMon(boxMon, move) == INVALID_U16) + if (GiveMoveToBoxMon(boxMon, move) == 0xFFFF) DeleteFirstMoveAndGiveMoveToBoxMon(boxMon, move); } } @@ -6495,7 +6495,7 @@ u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves) { u16 moveLevel; - if (gLevelUpLearnsets[species][i] == INVALID_U16) + if (gLevelUpLearnsets[species][i] == 0xFFFF) break; moveLevel = gLevelUpLearnsets[species][i] & 0xFE00; @@ -6524,7 +6524,7 @@ u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves) u8 numMoves = 0; int i; - for (i = 0; i < 20 && gLevelUpLearnsets[species][i] != INVALID_U16; i++) + for (i = 0; i < 20 && gLevelUpLearnsets[species][i] != 0xFFFF; i++) moves[numMoves++] = gLevelUpLearnsets[species][i] & 0x1FF; return numMoves; @@ -6549,7 +6549,7 @@ u8 GetNumberOfRelearnableMoves(struct Pokemon *mon) { u16 moveLevel; - if (gLevelUpLearnsets[species][i] == INVALID_U16) + if (gLevelUpLearnsets[species][i] == 0xFFFF) break; moveLevel = gLevelUpLearnsets[species][i] & 0xFE00; @@ -6584,7 +6584,7 @@ u16 SpeciesToPokedexNum(u16 species) species = SpeciesToHoennPokedexNum(species); if (species <= 202) return species; - return INVALID_U16; + return 0xFFFF; } } @@ -6747,7 +6747,7 @@ const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u bool32 IsHMMove2(u16 move) { int i = 0; - while (sHMMoves[i] != INVALID_U16) + while (sHMMoves[i] != 0xFFFF) { if (sHMMoves[i++] == move) return TRUE; diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index c9a4f5c91..edaedbabd 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -588,7 +588,7 @@ static const u8 sUnknown_0860AA64[][2] = {0, 2}, {1, 2}, {0, 2}, - {0, INVALID_U8} + {0, 0xFF} }; static const u8 sUnknown_0860AA80[][2] = @@ -787,30 +787,30 @@ static const u8 sBackAnimationIds[] = static const u8 sBackAnimNatureModTable[] = { 0x00, // NATURE_HARDY - 0x02, // NATURE_LONELY - 0x00, // NATURE_BRAVE - 0x00, // NATURE_ADAMANT - 0x00, // NATURE_NAUGHTY - 0x01, // NATURE_BOLD - 0x01, // NATURE_DOCILE - 0x01, // NATURE_RELAXED - 0x00, // NATURE_IMPISH - 0x01, // NATURE_LAX - 0x02, // NATURE_TIMID - 0x00, // NATURE_HASTY - 0x01, // NATURE_SERIOUS - 0x00, // NATURE_JOLLY - 0x00, // NATURE_NAIVE - 0x02, // NATURE_MODEST - 0x02, // NATURE_MILD - 0x02, // NATURE_QUIET - 0x02, // NATURE_BASHFUL - 0x01, // NATURE_RASH - 0x01, // NATURE_CALM - 0x02, // NATURE_GENTLE - 0x01, // NATURE_SASSY - 0x02, // NATURE_CAREFUL - 0x01, // NATURE_QUIRKY + 0x02, // NATURE_LONELY + 0x00, // NATURE_BRAVE + 0x00, // NATURE_ADAMANT + 0x00, // NATURE_NAUGHTY + 0x01, // NATURE_BOLD + 0x01, // NATURE_DOCILE + 0x01, // NATURE_RELAXED + 0x00, // NATURE_IMPISH + 0x01, // NATURE_LAX + 0x02, // NATURE_TIMID + 0x00, // NATURE_HASTY + 0x01, // NATURE_SERIOUS + 0x00, // NATURE_JOLLY + 0x00, // NATURE_NAIVE + 0x02, // NATURE_MODEST + 0x02, // NATURE_MILD + 0x02, // NATURE_QUIET + 0x02, // NATURE_BASHFUL + 0x01, // NATURE_RASH + 0x01, // NATURE_CALM + 0x02, // NATURE_GENTLE + 0x01, // NATURE_SASSY + 0x02, // NATURE_CAREFUL + 0x01, // NATURE_QUIRKY }; static const union AffineAnimCmd sSpriteAffineAnim_860AD48[] = @@ -1164,67 +1164,67 @@ NAKED static void sub_817F9F4(struct Sprite *sprite) { asm(".syntax unified\n\ - push {r4,lr}\n\ - adds r4, r0, 0\n\ - movs r0, 0x32\n\ - ldrsh r1, [r4, r0]\n\ - movs r0, 0xC0\n\ - lsls r0, 1\n\ - cmp r1, r0\n\ - ble _0817FA14\n\ - ldr r0, =SpriteCB_SetDummyOnAnimEnd\n\ - str r0, [r4, 0x1C]\n\ - movs r0, 0\n\ - strh r0, [r4, 0x24]\n\ - b _0817FA5E\n\ - .pool\n\ + push {r4,lr}\n\ + adds r4, r0, 0\n\ + movs r0, 0x32\n\ + ldrsh r1, [r4, r0]\n\ + movs r0, 0xC0\n\ + lsls r0, 1\n\ + cmp r1, r0\n\ + ble _0817FA14\n\ + ldr r0, =SpriteCB_SetDummyOnAnimEnd\n\ + str r0, [r4, 0x1C]\n\ + movs r0, 0\n\ + strh r0, [r4, 0x24]\n\ + b _0817FA5E\n\ + .pool\n\ _0817FA14:\n\ - adds r0, r1, 0\n\ - cmp r1, 0\n\ - bge _0817FA1C\n\ - adds r0, 0x7F\n\ + adds r0, r1, 0\n\ + cmp r1, 0\n\ + bge _0817FA1C\n\ + adds r0, 0x7F\n\ _0817FA1C:\n\ - asrs r2, r0, 7\n\ - lsls r0, r2, 16\n\ - asrs r0, 16\n\ - cmp r0, 0\n\ - blt _0817FA60\n\ - cmp r0, 0x1\n\ - ble _0817FA48\n\ - cmp r0, 0x3\n\ - bgt _0817FA60\n\ - ldr r2, =0xffffff00\n\ - adds r1, r2\n\ - lsls r0, r1, 16\n\ - asrs r0, 16\n\ - movs r1, 0x2E\n\ - ldrsh r2, [r4, r1]\n\ - lsls r1, r2, 1\n\ - adds r1, r2\n\ - lsls r1, 16\n\ - b _0817FA56\n\ - .pool\n\ + asrs r2, r0, 7\n\ + lsls r0, r2, 16\n\ + asrs r0, 16\n\ + cmp r0, 0\n\ + blt _0817FA60\n\ + cmp r0, 0x1\n\ + ble _0817FA48\n\ + cmp r0, 0x3\n\ + bgt _0817FA60\n\ + ldr r2, =0xffffff00\n\ + adds r1, r2\n\ + lsls r0, r1, 16\n\ + asrs r0, 16\n\ + movs r1, 0x2E\n\ + ldrsh r2, [r4, r1]\n\ + lsls r1, r2, 1\n\ + adds r1, r2\n\ + lsls r1, 16\n\ + b _0817FA56\n\ + .pool\n\ _0817FA48:\n\ - lsls r0, r2, 7\n\ - subs r0, r1, r0\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - movs r2, 0x2E\n\ - ldrsh r1, [r4, r2]\n\ - lsls r1, 17\n\ + lsls r0, r2, 7\n\ + subs r0, r1, r0\n\ + lsls r0, 16\n\ + asrs r0, 16\n\ + movs r2, 0x2E\n\ + ldrsh r1, [r4, r2]\n\ + lsls r1, 17\n\ _0817FA56:\n\ - asrs r1, 16\n\ - bl Sin\n\ - negs r0, r0\n\ + asrs r1, 16\n\ + bl Sin\n\ + negs r0, r0\n\ _0817FA5E:\n\ - strh r0, [r4, 0x26]\n\ + strh r0, [r4, 0x26]\n\ _0817FA60:\n\ - ldrh r0, [r4, 0x32]\n\ - adds r0, 0xC\n\ - strh r0, [r4, 0x32]\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ + ldrh r0, [r4, 0x32]\n\ + adds r0, 0xC\n\ + strh r0, [r4, 0x32]\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ .syntax divided"); } @@ -1666,7 +1666,7 @@ static void sub_818031C(struct Sprite *sprite) else amplitude = 0; - if (var5 == INVALID_U8) + if (var5 == 0xFF) { sprite->callback = SpriteCB_SetDummyOnAnimEnd; sprite->pos2.y = 0; @@ -2570,7 +2570,7 @@ static void pokemonanimfunc_2C(struct Sprite *sprite) sprite->data[4] = 0; } - if (sUnknown_0860AA64[sprite->data[6]][1] == INVALID_U8) + if (sUnknown_0860AA64[sprite->data[6]][1] == 0xFF) { sprite->callback = SpriteCB_SetDummyOnAnimEnd; } @@ -4157,17 +4157,17 @@ static void sub_8183574(struct Sprite *sprite) u8 var9 = sprite->data[6]; u8 var5 = sUnknown_0860AA80[sprite->data[5]][0]; u8 var2 = var5; - if (var5 != INVALID_U8) + if (var5 != 0xFF) var5 = sprite->data[7]; else - var5 = INVALID_U8; // needed to match + var5 = 0xFF; // needed to match var6 = sUnknown_0860AA80[sprite->data[5]][1]; var7 = 0; if (var2 != 0xFE) var7 = (var6 - var9) * var5 / var6; - if (var5 == INVALID_U8) + if (var5 == 0xFF) { sprite->callback = SpriteCB_SetDummyOnAnimEnd; sprite->pos2.y = 0; @@ -5278,7 +5278,7 @@ static const struct YellowBlendStruct sUnknown_0860ADCC[] = {0, 1}, {1, 1}, {0, 1}, - {0, INVALID_U8} + {0, 0xFF} }; static const struct YellowBlendStruct sUnknown_0860AE1C[] = @@ -5296,7 +5296,7 @@ static const struct YellowBlendStruct sUnknown_0860AE1C[] = {0, 2}, {1, 2}, {0, 2}, - {0, INVALID_U8} + {0, 0xFF} }; static const struct YellowBlendStruct sUnknown_0860AE54[] = @@ -5310,7 +5310,7 @@ static const struct YellowBlendStruct sUnknown_0860AE54[] = {0, 20}, {1, 1}, {0, 1}, - {0, INVALID_U8} + {0, 0xFF} }; static const struct YellowBlendStruct *const sUnknown_0860AE7C[] = @@ -5324,7 +5324,7 @@ static void BackAnimBlendYellow(struct Sprite *sprite) { const struct YellowBlendStruct *array = sUnknown_0860AE7C[sprite->data[3]]; sub_8184770(sprite); - if (array[sprite->data[6]].field_1 == INVALID_U8) + if (array[sprite->data[6]].field_1 == 0xFF) { sprite->pos2.x = 0; sprite->callback = SpriteCB_SetDummyOnAnimEnd; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 5926f9513..994cc520e 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1153,14 +1153,14 @@ void SafeLoadMonIconPalette(u16 species) if (species > SPECIES_EGG) species = 260; palIndex = gMonIconPaletteIndices[species]; - if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8) + if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF) LoadSpritePalette(&gMonIconPaletteTable[palIndex]); } void LoadMonIconPalette(u16 species) { u8 palIndex = gMonIconPaletteIndices[species]; - if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8) + if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF) LoadSpritePalette(&gMonIconPaletteTable[palIndex]); } @@ -1287,7 +1287,7 @@ static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *iconTemplate, s16 x, struct SpriteTemplate spriteTemplate = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = iconTemplate->paletteTag, .oam = iconTemplate->oam, .anims = iconTemplate->anims, diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index f90a6b8c2..2d9a2f08f 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -109,7 +109,7 @@ static void FormatMonSizeRecord(u8 *string, u32 size) static u8 CompareMonSize(u16 species, u16 *sizeRecord) { - if (gSpecialVar_Result == INVALID_U8) + if (gSpecialVar_Result == 0xFF) { return 0; } diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 30e16da28..465b97da2 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -134,7 +134,7 @@ s16 GetFirstFreeBoxSpot(u8 boxId) return i; } - return INVALID_S16; // all spots are taken + return -1; // all spots are taken } u8 CountPartyNonEggMons(void) @@ -426,7 +426,7 @@ s16 StorageSystemGetNextMonIndex(struct BoxPokemon *box, s8 startIdx, u8 stopIdx return i; } } - return INVALID_S16; + return -1; } void ResetPokemonStorageSystem(void) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index bef127cce..f1c248a1a 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -1152,7 +1152,7 @@ static bool8 SummaryScreen_LoadGraphics(void) break; case 17: pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &pssData->unk40F0); - if (pssData->spriteIds[0] != INVALID_U8) + if (pssData->spriteIds[0] != 0xFF) { pssData->unk40F0 = 0; gMain.state++; @@ -1509,7 +1509,7 @@ static void sub_81C0604(u8 taskId, s8 a) r4_2 = sub_81C08F8(a); } - if (r4_2 != INVALID_S8) + if (r4_2 != -1) { PlaySE(SE_SELECT); if (pssData->summary.unk7 != 0) @@ -1564,7 +1564,7 @@ static void sub_81C0704(u8 taskId) break; case 8: pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &data[1]); - if (pssData->spriteIds[0] == INVALID_U8) + if (pssData->spriteIds[0] == 0xFF) return; gSprites[pssData->spriteIds[0]].data[2] = 1; sub_81C0E24(); @@ -1601,9 +1601,9 @@ static s8 sub_81C08F8(s8 a) if (pssData->currPageIndex == PSS_PAGE_INFO) { if (a == -1 && pssData->curMonIndex == 0) - return INVALID_S8; + return -1; else if (a == 1 && pssData->curMonIndex >= pssData->maxMonIndex) - return INVALID_S8; + return -1; else return pssData->curMonIndex + a; } @@ -1615,7 +1615,7 @@ static s8 sub_81C08F8(s8 a) { index += a; if (index < 0 || index > pssData->maxMonIndex) - return INVALID_S8; + return -1; } while (GetMonData(&mon[index], MON_DATA_IS_EGG) != 0); return index; } @@ -1643,7 +1643,7 @@ static s8 sub_81C09B4(s8 a) r5 += a; if (r5 < 0 || r5 >= 6) - return INVALID_S8; + return -1; b = c[r5]; if (sub_81C0A50(&mon[b]) == TRUE) return b; @@ -2341,7 +2341,7 @@ static void sub_81C1DA4(u16 a, s16 b) else { u8 taskId = FindTaskIdByFunc(sub_81C1E20); - if (taskId == INVALID_U8) + if (taskId == 0xFF) { taskId = CreateTask(sub_81C1E20, 8); } @@ -2392,7 +2392,7 @@ static void sub_81C1EFC(u16 a, s16 b, u16 move) else { u8 taskId = FindTaskIdByFunc(sub_81C1F80); - if (taskId == INVALID_U8) + if (taskId == 0xFF) taskId = CreateTask(sub_81C1F80, 8); gTasks[taskId].data[0] = b; gTasks[taskId].data[1] = a; @@ -2580,12 +2580,12 @@ static void sub_81C240C(u16 move) { effectValue = gContestEffects[gContestMoves[move].effect].appeal; - if (effectValue != INVALID_U8) + if (effectValue != 0xFF) effectValue /= 10; for (i = 0; i < 8; i++) { - if (effectValue != INVALID_U8 && i < effectValue) + if (effectValue != 0xFF && i < effectValue) { tilemap[(i / 4 * 32) + (i & 3) + 0x1E6] = 0x103A; } @@ -2597,12 +2597,12 @@ static void sub_81C240C(u16 move) effectValue = gContestEffects[gContestMoves[move].effect].jam; - if (effectValue != INVALID_U8) + if (effectValue != 0xFF) effectValue /= 10; for (i = 0; i < 8; i++) { - if (effectValue != INVALID_U8 && i < effectValue) + if (effectValue != 0xFF && i < effectValue) { tilemap[(i / 4 * 32) + (i & 3) + 0x226] = 0x103C; } @@ -2634,7 +2634,7 @@ static void sub_81C2554(void) } for (i = 0; i < 8; i++) { - pssData->windowIds[i] = INVALID_U8; + pssData->windowIds[i] = 0xFF; } } @@ -2661,7 +2661,7 @@ static void sub_81C2628(void) struct Pokemon *mon = &pssData->currentMon; struct PokeSummary *summary = &pssData->summary; u16 dexNum = SpeciesToPokedexNum(summary->species); - if (dexNum != INVALID_U16) + if (dexNum != 0xFFFF) { StringCopy(gStringVar1, &gText_UnkCtrlF908Clear01[0]); ConvertIntToDecimalStringN(gStringVar2, dexNum, 2, 3); @@ -2895,7 +2895,7 @@ static void sub_81C2C38(u8 a) static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 templateId) { u8 *windowIdPtr = &(pssData->windowIds[templateId]); - if (*windowIdPtr == INVALID_U8) + if (*windowIdPtr == 0xFF) { *windowIdPtr = AddWindow(&template[templateId]); FillWindowPixelBuffer(*windowIdPtr, 0); @@ -2906,11 +2906,11 @@ static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 te static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex) { u8 *windowIdPtr = &(pssData->windowIds[windowIndex]); - if (*windowIdPtr != INVALID_U8) + if (*windowIdPtr != 0xFF) { ClearWindowTilemap(*windowIdPtr); RemoveWindow(*windowIdPtr); - *windowIdPtr = INVALID_U8; + *windowIdPtr = 0xFF; } } @@ -2919,7 +2919,7 @@ static void sub_81C2D9C(u8 pageIndex) u16 i; for (i = 0; i < 8; i++) { - if (pssData->windowIds[i] != INVALID_U8) + if (pssData->windowIds[i] != 0xFF) FillWindowPixelBuffer(pssData->windowIds[i], 0); } gUnknown_0861CE54[pageIndex](); @@ -3651,16 +3651,16 @@ static void sub_81C4190(void) for (i = 0; i < 28; i++) { - pssData->spriteIds[i] = INVALID_U8; + pssData->spriteIds[i] = 0xFF; } } static void DestroySpriteInArray(u8 spriteArrayId) { - if (pssData->spriteIds[spriteArrayId] != INVALID_U8) + if (pssData->spriteIds[spriteArrayId] != 0xFF) { DestroySprite(&gSprites[pssData->spriteIds[spriteArrayId]]); - pssData->spriteIds[spriteArrayId] = INVALID_U8; + pssData->spriteIds[spriteArrayId] = 0xFF; } } @@ -3675,7 +3675,7 @@ static void sub_81C424C(void) for (i = 3; i < 28; i++) { - if (pssData->spriteIds[i] != INVALID_U8) + if (pssData->spriteIds[i] != 0xFF) sub_81C4204(i, TRUE); } } @@ -3704,7 +3704,7 @@ static void sub_81C42C8(void) for (i = 3; i < 8; i++) { - if (pssData->spriteIds[i] == INVALID_U8) + if (pssData->spriteIds[i] == 0xFF) pssData->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2); sub_81C4204(i, TRUE); @@ -3851,13 +3851,13 @@ static u8 sub_81C45F4(struct Pokemon *mon, s16 *a1) } } (*a1)++; - return INVALID_S8; + return -1; case 1: pal = GetMonSpritePalStructFromOtIdPersonality(summary->species2, summary->OTID, summary->pid); LoadCompressedObjectPalette(pal); SetMultiuseSpriteTemplateToPokemon(pal->tag, 1); (*a1)++; - return INVALID_S8; + return -1; } } @@ -3921,10 +3921,10 @@ void SummaryScreen_SetUnknownTaskId(u8 a0) void SummaryScreen_DestroyUnknownTask(void) { - if (sUnknownTaskId != INVALID_U8) + if (sUnknownTaskId != 0xFF) { DestroyTask(sUnknownTaskId); - sUnknownTaskId = INVALID_U8; + sUnknownTaskId = 0xFF; } } @@ -3994,7 +3994,7 @@ static void CreateSetStatusSprite(void) u8 *spriteId = &pssData->spriteIds[2]; u8 anim; - if (*spriteId == INVALID_U8) + if (*spriteId == 0xFF) { *spriteId = CreateSprite(&sSpriteTemplate_StatusCondition, 64, 152, 0); } diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c index d0f65c4b0..b22e1db32 100644 --- a/src/rayquaza_scene.c +++ b/src/rayquaza_scene.c @@ -89,13 +89,13 @@ static void sub_81D9868(struct Sprite *sprite, u8 animNum, s16 x, s16 y); // const rom data static const TaskFunc sTasksForAnimations[] = { - Task_DuoFightAnim, // RAY_ANIM_DUO_FIGHT_PRE - Task_DuoFightAnim, // RAY_ANIM_DUO_FIGHT - Task_RayTakesFlightAnim, // RAY_ANIM_TAKES_FLIGHT - Task_RayDescendsAnim, // RAY_ANIM_DESCENDS - Task_RayChargesAnim, // RAY_ANIM_CHARGES - Task_RayChasesAwayAnim, // RAY_ANIM_CHACES_AWAY - Task_EndAfterFadeScreen // RAY_ANIM_END + [RAY_ANIM_DUO_FIGHT_PRE] = Task_DuoFightAnim, + [RAY_ANIM_DUO_FIGHT] = Task_DuoFightAnim, + [RAY_ANIM_TAKES_FLIGHT] = Task_RayTakesFlightAnim, + [RAY_ANIM_DESCENDS] = Task_RayDescendsAnim, + [RAY_ANIM_CHARGES] = Task_RayChargesAnim, + [RAY_ANIM_CHACES_AWAY] = Task_RayChasesAwayAnim, + [RAY_ANIM_END] = Task_EndAfterFadeScreen, }; static const struct OamData sOamData_862A6BC = diff --git a/src/record_mixing.c b/src/record_mixing.c index 4a4941294..975b51386 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -1763,7 +1763,7 @@ static void sub_80E8880(struct RankingHall1P *arg0, struct RankingHall1P *arg1) for (i = 0; i < 3; i++) { s32 highestWinStreak = 0; - s32 highestId = INVALID_S32; + s32 highestId = -1; for (j = 0; j < 6; j++) { if (arg1[j].winStreak > highestWinStreak) @@ -1788,7 +1788,7 @@ static void sub_80E88CC(struct RankingHall2P *arg0, struct RankingHall2P *arg1) for (i = 0; i < 3; i++) { s32 highestWinStreak = 0; - s32 highestId = INVALID_S32; + s32 highestId = -1; for (j = 0; j < 6; j++) { if (arg1[j].winStreak > highestWinStreak) diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 3fc08ff3f..81935b7c6 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -221,7 +221,7 @@ u8 RecordedBattle_GetBattlerAction(u8 battlerId) ResetPaletteFadeControl(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); SetMainCallback2(CB2_QuitRecordedBattle); - return INVALID_U8; + return 0xFF; } else { diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index da94c5c46..34444cbf4 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -160,7 +160,7 @@ static const union AnimCmd *const sSpriteAnimTable_85104E4[] = static const struct SpriteTemplate sSpriteTemplate_85104F0 = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0x1000, .oam = &sOamData_08510464, .anims = sSpriteAnimTable_85104E4, diff --git a/src/rock.c b/src/rock.c index b50ecc155..3b8e505d8 100644 --- a/src/rock.c +++ b/src/rock.c @@ -738,7 +738,7 @@ void sub_811131C(struct Sprite *sprite) if (TranslateAnimArc(sprite)) { u8 taskId = FindTaskIdByFunc(sub_81110A4); - if (taskId != INVALID_U8) + if (taskId != 0xFF) gTasks[taskId].data[11]--; DestroySprite(sprite); diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index ef82cbf0a..0553b9cf4 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -961,7 +961,7 @@ u8 sub_80132D4(struct UnkStruct_Main0 *arg0) if (var == 1) { id = sub_80176E4(&data->field_0->arr[i], data->field_4->arr); - if (id != INVALID_U8) + if (id != 0xFF) { data->field_0->arr[i].unk = data->field_4->arr[id].unk0; data->field_0->arr[i].field_18 = var; @@ -1382,7 +1382,7 @@ void sub_8013C7C(u8 taskId) case 3: if (sub_8013E44() == 1) PlaySE(SE_PC_LOGIN); - if (gTasks[taskId].data[15] == INVALID_U8) + if (gTasks[taskId].data[15] == 0xFF) data->state = 10; break; case 10: @@ -1401,14 +1401,14 @@ void sub_8013C7C(u8 taskId) bool32 sub_8013D88(u32 arg0, u32 id) { - if (id == INVALID_U8) + if (id == 0xFF) return TRUE; if (id <= ARRAY_COUNT(gUnknown_082F04D8)) // UB: <= may access data outside the array { const u8 *bytes = gUnknown_082F04D8[id]; - while ((*(bytes) != INVALID_U8)) + while ((*(bytes) != 0xFF)) { if ((*bytes) == arg0) return TRUE; @@ -1454,7 +1454,7 @@ u8 sub_8013E44(void) if (data->field_0->arr[i].field_1A_0 != 0) { id = sub_80176E4(&data->field_0->arr[i], data->field_4->arr); - if (id != INVALID_U8) + if (id != 0xFF) { if (data->field_0->arr[i].field_1A_0 == 1) { @@ -1500,7 +1500,7 @@ u8 sub_8013E44(void) for (id = 0; id < 4; id++) { - if (sub_8017734(data->field_0->arr, &data->field_4->arr[id].unk0, 16) != INVALID_U8) + if (sub_8017734(data->field_0->arr, &data->field_4->arr[id].unk0, 16) != 0xFF) ret = 1; } @@ -2178,7 +2178,7 @@ void sub_8014F48(u8 taskId) break; case 0: id = ListMenuHandleInputGetItemId(data->listTaskId); - if (gMain.newKeys & A_BUTTON && id != INVALID_S32) + if (gMain.newKeys & A_BUTTON && id != -1) { // this unused variable along with the assignment is needed to match u32 unusedVar; @@ -2732,7 +2732,7 @@ void sub_80156E0(u8 taskId) break; case 6: var5 = sub_8017178(&data->textState, &data->field_1B, &data->field_1C, &gUnknown_082F021C, &gUnknown_082F0244); - if (var5 != INVALID_S32) + if (var5 != -1) { if (gReceivedRemoteLinkPlayers == 0) { diff --git a/src/rom_8034C54.c b/src/rom_8034C54.c index 47d9eaf70..e175ecc64 100644 --- a/src/rom_8034C54.c +++ b/src/rom_8034C54.c @@ -255,7 +255,7 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2) u32 r5 = arg0->field_14; gUnknown_03000DD4 = arg0->firstOamId; gUnknown_03000DD8 = 0; - gUnknown_03000DDC = INVALID_S32; + gUnknown_03000DDC = -1; while (r5 != 0) { @@ -263,12 +263,12 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2) arg1 -= (r4 * r5); r5 /= 10; - if (r4 != 0 || gUnknown_03000DDC != INVALID_S32 || r5 == 0) + if (r4 != 0 || gUnknown_03000DDC != -1 || r5 == 0) { gMain.oamBuffer[gUnknown_03000DD4].tileNum = (r4 * arg0->field_9) + arg0->tileStart; gMain.oamBuffer[gUnknown_03000DD4].affineMode = 0; - if (gUnknown_03000DDC == INVALID_S32) + if (gUnknown_03000DDC == -1) gUnknown_03000DDC = gUnknown_03000DD8; } else diff --git a/src/rotating_gate.c b/src/rotating_gate.c index 395ced06e..f617321af 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -461,7 +461,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_RotatingGate[] = static const struct SpriteTemplate sSpriteTemplate_RotatingGateLarge = { .tileTag = ROTATING_GATE_TILE_TAG, - .paletteTag = INVALID_U16, + .paletteTag = 0xFFFF, .oam = &sOamData_RotatingGateLarge, .anims = sSpriteAnimTable_RotatingGateLarge, .images = NULL, @@ -472,7 +472,7 @@ static const struct SpriteTemplate sSpriteTemplate_RotatingGateLarge = static const struct SpriteTemplate sSpriteTemplate_RotatingGateRegular = { .tileTag = ROTATING_GATE_TILE_TAG, - .paletteTag = INVALID_U16, + .paletteTag = 0xFFFF, .oam = &sOamData_RotatingGateRegular, .anims = sSpriteAnimTable_RotatingGateRegular, .images = NULL, diff --git a/src/rtc.c b/src/rtc.c index 7553d7629..3f413d0e3 100644 --- a/src/rtc.c +++ b/src/rtc.c @@ -46,12 +46,12 @@ void RtcRestoreInterrupts(void) u32 ConvertBcdToBinary(u8 bcd) { if (bcd > 0x9F) - return INVALID_U8; + return 0xFF; if ((bcd & 0xF) <= 9) return (10 * ((bcd >> 4) & 0xF)) + (bcd & 0xF); else - return INVALID_U8; + return 0xFF; } bool8 IsLeapYear(u32 year) @@ -166,17 +166,17 @@ u16 RtcCheckInfo(struct SiiRtcInfo *rtc) year = ConvertBcdToBinary(rtc->year); - if (year == INVALID_U8) + if (year == 0xFF) errorFlags |= RTC_ERR_INVALID_YEAR; month = ConvertBcdToBinary(rtc->month); - if (month == INVALID_U8 || month == 0 || month > 12) + if (month == 0xFF || month == 0 || month > 12) errorFlags |= RTC_ERR_INVALID_MONTH; value = ConvertBcdToBinary(rtc->day); - if (value == INVALID_U8) + if (value == 0xFF) errorFlags |= RTC_ERR_INVALID_DAY; if (month == MONTH_FEB) diff --git a/src/safari_zone.c b/src/safari_zone.c index 69914b565..accf94981 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -185,7 +185,7 @@ struct Pokeblock *SafariZoneGetPokeblockInFront(void) { GetPokeblockFeederInFront(); - if (gSpecialVar_Result == INVALID_U16) + if (gSpecialVar_Result == 0xFFFF) return NULL; else return &sPokeblockFeeders[gSpecialVar_Result].pokeblock; @@ -195,7 +195,7 @@ struct Pokeblock *SafariZoneGetActivePokeblock(void) { GetPokeblockFeederWithinRange(); - if (gSpecialVar_Result == INVALID_U16) + if (gSpecialVar_Result == 0xFFFF) return NULL; else return &sPokeblockFeeders[gSpecialVar_Result].pokeblock; @@ -245,7 +245,7 @@ bool8 GetInFrontFeederPokeblockAndSteps(void) { GetPokeblockFeederInFront(); - if (gSpecialVar_Result == INVALID_U16) + if (gSpecialVar_Result == 0xFFFF) { return FALSE; } diff --git a/src/save.c b/src/save.c index de103864b..4ae516fc9 100644 --- a/src/save.c +++ b/src/save.c @@ -160,7 +160,7 @@ static u8 save_write_to_flash(u16 a1, const struct SaveSectionLocation *location if (gDamagedSaveSectors != 0) // skip the damaged sector. { - retVal = INVALID_U8; + retVal = 0xFF; gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; } @@ -220,7 +220,7 @@ static u8 TryWriteSector(u8 sector, u8 *data) if (ProgramFlashSectorAndVerify(sector, data) != 0) // is damaged? { SetDamagedSectorBits(ENABLE, sector); // set damaged sector bits. - return INVALID_U8; + return 0xFF; } else { @@ -263,14 +263,14 @@ static u8 sub_81529D4(u16 a1, const struct SaveSectionLocation *location) gUnknown_03006208++; if (gDamagedSaveSectors) { - retVal = INVALID_U8; + retVal = 0xFF; gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; } } else { - retVal = INVALID_U8; + retVal = 0xFF; } return retVal; @@ -284,7 +284,7 @@ static u8 sub_8152A34(u16 a1, const struct SaveSectionLocation *location) if (gDamagedSaveSectors) { - retVal = INVALID_U8; + retVal = 0xFF; gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; } @@ -329,15 +329,15 @@ static u8 ClearSaveData_2(u16 a1, const struct SaveSectionLocation *location) { if (ProgramFlashByte(sector, i, ((u8 *)gFastSaveSection)[i])) { - status = INVALID_U8; + status = 0xFF; break; } } - if (status == INVALID_U8) + if (status == 0xFF) { SetDamagedSectorBits(ENABLE, sector); - return INVALID_U8; + return 0xFF; } else { @@ -347,15 +347,15 @@ static u8 ClearSaveData_2(u16 a1, const struct SaveSectionLocation *location) { if (ProgramFlashByte(sector, 0xFF9 + i, ((u8 *)gFastSaveSection)[0xFF9 + i])) { - status = INVALID_U8; + status = 0xFF; break; } } - if (status == INVALID_U8) + if (status == 0xFF) { SetDamagedSectorBits(ENABLE, sector); - return INVALID_U8; + return 0xFF; } else { @@ -379,7 +379,7 @@ static u8 sav12_xor_get(u16 a1, const struct SaveSectionLocation *location) SetDamagedSectorBits(ENABLE, sector); gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; - return INVALID_U8; + return 0xFF; } else { @@ -402,7 +402,7 @@ static u8 sub_8152CAC(u16 a1, const struct SaveSectionLocation *location) SetDamagedSectorBits(ENABLE, sector); gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; - return INVALID_U8; + return 0xFF; } else { @@ -425,7 +425,7 @@ static u8 sub_8152D44(u16 a1, const struct SaveSectionLocation *location) SetDamagedSectorBits(ENABLE, sector); gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; - return INVALID_U8; + return 0xFF; } else { @@ -440,7 +440,7 @@ static u8 sub_8152DD0(u16 a1, const struct SaveSectionLocation *location) gFastSaveSection = &gSaveDataBuffer; if (a1 != 0xFFFF) { - retVal = INVALID_U8; + retVal = 0xFF; } else { @@ -715,8 +715,8 @@ u8 TrySavingData(u8 saveType) { if (gFlashMemoryPresent != TRUE) { - gUnknown_03006294 = INVALID_U8; - return INVALID_U8; + gUnknown_03006294 = 0xFF; + return 0xFF; } HandleSavingData(saveType); @@ -728,8 +728,8 @@ u8 TrySavingData(u8 saveType) else { DoSaveFailedScreen(saveType); - gUnknown_03006294 = INVALID_U8; - return INVALID_U8; + gUnknown_03006294 = 0xFF; + return 0xFF; } } @@ -748,7 +748,7 @@ bool8 sub_81533AC(void) // trade.s save u8 retVal = sub_81529D4(SECTOR_SAVE_SLOT_LENGTH, gRamSaveSectionLocations); if (gDamagedSaveSectors) DoSaveFailedScreen(0); - if (retVal == INVALID_U8) + if (retVal == 0xFF) return TRUE; else return FALSE; @@ -808,7 +808,7 @@ u8 Save_LoadGameData(u8 a1) if (gFlashMemoryPresent != TRUE) { gSaveFileStatus = 4; - return INVALID_U8; + return 0xFF; } UpdateSaveAddresses(); @@ -861,10 +861,10 @@ u32 TryCopySpecialSaveSection(u8 sector, u8* dst) u8* savData; if (sector != SECTOR_ID_TRAINER_HILL && sector != SECTOR_ID_RECORDED_BATTLE) - return INVALID_U8; + return 0xFF; ReadFlash(sector, 0, (u8 *)&gSaveDataBuffer, sizeof(struct SaveSection)); if (*(u32*)(&gSaveDataBuffer.data[0]) != 0xB39D) - return INVALID_U8; + return 0xFF; // copies whole save section except u32 counter i = 0; size = 0xFFB; @@ -882,7 +882,7 @@ u32 sub_8153634(u8 sector, u8* src) void* savDataBuffer; if (sector != 30 && sector != 31) - return INVALID_U8; + return 0xFF; savDataBuffer = &gSaveDataBuffer; *(u32*)(savDataBuffer) = 0xB39D; @@ -894,7 +894,7 @@ u32 sub_8153634(u8 sector, u8* src) for (; i <= size; i++) savData[i] = src[i]; if (ProgramFlashSectorAndVerify(sector, savDataBuffer) != 0) - return INVALID_U8; + return 0xFF; return 1; } diff --git a/src/save_location.c b/src/save_location.c index f7d3aa60b..d49afa736 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -12,7 +12,7 @@ static bool32 IsCurMapInLocationList(const u16 *list) s32 i; u16 locSum = (gSaveBlock1Ptr->location.mapGroup << 8) + (gSaveBlock1Ptr->location.mapNum); - for (i = 0; list[i] != INVALID_U16; i++) + for (i = 0; list[i] != 0xFFFF; i++) { if (list[i] == locSum) return TRUE; @@ -61,7 +61,7 @@ static const u16 sSaveLocationPokeCenterList[] = MAP_TRADE_CENTER, MAP_RECORD_CORNER, MAP_DOUBLE_BATTLE_COLOSSEUM, - INVALID_U16, + 0xFFFF, }; static bool32 IsCurMapPokeCenter(void) @@ -72,7 +72,7 @@ static bool32 IsCurMapPokeCenter(void) static const u16 sSaveLocationReloadLocList[] = // There's only 1 location, and it's presumed its for the save reload feature for battle tower. { MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, - INVALID_U16, + 0xFFFF, }; static bool32 IsCurMapReloadLocation(void) @@ -83,7 +83,7 @@ static bool32 IsCurMapReloadLocation(void) // Nulled out list. Unknown what this would have been. static const u16 sUnknown_0861440E[] = { - INVALID_U16, + 0xFFFF, }; static bool32 sub_81AFCEC(void) diff --git a/src/scanline_effect.c b/src/scanline_effect.c index 2e264ee29..a9ae9427b 100644 --- a/src/scanline_effect.c +++ b/src/scanline_effect.c @@ -22,10 +22,10 @@ void ScanlineEffect_Stop(void) { gScanlineEffect.state = 0; DmaStop(0); - if (gScanlineEffect.waveTaskId != INVALID_U8) + if (gScanlineEffect.waveTaskId != 0xFF) { DestroyTask(gScanlineEffect.waveTaskId); - gScanlineEffect.waveTaskId = INVALID_U8; + gScanlineEffect.waveTaskId = 0xFF; } } @@ -40,7 +40,7 @@ void ScanlineEffect_Clear(void) gScanlineEffect.state = 0; gScanlineEffect.unused16 = 0; gScanlineEffect.unused17 = 0; - gScanlineEffect.waveTaskId = INVALID_U8; + gScanlineEffect.waveTaskId = 0xFF; } void ScanlineEffect_SetParams(struct ScanlineEffectParams params) @@ -132,7 +132,7 @@ static void TaskFunc_UpdateWavePerFrame(u8 taskId) if (sShouldStopWaveTask) { DestroyTask(taskId); - gScanlineEffect.waveTaskId = INVALID_U8; + gScanlineEffect.waveTaskId = 0xFF; } else { diff --git a/src/scrcmd.c b/src/scrcmd.c index 4217f7237..f486b93a6 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -790,7 +790,7 @@ bool8 ScrCmd_warphole(struct ScriptContext *ctx) u16 y; PlayerGetDestCoords(&x, &y); - if (mapGroup == INVALID_U8 && mapNum == INVALID_U8) + if (mapGroup == 0xFF && mapNum == 0xFF) SetFixedHoleWarpAsDestination(x - 7, y - 7); else Overworld_SetWarpDestination(mapGroup, mapNum, -1, x - 7, y - 7); @@ -1491,7 +1491,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) if (width > 0x1C) width = 0x1C; - for (i = 0, height = 4; gStringVar4[i] != INVALID_U8;) + for (i = 0, height = 4; gStringVar4[i] != 0xFF;) { if (gStringVar4[i++] == 0xFE) height += 3; @@ -2238,8 +2238,8 @@ bool8 ScrCmd_warpD1(struct ScriptContext *ctx) u16 y = VarGet(ScriptReadHalfword(ctx)); Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y); - sub_808D074(GetPlayerFacingDirection()); - sub_80B0244(); + sub_808D074(GetPlayerFacingDirection()); + sub_80B0244(); ResetInitialPlayerAvatarState(); return TRUE; } @@ -2292,7 +2292,7 @@ bool8 ScrCmd_warpE0(struct ScriptContext *ctx) u16 y = VarGet(ScriptReadHalfword(ctx)); Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y); - sub_80AF79C(); + sub_80AF79C(); ResetInitialPlayerAvatarState(); return TRUE; } diff --git a/src/script.c b/src/script.c index 4e133a188..c61ae7183 100644 --- a/src/script.c +++ b/src/script.c @@ -391,11 +391,11 @@ bool32 sub_80991F8(void) struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data; if (scriptData->magic != RAM_SCRIPT_MAGIC) return FALSE; - if (scriptData->mapGroup != INVALID_U8) + if (scriptData->mapGroup != 0xFF) return FALSE; - if (scriptData->mapNum != INVALID_U8) + if (scriptData->mapNum != 0xFF) return FALSE; - if (scriptData->objectId != INVALID_U8) + if (scriptData->objectId != 0xFF) return FALSE; if (CalculateRamScriptChecksum() != gSaveBlock1Ptr->ramScript.checksum) return FALSE; @@ -409,11 +409,11 @@ u8 *sub_8099244(void) return NULL; if (scriptData->magic != RAM_SCRIPT_MAGIC) return NULL; - if (scriptData->mapGroup != INVALID_U8) + if (scriptData->mapGroup != 0xFF) return NULL; - if (scriptData->mapNum != INVALID_U8) + if (scriptData->mapNum != 0xFF) return NULL; - if (scriptData->objectId != INVALID_U8) + if (scriptData->objectId != 0xFF) return NULL; if (CalculateRamScriptChecksum() != gSaveBlock1Ptr->ramScript.checksum) { diff --git a/src/script_menu.c b/src/script_menu.c index fcb2d17a2..2aa546288 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1040,7 +1040,7 @@ bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress) } else { - gSpecialVar_Result = INVALID_U8; + gSpecialVar_Result = 0xFF; DrawMultichoiceMenu(left, top, multichoiceId, ignoreBPress, 0); return TRUE; } @@ -1054,7 +1054,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, bool8 } else { - gSpecialVar_Result = INVALID_U8; + gSpecialVar_Result = 0xFF; DrawMultichoiceMenu(left, top, multichoiceId, ignoreBPress, defaultChoice); return TRUE; } @@ -1201,7 +1201,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top) } else { - gSpecialVar_Result = INVALID_U8; + gSpecialVar_Result = 0xFF; DisplayYesNoMenu(); taskId = CreateTask(Task_HandleYesNoInput, 0x50); return TRUE; @@ -1211,7 +1211,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top) // unused bool8 IsScriptActive(void) { - if (gSpecialVar_Result == INVALID_U8) + if (gSpecialVar_Result == 0xFF) return FALSE; else return TRUE; @@ -1261,7 +1261,7 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPr int i; u8 newWidth; - gSpecialVar_Result = INVALID_U8; + gSpecialVar_Result = 0xFF; width = 0; for (i = 0; i < gMultichoiceLists[multichoiceId].count; i++) @@ -1320,7 +1320,7 @@ bool8 ScrSpecial_CreatePCMenu(void) } else { - gSpecialVar_Result = INVALID_U8; + gSpecialVar_Result = 0xFF; CreatePCMenu(); return TRUE; } @@ -1389,7 +1389,7 @@ bool8 sub_80E2548(void) } else { - gSpecialVar_Result = INVALID_U8; + gSpecialVar_Result = 0xFF; sub_80E2578(); return TRUE; } @@ -1407,7 +1407,7 @@ static void sub_80E2578(void) for (i = 0; i < ARRAY_COUNT(gUnknown_03001124); i++) { - gUnknown_03001124[i] |= INVALID_U8; + gUnknown_03001124[i] |= 0xFF; } GetFontAttribute(1, FONTATTR_MAX_LETTER_WIDTH); @@ -1508,7 +1508,7 @@ static void sub_80E2578(void) for (j = 0; j < ARRAY_COUNT(gUnknown_0858BB80); j++) { u8 test = gUnknown_03001124[j]; - if (test != INVALID_U8) + if (test != 0xFF) { pixelWidth = display_text_and_get_width(gUnknown_0858BB80[test], pixelWidth); } @@ -1520,7 +1520,7 @@ static void sub_80E2578(void) for (temp = 0, i = 0; i < ARRAY_COUNT(gUnknown_0858BB80); i++) { - if (gUnknown_03001124[i] != INVALID_U8) + if (gUnknown_03001124[i] != 0xFF) { AddTextPrinterParameterized(windowId, 1, gUnknown_0858BB80[gUnknown_03001124[i]], 8, temp * 16 + 1, TEXT_SPEED_FF, NULL); temp++; @@ -1575,7 +1575,7 @@ bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y) u8 taskId; u8 spriteId; - if (FindTaskIdByFunc(Task_PokemonPicWindow) != INVALID_U8) + if (FindTaskIdByFunc(Task_PokemonPicWindow) != 0xFF) { return FALSE; } @@ -1599,7 +1599,7 @@ bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void) { u8 taskId = FindTaskIdByFunc(Task_PokemonPicWindow); - if (taskId == INVALID_U8) + if (taskId == 0xFF) return NULL; gTasks[taskId].tState++; return IsPicboxClosed; @@ -1607,7 +1607,7 @@ bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void) static bool8 IsPicboxClosed(void) { - if (FindTaskIdByFunc(Task_PokemonPicWindow) == INVALID_U8) + if (FindTaskIdByFunc(Task_PokemonPicWindow) == 0xFF) return TRUE; else return FALSE; @@ -1672,7 +1672,7 @@ bool16 sp106_CreateStartMenu(void) return FALSE; } - gSpecialVar_Result = INVALID_U8; + gSpecialVar_Result = 0xFF; CreateStartMenu(); return TRUE; } diff --git a/src/script_movement.c b/src/script_movement.c index 54e6f9995..9fee9e060 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -50,7 +50,7 @@ void sub_80D338C(void) u8 taskId; taskId = sub_80D33F4(); - if (taskId != INVALID_U8) + if (taskId != 0xFF) { UnfreezeObjects(taskId); DestroyTask(taskId); @@ -65,7 +65,7 @@ static void sub_80D33AC(u8 priority) taskId = CreateTask(sub_80D3660, priority); for (i = 1; i < 16; i++) - gTasks[taskId].data[i] = INVALID_U16; + gTasks[taskId].data[i] = 0xFFFF; } static u8 sub_80D33F4(void) @@ -188,7 +188,7 @@ static void UnfreezeObjects(u8 taskId) pEventObjId = (u8 *)&gTasks[taskId].data[1]; for (i = 0; i < 16; i++, pEventObjId++) { - if (*pEventObjId != INVALID_U8) + if (*pEventObjId != 0xFF) UnfreezeEventObject(&gEventObjects[*pEventObjId]); } } @@ -201,7 +201,7 @@ static void sub_80D3660(u8 taskId) for (i = 0; i < 16; i++) { sub_80D3508(taskId, i, &var); - if (var != INVALID_U8) + if (var != 0xFF) sub_80A2490(taskId, i, var, sub_80D35CC(i)); } } diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index 77c1a88e0..7fc61f953 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -318,7 +318,7 @@ void ShowContestEntryMonPic(void) u8 taskId; u8 left, top; - if (FindTaskIdByFunc(sub_80F8EE8) == INVALID_U8) + if (FindTaskIdByFunc(sub_80F8EE8) == 0xFF) { AllocateMonSpritesGfx(); left = 10; @@ -361,7 +361,7 @@ void ShowContestEntryMonPic(void) void sub_80F8EB8(void) { u8 taskId = FindTaskIdByFunc(sub_80F8EE8); - if (taskId != INVALID_U8) + if (taskId != 0xFF) { gTasks[taskId].data[0]++; FreeMonSpritesGfx(); diff --git a/src/secret_base.c b/src/secret_base.c index 78e6bd7d0..4bf1709d2 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1385,7 +1385,7 @@ s16 sub_80EA990(u8 secretBaseRecordId) return i; } } - return INVALID_S16; + return -1; } u8 sub_80EA9D8(void) @@ -1427,7 +1427,7 @@ u8 sub_80EAA64(struct SecretBaseRecord *base, u32 version, u32 language) secretBaseRecordId = sub_80EA990(base->secretBaseId); if (secretBaseRecordId != 0) { - if (secretBaseRecordId != INVALID_S16) + if (secretBaseRecordId != -1) { if (gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_0 == 1) { @@ -1757,7 +1757,7 @@ void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx) gSaveBlock1Ptr->secretBases[i].sbr_field_1_6 = 0; } } - if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != INVALID_U16) + if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != 0xFFFF) { gSaveBlock1Ptr->secretBases[0].sbr_field_e ++; } diff --git a/src/shop.c b/src/shop.c index c0359bda0..b08d94545 100755 --- a/src/shop.c +++ b/src/shop.c @@ -446,9 +446,9 @@ static void CB2_InitBuyMenu(void) ResetTasks(); clear_scheduled_bg_copies_to_vram(); gShopDataPtr = AllocZeroed(sizeof(struct ShopData)); - gShopDataPtr->scrollIndicatorsTaskId = INVALID_U8; - gShopDataPtr->itemSpriteIds[0] = INVALID_U8; - gShopDataPtr->itemSpriteIds[1] = INVALID_U8; + gShopDataPtr->scrollIndicatorsTaskId = 0xFF; + gShopDataPtr->itemSpriteIds[0] = 0xFF; + gShopDataPtr->itemSpriteIds[1] = 0xFF; BuyMenuBuildListMenuTemplate(); BuyMenuInitBgs(); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); @@ -580,7 +580,7 @@ static void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y) static void BuyMenuAddScrollIndicatorArrows(void) { - if (gShopDataPtr->scrollIndicatorsTaskId == INVALID_U8 && gMartInfo.itemCount + 1 > 8) + if (gShopDataPtr->scrollIndicatorsTaskId == 0xFF && gMartInfo.itemCount + 1 > 8) { gShopDataPtr->scrollIndicatorsTaskId = AddScrollIndicatorArrowPairParameterized( SCROLL_ARROW_UP, @@ -596,10 +596,10 @@ static void BuyMenuAddScrollIndicatorArrows(void) static void BuyMenuRemoveScrollIndicatorArrows(void) { - if (gShopDataPtr->scrollIndicatorsTaskId != INVALID_U8) + if (gShopDataPtr->scrollIndicatorsTaskId != 0xFF) { RemoveScrollIndicatorArrowPair(gShopDataPtr->scrollIndicatorsTaskId); - gShopDataPtr->scrollIndicatorsTaskId = INVALID_U8; + gShopDataPtr->scrollIndicatorsTaskId = 0xFF; } } @@ -613,10 +613,10 @@ static void BuyMenuAddItemIcon(u16 item, u8 iconSlot) { u8 spriteId; u8 *spriteIdPtr = &gShopDataPtr->itemSpriteIds[iconSlot]; - if (*spriteIdPtr != INVALID_U8) + if (*spriteIdPtr != 0xFF) return; - if (gMartInfo.martType == MART_TYPE_0 || item == INVALID_U16) + if (gMartInfo.martType == MART_TYPE_0 || item == 0xFFFF) { spriteId = AddItemIconSprite(iconSlot + 2110, iconSlot + 2110, item); if (spriteId != MAX_SPRITES) @@ -637,13 +637,13 @@ static void BuyMenuAddItemIcon(u16 item, u8 iconSlot) static void BuyMenuRemoveItemIcon(u16 item, u8 iconSlot) { u8 *spriteIdPtr = &gShopDataPtr->itemSpriteIds[iconSlot]; - if (*spriteIdPtr == INVALID_U8) + if (*spriteIdPtr == 0xFF) return; FreeSpriteTilesByTag(iconSlot + 2110); FreeSpritePaletteByTag(iconSlot + 2110); DestroySprite(&gSprites[*spriteIdPtr]); - *spriteIdPtr = INVALID_U8; + *spriteIdPtr = 0xFF; } static void BuyMenuInitBgs(void) diff --git a/src/slot_machine.c b/src/slot_machine.c index 97fe0b146..0871506cd 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -1637,7 +1637,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) /*static */bool8 sub_8102A44(void) { - if (FindTaskIdByFunc(sub_8102A64) == INVALID_U8) + if (FindTaskIdByFunc(sub_8102A64) == 0xFF) return TRUE; else return FALSE; @@ -2672,7 +2672,7 @@ s16 sub_8102D5C(s16 a0) /*static */bool8 sub_810432C(void) { - if (FindTaskIdByFunc(sub_810434C) == INVALID_U8) + if (FindTaskIdByFunc(sub_810434C) == 0xFF) return TRUE; return FALSE; } @@ -3007,7 +3007,7 @@ s16 sub_8102D5C(s16 a0) /*static */bool8 sub_8104AEC(void) { - if (FindTaskIdByFunc(sub_8104B0C) == INVALID_U8) + if (FindTaskIdByFunc(sub_8104B0C) == 0xFF) return TRUE; else return FALSE; @@ -3108,7 +3108,7 @@ s16 sub_8102D5C(s16 a0) task = gTasks + sSlotMachine->unk3D; task->data[1] = arg0; - for (i = 0; gUnknown_083ED048[arg0][i].unk00 != INVALID_U8; i++) + for (i = 0; gUnknown_083ED048[arg0][i].unk00 != 0xFF; i++) { u8 spriteId; spriteId = sub_8105BB4( @@ -3138,7 +3138,7 @@ s16 sub_8102D5C(s16 a0) { u8 i; struct Task *task = gTasks + sSlotMachine->unk3D; - if ((u16)task->data[1] != INVALID_U16) + if ((u16)task->data[1] != 0xFFFF) gUnknown_083ED064[task->data[1]](); for (i = 4; i < 16; i++) { @@ -4201,74 +4201,74 @@ extern const u16 gSlotMachineMenu_Pal[]; /*static */void SlotMachineSetup_8_0(void) { gUnknown_0203AAF4 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AAF4[0].data = gUnknown_0203AAD4; - gUnknown_0203AAF4[0].size = 0x600; - - gUnknown_0203AAF8 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AAF8[0].data = gUnknown_0203AAD4 + 0x600; - gUnknown_0203AAF8[0].size = 0x200; - - gUnknown_0203AAFC = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AAFC[0].data = gUnknown_0203AAD4 + 0x800; - gUnknown_0203AAFC[0].size = 0x200; - - gUnknown_0203AB00 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB00[0].data = gUnknown_0203AAD4 + 0xA00; - gUnknown_0203AB00[0].size = 0x200; - - gUnknown_0203AB04 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB04[0].data = gUnknown_0203AAD4 + 0xC00; - gUnknown_0203AB04[0].size = 0x300; - - gUnknown_0203AB08 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB08[0].data = gUnknown_0203AAD4 + 0x1000; - gUnknown_0203AB08[0].size = 0x400; - - gUnknown_0203AB0C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB0C[0].data = gUnknown_0203AAD4 + 0x1400; - gUnknown_0203AB0C[0].size = 0x200; - - gUnknown_0203AB10 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB10[0].data = gUnknown_0203AAD4 + 0x1600; - gUnknown_0203AB10[0].size = 0x300; - - gUnknown_0203AB14 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB14[0].data = gUnknown_0203AAD4 + 0x1900; - gUnknown_0203AB14[0].size = 0x300; - - gUnknown_0203AB18 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); - gUnknown_0203AB18[0].data = gUnknown_0203AAD4 + 0x1C00; - gUnknown_0203AB18[0].size = 0x200; - gUnknown_0203AB18[1].data = gUnknown_0203AAD4 + 0x1E00; - gUnknown_0203AB18[1].size = 0x200; - - gUnknown_0203AB1C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB1C[0].data = gUnknown_0203AAD4 + 0x2000; - gUnknown_0203AB1C[0].size = 640; - - gUnknown_0203AB20 = AllocZeroed(sizeof(struct SpriteFrameImage) * 5); - gUnknown_0203AB20[0].data = gUnknown_0203AAD4 + 0x2280; - gUnknown_0203AB20[0].size = 0x80; - gUnknown_0203AB20[1].data = gUnknown_0203AAD4 + 0x2300; - gUnknown_0203AB20[1].size = 0x80; - gUnknown_0203AB20[2].data = gUnknown_0203AAD4 + 0x2380; - gUnknown_0203AB20[2].size = 0x80; - gUnknown_0203AB20[3].data = gUnknown_0203AAD4 + 0x2400; - gUnknown_0203AB20[3].size = 0x80; - gUnknown_0203AB20[4].data = gUnknown_0203AAD4 + 0x2480; - gUnknown_0203AB20[4].size = 0x80; - - gUnknown_0203AB24 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); - gUnknown_0203AB24[0].data = gUnknown_0203AAD4 + 0x2600; - gUnknown_0203AB24[0].size = 0x480; - gUnknown_0203AB24[1].data = gUnknown_0203AAD4 + 10880; - gUnknown_0203AB24[1].size = 0x480; - - gUnknown_0203AB28 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); - gUnknown_0203AB28[0].data = gUnknown_0203AAD4 + 0x2F00; - gUnknown_0203AB28[0].size = 0x180; - gUnknown_0203AB28[1].data = gUnknown_0203AAD4 + 0x3080; - gUnknown_0203AB28[1].size = 0x180; + gUnknown_0203AAF4[0].data = gUnknown_0203AAD4; + gUnknown_0203AAF4[0].size = 0x600; + + gUnknown_0203AAF8 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AAF8[0].data = gUnknown_0203AAD4 + 0x600; + gUnknown_0203AAF8[0].size = 0x200; + + gUnknown_0203AAFC = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AAFC[0].data = gUnknown_0203AAD4 + 0x800; + gUnknown_0203AAFC[0].size = 0x200; + + gUnknown_0203AB00 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AB00[0].data = gUnknown_0203AAD4 + 0xA00; + gUnknown_0203AB00[0].size = 0x200; + + gUnknown_0203AB04 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AB04[0].data = gUnknown_0203AAD4 + 0xC00; + gUnknown_0203AB04[0].size = 0x300; + + gUnknown_0203AB08 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AB08[0].data = gUnknown_0203AAD4 + 0x1000; + gUnknown_0203AB08[0].size = 0x400; + + gUnknown_0203AB0C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AB0C[0].data = gUnknown_0203AAD4 + 0x1400; + gUnknown_0203AB0C[0].size = 0x200; + + gUnknown_0203AB10 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AB10[0].data = gUnknown_0203AAD4 + 0x1600; + gUnknown_0203AB10[0].size = 0x300; + + gUnknown_0203AB14 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AB14[0].data = gUnknown_0203AAD4 + 0x1900; + gUnknown_0203AB14[0].size = 0x300; + + gUnknown_0203AB18 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); + gUnknown_0203AB18[0].data = gUnknown_0203AAD4 + 0x1C00; + gUnknown_0203AB18[0].size = 0x200; + gUnknown_0203AB18[1].data = gUnknown_0203AAD4 + 0x1E00; + gUnknown_0203AB18[1].size = 0x200; + + gUnknown_0203AB1C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AB1C[0].data = gUnknown_0203AAD4 + 0x2000; + gUnknown_0203AB1C[0].size = 640; + + gUnknown_0203AB20 = AllocZeroed(sizeof(struct SpriteFrameImage) * 5); + gUnknown_0203AB20[0].data = gUnknown_0203AAD4 + 0x2280; + gUnknown_0203AB20[0].size = 0x80; + gUnknown_0203AB20[1].data = gUnknown_0203AAD4 + 0x2300; + gUnknown_0203AB20[1].size = 0x80; + gUnknown_0203AB20[2].data = gUnknown_0203AAD4 + 0x2380; + gUnknown_0203AB20[2].size = 0x80; + gUnknown_0203AB20[3].data = gUnknown_0203AAD4 + 0x2400; + gUnknown_0203AB20[3].size = 0x80; + gUnknown_0203AB20[4].data = gUnknown_0203AAD4 + 0x2480; + gUnknown_0203AB20[4].size = 0x80; + + gUnknown_0203AB24 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); + gUnknown_0203AB24[0].data = gUnknown_0203AAD4 + 0x2600; + gUnknown_0203AB24[0].size = 0x480; + gUnknown_0203AB24[1].data = gUnknown_0203AAD4 + 10880; + gUnknown_0203AB24[1].size = 0x480; + + gUnknown_0203AB28 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); + gUnknown_0203AB28[0].data = gUnknown_0203AAD4 + 0x2F00; + gUnknown_0203AB28[0].size = 0x180; + gUnknown_0203AB28[1].data = gUnknown_0203AAD4 + 0x3080; + gUnknown_0203AB28[1].size = 0x180; } const u8 sReelSymbols[][21] = diff --git a/src/smokescreen.c b/src/smokescreen.c index 1119e9e90..9b37cd234 100644 --- a/src/smokescreen.c +++ b/src/smokescreen.c @@ -12,7 +12,7 @@ u8 sub_807521C(s16 x, s16 y, u8 a3) u8 spriteId1, spriteId2, spriteId3, spriteId4; struct Sprite *mainSprite; - if (GetSpriteTileStartByTag(gUnknown_0831C620.tag) == INVALID_U16) + if (GetSpriteTileStartByTag(gUnknown_0831C620.tag) == 0xFFFF) { LoadCompressedObjectPicUsingHeap(&gUnknown_0831C620); LoadCompressedObjectPaletteUsingHeap(&gUnknown_0831C628); diff --git a/src/sound.c b/src/sound.c index 7798700c3..ba3f659cc 100644 --- a/src/sound.c +++ b/src/sound.c @@ -247,7 +247,7 @@ void FadeInNewBGM(u16 songNum, u8 speed) { if (gDisableMusic) songNum = 0; - if (songNum == INVALID_U16) + if (songNum == 0xFFFF) songNum = 0; m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlayInfo_BGM); @@ -544,7 +544,7 @@ void PlayBGM(u16 songNum) { if (gDisableMusic) songNum = 0; - if (songNum == INVALID_U16) + if (songNum == 0xFFFF) songNum = 0; m4aSongNumStart(songNum); } diff --git a/src/sprite.c b/src/sprite.c index 3f0223dee..4087dd8c4 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -108,7 +108,7 @@ typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *); 0 \ } -#define ANIM_END INVALID_U16 +#define ANIM_END 0xFFFF #define AFFINE_ANIM_END 0x7FFF // forward declarations @@ -204,7 +204,7 @@ const union AffineAnimCmd * const gDummySpriteAffineAnimTable[] = { &sDummyAffin const struct SpriteTemplate gDummySpriteTemplate = { .tileTag = 0, - .paletteTag = INVALID_U16, + .paletteTag = 0xFFFF, .oam = &gDummyOamData, .anims = gDummySpriteAnimTable, .images = NULL, @@ -572,12 +572,12 @@ u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y, CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); - if (template->tileTag == INVALID_U16) + if (template->tileTag == 0xFFFF) { s16 tileNum; sprite->images = template->images; tileNum = AllocSpriteTiles((u8)(sprite->images->size / TILE_SIZE_4BPP)); - if (tileNum == INVALID_S16) + if (tileNum == -1) { ResetSprite(sprite); return MAX_SPRITES; @@ -595,7 +595,7 @@ u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y, if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK) InitSpriteAffineAnim(sprite); - if (template->paletteTag != INVALID_U16) + if (template->paletteTag != 0xFFFF) sprite->oam.paletteNum = IndexOfSpritePaletteTag(template->paletteTag); return index; @@ -740,7 +740,7 @@ s16 AllocSpriteTiles(u16 tileCount) i++; if (i == TOTAL_OBJ_TILE_COUNT) - return INVALID_S16; + return -1; } start = i; @@ -751,7 +751,7 @@ s16 AllocSpriteTiles(u16 tileCount) i++; if (i == TOTAL_OBJ_TILE_COUNT) - return INVALID_S16; + return -1; if (!SPRITE_TILE_IS_ALLOCATED(i)) numTilesFound++; @@ -877,7 +877,7 @@ void ResetAllSprites(void) void FreeSpriteTiles(struct Sprite *sprite) { - if (sprite->template->tileTag != INVALID_U16) + if (sprite->template->tileTag != 0xFFFF) FreeSpriteTilesByTag(sprite->template->tileTag); } @@ -923,7 +923,7 @@ void BeginAnim(struct Sprite *sprite) sprite->animLoopCounter = 0; imageValue = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue; - if (imageValue != INVALID_S16) + if (imageValue != -1) { sprite->animBeginning = FALSE; duration = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration; @@ -1441,7 +1441,7 @@ u8 AllocOamMatrix(void) bit <<= 1; } - return INVALID_U8; + return 0xFF; } void FreeOamMatrix(u8 matrixNum) @@ -1462,7 +1462,7 @@ void FreeOamMatrix(u8 matrixNum) void InitSpriteAffineAnim(struct Sprite *sprite) { u8 matrixNum = AllocOamMatrix(); - if (matrixNum != INVALID_U8) + if (matrixNum != 0xFF) { CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); sprite->oam.matrixNum = matrixNum; @@ -1508,7 +1508,7 @@ void LoadSpriteSheets(const struct SpriteSheet *sheets) void FreeSpriteTilesByTag(u16 tag) { u8 index = IndexOfSpriteTileTag(tag); - if (index != INVALID_U8) + if (index != 0xFF) { u16 i; u16 *rangeStarts; @@ -1523,7 +1523,7 @@ void FreeSpriteTilesByTag(u16 tag) for (i = start; i < start + count; i++) FREE_SPRITE_TILE(i); - sSpriteTileRangeTags[index] = INVALID_U16; + sSpriteTileRangeTags[index] = 0xFFFF; } } @@ -1533,7 +1533,7 @@ void FreeSpriteTileRanges(void) for (i = 0; i < MAX_SPRITES; i++) { - sSpriteTileRangeTags[i] = INVALID_U16; + sSpriteTileRangeTags[i] = 0xFFFF; SET_SPRITE_TILE_RANGE(i, 0, 0); } } @@ -1541,8 +1541,8 @@ void FreeSpriteTileRanges(void) u16 GetSpriteTileStartByTag(u16 tag) { u8 index = IndexOfSpriteTileTag(tag); - if (index == INVALID_U8) - return INVALID_U16; + if (index == 0xFF) + return 0xFFFF; return sSpriteTileRanges[index * 2]; } @@ -1554,7 +1554,7 @@ u8 IndexOfSpriteTileTag(u16 tag) if (sSpriteTileRangeTags[i] == tag) return i; - return INVALID_U8; + return 0xFF; } u16 GetSpriteTileTagByTileStart(u16 start) @@ -1563,16 +1563,16 @@ u16 GetSpriteTileTagByTileStart(u16 start) for (i = 0; i < MAX_SPRITES; i++) { - if (sSpriteTileRangeTags[i] != INVALID_U16 && sSpriteTileRanges[i * 2] == start) + if (sSpriteTileRangeTags[i] != 0xFFFF && sSpriteTileRanges[i * 2] == start) return sSpriteTileRangeTags[i]; } - return INVALID_U16; + return 0xFFFF; } void AllocSpriteTileRange(u16 tag, u16 start, u16 count) { - u8 freeIndex = IndexOfSpriteTileTag(INVALID_U16); + u8 freeIndex = IndexOfSpriteTileTag(0xFFFF); sSpriteTileRangeTags[freeIndex] = tag; SET_SPRITE_TILE_RANGE(freeIndex, start, count); } @@ -1582,21 +1582,21 @@ void FreeAllSpritePalettes(void) u8 i; gReservedSpritePaletteCount = 0; for (i = 0; i < 16; i++) - sSpritePaletteTags[i] = INVALID_U16; + sSpritePaletteTags[i] = 0xFFFF; } u8 LoadSpritePalette(const struct SpritePalette *palette) { u8 index = IndexOfSpritePaletteTag(palette->tag); - if (index != INVALID_U8) + if (index != 0xFF) return index; - index = IndexOfSpritePaletteTag(INVALID_U16); + index = IndexOfSpritePaletteTag(0xFFFF); - if (index == INVALID_U8) + if (index == 0xFF) { - return INVALID_U8; + return 0xFF; } else { @@ -1610,7 +1610,7 @@ void LoadSpritePalettes(const struct SpritePalette *palettes) { u8 i; for (i = 0; palettes[i].data != NULL; i++) - if (LoadSpritePalette(&palettes[i]) == INVALID_U8) + if (LoadSpritePalette(&palettes[i]) == 0xFF) break; } @@ -1621,10 +1621,10 @@ void DoLoadSpritePalette(const u16 *src, u16 paletteOffset) u8 AllocSpritePalette(u16 tag) { - u8 index = IndexOfSpritePaletteTag(INVALID_U16); - if (index == INVALID_U8) + u8 index = IndexOfSpritePaletteTag(0xFFFF); + if (index == 0xFF) { - return INVALID_U8; + return 0xFF; } else { @@ -1640,7 +1640,7 @@ u8 IndexOfSpritePaletteTag(u16 tag) if (sSpritePaletteTags[i] == tag) return i; - return INVALID_U8; + return 0xFF; } u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum) @@ -1651,8 +1651,8 @@ u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum) void FreeSpritePaletteByTag(u16 tag) { u8 index = IndexOfSpritePaletteTag(tag); - if (index != INVALID_U8) - sSpritePaletteTags[index] = INVALID_U16; + if (index != 0xFF) + sSpritePaletteTags[index] = 0xFFFF; } void SetSubspriteTables(struct Sprite *sprite, const struct SubspriteTable *subspriteTables) diff --git a/src/strings.c b/src/strings.c index 5dcf97e2b..dd674d348 100644 --- a/src/strings.c +++ b/src/strings.c @@ -255,25 +255,25 @@ const u8 gText_ThePC[] = _("the PC"); const u8 *const gReturnToXStringsTable[] = { gText_TheField, - gText_TheBattle, - gText_ThePokemonList, - gText_TheShop, - gText_TheField, - gText_TheField, - gText_ThePC, - gText_TheField, - gText_TheField, - gText_TheField, - gText_TheBattle, - gText_ThePC + gText_TheBattle, + gText_ThePokemonList, + gText_TheShop, + gText_TheField, + gText_TheField, + gText_ThePC, + gText_TheField, + gText_TheField, + gText_TheField, + gText_TheBattle, + gText_ThePC }; const u8 *const gReturnToXStringsTable2[] = { gText_TheField, - gText_TheBattle, - gText_ThePokemonList, - gText_TheField + gText_TheBattle, + gText_ThePokemonList, + gText_TheField }; const u8 gText_ReturnToVar1[] = _("Return to\n{STR_VAR_1}."); @@ -286,10 +286,10 @@ const u8 gText_KeyItemsPocket[] = _("KEY ITEMS"); const u8 *const gPocketNamesStringsTable[] = { gText_ItemsPocket, - gText_PokeBallsPocket, - gText_TMHMPocket, - gText_BerriesPocket, - gText_KeyItemsPocket + gText_PokeBallsPocket, + gText_TMHMPocket, + gText_BerriesPocket, + gText_KeyItemsPocket }; const u8 gText_UnkF908Var1Clear7Var2[] = _("{NO}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}"); diff --git a/src/task.c b/src/task.c index 2a77b8a9b..14b97a361 100644 --- a/src/task.c +++ b/src/task.c @@ -19,7 +19,7 @@ void ResetTasks(void) gTasks[i].func = TaskDummy; gTasks[i].prev = i; gTasks[i].next = i + 1; - gTasks[i].priority = INVALID_S8; + gTasks[i].priority = -1; memset(gTasks[i].data, 0, sizeof(gTasks[i].data)); } @@ -186,7 +186,7 @@ u8 FindTaskIdByFunc(TaskFunc func) if (gTasks[i].isActive == TRUE && gTasks[i].func == func) return (u8)i; - return INVALID_U8; + return 0xFF; } u8 GetTaskCount(void) diff --git a/src/text.c b/src/text.c index 44895722d..07c15596e 100644 --- a/src/text.c +++ b/src/text.c @@ -1877,7 +1877,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) if (func == NULL) return 0; - if (letterSpacing == INVALID_S16) + if (letterSpacing == -1) localLetterSpacing = GetFontAttribute(fontId, FONTATTR_LETTER_SPACING); else localLetterSpacing = letterSpacing; @@ -1953,7 +1953,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) func = GetFontWidthFunc(*++str); if (func == NULL) return 0; - if (letterSpacing == INVALID_S16) + if (letterSpacing == -1) localLetterSpacing = GetFontAttribute(*str, FONTATTR_LETTER_SPACING); break; case 0x11: diff --git a/src/title_screen.c b/src/title_screen.c index 70a1a3449..d60e3fc0b 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -66,14 +66,14 @@ static const u32 sTitleScreenCloudsGfx[] = INCBIN_U32("graphics/title_screen/clo const u16 gUnknown_0853FF70[] = { - 0x0010, 0x0110, 0x0210, 0x0310, 0x0410, 0x0510, 0x0610, 0x0710, - 0x0810, 0x0910, 0x0a10, 0x0b10, 0x0c10, 0x0d10, 0x0e10, 0x0f10, - 0x100f, 0x100e, 0x100d, 0x100c, 0x100b, 0x100a, 0x1009, 0x1008, - 0x1007, 0x1006, 0x1005, 0x1004, 0x1003, 0x1002, 0x1001, 0x1000, - 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, - 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, - 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, - 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, + 0x0010, 0x0110, 0x0210, 0x0310, 0x0410, 0x0510, 0x0610, 0x0710, + 0x0810, 0x0910, 0x0a10, 0x0b10, 0x0c10, 0x0d10, 0x0e10, 0x0f10, + 0x100f, 0x100e, 0x100d, 0x100c, 0x100b, 0x100a, 0x1009, 0x1008, + 0x1007, 0x1006, 0x1005, 0x1004, 0x1003, 0x1002, 0x1001, 0x1000, + 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, + 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, + 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, + 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, }; static const struct OamData sVersionBannerLeftOamData = diff --git a/src/trader.c b/src/trader.c index afb0cca48..e23efb4ce 100644 --- a/src/trader.c +++ b/src/trader.c @@ -155,7 +155,7 @@ void ScrSpecial_IsDecorationFull(void) { gSpecialVar_Result = FALSE; if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category - && GetFirstEmptyDecorSlot(gDecorations[gSpecialVar_0x8004].category) == INVALID_S8) + && GetFirstEmptyDecorSlot(gDecorations[gSpecialVar_0x8004].category) == -1) { sub_8127250(gStringVar2, gDecorations[gSpecialVar_0x8004].category); gSpecialVar_Result = TRUE; diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index fd97623fe..f5354a1e8 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -107,9 +107,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 { if (!isTrainer) { - if (paletteTag == INVALID_U16) + if (paletteTag == 0xFFFF) { - sCreatingSpriteTemplate.paletteTag |= INVALID_U16; + sCreatingSpriteTemplate.paletteTag |= 0xFFFF; LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20); } else @@ -120,9 +120,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 } else { - if (paletteTag == INVALID_U16) + if (paletteTag == 0xFFFF) { - sCreatingSpriteTemplate.paletteTag |= INVALID_U16; + sCreatingSpriteTemplate.paletteTag |= 0xFFFF; LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, 0x100 + paletteSlot * 0x10, 0x20); } else @@ -166,30 +166,30 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront } if (i == PICS_COUNT) { - return INVALID_U16; + return 0xFFFF; } framePics = Alloc(4 * 0x800); if (!framePics) { - return INVALID_U16; + return 0xFFFF; } images = Alloc(4 * sizeof(struct SpriteFrameImage)); if (!images) { Free(framePics); - return INVALID_U16; + return 0xFFFF; } if (DecompressPic(species, personality, isFrontPic, framePics, isTrainer, ignoreDeoxys)) { // debug trap? - return INVALID_U16; + return 0xFFFF; } for (j = 0; j < 4; j ++) { images[j].data = framePics + 0x800 * j; images[j].size = 0x800; } - sCreatingSpriteTemplate.tileTag = INVALID_U16; + sCreatingSpriteTemplate.tileTag = 0xFFFF; sCreatingSpriteTemplate.oam = &gUnknown_0860B064; AssignSpriteAnimsTable(isTrainer); sCreatingSpriteTemplate.images = images; @@ -197,7 +197,7 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront sCreatingSpriteTemplate.callback = DummyPicSpriteCallback; LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, isTrainer); spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0); - if (paletteTag == INVALID_U16) + if (paletteTag == 0xFFFF) { gSprites[spriteId].oam.paletteNum = paletteSlot; } @@ -232,12 +232,12 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1 } if (i == PICS_COUNT) { - return INVALID_U16; + return 0xFFFF; } framePics = Alloc(4 * 0x800); if (!framePics) { - return INVALID_U16; + return 0xFFFF; } if (flags & 0x80) { @@ -252,19 +252,19 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1 if (!images) { Free(framePics); - return INVALID_U16; + return 0xFFFF; } if (DecompressPic(species, personality, flags, framePics, FALSE, FALSE)) { // debug trap? - return INVALID_U16; + return 0xFFFF; } for (j = 0; j < 4; j ++) { images[j].data = framePics + 0x800 * j; images[j].size = 0x800; } - sCreatingSpriteTemplate.tileTag = INVALID_U16; + sCreatingSpriteTemplate.tileTag = 0xFFFF; sCreatingSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species]; sCreatingSpriteTemplate.images = images; if (flags2 == 0x01) @@ -285,7 +285,7 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1 sCreatingSpriteTemplate.callback = DummyPicSpriteCallback; LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, FALSE); spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0); - if (paletteTag == INVALID_U16) + if (paletteTag == 0xFFFF) { gSprites[spriteId].oam.paletteNum = paletteSlot; } @@ -312,11 +312,11 @@ static u16 FreeAndDestroyPicSpriteInternal(u16 spriteId) } if (i == PICS_COUNT) { - return INVALID_U16; + return 0xFFFF; } framePics = sSpritePics[i].frames; images = sSpritePics[i].images; - if (sSpritePics[i].paletteTag != INVALID_U16) + if (sSpritePics[i].paletteTag != 0xFFFF) { FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum)); } @@ -331,7 +331,7 @@ static u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic, { if (DecompressPic_HandleDeoxys(species, personality, isFrontPic, (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE)) { - return INVALID_U16; + return 0xFFFF; } LoadPicPaletteBySlot(species, otId, personality, paletteSlot, isTrainer); return 0; @@ -349,7 +349,7 @@ static u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic, Free(framePics); return 0; } - return INVALID_U16; + return 0xFFFF; } static u16 CreateMonPicSprite(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 ignoreDeoxys) diff --git a/src/trainer_see.c b/src/trainer_see.c index d3d450de4..17781bf4e 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -75,17 +75,17 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *train static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = { sub_80B4178, - sub_80B417C, - sub_80B41C0, - sub_80B4200, - sub_80B425C, - sub_80B4318, - sub_80B435C, - sub_80B4390, - sub_80B43AC, - sub_80B43E0, - sub_80B4438, - sub_80B44AC + sub_80B417C, + sub_80B41C0, + sub_80B4200, + sub_80B425C, + sub_80B4318, + sub_80B435C, + sub_80B4390, + sub_80B43AC, + sub_80B43E0, + sub_80B4438, + sub_80B44AC }; static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = diff --git a/src/tv.c b/src/tv.c index 0c5c3f564..f77e93cb7 100644 --- a/src/tv.c +++ b/src/tv.c @@ -799,7 +799,7 @@ u8 special_0x44(void) j --; } } while (j != selIdx); - return INVALID_U8; + return 0xFF; } u8 FindAnyTVShowOnTheAir(void) @@ -807,9 +807,9 @@ u8 FindAnyTVShowOnTheAir(void) u8 response; response = special_0x44(); - if (response == INVALID_U8) + if (response == 0xFF) { - return INVALID_U8; + return 0xFF; } if (gSaveBlock1Ptr->outbreakPokemonSpecies != SPECIES_NONE && gSaveBlock1Ptr->tvShows[response].common.kind == TVSHOW_MASS_OUTBREAK) { @@ -833,7 +833,7 @@ void UpdateTVScreensOnMap(int width, int height) { SetTVMetatilesOnMap(width, height, 0x3); } - else if (FlagGet(FLAG_SYS_TV_START) && (FindAnyTVShowOnTheAir() != INVALID_U8 || FindAnyTVNewsOnTheAir() != INVALID_U8 || IsTVShowInSearchOfTrainersAiring())) + else if (FlagGet(FLAG_SYS_TV_START) && (FindAnyTVShowOnTheAir() != 0xFF || FindAnyTVNewsOnTheAir() != 0xFF || IsTVShowInSearchOfTrainersAiring())) { FlagClear(FLAG_SYS_TV_WATCH); SetTVMetatilesOnMap(width, height, 0x3); @@ -887,7 +887,7 @@ u8 FindFirstActiveTVShowThatIsNotAMassOutbreak(void) return i; } } - return INVALID_U8; + return 0xFF; } u8 special_0x4a(void) @@ -932,7 +932,7 @@ void GabbyAndTyBeforeInterview(void) gSaveBlock1Ptr->gabbyAndTyData.mon1 = gBattleResults.playerMon1Species; gSaveBlock1Ptr->gabbyAndTyData.mon2 = gBattleResults.playerMon2Species; gSaveBlock1Ptr->gabbyAndTyData.lastMove = gBattleResults.lastUsedMovePlayer; - if (gSaveBlock1Ptr->gabbyAndTyData.battleNum != INVALID_U8) + if (gSaveBlock1Ptr->gabbyAndTyData.battleNum != 0xFF) { gSaveBlock1Ptr->gabbyAndTyData.battleNum ++; } @@ -1007,7 +1007,7 @@ bool8 IsTVShowInSearchOfTrainersAiring(void) bool8 GabbyAndTyGetLastQuote(void) { - if (gSaveBlock1Ptr->gabbyAndTyData.quote[0] == INVALID_U16) + if (gSaveBlock1Ptr->gabbyAndTyData.quote[0] == 0xFFFF) { return FALSE; } @@ -1125,7 +1125,7 @@ void PutPokemonTodayCaughtOnAir(void) if (!rbernoulli(1, 1) && StringCompare(gSpeciesNames[gBattleResults.caughtMonSpecies], gBattleResults.caughtMonNick)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_CAUGHT, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_CAUGHT, FALSE) != TRUE) { for (i = 0; i < 11; i ++) { @@ -1206,7 +1206,7 @@ void PutPokemonTodayFailedOnTheAir(void) if (ct > 2 && (gBattleOutcome == B_OUTCOME_MON_FLED || gBattleOutcome == B_OUTCOME_WON)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_FAILED, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_FAILED, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->pokemonTodayFailed.kind = TVSHOW_POKEMON_TODAY_FAILED; @@ -1282,7 +1282,7 @@ void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlaye u8 name[32]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_BATTLE_UPDATE); if (gSpecialVar_Result != 1) @@ -1329,7 +1329,7 @@ bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unus u8 name[32]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot == INVALID_S8) + if (sCurTVShowSlot == -1) { return FALSE; } @@ -1396,7 +1396,7 @@ void ContestLiveUpdates_BeforeInterview_1(u8 a0) DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24); sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show = &gSaveBlock1Ptr->tvShows[24]; show->contestLiveUpdates.round1Rank = a0; @@ -1410,7 +1410,7 @@ void ContestLiveUpdates_BeforeInterview_2(u8 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show->contestLiveUpdates.round2Rank = a0; } @@ -1422,7 +1422,7 @@ void ContestLiveUpdates_BeforeInterview_3(u8 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show->contestLiveUpdates.appealFlags1 = a0; } @@ -1434,7 +1434,7 @@ void ContestLiveUpdates_BeforeInterview_4(u16 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show->contestLiveUpdates.move = a0; } @@ -1446,7 +1446,7 @@ void ContestLiveUpdates_BeforeInterview_5(u8 a0, u8 a1) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show->contestLiveUpdates.winningSpecies = gContestMons[a1].species; StringCopy(show->contestLiveUpdates.winningTrainerName, gContestMons[a1].trainerName); @@ -1507,7 +1507,7 @@ void BravoTrainerPokemonProfile_BeforeInterview1(u16 a0) show = &gSaveBlock1Ptr->tvShows[24]; InterviewBefore_BravoTrainerPkmnProfile(); sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24); show->bravoTrainer.move = a0; @@ -1521,7 +1521,7 @@ void BravoTrainerPokemonProfile_BeforeInterview2(u8 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show->bravoTrainer.contestResult = a0; show->bravoTrainer.contestCategory = gSpecialVar_ContestCategory; @@ -1577,7 +1577,7 @@ void SaveRecordedItemPurchasesForTVShow(void) && !rbernoulli(1, 3)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SMART_SHOPPER, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SMART_SHOPPER, FALSE) != TRUE) { TV_SortPurchasesByQuantity(); if (gMartPurchaseHistory[0].quantity >= 20) @@ -1742,7 +1742,7 @@ static void sub_80ED718(void) if (!rbernoulli(1, 200)) { sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { outbreakIdx = Random() % ARRAY_COUNT(sPokeOutbreakSpeciesList); show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; @@ -1843,7 +1843,7 @@ void sub_80ED950(bool8 flag) PutFishingAdviceShowOnTheAir(); } sPokemonAnglerAttemptCounters &= 0xFF; - if (sPokemonAnglerAttemptCounters != INVALID_U8) + if (sPokemonAnglerAttemptCounters != 0xFF) { sPokemonAnglerAttemptCounters += 0x01; } @@ -1855,7 +1855,7 @@ void sub_80ED950(bool8 flag) PutFishingAdviceShowOnTheAir(); } sPokemonAnglerAttemptCounters &= 0xFF00; - if (sPokemonAnglerAttemptCounters >> 8 != INVALID_U8) + if (sPokemonAnglerAttemptCounters >> 8 != 0xFF) { sPokemonAnglerAttemptCounters += 0x0100; } @@ -1867,7 +1867,7 @@ void PutFishingAdviceShowOnTheAir(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FISHING_ADVICE, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FISHING_ADVICE, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->pokemonAngler.kind = TVSHOW_FISHING_ADVICE; @@ -1910,7 +1910,7 @@ void sub_80EDA80(void) if (!rbernoulli(1, 1)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_WORLD_OF_MASTERS, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_WORLD_OF_MASTERS, FALSE) != TRUE) { show2 = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show2->worldOfMasters.kind = TVSHOW_WORLD_OF_MASTERS; @@ -1936,7 +1936,7 @@ void sub_80EDB44(void) HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TODAYS_RIVAL_TRAINER, TRUE); sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->rivalTrainer.kind = TVSHOW_TODAYS_RIVAL_TRAINER; @@ -1984,7 +1984,7 @@ void sub_80EDC60(const u16 *words) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREND_WATCHER, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREND_WATCHER, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->trendWatcher.kind = TVSHOW_TREND_WATCHER; @@ -2003,7 +2003,7 @@ void sub_80EDCE8(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREASURE_INVESTIGATORS, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREASURE_INVESTIGATORS, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->treasureInvestigators.kind = TVSHOW_TREASURE_INVESTIGATORS; @@ -2024,7 +2024,7 @@ void sub_80EDD78(u16 nCoinsPaidOut) u16 nCoinsWon; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FIND_THAT_GAMER, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FIND_THAT_GAMER, FALSE) != TRUE) { flag = FALSE; switch (sFindThatGamerWhichGame) @@ -2207,7 +2207,7 @@ void TV_PutSecretBaseVisitOnTheAir(void) HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SECRET_BASE_VISIT, TRUE); sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->secretBaseVisit.kind = TVSHOW_SECRET_BASE_VISIT; @@ -2227,7 +2227,7 @@ void sub_80EE184(void) u16 balls; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BREAKING_NEWS, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BREAKING_NEWS, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->breakingNews.kind = TVSHOW_BREAKING_NEWS; @@ -2298,7 +2298,7 @@ void sub_80EE2CC(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_LOTTO_WINNER, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_LOTTO_WINNER, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->lottoWinner.kind = TVSHOW_LOTTO_WINNER; @@ -2318,7 +2318,7 @@ void sub_80EE35C(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u1 u8 j; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BATTLE_SEMINAR, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BATTLE_SEMINAR, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->battleSeminar.kind = TVSHOW_BATTLE_SEMINAR; @@ -2347,7 +2347,7 @@ void sub_80EE44C(u8 nMonsCaught, u8 nPkblkUsed) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SAFARI_FAN_CLUB, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SAFARI_FAN_CLUB, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->safariFanClub.kind = TVSHOW_SAFARI_FAN_CLUB; @@ -2365,7 +2365,7 @@ void sub_80EE4DC(struct Pokemon *pokemon, u8 ribbonMonDataIdx) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_CUTIES, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_CUTIES, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->cuties.kind = TVSHOW_CUTIES; @@ -2440,7 +2440,7 @@ void sub_80EE72C(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TRAINER_FAN_CLUB, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TRAINER_FAN_CLUB, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->trainerFanClub.kind = TVSHOW_TRAINER_FAN_CLUB; @@ -2456,7 +2456,7 @@ void sub_80EE72C(void) bool8 sub_80EE7C0(void) { sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot == INVALID_S8) + if (sCurTVShowSlot == -1) { return TRUE; } @@ -2493,7 +2493,7 @@ bool8 sub_80EE818(void) } } sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot == INVALID_S8) + if (sCurTVShowSlot == -1) { return FALSE; } @@ -2557,7 +2557,7 @@ void sub_80EEA70(void) if (HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SECRET_BASE_SECRETS, FALSE) != TRUE) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->secretBaseSecrets.kind = TVSHOW_SECRET_BASE_SECRETS; @@ -2608,7 +2608,7 @@ static void sub_80EEBF4(u8 actionIdx) HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_NUMBER_ONE, TRUE); sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->numberOne.kind = TVSHOW_NUMBER_ONE; @@ -2665,7 +2665,7 @@ static void sub_80EED88(void) if (FlagGet(FLAG_SYS_GAME_CLEAR)) { sCurTVShowSlot = sub_80EEE30(gSaveBlock1Ptr->pokeNews); - if (sCurTVShowSlot != INVALID_S8 && rbernoulli(1, 100) != TRUE) + if (sCurTVShowSlot != -1 && rbernoulli(1, 100) != TRUE) { newsKind = (Random() % 4) + POKENEWS_SLATEPORT; if (sub_80EF0E4(newsKind) != TRUE) @@ -2689,7 +2689,7 @@ s8 sub_80EEE30(PokeNews *pokeNews) return i; } } - return INVALID_S8; + return -1; } void ClearPokemonNews(void) @@ -2742,7 +2742,7 @@ u8 FindAnyTVNewsOnTheAir(void) return i; } } - return INVALID_U8; + return 0xFF; } void DoPokeNews(void) @@ -2751,7 +2751,7 @@ void DoPokeNews(void) u16 n; i = FindAnyTVNewsOnTheAir(); - if (i == INVALID_U8) + if (i == 0xFF) { gSpecialVar_Result = FALSE; } @@ -3252,7 +3252,7 @@ static void sub_80EFA88(void) { sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); gSpecialVar_0x8006 = sCurTVShowSlot; - if (sCurTVShowSlot == INVALID_S8) + if (sCurTVShowSlot == -1) { gSpecialVar_Result = TRUE; } @@ -3273,7 +3273,7 @@ s8 FindEmptyTVSlotWithinFirstFiveShowsOfArray(TVShow *shows) return i; } } - return INVALID_S8; + return -1; } s8 FindEmptyTVSlotBeyondFirstFiveShowsOfArray(TVShow *shows) @@ -3287,7 +3287,7 @@ s8 FindEmptyTVSlotBeyondFirstFiveShowsOfArray(TVShow *shows) return i; } } - return INVALID_S8; + return -1; } bool8 TV_BernoulliTrial(u16 ratio) @@ -3310,7 +3310,7 @@ void TV_FanClubLetter_RandomWordToStringVar3(TVShow *show) { i = 0; } - if (show->fanclubLetter.words[i] != INVALID_U16) + if (show->fanclubLetter.words[i] != 0xFFFF) { break; } @@ -3677,7 +3677,7 @@ static void sub_80F0358(TVShow player1[25], TVShow player2[25], TVShow player3[2 sRecordMixingPartnersWithoutShowsToShare = i; } sTVShowMixingCurSlot = sub_80F06D0(argslist[i][0]); - if (sTVShowMixingCurSlot == INVALID_S8) + if (sTVShowMixingCurSlot == -1) { sRecordMixingPartnersWithoutShowsToShare ++; if (sRecordMixingPartnersWithoutShowsToShare == sTVShowMixingNumPlayers) @@ -3690,7 +3690,7 @@ static void sub_80F0358(TVShow player1[25], TVShow player2[25], TVShow player3[2 for (j = 0; j < sTVShowMixingNumPlayers - 1; j ++) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(argslist[(i + j + 1) % sTVShowMixingNumPlayers][0]); - if (sCurTVShowSlot != INVALID_S8 + if (sCurTVShowSlot != -1 && sub_80F049C(&argslist[(i + j + 1) % sTVShowMixingNumPlayers][0], &argslist[i][0], (i + j + 1) % sTVShowMixingNumPlayers) == 1) { break; @@ -3801,7 +3801,7 @@ static s8 sub_80F06D0(TVShow *tvShows) return i; } } - return INVALID_S8; + return -1; } #ifdef NONMATCHING @@ -4486,12 +4486,12 @@ static void sub_80F0D60(PokeNews player1[16], PokeNews player2[16], PokeNews pla for (j = 0; j < sTVShowNewsMixingNumPlayers; j ++) { sTVShowMixingCurSlot = sub_80F0ECC(*argslist[j], i); - if (sTVShowMixingCurSlot != INVALID_S8) + if (sTVShowMixingCurSlot != -1) { for (k = 0; k < sTVShowNewsMixingNumPlayers - 1; k++) { sCurTVShowSlot = sub_80EEE30(*argslist[(j + k + 1) % sTVShowNewsMixingNumPlayers]); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { sub_80F0E58(argslist[(j + k + 1) % sTVShowNewsMixingNumPlayers], argslist[j]); } @@ -4538,7 +4538,7 @@ static s8 sub_80F0ECC(PokeNews *pokeNews, u8 idx) { if (pokeNews[idx].kind == POKENEWS_NONE) { - return INVALID_S8; + return -1; } return idx; } @@ -7425,7 +7425,7 @@ static void DoTVShowSecretBaseSecrets(void) } break; default: - for (i = 0; i < INVALID_U16; i ++) + for (i = 0; i < 0xFFFF; i ++) { sTVSecretBaseSecretsRandomValues[1] = Random() % bitCount; if (sTVSecretBaseSecretsRandomValues[1] != sTVSecretBaseSecretsRandomValues[0]) @@ -7447,7 +7447,7 @@ static void DoTVShowSecretBaseSecrets(void) } else { - for (i = 0; i < INVALID_U16; i ++) + for (i = 0; i < 0xFFFF; i ++) { sTVSecretBaseSecretsRandomValues[2] = Random() % bitCount; if (sTVSecretBaseSecretsRandomValues[2] != sTVSecretBaseSecretsRandomValues[0] && sTVSecretBaseSecretsRandomValues[2] != sTVSecretBaseSecretsRandomValues[1]) diff --git a/src/walda_phrase.c b/src/walda_phrase.c index 44da22f31..ff2ee7399 100644 --- a/src/walda_phrase.c +++ b/src/walda_phrase.c @@ -176,7 +176,7 @@ static void sub_81D9C90(u8 *array, s32 arg1, s32 arg2) s32 i, j; u8 var1, var2; - for (i = arg2 - 1; i != INVALID_S32; i--) + for (i = arg2 - 1; i != -1; i--) { var1 = (array[0] & 0x80) >> 7; diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 8fb7d08d6..3a8adaf15 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -43,4554 +43,4554 @@ EWRAM_DATA static u32 sFeebasRngValue = 0; // const rom data const struct WildPokemon gRoute101_LandMons[] = { - {2, 2, SPECIES_WURMPLE}, - {2, 2, SPECIES_POOCHYENA}, - {2, 2, SPECIES_WURMPLE}, - {3, 3, SPECIES_WURMPLE}, - {3, 3, SPECIES_POOCHYENA}, - {3, 3, SPECIES_POOCHYENA}, - {3, 3, SPECIES_WURMPLE}, - {3, 3, SPECIES_POOCHYENA}, - {2, 2, SPECIES_ZIGZAGOON}, - {2, 2, SPECIES_ZIGZAGOON}, - {3, 3, SPECIES_ZIGZAGOON}, - {3, 3, SPECIES_ZIGZAGOON}, + {2, 2, SPECIES_WURMPLE}, + {2, 2, SPECIES_POOCHYENA}, + {2, 2, SPECIES_WURMPLE}, + {3, 3, SPECIES_WURMPLE}, + {3, 3, SPECIES_POOCHYENA}, + {3, 3, SPECIES_POOCHYENA}, + {3, 3, SPECIES_WURMPLE}, + {3, 3, SPECIES_POOCHYENA}, + {2, 2, SPECIES_ZIGZAGOON}, + {2, 2, SPECIES_ZIGZAGOON}, + {3, 3, SPECIES_ZIGZAGOON}, + {3, 3, SPECIES_ZIGZAGOON}, }; const struct WildPokemonInfo gRoute101_LandMonsInfo = {20, gRoute101_LandMons}; const struct WildPokemon gRoute102_LandMons[] = { - {3, 3, SPECIES_POOCHYENA}, - {3, 3, SPECIES_WURMPLE}, - {4, 4, SPECIES_POOCHYENA}, - {4, 4, SPECIES_WURMPLE}, - {3, 3, SPECIES_LOTAD}, - {4, 4, SPECIES_LOTAD}, - {3, 3, SPECIES_ZIGZAGOON}, - {3, 3, SPECIES_ZIGZAGOON}, - {4, 4, SPECIES_ZIGZAGOON}, - {4, 4, SPECIES_RALTS}, - {4, 4, SPECIES_ZIGZAGOON}, - {3, 3, SPECIES_SEEDOT}, + {3, 3, SPECIES_POOCHYENA}, + {3, 3, SPECIES_WURMPLE}, + {4, 4, SPECIES_POOCHYENA}, + {4, 4, SPECIES_WURMPLE}, + {3, 3, SPECIES_LOTAD}, + {4, 4, SPECIES_LOTAD}, + {3, 3, SPECIES_ZIGZAGOON}, + {3, 3, SPECIES_ZIGZAGOON}, + {4, 4, SPECIES_ZIGZAGOON}, + {4, 4, SPECIES_RALTS}, + {4, 4, SPECIES_ZIGZAGOON}, + {3, 3, SPECIES_SEEDOT}, }; const struct WildPokemonInfo gRoute102_LandMonsInfo = {20, gRoute102_LandMons}; const struct WildPokemon gRoute102_WaterMons[] = { - {20, 30, SPECIES_MARILL}, - {10, 20, SPECIES_MARILL}, - {30, 35, SPECIES_MARILL}, - {5, 10, SPECIES_MARILL}, - {20, 30, SPECIES_GOLDEEN}, + {20, 30, SPECIES_MARILL}, + {10, 20, SPECIES_MARILL}, + {30, 35, SPECIES_MARILL}, + {5, 10, SPECIES_MARILL}, + {20, 30, SPECIES_GOLDEEN}, }; const struct WildPokemonInfo gRoute102_WaterMonsInfo = {4, gRoute102_WaterMons}; const struct WildPokemon gRoute102_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_CORPHISH}, - {25, 30, SPECIES_CORPHISH}, - {30, 35, SPECIES_CORPHISH}, - {20, 25, SPECIES_CORPHISH}, - {35, 40, SPECIES_CORPHISH}, - {40, 45, SPECIES_CORPHISH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_CORPHISH}, + {25, 30, SPECIES_CORPHISH}, + {30, 35, SPECIES_CORPHISH}, + {20, 25, SPECIES_CORPHISH}, + {35, 40, SPECIES_CORPHISH}, + {40, 45, SPECIES_CORPHISH}, }; const struct WildPokemonInfo gRoute102_FishingMonsInfo = {30, gRoute102_FishingMons}; const struct WildPokemon gRoute103_LandMons[] = { - {2, 2, SPECIES_POOCHYENA}, - {3, 3, SPECIES_POOCHYENA}, - {3, 3, SPECIES_POOCHYENA}, - {4, 4, SPECIES_POOCHYENA}, - {2, 2, SPECIES_WINGULL}, - {3, 3, SPECIES_ZIGZAGOON}, - {3, 3, SPECIES_ZIGZAGOON}, - {4, 4, SPECIES_ZIGZAGOON}, - {3, 3, SPECIES_WINGULL}, - {3, 3, SPECIES_WINGULL}, - {2, 2, SPECIES_WINGULL}, - {4, 4, SPECIES_WINGULL}, + {2, 2, SPECIES_POOCHYENA}, + {3, 3, SPECIES_POOCHYENA}, + {3, 3, SPECIES_POOCHYENA}, + {4, 4, SPECIES_POOCHYENA}, + {2, 2, SPECIES_WINGULL}, + {3, 3, SPECIES_ZIGZAGOON}, + {3, 3, SPECIES_ZIGZAGOON}, + {4, 4, SPECIES_ZIGZAGOON}, + {3, 3, SPECIES_WINGULL}, + {3, 3, SPECIES_WINGULL}, + {2, 2, SPECIES_WINGULL}, + {4, 4, SPECIES_WINGULL}, }; const struct WildPokemonInfo gRoute103_LandMonsInfo = {20, gRoute103_LandMons}; const struct WildPokemon gRoute103_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute103_WaterMonsInfo = {4, gRoute103_WaterMons}; const struct WildPokemon gRoute103_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute103_FishingMonsInfo = {30, gRoute103_FishingMons}; const struct WildPokemon gRoute104_LandMons[] = { - {4, 4, SPECIES_POOCHYENA}, - {4, 4, SPECIES_WURMPLE}, - {5, 5, SPECIES_POOCHYENA}, - {5, 5, SPECIES_MARILL}, - {4, 4, SPECIES_MARILL}, - {5, 5, SPECIES_POOCHYENA}, - {4, 4, SPECIES_TAILLOW}, - {5, 5, SPECIES_TAILLOW}, - {4, 4, SPECIES_WINGULL}, - {4, 4, SPECIES_WINGULL}, - {3, 3, SPECIES_WINGULL}, - {5, 5, SPECIES_WINGULL}, + {4, 4, SPECIES_POOCHYENA}, + {4, 4, SPECIES_WURMPLE}, + {5, 5, SPECIES_POOCHYENA}, + {5, 5, SPECIES_MARILL}, + {4, 4, SPECIES_MARILL}, + {5, 5, SPECIES_POOCHYENA}, + {4, 4, SPECIES_TAILLOW}, + {5, 5, SPECIES_TAILLOW}, + {4, 4, SPECIES_WINGULL}, + {4, 4, SPECIES_WINGULL}, + {3, 3, SPECIES_WINGULL}, + {5, 5, SPECIES_WINGULL}, }; const struct WildPokemonInfo gRoute104_LandMonsInfo = {20, gRoute104_LandMons}; const struct WildPokemon gRoute104_WaterMons[] = { - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute104_WaterMonsInfo = {4, gRoute104_WaterMons}; const struct WildPokemon gRoute104_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_MAGIKARP}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_MAGIKARP}, - {25, 30, SPECIES_MAGIKARP}, - {30, 35, SPECIES_MAGIKARP}, - {20, 25, SPECIES_MAGIKARP}, - {35, 40, SPECIES_MAGIKARP}, - {40, 45, SPECIES_MAGIKARP}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_MAGIKARP}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_MAGIKARP}, + {25, 30, SPECIES_MAGIKARP}, + {30, 35, SPECIES_MAGIKARP}, + {20, 25, SPECIES_MAGIKARP}, + {35, 40, SPECIES_MAGIKARP}, + {40, 45, SPECIES_MAGIKARP}, }; const struct WildPokemonInfo gRoute104_FishingMonsInfo = {30, gRoute104_FishingMons}; const struct WildPokemon gRoute105_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute105_WaterMonsInfo = {4, gRoute105_WaterMons}; const struct WildPokemon gRoute105_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute105_FishingMonsInfo = {30, gRoute105_FishingMons}; const struct WildPokemon gRoute110_LandMons[] = { - {12, 12, SPECIES_POOCHYENA}, - {12, 12, SPECIES_ELECTRIKE}, - {12, 12, SPECIES_GULPIN}, - {13, 13, SPECIES_ELECTRIKE}, - {13, 13, SPECIES_MINUN}, - {13, 13, SPECIES_ODDISH}, - {13, 13, SPECIES_MINUN}, - {13, 13, SPECIES_GULPIN}, - {12, 12, SPECIES_WINGULL}, - {12, 12, SPECIES_WINGULL}, - {12, 12, SPECIES_PLUSLE}, - {13, 13, SPECIES_PLUSLE}, + {12, 12, SPECIES_POOCHYENA}, + {12, 12, SPECIES_ELECTRIKE}, + {12, 12, SPECIES_GULPIN}, + {13, 13, SPECIES_ELECTRIKE}, + {13, 13, SPECIES_MINUN}, + {13, 13, SPECIES_ODDISH}, + {13, 13, SPECIES_MINUN}, + {13, 13, SPECIES_GULPIN}, + {12, 12, SPECIES_WINGULL}, + {12, 12, SPECIES_WINGULL}, + {12, 12, SPECIES_PLUSLE}, + {13, 13, SPECIES_PLUSLE}, }; const struct WildPokemonInfo gRoute110_LandMonsInfo = {20, gRoute110_LandMons}; const struct WildPokemon gRoute110_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute110_WaterMonsInfo = {4, gRoute110_WaterMons}; const struct WildPokemon gRoute110_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute110_FishingMonsInfo = {30, gRoute110_FishingMons}; const struct WildPokemon gRoute111_LandMons[] = { - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {21, 21, SPECIES_SANDSHREW}, - {21, 21, SPECIES_TRAPINCH}, - {19, 19, SPECIES_BALTOY}, - {21, 21, SPECIES_BALTOY}, - {19, 19, SPECIES_SANDSHREW}, - {19, 19, SPECIES_TRAPINCH}, - {20, 20, SPECIES_BALTOY}, - {20, 20, SPECIES_CACNEA}, - {22, 22, SPECIES_CACNEA}, - {22, 22, SPECIES_CACNEA}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {21, 21, SPECIES_SANDSHREW}, + {21, 21, SPECIES_TRAPINCH}, + {19, 19, SPECIES_BALTOY}, + {21, 21, SPECIES_BALTOY}, + {19, 19, SPECIES_SANDSHREW}, + {19, 19, SPECIES_TRAPINCH}, + {20, 20, SPECIES_BALTOY}, + {20, 20, SPECIES_CACNEA}, + {22, 22, SPECIES_CACNEA}, + {22, 22, SPECIES_CACNEA}, }; const struct WildPokemonInfo gRoute111_LandMonsInfo = {10, gRoute111_LandMons}; const struct WildPokemon gRoute111_WaterMons[] = { - {20, 30, SPECIES_MARILL}, - {10, 20, SPECIES_MARILL}, - {30, 35, SPECIES_MARILL}, - {5, 10, SPECIES_MARILL}, - {20, 30, SPECIES_GOLDEEN}, + {20, 30, SPECIES_MARILL}, + {10, 20, SPECIES_MARILL}, + {30, 35, SPECIES_MARILL}, + {5, 10, SPECIES_MARILL}, + {20, 30, SPECIES_GOLDEEN}, }; const struct WildPokemonInfo gRoute111_WaterMonsInfo = {4, gRoute111_WaterMons}; const struct WildPokemon gRoute111_RockSmashMons[] = { - {10, 15, SPECIES_GEODUDE}, - {5, 10, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, + {10, 15, SPECIES_GEODUDE}, + {5, 10, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, }; const struct WildPokemonInfo gRoute111_RockSmashMonsInfo = {20, gRoute111_RockSmashMons}; const struct WildPokemon gRoute111_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {20, 25, SPECIES_BARBOACH}, - {35, 40, SPECIES_BARBOACH}, - {40, 45, SPECIES_BARBOACH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {20, 25, SPECIES_BARBOACH}, + {35, 40, SPECIES_BARBOACH}, + {40, 45, SPECIES_BARBOACH}, }; const struct WildPokemonInfo gRoute111_FishingMonsInfo = {30, gRoute111_FishingMons}; const struct WildPokemon gRoute112_LandMons[] = { - {15, 15, SPECIES_NUMEL}, - {15, 15, SPECIES_NUMEL}, - {15, 15, SPECIES_MARILL}, - {14, 14, SPECIES_NUMEL}, - {14, 14, SPECIES_NUMEL}, - {14, 14, SPECIES_MARILL}, - {16, 16, SPECIES_NUMEL}, - {16, 16, SPECIES_MARILL}, - {16, 16, SPECIES_NUMEL}, - {16, 16, SPECIES_NUMEL}, - {16, 16, SPECIES_NUMEL}, - {16, 16, SPECIES_NUMEL}, + {15, 15, SPECIES_NUMEL}, + {15, 15, SPECIES_NUMEL}, + {15, 15, SPECIES_MARILL}, + {14, 14, SPECIES_NUMEL}, + {14, 14, SPECIES_NUMEL}, + {14, 14, SPECIES_MARILL}, + {16, 16, SPECIES_NUMEL}, + {16, 16, SPECIES_MARILL}, + {16, 16, SPECIES_NUMEL}, + {16, 16, SPECIES_NUMEL}, + {16, 16, SPECIES_NUMEL}, + {16, 16, SPECIES_NUMEL}, }; const struct WildPokemonInfo gRoute112_LandMonsInfo = {20, gRoute112_LandMons}; const struct WildPokemon gRoute113_LandMons[] = { - {15, 15, SPECIES_SPINDA}, - {15, 15, SPECIES_SPINDA}, - {15, 15, SPECIES_SLUGMA}, - {14, 14, SPECIES_SPINDA}, - {14, 14, SPECIES_SPINDA}, - {14, 14, SPECIES_SLUGMA}, - {16, 16, SPECIES_SPINDA}, - {16, 16, SPECIES_SLUGMA}, - {16, 16, SPECIES_SPINDA}, - {16, 16, SPECIES_SKARMORY}, - {16, 16, SPECIES_SPINDA}, - {16, 16, SPECIES_SKARMORY}, + {15, 15, SPECIES_SPINDA}, + {15, 15, SPECIES_SPINDA}, + {15, 15, SPECIES_SLUGMA}, + {14, 14, SPECIES_SPINDA}, + {14, 14, SPECIES_SPINDA}, + {14, 14, SPECIES_SLUGMA}, + {16, 16, SPECIES_SPINDA}, + {16, 16, SPECIES_SLUGMA}, + {16, 16, SPECIES_SPINDA}, + {16, 16, SPECIES_SKARMORY}, + {16, 16, SPECIES_SPINDA}, + {16, 16, SPECIES_SKARMORY}, }; const struct WildPokemonInfo gRoute113_LandMonsInfo = {20, gRoute113_LandMons}; const struct WildPokemon gRoute114_LandMons[] = { - {16, 16, SPECIES_SWABLU}, - {16, 16, SPECIES_LOTAD}, - {17, 17, SPECIES_SWABLU}, - {15, 15, SPECIES_SWABLU}, - {15, 15, SPECIES_LOTAD}, - {16, 16, SPECIES_LOMBRE}, - {16, 16, SPECIES_LOMBRE}, - {18, 18, SPECIES_LOMBRE}, - {17, 17, SPECIES_SEVIPER}, - {15, 15, SPECIES_SEVIPER}, - {17, 17, SPECIES_SEVIPER}, - {15, 15, SPECIES_NUZLEAF}, + {16, 16, SPECIES_SWABLU}, + {16, 16, SPECIES_LOTAD}, + {17, 17, SPECIES_SWABLU}, + {15, 15, SPECIES_SWABLU}, + {15, 15, SPECIES_LOTAD}, + {16, 16, SPECIES_LOMBRE}, + {16, 16, SPECIES_LOMBRE}, + {18, 18, SPECIES_LOMBRE}, + {17, 17, SPECIES_SEVIPER}, + {15, 15, SPECIES_SEVIPER}, + {17, 17, SPECIES_SEVIPER}, + {15, 15, SPECIES_NUZLEAF}, }; const struct WildPokemonInfo gRoute114_LandMonsInfo = {20, gRoute114_LandMons}; const struct WildPokemon gRoute114_WaterMons[] = { - {20, 30, SPECIES_MARILL}, - {10, 20, SPECIES_MARILL}, - {30, 35, SPECIES_MARILL}, - {5, 10, SPECIES_MARILL}, - {20, 30, SPECIES_GOLDEEN}, + {20, 30, SPECIES_MARILL}, + {10, 20, SPECIES_MARILL}, + {30, 35, SPECIES_MARILL}, + {5, 10, SPECIES_MARILL}, + {20, 30, SPECIES_GOLDEEN}, }; const struct WildPokemonInfo gRoute114_WaterMonsInfo = {4, gRoute114_WaterMons}; const struct WildPokemon gRoute114_RockSmashMons[] = { - {10, 15, SPECIES_GEODUDE}, - {5, 10, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, + {10, 15, SPECIES_GEODUDE}, + {5, 10, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, }; const struct WildPokemonInfo gRoute114_RockSmashMonsInfo = {20, gRoute114_RockSmashMons}; const struct WildPokemon gRoute114_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {20, 25, SPECIES_BARBOACH}, - {35, 40, SPECIES_BARBOACH}, - {40, 45, SPECIES_BARBOACH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {20, 25, SPECIES_BARBOACH}, + {35, 40, SPECIES_BARBOACH}, + {40, 45, SPECIES_BARBOACH}, }; const struct WildPokemonInfo gRoute114_FishingMonsInfo = {30, gRoute114_FishingMons}; const struct WildPokemon gRoute116_LandMons[] = { - {6, 6, SPECIES_POOCHYENA}, - {6, 6, SPECIES_WHISMUR}, - {6, 6, SPECIES_NINCADA}, - {7, 7, SPECIES_ABRA}, - {7, 7, SPECIES_NINCADA}, - {6, 6, SPECIES_TAILLOW}, - {7, 7, SPECIES_TAILLOW}, - {8, 8, SPECIES_TAILLOW}, - {7, 7, SPECIES_POOCHYENA}, - {8, 8, SPECIES_POOCHYENA}, - {7, 7, SPECIES_SKITTY}, - {8, 8, SPECIES_SKITTY}, + {6, 6, SPECIES_POOCHYENA}, + {6, 6, SPECIES_WHISMUR}, + {6, 6, SPECIES_NINCADA}, + {7, 7, SPECIES_ABRA}, + {7, 7, SPECIES_NINCADA}, + {6, 6, SPECIES_TAILLOW}, + {7, 7, SPECIES_TAILLOW}, + {8, 8, SPECIES_TAILLOW}, + {7, 7, SPECIES_POOCHYENA}, + {8, 8, SPECIES_POOCHYENA}, + {7, 7, SPECIES_SKITTY}, + {8, 8, SPECIES_SKITTY}, }; const struct WildPokemonInfo gRoute116_LandMonsInfo = {20, gRoute116_LandMons}; const struct WildPokemon gRoute117_LandMons[] = { - {13, 13, SPECIES_POOCHYENA}, - {13, 13, SPECIES_ODDISH}, - {14, 14, SPECIES_POOCHYENA}, - {14, 14, SPECIES_ODDISH}, - {13, 13, SPECIES_MARILL}, - {13, 13, SPECIES_ODDISH}, - {13, 13, SPECIES_ILLUMISE}, - {13, 13, SPECIES_ILLUMISE}, - {14, 14, SPECIES_ILLUMISE}, - {14, 14, SPECIES_ILLUMISE}, - {13, 13, SPECIES_VOLBEAT}, - {13, 13, SPECIES_SEEDOT}, + {13, 13, SPECIES_POOCHYENA}, + {13, 13, SPECIES_ODDISH}, + {14, 14, SPECIES_POOCHYENA}, + {14, 14, SPECIES_ODDISH}, + {13, 13, SPECIES_MARILL}, + {13, 13, SPECIES_ODDISH}, + {13, 13, SPECIES_ILLUMISE}, + {13, 13, SPECIES_ILLUMISE}, + {14, 14, SPECIES_ILLUMISE}, + {14, 14, SPECIES_ILLUMISE}, + {13, 13, SPECIES_VOLBEAT}, + {13, 13, SPECIES_SEEDOT}, }; const struct WildPokemonInfo gRoute117_LandMonsInfo = {20, gRoute117_LandMons}; const struct WildPokemon gRoute117_WaterMons[] = { - {20, 30, SPECIES_MARILL}, - {10, 20, SPECIES_MARILL}, - {30, 35, SPECIES_MARILL}, - {5, 10, SPECIES_MARILL}, - {20, 30, SPECIES_GOLDEEN}, + {20, 30, SPECIES_MARILL}, + {10, 20, SPECIES_MARILL}, + {30, 35, SPECIES_MARILL}, + {5, 10, SPECIES_MARILL}, + {20, 30, SPECIES_GOLDEEN}, }; const struct WildPokemonInfo gRoute117_WaterMonsInfo = {4, gRoute117_WaterMons}; const struct WildPokemon gRoute117_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_CORPHISH}, - {25, 30, SPECIES_CORPHISH}, - {30, 35, SPECIES_CORPHISH}, - {20, 25, SPECIES_CORPHISH}, - {35, 40, SPECIES_CORPHISH}, - {40, 45, SPECIES_CORPHISH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_CORPHISH}, + {25, 30, SPECIES_CORPHISH}, + {30, 35, SPECIES_CORPHISH}, + {20, 25, SPECIES_CORPHISH}, + {35, 40, SPECIES_CORPHISH}, + {40, 45, SPECIES_CORPHISH}, }; const struct WildPokemonInfo gRoute117_FishingMonsInfo = {30, gRoute117_FishingMons}; const struct WildPokemon gRoute118_LandMons[] = { - {24, 24, SPECIES_ZIGZAGOON}, - {24, 24, SPECIES_ELECTRIKE}, - {26, 26, SPECIES_ZIGZAGOON}, - {26, 26, SPECIES_ELECTRIKE}, - {26, 26, SPECIES_LINOONE}, - {26, 26, SPECIES_MANECTRIC}, - {25, 25, SPECIES_WINGULL}, - {25, 25, SPECIES_WINGULL}, - {26, 26, SPECIES_WINGULL}, - {26, 26, SPECIES_WINGULL}, - {27, 27, SPECIES_WINGULL}, - {25, 25, SPECIES_KECLEON}, + {24, 24, SPECIES_ZIGZAGOON}, + {24, 24, SPECIES_ELECTRIKE}, + {26, 26, SPECIES_ZIGZAGOON}, + {26, 26, SPECIES_ELECTRIKE}, + {26, 26, SPECIES_LINOONE}, + {26, 26, SPECIES_MANECTRIC}, + {25, 25, SPECIES_WINGULL}, + {25, 25, SPECIES_WINGULL}, + {26, 26, SPECIES_WINGULL}, + {26, 26, SPECIES_WINGULL}, + {27, 27, SPECIES_WINGULL}, + {25, 25, SPECIES_KECLEON}, }; const struct WildPokemonInfo gRoute118_LandMonsInfo = {20, gRoute118_LandMons}; const struct WildPokemon gRoute118_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute118_WaterMonsInfo = {4, gRoute118_WaterMons}; const struct WildPokemon gRoute118_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_CARVANHA}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_CARVANHA}, - {20, 25, SPECIES_CARVANHA}, - {35, 40, SPECIES_CARVANHA}, - {40, 45, SPECIES_CARVANHA}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_CARVANHA}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_CARVANHA}, + {20, 25, SPECIES_CARVANHA}, + {35, 40, SPECIES_CARVANHA}, + {40, 45, SPECIES_CARVANHA}, }; const struct WildPokemonInfo gRoute118_FishingMonsInfo = {30, gRoute118_FishingMons}; const struct WildPokemon gRoute124_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute124_WaterMonsInfo = {4, gRoute124_WaterMons}; const struct WildPokemon gRoute124_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute124_FishingMonsInfo = {30, gRoute124_FishingMons}; const struct WildPokemon gPetalburgWoods_LandMons[] = { - {5, 5, SPECIES_POOCHYENA}, - {5, 5, SPECIES_WURMPLE}, - {5, 5, SPECIES_SHROOMISH}, - {6, 6, SPECIES_POOCHYENA}, - {5, 5, SPECIES_SILCOON}, - {5, 5, SPECIES_CASCOON}, - {6, 6, SPECIES_WURMPLE}, - {6, 6, SPECIES_SHROOMISH}, - {5, 5, SPECIES_TAILLOW}, - {5, 5, SPECIES_SLAKOTH}, - {6, 6, SPECIES_TAILLOW}, - {6, 6, SPECIES_SLAKOTH}, + {5, 5, SPECIES_POOCHYENA}, + {5, 5, SPECIES_WURMPLE}, + {5, 5, SPECIES_SHROOMISH}, + {6, 6, SPECIES_POOCHYENA}, + {5, 5, SPECIES_SILCOON}, + {5, 5, SPECIES_CASCOON}, + {6, 6, SPECIES_WURMPLE}, + {6, 6, SPECIES_SHROOMISH}, + {5, 5, SPECIES_TAILLOW}, + {5, 5, SPECIES_SLAKOTH}, + {6, 6, SPECIES_TAILLOW}, + {6, 6, SPECIES_SLAKOTH}, }; const struct WildPokemonInfo gPetalburgWoods_LandMonsInfo = {20, gPetalburgWoods_LandMons}; const struct WildPokemon gRusturfTunnel_LandMons[] = { - {6, 6, SPECIES_WHISMUR}, - {7, 7, SPECIES_WHISMUR}, - {6, 6, SPECIES_WHISMUR}, - {6, 6, SPECIES_WHISMUR}, - {7, 7, SPECIES_WHISMUR}, - {7, 7, SPECIES_WHISMUR}, - {5, 5, SPECIES_WHISMUR}, - {8, 8, SPECIES_WHISMUR}, - {5, 5, SPECIES_WHISMUR}, - {8, 8, SPECIES_WHISMUR}, - {5, 5, SPECIES_WHISMUR}, - {8, 8, SPECIES_WHISMUR}, + {6, 6, SPECIES_WHISMUR}, + {7, 7, SPECIES_WHISMUR}, + {6, 6, SPECIES_WHISMUR}, + {6, 6, SPECIES_WHISMUR}, + {7, 7, SPECIES_WHISMUR}, + {7, 7, SPECIES_WHISMUR}, + {5, 5, SPECIES_WHISMUR}, + {8, 8, SPECIES_WHISMUR}, + {5, 5, SPECIES_WHISMUR}, + {8, 8, SPECIES_WHISMUR}, + {5, 5, SPECIES_WHISMUR}, + {8, 8, SPECIES_WHISMUR}, }; const struct WildPokemonInfo gRusturfTunnel_LandMonsInfo = {10, gRusturfTunnel_LandMons}; const struct WildPokemon gGraniteCave_1F_LandMons[] = { - {7, 7, SPECIES_ZUBAT}, - {8, 8, SPECIES_MAKUHITA}, - {7, 7, SPECIES_MAKUHITA}, - {8, 8, SPECIES_ZUBAT}, - {9, 9, SPECIES_MAKUHITA}, - {8, 8, SPECIES_ABRA}, - {10, 10, SPECIES_MAKUHITA}, - {6, 6, SPECIES_MAKUHITA}, - {7, 7, SPECIES_GEODUDE}, - {8, 8, SPECIES_GEODUDE}, - {6, 6, SPECIES_GEODUDE}, - {9, 9, SPECIES_GEODUDE}, + {7, 7, SPECIES_ZUBAT}, + {8, 8, SPECIES_MAKUHITA}, + {7, 7, SPECIES_MAKUHITA}, + {8, 8, SPECIES_ZUBAT}, + {9, 9, SPECIES_MAKUHITA}, + {8, 8, SPECIES_ABRA}, + {10, 10, SPECIES_MAKUHITA}, + {6, 6, SPECIES_MAKUHITA}, + {7, 7, SPECIES_GEODUDE}, + {8, 8, SPECIES_GEODUDE}, + {6, 6, SPECIES_GEODUDE}, + {9, 9, SPECIES_GEODUDE}, }; const struct WildPokemonInfo gGraniteCave_1F_LandMonsInfo = {10, gGraniteCave_1F_LandMons}; const struct WildPokemon gGraniteCave_B1F_LandMons[] = { - {9, 9, SPECIES_ZUBAT}, - {10, 10, SPECIES_ARON}, - {9, 9, SPECIES_ARON}, - {11, 11, SPECIES_ARON}, - {10, 10, SPECIES_ZUBAT}, - {9, 9, SPECIES_ABRA}, - {10, 10, SPECIES_MAKUHITA}, - {11, 11, SPECIES_MAKUHITA}, - {10, 10, SPECIES_SABLEYE}, - {10, 10, SPECIES_SABLEYE}, - {9, 9, SPECIES_SABLEYE}, - {11, 11, SPECIES_SABLEYE}, + {9, 9, SPECIES_ZUBAT}, + {10, 10, SPECIES_ARON}, + {9, 9, SPECIES_ARON}, + {11, 11, SPECIES_ARON}, + {10, 10, SPECIES_ZUBAT}, + {9, 9, SPECIES_ABRA}, + {10, 10, SPECIES_MAKUHITA}, + {11, 11, SPECIES_MAKUHITA}, + {10, 10, SPECIES_SABLEYE}, + {10, 10, SPECIES_SABLEYE}, + {9, 9, SPECIES_SABLEYE}, + {11, 11, SPECIES_SABLEYE}, }; const struct WildPokemonInfo gGraniteCave_B1F_LandMonsInfo = {10, gGraniteCave_B1F_LandMons}; const struct WildPokemon gMtPyre_1F_LandMons[] = { - {27, 27, SPECIES_SHUPPET}, - {28, 28, SPECIES_SHUPPET}, - {26, 26, SPECIES_SHUPPET}, - {25, 25, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {23, 23, SPECIES_SHUPPET}, - {22, 22, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, + {27, 27, SPECIES_SHUPPET}, + {28, 28, SPECIES_SHUPPET}, + {26, 26, SPECIES_SHUPPET}, + {25, 25, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {23, 23, SPECIES_SHUPPET}, + {22, 22, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, }; const struct WildPokemonInfo gMtPyre_1F_LandMonsInfo = {10, gMtPyre_1F_LandMons}; const struct WildPokemon gVictoryRoad_1F_LandMons[] = { - {40, 40, SPECIES_GOLBAT}, - {40, 40, SPECIES_HARIYAMA}, - {40, 40, SPECIES_LAIRON}, - {40, 40, SPECIES_LOUDRED}, - {36, 36, SPECIES_ZUBAT}, - {36, 36, SPECIES_MAKUHITA}, - {38, 38, SPECIES_GOLBAT}, - {38, 38, SPECIES_HARIYAMA}, - {36, 36, SPECIES_ARON}, - {36, 36, SPECIES_WHISMUR}, - {36, 36, SPECIES_ARON}, - {36, 36, SPECIES_WHISMUR}, + {40, 40, SPECIES_GOLBAT}, + {40, 40, SPECIES_HARIYAMA}, + {40, 40, SPECIES_LAIRON}, + {40, 40, SPECIES_LOUDRED}, + {36, 36, SPECIES_ZUBAT}, + {36, 36, SPECIES_MAKUHITA}, + {38, 38, SPECIES_GOLBAT}, + {38, 38, SPECIES_HARIYAMA}, + {36, 36, SPECIES_ARON}, + {36, 36, SPECIES_WHISMUR}, + {36, 36, SPECIES_ARON}, + {36, 36, SPECIES_WHISMUR}, }; const struct WildPokemonInfo gVictoryRoad_1F_LandMonsInfo = {10, gVictoryRoad_1F_LandMons}; const struct WildPokemon gSafariZone_South_LandMons[] = { - {25, 25, SPECIES_ODDISH}, - {27, 27, SPECIES_ODDISH}, - {25, 25, SPECIES_GIRAFARIG}, - {27, 27, SPECIES_GIRAFARIG}, - {25, 25, SPECIES_NATU}, - {25, 25, SPECIES_DODUO}, - {25, 25, SPECIES_GLOOM}, - {27, 27, SPECIES_WOBBUFFET}, - {25, 25, SPECIES_PIKACHU}, - {27, 27, SPECIES_WOBBUFFET}, - {27, 27, SPECIES_PIKACHU}, - {29, 29, SPECIES_WOBBUFFET}, + {25, 25, SPECIES_ODDISH}, + {27, 27, SPECIES_ODDISH}, + {25, 25, SPECIES_GIRAFARIG}, + {27, 27, SPECIES_GIRAFARIG}, + {25, 25, SPECIES_NATU}, + {25, 25, SPECIES_DODUO}, + {25, 25, SPECIES_GLOOM}, + {27, 27, SPECIES_WOBBUFFET}, + {25, 25, SPECIES_PIKACHU}, + {27, 27, SPECIES_WOBBUFFET}, + {27, 27, SPECIES_PIKACHU}, + {29, 29, SPECIES_WOBBUFFET}, }; const struct WildPokemonInfo gSafariZone_South_LandMonsInfo = {25, gSafariZone_South_LandMons}; const struct WildPokemon gUnderwater2_WaterMons[] = { - {20, 30, SPECIES_CLAMPERL}, - {20, 30, SPECIES_CHINCHOU}, - {30, 35, SPECIES_CLAMPERL}, - {30, 35, SPECIES_RELICANTH}, - {30, 35, SPECIES_RELICANTH}, + {20, 30, SPECIES_CLAMPERL}, + {20, 30, SPECIES_CHINCHOU}, + {30, 35, SPECIES_CLAMPERL}, + {30, 35, SPECIES_RELICANTH}, + {30, 35, SPECIES_RELICANTH}, }; const struct WildPokemonInfo gUnderwater2_WaterMonsInfo = {4, gUnderwater2_WaterMons}; const struct WildPokemon gAbandonedShip_Rooms_B1F_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_TENTACOOL}, - {30, 35, SPECIES_TENTACRUEL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_TENTACOOL}, + {30, 35, SPECIES_TENTACRUEL}, }; const struct WildPokemonInfo gAbandonedShip_Rooms_B1F_WaterMonsInfo = {4, gAbandonedShip_Rooms_B1F_WaterMons}; const struct WildPokemon gAbandonedShip_Rooms_B1F_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_TENTACOOL}, - {25, 30, SPECIES_TENTACOOL}, - {30, 35, SPECIES_TENTACOOL}, - {30, 35, SPECIES_TENTACRUEL}, - {25, 30, SPECIES_TENTACRUEL}, - {20, 25, SPECIES_TENTACRUEL}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_TENTACOOL}, + {25, 30, SPECIES_TENTACOOL}, + {30, 35, SPECIES_TENTACOOL}, + {30, 35, SPECIES_TENTACRUEL}, + {25, 30, SPECIES_TENTACRUEL}, + {20, 25, SPECIES_TENTACRUEL}, }; const struct WildPokemonInfo gAbandonedShip_Rooms_B1F_FishingMonsInfo = {20, gAbandonedShip_Rooms_B1F_FishingMons}; const struct WildPokemon gGraniteCave_B2F_LandMons[] = { - {10, 10, SPECIES_ZUBAT}, - {11, 11, SPECIES_ARON}, - {10, 10, SPECIES_ARON}, - {11, 11, SPECIES_ZUBAT}, - {12, 12, SPECIES_ARON}, - {10, 10, SPECIES_ABRA}, - {10, 10, SPECIES_SABLEYE}, - {11, 11, SPECIES_SABLEYE}, - {12, 12, SPECIES_SABLEYE}, - {10, 10, SPECIES_SABLEYE}, - {12, 12, SPECIES_SABLEYE}, - {10, 10, SPECIES_SABLEYE}, + {10, 10, SPECIES_ZUBAT}, + {11, 11, SPECIES_ARON}, + {10, 10, SPECIES_ARON}, + {11, 11, SPECIES_ZUBAT}, + {12, 12, SPECIES_ARON}, + {10, 10, SPECIES_ABRA}, + {10, 10, SPECIES_SABLEYE}, + {11, 11, SPECIES_SABLEYE}, + {12, 12, SPECIES_SABLEYE}, + {10, 10, SPECIES_SABLEYE}, + {12, 12, SPECIES_SABLEYE}, + {10, 10, SPECIES_SABLEYE}, }; const struct WildPokemonInfo gGraniteCave_B2F_LandMonsInfo = {10, gGraniteCave_B2F_LandMons}; const struct WildPokemon gGraniteCave_B2F_RockSmashMons[] = { - {10, 15, SPECIES_GEODUDE}, - {10, 20, SPECIES_NOSEPASS}, - {5, 10, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, + {10, 15, SPECIES_GEODUDE}, + {10, 20, SPECIES_NOSEPASS}, + {5, 10, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, }; const struct WildPokemonInfo gGraniteCave_B2F_RockSmashMonsInfo = {20, gGraniteCave_B2F_RockSmashMons}; const struct WildPokemon gFieryPath_LandMons[] = { - {15, 15, SPECIES_NUMEL}, - {15, 15, SPECIES_KOFFING}, - {16, 16, SPECIES_NUMEL}, - {15, 15, SPECIES_MACHOP}, - {15, 15, SPECIES_TORKOAL}, - {15, 15, SPECIES_SLUGMA}, - {16, 16, SPECIES_KOFFING}, - {16, 16, SPECIES_MACHOP}, - {14, 14, SPECIES_TORKOAL}, - {16, 16, SPECIES_TORKOAL}, - {14, 14, SPECIES_GRIMER}, - {14, 14, SPECIES_GRIMER}, + {15, 15, SPECIES_NUMEL}, + {15, 15, SPECIES_KOFFING}, + {16, 16, SPECIES_NUMEL}, + {15, 15, SPECIES_MACHOP}, + {15, 15, SPECIES_TORKOAL}, + {15, 15, SPECIES_SLUGMA}, + {16, 16, SPECIES_KOFFING}, + {16, 16, SPECIES_MACHOP}, + {14, 14, SPECIES_TORKOAL}, + {16, 16, SPECIES_TORKOAL}, + {14, 14, SPECIES_GRIMER}, + {14, 14, SPECIES_GRIMER}, }; const struct WildPokemonInfo gFieryPath_LandMonsInfo = {10, gFieryPath_LandMons}; const struct WildPokemon gMeteorFalls_B1F_2R_LandMons[] = { - {33, 33, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {30, 30, SPECIES_BAGON}, - {35, 35, SPECIES_SOLROCK}, - {35, 35, SPECIES_BAGON}, - {37, 37, SPECIES_SOLROCK}, - {25, 25, SPECIES_BAGON}, - {39, 39, SPECIES_SOLROCK}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {30, 30, SPECIES_BAGON}, + {35, 35, SPECIES_SOLROCK}, + {35, 35, SPECIES_BAGON}, + {37, 37, SPECIES_SOLROCK}, + {25, 25, SPECIES_BAGON}, + {39, 39, SPECIES_SOLROCK}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gMeteorFalls_B1F_2R_LandMonsInfo = {10, gMeteorFalls_B1F_2R_LandMons}; const struct WildPokemon gMeteorFalls_B1F_2R_WaterMons[] = { - {30, 35, SPECIES_GOLBAT}, - {30, 35, SPECIES_GOLBAT}, - {25, 35, SPECIES_SOLROCK}, - {15, 25, SPECIES_SOLROCK}, - {5, 15, SPECIES_SOLROCK}, + {30, 35, SPECIES_GOLBAT}, + {30, 35, SPECIES_GOLBAT}, + {25, 35, SPECIES_SOLROCK}, + {15, 25, SPECIES_SOLROCK}, + {5, 15, SPECIES_SOLROCK}, }; const struct WildPokemonInfo gMeteorFalls_B1F_2R_WaterMonsInfo = {4, gMeteorFalls_B1F_2R_WaterMons}; const struct WildPokemon gMeteorFalls_B1F_2R_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {30, 35, SPECIES_WHISCASH}, - {35, 40, SPECIES_WHISCASH}, - {40, 45, SPECIES_WHISCASH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {30, 35, SPECIES_WHISCASH}, + {35, 40, SPECIES_WHISCASH}, + {40, 45, SPECIES_WHISCASH}, }; const struct WildPokemonInfo gMeteorFalls_B1F_2R_FishingMonsInfo = {30, gMeteorFalls_B1F_2R_FishingMons}; const struct WildPokemon gJaggedPass_LandMons[] = { - {21, 21, SPECIES_NUMEL}, - {21, 21, SPECIES_NUMEL}, - {21, 21, SPECIES_MACHOP}, - {20, 20, SPECIES_NUMEL}, - {20, 20, SPECIES_SPOINK}, - {20, 20, SPECIES_MACHOP}, - {21, 21, SPECIES_SPOINK}, - {22, 22, SPECIES_MACHOP}, - {22, 22, SPECIES_NUMEL}, - {22, 22, SPECIES_SPOINK}, - {22, 22, SPECIES_NUMEL}, - {22, 22, SPECIES_SPOINK}, + {21, 21, SPECIES_NUMEL}, + {21, 21, SPECIES_NUMEL}, + {21, 21, SPECIES_MACHOP}, + {20, 20, SPECIES_NUMEL}, + {20, 20, SPECIES_SPOINK}, + {20, 20, SPECIES_MACHOP}, + {21, 21, SPECIES_SPOINK}, + {22, 22, SPECIES_MACHOP}, + {22, 22, SPECIES_NUMEL}, + {22, 22, SPECIES_SPOINK}, + {22, 22, SPECIES_NUMEL}, + {22, 22, SPECIES_SPOINK}, }; const struct WildPokemonInfo gJaggedPass_LandMonsInfo = {20, gJaggedPass_LandMons}; const struct WildPokemon gRoute106_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute106_WaterMonsInfo = {4, gRoute106_WaterMons}; const struct WildPokemon gRoute106_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute106_FishingMonsInfo = {30, gRoute106_FishingMons}; const struct WildPokemon gRoute107_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute107_WaterMonsInfo = {4, gRoute107_WaterMons}; const struct WildPokemon gRoute107_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute107_FishingMonsInfo = {30, gRoute107_FishingMons}; const struct WildPokemon gRoute108_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute108_WaterMonsInfo = {4, gRoute108_WaterMons}; const struct WildPokemon gRoute108_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute108_FishingMonsInfo = {30, gRoute108_FishingMons}; const struct WildPokemon gRoute109_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute109_WaterMonsInfo = {4, gRoute109_WaterMons}; const struct WildPokemon gRoute109_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute109_FishingMonsInfo = {30, gRoute109_FishingMons}; const struct WildPokemon gRoute115_LandMons[] = { - {23, 23, SPECIES_SWABLU}, - {23, 23, SPECIES_TAILLOW}, - {25, 25, SPECIES_SWABLU}, - {24, 24, SPECIES_TAILLOW}, - {25, 25, SPECIES_TAILLOW}, - {25, 25, SPECIES_SWELLOW}, - {24, 24, SPECIES_JIGGLYPUFF}, - {25, 25, SPECIES_JIGGLYPUFF}, - {24, 24, SPECIES_WINGULL}, - {24, 24, SPECIES_WINGULL}, - {26, 26, SPECIES_WINGULL}, - {25, 25, SPECIES_WINGULL}, + {23, 23, SPECIES_SWABLU}, + {23, 23, SPECIES_TAILLOW}, + {25, 25, SPECIES_SWABLU}, + {24, 24, SPECIES_TAILLOW}, + {25, 25, SPECIES_TAILLOW}, + {25, 25, SPECIES_SWELLOW}, + {24, 24, SPECIES_JIGGLYPUFF}, + {25, 25, SPECIES_JIGGLYPUFF}, + {24, 24, SPECIES_WINGULL}, + {24, 24, SPECIES_WINGULL}, + {26, 26, SPECIES_WINGULL}, + {25, 25, SPECIES_WINGULL}, }; const struct WildPokemonInfo gRoute115_LandMonsInfo = {20, gRoute115_LandMons}; const struct WildPokemon gRoute115_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute115_WaterMonsInfo = {4, gRoute115_WaterMons}; const struct WildPokemon gRoute115_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute115_FishingMonsInfo = {30, gRoute115_FishingMons}; const struct WildPokemon gNewMauville_Inside_LandMons[] = { - {24, 24, SPECIES_VOLTORB}, - {24, 24, SPECIES_MAGNEMITE}, - {25, 25, SPECIES_VOLTORB}, - {25, 25, SPECIES_MAGNEMITE}, - {23, 23, SPECIES_VOLTORB}, - {23, 23, SPECIES_MAGNEMITE}, - {26, 26, SPECIES_VOLTORB}, - {26, 26, SPECIES_MAGNEMITE}, - {22, 22, SPECIES_VOLTORB}, - {22, 22, SPECIES_MAGNEMITE}, - {26, 26, SPECIES_ELECTRODE}, - {26, 26, SPECIES_MAGNETON}, + {24, 24, SPECIES_VOLTORB}, + {24, 24, SPECIES_MAGNEMITE}, + {25, 25, SPECIES_VOLTORB}, + {25, 25, SPECIES_MAGNEMITE}, + {23, 23, SPECIES_VOLTORB}, + {23, 23, SPECIES_MAGNEMITE}, + {26, 26, SPECIES_VOLTORB}, + {26, 26, SPECIES_MAGNEMITE}, + {22, 22, SPECIES_VOLTORB}, + {22, 22, SPECIES_MAGNEMITE}, + {26, 26, SPECIES_ELECTRODE}, + {26, 26, SPECIES_MAGNETON}, }; const struct WildPokemonInfo gNewMauville_Inside_LandMonsInfo = {10, gNewMauville_Inside_LandMons}; const struct WildPokemon gRoute119_LandMons[] = { - {25, 25, SPECIES_ZIGZAGOON}, - {25, 25, SPECIES_LINOONE}, - {27, 27, SPECIES_ZIGZAGOON}, - {25, 25, SPECIES_ODDISH}, - {27, 27, SPECIES_LINOONE}, - {26, 26, SPECIES_ODDISH}, - {27, 27, SPECIES_ODDISH}, - {24, 24, SPECIES_ODDISH}, - {25, 25, SPECIES_TROPIUS}, - {26, 26, SPECIES_TROPIUS}, - {27, 27, SPECIES_TROPIUS}, - {25, 25, SPECIES_KECLEON}, + {25, 25, SPECIES_ZIGZAGOON}, + {25, 25, SPECIES_LINOONE}, + {27, 27, SPECIES_ZIGZAGOON}, + {25, 25, SPECIES_ODDISH}, + {27, 27, SPECIES_LINOONE}, + {26, 26, SPECIES_ODDISH}, + {27, 27, SPECIES_ODDISH}, + {24, 24, SPECIES_ODDISH}, + {25, 25, SPECIES_TROPIUS}, + {26, 26, SPECIES_TROPIUS}, + {27, 27, SPECIES_TROPIUS}, + {25, 25, SPECIES_KECLEON}, }; const struct WildPokemonInfo gRoute119_LandMonsInfo = {15, gRoute119_LandMons}; const struct WildPokemon gRoute119_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute119_WaterMonsInfo = {4, gRoute119_WaterMons}; const struct WildPokemon gRoute119_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_CARVANHA}, - {25, 30, SPECIES_CARVANHA}, - {30, 35, SPECIES_CARVANHA}, - {20, 25, SPECIES_CARVANHA}, - {35, 40, SPECIES_CARVANHA}, - {40, 45, SPECIES_CARVANHA}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_CARVANHA}, + {25, 30, SPECIES_CARVANHA}, + {30, 35, SPECIES_CARVANHA}, + {20, 25, SPECIES_CARVANHA}, + {35, 40, SPECIES_CARVANHA}, + {40, 45, SPECIES_CARVANHA}, }; const struct WildPokemonInfo gRoute119_FishingMonsInfo = {30, gRoute119_FishingMons}; const struct WildPokemon gRoute120_LandMons[] = { - {25, 25, SPECIES_POOCHYENA}, - {25, 25, SPECIES_MIGHTYENA}, - {27, 27, SPECIES_MIGHTYENA}, - {25, 25, SPECIES_ODDISH}, - {25, 25, SPECIES_MARILL}, - {26, 26, SPECIES_ODDISH}, - {27, 27, SPECIES_ODDISH}, - {27, 27, SPECIES_MARILL}, - {25, 25, SPECIES_ABSOL}, - {27, 27, SPECIES_ABSOL}, - {25, 25, SPECIES_KECLEON}, - {25, 25, SPECIES_SEEDOT}, + {25, 25, SPECIES_POOCHYENA}, + {25, 25, SPECIES_MIGHTYENA}, + {27, 27, SPECIES_MIGHTYENA}, + {25, 25, SPECIES_ODDISH}, + {25, 25, SPECIES_MARILL}, + {26, 26, SPECIES_ODDISH}, + {27, 27, SPECIES_ODDISH}, + {27, 27, SPECIES_MARILL}, + {25, 25, SPECIES_ABSOL}, + {27, 27, SPECIES_ABSOL}, + {25, 25, SPECIES_KECLEON}, + {25, 25, SPECIES_SEEDOT}, }; const struct WildPokemonInfo gRoute120_LandMonsInfo = {20, gRoute120_LandMons}; const struct WildPokemon gRoute120_WaterMons[] = { - {20, 30, SPECIES_MARILL}, - {10, 20, SPECIES_MARILL}, - {30, 35, SPECIES_MARILL}, - {5, 10, SPECIES_MARILL}, - {20, 30, SPECIES_GOLDEEN}, + {20, 30, SPECIES_MARILL}, + {10, 20, SPECIES_MARILL}, + {30, 35, SPECIES_MARILL}, + {5, 10, SPECIES_MARILL}, + {20, 30, SPECIES_GOLDEEN}, }; const struct WildPokemonInfo gRoute120_WaterMonsInfo = {4, gRoute120_WaterMons}; const struct WildPokemon gRoute120_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {20, 25, SPECIES_BARBOACH}, - {35, 40, SPECIES_BARBOACH}, - {40, 45, SPECIES_BARBOACH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {20, 25, SPECIES_BARBOACH}, + {35, 40, SPECIES_BARBOACH}, + {40, 45, SPECIES_BARBOACH}, }; const struct WildPokemonInfo gRoute120_FishingMonsInfo = {30, gRoute120_FishingMons}; const struct WildPokemon gRoute121_LandMons[] = { - {26, 26, SPECIES_POOCHYENA}, - {26, 26, SPECIES_SHUPPET}, - {26, 26, SPECIES_MIGHTYENA}, - {28, 28, SPECIES_SHUPPET}, - {28, 28, SPECIES_MIGHTYENA}, - {26, 26, SPECIES_ODDISH}, - {28, 28, SPECIES_ODDISH}, - {28, 28, SPECIES_GLOOM}, - {26, 26, SPECIES_WINGULL}, - {27, 27, SPECIES_WINGULL}, - {28, 28, SPECIES_WINGULL}, - {25, 25, SPECIES_KECLEON}, + {26, 26, SPECIES_POOCHYENA}, + {26, 26, SPECIES_SHUPPET}, + {26, 26, SPECIES_MIGHTYENA}, + {28, 28, SPECIES_SHUPPET}, + {28, 28, SPECIES_MIGHTYENA}, + {26, 26, SPECIES_ODDISH}, + {28, 28, SPECIES_ODDISH}, + {28, 28, SPECIES_GLOOM}, + {26, 26, SPECIES_WINGULL}, + {27, 27, SPECIES_WINGULL}, + {28, 28, SPECIES_WINGULL}, + {25, 25, SPECIES_KECLEON}, }; const struct WildPokemonInfo gRoute121_LandMonsInfo = {20, gRoute121_LandMons}; const struct WildPokemon gRoute121_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute121_WaterMonsInfo = {4, gRoute121_WaterMons}; const struct WildPokemon gRoute121_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute121_FishingMonsInfo = {30, gRoute121_FishingMons}; const struct WildPokemon gRoute122_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute122_WaterMonsInfo = {4, gRoute122_WaterMons}; const struct WildPokemon gRoute122_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute122_FishingMonsInfo = {30, gRoute122_FishingMons}; const struct WildPokemon gRoute123_LandMons[] = { - {26, 26, SPECIES_POOCHYENA}, - {26, 26, SPECIES_SHUPPET}, - {26, 26, SPECIES_MIGHTYENA}, - {28, 28, SPECIES_SHUPPET}, - {28, 28, SPECIES_MIGHTYENA}, - {26, 26, SPECIES_ODDISH}, - {28, 28, SPECIES_ODDISH}, - {28, 28, SPECIES_GLOOM}, - {26, 26, SPECIES_WINGULL}, - {27, 27, SPECIES_WINGULL}, - {28, 28, SPECIES_WINGULL}, - {25, 25, SPECIES_KECLEON}, + {26, 26, SPECIES_POOCHYENA}, + {26, 26, SPECIES_SHUPPET}, + {26, 26, SPECIES_MIGHTYENA}, + {28, 28, SPECIES_SHUPPET}, + {28, 28, SPECIES_MIGHTYENA}, + {26, 26, SPECIES_ODDISH}, + {28, 28, SPECIES_ODDISH}, + {28, 28, SPECIES_GLOOM}, + {26, 26, SPECIES_WINGULL}, + {27, 27, SPECIES_WINGULL}, + {28, 28, SPECIES_WINGULL}, + {25, 25, SPECIES_KECLEON}, }; const struct WildPokemonInfo gRoute123_LandMonsInfo = {20, gRoute123_LandMons}; const struct WildPokemon gRoute123_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute123_WaterMonsInfo = {4, gRoute123_WaterMons}; const struct WildPokemon gRoute123_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute123_FishingMonsInfo = {30, gRoute123_FishingMons}; const struct WildPokemon gMtPyre_2F_LandMons[] = { - {27, 27, SPECIES_SHUPPET}, - {28, 28, SPECIES_SHUPPET}, - {26, 26, SPECIES_SHUPPET}, - {25, 25, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {23, 23, SPECIES_SHUPPET}, - {22, 22, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, + {27, 27, SPECIES_SHUPPET}, + {28, 28, SPECIES_SHUPPET}, + {26, 26, SPECIES_SHUPPET}, + {25, 25, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {23, 23, SPECIES_SHUPPET}, + {22, 22, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, }; const struct WildPokemonInfo gMtPyre_2F_LandMonsInfo = {10, gMtPyre_2F_LandMons}; const struct WildPokemon gMtPyre_3F_LandMons[] = { - {27, 27, SPECIES_SHUPPET}, - {28, 28, SPECIES_SHUPPET}, - {26, 26, SPECIES_SHUPPET}, - {25, 25, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {23, 23, SPECIES_SHUPPET}, - {22, 22, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, + {27, 27, SPECIES_SHUPPET}, + {28, 28, SPECIES_SHUPPET}, + {26, 26, SPECIES_SHUPPET}, + {25, 25, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {23, 23, SPECIES_SHUPPET}, + {22, 22, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, }; const struct WildPokemonInfo gMtPyre_3F_LandMonsInfo = {10, gMtPyre_3F_LandMons}; const struct WildPokemon gMtPyre_4F_LandMons[] = { - {27, 27, SPECIES_SHUPPET}, - {28, 28, SPECIES_SHUPPET}, - {26, 26, SPECIES_SHUPPET}, - {25, 25, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {23, 23, SPECIES_SHUPPET}, - {22, 22, SPECIES_SHUPPET}, - {27, 27, SPECIES_DUSKULL}, - {27, 27, SPECIES_DUSKULL}, - {25, 25, SPECIES_DUSKULL}, - {29, 29, SPECIES_DUSKULL}, + {27, 27, SPECIES_SHUPPET}, + {28, 28, SPECIES_SHUPPET}, + {26, 26, SPECIES_SHUPPET}, + {25, 25, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {23, 23, SPECIES_SHUPPET}, + {22, 22, SPECIES_SHUPPET}, + {27, 27, SPECIES_DUSKULL}, + {27, 27, SPECIES_DUSKULL}, + {25, 25, SPECIES_DUSKULL}, + {29, 29, SPECIES_DUSKULL}, }; const struct WildPokemonInfo gMtPyre_4F_LandMonsInfo = {10, gMtPyre_4F_LandMons}; const struct WildPokemon gMtPyre_5F_LandMons[] = { - {27, 27, SPECIES_SHUPPET}, - {28, 28, SPECIES_SHUPPET}, - {26, 26, SPECIES_SHUPPET}, - {25, 25, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {23, 23, SPECIES_SHUPPET}, - {22, 22, SPECIES_SHUPPET}, - {27, 27, SPECIES_DUSKULL}, - {27, 27, SPECIES_DUSKULL}, - {25, 25, SPECIES_DUSKULL}, - {29, 29, SPECIES_DUSKULL}, + {27, 27, SPECIES_SHUPPET}, + {28, 28, SPECIES_SHUPPET}, + {26, 26, SPECIES_SHUPPET}, + {25, 25, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {23, 23, SPECIES_SHUPPET}, + {22, 22, SPECIES_SHUPPET}, + {27, 27, SPECIES_DUSKULL}, + {27, 27, SPECIES_DUSKULL}, + {25, 25, SPECIES_DUSKULL}, + {29, 29, SPECIES_DUSKULL}, }; const struct WildPokemonInfo gMtPyre_5F_LandMonsInfo = {10, gMtPyre_5F_LandMons}; const struct WildPokemon gMtPyre_6F_LandMons[] = { - {27, 27, SPECIES_SHUPPET}, - {28, 28, SPECIES_SHUPPET}, - {26, 26, SPECIES_SHUPPET}, - {25, 25, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {23, 23, SPECIES_SHUPPET}, - {22, 22, SPECIES_SHUPPET}, - {27, 27, SPECIES_DUSKULL}, - {27, 27, SPECIES_DUSKULL}, - {25, 25, SPECIES_DUSKULL}, - {29, 29, SPECIES_DUSKULL}, + {27, 27, SPECIES_SHUPPET}, + {28, 28, SPECIES_SHUPPET}, + {26, 26, SPECIES_SHUPPET}, + {25, 25, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {23, 23, SPECIES_SHUPPET}, + {22, 22, SPECIES_SHUPPET}, + {27, 27, SPECIES_DUSKULL}, + {27, 27, SPECIES_DUSKULL}, + {25, 25, SPECIES_DUSKULL}, + {29, 29, SPECIES_DUSKULL}, }; const struct WildPokemonInfo gMtPyre_6F_LandMonsInfo = {10, gMtPyre_6F_LandMons}; const struct WildPokemon gMtPyre_Exterior_LandMons[] = { - {27, 27, SPECIES_SHUPPET}, - {27, 27, SPECIES_SHUPPET}, - {28, 28, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {29, 29, SPECIES_VULPIX}, - {27, 27, SPECIES_VULPIX}, - {29, 29, SPECIES_VULPIX}, - {25, 25, SPECIES_VULPIX}, - {27, 27, SPECIES_WINGULL}, - {27, 27, SPECIES_WINGULL}, - {26, 26, SPECIES_WINGULL}, - {28, 28, SPECIES_WINGULL}, + {27, 27, SPECIES_SHUPPET}, + {27, 27, SPECIES_SHUPPET}, + {28, 28, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {29, 29, SPECIES_VULPIX}, + {27, 27, SPECIES_VULPIX}, + {29, 29, SPECIES_VULPIX}, + {25, 25, SPECIES_VULPIX}, + {27, 27, SPECIES_WINGULL}, + {27, 27, SPECIES_WINGULL}, + {26, 26, SPECIES_WINGULL}, + {28, 28, SPECIES_WINGULL}, }; const struct WildPokemonInfo gMtPyre_Exterior_LandMonsInfo = {10, gMtPyre_Exterior_LandMons}; const struct WildPokemon gMtPyre_Summit_LandMons[] = { - {28, 28, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {27, 27, SPECIES_SHUPPET}, - {26, 26, SPECIES_SHUPPET}, - {30, 30, SPECIES_SHUPPET}, - {25, 25, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {28, 28, SPECIES_DUSKULL}, - {26, 26, SPECIES_DUSKULL}, - {30, 30, SPECIES_DUSKULL}, - {28, 28, SPECIES_CHIMECHO}, - {28, 28, SPECIES_CHIMECHO}, + {28, 28, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {27, 27, SPECIES_SHUPPET}, + {26, 26, SPECIES_SHUPPET}, + {30, 30, SPECIES_SHUPPET}, + {25, 25, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {28, 28, SPECIES_DUSKULL}, + {26, 26, SPECIES_DUSKULL}, + {30, 30, SPECIES_DUSKULL}, + {28, 28, SPECIES_CHIMECHO}, + {28, 28, SPECIES_CHIMECHO}, }; const struct WildPokemonInfo gMtPyre_Summit_LandMonsInfo = {10, gMtPyre_Summit_LandMons}; const struct WildPokemon gGraniteCave_StevensRoom_LandMons[] = { - {7, 7, SPECIES_ZUBAT}, - {8, 8, SPECIES_MAKUHITA}, - {7, 7, SPECIES_MAKUHITA}, - {8, 8, SPECIES_ZUBAT}, - {9, 9, SPECIES_MAKUHITA}, - {8, 8, SPECIES_ABRA}, - {10, 10, SPECIES_MAKUHITA}, - {6, 6, SPECIES_MAKUHITA}, - {7, 7, SPECIES_ARON}, - {8, 8, SPECIES_ARON}, - {7, 7, SPECIES_ARON}, - {8, 8, SPECIES_ARON}, + {7, 7, SPECIES_ZUBAT}, + {8, 8, SPECIES_MAKUHITA}, + {7, 7, SPECIES_MAKUHITA}, + {8, 8, SPECIES_ZUBAT}, + {9, 9, SPECIES_MAKUHITA}, + {8, 8, SPECIES_ABRA}, + {10, 10, SPECIES_MAKUHITA}, + {6, 6, SPECIES_MAKUHITA}, + {7, 7, SPECIES_ARON}, + {8, 8, SPECIES_ARON}, + {7, 7, SPECIES_ARON}, + {8, 8, SPECIES_ARON}, }; const struct WildPokemonInfo gGraniteCave_StevensRoom_LandMonsInfo = {10, gGraniteCave_StevensRoom_LandMons}; const struct WildPokemon gRoute125_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute125_WaterMonsInfo = {4, gRoute125_WaterMons}; const struct WildPokemon gRoute125_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute125_FishingMonsInfo = {30, gRoute125_FishingMons}; const struct WildPokemon gRoute126_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute126_WaterMonsInfo = {4, gRoute126_WaterMons}; const struct WildPokemon gRoute126_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute126_FishingMonsInfo = {30, gRoute126_FishingMons}; const struct WildPokemon gRoute127_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute127_WaterMonsInfo = {4, gRoute127_WaterMons}; const struct WildPokemon gRoute127_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute127_FishingMonsInfo = {30, gRoute127_FishingMons}; const struct WildPokemon gRoute128_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute128_WaterMonsInfo = {4, gRoute128_WaterMons}; const struct WildPokemon gRoute128_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_LUVDISC}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_LUVDISC}, - {30, 35, SPECIES_WAILMER}, - {30, 35, SPECIES_CORSOLA}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_LUVDISC}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_LUVDISC}, + {30, 35, SPECIES_WAILMER}, + {30, 35, SPECIES_CORSOLA}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute128_FishingMonsInfo = {30, gRoute128_FishingMons}; const struct WildPokemon gRoute129_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_WAILORD}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_WAILORD}, }; const struct WildPokemonInfo gRoute129_WaterMonsInfo = {4, gRoute129_WaterMons}; const struct WildPokemon gRoute129_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute129_FishingMonsInfo = {30, gRoute129_FishingMons}; const struct WildPokemon gRoute130_LandMons[] = { - {30, 30, SPECIES_WYNAUT}, - {35, 35, SPECIES_WYNAUT}, - {25, 25, SPECIES_WYNAUT}, - {40, 40, SPECIES_WYNAUT}, - {20, 20, SPECIES_WYNAUT}, - {45, 45, SPECIES_WYNAUT}, - {15, 15, SPECIES_WYNAUT}, - {50, 50, SPECIES_WYNAUT}, - {10, 10, SPECIES_WYNAUT}, - {5, 5, SPECIES_WYNAUT}, - {10, 10, SPECIES_WYNAUT}, - {5, 5, SPECIES_WYNAUT}, + {30, 30, SPECIES_WYNAUT}, + {35, 35, SPECIES_WYNAUT}, + {25, 25, SPECIES_WYNAUT}, + {40, 40, SPECIES_WYNAUT}, + {20, 20, SPECIES_WYNAUT}, + {45, 45, SPECIES_WYNAUT}, + {15, 15, SPECIES_WYNAUT}, + {50, 50, SPECIES_WYNAUT}, + {10, 10, SPECIES_WYNAUT}, + {5, 5, SPECIES_WYNAUT}, + {10, 10, SPECIES_WYNAUT}, + {5, 5, SPECIES_WYNAUT}, }; const struct WildPokemonInfo gRoute130_LandMonsInfo = {20, gRoute130_LandMons}; const struct WildPokemon gRoute130_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute130_WaterMonsInfo = {4, gRoute130_WaterMons}; const struct WildPokemon gRoute130_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute130_FishingMonsInfo = {30, gRoute130_FishingMons}; const struct WildPokemon gRoute131_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute131_WaterMonsInfo = {4, gRoute131_WaterMons}; const struct WildPokemon gRoute131_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute131_FishingMonsInfo = {30, gRoute131_FishingMons}; const struct WildPokemon gRoute132_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute132_WaterMonsInfo = {4, gRoute132_WaterMons}; const struct WildPokemon gRoute132_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_HORSEA}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_HORSEA}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute132_FishingMonsInfo = {30, gRoute132_FishingMons}; const struct WildPokemon gRoute133_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute133_WaterMonsInfo = {4, gRoute133_WaterMons}; const struct WildPokemon gRoute133_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_HORSEA}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_HORSEA}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute133_FishingMonsInfo = {30, gRoute133_FishingMons}; const struct WildPokemon gRoute134_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute134_WaterMonsInfo = {4, gRoute134_WaterMons}; const struct WildPokemon gRoute134_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_HORSEA}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_HORSEA}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute134_FishingMonsInfo = {30, gRoute134_FishingMons}; const struct WildPokemon gAbandonedShip_HiddenFloorCorridors_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_TENTACOOL}, - {30, 35, SPECIES_TENTACRUEL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_TENTACOOL}, + {30, 35, SPECIES_TENTACRUEL}, }; const struct WildPokemonInfo gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo = {4, gAbandonedShip_HiddenFloorCorridors_WaterMons}; const struct WildPokemon gAbandonedShip_HiddenFloorCorridors_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_TENTACOOL}, - {25, 30, SPECIES_TENTACOOL}, - {30, 35, SPECIES_TENTACOOL}, - {30, 35, SPECIES_TENTACRUEL}, - {25, 30, SPECIES_TENTACRUEL}, - {20, 25, SPECIES_TENTACRUEL}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_TENTACOOL}, + {25, 30, SPECIES_TENTACOOL}, + {30, 35, SPECIES_TENTACOOL}, + {30, 35, SPECIES_TENTACRUEL}, + {25, 30, SPECIES_TENTACRUEL}, + {20, 25, SPECIES_TENTACRUEL}, }; const struct WildPokemonInfo gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo = {20, gAbandonedShip_HiddenFloorCorridors_FishingMons}; const struct WildPokemon gSeafloorCavern_Room1_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room1_LandMonsInfo = {4, gSeafloorCavern_Room1_LandMons}; const struct WildPokemon gSeafloorCavern_Room2_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room2_LandMonsInfo = {4, gSeafloorCavern_Room2_LandMons}; const struct WildPokemon gSeafloorCavern_Room3_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room3_LandMonsInfo = {4, gSeafloorCavern_Room3_LandMons}; const struct WildPokemon gSeafloorCavern_Room4_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room4_LandMonsInfo = {4, gSeafloorCavern_Room4_LandMons}; const struct WildPokemon gSeafloorCavern_Room5_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room5_LandMonsInfo = {4, gSeafloorCavern_Room5_LandMons}; const struct WildPokemon gSeafloorCavern_Room6_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room6_LandMonsInfo = {4, gSeafloorCavern_Room6_LandMons}; const struct WildPokemon gSeafloorCavern_Room6_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_ZUBAT}, - {30, 35, SPECIES_ZUBAT}, - {30, 35, SPECIES_GOLBAT}, - {30, 35, SPECIES_GOLBAT}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_ZUBAT}, + {30, 35, SPECIES_ZUBAT}, + {30, 35, SPECIES_GOLBAT}, + {30, 35, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room6_WaterMonsInfo = {4, gSeafloorCavern_Room6_WaterMons}; const struct WildPokemon gSeafloorCavern_Room6_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gSeafloorCavern_Room6_FishingMonsInfo = {10, gSeafloorCavern_Room6_FishingMons}; const struct WildPokemon gSeafloorCavern_Room7_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room7_LandMonsInfo = {4, gSeafloorCavern_Room7_LandMons}; const struct WildPokemon gSeafloorCavern_Room7_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_ZUBAT}, - {30, 35, SPECIES_ZUBAT}, - {30, 35, SPECIES_GOLBAT}, - {30, 35, SPECIES_GOLBAT}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_ZUBAT}, + {30, 35, SPECIES_ZUBAT}, + {30, 35, SPECIES_GOLBAT}, + {30, 35, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room7_WaterMonsInfo = {4, gSeafloorCavern_Room7_WaterMons}; const struct WildPokemon gSeafloorCavern_Room7_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gSeafloorCavern_Room7_FishingMonsInfo = {10, gSeafloorCavern_Room7_FishingMons}; const struct WildPokemon gSeafloorCavern_Room8_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room8_LandMonsInfo = {4, gSeafloorCavern_Room8_LandMons}; const struct WildPokemon gSeafloorCavern_Entrance_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_ZUBAT}, - {30, 35, SPECIES_ZUBAT}, - {30, 35, SPECIES_GOLBAT}, - {30, 35, SPECIES_GOLBAT}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_ZUBAT}, + {30, 35, SPECIES_ZUBAT}, + {30, 35, SPECIES_GOLBAT}, + {30, 35, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Entrance_WaterMonsInfo = {4, gSeafloorCavern_Entrance_WaterMons}; const struct WildPokemon gSeafloorCavern_Entrance_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gSeafloorCavern_Entrance_FishingMonsInfo = {10, gSeafloorCavern_Entrance_FishingMons}; const struct WildPokemon gCaveOfOrigin_Entrance_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gCaveOfOrigin_Entrance_LandMonsInfo = {4, gCaveOfOrigin_Entrance_LandMons}; const struct WildPokemon gCaveOfOrigin_1F_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {30, 30, SPECIES_SABLEYE}, - {32, 32, SPECIES_SABLEYE}, - {34, 34, SPECIES_SABLEYE}, - {33, 33, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {30, 30, SPECIES_SABLEYE}, + {32, 32, SPECIES_SABLEYE}, + {34, 34, SPECIES_SABLEYE}, + {33, 33, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gCaveOfOrigin_1F_LandMonsInfo = {4, gCaveOfOrigin_1F_LandMons}; const struct WildPokemon gCaveOfOrigin_UnusedRubySapphireMap1_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {30, 30, SPECIES_SABLEYE}, - {32, 32, SPECIES_SABLEYE}, - {34, 34, SPECIES_SABLEYE}, - {33, 33, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {30, 30, SPECIES_SABLEYE}, + {32, 32, SPECIES_SABLEYE}, + {34, 34, SPECIES_SABLEYE}, + {33, 33, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo = {4, gCaveOfOrigin_UnusedRubySapphireMap1_LandMons}; const struct WildPokemon gCaveOfOrigin_UnusedRubySapphireMap2_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {30, 30, SPECIES_SABLEYE}, - {32, 32, SPECIES_SABLEYE}, - {34, 34, SPECIES_SABLEYE}, - {33, 33, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {30, 30, SPECIES_SABLEYE}, + {32, 32, SPECIES_SABLEYE}, + {34, 34, SPECIES_SABLEYE}, + {33, 33, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo = {4, gCaveOfOrigin_UnusedRubySapphireMap2_LandMons}; const struct WildPokemon gCaveOfOrigin_UnusedRubySapphireMap3_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {30, 30, SPECIES_SABLEYE}, - {32, 32, SPECIES_SABLEYE}, - {34, 34, SPECIES_SABLEYE}, - {33, 33, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {30, 30, SPECIES_SABLEYE}, + {32, 32, SPECIES_SABLEYE}, + {34, 34, SPECIES_SABLEYE}, + {33, 33, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo = {4, gCaveOfOrigin_UnusedRubySapphireMap3_LandMons}; const struct WildPokemon gNewMauville_Entrance_LandMons[] = { - {24, 24, SPECIES_VOLTORB}, - {24, 24, SPECIES_MAGNEMITE}, - {25, 25, SPECIES_VOLTORB}, - {25, 25, SPECIES_MAGNEMITE}, - {23, 23, SPECIES_VOLTORB}, - {23, 23, SPECIES_MAGNEMITE}, - {26, 26, SPECIES_VOLTORB}, - {26, 26, SPECIES_MAGNEMITE}, - {22, 22, SPECIES_VOLTORB}, - {22, 22, SPECIES_MAGNEMITE}, - {22, 22, SPECIES_VOLTORB}, - {22, 22, SPECIES_MAGNEMITE}, + {24, 24, SPECIES_VOLTORB}, + {24, 24, SPECIES_MAGNEMITE}, + {25, 25, SPECIES_VOLTORB}, + {25, 25, SPECIES_MAGNEMITE}, + {23, 23, SPECIES_VOLTORB}, + {23, 23, SPECIES_MAGNEMITE}, + {26, 26, SPECIES_VOLTORB}, + {26, 26, SPECIES_MAGNEMITE}, + {22, 22, SPECIES_VOLTORB}, + {22, 22, SPECIES_MAGNEMITE}, + {22, 22, SPECIES_VOLTORB}, + {22, 22, SPECIES_MAGNEMITE}, }; const struct WildPokemonInfo gNewMauville_Entrance_LandMonsInfo = {10, gNewMauville_Entrance_LandMons}; const struct WildPokemon gSafariZone_Southwest_LandMons[] = { - {25, 25, SPECIES_ODDISH}, - {27, 27, SPECIES_ODDISH}, - {25, 25, SPECIES_GIRAFARIG}, - {27, 27, SPECIES_GIRAFARIG}, - {25, 25, SPECIES_NATU}, - {27, 27, SPECIES_DODUO}, - {25, 25, SPECIES_GLOOM}, - {27, 27, SPECIES_WOBBUFFET}, - {25, 25, SPECIES_PIKACHU}, - {27, 27, SPECIES_WOBBUFFET}, - {27, 27, SPECIES_PIKACHU}, - {29, 29, SPECIES_WOBBUFFET}, + {25, 25, SPECIES_ODDISH}, + {27, 27, SPECIES_ODDISH}, + {25, 25, SPECIES_GIRAFARIG}, + {27, 27, SPECIES_GIRAFARIG}, + {25, 25, SPECIES_NATU}, + {27, 27, SPECIES_DODUO}, + {25, 25, SPECIES_GLOOM}, + {27, 27, SPECIES_WOBBUFFET}, + {25, 25, SPECIES_PIKACHU}, + {27, 27, SPECIES_WOBBUFFET}, + {27, 27, SPECIES_PIKACHU}, + {29, 29, SPECIES_WOBBUFFET}, }; const struct WildPokemonInfo gSafariZone_Southwest_LandMonsInfo = {25, gSafariZone_Southwest_LandMons}; const struct WildPokemon gSafariZone_Southwest_WaterMons[] = { - {20, 30, SPECIES_PSYDUCK}, - {20, 30, SPECIES_PSYDUCK}, - {30, 35, SPECIES_PSYDUCK}, - {30, 35, SPECIES_PSYDUCK}, - {30, 35, SPECIES_PSYDUCK}, + {20, 30, SPECIES_PSYDUCK}, + {20, 30, SPECIES_PSYDUCK}, + {30, 35, SPECIES_PSYDUCK}, + {30, 35, SPECIES_PSYDUCK}, + {30, 35, SPECIES_PSYDUCK}, }; const struct WildPokemonInfo gSafariZone_Southwest_WaterMonsInfo = {9, gSafariZone_Southwest_WaterMons}; const struct WildPokemon gSafariZone_Southwest_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 25, SPECIES_GOLDEEN}, - {10, 30, SPECIES_GOLDEEN}, - {25, 30, SPECIES_GOLDEEN}, - {30, 35, SPECIES_GOLDEEN}, - {30, 35, SPECIES_SEAKING}, - {35, 40, SPECIES_SEAKING}, - {25, 30, SPECIES_SEAKING}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 25, SPECIES_GOLDEEN}, + {10, 30, SPECIES_GOLDEEN}, + {25, 30, SPECIES_GOLDEEN}, + {30, 35, SPECIES_GOLDEEN}, + {30, 35, SPECIES_SEAKING}, + {35, 40, SPECIES_SEAKING}, + {25, 30, SPECIES_SEAKING}, }; const struct WildPokemonInfo gSafariZone_Southwest_FishingMonsInfo = {35, gSafariZone_Southwest_FishingMons}; const struct WildPokemon gSafariZone_North_LandMons[] = { - {27, 27, SPECIES_PHANPY}, - {27, 27, SPECIES_ODDISH}, - {29, 29, SPECIES_PHANPY}, - {29, 29, SPECIES_ODDISH}, - {27, 27, SPECIES_NATU}, - {29, 29, SPECIES_GLOOM}, - {31, 31, SPECIES_GLOOM}, - {29, 29, SPECIES_NATU}, - {29, 29, SPECIES_XATU}, - {27, 27, SPECIES_HERACROSS}, - {31, 31, SPECIES_XATU}, - {29, 29, SPECIES_HERACROSS}, + {27, 27, SPECIES_PHANPY}, + {27, 27, SPECIES_ODDISH}, + {29, 29, SPECIES_PHANPY}, + {29, 29, SPECIES_ODDISH}, + {27, 27, SPECIES_NATU}, + {29, 29, SPECIES_GLOOM}, + {31, 31, SPECIES_GLOOM}, + {29, 29, SPECIES_NATU}, + {29, 29, SPECIES_XATU}, + {27, 27, SPECIES_HERACROSS}, + {31, 31, SPECIES_XATU}, + {29, 29, SPECIES_HERACROSS}, }; const struct WildPokemonInfo gSafariZone_North_LandMonsInfo = {25, gSafariZone_North_LandMons}; const struct WildPokemon gSafariZone_North_RockSmashMons[] = { - {10, 15, SPECIES_GEODUDE}, - {5, 10, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, - {20, 25, SPECIES_GEODUDE}, - {25, 30, SPECIES_GEODUDE}, + {10, 15, SPECIES_GEODUDE}, + {5, 10, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, + {20, 25, SPECIES_GEODUDE}, + {25, 30, SPECIES_GEODUDE}, }; const struct WildPokemonInfo gSafariZone_North_RockSmashMonsInfo = {25, gSafariZone_North_RockSmashMons}; const struct WildPokemon gSafariZone_Northwest_LandMons[] = { - {27, 27, SPECIES_RHYHORN}, - {27, 27, SPECIES_ODDISH}, - {29, 29, SPECIES_RHYHORN}, - {29, 29, SPECIES_ODDISH}, - {27, 27, SPECIES_DODUO}, - {29, 29, SPECIES_GLOOM}, - {31, 31, SPECIES_GLOOM}, - {29, 29, SPECIES_DODUO}, - {29, 29, SPECIES_DODRIO}, - {27, 27, SPECIES_PINSIR}, - {31, 31, SPECIES_DODRIO}, - {29, 29, SPECIES_PINSIR}, + {27, 27, SPECIES_RHYHORN}, + {27, 27, SPECIES_ODDISH}, + {29, 29, SPECIES_RHYHORN}, + {29, 29, SPECIES_ODDISH}, + {27, 27, SPECIES_DODUO}, + {29, 29, SPECIES_GLOOM}, + {31, 31, SPECIES_GLOOM}, + {29, 29, SPECIES_DODUO}, + {29, 29, SPECIES_DODRIO}, + {27, 27, SPECIES_PINSIR}, + {31, 31, SPECIES_DODRIO}, + {29, 29, SPECIES_PINSIR}, }; const struct WildPokemonInfo gSafariZone_Northwest_LandMonsInfo = {25, gSafariZone_Northwest_LandMons}; const struct WildPokemon gSafariZone_Northwest_WaterMons[] = { - {20, 30, SPECIES_PSYDUCK}, - {20, 30, SPECIES_PSYDUCK}, - {30, 35, SPECIES_PSYDUCK}, - {30, 35, SPECIES_GOLDUCK}, - {25, 40, SPECIES_GOLDUCK}, + {20, 30, SPECIES_PSYDUCK}, + {20, 30, SPECIES_PSYDUCK}, + {30, 35, SPECIES_PSYDUCK}, + {30, 35, SPECIES_GOLDUCK}, + {25, 40, SPECIES_GOLDUCK}, }; const struct WildPokemonInfo gSafariZone_Northwest_WaterMonsInfo = {9, gSafariZone_Northwest_WaterMons}; const struct WildPokemon gSafariZone_Northwest_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 25, SPECIES_GOLDEEN}, - {10, 30, SPECIES_GOLDEEN}, - {25, 30, SPECIES_GOLDEEN}, - {30, 35, SPECIES_GOLDEEN}, - {30, 35, SPECIES_SEAKING}, - {35, 40, SPECIES_SEAKING}, - {25, 30, SPECIES_SEAKING}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 25, SPECIES_GOLDEEN}, + {10, 30, SPECIES_GOLDEEN}, + {25, 30, SPECIES_GOLDEEN}, + {30, 35, SPECIES_GOLDEEN}, + {30, 35, SPECIES_SEAKING}, + {35, 40, SPECIES_SEAKING}, + {25, 30, SPECIES_SEAKING}, }; const struct WildPokemonInfo gSafariZone_Northwest_FishingMonsInfo = {35, gSafariZone_Northwest_FishingMons}; const struct WildPokemon gVictoryRoad_B1F_LandMons[] = { - {40, 40, SPECIES_GOLBAT}, - {40, 40, SPECIES_HARIYAMA}, - {40, 40, SPECIES_LAIRON}, - {40, 40, SPECIES_LAIRON}, - {38, 38, SPECIES_GOLBAT}, - {38, 38, SPECIES_HARIYAMA}, - {42, 42, SPECIES_GOLBAT}, - {42, 42, SPECIES_HARIYAMA}, - {42, 42, SPECIES_LAIRON}, - {38, 38, SPECIES_MAWILE}, - {42, 42, SPECIES_LAIRON}, - {38, 38, SPECIES_MAWILE}, + {40, 40, SPECIES_GOLBAT}, + {40, 40, SPECIES_HARIYAMA}, + {40, 40, SPECIES_LAIRON}, + {40, 40, SPECIES_LAIRON}, + {38, 38, SPECIES_GOLBAT}, + {38, 38, SPECIES_HARIYAMA}, + {42, 42, SPECIES_GOLBAT}, + {42, 42, SPECIES_HARIYAMA}, + {42, 42, SPECIES_LAIRON}, + {38, 38, SPECIES_MAWILE}, + {42, 42, SPECIES_LAIRON}, + {38, 38, SPECIES_MAWILE}, }; const struct WildPokemonInfo gVictoryRoad_B1F_LandMonsInfo = {10, gVictoryRoad_B1F_LandMons}; const struct WildPokemon gVictoryRoad_B1F_RockSmashMons[] = { - {30, 40, SPECIES_GRAVELER}, - {30, 40, SPECIES_GEODUDE}, - {35, 40, SPECIES_GRAVELER}, - {35, 40, SPECIES_GRAVELER}, - {35, 40, SPECIES_GRAVELER}, + {30, 40, SPECIES_GRAVELER}, + {30, 40, SPECIES_GEODUDE}, + {35, 40, SPECIES_GRAVELER}, + {35, 40, SPECIES_GRAVELER}, + {35, 40, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gVictoryRoad_B1F_RockSmashMonsInfo = {20, gVictoryRoad_B1F_RockSmashMons}; const struct WildPokemon gVictoryRoad_B2F_LandMons[] = { - {40, 40, SPECIES_GOLBAT}, - {40, 40, SPECIES_SABLEYE}, - {40, 40, SPECIES_LAIRON}, - {40, 40, SPECIES_LAIRON}, - {42, 42, SPECIES_GOLBAT}, - {42, 42, SPECIES_SABLEYE}, - {44, 44, SPECIES_GOLBAT}, - {44, 44, SPECIES_SABLEYE}, - {42, 42, SPECIES_LAIRON}, - {42, 42, SPECIES_MAWILE}, - {44, 44, SPECIES_LAIRON}, - {44, 44, SPECIES_MAWILE}, + {40, 40, SPECIES_GOLBAT}, + {40, 40, SPECIES_SABLEYE}, + {40, 40, SPECIES_LAIRON}, + {40, 40, SPECIES_LAIRON}, + {42, 42, SPECIES_GOLBAT}, + {42, 42, SPECIES_SABLEYE}, + {44, 44, SPECIES_GOLBAT}, + {44, 44, SPECIES_SABLEYE}, + {42, 42, SPECIES_LAIRON}, + {42, 42, SPECIES_MAWILE}, + {44, 44, SPECIES_LAIRON}, + {44, 44, SPECIES_MAWILE}, }; const struct WildPokemonInfo gVictoryRoad_B2F_LandMonsInfo = {10, gVictoryRoad_B2F_LandMons}; const struct WildPokemon gVictoryRoad_B2F_WaterMons[] = { - {30, 35, SPECIES_GOLBAT}, - {25, 30, SPECIES_GOLBAT}, - {35, 40, SPECIES_GOLBAT}, - {35, 40, SPECIES_GOLBAT}, - {35, 40, SPECIES_GOLBAT}, + {30, 35, SPECIES_GOLBAT}, + {25, 30, SPECIES_GOLBAT}, + {35, 40, SPECIES_GOLBAT}, + {35, 40, SPECIES_GOLBAT}, + {35, 40, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gVictoryRoad_B2F_WaterMonsInfo = {4, gVictoryRoad_B2F_WaterMons}; const struct WildPokemon gVictoryRoad_B2F_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {30, 35, SPECIES_WHISCASH}, - {35, 40, SPECIES_WHISCASH}, - {40, 45, SPECIES_WHISCASH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {30, 35, SPECIES_WHISCASH}, + {35, 40, SPECIES_WHISCASH}, + {40, 45, SPECIES_WHISCASH}, }; const struct WildPokemonInfo gVictoryRoad_B2F_FishingMonsInfo = {30, gVictoryRoad_B2F_FishingMons}; const struct WildPokemon gMeteorFalls_1F_1R_LandMons[] = { - {16, 16, SPECIES_ZUBAT}, - {17, 17, SPECIES_ZUBAT}, - {18, 18, SPECIES_ZUBAT}, - {15, 15, SPECIES_ZUBAT}, - {14, 14, SPECIES_ZUBAT}, - {16, 16, SPECIES_SOLROCK}, - {18, 18, SPECIES_SOLROCK}, - {14, 14, SPECIES_SOLROCK}, - {19, 19, SPECIES_ZUBAT}, - {20, 20, SPECIES_ZUBAT}, - {19, 19, SPECIES_ZUBAT}, - {20, 20, SPECIES_ZUBAT}, + {16, 16, SPECIES_ZUBAT}, + {17, 17, SPECIES_ZUBAT}, + {18, 18, SPECIES_ZUBAT}, + {15, 15, SPECIES_ZUBAT}, + {14, 14, SPECIES_ZUBAT}, + {16, 16, SPECIES_SOLROCK}, + {18, 18, SPECIES_SOLROCK}, + {14, 14, SPECIES_SOLROCK}, + {19, 19, SPECIES_ZUBAT}, + {20, 20, SPECIES_ZUBAT}, + {19, 19, SPECIES_ZUBAT}, + {20, 20, SPECIES_ZUBAT}, }; const struct WildPokemonInfo gMeteorFalls_1F_1R_LandMonsInfo = {10, gMeteorFalls_1F_1R_LandMons}; const struct WildPokemon gMeteorFalls_1F_1R_WaterMons[] = { - {5, 35, SPECIES_ZUBAT}, - {30, 35, SPECIES_ZUBAT}, - {25, 35, SPECIES_SOLROCK}, - {15, 25, SPECIES_SOLROCK}, - {5, 15, SPECIES_SOLROCK}, + {5, 35, SPECIES_ZUBAT}, + {30, 35, SPECIES_ZUBAT}, + {25, 35, SPECIES_SOLROCK}, + {15, 25, SPECIES_SOLROCK}, + {5, 15, SPECIES_SOLROCK}, }; const struct WildPokemonInfo gMeteorFalls_1F_1R_WaterMonsInfo = {4, gMeteorFalls_1F_1R_WaterMons}; const struct WildPokemon gMeteorFalls_1F_1R_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {20, 25, SPECIES_BARBOACH}, - {35, 40, SPECIES_BARBOACH}, - {40, 45, SPECIES_BARBOACH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {20, 25, SPECIES_BARBOACH}, + {35, 40, SPECIES_BARBOACH}, + {40, 45, SPECIES_BARBOACH}, }; const struct WildPokemonInfo gMeteorFalls_1F_1R_FishingMonsInfo = {30, gMeteorFalls_1F_1R_FishingMons}; const struct WildPokemon gMeteorFalls_1F_2R_LandMons[] = { - {33, 33, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {35, 35, SPECIES_SOLROCK}, - {33, 33, SPECIES_SOLROCK}, - {37, 37, SPECIES_SOLROCK}, - {35, 35, SPECIES_GOLBAT}, - {39, 39, SPECIES_SOLROCK}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {35, 35, SPECIES_SOLROCK}, + {33, 33, SPECIES_SOLROCK}, + {37, 37, SPECIES_SOLROCK}, + {35, 35, SPECIES_GOLBAT}, + {39, 39, SPECIES_SOLROCK}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gMeteorFalls_1F_2R_LandMonsInfo = {10, gMeteorFalls_1F_2R_LandMons}; const struct WildPokemon gMeteorFalls_1F_2R_WaterMons[] = { - {30, 35, SPECIES_GOLBAT}, - {30, 35, SPECIES_GOLBAT}, - {25, 35, SPECIES_SOLROCK}, - {15, 25, SPECIES_SOLROCK}, - {5, 15, SPECIES_SOLROCK}, + {30, 35, SPECIES_GOLBAT}, + {30, 35, SPECIES_GOLBAT}, + {25, 35, SPECIES_SOLROCK}, + {15, 25, SPECIES_SOLROCK}, + {5, 15, SPECIES_SOLROCK}, }; const struct WildPokemonInfo gMeteorFalls_1F_2R_WaterMonsInfo = {4, gMeteorFalls_1F_2R_WaterMons}; const struct WildPokemon gMeteorFalls_1F_2R_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {30, 35, SPECIES_WHISCASH}, - {35, 40, SPECIES_WHISCASH}, - {40, 45, SPECIES_WHISCASH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {30, 35, SPECIES_WHISCASH}, + {35, 40, SPECIES_WHISCASH}, + {40, 45, SPECIES_WHISCASH}, }; const struct WildPokemonInfo gMeteorFalls_1F_2R_FishingMonsInfo = {30, gMeteorFalls_1F_2R_FishingMons}; const struct WildPokemon gMeteorFalls_B1F_1R_LandMons[] = { - {33, 33, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {35, 35, SPECIES_SOLROCK}, - {33, 33, SPECIES_SOLROCK}, - {37, 37, SPECIES_SOLROCK}, - {35, 35, SPECIES_GOLBAT}, - {39, 39, SPECIES_SOLROCK}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {35, 35, SPECIES_SOLROCK}, + {33, 33, SPECIES_SOLROCK}, + {37, 37, SPECIES_SOLROCK}, + {35, 35, SPECIES_GOLBAT}, + {39, 39, SPECIES_SOLROCK}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gMeteorFalls_B1F_1R_LandMonsInfo = {10, gMeteorFalls_B1F_1R_LandMons}; const struct WildPokemon gMeteorFalls_B1F_1R_WaterMons[] = { - {30, 35, SPECIES_GOLBAT}, - {30, 35, SPECIES_GOLBAT}, - {25, 35, SPECIES_SOLROCK}, - {15, 25, SPECIES_SOLROCK}, - {5, 15, SPECIES_SOLROCK}, + {30, 35, SPECIES_GOLBAT}, + {30, 35, SPECIES_GOLBAT}, + {25, 35, SPECIES_SOLROCK}, + {15, 25, SPECIES_SOLROCK}, + {5, 15, SPECIES_SOLROCK}, }; const struct WildPokemonInfo gMeteorFalls_B1F_1R_WaterMonsInfo = {4, gMeteorFalls_B1F_1R_WaterMons}; const struct WildPokemon gMeteorFalls_B1F_1R_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {30, 35, SPECIES_WHISCASH}, - {35, 40, SPECIES_WHISCASH}, - {40, 45, SPECIES_WHISCASH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {30, 35, SPECIES_WHISCASH}, + {35, 40, SPECIES_WHISCASH}, + {40, 45, SPECIES_WHISCASH}, }; const struct WildPokemonInfo gMeteorFalls_B1F_1R_FishingMonsInfo = {30, gMeteorFalls_B1F_1R_FishingMons}; const struct WildPokemon gShoalCave_LowTideStairsRoom_LandMons[] = { - {26, 26, SPECIES_ZUBAT}, - {26, 26, SPECIES_SPHEAL}, - {28, 28, SPECIES_ZUBAT}, - {28, 28, SPECIES_SPHEAL}, - {30, 30, SPECIES_ZUBAT}, - {30, 30, SPECIES_SPHEAL}, - {32, 32, SPECIES_ZUBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, + {26, 26, SPECIES_ZUBAT}, + {26, 26, SPECIES_SPHEAL}, + {28, 28, SPECIES_ZUBAT}, + {28, 28, SPECIES_SPHEAL}, + {30, 30, SPECIES_ZUBAT}, + {30, 30, SPECIES_SPHEAL}, + {32, 32, SPECIES_ZUBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, }; const struct WildPokemonInfo gShoalCave_LowTideStairsRoom_LandMonsInfo = {10, gShoalCave_LowTideStairsRoom_LandMons}; const struct WildPokemon gShoalCave_LowTideLowerRoom_LandMons[] = { - {26, 26, SPECIES_ZUBAT}, - {26, 26, SPECIES_SPHEAL}, - {28, 28, SPECIES_ZUBAT}, - {28, 28, SPECIES_SPHEAL}, - {30, 30, SPECIES_ZUBAT}, - {30, 30, SPECIES_SPHEAL}, - {32, 32, SPECIES_ZUBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, + {26, 26, SPECIES_ZUBAT}, + {26, 26, SPECIES_SPHEAL}, + {28, 28, SPECIES_ZUBAT}, + {28, 28, SPECIES_SPHEAL}, + {30, 30, SPECIES_ZUBAT}, + {30, 30, SPECIES_SPHEAL}, + {32, 32, SPECIES_ZUBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, }; const struct WildPokemonInfo gShoalCave_LowTideLowerRoom_LandMonsInfo = {10, gShoalCave_LowTideLowerRoom_LandMons}; const struct WildPokemon gShoalCave_LowTideInnerRoom_LandMons[] = { - {26, 26, SPECIES_ZUBAT}, - {26, 26, SPECIES_SPHEAL}, - {28, 28, SPECIES_ZUBAT}, - {28, 28, SPECIES_SPHEAL}, - {30, 30, SPECIES_ZUBAT}, - {30, 30, SPECIES_SPHEAL}, - {32, 32, SPECIES_ZUBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, + {26, 26, SPECIES_ZUBAT}, + {26, 26, SPECIES_SPHEAL}, + {28, 28, SPECIES_ZUBAT}, + {28, 28, SPECIES_SPHEAL}, + {30, 30, SPECIES_ZUBAT}, + {30, 30, SPECIES_SPHEAL}, + {32, 32, SPECIES_ZUBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, }; const struct WildPokemonInfo gShoalCave_LowTideInnerRoom_LandMonsInfo = {10, gShoalCave_LowTideInnerRoom_LandMons}; const struct WildPokemon gShoalCave_LowTideInnerRoom_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_ZUBAT}, - {25, 30, SPECIES_SPHEAL}, - {25, 30, SPECIES_SPHEAL}, - {25, 35, SPECIES_SPHEAL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_ZUBAT}, + {25, 30, SPECIES_SPHEAL}, + {25, 30, SPECIES_SPHEAL}, + {25, 35, SPECIES_SPHEAL}, }; const struct WildPokemonInfo gShoalCave_LowTideInnerRoom_WaterMonsInfo = {4, gShoalCave_LowTideInnerRoom_WaterMons}; const struct WildPokemon gShoalCave_LowTideInnerRoom_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gShoalCave_LowTideInnerRoom_FishingMonsInfo = {10, gShoalCave_LowTideInnerRoom_FishingMons}; const struct WildPokemon gShoalCave_LowTideEntranceRoom_LandMons[] = { - {26, 26, SPECIES_ZUBAT}, - {26, 26, SPECIES_SPHEAL}, - {28, 28, SPECIES_ZUBAT}, - {28, 28, SPECIES_SPHEAL}, - {30, 30, SPECIES_ZUBAT}, - {30, 30, SPECIES_SPHEAL}, - {32, 32, SPECIES_ZUBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, + {26, 26, SPECIES_ZUBAT}, + {26, 26, SPECIES_SPHEAL}, + {28, 28, SPECIES_ZUBAT}, + {28, 28, SPECIES_SPHEAL}, + {30, 30, SPECIES_ZUBAT}, + {30, 30, SPECIES_SPHEAL}, + {32, 32, SPECIES_ZUBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, }; const struct WildPokemonInfo gShoalCave_LowTideEntranceRoom_LandMonsInfo = {10, gShoalCave_LowTideEntranceRoom_LandMons}; const struct WildPokemon gShoalCave_LowTideEntranceRoom_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_ZUBAT}, - {25, 30, SPECIES_SPHEAL}, - {25, 30, SPECIES_SPHEAL}, - {25, 35, SPECIES_SPHEAL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_ZUBAT}, + {25, 30, SPECIES_SPHEAL}, + {25, 30, SPECIES_SPHEAL}, + {25, 35, SPECIES_SPHEAL}, }; const struct WildPokemonInfo gShoalCave_LowTideEntranceRoom_WaterMonsInfo = {4, gShoalCave_LowTideEntranceRoom_WaterMons}; const struct WildPokemon gShoalCave_LowTideEntranceRoom_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gShoalCave_LowTideEntranceRoom_FishingMonsInfo = {10, gShoalCave_LowTideEntranceRoom_FishingMons}; const struct WildPokemon gLilycoveCity_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gLilycoveCity_WaterMonsInfo = {4, gLilycoveCity_WaterMons}; const struct WildPokemon gLilycoveCity_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_STARYU}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_STARYU}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gLilycoveCity_FishingMonsInfo = {10, gLilycoveCity_FishingMons}; const struct WildPokemon gDewfordTown_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gDewfordTown_WaterMonsInfo = {4, gDewfordTown_WaterMons}; const struct WildPokemon gDewfordTown_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gDewfordTown_FishingMonsInfo = {10, gDewfordTown_FishingMons}; const struct WildPokemon gSlateportCity_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gSlateportCity_WaterMonsInfo = {4, gSlateportCity_WaterMons}; const struct WildPokemon gSlateportCity_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gSlateportCity_FishingMonsInfo = {10, gSlateportCity_FishingMons}; const struct WildPokemon gMossdeepCity_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gMossdeepCity_WaterMonsInfo = {4, gMossdeepCity_WaterMons}; const struct WildPokemon gMossdeepCity_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gMossdeepCity_FishingMonsInfo = {10, gMossdeepCity_FishingMons}; const struct WildPokemon gPacifidlogTown_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gPacifidlogTown_WaterMonsInfo = {4, gPacifidlogTown_WaterMons}; const struct WildPokemon gPacifidlogTown_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gPacifidlogTown_FishingMonsInfo = {10, gPacifidlogTown_FishingMons}; const struct WildPokemon gEverGrandeCity_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gEverGrandeCity_WaterMonsInfo = {4, gEverGrandeCity_WaterMons}; const struct WildPokemon gEverGrandeCity_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_LUVDISC}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_LUVDISC}, - {30, 35, SPECIES_WAILMER}, - {30, 35, SPECIES_CORSOLA}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_LUVDISC}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_LUVDISC}, + {30, 35, SPECIES_WAILMER}, + {30, 35, SPECIES_CORSOLA}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gEverGrandeCity_FishingMonsInfo = {10, gEverGrandeCity_FishingMons}; const struct WildPokemon gPetalburgCity_WaterMons[] = { - {20, 30, SPECIES_MARILL}, - {10, 20, SPECIES_MARILL}, - {30, 35, SPECIES_MARILL}, - {5, 10, SPECIES_MARILL}, - {5, 10, SPECIES_MARILL}, + {20, 30, SPECIES_MARILL}, + {10, 20, SPECIES_MARILL}, + {30, 35, SPECIES_MARILL}, + {5, 10, SPECIES_MARILL}, + {5, 10, SPECIES_MARILL}, }; const struct WildPokemonInfo gPetalburgCity_WaterMonsInfo = {1, gPetalburgCity_WaterMons}; const struct WildPokemon gPetalburgCity_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_CORPHISH}, - {25, 30, SPECIES_CORPHISH}, - {30, 35, SPECIES_CORPHISH}, - {20, 25, SPECIES_CORPHISH}, - {35, 40, SPECIES_CORPHISH}, - {40, 45, SPECIES_CORPHISH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_CORPHISH}, + {25, 30, SPECIES_CORPHISH}, + {30, 35, SPECIES_CORPHISH}, + {20, 25, SPECIES_CORPHISH}, + {35, 40, SPECIES_CORPHISH}, + {40, 45, SPECIES_CORPHISH}, }; const struct WildPokemonInfo gPetalburgCity_FishingMonsInfo = {10, gPetalburgCity_FishingMons}; const struct WildPokemon gUnderwater1_WaterMons[] = { - {20, 30, SPECIES_CLAMPERL}, - {20, 30, SPECIES_CHINCHOU}, - {30, 35, SPECIES_CLAMPERL}, - {30, 35, SPECIES_RELICANTH}, - {30, 35, SPECIES_RELICANTH}, + {20, 30, SPECIES_CLAMPERL}, + {20, 30, SPECIES_CHINCHOU}, + {30, 35, SPECIES_CLAMPERL}, + {30, 35, SPECIES_RELICANTH}, + {30, 35, SPECIES_RELICANTH}, }; const struct WildPokemonInfo gUnderwater1_WaterMonsInfo = {4, gUnderwater1_WaterMons}; const struct WildPokemon gShoalCave_LowTideIceRoom_LandMons[] = { - {26, 26, SPECIES_ZUBAT}, - {26, 26, SPECIES_SPHEAL}, - {28, 28, SPECIES_ZUBAT}, - {28, 28, SPECIES_SPHEAL}, - {30, 30, SPECIES_ZUBAT}, - {30, 30, SPECIES_SPHEAL}, - {26, 26, SPECIES_SNORUNT}, - {32, 32, SPECIES_SPHEAL}, - {30, 30, SPECIES_GOLBAT}, - {28, 28, SPECIES_SNORUNT}, - {32, 32, SPECIES_GOLBAT}, - {30, 30, SPECIES_SNORUNT}, + {26, 26, SPECIES_ZUBAT}, + {26, 26, SPECIES_SPHEAL}, + {28, 28, SPECIES_ZUBAT}, + {28, 28, SPECIES_SPHEAL}, + {30, 30, SPECIES_ZUBAT}, + {30, 30, SPECIES_SPHEAL}, + {26, 26, SPECIES_SNORUNT}, + {32, 32, SPECIES_SPHEAL}, + {30, 30, SPECIES_GOLBAT}, + {28, 28, SPECIES_SNORUNT}, + {32, 32, SPECIES_GOLBAT}, + {30, 30, SPECIES_SNORUNT}, }; const struct WildPokemonInfo gShoalCave_LowTideIceRoom_LandMonsInfo = {10, gShoalCave_LowTideIceRoom_LandMons}; const struct WildPokemon gSkyPillar_1F_LandMons[] = { - {33, 33, SPECIES_SABLEYE}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {34, 34, SPECIES_SABLEYE}, - {36, 36, SPECIES_CLAYDOL}, - {37, 37, SPECIES_BANETTE}, - {38, 38, SPECIES_BANETTE}, - {36, 36, SPECIES_CLAYDOL}, - {37, 37, SPECIES_CLAYDOL}, - {38, 38, SPECIES_CLAYDOL}, - {37, 37, SPECIES_CLAYDOL}, - {38, 38, SPECIES_CLAYDOL}, + {33, 33, SPECIES_SABLEYE}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {34, 34, SPECIES_SABLEYE}, + {36, 36, SPECIES_CLAYDOL}, + {37, 37, SPECIES_BANETTE}, + {38, 38, SPECIES_BANETTE}, + {36, 36, SPECIES_CLAYDOL}, + {37, 37, SPECIES_CLAYDOL}, + {38, 38, SPECIES_CLAYDOL}, + {37, 37, SPECIES_CLAYDOL}, + {38, 38, SPECIES_CLAYDOL}, }; const struct WildPokemonInfo gSkyPillar_1F_LandMonsInfo = {10, gSkyPillar_1F_LandMons}; const struct WildPokemon gSootopolisCity_WaterMons[] = { - {5, 35, SPECIES_MAGIKARP}, - {10, 30, SPECIES_MAGIKARP}, - {15, 25, SPECIES_MAGIKARP}, - {25, 30, SPECIES_MAGIKARP}, - {25, 30, SPECIES_MAGIKARP}, + {5, 35, SPECIES_MAGIKARP}, + {10, 30, SPECIES_MAGIKARP}, + {15, 25, SPECIES_MAGIKARP}, + {25, 30, SPECIES_MAGIKARP}, + {25, 30, SPECIES_MAGIKARP}, }; const struct WildPokemonInfo gSootopolisCity_WaterMonsInfo = {1, gSootopolisCity_WaterMons}; const struct WildPokemon gSootopolisCity_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_MAGIKARP}, - {30, 35, SPECIES_MAGIKARP}, - {30, 35, SPECIES_MAGIKARP}, - {35, 40, SPECIES_GYARADOS}, - {35, 45, SPECIES_GYARADOS}, - {5, 45, SPECIES_GYARADOS}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_MAGIKARP}, + {30, 35, SPECIES_MAGIKARP}, + {30, 35, SPECIES_MAGIKARP}, + {35, 40, SPECIES_GYARADOS}, + {35, 45, SPECIES_GYARADOS}, + {5, 45, SPECIES_GYARADOS}, }; const struct WildPokemonInfo gSootopolisCity_FishingMonsInfo = {10, gSootopolisCity_FishingMons}; const struct WildPokemon gSkyPillar_3F_LandMons[] = { - {33, 33, SPECIES_SABLEYE}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {34, 34, SPECIES_SABLEYE}, - {36, 36, SPECIES_CLAYDOL}, - {37, 37, SPECIES_BANETTE}, - {38, 38, SPECIES_BANETTE}, - {36, 36, SPECIES_CLAYDOL}, - {37, 37, SPECIES_CLAYDOL}, - {38, 38, SPECIES_CLAYDOL}, - {37, 37, SPECIES_CLAYDOL}, - {38, 38, SPECIES_CLAYDOL}, + {33, 33, SPECIES_SABLEYE}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {34, 34, SPECIES_SABLEYE}, + {36, 36, SPECIES_CLAYDOL}, + {37, 37, SPECIES_BANETTE}, + {38, 38, SPECIES_BANETTE}, + {36, 36, SPECIES_CLAYDOL}, + {37, 37, SPECIES_CLAYDOL}, + {38, 38, SPECIES_CLAYDOL}, + {37, 37, SPECIES_CLAYDOL}, + {38, 38, SPECIES_CLAYDOL}, }; const struct WildPokemonInfo gSkyPillar_3F_LandMonsInfo = {10, gSkyPillar_3F_LandMons}; const struct WildPokemon gSkyPillar_5F_LandMons[] = { - {33, 33, SPECIES_SABLEYE}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {34, 34, SPECIES_SABLEYE}, - {36, 36, SPECIES_CLAYDOL}, - {37, 37, SPECIES_BANETTE}, - {38, 38, SPECIES_BANETTE}, - {36, 36, SPECIES_CLAYDOL}, - {37, 37, SPECIES_CLAYDOL}, - {38, 38, SPECIES_ALTARIA}, - {39, 39, SPECIES_ALTARIA}, - {39, 39, SPECIES_ALTARIA}, + {33, 33, SPECIES_SABLEYE}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {34, 34, SPECIES_SABLEYE}, + {36, 36, SPECIES_CLAYDOL}, + {37, 37, SPECIES_BANETTE}, + {38, 38, SPECIES_BANETTE}, + {36, 36, SPECIES_CLAYDOL}, + {37, 37, SPECIES_CLAYDOL}, + {38, 38, SPECIES_ALTARIA}, + {39, 39, SPECIES_ALTARIA}, + {39, 39, SPECIES_ALTARIA}, }; const struct WildPokemonInfo gSkyPillar_5F_LandMonsInfo = {10, gSkyPillar_5F_LandMons}; const struct WildPokemon gSafariZone_Southeast_LandMons[] = { - {33, 33, SPECIES_SUNKERN}, - {34, 34, SPECIES_MAREEP}, - {35, 35, SPECIES_SUNKERN}, - {36, 36, SPECIES_MAREEP}, - {34, 34, SPECIES_AIPOM}, - {33, 33, SPECIES_SPINARAK}, - {35, 35, SPECIES_HOOTHOOT}, - {34, 34, SPECIES_SNUBBULL}, - {36, 36, SPECIES_STANTLER}, - {37, 37, SPECIES_GLIGAR}, - {39, 39, SPECIES_STANTLER}, - {40, 40, SPECIES_GLIGAR}, + {33, 33, SPECIES_SUNKERN}, + {34, 34, SPECIES_MAREEP}, + {35, 35, SPECIES_SUNKERN}, + {36, 36, SPECIES_MAREEP}, + {34, 34, SPECIES_AIPOM}, + {33, 33, SPECIES_SPINARAK}, + {35, 35, SPECIES_HOOTHOOT}, + {34, 34, SPECIES_SNUBBULL}, + {36, 36, SPECIES_STANTLER}, + {37, 37, SPECIES_GLIGAR}, + {39, 39, SPECIES_STANTLER}, + {40, 40, SPECIES_GLIGAR}, }; const struct WildPokemonInfo gSafariZone_Southeast_LandMonsInfo = {25, gSafariZone_Southeast_LandMons}; const struct WildPokemon gSafariZone_Southeast_WaterMons[] = { - {25, 30, SPECIES_WOOPER}, - {25, 30, SPECIES_MARILL}, - {25, 30, SPECIES_MARILL}, - {30, 35, SPECIES_MARILL}, - {35, 40, SPECIES_QUAGSIRE}, + {25, 30, SPECIES_WOOPER}, + {25, 30, SPECIES_MARILL}, + {25, 30, SPECIES_MARILL}, + {30, 35, SPECIES_MARILL}, + {35, 40, SPECIES_QUAGSIRE}, }; const struct WildPokemonInfo gSafariZone_Southeast_WaterMonsInfo = {9, gSafariZone_Southeast_WaterMons}; const struct WildPokemon gSafariZone_Southeast_FishingMons[] = { - {25, 30, SPECIES_MAGIKARP}, - {25, 30, SPECIES_GOLDEEN}, - {25, 30, SPECIES_MAGIKARP}, - {25, 30, SPECIES_GOLDEEN}, - {30, 35, SPECIES_REMORAID}, - {25, 30, SPECIES_GOLDEEN}, - {25, 30, SPECIES_REMORAID}, - {30, 35, SPECIES_REMORAID}, - {30, 35, SPECIES_REMORAID}, - {35, 40, SPECIES_OCTILLERY}, + {25, 30, SPECIES_MAGIKARP}, + {25, 30, SPECIES_GOLDEEN}, + {25, 30, SPECIES_MAGIKARP}, + {25, 30, SPECIES_GOLDEEN}, + {30, 35, SPECIES_REMORAID}, + {25, 30, SPECIES_GOLDEEN}, + {25, 30, SPECIES_REMORAID}, + {30, 35, SPECIES_REMORAID}, + {30, 35, SPECIES_REMORAID}, + {35, 40, SPECIES_OCTILLERY}, }; const struct WildPokemonInfo gSafariZone_Southeast_FishingMonsInfo = {35, gSafariZone_Southeast_FishingMons}; const struct WildPokemon gSafariZone_Northeast_LandMons[] = { - {33, 33, SPECIES_AIPOM}, - {34, 34, SPECIES_TEDDIURSA}, - {35, 35, SPECIES_AIPOM}, - {36, 36, SPECIES_TEDDIURSA}, - {34, 34, SPECIES_SUNKERN}, - {33, 33, SPECIES_LEDYBA}, - {35, 35, SPECIES_HOOTHOOT}, - {34, 34, SPECIES_PINECO}, - {36, 36, SPECIES_HOUNDOUR}, - {37, 37, SPECIES_MILTANK}, - {39, 39, SPECIES_HOUNDOUR}, - {40, 40, SPECIES_MILTANK}, + {33, 33, SPECIES_AIPOM}, + {34, 34, SPECIES_TEDDIURSA}, + {35, 35, SPECIES_AIPOM}, + {36, 36, SPECIES_TEDDIURSA}, + {34, 34, SPECIES_SUNKERN}, + {33, 33, SPECIES_LEDYBA}, + {35, 35, SPECIES_HOOTHOOT}, + {34, 34, SPECIES_PINECO}, + {36, 36, SPECIES_HOUNDOUR}, + {37, 37, SPECIES_MILTANK}, + {39, 39, SPECIES_HOUNDOUR}, + {40, 40, SPECIES_MILTANK}, }; const struct WildPokemonInfo gSafariZone_Northeast_LandMonsInfo = {25, gSafariZone_Northeast_LandMons}; const struct WildPokemon gSafariZone_Northeast_RockSmashMons[] = { - {25, 30, SPECIES_SHUCKLE}, - {20, 25, SPECIES_SHUCKLE}, - {30, 35, SPECIES_SHUCKLE}, - {30, 35, SPECIES_SHUCKLE}, - {35, 40, SPECIES_SHUCKLE}, + {25, 30, SPECIES_SHUCKLE}, + {20, 25, SPECIES_SHUCKLE}, + {30, 35, SPECIES_SHUCKLE}, + {30, 35, SPECIES_SHUCKLE}, + {35, 40, SPECIES_SHUCKLE}, }; const struct WildPokemonInfo gSafariZone_Northeast_RockSmashMonsInfo = {25, gSafariZone_Northeast_RockSmashMons}; const struct WildPokemon gMagmaHideout_1F_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_1F_LandMonsInfo = {10, gMagmaHideout_1F_LandMons}; const struct WildPokemon gMagmaHideout_2F_1R_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_2F_1R_LandMonsInfo = {10, gMagmaHideout_2F_1R_LandMons}; const struct WildPokemon gMagmaHideout_2F_2R_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_2F_2R_LandMonsInfo = {10, gMagmaHideout_2F_2R_LandMons}; const struct WildPokemon gMagmaHideout_3F_1R_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_3F_1R_LandMonsInfo = {10, gMagmaHideout_3F_1R_LandMons}; const struct WildPokemon gMagmaHideout_3F_2R_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_3F_2R_LandMonsInfo = {10, gMagmaHideout_3F_2R_LandMons}; const struct WildPokemon gMagmaHideout_4F_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_4F_LandMonsInfo = {10, gMagmaHideout_4F_LandMons}; const struct WildPokemon gMagmaHideout_3F_3R_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_3F_3R_LandMonsInfo = {10, gMagmaHideout_3F_3R_LandMons}; const struct WildPokemon gMagmaHideout_2F_3R_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_2F_3R_LandMonsInfo = {10, gMagmaHideout_2F_3R_LandMons}; const struct WildPokemon gMirageTower_1F_LandMons[] = { - {21, 21, SPECIES_SANDSHREW}, - {21, 21, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {22, 22, SPECIES_SANDSHREW}, - {22, 22, SPECIES_TRAPINCH}, - {23, 23, SPECIES_SANDSHREW}, - {23, 23, SPECIES_TRAPINCH}, - {24, 24, SPECIES_SANDSHREW}, - {24, 24, SPECIES_TRAPINCH}, + {21, 21, SPECIES_SANDSHREW}, + {21, 21, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {22, 22, SPECIES_SANDSHREW}, + {22, 22, SPECIES_TRAPINCH}, + {23, 23, SPECIES_SANDSHREW}, + {23, 23, SPECIES_TRAPINCH}, + {24, 24, SPECIES_SANDSHREW}, + {24, 24, SPECIES_TRAPINCH}, }; const struct WildPokemonInfo gMirageTower_1F_LandMonsInfo = {10, gMirageTower_1F_LandMons}; const struct WildPokemon gMirageTower_2F_LandMons[] = { - {21, 21, SPECIES_SANDSHREW}, - {21, 21, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {22, 22, SPECIES_SANDSHREW}, - {22, 22, SPECIES_TRAPINCH}, - {23, 23, SPECIES_SANDSHREW}, - {23, 23, SPECIES_TRAPINCH}, - {24, 24, SPECIES_SANDSHREW}, - {24, 24, SPECIES_TRAPINCH}, + {21, 21, SPECIES_SANDSHREW}, + {21, 21, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {22, 22, SPECIES_SANDSHREW}, + {22, 22, SPECIES_TRAPINCH}, + {23, 23, SPECIES_SANDSHREW}, + {23, 23, SPECIES_TRAPINCH}, + {24, 24, SPECIES_SANDSHREW}, + {24, 24, SPECIES_TRAPINCH}, }; const struct WildPokemonInfo gMirageTower_2F_LandMonsInfo = {10, gMirageTower_2F_LandMons}; const struct WildPokemon gMirageTower_3F_LandMons[] = { - {21, 21, SPECIES_SANDSHREW}, - {21, 21, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {22, 22, SPECIES_SANDSHREW}, - {22, 22, SPECIES_TRAPINCH}, - {23, 23, SPECIES_SANDSHREW}, - {23, 23, SPECIES_TRAPINCH}, - {24, 24, SPECIES_SANDSHREW}, - {24, 24, SPECIES_TRAPINCH}, + {21, 21, SPECIES_SANDSHREW}, + {21, 21, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {22, 22, SPECIES_SANDSHREW}, + {22, 22, SPECIES_TRAPINCH}, + {23, 23, SPECIES_SANDSHREW}, + {23, 23, SPECIES_TRAPINCH}, + {24, 24, SPECIES_SANDSHREW}, + {24, 24, SPECIES_TRAPINCH}, }; const struct WildPokemonInfo gMirageTower_3F_LandMonsInfo = {10, gMirageTower_3F_LandMons}; const struct WildPokemon gMirageTower_4F_LandMons[] = { - {21, 21, SPECIES_SANDSHREW}, - {21, 21, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {22, 22, SPECIES_SANDSHREW}, - {22, 22, SPECIES_TRAPINCH}, - {23, 23, SPECIES_SANDSHREW}, - {23, 23, SPECIES_TRAPINCH}, - {24, 24, SPECIES_SANDSHREW}, - {24, 24, SPECIES_TRAPINCH}, + {21, 21, SPECIES_SANDSHREW}, + {21, 21, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {22, 22, SPECIES_SANDSHREW}, + {22, 22, SPECIES_TRAPINCH}, + {23, 23, SPECIES_SANDSHREW}, + {23, 23, SPECIES_TRAPINCH}, + {24, 24, SPECIES_SANDSHREW}, + {24, 24, SPECIES_TRAPINCH}, }; const struct WildPokemonInfo gMirageTower_4F_LandMonsInfo = {10, gMirageTower_4F_LandMons}; const struct WildPokemon gDesertUnderpass_LandMons[] = { - {38, 38, SPECIES_DITTO}, - {35, 35, SPECIES_WHISMUR}, - {40, 40, SPECIES_DITTO}, - {40, 40, SPECIES_LOUDRED}, - {41, 41, SPECIES_DITTO}, - {36, 36, SPECIES_WHISMUR}, - {38, 38, SPECIES_LOUDRED}, - {42, 42, SPECIES_DITTO}, - {38, 38, SPECIES_WHISMUR}, - {43, 43, SPECIES_DITTO}, - {44, 44, SPECIES_LOUDRED}, - {45, 45, SPECIES_DITTO}, + {38, 38, SPECIES_DITTO}, + {35, 35, SPECIES_WHISMUR}, + {40, 40, SPECIES_DITTO}, + {40, 40, SPECIES_LOUDRED}, + {41, 41, SPECIES_DITTO}, + {36, 36, SPECIES_WHISMUR}, + {38, 38, SPECIES_LOUDRED}, + {42, 42, SPECIES_DITTO}, + {38, 38, SPECIES_WHISMUR}, + {43, 43, SPECIES_DITTO}, + {44, 44, SPECIES_LOUDRED}, + {45, 45, SPECIES_DITTO}, }; const struct WildPokemonInfo gDesertUnderpass_LandMonsInfo = {10, gDesertUnderpass_LandMons}; const struct WildPokemon gArtisanCave_B1F_LandMons[] = { - {40, 40, SPECIES_SMEARGLE}, - {41, 41, SPECIES_SMEARGLE}, - {42, 42, SPECIES_SMEARGLE}, - {43, 43, SPECIES_SMEARGLE}, - {44, 44, SPECIES_SMEARGLE}, - {45, 45, SPECIES_SMEARGLE}, - {46, 46, SPECIES_SMEARGLE}, - {47, 47, SPECIES_SMEARGLE}, - {48, 48, SPECIES_SMEARGLE}, - {49, 49, SPECIES_SMEARGLE}, - {50, 50, SPECIES_SMEARGLE}, - {50, 50, SPECIES_SMEARGLE}, + {40, 40, SPECIES_SMEARGLE}, + {41, 41, SPECIES_SMEARGLE}, + {42, 42, SPECIES_SMEARGLE}, + {43, 43, SPECIES_SMEARGLE}, + {44, 44, SPECIES_SMEARGLE}, + {45, 45, SPECIES_SMEARGLE}, + {46, 46, SPECIES_SMEARGLE}, + {47, 47, SPECIES_SMEARGLE}, + {48, 48, SPECIES_SMEARGLE}, + {49, 49, SPECIES_SMEARGLE}, + {50, 50, SPECIES_SMEARGLE}, + {50, 50, SPECIES_SMEARGLE}, }; const struct WildPokemonInfo gArtisanCave_B1F_LandMonsInfo = {10, gArtisanCave_B1F_LandMons}; const struct WildPokemon gArtisanCave_1F_LandMons[] = { - {40, 40, SPECIES_SMEARGLE}, - {41, 41, SPECIES_SMEARGLE}, - {42, 42, SPECIES_SMEARGLE}, - {43, 43, SPECIES_SMEARGLE}, - {44, 44, SPECIES_SMEARGLE}, - {45, 45, SPECIES_SMEARGLE}, - {46, 46, SPECIES_SMEARGLE}, - {47, 47, SPECIES_SMEARGLE}, - {48, 48, SPECIES_SMEARGLE}, - {49, 49, SPECIES_SMEARGLE}, - {50, 50, SPECIES_SMEARGLE}, - {50, 50, SPECIES_SMEARGLE}, + {40, 40, SPECIES_SMEARGLE}, + {41, 41, SPECIES_SMEARGLE}, + {42, 42, SPECIES_SMEARGLE}, + {43, 43, SPECIES_SMEARGLE}, + {44, 44, SPECIES_SMEARGLE}, + {45, 45, SPECIES_SMEARGLE}, + {46, 46, SPECIES_SMEARGLE}, + {47, 47, SPECIES_SMEARGLE}, + {48, 48, SPECIES_SMEARGLE}, + {49, 49, SPECIES_SMEARGLE}, + {50, 50, SPECIES_SMEARGLE}, + {50, 50, SPECIES_SMEARGLE}, }; const struct WildPokemonInfo gArtisanCave_1F_LandMonsInfo = {10, gArtisanCave_1F_LandMons}; const struct WildPokemon gAlteringCave1_LandMons[] = { - {10, 10, SPECIES_ZUBAT}, - {12, 12, SPECIES_ZUBAT}, - {8, 8, SPECIES_ZUBAT}, - {14, 14, SPECIES_ZUBAT}, - {10, 10, SPECIES_ZUBAT}, - {12, 12, SPECIES_ZUBAT}, - {16, 16, SPECIES_ZUBAT}, - {6, 6, SPECIES_ZUBAT}, - {8, 8, SPECIES_ZUBAT}, - {14, 14, SPECIES_ZUBAT}, - {8, 8, SPECIES_ZUBAT}, - {14, 14, SPECIES_ZUBAT}, + {10, 10, SPECIES_ZUBAT}, + {12, 12, SPECIES_ZUBAT}, + {8, 8, SPECIES_ZUBAT}, + {14, 14, SPECIES_ZUBAT}, + {10, 10, SPECIES_ZUBAT}, + {12, 12, SPECIES_ZUBAT}, + {16, 16, SPECIES_ZUBAT}, + {6, 6, SPECIES_ZUBAT}, + {8, 8, SPECIES_ZUBAT}, + {14, 14, SPECIES_ZUBAT}, + {8, 8, SPECIES_ZUBAT}, + {14, 14, SPECIES_ZUBAT}, }; const struct WildPokemonInfo gAlteringCave1_LandMonsInfo = {7, gAlteringCave1_LandMons}; const struct WildPokemon gAlteringCave2_LandMons[] = { - {7, 7, SPECIES_MAREEP}, - {9, 9, SPECIES_MAREEP}, - {5, 5, SPECIES_MAREEP}, - {11, 11, SPECIES_MAREEP}, - {7, 7, SPECIES_MAREEP}, - {9, 9, SPECIES_MAREEP}, - {13, 13, SPECIES_MAREEP}, - {3, 3, SPECIES_MAREEP}, - {5, 5, SPECIES_MAREEP}, - {11, 11, SPECIES_MAREEP}, - {5, 5, SPECIES_MAREEP}, - {11, 11, SPECIES_MAREEP}, + {7, 7, SPECIES_MAREEP}, + {9, 9, SPECIES_MAREEP}, + {5, 5, SPECIES_MAREEP}, + {11, 11, SPECIES_MAREEP}, + {7, 7, SPECIES_MAREEP}, + {9, 9, SPECIES_MAREEP}, + {13, 13, SPECIES_MAREEP}, + {3, 3, SPECIES_MAREEP}, + {5, 5, SPECIES_MAREEP}, + {11, 11, SPECIES_MAREEP}, + {5, 5, SPECIES_MAREEP}, + {11, 11, SPECIES_MAREEP}, }; const struct WildPokemonInfo gAlteringCave2_LandMonsInfo = {7, gAlteringCave2_LandMons}; const struct WildPokemon gAlteringCave3_LandMons[] = { - {23, 23, SPECIES_PINECO}, - {25, 25, SPECIES_PINECO}, - {22, 22, SPECIES_PINECO}, - {27, 27, SPECIES_PINECO}, - {23, 23, SPECIES_PINECO}, - {25, 25, SPECIES_PINECO}, - {29, 29, SPECIES_PINECO}, - {19, 19, SPECIES_PINECO}, - {21, 21, SPECIES_PINECO}, - {27, 27, SPECIES_PINECO}, - {21, 21, SPECIES_PINECO}, - {27, 27, SPECIES_PINECO}, + {23, 23, SPECIES_PINECO}, + {25, 25, SPECIES_PINECO}, + {22, 22, SPECIES_PINECO}, + {27, 27, SPECIES_PINECO}, + {23, 23, SPECIES_PINECO}, + {25, 25, SPECIES_PINECO}, + {29, 29, SPECIES_PINECO}, + {19, 19, SPECIES_PINECO}, + {21, 21, SPECIES_PINECO}, + {27, 27, SPECIES_PINECO}, + {21, 21, SPECIES_PINECO}, + {27, 27, SPECIES_PINECO}, }; const struct WildPokemonInfo gAlteringCave3_LandMonsInfo = {7, gAlteringCave3_LandMons}; const struct WildPokemon gAlteringCave4_LandMons[] = { - {16, 16, SPECIES_HOUNDOUR}, - {18, 18, SPECIES_HOUNDOUR}, - {14, 14, SPECIES_HOUNDOUR}, - {20, 20, SPECIES_HOUNDOUR}, - {16, 16, SPECIES_HOUNDOUR}, - {18, 18, SPECIES_HOUNDOUR}, - {22, 22, SPECIES_HOUNDOUR}, - {12, 12, SPECIES_HOUNDOUR}, - {14, 14, SPECIES_HOUNDOUR}, - {20, 20, SPECIES_HOUNDOUR}, - {14, 14, SPECIES_HOUNDOUR}, - {20, 20, SPECIES_HOUNDOUR}, + {16, 16, SPECIES_HOUNDOUR}, + {18, 18, SPECIES_HOUNDOUR}, + {14, 14, SPECIES_HOUNDOUR}, + {20, 20, SPECIES_HOUNDOUR}, + {16, 16, SPECIES_HOUNDOUR}, + {18, 18, SPECIES_HOUNDOUR}, + {22, 22, SPECIES_HOUNDOUR}, + {12, 12, SPECIES_HOUNDOUR}, + {14, 14, SPECIES_HOUNDOUR}, + {20, 20, SPECIES_HOUNDOUR}, + {14, 14, SPECIES_HOUNDOUR}, + {20, 20, SPECIES_HOUNDOUR}, }; const struct WildPokemonInfo gAlteringCave4_LandMonsInfo = {7, gAlteringCave4_LandMons}; const struct WildPokemon gAlteringCave5_LandMons[] = { - {10, 10, SPECIES_TEDDIURSA}, - {12, 12, SPECIES_TEDDIURSA}, - {8, 8, SPECIES_TEDDIURSA}, - {14, 14, SPECIES_TEDDIURSA}, - {10, 10, SPECIES_TEDDIURSA}, - {12, 12, SPECIES_TEDDIURSA}, - {16, 16, SPECIES_TEDDIURSA}, - {6, 6, SPECIES_TEDDIURSA}, - {8, 8, SPECIES_TEDDIURSA}, - {14, 14, SPECIES_TEDDIURSA}, - {8, 8, SPECIES_TEDDIURSA}, - {14, 14, SPECIES_TEDDIURSA}, + {10, 10, SPECIES_TEDDIURSA}, + {12, 12, SPECIES_TEDDIURSA}, + {8, 8, SPECIES_TEDDIURSA}, + {14, 14, SPECIES_TEDDIURSA}, + {10, 10, SPECIES_TEDDIURSA}, + {12, 12, SPECIES_TEDDIURSA}, + {16, 16, SPECIES_TEDDIURSA}, + {6, 6, SPECIES_TEDDIURSA}, + {8, 8, SPECIES_TEDDIURSA}, + {14, 14, SPECIES_TEDDIURSA}, + {8, 8, SPECIES_TEDDIURSA}, + {14, 14, SPECIES_TEDDIURSA}, }; const struct WildPokemonInfo gAlteringCave5_LandMonsInfo = {7, gAlteringCave5_LandMons}; const struct WildPokemon gAlteringCave6_LandMons[] = { - {22, 22, SPECIES_AIPOM}, - {24, 24, SPECIES_AIPOM}, - {20, 20, SPECIES_AIPOM}, - {26, 26, SPECIES_AIPOM}, - {22, 22, SPECIES_AIPOM}, - {24, 24, SPECIES_AIPOM}, - {28, 28, SPECIES_AIPOM}, - {18, 18, SPECIES_AIPOM}, - {20, 20, SPECIES_AIPOM}, - {26, 26, SPECIES_AIPOM}, - {20, 20, SPECIES_AIPOM}, - {26, 26, SPECIES_AIPOM}, + {22, 22, SPECIES_AIPOM}, + {24, 24, SPECIES_AIPOM}, + {20, 20, SPECIES_AIPOM}, + {26, 26, SPECIES_AIPOM}, + {22, 22, SPECIES_AIPOM}, + {24, 24, SPECIES_AIPOM}, + {28, 28, SPECIES_AIPOM}, + {18, 18, SPECIES_AIPOM}, + {20, 20, SPECIES_AIPOM}, + {26, 26, SPECIES_AIPOM}, + {20, 20, SPECIES_AIPOM}, + {26, 26, SPECIES_AIPOM}, }; const struct WildPokemonInfo gAlteringCave6_LandMonsInfo = {7, gAlteringCave6_LandMons}; const struct WildPokemon gAlteringCave7_LandMons[] = { - {22, 22, SPECIES_SHUCKLE}, - {24, 24, SPECIES_SHUCKLE}, - {20, 20, SPECIES_SHUCKLE}, - {26, 26, SPECIES_SHUCKLE}, - {22, 22, SPECIES_SHUCKLE}, - {24, 24, SPECIES_SHUCKLE}, - {28, 28, SPECIES_SHUCKLE}, - {18, 18, SPECIES_SHUCKLE}, - {20, 20, SPECIES_SHUCKLE}, - {26, 26, SPECIES_SHUCKLE}, - {20, 20, SPECIES_SHUCKLE}, - {26, 26, SPECIES_SHUCKLE}, + {22, 22, SPECIES_SHUCKLE}, + {24, 24, SPECIES_SHUCKLE}, + {20, 20, SPECIES_SHUCKLE}, + {26, 26, SPECIES_SHUCKLE}, + {22, 22, SPECIES_SHUCKLE}, + {24, 24, SPECIES_SHUCKLE}, + {28, 28, SPECIES_SHUCKLE}, + {18, 18, SPECIES_SHUCKLE}, + {20, 20, SPECIES_SHUCKLE}, + {26, 26, SPECIES_SHUCKLE}, + {20, 20, SPECIES_SHUCKLE}, + {26, 26, SPECIES_SHUCKLE}, }; const struct WildPokemonInfo gAlteringCave7_LandMonsInfo = {7, gAlteringCave7_LandMons}; const struct WildPokemon gAlteringCave8_LandMons[] = { - {22, 22, SPECIES_STANTLER}, - {24, 24, SPECIES_STANTLER}, - {20, 20, SPECIES_STANTLER}, - {26, 26, SPECIES_STANTLER}, - {22, 22, SPECIES_STANTLER}, - {24, 24, SPECIES_STANTLER}, - {28, 28, SPECIES_STANTLER}, - {18, 18, SPECIES_STANTLER}, - {20, 20, SPECIES_STANTLER}, - {26, 26, SPECIES_STANTLER}, - {20, 20, SPECIES_STANTLER}, - {26, 26, SPECIES_STANTLER}, + {22, 22, SPECIES_STANTLER}, + {24, 24, SPECIES_STANTLER}, + {20, 20, SPECIES_STANTLER}, + {26, 26, SPECIES_STANTLER}, + {22, 22, SPECIES_STANTLER}, + {24, 24, SPECIES_STANTLER}, + {28, 28, SPECIES_STANTLER}, + {18, 18, SPECIES_STANTLER}, + {20, 20, SPECIES_STANTLER}, + {26, 26, SPECIES_STANTLER}, + {20, 20, SPECIES_STANTLER}, + {26, 26, SPECIES_STANTLER}, }; const struct WildPokemonInfo gAlteringCave8_LandMonsInfo = {7, gAlteringCave8_LandMons}; const struct WildPokemon gAlteringCave9_LandMons[] = { - {22, 22, SPECIES_SMEARGLE}, - {24, 24, SPECIES_SMEARGLE}, - {20, 20, SPECIES_SMEARGLE}, - {26, 26, SPECIES_SMEARGLE}, - {22, 22, SPECIES_SMEARGLE}, - {24, 24, SPECIES_SMEARGLE}, - {28, 28, SPECIES_SMEARGLE}, - {18, 18, SPECIES_SMEARGLE}, - {20, 20, SPECIES_SMEARGLE}, - {26, 26, SPECIES_SMEARGLE}, - {20, 20, SPECIES_SMEARGLE}, - {26, 26, SPECIES_SMEARGLE}, + {22, 22, SPECIES_SMEARGLE}, + {24, 24, SPECIES_SMEARGLE}, + {20, 20, SPECIES_SMEARGLE}, + {26, 26, SPECIES_SMEARGLE}, + {22, 22, SPECIES_SMEARGLE}, + {24, 24, SPECIES_SMEARGLE}, + {28, 28, SPECIES_SMEARGLE}, + {18, 18, SPECIES_SMEARGLE}, + {20, 20, SPECIES_SMEARGLE}, + {26, 26, SPECIES_SMEARGLE}, + {20, 20, SPECIES_SMEARGLE}, + {26, 26, SPECIES_SMEARGLE}, }; const struct WildPokemonInfo gAlteringCave9_LandMonsInfo = {7, gAlteringCave9_LandMons}; const struct WildPokemon gMeteorFalls_StevensCave_LandMons[] = { - {33, 33, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {35, 35, SPECIES_SOLROCK}, - {33, 33, SPECIES_SOLROCK}, - {37, 37, SPECIES_SOLROCK}, - {35, 35, SPECIES_GOLBAT}, - {39, 39, SPECIES_SOLROCK}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {35, 35, SPECIES_SOLROCK}, + {33, 33, SPECIES_SOLROCK}, + {37, 37, SPECIES_SOLROCK}, + {35, 35, SPECIES_GOLBAT}, + {39, 39, SPECIES_SOLROCK}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gMeteorFalls_StevensCave_LandMonsInfo = {10, gMeteorFalls_StevensCave_LandMons}; const struct WildPokemonHeader gWildMonHeaders[] = { - { - .mapGroup = MAP_GROUP(ROUTE101), - .mapNum = MAP_NUM(ROUTE101), - .landMonsInfo = &gRoute101_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ROUTE102), - .mapNum = MAP_NUM(ROUTE102), - .landMonsInfo = &gRoute102_LandMonsInfo, - .waterMonsInfo = &gRoute102_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute102_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE103), - .mapNum = MAP_NUM(ROUTE103), - .landMonsInfo = &gRoute103_LandMonsInfo, - .waterMonsInfo = &gRoute103_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute103_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE104), - .mapNum = MAP_NUM(ROUTE104), - .landMonsInfo = &gRoute104_LandMonsInfo, - .waterMonsInfo = &gRoute104_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute104_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE105), - .mapNum = MAP_NUM(ROUTE105), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute105_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute105_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE110), - .mapNum = MAP_NUM(ROUTE110), - .landMonsInfo = &gRoute110_LandMonsInfo, - .waterMonsInfo = &gRoute110_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute110_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE111), - .mapNum = MAP_NUM(ROUTE111), - .landMonsInfo = &gRoute111_LandMonsInfo, - .waterMonsInfo = &gRoute111_WaterMonsInfo, - .rockSmashMonsInfo = &gRoute111_RockSmashMonsInfo, - .fishingMonsInfo = &gRoute111_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE112), - .mapNum = MAP_NUM(ROUTE112), - .landMonsInfo = &gRoute112_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ROUTE113), - .mapNum = MAP_NUM(ROUTE113), - .landMonsInfo = &gRoute113_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ROUTE114), - .mapNum = MAP_NUM(ROUTE114), - .landMonsInfo = &gRoute114_LandMonsInfo, - .waterMonsInfo = &gRoute114_WaterMonsInfo, - .rockSmashMonsInfo = &gRoute114_RockSmashMonsInfo, - .fishingMonsInfo = &gRoute114_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE116), - .mapNum = MAP_NUM(ROUTE116), - .landMonsInfo = &gRoute116_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ROUTE117), - .mapNum = MAP_NUM(ROUTE117), - .landMonsInfo = &gRoute117_LandMonsInfo, - .waterMonsInfo = &gRoute117_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute117_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE118), - .mapNum = MAP_NUM(ROUTE118), - .landMonsInfo = &gRoute118_LandMonsInfo, - .waterMonsInfo = &gRoute118_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute118_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE124), - .mapNum = MAP_NUM(ROUTE124), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute124_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute124_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(PETALBURG_WOODS), - .mapNum = MAP_NUM(PETALBURG_WOODS), - .landMonsInfo = &gPetalburgWoods_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(RUSTURF_TUNNEL), - .mapNum = MAP_NUM(RUSTURF_TUNNEL), - .landMonsInfo = &gRusturfTunnel_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(GRANITE_CAVE_1F), - .mapNum = MAP_NUM(GRANITE_CAVE_1F), - .landMonsInfo = &gGraniteCave_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(GRANITE_CAVE_B1F), - .mapNum = MAP_NUM(GRANITE_CAVE_B1F), - .landMonsInfo = &gGraniteCave_B1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_1F), - .mapNum = MAP_NUM(MT_PYRE_1F), - .landMonsInfo = &gMtPyre_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(VICTORY_ROAD_1F), - .mapNum = MAP_NUM(VICTORY_ROAD_1F), - .landMonsInfo = &gVictoryRoad_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTH), - .mapNum = MAP_NUM(SAFARI_ZONE_SOUTH), - .landMonsInfo = &gSafariZone_South_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(UNDERWATER2), - .mapNum = MAP_NUM(UNDERWATER2), - .landMonsInfo = NULL, - .waterMonsInfo = &gUnderwater2_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ABANDONED_SHIP_ROOMS_B1F), - .mapNum = MAP_NUM(ABANDONED_SHIP_ROOMS_B1F), - .landMonsInfo = NULL, - .waterMonsInfo = &gAbandonedShip_Rooms_B1F_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gAbandonedShip_Rooms_B1F_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(GRANITE_CAVE_B2F), - .mapNum = MAP_NUM(GRANITE_CAVE_B2F), - .landMonsInfo = &gGraniteCave_B2F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = &gGraniteCave_B2F_RockSmashMonsInfo, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(FIERY_PATH), - .mapNum = MAP_NUM(FIERY_PATH), - .landMonsInfo = &gFieryPath_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(METEOR_FALLS_B1F_2R), - .mapNum = MAP_NUM(METEOR_FALLS_B1F_2R), - .landMonsInfo = &gMeteorFalls_B1F_2R_LandMonsInfo, - .waterMonsInfo = &gMeteorFalls_B1F_2R_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gMeteorFalls_B1F_2R_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(JAGGED_PASS), - .mapNum = MAP_NUM(JAGGED_PASS), - .landMonsInfo = &gJaggedPass_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ROUTE106), - .mapNum = MAP_NUM(ROUTE106), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute106_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute106_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE107), - .mapNum = MAP_NUM(ROUTE107), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute107_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute107_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE108), - .mapNum = MAP_NUM(ROUTE108), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute108_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute108_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE109), - .mapNum = MAP_NUM(ROUTE109), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute109_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute109_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE115), - .mapNum = MAP_NUM(ROUTE115), - .landMonsInfo = &gRoute115_LandMonsInfo, - .waterMonsInfo = &gRoute115_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute115_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(NEW_MAUVILLE_INSIDE), - .mapNum = MAP_NUM(NEW_MAUVILLE_INSIDE), - .landMonsInfo = &gNewMauville_Inside_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ROUTE119), - .mapNum = MAP_NUM(ROUTE119), - .landMonsInfo = &gRoute119_LandMonsInfo, - .waterMonsInfo = &gRoute119_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute119_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE120), - .mapNum = MAP_NUM(ROUTE120), - .landMonsInfo = &gRoute120_LandMonsInfo, - .waterMonsInfo = &gRoute120_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute120_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE121), - .mapNum = MAP_NUM(ROUTE121), - .landMonsInfo = &gRoute121_LandMonsInfo, - .waterMonsInfo = &gRoute121_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute121_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE122), - .mapNum = MAP_NUM(ROUTE122), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute122_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute122_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE123), - .mapNum = MAP_NUM(ROUTE123), - .landMonsInfo = &gRoute123_LandMonsInfo, - .waterMonsInfo = &gRoute123_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute123_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_2F), - .mapNum = MAP_NUM(MT_PYRE_2F), - .landMonsInfo = &gMtPyre_2F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_3F), - .mapNum = MAP_NUM(MT_PYRE_3F), - .landMonsInfo = &gMtPyre_3F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_4F), - .mapNum = MAP_NUM(MT_PYRE_4F), - .landMonsInfo = &gMtPyre_4F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_5F), - .mapNum = MAP_NUM(MT_PYRE_5F), - .landMonsInfo = &gMtPyre_5F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_6F), - .mapNum = MAP_NUM(MT_PYRE_6F), - .landMonsInfo = &gMtPyre_6F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_EXTERIOR), - .mapNum = MAP_NUM(MT_PYRE_EXTERIOR), - .landMonsInfo = &gMtPyre_Exterior_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_SUMMIT), - .mapNum = MAP_NUM(MT_PYRE_SUMMIT), - .landMonsInfo = &gMtPyre_Summit_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(GRANITE_CAVE_STEVENS_ROOM), - .mapNum = MAP_NUM(GRANITE_CAVE_STEVENS_ROOM), - .landMonsInfo = &gGraniteCave_StevensRoom_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ROUTE125), - .mapNum = MAP_NUM(ROUTE125), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute125_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute125_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE126), - .mapNum = MAP_NUM(ROUTE126), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute126_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute126_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE127), - .mapNum = MAP_NUM(ROUTE127), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute127_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute127_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE128), - .mapNum = MAP_NUM(ROUTE128), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute128_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute128_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE129), - .mapNum = MAP_NUM(ROUTE129), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute129_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute129_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE130), - .mapNum = MAP_NUM(ROUTE130), - .landMonsInfo = &gRoute130_LandMonsInfo, - .waterMonsInfo = &gRoute130_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute130_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE131), - .mapNum = MAP_NUM(ROUTE131), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute131_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute131_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE132), - .mapNum = MAP_NUM(ROUTE132), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute132_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute132_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE133), - .mapNum = MAP_NUM(ROUTE133), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute133_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute133_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE134), - .mapNum = MAP_NUM(ROUTE134), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute134_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute134_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS), - .mapNum = MAP_NUM(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS), - .landMonsInfo = NULL, - .waterMonsInfo = &gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM1), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM1), - .landMonsInfo = &gSeafloorCavern_Room1_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM2), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM2), - .landMonsInfo = &gSeafloorCavern_Room2_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM3), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM3), - .landMonsInfo = &gSeafloorCavern_Room3_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM4), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM4), - .landMonsInfo = &gSeafloorCavern_Room4_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM5), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM5), - .landMonsInfo = &gSeafloorCavern_Room5_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM6), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM6), - .landMonsInfo = &gSeafloorCavern_Room6_LandMonsInfo, - .waterMonsInfo = &gSeafloorCavern_Room6_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSeafloorCavern_Room6_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM7), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM7), - .landMonsInfo = &gSeafloorCavern_Room7_LandMonsInfo, - .waterMonsInfo = &gSeafloorCavern_Room7_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSeafloorCavern_Room7_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM8), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM8), - .landMonsInfo = &gSeafloorCavern_Room8_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ENTRANCE), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ENTRANCE), - .landMonsInfo = NULL, - .waterMonsInfo = &gSeafloorCavern_Entrance_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSeafloorCavern_Entrance_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_ENTRANCE), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_ENTRANCE), - .landMonsInfo = &gCaveOfOrigin_Entrance_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_1F), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_1F), - .landMonsInfo = &gCaveOfOrigin_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1), - .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2), - .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3), - .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(NEW_MAUVILLE_ENTRANCE), - .mapNum = MAP_NUM(NEW_MAUVILLE_ENTRANCE), - .landMonsInfo = &gNewMauville_Entrance_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHWEST), - .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHWEST), - .landMonsInfo = &gSafariZone_Southwest_LandMonsInfo, - .waterMonsInfo = &gSafariZone_Southwest_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSafariZone_Southwest_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTH), - .mapNum = MAP_NUM(SAFARI_ZONE_NORTH), - .landMonsInfo = &gSafariZone_North_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = &gSafariZone_North_RockSmashMonsInfo, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHWEST), - .mapNum = MAP_NUM(SAFARI_ZONE_NORTHWEST), - .landMonsInfo = &gSafariZone_Northwest_LandMonsInfo, - .waterMonsInfo = &gSafariZone_Northwest_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSafariZone_Northwest_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(VICTORY_ROAD_B1F), - .mapNum = MAP_NUM(VICTORY_ROAD_B1F), - .landMonsInfo = &gVictoryRoad_B1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = &gVictoryRoad_B1F_RockSmashMonsInfo, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(VICTORY_ROAD_B2F), - .mapNum = MAP_NUM(VICTORY_ROAD_B2F), - .landMonsInfo = &gVictoryRoad_B2F_LandMonsInfo, - .waterMonsInfo = &gVictoryRoad_B2F_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gVictoryRoad_B2F_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(METEOR_FALLS_1F_1R), - .mapNum = MAP_NUM(METEOR_FALLS_1F_1R), - .landMonsInfo = &gMeteorFalls_1F_1R_LandMonsInfo, - .waterMonsInfo = &gMeteorFalls_1F_1R_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gMeteorFalls_1F_1R_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(METEOR_FALLS_1F_2R), - .mapNum = MAP_NUM(METEOR_FALLS_1F_2R), - .landMonsInfo = &gMeteorFalls_1F_2R_LandMonsInfo, - .waterMonsInfo = &gMeteorFalls_1F_2R_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gMeteorFalls_1F_2R_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(METEOR_FALLS_B1F_1R), - .mapNum = MAP_NUM(METEOR_FALLS_B1F_1R), - .landMonsInfo = &gMeteorFalls_B1F_1R_LandMonsInfo, - .waterMonsInfo = &gMeteorFalls_B1F_1R_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gMeteorFalls_B1F_1R_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM), - .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM), - .landMonsInfo = &gShoalCave_LowTideStairsRoom_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM), - .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM), - .landMonsInfo = &gShoalCave_LowTideLowerRoom_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_INNER_ROOM), - .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_INNER_ROOM), - .landMonsInfo = &gShoalCave_LowTideInnerRoom_LandMonsInfo, - .waterMonsInfo = &gShoalCave_LowTideInnerRoom_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gShoalCave_LowTideInnerRoom_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM), - .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM), - .landMonsInfo = &gShoalCave_LowTideEntranceRoom_LandMonsInfo, - .waterMonsInfo = &gShoalCave_LowTideEntranceRoom_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gShoalCave_LowTideEntranceRoom_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(LILYCOVE_CITY), - .mapNum = MAP_NUM(LILYCOVE_CITY), - .landMonsInfo = NULL, - .waterMonsInfo = &gLilycoveCity_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gLilycoveCity_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(DEWFORD_TOWN), - .mapNum = MAP_NUM(DEWFORD_TOWN), - .landMonsInfo = NULL, - .waterMonsInfo = &gDewfordTown_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gDewfordTown_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SLATEPORT_CITY), - .mapNum = MAP_NUM(SLATEPORT_CITY), - .landMonsInfo = NULL, - .waterMonsInfo = &gSlateportCity_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSlateportCity_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(MOSSDEEP_CITY), - .mapNum = MAP_NUM(MOSSDEEP_CITY), - .landMonsInfo = NULL, - .waterMonsInfo = &gMossdeepCity_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gMossdeepCity_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(PACIFIDLOG_TOWN), - .mapNum = MAP_NUM(PACIFIDLOG_TOWN), - .landMonsInfo = NULL, - .waterMonsInfo = &gPacifidlogTown_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gPacifidlogTown_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(EVER_GRANDE_CITY), - .mapNum = MAP_NUM(EVER_GRANDE_CITY), - .landMonsInfo = NULL, - .waterMonsInfo = &gEverGrandeCity_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gEverGrandeCity_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(PETALBURG_CITY), - .mapNum = MAP_NUM(PETALBURG_CITY), - .landMonsInfo = NULL, - .waterMonsInfo = &gPetalburgCity_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gPetalburgCity_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(UNDERWATER1), - .mapNum = MAP_NUM(UNDERWATER1), - .landMonsInfo = NULL, - .waterMonsInfo = &gUnderwater1_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ICE_ROOM), - .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ICE_ROOM), - .landMonsInfo = &gShoalCave_LowTideIceRoom_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SKY_PILLAR_1F), - .mapNum = MAP_NUM(SKY_PILLAR_1F), - .landMonsInfo = &gSkyPillar_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SOOTOPOLIS_CITY), - .mapNum = MAP_NUM(SOOTOPOLIS_CITY), - .landMonsInfo = NULL, - .waterMonsInfo = &gSootopolisCity_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSootopolisCity_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SKY_PILLAR_3F), - .mapNum = MAP_NUM(SKY_PILLAR_3F), - .landMonsInfo = &gSkyPillar_3F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SKY_PILLAR_5F), - .mapNum = MAP_NUM(SKY_PILLAR_5F), - .landMonsInfo = &gSkyPillar_5F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHEAST), - .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHEAST), - .landMonsInfo = &gSafariZone_Southeast_LandMonsInfo, - .waterMonsInfo = &gSafariZone_Southeast_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSafariZone_Southeast_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHEAST), - .mapNum = MAP_NUM(SAFARI_ZONE_NORTHEAST), - .landMonsInfo = &gSafariZone_Northeast_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = &gSafariZone_Northeast_RockSmashMonsInfo, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_1F), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_1F), - .landMonsInfo = &gMagmaHideout_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_1R), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_1R), - .landMonsInfo = &gMagmaHideout_2F_1R_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_2R), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_2R), - .landMonsInfo = &gMagmaHideout_2F_2R_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_1R), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_1R), - .landMonsInfo = &gMagmaHideout_3F_1R_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_2R), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_2R), - .landMonsInfo = &gMagmaHideout_3F_2R_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_4F), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_4F), - .landMonsInfo = &gMagmaHideout_4F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_3R), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_3R), - .landMonsInfo = &gMagmaHideout_3F_3R_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_3R), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_3R), - .landMonsInfo = &gMagmaHideout_2F_3R_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MIRAGE_TOWER_1F), - .mapNum = MAP_NUM(MIRAGE_TOWER_1F), - .landMonsInfo = &gMirageTower_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MIRAGE_TOWER_2F), - .mapNum = MAP_NUM(MIRAGE_TOWER_2F), - .landMonsInfo = &gMirageTower_2F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MIRAGE_TOWER_3F), - .mapNum = MAP_NUM(MIRAGE_TOWER_3F), - .landMonsInfo = &gMirageTower_3F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MIRAGE_TOWER_4F), - .mapNum = MAP_NUM(MIRAGE_TOWER_4F), - .landMonsInfo = &gMirageTower_4F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(DESERT_UNDERPASS), - .mapNum = MAP_NUM(DESERT_UNDERPASS), - .landMonsInfo = &gDesertUnderpass_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ARTISAN_CAVE_B1F), - .mapNum = MAP_NUM(ARTISAN_CAVE_B1F), - .landMonsInfo = &gArtisanCave_B1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ARTISAN_CAVE_1F), - .mapNum = MAP_NUM(ARTISAN_CAVE_1F), - .landMonsInfo = &gArtisanCave_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave1_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave2_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave3_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave4_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave5_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave6_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave7_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave8_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave9_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(METEOR_FALLS_STEVENS_CAVE), - .mapNum = MAP_NUM(METEOR_FALLS_STEVENS_CAVE), - .landMonsInfo = &gMeteorFalls_StevensCave_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(UNDEFINED), - .mapNum = MAP_NUM(UNDEFINED), - .landMonsInfo = NULL, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, + { + .mapGroup = MAP_GROUP(ROUTE101), + .mapNum = MAP_NUM(ROUTE101), + .landMonsInfo = &gRoute101_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE102), + .mapNum = MAP_NUM(ROUTE102), + .landMonsInfo = &gRoute102_LandMonsInfo, + .waterMonsInfo = &gRoute102_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute102_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE103), + .mapNum = MAP_NUM(ROUTE103), + .landMonsInfo = &gRoute103_LandMonsInfo, + .waterMonsInfo = &gRoute103_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute103_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE104), + .mapNum = MAP_NUM(ROUTE104), + .landMonsInfo = &gRoute104_LandMonsInfo, + .waterMonsInfo = &gRoute104_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute104_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE105), + .mapNum = MAP_NUM(ROUTE105), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute105_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute105_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE110), + .mapNum = MAP_NUM(ROUTE110), + .landMonsInfo = &gRoute110_LandMonsInfo, + .waterMonsInfo = &gRoute110_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute110_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE111), + .mapNum = MAP_NUM(ROUTE111), + .landMonsInfo = &gRoute111_LandMonsInfo, + .waterMonsInfo = &gRoute111_WaterMonsInfo, + .rockSmashMonsInfo = &gRoute111_RockSmashMonsInfo, + .fishingMonsInfo = &gRoute111_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE112), + .mapNum = MAP_NUM(ROUTE112), + .landMonsInfo = &gRoute112_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE113), + .mapNum = MAP_NUM(ROUTE113), + .landMonsInfo = &gRoute113_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE114), + .mapNum = MAP_NUM(ROUTE114), + .landMonsInfo = &gRoute114_LandMonsInfo, + .waterMonsInfo = &gRoute114_WaterMonsInfo, + .rockSmashMonsInfo = &gRoute114_RockSmashMonsInfo, + .fishingMonsInfo = &gRoute114_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE116), + .mapNum = MAP_NUM(ROUTE116), + .landMonsInfo = &gRoute116_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE117), + .mapNum = MAP_NUM(ROUTE117), + .landMonsInfo = &gRoute117_LandMonsInfo, + .waterMonsInfo = &gRoute117_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute117_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE118), + .mapNum = MAP_NUM(ROUTE118), + .landMonsInfo = &gRoute118_LandMonsInfo, + .waterMonsInfo = &gRoute118_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute118_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE124), + .mapNum = MAP_NUM(ROUTE124), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute124_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute124_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(PETALBURG_WOODS), + .mapNum = MAP_NUM(PETALBURG_WOODS), + .landMonsInfo = &gPetalburgWoods_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(RUSTURF_TUNNEL), + .mapNum = MAP_NUM(RUSTURF_TUNNEL), + .landMonsInfo = &gRusturfTunnel_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(GRANITE_CAVE_1F), + .mapNum = MAP_NUM(GRANITE_CAVE_1F), + .landMonsInfo = &gGraniteCave_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(GRANITE_CAVE_B1F), + .mapNum = MAP_NUM(GRANITE_CAVE_B1F), + .landMonsInfo = &gGraniteCave_B1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_1F), + .mapNum = MAP_NUM(MT_PYRE_1F), + .landMonsInfo = &gMtPyre_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(VICTORY_ROAD_1F), + .mapNum = MAP_NUM(VICTORY_ROAD_1F), + .landMonsInfo = &gVictoryRoad_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTH), + .mapNum = MAP_NUM(SAFARI_ZONE_SOUTH), + .landMonsInfo = &gSafariZone_South_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(UNDERWATER2), + .mapNum = MAP_NUM(UNDERWATER2), + .landMonsInfo = NULL, + .waterMonsInfo = &gUnderwater2_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ABANDONED_SHIP_ROOMS_B1F), + .mapNum = MAP_NUM(ABANDONED_SHIP_ROOMS_B1F), + .landMonsInfo = NULL, + .waterMonsInfo = &gAbandonedShip_Rooms_B1F_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gAbandonedShip_Rooms_B1F_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(GRANITE_CAVE_B2F), + .mapNum = MAP_NUM(GRANITE_CAVE_B2F), + .landMonsInfo = &gGraniteCave_B2F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = &gGraniteCave_B2F_RockSmashMonsInfo, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(FIERY_PATH), + .mapNum = MAP_NUM(FIERY_PATH), + .landMonsInfo = &gFieryPath_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(METEOR_FALLS_B1F_2R), + .mapNum = MAP_NUM(METEOR_FALLS_B1F_2R), + .landMonsInfo = &gMeteorFalls_B1F_2R_LandMonsInfo, + .waterMonsInfo = &gMeteorFalls_B1F_2R_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gMeteorFalls_B1F_2R_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(JAGGED_PASS), + .mapNum = MAP_NUM(JAGGED_PASS), + .landMonsInfo = &gJaggedPass_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE106), + .mapNum = MAP_NUM(ROUTE106), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute106_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute106_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE107), + .mapNum = MAP_NUM(ROUTE107), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute107_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute107_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE108), + .mapNum = MAP_NUM(ROUTE108), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute108_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute108_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE109), + .mapNum = MAP_NUM(ROUTE109), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute109_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute109_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE115), + .mapNum = MAP_NUM(ROUTE115), + .landMonsInfo = &gRoute115_LandMonsInfo, + .waterMonsInfo = &gRoute115_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute115_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(NEW_MAUVILLE_INSIDE), + .mapNum = MAP_NUM(NEW_MAUVILLE_INSIDE), + .landMonsInfo = &gNewMauville_Inside_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE119), + .mapNum = MAP_NUM(ROUTE119), + .landMonsInfo = &gRoute119_LandMonsInfo, + .waterMonsInfo = &gRoute119_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute119_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE120), + .mapNum = MAP_NUM(ROUTE120), + .landMonsInfo = &gRoute120_LandMonsInfo, + .waterMonsInfo = &gRoute120_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute120_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE121), + .mapNum = MAP_NUM(ROUTE121), + .landMonsInfo = &gRoute121_LandMonsInfo, + .waterMonsInfo = &gRoute121_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute121_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE122), + .mapNum = MAP_NUM(ROUTE122), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute122_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute122_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE123), + .mapNum = MAP_NUM(ROUTE123), + .landMonsInfo = &gRoute123_LandMonsInfo, + .waterMonsInfo = &gRoute123_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute123_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_2F), + .mapNum = MAP_NUM(MT_PYRE_2F), + .landMonsInfo = &gMtPyre_2F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_3F), + .mapNum = MAP_NUM(MT_PYRE_3F), + .landMonsInfo = &gMtPyre_3F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_4F), + .mapNum = MAP_NUM(MT_PYRE_4F), + .landMonsInfo = &gMtPyre_4F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_5F), + .mapNum = MAP_NUM(MT_PYRE_5F), + .landMonsInfo = &gMtPyre_5F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_6F), + .mapNum = MAP_NUM(MT_PYRE_6F), + .landMonsInfo = &gMtPyre_6F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_EXTERIOR), + .mapNum = MAP_NUM(MT_PYRE_EXTERIOR), + .landMonsInfo = &gMtPyre_Exterior_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_SUMMIT), + .mapNum = MAP_NUM(MT_PYRE_SUMMIT), + .landMonsInfo = &gMtPyre_Summit_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(GRANITE_CAVE_STEVENS_ROOM), + .mapNum = MAP_NUM(GRANITE_CAVE_STEVENS_ROOM), + .landMonsInfo = &gGraniteCave_StevensRoom_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE125), + .mapNum = MAP_NUM(ROUTE125), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute125_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute125_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE126), + .mapNum = MAP_NUM(ROUTE126), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute126_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute126_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE127), + .mapNum = MAP_NUM(ROUTE127), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute127_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute127_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE128), + .mapNum = MAP_NUM(ROUTE128), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute128_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute128_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE129), + .mapNum = MAP_NUM(ROUTE129), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute129_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute129_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE130), + .mapNum = MAP_NUM(ROUTE130), + .landMonsInfo = &gRoute130_LandMonsInfo, + .waterMonsInfo = &gRoute130_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute130_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE131), + .mapNum = MAP_NUM(ROUTE131), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute131_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute131_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE132), + .mapNum = MAP_NUM(ROUTE132), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute132_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute132_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE133), + .mapNum = MAP_NUM(ROUTE133), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute133_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute133_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE134), + .mapNum = MAP_NUM(ROUTE134), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute134_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute134_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS), + .mapNum = MAP_NUM(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS), + .landMonsInfo = NULL, + .waterMonsInfo = &gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM1), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM1), + .landMonsInfo = &gSeafloorCavern_Room1_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM2), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM2), + .landMonsInfo = &gSeafloorCavern_Room2_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM3), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM3), + .landMonsInfo = &gSeafloorCavern_Room3_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM4), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM4), + .landMonsInfo = &gSeafloorCavern_Room4_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM5), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM5), + .landMonsInfo = &gSeafloorCavern_Room5_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM6), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM6), + .landMonsInfo = &gSeafloorCavern_Room6_LandMonsInfo, + .waterMonsInfo = &gSeafloorCavern_Room6_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSeafloorCavern_Room6_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM7), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM7), + .landMonsInfo = &gSeafloorCavern_Room7_LandMonsInfo, + .waterMonsInfo = &gSeafloorCavern_Room7_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSeafloorCavern_Room7_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM8), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM8), + .landMonsInfo = &gSeafloorCavern_Room8_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ENTRANCE), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ENTRANCE), + .landMonsInfo = NULL, + .waterMonsInfo = &gSeafloorCavern_Entrance_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSeafloorCavern_Entrance_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_ENTRANCE), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_ENTRANCE), + .landMonsInfo = &gCaveOfOrigin_Entrance_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_1F), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_1F), + .landMonsInfo = &gCaveOfOrigin_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1), + .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2), + .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3), + .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(NEW_MAUVILLE_ENTRANCE), + .mapNum = MAP_NUM(NEW_MAUVILLE_ENTRANCE), + .landMonsInfo = &gNewMauville_Entrance_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHWEST), + .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHWEST), + .landMonsInfo = &gSafariZone_Southwest_LandMonsInfo, + .waterMonsInfo = &gSafariZone_Southwest_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSafariZone_Southwest_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTH), + .mapNum = MAP_NUM(SAFARI_ZONE_NORTH), + .landMonsInfo = &gSafariZone_North_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = &gSafariZone_North_RockSmashMonsInfo, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHWEST), + .mapNum = MAP_NUM(SAFARI_ZONE_NORTHWEST), + .landMonsInfo = &gSafariZone_Northwest_LandMonsInfo, + .waterMonsInfo = &gSafariZone_Northwest_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSafariZone_Northwest_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(VICTORY_ROAD_B1F), + .mapNum = MAP_NUM(VICTORY_ROAD_B1F), + .landMonsInfo = &gVictoryRoad_B1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = &gVictoryRoad_B1F_RockSmashMonsInfo, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(VICTORY_ROAD_B2F), + .mapNum = MAP_NUM(VICTORY_ROAD_B2F), + .landMonsInfo = &gVictoryRoad_B2F_LandMonsInfo, + .waterMonsInfo = &gVictoryRoad_B2F_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gVictoryRoad_B2F_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(METEOR_FALLS_1F_1R), + .mapNum = MAP_NUM(METEOR_FALLS_1F_1R), + .landMonsInfo = &gMeteorFalls_1F_1R_LandMonsInfo, + .waterMonsInfo = &gMeteorFalls_1F_1R_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gMeteorFalls_1F_1R_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(METEOR_FALLS_1F_2R), + .mapNum = MAP_NUM(METEOR_FALLS_1F_2R), + .landMonsInfo = &gMeteorFalls_1F_2R_LandMonsInfo, + .waterMonsInfo = &gMeteorFalls_1F_2R_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gMeteorFalls_1F_2R_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(METEOR_FALLS_B1F_1R), + .mapNum = MAP_NUM(METEOR_FALLS_B1F_1R), + .landMonsInfo = &gMeteorFalls_B1F_1R_LandMonsInfo, + .waterMonsInfo = &gMeteorFalls_B1F_1R_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gMeteorFalls_B1F_1R_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM), + .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM), + .landMonsInfo = &gShoalCave_LowTideStairsRoom_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM), + .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM), + .landMonsInfo = &gShoalCave_LowTideLowerRoom_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_INNER_ROOM), + .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_INNER_ROOM), + .landMonsInfo = &gShoalCave_LowTideInnerRoom_LandMonsInfo, + .waterMonsInfo = &gShoalCave_LowTideInnerRoom_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gShoalCave_LowTideInnerRoom_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM), + .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM), + .landMonsInfo = &gShoalCave_LowTideEntranceRoom_LandMonsInfo, + .waterMonsInfo = &gShoalCave_LowTideEntranceRoom_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gShoalCave_LowTideEntranceRoom_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(LILYCOVE_CITY), + .mapNum = MAP_NUM(LILYCOVE_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &gLilycoveCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gLilycoveCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(DEWFORD_TOWN), + .mapNum = MAP_NUM(DEWFORD_TOWN), + .landMonsInfo = NULL, + .waterMonsInfo = &gDewfordTown_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gDewfordTown_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SLATEPORT_CITY), + .mapNum = MAP_NUM(SLATEPORT_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &gSlateportCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSlateportCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(MOSSDEEP_CITY), + .mapNum = MAP_NUM(MOSSDEEP_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &gMossdeepCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gMossdeepCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(PACIFIDLOG_TOWN), + .mapNum = MAP_NUM(PACIFIDLOG_TOWN), + .landMonsInfo = NULL, + .waterMonsInfo = &gPacifidlogTown_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gPacifidlogTown_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(EVER_GRANDE_CITY), + .mapNum = MAP_NUM(EVER_GRANDE_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &gEverGrandeCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gEverGrandeCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(PETALBURG_CITY), + .mapNum = MAP_NUM(PETALBURG_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &gPetalburgCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gPetalburgCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(UNDERWATER1), + .mapNum = MAP_NUM(UNDERWATER1), + .landMonsInfo = NULL, + .waterMonsInfo = &gUnderwater1_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ICE_ROOM), + .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ICE_ROOM), + .landMonsInfo = &gShoalCave_LowTideIceRoom_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SKY_PILLAR_1F), + .mapNum = MAP_NUM(SKY_PILLAR_1F), + .landMonsInfo = &gSkyPillar_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SOOTOPOLIS_CITY), + .mapNum = MAP_NUM(SOOTOPOLIS_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &gSootopolisCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSootopolisCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SKY_PILLAR_3F), + .mapNum = MAP_NUM(SKY_PILLAR_3F), + .landMonsInfo = &gSkyPillar_3F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SKY_PILLAR_5F), + .mapNum = MAP_NUM(SKY_PILLAR_5F), + .landMonsInfo = &gSkyPillar_5F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHEAST), + .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHEAST), + .landMonsInfo = &gSafariZone_Southeast_LandMonsInfo, + .waterMonsInfo = &gSafariZone_Southeast_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSafariZone_Southeast_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHEAST), + .mapNum = MAP_NUM(SAFARI_ZONE_NORTHEAST), + .landMonsInfo = &gSafariZone_Northeast_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = &gSafariZone_Northeast_RockSmashMonsInfo, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_1F), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_1F), + .landMonsInfo = &gMagmaHideout_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_1R), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_1R), + .landMonsInfo = &gMagmaHideout_2F_1R_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_2R), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_2R), + .landMonsInfo = &gMagmaHideout_2F_2R_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_1R), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_1R), + .landMonsInfo = &gMagmaHideout_3F_1R_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_2R), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_2R), + .landMonsInfo = &gMagmaHideout_3F_2R_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_4F), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_4F), + .landMonsInfo = &gMagmaHideout_4F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_3R), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_3R), + .landMonsInfo = &gMagmaHideout_3F_3R_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_3R), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_3R), + .landMonsInfo = &gMagmaHideout_2F_3R_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MIRAGE_TOWER_1F), + .mapNum = MAP_NUM(MIRAGE_TOWER_1F), + .landMonsInfo = &gMirageTower_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MIRAGE_TOWER_2F), + .mapNum = MAP_NUM(MIRAGE_TOWER_2F), + .landMonsInfo = &gMirageTower_2F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MIRAGE_TOWER_3F), + .mapNum = MAP_NUM(MIRAGE_TOWER_3F), + .landMonsInfo = &gMirageTower_3F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MIRAGE_TOWER_4F), + .mapNum = MAP_NUM(MIRAGE_TOWER_4F), + .landMonsInfo = &gMirageTower_4F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(DESERT_UNDERPASS), + .mapNum = MAP_NUM(DESERT_UNDERPASS), + .landMonsInfo = &gDesertUnderpass_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ARTISAN_CAVE_B1F), + .mapNum = MAP_NUM(ARTISAN_CAVE_B1F), + .landMonsInfo = &gArtisanCave_B1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ARTISAN_CAVE_1F), + .mapNum = MAP_NUM(ARTISAN_CAVE_1F), + .landMonsInfo = &gArtisanCave_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave1_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave2_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave3_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave4_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave5_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave6_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave7_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave8_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave9_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(METEOR_FALLS_STEVENS_CAVE), + .mapNum = MAP_NUM(METEOR_FALLS_STEVENS_CAVE), + .landMonsInfo = &gMeteorFalls_StevensCave_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(UNDEFINED), + .mapNum = MAP_NUM(UNDEFINED), + .landMonsInfo = NULL, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, }; const struct WildPokemon gBattlePyramidPlaceholders_1[] = { - {5, 5, SPECIES_BULBASAUR}, - {5, 5, SPECIES_BULBASAUR}, - {5, 5, SPECIES_BULBASAUR}, - {5, 5, SPECIES_BULBASAUR}, - {5, 5, SPECIES_IVYSAUR}, - {5, 5, SPECIES_IVYSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_BULBASAUR}, + {5, 5, SPECIES_BULBASAUR}, + {5, 5, SPECIES_BULBASAUR}, + {5, 5, SPECIES_BULBASAUR}, + {5, 5, SPECIES_IVYSAUR}, + {5, 5, SPECIES_IVYSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_CHARMANDER}, }; const struct WildPokemonInfo gBattlePyramidPlaceholders_1Info = {4, gBattlePyramidPlaceholders_1}; const struct WildPokemon gBattlePyramidPlaceholders_2[] = { - {5, 5, SPECIES_IVYSAUR}, - {5, 5, SPECIES_IVYSAUR}, - {5, 5, SPECIES_IVYSAUR}, - {5, 5, SPECIES_IVYSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_IVYSAUR}, + {5, 5, SPECIES_IVYSAUR}, + {5, 5, SPECIES_IVYSAUR}, + {5, 5, SPECIES_IVYSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMANDER}, }; const struct WildPokemonInfo gBattlePyramidPlaceholders_2Info = {4, gBattlePyramidPlaceholders_2}; const struct WildPokemon gBattlePyramidPlaceholders_3[] = { - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARIZARD}, }; const struct WildPokemonInfo gBattlePyramidPlaceholders_3Info = {4, gBattlePyramidPlaceholders_3}; const struct WildPokemon gBattlePyramidPlaceholders_4[] = { - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_SQUIRTLE}, }; const struct WildPokemonInfo gBattlePyramidPlaceholders_4Info = {4, gBattlePyramidPlaceholders_4}; const struct WildPokemon gBattlePyramidPlaceholders_5[] = { - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_WARTORTLE}, }; const struct WildPokemonInfo gBattlePyramidPlaceholders_5Info = {4, gBattlePyramidPlaceholders_5}; const struct WildPokemon gBattlePyramidPlaceholders_6[] = { - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_WARTORTLE}, }; const struct WildPokemonInfo gBattlePyramidPlaceholders_6Info = {4, gBattlePyramidPlaceholders_6}; const struct WildPokemon gBattlePyramidPlaceholders_7[] = { - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, }; const struct WildPokemonInfo gBattlePyramidPlaceholders_7Info = {8, gBattlePyramidPlaceholders_7}; const struct WildPokemonHeader gBattlePyramidWildMonHeaders[] = { - { - .mapGroup = 0, - .mapNum = 1, - .landMonsInfo = &gBattlePyramidPlaceholders_1Info, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 2, - .landMonsInfo = &gBattlePyramidPlaceholders_2Info, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 3, - .landMonsInfo = &gBattlePyramidPlaceholders_3Info, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 4, - .landMonsInfo = &gBattlePyramidPlaceholders_4Info, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 5, - .landMonsInfo = &gBattlePyramidPlaceholders_5Info, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 6, - .landMonsInfo = &gBattlePyramidPlaceholders_6Info, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 7, - .landMonsInfo = &gBattlePyramidPlaceholders_7Info, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 255, - .mapNum = 255, - .landMonsInfo = NULL, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, + { + .mapGroup = 0, + .mapNum = 1, + .landMonsInfo = &gBattlePyramidPlaceholders_1Info, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 2, + .landMonsInfo = &gBattlePyramidPlaceholders_2Info, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 3, + .landMonsInfo = &gBattlePyramidPlaceholders_3Info, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 4, + .landMonsInfo = &gBattlePyramidPlaceholders_4Info, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 5, + .landMonsInfo = &gBattlePyramidPlaceholders_5Info, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 6, + .landMonsInfo = &gBattlePyramidPlaceholders_6Info, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 7, + .landMonsInfo = &gBattlePyramidPlaceholders_7Info, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 255, + .mapNum = 255, + .landMonsInfo = NULL, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, }; const struct WildPokemon gBattlePikeMons_1[] = { - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_DUSCLOPS}, - {5, 5, SPECIES_DUSCLOPS}, - {5, 5, SPECIES_DUSCLOPS}, - {5, 5, SPECIES_DUSCLOPS}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_DUSCLOPS}, - {5, 5, SPECIES_DUSCLOPS}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_DUSCLOPS}, + {5, 5, SPECIES_DUSCLOPS}, + {5, 5, SPECIES_DUSCLOPS}, + {5, 5, SPECIES_DUSCLOPS}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_DUSCLOPS}, + {5, 5, SPECIES_DUSCLOPS}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, }; const struct WildPokemonInfo gBattlePikeMonsInfo_1 = {10, gBattlePikeMons_1}; const struct WildPokemon gBattlePikeMons_2[] = { - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_ELECTRODE}, - {5, 5, SPECIES_ELECTRODE}, - {5, 5, SPECIES_ELECTRODE}, - {5, 5, SPECIES_ELECTRODE}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_ELECTRODE}, - {5, 5, SPECIES_ELECTRODE}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_ELECTRODE}, + {5, 5, SPECIES_ELECTRODE}, + {5, 5, SPECIES_ELECTRODE}, + {5, 5, SPECIES_ELECTRODE}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_ELECTRODE}, + {5, 5, SPECIES_ELECTRODE}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, }; const struct WildPokemonInfo gBattlePikeMonsInfo_2 = {10, gBattlePikeMons_2}; const struct WildPokemon gBattlePikeMons_3[] = { - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_BRELOOM}, - {5, 5, SPECIES_BRELOOM}, - {5, 5, SPECIES_BRELOOM}, - {5, 5, SPECIES_BRELOOM}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_BRELOOM}, - {5, 5, SPECIES_BRELOOM}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_BRELOOM}, + {5, 5, SPECIES_BRELOOM}, + {5, 5, SPECIES_BRELOOM}, + {5, 5, SPECIES_BRELOOM}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_BRELOOM}, + {5, 5, SPECIES_BRELOOM}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, }; const struct WildPokemonInfo gBattlePikeMonsInfo_3 = {10, gBattlePikeMons_3}; const struct WildPokemon gBattlePikeMons_4[] = { - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_WOBBUFFET}, - {5, 5, SPECIES_WOBBUFFET}, - {5, 5, SPECIES_WOBBUFFET}, - {5, 5, SPECIES_WOBBUFFET}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_WOBBUFFET}, - {5, 5, SPECIES_WOBBUFFET}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_WOBBUFFET}, + {5, 5, SPECIES_WOBBUFFET}, + {5, 5, SPECIES_WOBBUFFET}, + {5, 5, SPECIES_WOBBUFFET}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_WOBBUFFET}, + {5, 5, SPECIES_WOBBUFFET}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, }; const struct WildPokemonInfo gBattlePikeMonsInfo_4 = {10, gBattlePikeMons_4}; const struct WildPokemonHeader gBattlePikeWildMonHeaders[] = { - { - .mapGroup = 0, - .mapNum = 1, - .landMonsInfo = &gBattlePikeMonsInfo_1, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 2, - .landMonsInfo = &gBattlePikeMonsInfo_2, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 3, - .landMonsInfo = &gBattlePikeMonsInfo_3, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 4, - .landMonsInfo = &gBattlePikeMonsInfo_4, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 255, - .mapNum = 255, - .landMonsInfo = NULL, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, + { + .mapGroup = 0, + .mapNum = 1, + .landMonsInfo = &gBattlePikeMonsInfo_1, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 2, + .landMonsInfo = &gBattlePikeMonsInfo_2, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 3, + .landMonsInfo = &gBattlePikeMonsInfo_3, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 4, + .landMonsInfo = &gBattlePikeMonsInfo_4, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 255, + .mapNum = 255, + .landMonsInfo = NULL, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, }; const struct WildPokemon gWildFeebasRoute119Data = {20, 25, SPECIES_FEEBAS}; const u16 gRoute119WaterTileData[] = { - 0, 0x2D, 0, - 0x2E, 0x5B, 0x83, - 0x5C, 0x8B, 0x12A, + 0, 0x2D, 0, + 0x2E, 0x5B, 0x83, + 0x5C, 0x8B, 0x12A, }; // code @@ -4825,7 +4825,7 @@ static u16 GetCurrentMapWildMonHeaderId(void) for (i = 0; ; i++) { const struct WildPokemonHeader *wildHeader = &gWildMonHeaders[i]; - if (wildHeader->mapGroup == INVALID_U8) + if (wildHeader->mapGroup == 0xFF) break; if (gWildMonHeaders[i].mapGroup == gSaveBlock1Ptr->location.mapGroup && @@ -4845,7 +4845,7 @@ static u16 GetCurrentMapWildMonHeaderId(void) } } - return INVALID_S16; + return -1; } static u8 PickWildMonNature(void) @@ -5079,7 +5079,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi return FALSE; headerId = GetCurrentMapWildMonHeaderId(); - if (headerId == INVALID_U16) + if (headerId == 0xFFFF) { if (gMapHeader.mapLayoutId == 0x166) { @@ -5190,7 +5190,7 @@ void RockSmashWildEncounter(void) { u16 headerId = GetCurrentMapWildMonHeaderId(); - if (headerId != INVALID_U16) + if (headerId != 0xFFFF) { const struct WildPokemonInfo *wildPokemonInfo = gWildMonHeaders[headerId].rockSmashMonsInfo; @@ -5222,7 +5222,7 @@ bool8 SweetScentWildEncounter(void) PlayerGetDestCoords(&x, &y); headerId = GetCurrentMapWildMonHeaderId(); - if (headerId == INVALID_U16) + if (headerId == 0xFFFF) { if (gMapHeader.mapLayoutId == 0x166) { @@ -5292,7 +5292,7 @@ bool8 DoesCurrentMapHaveFishingMons(void) { u16 headerId = GetCurrentMapWildMonHeaderId(); - if (headerId != INVALID_U16 && gWildMonHeaders[headerId].fishingMonsInfo != NULL) + if (headerId != 0xFFFF && gWildMonHeaders[headerId].fishingMonsInfo != NULL) return TRUE; else return FALSE; @@ -5326,7 +5326,7 @@ u16 GetLocalWildMon(bool8 *isWaterMon) *isWaterMon = FALSE; headerId = GetCurrentMapWildMonHeaderId(); - if (headerId == INVALID_U16) + if (headerId == 0xFFFF) return SPECIES_NONE; landMonsInfo = gWildMonHeaders[headerId].landMonsInfo; waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo; @@ -5358,7 +5358,7 @@ u16 GetLocalWaterMon(void) { u16 headerId = GetCurrentMapWildMonHeaderId(); - if (headerId != INVALID_U16) + if (headerId != 0xFFFF) { const struct WildPokemonInfo *waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo; diff --git a/src/window.c b/src/window.c index d5b996df1..4e1a38eff 100644 --- a/src/window.c +++ b/src/window.c @@ -52,12 +52,12 @@ bool16 InitWindows(const struct WindowTemplate *templates) gWindows[i].tileData = NULL; } - for (i = 0, allocatedBaseBlock = 0, bgLayer = templates[i].bg; bgLayer != INVALID_U8 && i < 0x20; ++i, bgLayer = templates[i].bg) + for (i = 0, allocatedBaseBlock = 0, bgLayer = templates[i].bg; bgLayer != 0xFF && i < 0x20; ++i, bgLayer = templates[i].bg) { if (gUnneededFireRedVariable == 1) { allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, templates[i].width * templates[i].height, 0); - if (allocatedBaseBlock == INVALID_S32) + if (allocatedBaseBlock == -1) return FALSE; } @@ -65,7 +65,7 @@ bool16 InitWindows(const struct WindowTemplate *templates) { attrib = GetBgAttribute(bgLayer, 0x8); - if (attrib != INVALID_U16) + if (attrib != 0xFFFF) { allocatedTilemapBuffer = AllocZeroed(attrib); @@ -121,12 +121,12 @@ u16 AddWindow(const struct WindowTemplate *template) for (win = 0; win < WINDOWS_MAX; ++win) { - if ((bgLayer = gWindows[win].window.bg) == INVALID_U8) + if ((bgLayer = gWindows[win].window.bg) == 0xFF) break; } if (win == WINDOWS_MAX) - return INVALID_U8; + return 0xFF; bgLayer = template->bg; allocatedBaseBlock = 0; @@ -135,20 +135,20 @@ u16 AddWindow(const struct WindowTemplate *template) { allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, template->width * template->height, 0); - if (allocatedBaseBlock == INVALID_S32) - return INVALID_U8; + if (allocatedBaseBlock == -1) + return 0xFF; } if (gUnknown_03002F70[bgLayer] == NULL) { attrib = GetBgAttribute(bgLayer, 0x8); - if (attrib != INVALID_U16) + if (attrib != 0xFFFF) { allocatedTilemapBuffer = AllocZeroed(attrib); if (allocatedTilemapBuffer == NULL) - return INVALID_U8; + return 0xFF; for (i = 0; i < attrib; ++i) allocatedTilemapBuffer[i] = 0; @@ -167,7 +167,7 @@ u16 AddWindow(const struct WindowTemplate *template) Free(gUnknown_03002F70[bgLayer]); gUnknown_03002F70[bgLayer] = allocatedTilemapBuffer; } - return INVALID_U8; + return 0xFF; } gWindows[win].tileData = allocatedTilemapBuffer; @@ -190,12 +190,12 @@ int AddWindowWithoutTileMap(const struct WindowTemplate *template) for (win = 0; win < WINDOWS_MAX; ++win) { - if (gWindows[win].window.bg == INVALID_U8) + if (gWindows[win].window.bg == 0xFF) break; } if (win == WINDOWS_MAX) - return INVALID_U8; + return 0xFF; bgLayer = template->bg; allocatedBaseBlock = 0; @@ -204,8 +204,8 @@ int AddWindowWithoutTileMap(const struct WindowTemplate *template) { allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, template->width * template->height, 0); - if (allocatedBaseBlock == INVALID_S32) - return INVALID_U8; + if (allocatedBaseBlock == -1) + return 0xFF; } gWindows[win].window = *template; @@ -609,21 +609,21 @@ u16 AddWindow8Bit(struct WindowTemplate *template) for (windowId = 0; windowId < 32; windowId++) { - if (gWindows[windowId].window.bg == INVALID_U8) + if (gWindows[windowId].window.bg == 0xFF) break; } if (windowId == WINDOWS_MAX) - return INVALID_U8; + return 0xFF; bgLayer = template->bg; if (gUnknown_03002F70[bgLayer] == 0) { u16 attribute = GetBgAttribute(bgLayer, 8); - if (attribute != INVALID_U16) + if (attribute != 0xFFFF) { s32 i; memAddress = Alloc(attribute); if (memAddress == NULL) - return INVALID_U8; + return 0xFF; for (i = 0; i < attribute; i++) // if we're going to zero out the memory anyway, why not call AllocZeroed? memAddress[i] = 0; gUnknown_03002F70[bgLayer] = memAddress; @@ -638,7 +638,7 @@ u16 AddWindow8Bit(struct WindowTemplate *template) Free(gUnknown_03002F70[bgLayer]); gUnknown_03002F70[bgLayer] = NULL; } - return INVALID_U8; + return 0xFF; } else { -- cgit v1.2.3 From 4fc3fa9e44fb3de091b5e1b157915e1b8fb6510b Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Fri, 7 Dec 2018 20:16:19 +0800 Subject: Realign comments, clean tables in pokemon_animation.c and use SPECIES_OLD_UNOWN_ defines --- src/battle_script_commands.c | 78 +- src/data/graphics/items.h | 2 +- src/data/item_icon_table.h | 116 +- src/data/pokemon_graphics/enemy_mon_elevation.h | 50 +- src/data/text/item_descriptions.h | 2 +- src/pokemon.c | 1658 ++++++++++++----------- src/pokemon_animation.c | 48 +- 7 files changed, 978 insertions(+), 976 deletions(-) (limited to 'src') diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 610d0050e..59631b78c 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -677,45 +677,45 @@ static const u32 sStatusFlagsForMoveEffects[] = static const u8* const sMoveEffectBS_Ptrs[] = { - BattleScript_MoveEffectSleep, // 0 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SLEEP - BattleScript_MoveEffectPoison, // MOVE_EFFECT_POISON - BattleScript_MoveEffectBurn, // MOVE_EFFECT_BURN - BattleScript_MoveEffectFreeze, // MOVE_EFFECT_FREEZE - BattleScript_MoveEffectParalysis, // MOVE_EFFECT_PARALYSIS - BattleScript_MoveEffectToxic, // MOVE_EFFECT_TOXIC - BattleScript_MoveEffectConfusion, // MOVE_EFFECT_CONFUSION - BattleScript_MoveEffectSleep, // MOVE_EFFECT_FLINCH - BattleScript_MoveEffectSleep, // MOVE_EFFECT_TRI_ATTACK - BattleScript_MoveEffectUproar, // MOVE_EFFECT_UPROAR - BattleScript_MoveEffectPayDay, // MOVE_EFFECT_PAYDAY - BattleScript_MoveEffectSleep, // MOVE_EFFECT_CHARGING - BattleScript_MoveEffectWrap, // MOVE_EFFECT_WRAP - BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_25 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RECHARGE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAGE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_STEAL_ITEM - BattleScript_MoveEffectSleep, // MOVE_EFFECT_PREVENT_ESCAPE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_NIGHTMARE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ALL_STATS_UP - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAPIDSPIN - BattleScript_MoveEffectSleep, // MOVE_EFFECT_REMOVE_PARALYSIS - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_DEF_DOWN - BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_33 + BattleScript_MoveEffectSleep, // 0 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SLEEP + BattleScript_MoveEffectPoison, // MOVE_EFFECT_POISON + BattleScript_MoveEffectBurn, // MOVE_EFFECT_BURN + BattleScript_MoveEffectFreeze, // MOVE_EFFECT_FREEZE + BattleScript_MoveEffectParalysis, // MOVE_EFFECT_PARALYSIS + BattleScript_MoveEffectToxic, // MOVE_EFFECT_TOXIC + BattleScript_MoveEffectConfusion, // MOVE_EFFECT_CONFUSION + BattleScript_MoveEffectSleep, // MOVE_EFFECT_FLINCH + BattleScript_MoveEffectSleep, // MOVE_EFFECT_TRI_ATTACK + BattleScript_MoveEffectUproar, // MOVE_EFFECT_UPROAR + BattleScript_MoveEffectPayDay, // MOVE_EFFECT_PAYDAY + BattleScript_MoveEffectSleep, // MOVE_EFFECT_CHARGING + BattleScript_MoveEffectWrap, // MOVE_EFFECT_WRAP + BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_25 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_RECHARGE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAGE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_STEAL_ITEM + BattleScript_MoveEffectSleep, // MOVE_EFFECT_PREVENT_ESCAPE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_NIGHTMARE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ALL_STATS_UP + BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAPIDSPIN + BattleScript_MoveEffectSleep, // MOVE_EFFECT_REMOVE_PARALYSIS + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_DEF_DOWN + BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_33 }; static const struct WindowTemplate sUnusedWinTemplate = {0, 1, 3, 7, 0xF, 0x1F, 0x3F}; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 0c4a6e21b..26da9061d 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -134,7 +134,7 @@ const u32 gItemIconPalette_GreenShard[] = INCBIN_U32("graphics/items/icon_palett const u32 gItemIcon_HPUp[] = INCBIN_U32("graphics/items/icons/hp_up.4bpp.lz"); const u32 gItemIconPalette_HPUp[] = INCBIN_U32("graphics/items/icon_palettes/hp_up.gbapal.lz"); -const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz"); +const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz"); const u32 gItemIconPalette_Protein[] = INCBIN_U32("graphics/items/icon_palettes/protein.gbapal.lz"); const u32 gItemIconPalette_Iron[] = INCBIN_U32("graphics/items/icon_palettes/iron.gbapal.lz"); const u32 gItemIconPalette_Carbos[] = INCBIN_U32("graphics/items/icon_palettes/carbos.gbapal.lz"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index f55a8468e..c36969ab5 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -311,64 +311,64 @@ const u32 *const gItemIconTable[][2] = [ITEM_CLAW_FOSSIL] = {gItemIcon_ClawFossil, gItemIconPalette_HoennFossil}, [ITEM_DEVON_SCOPE] = {gItemIcon_DevonScope, gItemIconPalette_DevonScope}, // TMs / HMs - [ITEM_TM01] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM01 - [ITEM_TM02] = {gItemIcon_TM, gItemIconPalette_DragonTMHM}, // TM02 - [ITEM_TM03] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, // TM03 - [ITEM_TM04] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM04 - [ITEM_TM05] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM05 - [ITEM_TM06] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, // TM06 - [ITEM_TM07] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM07 - [ITEM_TM08] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM08 - [ITEM_TM09] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM09 - [ITEM_TM10] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM10 - [ITEM_TM11] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM11 - [ITEM_TM12] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM12 - [ITEM_TM13] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM13 - [ITEM_TM14] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM14 - [ITEM_TM15] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM15 - [ITEM_TM16] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM16 - [ITEM_TM17] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM17 - [ITEM_TM18] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, // TM18 - [ITEM_TM19] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM19 - [ITEM_TM20] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM20 - [ITEM_TM21] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM21 - [ITEM_TM22] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM22 - [ITEM_TM23] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, // TM23 - [ITEM_TM24] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM24 - [ITEM_TM25] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM25 - [ITEM_TM26] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, // TM26 - [ITEM_TM27] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM27 - [ITEM_TM28] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, // TM28 - [ITEM_TM29] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM29 - [ITEM_TM30] = {gItemIcon_TM, gItemIconPalette_GhostTMHM}, // TM30 - [ITEM_TM31] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM31 - [ITEM_TM32] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM32 - [ITEM_TM33] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM33 - [ITEM_TM34] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM34 - [ITEM_TM35] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM35 - [ITEM_TM36] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, // TM36 - [ITEM_TM37] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, // TM37 - [ITEM_TM38] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM38 - [ITEM_TM39] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, // TM39 - [ITEM_TM40] = {gItemIcon_TM, gItemIconPalette_FlyingTMHM}, // TM40 - [ITEM_TM41] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM41 - [ITEM_TM42] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM42 - [ITEM_TM43] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM43 - [ITEM_TM44] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM44 - [ITEM_TM45] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM45 - [ITEM_TM46] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM46 - [ITEM_TM47] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, // TM47 - [ITEM_TM48] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM48 - [ITEM_TM49] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM49 - [ITEM_TM50] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM50 - [ITEM_HM01] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM01 - [ITEM_HM02] = {gItemIcon_HM, gItemIconPalette_FlyingTMHM}, // HM02 - [ITEM_HM03] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM03 - [ITEM_HM04] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM04 - [ITEM_HM05] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM05 - [ITEM_HM06] = {gItemIcon_HM, gItemIconPalette_FightingTMHM}, // HM06 - [ITEM_HM07] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM07 - [ITEM_HM08] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM08 + [ITEM_TM01] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, + [ITEM_TM02] = {gItemIcon_TM, gItemIconPalette_DragonTMHM}, + [ITEM_TM03] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, + [ITEM_TM04] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, + [ITEM_TM05] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM06] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, + [ITEM_TM07] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, + [ITEM_TM08] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, + [ITEM_TM09] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, + [ITEM_TM10] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM11] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, + [ITEM_TM12] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, + [ITEM_TM13] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, + [ITEM_TM14] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, + [ITEM_TM15] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM16] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, + [ITEM_TM17] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM18] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, + [ITEM_TM19] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, + [ITEM_TM20] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM21] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM22] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, + [ITEM_TM23] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, + [ITEM_TM24] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, + [ITEM_TM25] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, + [ITEM_TM26] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, + [ITEM_TM27] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM28] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, + [ITEM_TM29] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, + [ITEM_TM30] = {gItemIcon_TM, gItemIconPalette_GhostTMHM}, + [ITEM_TM31] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, + [ITEM_TM32] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM33] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, + [ITEM_TM34] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, + [ITEM_TM35] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, + [ITEM_TM36] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, + [ITEM_TM37] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, + [ITEM_TM38] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, + [ITEM_TM39] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, + [ITEM_TM40] = {gItemIcon_TM, gItemIconPalette_FlyingTMHM}, + [ITEM_TM41] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, + [ITEM_TM42] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM43] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM44] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, + [ITEM_TM45] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM46] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, + [ITEM_TM47] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, + [ITEM_TM48] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, + [ITEM_TM49] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, + [ITEM_TM50] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, + [ITEM_HM01] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, + [ITEM_HM02] = {gItemIcon_HM, gItemIconPalette_FlyingTMHM}, + [ITEM_HM03] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, + [ITEM_HM04] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, + [ITEM_HM05] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, + [ITEM_HM06] = {gItemIcon_HM, gItemIconPalette_FightingTMHM}, + [ITEM_HM07] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, + [ITEM_HM08] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // ???????? [ITEM_15B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, [ITEM_15C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 61fd943a2..c8f079a5c 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -256,31 +256,31 @@ const u8 gEnemyMonElevation[] = [SPECIES_LUGIA] = 6, [SPECIES_HO_OH] = 6, [SPECIES_CELEBI] = 15, - [252] = 0, - [253] = 0, - [254] = 0, - [255] = 0, - [256] = 0, - [257] = 0, - [258] = 0, - [259] = 0, - [260] = 0, - [261] = 0, - [262] = 0, - [263] = 0, - [264] = 0, - [265] = 0, - [266] = 0, - [267] = 0, - [268] = 0, - [269] = 0, - [270] = 0, - [271] = 0, - [272] = 0, - [273] = 0, - [274] = 0, - [275] = 0, - [276] = 0, + [SPECIES_OLD_UNOWN_B] = 0, + [SPECIES_OLD_UNOWN_C] = 0, + [SPECIES_OLD_UNOWN_D] = 0, + [SPECIES_OLD_UNOWN_E] = 0, + [SPECIES_OLD_UNOWN_F] = 0, + [SPECIES_OLD_UNOWN_G] = 0, + [SPECIES_OLD_UNOWN_H] = 0, + [SPECIES_OLD_UNOWN_I] = 0, + [SPECIES_OLD_UNOWN_J] = 0, + [SPECIES_OLD_UNOWN_K] = 0, + [SPECIES_OLD_UNOWN_L] = 0, + [SPECIES_OLD_UNOWN_M] = 0, + [SPECIES_OLD_UNOWN_N] = 0, + [SPECIES_OLD_UNOWN_O] = 0, + [SPECIES_OLD_UNOWN_P] = 0, + [SPECIES_OLD_UNOWN_Q] = 0, + [SPECIES_OLD_UNOWN_R] = 0, + [SPECIES_OLD_UNOWN_S] = 0, + [SPECIES_OLD_UNOWN_T] = 0, + [SPECIES_OLD_UNOWN_U] = 0, + [SPECIES_OLD_UNOWN_V] = 0, + [SPECIES_OLD_UNOWN_W] = 0, + [SPECIES_OLD_UNOWN_X] = 0, + [SPECIES_OLD_UNOWN_Y] = 0, + [SPECIES_OLD_UNOWN_Z] = 0, [SPECIES_TREECKO] = 0, [SPECIES_GROVYLE] = 0, [SPECIES_SCEPTILE] = 0, diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 8de5183ec..26193bfd5 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -7,7 +7,7 @@ const u8 gPokeBallItemDescription[] = _("A tool used for\ncatching wild\nPOKéMO const u8 gSafariBallItemDescription[] = _("A special BALL that\nis used only in the\nSAFARI ZONE."); const u8 gNetBallItemDescription[] = _("A BALL that works\nwell on WATER- and\nBUG-type POKéMON."); const u8 gDiveBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\non the ocean floor."); -const u8 gNestBallItemDescription[] = _("A BALL that works\nbetter on weaker\nPOKéMON."); +const u8 gNestBallItemDescription[] = _("A BALL that works\nbetter on weaker\nPOKéMON."); const u8 gRepeatBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\ncaught before."); const u8 gTimerBallItemDescription[] = _("A BALL that gains\npower in battles\ntaking many turns."); const u8 gLuxuryBallItemDescription[] = _("A cozy BALL that\nmakes POKéMON\nmore friendly."); diff --git a/src/pokemon.c b/src/pokemon.c index dbef22338..7a7d672f5 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1405,834 +1405,836 @@ const s8 gNatureStatTable[][5] = #include "data/pokemon/evolution.h" #include "data/pokemon/level_up_learnset_pointers.h" +// These two tables are zero-based. + static const u8 sMonFrontAnimIdsTable[] = { - 0x06, // SPECIES_BULBASAUR - 0x17, // SPECIES_IVYSAUR - 0x2f, // SPECIES_VENUSAUR - 0x52, // SPECIES_CHARMANDER - 0x25, // SPECIES_CHARMELEON - 0x10, // SPECIES_CHARIZARD - 0x0b, // SPECIES_SQUIRTLE - 0x13, // SPECIES_WARTORTLE - 0x19, // SPECIES_BLASTOISE - 0x0b, // SPECIES_CATERPIE - 0x0b, // SPECIES_METAPOD - 0x1d, // SPECIES_BUTTERFREE - 0x46, // SPECIES_WEEDLE - 0x20, // SPECIES_KAKUNA - 0x02, // SPECIES_BEEDRILL - 0x47, // SPECIES_PIDGEY - 0x17, // SPECIES_PIDGEOTTO - 0x29, // SPECIES_PIDGEOT - 0x43, // SPECIES_RATTATA - 0x2b, // SPECIES_RATICATE - 0x18, // SPECIES_SPEAROW - 0x2b, // SPECIES_FEAROW - 0x16, // SPECIES_EKANS - 0x17, // SPECIES_ARBOK - 0x2c, // SPECIES_PIKACHU - 0x17, // SPECIES_RAICHU - 0x2d, // SPECIES_SANDSHREW - 0x17, // SPECIES_SANDSLASH - 0x00, // SPECIES_NIDORAN_F - 0x17, // SPECIES_NIDORINA - 0x0f, // SPECIES_NIDOQUEEN - 0x09, // SPECIES_NIDORAN_M - 0x13, // SPECIES_NIDORINO - 0x0f, // SPECIES_NIDOKING - 0x00, // SPECIES_CLEFAIRY - 0x4a, // SPECIES_CLEFABLE - 0x17, // SPECIES_VULPIX - 0x10, // SPECIES_NINETALES - 0x48, // SPECIES_JIGGLYPUFF - 0x31, // SPECIES_WIGGLYTUFF - 0x00, // SPECIES_ZUBAT - 0x1d, // SPECIES_GOLBAT - 0x00, // SPECIES_ODDISH - 0x45, // SPECIES_GLOOM - 0x49, // SPECIES_VILEPLUME - 0x46, // SPECIES_PARAS - 0x0f, // SPECIES_PARASECT - 0x06, // SPECIES_VENONAT - 0x4b, // SPECIES_VENOMOTH - 0x10, // SPECIES_DIGLETT - 0x4c, // SPECIES_DUGTRIO - 0x52, // SPECIES_MEOWTH - 0x17, // SPECIES_PERSIAN - 0x06, // SPECIES_PSYDUCK - 0x4c, // SPECIES_GOLDUCK - 0x32, // SPECIES_MANKEY - 0x48, // SPECIES_PRIMEAPE - 0x25, // SPECIES_GROWLITHE - 0x02, // SPECIES_ARCANINE - 0x00, // SPECIES_POLIWAG - 0x32, // SPECIES_POLIWHIRL - 0x19, // SPECIES_POLIWRATH - 0x31, // SPECIES_ABRA - 0x09, // SPECIES_KADABRA - 0x17, // SPECIES_ALAKAZAM - 0x00, // SPECIES_MACHOP - 0x10, // SPECIES_MACHOKE - 0x31, // SPECIES_MACHAMP - 0x17, // SPECIES_BELLSPROUT - 0x0d, // SPECIES_WEEPINBELL - 0x32, // SPECIES_VICTREEBEL - 0x00, // SPECIES_TENTACOOL - 0x00, // SPECIES_TENTACRUEL - 0x48, // SPECIES_GEODUDE - 0x48, // SPECIES_GRAVELER - 0x2f, // SPECIES_GOLEM - 0x20, // SPECIES_PONYTA - 0x11, // SPECIES_RAPIDASH - 0x45, // SPECIES_SLOWPOKE - 0x0b, // SPECIES_SLOWBRO - 0x54, // SPECIES_MAGNEMITE - 0x2c, // SPECIES_MAGNETON - 0x48, // SPECIES_FARFETCHD - 0x4c, // SPECIES_DODUO - 0x41, // SPECIES_DODRIO - 0x0b, // SPECIES_SEEL - 0x45, // SPECIES_DEWGONG - 0x46, // SPECIES_GRIMER - 0x30, // SPECIES_MUK - 0x12, // SPECIES_SHELLDER - 0x1d, // SPECIES_CLOYSTER - 0x15, // SPECIES_GASTLY - 0x35, // SPECIES_HAUNTER - 0x3a, // SPECIES_GENGAR - 0x43, // SPECIES_ONIX - 0x4f, // SPECIES_DROWZEE - 0x09, // SPECIES_HYPNO - 0x03, // SPECIES_KRABBY - 0x4b, // SPECIES_KINGLER - 0x00, // SPECIES_VOLTORB - 0x00, // SPECIES_ELECTRODE - 0x46, // SPECIES_EXEGGCUTE - 0x32, // SPECIES_EXEGGUTOR - 0x48, // SPECIES_CUBONE - 0x05, // SPECIES_MAROWAK - 0x16, // SPECIES_HITMONLEE - 0x09, // SPECIES_HITMONCHAN - 0x45, // SPECIES_LICKITUNG - 0x13, // SPECIES_KOFFING - 0x04, // SPECIES_WEEZING - 0x10, // SPECIES_RHYHORN - 0x13, // SPECIES_RHYDON - 0x45, // SPECIES_CHANSEY - 0x48, // SPECIES_TANGELA - 0x17, // SPECIES_KANGASKHAN - 0x12, // SPECIES_HORSEA - 0x04, // SPECIES_SEADRA - 0x0d, // SPECIES_GOLDEEN - 0x1c, // SPECIES_SEAKING - 0x4e, // SPECIES_STARYU - 0x12, // SPECIES_STARMIE - 0x46, // SPECIES_MR_MIME - 0x02, // SPECIES_SCYTHER - 0x17, // SPECIES_JYNX - 0x2c, // SPECIES_ELECTABUZZ - 0x0f, // SPECIES_MAGMAR - 0x09, // SPECIES_PINSIR - 0x19, // SPECIES_TAUROS - 0x05, // SPECIES_MAGIKARP - 0x48, // SPECIES_GYARADOS - 0x17, // SPECIES_LAPRAS - 0x01, // SPECIES_DITTO - 0x17, // SPECIES_EEVEE - 0x17, // SPECIES_VAPOREON - 0x00, // SPECIES_JOLTEON - 0x17, // SPECIES_FLAREON - 0x52, // SPECIES_PORYGON - 0x51, // SPECIES_OMANYTE - 0x09, // SPECIES_OMASTAR - 0x1d, // SPECIES_KABUTO - 0x0f, // SPECIES_KABUTOPS - 0x47, // SPECIES_AERODACTYL - 0x0b, // SPECIES_SNORLAX - 0x09, // SPECIES_ARTICUNO - 0x2c, // SPECIES_ZAPDOS - 0x45, // SPECIES_MOLTRES - 0x00, // SPECIES_DRATINI - 0x10, // SPECIES_DRAGONAIR - 0x47, // SPECIES_DRAGONITE - 0x09, // SPECIES_MEWTWO - 0x0d, // SPECIES_MEW - 0x00, // SPECIES_CHIKORITA - 0x00, // SPECIES_BAYLEEF - 0x17, // SPECIES_MEGANIUM - 0x52, // SPECIES_CYNDAQUIL - 0x17, // SPECIES_QUILAVA - 0x10, // SPECIES_TYPHLOSION - 0x31, // SPECIES_TOTODILE - 0x0f, // SPECIES_CROCONAW - 0x0f, // SPECIES_FERALIGATR - 0x00, // SPECIES_SENTRET - 0x32, // SPECIES_FURRET - 0x47, // SPECIES_HOOTHOOT - 0x17, // SPECIES_NOCTOWL - 0x52, // SPECIES_LEDYBA - 0x47, // SPECIES_LEDIAN - 0x4f, // SPECIES_SPINARAK - 0x0f, // SPECIES_ARIADOS - 0x00, // SPECIES_CROBAT - 0x45, // SPECIES_CHINCHOU - 0x51, // SPECIES_LANTURN - 0x1e, // SPECIES_PICHU - 0x52, // SPECIES_CLEFFA - 0x0c, // SPECIES_IGGLYBUFF - 0x0b, // SPECIES_TOGEPI - 0x00, // SPECIES_TOGETIC - 0x31, // SPECIES_NATU - 0x09, // SPECIES_XATU - 0x00, // SPECIES_MAREEP - 0x1e, // SPECIES_FLAAFFY - 0x2c, // SPECIES_AMPHAROS - 0x0b, // SPECIES_BELLOSSOM - 0x00, // SPECIES_MARILL - 0x4a, // SPECIES_AZUMARILL - 0x46, // SPECIES_SUDOWOODO - 0x32, // SPECIES_POLITOED - 0x1c, // SPECIES_HOPPIP - 0x18, // SPECIES_SKIPLOOM - 0x51, // SPECIES_JUMPLUFF - 0x32, // SPECIES_AIPOM - 0x52, // SPECIES_SUNKERN - 0x00, // SPECIES_SUNFLORA - 0x2b, // SPECIES_YANMA - 0x00, // SPECIES_WOOPER - 0x16, // SPECIES_QUAGSIRE - 0x09, // SPECIES_ESPEON - 0x10, // SPECIES_UMBREON - 0x00, // SPECIES_MURKROW - 0x13, // SPECIES_SLOWKING - 0x1c, // SPECIES_MISDREAVUS - 0x0a, // SPECIES_UNOWN - 0x30, // SPECIES_WOBBUFFET - 0x1e, // SPECIES_GIRAFARIG - 0x0b, // SPECIES_PINECO - 0x10, // SPECIES_FORRETRESS - 0x00, // SPECIES_DUNSPARCE - 0x13, // SPECIES_GLIGAR - 0x0f, // SPECIES_STEELIX - 0x17, // SPECIES_SNUBBULL - 0x10, // SPECIES_GRANBULL - 0x3a, // SPECIES_QWILFISH - 0x02, // SPECIES_SCIZOR - 0x0b, // SPECIES_SHUCKLE - 0x41, // SPECIES_HERACROSS - 0x16, // SPECIES_SNEASEL - 0x17, // SPECIES_TEDDIURSA - 0x10, // SPECIES_URSARING - 0x17, // SPECIES_SLUGMA - 0x17, // SPECIES_MAGCARGO - 0x00, // SPECIES_SWINUB - 0x0f, // SPECIES_PILOSWINE - 0x03, // SPECIES_CORSOLA - 0x52, // SPECIES_REMORAID - 0x17, // SPECIES_OCTILLERY - 0x52, // SPECIES_DELIBIRD - 0x0d, // SPECIES_MANTINE - 0x17, // SPECIES_SKARMORY - 0x17, // SPECIES_HOUNDOUR - 0x10, // SPECIES_HOUNDOOM - 0x42, // SPECIES_KINGDRA - 0x32, // SPECIES_PHANPY - 0x19, // SPECIES_DONPHAN - 0x00, // SPECIES_PORYGON2 - 0x00, // SPECIES_STANTLER - 0x31, // SPECIES_SMEARGLE - 0x16, // SPECIES_TYROGUE - 0x02, // SPECIES_HITMONTOP - 0x09, // SPECIES_SMOOCHUM - 0x2c, // SPECIES_ELEKID - 0x00, // SPECIES_MAGBY - 0x45, // SPECIES_MILTANK - 0x00, // SPECIES_BLISSEY - 0x2c, // SPECIES_RAIKOU - 0x09, // SPECIES_ENTEI - 0x10, // SPECIES_SUICUNE - 0x52, // SPECIES_LARVITAR - 0x10, // SPECIES_PUPITAR - 0x0f, // SPECIES_TYRANITAR - 0x3a, // SPECIES_LUGIA - 0x09, // SPECIES_HO_OH - 0x18, // SPECIES_CELEBI - 0x00, // 252 - 0x00, // 253 - 0x00, // 254 - 0x00, // 255 - 0x00, // 256 - 0x00, // 257 - 0x00, // 258 - 0x00, // 259 - 0x00, // 260 - 0x00, // 261 - 0x00, // 262 - 0x00, // 263 - 0x00, // 264 - 0x00, // 265 - 0x00, // 266 - 0x00, // 267 - 0x00, // 268 - 0x00, // 269 - 0x00, // 270 - 0x00, // 271 - 0x00, // 272 - 0x00, // 273 - 0x00, // 274 - 0x00, // 275 - 0x00, // 276 - 0x00, // SPECIES_TREECKO - 0x17, // SPECIES_GROVYLE - 0x10, // SPECIES_SCEPTILE - 0x16, // SPECIES_TORCHIC - 0x06, // SPECIES_COMBUSKEN - 0x0f, // SPECIES_BLAZIKEN - 0x01, // SPECIES_MUDKIP - 0x04, // SPECIES_MARSHTOMP - 0x1e, // SPECIES_SWAMPERT - 0x10, // SPECIES_POOCHYENA - 0x10, // SPECIES_MIGHTYENA - 0x03, // SPECIES_ZIGZAGOON - 0x09, // SPECIES_LINOONE - 0x00, // SPECIES_WURMPLE - 0x00, // SPECIES_SILCOON - 0x04, // SPECIES_BEAUTIFLY - 0x04, // SPECIES_CASCOON - 0x06, // SPECIES_DUSTOX - 0x00, // SPECIES_LOTAD - 0x00, // SPECIES_LOMBRE - 0x49, // SPECIES_LUDICOLO - 0x05, // SPECIES_SEEDOT - 0x00, // SPECIES_NUZLEAF - 0x02, // SPECIES_SHIFTRY - 0x00, // SPECIES_NINCADA - 0x46, // SPECIES_NINJASK - 0x1c, // SPECIES_SHEDINJA - 0x1e, // SPECIES_TAILLOW - 0x01, // SPECIES_SWELLOW - 0x00, // SPECIES_SHROOMISH - 0x00, // SPECIES_BRELOOM - 0x31, // SPECIES_SPINDA - 0x1b, // SPECIES_WINGULL - 0x1c, // SPECIES_PELIPPER - 0x00, // SPECIES_SURSKIT - 0x00, // SPECIES_MASQUERAIN - 0x01, // SPECIES_WAILMER - 0x1c, // SPECIES_WAILORD - 0x00, // SPECIES_SKITTY - 0x17, // SPECIES_DELCATTY - 0x35, // SPECIES_KECLEON - 0x1d, // SPECIES_BALTOY - 0x51, // SPECIES_CLAYDOL - 0x49, // SPECIES_NOSEPASS - 0x17, // SPECIES_TORKOAL - 0x15, // SPECIES_SABLEYE - 0x49, // SPECIES_BARBOACH - 0x49, // SPECIES_WHISCASH - 0x1d, // SPECIES_LUVDISC - 0x10, // SPECIES_CORPHISH - 0x09, // SPECIES_CRAWDAUNT - 0x49, // SPECIES_FEEBAS - 0x22, // SPECIES_MILOTIC - 0x49, // SPECIES_CARVANHA - 0x56, // SPECIES_SHARPEDO - 0x10, // SPECIES_TRAPINCH - 0x0f, // SPECIES_VIBRAVA - 0x4b, // SPECIES_FLYGON - 0x0b, // SPECIES_MAKUHITA - 0x34, // SPECIES_HARIYAMA - 0x00, // SPECIES_ELECTRIKE - 0x00, // SPECIES_MANECTRIC - 0x04, // SPECIES_NUMEL - 0x10, // SPECIES_CAMERUPT - 0x53, // SPECIES_SPHEAL - 0x17, // SPECIES_SEALEO - 0x0f, // SPECIES_WALREIN - 0x49, // SPECIES_CACNEA - 0x04, // SPECIES_CACTURNE - 0x45, // SPECIES_SNORUNT - 0x0a, // SPECIES_GLALIE - 0x0e, // SPECIES_LUNATONE - 0x08, // SPECIES_SOLROCK - 0x00, // SPECIES_AZURILL - 0x56, // SPECIES_SPOINK - 0x32, // SPECIES_GRUMPIG - 0x00, // SPECIES_PLUSLE - 0x01, // SPECIES_MINUN - 0x00, // SPECIES_MAWILE - 0x05, // SPECIES_MEDITITE - 0x45, // SPECIES_MEDICHAM - 0x04, // SPECIES_SWABLU - 0x16, // SPECIES_ALTARIA - 0x32, // SPECIES_WYNAUT - 0x0a, // SPECIES_DUSKULL - 0x02, // SPECIES_DUSCLOPS - 0x45, // SPECIES_ROSELIA - 0x45, // SPECIES_SLAKOTH - 0x31, // SPECIES_VIGOROTH - 0x45, // SPECIES_SLAKING - 0x00, // SPECIES_GULPIN - 0x45, // SPECIES_SWALOT - 0x10, // SPECIES_TROPIUS - 0x03, // SPECIES_WHISMUR - 0x49, // SPECIES_LOUDRED - 0x19, // SPECIES_EXPLOUD - 0x12, // SPECIES_CLAMPERL - 0x09, // SPECIES_HUNTAIL - 0x1c, // SPECIES_GOREBYSS - 0x11, // SPECIES_ABSOL - 0x1c, // SPECIES_SHUPPET - 0x0d, // SPECIES_BANETTE - 0x17, // SPECIES_SEVIPER - 0x09, // SPECIES_ZANGOOSE - 0x1a, // SPECIES_RELICANTH - 0x45, // SPECIES_ARON - 0x00, // SPECIES_LAIRON - 0x19, // SPECIES_AGGRON - 0x1d, // SPECIES_CASTFORM - 0x00, // SPECIES_VOLBEAT - 0x05, // SPECIES_ILLUMISE - 0x17, // SPECIES_LILEEP - 0x19, // SPECIES_CRADILY - 0x12, // SPECIES_ANORITH - 0x10, // SPECIES_ARMALDO - 0x45, // SPECIES_RALTS - 0x00, // SPECIES_KIRLIA - 0x00, // SPECIES_GARDEVOIR - 0x19, // SPECIES_BAGON - 0x04, // SPECIES_SHELGON - 0x0f, // SPECIES_SALAMENCE - 0x0f, // SPECIES_BELDUM - 0x04, // SPECIES_METANG - 0x10, // SPECIES_METAGROSS - 0x01, // SPECIES_REGIROCK - 0x44, // SPECIES_REGICE - 0x09, // SPECIES_REGISTEEL - 0x2d, // SPECIES_KYOGRE - 0x10, // SPECIES_GROUDON - 0x0f, // SPECIES_RAYQUAZA - 0x2d, // SPECIES_LATIAS - 0x10, // SPECIES_LATIOS - 0x0d, // SPECIES_JIRACHI - 0x1b, // SPECIES_DEOXYS - 0x1d, // SPECIES_CHIMECHO + [SPECIES_BULBASAUR-1] = 0x06, + [SPECIES_IVYSAUR-1] = 0x17, + [SPECIES_VENUSAUR-1] = 0x2f, + [SPECIES_CHARMANDER-1] = 0x52, + [SPECIES_CHARMELEON-1] = 0x25, + [SPECIES_CHARIZARD-1] = 0x10, + [SPECIES_SQUIRTLE-1] = 0x0b, + [SPECIES_WARTORTLE-1] = 0x13, + [SPECIES_BLASTOISE-1] = 0x19, + [SPECIES_CATERPIE-1] = 0x0b, + [SPECIES_METAPOD-1] = 0x0b, + [SPECIES_BUTTERFREE-1] = 0x1d, + [SPECIES_WEEDLE-1] = 0x46, + [SPECIES_KAKUNA-1] = 0x20, + [SPECIES_BEEDRILL-1] = 0x02, + [SPECIES_PIDGEY-1] = 0x47, + [SPECIES_PIDGEOTTO-1] = 0x17, + [SPECIES_PIDGEOT-1] = 0x29, + [SPECIES_RATTATA-1] = 0x43, + [SPECIES_RATICATE-1] = 0x2b, + [SPECIES_SPEAROW-1] = 0x18, + [SPECIES_FEAROW-1] = 0x2b, + [SPECIES_EKANS-1] = 0x16, + [SPECIES_ARBOK-1] = 0x17, + [SPECIES_PIKACHU-1] = 0x2c, + [SPECIES_RAICHU-1] = 0x17, + [SPECIES_SANDSHREW-1] = 0x2d, + [SPECIES_SANDSLASH-1] = 0x17, + [SPECIES_NIDORAN_F-1] = 0x00, + [SPECIES_NIDORINA-1] = 0x17, + [SPECIES_NIDOQUEEN-1] = 0x0f, + [SPECIES_NIDORAN_M-1] = 0x09, + [SPECIES_NIDORINO-1] = 0x13, + [SPECIES_NIDOKING-1] = 0x0f, + [SPECIES_CLEFAIRY-1] = 0x00, + [SPECIES_CLEFABLE-1] = 0x4a, + [SPECIES_VULPIX-1] = 0x17, + [SPECIES_NINETALES-1] = 0x10, + [SPECIES_JIGGLYPUFF-1] = 0x48, + [SPECIES_WIGGLYTUFF-1] = 0x31, + [SPECIES_ZUBAT-1] = 0x00, + [SPECIES_GOLBAT-1] = 0x1d, + [SPECIES_ODDISH-1] = 0x00, + [SPECIES_GLOOM-1] = 0x45, + [SPECIES_VILEPLUME-1] = 0x49, + [SPECIES_PARAS-1] = 0x46, + [SPECIES_PARASECT-1] = 0x0f, + [SPECIES_VENONAT-1] = 0x06, + [SPECIES_VENOMOTH-1] = 0x4b, + [SPECIES_DIGLETT-1] = 0x10, + [SPECIES_DUGTRIO-1] = 0x4c, + [SPECIES_MEOWTH-1] = 0x52, + [SPECIES_PERSIAN-1] = 0x17, + [SPECIES_PSYDUCK-1] = 0x06, + [SPECIES_GOLDUCK-1] = 0x4c, + [SPECIES_MANKEY-1] = 0x32, + [SPECIES_PRIMEAPE-1] = 0x48, + [SPECIES_GROWLITHE-1] = 0x25, + [SPECIES_ARCANINE-1] = 0x02, + [SPECIES_POLIWAG-1] = 0x00, + [SPECIES_POLIWHIRL-1] = 0x32, + [SPECIES_POLIWRATH-1] = 0x19, + [SPECIES_ABRA-1] = 0x31, + [SPECIES_KADABRA-1] = 0x09, + [SPECIES_ALAKAZAM-1] = 0x17, + [SPECIES_MACHOP-1] = 0x00, + [SPECIES_MACHOKE-1] = 0x10, + [SPECIES_MACHAMP-1] = 0x31, + [SPECIES_BELLSPROUT-1] = 0x17, + [SPECIES_WEEPINBELL-1] = 0x0d, + [SPECIES_VICTREEBEL-1] = 0x32, + [SPECIES_TENTACOOL-1] = 0x00, + [SPECIES_TENTACRUEL-1] = 0x00, + [SPECIES_GEODUDE-1] = 0x48, + [SPECIES_GRAVELER-1] = 0x48, + [SPECIES_GOLEM-1] = 0x2f, + [SPECIES_PONYTA-1] = 0x20, + [SPECIES_RAPIDASH-1] = 0x11, + [SPECIES_SLOWPOKE-1] = 0x45, + [SPECIES_SLOWBRO-1] = 0x0b, + [SPECIES_MAGNEMITE-1] = 0x54, + [SPECIES_MAGNETON-1] = 0x2c, + [SPECIES_FARFETCHD-1] = 0x48, + [SPECIES_DODUO-1] = 0x4c, + [SPECIES_DODRIO-1] = 0x41, + [SPECIES_SEEL-1] = 0x0b, + [SPECIES_DEWGONG-1] = 0x45, + [SPECIES_GRIMER-1] = 0x46, + [SPECIES_MUK-1] = 0x30, + [SPECIES_SHELLDER-1] = 0x12, + [SPECIES_CLOYSTER-1] = 0x1d, + [SPECIES_GASTLY-1] = 0x15, + [SPECIES_HAUNTER-1] = 0x35, + [SPECIES_GENGAR-1] = 0x3a, + [SPECIES_ONIX-1] = 0x43, + [SPECIES_DROWZEE-1] = 0x4f, + [SPECIES_HYPNO-1] = 0x09, + [SPECIES_KRABBY-1] = 0x03, + [SPECIES_KINGLER-1] = 0x4b, + [SPECIES_VOLTORB-1] = 0x00, + [SPECIES_ELECTRODE-1] = 0x00, + [SPECIES_EXEGGCUTE-1] = 0x46, + [SPECIES_EXEGGUTOR-1] = 0x32, + [SPECIES_CUBONE-1] = 0x48, + [SPECIES_MAROWAK-1] = 0x05, + [SPECIES_HITMONLEE-1] = 0x16, + [SPECIES_HITMONCHAN-1] = 0x09, + [SPECIES_LICKITUNG-1] = 0x45, + [SPECIES_KOFFING-1] = 0x13, + [SPECIES_WEEZING-1] = 0x04, + [SPECIES_RHYHORN-1] = 0x10, + [SPECIES_RHYDON-1] = 0x13, + [SPECIES_CHANSEY-1] = 0x45, + [SPECIES_TANGELA-1] = 0x48, + [SPECIES_KANGASKHAN-1] = 0x17, + [SPECIES_HORSEA-1] = 0x12, + [SPECIES_SEADRA-1] = 0x04, + [SPECIES_GOLDEEN-1] = 0x0d, + [SPECIES_SEAKING-1] = 0x1c, + [SPECIES_STARYU-1] = 0x4e, + [SPECIES_STARMIE-1] = 0x12, + [SPECIES_MR_MIME-1] = 0x46, + [SPECIES_SCYTHER-1] = 0x02, + [SPECIES_JYNX-1] = 0x17, + [SPECIES_ELECTABUZZ-1] = 0x2c, + [SPECIES_MAGMAR-1] = 0x0f, + [SPECIES_PINSIR-1] = 0x09, + [SPECIES_TAUROS-1] = 0x19, + [SPECIES_MAGIKARP-1] = 0x05, + [SPECIES_GYARADOS-1] = 0x48, + [SPECIES_LAPRAS-1] = 0x17, + [SPECIES_DITTO-1] = 0x01, + [SPECIES_EEVEE-1] = 0x17, + [SPECIES_VAPOREON-1] = 0x17, + [SPECIES_JOLTEON-1] = 0x00, + [SPECIES_FLAREON-1] = 0x17, + [SPECIES_PORYGON-1] = 0x52, + [SPECIES_OMANYTE-1] = 0x51, + [SPECIES_OMASTAR-1] = 0x09, + [SPECIES_KABUTO-1] = 0x1d, + [SPECIES_KABUTOPS-1] = 0x0f, + [SPECIES_AERODACTYL-1] = 0x47, + [SPECIES_SNORLAX-1] = 0x0b, + [SPECIES_ARTICUNO-1] = 0x09, + [SPECIES_ZAPDOS-1] = 0x2c, + [SPECIES_MOLTRES-1] = 0x45, + [SPECIES_DRATINI-1] = 0x00, + [SPECIES_DRAGONAIR-1] = 0x10, + [SPECIES_DRAGONITE-1] = 0x47, + [SPECIES_MEWTWO-1] = 0x09, + [SPECIES_MEW-1] = 0x0d, + [SPECIES_CHIKORITA-1] = 0x00, + [SPECIES_BAYLEEF-1] = 0x00, + [SPECIES_MEGANIUM-1] = 0x17, + [SPECIES_CYNDAQUIL-1] = 0x52, + [SPECIES_QUILAVA-1] = 0x17, + [SPECIES_TYPHLOSION-1] = 0x10, + [SPECIES_TOTODILE-1] = 0x31, + [SPECIES_CROCONAW-1] = 0x0f, + [SPECIES_FERALIGATR-1] = 0x0f, + [SPECIES_SENTRET-1] = 0x00, + [SPECIES_FURRET-1] = 0x32, + [SPECIES_HOOTHOOT-1] = 0x47, + [SPECIES_NOCTOWL-1] = 0x17, + [SPECIES_LEDYBA-1] = 0x52, + [SPECIES_LEDIAN-1] = 0x47, + [SPECIES_SPINARAK-1] = 0x4f, + [SPECIES_ARIADOS-1] = 0x0f, + [SPECIES_CROBAT-1] = 0x00, + [SPECIES_CHINCHOU-1] = 0x45, + [SPECIES_LANTURN-1] = 0x51, + [SPECIES_PICHU-1] = 0x1e, + [SPECIES_CLEFFA-1] = 0x52, + [SPECIES_IGGLYBUFF-1] = 0x0c, + [SPECIES_TOGEPI-1] = 0x0b, + [SPECIES_TOGETIC-1] = 0x00, + [SPECIES_NATU-1] = 0x31, + [SPECIES_XATU-1] = 0x09, + [SPECIES_MAREEP-1] = 0x00, + [SPECIES_FLAAFFY-1] = 0x1e, + [SPECIES_AMPHAROS-1] = 0x2c, + [SPECIES_BELLOSSOM-1] = 0x0b, + [SPECIES_MARILL-1] = 0x00, + [SPECIES_AZUMARILL-1] = 0x4a, + [SPECIES_SUDOWOODO-1] = 0x46, + [SPECIES_POLITOED-1] = 0x32, + [SPECIES_HOPPIP-1] = 0x1c, + [SPECIES_SKIPLOOM-1] = 0x18, + [SPECIES_JUMPLUFF-1] = 0x51, + [SPECIES_AIPOM-1] = 0x32, + [SPECIES_SUNKERN-1] = 0x52, + [SPECIES_SUNFLORA-1] = 0x00, + [SPECIES_YANMA-1] = 0x2b, + [SPECIES_WOOPER-1] = 0x00, + [SPECIES_QUAGSIRE-1] = 0x16, + [SPECIES_ESPEON-1] = 0x09, + [SPECIES_UMBREON-1] = 0x10, + [SPECIES_MURKROW-1] = 0x00, + [SPECIES_SLOWKING-1] = 0x13, + [SPECIES_MISDREAVUS-1] = 0x1c, + [SPECIES_UNOWN-1] = 0x0a, + [SPECIES_WOBBUFFET-1] = 0x30, + [SPECIES_GIRAFARIG-1] = 0x1e, + [SPECIES_PINECO-1] = 0x0b, + [SPECIES_FORRETRESS-1] = 0x10, + [SPECIES_DUNSPARCE-1] = 0x00, + [SPECIES_GLIGAR-1] = 0x13, + [SPECIES_STEELIX-1] = 0x0f, + [SPECIES_SNUBBULL-1] = 0x17, + [SPECIES_GRANBULL-1] = 0x10, + [SPECIES_QWILFISH-1] = 0x3a, + [SPECIES_SCIZOR-1] = 0x02, + [SPECIES_SHUCKLE-1] = 0x0b, + [SPECIES_HERACROSS-1] = 0x41, + [SPECIES_SNEASEL-1] = 0x16, + [SPECIES_TEDDIURSA-1] = 0x17, + [SPECIES_URSARING-1] = 0x10, + [SPECIES_SLUGMA-1] = 0x17, + [SPECIES_MAGCARGO-1] = 0x17, + [SPECIES_SWINUB-1] = 0x00, + [SPECIES_PILOSWINE-1] = 0x0f, + [SPECIES_CORSOLA-1] = 0x03, + [SPECIES_REMORAID-1] = 0x52, + [SPECIES_OCTILLERY-1] = 0x17, + [SPECIES_DELIBIRD-1] = 0x52, + [SPECIES_MANTINE-1] = 0x0d, + [SPECIES_SKARMORY-1] = 0x17, + [SPECIES_HOUNDOUR-1] = 0x17, + [SPECIES_HOUNDOOM-1] = 0x10, + [SPECIES_KINGDRA-1] = 0x42, + [SPECIES_PHANPY-1] = 0x32, + [SPECIES_DONPHAN-1] = 0x19, + [SPECIES_PORYGON2-1] = 0x00, + [SPECIES_STANTLER-1] = 0x00, + [SPECIES_SMEARGLE-1] = 0x31, + [SPECIES_TYROGUE-1] = 0x16, + [SPECIES_HITMONTOP-1] = 0x02, + [SPECIES_SMOOCHUM-1] = 0x09, + [SPECIES_ELEKID-1] = 0x2c, + [SPECIES_MAGBY-1] = 0x00, + [SPECIES_MILTANK-1] = 0x45, + [SPECIES_BLISSEY-1] = 0x00, + [SPECIES_RAIKOU-1] = 0x2c, + [SPECIES_ENTEI-1] = 0x09, + [SPECIES_SUICUNE-1] = 0x10, + [SPECIES_LARVITAR-1] = 0x52, + [SPECIES_PUPITAR-1] = 0x10, + [SPECIES_TYRANITAR-1] = 0x0f, + [SPECIES_LUGIA-1] = 0x3a, + [SPECIES_HO_OH-1] = 0x09, + [SPECIES_CELEBI-1] = 0x18, + [SPECIES_OLD_UNOWN_B-1] = 0x00, + [SPECIES_OLD_UNOWN_C-1] = 0x00, + [SPECIES_OLD_UNOWN_D-1] = 0x00, + [SPECIES_OLD_UNOWN_E-1] = 0x00, + [SPECIES_OLD_UNOWN_F-1] = 0x00, + [SPECIES_OLD_UNOWN_G-1] = 0x00, + [SPECIES_OLD_UNOWN_H-1] = 0x00, + [SPECIES_OLD_UNOWN_I-1] = 0x00, + [SPECIES_OLD_UNOWN_J-1] = 0x00, + [SPECIES_OLD_UNOWN_K-1] = 0x00, + [SPECIES_OLD_UNOWN_L-1] = 0x00, + [SPECIES_OLD_UNOWN_M-1] = 0x00, + [SPECIES_OLD_UNOWN_N-1] = 0x00, + [SPECIES_OLD_UNOWN_O-1] = 0x00, + [SPECIES_OLD_UNOWN_P-1] = 0x00, + [SPECIES_OLD_UNOWN_Q-1] = 0x00, + [SPECIES_OLD_UNOWN_R-1] = 0x00, + [SPECIES_OLD_UNOWN_S-1] = 0x00, + [SPECIES_OLD_UNOWN_T-1] = 0x00, + [SPECIES_OLD_UNOWN_U-1] = 0x00, + [SPECIES_OLD_UNOWN_V-1] = 0x00, + [SPECIES_OLD_UNOWN_W-1] = 0x00, + [SPECIES_OLD_UNOWN_X-1] = 0x00, + [SPECIES_OLD_UNOWN_Y-1] = 0x00, + [SPECIES_OLD_UNOWN_Z-1] = 0x00, + [SPECIES_TREECKO-1] = 0x00, + [SPECIES_GROVYLE-1] = 0x17, + [SPECIES_SCEPTILE-1] = 0x10, + [SPECIES_TORCHIC-1] = 0x16, + [SPECIES_COMBUSKEN-1] = 0x06, + [SPECIES_BLAZIKEN-1] = 0x0f, + [SPECIES_MUDKIP-1] = 0x01, + [SPECIES_MARSHTOMP-1] = 0x04, + [SPECIES_SWAMPERT-1] = 0x1e, + [SPECIES_POOCHYENA-1] = 0x10, + [SPECIES_MIGHTYENA-1] = 0x10, + [SPECIES_ZIGZAGOON-1] = 0x03, + [SPECIES_LINOONE-1] = 0x09, + [SPECIES_WURMPLE-1] = 0x00, + [SPECIES_SILCOON-1] = 0x00, + [SPECIES_BEAUTIFLY-1] = 0x04, + [SPECIES_CASCOON-1] = 0x04, + [SPECIES_DUSTOX-1] = 0x06, + [SPECIES_LOTAD-1] = 0x00, + [SPECIES_LOMBRE-1] = 0x00, + [SPECIES_LUDICOLO-1] = 0x49, + [SPECIES_SEEDOT-1] = 0x05, + [SPECIES_NUZLEAF-1] = 0x00, + [SPECIES_SHIFTRY-1] = 0x02, + [SPECIES_NINCADA-1] = 0x00, + [SPECIES_NINJASK-1] = 0x46, + [SPECIES_SHEDINJA-1] = 0x1c, + [SPECIES_TAILLOW-1] = 0x1e, + [SPECIES_SWELLOW-1] = 0x01, + [SPECIES_SHROOMISH-1] = 0x00, + [SPECIES_BRELOOM-1] = 0x00, + [SPECIES_SPINDA-1] = 0x31, + [SPECIES_WINGULL-1] = 0x1b, + [SPECIES_PELIPPER-1] = 0x1c, + [SPECIES_SURSKIT-1] = 0x00, + [SPECIES_MASQUERAIN-1] = 0x00, + [SPECIES_WAILMER-1] = 0x01, + [SPECIES_WAILORD-1] = 0x1c, + [SPECIES_SKITTY-1] = 0x00, + [SPECIES_DELCATTY-1] = 0x17, + [SPECIES_KECLEON-1] = 0x35, + [SPECIES_BALTOY-1] = 0x1d, + [SPECIES_CLAYDOL-1] = 0x51, + [SPECIES_NOSEPASS-1] = 0x49, + [SPECIES_TORKOAL-1] = 0x17, + [SPECIES_SABLEYE-1] = 0x15, + [SPECIES_BARBOACH-1] = 0x49, + [SPECIES_WHISCASH-1] = 0x49, + [SPECIES_LUVDISC-1] = 0x1d, + [SPECIES_CORPHISH-1] = 0x10, + [SPECIES_CRAWDAUNT-1] = 0x09, + [SPECIES_FEEBAS-1] = 0x49, + [SPECIES_MILOTIC-1] = 0x22, + [SPECIES_CARVANHA-1] = 0x49, + [SPECIES_SHARPEDO-1] = 0x56, + [SPECIES_TRAPINCH-1] = 0x10, + [SPECIES_VIBRAVA-1] = 0x0f, + [SPECIES_FLYGON-1] = 0x4b, + [SPECIES_MAKUHITA-1] = 0x0b, + [SPECIES_HARIYAMA-1] = 0x34, + [SPECIES_ELECTRIKE-1] = 0x00, + [SPECIES_MANECTRIC-1] = 0x00, + [SPECIES_NUMEL-1] = 0x04, + [SPECIES_CAMERUPT-1] = 0x10, + [SPECIES_SPHEAL-1] = 0x53, + [SPECIES_SEALEO-1] = 0x17, + [SPECIES_WALREIN-1] = 0x0f, + [SPECIES_CACNEA-1] = 0x49, + [SPECIES_CACTURNE-1] = 0x04, + [SPECIES_SNORUNT-1] = 0x45, + [SPECIES_GLALIE-1] = 0x0a, + [SPECIES_LUNATONE-1] = 0x0e, + [SPECIES_SOLROCK-1] = 0x08, + [SPECIES_AZURILL-1] = 0x00, + [SPECIES_SPOINK-1] = 0x56, + [SPECIES_GRUMPIG-1] = 0x32, + [SPECIES_PLUSLE-1] = 0x00, + [SPECIES_MINUN-1] = 0x01, + [SPECIES_MAWILE-1] = 0x00, + [SPECIES_MEDITITE-1] = 0x05, + [SPECIES_MEDICHAM-1] = 0x45, + [SPECIES_SWABLU-1] = 0x04, + [SPECIES_ALTARIA-1] = 0x16, + [SPECIES_WYNAUT-1] = 0x32, + [SPECIES_DUSKULL-1] = 0x0a, + [SPECIES_DUSCLOPS-1] = 0x02, + [SPECIES_ROSELIA-1] = 0x45, + [SPECIES_SLAKOTH-1] = 0x45, + [SPECIES_VIGOROTH-1] = 0x31, + [SPECIES_SLAKING-1] = 0x45, + [SPECIES_GULPIN-1] = 0x00, + [SPECIES_SWALOT-1] = 0x45, + [SPECIES_TROPIUS-1] = 0x10, + [SPECIES_WHISMUR-1] = 0x03, + [SPECIES_LOUDRED-1] = 0x49, + [SPECIES_EXPLOUD-1] = 0x19, + [SPECIES_CLAMPERL-1] = 0x12, + [SPECIES_HUNTAIL-1] = 0x09, + [SPECIES_GOREBYSS-1] = 0x1c, + [SPECIES_ABSOL-1] = 0x11, + [SPECIES_SHUPPET-1] = 0x1c, + [SPECIES_BANETTE-1] = 0x0d, + [SPECIES_SEVIPER-1] = 0x17, + [SPECIES_ZANGOOSE-1] = 0x09, + [SPECIES_RELICANTH-1] = 0x1a, + [SPECIES_ARON-1] = 0x45, + [SPECIES_LAIRON-1] = 0x00, + [SPECIES_AGGRON-1] = 0x19, + [SPECIES_CASTFORM-1] = 0x1d, + [SPECIES_VOLBEAT-1] = 0x00, + [SPECIES_ILLUMISE-1] = 0x05, + [SPECIES_LILEEP-1] = 0x17, + [SPECIES_CRADILY-1] = 0x19, + [SPECIES_ANORITH-1] = 0x12, + [SPECIES_ARMALDO-1] = 0x10, + [SPECIES_RALTS-1] = 0x45, + [SPECIES_KIRLIA-1] = 0x00, + [SPECIES_GARDEVOIR-1] = 0x00, + [SPECIES_BAGON-1] = 0x19, + [SPECIES_SHELGON-1] = 0x04, + [SPECIES_SALAMENCE-1] = 0x0f, + [SPECIES_BELDUM-1] = 0x0f, + [SPECIES_METANG-1] = 0x04, + [SPECIES_METAGROSS-1] = 0x10, + [SPECIES_REGIROCK-1] = 0x01, + [SPECIES_REGICE-1] = 0x44, + [SPECIES_REGISTEEL-1] = 0x09, + [SPECIES_KYOGRE-1] = 0x2d, + [SPECIES_GROUDON-1] = 0x10, + [SPECIES_RAYQUAZA-1] = 0x0f, + [SPECIES_LATIAS-1] = 0x2d, + [SPECIES_LATIOS-1] = 0x10, + [SPECIES_JIRACHI-1] = 0x0d, + [SPECIES_DEOXYS-1] = 0x1b, + [SPECIES_CHIMECHO-1] = 0x1d, }; static const u8 sMonAnimationDelayTable[] = { - 0x00, // SPECIES_BULBASAUR - 0x00, // SPECIES_IVYSAUR - 0x00, // SPECIES_VENUSAUR - 0x00, // SPECIES_CHARMANDER - 0x00, // SPECIES_CHARMELEON - 0x00, // SPECIES_CHARIZARD - 0x00, // SPECIES_SQUIRTLE - 0x00, // SPECIES_WARTORTLE - 0x32, // SPECIES_BLASTOISE - 0x00, // SPECIES_CATERPIE - 0x00, // SPECIES_METAPOD - 0x00, // SPECIES_BUTTERFREE - 0x0a, // SPECIES_WEEDLE - 0x14, // SPECIES_KAKUNA - 0x23, // SPECIES_BEEDRILL - 0x00, // SPECIES_PIDGEY - 0x19, // SPECIES_PIDGEOTTO - 0x00, // SPECIES_PIDGEOT - 0x00, // SPECIES_RATTATA - 0x00, // SPECIES_RATICATE - 0x00, // SPECIES_SPEAROW - 0x02, // SPECIES_FEAROW - 0x1e, // SPECIES_EKANS - 0x00, // SPECIES_ARBOK - 0x00, // SPECIES_PIKACHU - 0x00, // SPECIES_RAICHU - 0x00, // SPECIES_SANDSHREW - 0x00, // SPECIES_SANDSLASH - 0x1c, // SPECIES_NIDORAN_F - 0x00, // SPECIES_NIDORINA - 0x00, // SPECIES_NIDOQUEEN - 0x00, // SPECIES_NIDORAN_M - 0x00, // SPECIES_NIDORINO - 0x19, // SPECIES_NIDOKING - 0x00, // SPECIES_CLEFAIRY - 0x00, // SPECIES_CLEFABLE - 0x00, // SPECIES_VULPIX - 0x00, // SPECIES_NINETALES - 0x00, // SPECIES_JIGGLYPUFF - 0x00, // SPECIES_WIGGLYTUFF - 0x00, // SPECIES_ZUBAT - 0x00, // SPECIES_GOLBAT - 0x00, // SPECIES_ODDISH - 0x00, // SPECIES_GLOOM - 0x00, // SPECIES_VILEPLUME - 0x0a, // SPECIES_PARAS - 0x2d, // SPECIES_PARASECT - 0x14, // SPECIES_VENONAT - 0x00, // SPECIES_VENOMOTH - 0x19, // SPECIES_DIGLETT - 0x23, // SPECIES_DUGTRIO - 0x28, // SPECIES_MEOWTH - 0x14, // SPECIES_PERSIAN - 0x00, // SPECIES_PSYDUCK - 0x00, // SPECIES_GOLDUCK - 0x14, // SPECIES_MANKEY - 0x00, // SPECIES_PRIMEAPE - 0x1e, // SPECIES_GROWLITHE - 0x28, // SPECIES_ARCANINE - 0x00, // SPECIES_POLIWAG - 0x05, // SPECIES_POLIWHIRL - 0x00, // SPECIES_POLIWRATH - 0x00, // SPECIES_ABRA - 0x00, // SPECIES_KADABRA - 0x00, // SPECIES_ALAKAZAM - 0x00, // SPECIES_MACHOP - 0x00, // SPECIES_MACHOKE - 0x00, // SPECIES_MACHAMP - 0x00, // SPECIES_BELLSPROUT - 0x03, // SPECIES_WEEPINBELL - 0x00, // SPECIES_VICTREEBEL - 0x00, // SPECIES_TENTACOOL - 0x00, // SPECIES_TENTACRUEL - 0x00, // SPECIES_GEODUDE - 0x00, // SPECIES_GRAVELER - 0x00, // SPECIES_GOLEM - 0x00, // SPECIES_PONYTA - 0x00, // SPECIES_RAPIDASH - 0x00, // SPECIES_SLOWPOKE - 0x00, // SPECIES_SLOWBRO - 0x00, // SPECIES_MAGNEMITE - 0x00, // SPECIES_MAGNETON - 0x00, // SPECIES_FARFETCHD - 0x00, // SPECIES_DODUO - 0x00, // SPECIES_DODRIO - 0x00, // SPECIES_SEEL - 0x00, // SPECIES_DEWGONG - 0x00, // SPECIES_GRIMER - 0x2d, // SPECIES_MUK - 0x14, // SPECIES_SHELLDER - 0x00, // SPECIES_CLOYSTER - 0x00, // SPECIES_GASTLY - 0x17, // SPECIES_HAUNTER - 0x00, // SPECIES_GENGAR - 0x00, // SPECIES_ONIX - 0x30, // SPECIES_DROWZEE - 0x28, // SPECIES_HYPNO - 0x00, // SPECIES_KRABBY - 0x00, // SPECIES_KINGLER - 0x00, // SPECIES_VOLTORB - 0x00, // SPECIES_ELECTRODE - 0x00, // SPECIES_EXEGGCUTE - 0x00, // SPECIES_EXEGGUTOR - 0x00, // SPECIES_CUBONE - 0x00, // SPECIES_MAROWAK - 0x00, // SPECIES_HITMONLEE - 0x19, // SPECIES_HITMONCHAN - 0x00, // SPECIES_LICKITUNG - 0x00, // SPECIES_KOFFING - 0x00, // SPECIES_WEEZING - 0x00, // SPECIES_RHYHORN - 0x00, // SPECIES_RHYDON - 0x00, // SPECIES_CHANSEY - 0x00, // SPECIES_TANGELA - 0x00, // SPECIES_KANGASKHAN - 0x00, // SPECIES_HORSEA - 0x00, // SPECIES_SEADRA - 0x00, // SPECIES_GOLDEEN - 0x00, // SPECIES_SEAKING - 0x00, // SPECIES_STARYU - 0x00, // SPECIES_STARMIE - 0x00, // SPECIES_MR_MIME - 0x0a, // SPECIES_SCYTHER - 0x00, // SPECIES_JYNX - 0x00, // SPECIES_ELECTABUZZ - 0x00, // SPECIES_MAGMAR - 0x00, // SPECIES_PINSIR - 0x0a, // SPECIES_TAUROS - 0x00, // SPECIES_MAGIKARP - 0x00, // SPECIES_GYARADOS - 0x00, // SPECIES_LAPRAS - 0x00, // SPECIES_DITTO - 0x00, // SPECIES_EEVEE - 0x00, // SPECIES_VAPOREON - 0x00, // SPECIES_JOLTEON - 0x00, // SPECIES_FLAREON - 0x00, // SPECIES_PORYGON - 0x00, // SPECIES_OMANYTE - 0x00, // SPECIES_OMASTAR - 0x00, // SPECIES_KABUTO - 0x00, // SPECIES_KABUTOPS - 0x00, // SPECIES_AERODACTYL - 0x00, // SPECIES_SNORLAX - 0x00, // SPECIES_ARTICUNO - 0x00, // SPECIES_ZAPDOS - 0x00, // SPECIES_MOLTRES - 0x00, // SPECIES_DRATINI - 0x00, // SPECIES_DRAGONAIR - 0x00, // SPECIES_DRAGONITE - 0x00, // SPECIES_MEWTWO - 0x00, // SPECIES_MEW - 0x00, // SPECIES_CHIKORITA - 0x00, // SPECIES_BAYLEEF - 0x00, // SPECIES_MEGANIUM - 0x00, // SPECIES_CYNDAQUIL - 0x00, // SPECIES_QUILAVA - 0x14, // SPECIES_TYPHLOSION - 0x00, // SPECIES_TOTODILE - 0x00, // SPECIES_CROCONAW - 0x05, // SPECIES_FERALIGATR - 0x00, // SPECIES_SENTRET - 0x00, // SPECIES_FURRET - 0x00, // SPECIES_HOOTHOOT - 0x00, // SPECIES_NOCTOWL - 0x00, // SPECIES_LEDYBA - 0x00, // SPECIES_LEDIAN - 0x00, // SPECIES_SPINARAK - 0x00, // SPECIES_ARIADOS - 0x00, // SPECIES_CROBAT - 0x00, // SPECIES_CHINCHOU - 0x00, // SPECIES_LANTURN - 0x00, // SPECIES_PICHU - 0x00, // SPECIES_CLEFFA - 0x00, // SPECIES_IGGLYBUFF - 0x00, // SPECIES_TOGEPI - 0x00, // SPECIES_TOGETIC - 0x1e, // SPECIES_NATU - 0x00, // SPECIES_XATU - 0x32, // SPECIES_MAREEP - 0x00, // SPECIES_FLAAFFY - 0x0a, // SPECIES_AMPHAROS - 0x00, // SPECIES_BELLOSSOM - 0x00, // SPECIES_MARILL - 0x00, // SPECIES_AZUMARILL - 0x00, // SPECIES_SUDOWOODO - 0x28, // SPECIES_POLITOED - 0x00, // SPECIES_HOPPIP - 0x00, // SPECIES_SKIPLOOM - 0x00, // SPECIES_JUMPLUFF - 0x00, // SPECIES_AIPOM - 0x00, // SPECIES_SUNKERN - 0x00, // SPECIES_SUNFLORA - 0x00, // SPECIES_YANMA - 0x00, // SPECIES_WOOPER - 0x00, // SPECIES_QUAGSIRE - 0x00, // SPECIES_ESPEON - 0x00, // SPECIES_UMBREON - 0x00, // SPECIES_MURKROW - 0x00, // SPECIES_SLOWKING - 0x00, // SPECIES_MISDREAVUS - 0x00, // SPECIES_UNOWN - 0x00, // SPECIES_WOBBUFFET - 0x00, // SPECIES_GIRAFARIG - 0x00, // SPECIES_PINECO - 0x00, // SPECIES_FORRETRESS - 0x0a, // SPECIES_DUNSPARCE - 0x00, // SPECIES_GLIGAR - 0x2d, // SPECIES_STEELIX - 0x00, // SPECIES_SNUBBULL - 0x00, // SPECIES_GRANBULL - 0x27, // SPECIES_QWILFISH - 0x13, // SPECIES_SCIZOR - 0x00, // SPECIES_SHUCKLE - 0x00, // SPECIES_HERACROSS - 0x00, // SPECIES_SNEASEL - 0x00, // SPECIES_TEDDIURSA - 0x00, // SPECIES_URSARING - 0x00, // SPECIES_SLUGMA - 0x00, // SPECIES_MAGCARGO - 0x00, // SPECIES_SWINUB - 0x00, // SPECIES_PILOSWINE - 0x00, // SPECIES_CORSOLA - 0x00, // SPECIES_REMORAID - 0x14, // SPECIES_OCTILLERY - 0x00, // SPECIES_DELIBIRD - 0x00, // SPECIES_MANTINE - 0x00, // SPECIES_SKARMORY - 0x00, // SPECIES_HOUNDOUR - 0x00, // SPECIES_HOUNDOOM - 0x00, // SPECIES_KINGDRA - 0x00, // SPECIES_PHANPY - 0x00, // SPECIES_DONPHAN - 0x00, // SPECIES_PORYGON2 - 0x00, // SPECIES_STANTLER - 0x00, // SPECIES_SMEARGLE - 0x00, // SPECIES_TYROGUE - 0x00, // SPECIES_HITMONTOP - 0x28, // SPECIES_SMOOCHUM - 0x00, // SPECIES_ELEKID - 0x00, // SPECIES_MAGBY - 0x00, // SPECIES_MILTANK - 0x00, // SPECIES_BLISSEY - 0x00, // SPECIES_RAIKOU - 0x00, // SPECIES_ENTEI - 0x00, // SPECIES_SUICUNE - 0x00, // SPECIES_LARVITAR - 0x00, // SPECIES_PUPITAR - 0x0a, // SPECIES_TYRANITAR - 0x14, // SPECIES_LUGIA - 0x00, // SPECIES_HO_OH - 0x00, // SPECIES_CELEBI - 0x00, // 252 - 0x00, // 253 - 0x00, // 254 - 0x00, // 255 - 0x00, // 256 - 0x00, // 257 - 0x00, // 258 - 0x00, // 259 - 0x00, // 260 - 0x00, // 261 - 0x00, // 262 - 0x00, // 263 - 0x00, // 264 - 0x00, // 265 - 0x00, // 266 - 0x00, // 267 - 0x00, // 268 - 0x00, // 269 - 0x00, // 270 - 0x00, // 271 - 0x00, // 272 - 0x00, // 273 - 0x00, // 274 - 0x00, // 275 - 0x00, // 276 - 0x00, // SPECIES_TREECKO - 0x00, // SPECIES_GROVYLE - 0x00, // SPECIES_SCEPTILE - 0x00, // SPECIES_TORCHIC - 0x00, // SPECIES_COMBUSKEN - 0x00, // SPECIES_BLAZIKEN - 0x00, // SPECIES_MUDKIP - 0x00, // SPECIES_MARSHTOMP - 0x00, // SPECIES_SWAMPERT - 0x00, // SPECIES_POOCHYENA - 0x00, // SPECIES_MIGHTYENA - 0x00, // SPECIES_ZIGZAGOON - 0x00, // SPECIES_LINOONE - 0x00, // SPECIES_WURMPLE - 0x00, // SPECIES_SILCOON - 0x00, // SPECIES_BEAUTIFLY - 0x00, // SPECIES_CASCOON - 0x00, // SPECIES_DUSTOX - 0x00, // SPECIES_LOTAD - 0x00, // SPECIES_LOMBRE - 0x00, // SPECIES_LUDICOLO - 0x00, // SPECIES_SEEDOT - 0x00, // SPECIES_NUZLEAF - 0x00, // SPECIES_SHIFTRY - 0x00, // SPECIES_NINCADA - 0x00, // SPECIES_NINJASK - 0x00, // SPECIES_SHEDINJA - 0x00, // SPECIES_TAILLOW - 0x00, // SPECIES_SWELLOW - 0x00, // SPECIES_SHROOMISH - 0x00, // SPECIES_BRELOOM - 0x00, // SPECIES_SPINDA - 0x00, // SPECIES_WINGULL - 0x00, // SPECIES_PELIPPER - 0x00, // SPECIES_SURSKIT - 0x00, // SPECIES_MASQUERAIN - 0x00, // SPECIES_WAILMER - 0x0a, // SPECIES_WAILORD - 0x00, // SPECIES_SKITTY - 0x00, // SPECIES_DELCATTY - 0x1e, // SPECIES_KECLEON - 0x00, // SPECIES_BALTOY - 0x00, // SPECIES_CLAYDOL - 0x00, // SPECIES_NOSEPASS - 0x00, // SPECIES_TORKOAL - 0x00, // SPECIES_SABLEYE - 0x00, // SPECIES_BARBOACH - 0x00, // SPECIES_WHISCASH - 0x00, // SPECIES_LUVDISC - 0x00, // SPECIES_CORPHISH - 0x00, // SPECIES_CRAWDAUNT - 0x00, // SPECIES_FEEBAS - 0x2d, // SPECIES_MILOTIC - 0x00, // SPECIES_CARVANHA - 0x00, // SPECIES_SHARPEDO - 0x00, // SPECIES_TRAPINCH - 0x00, // SPECIES_VIBRAVA - 0x00, // SPECIES_FLYGON - 0x00, // SPECIES_MAKUHITA - 0x00, // SPECIES_HARIYAMA - 0x00, // SPECIES_ELECTRIKE - 0x00, // SPECIES_MANECTRIC - 0x00, // SPECIES_NUMEL - 0x00, // SPECIES_CAMERUPT - 0x0f, // SPECIES_SPHEAL - 0x00, // SPECIES_SEALEO - 0x00, // SPECIES_WALREIN - 0x00, // SPECIES_CACNEA - 0x00, // SPECIES_CACTURNE - 0x14, // SPECIES_SNORUNT - 0x00, // SPECIES_GLALIE - 0x00, // SPECIES_LUNATONE - 0x00, // SPECIES_SOLROCK - 0x00, // SPECIES_AZURILL - 0x00, // SPECIES_SPOINK - 0x0f, // SPECIES_GRUMPIG - 0x00, // SPECIES_PLUSLE - 0x00, // SPECIES_MINUN - 0x00, // SPECIES_MAWILE - 0x00, // SPECIES_MEDITITE - 0x00, // SPECIES_MEDICHAM - 0x00, // SPECIES_SWABLU - 0x00, // SPECIES_ALTARIA - 0x0f, // SPECIES_WYNAUT - 0x00, // SPECIES_DUSKULL - 0x1e, // SPECIES_DUSCLOPS - 0x00, // SPECIES_ROSELIA - 0x00, // SPECIES_SLAKOTH - 0x00, // SPECIES_VIGOROTH - 0x00, // SPECIES_SLAKING - 0x00, // SPECIES_GULPIN - 0x00, // SPECIES_SWALOT - 0x00, // SPECIES_TROPIUS - 0x00, // SPECIES_WHISMUR - 0x00, // SPECIES_LOUDRED - 0x00, // SPECIES_EXPLOUD - 0x00, // SPECIES_CLAMPERL - 0x00, // SPECIES_HUNTAIL - 0x00, // SPECIES_GOREBYSS - 0x2d, // SPECIES_ABSOL - 0x00, // SPECIES_SHUPPET - 0x00, // SPECIES_BANETTE - 0x00, // SPECIES_SEVIPER - 0x00, // SPECIES_ZANGOOSE - 0x00, // SPECIES_RELICANTH - 0x00, // SPECIES_ARON - 0x00, // SPECIES_LAIRON - 0x00, // SPECIES_AGGRON - 0x00, // SPECIES_CASTFORM - 0x00, // SPECIES_VOLBEAT - 0x00, // SPECIES_ILLUMISE - 0x00, // SPECIES_LILEEP - 0x00, // SPECIES_CRADILY - 0x00, // SPECIES_ANORITH - 0x00, // SPECIES_ARMALDO - 0x00, // SPECIES_RALTS - 0x00, // SPECIES_KIRLIA - 0x00, // SPECIES_GARDEVOIR - 0x00, // SPECIES_BAGON - 0x00, // SPECIES_SHELGON - 0x46, // SPECIES_SALAMENCE - 0x00, // SPECIES_BELDUM - 0x00, // SPECIES_METANG - 0x00, // SPECIES_METAGROSS - 0x00, // SPECIES_REGIROCK - 0x00, // SPECIES_REGICE - 0x00, // SPECIES_REGISTEEL - 0x3c, // SPECIES_KYOGRE - 0x00, // SPECIES_GROUDON - 0x3c, // SPECIES_RAYQUAZA - 0x00, // SPECIES_LATIAS - 0x00, // SPECIES_LATIOS - 0x00, // SPECIES_JIRACHI - 0x00, // SPECIES_DEOXYS - 0x00, // SPECIES_CHIMECHO + [SPECIES_BULBASAUR-1] = 0x00, + [SPECIES_IVYSAUR-1] = 0x00, + [SPECIES_VENUSAUR-1] = 0x00, + [SPECIES_CHARMANDER-1] = 0x00, + [SPECIES_CHARMELEON-1] = 0x00, + [SPECIES_CHARIZARD-1] = 0x00, + [SPECIES_SQUIRTLE-1] = 0x00, + [SPECIES_WARTORTLE-1] = 0x00, + [SPECIES_BLASTOISE-1] = 0x32, + [SPECIES_CATERPIE-1] = 0x00, + [SPECIES_METAPOD-1] = 0x00, + [SPECIES_BUTTERFREE-1] = 0x00, + [SPECIES_WEEDLE-1] = 0x0a, + [SPECIES_KAKUNA-1] = 0x14, + [SPECIES_BEEDRILL-1] = 0x23, + [SPECIES_PIDGEY-1] = 0x00, + [SPECIES_PIDGEOTTO-1] = 0x19, + [SPECIES_PIDGEOT-1] = 0x00, + [SPECIES_RATTATA-1] = 0x00, + [SPECIES_RATICATE-1] = 0x00, + [SPECIES_SPEAROW-1] = 0x00, + [SPECIES_FEAROW-1] = 0x02, + [SPECIES_EKANS-1] = 0x1e, + [SPECIES_ARBOK-1] = 0x00, + [SPECIES_PIKACHU-1] = 0x00, + [SPECIES_RAICHU-1] = 0x00, + [SPECIES_SANDSHREW-1] = 0x00, + [SPECIES_SANDSLASH-1] = 0x00, + [SPECIES_NIDORAN_F-1] = 0x1c, + [SPECIES_NIDORINA-1] = 0x00, + [SPECIES_NIDOQUEEN-1] = 0x00, + [SPECIES_NIDORAN_M-1] = 0x00, + [SPECIES_NIDORINO-1] = 0x00, + [SPECIES_NIDOKING-1] = 0x19, + [SPECIES_CLEFAIRY-1] = 0x00, + [SPECIES_CLEFABLE-1] = 0x00, + [SPECIES_VULPIX-1] = 0x00, + [SPECIES_NINETALES-1] = 0x00, + [SPECIES_JIGGLYPUFF-1] = 0x00, + [SPECIES_WIGGLYTUFF-1] = 0x00, + [SPECIES_ZUBAT-1] = 0x00, + [SPECIES_GOLBAT-1] = 0x00, + [SPECIES_ODDISH-1] = 0x00, + [SPECIES_GLOOM-1] = 0x00, + [SPECIES_VILEPLUME-1] = 0x00, + [SPECIES_PARAS-1] = 0x0a, + [SPECIES_PARASECT-1] = 0x2d, + [SPECIES_VENONAT-1] = 0x14, + [SPECIES_VENOMOTH-1] = 0x00, + [SPECIES_DIGLETT-1] = 0x19, + [SPECIES_DUGTRIO-1] = 0x23, + [SPECIES_MEOWTH-1] = 0x28, + [SPECIES_PERSIAN-1] = 0x14, + [SPECIES_PSYDUCK-1] = 0x00, + [SPECIES_GOLDUCK-1] = 0x00, + [SPECIES_MANKEY-1] = 0x14, + [SPECIES_PRIMEAPE-1] = 0x00, + [SPECIES_GROWLITHE-1] = 0x1e, + [SPECIES_ARCANINE-1] = 0x28, + [SPECIES_POLIWAG-1] = 0x00, + [SPECIES_POLIWHIRL-1] = 0x05, + [SPECIES_POLIWRATH-1] = 0x00, + [SPECIES_ABRA-1] = 0x00, + [SPECIES_KADABRA-1] = 0x00, + [SPECIES_ALAKAZAM-1] = 0x00, + [SPECIES_MACHOP-1] = 0x00, + [SPECIES_MACHOKE-1] = 0x00, + [SPECIES_MACHAMP-1] = 0x00, + [SPECIES_BELLSPROUT-1] = 0x00, + [SPECIES_WEEPINBELL-1] = 0x03, + [SPECIES_VICTREEBEL-1] = 0x00, + [SPECIES_TENTACOOL-1] = 0x00, + [SPECIES_TENTACRUEL-1] = 0x00, + [SPECIES_GEODUDE-1] = 0x00, + [SPECIES_GRAVELER-1] = 0x00, + [SPECIES_GOLEM-1] = 0x00, + [SPECIES_PONYTA-1] = 0x00, + [SPECIES_RAPIDASH-1] = 0x00, + [SPECIES_SLOWPOKE-1] = 0x00, + [SPECIES_SLOWBRO-1] = 0x00, + [SPECIES_MAGNEMITE-1] = 0x00, + [SPECIES_MAGNETON-1] = 0x00, + [SPECIES_FARFETCHD-1] = 0x00, + [SPECIES_DODUO-1] = 0x00, + [SPECIES_DODRIO-1] = 0x00, + [SPECIES_SEEL-1] = 0x00, + [SPECIES_DEWGONG-1] = 0x00, + [SPECIES_GRIMER-1] = 0x00, + [SPECIES_MUK-1] = 0x2d, + [SPECIES_SHELLDER-1] = 0x14, + [SPECIES_CLOYSTER-1] = 0x00, + [SPECIES_GASTLY-1] = 0x00, + [SPECIES_HAUNTER-1] = 0x17, + [SPECIES_GENGAR-1] = 0x00, + [SPECIES_ONIX-1] = 0x00, + [SPECIES_DROWZEE-1] = 0x30, + [SPECIES_HYPNO-1] = 0x28, + [SPECIES_KRABBY-1] = 0x00, + [SPECIES_KINGLER-1] = 0x00, + [SPECIES_VOLTORB-1] = 0x00, + [SPECIES_ELECTRODE-1] = 0x00, + [SPECIES_EXEGGCUTE-1] = 0x00, + [SPECIES_EXEGGUTOR-1] = 0x00, + [SPECIES_CUBONE-1] = 0x00, + [SPECIES_MAROWAK-1] = 0x00, + [SPECIES_HITMONLEE-1] = 0x00, + [SPECIES_HITMONCHAN-1] = 0x19, + [SPECIES_LICKITUNG-1] = 0x00, + [SPECIES_KOFFING-1] = 0x00, + [SPECIES_WEEZING-1] = 0x00, + [SPECIES_RHYHORN-1] = 0x00, + [SPECIES_RHYDON-1] = 0x00, + [SPECIES_CHANSEY-1] = 0x00, + [SPECIES_TANGELA-1] = 0x00, + [SPECIES_KANGASKHAN-1] = 0x00, + [SPECIES_HORSEA-1] = 0x00, + [SPECIES_SEADRA-1] = 0x00, + [SPECIES_GOLDEEN-1] = 0x00, + [SPECIES_SEAKING-1] = 0x00, + [SPECIES_STARYU-1] = 0x00, + [SPECIES_STARMIE-1] = 0x00, + [SPECIES_MR_MIME-1] = 0x00, + [SPECIES_SCYTHER-1] = 0x0a, + [SPECIES_JYNX-1] = 0x00, + [SPECIES_ELECTABUZZ-1] = 0x00, + [SPECIES_MAGMAR-1] = 0x00, + [SPECIES_PINSIR-1] = 0x00, + [SPECIES_TAUROS-1] = 0x0a, + [SPECIES_MAGIKARP-1] = 0x00, + [SPECIES_GYARADOS-1] = 0x00, + [SPECIES_LAPRAS-1] = 0x00, + [SPECIES_DITTO-1] = 0x00, + [SPECIES_EEVEE-1] = 0x00, + [SPECIES_VAPOREON-1] = 0x00, + [SPECIES_JOLTEON-1] = 0x00, + [SPECIES_FLAREON-1] = 0x00, + [SPECIES_PORYGON-1] = 0x00, + [SPECIES_OMANYTE-1] = 0x00, + [SPECIES_OMASTAR-1] = 0x00, + [SPECIES_KABUTO-1] = 0x00, + [SPECIES_KABUTOPS-1] = 0x00, + [SPECIES_AERODACTYL-1] = 0x00, + [SPECIES_SNORLAX-1] = 0x00, + [SPECIES_ARTICUNO-1] = 0x00, + [SPECIES_ZAPDOS-1] = 0x00, + [SPECIES_MOLTRES-1] = 0x00, + [SPECIES_DRATINI-1] = 0x00, + [SPECIES_DRAGONAIR-1] = 0x00, + [SPECIES_DRAGONITE-1] = 0x00, + [SPECIES_MEWTWO-1] = 0x00, + [SPECIES_MEW-1] = 0x00, + [SPECIES_CHIKORITA-1] = 0x00, + [SPECIES_BAYLEEF-1] = 0x00, + [SPECIES_MEGANIUM-1] = 0x00, + [SPECIES_CYNDAQUIL-1] = 0x00, + [SPECIES_QUILAVA-1] = 0x00, + [SPECIES_TYPHLOSION-1] = 0x14, + [SPECIES_TOTODILE-1] = 0x00, + [SPECIES_CROCONAW-1] = 0x00, + [SPECIES_FERALIGATR-1] = 0x05, + [SPECIES_SENTRET-1] = 0x00, + [SPECIES_FURRET-1] = 0x00, + [SPECIES_HOOTHOOT-1] = 0x00, + [SPECIES_NOCTOWL-1] = 0x00, + [SPECIES_LEDYBA-1] = 0x00, + [SPECIES_LEDIAN-1] = 0x00, + [SPECIES_SPINARAK-1] = 0x00, + [SPECIES_ARIADOS-1] = 0x00, + [SPECIES_CROBAT-1] = 0x00, + [SPECIES_CHINCHOU-1] = 0x00, + [SPECIES_LANTURN-1] = 0x00, + [SPECIES_PICHU-1] = 0x00, + [SPECIES_CLEFFA-1] = 0x00, + [SPECIES_IGGLYBUFF-1] = 0x00, + [SPECIES_TOGEPI-1] = 0x00, + [SPECIES_TOGETIC-1] = 0x00, + [SPECIES_NATU-1] = 0x1e, + [SPECIES_XATU-1] = 0x00, + [SPECIES_MAREEP-1] = 0x32, + [SPECIES_FLAAFFY-1] = 0x00, + [SPECIES_AMPHAROS-1] = 0x0a, + [SPECIES_BELLOSSOM-1] = 0x00, + [SPECIES_MARILL-1] = 0x00, + [SPECIES_AZUMARILL-1] = 0x00, + [SPECIES_SUDOWOODO-1] = 0x00, + [SPECIES_POLITOED-1] = 0x28, + [SPECIES_HOPPIP-1] = 0x00, + [SPECIES_SKIPLOOM-1] = 0x00, + [SPECIES_JUMPLUFF-1] = 0x00, + [SPECIES_AIPOM-1] = 0x00, + [SPECIES_SUNKERN-1] = 0x00, + [SPECIES_SUNFLORA-1] = 0x00, + [SPECIES_YANMA-1] = 0x00, + [SPECIES_WOOPER-1] = 0x00, + [SPECIES_QUAGSIRE-1] = 0x00, + [SPECIES_ESPEON-1] = 0x00, + [SPECIES_UMBREON-1] = 0x00, + [SPECIES_MURKROW-1] = 0x00, + [SPECIES_SLOWKING-1] = 0x00, + [SPECIES_MISDREAVUS-1] = 0x00, + [SPECIES_UNOWN-1] = 0x00, + [SPECIES_WOBBUFFET-1] = 0x00, + [SPECIES_GIRAFARIG-1] = 0x00, + [SPECIES_PINECO-1] = 0x00, + [SPECIES_FORRETRESS-1] = 0x00, + [SPECIES_DUNSPARCE-1] = 0x0a, + [SPECIES_GLIGAR-1] = 0x00, + [SPECIES_STEELIX-1] = 0x2d, + [SPECIES_SNUBBULL-1] = 0x00, + [SPECIES_GRANBULL-1] = 0x00, + [SPECIES_QWILFISH-1] = 0x27, + [SPECIES_SCIZOR-1] = 0x13, + [SPECIES_SHUCKLE-1] = 0x00, + [SPECIES_HERACROSS-1] = 0x00, + [SPECIES_SNEASEL-1] = 0x00, + [SPECIES_TEDDIURSA-1] = 0x00, + [SPECIES_URSARING-1] = 0x00, + [SPECIES_SLUGMA-1] = 0x00, + [SPECIES_MAGCARGO-1] = 0x00, + [SPECIES_SWINUB-1] = 0x00, + [SPECIES_PILOSWINE-1] = 0x00, + [SPECIES_CORSOLA-1] = 0x00, + [SPECIES_REMORAID-1] = 0x00, + [SPECIES_OCTILLERY-1] = 0x14, + [SPECIES_DELIBIRD-1] = 0x00, + [SPECIES_MANTINE-1] = 0x00, + [SPECIES_SKARMORY-1] = 0x00, + [SPECIES_HOUNDOUR-1] = 0x00, + [SPECIES_HOUNDOOM-1] = 0x00, + [SPECIES_KINGDRA-1] = 0x00, + [SPECIES_PHANPY-1] = 0x00, + [SPECIES_DONPHAN-1] = 0x00, + [SPECIES_PORYGON2-1] = 0x00, + [SPECIES_STANTLER-1] = 0x00, + [SPECIES_SMEARGLE-1] = 0x00, + [SPECIES_TYROGUE-1] = 0x00, + [SPECIES_HITMONTOP-1] = 0x00, + [SPECIES_SMOOCHUM-1] = 0x28, + [SPECIES_ELEKID-1] = 0x00, + [SPECIES_MAGBY-1] = 0x00, + [SPECIES_MILTANK-1] = 0x00, + [SPECIES_BLISSEY-1] = 0x00, + [SPECIES_RAIKOU-1] = 0x00, + [SPECIES_ENTEI-1] = 0x00, + [SPECIES_SUICUNE-1] = 0x00, + [SPECIES_LARVITAR-1] = 0x00, + [SPECIES_PUPITAR-1] = 0x00, + [SPECIES_TYRANITAR-1] = 0x0a, + [SPECIES_LUGIA-1] = 0x14, + [SPECIES_HO_OH-1] = 0x00, + [SPECIES_CELEBI-1] = 0x00, + [SPECIES_OLD_UNOWN_B-1] = 0x00, + [SPECIES_OLD_UNOWN_C-1] = 0x00, + [SPECIES_OLD_UNOWN_D-1] = 0x00, + [SPECIES_OLD_UNOWN_E-1] = 0x00, + [SPECIES_OLD_UNOWN_F-1] = 0x00, + [SPECIES_OLD_UNOWN_G-1] = 0x00, + [SPECIES_OLD_UNOWN_H-1] = 0x00, + [SPECIES_OLD_UNOWN_I-1] = 0x00, + [SPECIES_OLD_UNOWN_J-1] = 0x00, + [SPECIES_OLD_UNOWN_K-1] = 0x00, + [SPECIES_OLD_UNOWN_L-1] = 0x00, + [SPECIES_OLD_UNOWN_M-1] = 0x00, + [SPECIES_OLD_UNOWN_N-1] = 0x00, + [SPECIES_OLD_UNOWN_O-1] = 0x00, + [SPECIES_OLD_UNOWN_P-1] = 0x00, + [SPECIES_OLD_UNOWN_Q-1] = 0x00, + [SPECIES_OLD_UNOWN_R-1] = 0x00, + [SPECIES_OLD_UNOWN_S-1] = 0x00, + [SPECIES_OLD_UNOWN_T-1] = 0x00, + [SPECIES_OLD_UNOWN_U-1] = 0x00, + [SPECIES_OLD_UNOWN_V-1] = 0x00, + [SPECIES_OLD_UNOWN_W-1] = 0x00, + [SPECIES_OLD_UNOWN_X-1] = 0x00, + [SPECIES_OLD_UNOWN_Y-1] = 0x00, + [SPECIES_OLD_UNOWN_Z-1] = 0x00, + [SPECIES_TREECKO-1] = 0x00, + [SPECIES_GROVYLE-1] = 0x00, + [SPECIES_SCEPTILE-1] = 0x00, + [SPECIES_TORCHIC-1] = 0x00, + [SPECIES_COMBUSKEN-1] = 0x00, + [SPECIES_BLAZIKEN-1] = 0x00, + [SPECIES_MUDKIP-1] = 0x00, + [SPECIES_MARSHTOMP-1] = 0x00, + [SPECIES_SWAMPERT-1] = 0x00, + [SPECIES_POOCHYENA-1] = 0x00, + [SPECIES_MIGHTYENA-1] = 0x00, + [SPECIES_ZIGZAGOON-1] = 0x00, + [SPECIES_LINOONE-1] = 0x00, + [SPECIES_WURMPLE-1] = 0x00, + [SPECIES_SILCOON-1] = 0x00, + [SPECIES_BEAUTIFLY-1] = 0x00, + [SPECIES_CASCOON-1] = 0x00, + [SPECIES_DUSTOX-1] = 0x00, + [SPECIES_LOTAD-1] = 0x00, + [SPECIES_LOMBRE-1] = 0x00, + [SPECIES_LUDICOLO-1] = 0x00, + [SPECIES_SEEDOT-1] = 0x00, + [SPECIES_NUZLEAF-1] = 0x00, + [SPECIES_SHIFTRY-1] = 0x00, + [SPECIES_NINCADA-1] = 0x00, + [SPECIES_NINJASK-1] = 0x00, + [SPECIES_SHEDINJA-1] = 0x00, + [SPECIES_TAILLOW-1] = 0x00, + [SPECIES_SWELLOW-1] = 0x00, + [SPECIES_SHROOMISH-1] = 0x00, + [SPECIES_BRELOOM-1] = 0x00, + [SPECIES_SPINDA-1] = 0x00, + [SPECIES_WINGULL-1] = 0x00, + [SPECIES_PELIPPER-1] = 0x00, + [SPECIES_SURSKIT-1] = 0x00, + [SPECIES_MASQUERAIN-1] = 0x00, + [SPECIES_WAILMER-1] = 0x00, + [SPECIES_WAILORD-1] = 0x0a, + [SPECIES_SKITTY-1] = 0x00, + [SPECIES_DELCATTY-1] = 0x00, + [SPECIES_KECLEON-1] = 0x1e, + [SPECIES_BALTOY-1] = 0x00, + [SPECIES_CLAYDOL-1] = 0x00, + [SPECIES_NOSEPASS-1] = 0x00, + [SPECIES_TORKOAL-1] = 0x00, + [SPECIES_SABLEYE-1] = 0x00, + [SPECIES_BARBOACH-1] = 0x00, + [SPECIES_WHISCASH-1] = 0x00, + [SPECIES_LUVDISC-1] = 0x00, + [SPECIES_CORPHISH-1] = 0x00, + [SPECIES_CRAWDAUNT-1] = 0x00, + [SPECIES_FEEBAS-1] = 0x00, + [SPECIES_MILOTIC-1] = 0x2d, + [SPECIES_CARVANHA-1] = 0x00, + [SPECIES_SHARPEDO-1] = 0x00, + [SPECIES_TRAPINCH-1] = 0x00, + [SPECIES_VIBRAVA-1] = 0x00, + [SPECIES_FLYGON-1] = 0x00, + [SPECIES_MAKUHITA-1] = 0x00, + [SPECIES_HARIYAMA-1] = 0x00, + [SPECIES_ELECTRIKE-1] = 0x00, + [SPECIES_MANECTRIC-1] = 0x00, + [SPECIES_NUMEL-1] = 0x00, + [SPECIES_CAMERUPT-1] = 0x00, + [SPECIES_SPHEAL-1] = 0x0f, + [SPECIES_SEALEO-1] = 0x00, + [SPECIES_WALREIN-1] = 0x00, + [SPECIES_CACNEA-1] = 0x00, + [SPECIES_CACTURNE-1] = 0x00, + [SPECIES_SNORUNT-1] = 0x14, + [SPECIES_GLALIE-1] = 0x00, + [SPECIES_LUNATONE-1] = 0x00, + [SPECIES_SOLROCK-1] = 0x00, + [SPECIES_AZURILL-1] = 0x00, + [SPECIES_SPOINK-1] = 0x00, + [SPECIES_GRUMPIG-1] = 0x0f, + [SPECIES_PLUSLE-1] = 0x00, + [SPECIES_MINUN-1] = 0x00, + [SPECIES_MAWILE-1] = 0x00, + [SPECIES_MEDITITE-1] = 0x00, + [SPECIES_MEDICHAM-1] = 0x00, + [SPECIES_SWABLU-1] = 0x00, + [SPECIES_ALTARIA-1] = 0x00, + [SPECIES_WYNAUT-1] = 0x0f, + [SPECIES_DUSKULL-1] = 0x00, + [SPECIES_DUSCLOPS-1] = 0x1e, + [SPECIES_ROSELIA-1] = 0x00, + [SPECIES_SLAKOTH-1] = 0x00, + [SPECIES_VIGOROTH-1] = 0x00, + [SPECIES_SLAKING-1] = 0x00, + [SPECIES_GULPIN-1] = 0x00, + [SPECIES_SWALOT-1] = 0x00, + [SPECIES_TROPIUS-1] = 0x00, + [SPECIES_WHISMUR-1] = 0x00, + [SPECIES_LOUDRED-1] = 0x00, + [SPECIES_EXPLOUD-1] = 0x00, + [SPECIES_CLAMPERL-1] = 0x00, + [SPECIES_HUNTAIL-1] = 0x00, + [SPECIES_GOREBYSS-1] = 0x00, + [SPECIES_ABSOL-1] = 0x2d, + [SPECIES_SHUPPET-1] = 0x00, + [SPECIES_BANETTE-1] = 0x00, + [SPECIES_SEVIPER-1] = 0x00, + [SPECIES_ZANGOOSE-1] = 0x00, + [SPECIES_RELICANTH-1] = 0x00, + [SPECIES_ARON-1] = 0x00, + [SPECIES_LAIRON-1] = 0x00, + [SPECIES_AGGRON-1] = 0x00, + [SPECIES_CASTFORM-1] = 0x00, + [SPECIES_VOLBEAT-1] = 0x00, + [SPECIES_ILLUMISE-1] = 0x00, + [SPECIES_LILEEP-1] = 0x00, + [SPECIES_CRADILY-1] = 0x00, + [SPECIES_ANORITH-1] = 0x00, + [SPECIES_ARMALDO-1] = 0x00, + [SPECIES_RALTS-1] = 0x00, + [SPECIES_KIRLIA-1] = 0x00, + [SPECIES_GARDEVOIR-1] = 0x00, + [SPECIES_BAGON-1] = 0x00, + [SPECIES_SHELGON-1] = 0x00, + [SPECIES_SALAMENCE-1] = 0x46, + [SPECIES_BELDUM-1] = 0x00, + [SPECIES_METANG-1] = 0x00, + [SPECIES_METAGROSS-1] = 0x00, + [SPECIES_REGIROCK-1] = 0x00, + [SPECIES_REGICE-1] = 0x00, + [SPECIES_REGISTEEL-1] = 0x00, + [SPECIES_KYOGRE-1] = 0x3c, + [SPECIES_GROUDON-1] = 0x00, + [SPECIES_RAYQUAZA-1] = 0x3c, + [SPECIES_LATIAS-1] = 0x00, + [SPECIES_LATIOS-1] = 0x00, + [SPECIES_JIRACHI-1] = 0x00, + [SPECIES_DEOXYS-1] = 0x00, + [SPECIES_CHIMECHO-1] = 0x00, }; const u8 gUnknown_08329D22[] = {0x03, 0x0c, 0x30, 0xc0}; // Masks for getting PP Up count, also PP Max values @@ -2458,12 +2460,12 @@ static const struct SpeciesItem sAlteringCaveWildMonHeldItems[] = {SPECIES_NONE, ITEM_NONE}, {SPECIES_MAREEP, ITEM_GANLON_BERRY}, {SPECIES_PINECO, ITEM_APICOT_BERRY}, - {SPECIES_HOUNDOUR, ITEM_BIG_MUSHROOM}, - {SPECIES_TEDDIURSA, ITEM_PETAYA_BERRY}, - {SPECIES_AIPOM, ITEM_BERRY_JUICE}, - {SPECIES_SHUCKLE, ITEM_BERRY_JUICE}, - {SPECIES_STANTLER, ITEM_PETAYA_BERRY}, - {SPECIES_SMEARGLE, ITEM_SALAC_BERRY}, + {SPECIES_HOUNDOUR, ITEM_BIG_MUSHROOM}, + {SPECIES_TEDDIURSA, ITEM_PETAYA_BERRY}, + {SPECIES_AIPOM, ITEM_BERRY_JUICE}, + {SPECIES_SHUCKLE, ITEM_BERRY_JUICE}, + {SPECIES_STANTLER, ITEM_PETAYA_BERRY}, + {SPECIES_SMEARGLE, ITEM_SALAC_BERRY}, }; static const struct OamData sOamData_8329F20 = diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index edaedbabd..6aa7593ca 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -786,30 +786,30 @@ static const u8 sBackAnimationIds[] = static const u8 sBackAnimNatureModTable[] = { - 0x00, // NATURE_HARDY - 0x02, // NATURE_LONELY - 0x00, // NATURE_BRAVE - 0x00, // NATURE_ADAMANT - 0x00, // NATURE_NAUGHTY - 0x01, // NATURE_BOLD - 0x01, // NATURE_DOCILE - 0x01, // NATURE_RELAXED - 0x00, // NATURE_IMPISH - 0x01, // NATURE_LAX - 0x02, // NATURE_TIMID - 0x00, // NATURE_HASTY - 0x01, // NATURE_SERIOUS - 0x00, // NATURE_JOLLY - 0x00, // NATURE_NAIVE - 0x02, // NATURE_MODEST - 0x02, // NATURE_MILD - 0x02, // NATURE_QUIET - 0x02, // NATURE_BASHFUL - 0x01, // NATURE_RASH - 0x01, // NATURE_CALM - 0x02, // NATURE_GENTLE - 0x01, // NATURE_SASSY - 0x02, // NATURE_CAREFUL + [NATURE_HARDY] = 0x00, + [NATURE_LONELY] = 0x02, + [NATURE_BRAVE] = 0x00, + [NATURE_ADAMANT] = 0x00, + [NATURE_NAUGHTY] = 0x00, + [NATURE_BOLD] = 0x01, + [NATURE_DOCILE] = 0x01, + [NATURE_RELAXED] = 0x01, + [NATURE_IMPISH] = 0x00, + [NATURE_LAX] = 0x01, + [NATURE_TIMID] = 0x02, + [NATURE_HASTY] = 0x00, + [NATURE_SERIOUS] = 0x01, + [NATURE_JOLLY] = 0x00, + [NATURE_NAIVE] = 0x00, + [NATURE_MODEST] = 0x02, + [NATURE_MILD] = 0x02, + [NATURE_QUIET] = 0x02, + [NATURE_BASHFUL] = 0x02, + [NATURE_RASH] = 0x01, + [NATURE_CALM] = 0x01, + [NATURE_GENTLE] = 0x02, + [NATURE_SASSY] = 0x01, + [NATURE_CAREFUL] = 0x02, 0x01, // NATURE_QUIRKY }; -- cgit v1.2.3 From 2615ece23bd9463f3e43fca40eac1adcabeb2813 Mon Sep 17 00:00:00 2001 From: Melody Date: Fri, 7 Dec 2018 10:41:08 -0500 Subject: Use normal apostrophes like adults --- src/battle_message.c | 278 ++++++++++++++-------------- src/berry.c | 6 +- src/berry_blender.c | 4 +- src/data/items.h | 4 +- src/data/pokemon/pokedex_text.h | 156 ++++++++-------- src/data/region_map/region_map_entries.h | 2 +- src/data/text/abilities.h | 8 +- src/data/text/item_descriptions.h | 38 ++-- src/data/text/move_descriptions.h | 112 ++++++------ src/data/text/species_names.h | 2 +- src/landmark.c | 14 +- src/mystery_event_msg.c | 2 +- src/naming_screen.c | 2 +- src/strings.c | 302 +++++++++++++++---------------- 14 files changed, 465 insertions(+), 465 deletions(-) (limited to 'src') diff --git a/src/battle_message.c b/src/battle_message.c index 47c4cbe1d..7f54fc26a 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -71,58 +71,58 @@ static const u8 sText_ABoosted[] = _(" a boosted"); static const u8 sText_PkmnGrewToLv[] = _("{B_BUFF1} grew to\nLV. {B_BUFF2}!{UNKNOWN_A}\p"); static const u8 sText_PkmnLearnedMove[] = _("{B_BUFF1} learned\n{B_BUFF2}!{UNKNOWN_A}\p"); static const u8 sText_TryToLearnMove1[] = _("{B_BUFF1} is trying to\nlearn {B_BUFF2}.\p"); -static const u8 sText_TryToLearnMove2[] = _("But, {B_BUFF1} can’t learn\nmore than four moves.\p"); +static const u8 sText_TryToLearnMove2[] = _("But, {B_BUFF1} can't learn\nmore than four moves.\p"); static const u8 sText_TryToLearnMove3[] = _("Delete a move to make\nroom for {B_BUFF2}?"); static const u8 sText_PkmnForgotMove[] = _("{B_BUFF1} forgot\n{B_BUFF2}.\p"); static const u8 sText_StopLearningMove[] = _("{PAUSE 32}Stop learning\n{B_BUFF2}?"); static const u8 sText_DidNotLearnMove[] = _("{B_BUFF1} did not learn\n{B_BUFF2}.\p"); static const u8 sText_UseNextPkmn[] = _("Use next POKéMON?"); -static const u8 sText_AttackMissed[] = _("{B_ATK_NAME_WITH_PREFIX}’s\nattack missed!"); +static const u8 sText_AttackMissed[] = _("{B_ATK_NAME_WITH_PREFIX}'s\nattack missed!"); static const u8 sText_PkmnProtectedItself[] = _("{B_DEF_NAME_WITH_PREFIX}\nprotected itself!"); static const u8 sText_AvoidedDamage[] = _("{B_DEF_NAME_WITH_PREFIX} avoided\ndamage with {B_DEF_ABILITY}!"); static const u8 sText_PkmnMakesGroundMiss[] = _("{B_DEF_NAME_WITH_PREFIX} makes GROUND\nmoves miss with {B_DEF_ABILITY}!"); static const u8 sText_PkmnAvoidedAttack[] = _("{B_DEF_NAME_WITH_PREFIX} avoided\nthe attack!"); -static const u8 sText_ItDoesntAffect[] = _("It doesn’t affect\n{B_DEF_NAME_WITH_PREFIX}…"); +static const u8 sText_ItDoesntAffect[] = _("It doesn't affect\n{B_DEF_NAME_WITH_PREFIX}…"); static const u8 sText_AttackerFainted[] = _("{B_ATK_NAME_WITH_PREFIX}\nfainted!\p"); static const u8 sText_TargetFainted[] = _("{B_DEF_NAME_WITH_PREFIX}\nfainted!\p"); static const u8 sText_PlayerGotMoney[] = _("{B_PLAYER_NAME} got ¥{B_BUFF1}\nfor winning!\p"); static const u8 sText_PlayerWhiteout[] = _("{B_PLAYER_NAME} is out of\nusable POKéMON!\p"); static const u8 sText_PlayerWhiteout2[] = _("{B_PLAYER_NAME} whited out!{PAUSE_UNTIL_PRESS}"); static const u8 sText_PreventsEscape[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} prevents\nescape with {B_SCR_ACTIVE_ABILITY}!\p"); -static const u8 sText_CantEscape2[] = _("Can’t escape!\p"); -static const u8 sText_AttackerCantEscape[] = _("{B_ATK_NAME_WITH_PREFIX} can’t escape!"); +static const u8 sText_CantEscape2[] = _("Can't escape!\p"); +static const u8 sText_AttackerCantEscape[] = _("{B_ATK_NAME_WITH_PREFIX} can't escape!"); static const u8 sText_HitXTimes[] = _("Hit {B_BUFF1} time(s)!"); static const u8 sText_PkmnFellAsleep[] = _("{B_EFF_NAME_WITH_PREFIX}\nfell asleep!"); -static const u8 sText_PkmnMadeSleep[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nmade {B_EFF_NAME_WITH_PREFIX} sleep!"); +static const u8 sText_PkmnMadeSleep[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nmade {B_EFF_NAME_WITH_PREFIX} sleep!"); static const u8 sText_PkmnAlreadyAsleep[] = _("{B_DEF_NAME_WITH_PREFIX} is\nalready asleep!"); static const u8 sText_PkmnAlreadyAsleep2[] = _("{B_ATK_NAME_WITH_PREFIX} is\nalready asleep!"); -static const u8 sText_PkmnWasntAffected[] = _("{B_DEF_NAME_WITH_PREFIX}\nwasn’t affected!"); +static const u8 sText_PkmnWasntAffected[] = _("{B_DEF_NAME_WITH_PREFIX}\nwasn't affected!"); static const u8 sText_PkmnWasPoisoned[] = _("{B_EFF_NAME_WITH_PREFIX}\nwas poisoned!"); -static const u8 sText_PkmnPoisonedBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\npoisoned {B_EFF_NAME_WITH_PREFIX}!"); +static const u8 sText_PkmnPoisonedBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\npoisoned {B_EFF_NAME_WITH_PREFIX}!"); static const u8 sText_PkmnHurtByPoison[] = _("{B_ATK_NAME_WITH_PREFIX} is hurt\nby poison!"); static const u8 sText_PkmnAlreadyPoisoned[] = _("{B_DEF_NAME_WITH_PREFIX} is already\npoisoned."); static const u8 sText_PkmnBadlyPoisoned[] = _("{B_EFF_NAME_WITH_PREFIX} is badly\npoisoned!"); static const u8 sText_PkmnEnergyDrained[] = _("{B_DEF_NAME_WITH_PREFIX} had its\nenergy drained!"); static const u8 sText_PkmnWasBurned[] = _("{B_EFF_NAME_WITH_PREFIX} was burned!"); -static const u8 sText_PkmnBurnedBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nburned {B_EFF_NAME_WITH_PREFIX}!"); +static const u8 sText_PkmnBurnedBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nburned {B_EFF_NAME_WITH_PREFIX}!"); static const u8 sText_PkmnHurtByBurn[] = _("{B_ATK_NAME_WITH_PREFIX} is hurt\nby its burn!"); static const u8 sText_PkmnAlreadyHasBurn[] = _("{B_DEF_NAME_WITH_PREFIX} already\nhas a burn."); static const u8 sText_PkmnWasFrozen[] = _("{B_EFF_NAME_WITH_PREFIX} was\nfrozen solid!"); -static const u8 sText_PkmnFrozenBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nfroze {B_EFF_NAME_WITH_PREFIX} solid!"); +static const u8 sText_PkmnFrozenBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nfroze {B_EFF_NAME_WITH_PREFIX} solid!"); static const u8 sText_PkmnIsFrozen[] = _("{B_ATK_NAME_WITH_PREFIX} is\nfrozen solid!"); static const u8 sText_PkmnWasDefrosted[] = _("{B_DEF_NAME_WITH_PREFIX} was\ndefrosted!"); static const u8 sText_PkmnWasDefrosted2[] = _("{B_ATK_NAME_WITH_PREFIX} was\ndefrosted!"); static const u8 sText_PkmnWasDefrostedBy[] = _("{B_ATK_NAME_WITH_PREFIX} was\ndefrosted by {B_CURRENT_MOVE}!"); static const u8 sText_PkmnWasParalyzed[] = _("{B_EFF_NAME_WITH_PREFIX} is paralyzed!\nIt may be unable to move!"); -static const u8 sText_PkmnWasParalyzedBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nparalyzed {B_EFF_NAME_WITH_PREFIX}!\lIt may be unable to move!"); -static const u8 sText_PkmnIsParalyzed[] = _("{B_ATK_NAME_WITH_PREFIX} is paralyzed!\nIt can’t move!"); +static const u8 sText_PkmnWasParalyzedBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nparalyzed {B_EFF_NAME_WITH_PREFIX}!\lIt may be unable to move!"); +static const u8 sText_PkmnIsParalyzed[] = _("{B_ATK_NAME_WITH_PREFIX} is paralyzed!\nIt can't move!"); static const u8 sText_PkmnIsAlreadyParalyzed[] = _("{B_DEF_NAME_WITH_PREFIX} is\nalready paralyzed!"); static const u8 sText_PkmnHealedParalysis[] = _("{B_DEF_NAME_WITH_PREFIX} was\nhealed of paralysis!"); -static const u8 sText_PkmnDreamEaten[] = _("{B_DEF_NAME_WITH_PREFIX}’s\ndream was eaten!"); -static const u8 sText_StatsWontIncrease[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_BUFF1}\nwon’t go higher!"); -static const u8 sText_StatsWontDecrease[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_BUFF1}\nwon’t go lower!"); -static const u8 sText_TeamStoppedWorking[] = _("Your team’s {B_BUFF1}\nstopped working!"); -static const u8 sText_FoeStoppedWorking[] = _("The foe’s {B_BUFF1}\nstopped working!"); +static const u8 sText_PkmnDreamEaten[] = _("{B_DEF_NAME_WITH_PREFIX}'s\ndream was eaten!"); +static const u8 sText_StatsWontIncrease[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1}\nwon't go higher!"); +static const u8 sText_StatsWontDecrease[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\nwon't go lower!"); +static const u8 sText_TeamStoppedWorking[] = _("Your team's {B_BUFF1}\nstopped working!"); +static const u8 sText_FoeStoppedWorking[] = _("The foe's {B_BUFF1}\nstopped working!"); static const u8 sText_PkmnIsConfused[] = _("{B_ATK_NAME_WITH_PREFIX} is\nconfused!"); static const u8 sText_PkmnHealedConfusion[] = _("{B_ATK_NAME_WITH_PREFIX} snapped\nout of confusion!"); static const u8 sText_PkmnWasConfused[] = _("{B_EFF_NAME_WITH_PREFIX} became\nconfused!"); @@ -134,14 +134,14 @@ static const u8 sText_PkmnBlownAway[] = _("{B_DEF_NAME_WITH_PREFIX} was\nblown a static const u8 sText_PkmnChangedType[] = _("{B_ATK_NAME_WITH_PREFIX} transformed\ninto the {B_BUFF1} type!"); static const u8 sText_PkmnFlinched[] = _("{B_ATK_NAME_WITH_PREFIX} flinched!"); static const u8 sText_PkmnRegainedHealth[] = _("{B_DEF_NAME_WITH_PREFIX} regained\nhealth!"); -static const u8 sText_PkmnHPFull[] = _("{B_DEF_NAME_WITH_PREFIX}’s\nHP is full!"); -static const u8 sText_PkmnRaisedSpDef[] = _("{B_ATK_PREFIX2}’s {B_CURRENT_MOVE}\nraised SP. DEF!"); -static const u8 sText_PkmnRaisedSpDefALittle[] = _("{B_ATK_PREFIX2}’s {B_CURRENT_MOVE}\nraised SP. DEF a little!"); -static const u8 sText_PkmnRaisedDef[] = _("{B_ATK_PREFIX2}’s {B_CURRENT_MOVE}\nraised DEFENSE!"); -static const u8 sText_PkmnRaisedDefALittle[] = _("{B_ATK_PREFIX2}’s {B_CURRENT_MOVE}\nraised DEFENSE a little!"); -static const u8 sText_PkmnCoveredByVeil[] = _("{B_ATK_PREFIX2}’s party is covered\nby a veil!"); -static const u8 sText_PkmnUsedSafeguard[] = _("{B_DEF_NAME_WITH_PREFIX}’s party is protected\nby SAFEGUARD!"); -static const u8 sText_PkmnSafeguardExpired[] = _("{B_ATK_PREFIX3}’s party is no longer\nprotected by SAFEGUARD!"); +static const u8 sText_PkmnHPFull[] = _("{B_DEF_NAME_WITH_PREFIX}'s\nHP is full!"); +static const u8 sText_PkmnRaisedSpDef[] = _("{B_ATK_PREFIX2}'s {B_CURRENT_MOVE}\nraised SP. DEF!"); +static const u8 sText_PkmnRaisedSpDefALittle[] = _("{B_ATK_PREFIX2}'s {B_CURRENT_MOVE}\nraised SP. DEF a little!"); +static const u8 sText_PkmnRaisedDef[] = _("{B_ATK_PREFIX2}'s {B_CURRENT_MOVE}\nraised DEFENSE!"); +static const u8 sText_PkmnRaisedDefALittle[] = _("{B_ATK_PREFIX2}'s {B_CURRENT_MOVE}\nraised DEFENSE a little!"); +static const u8 sText_PkmnCoveredByVeil[] = _("{B_ATK_PREFIX2}'s party is covered\nby a veil!"); +static const u8 sText_PkmnUsedSafeguard[] = _("{B_DEF_NAME_WITH_PREFIX}'s party is protected\nby SAFEGUARD!"); +static const u8 sText_PkmnSafeguardExpired[] = _("{B_ATK_PREFIX3}'s party is no longer\nprotected by SAFEGUARD!"); static const u8 sText_PkmnWentToSleep[] = _("{B_ATK_NAME_WITH_PREFIX} went\nto sleep!"); static const u8 sText_PkmnSleptHealthy[] = _("{B_ATK_NAME_WITH_PREFIX} slept and\nbecame healthy!"); static const u8 sText_PkmnWhippedWhirlwind[] = _("{B_ATK_NAME_WITH_PREFIX} whipped\nup a whirlwind!"); @@ -152,7 +152,7 @@ static const u8 sText_PkmnFlewHigh[] = _("{B_ATK_NAME_WITH_PREFIX} flew\nup high static const u8 sText_PkmnDugHole[] = _("{B_ATK_NAME_WITH_PREFIX} dug a hole!"); static const u8 sText_PkmnHidUnderwater[] = _("{B_ATK_NAME_WITH_PREFIX} hid\nunderwater!"); static const u8 sText_PkmnSprangUp[] = _("{B_ATK_NAME_WITH_PREFIX} sprang up!"); -static const u8 sText_PkmnSqueezedByBind[] = _("{B_DEF_NAME_WITH_PREFIX} was squeezed by\n{B_ATK_NAME_WITH_PREFIX}’s BIND!"); +static const u8 sText_PkmnSqueezedByBind[] = _("{B_DEF_NAME_WITH_PREFIX} was squeezed by\n{B_ATK_NAME_WITH_PREFIX}'s BIND!"); static const u8 sText_PkmnTrappedInVortex[] = _("{B_DEF_NAME_WITH_PREFIX} was trapped\nin the vortex!"); static const u8 sText_PkmnTrappedBySandTomb[] = _("{B_DEF_NAME_WITH_PREFIX} was trapped\nby SAND TOMB!"); static const u8 sText_PkmnWrappedBy[] = _("{B_DEF_NAME_WITH_PREFIX} was WRAPPED by\n{B_ATK_NAME_WITH_PREFIX}!"); @@ -167,21 +167,21 @@ static const u8 sText_PkmnHitWithRecoil[] = _("{B_ATK_NAME_WITH_PREFIX} is hit\n static const u8 sText_PkmnProtectedItself2[] = _("{B_ATK_NAME_WITH_PREFIX} protected\nitself!"); static const u8 sText_PkmnBuffetedBySandstorm[] = _("{B_ATK_NAME_WITH_PREFIX} is buffeted\nby the sandstorm!"); static const u8 sText_PkmnPeltedByHail[] = _("{B_ATK_NAME_WITH_PREFIX} is pelted\nby HAIL!"); -static const u8 sText_PkmnsXWoreOff[] = _("{B_ATK_PREFIX1}’s {B_BUFF1}\nwore off!"); +static const u8 sText_PkmnsXWoreOff[] = _("{B_ATK_PREFIX1}'s {B_BUFF1}\nwore off!"); static const u8 sText_PkmnSeeded[] = _("{B_DEF_NAME_WITH_PREFIX} was seeded!"); static const u8 sText_PkmnEvadedAttack[] = _("{B_DEF_NAME_WITH_PREFIX} evaded\nthe attack!"); -static const u8 sText_PkmnSappedByLeechSeed[] = _("{B_ATK_NAME_WITH_PREFIX}’s health is\nsapped by LEECH SEED!"); +static const u8 sText_PkmnSappedByLeechSeed[] = _("{B_ATK_NAME_WITH_PREFIX}'s health is\nsapped by LEECH SEED!"); static const u8 sText_PkmnFastAsleep[] = _("{B_ATK_NAME_WITH_PREFIX} is fast\nasleep."); static const u8 sText_PkmnWokeUp[] = _("{B_ATK_NAME_WITH_PREFIX} woke up!"); -static const u8 sText_PkmnUproarKeptAwake[] = _("But {B_SCR_ACTIVE_NAME_WITH_PREFIX}’s UPROAR\nkept it awake!"); +static const u8 sText_PkmnUproarKeptAwake[] = _("But {B_SCR_ACTIVE_NAME_WITH_PREFIX}'s UPROAR\nkept it awake!"); static const u8 sText_PkmnWokeUpInUproar[] = _("{B_ATK_NAME_WITH_PREFIX} woke up\nin the UPROAR!"); static const u8 sText_PkmnCausedUproar[] = _("{B_ATK_NAME_WITH_PREFIX} caused\nan UPROAR!"); static const u8 sText_PkmnMakingUproar[] = _("{B_ATK_NAME_WITH_PREFIX} is making\nan UPROAR!"); static const u8 sText_PkmnCalmedDown[] = _("{B_ATK_NAME_WITH_PREFIX} calmed down."); -static const u8 sText_PkmnCantSleepInUproar[] = _("But {B_DEF_NAME_WITH_PREFIX} can’t\nsleep in an UPROAR!"); +static const u8 sText_PkmnCantSleepInUproar[] = _("But {B_DEF_NAME_WITH_PREFIX} can't\nsleep in an UPROAR!"); static const u8 sText_PkmnStockpiled[] = _("{B_ATK_NAME_WITH_PREFIX} STOCKPILED\n{B_BUFF1}!"); -static const u8 sText_PkmnCantStockpile[] = _("{B_ATK_NAME_WITH_PREFIX} can’t\nSTOCKPILE any more!"); -static const u8 sText_PkmnCantSleepInUproar2[] = _("But {B_DEF_NAME_WITH_PREFIX} can’t\nsleep in an UPROAR!"); +static const u8 sText_PkmnCantStockpile[] = _("{B_ATK_NAME_WITH_PREFIX} can't\nSTOCKPILE any more!"); +static const u8 sText_PkmnCantSleepInUproar2[] = _("But {B_DEF_NAME_WITH_PREFIX} can't\nsleep in an UPROAR!"); static const u8 sText_UproarKeptPkmnAwake[] = _("But the UPROAR kept\n{B_DEF_NAME_WITH_PREFIX} awake!"); static const u8 sText_PkmnStayedAwakeUsing[] = _("{B_DEF_NAME_WITH_PREFIX} stayed awake\nusing its {B_DEF_ABILITY}!"); static const u8 sText_PkmnStoringEnergy[] = _("{B_ATK_NAME_WITH_PREFIX} is storing\nenergy!"); @@ -193,45 +193,45 @@ static const u8 sText_PkmnTransformedInto[] = _("{B_ATK_NAME_WITH_PREFIX} transf static const u8 sText_PkmnMadeSubstitute[] = _("{B_ATK_NAME_WITH_PREFIX} made\na SUBSTITUTE!"); static const u8 sText_PkmnHasSubstitute[] = _("{B_ATK_NAME_WITH_PREFIX} already\nhas a SUBSTITUTE!"); static const u8 sText_SubstituteDamaged[] = _("The SUBSTITUTE took damage\nfor {B_DEF_NAME_WITH_PREFIX}!\p"); -static const u8 sText_PkmnSubstituteFaded[] = _("{B_DEF_NAME_WITH_PREFIX}’s\nSUBSTITUTE faded!\p"); +static const u8 sText_PkmnSubstituteFaded[] = _("{B_DEF_NAME_WITH_PREFIX}'s\nSUBSTITUTE faded!\p"); static const u8 sText_PkmnMustRecharge[] = _("{B_ATK_NAME_WITH_PREFIX} must\nrecharge!"); -static const u8 sText_PkmnRageBuilding[] = _("{B_DEF_NAME_WITH_PREFIX}’s RAGE\nis building!"); -static const u8 sText_PkmnMoveWasDisabled[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_BUFF1}\nwas disabled!"); +static const u8 sText_PkmnRageBuilding[] = _("{B_DEF_NAME_WITH_PREFIX}'s RAGE\nis building!"); +static const u8 sText_PkmnMoveWasDisabled[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\nwas disabled!"); static const u8 sText_PkmnMoveDisabledNoMore[] = _("{B_ATK_NAME_WITH_PREFIX} is disabled\nno more!"); static const u8 sText_PkmnGotEncore[] = _("{B_DEF_NAME_WITH_PREFIX} got\nan ENCORE!"); -static const u8 sText_PkmnEncoreEnded[] = _("{B_ATK_NAME_WITH_PREFIX}’s ENCORE\nended!"); +static const u8 sText_PkmnEncoreEnded[] = _("{B_ATK_NAME_WITH_PREFIX}'s ENCORE\nended!"); static const u8 sText_PkmnTookAim[] = _("{B_ATK_NAME_WITH_PREFIX} took aim\nat {B_DEF_NAME_WITH_PREFIX}!"); static const u8 sText_PkmnSketchedMove[] = _("{B_ATK_NAME_WITH_PREFIX} SKETCHED\n{B_BUFF1}!"); static const u8 sText_PkmnTryingToTakeFoe[] = _("{B_ATK_NAME_WITH_PREFIX} is trying\nto take its foe with it!"); static const u8 sText_PkmnTookFoe[] = _("{B_DEF_NAME_WITH_PREFIX} took\n{B_ATK_NAME_WITH_PREFIX} with it!"); -static const u8 sText_PkmnReducedPP[] = _("Reduced {B_DEF_NAME_WITH_PREFIX}’s\n{B_BUFF1} by {B_BUFF2}!"); -static const u8 sText_PkmnStoleItem[] = _("{B_ATK_NAME_WITH_PREFIX} stole\n{B_DEF_NAME_WITH_PREFIX}’s {B_LAST_ITEM}!"); -static const u8 sText_TargetCantEscapeNow[] = _("{B_DEF_NAME_WITH_PREFIX} can’t\nescape now!"); +static const u8 sText_PkmnReducedPP[] = _("Reduced {B_DEF_NAME_WITH_PREFIX}'s\n{B_BUFF1} by {B_BUFF2}!"); +static const u8 sText_PkmnStoleItem[] = _("{B_ATK_NAME_WITH_PREFIX} stole\n{B_DEF_NAME_WITH_PREFIX}'s {B_LAST_ITEM}!"); +static const u8 sText_TargetCantEscapeNow[] = _("{B_DEF_NAME_WITH_PREFIX} can't\nescape now!"); static const u8 sText_PkmnFellIntoNightmare[] = _("{B_DEF_NAME_WITH_PREFIX} fell into\na NIGHTMARE!"); static const u8 sText_PkmnLockedInNightmare[] = _("{B_ATK_NAME_WITH_PREFIX} is locked\nin a NIGHTMARE!"); static const u8 sText_PkmnLaidCurse[] = _("{B_ATK_NAME_WITH_PREFIX} cut its own HP and\nlaid a CURSE on {B_DEF_NAME_WITH_PREFIX}!"); static const u8 sText_PkmnAfflictedByCurse[] = _("{B_ATK_NAME_WITH_PREFIX} is afflicted\nby the CURSE!"); -static const u8 sText_SpikesScattered[] = _("SPIKES were scattered all around\nthe opponent’s side!"); +static const u8 sText_SpikesScattered[] = _("SPIKES were scattered all around\nthe opponent's side!"); static const u8 sText_PkmnHurtBySpikes[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} is hurt\nby SPIKES!"); static const u8 sText_PkmnIdentified[] = _("{B_ATK_NAME_WITH_PREFIX} identified\n{B_DEF_NAME_WITH_PREFIX}!"); -static const u8 sText_PkmnPerishCountFell[] = _("{B_ATK_NAME_WITH_PREFIX}’s PERISH count\nfell to {B_BUFF1}!"); +static const u8 sText_PkmnPerishCountFell[] = _("{B_ATK_NAME_WITH_PREFIX}'s PERISH count\nfell to {B_BUFF1}!"); static const u8 sText_PkmnBracedItself[] = _("{B_ATK_NAME_WITH_PREFIX} braced\nitself!"); static const u8 sText_PkmnEnduredHit[] = _("{B_DEF_NAME_WITH_PREFIX} ENDURED\nthe hit!"); static const u8 sText_MagnitudeStrength[] = _("MAGNITUDE {B_BUFF1}!"); static const u8 sText_PkmnCutHPMaxedAttack[] = _("{B_ATK_NAME_WITH_PREFIX} cut its own HP\nand maximized ATTACK!"); -static const u8 sText_PkmnCopiedStatChanges[] = _("{B_ATK_NAME_WITH_PREFIX} copied\n{B_DEF_NAME_WITH_PREFIX}’s stat changes!"); -static const u8 sText_PkmnGotFree[] = _("{B_ATK_NAME_WITH_PREFIX} got free of\n{B_DEF_NAME_WITH_PREFIX}’s {B_BUFF1}!"); +static const u8 sText_PkmnCopiedStatChanges[] = _("{B_ATK_NAME_WITH_PREFIX} copied\n{B_DEF_NAME_WITH_PREFIX}'s stat changes!"); +static const u8 sText_PkmnGotFree[] = _("{B_ATK_NAME_WITH_PREFIX} got free of\n{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}!"); static const u8 sText_PkmnShedLeechSeed[] = _("{B_ATK_NAME_WITH_PREFIX} shed\nLEECH SEED!"); static const u8 sText_PkmnBlewAwaySpikes[] = _("{B_ATK_NAME_WITH_PREFIX} blew away\nSPIKES!"); static const u8 sText_PkmnFledFromBattle[] = _("{B_ATK_NAME_WITH_PREFIX} fled from\nbattle!"); static const u8 sText_PkmnForesawAttack[] = _("{B_ATK_NAME_WITH_PREFIX} foresaw\nan attack!"); static const u8 sText_PkmnTookAttack[] = _("{B_DEF_NAME_WITH_PREFIX} took the\n{B_BUFF1} attack!"); static const u8 sText_PkmnChoseXAsDestiny[] = _("{B_ATK_NAME_WITH_PREFIX} chose\n{B_CURRENT_MOVE} as its destiny!"); -static const u8 sText_PkmnAttack[] = _("{B_BUFF1}’s attack!"); +static const u8 sText_PkmnAttack[] = _("{B_BUFF1}'s attack!"); static const u8 sText_PkmnCenterAttention[] = _("{B_ATK_NAME_WITH_PREFIX} became the\ncenter of attention!"); static const u8 sText_PkmnChargingPower[] = _("{B_ATK_NAME_WITH_PREFIX} began\ncharging power!"); static const u8 sText_NaturePowerTurnedInto[] = _("NATURE POWER turned into\n{B_CURRENT_MOVE}!"); -static const u8 sText_PkmnStatusNormal[] = _("{B_ATK_NAME_WITH_PREFIX}’s status\nreturned to normal!"); +static const u8 sText_PkmnStatusNormal[] = _("{B_ATK_NAME_WITH_PREFIX}'s status\nreturned to normal!"); static const u8 sText_PkmnSubjectedToTorment[] = _("{B_DEF_NAME_WITH_PREFIX} was subjected\nto TORMENT!"); static const u8 sText_PkmnTighteningFocus[] = _("{B_ATK_NAME_WITH_PREFIX} is tightening\nits focus!"); static const u8 sText_PkmnFellForTaunt[] = _("{B_DEF_NAME_WITH_PREFIX} fell for\nthe TAUNT!"); @@ -240,93 +240,93 @@ static const u8 sText_PkmnSwitchedItems[] = _("{B_ATK_NAME_WITH_PREFIX} switched static const u8 sText_PkmnObtainedX[] = _("{B_ATK_NAME_WITH_PREFIX} obtained\n{B_BUFF1}."); static const u8 sText_PkmnObtainedX2[] = _("{B_DEF_NAME_WITH_PREFIX} obtained\n{B_BUFF2}."); static const u8 sText_PkmnObtainedXYObtainedZ[] = _("{B_ATK_NAME_WITH_PREFIX} obtained\n{B_BUFF1}.\p{B_DEF_NAME_WITH_PREFIX} obtained\n{B_BUFF2}."); -static const u8 sText_PkmnCopiedFoe[] = _("{B_ATK_NAME_WITH_PREFIX} copied\n{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}!"); +static const u8 sText_PkmnCopiedFoe[] = _("{B_ATK_NAME_WITH_PREFIX} copied\n{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}!"); static const u8 sText_PkmnMadeWish[] = _("{B_ATK_NAME_WITH_PREFIX} made a WISH!"); -static const u8 sText_PkmnWishCameTrue[] = _("{B_BUFF1}’s WISH\ncame true!"); +static const u8 sText_PkmnWishCameTrue[] = _("{B_BUFF1}'s WISH\ncame true!"); static const u8 sText_PkmnPlantedRoots[] = _("{B_ATK_NAME_WITH_PREFIX} planted its roots!"); static const u8 sText_PkmnAbsorbedNutrients[] = _("{B_ATK_NAME_WITH_PREFIX} absorbed\nnutrients with its roots!"); static const u8 sText_PkmnAnchoredItself[] = _("{B_DEF_NAME_WITH_PREFIX} anchored\nitself with its roots!"); static const u8 sText_PkmnWasMadeDrowsy[] = _("{B_ATK_NAME_WITH_PREFIX} made\n{B_DEF_NAME_WITH_PREFIX} drowsy!"); -static const u8 sText_PkmnKnockedOff[] = _("{B_ATK_NAME_WITH_PREFIX} knocked off\n{B_DEF_NAME_WITH_PREFIX}’s {B_LAST_ITEM}!"); +static const u8 sText_PkmnKnockedOff[] = _("{B_ATK_NAME_WITH_PREFIX} knocked off\n{B_DEF_NAME_WITH_PREFIX}'s {B_LAST_ITEM}!"); static const u8 sText_PkmnSwappedAbilities[] = _("{B_ATK_NAME_WITH_PREFIX} swapped abilities\nwith its opponent!"); -static const u8 sText_PkmnSealedOpponentMove[] = _("{B_ATK_NAME_WITH_PREFIX} sealed the\nopponent’s move(s)!"); +static const u8 sText_PkmnSealedOpponentMove[] = _("{B_ATK_NAME_WITH_PREFIX} sealed the\nopponent's move(s)!"); static const u8 sText_PkmnWantsGrudge[] = _("{B_ATK_NAME_WITH_PREFIX} wants the\nopponent to bear a GRUDGE!"); -static const u8 sText_PkmnLostPPGrudge[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_BUFF1} lost\nall its PP due to the GRUDGE!"); +static const u8 sText_PkmnLostPPGrudge[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1} lost\nall its PP due to the GRUDGE!"); static const u8 sText_PkmnShroudedItself[] = _("{B_ATK_NAME_WITH_PREFIX} shrouded\nitself in {B_CURRENT_MOVE}!"); -static const u8 sText_PkmnMoveBounced[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_CURRENT_MOVE}\nwas bounced back by MAGIC COAT!"); +static const u8 sText_PkmnMoveBounced[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_CURRENT_MOVE}\nwas bounced back by MAGIC COAT!"); static const u8 sText_PkmnWaitsForTarget[] = _("{B_ATK_NAME_WITH_PREFIX} waits for a target\nto make a move!"); -static const u8 sText_PkmnSnatchedMove[] = _("{B_DEF_NAME_WITH_PREFIX} SNATCHED\n{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s move!"); -static const u8 sText_ElectricityWeakened[] = _("Electricity’s power was\nweakened!"); -static const u8 sText_FireWeakened[] = _("Fire’s power was\nweakened!"); +static const u8 sText_PkmnSnatchedMove[] = _("{B_DEF_NAME_WITH_PREFIX} SNATCHED\n{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s move!"); +static const u8 sText_ElectricityWeakened[] = _("Electricity's power was\nweakened!"); +static const u8 sText_FireWeakened[] = _("Fire's power was\nweakened!"); static const u8 sText_XFoundOneY[] = _("{B_ATK_NAME_WITH_PREFIX} found\none {B_LAST_ITEM}!"); static const u8 sText_SoothingAroma[] = _("A soothing aroma wafted\nthrough the area!"); -static const u8 sText_ItemsCantBeUsedNow[] = _("Items can’t be used now.{PAUSE 64}"); +static const u8 sText_ItemsCantBeUsedNow[] = _("Items can't be used now.{PAUSE 64}"); static const u8 sText_ForXCommaYZ[] = _("For {B_SCR_ACTIVE_NAME_WITH_PREFIX},\n{B_LAST_ITEM} {B_BUFF1}"); static const u8 sText_PkmnUsedXToGetPumped[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} used\n{B_LAST_ITEM} to get pumped!"); -static const u8 sText_PkmnLostFocus[] = _("{B_ATK_NAME_WITH_PREFIX} lost its\nfocus and couldn’t move!"); +static const u8 sText_PkmnLostFocus[] = _("{B_ATK_NAME_WITH_PREFIX} lost its\nfocus and couldn't move!"); static const u8 sText_PkmnWasDraggedOut[] = _("{B_DEF_NAME_WITH_PREFIX} was\ndragged out!\p"); static const u8 sText_TheWallShattered[] = _("The wall shattered!"); static const u8 sText_ButNoEffect[] = _("But it had no effect!"); static const u8 sText_PkmnHasNoMovesLeft[] = _("{B_ACTIVE_NAME_WITH_PREFIX} has no\nmoves left!\p"); -static const u8 sText_PkmnMoveIsDisabled[] = _("{B_ACTIVE_NAME_WITH_PREFIX}’s {B_CURRENT_MOVE}\nis disabled!\p"); -static const u8 sText_PkmnCantUseMoveTorment[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can’t use the same\nmove in a row due to the TORMENT!\p"); -static const u8 sText_PkmnCantUseMoveTaunt[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can’t use\n{B_CURRENT_MOVE} after the TAUNT!\p"); -static const u8 sText_PkmnCantUseMoveSealed[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can’t use the\nsealed {B_CURRENT_MOVE}!\p"); -static const u8 sText_PkmnMadeItRain[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nmade it rain!"); -static const u8 sText_PkmnRaisedSpeed[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nraised its SPEED!"); +static const u8 sText_PkmnMoveIsDisabled[] = _("{B_ACTIVE_NAME_WITH_PREFIX}'s {B_CURRENT_MOVE}\nis disabled!\p"); +static const u8 sText_PkmnCantUseMoveTorment[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can't use the same\nmove in a row due to the TORMENT!\p"); +static const u8 sText_PkmnCantUseMoveTaunt[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can't use\n{B_CURRENT_MOVE} after the TAUNT!\p"); +static const u8 sText_PkmnCantUseMoveSealed[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can't use the\nsealed {B_CURRENT_MOVE}!\p"); +static const u8 sText_PkmnMadeItRain[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nmade it rain!"); +static const u8 sText_PkmnRaisedSpeed[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nraised its SPEED!"); static const u8 sText_PkmnProtectedBy[] = _("{B_DEF_NAME_WITH_PREFIX} was protected\nby {B_DEF_ABILITY}!"); -static const u8 sText_PkmnPreventsUsage[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nprevents {B_ATK_NAME_WITH_PREFIX}\lfrom using {B_CURRENT_MOVE}!"); +static const u8 sText_PkmnPreventsUsage[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nprevents {B_ATK_NAME_WITH_PREFIX}\lfrom using {B_CURRENT_MOVE}!"); static const u8 sText_PkmnRestoredHPUsing[] = _("{B_DEF_NAME_WITH_PREFIX} restored HP\nusing its {B_DEF_ABILITY}!"); -static const u8 sText_PkmnsXMadeYUseless[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nmade {B_CURRENT_MOVE} useless!"); -static const u8 sText_PkmnChangedTypeWith[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nmade it the {B_BUFF1} type!"); -static const u8 sText_PkmnPreventsParalysisWith[] = _("{B_EFF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nprevents paralysis!"); -static const u8 sText_PkmnPreventsRomanceWith[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nprevents romance!"); -static const u8 sText_PkmnPreventsPoisoningWith[] = _("{B_EFF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nprevents poisoning!"); -static const u8 sText_PkmnPreventsConfusionWith[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nprevents confusion!"); -static const u8 sText_PkmnRaisedFirePowerWith[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nraised its FIRE power!"); +static const u8 sText_PkmnsXMadeYUseless[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nmade {B_CURRENT_MOVE} useless!"); +static const u8 sText_PkmnChangedTypeWith[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nmade it the {B_BUFF1} type!"); +static const u8 sText_PkmnPreventsParalysisWith[] = _("{B_EFF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nprevents paralysis!"); +static const u8 sText_PkmnPreventsRomanceWith[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nprevents romance!"); +static const u8 sText_PkmnPreventsPoisoningWith[] = _("{B_EFF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nprevents poisoning!"); +static const u8 sText_PkmnPreventsConfusionWith[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nprevents confusion!"); +static const u8 sText_PkmnRaisedFirePowerWith[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nraised its FIRE power!"); static const u8 sText_PkmnAnchorsItselfWith[] = _("{B_DEF_NAME_WITH_PREFIX} anchors\nitself with {B_DEF_ABILITY}!"); -static const u8 sText_PkmnCutsAttackWith[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\ncuts {B_DEF_NAME_WITH_PREFIX}’s ATTACK!"); -static const u8 sText_PkmnPreventsStatLossWith[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nprevents stat loss!"); -static const u8 sText_PkmnHurtsWith[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nhurt {B_ATK_NAME_WITH_PREFIX}!"); -static const u8 sText_PkmnTraced[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} TRACED\n{B_BUFF1}’s {B_BUFF2}!"); -static const u8 sText_PkmnsXPreventsBurns[] = _("{B_EFF_NAME_WITH_PREFIX}’s {B_EFF_ABILITY}\nprevents burns!"); -static const u8 sText_PkmnsXBlocksY[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nblocks {B_CURRENT_MOVE}!"); -static const u8 sText_PkmnsXBlocksY2[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nblocks {B_CURRENT_MOVE}!"); -static const u8 sText_PkmnsXRestoredHPALittle2[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_ATK_ABILITY}\nrestored its HP a little!"); -static const u8 sText_PkmnsXWhippedUpSandstorm[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nwhipped up a sandstorm!"); -static const u8 sText_PkmnsXIntensifiedSun[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nintensified the sun’s rays!"); -static const u8 sText_PkmnsXPreventsYLoss[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nprevents {B_BUFF1} loss!"); -static const u8 sText_PkmnsXInfatuatedY[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\ninfatuated {B_ATK_NAME_WITH_PREFIX}!"); -static const u8 sText_PkmnsXMadeYIneffective[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nmade {B_CURRENT_MOVE} ineffective!"); -static const u8 sText_PkmnsXCuredYProblem[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\ncured its {B_BUFF1} problem!"); +static const u8 sText_PkmnCutsAttackWith[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\ncuts {B_DEF_NAME_WITH_PREFIX}'s ATTACK!"); +static const u8 sText_PkmnPreventsStatLossWith[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nprevents stat loss!"); +static const u8 sText_PkmnHurtsWith[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nhurt {B_ATK_NAME_WITH_PREFIX}!"); +static const u8 sText_PkmnTraced[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} TRACED\n{B_BUFF1}'s {B_BUFF2}!"); +static const u8 sText_PkmnsXPreventsBurns[] = _("{B_EFF_NAME_WITH_PREFIX}'s {B_EFF_ABILITY}\nprevents burns!"); +static const u8 sText_PkmnsXBlocksY[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nblocks {B_CURRENT_MOVE}!"); +static const u8 sText_PkmnsXBlocksY2[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nblocks {B_CURRENT_MOVE}!"); +static const u8 sText_PkmnsXRestoredHPALittle2[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_ATK_ABILITY}\nrestored its HP a little!"); +static const u8 sText_PkmnsXWhippedUpSandstorm[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nwhipped up a sandstorm!"); +static const u8 sText_PkmnsXIntensifiedSun[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nintensified the sun's rays!"); +static const u8 sText_PkmnsXPreventsYLoss[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nprevents {B_BUFF1} loss!"); +static const u8 sText_PkmnsXInfatuatedY[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\ninfatuated {B_ATK_NAME_WITH_PREFIX}!"); +static const u8 sText_PkmnsXMadeYIneffective[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nmade {B_CURRENT_MOVE} ineffective!"); +static const u8 sText_PkmnsXCuredYProblem[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\ncured its {B_BUFF1} problem!"); static const u8 sText_ItSuckedLiquidOoze[] = _("It sucked up the\nLIQUID OOZE!"); static const u8 sText_PkmnTransformed[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} transformed!"); -static const u8 sText_PkmnsXTookAttack[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\ntook the attack!"); -const u8 gText_PkmnsXPreventsSwitching[] = _("{B_BUFF1}’s {B_LAST_ABILITY}\nprevents switching!\p"); -static const u8 sText_PreventedFromWorking[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nprevented {B_SCR_ACTIVE_NAME_WITH_PREFIX}’s\l{B_BUFF1} from working!"); -static const u8 sText_PkmnsXMadeItIneffective[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nmade it ineffective!"); -static const u8 sText_PkmnsXPreventsFlinching[] = _("{B_EFF_NAME_WITH_PREFIX}’s {B_EFF_ABILITY}\nprevents flinching!"); -static const u8 sText_PkmnsXPreventsYsZ[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_ATK_ABILITY}\nprevents {B_DEF_NAME_WITH_PREFIX}’s\l{B_DEF_ABILITY} from working!"); -static const u8 sText_PkmnsXCuredItsYProblem[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\ncured its {B_BUFF1} problem!"); -static const u8 sText_PkmnsXHadNoEffectOnY[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nhad no effect on {B_EFF_NAME_WITH_PREFIX}!"); +static const u8 sText_PkmnsXTookAttack[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\ntook the attack!"); +const u8 gText_PkmnsXPreventsSwitching[] = _("{B_BUFF1}'s {B_LAST_ABILITY}\nprevents switching!\p"); +static const u8 sText_PreventedFromWorking[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nprevented {B_SCR_ACTIVE_NAME_WITH_PREFIX}'s\l{B_BUFF1} from working!"); +static const u8 sText_PkmnsXMadeItIneffective[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nmade it ineffective!"); +static const u8 sText_PkmnsXPreventsFlinching[] = _("{B_EFF_NAME_WITH_PREFIX}'s {B_EFF_ABILITY}\nprevents flinching!"); +static const u8 sText_PkmnsXPreventsYsZ[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_ATK_ABILITY}\nprevents {B_DEF_NAME_WITH_PREFIX}'s\l{B_DEF_ABILITY} from working!"); +static const u8 sText_PkmnsXCuredItsYProblem[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\ncured its {B_BUFF1} problem!"); +static const u8 sText_PkmnsXHadNoEffectOnY[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nhad no effect on {B_EFF_NAME_WITH_PREFIX}!"); static const u8 sText_StatSharply[] = _("sharply "); const u8 gText_StatRose[] = _("rose!"); static const u8 sText_StatHarshly[] = _("harshly "); static const u8 sText_StatFell[] = _("fell!"); -static const u8 sText_PkmnsStatChanged[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_BUFF1}\n{B_BUFF2}"); -const u8 gText_PkmnsStatChanged2[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_BUFF1}\n{B_BUFF2}"); +static const u8 sText_PkmnsStatChanged[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); +const u8 gText_PkmnsStatChanged2[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); static const u8 sText_UsingXTheYOfZN[] = _("Using {B_LAST_ITEM}, the {B_BUFF1}\nof {B_SCR_ACTIVE_NAME_WITH_PREFIX} {B_BUFF2}"); -static const u8 sText_PkmnsStatChanged3[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_BUFF1}\n{B_BUFF2}"); -static const u8 sText_PkmnsStatChanged4[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_BUFF1}\n{B_BUFF2}"); -static const u8 sText_StatsWontIncrease2[] = _("{B_ATK_NAME_WITH_PREFIX}’s stats won’t\ngo any higher!"); -static const u8 sText_StatsWontDecrease2[] = _("{B_DEF_NAME_WITH_PREFIX}’s stats won’t\ngo any lower!"); +static const u8 sText_PkmnsStatChanged3[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); +static const u8 sText_PkmnsStatChanged4[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); +static const u8 sText_StatsWontIncrease2[] = _("{B_ATK_NAME_WITH_PREFIX}'s stats won't\ngo any higher!"); +static const u8 sText_StatsWontDecrease2[] = _("{B_DEF_NAME_WITH_PREFIX}'s stats won't\ngo any lower!"); static const u8 sText_CriticalHit[] = _("A critical hit!"); -static const u8 sText_OneHitKO[] = _("It’s a one-hit KO!"); +static const u8 sText_OneHitKO[] = _("It's a one-hit KO!"); static const u8 sText_123Poof[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p"); static const u8 sText_AndEllipsis[] = _("And…\p"); -static const u8 sText_HMMovesCantBeForgotten[] = _("HM moves can’t be\nforgotten now.\p"); -static const u8 sText_NotVeryEffective[] = _("It’s not very effective…"); -static const u8 sText_SuperEffective[] = _("It’s super effective!"); +static const u8 sText_HMMovesCantBeForgotten[] = _("HM moves can't be\nforgotten now.\p"); +static const u8 sText_NotVeryEffective[] = _("It's not very effective…"); +static const u8 sText_SuperEffective[] = _("It's super effective!"); static const u8 sText_GotAwaySafely[] = _("{PLAY_SE 0x0011}Got away safely!\p"); static const u8 sText_PkmnFledUsingIts[] = _("{PLAY_SE 0x0011}{B_ATK_NAME_WITH_PREFIX} fled\nusing its {B_LAST_ITEM}!\p"); static const u8 sText_PkmnFledUsing[] = _("{PLAY_SE 0x0011}{B_ATK_NAME_WITH_PREFIX} fled\nusing {B_ATK_ABILITY}!\p"); @@ -339,9 +339,9 @@ static const u8 sText_PlayerBattledToDrawLinkTrainer[] = _("Player battled to a static const u8 sText_PlayerBattledToDrawVsTwo[] = _("Player battled to a draw against\n{B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}!"); static const u8 sText_WildFled[] = _("{PLAY_SE 0x0011}{B_LINK_OPPONENT1_NAME} fled!"); static const u8 sText_TwoWildFled[] = _("{PLAY_SE 0x0011}{B_LINK_OPPONENT1_NAME} and\n{B_LINK_OPPONENT2_NAME} fled!"); -static const u8 sText_NoRunningFromTrainers[] = _("No! There’s no running\nfrom a TRAINER battle!\p"); -static const u8 sText_CantEscape[] = _("Can’t escape!\p"); -static const u8 sText_DontLeaveBirch[] = _("PROF. BIRCH: Don’t leave me like this!\p"); +static const u8 sText_NoRunningFromTrainers[] = _("No! There's no running\nfrom a TRAINER battle!\p"); +static const u8 sText_CantEscape[] = _("Can't escape!\p"); +static const u8 sText_DontLeaveBirch[] = _("PROF. BIRCH: Don't leave me like this!\p"); static const u8 sText_ButNothingHappened[] = _("But nothing happened!"); static const u8 sText_ButItFailed[] = _("But it failed!"); static const u8 sText_ItHurtConfusion[] = _("It hurt itself in its\nconfusion!"); @@ -369,26 +369,26 @@ static const u8 sText_TooWeakForSubstitute[] = _("It was too weak to make\na SUB static const u8 sText_SharedPain[] = _("The battlers shared\ntheir pain!"); static const u8 sText_BellChimed[] = _("A bell chimed!"); static const u8 sText_FaintInThree[] = _("All affected POKéMON will\nfaint in three turns!"); -static const u8 sText_NoPPLeft[] = _("There’s no PP left for\nthis move!\p"); +static const u8 sText_NoPPLeft[] = _("There's no PP left for\nthis move!\p"); static const u8 sText_ButNoPPLeft[] = _("But there was no PP left\nfor the move!"); static const u8 sText_PkmnIgnoresAsleep[] = _("{B_ATK_NAME_WITH_PREFIX} ignored\norders while asleep!"); static const u8 sText_PkmnIgnoredOrders[] = _("{B_ATK_NAME_WITH_PREFIX} ignored\norders!"); static const u8 sText_PkmnBeganToNap[] = _("{B_ATK_NAME_WITH_PREFIX} began to nap!"); static const u8 sText_PkmnLoafing[] = _("{B_ATK_NAME_WITH_PREFIX} is\nloafing around!"); -static const u8 sText_PkmnWontObey[] = _("{B_ATK_NAME_WITH_PREFIX} won’t\nobey!"); +static const u8 sText_PkmnWontObey[] = _("{B_ATK_NAME_WITH_PREFIX} won't\nobey!"); static const u8 sText_PkmnTurnedAway[] = _("{B_ATK_NAME_WITH_PREFIX} turned away!"); static const u8 sText_PkmnPretendNotNotice[] = _("{B_ATK_NAME_WITH_PREFIX} pretended\nnot to notice!"); static const u8 sText_EnemyAboutToSwitchPkmn[] = _("{B_TRAINER1_CLASS} {B_TRAINER1_NAME} is\nabout to use {B_BUFF2}.\pWill {B_PLAYER_NAME} change\nPOKéMON?"); static const u8 sText_PkmnLearnedMove2[] = _("{B_ATK_NAME_WITH_PREFIX} learned\n{B_BUFF1}!"); static const u8 sText_PlayerDefeatedLinkTrainerTrainer1[] = _("Player defeated\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!\p"); static const u8 sText_CreptCloser[] = _("{B_PLAYER_NAME} crept closer to\n{B_OPPONENT_MON1_NAME}!"); -static const u8 sText_CantGetCloser[] = _("{B_PLAYER_NAME} can’t get any closer!"); +static const u8 sText_CantGetCloser[] = _("{B_PLAYER_NAME} can't get any closer!"); static const u8 sText_PkmnWatchingCarefully[] = _("{B_OPPONENT_MON1_NAME} is watching\ncarefully!"); static const u8 sText_PkmnCuriousAboutX[] = _("{B_OPPONENT_MON1_NAME} is curious about\nthe {B_BUFF1}!"); static const u8 sText_PkmnEnthralledByX[] = _("{B_OPPONENT_MON1_NAME} is enthralled by\nthe {B_BUFF1}!"); static const u8 sText_PkmnIgnoredX[] = _("{B_OPPONENT_MON1_NAME} completely ignored\nthe {B_BUFF1}!"); static const u8 sText_ThrewPokeblockAtPkmn[] = _("{B_PLAYER_NAME} threw a {POKEBLOCK}\nat the {B_OPPONENT_MON1_NAME}!"); -static const u8 sText_OutOfSafariBalls[] = _("{PLAY_SE 0x0049}ANNOUNCER: You’re out of\nSAFARI BALLS! Game over!\p"); +static const u8 sText_OutOfSafariBalls[] = _("{PLAY_SE 0x0049}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p"); static const u8 sText_OpponentMon1Appeared[] = _("{B_OPPONENT_MON1_NAME} appeared!\p"); static const u8 sText_WildPkmnAppeared[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!\p"); static const u8 sText_WildPkmnAppeared2[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!\p"); @@ -410,9 +410,9 @@ static const u8 sText_GoTwoPkmn[] = _("Go! {B_PLAYER_MON1_NAME} and\n{B_PLAYER_M static const u8 sText_GoPkmn2[] = _("Go! {B_BUFF1}!"); static const u8 sText_DoItPkmn[] = _("Do it! {B_BUFF1}!"); static const u8 sText_GoForItPkmn[] = _("Go for it, {B_BUFF1}!"); -static const u8 sText_YourFoesWeakGetEmPkmn[] = _("Your foe’s weak!\nGet ’em, {B_BUFF1}!"); +static const u8 sText_YourFoesWeakGetEmPkmn[] = _("Your foe's weak!\nGet 'em, {B_BUFF1}!"); static const u8 sText_LinkPartnerSentOutPkmnGoPkmn[] = _("{B_LINK_PARTNER_NAME} sent out {B_LINK_PLAYER_MON2_NAME}!\nGo! {B_LINK_PLAYER_MON1_NAME}!"); -static const u8 sText_PkmnThatsEnough[] = _("{B_BUFF1}, that’s enough!\nCome back!"); +static const u8 sText_PkmnThatsEnough[] = _("{B_BUFF1}, that's enough!\nCome back!"); static const u8 sText_PkmnComeBack[] = _("{B_BUFF1}, come back!"); static const u8 sText_PkmnOkComeBack[] = _("{B_BUFF1}, OK!\nCome back!"); static const u8 sText_PkmnGoodComeBack[] = _("{B_BUFF1}, good!\nCome back!"); @@ -467,8 +467,8 @@ static const u8 sText_PlayerUsedItem[] = _("{B_PLAYER_NAME} used\n{B_LAST_ITEM}! static const u8 sText_WallyUsedItem[] = _("WALLY used\n{B_LAST_ITEM}!"); static const u8 sText_Trainer1UsedItem[] = _("{B_TRAINER1_CLASS} {B_TRAINER1_NAME}\nused {B_LAST_ITEM}!"); static const u8 sText_TrainerBlockedBall[] = _("The TRAINER blocked the BALL!"); -static const u8 sText_DontBeAThief[] = _("Don’t be a thief!"); -static const u8 sText_ItDodgedBall[] = _("It dodged the thrown BALL!\nThis POKéMON can’t be caught!"); +static const u8 sText_DontBeAThief[] = _("Don't be a thief!"); +static const u8 sText_ItDodgedBall[] = _("It dodged the thrown BALL!\nThis POKéMON can't be caught!"); static const u8 sText_YouMissedPkmn[] = _("You missed the POKéMON!"); static const u8 sText_PkmnBrokeFree[] = _("Oh, no!\nThe POKéMON broke free!"); static const u8 sText_ItAppearedCaught[] = _("Aww!\nIt appeared to be caught!"); @@ -478,30 +478,30 @@ static const u8 sText_GotchaPkmnCaught[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} wa static const u8 sText_GotchaPkmnCaught2[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}{PAUSE 127}"); static const u8 sText_GiveNicknameCaptured[] = _("Give a nickname to the\ncaptured {B_OPPONENT_MON1_NAME}?"); static const u8 sText_PkmnSentToPC[] = _("{B_OPPONENT_MON1_NAME} was sent to\n{B_PC_CREATOR_NAME} PC."); -static const u8 sText_Someones[] = _("someone’s"); -static const u8 sText_Lanettes[] = _("LANETTE’s"); -static const u8 sText_PkmnDataAddedToDex[] = _("{B_OPPONENT_MON1_NAME}’s data was\nadded to the POKéDEX.\p"); +static const u8 sText_Someones[] = _("someone's"); +static const u8 sText_Lanettes[] = _("LANETTE's"); +static const u8 sText_PkmnDataAddedToDex[] = _("{B_OPPONENT_MON1_NAME}'s data was\nadded to the POKéDEX.\p"); static const u8 sText_ItIsRaining[] = _("It is raining."); static const u8 sText_SandstormIsRaging[] = _("A sandstorm is raging."); -static const u8 sText_BoxIsFull[] = _("The BOX is full!\nYou can’t catch any more!\p"); +static const u8 sText_BoxIsFull[] = _("The BOX is full!\nYou can't catch any more!\p"); static const u8 sText_EnigmaBerry[] = _("ENIGMA BERRY"); static const u8 sText_BerrySuffix[] = _(" BERRY"); -static const u8 sText_PkmnsItemCuredParalysis[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\ncured paralysis!"); -static const u8 sText_PkmnsItemCuredPoison[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\ncured poison!"); -static const u8 sText_PkmnsItemHealedBurn[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nhealed its burn!"); -static const u8 sText_PkmnsItemDefrostedIt[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\ndefrosted it!"); -static const u8 sText_PkmnsItemWokeIt[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nwoke it from its sleep!"); -static const u8 sText_PkmnsItemSnappedOut[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nsnapped it out of confusion!"); -static const u8 sText_PkmnsItemCuredProblem[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\ncured its {B_BUFF1} problem!"); -static const u8 sText_PkmnsItemNormalizedStatus[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nnormalized its status!"); -static const u8 sText_PkmnsItemRestoredHealth[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nrestored health!"); -static const u8 sText_PkmnsItemRestoredPP[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nrestored {B_BUFF1}’s PP!"); -static const u8 sText_PkmnsItemRestoredStatus[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nrestored its status!"); -static const u8 sText_PkmnsItemRestoredHPALittle[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nrestored its HP a little!"); +static const u8 sText_PkmnsItemCuredParalysis[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\ncured paralysis!"); +static const u8 sText_PkmnsItemCuredPoison[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\ncured poison!"); +static const u8 sText_PkmnsItemHealedBurn[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nhealed its burn!"); +static const u8 sText_PkmnsItemDefrostedIt[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\ndefrosted it!"); +static const u8 sText_PkmnsItemWokeIt[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nwoke it from its sleep!"); +static const u8 sText_PkmnsItemSnappedOut[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nsnapped it out of confusion!"); +static const u8 sText_PkmnsItemCuredProblem[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\ncured its {B_BUFF1} problem!"); +static const u8 sText_PkmnsItemNormalizedStatus[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nnormalized its status!"); +static const u8 sText_PkmnsItemRestoredHealth[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nrestored health!"); +static const u8 sText_PkmnsItemRestoredPP[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nrestored {B_BUFF1}'s PP!"); +static const u8 sText_PkmnsItemRestoredStatus[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nrestored its status!"); +static const u8 sText_PkmnsItemRestoredHPALittle[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nrestored its HP a little!"); static const u8 sText_ItemAllowsOnlyYMove[] = _("{B_LAST_ITEM} allows the\nuse of only {B_CURRENT_MOVE}!\p"); static const u8 sText_PkmnHungOnWithX[] = _("{B_DEF_NAME_WITH_PREFIX} hung on\nusing its {B_LAST_ITEM}!"); const u8 gText_EmptyString3[] = _(""); -static const u8 sText_YouThrowABallNowRight[] = _("You throw a BALL now, right?\nI… I’ll do my best!"); +static const u8 sText_YouThrowABallNowRight[] = _("You throw a BALL now, right?\nI… I'll do my best!"); // early declaration of strings static const u8 sText_PkmnIncapableOfPower[]; @@ -1215,7 +1215,7 @@ const u8 gText_Win[] = _("{HIGHLIGHT TRANSPARENT}Win"); const u8 gText_Loss[] = _("{HIGHLIGHT TRANSPARENT}Loss"); const u8 gText_Draw[] = _("{HIGHLIGHT TRANSPARENT}Draw"); static const u8 sText_SpaceIs[] = _(" is"); -static const u8 sText_ApostropheS[] = _("’s"); +static const u8 sText_ApostropheS[] = _("'s"); static const u8 sATypeMove_Table[][17] = { @@ -1272,7 +1272,7 @@ static const u8 sText_InGamePartnerSentOutZGoN[] = _("{B_PARTNER_CLASS} {B_PARTN static const u8 sText_TwoInGameTrainersDefeated[] = _("{B_TRAINER1_CLASS} {B_TRAINER1_NAME} and\n{B_TRAINER2_CLASS} {B_TRAINER2_NAME}\lwere defeated!\p"); static const u8 sText_Trainer2LoseText[] = _("{B_TRAINER2_LOSE_TEXT}"); static const u8 sText_PkmnIncapableOfPower[] = _("{B_ATK_NAME_WITH_PREFIX} appears incapable\nof using its power!"); -static const u8 sText_GlintAppearsInEye[] = _("A glint appears in\n{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s eyes!"); +static const u8 sText_GlintAppearsInEye[] = _("A glint appears in\n{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s eyes!"); static const u8 sText_PkmnGettingIntoPosition[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} is getting into\nposition!"); static const u8 sText_PkmnBeganGrowlingDeeply[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} began growling deeply!"); static const u8 sText_PkmnEagerForMore[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} is eager for more!"); @@ -1284,16 +1284,16 @@ const u16 gStringIds_85CCF0A[] = }; static const u8 sText_RefIfNothingIsDecided[] = _("REFEREE: If nothing is decided in\n3 turns, we will go to judging!"); -static const u8 sText_RefThatsIt[] = _("REFEREE: That’s it! We will now go to\njudging to determine the winner!"); +static const u8 sText_RefThatsIt[] = _("REFEREE: That's it! We will now go to\njudging to determine the winner!"); static const u8 sText_RefJudgeMind[] = _("REFEREE: Judging category 1, Mind!\nThe POKéMON showing the most guts!\p"); static const u8 sText_RefJudgeSkill[] = _("REFEREE: Judging category 2, Skill!\nThe POKéMON using moves the best!\p"); static const u8 sText_RefJudgeBody[] = _("REFEREE: Judging category 3, Body!\nThe POKéMON with the most vitality!\p"); -static const u8 sText_RefJudgement1[] = _("REFEREE: Judgment: {B_BUFF1} to {B_BUFF2}!\nThe winner is {B_PLAYER_NAME}’s {B_PLAYER_MON1_NAME}!\p"); -static const u8 sText_RefJudgement2[] = _("REFEREE: Judgment: {B_BUFF1} to {B_BUFF2}!\nThe winner is {B_TRAINER1_NAME}’s {B_OPPONENT_MON1_NAME}!\p"); +static const u8 sText_RefJudgement1[] = _("REFEREE: Judgment: {B_BUFF1} to {B_BUFF2}!\nThe winner is {B_PLAYER_NAME}'s {B_PLAYER_MON1_NAME}!\p"); +static const u8 sText_RefJudgement2[] = _("REFEREE: Judgment: {B_BUFF1} to {B_BUFF2}!\nThe winner is {B_TRAINER1_NAME}'s {B_OPPONENT_MON1_NAME}!\p"); static const u8 sText_RefJudgement3[] = _("REFEREE: Judgment: 3 to 3!\nWe have a draw!\p"); -static const u8 sText_DefeatedOpponentByReferee[] = _("{B_PLAYER_MON1_NAME} defeated the opponent\n{B_OPPONENT_MON1_NAME} in a REFEREE’s decision!"); -static const u8 sText_LostToOpponentByReferee[] = _("{B_PLAYER_MON1_NAME} lost to the opponent\n{B_OPPONENT_MON1_NAME} in a REFEREE’s decision!"); -static const u8 sText_TiedOpponentByReferee[] = _("{B_PLAYER_MON1_NAME} tied the opponent\n{B_OPPONENT_MON1_NAME} in a REFEREE’s decision!"); +static const u8 sText_DefeatedOpponentByReferee[] = _("{B_PLAYER_MON1_NAME} defeated the opponent\n{B_OPPONENT_MON1_NAME} in a REFEREE's decision!"); +static const u8 sText_LostToOpponentByReferee[] = _("{B_PLAYER_MON1_NAME} lost to the opponent\n{B_OPPONENT_MON1_NAME} in a REFEREE's decision!"); +static const u8 sText_TiedOpponentByReferee[] = _("{B_PLAYER_MON1_NAME} tied the opponent\n{B_OPPONENT_MON1_NAME} in a REFEREE's decision!"); static const u8 sText_RefCommenceBattle[] = _("REFEREE: {B_PLAYER_MON1_NAME} VS {B_OPPONENT_MON1_NAME}!\nCommence battling!"); const u8 * const gRefereeStringsTable[] = @@ -1317,7 +1317,7 @@ static const u8 sText_Trainer1Fled[] = _( "{PLAY_SE 0x0011}{B_TRAINER1_CLASS} {B static const u8 sText_PlayerLostAgainstTrainer1[] = _("Player lost against\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!"); static const u8 sText_PlayerBattledToDrawTrainer1[] = _("Player battled to a draw against\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!"); const u8 gText_RecordBattleToPass[] = _("Would you like to record your battle\non your FRONTIER PASS?"); -const u8 gText_BattleRecordedOnPass[] = _("{B_PLAYER_NAME}’s battle result was recorded\non the FRONTIER PASS."); +const u8 gText_BattleRecordedOnPass[] = _("{B_PLAYER_NAME}'s battle result was recorded\non the FRONTIER PASS."); static const u8 sText_LinkTrainerWantsToBattlePause[] = _("{B_LINK_OPPONENT1_NAME}\nwants to battle!{PAUSE 49}"); static const u8 sText_TwoLinkTrainersWantToBattlePause[] = _("{B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}\nwant to battle!{PAUSE 49}"); diff --git a/src/berry.c b/src/berry.c index 9f08165b8..24ed370c3 100644 --- a/src/berry.c +++ b/src/berry.c @@ -32,7 +32,7 @@ static u16 GetStageDurationByBerryType(u8); //.rodata static const u8 sBerryDescriptionPart1_Cheri[] = _("Blooms with delicate pretty flowers."); static const u8 sBerryDescriptionPart2_Cheri[] = _("The bright red BERRY is very spicy."); -static const u8 sBerryDescriptionPart1_Chesto[] = _("The BERRY’s thick skin and fruit are"); +static const u8 sBerryDescriptionPart1_Chesto[] = _("The BERRY's thick skin and fruit are"); static const u8 sBerryDescriptionPart2_Chesto[] = _("very tough. It is dry-tasting all over."); static const u8 sBerryDescriptionPart1_Pecha[] = _("Very sweet and delicious."); static const u8 sBerryDescriptionPart2_Pecha[] = _("Also very tender - handle with care."); @@ -44,7 +44,7 @@ static const u8 sBerryDescriptionPart1_Leppa[] = _("Grows slower than CHERI and static const u8 sBerryDescriptionPart2_Leppa[] = _("The smaller the BERRY, the tastier."); static const u8 sBerryDescriptionPart1_Oran[] = _("A peculiar BERRY with a mix of flavors."); static const u8 sBerryDescriptionPart2_Oran[] = _("BERRIES grow in half a day."); -static const u8 sBerryDescriptionPart1_Persim[] = _("Loves sunlight. The BERRY’s color"); +static const u8 sBerryDescriptionPart1_Persim[] = _("Loves sunlight. The BERRY's color"); static const u8 sBerryDescriptionPart2_Persim[] = _("grows vivid when exposed to the sun."); static const u8 sBerryDescriptionPart1_Lum[] = _("Slow to grow. If raised with loving"); static const u8 sBerryDescriptionPart2_Lum[] = _("care, it may grow two BERRIES."); @@ -113,7 +113,7 @@ static const u8 sBerryDescriptionPart2_Apicot[] = _("what may happen or how it c static const u8 sBerryDescriptionPart1_Lansat[] = _("Said to be a legendary BERRY."); static const u8 sBerryDescriptionPart2_Lansat[] = _("Holding it supposedly brings joy."); static const u8 sBerryDescriptionPart1_Starf[] = _("So strong, it was abandoned at the"); -static const u8 sBerryDescriptionPart2_Starf[] = _("world’s edge. Considered a mirage."); +static const u8 sBerryDescriptionPart2_Starf[] = _("world's edge. Considered a mirage."); static const u8 sBerryDescriptionPart1_Enigma[] = _("A completely enigmatic BERRY."); static const u8 sBerryDescriptionPart2_Enigma[] = _("Appears to have the power of stars."); diff --git a/src/berry_blender.c b/src/berry_blender.c index 7320e905f..121831e1b 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -260,10 +260,10 @@ static const u8 sText_PressAToStart[] = _("Press the A Button to start."); static const u8 sText_PleaseWaitAWhile[] = _("Please wait a while."); static const u8 sText_CommunicationStandby[] = _("Communication standby…"); static const u8 sText_WouldLikeToBlendAnotherBerry[] = _("Would you like to blend another BERRY?"); -static const u8 sText_RunOutOfBerriesForBlending[] = _("You’ve run out of BERRIES for\nblending in the BERRY BLENDER.\p"); +static const u8 sText_RunOutOfBerriesForBlending[] = _("You've run out of BERRIES for\nblending in the BERRY BLENDER.\p"); static const u8 sText_YourPokeblockCaseIsFull[] = _("Your {POKEBLOCK} CASE is full.\p"); static const u8 sText_HasNoBerriesToPut[] = _(" has no BERRIES to put in\nthe BERRY BLENDER."); -static const u8 sText_ApostropheSPokeblockCaseIsFull[] = _("’s {POKEBLOCK} CASE is full.\p"); +static const u8 sText_ApostropheSPokeblockCaseIsFull[] = _("'s {POKEBLOCK} CASE is full.\p"); static const u8 sText_BlendingResults[] = _("RESULTS OF BLENDING"); static const u8 sText_BerryUsed[] = _("BERRY USED"); static const u8 sText_SpaceBerry[] = _(" BERRY"); diff --git a/src/data/items.h b/src/data/items.h index a36a13033..7d7caa289 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -3389,7 +3389,7 @@ const struct Item gItems[] = [ITEM_KINGS_ROCK] = { - .name = _("KING’S ROCK"), + .name = _("KING'S ROCK"), .itemId = ITEM_KINGS_ROCK, .price = 100, .holdEffect = HOLD_EFFECT_FLINCH, @@ -6311,7 +6311,7 @@ const struct Item gItems[] = [ITEM_OAKS_PARCEL] = { - .name = _("OAK’S PARCEL"), + .name = _("OAK'S PARCEL"), .itemId = ITEM_OAKS_PARCEL, .price = 0, .holdEffect = HOLD_EFFECT_NONE, diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index 565c1acaf..0daf7fc86 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -7,19 +7,19 @@ const u8 gDummyPokedexText[] = _( const u8 gBulbasaurPokedexText[] = _( "BULBASAUR can be seen napping in bright\n" "sunlight. There is a seed on its back.\n" - "By soaking up the sun’s rays, the seed\n" + "By soaking up the sun's rays, the seed\n" "grows progressively larger."); const u8 gIvysaurPokedexText[] = _( - "To support its bulb, IVYSAUR’s legs\n" + "To support its bulb, IVYSAUR's legs\n" "grow sturdy. If it spends more time lying in\n" "the sunlight, the bud will soon bloom into\n" "a large flower."); const u8 gVenusaurPokedexText[] = _( - "VENUSAUR’s flower is said to take on vivid\n" + "VENUSAUR's flower is said to take on vivid\n" "colors if it gets plenty of nutrition and\n" - "sunlight. The flower’s aroma soothes the\n" + "sunlight. The flower's aroma soothes the\n" "emotions of people."); const u8 gCharmanderPokedexText[] = _( @@ -50,7 +50,7 @@ const u8 gWartortlePokedexText[] = _( "Its large tail is covered with rich, thick\n" "fur that deepens in color with age.\n" "The scratches on its shell are evidence\n" - "of this POKéMON’s toughness in battle."); + "of this POKéMON's toughness in battle."); const u8 gBlastoisePokedexText[] = _( "The waterspouts that protrude from its\n" @@ -119,7 +119,7 @@ const u8 gRattataPokedexText[] = _( "It will make its nest anywhere."); const u8 gRaticatePokedexText[] = _( - "A RATICATE’s sturdy fangs grow steadily.\n" + "A RATICATE's sturdy fangs grow steadily.\n" "To keep them ground down, it gnaws on\n" "rocks and logs. It may even chew on the\n" "walls of houses."); @@ -194,7 +194,7 @@ const u8 gNidoranMPokedexText[] = _( "The male NIDORAN has developed muscles\n" "that freely move its ears in any direction.\n" "Even the slightest sound does not escape\n" - "this POKéMON’s notice."); + "this POKéMON's notice."); const u8 gNidorinoPokedexText[] = _( "Its horn is harder than a diamond.\n" @@ -203,7 +203,7 @@ const u8 gNidorinoPokedexText[] = _( "challenges the foe with all its might."); const u8 gNidokingPokedexText[] = _( - "A NIDOKING’s thick tail packs enormously\n" + "A NIDOKING's thick tail packs enormously\n" "destructive power capable of toppling\n" "a metal transmission tower. Once it goes\n" "on a rampage, there is no stopping it."); @@ -222,7 +222,7 @@ const u8 gClefablePokedexText[] = _( const u8 gVulpixPokedexText[] = _( "It can freely control fire, making fiery\n" - "orbs fly like will-o’-the-wisps. Just\n" + "orbs fly like will-o'-the-wisps. Just\n" "before evolution, its six tails grow hot \n" "as if on fire."); @@ -234,7 +234,7 @@ const u8 gNinetalesPokedexText[] = _( const u8 gJigglypuffPokedexText[] = _( "Nothing can avoid falling asleep hearing a\n" - "JIGGLYPUFF’s song. The sound waves of its\n" + "JIGGLYPUFF's song. The sound waves of its\n" "singing voice match the brain waves of\n" "someone in a deep sleep."); @@ -317,7 +317,7 @@ const u8 gMeowthPokedexText[] = _( "shiny coins that glitter with light."); const u8 gPersianPokedexText[] = _( - "A PERSIAN’s six bold whiskers sense air\n" + "A PERSIAN's six bold whiskers sense air\n" "movements to determine what is in its\n" "vicinity. It becomes docile if grabbed\n" "by the whiskers."); @@ -336,7 +336,7 @@ const u8 gGolduckPokedexText[] = _( const u8 gMankeyPokedexText[] = _( "When it starts shaking and its nasal\n" - "breathing turns rough, it’s a sure sign\n" + "breathing turns rough, it's a sure sign\n" "of anger. However, since this happens\n" "instantly, there is no time to flee."); @@ -348,7 +348,7 @@ const u8 gPrimeapePokedexText[] = _( const u8 gGrowlithePokedexText[] = _( "Its superb sense of smell ensures that\n" - "this POKéMON won’t forget any scent,\n" + "this POKéMON won't forget any scent,\n" "no matter what. It uses its sense of smell\n" "to detect the emotions of others."); @@ -359,7 +359,7 @@ const u8 gArcaninePokedexText[] = _( "is its source of power."); const u8 gPoliwagPokedexText[] = _( - "It is possible to see this POKéMON’s spiral\n" + "It is possible to see this POKéMON's spiral\n" "innards right through its thin skin.\n" "However, the skin is also very flexible.\n" "Even sharp fangs bounce right off it."); @@ -390,7 +390,7 @@ const u8 gKadabraPokedexText[] = _( const u8 gAlakazamPokedexText[] = _( "While it has strong psychic abilities and\n" - "high intelligence, an ALAKAZAM’s muscles\n" + "high intelligence, an ALAKAZAM's muscles\n" "are very weak. It uses psychic power to\n" "move its body."); @@ -413,7 +413,7 @@ const u8 gMachampPokedexText[] = _( "a tough opponent."); const u8 gBellsproutPokedexText[] = _( - "A BELLSPROUT’s thin and flexible body lets\n" + "A BELLSPROUT's thin and flexible body lets\n" "it bend and sway to avoid any attack,\n" "however strong it may be. From its mouth,\n" "it leaks a fluid that melts even iron."); @@ -476,11 +476,11 @@ const u8 gSlowpokePokedexText[] = _( "It catches prey by dipping its tail in\n" "water at the side of a river. But it often\n" "forgets what it is doing and spends entire\n" - "days just loafing at water’s edge."); + "days just loafing at water's edge."); const u8 gSlowbroPokedexText[] = _( "Its tail has a SHELLDER firmly attached\n" - "with a bite. As a result, the tail can’t be\n" + "with a bite. As a result, the tail can't be\n" "used for fishing anymore. This forces it\n" "to reluctantly swim and catch prey."); @@ -528,7 +528,7 @@ const u8 gDewgongPokedexText[] = _( const u8 gGrimerPokedexText[] = _( "Born from polluted sludge in the sea,\n" - "GRIMER’s favorite food is anything filthy.\n" + "GRIMER's favorite food is anything filthy.\n" "They feed on wastewater pumped out from\n" "factories."); @@ -551,14 +551,14 @@ const u8 gCloysterPokedexText[] = _( "shell using the same system."); const u8 gGastlyPokedexText[] = _( - "When exposed to a strong wind, a GASTLY’s\n" + "When exposed to a strong wind, a GASTLY's\n" "gaseous body quickly dwindles away.\n" "They cluster under the eaves of houses\n" "to escape the ravages of wind."); const u8 gHaunterPokedexText[] = _( "If a HAUNTER beckons you while it is\n" - "floating in darkness, don’t approach it.\n" + "floating in darkness, don't approach it.\n" "This POKéMON will try to lick you with its\n" "tongue and steal your life away."); @@ -576,13 +576,13 @@ const u8 gOnixPokedexText[] = _( const u8 gDrowzeePokedexText[] = _( "If your nose becomes itchy while you are\n" - "sleeping, it’s a sure sign that a DROWZEE is\n" + "sleeping, it's a sure sign that a DROWZEE is\n" "standing above your pillow and trying to\n" "eat your dream through your nostrils."); const u8 gHypnoPokedexText[] = _( "The arcing movement and glitter of the\n" - "pendulum in a HYPNO’s hand lull the foe\n" + "pendulum in a HYPNO's hand lull the foe\n" "into deep hypnosis. While searching for\n" "prey, it polishes the pendulum."); @@ -617,7 +617,7 @@ const u8 gExeggcutePokedexText[] = _( "appear, it is close to evolution."); const u8 gExeggutorPokedexText[] = _( - "Originally from the tropics, EXEGGUTOR’s\n" + "Originally from the tropics, EXEGGUTOR's\n" "heads grow larger from exposure to strong\n" "sunlight. It is said that when the heads\n" "fall, they group to form an EXEGGCUTE."); @@ -665,9 +665,9 @@ const u8 gWeezingPokedexText[] = _( "from garbage are the ultimate feast."); const u8 gRhyhornPokedexText[] = _( - "Once it starts running, it doesn’t stop.\n" + "Once it starts running, it doesn't stop.\n" "Its tiny brain makes it so stupid that it\n" - "can’t remember why it started running in\n" + "can't remember why it started running in\n" "the first place."); const u8 gRhydonPokedexText[] = _( @@ -691,7 +691,7 @@ const u8 gTangelaPokedexText[] = _( const u8 gKangaskhanPokedexText[] = _( "If you come across a young KANGASKHAN\n" "playing by itself, never try to catch it.\n" - "The baby’s parent is sure to be in the area,\n" + "The baby's parent is sure to be in the area,\n" "and it will become violently enraged."); const u8 gHorseaPokedexText[] = _( @@ -810,12 +810,12 @@ const u8 gVaporeonPokedexText[] = _( const u8 gJolteonPokedexText[] = _( "Its cells generate weak power that is\n" - "amplified by its fur’s static electricity\n" + "amplified by its fur's static electricity\n" "to drop thunderbolts. The bristling fur is\n" "made of electrically charged needles."); const u8 gFlareonPokedexText[] = _( - "FLAREON’s fluffy fur releases heat into\n" + "FLAREON's fluffy fur releases heat into\n" "the air so that its body does not get\n" "excessively hot. Its body temperature can\n" "rise to a maximum of 1,650 degrees F."); @@ -857,7 +857,7 @@ const u8 gAerodactylPokedexText[] = _( "have been the king of the skies."); const u8 gSnorlaxPokedexText[] = _( - "SNORLAX’s typical day consists of nothing\n" + "SNORLAX's typical day consists of nothing\n" "more than eating and sleeping. It is such\n" "a docile POKéMON that there are children\n" "who use its big belly as a place to play."); @@ -917,16 +917,16 @@ const u8 gChikoritaPokedexText[] = _( "atmosphere that becalms the battlers."); const u8 gBayleefPokedexText[] = _( - "A BAYLEEF’s neck is ringed by curled-up\n" + "A BAYLEEF's neck is ringed by curled-up\n" "leaves. Inside each leaf is a small tree\n" "shoot. The fragrance of this shoot\n" "makes people peppy."); const u8 gMeganiumPokedexText[] = _( - "The fragrance of a MEGANIUM’s flower\n" + "The fragrance of a MEGANIUM's flower\n" "soothes and calms emotions. In battle,\n" "it gives off more of its becalming scent\n" - "to blunt the foe’s fighting spirit."); + "to blunt the foe's fighting spirit."); const u8 gCyndaquilPokedexText[] = _( "It flares flames from its back to protect\n" @@ -947,7 +947,7 @@ const u8 gTyphlosionPokedexText[] = _( "blasts that burn everything to cinders."); const u8 gTotodilePokedexText[] = _( - "Despite its small body, TOTODILE’s jaws\n" + "Despite its small body, TOTODILE's jaws\n" "are very powerful. While it may think it is\n" "just playfully nipping, its bite has enough\n" "strength to cause serious injury."); @@ -978,7 +978,7 @@ const u8 gFurretPokedexText[] = _( const u8 gHoothootPokedexText[] = _( "It has an internal organ that senses\n" - "the earth’s rotation. Using this special\n" + "the earth's rotation. Using this special\n" "organ, a HOOTHOOT begins hooting at\n" "precisely the same time every day."); @@ -992,7 +992,7 @@ const u8 gLedybaPokedexText[] = _( "LEDYBA communicate using a fluid that\n" "they secrete from where the legs join the\n" "body. They are said to convey feelings to\n" - "others by altering the fluid’s scent."); + "others by altering the fluid's scent."); const u8 gLedianPokedexText[] = _( "It is said that in lands with clean air,\n" @@ -1022,7 +1022,7 @@ const u8 gChinchouPokedexText[] = _( "When it senses danger, it discharges\n" "positive and negative electricity from its\n" "two antennae. It lives in depths beyond\n" - "sunlight’s reach."); + "sunlight's reach."); const u8 gLanturnPokedexText[] = _( "The light-emitting orbs on its back are\n" @@ -1063,7 +1063,7 @@ const u8 gTogeticPokedexText[] = _( const u8 gNatuPokedexText[] = _( "It runs up short trees that grow on the\n" "savanna to peck at new shoots.\n" - "A NATU’s eyes look as if they are\n" + "A NATU's eyes look as if they are\n" "always observing something."); const u8 gXatuPokedexText[] = _( @@ -1100,7 +1100,7 @@ const u8 gMarillPokedexText[] = _( "Its body is covered with water-repellent\n" "fur. Because of the fur, it can swim\n" "through water at high speed without being\n" - "slowed by the water’s resistance."); + "slowed by the water's resistance."); const u8 gAzumarillPokedexText[] = _( "It lives in water virtually all day long.\n" @@ -1128,7 +1128,7 @@ const u8 gHoppipPokedexText[] = _( const u8 gSkiploomPokedexText[] = _( "It blossoms when the temperature rises\n" - "above 64 degrees F. Because its flower’s\n" + "above 64 degrees F. Because its flower's\n" "blooming changes with the temperature,\n" "it is sometimes used as a thermometer."); @@ -1141,7 +1141,7 @@ const u8 gJumpluffPokedexText[] = _( const u8 gAipomPokedexText[] = _( "Its tail ends with a dexterous, handlike\n" "appendage. However, because it uses the\n" - "tail so much, AIPOM’s real hands have\n" + "tail so much, AIPOM's real hands have\n" "become rather clumsy."); const u8 gSunkernPokedexText[] = _( @@ -1171,7 +1171,7 @@ const u8 gWooperPokedexText[] = _( const u8 gQuagsirePokedexText[] = _( "A QUAGSIRE hunts by leaving its mouth wide\n" "open in water and waiting for its prey to\n" - "blunder in. Because it doesn’t move, it\n" + "blunder in. Because it doesn't move, it\n" "does not get very hungry."); const u8 gEspeonPokedexText[] = _( @@ -1182,7 +1182,7 @@ const u8 gEspeonPokedexText[] = _( const u8 gUmbreonPokedexText[] = _( "UMBREON evolved from exposure to the\n" - "moon’s energy pulses. It lurks in darkness\n" + "moon's energy pulses. It lurks in darkness\n" "and waits for its foes to move. The rings\n" "on its body glow when it leaps to attack."); @@ -1231,7 +1231,7 @@ const u8 gPinecoPokedexText[] = _( const u8 gForretressPokedexText[] = _( "It keeps itself inside its steel shell.\n" "The shell is opened when it is catching\n" - "prey, but it is so quick that the shell’s\n" + "prey, but it is so quick that the shell's\n" "inside cannot be seen."); const u8 gDunsparcePokedexText[] = _( @@ -1249,7 +1249,7 @@ const u8 gGligarPokedexText[] = _( const u8 gSteelixPokedexText[] = _( "STEELIX live even further underground\n" "than ONIX. This POKéMON is known to dig\n" - "toward the earth’s core, reaching a depth\n" + "toward the earth's core, reaching a depth\n" "of over six-tenths of a mile underground."); const u8 gSnubbullPokedexText[] = _( @@ -1316,7 +1316,7 @@ const u8 gMagcargoPokedexText[] = _( "The shell on its back is made of hardened\n" "magma. Tens of thousands of years spent\n" "living in volcanic craters have turned\n" - "MAGCARGO’s bodies into magma."); + "MAGCARGO's bodies into magma."); const u8 gSwinubPokedexText[] = _( "It roots for food by rubbing its snout\n" @@ -1369,7 +1369,7 @@ const u8 gSkarmoryPokedexText[] = _( const u8 gHoundourPokedexText[] = _( "HOUNDOUR communicate with each other\n" "using a variety of cries to corner their\n" - "prey. This POKéMON’s remarkable teamwork\n" + "prey. This POKéMON's remarkable teamwork\n" "is simply unparalleled."); const u8 gHoundoomPokedexText[] = _( @@ -1385,7 +1385,7 @@ const u8 gKingdraPokedexText[] = _( "even ships."); const u8 gPhanpyPokedexText[] = _( - "PHANPY’s big ears serve as broad fans.\n" + "PHANPY's big ears serve as broad fans.\n" "When it becomes hot, it flaps the ears\n" "busily to cool down. Even the young are\n" "very strong."); @@ -1394,7 +1394,7 @@ const u8 gDonphanPokedexText[] = _( "A DONPHAN is so strong it can easily haul\n" "a dump truck. Its hide has toughened to a\n" "rock-hard state. An ordinary sort of\n" - "attack won’t even leave a scratch."); + "attack won't even leave a scratch."); const u8 gPorygon2PokedexText[] = _( "It was created by humans using the power\n" @@ -1403,7 +1403,7 @@ const u8 gPorygon2PokedexText[] = _( "gestures and emotions on its own."); const u8 gStantlerPokedexText[] = _( - "STANTLER’s magnificent antlers were\n" + "STANTLER's magnificent antlers were\n" "once traded at high prices as works of art.\n" "As a result, this POKéMON was hunted\n" "close to extinction."); @@ -1429,8 +1429,8 @@ const u8 gHitmontopPokedexText[] = _( const u8 gSmoochumPokedexText[] = _( "It actively runs about, but also falls\n" "often. Whenever it falls, it will check its\n" - "reflection on a lake’s surface to make\n" - "sure its face hasn’t become dirty."); + "reflection on a lake's surface to make\n" + "sure its face hasn't become dirty."); const u8 gElekidPokedexText[] = _( "If it touches metal and discharges the\n" @@ -1447,7 +1447,7 @@ const u8 gMagbyPokedexText[] = _( const u8 gMiltankPokedexText[] = _( "It gives over five gallons of milk daily.\n" "Its sweet milk is enjoyed by children and\n" - "grown-ups alike. People who can’t drink\n" + "grown-ups alike. People who can't drink\n" "milk turn it into yogurt and eat it instead."); const u8 gBlisseyPokedexText[] = _( @@ -1478,7 +1478,7 @@ const u8 gLarvitarPokedexText[] = _( "A LARVITAR is born deep under the ground.\n" "It must eat its way through the soil above\n" "and reach the surface for it to see its\n" - "parents’ faces."); + "parents' faces."); const u8 gPupitarPokedexText[] = _( "A PUPITAR creates a gas inside its body\n" @@ -1514,10 +1514,10 @@ const u8 gTreeckoPokedexText[] = _( "It makes its nest in a giant tree in the\n" "forest. It ferociously guards against\n" "anything nearing its territory. It is said\n" - "to be the protector of the forest’s trees."); + "to be the protector of the forest's trees."); const u8 gGrovylePokedexText[] = _( - "Leaves grow out of this POKéMON’s body.\n" + "Leaves grow out of this POKéMON's body.\n" "They help obscure a GROVYLE from the eyes\n" "of its enemies while it is in a thickly\n" "overgrown forest."); @@ -1532,7 +1532,7 @@ const u8 gTorchicPokedexText[] = _( "If attacked, it strikes back by spitting\n" "balls of fire it forms in its stomach.\n" "A TORCHIC dislikes darkness because it\n" - "can’t see its surroundings."); + "can't see its surroundings."); const u8 gCombuskenPokedexText[] = _( "It lashes out with 10 kicks per second.\n" @@ -1550,7 +1550,7 @@ const u8 gMudkipPokedexText[] = _( "On land, it can powerfully lift large\n" "boulders by planting its four feet and\n" "heaving. It sleeps by burying itself in soil\n" - "at the water’s edge."); + "at the water's edge."); const u8 gMarshtompPokedexText[] = _( "Its toughened hind legs enable it to stand\n" @@ -1572,7 +1572,7 @@ const u8 gPoochyenaPokedexText[] = _( const u8 gMightyenaPokedexText[] = _( "In the wild, MIGHTYENA live in a pack.\n" - "They never defy their leader’s orders.\n" + "They never defy their leader's orders.\n" "They defeat foes with perfectly\n" "coordinated teamwork."); @@ -1704,7 +1704,7 @@ const u8 gSurskitPokedexText[] = _( const u8 gMasquerainPokedexText[] = _( "It intimidates foes with the large eyelike\n" - "patterns on its antennae. Because it can’t\n" + "patterns on its antennae. Because it can't\n" "fly if its wings get wet, it shelters itself\n" "from rain under large trees and eaves."); @@ -1722,15 +1722,15 @@ const u8 gBreloomPokedexText[] = _( const u8 gSlakothPokedexText[] = _( "It sleeps virtually all day and night long.\n" - "It doesn’t change its nest its entire life,\n" + "It doesn't change its nest its entire life,\n" "but it sometimes travels great distances\n" "by swimming in rivers."); const u8 gVigorothPokedexText[] = _( - "It can’t keep still because its blood boils\n" + "It can't keep still because its blood boils\n" "with energy. It runs through the fields\n" "and mountains all day to calm itself. If it\n" - "doesn’t, it can’t sleep at night."); + "doesn't, it can't sleep at night."); const u8 gSlakingPokedexText[] = _( "Hordes of SLAKING gather around trees\n" @@ -1783,7 +1783,7 @@ const u8 gMakuhitaPokedexText[] = _( const u8 gHariyamaPokedexText[] = _( "It has the habit of challenging others\n" "without hesitation to tests of strength.\n" - "It’s been known to stand on train tracks\n" + "It's been known to stand on train tracks\n" "and stop trains using forearm thrusts."); const u8 gAzurillPokedexText[] = _( @@ -1799,7 +1799,7 @@ const u8 gNosepassPokedexText[] = _( "seasons."); const u8 gSkittyPokedexText[] = _( - "A SKITTY’s adorably cute behavior makes it\n" + "A SKITTY's adorably cute behavior makes it\n" "highly popular. In battle, it makes its tail\n" "puff out. It threatens foes with a sharp\n" "growl."); @@ -1837,7 +1837,7 @@ const u8 gLaironPokedexText[] = _( const u8 gAggronPokedexText[] = _( "Its iron horns grow longer a little at\n" "a time. They are used to determine the\n" - "AGGRON’s age. The gouges in its armor are\n" + "AGGRON's age. The gouges in its armor are\n" "worn with pride as mementos from battles."); const u8 gMedititePokedexText[] = _( @@ -1848,7 +1848,7 @@ const u8 gMedititePokedexText[] = _( const u8 gMedichamPokedexText[] = _( "Through crushingly harsh yoga training, it\n" - "gained the power to foretell its foe’s\n" + "gained the power to foretell its foe's\n" "actions. It battles with elegant, dance-\n" "like movement."); @@ -1895,7 +1895,7 @@ const u8 gRoseliaPokedexText[] = _( "effect of making its foes careless."); const u8 gGulpinPokedexText[] = _( - "This POKéMON’s stomach fluid can even\n" + "This POKéMON's stomach fluid can even\n" "digest scrap iron. In one gulp, it can\n" "swallow something that is as large as\n" "itself."); @@ -1903,7 +1903,7 @@ const u8 gGulpinPokedexText[] = _( const u8 gSwalotPokedexText[] = _( "Its powerful stomach acid is capable of\n" "digesting almost anything. The one thing\n" - "in the whole world a SWALOT can’t digest is\n" + "in the whole world a SWALOT can't digest is\n" "its own stomach."); const u8 gCarvanhaPokedexText[] = _( @@ -1946,11 +1946,11 @@ const u8 gTorkoalPokedexText[] = _( "It battles using energy it gets from\n" "burning coal. When loosing smoke from its\n" "nostrils, it lets off a sound that is\n" - "similar to a locomotive’s horn."); + "similar to a locomotive's horn."); const u8 gSpoinkPokedexText[] = _( "A POKéMON that manipulates psychic power\n" - "at will. It doesn’t stop bouncing even when\n" + "at will. It doesn't stop bouncing even when\n" "it is asleep. It loves eating mushrooms\n" "that grow underground."); @@ -1964,7 +1964,7 @@ const u8 gSpindaPokedexText[] = _( "It is distinguished by a pattern of\n" "spots that is always different. Its\n" "unsteady, tottering walk has the\n" - "effect of fouling its foe’s aim."); + "effect of fouling its foe's aim."); const u8 gTrapinchPokedexText[] = _( "Its big jaws crunch through boulders.\n" @@ -1974,7 +1974,7 @@ const u8 gTrapinchPokedexText[] = _( const u8 gVibravaPokedexText[] = _( "It looses ultrasonic waves by rubbing its\n" - "wings together. Since a VIBRAVA’s wings\n" + "wings together. Since a VIBRAVA's wings\n" "are still in the process of growing, it can\n" "only fly short distances."); @@ -2016,7 +2016,7 @@ const u8 gZangoosePokedexText[] = _( const u8 gSeviperPokedexText[] = _( "SEVIPER and ZANGOOSE are eternal rivals.\n" - "It counters a ZANGOOSE’s dazzling agility\n" + "It counters a ZANGOOSE's dazzling agility\n" "with its swordlike tail, which also oozes\n" "a horrible poison."); @@ -2028,7 +2028,7 @@ const u8 gLunatonePokedexText[] = _( const u8 gSolrockPokedexText[] = _( "Solar energy is the source of this \n" - "POKéMON’s power. On sunny days, groups of\n" + "POKéMON's power. On sunny days, groups of\n" "SOLROCK line up facing the sun and absorb\n" "its light."); @@ -2036,7 +2036,7 @@ const u8 gBarboachPokedexText[] = _( "Its body is covered with a slimy film.\n" "The film acts as a barrier to prevent germs\n" "in muddy water from entering the\n" - "BARBOACH’s body."); + "BARBOACH's body."); const u8 gWhiscashPokedexText[] = _( "Mysteriously, it can foretell earthquakes.\n" @@ -2065,7 +2065,7 @@ const u8 gBaltoyPokedexText[] = _( const u8 gClaydolPokedexText[] = _( "A CLAYDOL sleeps while hovering in midair.\n" "Its arms are separate from its body.\n" - "They are kept floating by the POKéMON’s\n" + "They are kept floating by the POKéMON's\n" "manipulation of psychic power."); const u8 gLileepPokedexText[] = _( @@ -2222,7 +2222,7 @@ const u8 gLuvdiscPokedexText[] = _( "LUVDISC make the branches of CORSOLA\n" "their nests. There is a custom from long\n" "ago of giving a LUVDISC as a gift to\n" - "express one’s feelings of love."); + "express one's feelings of love."); const u8 gBagonPokedexText[] = _( "Although it is small, this POKéMON is very\n" diff --git a/src/data/region_map/region_map_entries.h b/src/data/region_map/region_map_entries.h index 9c7e3f2fc..0c79c04ac 100644 --- a/src/data/region_map/region_map_entries.h +++ b/src/data/region_map/region_map_entries.h @@ -126,7 +126,7 @@ static const u8 sMapName_MtMoon[] = _("MT. MOON"); static const u8 sMapName_SSAnne[] = _("S.S. ANNE"); static const u8 sMapName_UndergroundPath[] = _("UNDERGROUND PATH"); static const u8 sMapName_UndergroundPath2[] = _("UNDERGROUND PATH"); -static const u8 sMapName_DiglettsCave[] = _("DIGLETT’S CAVE"); +static const u8 sMapName_DiglettsCave[] = _("DIGLETT'S CAVE"); static const u8 sMapName_KantoVictoryRoad[] = _("VICTORY ROAD"); static const u8 sMapName_RocketHideout[] = _("ROCKET HIDEOUT"); static const u8 sMapName_SilphCo[] = _("SILPH CO."); diff --git a/src/data/text/abilities.h b/src/data/text/abilities.h index 97c29f9ee..093119726 100644 --- a/src/data/text/abilities.h +++ b/src/data/text/abilities.h @@ -14,14 +14,14 @@ static const u8 sObliviousDescription[] = _("Prevents attraction."); static const u8 sCloudNineDescription[] = _("Negates weather effects."); static const u8 sCompoundEyesDescription[] = _("Raises accuracy."); static const u8 sInsomniaDescription[] = _("Prevents sleep."); -static const u8 sColorChangeDescription[] = _("Changes type to foe’s move."); +static const u8 sColorChangeDescription[] = _("Changes type to foe's move."); static const u8 sImmunityDescription[] = _("Prevents poisoning."); static const u8 sFlashFireDescription[] = _("Powers up if hit by fire."); static const u8 sShieldDustDescription[] = _("Prevents added effects."); static const u8 sOwnTempoDescription[] = _("Prevents confusion."); static const u8 sSuctionCupsDescription[] = _("Firmly anchors the body."); -static const u8 sIntimidateDescription[] = _("Lowers the foe’s ATTACK."); -static const u8 sShadowTagDescription[] = _("Prevents the foe’s escape."); +static const u8 sIntimidateDescription[] = _("Lowers the foe's ATTACK."); +static const u8 sShadowTagDescription[] = _("Prevents the foe's escape."); static const u8 sRoughSkinDescription[] = _("Hurts to touch."); static const u8 sWonderGuardDescription[] = _("“Super effective” hits."); static const u8 sLevitateDescription[] = _("Not hit by GROUND attacks."); @@ -44,7 +44,7 @@ static const u8 sMagnetPullDescription[] = _("Traps STEEL-type POKéMON."); static const u8 sSoundproofDescription[] = _("Avoids sound-based moves."); static const u8 sRainDishDescription[] = _("Slight HP recovery in rain."); static const u8 sSandStreamDescription[] = _("Summons a sandstorm."); -static const u8 sPressureDescription[] = _("Raises foe’s PP usage."); +static const u8 sPressureDescription[] = _("Raises foe's PP usage."); static const u8 sThickFatDescription[] = _("Heat-and-cold protection."); static const u8 sEarlyBirdDescription[] = _("Awakens quickly from sleep."); static const u8 sFlameBodyDescription[] = _("Burns the foe on contact."); diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index ff0b680dd..1812a1d74 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -37,7 +37,7 @@ const u8 gRevivalHerbItemDescription[] = _("A very bitter herb\nthat revives a\n const u8 gEtherItemDescription[] = _("Restores the PP\nof a selected move\nby 10."); const u8 gMaxEtherItemDescription[] = _("Fully restores the\nPP of a selected\nmove."); const u8 gElixirItemDescription[] = _("Restores the PP\nof all moves by 10."); -const u8 gMaxElixirItemDescription[] = _("Fully restores the\nPP of a POKéMON’s\nmoves."); +const u8 gMaxElixirItemDescription[] = _("Fully restores the\nPP of a POKéMON's\nmoves."); const u8 gLavaCookieItemDescription[] = _("A local specialty\nthat heals all\nstatus problems."); const u8 gBlueFluteItemDescription[] = _("A glass flute that\nawakens sleeping\nPOKéMON."); const u8 gYellowFluteItemDescription[] = _("A glass flute that\nsnaps POKéMON\nout of confusion."); @@ -159,7 +159,7 @@ const u8 gExpShareItemDescription[] = _("A hold item that\ngets EXP. points\nfro const u8 gQuickClawItemDescription[] = _("A hold item that\noccasionally allows\nthe first strike."); const u8 gSootheBellItemDescription[] = _("A hold item that\ncalms spirits and\nfosters friendship."); const u8 gMentalHerbItemDescription[] = _("A hold item that\nsnaps POKéMON out\nof infatuation."); -const u8 gChoiceBandItemDescription[] = _("Raises a move’s\npower, but permits\nonly that move."); +const u8 gChoiceBandItemDescription[] = _("Raises a move's\npower, but permits\nonly that move."); const u8 gKingsRockItemDescription[] = _("A hold item that\nmay cause flinching\nwhen the foe is hit."); const u8 gSilverPowderItemDescription[] = _("A hold item that\nraises the power of\nBUG-type moves."); const u8 gAmuletCoinItemDescription[] = _("Doubles money in\nbattle if the\nholder takes part."); @@ -194,11 +194,11 @@ const u8 gSilkScarfItemDescription[] = _("A hold item that\nraises the power of\ const u8 gUpGradeItemDescription[] = _("A peculiar box made\nby SILPH CO."); const u8 gShellBellItemDescription[] = _("A hold item that\nrestores HP upon\nstriking the foe."); const u8 gSeaIncenseItemDescription[] = _("A hold item that\nslightly boosts\nWATER-type moves."); -const u8 gLaxIncenseItemDescription[] = _("A hold item that\nslightly lowers the\nfoe’s accuracy."); -const u8 gLuckyPunchItemDescription[] = _("A hold item that\nraises CHANSEY’s\ncritical-hit rate."); -const u8 gMetalPowderItemDescription[] = _("A hold item that\nraises DITTO’s\nDEFENSE."); -const u8 gThickClubItemDescription[] = _("A hold item that \nraises CUBONE or\nMAROWAK’s ATTACK."); -const u8 gStickItemDescription[] = _("A hold item that\nraises FARFETCH’D’s\ncritical-hit ratio."); +const u8 gLaxIncenseItemDescription[] = _("A hold item that\nslightly lowers the\nfoe's accuracy."); +const u8 gLuckyPunchItemDescription[] = _("A hold item that\nraises CHANSEY's\ncritical-hit rate."); +const u8 gMetalPowderItemDescription[] = _("A hold item that\nraises DITTO's\nDEFENSE."); +const u8 gThickClubItemDescription[] = _("A hold item that \nraises CUBONE or\nMAROWAK's ATTACK."); +const u8 gStickItemDescription[] = _("A hold item that\nraises FARFETCH'D's\ncritical-hit ratio."); const u8 gRedScarfItemDescription[] = _("A hold item that\nraises COOL in\nCONTESTS."); const u8 gBlueScarfItemDescription[] = _("A hold item that\nraises BEAUTY in\nCONTESTS."); const u8 gPinkScarfItemDescription[] = _("A hold item that\nraises CUTE in\nCONTESTS."); @@ -214,7 +214,7 @@ const u8 gSuperRodItemDescription[] = _("The best fishing\nrod for catching\nwil const u8 gSSTicketItemDescription[] = _("The ticket required\nfor sailing on a\nferry."); const u8 gContestPassItemDescription[] = _("The pass required\nfor entering\nPOKéMON CONTESTS."); const u8 gWailmerPailItemDescription[] = _("A tool used for\nwatering BERRIES\nand plants."); -const u8 gDevonGoodsItemDescription[] = _("A package that\ncontains DEVON’s\nmachine parts."); +const u8 gDevonGoodsItemDescription[] = _("A package that\ncontains DEVON's\nmachine parts."); const u8 gSootSackItemDescription[] = _("A sack used to\ngather and hold\nvolcanic ash."); const u8 gBasementKeyItemDescription[] = _("The key for NEW\nMAUVILLE beneath\nMAUVILLE CITY."); const u8 gAcroBikeItemDescription[] = _("A folding bicycle\ncapable of jumps\nand wheelies."); @@ -274,13 +274,13 @@ const u8 gTM36ItemDescription[] = _("Hurls sludge at the\nfoe. It may poison\nth const u8 gTM37ItemDescription[] = _("Causes a sandstorm\nthat hits the foe\nover several turns."); const u8 gTM38ItemDescription[] = _("A powerful fire\nattack that may\nburn the foe."); const u8 gTM39ItemDescription[] = _("Stops the foe from\nmoving with rocks.\nMay lower SPEED."); -const u8 gTM40ItemDescription[] = _("An extremely fast\nattack that can’t\nbe avoided."); +const u8 gTM40ItemDescription[] = _("An extremely fast\nattack that can't\nbe avoided."); const u8 gTM41ItemDescription[] = _("Prevents the foe\nfrom using the same\nmove in a row."); const u8 gTM42ItemDescription[] = _("Raises ATTACK when\npoisoned, burned,\nor paralyzed."); const u8 gTM43ItemDescription[] = _("Adds an effect to\nattack depending\non the location."); const u8 gTM44ItemDescription[] = _("The user sleeps for\n2 turns to restore\nhealth and status."); const u8 gTM45ItemDescription[] = _("Makes it tough to\nattack a foe of the\nopposite gender."); -const u8 gTM46ItemDescription[] = _("While attacking,\nit may steal the\nfoe’s held item."); +const u8 gTM46ItemDescription[] = _("While attacking,\nit may steal the\nfoe's held item."); const u8 gTM47ItemDescription[] = _("Spreads hard-\nedged wings and\nslams into the foe."); const u8 gTM48ItemDescription[] = _("Switches abilities\nwith the foe on the\nturn this is used."); const u8 gTM49ItemDescription[] = _("Steals the effects\nof the move the foe\nis trying to use."); @@ -295,17 +295,17 @@ const u8 gHM06ItemDescription[] = _("A rock-crushingly\ntough attack that\nmay l const u8 gHM07ItemDescription[] = _("Attacks the foe\nwith enough power\nto climb waterfalls."); const u8 gHM08ItemDescription[] = _("Dives underwater\nthe 1st turn, then\nattacks next turn."); // FireRed/LeafGreen key items -const u8 gOaksParcelItemDescription[] = _("A parcel for PROF.\nOAK from a POKéMON\nMART’s clerk."); +const u8 gOaksParcelItemDescription[] = _("A parcel for PROF.\nOAK from a POKéMON\nMART's clerk."); const u8 gPokeFluteItemDescription[] = _("A sweet-sounding\nflute that awakens\nPOKéMON."); -const u8 gSecretKeyItemDescription[] = _("The key to the\nCINNABAR ISLAND\nGYM’s entrance."); +const u8 gSecretKeyItemDescription[] = _("The key to the\nCINNABAR ISLAND\nGYM's entrance."); const u8 gBikeVoucherItemDescription[] = _("A voucher for\nobtaining a bicycle\nfrom the BIKE SHOP."); -const u8 gGoldTeethItemDescription[] = _("Gold dentures lost\nby the SAFARI\nZONE’s WARDEN."); +const u8 gGoldTeethItemDescription[] = _("Gold dentures lost\nby the SAFARI\nZONE's WARDEN."); const u8 gOldAmberItemDescription[] = _("A stone containing\nthe genes of an\nancient POKéMON."); -const u8 gCardKeyItemDescription[] = _("A card-type door\nkey used in SILPH\nCO’s office."); -const u8 gLiftKeyItemDescription[] = _("An elevator key\nused in TEAM\nROCKET’s HIDEOUT."); -const u8 gHelixFossilItemDescription[] = _("A piece of an\nancient marine\nPOKéMON’s seashell."); -const u8 gDomeFossilItemDescription[] = _("A piece of an\nancient marine\nPOKéMON’s shell."); -const u8 gSilphScopeItemDescription[] = _("SILPH CO’s scope\nmakes unseeable\nPOKéMON visible."); +const u8 gCardKeyItemDescription[] = _("A card-type door\nkey used in SILPH\nCO's office."); +const u8 gLiftKeyItemDescription[] = _("An elevator key\nused in TEAM\nROCKET's HIDEOUT."); +const u8 gHelixFossilItemDescription[] = _("A piece of an\nancient marine\nPOKéMON's seashell."); +const u8 gDomeFossilItemDescription[] = _("A piece of an\nancient marine\nPOKéMON's shell."); +const u8 gSilphScopeItemDescription[] = _("SILPH CO's scope\nmakes unseeable\nPOKéMON visible."); const u8 gBicycleItemDescription[] = _("A folding bicycle\nthat is faster than\nthe RUNNING SHOES."); const u8 gTownMapItemDescription[] = _("Can be viewed\nanytime. Shows your\npresent location."); const u8 gVSSeekerItemDescription[] = _("A rechargeable unit\nthat flags battle-\nready TRAINERS."); @@ -322,5 +322,5 @@ const u8 gPowderJarItemDescription[] = _("Stores BERRY\nPOWDER made using\na BER const u8 gRubyItemDescription[] = _("An exquisite, red-\nglowing gem that\nsymbolizes passion."); const u8 gSapphireItemDescription[] = _("A brilliant blue gem\nthat symbolizes\nhonesty."); // Emerald-specific key items -const u8 gMagmaEmblemItemDescription[] = _("A medal-like item in\nthe same shape as\nTEAM MAGMA’s mark."); +const u8 gMagmaEmblemItemDescription[] = _("A medal-like item in\nthe same shape as\nTEAM MAGMA's mark."); const u8 gOldSeaMapItemDescription[] = _("A faded sea chart\nthat shows the way\nto a certain island."); diff --git a/src/data/text/move_descriptions.h b/src/data/text/move_descriptions.h index 3642f66b1..fd497a889 100644 --- a/src/data/text/move_descriptions.h +++ b/src/data/text/move_descriptions.h @@ -110,7 +110,7 @@ static const u8 sRollingKickDescription[] = _( "a rapid spin."); static const u8 sSandAttackDescription[] = _( - "Reduces the foe’s accuracy\n" + "Reduces the foe's accuracy\n" "by hurling sand in its face."); static const u8 sHeadbuttDescription[] = _( @@ -155,7 +155,7 @@ static const u8 sDoubleEdgeDescription[] = _( static const u8 sTailWhipDescription[] = _( "Wags the tail to lower the\n" - "foe’s DEFENSE."); + "foe's DEFENSE."); static const u8 sPoisonStingDescription[] = _( "A toxic attack with barbs,\n" @@ -179,7 +179,7 @@ static const u8 sBiteDescription[] = _( static const u8 sGrowlDescription[] = _( "Growls cutely to reduce the\n" - "foe’s ATTACK."); + "foe's ATTACK."); static const u8 sRoarDescription[] = _( "Makes the foe flee to end\n" @@ -199,7 +199,7 @@ static const u8 sSonicBoomDescription[] = _( static const u8 sDisableDescription[] = _( "Psychically disables one of\n" - "the foe’s moves."); + "the foe's moves."); static const u8 sAcidDescription[] = _( "Sprays a hide-melting acid.\n" @@ -275,7 +275,7 @@ static const u8 sCounterDescription[] = _( static const u8 sSeismicTossDescription[] = _( "Inflicts damage identical\n" - "to the user’s level."); + "to the user's level."); static const u8 sStrengthDescription[] = _( "Builds enormous power,\n" @@ -394,7 +394,7 @@ static const u8 sQuickAttackDescription[] = _( "that always strikes first."); static const u8 sRageDescription[] = _( - "Raises the user’s ATTACK\n" + "Raises the user's ATTACK\n" "every time it is hit."); static const u8 sTeleportDescription[] = _( @@ -403,7 +403,7 @@ static const u8 sTeleportDescription[] = _( static const u8 sNightShadeDescription[] = _( "Inflicts damage identical\n" - "to the user’s level."); + "to the user's level."); static const u8 sMimicDescription[] = _( "Copies a move used by the\n" @@ -411,7 +411,7 @@ static const u8 sMimicDescription[] = _( static const u8 sScreechDescription[] = _( "Emits a screech to sharply\n" - "reduce the foe’s DEFENSE."); + "reduce the foe's DEFENSE."); static const u8 sDoubleTeamDescription[] = _( "Creates illusory copies to\n" @@ -419,18 +419,18 @@ static const u8 sDoubleTeamDescription[] = _( static const u8 sRecoverDescription[] = _( "Recovers up to half the\n" - "user’s maximum HP."); + "user's maximum HP."); static const u8 sHardenDescription[] = _( - "Stiffens the body’s \n" + "Stiffens the body's \n" "muscles to raise DEFENSE."); static const u8 sMinimizeDescription[] = _( - "Minimizes the user’s size\n" + "Minimizes the user's size\n" "to raise evasiveness."); static const u8 sSmokescreenDescription[] = _( - "Lowers the foe’s accuracy\n" + "Lowers the foe's accuracy\n" "using smoke, ink, etc."); static const u8 sConfuseRayDescription[] = _( @@ -474,7 +474,7 @@ static const u8 sMetronomeDescription[] = _( "POKéMON move at random."); static const u8 sMirrorMoveDescription[] = _( - "Counters the foe’s attack\n" + "Counters the foe's attack\n" "with the same move."); static const u8 sSelfDestructDescription[] = _( @@ -539,7 +539,7 @@ static const u8 sKinesisDescription[] = _( static const u8 sSoftBoiledDescription[] = _( "Recovers up to half the\n" - "user’s maximum HP."); + "user's maximum HP."); static const u8 sHiJumpKickDescription[] = _( "A jumping knee kick. If it\n" @@ -574,12 +574,12 @@ static const u8 sSkyAttackDescription[] = _( "then strikes the next turn."); static const u8 sTransformDescription[] = _( - "Alters the user’s cells to\n" + "Alters the user's cells to\n" "become a copy of the foe."); static const u8 sBubbleDescription[] = _( "An attack using bubbles.\n" - "May lower the foe’s SPEED."); + "May lower the foe's SPEED."); static const u8 sDizzyPunchDescription[] = _( "A rhythmic punch that may\n" @@ -598,11 +598,11 @@ static const u8 sPsywaveDescription[] = _( "wave of varying intensity."); static const u8 sSplashDescription[] = _( - "It’s just a splash...\n" + "It's just a splash...\n" "Has no effect whatsoever."); static const u8 sAcidArmorDescription[] = _( - "Liquifies the user’s body\n" + "Liquifies the user's body\n" "to sharply raise DEFENSE."); static const u8 sCrabhammerDescription[] = _( @@ -638,8 +638,8 @@ static const u8 sSharpenDescription[] = _( "and raises ATTACK."); static const u8 sConversionDescription[] = _( - "Changes the user’s type\n" - "into a known move’s type."); + "Changes the user's type\n" + "into a known move's type."); static const u8 sTriAttackDescription[] = _( "Fires three types of beams\n" @@ -647,7 +647,7 @@ static const u8 sTriAttackDescription[] = _( static const u8 sSuperFangDescription[] = _( "Attacks with sharp fangs\n" - "and cuts half the foe’s HP."); + "and cuts half the foe's HP."); static const u8 sSlashDescription[] = _( "Slashes with claws, etc. Has\n" @@ -655,14 +655,14 @@ static const u8 sSlashDescription[] = _( static const u8 sSubstituteDescription[] = _( "Creates a decoy using 1/4\n" - "of the user’s maximum HP."); + "of the user's maximum HP."); static const u8 sStruggleDescription[] = _( "Used only if all PP are gone.\n" "Also hurts the user a little."); static const u8 sSketchDescription[] = _( - "Copies the foe’s last move\n" + "Copies the foe's last move\n" "permanently."); static const u8 sTripleKickDescription[] = _( @@ -671,15 +671,15 @@ static const u8 sTripleKickDescription[] = _( static const u8 sThiefDescription[] = _( "While attacking, it may\n" - "steal the foe’s held item."); + "steal the foe's held item."); static const u8 sSpiderWebDescription[] = _( "Ensnares the foe to stop it\n" "from fleeing or switching."); static const u8 sMindReaderDescription[] = _( - "Senses the foe’s action to\n" - "ensure the next move’s hit."); + "Senses the foe's action to\n" + "ensure the next move's hit."); static const u8 sNightmareDescription[] = _( "Inflicts 1/4 damage on a\n" @@ -699,11 +699,11 @@ static const u8 sCurseDescription[] = _( static const u8 sFlailDescription[] = _( "Inflicts more damage when\n" - "the user’s HP is down."); + "the user's HP is down."); static const u8 sConversion2Description[] = _( "Makes the user resistant\n" - "to the last attack’s type."); + "to the last attack's type."); static const u8 sAeroblastDescription[] = _( "Launches a vacuumed blast.\n" @@ -715,11 +715,11 @@ static const u8 sCottonSporeDescription[] = _( static const u8 sReversalDescription[] = _( "Inflicts more damage when\n" - "the user’s HP is down."); + "the user's HP is down."); static const u8 sSpiteDescription[] = _( "Spitefully cuts the PP\n" - "of the foe’s last move."); + "of the foe's last move."); static const u8 sPowderSnowDescription[] = _( "Blasts the foe with a snowy\n" @@ -754,7 +754,7 @@ static const u8 sSludgeBombDescription[] = _( "damage. May also poison."); static const u8 sMudSlapDescription[] = _( - "Hurls mud in the foe’s face\n" + "Hurls mud in the foe's face\n" "to reduce its accuracy."); static const u8 sOctazookaDescription[] = _( @@ -770,7 +770,7 @@ static const u8 sZapCannonDescription[] = _( "paralysis, but inaccurate."); static const u8 sForesightDescription[] = _( - "Negates the foe’s efforts\n" + "Negates the foe's efforts\n" "to heighten evasiveness."); static const u8 sDestinyBondDescription[] = _( @@ -783,7 +783,7 @@ static const u8 sPerishSongDescription[] = _( static const u8 sIcyWindDescription[] = _( "A chilling attack that\n" - "lowers the foe’s SPEED."); + "lowers the foe's SPEED."); static const u8 sDetectDescription[] = _( "Evades attack, but may fail\n" @@ -831,7 +831,7 @@ static const u8 sSwaggerDescription[] = _( static const u8 sMilkDrinkDescription[] = _( "Recovers up to half the\n" - "user’s maximum HP."); + "user's maximum HP."); static const u8 sSparkDescription[] = _( "An electrified tackle that\n" @@ -878,7 +878,7 @@ static const u8 sSafeguardDescription[] = _( "all status problems."); static const u8 sPainSplitDescription[] = _( - "Adds the user and foe’s HP,\n" + "Adds the user and foe's HP,\n" "then shares them equally."); static const u8 sSacredFireDescription[] = _( @@ -927,10 +927,10 @@ static const u8 sIronTailDescription[] = _( static const u8 sMetalClawDescription[] = _( "A claw attack that may\n" - "raise the user’s ATTACK."); + "raise the user's ATTACK."); static const u8 sVitalThrowDescription[] = _( - "Makes the user’s move last,\n" + "Makes the user's move last,\n" "but it never misses."); static const u8 sMorningSunDescription[] = _( @@ -970,11 +970,11 @@ static const u8 sCrunchDescription[] = _( "May lower SP. DEF."); static const u8 sMirrorCoatDescription[] = _( - "Counters the foe’s special\n" + "Counters the foe's special\n" "attack at double the power."); static const u8 sPsychUpDescription[] = _( - "Copies the foe’s effect(s)\n" + "Copies the foe's effect(s)\n" "and gives to the user."); static const u8 sExtremeSpeedDescription[] = _( @@ -987,7 +987,7 @@ static const u8 sAncientPowerDescription[] = _( static const u8 sShadowBallDescription[] = _( "Hurls a black blob that may\n" - "lower the foe’s SP. DEF."); + "lower the foe's SP. DEF."); static const u8 sFutureSightDescription[] = _( "Heightens inner power to\n" @@ -1047,7 +1047,7 @@ static const u8 sWillOWispDescription[] = _( static const u8 sMementoDescription[] = _( "The user faints and lowers\n" - "the foe’s abilities."); + "the foe's abilities."); static const u8 sFacadeDescription[] = _( "Boosts ATTACK when burned,\n" @@ -1079,7 +1079,7 @@ static const u8 sTauntDescription[] = _( static const u8 sHelpingHandDescription[] = _( "Boosts the power of the\n" - "recipient’s moves."); + "recipient's moves."); static const u8 sTrickDescription[] = _( "Tricks the foe into trading\n" @@ -1095,11 +1095,11 @@ static const u8 sWishDescription[] = _( static const u8 sAssistDescription[] = _( "Attacks randomly with one\n" - "of the partner’s moves."); + "of the partner's moves."); static const u8 sIngrainDescription[] = _( "Lays roots that restore HP.\n" - "The user can’t switch out."); + "The user can't switch out."); static const u8 sSuperpowerDescription[] = _( "Boosts strength sharply,\n" @@ -1126,15 +1126,15 @@ static const u8 sYawnDescription[] = _( "then sleeping next turn."); static const u8 sKnockOffDescription[] = _( - "Knocks down the foe’s held\n" + "Knocks down the foe's held\n" "item to prevent its use."); static const u8 sEndeavorDescription[] = _( - "Gains power if the user’s HP\n" - "is lower than the foe’s HP."); + "Gains power if the user's HP\n" + "is lower than the foe's HP."); static const u8 sEruptionDescription[] = _( - "The higher the user’s HP,\n" + "The higher the user's HP,\n" "the more damage caused."); static const u8 sSkillSwapDescription[] = _( @@ -1151,7 +1151,7 @@ static const u8 sRefreshDescription[] = _( static const u8 sGrudgeDescription[] = _( "If the user faints, deletes\n" - "all PP of foe’s last move."); + "all PP of foe's last move."); static const u8 sSnatchDescription[] = _( "Steals the effects of the\n" @@ -1170,7 +1170,7 @@ static const u8 sArmThrustDescription[] = _( "strike the foe 2 to 5 times."); static const u8 sCamouflageDescription[] = _( - "Alters the POKéMON’s type\n" + "Alters the POKéMON's type\n" "depending on the location."); static const u8 sTailGlowDescription[] = _( @@ -1242,7 +1242,7 @@ static const u8 sAstonishDescription[] = _( "the foe into flinching."); static const u8 sWeatherBallDescription[] = _( - "The move’s type and power\n" + "The move's type and power\n" "change with the weather."); static const u8 sAromatherapyDescription[] = _( @@ -1251,7 +1251,7 @@ static const u8 sAromatherapyDescription[] = _( static const u8 sFakeTearsDescription[] = _( "Feigns crying to sharply\n" - "lower the foe’s SP. DEF."); + "lower the foe's SP. DEF."); static const u8 sAirCutterDescription[] = _( "Hacks with razorlike wind.\n" @@ -1262,7 +1262,7 @@ static const u8 sOverheatDescription[] = _( "but sharply lowers SP. ATK."); static const u8 sOdorSleuthDescription[] = _( - "Negates the foe’s efforts\n" + "Negates the foe's efforts\n" "to heighten evasiveness."); static const u8 sRockTombDescription[] = _( @@ -1291,7 +1291,7 @@ static const u8 sCosmicPowerDescription[] = _( static const u8 sWaterSpoutDescription[] = _( "Inflicts more damage if the\n" - "user’s HP is high."); + "user's HP is high."); static const u8 sSignalBeamDescription[] = _( "A strange beam attack that\n" @@ -1334,11 +1334,11 @@ static const u8 sIcicleSpearDescription[] = _( "2 to 5 icicles in a row."); static const u8 sIronDefenseDescription[] = _( - "Hardens the body’s surface\n" + "Hardens the body's surface\n" "to sharply raise DEFENSE."); static const u8 sBlockDescription[] = _( - "Blocks the foe’s way to\n" + "Blocks the foe's way to\n" "prevent escape."); static const u8 sHowlDescription[] = _( diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 840beb22b..25f2c9aa2 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -82,7 +82,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_SLOWBRO] = _("SLOWBRO"), [SPECIES_MAGNEMITE] = _("MAGNEMITE"), [SPECIES_MAGNETON] = _("MAGNETON"), - [SPECIES_FARFETCHD] = _("FARFETCH’D"), + [SPECIES_FARFETCHD] = _("FARFETCH'D"), [SPECIES_DODUO] = _("DODUO"), [SPECIES_DODRIO] = _("DODRIO"), [SPECIES_SEEL] = _("SEEL"), diff --git a/src/landmark.c b/src/landmark.c index 4eade159a..ab4add509 100644 --- a/src/landmark.c +++ b/src/landmark.c @@ -17,21 +17,21 @@ struct LandmarkList static const u8 LandmarkName_FlowerShop[] = _("FLOWER SHOP"); static const u8 LandmarkName_PetalburgWoods[] = _("PETALBURG WOODS"); -static const u8 LandmarkName_MrBrineysCottage[] = _("MR. BRINEY’S COTTAGE"); +static const u8 LandmarkName_MrBrineysCottage[] = _("MR. BRINEY'S COTTAGE"); static const u8 LandmarkName_AbandonedShip[] = _("ABANDONED SHIP"); static const u8 LandmarkName_SeashoreHouse[] = _("SEASHORE HOUSE"); static const u8 LandmarkName_SlateportBeach[] = _("SLATEPORT BEACH"); static const u8 LandmarkName_CyclingRoad[] = _("CYCLING ROAD"); static const u8 LandmarkName_NewMauville[] = _("NEW MAUVILLE"); static const u8 LandmarkName_TrickHouse[] = _("TRICK HOUSE"); -static const u8 LandmarkName_OldLadysRestShop[] = _("OLD LADY’S REST STOP"); +static const u8 LandmarkName_OldLadysRestShop[] = _("OLD LADY'S REST STOP"); static const u8 LandmarkName_Desert[] = _("DESERT"); static const u8 LandmarkName_WinstrateFamily[] = _("THE WINSTRATE FAMILY"); static const u8 LandmarkName_CableCar[] = _("CABLE CAR"); static const u8 LandmarkName_GlassWorkshop[] = _("GLASS WORKSHOP"); static const u8 LandmarkName_WeatherInstitute[] = _("WEATHER INSTITUTE"); static const u8 LandmarkName_MeteorFalls[] = _("METEOR FALLS"); -static const u8 LandmarkName_TunnelersRestHouse[] = _("TUNNELER’S RESTHOUSE"); +static const u8 LandmarkName_TunnelersRestHouse[] = _("TUNNELER'S RESTHOUSE"); static const u8 LandmarkName_RusturfTunnel[] = _("RUSTURF TUNNEL"); static const u8 LandmarkName_PokemonDayCare[] = _("POKéMON DAY CARE"); static const u8 LandmarkName_SafariZoneEntrance[] = _("SAFARI ZONE ENTRANCE"); @@ -40,18 +40,18 @@ static const u8 LandmarkName_ShoalCave[] = _("SHOAL CAVE"); static const u8 LandmarkName_SeafloorCavern[] = _("SEAFLOOR CAVERN"); static const u8 LandmarkName_GraniteCave[] = _("GRANITE CAVE"); static const u8 LandmarkName_OceanCurrent[] = _("OCEAN CURRENT"); -static const u8 LandmarkName_LanettesHouse[] = _("LANETTE’S HOUSE"); +static const u8 LandmarkName_LanettesHouse[] = _("LANETTE'S HOUSE"); static const u8 LandmarkName_FieryPath[] = _("FIERY PATH"); static const u8 LandmarkName_JaggedPass[] = _("JAGGED PASS"); static const u8 LandmarkName_SkyPillar[] = _("SKY PILLAR"); -static const u8 LandmarkName_BerryMastersHouse[] = _("BERRY MASTER’S HOUSE"); +static const u8 LandmarkName_BerryMastersHouse[] = _("BERRY MASTER'S HOUSE"); static const u8 LandmarkName_IslandCave[] = _("ISLAND CAVE"); static const u8 LandmarkName_DesertRuins[] = _("DESERT RUINS"); static const u8 LandmarkName_ScorchedSlab[] = _("SCORCHED SLAB"); static const u8 LandmarkName_AncientTomb[] = _("ANCIENT TOMB"); static const u8 LandmarkName_SealedChamber[] = _("SEALED CHAMBER"); -static const u8 LandmarkName_FossilManiacsHouse[] = _("FOSSIL MANIAC’S HOUSE"); -static const u8 LandmarkName_HuntersHouse[] = _("HUNTER’S HOUSE"); +static const u8 LandmarkName_FossilManiacsHouse[] = _("FOSSIL MANIAC'S HOUSE"); +static const u8 LandmarkName_HuntersHouse[] = _("HUNTER'S HOUSE"); static const u8 LandmarkName_MagmaHideout[] = _("MAGMA HIDEOUT"); static const u8 LandmarkName_MirageTower[] = _("MIRAGE TOWER"); static const u8 LandmarkName_AlteringCave[] = _("ALTERING CAVE"); diff --git a/src/mystery_event_msg.c b/src/mystery_event_msg.c index 74261179b..e0e70a218 100644 --- a/src/mystery_event_msg.c +++ b/src/mystery_event_msg.c @@ -10,4 +10,4 @@ const u8 gText_MysteryGiftSentOver[] = _("{STR_VAR_1} was sent over!"); const u8 gText_MysteryGiftFullParty[] = _("Your party is full.\n{STR_VAR_1} could not be sent over."); const u8 gText_MysteryGiftNewTrainer[] = _("A new TRAINER has arrived in\nHOENN."); const u8 gText_MysteryGiftNewAdversaryInBattleTower[] = _("A new adversary has arrived in the\nBATTLE TOWER."); -const u8 gText_MysteryGiftCantBeUsed[] = _("This data can’t be used in\nthis version."); +const u8 gText_MysteryGiftCantBeUsed[] = _("This data can't be used in\nthis version."); diff --git a/src/naming_screen.c b/src/naming_screen.c index 9902df04c..1a9a15d58 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -150,7 +150,7 @@ static const struct WindowTemplate gUnknown_0858BE10[] = DUMMY_WIN_TEMPLATE }; -static const u8 gUnknown_0858BE40[] = __("abcdef .ghijkl ,mnopqrs tuvwxyz ABCDEF .GHIJKL ,MNOPQRS TUVWXYZ 01234 56789 !?♂♀/- …“”‘’ "); +static const u8 gUnknown_0858BE40[] = __("abcdef .ghijkl ,mnopqrs tuvwxyz ABCDEF .GHIJKL ,MNOPQRS TUVWXYZ 01234 56789 !?♂♀/- …“”‘' "); static const u8 gUnknown_0858BEA0[] = { 8, 8, 6 }; static const u8 gUnknown_0858BEA3[] = { 0, 12, 24, 56, 68, 80, 92, 123, 0, 12, 24, 56, 68, 80, 92, 123, 0, 22, 44, 66, 88, 110, 0, 0 }; diff --git a/src/strings.c b/src/strings.c index 3cf801c7c..7b3df0eca 100644 --- a/src/strings.c +++ b/src/strings.c @@ -26,8 +26,8 @@ const u8 gText_MainMenuMysteryGift[] = _("MYSTERY GIFT"); const u8 gText_MainMenuMysteryGift2[] = _("MYSTERY GIFT"); const u8 gText_MainMenuMysteryEvents[] = _("MYSTERY EVENTS"); const u8 gText_WirelessNotConnected[] = _("The Wireless Adapter is not\nconnected."); -const u8 gText_MysteryGiftCantUse[] = _("MYSTERY GIFT can’t be used while\nthe Wireless Adapter is attached."); -const u8 gText_MysteryEventsCantUse[] = _("MYSTERY EVENTS can’t be used while\nthe Wireless Adapter is attached."); +const u8 gText_MysteryGiftCantUse[] = _("MYSTERY GIFT can't be used while\nthe Wireless Adapter is attached."); +const u8 gText_MysteryEventsCantUse[] = _("MYSTERY EVENTS can't be used while\nthe Wireless Adapter is attached."); const u8 gUnknown_085E836D[] = _("Updating save file using external\ndata. Please wait."); const u8 gUnknown_085E83A2[] = _("The save file has been updated."); const u8 gText_SaveFileCorrupted[] = _("The save file is corrupted. The\nprevious save file will be loaded."); @@ -97,10 +97,10 @@ const u8 gText_DefaultNameLucy[] = _("LUCY"); const u8 gText_DefaultNameHalie[] = _("HALIE"); const u8 gText_ThisIsAPokemon[] = _("This is what we call a “POKéMON.”{PAUSE 96}\p"); const u8 gText_5MarksPokemon[] = _("????? POKéMON"); -const u8 gText_UnkHeight[] = _("{CLEAR_TO 0x0C}??’??”"); +const u8 gText_UnkHeight[] = _("{CLEAR_TO 0x0C}??'??”"); const u8 gText_UnkWeight[] = _("????.? lbs."); const u8 gUnknown_085E86DC[] = _(" POKéMON"); -const u8 gUnknown_085E86FB[] = _("{CLEAR_TO 0x0C} ’ ”"); +const u8 gUnknown_085E86FB[] = _("{CLEAR_TO 0x0C} ' ”"); const u8 gUnknown_085E8709[] = _(" . lbs."); const u8 gUnknown_085E871A[] = _(""); const u8 gText_CryOf[] = _("CRY OF"); @@ -148,7 +148,7 @@ const u8 gText_DexSearchColorPurple[] = _("PURPLE"); const u8 gText_DexSearchColorGray[] = _("GRAY"); const u8 gText_DexSearchColorWhite[] = _("WHITE"); const u8 gText_DexSearchColorPink[] = _("PINK"); -const u8 gText_DexHoennDescription[] = _("HOENN region’s POKéDEX"); +const u8 gText_DexHoennDescription[] = _("HOENN region's POKéDEX"); const u8 gText_DexNatDescription[] = _("National edition POKéDEX"); const u8 gText_DexSortNumericalDescription[] = _("POKéMON are listed according to their\nnumber."); const u8 gText_DexSortAtoZDescription[] = _("Spotted and owned POKéMON are listed\nalphabetically."); @@ -157,13 +157,13 @@ const u8 gText_DexSortLightestDescription[] = _("Owned POKéMON are listed from const u8 gText_DexSortTallestDescription[] = _("Owned POKéMON are listed from the\ntallest to the smallest."); const u8 ggText_DexSortSmallestDescription[] = _("Owned POKéMON are listed from the\nsmallest to the tallest."); const u8 gText_DexEmptyString[] = _(""); -const u8 gText_DexSearchDontSpecify[] = _("DON’T SPECIFY."); +const u8 gText_DexSearchDontSpecify[] = _("DON'T SPECIFY."); const u8 gText_DexSearchTypeNone[] = _("NONE"); const u8 gText_SelectorArrow[] = _("▶"); const u8 gUnknown_085E8B3C[] = _(" "); const u8 gText_WelcomeToHOF[] = _("Welcome to the HALL OF FAME!"); -const u8 gUnknown_085E8B5B[] = _("Spotted POKéMON: {STR_VAR_1}!\nOwned POKéMON: {STR_VAR_2}!\pPROF. BIRCH’s POKéDEX rating!\pPROF. BIRCH: Let’s see…\p"); -const u8 gUnknown_085E8BBA[] = _("SAVING…\nDON’T TURN OFF THE POWER."); +const u8 gUnknown_085E8B5B[] = _("Spotted POKéMON: {STR_VAR_1}!\nOwned POKéMON: {STR_VAR_2}!\pPROF. BIRCH's POKéDEX rating!\pPROF. BIRCH: Let's see…\p"); +const u8 gUnknown_085E8BBA[] = _("SAVING…\nDON'T TURN OFF THE POWER."); const u8 gText_HOFCorrupted[] = _("The HALL OF FAME data is corrupted."); const u8 gText_HOFNumber[] = _("HALL OF FAME No. {STR_VAR_1}"); const u8 gText_LeagueChamp[] = _("LEAGUE CHAMPION!\nCONGRATULATIONS!"); @@ -218,24 +218,24 @@ const u8 gUnknown_085E8DA4[] = _(" BERRY"); const u8 gText_Coins[] = _("{STR_VAR_1} COINS"); const u8 gText_CloseBag[] = _("CLOSE BAG"); const u8 gText_Var1IsSelected[] = _("{STR_VAR_1} is\nselected."); -const u8 gText_CantWriteMail[] = _("You can’t write\nMAIL here."); +const u8 gText_CantWriteMail[] = _("You can't write\nMAIL here."); const u8 gText_NoPokemon[] = _("There is no\nPOKéMON."); const u8 gText_MoveVar1Where[] = _("Move the\n{STR_VAR_1}\nwhere?"); -const u8 gText_Var1CantBeHeld[] = _("The {STR_VAR_1} can’t be held."); -const u8 gText_Var1CantBeHeldHere[] = _("The {STR_VAR_1} can’t be held\nhere."); +const u8 gText_Var1CantBeHeld[] = _("The {STR_VAR_1} can't be held."); +const u8 gText_Var1CantBeHeldHere[] = _("The {STR_VAR_1} can't be held\nhere."); const u8 gText_DepositHowManyVar1[] = _("Deposit how many\n{STR_VAR_1}(s)?"); const u8 gText_DepositedVar2Var1s[] = _("Deposited {STR_VAR_2}\n{STR_VAR_1}(s)."); -const u8 gText_NoRoomForItems[] = _("There’s no room to\nstore items."); -const u8 gText_CantStoreImportantItems[] = _("Important items\ncan’t be stored in\nthe PC!"); -const u8 gText_TooImportantToToss[] = _("That’s much too\nimportant to toss\nout!"); +const u8 gText_NoRoomForItems[] = _("There's no room to\nstore items."); +const u8 gText_CantStoreImportantItems[] = _("Important items\ncan't be stored in\nthe PC!"); +const u8 gText_TooImportantToToss[] = _("That's much too\nimportant to toss\nout!"); const u8 gText_TossHowManyVar1s[] = _("Toss out how many\n{STR_VAR_1}(s)?"); const u8 gText_ThrewAwayVar2Var1s[] = _("Threw away {STR_VAR_2}\n{STR_VAR_1}(s)."); const u8 gText_ConfirmTossItems[] = _("Is it okay to\nthrow away {STR_VAR_2}\n{STR_VAR_1}(s)?"); -const u8 gText_DadsAdvice[] = _("DAD’s advice…\n{PLAYER}, there’s a time and place for\leverything!{PAUSE_UNTIL_PRESS}"); -const u8 gText_CantDismountBike[] = _("You can’t dismount your BIKE here.{PAUSE_UNTIL_PRESS}"); -const u8 gText_ItemFinderNearby[] = _("Huh?\nThe ITEMFINDER’s responding!\pThere’s an item buried around here!{PAUSE_UNTIL_PRESS}"); -const u8 gText_ItemFinderOnTop[] = _("Oh!\nThe ITEMFINDER’s shaking wildly!{PAUSE_UNTIL_PRESS}"); -const u8 gText_ItemFinderNothing[] = _("… … … …Nope!\nThere’s no response.{PAUSE_UNTIL_PRESS}"); +const u8 gText_DadsAdvice[] = _("DAD's advice…\n{PLAYER}, there's a time and place for\leverything!{PAUSE_UNTIL_PRESS}"); +const u8 gText_CantDismountBike[] = _("You can't dismount your BIKE here.{PAUSE_UNTIL_PRESS}"); +const u8 gText_ItemFinderNearby[] = _("Huh?\nThe ITEMFINDER's responding!\pThere's an item buried around here!{PAUSE_UNTIL_PRESS}"); +const u8 gText_ItemFinderOnTop[] = _("Oh!\nThe ITEMFINDER's shaking wildly!{PAUSE_UNTIL_PRESS}"); +const u8 gText_ItemFinderNothing[] = _("… … … …Nope!\nThere's no response.{PAUSE_UNTIL_PRESS}"); const u8 gText_CoinCase[] = _("Your COINS:\n{STR_VAR_1}{PAUSE_UNTIL_PRESS}"); const u8 gText_BootedUpTM[] = _("Booted up a TM."); const u8 gText_BootedUpHM[] = _("Booted up an HM."); @@ -343,18 +343,18 @@ const u8 gText_QuitShopping[] = _("Quit shopping."); const u8 gText_Var1CertainlyHowMany[] = _("{STR_VAR_1}? Certainly.\nHow many would you like?"); const u8 gText_Var1CertainlyHowMany2[] = _("{STR_VAR_1}? Certainly.\nHow many would you like?"); const u8 gText_Var1AndYouWantedVar2[] = _("{STR_VAR_1}? And you wanted {STR_VAR_2}?\nThat will be ¥{STR_VAR_3}."); -const u8 gText_Var1IsItThatllBeVar2[] = _("{STR_VAR_1}, is it?\nThat’ll be ¥{STR_VAR_2}. Do you want it?"); -const u8 gText_YouWantedVar1ThatllBeVar2[] = _("You wanted {STR_VAR_1}?\nThat’ll be ¥{STR_VAR_2}. Will that be okay?"); +const u8 gText_Var1IsItThatllBeVar2[] = _("{STR_VAR_1}, is it?\nThat'll be ¥{STR_VAR_2}. Do you want it?"); +const u8 gText_YouWantedVar1ThatllBeVar2[] = _("You wanted {STR_VAR_1}?\nThat'll be ¥{STR_VAR_2}. Will that be okay?"); const u8 gText_HereYouGoThankYou[] = _("Here you go!\nThank you very much."); -const u8 gText_ThankYouIllSendItHome[] = _("Thank you!\nI’ll send it to your home PC."); -const u8 gText_ThanksIllSendItHome[] = _("Thanks!\nI’ll send it to your PC at home."); -const u8 gText_YouDontHaveMoney[] = _("You don’t have enough money.{PAUSE_UNTIL_PRESS}"); +const u8 gText_ThankYouIllSendItHome[] = _("Thank you!\nI'll send it to your home PC."); +const u8 gText_ThanksIllSendItHome[] = _("Thanks!\nI'll send it to your PC at home."); +const u8 gText_YouDontHaveMoney[] = _("You don't have enough money.{PAUSE_UNTIL_PRESS}"); const u8 gText_NoMoreRoomForThis[] = _("You have no more room for this\nitem.{PAUSE_UNTIL_PRESS}"); const u8 gText_SpaceForVar1Full[] = _("The space for {STR_VAR_1} is full.{PAUSE_UNTIL_PRESS}"); const u8 gText_AnythingElseICanHelp[] = _("Is there anything else I can help\nyou with?"); const u8 gText_CanIHelpWithAnythingElse[] = _("Can I help you with anything else?"); -const u8 gText_ThrowInPremierBall[] = _("I’ll throw in a PREMIER BALL, too.{PAUSE_UNTIL_PRESS}"); -const u8 gText_CantBuyKeyItem[] = _("{STR_VAR_2}? Oh, no.\nI can’t buy that.{PAUSE_UNTIL_PRESS}"); +const u8 gText_ThrowInPremierBall[] = _("I'll throw in a PREMIER BALL, too.{PAUSE_UNTIL_PRESS}"); +const u8 gText_CantBuyKeyItem[] = _("{STR_VAR_2}? Oh, no.\nI can't buy that.{PAUSE_UNTIL_PRESS}"); const u8 gText_HowManyToSell[] = _("{STR_VAR_2}?\nHow many would you like to sell?"); const u8 gText_ICanPayVar1[] = _("I can pay ¥{STR_VAR_1}.\nWould that be okay?"); const u8 gText_TurnedOverVar1ForVar2[] = _("Turned over the {STR_VAR_2}\nand received ¥{STR_VAR_1}."); @@ -372,53 +372,53 @@ const u8 gText_Trade4[] = _("TRADE"); const u8 gText_HP3[] = _("HP"); const u8 gText_SpAtk3[] = _("SP. ATK"); const u8 gText_SpDef3[] = _("SP. DEF"); -const u8 gText_WontHaveEffect[] = _("It won’t have any effect.{PAUSE_UNTIL_PRESS}"); -const u8 gText_CantBeUsedOnPkmn[] = _("This can’t be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}"); -const u8 gText_PkmnCantSwitchOut[] = _("{STR_VAR_1} can’t be switched\nout!{PAUSE_UNTIL_PRESS}"); +const u8 gText_WontHaveEffect[] = _("It won't have any effect.{PAUSE_UNTIL_PRESS}"); +const u8 gText_CantBeUsedOnPkmn[] = _("This can't be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnCantSwitchOut[] = _("{STR_VAR_1} can't be switched\nout!{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnAlreadyInBattle[] = _("{STR_VAR_1} is already\nin battle!{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnAlreadySelected[] = _("{STR_VAR_1} has already been\nselected.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnHasNoEnergy[] = _("{STR_VAR_1} has no energy\nleft to battle!{PAUSE_UNTIL_PRESS}"); -const u8 gText_CantSwitchWithAlly[] = _("You can’t switch {STR_VAR_1}’s\nPOKéMON with one of yours!{PAUSE_UNTIL_PRESS}"); -const u8 gText_EggCantBattle[] = _("An EGG can’t battle!{PAUSE_UNTIL_PRESS}"); -const u8 gText_CantUseUntilNewBadge[] = _("This can’t be used until a new\nBADGE is obtained.{PAUSE_UNTIL_PRESS}"); +const u8 gText_CantSwitchWithAlly[] = _("You can't switch {STR_VAR_1}'s\nPOKéMON with one of yours!{PAUSE_UNTIL_PRESS}"); +const u8 gText_EggCantBattle[] = _("An EGG can't battle!{PAUSE_UNTIL_PRESS}"); +const u8 gText_CantUseUntilNewBadge[] = _("This can't be used until a new\nBADGE is obtained.{PAUSE_UNTIL_PRESS}"); const u8 gText_NoMoreThanVar1Pkmn[] = _("No more than {STR_VAR_1} POKéMON\nmay enter.{PAUSE_UNTIL_PRESS}"); const u8 gText_SendMailToPC[] = _("Send the removed MAIL to\nyour PC?"); const u8 gText_MailSentToPC[] = _("The MAIL was sent to your PC.{PAUSE_UNTIL_PRESS}"); -const u8 gText_PCMailboxFull[] = _("Your PC’s MAILBOX is full.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PCMailboxFull[] = _("Your PC's MAILBOX is full.{PAUSE_UNTIL_PRESS}"); const u8 gText_MailMessageWillBeLost[] = _("If the MAIL is removed, the\nmessage will be lost. Okay?"); const u8 gText_RemoveMailBeforeItem[] = _("MAIL must be removed before\nholding an item.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnWasGivenItem[] = _("{STR_VAR_1} was given the\n{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}"); const u8 gText_SwitchPkmnItem[] = _("{STR_VAR_1} is already holding\none {STR_VAR_2}.\pWould you like to switch the\ntwo items?"); -const u8 gText_PkmnNotHolding[] = _("{STR_VAR_1} isn’t holding\nanything.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnNotHolding[] = _("{STR_VAR_1} isn't holding\nanything.{PAUSE_UNTIL_PRESS}"); const u8 gText_RecievedItemFromPkmn[] = _("Received the {STR_VAR_2}\nfrom {STR_VAR_1}.{PAUSE_UNTIL_PRESS}"); const u8 gText_MailTakenFromPkmn[] = _("MAIL was taken from the\nPOKéMON.{PAUSE_UNTIL_PRESS}"); const u8 gText_SwitchedPkmnItem[] = _("The {STR_VAR_2} was taken and\nreplaced with the {STR_VAR_1}.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnHoldingItemCantHoldMail[] = _("This POKéMON is holding an\nitem. It cannot hold MAIL.{PAUSE_UNTIL_PRESS}"); const u8 gText_MailTransferredFromMailbox[] = _("MAIL was transferred from\nthe MAILBOX.{PAUSE_UNTIL_PRESS}"); -const u8 gText_BagFullCouldNotRemoveItem[] = _("The BAG is full. The POKéMON’s\nitem could not be removed.{PAUSE_UNTIL_PRESS}"); +const u8 gText_BagFullCouldNotRemoveItem[] = _("The BAG is full. The POKéMON's\nitem could not be removed.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnLearnedMove3[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!"); -const u8 gText_PkmnCantLearnMove[] = _("{STR_VAR_1} and {STR_VAR_2}\nare not compatible.\p{STR_VAR_2} can’t be\nlearned.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnCantLearnMove[] = _("{STR_VAR_1} and {STR_VAR_2}\nare not compatible.\p{STR_VAR_2} can't be\nlearned.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnNeedsToReplaceMove[] = _("{STR_VAR_1} wants to learn the\nmove {STR_VAR_2}.\pHowever, {STR_VAR_1} already\nknows four moves.\pShould a move be deleted and\nreplaced with {STR_VAR_2}?"); const u8 gText_StopLearningMove2[] = _("Stop trying to teach\n{STR_VAR_2}?"); const u8 gText_MoveNotLearned[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); const u8 gText_WhichMoveToForget[] = _("Which move should be forgotten?{PAUSE_UNTIL_PRESS}"); const u8 gText_12PoofForgotMove[] = _("1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd…{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnAlreadyKnows[] = _("{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); -const u8 gText_PkmnHPRestoredByVar2[] = _("{STR_VAR_1}’s HP was restored\nby {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnHPRestoredByVar2[] = _("{STR_VAR_1}'s HP was restored\nby {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnCuredOfPoison[] = _("{STR_VAR_1} was cured of its\npoisoning.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnCuredOfParalysis[] = _("{STR_VAR_1} was cured of\nparalysis.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnWokeUp2[] = _("{STR_VAR_1} woke up.{PAUSE_UNTIL_PRESS}"); -const u8 gText_PkmnBurnHealed[] = _("{STR_VAR_1}’s burn was healed.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnBurnHealed[] = _("{STR_VAR_1}'s burn was healed.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnThawedOut[] = _("{STR_VAR_1} was thawed out.{PAUSE_UNTIL_PRESS}"); const u8 gText_PPWasRestored[] = _("PP was restored.{PAUSE_UNTIL_PRESS}"); const u8 gUnknown_085E9CCA[] = _("{STR_VAR_1} regained health.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnBecameHealthy[] = _("{STR_VAR_1} became healthy.{PAUSE_UNTIL_PRESS}"); -const u8 gText_MovesPPIncreased[] = _("{STR_VAR_1}’s PP increased.{PAUSE_UNTIL_PRESS}"); +const u8 gText_MovesPPIncreased[] = _("{STR_VAR_1}'s PP increased.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnElevatedToLvVar2[] = _("{STR_VAR_1} was elevated to\nLv. {STR_VAR_2}."); -const u8 gText_PkmnBaseVar2StatIncreased[] = _("{STR_VAR_1}’s base {STR_VAR_2}\nstat was raised.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnBaseVar2StatIncreased[] = _("{STR_VAR_1}'s base {STR_VAR_2}\nstat was raised.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnFriendlyBaseVar2Fell[] = _("{STR_VAR_1} turned friendly.\nThe base {STR_VAR_2} fell!{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnAdoresBaseVar2Fell[] = _("{STR_VAR_1} adores you!\nThe base {STR_VAR_2} fell!{PAUSE_UNTIL_PRESS}"); -const u8 gText_PkmnFriendlyBaseVar2CantFall[] = _("{STR_VAR_1} turned friendly.\nThe base {STR_VAR_2} can’t fall!{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnFriendlyBaseVar2CantFall[] = _("{STR_VAR_1} turned friendly.\nThe base {STR_VAR_2} can't fall!{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnSnappedOutOfConfusion[] = _("{STR_VAR_1} snapped out of its\nconfusion.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnGotOverInfatuation[] = _("{STR_VAR_1} got over its\ninfatuation.{PAUSE_UNTIL_PRESS}"); const u8 gText_ThrowAwayItem[] = _("Throw away this\n{STR_VAR_1}?"); @@ -430,10 +430,10 @@ const u8 gUnknown_085E9E64[] = _("Teach which POKéMON?"); const u8 gUnknown_085E9E79[] = _("Use on which POKéMON?"); const u8 gUnknown_085E9E8F[] = _("Give to which POKéMON?"); const u8 gUnknown_085E9EA6[] = _("Do what with this {PKMN}?"); -const u8 gUnknown_085E9EBC[] = _("There’s nothing to CUT."); -const u8 gUnknown_085E9ED4[] = _("You can’t SURF here."); -const u8 gUnknown_085E9EE9[] = _("You’re already SURFING."); -const u8 gUnknown_085E9F01[] = _("Can’t use that here."); +const u8 gUnknown_085E9EBC[] = _("There's nothing to CUT."); +const u8 gUnknown_085E9ED4[] = _("You can't SURF here."); +const u8 gUnknown_085E9EE9[] = _("You're already SURFING."); +const u8 gUnknown_085E9F01[] = _("Can't use that here."); const u8 gUnknown_085E9F16[] = _("Restore which move?"); const u8 gUnknown_085E9F2A[] = _("Boost PP of which move?"); const u8 gUnknown_085E9F42[] = _("Do what with an item?"); @@ -441,13 +441,13 @@ const u8 gUnknown_085E9F58[] = _("No POKéMON for battle!"); const u8 gUnknown_085E9F6F[] = _("Choose a POKéMON."); const u8 gUnknown_085E9F81[] = _("Not enough HP…"); const u8 gUnknown_085E9F90[] = _("{STR_VAR_1} POKéMON are needed."); -const u8 gUnknown_085E9FA7[] = _("POKéMON can’t be the same."); +const u8 gUnknown_085E9FA7[] = _("POKéMON can't be the same."); const u8 gUnknown_085E9FC2[] = _("No identical hold items."); const u8 gUnknown_085E9FDB[] = _("The current is much too fast!"); const u8 gUnknown_085E9FF9[] = _("Do what with the MAIL?"); const u8 gUnknown_085EA010[] = _("Choose POKéMON or CANCEL."); const u8 gUnknown_085EA02A[] = _("Choose POKéMON and confirm."); -const u8 gUnknown_085EA046[] = _("Let’s enjoy cycling!"); +const u8 gUnknown_085EA046[] = _("Let's enjoy cycling!"); const u8 gUnknown_085EA05B[] = _("This is in use already."); const u8 gUnknown_085EA073[] = _("{STR_VAR_1} is already holding\none {STR_VAR_2}."); const u8 gUnknown_085EA091[] = _("No use."); @@ -461,9 +461,9 @@ const u8 gUnknown_085EA0BF[] = _("ABLE!"); const u8 gUnknown_085EA0C5[] = _("NOT ABLE!"); const u8 gUnknown_085EA0CF[] = _("LEARNED"); const u8 gUnknown_085EA0D7[] = _("HAVE"); -const u8 gUnknown_085EA0DC[] = _("DON’T HAVE"); +const u8 gUnknown_085EA0DC[] = _("DON'T HAVE"); const u8 gUnknown_085EA0E7[] = _("FOURTH"); -const u8 gText_PkmnCantParticipate[] = _("That POKéMON can’t participate.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnCantParticipate[] = _("That POKéMON can't participate.{PAUSE_UNTIL_PRESS}"); const u8 gText_CancelParticipation[] = _("Cancel participation?"); const u8 gText_CancelBattle[] = _("Cancel the battle?"); const u8 gText_ReturnToWaitingRoom[] = _("Return to the WAITING ROOM?"); @@ -472,14 +472,14 @@ const u8 gText_EscapeFromHere[] = _("Want to escape from here and return\nto {ST const u8 gText_ReturnToHealingSpot[] = _("Want to return to the healing spot\nused last in {STR_VAR_1}?"); const u8 gText_PauseUntilPress[] = _("{PAUSE_UNTIL_PRESS}"); const u8 gJPText_PutVar1IntoSpinner[] = _("{STR_VAR_1}を ぐるぐるこうかんに\nだして よろしいですか？"); -ALIGNED(4) const u8 gText_OnlyPkmnForBattle[] = _("That’s your only\nPOKéMON for battle."); -ALIGNED(4) const u8 gText_PkmnCantBeTradedNow[] = _("That POKéMON can’t be traded\nnow."); -ALIGNED(4) const u8 gText_EggCantBeTradedNow[] = _("An EGG can’t be traded now."); -ALIGNED(4) const u8 gText_OtherTrainersPkmnCantBeTraded[] = _("The other TRAINER’s POKéMON\ncan’t be traded now."); -ALIGNED(4) const u8 gText_OtherTrainerCantAcceptPkmn[] = _("The other TRAINER can’t accept\nthat POKéMON now."); -ALIGNED(4) const u8 gText_CantTradeWithTrainer[] = _("You can’t trade with that\nTRAINER now."); -ALIGNED(4) const u8 gText_NotPkmnOtherTrainerWants[] = _("That isn’t the type of POKéMON\nthat the other TRAINER wants."); -ALIGNED(4) const u8 gText_ThatIsntAnEgg[] = _("That isn’t an EGG."); +ALIGNED(4) const u8 gText_OnlyPkmnForBattle[] = _("That's your only\nPOKéMON for battle."); +ALIGNED(4) const u8 gText_PkmnCantBeTradedNow[] = _("That POKéMON can't be traded\nnow."); +ALIGNED(4) const u8 gText_EggCantBeTradedNow[] = _("An EGG can't be traded now."); +ALIGNED(4) const u8 gText_OtherTrainersPkmnCantBeTraded[] = _("The other TRAINER's POKéMON\ncan't be traded now."); +ALIGNED(4) const u8 gText_OtherTrainerCantAcceptPkmn[] = _("The other TRAINER can't accept\nthat POKéMON now."); +ALIGNED(4) const u8 gText_CantTradeWithTrainer[] = _("You can't trade with that\nTRAINER now."); +ALIGNED(4) const u8 gText_NotPkmnOtherTrainerWants[] = _("That isn't the type of POKéMON\nthat the other TRAINER wants."); +ALIGNED(4) const u8 gText_ThatIsntAnEgg[] = _("That isn't an EGG."); const u8 gText_Register[] = _("REGISTER"); const u8 gText_Attack3[] = _("ATTACK"); const u8 gText_Defense3[] = _("DEFENSE"); @@ -510,8 +510,8 @@ const u8 gText_Info[] = _("INFO"); const u8 gText_EggWillTakeALongTime[] = _("It looks like this EGG will\ntake a long time to hatch."); const u8 gText_EggWillTakeSomeTime[] = _("What will hatch from this?\nIt will take some time."); const u8 gText_EggWillHatchSoon[] = _("It moves occasionally.\nIt should hatch soon."); -const u8 gText_EggAboutToHatch[] = _("It’s making sounds.\nIt’s about to hatch!"); -const u8 gText_HMMovesCantBeForgotten2[] = _("HM moves can’t be\nforgotten now."); +const u8 gText_EggAboutToHatch[] = _("It's making sounds.\nIt's about to hatch!"); +const u8 gText_HMMovesCantBeForgotten2[] = _("HM moves can't be\nforgotten now."); const u8 gText_XNatureMetAtYZ[] = _("{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}."); const u8 gText_XNatureHatchedAtYZ[] = _("{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}."); const u8 gText_XNatureObtainedInTrade[] = _("{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nobtained in a trade."); @@ -525,7 +525,7 @@ const u8 gText_PeculiarEggNicePlace[] = _("A peculiar POKéMON EGG\nobtained at const u8 gText_PeculiarEggTrade[] = _("A peculiar POKéMON EGG\nobtained in a trade."); const u8 gText_EggFromHotSprings[] = _("A POKéMON EGG obtained\nat the hot springs."); const u8 gText_EggFromTraveler[] = _("An odd POKéMON EGG\nobtained from a traveler."); -const u8 gText_ApostropheSBase[] = _("’s BASE"); +const u8 gText_ApostropheSBase[] = _("'s BASE"); const u8 gText_OkayToDeleteFromRegistry[] = _("Is it okay to delete {STR_VAR_1}\nfrom the REGISTRY?"); const u8 gText_RegisteredDataDeleted[] = _("The registered data was deleted.{PAUSE_UNTIL_PRESS}"); const u8 gText_NoRegistry[] = _("There is no REGISTRY.{PAUSE_UNTIL_PRESS}"); @@ -550,14 +550,14 @@ const u8 gText_Cushion[] = _("CUSHION"); const u8 gText_Gold[] = _("GOLD"); const u8 gText_Silver[] = _("SILVER"); const u8 gText_PlaceItHere[] = _("Place it here?"); -const u8 gText_CantBePlacedHere[] = _("It can’t be placed here."); +const u8 gText_CantBePlacedHere[] = _("It can't be placed here."); const u8 gText_CancelDecorating[] = _("Cancel decorating?"); const u8 gText_InUseAlready[] = _("This is in use already."); const u8 gText_NoMoreDecorations[] = _("No more decorations can be placed.\nThe most that can be placed are {STR_VAR_1}."); const u8 gText_NoMoreDecorations2[] = _("No more decorations can be placed.\nThe most that can be placed are {STR_VAR_1}."); -const u8 gUnknown_085EA978[] = _("This can’t be placed here.\nIt must be on a DESK, etc."); -const u8 gText_CantPlaceInRoom[] = _("This decoration can’t be placed in\nyour own room."); -const u8 gText_CantThrowAwayInUse[] = _("This decoration is in use.\nIt can’t be thrown away."); +const u8 gUnknown_085EA978[] = _("This can't be placed here.\nIt must be on a DESK, etc."); +const u8 gText_CantPlaceInRoom[] = _("This decoration can't be placed in\nyour own room."); +const u8 gText_CantThrowAwayInUse[] = _("This decoration is in use.\nIt can't be thrown away."); const u8 gText_DecorationWillBeDiscarded[] = _("This {STR_VAR_1} will be discarded.\nIs that okay?"); const u8 gText_DecorationThrownAway[] = _("The decoration item was thrown away."); const u8 gText_StopPuttingAwayDecorations[] = _("Stop putting away decorations?"); @@ -586,8 +586,8 @@ const u8 gText_WithdrawXItems[] = _("Withdrew {STR_VAR_2}\n{STR_VAR_1}(s)."); const u8 gText_Read[] = _("READ"); const u8 gText_MoveToBag[] = _("MOVE TO BAG"); const u8 gText_Give2[] = _("GIVE"); -const u8 gText_NoMailHere[] = _("There’s no MAIL here.{PAUSE_UNTIL_PRESS}"); -const u8 gText_WhatToDoWithVar1sMail[] = _("What would you like to do with\n{STR_VAR_1}’s MAIL?"); +const u8 gText_NoMailHere[] = _("There's no MAIL here.{PAUSE_UNTIL_PRESS}"); +const u8 gText_WhatToDoWithVar1sMail[] = _("What would you like to do with\n{STR_VAR_1}'s MAIL?"); const u8 gText_MessageWillBeLost[] = _("The message will be lost.\nIs that okay?"); const u8 gText_BagIsFull[] = _("The BAG is full.{PAUSE_UNTIL_PRESS}"); const u8 gText_MailToBagMessageErased[] = _("The MAIL was returned to the BAG\nwith its message erased.{PAUSE_UNTIL_PRESS}"); @@ -606,7 +606,7 @@ const u8 gUnknown_085EAD56[] = _("LILYCOVE"); const u8 gUnknown_085EAD5F[] = _("DEWFORD"); const u8 gUnknown_085EAD67[] = _("ENTER"); const u8 gUnknown_085EAD6D[] = _("INFO"); -const u8 gUnknown_085EAD72[] = _("What’s a CONTEST?"); +const u8 gUnknown_085EAD72[] = _("What's a CONTEST?"); const u8 gUnknown_085EAD84[] = _("Types of CONTESTS"); const u8 gUnknown_085EAD96[] = _("Ranks"); const u8 gUnknown_085EAD9C[] = _("Judging"); @@ -701,9 +701,9 @@ const u8 gText_Key_Items[] = _("KEY ITEMS"); const u8 gText_Poke_Balls[] = _("POKé BALLS"); const u8 gText_TMs_Hms[] = _("TMs & HMs"); const u8 gText_Berries2[] = _("BERRIES"); -const u8 gText_SomeonesPC[] = _("SOMEONE’S PC"); -const u8 gText_LanettesPC[] = _("LANETTE’S PC"); -const u8 gText_PlayersPC[] = _("{PLAYER}’s PC"); +const u8 gText_SomeonesPC[] = _("SOMEONE'S PC"); +const u8 gText_LanettesPC[] = _("LANETTE'S PC"); +const u8 gText_PlayersPC[] = _("{PLAYER}'s PC"); const u8 gText_HallOfFame[] = _("HALL OF FAME"); const u8 gText_LogOff[] = _("LOG OFF"); const u8 gText_Opponent[] = _("OPPONENT"); @@ -745,10 +745,10 @@ const u8 gText_NavelRock[] = _("NAVEL ROCK"); const u8 gUnknown_085EB2E4[] = _("CLAW FOSSIL"); const u8 gUnknown_085EB2F0[] = _("ROOT FOSSIL"); const u8 gUnknown_085EB2FC[] = _("NO"); -const u8 gUnknown_085EB2FF[] = _("I’ll battle now!"); +const u8 gUnknown_085EB2FF[] = _("I'll battle now!"); const u8 gUnknown_085EB310[] = _("I won!"); const u8 gUnknown_085EB317[] = _("I lost!"); -const u8 gUnknown_085EB31F[] = _("I won’t tell."); +const u8 gUnknown_085EB31F[] = _("I won't tell."); const u8 gUnknown_085EB32D[] = _("NORMAL TAG MATCH"); const u8 gUnknown_085EB33E[] = _("VARIETY TAG MATCH"); const u8 gUnknown_085EB350[] = _("UNIQUE TAG MATCH"); @@ -856,7 +856,7 @@ const u8 gText_SlateportCity[] = _("SLATEPORT CITY"); const u8 gText_CaveOfOrigin[] = _("CAVE OF ORIGIN"); const u8 gText_MtPyre[] = _("MT. PYRE"); const u8 gText_SkyPillar[] = _("SKY PILLAR"); -const u8 gText_DontRemember[] = _("Don’t remember"); +const u8 gText_DontRemember[] = _("Don't remember"); const u8 gText_Exit[] = _("EXIT"); const u8 gText_ExitFromBox[] = _("Exit from the BOX?"); const u8 gText_WhatDoYouWantToDo[] = _("What do you want to do?"); @@ -871,11 +871,11 @@ const u8 gText_ReleaseThisPokemon[] = _("Release this POKéMON?"); const u8 gText_PkmnWasReleased[] = _("{SPECIAL_F7 0x00} was released."); const u8 gText_ByeByePkmn[] = _("Bye-bye, {SPECIAL_F7 0x00}!"); const u8 gText_MarkYourPkmn[] = _("Mark your POKéMON."); -const u8 gText_ThatsYourLastPkmn[] = _("That’s your last POKéMON!"); -const u8 gText_YourPartysFull[] = _("Your party’s full!"); -const u8 gText_YoureHoldingAPkmn[] = _("You’re holding a POKéMON!"); +const u8 gText_ThatsYourLastPkmn[] = _("That's your last POKéMON!"); +const u8 gText_YourPartysFull[] = _("Your party's full!"); +const u8 gText_YoureHoldingAPkmn[] = _("You're holding a POKéMON!"); const u8 gText_WhichOneWillYouTake[] = _("Which one will you take?"); -const u8 gText_YouCantReleaseAnEgg[] = _("You can’t release an EGG."); +const u8 gText_YouCantReleaseAnEgg[] = _("You can't release an EGG."); const u8 gText_ContinueBoxOperations[] = _("Continue BOX operations?"); const u8 gText_PkmnCameBack[] = _("{SPECIAL_F7 0x00} came back!"); const u8 gText_WasItWorriedAboutYou[] = _("Was it worried about you?"); @@ -887,7 +887,7 @@ const u8 gText_BagIsFull2[] = _("The BAG is full."); const u8 gText_PutItemInBag[] = _("Put this item in the BAG?"); const u8 gText_ItemIsNowHeld[] = _("{SPECIAL_F7 0x00} is now held."); const u8 gText_ChangedToNewItem[] = _("Changed to {SPECIAL_F7 0x00}."); -const u8 gText_MailCantBeStored[] = _("MAIL can’t be stored!"); +const u8 gText_MailCantBeStored[] = _("MAIL can't be stored!"); const u8 gPCText_Cancel[] = _("CANCEL"); const u8 gPCText_Store[] = _("STORE"); const u8 gPCText_Withdraw[] = _("WITHDRAW"); @@ -961,9 +961,9 @@ const u8 gText_NumberOfBattles[] = _("No. of battles"); const u8 gUnknown_085EBE7D[] = _("DETAIL"); const u8 gUnknown_085EBE84[] = _("CALL"); const u8 gUnknown_085EBE89[] = _("EXIT"); -const u8 gUnknown_085EBE8E[] = _("Can’t call opponent here."); +const u8 gUnknown_085EBE8E[] = _("Can't call opponent here."); const u8 gUnknown_085EBEA8[] = _("STRATEGY"); -const u8 gUnknown_085EBEB1[] = _("TRAINER’S POKéMON"); +const u8 gUnknown_085EBEB1[] = _("TRAINER'S POKéMON"); const u8 gUnknown_085EBEC3[] = _("SELF-INTRODUCTION"); const u8 gUnknown_085EBED5[] = _("{CLEAR 0x80}"); const u8 gUnknown_085EBED9[] = _("{A_BUTTON}ZOOM {B_BUTTON}CANCEL"); @@ -1004,9 +1004,9 @@ const u8 gUnknown_085EC104[] = _("With four phrases,"); const u8 gText_CombineNineWordsOrPhrases[] = _("Combine nine words or phrases"); const u8 gText_AndMakeAMessage2[] = _("and make a message."); const u8 gText_ChangeJustOneWordOrPhrase[] = _("Change just one word or phrase"); -const u8 gText_AndImproveTheBardsSong[] = _("and improve the BARD’s song."); +const u8 gText_AndImproveTheBardsSong[] = _("and improve the BARD's song."); const u8 gText_YourProfile[] = _("Your profile"); -const u8 gText_YourFeelingAtTheBattlesStart[] = _("Your feeling at the battle’s start"); +const u8 gText_YourFeelingAtTheBattlesStart[] = _("Your feeling at the battle's start"); const u8 gText_WhatYouSayIfYouWin[] = _("What you say if you win a battle"); const u8 gText_WhatYouSayIfYouLose[] = _("What you say if you lose a battle"); const u8 gText_TheAnswer[] = _("The answer"); @@ -1020,7 +1020,7 @@ const u8 gText_IsAsShownOkay[] = _("is as shown. Okay?"); const u8 gText_CombineTwoWordsOrPhrases2[] = _("Combine two words or phrases"); const u8 gText_ToTeachHerAGoodSaying[] = _("to teach her a good saying."); const u8 gText_FindWordsWhichFit[] = _("Find words which fit"); -const u8 gText_TheTrainersImage[] = _("the TRAINER’s image."); +const u8 gText_TheTrainersImage[] = _("the TRAINER's image."); const u8 gText_TheImage[] = _("The image:"); const u8 gText_OutOfTheListedChoices[] = _("Out of the listed choices,"); const u8 gText_SelectTheAnswerToTheQuiz[] = _("select the answer to the quiz!"); @@ -1029,21 +1029,21 @@ const u8 gText_PickAWordOrPhraseAnd[] = _("Pick a word or phrase and"); const u8 gText_SetTheQuizAnswer[] = _("set the quiz answer."); const u8 gText_TheAnswerColon[] = _("The answer:"); const u8 gUnknown_085EC387[] = _("The quiz:"); -const u8 gText_ApprenticePhrase[] = _("Apprentice’s phrase:"); +const u8 gText_ApprenticePhrase[] = _("Apprentice's phrase:"); const u8 gText_QuitEditing[] = _("Quit editing?"); const u8 gText_StopGivingPkmnMail[] = _("Stop giving the POKéMON MAIL?"); const u8 gText_AndFillOutTheQuestionnaire[] = _("and fill out the questionnaire."); -const u8 gText_LetsReplyToTheInterview[] = _("Let’s reply to the interview!"); +const u8 gText_LetsReplyToTheInterview[] = _("Let's reply to the interview!"); const u8 gText_AllTextBeingEditedWill[] = _("All the text being edited will"); const u8 gText_BeDeletedThatOkay[] = _("be deleted. Is that okay?"); const u8 gUnknown_085EC449[] = _("Quit editing?"); const u8 gUnknown_085EC457[] = _("The edited text will not be saved."); const u8 gUnknown_085EC47A[] = _("Is that okay?"); const u8 gUnknown_085EC488[] = _("Please enter a phrase or word."); -const u8 gUnknown_085EC4A7[] = _("The entire text can’t be deleted."); +const u8 gUnknown_085EC4A7[] = _("The entire text can't be deleted."); const u8 gText_OnlyOnePhrase[] = _("Only one phrase may be changed."); const u8 gText_OriginalSongWillBeUsed[] = _("The original song will be used."); -const u8 gUnknown_085EC509[] = _("That’s trendy already!"); +const u8 gUnknown_085EC509[] = _("That's trendy already!"); const u8 gText_CombineTwoWordsOrPhrases3[] = _("Combine two words or phrases."); const u8 gUnknown_085EC53E[] = _("Quit giving information?"); const u8 gUnknown_085EC557[] = _("Stop giving the POKéMON MAIL?"); @@ -1051,20 +1051,20 @@ const u8 gUnknown_085EC575[] = _("Create a quiz!"); const u8 gUnknown_085EC584[] = _("Set the answer!"); const u8 gUnknown_085EC594[] = _("Cancel the selection?"); const u8 gText_Profile[] = _("PROFILE"); -const u8 gText_AtTheBattlesStart[] = _("At the battle’s start:"); +const u8 gText_AtTheBattlesStart[] = _("At the battle's start:"); const u8 gText_UponWinningABattle[] = _("Upon winning a battle:"); const u8 gText_UponLosingABattle[] = _("Upon losing a battle:"); -const u8 gText_TheBardsSong[] = _("The BARD’s Song"); -const u8 gText_WhatsHipAndHappening[] = _("What’s hip and happening?"); +const u8 gText_TheBardsSong[] = _("The BARD's Song"); +const u8 gText_WhatsHipAndHappening[] = _("What's hip and happening?"); const u8 gText_Interview[] = _("Interview"); const u8 gText_GoodSaying[] = _("Good saying"); -const u8 gText_FansQuestion[] = _("Fan’s question"); +const u8 gText_FansQuestion[] = _("Fan's question"); const u8 gUnknown_085EC645[] = _("クイズの こたえは？"); -const u8 gText_ApprenticesPhrase[] = _("Apprentice’s phrase"); +const u8 gText_ApprenticesPhrase[] = _("Apprentice's phrase"); const u8 gText_Questionnaire[] = _("QUESTIONNAIRE"); const u8 gText_YouCannotQuitHere[] = _("You cannot quit here."); const u8 gText_SectionMustBeCompleted[] = _("This section must be completed."); -const u8 gText_F700sQuiz[] = _("{SPECIAL_F7 0x00}’s quiz"); +const u8 gText_F700sQuiz[] = _("{SPECIAL_F7 0x00}'s quiz"); const u8 gText_Lady[] = _("Lady"); const u8 gText_AfterYouHaveReadTheQuiz[] = _("After you have read the quiz"); const u8 gText_QuestionPressTheAButton[] = _("question, press the A Button."); @@ -1074,7 +1074,7 @@ const u8 gText_ChallengeQuestionMark[] = _("challenge?"); const u8 gText_IsThisQuizOK[] = _("Is this quiz OK?"); const u8 gText_CreateAQuiz[] = _("Create a quiz!"); const u8 gText_SelectTheAnswer[] = _("Select the answer!"); -const u8 gText_LyricsCantBeDeleted[] = _("The lyrics can’t be deleted."); +const u8 gText_LyricsCantBeDeleted[] = _("The lyrics can't be deleted."); const u8 gText_PokemonLeague[] = _("POKéMON LEAGUE"); const u8 gText_PokemonCenter[] = _("POKéMON CENTER"); const u8 gText_GetsAPokeBlockQuestion[] = _(" gets a {POKEBLOCK}?"); @@ -1085,7 +1085,7 @@ const u8 gText_Smartness[] = _("Smartness "); const u8 gText_Toughness[] = _("Toughness "); const u8 gText_WasEnhanced[] = _("was enhanced!"); const u8 gText_NothingChanged[] = _("Nothing changed!"); -const u8 gText_WontEatAnymore[] = _("It won’t eat anymore…"); +const u8 gText_WontEatAnymore[] = _("It won't eat anymore…"); const u8 gText_SaveFailedCheckingBackup[] = _("Save failed. Checking the backup\nmemory… Please wait.\n{COLOR RED}“Time required: about 1 minute”"); const u8 gText_BackupMemoryDamaged[] = _("The backup memory is damaged, or\nthe internal battery has run dry.\nYou can still play, but not save."); const u8 gText_GamePlayCannotBeContinued[] = _("{COLOR RED}“Game play cannot be continued.\nReturning to the title screen…”"); @@ -1102,7 +1102,7 @@ const u8 gText_PleaseResetTime[] = _("Please reset the time."); const u8 gText_ClockHasBeenReset[] = _("The clock has been reset.\nData will be saved. Please wait."); const u8 gText_SaveCompleted[] = _("Save completed."); const u8 gText_SaveFailed[] = _("Save failed…"); -const u8 gText_NoSaveFileCantSetTime[] = _("There is no save file, so the time\ncan’t be set."); +const u8 gText_NoSaveFileCantSetTime[] = _("There is no save file, so the time\ncan't be set."); const u8 gText_InGameClockUsable[] = _("The in-game clock adjustment system\nis now useable."); const u8 gText_Slots[] = _("SLOTS"); const u8 gText_Roulette[] = _("ROULETTE"); @@ -1162,7 +1162,7 @@ const u8 gText_QuickClaw48BP[] = _("QUICK CLAW{CLEAR_TO 0x5E}48BP"); const u8 gText_MentalHerb48BP[] = _("MENTAL HERB{CLEAR_TO 0x5E}48BP"); const u8 gText_BrightPowder64BP[] = _("BRIGHTPOWDER{CLEAR_TO 0x5E}64BP"); const u8 gText_ChoiceBand64BP[] = _("CHOICE BAND{CLEAR_TO 0x5E}64BP"); -const u8 gText_KingsRock64BP[] = _("KING’S ROCK{CLEAR_TO 0x5E}64BP"); +const u8 gText_KingsRock64BP[] = _("KING'S ROCK{CLEAR_TO 0x5E}64BP"); const u8 gText_FocusBand64BP[] = _("FOCUS BAND{CLEAR_TO 0x5E}64BP"); const u8 gText_ScopeLens64BP[] = _("SCOPE LENS{CLEAR_TO 0x5E}64BP"); const u8 gText_Softboiled16BP[] = _("SOFTBOILED{CLEAR_TO 0x4E}16BP"); @@ -1197,7 +1197,7 @@ const u8 gText_Colon2[] = _(":"); const u8 gUnknown_085ECF91[] = _(" points"); const u8 gText_TrainerCardTime[] = _("TIME"); const u8 gUnknown_085ECF9E[] = _("ゲ-ムポイント"); -const u8 gText_Var1sTrainerCard[] = _("{STR_VAR_1}’s TRAINER CARD"); +const u8 gText_Var1sTrainerCard[] = _("{STR_VAR_1}'s TRAINER CARD"); const u8 gText_HallOfFameDebut[] = _("HALL OF FAME DEBUT "); const u8 gText_LinkBattles[] = _("LINK BATTLES"); const u8 gText_LinkCableBattles[] = _("LINK CABLE BATTLES"); @@ -1237,7 +1237,7 @@ const u8 gText_BDot[] = _("B."); const u8 gText_AnnouncingResults[] = _("Announcing the results!"); const u8 gText_PreliminaryResults[] = _("The preliminary results!"); const u8 gText_Round2Results[] = _("Round 2 results!"); -const u8 gText_Var1sVar2Won[] = _("{STR_VAR_1}’s {STR_VAR_2} won!"); +const u8 gText_Var1sVar2Won[] = _("{STR_VAR_1}'s {STR_VAR_2} won!"); const u8 gText_CommunicationStandby[] = _("Communication standby…"); const u8 gText_ColorDarkGrey[] = _("{COLOR DARK_GREY}"); const u8 gUnknown_085ED222[] = _("{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR6 WHITE DYNAMIC_COLOR5}"); @@ -1264,14 +1264,14 @@ const u8 gText_ExitingChat[] = _("Exiting the chat…"); const u8 gText_LeaderLeftEndingChat[] = _("The LEADER, {SPECIAL_F7 0x00}, has\nleft, ending the chat."); const u8 gText_RegisteredTextChanged[] = _("The registered text has been changed.\nIs it okay to save the game?"); const u8 gText_AlreadySavedFile_Unused[] = _("There is already a saved file.\nIs it okay to overwrite it?"); -const u8 gText_SavingDontTurnOff_Unused[] = _("SAVING…\nDON’T TURN OFF THE POWER."); +const u8 gText_SavingDontTurnOff_Unused[] = _("SAVING…\nDON'T TURN OFF THE POWER."); const u8 gText_PlayerSavedGame_Unused[] = _("{SPECIAL_F7 0x00} saved the game."); const u8 gText_IfLeaderLeavesChatEnds[] = _("If the LEADER leaves, the chat\nwill end. Is that okay?"); const u8 gText_Hello[] = _("HELLO"); const u8 gText_Pokemon2[] = _("POKéMON"); const u8 gText_Trade[] = _("TRADE"); const u8 gText_Battle[] = _("BATTLE"); -const u8 gText_Lets[] = _("LET’S"); +const u8 gText_Lets[] = _("LET'S"); const u8 gText_Ok[] = _("OK!"); const u8 gText_Sorry[] = _("SORRY"); const u8 gText_YayUnkF9F9[] = _("YAY{EMOJI_BIGSMILE}"); @@ -1279,18 +1279,18 @@ const u8 gText_ThankYou[] = _("THANK YOU"); const u8 gText_ByeBye[] = _("BYE-BYE!"); const u8 gMatchCallStevenStrategyText[] = _("Attack the weak points!"); const u8 gMatchCall_StevenTrainersPokemonText[] = _("Ultimate STEEL POKéMON."); -const u8 gMatchCall_StevenSelfIntroductionText_Line1_BeforeMeteorFallsBattle[] = _("I’d climb even waterfalls"); +const u8 gMatchCall_StevenSelfIntroductionText_Line1_BeforeMeteorFallsBattle[] = _("I'd climb even waterfalls"); const u8 gMatchCall_StevenSelfIntroductionText_Line2_BeforeMeteorFallsBattle[] = _("to find a rare stone!"); -const u8 gMatchCall_StevenSelfIntroductionText_Line1_AfterMeteorFallsBattle[] = _("I’m the strongest and most"); +const u8 gMatchCall_StevenSelfIntroductionText_Line1_AfterMeteorFallsBattle[] = _("I'm the strongest and most"); const u8 gMatchCall_StevenSelfIntroductionText_Line2_AfterMeteorFallsBattle[] = _("energetic after all!"); const u8 gMatchCall_BrendanStrategyText[] = _("Battle with knowledge!"); const u8 gMatchCall_BrendanTrainersPokemonText[] = _("I will use various POKéMON."); -const u8 gMatchCall_BrendanSelfIntroductionText_Line1[] = _("I’ll be a better POKéMON"); +const u8 gMatchCall_BrendanSelfIntroductionText_Line1[] = _("I'll be a better POKéMON"); const u8 gMatchCall_BrendanSelfIntroductionText_Line2[] = _("prof than my father is!"); -const u8 gMatchCall_MayStrategyText[] = _("I’m not so good at battles."); -const u8 gMatchCall_MayTrainersPokemonText[] = _("I’ll use any POKéMON!"); +const u8 gMatchCall_MayStrategyText[] = _("I'm not so good at battles."); +const u8 gMatchCall_MayTrainersPokemonText[] = _("I'll use any POKéMON!"); const u8 gMatchCall_MaySelfIntroductionText_Line1[] = _("My POKéMON and I help"); -const u8 gMatchCall_MaySelfIntroductionText_Line2[] = _("my father’s research."); +const u8 gMatchCall_MaySelfIntroductionText_Line2[] = _("my father's research."); const u8 gText_HatchedFromEgg[] = _("{STR_VAR_1} hatched from the EGG!"); const u8 gText_NickHatchPrompt[] = _("Would you like to nickname the newly\nhatched {STR_VAR_1}?"); ALIGNED(4) const u8 gText_ReadyToBerryCrush[] = _("Are you ready to BERRY-CRUSH?\nPlease pick a BERRY for use.\p"); @@ -1300,7 +1300,7 @@ ALIGNED(4) const u8 gText_RecordingGameResults[] = _("Recording your game result ALIGNED(4) const u8 gText_PlayBerryCrushAgain[] = _("Want to play BERRY CRUSH again?"); ALIGNED(4) const u8 gText_YouHaveNoBerries[] = _("You have no BERRIES.\nThe game will be canceled."); ALIGNED(4) const u8 gText_MemberDroppedOut[] = _("A member dropped out.\nThe game will be canceled."); -ALIGNED(4) const u8 gText_TimesUpNoGoodPowder[] = _("Time’s up.\pGood BERRY POWDER could not be\nmade…\p"); +ALIGNED(4) const u8 gText_TimesUpNoGoodPowder[] = _("Time's up.\pGood BERRY POWDER could not be\nmade…\p"); ALIGNED(4) const u8 gText_CommunicationStandby2[] = _("Communication standby…"); ALIGNED(4) const u8 gText_1DotBlueF700[] = _("1. {COLOR BLUE}{SHADOW LIGHT_BLUE}{SPECIAL_F7 0x00}"); ALIGNED(4) const u8 gText_1DotF700[] = _("1. {SPECIAL_F7 0x00}"); @@ -1377,7 +1377,7 @@ const u8 gText_3Colon[] = _("3:"); const u8 gText_4Colon[] = _("4:"); const u8 gText_5Colon[] = _("5:"); const u8 gText_FirstPlacePrize[] = _("The first-place winner gets\nthis {SPECIAL_F7 0x00}!"); -const u8 gText_CantHoldAnyMore[] = _("You can’t hold any more!"); +const u8 gText_CantHoldAnyMore[] = _("You can't hold any more!"); const u8 gText_FilledStorageSpace[] = _("It filled its storage space."); const u8 gText_WantToPlayAgain[] = _("Want to play again?"); const u8 gText_SomeoneDroppedOut[] = _("Somebody dropped out.\nThe link will be canceled."); @@ -1389,13 +1389,13 @@ const u8 gText_PkmnJumpRecords[] = _("POKéMON JUMP RECORDS"); const u8 gText_JumpsInARow[] = _("Jumps in a row:"); const u8 gText_BestScore2[] = _("Best score:"); const u8 gText_ExcellentsInARow[] = _("EXCELLENTS in a row:"); -const u8 gText_AwesomeWonF701F700[] = _("Awesome score! You’ve\nwon {SPECIAL_F7 0x01} {SPECIAL_F7 0x00}!"); +const u8 gText_AwesomeWonF701F700[] = _("Awesome score! You've\nwon {SPECIAL_F7 0x01} {SPECIAL_F7 0x00}!"); const u8 gText_FilledStorageSpace2[] = _("It filled its storage space."); -const u8 gText_CantHoldMore[] = _("You can’t hold any more!"); +const u8 gText_CantHoldMore[] = _("You can't hold any more!"); const u8 gText_WantToPlayAgain2[] = _("Want to play again?"); const u8 gText_SomeoneDroppedOut2[] = _("Somebody dropped out.\nThe link will be canceled."); const u8 gText_CommunicationStandby4[] = _("Communication standby…"); -const u8 gText_LinkContestResults[] = _("{PLAYER}’s Link Contest Results"); +const u8 gText_LinkContestResults[] = _("{PLAYER}'s Link Contest Results"); const u8 gText_1st[] = _("1st"); const u8 gText_2nd[] = _("2nd"); const u8 gText_3rd[] = _("3rd"); @@ -1405,9 +1405,9 @@ const u8 gUnknown_085EDFB7[] = _("POKeMON"); const u8 gJPText_MysteryGift[] = _("ふしぎなもらいもの"); const u8 gJPText_DecideStop[] = _("{A_BUTTON}けってい {B_BUTTON}やめる"); const u8 gUnknown_085EDFD6[] = _("カードeリーダー{PLUS}　で\nふしぎなもらいものを　よみこみます"); -const u8 gUnknown_085EDFF5[] = _("カードeリーダー{PLUS}の　メニューから\n‘つうしん’を　えらび"); -const u8 gUnknown_085EE014[] = _("‘ゲームボーイアドバンスとつうしん’\nを　せんたく　してください"); -const u8 gUnknown_085EE035[] = _("カードeリーダー{PLUS}の　‘つうしん’を\nえらんで　Aボタンを　おしてください"); +const u8 gUnknown_085EDFF5[] = _("カードeリーダー{PLUS}の　メニューから\n‘つうしん'を　えらび"); +const u8 gUnknown_085EE014[] = _("‘ゲームボーイアドバンスとつうしん'\nを　せんたく　してください"); +const u8 gUnknown_085EE035[] = _("カードeリーダー{PLUS}の　‘つうしん'を\nえらんで　Aボタンを　おしてください"); const u8 gUnknown_085EE05C[] = _("せつぞくが　まちがっています"); const u8 gUnknown_085EE06B[] = _("カードの　よみこみを\nちゅうし　しました"); const u8 gUnknown_085EE080[] = _("カードeリーダー{PLUS}と\nつうしん　できません"); @@ -1422,19 +1422,19 @@ const u8 gUnknown_085EE12D[] = _("かきこみ　エラー　です\nデータ const u8 gUnknown_085EE14B[] = _("RED"); const u8 gUnknown_085EE14F[] = _("BLUE"); const u8 gUnknown_085EE154[] = _("---"); -const u8 gText_SingleBattleRoomResults[] = _("{PLAYER}’s Single Battle Room Results"); -const u8 gText_DoubleBattleRoomResults[] = _("{PLAYER}’s Double Battle Room Results"); -const u8 gText_MultiBattleRoomResults[] = _("{PLAYER}’s Multi Battle Room Results"); -const u8 gText_LinkMultiBattleRoomResults[] = _("{PLAYER}’s Link Multi Battle Room Results"); -const u8 gText_SingleBattleTourneyResults[] = _("{PLAYER}’s Single Battle Tourney Results"); -const u8 gText_DoubleBattleTourneyResults[] = _("{PLAYER}’s Double Battle Tourney Results"); -const u8 gText_SingleBattleHallResults[] = _("{PLAYER}’s Single Battle Hall Results"); -const u8 gText_DoubleBattleHallResults[] = _("{PLAYER}’s Double Battle Hall Results"); -const u8 gText_BattleChoiceResults[] = _("{PLAYER}’s Battle Choice Results"); -const u8 gText_SetKOTourneyResults[] = _("{PLAYER}’s Set KO Tourney Results"); -const u8 gText_BattleSwapSingleResults[] = _("{PLAYER}’s Battle Swap Single Results"); -const u8 gText_BattleSwapDoubleResults[] = _("{PLAYER}’s Battle Swap Double Results"); -const u8 gText_BattleQuestResults[] = _("{PLAYER}’s Battle Quest Results"); +const u8 gText_SingleBattleRoomResults[] = _("{PLAYER}'s Single Battle Room Results"); +const u8 gText_DoubleBattleRoomResults[] = _("{PLAYER}'s Double Battle Room Results"); +const u8 gText_MultiBattleRoomResults[] = _("{PLAYER}'s Multi Battle Room Results"); +const u8 gText_LinkMultiBattleRoomResults[] = _("{PLAYER}'s Link Multi Battle Room Results"); +const u8 gText_SingleBattleTourneyResults[] = _("{PLAYER}'s Single Battle Tourney Results"); +const u8 gText_DoubleBattleTourneyResults[] = _("{PLAYER}'s Double Battle Tourney Results"); +const u8 gText_SingleBattleHallResults[] = _("{PLAYER}'s Single Battle Hall Results"); +const u8 gText_DoubleBattleHallResults[] = _("{PLAYER}'s Double Battle Hall Results"); +const u8 gText_BattleChoiceResults[] = _("{PLAYER}'s Battle Choice Results"); +const u8 gText_SetKOTourneyResults[] = _("{PLAYER}'s Set KO Tourney Results"); +const u8 gText_BattleSwapSingleResults[] = _("{PLAYER}'s Battle Swap Single Results"); +const u8 gText_BattleSwapDoubleResults[] = _("{PLAYER}'s Battle Swap Double Results"); +const u8 gText_BattleQuestResults[] = _("{PLAYER}'s Battle Quest Results"); const u8 gText_Lv502[] = _("LV. 50"); const u8 gText_OpenLv[] = _("OPEN LV."); const u8 gText_WinStreak[] = _("Win streak: {STR_VAR_1}"); @@ -1460,7 +1460,7 @@ ALIGNED(4) const u8 gText_FrontierFacilityKOsStreak[] = _("KOs in a row: {STR_VA ALIGNED(4) const u8 gText_FrontierFacilityFloorsCleared[] = _("Floors cleared: {STR_VAR_2}"); ALIGNED(4) const u8 gText_123Dot[][3] = {_("1."), _("2."), _("3.")}; -const u8 gText_SavingDontTurnOff2[] = _("SAVING…\nDON’T TURN OFF THE POWER."); +const u8 gText_SavingDontTurnOff2[] = _("SAVING…\nDON'T TURN OFF THE POWER."); const u8 gText_BlenderMaxSpeedRecord[] = _("BERRY BLENDER\nMAXIMUM SPEED RECORD!"); const u8 gText_234Players[] = _("2 PLAYERS\n3 PLAYERS\n4 PLAYERS"); const u8 gText_YesNo[] = _("YES\nNO"); @@ -1529,7 +1529,7 @@ const u8 gText_Peak[] = _("Peak"); const u8 gText_LinkStandby2[] = _("Link standby…\n… … B Button: Cancel"); const u8 gText_PressAToLoadEvent[] = _("Press the A Button to load event.\n… … B Button: Cancel"); const u8 gText_LoadingEvent[] = _("Loading event…"); -const u8 gText_DontRemoveCableTurnOff[] = _("Don’t remove the Game Link cable.\nDon’t turn off the power."); +const u8 gText_DontRemoveCableTurnOff[] = _("Don't remove the Game Link cable.\nDon't turn off the power."); const u8 gText_EventSafelyLoaded[] = _("The event was safely loaded."); const u8 gText_LoadErrorEndingSession[] = _("Loading error.\nEnding session."); const u8 gUnknown_085EE846[] = _("プレイヤー"); @@ -1541,7 +1541,7 @@ const u8 gUnknown_085EE8DC[] = _("{COLOR RED}{SHADOW LIGHT_RED}ゲ-ムフリ-ク const u8 gUnknown_085EE8EA[] = _("{COLOR RED}{SHADOW LIGHT_RED}"); const u8 gText_Hoenn[] = _("HOENN"); const u8 gText_OhABite[] = _("Oh! A bite!"); -const u8 gText_PokemonOnHook[] = _("A POKéMON’s on the hook!{PAUSE_UNTIL_PRESS}"); +const u8 gText_PokemonOnHook[] = _("A POKéMON's on the hook!{PAUSE_UNTIL_PRESS}"); const u8 gText_NotEvenANibble[] = _("Not even a nibble…{PAUSE_UNTIL_PRESS}"); const u8 gText_ItGotAway[] = _("It got away…{PAUSE_UNTIL_PRESS}"); const u8 gText_XWillBeSentToY[] = _("{STR_VAR_2} will be\nsent to {STR_VAR_1}."); @@ -1587,10 +1587,10 @@ const u8 gText_MixingRecords[] = _("Mixing records…"); const u8 gText_RecordMixingComplete[] = _("Record mixing completed.\nThank you for waiting."); const u8 gText_YourName[] = _("YOUR NAME?"); const u8 gText_BoxName[] = _("BOX NAME?"); -const u8 gText_PkmnsNickname[] = _("{STR_VAR_1}’s nickname?"); +const u8 gText_PkmnsNickname[] = _("{STR_VAR_1}'s nickname?"); const u8 gText_TellHimTheWords[] = _("Tell him the words."); const u8 gText_MoveOkBack[] = _("{DPAD_NONE}MOVE {A_BUTTON}OK {B_BUTTON}BACK"); -const u8 gText_CallCantBeMadeHere[] = _("A call can’t be made from here."); +const u8 gText_CallCantBeMadeHere[] = _("A call can't be made from here."); const u8 gUnknown_085EEB2B[] = _("HANDSOME"); const u8 gUnknown_085EEB34[] = _("VINNY"); const u8 gUnknown_085EEB3A[] = _("MOREME"); @@ -1619,7 +1619,7 @@ const u8 gText_Deselect[] = _("DESELECT"); const u8 gText_TheseThreePkmnOkay[] = _("Are these three POKéMON OK?"); const u8 gText_Yes2[] = _("YES"); const u8 gText_No2[] = _("NO"); -const u8 gText_CantSelectSamePkmn[] = _("Can’t select same {PKMN}."); +const u8 gText_CantSelectSamePkmn[] = _("Can't select same {PKMN}."); const u8 gText_PkmnSwap[] = _("POKéMON SWAP"); const u8 gText_SelectPkmnToSwap[] = _("Select POKéMON to swap."); const u8 gText_SelectPkmnToAccept[] = _("Select POKéMON to accept."); @@ -1670,8 +1670,8 @@ ALIGNED(4) const u8 gText_VarietyOfEventsImportedWireless[] = _("A variety of ev ALIGNED(4) const u8 gText_WonderCardsInPossession[] = _("Read the WONDER CARDS in your\npossession."); ALIGNED(4) const u8 gText_ReadNewsThatArrived[] = _("Read the NEWS that arrived."); ALIGNED(4) const u8 gText_ReturnToTitle[] = _("Return to the title screen."); -ALIGNED(4) const u8 gText_DontHaveCardNewOneInput[] = _("You don’t have a WONDER CARD,\nso a new CARD will be input."); -ALIGNED(4) const u8 gText_DontHaveNewsNewOneInput[] = _("You don’t have any WONDER NEWS,\nso new NEWS will be input."); +ALIGNED(4) const u8 gText_DontHaveCardNewOneInput[] = _("You don't have a WONDER CARD,\nso a new CARD will be input."); +ALIGNED(4) const u8 gText_DontHaveNewsNewOneInput[] = _("You don't have any WONDER NEWS,\nso new NEWS will be input."); ALIGNED(4) const u8 gText_WhereShouldCardBeAccessed[] = _("Where should the WONDER CARD\nbe accessed?"); ALIGNED(4) const u8 gText_WhereShouldNewsBeAccessed[] = _("Where should the WONDER NEWS\nbe accessed?"); ALIGNED(4) const u8 gUnknown_085EEFC0[] = _("Communication standby…\nB Button: Cancel"); @@ -1680,7 +1680,7 @@ ALIGNED(4) const u8 gText_CommunicationCompleted[] = _("Communication completed. ALIGNED(4) const u8 gText_CommunicationError[] = _("Communication error."); ALIGNED(4) const u8 gText_CommunicationCanceled[] = _("Communication has been canceled."); ALIGNED(4) const u8 gText_ThrowAwayWonderCard[] = _("Throw away the WONDER CARD\nand input a new CARD?"); -ALIGNED(4) const u8 gText_HaventReceivedCardsGift[] = _("You haven’t received the CARD’s gift\nyet. Input a new CARD anyway?"); +ALIGNED(4) const u8 gText_HaventReceivedCardsGift[] = _("You haven't received the CARD's gift\nyet. Input a new CARD anyway?"); ALIGNED(4) const u8 gText_WonderCardReceivedFrom[] = _("A WONDER CARD has been received\nfrom {STR_VAR_1}."); ALIGNED(4) const u8 gText_WonderNewsReceivedFrom[] = _("A WONDER NEWS item has been\nreceived from {STR_VAR_1}."); ALIGNED(4) const u8 gText_WonderCardReceived[] = _("A new WONDER CARD has been\nreceived."); @@ -1690,10 +1690,10 @@ ALIGNED(4) const u8 gText_NewTrainerReceived[] = _("A new TRAINER has arrived.") ALIGNED(4) const u8 gText_AlreadyHadCard[] = _("You already had that\nWONDER CARD."); ALIGNED(4) const u8 gText_AlreadyHadNews[] = _("You already had that\nWONDER NEWS item."); ALIGNED(4) const u8 gText_AlreadyHadStamp[] = _("You already had that\nSTAMP."); -ALIGNED(4) const u8 gText_NoMoreRoomForStamps[] = _("There’s no more room for adding\nSTAMPS."); +ALIGNED(4) const u8 gText_NoMoreRoomForStamps[] = _("There's no more room for adding\nSTAMPS."); ALIGNED(4) const u8 gText_RecordUploadedViaWireless[] = _("Your record has been uploaded via\nWIRELESS COMMUNICATION."); -ALIGNED(4) const u8 gText_CantAcceptCardFromTrainer[] = _("You can’t accept a WONDER CARD\nfrom this TRAINER."); -ALIGNED(4) const u8 gText_CantAcceptNewsFromTrainer[] = _("You can’t accept WONDER NEWS\nfrom this TRAINER."); +ALIGNED(4) const u8 gText_CantAcceptCardFromTrainer[] = _("You can't accept a WONDER CARD\nfrom this TRAINER."); +ALIGNED(4) const u8 gText_CantAcceptNewsFromTrainer[] = _("You can't accept WONDER NEWS\nfrom this TRAINER."); ALIGNED(4) const u8 gText_NothingSentOver[] = _("Nothing was sent over…"); ALIGNED(4) const u8 gText_WhatToDoWithCards[] = _("What would you like to do\nwith the WONDER CARDS?"); ALIGNED(4) const u8 gText_WhatToDoWithNews[] = _("What would you like to do\nwith the WONDER NEWS?"); @@ -1707,10 +1707,10 @@ ALIGNED(4) const u8 gText_OtherTrainerHasCard[] = _("The other TRAINER has the s ALIGNED(4) const u8 gText_OtherTrainerHasNews[] = _("The other TRAINER has the same\nWONDER NEWS already."); ALIGNED(4) const u8 gText_OtherTrainerHasStamp[] = _("The other TRAINER has the same\nSTAMP already."); ALIGNED(4) const u8 gText_OtherTrainerCanceled[] = _("The other TRAINER canceled\ncommunication."); -ALIGNED(4) const u8 gText_CantSendGiftToTrainer[] = _("You can’t send a MYSTERY GIFT to\nthis TRAINER."); -ALIGNED(4) const u8 gText_IfThrowAwayCardEventWontHappen[] = _("If you throw away the CARD,\nits event won’t happen. Okay?"); +ALIGNED(4) const u8 gText_CantSendGiftToTrainer[] = _("You can't send a MYSTERY GIFT to\nthis TRAINER."); +ALIGNED(4) const u8 gText_IfThrowAwayCardEventWontHappen[] = _("If you throw away the CARD,\nits event won't happen. Okay?"); ALIGNED(4) const u8 gText_OkayToDiscardNews[] = _("Is it okay to discard this\nNEWS item?"); -ALIGNED(4) const u8 gText_HaventReceivedGiftOkayToDiscard[] = _("You haven’t received the\nGIFT. Is it okay to discard?"); +ALIGNED(4) const u8 gText_HaventReceivedGiftOkayToDiscard[] = _("You haven't received the\nGIFT. Is it okay to discard?"); ALIGNED(4) const u8 gText_DataWillBeSaved[] = _("Data will be saved.\nPlease wait."); ALIGNED(4) const u8 gText_SaveCompletedPressA[] = _("Save completed.\nPlease press the A Button."); ALIGNED(4) const u8 gText_WonderCardThrownAway[] = _("The WONDER CARD was thrown away."); @@ -1718,18 +1718,18 @@ ALIGNED(4) const u8 gText_WonderNewsThrownAway[] = _("The WONDER NEWS was thrown ALIGNED(4) const u8 gText_MysteryGift[] = _("MYSTERY GIFT"); ALIGNED(4) const u8 gText_PickOKExit[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}EXIT"); ALIGNED(4) const u8 gText_PickOKCancel[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}CANCEL"); -const u8 gText_PlayersBattleResults[] = _("{PLAYER}’s BATTLE RESULTS"); +const u8 gText_PlayersBattleResults[] = _("{PLAYER}'s BATTLE RESULTS"); const u8 gText_TotalRecordWLD[] = _("TOTAL RECORD W:{STR_VAR_1} L:{STR_VAR_2} D:{STR_VAR_3}"); const u8 gText_WinLoseDraw[] = _("{CLEAR_TO 0x53}WIN{CLEAR_TO 0x80}LOSE{CLEAR_TO 0xB0}DRAW"); const u8 gText_CommunicationStandby5[] = _("Communication standby…"); const u8 gText_QuitTheGame[] = _("Quit the game?"); -const u8 gText_YouveGot9999Coins[] = _("You’ve got 9,999 COINS."); -const u8 gText_YouveRunOutOfCoins[] = _("You’ve run out of COINS.\nGame over!"); -const u8 gText_YouDontHaveThreeCoins[] = _("You don’t have three COINS."); -const u8 gText_ReelTimeHelp[] = _("REEL TIME\nHere’s your chance to take\naim and nail marks!\nReel Time continues for the\nawarded number of spins.\nIt all ends on a Big Bonus."); +const u8 gText_YouveGot9999Coins[] = _("You've got 9,999 COINS."); +const u8 gText_YouveRunOutOfCoins[] = _("You've run out of COINS.\nGame over!"); +const u8 gText_YouDontHaveThreeCoins[] = _("You don't have three COINS."); +const u8 gText_ReelTimeHelp[] = _("REEL TIME\nHere's your chance to take\naim and nail marks!\nReel Time continues for the\nawarded number of spins.\nIt all ends on a Big Bonus."); const u8 gDaycareText_GetAlongVeryWell[] = _("The two seem to get along\nvery well."); const u8 gDaycareText_GetAlong[] = _("The two seem to get along."); -const u8 gDaycareText_DontLikeOther[] = _("The two don’t seem to like\neach other much."); +const u8 gDaycareText_DontLikeOther[] = _("The two don't seem to like\neach other much."); const u8 gDaycareText_PlayOther[] = _("The two prefer to play with other\nPOKéMON than each other."); const u8 gText_NewLine2[] = _("\n"); const u8 gText_Exit4[] = _("EXIT"); @@ -1744,7 +1744,7 @@ const u8 gUnknown_085EF8BF[] = _("4F"); const u8 gText_TeachWhichMoveToPkmn[] = _("Teach which move to {STR_VAR_1}?"); const u8 gText_TeachX[] = _("Teach {STR_VAR_2}?"); const u8 gText_PkmnLearnedMove4[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!"); -const u8 gText_PkmnTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can’t learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?"); +const u8 gText_PkmnTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can't learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?"); const u8 gText_StopTryingToTeachMove[] = _("Stop trying to teach\n{STR_VAR_2}?"); const u8 gText_12AndPoof[] = _("{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p"); const u8 gText_PkmnForgotMoveAndLearnedNew[] = _("{STR_VAR_1} forgot {STR_VAR_3}.\pAnd…\p{STR_VAR_1} learned {STR_VAR_2}."); @@ -1782,7 +1782,7 @@ const u8 gNormanMatchCallName[] = _("DAD"); const u8 gMomMatchCallName[] = _("MOM"); const u8 gScottMatchCallDesc[] = _("ELUSIVE EYES"); const u8 gScottMatchCallName[] = _("SCOTT"); -const u8 gRoxanneMatchCallDesc[] = _("ROCKIN’ WHIZ"); +const u8 gRoxanneMatchCallDesc[] = _("ROCKIN' WHIZ"); const u8 gBrawlyMatchCallDesc[] = _("THE BIG HIT"); const u8 gWattsonMatchCallDesc[] = _("SWELL SHOCK"); const u8 gFlanneryMatchCallDesc[] = _("PASSION BURN"); -- cgit v1.2.3 From 6068495619364c8e0ccae15ad036a1b5a9eef171 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 7 Dec 2018 23:50:56 +0100 Subject: Document trainer battle scripts (#430) --- src/battle_main.c | 8 ++++---- src/battle_script_commands.c | 2 +- src/battle_setup.c | 20 ++++++++++---------- src/battle_util.c | 4 ++-- src/daycare.c | 5 +---- src/trainer_see.c | 8 ++++---- 6 files changed, 22 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/battle_main.c b/src/battle_main.c index de0becd2a..6d9d90356 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3071,7 +3071,7 @@ static void BattleStartClearSetData(void) *(gBattleStruct->AI_monToSwitchIntoId + i) = PARTY_SIZE; } - gBattleStruct->field_DF = 0; + gBattleStruct->givenExpMons = 0; gBattleStruct->field_92 = 0; gRandomTurnNumber = Random(); @@ -3192,7 +3192,7 @@ void SwitchInClearSetData(void) gBattleResources->flags->flags[gActiveBattler] = 0; gCurrentMove = 0; - gBattleStruct->field_DA = 0xFF; + gBattleStruct->arenaTurnCounter = 0xFF; ClearBattlerMoveHistory(gActiveBattler); ClearBattlerAbilityHistory(gActiveBattler); @@ -3994,7 +3994,7 @@ void BattleTurnPassed(void) if (gBattleResults.battleTurnCounter < 0xFF) { gBattleResults.battleTurnCounter++; - gBattleStruct->field_DA++; + gBattleStruct->arenaTurnCounter++; } for (i = 0; i < gBattlersCount; i++) @@ -4013,7 +4013,7 @@ void BattleTurnPassed(void) if (gBattleTypeFlags & BATTLE_TYPE_PALACE) BattleScriptExecute(BattleScript_82DB881); - else if (gBattleTypeFlags & BATTLE_TYPE_ARENA && gBattleStruct->field_DA == 0) + else if (gBattleTypeFlags & BATTLE_TYPE_ARENA && gBattleStruct->arenaTurnCounter == 0) BattleScriptExecute(BattleScript_ArenaTurnBeginning); } diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6a7ca1725..e627f9d67 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3270,7 +3270,7 @@ static void atk23_getexp(void) else { gBattleScripting.atk23_state++; - gBattleStruct->field_DF |= gBitTable[gBattlerPartyIndexes[gBattlerFainted]]; + gBattleStruct->givenExpMons |= gBitTable[gBattlerPartyIndexes[gBattlerFainted]]; } break; case 1: // calculate experience points to redistribute diff --git a/src/battle_setup.c b/src/battle_setup.c index 4243d2f3f..5377f39b5 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -306,7 +306,7 @@ const struct RematchTrainer gRematchTable[REMATCH_TABLE_ENTRIES] = {{TRAINER_TRENT_1, TRAINER_TRENT_2, TRAINER_TRENT_3, TRAINER_TRENT_4, TRAINER_TRENT_5}, 0x0, 0x1b}, {{TRAINER_SAWYER_1, TRAINER_SAWYER_2, TRAINER_SAWYER_3, TRAINER_SAWYER_4, TRAINER_SAWYER_5}, 0x18, 0xc}, {{TRAINER_KIRA_AND_DAN_1, TRAINER_KIRA_AND_DAN_2, TRAINER_KIRA_AND_DAN_3, TRAINER_KIRA_AND_DAN_4, TRAINER_KIRA_AND_DAN_5}, 0x18, 0x3e}, - {{TRAINER_WALLY_3, 0x292, 0x293, 0x294, 0x294}, 0x18, 0x2b}, + {{TRAINER_WALLY_3, TRAINER_WALLY_4, TRAINER_WALLY_5, TRAINER_WALLY_6, TRAINER_WALLY_6}, 0x18, 0x2b}, {{TRAINER_ROXANNE_1, TRAINER_ROXANNE_2, TRAINER_ROXANNE_3, TRAINER_ROXANNE_4, TRAINER_ROXANNE_5}, 0x0, 0x3}, {{TRAINER_BRAWLY_1, TRAINER_BRAWLY_2, TRAINER_BRAWLY_3, TRAINER_BRAWLY_4, TRAINER_BRAWLY_5}, 0x0, 0xb}, {{TRAINER_WATTSON_1, TRAINER_WATTSON_2, TRAINER_WATTSON_3, TRAINER_WATTSON_4, TRAINER_WATTSON_5}, 0x0, 0x2}, @@ -1088,7 +1088,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) { case TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT: TrainerBattleLoadArgs(sOrdinaryNoIntroBattleParams, data); - return EventScript_2713C2; + return EventScript_DoTainerBattle; case TRAINER_BATTLE_DOUBLE: TrainerBattleLoadArgs(sDoubleBattleParams, data); SetMapVarsToTrainer(); @@ -1103,11 +1103,11 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) { TrainerBattleLoadArgs(sTrainerBContinueScriptBattleParams, data); } - return EventScript_271362; + return EventScript_TryDoNormalTrainerBattle; case TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC: TrainerBattleLoadArgs(sContinueScriptBattleParams, data); SetMapVarsToTrainer(); - return EventScript_271362; + return EventScript_TryDoNormalTrainerBattle; case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE: case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC: TrainerBattleLoadArgs(sContinueScriptDoubleBattleParams, data); @@ -1122,8 +1122,8 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) TrainerBattleLoadArgs(sOrdinaryBattleParams, data); SetMapVarsToTrainer(); gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A); - return EventScript_2713D1; - case TRAINER_BATTLE_9: + return EventScript_TryDoRematchBattle; + case TRAINER_BATTLE_PYRAMID: if (gApproachingTrainerId == 0) { TrainerBattleLoadArgs(sOrdinaryBattleParams, data); @@ -1135,7 +1135,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data); gTrainerBattleOpponent_B = LocalIdToPyramidTrainerId(gSpecialVar_LastTalked); } - return EventScript_271362; + return EventScript_TryDoNormalTrainerBattle; case TRAINER_BATTLE_SET_TRAINER_A: TrainerBattleLoadArgs(sOrdinaryBattleParams, data); return NULL; @@ -1154,7 +1154,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data); gTrainerBattleOpponent_B = sub_81D6180(gSpecialVar_LastTalked); } - return EventScript_271362; + return EventScript_TryDoNormalTrainerBattle; default: if (gApproachingTrainerId == 0) { @@ -1165,7 +1165,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) { TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data); } - return EventScript_271362; + return EventScript_TryDoNormalTrainerBattle; } } @@ -1197,7 +1197,7 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data) return FlagGet(FLAG_TRAINER_FLAG_START + flag); } -void sub_80B16D8(void) +void SetUpTrainerMovement(void) { struct EventObject *eventObject = &gEventObjects[gSelectedEventObject]; diff --git a/src/battle_util.c b/src/battle_util.c index 251a545c9..4c9ef75d9 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1192,7 +1192,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void) // fall through case 2: if ((gBattleTypeFlags & BATTLE_TYPE_ARENA) - && gBattleStruct->field_DA == 2 + && gBattleStruct->arenaTurnCounter == 2 && gBattleMons[0].hp != 0 && gBattleMons[1].hp != 0) { s32 i; @@ -1238,7 +1238,7 @@ bool8 HandleFaintedMonActions(void) { gBattlerFainted = gBattlerTarget = gBattleStruct->faintedActionsBattlerId; if (gBattleMons[gBattleStruct->faintedActionsBattlerId].hp == 0 - && !(gBattleStruct->field_DF & gBitTable[gBattlerPartyIndexes[gBattleStruct->faintedActionsBattlerId]]) + && !(gBattleStruct->givenExpMons & gBitTable[gBattlerPartyIndexes[gBattleStruct->faintedActionsBattlerId]]) && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBattlerId])) { BattleScriptExecute(BattleScript_GiveExp); diff --git a/src/daycare.c b/src/daycare.c index 2356b36f5..21678adc0 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -19,6 +19,7 @@ #include "task.h" #include "window.h" #include "list_menu.h" +#include "overworld.h" #define EGG_MOVES_ARRAY_COUNT 10 #define EGG_LVL_UP_MOVES_ARRAY_COUNT 50 @@ -39,12 +40,8 @@ extern const u8 gDaycareText_PlayOther[]; extern u8 GetCursorSelectionMonId(void); extern u16 ItemIdToBattleMoveId(u16); -extern s32 ListMenuHandleInputGetItemId(u8); -extern void DestroyListMenuTask(u8, u16*, u16*); extern void sub_819746C(u8, bool8); -extern void NewMenuHelpers_DrawStdWindowFrame(u8, bool8); extern void sub_81B9328(void); -extern void CB2_ReturnToField(void); // this file's functions static void ClearDaycareMonMail(struct DayCareMail *mail); diff --git a/src/trainer_see.c b/src/trainer_see.c index d3d450de4..244a7021c 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -630,26 +630,26 @@ static void Task_DestroyTrainerApproachTask(u8 taskId) EnableBothScriptContexts(); } -void sub_80B45D0(void) +void TryPrepareSecondApproachingTrainer(void) { if (gNoOfApproachingTrainers == 2) { if (gApproachingTrainerId == 0) { gApproachingTrainerId++; - gSpecialVar_Result = 1; + gSpecialVar_Result = TRUE; UnfreezeEventObjects(); FreezeEventObjectsExceptOne(gApproachingTrainers[1].eventObjectId); } else { gApproachingTrainerId = 0; - gSpecialVar_Result = 0; + gSpecialVar_Result = FALSE; } } else { - gSpecialVar_Result = 0; + gSpecialVar_Result = FALSE; } } -- cgit v1.2.3 From 4d307a6f63b13c9a52755bb40842cdf77001dcc2 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Sat, 8 Dec 2018 11:33:41 +0800 Subject: Clean some more arrays --- src/battle_script_commands.c | 118 +++++++++++++++++++++---------------------- src/pokemon_animation.c | 2 +- 2 files changed, 60 insertions(+), 60 deletions(-) (limited to 'src') diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 59631b78c..26be44f07 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -677,45 +677,45 @@ static const u32 sStatusFlagsForMoveEffects[] = static const u8* const sMoveEffectBS_Ptrs[] = { - BattleScript_MoveEffectSleep, // 0 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SLEEP - BattleScript_MoveEffectPoison, // MOVE_EFFECT_POISON - BattleScript_MoveEffectBurn, // MOVE_EFFECT_BURN - BattleScript_MoveEffectFreeze, // MOVE_EFFECT_FREEZE - BattleScript_MoveEffectParalysis, // MOVE_EFFECT_PARALYSIS - BattleScript_MoveEffectToxic, // MOVE_EFFECT_TOXIC - BattleScript_MoveEffectConfusion, // MOVE_EFFECT_CONFUSION - BattleScript_MoveEffectSleep, // MOVE_EFFECT_FLINCH - BattleScript_MoveEffectSleep, // MOVE_EFFECT_TRI_ATTACK - BattleScript_MoveEffectUproar, // MOVE_EFFECT_UPROAR - BattleScript_MoveEffectPayDay, // MOVE_EFFECT_PAYDAY - BattleScript_MoveEffectSleep, // MOVE_EFFECT_CHARGING - BattleScript_MoveEffectWrap, // MOVE_EFFECT_WRAP - BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_25 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RECHARGE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAGE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_STEAL_ITEM - BattleScript_MoveEffectSleep, // MOVE_EFFECT_PREVENT_ESCAPE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_NIGHTMARE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ALL_STATS_UP - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAPIDSPIN - BattleScript_MoveEffectSleep, // MOVE_EFFECT_REMOVE_PARALYSIS - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_DEF_DOWN - BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_33 + [0] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SLEEP] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_POISON] = BattleScript_MoveEffectPoison, + [MOVE_EFFECT_BURN] = BattleScript_MoveEffectBurn, + [MOVE_EFFECT_FREEZE] = BattleScript_MoveEffectFreeze, + [MOVE_EFFECT_PARALYSIS] = BattleScript_MoveEffectParalysis, + [MOVE_EFFECT_TOXIC] = BattleScript_MoveEffectToxic, + [MOVE_EFFECT_CONFUSION] = BattleScript_MoveEffectConfusion, + [MOVE_EFFECT_FLINCH] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_TRI_ATTACK] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_UPROAR] = BattleScript_MoveEffectUproar, + [MOVE_EFFECT_PAYDAY] = BattleScript_MoveEffectPayDay, + [MOVE_EFFECT_CHARGING] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_WRAP] = BattleScript_MoveEffectWrap, + [MOVE_EFFECT_RECOIL_25] = BattleScript_MoveEffectRecoil, + [MOVE_EFFECT_ATK_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_DEF_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SPD_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SP_ATK_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SP_DEF_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_ACC_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_EVS_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_ATK_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_DEF_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SPD_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SP_ATK_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SP_DEF_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_ACC_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_EVS_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_RECHARGE] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_RAGE] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_STEAL_ITEM] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_PREVENT_ESCAPE] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_NIGHTMARE] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_ALL_STATS_UP] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_RAPIDSPIN] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_REMOVE_PARALYSIS] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_ATK_DEF_DOWN] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_RECOIL_33] = BattleScript_MoveEffectRecoil, }; static const struct WindowTemplate sUnusedWinTemplate = {0, 1, 3, 7, 0xF, 0x1F, 0x3F}; @@ -768,26 +768,26 @@ static const u16 sProtectSuccessRates[] = {USHRT_MAX, USHRT_MAX / 2, USHRT_MAX / static const u16 sMovesForbiddenToCopy[] = { - MOVE_METRONOME, - MOVE_STRUGGLE, - MOVE_SKETCH, - MOVE_MIMIC, - MIMIC_FORBIDDEN_END, - MOVE_COUNTER, - MOVE_MIRROR_COAT, - MOVE_PROTECT, - MOVE_DETECT, - MOVE_ENDURE, - MOVE_DESTINY_BOND, - MOVE_SLEEP_TALK, - MOVE_THIEF, - MOVE_FOLLOW_ME, - MOVE_SNATCH, - MOVE_HELPING_HAND, - MOVE_COVET, - MOVE_TRICK, - MOVE_FOCUS_PUNCH, - METRONOME_FORBIDDEN_END + MOVE_METRONOME, + MOVE_STRUGGLE, + MOVE_SKETCH, + MOVE_MIMIC, + MIMIC_FORBIDDEN_END, + MOVE_COUNTER, + MOVE_MIRROR_COAT, + MOVE_PROTECT, + MOVE_DETECT, + MOVE_ENDURE, + MOVE_DESTINY_BOND, + MOVE_SLEEP_TALK, + MOVE_THIEF, + MOVE_FOLLOW_ME, + MOVE_SNATCH, + MOVE_HELPING_HAND, + MOVE_COVET, + MOVE_TRICK, + MOVE_FOCUS_PUNCH, + METRONOME_FORBIDDEN_END }; static const u8 sFlailHpScaleToPowerTable[] = diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 6aa7593ca..8c468d9f4 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -810,7 +810,7 @@ static const u8 sBackAnimNatureModTable[] = [NATURE_GENTLE] = 0x02, [NATURE_SASSY] = 0x01, [NATURE_CAREFUL] = 0x02, - 0x01, // NATURE_QUIRKY + [NATURE_QUIRKY] = 0x01, }; static const union AffineAnimCmd sSpriteAffineAnim_860AD48[] = -- cgit v1.2.3 From 907ed3f5f5537d14ed6136daeb81e38c383239c2 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Sat, 8 Dec 2018 11:39:35 +0800 Subject: Format pokemon.c --- src/pokemon.c | 1646 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 823 insertions(+), 823 deletions(-) (limited to 'src') diff --git a/src/pokemon.c b/src/pokemon.c index 7a7d672f5..eec995050 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1405,836 +1405,836 @@ const s8 gNatureStatTable[][5] = #include "data/pokemon/evolution.h" #include "data/pokemon/level_up_learnset_pointers.h" -// These two tables are zero-based. +// SPECIES_NONE are ignored in the following two tables, so decrement before accessing these arrays to get the right result static const u8 sMonFrontAnimIdsTable[] = { - [SPECIES_BULBASAUR-1] = 0x06, - [SPECIES_IVYSAUR-1] = 0x17, - [SPECIES_VENUSAUR-1] = 0x2f, - [SPECIES_CHARMANDER-1] = 0x52, - [SPECIES_CHARMELEON-1] = 0x25, - [SPECIES_CHARIZARD-1] = 0x10, - [SPECIES_SQUIRTLE-1] = 0x0b, - [SPECIES_WARTORTLE-1] = 0x13, - [SPECIES_BLASTOISE-1] = 0x19, - [SPECIES_CATERPIE-1] = 0x0b, - [SPECIES_METAPOD-1] = 0x0b, - [SPECIES_BUTTERFREE-1] = 0x1d, - [SPECIES_WEEDLE-1] = 0x46, - [SPECIES_KAKUNA-1] = 0x20, - [SPECIES_BEEDRILL-1] = 0x02, - [SPECIES_PIDGEY-1] = 0x47, - [SPECIES_PIDGEOTTO-1] = 0x17, - [SPECIES_PIDGEOT-1] = 0x29, - [SPECIES_RATTATA-1] = 0x43, - [SPECIES_RATICATE-1] = 0x2b, - [SPECIES_SPEAROW-1] = 0x18, - [SPECIES_FEAROW-1] = 0x2b, - [SPECIES_EKANS-1] = 0x16, - [SPECIES_ARBOK-1] = 0x17, - [SPECIES_PIKACHU-1] = 0x2c, - [SPECIES_RAICHU-1] = 0x17, - [SPECIES_SANDSHREW-1] = 0x2d, - [SPECIES_SANDSLASH-1] = 0x17, - [SPECIES_NIDORAN_F-1] = 0x00, - [SPECIES_NIDORINA-1] = 0x17, - [SPECIES_NIDOQUEEN-1] = 0x0f, - [SPECIES_NIDORAN_M-1] = 0x09, - [SPECIES_NIDORINO-1] = 0x13, - [SPECIES_NIDOKING-1] = 0x0f, - [SPECIES_CLEFAIRY-1] = 0x00, - [SPECIES_CLEFABLE-1] = 0x4a, - [SPECIES_VULPIX-1] = 0x17, - [SPECIES_NINETALES-1] = 0x10, - [SPECIES_JIGGLYPUFF-1] = 0x48, - [SPECIES_WIGGLYTUFF-1] = 0x31, - [SPECIES_ZUBAT-1] = 0x00, - [SPECIES_GOLBAT-1] = 0x1d, - [SPECIES_ODDISH-1] = 0x00, - [SPECIES_GLOOM-1] = 0x45, - [SPECIES_VILEPLUME-1] = 0x49, - [SPECIES_PARAS-1] = 0x46, - [SPECIES_PARASECT-1] = 0x0f, - [SPECIES_VENONAT-1] = 0x06, - [SPECIES_VENOMOTH-1] = 0x4b, - [SPECIES_DIGLETT-1] = 0x10, - [SPECIES_DUGTRIO-1] = 0x4c, - [SPECIES_MEOWTH-1] = 0x52, - [SPECIES_PERSIAN-1] = 0x17, - [SPECIES_PSYDUCK-1] = 0x06, - [SPECIES_GOLDUCK-1] = 0x4c, - [SPECIES_MANKEY-1] = 0x32, - [SPECIES_PRIMEAPE-1] = 0x48, - [SPECIES_GROWLITHE-1] = 0x25, - [SPECIES_ARCANINE-1] = 0x02, - [SPECIES_POLIWAG-1] = 0x00, - [SPECIES_POLIWHIRL-1] = 0x32, - [SPECIES_POLIWRATH-1] = 0x19, - [SPECIES_ABRA-1] = 0x31, - [SPECIES_KADABRA-1] = 0x09, - [SPECIES_ALAKAZAM-1] = 0x17, - [SPECIES_MACHOP-1] = 0x00, - [SPECIES_MACHOKE-1] = 0x10, - [SPECIES_MACHAMP-1] = 0x31, - [SPECIES_BELLSPROUT-1] = 0x17, - [SPECIES_WEEPINBELL-1] = 0x0d, - [SPECIES_VICTREEBEL-1] = 0x32, - [SPECIES_TENTACOOL-1] = 0x00, - [SPECIES_TENTACRUEL-1] = 0x00, - [SPECIES_GEODUDE-1] = 0x48, - [SPECIES_GRAVELER-1] = 0x48, - [SPECIES_GOLEM-1] = 0x2f, - [SPECIES_PONYTA-1] = 0x20, - [SPECIES_RAPIDASH-1] = 0x11, - [SPECIES_SLOWPOKE-1] = 0x45, - [SPECIES_SLOWBRO-1] = 0x0b, - [SPECIES_MAGNEMITE-1] = 0x54, - [SPECIES_MAGNETON-1] = 0x2c, - [SPECIES_FARFETCHD-1] = 0x48, - [SPECIES_DODUO-1] = 0x4c, - [SPECIES_DODRIO-1] = 0x41, - [SPECIES_SEEL-1] = 0x0b, - [SPECIES_DEWGONG-1] = 0x45, - [SPECIES_GRIMER-1] = 0x46, - [SPECIES_MUK-1] = 0x30, - [SPECIES_SHELLDER-1] = 0x12, - [SPECIES_CLOYSTER-1] = 0x1d, - [SPECIES_GASTLY-1] = 0x15, - [SPECIES_HAUNTER-1] = 0x35, - [SPECIES_GENGAR-1] = 0x3a, - [SPECIES_ONIX-1] = 0x43, - [SPECIES_DROWZEE-1] = 0x4f, - [SPECIES_HYPNO-1] = 0x09, - [SPECIES_KRABBY-1] = 0x03, - [SPECIES_KINGLER-1] = 0x4b, - [SPECIES_VOLTORB-1] = 0x00, - [SPECIES_ELECTRODE-1] = 0x00, - [SPECIES_EXEGGCUTE-1] = 0x46, - [SPECIES_EXEGGUTOR-1] = 0x32, - [SPECIES_CUBONE-1] = 0x48, - [SPECIES_MAROWAK-1] = 0x05, - [SPECIES_HITMONLEE-1] = 0x16, - [SPECIES_HITMONCHAN-1] = 0x09, - [SPECIES_LICKITUNG-1] = 0x45, - [SPECIES_KOFFING-1] = 0x13, - [SPECIES_WEEZING-1] = 0x04, - [SPECIES_RHYHORN-1] = 0x10, - [SPECIES_RHYDON-1] = 0x13, - [SPECIES_CHANSEY-1] = 0x45, - [SPECIES_TANGELA-1] = 0x48, - [SPECIES_KANGASKHAN-1] = 0x17, - [SPECIES_HORSEA-1] = 0x12, - [SPECIES_SEADRA-1] = 0x04, - [SPECIES_GOLDEEN-1] = 0x0d, - [SPECIES_SEAKING-1] = 0x1c, - [SPECIES_STARYU-1] = 0x4e, - [SPECIES_STARMIE-1] = 0x12, - [SPECIES_MR_MIME-1] = 0x46, - [SPECIES_SCYTHER-1] = 0x02, - [SPECIES_JYNX-1] = 0x17, - [SPECIES_ELECTABUZZ-1] = 0x2c, - [SPECIES_MAGMAR-1] = 0x0f, - [SPECIES_PINSIR-1] = 0x09, - [SPECIES_TAUROS-1] = 0x19, - [SPECIES_MAGIKARP-1] = 0x05, - [SPECIES_GYARADOS-1] = 0x48, - [SPECIES_LAPRAS-1] = 0x17, - [SPECIES_DITTO-1] = 0x01, - [SPECIES_EEVEE-1] = 0x17, - [SPECIES_VAPOREON-1] = 0x17, - [SPECIES_JOLTEON-1] = 0x00, - [SPECIES_FLAREON-1] = 0x17, - [SPECIES_PORYGON-1] = 0x52, - [SPECIES_OMANYTE-1] = 0x51, - [SPECIES_OMASTAR-1] = 0x09, - [SPECIES_KABUTO-1] = 0x1d, - [SPECIES_KABUTOPS-1] = 0x0f, - [SPECIES_AERODACTYL-1] = 0x47, - [SPECIES_SNORLAX-1] = 0x0b, - [SPECIES_ARTICUNO-1] = 0x09, - [SPECIES_ZAPDOS-1] = 0x2c, - [SPECIES_MOLTRES-1] = 0x45, - [SPECIES_DRATINI-1] = 0x00, - [SPECIES_DRAGONAIR-1] = 0x10, - [SPECIES_DRAGONITE-1] = 0x47, - [SPECIES_MEWTWO-1] = 0x09, - [SPECIES_MEW-1] = 0x0d, - [SPECIES_CHIKORITA-1] = 0x00, - [SPECIES_BAYLEEF-1] = 0x00, - [SPECIES_MEGANIUM-1] = 0x17, - [SPECIES_CYNDAQUIL-1] = 0x52, - [SPECIES_QUILAVA-1] = 0x17, - [SPECIES_TYPHLOSION-1] = 0x10, - [SPECIES_TOTODILE-1] = 0x31, - [SPECIES_CROCONAW-1] = 0x0f, - [SPECIES_FERALIGATR-1] = 0x0f, - [SPECIES_SENTRET-1] = 0x00, - [SPECIES_FURRET-1] = 0x32, - [SPECIES_HOOTHOOT-1] = 0x47, - [SPECIES_NOCTOWL-1] = 0x17, - [SPECIES_LEDYBA-1] = 0x52, - [SPECIES_LEDIAN-1] = 0x47, - [SPECIES_SPINARAK-1] = 0x4f, - [SPECIES_ARIADOS-1] = 0x0f, - [SPECIES_CROBAT-1] = 0x00, - [SPECIES_CHINCHOU-1] = 0x45, - [SPECIES_LANTURN-1] = 0x51, - [SPECIES_PICHU-1] = 0x1e, - [SPECIES_CLEFFA-1] = 0x52, - [SPECIES_IGGLYBUFF-1] = 0x0c, - [SPECIES_TOGEPI-1] = 0x0b, - [SPECIES_TOGETIC-1] = 0x00, - [SPECIES_NATU-1] = 0x31, - [SPECIES_XATU-1] = 0x09, - [SPECIES_MAREEP-1] = 0x00, - [SPECIES_FLAAFFY-1] = 0x1e, - [SPECIES_AMPHAROS-1] = 0x2c, - [SPECIES_BELLOSSOM-1] = 0x0b, - [SPECIES_MARILL-1] = 0x00, - [SPECIES_AZUMARILL-1] = 0x4a, - [SPECIES_SUDOWOODO-1] = 0x46, - [SPECIES_POLITOED-1] = 0x32, - [SPECIES_HOPPIP-1] = 0x1c, - [SPECIES_SKIPLOOM-1] = 0x18, - [SPECIES_JUMPLUFF-1] = 0x51, - [SPECIES_AIPOM-1] = 0x32, - [SPECIES_SUNKERN-1] = 0x52, - [SPECIES_SUNFLORA-1] = 0x00, - [SPECIES_YANMA-1] = 0x2b, - [SPECIES_WOOPER-1] = 0x00, - [SPECIES_QUAGSIRE-1] = 0x16, - [SPECIES_ESPEON-1] = 0x09, - [SPECIES_UMBREON-1] = 0x10, - [SPECIES_MURKROW-1] = 0x00, - [SPECIES_SLOWKING-1] = 0x13, - [SPECIES_MISDREAVUS-1] = 0x1c, - [SPECIES_UNOWN-1] = 0x0a, - [SPECIES_WOBBUFFET-1] = 0x30, - [SPECIES_GIRAFARIG-1] = 0x1e, - [SPECIES_PINECO-1] = 0x0b, - [SPECIES_FORRETRESS-1] = 0x10, - [SPECIES_DUNSPARCE-1] = 0x00, - [SPECIES_GLIGAR-1] = 0x13, - [SPECIES_STEELIX-1] = 0x0f, - [SPECIES_SNUBBULL-1] = 0x17, - [SPECIES_GRANBULL-1] = 0x10, - [SPECIES_QWILFISH-1] = 0x3a, - [SPECIES_SCIZOR-1] = 0x02, - [SPECIES_SHUCKLE-1] = 0x0b, - [SPECIES_HERACROSS-1] = 0x41, - [SPECIES_SNEASEL-1] = 0x16, - [SPECIES_TEDDIURSA-1] = 0x17, - [SPECIES_URSARING-1] = 0x10, - [SPECIES_SLUGMA-1] = 0x17, - [SPECIES_MAGCARGO-1] = 0x17, - [SPECIES_SWINUB-1] = 0x00, - [SPECIES_PILOSWINE-1] = 0x0f, - [SPECIES_CORSOLA-1] = 0x03, - [SPECIES_REMORAID-1] = 0x52, - [SPECIES_OCTILLERY-1] = 0x17, - [SPECIES_DELIBIRD-1] = 0x52, - [SPECIES_MANTINE-1] = 0x0d, - [SPECIES_SKARMORY-1] = 0x17, - [SPECIES_HOUNDOUR-1] = 0x17, - [SPECIES_HOUNDOOM-1] = 0x10, - [SPECIES_KINGDRA-1] = 0x42, - [SPECIES_PHANPY-1] = 0x32, - [SPECIES_DONPHAN-1] = 0x19, - [SPECIES_PORYGON2-1] = 0x00, - [SPECIES_STANTLER-1] = 0x00, - [SPECIES_SMEARGLE-1] = 0x31, - [SPECIES_TYROGUE-1] = 0x16, - [SPECIES_HITMONTOP-1] = 0x02, - [SPECIES_SMOOCHUM-1] = 0x09, - [SPECIES_ELEKID-1] = 0x2c, - [SPECIES_MAGBY-1] = 0x00, - [SPECIES_MILTANK-1] = 0x45, - [SPECIES_BLISSEY-1] = 0x00, - [SPECIES_RAIKOU-1] = 0x2c, - [SPECIES_ENTEI-1] = 0x09, - [SPECIES_SUICUNE-1] = 0x10, - [SPECIES_LARVITAR-1] = 0x52, - [SPECIES_PUPITAR-1] = 0x10, - [SPECIES_TYRANITAR-1] = 0x0f, - [SPECIES_LUGIA-1] = 0x3a, - [SPECIES_HO_OH-1] = 0x09, - [SPECIES_CELEBI-1] = 0x18, - [SPECIES_OLD_UNOWN_B-1] = 0x00, - [SPECIES_OLD_UNOWN_C-1] = 0x00, - [SPECIES_OLD_UNOWN_D-1] = 0x00, - [SPECIES_OLD_UNOWN_E-1] = 0x00, - [SPECIES_OLD_UNOWN_F-1] = 0x00, - [SPECIES_OLD_UNOWN_G-1] = 0x00, - [SPECIES_OLD_UNOWN_H-1] = 0x00, - [SPECIES_OLD_UNOWN_I-1] = 0x00, - [SPECIES_OLD_UNOWN_J-1] = 0x00, - [SPECIES_OLD_UNOWN_K-1] = 0x00, - [SPECIES_OLD_UNOWN_L-1] = 0x00, - [SPECIES_OLD_UNOWN_M-1] = 0x00, - [SPECIES_OLD_UNOWN_N-1] = 0x00, - [SPECIES_OLD_UNOWN_O-1] = 0x00, - [SPECIES_OLD_UNOWN_P-1] = 0x00, - [SPECIES_OLD_UNOWN_Q-1] = 0x00, - [SPECIES_OLD_UNOWN_R-1] = 0x00, - [SPECIES_OLD_UNOWN_S-1] = 0x00, - [SPECIES_OLD_UNOWN_T-1] = 0x00, - [SPECIES_OLD_UNOWN_U-1] = 0x00, - [SPECIES_OLD_UNOWN_V-1] = 0x00, - [SPECIES_OLD_UNOWN_W-1] = 0x00, - [SPECIES_OLD_UNOWN_X-1] = 0x00, - [SPECIES_OLD_UNOWN_Y-1] = 0x00, - [SPECIES_OLD_UNOWN_Z-1] = 0x00, - [SPECIES_TREECKO-1] = 0x00, - [SPECIES_GROVYLE-1] = 0x17, - [SPECIES_SCEPTILE-1] = 0x10, - [SPECIES_TORCHIC-1] = 0x16, - [SPECIES_COMBUSKEN-1] = 0x06, - [SPECIES_BLAZIKEN-1] = 0x0f, - [SPECIES_MUDKIP-1] = 0x01, - [SPECIES_MARSHTOMP-1] = 0x04, - [SPECIES_SWAMPERT-1] = 0x1e, - [SPECIES_POOCHYENA-1] = 0x10, - [SPECIES_MIGHTYENA-1] = 0x10, - [SPECIES_ZIGZAGOON-1] = 0x03, - [SPECIES_LINOONE-1] = 0x09, - [SPECIES_WURMPLE-1] = 0x00, - [SPECIES_SILCOON-1] = 0x00, - [SPECIES_BEAUTIFLY-1] = 0x04, - [SPECIES_CASCOON-1] = 0x04, - [SPECIES_DUSTOX-1] = 0x06, - [SPECIES_LOTAD-1] = 0x00, - [SPECIES_LOMBRE-1] = 0x00, - [SPECIES_LUDICOLO-1] = 0x49, - [SPECIES_SEEDOT-1] = 0x05, - [SPECIES_NUZLEAF-1] = 0x00, - [SPECIES_SHIFTRY-1] = 0x02, - [SPECIES_NINCADA-1] = 0x00, - [SPECIES_NINJASK-1] = 0x46, - [SPECIES_SHEDINJA-1] = 0x1c, - [SPECIES_TAILLOW-1] = 0x1e, - [SPECIES_SWELLOW-1] = 0x01, - [SPECIES_SHROOMISH-1] = 0x00, - [SPECIES_BRELOOM-1] = 0x00, - [SPECIES_SPINDA-1] = 0x31, - [SPECIES_WINGULL-1] = 0x1b, - [SPECIES_PELIPPER-1] = 0x1c, - [SPECIES_SURSKIT-1] = 0x00, - [SPECIES_MASQUERAIN-1] = 0x00, - [SPECIES_WAILMER-1] = 0x01, - [SPECIES_WAILORD-1] = 0x1c, - [SPECIES_SKITTY-1] = 0x00, - [SPECIES_DELCATTY-1] = 0x17, - [SPECIES_KECLEON-1] = 0x35, - [SPECIES_BALTOY-1] = 0x1d, - [SPECIES_CLAYDOL-1] = 0x51, - [SPECIES_NOSEPASS-1] = 0x49, - [SPECIES_TORKOAL-1] = 0x17, - [SPECIES_SABLEYE-1] = 0x15, - [SPECIES_BARBOACH-1] = 0x49, - [SPECIES_WHISCASH-1] = 0x49, - [SPECIES_LUVDISC-1] = 0x1d, - [SPECIES_CORPHISH-1] = 0x10, - [SPECIES_CRAWDAUNT-1] = 0x09, - [SPECIES_FEEBAS-1] = 0x49, - [SPECIES_MILOTIC-1] = 0x22, - [SPECIES_CARVANHA-1] = 0x49, - [SPECIES_SHARPEDO-1] = 0x56, - [SPECIES_TRAPINCH-1] = 0x10, - [SPECIES_VIBRAVA-1] = 0x0f, - [SPECIES_FLYGON-1] = 0x4b, - [SPECIES_MAKUHITA-1] = 0x0b, - [SPECIES_HARIYAMA-1] = 0x34, - [SPECIES_ELECTRIKE-1] = 0x00, - [SPECIES_MANECTRIC-1] = 0x00, - [SPECIES_NUMEL-1] = 0x04, - [SPECIES_CAMERUPT-1] = 0x10, - [SPECIES_SPHEAL-1] = 0x53, - [SPECIES_SEALEO-1] = 0x17, - [SPECIES_WALREIN-1] = 0x0f, - [SPECIES_CACNEA-1] = 0x49, - [SPECIES_CACTURNE-1] = 0x04, - [SPECIES_SNORUNT-1] = 0x45, - [SPECIES_GLALIE-1] = 0x0a, - [SPECIES_LUNATONE-1] = 0x0e, - [SPECIES_SOLROCK-1] = 0x08, - [SPECIES_AZURILL-1] = 0x00, - [SPECIES_SPOINK-1] = 0x56, - [SPECIES_GRUMPIG-1] = 0x32, - [SPECIES_PLUSLE-1] = 0x00, - [SPECIES_MINUN-1] = 0x01, - [SPECIES_MAWILE-1] = 0x00, - [SPECIES_MEDITITE-1] = 0x05, - [SPECIES_MEDICHAM-1] = 0x45, - [SPECIES_SWABLU-1] = 0x04, - [SPECIES_ALTARIA-1] = 0x16, - [SPECIES_WYNAUT-1] = 0x32, - [SPECIES_DUSKULL-1] = 0x0a, - [SPECIES_DUSCLOPS-1] = 0x02, - [SPECIES_ROSELIA-1] = 0x45, - [SPECIES_SLAKOTH-1] = 0x45, - [SPECIES_VIGOROTH-1] = 0x31, - [SPECIES_SLAKING-1] = 0x45, - [SPECIES_GULPIN-1] = 0x00, - [SPECIES_SWALOT-1] = 0x45, - [SPECIES_TROPIUS-1] = 0x10, - [SPECIES_WHISMUR-1] = 0x03, - [SPECIES_LOUDRED-1] = 0x49, - [SPECIES_EXPLOUD-1] = 0x19, - [SPECIES_CLAMPERL-1] = 0x12, - [SPECIES_HUNTAIL-1] = 0x09, - [SPECIES_GOREBYSS-1] = 0x1c, - [SPECIES_ABSOL-1] = 0x11, - [SPECIES_SHUPPET-1] = 0x1c, - [SPECIES_BANETTE-1] = 0x0d, - [SPECIES_SEVIPER-1] = 0x17, - [SPECIES_ZANGOOSE-1] = 0x09, - [SPECIES_RELICANTH-1] = 0x1a, - [SPECIES_ARON-1] = 0x45, - [SPECIES_LAIRON-1] = 0x00, - [SPECIES_AGGRON-1] = 0x19, - [SPECIES_CASTFORM-1] = 0x1d, - [SPECIES_VOLBEAT-1] = 0x00, - [SPECIES_ILLUMISE-1] = 0x05, - [SPECIES_LILEEP-1] = 0x17, - [SPECIES_CRADILY-1] = 0x19, - [SPECIES_ANORITH-1] = 0x12, - [SPECIES_ARMALDO-1] = 0x10, - [SPECIES_RALTS-1] = 0x45, - [SPECIES_KIRLIA-1] = 0x00, - [SPECIES_GARDEVOIR-1] = 0x00, - [SPECIES_BAGON-1] = 0x19, - [SPECIES_SHELGON-1] = 0x04, - [SPECIES_SALAMENCE-1] = 0x0f, - [SPECIES_BELDUM-1] = 0x0f, - [SPECIES_METANG-1] = 0x04, - [SPECIES_METAGROSS-1] = 0x10, - [SPECIES_REGIROCK-1] = 0x01, - [SPECIES_REGICE-1] = 0x44, - [SPECIES_REGISTEEL-1] = 0x09, - [SPECIES_KYOGRE-1] = 0x2d, - [SPECIES_GROUDON-1] = 0x10, - [SPECIES_RAYQUAZA-1] = 0x0f, - [SPECIES_LATIAS-1] = 0x2d, - [SPECIES_LATIOS-1] = 0x10, - [SPECIES_JIRACHI-1] = 0x0d, - [SPECIES_DEOXYS-1] = 0x1b, - [SPECIES_CHIMECHO-1] = 0x1d, + [SPECIES_BULBASAUR - 1] = 0x06, + [SPECIES_IVYSAUR - 1] = 0x17, + [SPECIES_VENUSAUR - 1] = 0x2f, + [SPECIES_CHARMANDER - 1] = 0x52, + [SPECIES_CHARMELEON - 1] = 0x25, + [SPECIES_CHARIZARD - 1] = 0x10, + [SPECIES_SQUIRTLE - 1] = 0x0b, + [SPECIES_WARTORTLE - 1] = 0x13, + [SPECIES_BLASTOISE - 1] = 0x19, + [SPECIES_CATERPIE - 1] = 0x0b, + [SPECIES_METAPOD - 1] = 0x0b, + [SPECIES_BUTTERFREE - 1] = 0x1d, + [SPECIES_WEEDLE - 1] = 0x46, + [SPECIES_KAKUNA - 1] = 0x20, + [SPECIES_BEEDRILL - 1] = 0x02, + [SPECIES_PIDGEY - 1] = 0x47, + [SPECIES_PIDGEOTTO - 1] = 0x17, + [SPECIES_PIDGEOT - 1] = 0x29, + [SPECIES_RATTATA - 1] = 0x43, + [SPECIES_RATICATE - 1] = 0x2b, + [SPECIES_SPEAROW - 1] = 0x18, + [SPECIES_FEAROW - 1] = 0x2b, + [SPECIES_EKANS - 1] = 0x16, + [SPECIES_ARBOK - 1] = 0x17, + [SPECIES_PIKACHU - 1] = 0x2c, + [SPECIES_RAICHU - 1] = 0x17, + [SPECIES_SANDSHREW - 1] = 0x2d, + [SPECIES_SANDSLASH - 1] = 0x17, + [SPECIES_NIDORAN_F - 1] = 0x00, + [SPECIES_NIDORINA - 1] = 0x17, + [SPECIES_NIDOQUEEN - 1] = 0x0f, + [SPECIES_NIDORAN_M - 1] = 0x09, + [SPECIES_NIDORINO - 1] = 0x13, + [SPECIES_NIDOKING - 1] = 0x0f, + [SPECIES_CLEFAIRY - 1] = 0x00, + [SPECIES_CLEFABLE - 1] = 0x4a, + [SPECIES_VULPIX - 1] = 0x17, + [SPECIES_NINETALES - 1] = 0x10, + [SPECIES_JIGGLYPUFF - 1] = 0x48, + [SPECIES_WIGGLYTUFF - 1] = 0x31, + [SPECIES_ZUBAT - 1] = 0x00, + [SPECIES_GOLBAT - 1] = 0x1d, + [SPECIES_ODDISH - 1] = 0x00, + [SPECIES_GLOOM - 1] = 0x45, + [SPECIES_VILEPLUME - 1] = 0x49, + [SPECIES_PARAS - 1] = 0x46, + [SPECIES_PARASECT - 1] = 0x0f, + [SPECIES_VENONAT - 1] = 0x06, + [SPECIES_VENOMOTH - 1] = 0x4b, + [SPECIES_DIGLETT - 1] = 0x10, + [SPECIES_DUGTRIO - 1] = 0x4c, + [SPECIES_MEOWTH - 1] = 0x52, + [SPECIES_PERSIAN - 1] = 0x17, + [SPECIES_PSYDUCK - 1] = 0x06, + [SPECIES_GOLDUCK - 1] = 0x4c, + [SPECIES_MANKEY - 1] = 0x32, + [SPECIES_PRIMEAPE - 1] = 0x48, + [SPECIES_GROWLITHE - 1] = 0x25, + [SPECIES_ARCANINE - 1] = 0x02, + [SPECIES_POLIWAG - 1] = 0x00, + [SPECIES_POLIWHIRL - 1] = 0x32, + [SPECIES_POLIWRATH - 1] = 0x19, + [SPECIES_ABRA - 1] = 0x31, + [SPECIES_KADABRA - 1] = 0x09, + [SPECIES_ALAKAZAM - 1] = 0x17, + [SPECIES_MACHOP - 1] = 0x00, + [SPECIES_MACHOKE - 1] = 0x10, + [SPECIES_MACHAMP - 1] = 0x31, + [SPECIES_BELLSPROUT - 1] = 0x17, + [SPECIES_WEEPINBELL - 1] = 0x0d, + [SPECIES_VICTREEBEL - 1] = 0x32, + [SPECIES_TENTACOOL - 1] = 0x00, + [SPECIES_TENTACRUEL - 1] = 0x00, + [SPECIES_GEODUDE - 1] = 0x48, + [SPECIES_GRAVELER - 1] = 0x48, + [SPECIES_GOLEM - 1] = 0x2f, + [SPECIES_PONYTA - 1] = 0x20, + [SPECIES_RAPIDASH - 1] = 0x11, + [SPECIES_SLOWPOKE - 1] = 0x45, + [SPECIES_SLOWBRO - 1] = 0x0b, + [SPECIES_MAGNEMITE - 1] = 0x54, + [SPECIES_MAGNETON - 1] = 0x2c, + [SPECIES_FARFETCHD - 1] = 0x48, + [SPECIES_DODUO - 1] = 0x4c, + [SPECIES_DODRIO - 1] = 0x41, + [SPECIES_SEEL - 1] = 0x0b, + [SPECIES_DEWGONG - 1] = 0x45, + [SPECIES_GRIMER - 1] = 0x46, + [SPECIES_MUK - 1] = 0x30, + [SPECIES_SHELLDER - 1] = 0x12, + [SPECIES_CLOYSTER - 1] = 0x1d, + [SPECIES_GASTLY - 1] = 0x15, + [SPECIES_HAUNTER - 1] = 0x35, + [SPECIES_GENGAR - 1] = 0x3a, + [SPECIES_ONIX - 1] = 0x43, + [SPECIES_DROWZEE - 1] = 0x4f, + [SPECIES_HYPNO - 1] = 0x09, + [SPECIES_KRABBY - 1] = 0x03, + [SPECIES_KINGLER - 1] = 0x4b, + [SPECIES_VOLTORB - 1] = 0x00, + [SPECIES_ELECTRODE - 1] = 0x00, + [SPECIES_EXEGGCUTE - 1] = 0x46, + [SPECIES_EXEGGUTOR - 1] = 0x32, + [SPECIES_CUBONE - 1] = 0x48, + [SPECIES_MAROWAK - 1] = 0x05, + [SPECIES_HITMONLEE - 1] = 0x16, + [SPECIES_HITMONCHAN - 1] = 0x09, + [SPECIES_LICKITUNG - 1] = 0x45, + [SPECIES_KOFFING - 1] = 0x13, + [SPECIES_WEEZING - 1] = 0x04, + [SPECIES_RHYHORN - 1] = 0x10, + [SPECIES_RHYDON - 1] = 0x13, + [SPECIES_CHANSEY - 1] = 0x45, + [SPECIES_TANGELA - 1] = 0x48, + [SPECIES_KANGASKHAN - 1] = 0x17, + [SPECIES_HORSEA - 1] = 0x12, + [SPECIES_SEADRA - 1] = 0x04, + [SPECIES_GOLDEEN - 1] = 0x0d, + [SPECIES_SEAKING - 1] = 0x1c, + [SPECIES_STARYU - 1] = 0x4e, + [SPECIES_STARMIE - 1] = 0x12, + [SPECIES_MR_MIME - 1] = 0x46, + [SPECIES_SCYTHER - 1] = 0x02, + [SPECIES_JYNX - 1] = 0x17, + [SPECIES_ELECTABUZZ - 1] = 0x2c, + [SPECIES_MAGMAR - 1] = 0x0f, + [SPECIES_PINSIR - 1] = 0x09, + [SPECIES_TAUROS - 1] = 0x19, + [SPECIES_MAGIKARP - 1] = 0x05, + [SPECIES_GYARADOS - 1] = 0x48, + [SPECIES_LAPRAS - 1] = 0x17, + [SPECIES_DITTO - 1] = 0x01, + [SPECIES_EEVEE - 1] = 0x17, + [SPECIES_VAPOREON - 1] = 0x17, + [SPECIES_JOLTEON - 1] = 0x00, + [SPECIES_FLAREON - 1] = 0x17, + [SPECIES_PORYGON - 1] = 0x52, + [SPECIES_OMANYTE - 1] = 0x51, + [SPECIES_OMASTAR - 1] = 0x09, + [SPECIES_KABUTO - 1] = 0x1d, + [SPECIES_KABUTOPS - 1] = 0x0f, + [SPECIES_AERODACTYL - 1] = 0x47, + [SPECIES_SNORLAX - 1] = 0x0b, + [SPECIES_ARTICUNO - 1] = 0x09, + [SPECIES_ZAPDOS - 1] = 0x2c, + [SPECIES_MOLTRES - 1] = 0x45, + [SPECIES_DRATINI - 1] = 0x00, + [SPECIES_DRAGONAIR - 1] = 0x10, + [SPECIES_DRAGONITE - 1] = 0x47, + [SPECIES_MEWTWO - 1] = 0x09, + [SPECIES_MEW - 1] = 0x0d, + [SPECIES_CHIKORITA - 1] = 0x00, + [SPECIES_BAYLEEF - 1] = 0x00, + [SPECIES_MEGANIUM - 1] = 0x17, + [SPECIES_CYNDAQUIL - 1] = 0x52, + [SPECIES_QUILAVA - 1] = 0x17, + [SPECIES_TYPHLOSION - 1] = 0x10, + [SPECIES_TOTODILE - 1] = 0x31, + [SPECIES_CROCONAW - 1] = 0x0f, + [SPECIES_FERALIGATR - 1] = 0x0f, + [SPECIES_SENTRET - 1] = 0x00, + [SPECIES_FURRET - 1] = 0x32, + [SPECIES_HOOTHOOT - 1] = 0x47, + [SPECIES_NOCTOWL - 1] = 0x17, + [SPECIES_LEDYBA - 1] = 0x52, + [SPECIES_LEDIAN - 1] = 0x47, + [SPECIES_SPINARAK - 1] = 0x4f, + [SPECIES_ARIADOS - 1] = 0x0f, + [SPECIES_CROBAT - 1] = 0x00, + [SPECIES_CHINCHOU - 1] = 0x45, + [SPECIES_LANTURN - 1] = 0x51, + [SPECIES_PICHU - 1] = 0x1e, + [SPECIES_CLEFFA - 1] = 0x52, + [SPECIES_IGGLYBUFF - 1] = 0x0c, + [SPECIES_TOGEPI - 1] = 0x0b, + [SPECIES_TOGETIC - 1] = 0x00, + [SPECIES_NATU - 1] = 0x31, + [SPECIES_XATU - 1] = 0x09, + [SPECIES_MAREEP - 1] = 0x00, + [SPECIES_FLAAFFY - 1] = 0x1e, + [SPECIES_AMPHAROS - 1] = 0x2c, + [SPECIES_BELLOSSOM - 1] = 0x0b, + [SPECIES_MARILL - 1] = 0x00, + [SPECIES_AZUMARILL - 1] = 0x4a, + [SPECIES_SUDOWOODO - 1] = 0x46, + [SPECIES_POLITOED - 1] = 0x32, + [SPECIES_HOPPIP - 1] = 0x1c, + [SPECIES_SKIPLOOM - 1] = 0x18, + [SPECIES_JUMPLUFF - 1] = 0x51, + [SPECIES_AIPOM - 1] = 0x32, + [SPECIES_SUNKERN - 1] = 0x52, + [SPECIES_SUNFLORA - 1] = 0x00, + [SPECIES_YANMA - 1] = 0x2b, + [SPECIES_WOOPER - 1] = 0x00, + [SPECIES_QUAGSIRE - 1] = 0x16, + [SPECIES_ESPEON - 1] = 0x09, + [SPECIES_UMBREON - 1] = 0x10, + [SPECIES_MURKROW - 1] = 0x00, + [SPECIES_SLOWKING - 1] = 0x13, + [SPECIES_MISDREAVUS - 1] = 0x1c, + [SPECIES_UNOWN - 1] = 0x0a, + [SPECIES_WOBBUFFET - 1] = 0x30, + [SPECIES_GIRAFARIG - 1] = 0x1e, + [SPECIES_PINECO - 1] = 0x0b, + [SPECIES_FORRETRESS - 1] = 0x10, + [SPECIES_DUNSPARCE - 1] = 0x00, + [SPECIES_GLIGAR - 1] = 0x13, + [SPECIES_STEELIX - 1] = 0x0f, + [SPECIES_SNUBBULL - 1] = 0x17, + [SPECIES_GRANBULL - 1] = 0x10, + [SPECIES_QWILFISH - 1] = 0x3a, + [SPECIES_SCIZOR - 1] = 0x02, + [SPECIES_SHUCKLE - 1] = 0x0b, + [SPECIES_HERACROSS - 1] = 0x41, + [SPECIES_SNEASEL - 1] = 0x16, + [SPECIES_TEDDIURSA - 1] = 0x17, + [SPECIES_URSARING - 1] = 0x10, + [SPECIES_SLUGMA - 1] = 0x17, + [SPECIES_MAGCARGO - 1] = 0x17, + [SPECIES_SWINUB - 1] = 0x00, + [SPECIES_PILOSWINE - 1] = 0x0f, + [SPECIES_CORSOLA - 1] = 0x03, + [SPECIES_REMORAID - 1] = 0x52, + [SPECIES_OCTILLERY - 1] = 0x17, + [SPECIES_DELIBIRD - 1] = 0x52, + [SPECIES_MANTINE - 1] = 0x0d, + [SPECIES_SKARMORY - 1] = 0x17, + [SPECIES_HOUNDOUR - 1] = 0x17, + [SPECIES_HOUNDOOM - 1] = 0x10, + [SPECIES_KINGDRA - 1] = 0x42, + [SPECIES_PHANPY - 1] = 0x32, + [SPECIES_DONPHAN - 1] = 0x19, + [SPECIES_PORYGON2 - 1] = 0x00, + [SPECIES_STANTLER - 1] = 0x00, + [SPECIES_SMEARGLE - 1] = 0x31, + [SPECIES_TYROGUE - 1] = 0x16, + [SPECIES_HITMONTOP - 1] = 0x02, + [SPECIES_SMOOCHUM - 1] = 0x09, + [SPECIES_ELEKID - 1] = 0x2c, + [SPECIES_MAGBY - 1] = 0x00, + [SPECIES_MILTANK - 1] = 0x45, + [SPECIES_BLISSEY - 1] = 0x00, + [SPECIES_RAIKOU - 1] = 0x2c, + [SPECIES_ENTEI - 1] = 0x09, + [SPECIES_SUICUNE - 1] = 0x10, + [SPECIES_LARVITAR - 1] = 0x52, + [SPECIES_PUPITAR - 1] = 0x10, + [SPECIES_TYRANITAR - 1] = 0x0f, + [SPECIES_LUGIA - 1] = 0x3a, + [SPECIES_HO_OH - 1] = 0x09, + [SPECIES_CELEBI - 1] = 0x18, + [SPECIES_OLD_UNOWN_B - 1] = 0x00, + [SPECIES_OLD_UNOWN_C - 1] = 0x00, + [SPECIES_OLD_UNOWN_D - 1] = 0x00, + [SPECIES_OLD_UNOWN_E - 1] = 0x00, + [SPECIES_OLD_UNOWN_F - 1] = 0x00, + [SPECIES_OLD_UNOWN_G - 1] = 0x00, + [SPECIES_OLD_UNOWN_H - 1] = 0x00, + [SPECIES_OLD_UNOWN_I - 1] = 0x00, + [SPECIES_OLD_UNOWN_J - 1] = 0x00, + [SPECIES_OLD_UNOWN_K - 1] = 0x00, + [SPECIES_OLD_UNOWN_L - 1] = 0x00, + [SPECIES_OLD_UNOWN_M - 1] = 0x00, + [SPECIES_OLD_UNOWN_N - 1] = 0x00, + [SPECIES_OLD_UNOWN_O - 1] = 0x00, + [SPECIES_OLD_UNOWN_P - 1] = 0x00, + [SPECIES_OLD_UNOWN_Q - 1] = 0x00, + [SPECIES_OLD_UNOWN_R - 1] = 0x00, + [SPECIES_OLD_UNOWN_S - 1] = 0x00, + [SPECIES_OLD_UNOWN_T - 1] = 0x00, + [SPECIES_OLD_UNOWN_U - 1] = 0x00, + [SPECIES_OLD_UNOWN_V - 1] = 0x00, + [SPECIES_OLD_UNOWN_W - 1] = 0x00, + [SPECIES_OLD_UNOWN_X - 1] = 0x00, + [SPECIES_OLD_UNOWN_Y - 1] = 0x00, + [SPECIES_OLD_UNOWN_Z - 1] = 0x00, + [SPECIES_TREECKO - 1] = 0x00, + [SPECIES_GROVYLE - 1] = 0x17, + [SPECIES_SCEPTILE - 1] = 0x10, + [SPECIES_TORCHIC - 1] = 0x16, + [SPECIES_COMBUSKEN - 1] = 0x06, + [SPECIES_BLAZIKEN - 1] = 0x0f, + [SPECIES_MUDKIP - 1] = 0x01, + [SPECIES_MARSHTOMP - 1] = 0x04, + [SPECIES_SWAMPERT - 1] = 0x1e, + [SPECIES_POOCHYENA - 1] = 0x10, + [SPECIES_MIGHTYENA - 1] = 0x10, + [SPECIES_ZIGZAGOON - 1] = 0x03, + [SPECIES_LINOONE - 1] = 0x09, + [SPECIES_WURMPLE - 1] = 0x00, + [SPECIES_SILCOON - 1] = 0x00, + [SPECIES_BEAUTIFLY - 1] = 0x04, + [SPECIES_CASCOON - 1] = 0x04, + [SPECIES_DUSTOX - 1] = 0x06, + [SPECIES_LOTAD - 1] = 0x00, + [SPECIES_LOMBRE - 1] = 0x00, + [SPECIES_LUDICOLO - 1] = 0x49, + [SPECIES_SEEDOT - 1] = 0x05, + [SPECIES_NUZLEAF - 1] = 0x00, + [SPECIES_SHIFTRY - 1] = 0x02, + [SPECIES_NINCADA - 1] = 0x00, + [SPECIES_NINJASK - 1] = 0x46, + [SPECIES_SHEDINJA - 1] = 0x1c, + [SPECIES_TAILLOW - 1] = 0x1e, + [SPECIES_SWELLOW - 1] = 0x01, + [SPECIES_SHROOMISH - 1] = 0x00, + [SPECIES_BRELOOM - 1] = 0x00, + [SPECIES_SPINDA - 1] = 0x31, + [SPECIES_WINGULL - 1] = 0x1b, + [SPECIES_PELIPPER - 1] = 0x1c, + [SPECIES_SURSKIT - 1] = 0x00, + [SPECIES_MASQUERAIN - 1] = 0x00, + [SPECIES_WAILMER - 1] = 0x01, + [SPECIES_WAILORD - 1] = 0x1c, + [SPECIES_SKITTY - 1] = 0x00, + [SPECIES_DELCATTY - 1] = 0x17, + [SPECIES_KECLEON - 1] = 0x35, + [SPECIES_BALTOY - 1] = 0x1d, + [SPECIES_CLAYDOL - 1] = 0x51, + [SPECIES_NOSEPASS - 1] = 0x49, + [SPECIES_TORKOAL - 1] = 0x17, + [SPECIES_SABLEYE - 1] = 0x15, + [SPECIES_BARBOACH - 1] = 0x49, + [SPECIES_WHISCASH - 1] = 0x49, + [SPECIES_LUVDISC - 1] = 0x1d, + [SPECIES_CORPHISH - 1] = 0x10, + [SPECIES_CRAWDAUNT - 1] = 0x09, + [SPECIES_FEEBAS - 1] = 0x49, + [SPECIES_MILOTIC - 1] = 0x22, + [SPECIES_CARVANHA - 1] = 0x49, + [SPECIES_SHARPEDO - 1] = 0x56, + [SPECIES_TRAPINCH - 1] = 0x10, + [SPECIES_VIBRAVA - 1] = 0x0f, + [SPECIES_FLYGON - 1] = 0x4b, + [SPECIES_MAKUHITA - 1] = 0x0b, + [SPECIES_HARIYAMA - 1] = 0x34, + [SPECIES_ELECTRIKE - 1] = 0x00, + [SPECIES_MANECTRIC - 1] = 0x00, + [SPECIES_NUMEL - 1] = 0x04, + [SPECIES_CAMERUPT - 1] = 0x10, + [SPECIES_SPHEAL - 1] = 0x53, + [SPECIES_SEALEO - 1] = 0x17, + [SPECIES_WALREIN - 1] = 0x0f, + [SPECIES_CACNEA - 1] = 0x49, + [SPECIES_CACTURNE - 1] = 0x04, + [SPECIES_SNORUNT - 1] = 0x45, + [SPECIES_GLALIE - 1] = 0x0a, + [SPECIES_LUNATONE - 1] = 0x0e, + [SPECIES_SOLROCK - 1] = 0x08, + [SPECIES_AZURILL - 1] = 0x00, + [SPECIES_SPOINK - 1] = 0x56, + [SPECIES_GRUMPIG - 1] = 0x32, + [SPECIES_PLUSLE - 1] = 0x00, + [SPECIES_MINUN - 1] = 0x01, + [SPECIES_MAWILE - 1] = 0x00, + [SPECIES_MEDITITE - 1] = 0x05, + [SPECIES_MEDICHAM - 1] = 0x45, + [SPECIES_SWABLU - 1] = 0x04, + [SPECIES_ALTARIA - 1] = 0x16, + [SPECIES_WYNAUT - 1] = 0x32, + [SPECIES_DUSKULL - 1] = 0x0a, + [SPECIES_DUSCLOPS - 1] = 0x02, + [SPECIES_ROSELIA - 1] = 0x45, + [SPECIES_SLAKOTH - 1] = 0x45, + [SPECIES_VIGOROTH - 1] = 0x31, + [SPECIES_SLAKING - 1] = 0x45, + [SPECIES_GULPIN - 1] = 0x00, + [SPECIES_SWALOT - 1] = 0x45, + [SPECIES_TROPIUS - 1] = 0x10, + [SPECIES_WHISMUR - 1] = 0x03, + [SPECIES_LOUDRED - 1] = 0x49, + [SPECIES_EXPLOUD - 1] = 0x19, + [SPECIES_CLAMPERL - 1] = 0x12, + [SPECIES_HUNTAIL - 1] = 0x09, + [SPECIES_GOREBYSS - 1] = 0x1c, + [SPECIES_ABSOL - 1] = 0x11, + [SPECIES_SHUPPET - 1] = 0x1c, + [SPECIES_BANETTE - 1] = 0x0d, + [SPECIES_SEVIPER - 1] = 0x17, + [SPECIES_ZANGOOSE - 1] = 0x09, + [SPECIES_RELICANTH - 1] = 0x1a, + [SPECIES_ARON - 1] = 0x45, + [SPECIES_LAIRON - 1] = 0x00, + [SPECIES_AGGRON - 1] = 0x19, + [SPECIES_CASTFORM - 1] = 0x1d, + [SPECIES_VOLBEAT - 1] = 0x00, + [SPECIES_ILLUMISE - 1] = 0x05, + [SPECIES_LILEEP - 1] = 0x17, + [SPECIES_CRADILY - 1] = 0x19, + [SPECIES_ANORITH - 1] = 0x12, + [SPECIES_ARMALDO - 1] = 0x10, + [SPECIES_RALTS - 1] = 0x45, + [SPECIES_KIRLIA - 1] = 0x00, + [SPECIES_GARDEVOIR - 1] = 0x00, + [SPECIES_BAGON - 1] = 0x19, + [SPECIES_SHELGON - 1] = 0x04, + [SPECIES_SALAMENCE - 1] = 0x0f, + [SPECIES_BELDUM - 1] = 0x0f, + [SPECIES_METANG - 1] = 0x04, + [SPECIES_METAGROSS - 1] = 0x10, + [SPECIES_REGIROCK - 1] = 0x01, + [SPECIES_REGICE - 1] = 0x44, + [SPECIES_REGISTEEL - 1] = 0x09, + [SPECIES_KYOGRE - 1] = 0x2d, + [SPECIES_GROUDON - 1] = 0x10, + [SPECIES_RAYQUAZA - 1] = 0x0f, + [SPECIES_LATIAS - 1] = 0x2d, + [SPECIES_LATIOS - 1] = 0x10, + [SPECIES_JIRACHI - 1] = 0x0d, + [SPECIES_DEOXYS - 1] = 0x1b, + [SPECIES_CHIMECHO - 1] = 0x1d, }; static const u8 sMonAnimationDelayTable[] = { - [SPECIES_BULBASAUR-1] = 0x00, - [SPECIES_IVYSAUR-1] = 0x00, - [SPECIES_VENUSAUR-1] = 0x00, - [SPECIES_CHARMANDER-1] = 0x00, - [SPECIES_CHARMELEON-1] = 0x00, - [SPECIES_CHARIZARD-1] = 0x00, - [SPECIES_SQUIRTLE-1] = 0x00, - [SPECIES_WARTORTLE-1] = 0x00, - [SPECIES_BLASTOISE-1] = 0x32, - [SPECIES_CATERPIE-1] = 0x00, - [SPECIES_METAPOD-1] = 0x00, - [SPECIES_BUTTERFREE-1] = 0x00, - [SPECIES_WEEDLE-1] = 0x0a, - [SPECIES_KAKUNA-1] = 0x14, - [SPECIES_BEEDRILL-1] = 0x23, - [SPECIES_PIDGEY-1] = 0x00, - [SPECIES_PIDGEOTTO-1] = 0x19, - [SPECIES_PIDGEOT-1] = 0x00, - [SPECIES_RATTATA-1] = 0x00, - [SPECIES_RATICATE-1] = 0x00, - [SPECIES_SPEAROW-1] = 0x00, - [SPECIES_FEAROW-1] = 0x02, - [SPECIES_EKANS-1] = 0x1e, - [SPECIES_ARBOK-1] = 0x00, - [SPECIES_PIKACHU-1] = 0x00, - [SPECIES_RAICHU-1] = 0x00, - [SPECIES_SANDSHREW-1] = 0x00, - [SPECIES_SANDSLASH-1] = 0x00, - [SPECIES_NIDORAN_F-1] = 0x1c, - [SPECIES_NIDORINA-1] = 0x00, - [SPECIES_NIDOQUEEN-1] = 0x00, - [SPECIES_NIDORAN_M-1] = 0x00, - [SPECIES_NIDORINO-1] = 0x00, - [SPECIES_NIDOKING-1] = 0x19, - [SPECIES_CLEFAIRY-1] = 0x00, - [SPECIES_CLEFABLE-1] = 0x00, - [SPECIES_VULPIX-1] = 0x00, - [SPECIES_NINETALES-1] = 0x00, - [SPECIES_JIGGLYPUFF-1] = 0x00, - [SPECIES_WIGGLYTUFF-1] = 0x00, - [SPECIES_ZUBAT-1] = 0x00, - [SPECIES_GOLBAT-1] = 0x00, - [SPECIES_ODDISH-1] = 0x00, - [SPECIES_GLOOM-1] = 0x00, - [SPECIES_VILEPLUME-1] = 0x00, - [SPECIES_PARAS-1] = 0x0a, - [SPECIES_PARASECT-1] = 0x2d, - [SPECIES_VENONAT-1] = 0x14, - [SPECIES_VENOMOTH-1] = 0x00, - [SPECIES_DIGLETT-1] = 0x19, - [SPECIES_DUGTRIO-1] = 0x23, - [SPECIES_MEOWTH-1] = 0x28, - [SPECIES_PERSIAN-1] = 0x14, - [SPECIES_PSYDUCK-1] = 0x00, - [SPECIES_GOLDUCK-1] = 0x00, - [SPECIES_MANKEY-1] = 0x14, - [SPECIES_PRIMEAPE-1] = 0x00, - [SPECIES_GROWLITHE-1] = 0x1e, - [SPECIES_ARCANINE-1] = 0x28, - [SPECIES_POLIWAG-1] = 0x00, - [SPECIES_POLIWHIRL-1] = 0x05, - [SPECIES_POLIWRATH-1] = 0x00, - [SPECIES_ABRA-1] = 0x00, - [SPECIES_KADABRA-1] = 0x00, - [SPECIES_ALAKAZAM-1] = 0x00, - [SPECIES_MACHOP-1] = 0x00, - [SPECIES_MACHOKE-1] = 0x00, - [SPECIES_MACHAMP-1] = 0x00, - [SPECIES_BELLSPROUT-1] = 0x00, - [SPECIES_WEEPINBELL-1] = 0x03, - [SPECIES_VICTREEBEL-1] = 0x00, - [SPECIES_TENTACOOL-1] = 0x00, - [SPECIES_TENTACRUEL-1] = 0x00, - [SPECIES_GEODUDE-1] = 0x00, - [SPECIES_GRAVELER-1] = 0x00, - [SPECIES_GOLEM-1] = 0x00, - [SPECIES_PONYTA-1] = 0x00, - [SPECIES_RAPIDASH-1] = 0x00, - [SPECIES_SLOWPOKE-1] = 0x00, - [SPECIES_SLOWBRO-1] = 0x00, - [SPECIES_MAGNEMITE-1] = 0x00, - [SPECIES_MAGNETON-1] = 0x00, - [SPECIES_FARFETCHD-1] = 0x00, - [SPECIES_DODUO-1] = 0x00, - [SPECIES_DODRIO-1] = 0x00, - [SPECIES_SEEL-1] = 0x00, - [SPECIES_DEWGONG-1] = 0x00, - [SPECIES_GRIMER-1] = 0x00, - [SPECIES_MUK-1] = 0x2d, - [SPECIES_SHELLDER-1] = 0x14, - [SPECIES_CLOYSTER-1] = 0x00, - [SPECIES_GASTLY-1] = 0x00, - [SPECIES_HAUNTER-1] = 0x17, - [SPECIES_GENGAR-1] = 0x00, - [SPECIES_ONIX-1] = 0x00, - [SPECIES_DROWZEE-1] = 0x30, - [SPECIES_HYPNO-1] = 0x28, - [SPECIES_KRABBY-1] = 0x00, - [SPECIES_KINGLER-1] = 0x00, - [SPECIES_VOLTORB-1] = 0x00, - [SPECIES_ELECTRODE-1] = 0x00, - [SPECIES_EXEGGCUTE-1] = 0x00, - [SPECIES_EXEGGUTOR-1] = 0x00, - [SPECIES_CUBONE-1] = 0x00, - [SPECIES_MAROWAK-1] = 0x00, - [SPECIES_HITMONLEE-1] = 0x00, - [SPECIES_HITMONCHAN-1] = 0x19, - [SPECIES_LICKITUNG-1] = 0x00, - [SPECIES_KOFFING-1] = 0x00, - [SPECIES_WEEZING-1] = 0x00, - [SPECIES_RHYHORN-1] = 0x00, - [SPECIES_RHYDON-1] = 0x00, - [SPECIES_CHANSEY-1] = 0x00, - [SPECIES_TANGELA-1] = 0x00, - [SPECIES_KANGASKHAN-1] = 0x00, - [SPECIES_HORSEA-1] = 0x00, - [SPECIES_SEADRA-1] = 0x00, - [SPECIES_GOLDEEN-1] = 0x00, - [SPECIES_SEAKING-1] = 0x00, - [SPECIES_STARYU-1] = 0x00, - [SPECIES_STARMIE-1] = 0x00, - [SPECIES_MR_MIME-1] = 0x00, - [SPECIES_SCYTHER-1] = 0x0a, - [SPECIES_JYNX-1] = 0x00, - [SPECIES_ELECTABUZZ-1] = 0x00, - [SPECIES_MAGMAR-1] = 0x00, - [SPECIES_PINSIR-1] = 0x00, - [SPECIES_TAUROS-1] = 0x0a, - [SPECIES_MAGIKARP-1] = 0x00, - [SPECIES_GYARADOS-1] = 0x00, - [SPECIES_LAPRAS-1] = 0x00, - [SPECIES_DITTO-1] = 0x00, - [SPECIES_EEVEE-1] = 0x00, - [SPECIES_VAPOREON-1] = 0x00, - [SPECIES_JOLTEON-1] = 0x00, - [SPECIES_FLAREON-1] = 0x00, - [SPECIES_PORYGON-1] = 0x00, - [SPECIES_OMANYTE-1] = 0x00, - [SPECIES_OMASTAR-1] = 0x00, - [SPECIES_KABUTO-1] = 0x00, - [SPECIES_KABUTOPS-1] = 0x00, - [SPECIES_AERODACTYL-1] = 0x00, - [SPECIES_SNORLAX-1] = 0x00, - [SPECIES_ARTICUNO-1] = 0x00, - [SPECIES_ZAPDOS-1] = 0x00, - [SPECIES_MOLTRES-1] = 0x00, - [SPECIES_DRATINI-1] = 0x00, - [SPECIES_DRAGONAIR-1] = 0x00, - [SPECIES_DRAGONITE-1] = 0x00, - [SPECIES_MEWTWO-1] = 0x00, - [SPECIES_MEW-1] = 0x00, - [SPECIES_CHIKORITA-1] = 0x00, - [SPECIES_BAYLEEF-1] = 0x00, - [SPECIES_MEGANIUM-1] = 0x00, - [SPECIES_CYNDAQUIL-1] = 0x00, - [SPECIES_QUILAVA-1] = 0x00, - [SPECIES_TYPHLOSION-1] = 0x14, - [SPECIES_TOTODILE-1] = 0x00, - [SPECIES_CROCONAW-1] = 0x00, - [SPECIES_FERALIGATR-1] = 0x05, - [SPECIES_SENTRET-1] = 0x00, - [SPECIES_FURRET-1] = 0x00, - [SPECIES_HOOTHOOT-1] = 0x00, - [SPECIES_NOCTOWL-1] = 0x00, - [SPECIES_LEDYBA-1] = 0x00, - [SPECIES_LEDIAN-1] = 0x00, - [SPECIES_SPINARAK-1] = 0x00, - [SPECIES_ARIADOS-1] = 0x00, - [SPECIES_CROBAT-1] = 0x00, - [SPECIES_CHINCHOU-1] = 0x00, - [SPECIES_LANTURN-1] = 0x00, - [SPECIES_PICHU-1] = 0x00, - [SPECIES_CLEFFA-1] = 0x00, - [SPECIES_IGGLYBUFF-1] = 0x00, - [SPECIES_TOGEPI-1] = 0x00, - [SPECIES_TOGETIC-1] = 0x00, - [SPECIES_NATU-1] = 0x1e, - [SPECIES_XATU-1] = 0x00, - [SPECIES_MAREEP-1] = 0x32, - [SPECIES_FLAAFFY-1] = 0x00, - [SPECIES_AMPHAROS-1] = 0x0a, - [SPECIES_BELLOSSOM-1] = 0x00, - [SPECIES_MARILL-1] = 0x00, - [SPECIES_AZUMARILL-1] = 0x00, - [SPECIES_SUDOWOODO-1] = 0x00, - [SPECIES_POLITOED-1] = 0x28, - [SPECIES_HOPPIP-1] = 0x00, - [SPECIES_SKIPLOOM-1] = 0x00, - [SPECIES_JUMPLUFF-1] = 0x00, - [SPECIES_AIPOM-1] = 0x00, - [SPECIES_SUNKERN-1] = 0x00, - [SPECIES_SUNFLORA-1] = 0x00, - [SPECIES_YANMA-1] = 0x00, - [SPECIES_WOOPER-1] = 0x00, - [SPECIES_QUAGSIRE-1] = 0x00, - [SPECIES_ESPEON-1] = 0x00, - [SPECIES_UMBREON-1] = 0x00, - [SPECIES_MURKROW-1] = 0x00, - [SPECIES_SLOWKING-1] = 0x00, - [SPECIES_MISDREAVUS-1] = 0x00, - [SPECIES_UNOWN-1] = 0x00, - [SPECIES_WOBBUFFET-1] = 0x00, - [SPECIES_GIRAFARIG-1] = 0x00, - [SPECIES_PINECO-1] = 0x00, - [SPECIES_FORRETRESS-1] = 0x00, - [SPECIES_DUNSPARCE-1] = 0x0a, - [SPECIES_GLIGAR-1] = 0x00, - [SPECIES_STEELIX-1] = 0x2d, - [SPECIES_SNUBBULL-1] = 0x00, - [SPECIES_GRANBULL-1] = 0x00, - [SPECIES_QWILFISH-1] = 0x27, - [SPECIES_SCIZOR-1] = 0x13, - [SPECIES_SHUCKLE-1] = 0x00, - [SPECIES_HERACROSS-1] = 0x00, - [SPECIES_SNEASEL-1] = 0x00, - [SPECIES_TEDDIURSA-1] = 0x00, - [SPECIES_URSARING-1] = 0x00, - [SPECIES_SLUGMA-1] = 0x00, - [SPECIES_MAGCARGO-1] = 0x00, - [SPECIES_SWINUB-1] = 0x00, - [SPECIES_PILOSWINE-1] = 0x00, - [SPECIES_CORSOLA-1] = 0x00, - [SPECIES_REMORAID-1] = 0x00, - [SPECIES_OCTILLERY-1] = 0x14, - [SPECIES_DELIBIRD-1] = 0x00, - [SPECIES_MANTINE-1] = 0x00, - [SPECIES_SKARMORY-1] = 0x00, - [SPECIES_HOUNDOUR-1] = 0x00, - [SPECIES_HOUNDOOM-1] = 0x00, - [SPECIES_KINGDRA-1] = 0x00, - [SPECIES_PHANPY-1] = 0x00, - [SPECIES_DONPHAN-1] = 0x00, - [SPECIES_PORYGON2-1] = 0x00, - [SPECIES_STANTLER-1] = 0x00, - [SPECIES_SMEARGLE-1] = 0x00, - [SPECIES_TYROGUE-1] = 0x00, - [SPECIES_HITMONTOP-1] = 0x00, - [SPECIES_SMOOCHUM-1] = 0x28, - [SPECIES_ELEKID-1] = 0x00, - [SPECIES_MAGBY-1] = 0x00, - [SPECIES_MILTANK-1] = 0x00, - [SPECIES_BLISSEY-1] = 0x00, - [SPECIES_RAIKOU-1] = 0x00, - [SPECIES_ENTEI-1] = 0x00, - [SPECIES_SUICUNE-1] = 0x00, - [SPECIES_LARVITAR-1] = 0x00, - [SPECIES_PUPITAR-1] = 0x00, - [SPECIES_TYRANITAR-1] = 0x0a, - [SPECIES_LUGIA-1] = 0x14, - [SPECIES_HO_OH-1] = 0x00, - [SPECIES_CELEBI-1] = 0x00, - [SPECIES_OLD_UNOWN_B-1] = 0x00, - [SPECIES_OLD_UNOWN_C-1] = 0x00, - [SPECIES_OLD_UNOWN_D-1] = 0x00, - [SPECIES_OLD_UNOWN_E-1] = 0x00, - [SPECIES_OLD_UNOWN_F-1] = 0x00, - [SPECIES_OLD_UNOWN_G-1] = 0x00, - [SPECIES_OLD_UNOWN_H-1] = 0x00, - [SPECIES_OLD_UNOWN_I-1] = 0x00, - [SPECIES_OLD_UNOWN_J-1] = 0x00, - [SPECIES_OLD_UNOWN_K-1] = 0x00, - [SPECIES_OLD_UNOWN_L-1] = 0x00, - [SPECIES_OLD_UNOWN_M-1] = 0x00, - [SPECIES_OLD_UNOWN_N-1] = 0x00, - [SPECIES_OLD_UNOWN_O-1] = 0x00, - [SPECIES_OLD_UNOWN_P-1] = 0x00, - [SPECIES_OLD_UNOWN_Q-1] = 0x00, - [SPECIES_OLD_UNOWN_R-1] = 0x00, - [SPECIES_OLD_UNOWN_S-1] = 0x00, - [SPECIES_OLD_UNOWN_T-1] = 0x00, - [SPECIES_OLD_UNOWN_U-1] = 0x00, - [SPECIES_OLD_UNOWN_V-1] = 0x00, - [SPECIES_OLD_UNOWN_W-1] = 0x00, - [SPECIES_OLD_UNOWN_X-1] = 0x00, - [SPECIES_OLD_UNOWN_Y-1] = 0x00, - [SPECIES_OLD_UNOWN_Z-1] = 0x00, - [SPECIES_TREECKO-1] = 0x00, - [SPECIES_GROVYLE-1] = 0x00, - [SPECIES_SCEPTILE-1] = 0x00, - [SPECIES_TORCHIC-1] = 0x00, - [SPECIES_COMBUSKEN-1] = 0x00, - [SPECIES_BLAZIKEN-1] = 0x00, - [SPECIES_MUDKIP-1] = 0x00, - [SPECIES_MARSHTOMP-1] = 0x00, - [SPECIES_SWAMPERT-1] = 0x00, - [SPECIES_POOCHYENA-1] = 0x00, - [SPECIES_MIGHTYENA-1] = 0x00, - [SPECIES_ZIGZAGOON-1] = 0x00, - [SPECIES_LINOONE-1] = 0x00, - [SPECIES_WURMPLE-1] = 0x00, - [SPECIES_SILCOON-1] = 0x00, - [SPECIES_BEAUTIFLY-1] = 0x00, - [SPECIES_CASCOON-1] = 0x00, - [SPECIES_DUSTOX-1] = 0x00, - [SPECIES_LOTAD-1] = 0x00, - [SPECIES_LOMBRE-1] = 0x00, - [SPECIES_LUDICOLO-1] = 0x00, - [SPECIES_SEEDOT-1] = 0x00, - [SPECIES_NUZLEAF-1] = 0x00, - [SPECIES_SHIFTRY-1] = 0x00, - [SPECIES_NINCADA-1] = 0x00, - [SPECIES_NINJASK-1] = 0x00, - [SPECIES_SHEDINJA-1] = 0x00, - [SPECIES_TAILLOW-1] = 0x00, - [SPECIES_SWELLOW-1] = 0x00, - [SPECIES_SHROOMISH-1] = 0x00, - [SPECIES_BRELOOM-1] = 0x00, - [SPECIES_SPINDA-1] = 0x00, - [SPECIES_WINGULL-1] = 0x00, - [SPECIES_PELIPPER-1] = 0x00, - [SPECIES_SURSKIT-1] = 0x00, - [SPECIES_MASQUERAIN-1] = 0x00, - [SPECIES_WAILMER-1] = 0x00, - [SPECIES_WAILORD-1] = 0x0a, - [SPECIES_SKITTY-1] = 0x00, - [SPECIES_DELCATTY-1] = 0x00, - [SPECIES_KECLEON-1] = 0x1e, - [SPECIES_BALTOY-1] = 0x00, - [SPECIES_CLAYDOL-1] = 0x00, - [SPECIES_NOSEPASS-1] = 0x00, - [SPECIES_TORKOAL-1] = 0x00, - [SPECIES_SABLEYE-1] = 0x00, - [SPECIES_BARBOACH-1] = 0x00, - [SPECIES_WHISCASH-1] = 0x00, - [SPECIES_LUVDISC-1] = 0x00, - [SPECIES_CORPHISH-1] = 0x00, - [SPECIES_CRAWDAUNT-1] = 0x00, - [SPECIES_FEEBAS-1] = 0x00, - [SPECIES_MILOTIC-1] = 0x2d, - [SPECIES_CARVANHA-1] = 0x00, - [SPECIES_SHARPEDO-1] = 0x00, - [SPECIES_TRAPINCH-1] = 0x00, - [SPECIES_VIBRAVA-1] = 0x00, - [SPECIES_FLYGON-1] = 0x00, - [SPECIES_MAKUHITA-1] = 0x00, - [SPECIES_HARIYAMA-1] = 0x00, - [SPECIES_ELECTRIKE-1] = 0x00, - [SPECIES_MANECTRIC-1] = 0x00, - [SPECIES_NUMEL-1] = 0x00, - [SPECIES_CAMERUPT-1] = 0x00, - [SPECIES_SPHEAL-1] = 0x0f, - [SPECIES_SEALEO-1] = 0x00, - [SPECIES_WALREIN-1] = 0x00, - [SPECIES_CACNEA-1] = 0x00, - [SPECIES_CACTURNE-1] = 0x00, - [SPECIES_SNORUNT-1] = 0x14, - [SPECIES_GLALIE-1] = 0x00, - [SPECIES_LUNATONE-1] = 0x00, - [SPECIES_SOLROCK-1] = 0x00, - [SPECIES_AZURILL-1] = 0x00, - [SPECIES_SPOINK-1] = 0x00, - [SPECIES_GRUMPIG-1] = 0x0f, - [SPECIES_PLUSLE-1] = 0x00, - [SPECIES_MINUN-1] = 0x00, - [SPECIES_MAWILE-1] = 0x00, - [SPECIES_MEDITITE-1] = 0x00, - [SPECIES_MEDICHAM-1] = 0x00, - [SPECIES_SWABLU-1] = 0x00, - [SPECIES_ALTARIA-1] = 0x00, - [SPECIES_WYNAUT-1] = 0x0f, - [SPECIES_DUSKULL-1] = 0x00, - [SPECIES_DUSCLOPS-1] = 0x1e, - [SPECIES_ROSELIA-1] = 0x00, - [SPECIES_SLAKOTH-1] = 0x00, - [SPECIES_VIGOROTH-1] = 0x00, - [SPECIES_SLAKING-1] = 0x00, - [SPECIES_GULPIN-1] = 0x00, - [SPECIES_SWALOT-1] = 0x00, - [SPECIES_TROPIUS-1] = 0x00, - [SPECIES_WHISMUR-1] = 0x00, - [SPECIES_LOUDRED-1] = 0x00, - [SPECIES_EXPLOUD-1] = 0x00, - [SPECIES_CLAMPERL-1] = 0x00, - [SPECIES_HUNTAIL-1] = 0x00, - [SPECIES_GOREBYSS-1] = 0x00, - [SPECIES_ABSOL-1] = 0x2d, - [SPECIES_SHUPPET-1] = 0x00, - [SPECIES_BANETTE-1] = 0x00, - [SPECIES_SEVIPER-1] = 0x00, - [SPECIES_ZANGOOSE-1] = 0x00, - [SPECIES_RELICANTH-1] = 0x00, - [SPECIES_ARON-1] = 0x00, - [SPECIES_LAIRON-1] = 0x00, - [SPECIES_AGGRON-1] = 0x00, - [SPECIES_CASTFORM-1] = 0x00, - [SPECIES_VOLBEAT-1] = 0x00, - [SPECIES_ILLUMISE-1] = 0x00, - [SPECIES_LILEEP-1] = 0x00, - [SPECIES_CRADILY-1] = 0x00, - [SPECIES_ANORITH-1] = 0x00, - [SPECIES_ARMALDO-1] = 0x00, - [SPECIES_RALTS-1] = 0x00, - [SPECIES_KIRLIA-1] = 0x00, - [SPECIES_GARDEVOIR-1] = 0x00, - [SPECIES_BAGON-1] = 0x00, - [SPECIES_SHELGON-1] = 0x00, - [SPECIES_SALAMENCE-1] = 0x46, - [SPECIES_BELDUM-1] = 0x00, - [SPECIES_METANG-1] = 0x00, - [SPECIES_METAGROSS-1] = 0x00, - [SPECIES_REGIROCK-1] = 0x00, - [SPECIES_REGICE-1] = 0x00, - [SPECIES_REGISTEEL-1] = 0x00, - [SPECIES_KYOGRE-1] = 0x3c, - [SPECIES_GROUDON-1] = 0x00, - [SPECIES_RAYQUAZA-1] = 0x3c, - [SPECIES_LATIAS-1] = 0x00, - [SPECIES_LATIOS-1] = 0x00, - [SPECIES_JIRACHI-1] = 0x00, - [SPECIES_DEOXYS-1] = 0x00, - [SPECIES_CHIMECHO-1] = 0x00, + [SPECIES_BULBASAUR - 1] = 0x00, + [SPECIES_IVYSAUR - 1] = 0x00, + [SPECIES_VENUSAUR - 1] = 0x00, + [SPECIES_CHARMANDER - 1] = 0x00, + [SPECIES_CHARMELEON - 1] = 0x00, + [SPECIES_CHARIZARD - 1] = 0x00, + [SPECIES_SQUIRTLE - 1] = 0x00, + [SPECIES_WARTORTLE - 1] = 0x00, + [SPECIES_BLASTOISE - 1] = 0x32, + [SPECIES_CATERPIE - 1] = 0x00, + [SPECIES_METAPOD - 1] = 0x00, + [SPECIES_BUTTERFREE - 1] = 0x00, + [SPECIES_WEEDLE - 1] = 0x0a, + [SPECIES_KAKUNA - 1] = 0x14, + [SPECIES_BEEDRILL - 1] = 0x23, + [SPECIES_PIDGEY - 1] = 0x00, + [SPECIES_PIDGEOTTO - 1] = 0x19, + [SPECIES_PIDGEOT - 1] = 0x00, + [SPECIES_RATTATA - 1] = 0x00, + [SPECIES_RATICATE - 1] = 0x00, + [SPECIES_SPEAROW - 1] = 0x00, + [SPECIES_FEAROW - 1] = 0x02, + [SPECIES_EKANS - 1] = 0x1e, + [SPECIES_ARBOK - 1] = 0x00, + [SPECIES_PIKACHU - 1] = 0x00, + [SPECIES_RAICHU - 1] = 0x00, + [SPECIES_SANDSHREW - 1] = 0x00, + [SPECIES_SANDSLASH - 1] = 0x00, + [SPECIES_NIDORAN_F - 1] = 0x1c, + [SPECIES_NIDORINA - 1] = 0x00, + [SPECIES_NIDOQUEEN - 1] = 0x00, + [SPECIES_NIDORAN_M - 1] = 0x00, + [SPECIES_NIDORINO - 1] = 0x00, + [SPECIES_NIDOKING - 1] = 0x19, + [SPECIES_CLEFAIRY - 1] = 0x00, + [SPECIES_CLEFABLE - 1] = 0x00, + [SPECIES_VULPIX - 1] = 0x00, + [SPECIES_NINETALES - 1] = 0x00, + [SPECIES_JIGGLYPUFF - 1] = 0x00, + [SPECIES_WIGGLYTUFF - 1] = 0x00, + [SPECIES_ZUBAT - 1] = 0x00, + [SPECIES_GOLBAT - 1] = 0x00, + [SPECIES_ODDISH - 1] = 0x00, + [SPECIES_GLOOM - 1] = 0x00, + [SPECIES_VILEPLUME - 1] = 0x00, + [SPECIES_PARAS - 1] = 0x0a, + [SPECIES_PARASECT - 1] = 0x2d, + [SPECIES_VENONAT - 1] = 0x14, + [SPECIES_VENOMOTH - 1] = 0x00, + [SPECIES_DIGLETT - 1] = 0x19, + [SPECIES_DUGTRIO - 1] = 0x23, + [SPECIES_MEOWTH - 1] = 0x28, + [SPECIES_PERSIAN - 1] = 0x14, + [SPECIES_PSYDUCK - 1] = 0x00, + [SPECIES_GOLDUCK - 1] = 0x00, + [SPECIES_MANKEY - 1] = 0x14, + [SPECIES_PRIMEAPE - 1] = 0x00, + [SPECIES_GROWLITHE - 1] = 0x1e, + [SPECIES_ARCANINE - 1] = 0x28, + [SPECIES_POLIWAG - 1] = 0x00, + [SPECIES_POLIWHIRL - 1] = 0x05, + [SPECIES_POLIWRATH - 1] = 0x00, + [SPECIES_ABRA - 1] = 0x00, + [SPECIES_KADABRA - 1] = 0x00, + [SPECIES_ALAKAZAM - 1] = 0x00, + [SPECIES_MACHOP - 1] = 0x00, + [SPECIES_MACHOKE - 1] = 0x00, + [SPECIES_MACHAMP - 1] = 0x00, + [SPECIES_BELLSPROUT - 1] = 0x00, + [SPECIES_WEEPINBELL - 1] = 0x03, + [SPECIES_VICTREEBEL - 1] = 0x00, + [SPECIES_TENTACOOL - 1] = 0x00, + [SPECIES_TENTACRUEL - 1] = 0x00, + [SPECIES_GEODUDE - 1] = 0x00, + [SPECIES_GRAVELER - 1] = 0x00, + [SPECIES_GOLEM - 1] = 0x00, + [SPECIES_PONYTA - 1] = 0x00, + [SPECIES_RAPIDASH - 1] = 0x00, + [SPECIES_SLOWPOKE - 1] = 0x00, + [SPECIES_SLOWBRO - 1] = 0x00, + [SPECIES_MAGNEMITE - 1] = 0x00, + [SPECIES_MAGNETON - 1] = 0x00, + [SPECIES_FARFETCHD - 1] = 0x00, + [SPECIES_DODUO - 1] = 0x00, + [SPECIES_DODRIO - 1] = 0x00, + [SPECIES_SEEL - 1] = 0x00, + [SPECIES_DEWGONG - 1] = 0x00, + [SPECIES_GRIMER - 1] = 0x00, + [SPECIES_MUK - 1] = 0x2d, + [SPECIES_SHELLDER - 1] = 0x14, + [SPECIES_CLOYSTER - 1] = 0x00, + [SPECIES_GASTLY - 1] = 0x00, + [SPECIES_HAUNTER - 1] = 0x17, + [SPECIES_GENGAR - 1] = 0x00, + [SPECIES_ONIX - 1] = 0x00, + [SPECIES_DROWZEE - 1] = 0x30, + [SPECIES_HYPNO - 1] = 0x28, + [SPECIES_KRABBY - 1] = 0x00, + [SPECIES_KINGLER - 1] = 0x00, + [SPECIES_VOLTORB - 1] = 0x00, + [SPECIES_ELECTRODE - 1] = 0x00, + [SPECIES_EXEGGCUTE - 1] = 0x00, + [SPECIES_EXEGGUTOR - 1] = 0x00, + [SPECIES_CUBONE - 1] = 0x00, + [SPECIES_MAROWAK - 1] = 0x00, + [SPECIES_HITMONLEE - 1] = 0x00, + [SPECIES_HITMONCHAN - 1] = 0x19, + [SPECIES_LICKITUNG - 1] = 0x00, + [SPECIES_KOFFING - 1] = 0x00, + [SPECIES_WEEZING - 1] = 0x00, + [SPECIES_RHYHORN - 1] = 0x00, + [SPECIES_RHYDON - 1] = 0x00, + [SPECIES_CHANSEY - 1] = 0x00, + [SPECIES_TANGELA - 1] = 0x00, + [SPECIES_KANGASKHAN - 1] = 0x00, + [SPECIES_HORSEA - 1] = 0x00, + [SPECIES_SEADRA - 1] = 0x00, + [SPECIES_GOLDEEN - 1] = 0x00, + [SPECIES_SEAKING - 1] = 0x00, + [SPECIES_STARYU - 1] = 0x00, + [SPECIES_STARMIE - 1] = 0x00, + [SPECIES_MR_MIME - 1] = 0x00, + [SPECIES_SCYTHER - 1] = 0x0a, + [SPECIES_JYNX - 1] = 0x00, + [SPECIES_ELECTABUZZ - 1] = 0x00, + [SPECIES_MAGMAR - 1] = 0x00, + [SPECIES_PINSIR - 1] = 0x00, + [SPECIES_TAUROS - 1] = 0x0a, + [SPECIES_MAGIKARP - 1] = 0x00, + [SPECIES_GYARADOS - 1] = 0x00, + [SPECIES_LAPRAS - 1] = 0x00, + [SPECIES_DITTO - 1] = 0x00, + [SPECIES_EEVEE - 1] = 0x00, + [SPECIES_VAPOREON - 1] = 0x00, + [SPECIES_JOLTEON - 1] = 0x00, + [SPECIES_FLAREON - 1] = 0x00, + [SPECIES_PORYGON - 1] = 0x00, + [SPECIES_OMANYTE - 1] = 0x00, + [SPECIES_OMASTAR - 1] = 0x00, + [SPECIES_KABUTO - 1] = 0x00, + [SPECIES_KABUTOPS - 1] = 0x00, + [SPECIES_AERODACTYL - 1] = 0x00, + [SPECIES_SNORLAX - 1] = 0x00, + [SPECIES_ARTICUNO - 1] = 0x00, + [SPECIES_ZAPDOS - 1] = 0x00, + [SPECIES_MOLTRES - 1] = 0x00, + [SPECIES_DRATINI - 1] = 0x00, + [SPECIES_DRAGONAIR - 1] = 0x00, + [SPECIES_DRAGONITE - 1] = 0x00, + [SPECIES_MEWTWO - 1] = 0x00, + [SPECIES_MEW - 1] = 0x00, + [SPECIES_CHIKORITA - 1] = 0x00, + [SPECIES_BAYLEEF - 1] = 0x00, + [SPECIES_MEGANIUM - 1] = 0x00, + [SPECIES_CYNDAQUIL - 1] = 0x00, + [SPECIES_QUILAVA - 1] = 0x00, + [SPECIES_TYPHLOSION - 1] = 0x14, + [SPECIES_TOTODILE - 1] = 0x00, + [SPECIES_CROCONAW - 1] = 0x00, + [SPECIES_FERALIGATR - 1] = 0x05, + [SPECIES_SENTRET - 1] = 0x00, + [SPECIES_FURRET - 1] = 0x00, + [SPECIES_HOOTHOOT - 1] = 0x00, + [SPECIES_NOCTOWL - 1] = 0x00, + [SPECIES_LEDYBA - 1] = 0x00, + [SPECIES_LEDIAN - 1] = 0x00, + [SPECIES_SPINARAK - 1] = 0x00, + [SPECIES_ARIADOS - 1] = 0x00, + [SPECIES_CROBAT - 1] = 0x00, + [SPECIES_CHINCHOU - 1] = 0x00, + [SPECIES_LANTURN - 1] = 0x00, + [SPECIES_PICHU - 1] = 0x00, + [SPECIES_CLEFFA - 1] = 0x00, + [SPECIES_IGGLYBUFF - 1] = 0x00, + [SPECIES_TOGEPI - 1] = 0x00, + [SPECIES_TOGETIC - 1] = 0x00, + [SPECIES_NATU - 1] = 0x1e, + [SPECIES_XATU - 1] = 0x00, + [SPECIES_MAREEP - 1] = 0x32, + [SPECIES_FLAAFFY - 1] = 0x00, + [SPECIES_AMPHAROS - 1] = 0x0a, + [SPECIES_BELLOSSOM - 1] = 0x00, + [SPECIES_MARILL - 1] = 0x00, + [SPECIES_AZUMARILL - 1] = 0x00, + [SPECIES_SUDOWOODO - 1] = 0x00, + [SPECIES_POLITOED - 1] = 0x28, + [SPECIES_HOPPIP - 1] = 0x00, + [SPECIES_SKIPLOOM - 1] = 0x00, + [SPECIES_JUMPLUFF - 1] = 0x00, + [SPECIES_AIPOM - 1] = 0x00, + [SPECIES_SUNKERN - 1] = 0x00, + [SPECIES_SUNFLORA - 1] = 0x00, + [SPECIES_YANMA - 1] = 0x00, + [SPECIES_WOOPER - 1] = 0x00, + [SPECIES_QUAGSIRE - 1] = 0x00, + [SPECIES_ESPEON - 1] = 0x00, + [SPECIES_UMBREON - 1] = 0x00, + [SPECIES_MURKROW - 1] = 0x00, + [SPECIES_SLOWKING - 1] = 0x00, + [SPECIES_MISDREAVUS - 1] = 0x00, + [SPECIES_UNOWN - 1] = 0x00, + [SPECIES_WOBBUFFET - 1] = 0x00, + [SPECIES_GIRAFARIG - 1] = 0x00, + [SPECIES_PINECO - 1] = 0x00, + [SPECIES_FORRETRESS - 1] = 0x00, + [SPECIES_DUNSPARCE - 1] = 0x0a, + [SPECIES_GLIGAR - 1] = 0x00, + [SPECIES_STEELIX - 1] = 0x2d, + [SPECIES_SNUBBULL - 1] = 0x00, + [SPECIES_GRANBULL - 1] = 0x00, + [SPECIES_QWILFISH - 1] = 0x27, + [SPECIES_SCIZOR - 1] = 0x13, + [SPECIES_SHUCKLE - 1] = 0x00, + [SPECIES_HERACROSS - 1] = 0x00, + [SPECIES_SNEASEL - 1] = 0x00, + [SPECIES_TEDDIURSA - 1] = 0x00, + [SPECIES_URSARING - 1] = 0x00, + [SPECIES_SLUGMA - 1] = 0x00, + [SPECIES_MAGCARGO - 1] = 0x00, + [SPECIES_SWINUB - 1] = 0x00, + [SPECIES_PILOSWINE - 1] = 0x00, + [SPECIES_CORSOLA - 1] = 0x00, + [SPECIES_REMORAID - 1] = 0x00, + [SPECIES_OCTILLERY - 1] = 0x14, + [SPECIES_DELIBIRD - 1] = 0x00, + [SPECIES_MANTINE - 1] = 0x00, + [SPECIES_SKARMORY - 1] = 0x00, + [SPECIES_HOUNDOUR - 1] = 0x00, + [SPECIES_HOUNDOOM - 1] = 0x00, + [SPECIES_KINGDRA - 1] = 0x00, + [SPECIES_PHANPY - 1] = 0x00, + [SPECIES_DONPHAN - 1] = 0x00, + [SPECIES_PORYGON2 - 1] = 0x00, + [SPECIES_STANTLER - 1] = 0x00, + [SPECIES_SMEARGLE - 1] = 0x00, + [SPECIES_TYROGUE - 1] = 0x00, + [SPECIES_HITMONTOP - 1] = 0x00, + [SPECIES_SMOOCHUM - 1] = 0x28, + [SPECIES_ELEKID - 1] = 0x00, + [SPECIES_MAGBY - 1] = 0x00, + [SPECIES_MILTANK - 1] = 0x00, + [SPECIES_BLISSEY - 1] = 0x00, + [SPECIES_RAIKOU - 1] = 0x00, + [SPECIES_ENTEI - 1] = 0x00, + [SPECIES_SUICUNE - 1] = 0x00, + [SPECIES_LARVITAR - 1] = 0x00, + [SPECIES_PUPITAR - 1] = 0x00, + [SPECIES_TYRANITAR - 1] = 0x0a, + [SPECIES_LUGIA - 1] = 0x14, + [SPECIES_HO_OH - 1] = 0x00, + [SPECIES_CELEBI - 1] = 0x00, + [SPECIES_OLD_UNOWN_B - 1] = 0x00, + [SPECIES_OLD_UNOWN_C - 1] = 0x00, + [SPECIES_OLD_UNOWN_D - 1] = 0x00, + [SPECIES_OLD_UNOWN_E - 1] = 0x00, + [SPECIES_OLD_UNOWN_F - 1] = 0x00, + [SPECIES_OLD_UNOWN_G - 1] = 0x00, + [SPECIES_OLD_UNOWN_H - 1] = 0x00, + [SPECIES_OLD_UNOWN_I - 1] = 0x00, + [SPECIES_OLD_UNOWN_J - 1] = 0x00, + [SPECIES_OLD_UNOWN_K - 1] = 0x00, + [SPECIES_OLD_UNOWN_L - 1] = 0x00, + [SPECIES_OLD_UNOWN_M - 1] = 0x00, + [SPECIES_OLD_UNOWN_N - 1] = 0x00, + [SPECIES_OLD_UNOWN_O - 1] = 0x00, + [SPECIES_OLD_UNOWN_P - 1] = 0x00, + [SPECIES_OLD_UNOWN_Q - 1] = 0x00, + [SPECIES_OLD_UNOWN_R - 1] = 0x00, + [SPECIES_OLD_UNOWN_S - 1] = 0x00, + [SPECIES_OLD_UNOWN_T - 1] = 0x00, + [SPECIES_OLD_UNOWN_U - 1] = 0x00, + [SPECIES_OLD_UNOWN_V - 1] = 0x00, + [SPECIES_OLD_UNOWN_W - 1] = 0x00, + [SPECIES_OLD_UNOWN_X - 1] = 0x00, + [SPECIES_OLD_UNOWN_Y - 1] = 0x00, + [SPECIES_OLD_UNOWN_Z - 1] = 0x00, + [SPECIES_TREECKO - 1] = 0x00, + [SPECIES_GROVYLE - 1] = 0x00, + [SPECIES_SCEPTILE - 1] = 0x00, + [SPECIES_TORCHIC - 1] = 0x00, + [SPECIES_COMBUSKEN - 1] = 0x00, + [SPECIES_BLAZIKEN - 1] = 0x00, + [SPECIES_MUDKIP - 1] = 0x00, + [SPECIES_MARSHTOMP - 1] = 0x00, + [SPECIES_SWAMPERT - 1] = 0x00, + [SPECIES_POOCHYENA - 1] = 0x00, + [SPECIES_MIGHTYENA - 1] = 0x00, + [SPECIES_ZIGZAGOON - 1] = 0x00, + [SPECIES_LINOONE - 1] = 0x00, + [SPECIES_WURMPLE - 1] = 0x00, + [SPECIES_SILCOON - 1] = 0x00, + [SPECIES_BEAUTIFLY - 1] = 0x00, + [SPECIES_CASCOON - 1] = 0x00, + [SPECIES_DUSTOX - 1] = 0x00, + [SPECIES_LOTAD - 1] = 0x00, + [SPECIES_LOMBRE - 1] = 0x00, + [SPECIES_LUDICOLO - 1] = 0x00, + [SPECIES_SEEDOT - 1] = 0x00, + [SPECIES_NUZLEAF - 1] = 0x00, + [SPECIES_SHIFTRY - 1] = 0x00, + [SPECIES_NINCADA - 1] = 0x00, + [SPECIES_NINJASK - 1] = 0x00, + [SPECIES_SHEDINJA - 1] = 0x00, + [SPECIES_TAILLOW - 1] = 0x00, + [SPECIES_SWELLOW - 1] = 0x00, + [SPECIES_SHROOMISH - 1] = 0x00, + [SPECIES_BRELOOM - 1] = 0x00, + [SPECIES_SPINDA - 1] = 0x00, + [SPECIES_WINGULL - 1] = 0x00, + [SPECIES_PELIPPER - 1] = 0x00, + [SPECIES_SURSKIT - 1] = 0x00, + [SPECIES_MASQUERAIN - 1] = 0x00, + [SPECIES_WAILMER - 1] = 0x00, + [SPECIES_WAILORD - 1] = 0x0a, + [SPECIES_SKITTY - 1] = 0x00, + [SPECIES_DELCATTY - 1] = 0x00, + [SPECIES_KECLEON - 1] = 0x1e, + [SPECIES_BALTOY - 1] = 0x00, + [SPECIES_CLAYDOL - 1] = 0x00, + [SPECIES_NOSEPASS - 1] = 0x00, + [SPECIES_TORKOAL - 1] = 0x00, + [SPECIES_SABLEYE - 1] = 0x00, + [SPECIES_BARBOACH - 1] = 0x00, + [SPECIES_WHISCASH - 1] = 0x00, + [SPECIES_LUVDISC - 1] = 0x00, + [SPECIES_CORPHISH - 1] = 0x00, + [SPECIES_CRAWDAUNT - 1] = 0x00, + [SPECIES_FEEBAS - 1] = 0x00, + [SPECIES_MILOTIC - 1] = 0x2d, + [SPECIES_CARVANHA - 1] = 0x00, + [SPECIES_SHARPEDO - 1] = 0x00, + [SPECIES_TRAPINCH - 1] = 0x00, + [SPECIES_VIBRAVA - 1] = 0x00, + [SPECIES_FLYGON - 1] = 0x00, + [SPECIES_MAKUHITA - 1] = 0x00, + [SPECIES_HARIYAMA - 1] = 0x00, + [SPECIES_ELECTRIKE - 1] = 0x00, + [SPECIES_MANECTRIC - 1] = 0x00, + [SPECIES_NUMEL - 1] = 0x00, + [SPECIES_CAMERUPT - 1] = 0x00, + [SPECIES_SPHEAL - 1] = 0x0f, + [SPECIES_SEALEO - 1] = 0x00, + [SPECIES_WALREIN - 1] = 0x00, + [SPECIES_CACNEA - 1] = 0x00, + [SPECIES_CACTURNE - 1] = 0x00, + [SPECIES_SNORUNT - 1] = 0x14, + [SPECIES_GLALIE - 1] = 0x00, + [SPECIES_LUNATONE - 1] = 0x00, + [SPECIES_SOLROCK - 1] = 0x00, + [SPECIES_AZURILL - 1] = 0x00, + [SPECIES_SPOINK - 1] = 0x00, + [SPECIES_GRUMPIG - 1] = 0x0f, + [SPECIES_PLUSLE - 1] = 0x00, + [SPECIES_MINUN - 1] = 0x00, + [SPECIES_MAWILE - 1] = 0x00, + [SPECIES_MEDITITE - 1] = 0x00, + [SPECIES_MEDICHAM - 1] = 0x00, + [SPECIES_SWABLU - 1] = 0x00, + [SPECIES_ALTARIA - 1] = 0x00, + [SPECIES_WYNAUT - 1] = 0x0f, + [SPECIES_DUSKULL - 1] = 0x00, + [SPECIES_DUSCLOPS - 1] = 0x1e, + [SPECIES_ROSELIA - 1] = 0x00, + [SPECIES_SLAKOTH - 1] = 0x00, + [SPECIES_VIGOROTH - 1] = 0x00, + [SPECIES_SLAKING - 1] = 0x00, + [SPECIES_GULPIN - 1] = 0x00, + [SPECIES_SWALOT - 1] = 0x00, + [SPECIES_TROPIUS - 1] = 0x00, + [SPECIES_WHISMUR - 1] = 0x00, + [SPECIES_LOUDRED - 1] = 0x00, + [SPECIES_EXPLOUD - 1] = 0x00, + [SPECIES_CLAMPERL - 1] = 0x00, + [SPECIES_HUNTAIL - 1] = 0x00, + [SPECIES_GOREBYSS - 1] = 0x00, + [SPECIES_ABSOL - 1] = 0x2d, + [SPECIES_SHUPPET - 1] = 0x00, + [SPECIES_BANETTE - 1] = 0x00, + [SPECIES_SEVIPER - 1] = 0x00, + [SPECIES_ZANGOOSE - 1] = 0x00, + [SPECIES_RELICANTH - 1] = 0x00, + [SPECIES_ARON - 1] = 0x00, + [SPECIES_LAIRON - 1] = 0x00, + [SPECIES_AGGRON - 1] = 0x00, + [SPECIES_CASTFORM - 1] = 0x00, + [SPECIES_VOLBEAT - 1] = 0x00, + [SPECIES_ILLUMISE - 1] = 0x00, + [SPECIES_LILEEP - 1] = 0x00, + [SPECIES_CRADILY - 1] = 0x00, + [SPECIES_ANORITH - 1] = 0x00, + [SPECIES_ARMALDO - 1] = 0x00, + [SPECIES_RALTS - 1] = 0x00, + [SPECIES_KIRLIA - 1] = 0x00, + [SPECIES_GARDEVOIR - 1] = 0x00, + [SPECIES_BAGON - 1] = 0x00, + [SPECIES_SHELGON - 1] = 0x00, + [SPECIES_SALAMENCE - 1] = 0x46, + [SPECIES_BELDUM - 1] = 0x00, + [SPECIES_METANG - 1] = 0x00, + [SPECIES_METAGROSS - 1] = 0x00, + [SPECIES_REGIROCK - 1] = 0x00, + [SPECIES_REGICE - 1] = 0x00, + [SPECIES_REGISTEEL - 1] = 0x00, + [SPECIES_KYOGRE - 1] = 0x3c, + [SPECIES_GROUDON - 1] = 0x00, + [SPECIES_RAYQUAZA - 1] = 0x3c, + [SPECIES_LATIAS - 1] = 0x00, + [SPECIES_LATIOS - 1] = 0x00, + [SPECIES_JIRACHI - 1] = 0x00, + [SPECIES_DEOXYS - 1] = 0x00, + [SPECIES_CHIMECHO - 1] = 0x00, }; const u8 gUnknown_08329D22[] = {0x03, 0x0c, 0x30, 0xc0}; // Masks for getting PP Up count, also PP Max values -- cgit v1.2.3 From f50faac244dab668b1d7f95dc276615888a5ed55 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Sat, 8 Dec 2018 14:10:30 +0800 Subject: Clean more tables --- src/battle_main.c | 50 +-- src/battle_message.c | 738 ++++++++++++++++++------------------- src/data/pokemon/cry_ids.h | 270 +++++++------- src/pokemon_icon.c | 880 ++++++++++++++++++++++----------------------- 4 files changed, 969 insertions(+), 969 deletions(-) (limited to 'src') diff --git a/src/battle_main.c b/src/battle_main.c index 0437eaef4..e275eee9e 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -507,35 +507,35 @@ const struct TrainerMoney gTrainerMoneyTable[] = static void (* const sTurnActionsFuncsTable[])(void) = { - HandleAction_UseMove, // B_ACTION_USE_MOVE - HandleAction_UseItem, // B_ACTION_USE_ITEM - HandleAction_Switch, // B_ACTION_SWITCH - HandleAction_Run, // B_ACTION_RUN - HandleAction_WatchesCarefully, // B_ACTION_SAFARI_WATCH_CAREFULLY - HandleAction_SafariZoneBallThrow, // B_ACTION_SAFARI_BALL - HandleAction_ThrowPokeblock, // B_ACTION_SAFARI_POKEBLOCK - HandleAction_GoNear, // B_ACTION_SAFARI_GO_NEAR - HandleAction_SafariZoneRun, // B_ACTION_SAFARI_RUN - HandleAction_WallyBallThrow, // B_ACTION_WALLY_THROW - HandleAction_RunBattleScript, // B_ACTION_EXEC_SCRIPT - HandleAction_Action11, // not sure about this one - HandleAction_ActionFinished, // B_ACTION_FINISHED - HandleAction_NothingIsFainted, // B_ACTION_NOTHING_FAINTED + [B_ACTION_USE_MOVE] = HandleAction_UseMove, + [B_ACTION_USE_ITEM] = HandleAction_UseItem, + [B_ACTION_SWITCH] = HandleAction_Switch, + [B_ACTION_RUN] = HandleAction_Run, + [B_ACTION_SAFARI_WATCH_CAREFULLY] = HandleAction_WatchesCarefully, + [B_ACTION_SAFARI_BALL] = HandleAction_SafariZoneBallThrow, + [B_ACTION_SAFARI_POKEBLOCK] = HandleAction_ThrowPokeblock, + [B_ACTION_SAFARI_GO_NEAR] = HandleAction_GoNear, + [B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun, + [B_ACTION_WALLY_THROW] = HandleAction_WallyBallThrow, + [B_ACTION_EXEC_SCRIPT] = HandleAction_RunBattleScript, + [11] = HandleAction_Action11, // not sure about this one + [B_ACTION_FINISHED] = HandleAction_ActionFinished, + [B_ACTION_NOTHING_FAINTED] = HandleAction_NothingIsFainted, }; static void (* const sEndTurnFuncsTable[])(void) = { - HandleEndTurn_ContinueBattle, // battle outcome 0 - HandleEndTurn_BattleWon, // B_OUTCOME_WON - HandleEndTurn_BattleLost, // B_OUTCOME_LOST - HandleEndTurn_BattleLost, // B_OUTCOME_DREW - HandleEndTurn_RanFromBattle, // B_OUTCOME_RAN - HandleEndTurn_FinishBattle, // B_OUTCOME_PLAYER_TELEPORTED - HandleEndTurn_MonFled, // B_OUTCOME_MON_FLED - HandleEndTurn_FinishBattle, // B_OUTCOME_CAUGHT - HandleEndTurn_FinishBattle, // B_OUTCOME_NO_SAFARI_BALLS - HandleEndTurn_FinishBattle, // B_OUTCOME_FORFEITED - HandleEndTurn_FinishBattle, // B_OUTCOME_MON_TELEPORTED + [0] = HandleEndTurn_ContinueBattle, //B_OUTCOME_NONE? + [B_OUTCOME_WON] = HandleEndTurn_BattleWon, + [B_OUTCOME_LOST] = HandleEndTurn_BattleLost, + [B_OUTCOME_DREW] = HandleEndTurn_BattleLost, + [B_OUTCOME_RAN] = HandleEndTurn_RanFromBattle, + [B_OUTCOME_PLAYER_TELEPORTED] = HandleEndTurn_FinishBattle, + [B_OUTCOME_MON_FLED] = HandleEndTurn_MonFled, + [B_OUTCOME_CAUGHT] = HandleEndTurn_FinishBattle, + [B_OUTCOME_NO_SAFARI_BALLS] = HandleEndTurn_FinishBattle, + [B_OUTCOME_FORFEITED] = HandleEndTurn_FinishBattle, + [B_OUTCOME_MON_TELEPORTED] = HandleEndTurn_FinishBattle, }; const u8 gStatusConditionString_PoisonJpn[8] = _("どく$$$$$"); diff --git a/src/battle_message.c b/src/battle_message.c index 7d74fb3cf..75f9b1da8 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -521,375 +521,375 @@ static const u8 sText_Trainer2LoseText[]; const u8 * const gBattleStringsTable[BATTLESTRINGS_COUNT] = { - sText_Trainer1LoseText, // 12 - sText_PkmnGainedEXP, // 13 - sText_PkmnGrewToLv, // 14 - sText_PkmnLearnedMove, // 15 - sText_TryToLearnMove1, // 16 - sText_TryToLearnMove2, // 17 - sText_TryToLearnMove3, // 18 - sText_PkmnForgotMove, // 19 - sText_StopLearningMove, // 20 - sText_DidNotLearnMove, // 21 - sText_PkmnLearnedMove2, // 22 - sText_AttackMissed, // 23 - sText_PkmnProtectedItself, // 24 - sText_StatsWontIncrease2, // 25 - sText_AvoidedDamage, // 26 - sText_ItDoesntAffect, // 27 - sText_AttackerFainted, // 28 - sText_TargetFainted, // 29 - sText_PlayerGotMoney, // 30 - sText_PlayerWhiteout, // 31 - sText_PlayerWhiteout2, // 32 - sText_PreventsEscape, // 33 - sText_HitXTimes, // 34 - sText_PkmnFellAsleep, // 35 - sText_PkmnMadeSleep, // 36 - sText_PkmnAlreadyAsleep, // 37 - sText_PkmnAlreadyAsleep2, // 38 - sText_PkmnWasntAffected, // 39 - sText_PkmnWasPoisoned, // 40 - sText_PkmnPoisonedBy, // 41 - sText_PkmnHurtByPoison, // 42 - sText_PkmnAlreadyPoisoned, // 43 - sText_PkmnBadlyPoisoned, // 44 - sText_PkmnEnergyDrained, // 45 - sText_PkmnWasBurned, // 46 - sText_PkmnBurnedBy, // 47 - sText_PkmnHurtByBurn, // 48 - sText_PkmnWasFrozen, // 49 - sText_PkmnFrozenBy, // 50 - sText_PkmnIsFrozen, // 51 - sText_PkmnWasDefrosted, // 52 - sText_PkmnWasDefrosted2, // 53 - sText_PkmnWasDefrostedBy, // 54 - sText_PkmnWasParalyzed, // 55 - sText_PkmnWasParalyzedBy, // 56 - sText_PkmnIsParalyzed, // 57 - sText_PkmnIsAlreadyParalyzed, // 58 - sText_PkmnHealedParalysis, // 59 - sText_PkmnDreamEaten, // 60 - sText_StatsWontIncrease, // 61 - sText_StatsWontDecrease, // 62 - sText_TeamStoppedWorking, // 63 - sText_FoeStoppedWorking, // 64 - sText_PkmnIsConfused, // 65 - sText_PkmnHealedConfusion, // 66 - sText_PkmnWasConfused, // 67 - sText_PkmnAlreadyConfused, // 68 - sText_PkmnFellInLove, // 69 - sText_PkmnInLove, // 70 - sText_PkmnImmobilizedByLove, // 71 - sText_PkmnBlownAway, // 72 - sText_PkmnChangedType, // 73 - sText_PkmnFlinched, // 74 - sText_PkmnRegainedHealth, // 75 - sText_PkmnHPFull, // 76 - sText_PkmnRaisedSpDef, // 77 - sText_PkmnRaisedDef, // 78 - sText_PkmnCoveredByVeil, // 79 - sText_PkmnUsedSafeguard, // 80 - sText_PkmnSafeguardExpired, // 81 - sText_PkmnWentToSleep, // 82 - sText_PkmnSleptHealthy, // 83 - sText_PkmnWhippedWhirlwind, // 84 - sText_PkmnTookSunlight, // 85 - sText_PkmnLoweredHead, // 86 - sText_PkmnIsGlowing, // 87 - sText_PkmnFlewHigh, // 88 - sText_PkmnDugHole, // 89 - sText_PkmnSqueezedByBind, // 90 - sText_PkmnTrappedInVortex, // 91 - sText_PkmnWrappedBy, // 92 - sText_PkmnClamped, // 93 - sText_PkmnHurtBy, // 94 - sText_PkmnFreedFrom, // 95 - sText_PkmnCrashed, // 96 - gText_PkmnShroudedInMist, // 97 - sText_PkmnProtectedByMist, // 98 - gText_PkmnGettingPumped, // 99 - sText_PkmnHitWithRecoil, // 100 - sText_PkmnProtectedItself2, // 101 - sText_PkmnBuffetedBySandstorm, // 102 - sText_PkmnPeltedByHail, // 103 - sText_PkmnSeeded, // 104 - sText_PkmnEvadedAttack, // 105 - sText_PkmnSappedByLeechSeed, // 106 - sText_PkmnFastAsleep, // 107 - sText_PkmnWokeUp, // 108 - sText_PkmnUproarKeptAwake, // 109 - sText_PkmnWokeUpInUproar, // 110 - sText_PkmnCausedUproar, // 111 - sText_PkmnMakingUproar, // 112 - sText_PkmnCalmedDown, // 113 - sText_PkmnCantSleepInUproar, // 114 - sText_PkmnStockpiled, // 115 - sText_PkmnCantStockpile, // 116 - sText_PkmnCantSleepInUproar2, // 117 - sText_UproarKeptPkmnAwake, // 118 - sText_PkmnStayedAwakeUsing, // 119 - sText_PkmnStoringEnergy, // 120 - sText_PkmnUnleashedEnergy, // 121 - sText_PkmnFatigueConfusion, // 122 - sText_PkmnPickedUpItem, // 123 - sText_PkmnUnaffected, // 124 - sText_PkmnTransformedInto, // 125 - sText_PkmnMadeSubstitute, // 126 - sText_PkmnHasSubstitute, // 127 - sText_SubstituteDamaged, // 128 - sText_PkmnSubstituteFaded, // 129 - sText_PkmnMustRecharge, // 130 - sText_PkmnRageBuilding, // 131 - sText_PkmnMoveWasDisabled, // 132 - sText_PkmnMoveIsDisabled, // 133 - sText_PkmnMoveDisabledNoMore, // 134 - sText_PkmnGotEncore, // 135 - sText_PkmnEncoreEnded, // 136 - sText_PkmnTookAim, // 137 - sText_PkmnSketchedMove, // 138 - sText_PkmnTryingToTakeFoe, // 139 - sText_PkmnTookFoe, // 140 - sText_PkmnReducedPP, // 141 - sText_PkmnStoleItem, // 142 - sText_TargetCantEscapeNow, // 143 - sText_PkmnFellIntoNightmare, // 144 - sText_PkmnLockedInNightmare, // 145 - sText_PkmnLaidCurse, // 146 - sText_PkmnAfflictedByCurse, // 147 - sText_SpikesScattered, // 148 - sText_PkmnHurtBySpikes, // 149 - sText_PkmnIdentified, // 150 - sText_PkmnPerishCountFell, // 151 - sText_PkmnBracedItself, // 152 - sText_PkmnEnduredHit, // 153 - sText_MagnitudeStrength, // 154 - sText_PkmnCutHPMaxedAttack, // 155 - sText_PkmnCopiedStatChanges, // 156 - sText_PkmnGotFree, // 157 - sText_PkmnShedLeechSeed, // 158 - sText_PkmnBlewAwaySpikes, // 159 - sText_PkmnFledFromBattle, // 160 - sText_PkmnForesawAttack, // 161 - sText_PkmnTookAttack, // 162 - sText_PkmnAttack, // 163 - sText_PkmnCenterAttention, // 164 - sText_PkmnChargingPower, // 165 - sText_NaturePowerTurnedInto, // 166 - sText_PkmnStatusNormal, // 167 - sText_PkmnHasNoMovesLeft, // 168 - sText_PkmnSubjectedToTorment, // 169 - sText_PkmnCantUseMoveTorment, // 170 - sText_PkmnTighteningFocus, // 171 - sText_PkmnFellForTaunt, // 172 - sText_PkmnCantUseMoveTaunt, // 173 - sText_PkmnReadyToHelp, // 174 - sText_PkmnSwitchedItems, // 175 - sText_PkmnCopiedFoe, // 176 - sText_PkmnMadeWish, // 177 - sText_PkmnWishCameTrue, // 178 - sText_PkmnPlantedRoots, // 179 - sText_PkmnAbsorbedNutrients, // 180 - sText_PkmnAnchoredItself, // 181 - sText_PkmnWasMadeDrowsy, // 182 - sText_PkmnKnockedOff, // 183 - sText_PkmnSwappedAbilities, // 184 - sText_PkmnSealedOpponentMove, // 185 - sText_PkmnCantUseMoveSealed, // 186 - sText_PkmnWantsGrudge, // 187 - sText_PkmnLostPPGrudge, // 188 - sText_PkmnShroudedItself, // 189 - sText_PkmnMoveBounced, // 190 - sText_PkmnWaitsForTarget, // 191 - sText_PkmnSnatchedMove, // 192 - sText_PkmnMadeItRain, // 193 - sText_PkmnRaisedSpeed, // 194 - sText_PkmnProtectedBy, // 195 - sText_PkmnPreventsUsage, // 196 - sText_PkmnRestoredHPUsing, // 197 - sText_PkmnChangedTypeWith, // 198 - sText_PkmnPreventsParalysisWith, // 199 - sText_PkmnPreventsRomanceWith, // 200 - sText_PkmnPreventsPoisoningWith, // 201 - sText_PkmnPreventsConfusionWith, // 202 - sText_PkmnRaisedFirePowerWith, // 203 - sText_PkmnAnchorsItselfWith, // 204 - sText_PkmnCutsAttackWith, // 205 - sText_PkmnPreventsStatLossWith, // 206 - sText_PkmnHurtsWith, // 207 - sText_PkmnTraced, // 208 - sText_StatSharply, // 209 - gText_StatRose, // 210 - sText_StatHarshly, // 211 - sText_StatFell, // 212 - sText_PkmnsStatChanged, // 213 - gText_PkmnsStatChanged2, // 214 - sText_PkmnsStatChanged3, // 215 - sText_PkmnsStatChanged4, // 216 - sText_CriticalHit, // 217 - sText_OneHitKO, // 218 - sText_123Poof, // 219 - sText_AndEllipsis, // 220 - sText_NotVeryEffective, // 221 - sText_SuperEffective, // 222 - sText_GotAwaySafely, // 223 - sText_WildPkmnFled, // 224 - sText_NoRunningFromTrainers, // 225 - sText_CantEscape, // 226 - sText_DontLeaveBirch, // 227 - sText_ButNothingHappened, // 228 - sText_ButItFailed, // 229 - sText_ItHurtConfusion, // 230 - sText_MirrorMoveFailed, // 231 - sText_StartedToRain, // 232 - sText_DownpourStarted, // 233 - sText_RainContinues, // 234 - sText_DownpourContinues, // 235 - sText_RainStopped, // 236 - sText_SandstormBrewed, // 237 - sText_SandstormRages, // 238 - sText_SandstormSubsided, // 239 - sText_SunlightGotBright, // 240 - sText_SunlightStrong, // 241 - sText_SunlightFaded, // 242 - sText_StartedHail, // 243 - sText_HailContinues, // 244 - sText_HailStopped, // 245 - sText_FailedToSpitUp, // 246 - sText_FailedToSwallow, // 247 - sText_WindBecameHeatWave, // 248 - sText_StatChangesGone, // 249 - sText_CoinsScattered, // 250 - sText_TooWeakForSubstitute, // 251 - sText_SharedPain, // 252 - sText_BellChimed, // 253 - sText_FaintInThree, // 254 - sText_NoPPLeft, // 255 - sText_ButNoPPLeft, // 256 - sText_PlayerUsedItem, // 257 - sText_WallyUsedItem, // 258 - sText_TrainerBlockedBall, // 259 - sText_DontBeAThief, // 260 - sText_ItDodgedBall, // 261 - sText_YouMissedPkmn, // 262 - sText_PkmnBrokeFree, // 263 - sText_ItAppearedCaught, // 264 - sText_AarghAlmostHadIt, // 265 - sText_ShootSoClose, // 266 - sText_GotchaPkmnCaught, // 267 - sText_GotchaPkmnCaught2, // 268 - sText_GiveNicknameCaptured, // 269 - sText_PkmnSentToPC, // 270 - sText_PkmnDataAddedToDex, // 271 - sText_ItIsRaining, // 272 - sText_SandstormIsRaging, // 273 - sText_CantEscape2, // 274 - sText_PkmnIgnoresAsleep, // 275 - sText_PkmnIgnoredOrders, // 276 - sText_PkmnBeganToNap, // 277 - sText_PkmnLoafing, // 278 - sText_PkmnWontObey, // 279 - sText_PkmnTurnedAway, // 280 - sText_PkmnPretendNotNotice, // 281 - sText_EnemyAboutToSwitchPkmn, // 282 - sText_CreptCloser, // 283 - sText_CantGetCloser, // 284 - sText_PkmnWatchingCarefully, // 285 - sText_PkmnCuriousAboutX, // 286 - sText_PkmnEnthralledByX, // 287 - sText_PkmnIgnoredX, // 288 - sText_ThrewPokeblockAtPkmn, // 289 - sText_OutOfSafariBalls, // 290 - sText_PkmnsItemCuredParalysis, // 291 - sText_PkmnsItemCuredPoison, // 292 - sText_PkmnsItemHealedBurn, // 293 - sText_PkmnsItemDefrostedIt, // 294 - sText_PkmnsItemWokeIt, // 295 - sText_PkmnsItemSnappedOut, // 296 - sText_PkmnsItemCuredProblem, // 297 - sText_PkmnsItemRestoredHealth, // 298 - sText_PkmnsItemRestoredPP, // 299 - sText_PkmnsItemRestoredStatus, // 300 - sText_PkmnsItemRestoredHPALittle, // 301 - sText_ItemAllowsOnlyYMove, // 302 - sText_PkmnHungOnWithX, // 303 - gText_EmptyString3, // 304 - sText_PkmnsXPreventsBurns, // 305 - sText_PkmnsXBlocksY, // 306 - sText_PkmnsXRestoredHPALittle2, // 307 - sText_PkmnsXWhippedUpSandstorm, // 308 - sText_PkmnsXPreventsYLoss, // 309 - sText_PkmnsXInfatuatedY, // 310 - sText_PkmnsXMadeYIneffective, // 311 - sText_PkmnsXCuredYProblem, // 312 - sText_ItSuckedLiquidOoze, // 313 - sText_PkmnTransformed, // 314 - sText_ElectricityWeakened, // 315 - sText_FireWeakened, // 316 - sText_PkmnHidUnderwater, // 317 - sText_PkmnSprangUp, // 318 - sText_HMMovesCantBeForgotten, // 319 - sText_XFoundOneY, // 320 - sText_PlayerDefeatedLinkTrainerTrainer1, // 321 - sText_SoothingAroma, // 322 - sText_ItemsCantBeUsedNow, // 323 - sText_ForXCommaYZ, // 324 - sText_UsingXTheYOfZN, // 325 - sText_PkmnUsedXToGetPumped, // 326 - sText_PkmnsXMadeYUseless, // 327 - sText_PkmnTrappedBySandTomb, // 328 - sText_EmptyString4, // 329 - sText_ABoosted, // 330 - sText_PkmnsXIntensifiedSun, // 331 - sText_PkmnMakesGroundMiss, // 332 - sText_YouThrowABallNowRight, // 333 - sText_PkmnsXTookAttack, // 334 - sText_PkmnChoseXAsDestiny, // 335 - sText_PkmnLostFocus, // 336 - sText_UseNextPkmn, // 337 - sText_PkmnFledUsingIts, // 338 - sText_PkmnFledUsing, // 339 - sText_PkmnWasDraggedOut, // 340 - sText_PreventedFromWorking, // 341 - sText_PkmnsItemNormalizedStatus, // 342 - sText_Trainer1UsedItem, // 343 - sText_BoxIsFull, // 344 - sText_PkmnAvoidedAttack, // 345 - sText_PkmnsXMadeItIneffective, // 346 - sText_PkmnsXPreventsFlinching, // 347 - sText_PkmnAlreadyHasBurn, // 348 - sText_StatsWontDecrease2, // 349 - sText_PkmnsXBlocksY2, // 350 - sText_PkmnsXWoreOff, // 351 - sText_PkmnRaisedDefALittle, // 352 - sText_PkmnRaisedSpDefALittle, // 353 - sText_TheWallShattered, // 354 - sText_PkmnsXPreventsYsZ, // 355 - sText_PkmnsXCuredItsYProblem, // 356 - sText_AttackerCantEscape, // 357 - sText_PkmnObtainedX, // 358 - sText_PkmnObtainedX2, // 359 - sText_PkmnObtainedXYObtainedZ, // 360 - sText_ButNoEffect, // 361 - sText_PkmnsXHadNoEffectOnY, // 362 - sText_TwoInGameTrainersDefeated, // 363 - sText_Trainer2LoseText, // 364 - sText_PkmnIncapableOfPower, // 365 - sText_GlintAppearsInEye, // 366 - sText_PkmnGettingIntoPosition, // 367 - sText_PkmnBeganGrowlingDeeply, // 368 - sText_PkmnEagerForMore, // 369 - sText_DefeatedOpponentByReferee, // 370 - sText_LostToOpponentByReferee, // 371 - sText_TiedOpponentByReferee, // 372 - sText_QuestionForfeitMatch, // 373 - sText_ForfeitedMatch, // 374 - gText_PkmnTransferredSomeonesPC, // 375 - gText_PkmnTransferredLanettesPC, // 376 - gText_PkmnBoxSomeonesPCFull, // 377 - gText_PkmnBoxLanettesPCFull, // 378 - sText_Trainer1WinText, // 379 - sText_Trainer2WinText, // 380 + [STRINGID_TRAINER1LOSETEXT - 12] = sText_Trainer1LoseText, + [STRINGID_PKMNGAINEDEXP - 12] = sText_PkmnGainedEXP, + [STRINGID_PKMNGREWTOLV - 12] = sText_PkmnGrewToLv, + [STRINGID_PKMNLEARNEDMOVE - 12] = sText_PkmnLearnedMove, + [STRINGID_TRYTOLEARNMOVE1 - 12] = sText_TryToLearnMove1, + [STRINGID_TRYTOLEARNMOVE2 - 12] = sText_TryToLearnMove2, + [STRINGID_TRYTOLEARNMOVE3 - 12] = sText_TryToLearnMove3, + [STRINGID_PKMNFORGOTMOVE - 12] = sText_PkmnForgotMove, + [STRINGID_STOPLEARNINGMOVE - 12] = sText_StopLearningMove, + [STRINGID_DIDNOTLEARNMOVE - 12] = sText_DidNotLearnMove, + [STRINGID_PKMNLEARNEDMOVE2 - 12] = sText_PkmnLearnedMove2, + [STRINGID_ATTACKMISSED - 12] = sText_AttackMissed, + [STRINGID_PKMNPROTECTEDITSELF - 12] = sText_PkmnProtectedItself, + [STRINGID_STATSWONTINCREASE2 - 12] = sText_StatsWontIncrease2, + [STRINGID_AVOIDEDDAMAGE - 12] = sText_AvoidedDamage, + [STRINGID_ITDOESNTAFFECT - 12] = sText_ItDoesntAffect, + [STRINGID_ATTACKERFAINTED - 12] = sText_AttackerFainted, + [STRINGID_TARGETFAINTED - 12] = sText_TargetFainted, + [STRINGID_PLAYERGOTMONEY - 12] = sText_PlayerGotMoney, + [STRINGID_PLAYERWHITEOUT - 12] = sText_PlayerWhiteout, + [STRINGID_PLAYERWHITEOUT2 - 12] = sText_PlayerWhiteout2, + [STRINGID_PREVENTSESCAPE - 12] = sText_PreventsEscape, + [STRINGID_HITXTIMES - 12] = sText_HitXTimes, + [STRINGID_PKMNFELLASLEEP - 12] = sText_PkmnFellAsleep, + [STRINGID_PKMNMADESLEEP - 12] = sText_PkmnMadeSleep, + [STRINGID_PKMNALREADYASLEEP - 12] = sText_PkmnAlreadyAsleep, + [STRINGID_PKMNALREADYASLEEP2 - 12] = sText_PkmnAlreadyAsleep2, + [STRINGID_PKMNWASNTAFFECTED - 12] = sText_PkmnWasntAffected, + [STRINGID_PKMNWASPOISONED - 12] = sText_PkmnWasPoisoned, + [STRINGID_PKMNPOISONEDBY - 12] = sText_PkmnPoisonedBy, + [STRINGID_PKMNHURTBYPOISON - 12] = sText_PkmnHurtByPoison, + [STRINGID_PKMNALREADYPOISONED - 12] = sText_PkmnAlreadyPoisoned, + [STRINGID_PKMNBADLYPOISONED - 12] = sText_PkmnBadlyPoisoned, + [STRINGID_PKMNENERGYDRAINED - 12] = sText_PkmnEnergyDrained, + [STRINGID_PKMNWASBURNED - 12] = sText_PkmnWasBurned, + [STRINGID_PKMNBURNEDBY - 12] = sText_PkmnBurnedBy, + [STRINGID_PKMNHURTBYBURN - 12] = sText_PkmnHurtByBurn, + [STRINGID_PKMNWASFROZEN - 12] = sText_PkmnWasFrozen, + [STRINGID_PKMNFROZENBY - 12] = sText_PkmnFrozenBy, + [STRINGID_PKMNISFROZEN - 12] = sText_PkmnIsFrozen, + [STRINGID_PKMNWASDEFROSTED - 12] = sText_PkmnWasDefrosted, + [STRINGID_PKMNWASDEFROSTED2 - 12] = sText_PkmnWasDefrosted2, + [STRINGID_PKMNWASDEFROSTEDBY - 12] = sText_PkmnWasDefrostedBy, + [STRINGID_PKMNWASPARALYZED - 12] = sText_PkmnWasParalyzed, + [STRINGID_PKMNWASPARALYZEDBY - 12] = sText_PkmnWasParalyzedBy, + [STRINGID_PKMNISPARALYZED - 12] = sText_PkmnIsParalyzed, + [STRINGID_PKMNISALREADYPARALYZED - 12] = sText_PkmnIsAlreadyParalyzed, + [STRINGID_PKMNHEALEDPARALYSIS - 12] = sText_PkmnHealedParalysis, + [STRINGID_PKMNDREAMEATEN - 12] = sText_PkmnDreamEaten, + [STRINGID_STATSWONTINCREASE - 12] = sText_StatsWontIncrease, + [STRINGID_STATSWONTDECREASE - 12] = sText_StatsWontDecrease, + [STRINGID_TEAMSTOPPEDWORKING - 12] = sText_TeamStoppedWorking, + [STRINGID_FOESTOPPEDWORKING - 12] = sText_FoeStoppedWorking, + [STRINGID_PKMNISCONFUSED - 12] = sText_PkmnIsConfused, + [STRINGID_PKMNHEALEDCONFUSION - 12] = sText_PkmnHealedConfusion, + [STRINGID_PKMNWASCONFUSED - 12] = sText_PkmnWasConfused, + [STRINGID_PKMNALREADYCONFUSED - 12] = sText_PkmnAlreadyConfused, + [STRINGID_PKMNFELLINLOVE - 12] = sText_PkmnFellInLove, + [STRINGID_PKMNINLOVE - 12] = sText_PkmnInLove, + [STRINGID_PKMNIMMOBILIZEDBYLOVE - 12] = sText_PkmnImmobilizedByLove, + [STRINGID_PKMNBLOWNAWAY - 12] = sText_PkmnBlownAway, + [STRINGID_PKMNCHANGEDTYPE - 12] = sText_PkmnChangedType, + [STRINGID_PKMNFLINCHED - 12] = sText_PkmnFlinched, + [STRINGID_PKMNREGAINEDHEALTH - 12] = sText_PkmnRegainedHealth, + [STRINGID_PKMNHPFULL - 12] = sText_PkmnHPFull, + [STRINGID_PKMNRAISEDSPDEF - 12] = sText_PkmnRaisedSpDef, + [STRINGID_PKMNRAISEDDEF - 12] = sText_PkmnRaisedDef, + [STRINGID_PKMNCOVEREDBYVEIL - 12] = sText_PkmnCoveredByVeil, + [STRINGID_PKMNUSEDSAFEGUARD - 12] = sText_PkmnUsedSafeguard, + [STRINGID_PKMNSAFEGUARDEXPIRED - 12] = sText_PkmnSafeguardExpired, + [STRINGID_PKMNWENTTOSLEEP - 12] = sText_PkmnWentToSleep, + [STRINGID_PKMNSLEPTHEALTHY - 12] = sText_PkmnSleptHealthy, + [STRINGID_PKMNWHIPPEDWHIRLWIND - 12] = sText_PkmnWhippedWhirlwind, + [STRINGID_PKMNTOOKSUNLIGHT - 12] = sText_PkmnTookSunlight, + [STRINGID_PKMNLOWEREDHEAD - 12] = sText_PkmnLoweredHead, + [STRINGID_PKMNISGLOWING - 12] = sText_PkmnIsGlowing, + [STRINGID_PKMNFLEWHIGH - 12] = sText_PkmnFlewHigh, + [STRINGID_PKMNDUGHOLE - 12] = sText_PkmnDugHole, + [STRINGID_PKMNSQUEEZEDBYBIND - 12] = sText_PkmnSqueezedByBind, + [STRINGID_PKMNTRAPPEDINVORTEX - 12] = sText_PkmnTrappedInVortex, + [STRINGID_PKMNWRAPPEDBY - 12] = sText_PkmnWrappedBy, + [STRINGID_PKMNCLAMPED - 12] = sText_PkmnClamped, + [STRINGID_PKMNHURTBY - 12] = sText_PkmnHurtBy, + [STRINGID_PKMNFREEDFROM - 12] = sText_PkmnFreedFrom, + [STRINGID_PKMNCRASHED - 12] = sText_PkmnCrashed, + [STRINGID_PKMNSHROUDEDINMIST - 12] = gText_PkmnShroudedInMist, + [STRINGID_PKMNPROTECTEDBYMIST - 12] = sText_PkmnProtectedByMist, + [STRINGID_PKMNGETTINGPUMPED - 12] = gText_PkmnGettingPumped, + [STRINGID_PKMNHITWITHRECOIL - 12] = sText_PkmnHitWithRecoil, + [STRINGID_PKMNPROTECTEDITSELF2 - 12] = sText_PkmnProtectedItself2, + [STRINGID_PKMNBUFFETEDBYSANDSTORM - 12] = sText_PkmnBuffetedBySandstorm, + [STRINGID_PKMNPELTEDBYHAIL - 12] = sText_PkmnPeltedByHail, + [STRINGID_PKMNSEEDED - 12] = sText_PkmnSeeded, + [STRINGID_PKMNEVADEDATTACK - 12] = sText_PkmnEvadedAttack, + [STRINGID_PKMNSAPPEDBYLEECHSEED - 12] = sText_PkmnSappedByLeechSeed, + [STRINGID_PKMNFASTASLEEP - 12] = sText_PkmnFastAsleep, + [STRINGID_PKMNWOKEUP - 12] = sText_PkmnWokeUp, + [STRINGID_PKMNUPROARKEPTAWAKE - 12] = sText_PkmnUproarKeptAwake, + [STRINGID_PKMNWOKEUPINUPROAR - 12] = sText_PkmnWokeUpInUproar, + [STRINGID_PKMNCAUSEDUPROAR - 12] = sText_PkmnCausedUproar, + [STRINGID_PKMNMAKINGUPROAR - 12] = sText_PkmnMakingUproar, + [STRINGID_PKMNCALMEDDOWN - 12] = sText_PkmnCalmedDown, + [STRINGID_PKMNCANTSLEEPINUPROAR - 12] = sText_PkmnCantSleepInUproar, + [STRINGID_PKMNSTOCKPILED - 12] = sText_PkmnStockpiled, + [STRINGID_PKMNCANTSTOCKPILE - 12] = sText_PkmnCantStockpile, + [STRINGID_PKMNCANTSLEEPINUPROAR2 - 12] = sText_PkmnCantSleepInUproar2, + [STRINGID_UPROARKEPTPKMNAWAKE - 12] = sText_UproarKeptPkmnAwake, + [STRINGID_PKMNSTAYEDAWAKEUSING - 12] = sText_PkmnStayedAwakeUsing, + [STRINGID_PKMNSTORINGENERGY - 12] = sText_PkmnStoringEnergy, + [STRINGID_PKMNUNLEASHEDENERGY - 12] = sText_PkmnUnleashedEnergy, + [STRINGID_PKMNFATIGUECONFUSION - 12] = sText_PkmnFatigueConfusion, + [STRINGID_PKMNPICKEDUPITEM - 12] = sText_PkmnPickedUpItem, + [STRINGID_PKMNUNAFFECTED - 12] = sText_PkmnUnaffected, + [STRINGID_PKMNTRANSFORMEDINTO - 12] = sText_PkmnTransformedInto, + [STRINGID_PKMNMADESUBSTITUTE - 12] = sText_PkmnMadeSubstitute, + [STRINGID_PKMNHASSUBSTITUTE - 12] = sText_PkmnHasSubstitute, + [STRINGID_SUBSTITUTEDAMAGED - 12] = sText_SubstituteDamaged, + [STRINGID_PKMNSUBSTITUTEFADED - 12] = sText_PkmnSubstituteFaded, + [STRINGID_PKMNMUSTRECHARGE - 12] = sText_PkmnMustRecharge, + [STRINGID_PKMNRAGEBUILDING - 12] = sText_PkmnRageBuilding, + [STRINGID_PKMNMOVEWASDISABLED - 12] = sText_PkmnMoveWasDisabled, + [STRINGID_PKMNMOVEISDISABLED - 12] = sText_PkmnMoveIsDisabled, + [STRINGID_PKMNMOVEDISABLEDNOMORE - 12] = sText_PkmnMoveDisabledNoMore, + [STRINGID_PKMNGOTENCORE - 12] = sText_PkmnGotEncore, + [STRINGID_PKMNENCOREENDED - 12] = sText_PkmnEncoreEnded, + [STRINGID_PKMNTOOKAIM - 12] = sText_PkmnTookAim, + [STRINGID_PKMNSKETCHEDMOVE - 12] = sText_PkmnSketchedMove, + [STRINGID_PKMNTRYINGTOTAKEFOE - 12] = sText_PkmnTryingToTakeFoe, + [STRINGID_PKMNTOOKFOE - 12] = sText_PkmnTookFoe, + [STRINGID_PKMNREDUCEDPP - 12] = sText_PkmnReducedPP, + [STRINGID_PKMNSTOLEITEM - 12] = sText_PkmnStoleItem, + [STRINGID_TARGETCANTESCAPENOW - 12] = sText_TargetCantEscapeNow, + [STRINGID_PKMNFELLINTONIGHTMARE - 12] = sText_PkmnFellIntoNightmare, + [STRINGID_PKMNLOCKEDINNIGHTMARE - 12] = sText_PkmnLockedInNightmare, + [STRINGID_PKMNLAIDCURSE - 12] = sText_PkmnLaidCurse, + [STRINGID_PKMNAFFLICTEDBYCURSE - 12] = sText_PkmnAfflictedByCurse, + [STRINGID_SPIKESSCATTERED - 12] = sText_SpikesScattered, + [STRINGID_PKMNHURTBYSPIKES - 12] = sText_PkmnHurtBySpikes, + [STRINGID_PKMNIDENTIFIED - 12] = sText_PkmnIdentified, + [STRINGID_PKMNPERISHCOUNTFELL - 12] = sText_PkmnPerishCountFell, + [STRINGID_PKMNBRACEDITSELF - 12] = sText_PkmnBracedItself, + [STRINGID_PKMNENDUREDHIT - 12] = sText_PkmnEnduredHit, + [STRINGID_MAGNITUDESTRENGTH - 12] = sText_MagnitudeStrength, + [STRINGID_PKMNCUTHPMAXEDATTACK - 12] = sText_PkmnCutHPMaxedAttack, + [STRINGID_PKMNCOPIEDSTATCHANGES - 12] = sText_PkmnCopiedStatChanges, + [STRINGID_PKMNGOTFREE - 12] = sText_PkmnGotFree, + [STRINGID_PKMNSHEDLEECHSEED - 12] = sText_PkmnShedLeechSeed, + [STRINGID_PKMNBLEWAWAYSPIKES - 12] = sText_PkmnBlewAwaySpikes, + [STRINGID_PKMNFLEDFROMBATTLE - 12] = sText_PkmnFledFromBattle, + [STRINGID_PKMNFORESAWATTACK - 12] = sText_PkmnForesawAttack, + [STRINGID_PKMNTOOKATTACK - 12] = sText_PkmnTookAttack, + [STRINGID_PKMNATTACK - 12] = sText_PkmnAttack, + [STRINGID_PKMNCENTERATTENTION - 12] = sText_PkmnCenterAttention, + [STRINGID_PKMNCHARGINGPOWER - 12] = sText_PkmnChargingPower, + [STRINGID_NATUREPOWERTURNEDINTO - 12] = sText_NaturePowerTurnedInto, + [STRINGID_PKMNSTATUSNORMAL - 12] = sText_PkmnStatusNormal, + [STRINGID_PKMNHASNOMOVESLEFT - 12] = sText_PkmnHasNoMovesLeft, + [STRINGID_PKMNSUBJECTEDTOTORMENT - 12] = sText_PkmnSubjectedToTorment, + [STRINGID_PKMNCANTUSEMOVETORMENT - 12] = sText_PkmnCantUseMoveTorment, + [STRINGID_PKMNTIGHTENINGFOCUS - 12] = sText_PkmnTighteningFocus, + [STRINGID_PKMNFELLFORTAUNT - 12] = sText_PkmnFellForTaunt, + [STRINGID_PKMNCANTUSEMOVETAUNT - 12] = sText_PkmnCantUseMoveTaunt, + [STRINGID_PKMNREADYTOHELP - 12] = sText_PkmnReadyToHelp, + [STRINGID_PKMNSWITCHEDITEMS - 12] = sText_PkmnSwitchedItems, + [STRINGID_PKMNCOPIEDFOE - 12] = sText_PkmnCopiedFoe, + [STRINGID_PKMNMADEWISH - 12] = sText_PkmnMadeWish, + [STRINGID_PKMNWISHCAMETRUE - 12] = sText_PkmnWishCameTrue, + [STRINGID_PKMNPLANTEDROOTS - 12] = sText_PkmnPlantedRoots, + [STRINGID_PKMNABSORBEDNUTRIENTS - 12] = sText_PkmnAbsorbedNutrients, + [STRINGID_PKMNANCHOREDITSELF - 12] = sText_PkmnAnchoredItself, + [STRINGID_PKMNWASMADEDROWSY - 12] = sText_PkmnWasMadeDrowsy, + [STRINGID_PKMNKNOCKEDOFF - 12] = sText_PkmnKnockedOff, + [STRINGID_PKMNSWAPPEDABILITIES - 12] = sText_PkmnSwappedAbilities, + [STRINGID_PKMNSEALEDOPPONENTMOVE - 12] = sText_PkmnSealedOpponentMove, + [STRINGID_PKMNCANTUSEMOVESEALED - 12] = sText_PkmnCantUseMoveSealed, + [STRINGID_PKMNWANTSGRUDGE - 12] = sText_PkmnWantsGrudge, + [STRINGID_PKMNLOSTPPGRUDGE - 12] = sText_PkmnLostPPGrudge, + [STRINGID_PKMNSHROUDEDITSELF - 12] = sText_PkmnShroudedItself, + [STRINGID_PKMNMOVEBOUNCED - 12] = sText_PkmnMoveBounced, + [STRINGID_PKMNWAITSFORTARGET - 12] = sText_PkmnWaitsForTarget, + [STRINGID_PKMNSNATCHEDMOVE - 12] = sText_PkmnSnatchedMove, + [STRINGID_PKMNMADEITRAIN - 12] = sText_PkmnMadeItRain, + [STRINGID_PKMNRAISEDSPEED - 12] = sText_PkmnRaisedSpeed, + [STRINGID_PKMNPROTECTEDBY - 12] = sText_PkmnProtectedBy, + [STRINGID_PKMNPREVENTSUSAGE - 12] = sText_PkmnPreventsUsage, + [STRINGID_PKMNRESTOREDHPUSING - 12] = sText_PkmnRestoredHPUsing, + [STRINGID_PKMNCHANGEDTYPEWITH - 12] = sText_PkmnChangedTypeWith, + [STRINGID_PKMNPREVENTSPARALYSISWITH - 12] = sText_PkmnPreventsParalysisWith, + [STRINGID_PKMNPREVENTSROMANCEWITH - 12] = sText_PkmnPreventsRomanceWith, + [STRINGID_PKMNPREVENTSPOISONINGWITH - 12] = sText_PkmnPreventsPoisoningWith, + [STRINGID_PKMNPREVENTSCONFUSIONWITH - 12] = sText_PkmnPreventsConfusionWith, + [STRINGID_PKMNRAISEDFIREPOWERWITH - 12] = sText_PkmnRaisedFirePowerWith, + [STRINGID_PKMNANCHORSITSELFWITH - 12] = sText_PkmnAnchorsItselfWith, + [STRINGID_PKMNCUTSATTACKWITH - 12] = sText_PkmnCutsAttackWith, + [STRINGID_PKMNPREVENTSSTATLOSSWITH - 12] = sText_PkmnPreventsStatLossWith, + [STRINGID_PKMNHURTSWITH - 12] = sText_PkmnHurtsWith, + [STRINGID_PKMNTRACED - 12] = sText_PkmnTraced, + [STRINGID_STATSHARPLY - 12] = sText_StatSharply, + [STRINGID_STATROSE - 12] = gText_StatRose, + [STRINGID_STATHARSHLY - 12] = sText_StatHarshly, + [STRINGID_STATFELL - 12] = sText_StatFell, + [STRINGID_PKMNSSTATCHANGED - 12] = sText_PkmnsStatChanged, + [STRINGID_PKMNSSTATCHANGED2 - 12] = gText_PkmnsStatChanged2, + [STRINGID_PKMNSSTATCHANGED3 - 12] = sText_PkmnsStatChanged3, + [STRINGID_PKMNSSTATCHANGED4 - 12] = sText_PkmnsStatChanged4, + [STRINGID_CRITICALHIT - 12] = sText_CriticalHit, + [STRINGID_ONEHITKO - 12] = sText_OneHitKO, + [STRINGID_123POOF - 12] = sText_123Poof, + [STRINGID_ANDELLIPSIS - 12] = sText_AndEllipsis, + [STRINGID_NOTVERYEFFECTIVE - 12] = sText_NotVeryEffective, + [STRINGID_SUPEREFFECTIVE - 12] = sText_SuperEffective, + [STRINGID_GOTAWAYSAFELY - 12] = sText_GotAwaySafely, + [STRINGID_WILDPKMNFLED - 12] = sText_WildPkmnFled, + [STRINGID_NORUNNINGFROMTRAINERS - 12] = sText_NoRunningFromTrainers, + [STRINGID_CANTESCAPE - 12] = sText_CantEscape, + [STRINGID_DONTLEAVEBIRCH - 12] = sText_DontLeaveBirch, + [STRINGID_BUTNOTHINGHAPPENED - 12] = sText_ButNothingHappened, + [STRINGID_BUTITFAILED - 12] = sText_ButItFailed, + [STRINGID_ITHURTCONFUSION - 12] = sText_ItHurtConfusion, + [STRINGID_MIRRORMOVEFAILED - 12] = sText_MirrorMoveFailed, + [STRINGID_STARTEDTORAIN - 12] = sText_StartedToRain, + [STRINGID_DOWNPOURSTARTED - 12] = sText_DownpourStarted, + [STRINGID_RAINCONTINUES - 12] = sText_RainContinues, + [STRINGID_DOWNPOURCONTINUES - 12] = sText_DownpourContinues, + [STRINGID_RAINSTOPPED - 12] = sText_RainStopped, + [STRINGID_SANDSTORMBREWED - 12] = sText_SandstormBrewed, + [STRINGID_SANDSTORMRAGES - 12] = sText_SandstormRages, + [STRINGID_SANDSTORMSUBSIDED - 12] = sText_SandstormSubsided, + [STRINGID_SUNLIGHTGOTBRIGHT - 12] = sText_SunlightGotBright, + [STRINGID_SUNLIGHTSTRONG - 12] = sText_SunlightStrong, + [STRINGID_SUNLIGHTFADED - 12] = sText_SunlightFaded, + [STRINGID_STARTEDHAIL - 12] = sText_StartedHail, + [STRINGID_HAILCONTINUES - 12] = sText_HailContinues, + [STRINGID_HAILSTOPPED - 12] = sText_HailStopped, + [STRINGID_FAILEDTOSPITUP - 12] = sText_FailedToSpitUp, + [STRINGID_FAILEDTOSWALLOW - 12] = sText_FailedToSwallow, + [STRINGID_WINDBECAMEHEATWAVE - 12] = sText_WindBecameHeatWave, + [STRINGID_STATCHANGESGONE - 12] = sText_StatChangesGone, + [STRINGID_COINSSCATTERED - 12] = sText_CoinsScattered, + [STRINGID_TOOWEAKFORSUBSTITUTE - 12] = sText_TooWeakForSubstitute, + [STRINGID_SHAREDPAIN - 12] = sText_SharedPain, + [STRINGID_BELLCHIMED - 12] = sText_BellChimed, + [STRINGID_FAINTINTHREE - 12] = sText_FaintInThree, + [STRINGID_NOPPLEFT - 12] = sText_NoPPLeft, + [STRINGID_BUTNOPPLEFT - 12] = sText_ButNoPPLeft, + [STRINGID_PLAYERUSEDITEM - 12] = sText_PlayerUsedItem, + [STRINGID_WALLYUSEDITEM - 12] = sText_WallyUsedItem, + [STRINGID_TRAINERBLOCKEDBALL - 12] = sText_TrainerBlockedBall, + [STRINGID_DONTBEATHIEF - 12] = sText_DontBeAThief, + [STRINGID_ITDODGEDBALL - 12] = sText_ItDodgedBall, + [STRINGID_YOUMISSEDPKMN - 12] = sText_YouMissedPkmn, + [STRINGID_PKMNBROKEFREE - 12] = sText_PkmnBrokeFree, + [STRINGID_ITAPPEAREDCAUGHT - 12] = sText_ItAppearedCaught, + [STRINGID_AARGHALMOSTHADIT - 12] = sText_AarghAlmostHadIt, + [STRINGID_SHOOTSOCLOSE - 12] = sText_ShootSoClose, + [STRINGID_GOTCHAPKMNCAUGHT - 12] = sText_GotchaPkmnCaught, + [STRINGID_GOTCHAPKMNCAUGHT2 - 12] = sText_GotchaPkmnCaught2, + [STRINGID_GIVENICKNAMECAPTURED - 12] = sText_GiveNicknameCaptured, + [STRINGID_PKMNSENTTOPC - 12] = sText_PkmnSentToPC, + [STRINGID_PKMNDATAADDEDTODEX - 12] = sText_PkmnDataAddedToDex, + [STRINGID_ITISRAINING - 12] = sText_ItIsRaining, + [STRINGID_SANDSTORMISRAGING - 12] = sText_SandstormIsRaging, + [STRINGID_CANTESCAPE2 - 12] = sText_CantEscape2, + [STRINGID_PKMNIGNORESASLEEP - 12] = sText_PkmnIgnoresAsleep, + [STRINGID_PKMNIGNOREDORDERS - 12] = sText_PkmnIgnoredOrders, + [STRINGID_PKMNBEGANTONAP - 12] = sText_PkmnBeganToNap, + [STRINGID_PKMNLOAFING - 12] = sText_PkmnLoafing, + [STRINGID_PKMNWONTOBEY - 12] = sText_PkmnWontObey, + [STRINGID_PKMNTURNEDAWAY - 12] = sText_PkmnTurnedAway, + [STRINGID_PKMNPRETENDNOTNOTICE - 12] = sText_PkmnPretendNotNotice, + [STRINGID_ENEMYABOUTTOSWITCHPKMN - 12] = sText_EnemyAboutToSwitchPkmn, + [STRINGID_CREPTCLOSER - 12] = sText_CreptCloser, + [STRINGID_CANTGETCLOSER - 12] = sText_CantGetCloser, + [STRINGID_PKMNWATCHINGCAREFULLY - 12] = sText_PkmnWatchingCarefully, + [STRINGID_PKMNCURIOUSABOUTX - 12] = sText_PkmnCuriousAboutX, + [STRINGID_PKMNENTHRALLEDBYX - 12] = sText_PkmnEnthralledByX, + [STRINGID_PKMNIGNOREDX - 12] = sText_PkmnIgnoredX, + [STRINGID_THREWPOKEBLOCKATPKMN - 12] = sText_ThrewPokeblockAtPkmn, + [STRINGID_OUTOFSAFARIBALLS - 12] = sText_OutOfSafariBalls, + [STRINGID_PKMNSITEMCUREDPARALYSIS - 12] = sText_PkmnsItemCuredParalysis, + [STRINGID_PKMNSITEMCUREDPOISON - 12] = sText_PkmnsItemCuredPoison, + [STRINGID_PKMNSITEMHEALEDBURN - 12] = sText_PkmnsItemHealedBurn, + [STRINGID_PKMNSITEMDEFROSTEDIT - 12] = sText_PkmnsItemDefrostedIt, + [STRINGID_PKMNSITEMWOKEIT - 12] = sText_PkmnsItemWokeIt, + [STRINGID_PKMNSITEMSNAPPEDOUT - 12] = sText_PkmnsItemSnappedOut, + [STRINGID_PKMNSITEMCUREDPROBLEM - 12] = sText_PkmnsItemCuredProblem, + [STRINGID_PKMNSITEMRESTOREDHEALTH - 12] = sText_PkmnsItemRestoredHealth, + [STRINGID_PKMNSITEMRESTOREDPP - 12] = sText_PkmnsItemRestoredPP, + [STRINGID_PKMNSITEMRESTOREDSTATUS - 12] = sText_PkmnsItemRestoredStatus, + [STRINGID_PKMNSITEMRESTOREDHPALITTLE - 12] = sText_PkmnsItemRestoredHPALittle, + [STRINGID_ITEMALLOWSONLYYMOVE - 12] = sText_ItemAllowsOnlyYMove, + [STRINGID_PKMNHUNGONWITHX - 12] = sText_PkmnHungOnWithX, + [STRINGID_EMPTYSTRING3 - 12] = gText_EmptyString3, + [STRINGID_PKMNSXPREVENTSBURNS - 12] = sText_PkmnsXPreventsBurns, + [STRINGID_PKMNSXBLOCKSY - 12] = sText_PkmnsXBlocksY, + [STRINGID_PKMNSXRESTOREDHPALITTLE2 - 12] = sText_PkmnsXRestoredHPALittle2, + [STRINGID_PKMNSXWHIPPEDUPSANDSTORM - 12] = sText_PkmnsXWhippedUpSandstorm, + [STRINGID_PKMNSXPREVENTSYLOSS - 12] = sText_PkmnsXPreventsYLoss, + [STRINGID_PKMNSXINFATUATEDY - 12] = sText_PkmnsXInfatuatedY, + [STRINGID_PKMNSXMADEYINEFFECTIVE - 12] = sText_PkmnsXMadeYIneffective, + [STRINGID_PKMNSXCUREDYPROBLEM - 12] = sText_PkmnsXCuredYProblem, + [STRINGID_ITSUCKEDLIQUIDOOZE - 12] = sText_ItSuckedLiquidOoze, + [STRINGID_PKMNTRANSFORMED - 12] = sText_PkmnTransformed, + [STRINGID_ELECTRICITYWEAKENED - 12] = sText_ElectricityWeakened, + [STRINGID_FIREWEAKENED - 12] = sText_FireWeakened, + [STRINGID_PKMNHIDUNDERWATER - 12] = sText_PkmnHidUnderwater, + [STRINGID_PKMNSPRANGUP - 12] = sText_PkmnSprangUp, + [STRINGID_HMMOVESCANTBEFORGOTTEN - 12] = sText_HMMovesCantBeForgotten, + [STRINGID_XFOUNDONEY - 12] = sText_XFoundOneY, + [STRINGID_PLAYERDEFEATEDTRAINER1 - 12] = sText_PlayerDefeatedLinkTrainerTrainer1, + [STRINGID_SOOTHINGAROMA - 12] = sText_SoothingAroma, + [STRINGID_ITEMSCANTBEUSEDNOW - 12] = sText_ItemsCantBeUsedNow, + [STRINGID_FORXCOMMAYZ - 12] = sText_ForXCommaYZ, + [STRINGID_USINGXTHEYOFZN - 12] = sText_UsingXTheYOfZN, + [STRINGID_PKMNUSEDXTOGETPUMPED - 12] = sText_PkmnUsedXToGetPumped, + [STRINGID_PKMNSXMADEYUSELESS - 12] = sText_PkmnsXMadeYUseless, + [STRINGID_PKMNTRAPPEDBYSANDTOMB - 12] = sText_PkmnTrappedBySandTomb, + [STRINGID_EMPTYSTRING4 - 12] = sText_EmptyString4, + [STRINGID_ABOOSTED - 12] = sText_ABoosted, + [STRINGID_PKMNSXINTENSIFIEDSUN - 12] = sText_PkmnsXIntensifiedSun, + [STRINGID_PKMNMAKESGROUNDMISS - 12] = sText_PkmnMakesGroundMiss, + [STRINGID_YOUTHROWABALLNOWRIGHT - 12] = sText_YouThrowABallNowRight, + [STRINGID_PKMNSXTOOKATTACK - 12] = sText_PkmnsXTookAttack, + [STRINGID_PKMNCHOSEXASDESTINY - 12] = sText_PkmnChoseXAsDestiny, + [STRINGID_PKMNLOSTFOCUS - 12] = sText_PkmnLostFocus, + [STRINGID_USENEXTPKMN - 12] = sText_UseNextPkmn, + [STRINGID_PKMNFLEDUSINGITS - 12] = sText_PkmnFledUsingIts, + [STRINGID_PKMNFLEDUSING - 12] = sText_PkmnFledUsing, + [STRINGID_PKMNWASDRAGGEDOUT - 12] = sText_PkmnWasDraggedOut, + [STRINGID_PREVENTEDFROMWORKING - 12] = sText_PreventedFromWorking, + [STRINGID_PKMNSITEMNORMALIZEDSTATUS - 12] = sText_PkmnsItemNormalizedStatus, + [STRINGID_TRAINER1USEDITEM - 12] = sText_Trainer1UsedItem, + [STRINGID_BOXISFULL - 12] = sText_BoxIsFull, + [STRINGID_PKMNAVOIDEDATTACK - 12] = sText_PkmnAvoidedAttack, + [STRINGID_PKMNSXMADEITINEFFECTIVE - 12] = sText_PkmnsXMadeItIneffective, + [STRINGID_PKMNSXPREVENTSFLINCHING - 12] = sText_PkmnsXPreventsFlinching, + [STRINGID_PKMNALREADYHASBURN - 12] = sText_PkmnAlreadyHasBurn, + [STRINGID_STATSWONTDECREASE2 - 12] = sText_StatsWontDecrease2, + [STRINGID_PKMNSXBLOCKSY2 - 12] = sText_PkmnsXBlocksY2, + [STRINGID_PKMNSXWOREOFF - 12] = sText_PkmnsXWoreOff, + [STRINGID_PKMNRAISEDDEFALITTLE - 12] = sText_PkmnRaisedDefALittle, + [STRINGID_PKMNRAISEDSPDEFALITTLE - 12] = sText_PkmnRaisedSpDefALittle, + [STRINGID_THEWALLSHATTERED - 12] = sText_TheWallShattered, + [STRINGID_PKMNSXPREVENTSYSZ - 12] = sText_PkmnsXPreventsYsZ, + [STRINGID_PKMNSXCUREDITSYPROBLEM - 12] = sText_PkmnsXCuredItsYProblem, + [STRINGID_ATTACKERCANTESCAPE - 12] = sText_AttackerCantEscape, + [STRINGID_PKMNOBTAINEDX - 12] = sText_PkmnObtainedX, + [STRINGID_PKMNOBTAINEDX2 - 12] = sText_PkmnObtainedX2, + [STRINGID_PKMNOBTAINEDXYOBTAINEDZ - 12] = sText_PkmnObtainedXYObtainedZ, + [STRINGID_BUTNOEFFECT - 12] = sText_ButNoEffect, + [STRINGID_PKMNSXHADNOEFFECTONY - 12] = sText_PkmnsXHadNoEffectOnY, + [STRINGID_TWOENEMIESDEFEATED - 12] = sText_TwoInGameTrainersDefeated, + [STRINGID_TRAINER2LOSETEXT - 12] = sText_Trainer2LoseText, + [STRINGID_PKMNINCAPABLEOFPOWER - 12] = sText_PkmnIncapableOfPower, + [STRINGID_GLINTAPPEARSINEYE - 12] = sText_GlintAppearsInEye, + [STRINGID_PKMNGETTINGINTOPOSITION - 12] = sText_PkmnGettingIntoPosition, + [STRINGID_PKMNBEGANGROWLINGDEEPLY - 12] = sText_PkmnBeganGrowlingDeeply, + [STRINGID_PKMNEAGERFORMORE - 12] = sText_PkmnEagerForMore, + [STRINGID_DEFEATEDOPPONENTBYREFEREE - 12] = sText_DefeatedOpponentByReferee, + [STRINGID_LOSTTOOPPONENTBYREFEREE - 12] = sText_LostToOpponentByReferee, + [STRINGID_TIEDOPPONENTBYREFEREE - 12] = sText_TiedOpponentByReferee, + [STRINGID_QUESTIONFORFEITMATCH - 12] = sText_QuestionForfeitMatch, + [STRINGID_FORFEITEDMATCH - 12] = sText_ForfeitedMatch, + [STRINGID_PKMNTRANSFERREDSOMEONESPC - 12] = gText_PkmnTransferredSomeonesPC, + [STRINGID_PKMNTRANSFERREDLANETTESPC - 12] = gText_PkmnTransferredLanettesPC, + [STRINGID_PKMNBOXSOMEONESPCFULL - 12] = gText_PkmnBoxSomeonesPCFull, + [STRINGID_PKMNBOXLANETTESPCFULL - 12] = gText_PkmnBoxLanettesPCFull, + [STRINGID_TRAINER1WINTEXT - 12] = sText_Trainer1WinText, + [STRINGID_TRAINER2WINTEXT - 12] = sText_Trainer2WinText, }; const u16 gMissStringIds[] = diff --git a/src/data/pokemon/cry_ids.h b/src/data/pokemon/cry_ids.h index 0c7dd8dad..e53ffd2a8 100644 --- a/src/data/pokemon/cry_ids.h +++ b/src/data/pokemon/cry_ids.h @@ -1,138 +1,138 @@ const u16 gSpeciesIdToCryId[] = { - 273, // TREECKO - 274, // GROVYLE - 275, // SCEPTILE - 270, // TORCHIC - 271, // COMBUSKEN - 272, // BLAZIKEN - 276, // MUDKIP - 277, // MARSHTOMP - 278, // SWAMPERT - 359, // POOCHYENA - 360, // MIGHTYENA - 378, // ZIGZAGOON - 375, // LINOONE - 290, // WURMPLE - 291, // SILCOON - 292, // BEAUTIFLY - 293, // CASCOON - 294, // DUSTOX - 283, // LOTAD - 284, // LOMBRE - 285, // LUDICOLO - 286, // SEEDOT - 287, // NUZLEAF - 288, // SHIFTRY - 301, // NINCADA - 302, // NINJASK - 303, // SHEDINJA - 266, // TAILLOW - 267, // SWELLOW - 374, // SHROOMISH - 373, // BRELOOM - 269, // SPINDA - 280, // WINGULL - 279, // PELIPPER - 310, // SURSKIT - 311, // MASQUERAIN - 377, // WAILMER - 381, // WAILORD - 312, // SKITTY - 313, // DELCATTY - 251, // KECLEON - 329, // BALTOY - 330, // CLAYDOL - 306, // NOSEPASS - 253, // TORKOAL - 362, // SABLEYE - 318, // BARBOACH - 319, // WHISCASH - 368, // LUVDISC - 320, // CORPHISH - 321, // CRAWDAUNT - 333, // FEEBAS - 334, // MILOTIC - 289, // CARVANHA - 260, // SHARPEDO - 324, // TRAPINCH - 325, // VIBRAVA - 326, // FLYGON - 304, // MAKUHITA - 305, // HARIYAMA - 254, // ELECTRIKE - 255, // MANECTRIC - 316, // NUMEL - 317, // CAMERUPT - 338, // SPHEAL - 339, // SEALEO - 340, // WALREIN - 327, // CACNEA - 328, // CACTURNE - 383, // SNORUNT - 307, // GLALIE - 331, // LUNATONE - 332, // SOLROCK - 262, // AZURILL - 322, // SPOINK - 323, // GRUMPIG - 308, // PLUSLE - 309, // MINUN - 363, // MAWILE - 336, // MEDITITE - 337, // MEDICHAM - 263, // SWABLU - 264, // ALTARIA - 258, // WYNAUT - 256, // DUSKULL - 361, // DUSCLOPS - 252, // ROSELIA - 298, // SLAKOTH - 299, // VIGOROTH - 300, // SLAKING - 314, // GULPIN - 315, // SWALOT - 376, // TROPIUS - 382, // WHISMUR - 380, // LOUDRED - 379, // EXPLOUD - 341, // CLAMPERL - 342, // HUNTAIL - 343, // GOREBYSS - 335, // ABSOL - 282, // SHUPPET - 281, // BANETTE - 259, // SEVIPER - 261, // ZANGOOSE - 367, // RELICANTH - 364, // ARON - 365, // LAIRON - 366, // AGGRON - 356, // CASTFORM - 357, // VOLBEAT - 358, // ILLUMISE - 344, // LILEEP - 345, // CRADILY - 346, // ANORITH - 347, // ARMALDO - 295, // RALTS - 296, // KIRLIA - 297, // GARDEVOIR - 351, // BAGON - 352, // SHELGON - 372, // SALAMENCE - 348, // BELDUM - 349, // METANG - 350, // METAGROSS - 353, // REGIROCK - 354, // REGICE - 355, // REGISTEEL - 370, // KYOGRE - 369, // GROUDON - 371, // RAYQUAZA - 257, // LATIAS - 384, // LATIOS - 385, // JIRACHI - 386, // DEOXYS - 387 // CHIMECHO + [SPECIES_TREECKO - 277] = 273, + [SPECIES_GROVYLE - 277] = 274, + [SPECIES_SCEPTILE - 277] = 275, + [SPECIES_TORCHIC - 277] = 270, + [SPECIES_COMBUSKEN - 277] = 271, + [SPECIES_BLAZIKEN - 277] = 272, + [SPECIES_MUDKIP - 277] = 276, + [SPECIES_MARSHTOMP - 277] = 277, + [SPECIES_SWAMPERT - 277] = 278, + [SPECIES_POOCHYENA - 277] = 359, + [SPECIES_MIGHTYENA - 277] = 360, + [SPECIES_ZIGZAGOON - 277] = 378, + [SPECIES_LINOONE - 277] = 375, + [SPECIES_WURMPLE - 277] = 290, + [SPECIES_SILCOON - 277] = 291, + [SPECIES_BEAUTIFLY - 277] = 292, + [SPECIES_CASCOON - 277] = 293, + [SPECIES_DUSTOX - 277] = 294, + [SPECIES_LOTAD - 277] = 283, + [SPECIES_LOMBRE - 277] = 284, + [SPECIES_LUDICOLO - 277] = 285, + [SPECIES_SEEDOT - 277] = 286, + [SPECIES_NUZLEAF - 277] = 287, + [SPECIES_SHIFTRY - 277] = 288, + [SPECIES_NINCADA - 277] = 301, + [SPECIES_NINJASK - 277] = 302, + [SPECIES_SHEDINJA - 277] = 303, + [SPECIES_TAILLOW - 277] = 266, + [SPECIES_SWELLOW - 277] = 267, + [SPECIES_SHROOMISH - 277] = 374, + [SPECIES_BRELOOM - 277] = 373, + [SPECIES_SPINDA - 277] = 269, + [SPECIES_WINGULL - 277] = 280, + [SPECIES_PELIPPER - 277] = 279, + [SPECIES_SURSKIT - 277] = 310, + [SPECIES_MASQUERAIN - 277] = 311, + [SPECIES_WAILMER - 277] = 377, + [SPECIES_WAILORD - 277] = 381, + [SPECIES_SKITTY - 277] = 312, + [SPECIES_DELCATTY - 277] = 313, + [SPECIES_KECLEON - 277] = 251, + [SPECIES_BALTOY - 277] = 329, + [SPECIES_CLAYDOL - 277] = 330, + [SPECIES_NOSEPASS - 277] = 306, + [SPECIES_TORKOAL - 277] = 253, + [SPECIES_SABLEYE - 277] = 362, + [SPECIES_BARBOACH - 277] = 318, + [SPECIES_WHISCASH - 277] = 319, + [SPECIES_LUVDISC - 277] = 368, + [SPECIES_CORPHISH - 277] = 320, + [SPECIES_CRAWDAUNT - 277] = 321, + [SPECIES_FEEBAS - 277] = 333, + [SPECIES_MILOTIC - 277] = 334, + [SPECIES_CARVANHA - 277] = 289, + [SPECIES_SHARPEDO - 277] = 260, + [SPECIES_TRAPINCH - 277] = 324, + [SPECIES_VIBRAVA - 277] = 325, + [SPECIES_FLYGON - 277] = 326, + [SPECIES_MAKUHITA - 277] = 304, + [SPECIES_HARIYAMA - 277] = 305, + [SPECIES_ELECTRIKE - 277] = 254, + [SPECIES_MANECTRIC - 277] = 255, + [SPECIES_NUMEL - 277] = 316, + [SPECIES_CAMERUPT - 277] = 317, + [SPECIES_SPHEAL - 277] = 338, + [SPECIES_SEALEO - 277] = 339, + [SPECIES_WALREIN - 277] = 340, + [SPECIES_CACNEA - 277] = 327, + [SPECIES_CACTURNE - 277] = 328, + [SPECIES_SNORUNT - 277] = 383, + [SPECIES_GLALIE - 277] = 307, + [SPECIES_LUNATONE - 277] = 331, + [SPECIES_SOLROCK - 277] = 332, + [SPECIES_AZURILL - 277] = 262, + [SPECIES_SPOINK - 277] = 322, + [SPECIES_GRUMPIG - 277] = 323, + [SPECIES_PLUSLE - 277] = 308, + [SPECIES_MINUN - 277] = 309, + [SPECIES_MAWILE - 277] = 363, + [SPECIES_MEDITITE - 277] = 336, + [SPECIES_MEDICHAM - 277] = 337, + [SPECIES_SWABLU - 277] = 263, + [SPECIES_ALTARIA - 277] = 264, + [SPECIES_WYNAUT - 277] = 258, + [SPECIES_DUSKULL - 277] = 256, + [SPECIES_DUSCLOPS - 277] = 361, + [SPECIES_ROSELIA - 277] = 252, + [SPECIES_SLAKOTH - 277] = 298, + [SPECIES_VIGOROTH - 277] = 299, + [SPECIES_SLAKING - 277] = 300, + [SPECIES_GULPIN - 277] = 314, + [SPECIES_SWALOT - 277] = 315, + [SPECIES_TROPIUS - 277] = 376, + [SPECIES_WHISMUR - 277] = 382, + [SPECIES_LOUDRED - 277] = 380, + [SPECIES_EXPLOUD - 277] = 379, + [SPECIES_CLAMPERL - 277] = 341, + [SPECIES_HUNTAIL - 277] = 342, + [SPECIES_GOREBYSS - 277] = 343, + [SPECIES_ABSOL - 277] = 335, + [SPECIES_SHUPPET - 277] = 282, + [SPECIES_BANETTE - 277] = 281, + [SPECIES_SEVIPER - 277] = 259, + [SPECIES_ZANGOOSE - 277] = 261, + [SPECIES_RELICANTH - 277] = 367, + [SPECIES_ARON - 277] = 364, + [SPECIES_LAIRON - 277] = 365, + [SPECIES_AGGRON - 277] = 366, + [SPECIES_CASTFORM - 277] = 356, + [SPECIES_VOLBEAT - 277] = 357, + [SPECIES_ILLUMISE - 277] = 358, + [SPECIES_LILEEP - 277] = 344, + [SPECIES_CRADILY - 277] = 345, + [SPECIES_ANORITH - 277] = 346, + [SPECIES_ARMALDO - 277] = 347, + [SPECIES_RALTS - 277] = 295, + [SPECIES_KIRLIA - 277] = 296, + [SPECIES_GARDEVOIR - 277] = 297, + [SPECIES_BAGON - 277] = 351, + [SPECIES_SHELGON - 277] = 352, + [SPECIES_SALAMENCE - 277] = 372, + [SPECIES_BELDUM - 277] = 348, + [SPECIES_METANG - 277] = 349, + [SPECIES_METAGROSS - 277] = 350, + [SPECIES_REGIROCK - 277] = 353, + [SPECIES_REGICE - 277] = 354, + [SPECIES_REGISTEEL - 277] = 355, + [SPECIES_KYOGRE - 277] = 370, + [SPECIES_GROUDON - 277] = 369, + [SPECIES_RAYQUAZA - 277] = 371, + [SPECIES_LATIAS - 277] = 257, + [SPECIES_LATIOS - 277] = 384, + [SPECIES_JIRACHI - 277] = 385, + [SPECIES_DEOXYS - 277] = 386, + [SPECIES_CHIMECHO - 277] = 387, }; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 994cc520e..e1e446007 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -469,446 +469,446 @@ const u8 *const gMonIconTable[] = const u8 gMonIconPaletteIndices[] = { - 0, // ?????????? - 1, // Bulbasaur - 1, // Ivysaur - 1, // Venusaur - 0, // Charmander - 0, // Charmeleon - 0, // Charizard - 0, // Squirtle - 2, // Wartortle - 2, // Blastoise - 1, // Caterpie - 1, // Metapod - 0, // Butterfree - 1, // Weedle - 2, // Kakuna - 2, // Beedrill - 0, // Pidgey - 0, // Pidgeotto - 0, // Pidgeot - 2, // Rattata - 1, // Raticate - 0, // Spearow - 0, // Fearow - 2, // Ekans - 2, // Arbok - 2, // Pikachu - 0, // Raichu - 2, // Sandshrew - 2, // Sandslash - 2, // Nidoran♀ - 2, // Nidorina - 2, // Nidoqueen - 2, // Nidoran♂ - 2, // Nidorino - 2, // Nidoking - 0, // Clefairy - 0, // Clefable - 2, // Vulpix - 1, // Ninetales - 0, // Jigglypuff - 0, // Wigglytuff - 2, // Zubat - 2, // Golbat - 1, // Oddish - 0, // Gloom - 0, // Vileplume - 0, // Paras - 0, // Parasect - 0, // Venonat - 2, // Venomoth - 2, // Diglett - 2, // Dugtrio - 1, // Meowth - 1, // Persian - 1, // Psyduck - 2, // Golduck - 1, // Mankey - 2, // Primeape - 0, // Growlithe - 0, // Arcanine - 0, // Poliwag - 0, // Poliwhirl - 0, // Poliwrath - 2, // Abra - 2, // Kadabra - 2, // Alakazam - 0, // Machop - 2, // Machoke - 0, // Machamp - 1, // Bellsprout - 1, // Weepinbell - 1, // Victreebel - 2, // Tentacool - 2, // Tentacruel - 1, // Geodude - 1, // Graveler - 1, // Golem - 0, // Ponyta - 0, // Rapidash - 0, // Slowpoke - 0, // Slowbro - 0, // Magnemite - 0, // Magneton - 1, // Farfetch'd - 2, // Doduo - 2, // Dodrio - 2, // Seel - 2, // Dewgong - 2, // Grimer - 2, // Muk - 2, // Shellder - 2, // Cloyster - 2, // Gastly - 2, // Haunter - 2, // Gengar - 2, // Onix - 2, // Drowzee - 1, // Hypno - 2, // Krabby - 2, // Kingler - 0, // Voltorb - 0, // Electrode - 0, // Exeggcute - 1, // Exeggutor - 1, // Cubone - 1, // Marowak - 2, // Hitmonlee - 2, // Hitmonchan - 1, // Lickitung - 2, // Koffing - 2, // Weezing - 1, // Rhyhorn - 1, // Rhydon - 0, // Chansey - 0, // Tangela - 1, // Kangaskhan - 0, // Horsea - 0, // Seadra - 0, // Goldeen - 0, // Seaking - 2, // Staryu - 2, // Starmie - 0, // Mr. mime - 1, // Scyther - 2, // Jynx - 1, // Electabuzz - 0, // Magmar - 2, // Pinsir - 2, // Tauros - 0, // Magikarp - 0, // Gyarados - 2, // Lapras - 2, // Ditto - 2, // Eevee - 0, // Vaporeon - 0, // Jolteon - 0, // Flareon - 0, // Porygon - 0, // Omanyte - 0, // Omastar - 2, // Kabuto - 2, // Kabutops - 0, // Aerodactyl - 1, // Snorlax - 0, // Articuno - 0, // Zapdos - 0, // Moltres - 0, // Dratini - 0, // Dragonair - 2, // Dragonite - 2, // Mewtwo - 0, // Mew - 1, // Chikorita - 1, // Bayleef - 1, // Meganium - 1, // Cyndaquil - 1, // Quilava - 1, // Typhlosion - 2, // Totodile - 2, // Croconaw - 2, // Feraligatr - 2, // Sentret - 2, // Furret - 2, // Hoothoot - 2, // Noctowl - 0, // Ledyba - 0, // Ledian - 1, // Spinarak - 0, // Ariados - 2, // Crobat - 2, // Chinchou - 0, // Lanturn - 0, // Pichu - 0, // Cleffa - 1, // Igglybuff - 2, // Togepi - 2, // Togetic - 0, // Natu - 0, // Xatu - 2, // Mareep - 0, // Flaaffy - 0, // Ampharos - 1, // Bellossom - 2, // Marill - 2, // Azumarill - 1, // Sudowoodo - 1, // Politoed - 1, // Hoppip - 1, // Skiploom - 2, // Jumpluff - 2, // Aipom - 1, // Sunkern - 1, // Sunflora - 1, // Yanma - 0, // Wooper - 0, // Quagsire - 2, // Espeon - 2, // Umbreon - 2, // Murkrow - 0, // Slowking - 0, // Misdreavus - 0, // Unown A - 0, // Wobbuffet - 1, // Girafarig - 0, // Pineco - 2, // Forretress - 2, // Dunsparce - 2, // Gligar - 0, // Steelix - 0, // Snubbull - 2, // Granbull - 0, // Qwilfish - 0, // Scizor - 1, // Shuckle - 2, // Heracross - 0, // Sneasel - 0, // Teddiursa - 2, // Ursaring - 0, // Slugma - 0, // Magcargo - 2, // Swinub - 2, // Piloswine - 0, // Corsola - 0, // Remoraid - 0, // Octillery - 0, // Delibird - 2, // Mantine - 0, // Skarmory - 0, // Houndour - 0, // Houndoom - 0, // Kingdra - 0, // Phanpy - 0, // Donphan - 0, // Porygon2 - 2, // Stantler - 1, // Smeargle - 2, // Tyrogue - 2, // Hitmontop - 1, // Smoochum - 1, // Elekid - 1, // Magby - 1, // Miltank - 1, // Blissey - 0, // Raikou - 2, // Entei - 0, // Suicune - 1, // Larvitar - 0, // Pupitar - 1, // Tyranitar - 0, // Lugia - 1, // Ho-Oh - 1, // Celebi - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 1, // Treecko - 0, // Grovyle - 1, // Sceptile - 0, // Torchic - 0, // Combusken - 0, // Blaziken - 0, // Mudkip - 0, // Marshtomp - 0, // Swampert - 2, // Poochyena - 2, // Mightyena - 2, // Zigzagoon - 2, // Linoone - 0, // Wurmple - 2, // Silcoon - 0, // Beautifly - 2, // Cascoon - 1, // Dustox - 1, // Lotad - 1, // Lombre - 1, // Ludicolo - 1, // Seedot - 1, // Nuzleaf - 0, // Shiftry - 1, // Nincada - 1, // Ninjask - 1, // Shedinja - 2, // Taillow - 2, // Swellow - 1, // Shroomish - 1, // Breloom - 1, // Spinda - 0, // Wingull - 0, // Pelipper - 2, // Surskit - 0, // Masquerain - 2, // Wailmer - 0, // Wailord - 0, // Skitty - 2, // Delcatty - 1, // Kecleon - 1, // Baltoy - 0, // Claydol - 0, // Nosepass - 1, // Torkoal - 2, // Sableye - 0, // Barboach - 0, // Whiscash - 0, // Luvdisc - 0, // Corphish - 0, // Crawdaunt - 2, // Feebas - 0, // Milotic - 0, // Carvanha - 0, // Sharpedo - 1, // Trapinch - 1, // Vibrava - 1, // Flygon - 2, // Makuhita - 1, // Hariyama - 1, // Electrike - 0, // Manectric - 1, // Numel - 0, // Camerupt - 2, // Spheal - 2, // Sealeo - 0, // Walrein - 1, // Cacnea - 1, // Cacturne - 2, // Snorunt - 0, // Glalie - 1, // Lunatone - 0, // Solrock - 2, // Azurill - 0, // Spoink - 2, // Grumpig - 0, // Plusle - 0, // Minun - 2, // Mawile - 0, // Meditite - 0, // Medicham - 0, // Swablu - 0, // Altaria - 0, // Wynaut - 0, // Duskull - 0, // Dusclops - 0, // Roselia - 2, // Slakoth - 2, // Vigoroth - 1, // Slaking - 1, // Gulpin - 2, // Swalot - 1, // Tropius - 0, // Whismur - 2, // Loudred - 2, // Exploud - 0, // Clamperl - 0, // Huntail - 0, // Gorebyss - 0, // Absol - 0, // Shuppet - 0, // Banette - 2, // Seviper - 0, // Zangoose - 1, // Relicanth - 2, // Aron - 2, // Lairon - 2, // Aggron - 0, // Castform - 0, // Volbeat - 2, // Illumise - 2, // Lileep - 0, // Cradily - 0, // Anorith - 0, // Armaldo - 1, // Ralts - 1, // Kirlia - 1, // Gardevoir - 2, // Bagon - 2, // Shelgon - 0, // Salamence - 0, // Beldum - 0, // Metang - 0, // Metagross - 2, // Regirock - 2, // Regice - 2, // Registeel - 2, // Kyogre - 0, // Groudon - 1, // Rayquaza - 0, // Latias - 2, // Latios - 0, // Jirachi - 0, // Deoxys - 0, // Chimecho - 1, // Egg - 0, // Unown B - 0, // Unown C - 0, // Unown D - 0, // Unown E - 0, // Unown F - 0, // Unown G - 0, // Unown H - 0, // Unown I - 0, // Unown J - 0, // Unown K - 0, // Unown L - 0, // Unown M - 0, // Unown N - 0, // Unown O - 0, // Unown P - 0, // Unown Q - 0, // Unown R - 0, // Unown S - 0, // Unown T - 0, // Unown U - 0, // Unown V - 0, // Unown W - 0, // Unown X - 0, // Unown Y - 0, // Unown Z - 0, // Unown Exclamation Mark - 0, // Unown Question Mark + [SPECIES_NONE] = 0, + [SPECIES_BULBASAUR] = 1, + [SPECIES_IVYSAUR] = 1, + [SPECIES_VENUSAUR] = 1, + [SPECIES_CHARMANDER] = 0, + [SPECIES_CHARMELEON] = 0, + [SPECIES_CHARIZARD] = 0, + [SPECIES_SQUIRTLE] = 0, + [SPECIES_WARTORTLE] = 2, + [SPECIES_BLASTOISE] = 2, + [SPECIES_CATERPIE] = 1, + [SPECIES_METAPOD] = 1, + [SPECIES_BUTTERFREE] = 0, + [SPECIES_WEEDLE] = 1, + [SPECIES_KAKUNA] = 2, + [SPECIES_BEEDRILL] = 2, + [SPECIES_PIDGEY] = 0, + [SPECIES_PIDGEOTTO] = 0, + [SPECIES_PIDGEOT] = 0, + [SPECIES_RATTATA] = 2, + [SPECIES_RATICATE] = 1, + [SPECIES_SPEAROW] = 0, + [SPECIES_FEAROW] = 0, + [SPECIES_EKANS] = 2, + [SPECIES_ARBOK] = 2, + [SPECIES_PIKACHU] = 2, + [SPECIES_RAICHU] = 0, + [SPECIES_SANDSHREW] = 2, + [SPECIES_SANDSLASH] = 2, + [SPECIES_NIDORAN_F] = 2, + [SPECIES_NIDORINA] = 2, + [SPECIES_NIDOQUEEN] = 2, + [SPECIES_NIDORAN_M] = 2, + [SPECIES_NIDORINO] = 2, + [SPECIES_NIDOKING] = 2, + [SPECIES_CLEFAIRY] = 0, + [SPECIES_CLEFABLE] = 0, + [SPECIES_VULPIX] = 2, + [SPECIES_NINETALES] = 1, + [SPECIES_JIGGLYPUFF] = 0, + [SPECIES_WIGGLYTUFF] = 0, + [SPECIES_ZUBAT] = 2, + [SPECIES_GOLBAT] = 2, + [SPECIES_ODDISH] = 1, + [SPECIES_GLOOM] = 0, + [SPECIES_VILEPLUME] = 0, + [SPECIES_PARAS] = 0, + [SPECIES_PARASECT] = 0, + [SPECIES_VENONAT] = 0, + [SPECIES_VENOMOTH] = 2, + [SPECIES_DIGLETT] = 2, + [SPECIES_DUGTRIO] = 2, + [SPECIES_MEOWTH] = 1, + [SPECIES_PERSIAN] = 1, + [SPECIES_PSYDUCK] = 1, + [SPECIES_GOLDUCK] = 2, + [SPECIES_MANKEY] = 1, + [SPECIES_PRIMEAPE] = 2, + [SPECIES_GROWLITHE] = 0, + [SPECIES_ARCANINE] = 0, + [SPECIES_POLIWAG] = 0, + [SPECIES_POLIWHIRL] = 0, + [SPECIES_POLIWRATH] = 0, + [SPECIES_ABRA] = 2, + [SPECIES_KADABRA] = 2, + [SPECIES_ALAKAZAM] = 2, + [SPECIES_MACHOP] = 0, + [SPECIES_MACHOKE] = 2, + [SPECIES_MACHAMP] = 0, + [SPECIES_BELLSPROUT] = 1, + [SPECIES_WEEPINBELL] = 1, + [SPECIES_VICTREEBEL] = 1, + [SPECIES_TENTACOOL] = 2, + [SPECIES_TENTACRUEL] = 2, + [SPECIES_GEODUDE] = 1, + [SPECIES_GRAVELER] = 1, + [SPECIES_GOLEM] = 1, + [SPECIES_PONYTA] = 0, + [SPECIES_RAPIDASH] = 0, + [SPECIES_SLOWPOKE] = 0, + [SPECIES_SLOWBRO] = 0, + [SPECIES_MAGNEMITE] = 0, + [SPECIES_MAGNETON] = 0, + [SPECIES_FARFETCHD] = 1, + [SPECIES_DODUO] = 2, + [SPECIES_DODRIO] = 2, + [SPECIES_SEEL] = 2, + [SPECIES_DEWGONG] = 2, + [SPECIES_GRIMER] = 2, + [SPECIES_MUK] = 2, + [SPECIES_SHELLDER] = 2, + [SPECIES_CLOYSTER] = 2, + [SPECIES_GASTLY] = 2, + [SPECIES_HAUNTER] = 2, + [SPECIES_GENGAR] = 2, + [SPECIES_ONIX] = 2, + [SPECIES_DROWZEE] = 2, + [SPECIES_HYPNO] = 1, + [SPECIES_KRABBY] = 2, + [SPECIES_KINGLER] = 2, + [SPECIES_VOLTORB] = 0, + [SPECIES_ELECTRODE] = 0, + [SPECIES_EXEGGCUTE] = 0, + [SPECIES_EXEGGUTOR] = 1, + [SPECIES_CUBONE] = 1, + [SPECIES_MAROWAK] = 1, + [SPECIES_HITMONLEE] = 2, + [SPECIES_HITMONCHAN] = 2, + [SPECIES_LICKITUNG] = 1, + [SPECIES_KOFFING] = 2, + [SPECIES_WEEZING] = 2, + [SPECIES_RHYHORN] = 1, + [SPECIES_RHYDON] = 1, + [SPECIES_CHANSEY] = 0, + [SPECIES_TANGELA] = 0, + [SPECIES_KANGASKHAN] = 1, + [SPECIES_HORSEA] = 0, + [SPECIES_SEADRA] = 0, + [SPECIES_GOLDEEN] = 0, + [SPECIES_SEAKING] = 0, + [SPECIES_STARYU] = 2, + [SPECIES_STARMIE] = 2, + [SPECIES_MR_MIME] = 0, + [SPECIES_SCYTHER] = 1, + [SPECIES_JYNX] = 2, + [SPECIES_ELECTABUZZ] = 1, + [SPECIES_MAGMAR] = 0, + [SPECIES_PINSIR] = 2, + [SPECIES_TAUROS] = 2, + [SPECIES_MAGIKARP] = 0, + [SPECIES_GYARADOS] = 0, + [SPECIES_LAPRAS] = 2, + [SPECIES_DITTO] = 2, + [SPECIES_EEVEE] = 2, + [SPECIES_VAPOREON] = 0, + [SPECIES_JOLTEON] = 0, + [SPECIES_FLAREON] = 0, + [SPECIES_PORYGON] = 0, + [SPECIES_OMANYTE] = 0, + [SPECIES_OMASTAR] = 0, + [SPECIES_KABUTO] = 2, + [SPECIES_KABUTOPS] = 2, + [SPECIES_AERODACTYL] = 0, + [SPECIES_SNORLAX] = 1, + [SPECIES_ARTICUNO] = 0, + [SPECIES_ZAPDOS] = 0, + [SPECIES_MOLTRES] = 0, + [SPECIES_DRATINI] = 0, + [SPECIES_DRAGONAIR] = 0, + [SPECIES_DRAGONITE] = 2, + [SPECIES_MEWTWO] = 2, + [SPECIES_MEW] = 0, + [SPECIES_CHIKORITA] = 1, + [SPECIES_BAYLEEF] = 1, + [SPECIES_MEGANIUM] = 1, + [SPECIES_CYNDAQUIL] = 1, + [SPECIES_QUILAVA] = 1, + [SPECIES_TYPHLOSION] = 1, + [SPECIES_TOTODILE] = 2, + [SPECIES_CROCONAW] = 2, + [SPECIES_FERALIGATR] = 2, + [SPECIES_SENTRET] = 2, + [SPECIES_FURRET] = 2, + [SPECIES_HOOTHOOT] = 2, + [SPECIES_NOCTOWL] = 2, + [SPECIES_LEDYBA] = 0, + [SPECIES_LEDIAN] = 0, + [SPECIES_SPINARAK] = 1, + [SPECIES_ARIADOS] = 0, + [SPECIES_CROBAT] = 2, + [SPECIES_CHINCHOU] = 2, + [SPECIES_LANTURN] = 0, + [SPECIES_PICHU] = 0, + [SPECIES_CLEFFA] = 0, + [SPECIES_IGGLYBUFF] = 1, + [SPECIES_TOGEPI] = 2, + [SPECIES_TOGETIC] = 2, + [SPECIES_NATU] = 0, + [SPECIES_XATU] = 0, + [SPECIES_MAREEP] = 2, + [SPECIES_FLAAFFY] = 0, + [SPECIES_AMPHAROS] = 0, + [SPECIES_BELLOSSOM] = 1, + [SPECIES_MARILL] = 2, + [SPECIES_AZUMARILL] = 2, + [SPECIES_SUDOWOODO] = 1, + [SPECIES_POLITOED] = 1, + [SPECIES_HOPPIP] = 1, + [SPECIES_SKIPLOOM] = 1, + [SPECIES_JUMPLUFF] = 2, + [SPECIES_AIPOM] = 2, + [SPECIES_SUNKERN] = 1, + [SPECIES_SUNFLORA] = 1, + [SPECIES_YANMA] = 1, + [SPECIES_WOOPER] = 0, + [SPECIES_QUAGSIRE] = 0, + [SPECIES_ESPEON] = 2, + [SPECIES_UMBREON] = 2, + [SPECIES_MURKROW] = 2, + [SPECIES_SLOWKING] = 0, + [SPECIES_MISDREAVUS] = 0, + [SPECIES_UNOWN] = 0, + [SPECIES_WOBBUFFET] = 0, + [SPECIES_GIRAFARIG] = 1, + [SPECIES_PINECO] = 0, + [SPECIES_FORRETRESS] = 2, + [SPECIES_DUNSPARCE] = 2, + [SPECIES_GLIGAR] = 2, + [SPECIES_STEELIX] = 0, + [SPECIES_SNUBBULL] = 0, + [SPECIES_GRANBULL] = 2, + [SPECIES_QWILFISH] = 0, + [SPECIES_SCIZOR] = 0, + [SPECIES_SHUCKLE] = 1, + [SPECIES_HERACROSS] = 2, + [SPECIES_SNEASEL] = 0, + [SPECIES_TEDDIURSA] = 0, + [SPECIES_URSARING] = 2, + [SPECIES_SLUGMA] = 0, + [SPECIES_MAGCARGO] = 0, + [SPECIES_SWINUB] = 2, + [SPECIES_PILOSWINE] = 2, + [SPECIES_CORSOLA] = 0, + [SPECIES_REMORAID] = 0, + [SPECIES_OCTILLERY] = 0, + [SPECIES_DELIBIRD] = 0, + [SPECIES_MANTINE] = 2, + [SPECIES_SKARMORY] = 0, + [SPECIES_HOUNDOUR] = 0, + [SPECIES_HOUNDOOM] = 0, + [SPECIES_KINGDRA] = 0, + [SPECIES_PHANPY] = 0, + [SPECIES_DONPHAN] = 0, + [SPECIES_PORYGON2] = 0, + [SPECIES_STANTLER] = 2, + [SPECIES_SMEARGLE] = 1, + [SPECIES_TYROGUE] = 2, + [SPECIES_HITMONTOP] = 2, + [SPECIES_SMOOCHUM] = 1, + [SPECIES_ELEKID] = 1, + [SPECIES_MAGBY] = 1, + [SPECIES_MILTANK] = 1, + [SPECIES_BLISSEY] = 1, + [SPECIES_RAIKOU] = 0, + [SPECIES_ENTEI] = 2, + [SPECIES_SUICUNE] = 0, + [SPECIES_LARVITAR] = 1, + [SPECIES_PUPITAR] = 0, + [SPECIES_TYRANITAR] = 1, + [SPECIES_LUGIA] = 0, + [SPECIES_HO_OH] = 1, + [SPECIES_CELEBI] = 1, + [SPECIES_OLD_UNOWN_B] = 0, + [SPECIES_OLD_UNOWN_C] = 0, + [SPECIES_OLD_UNOWN_D] = 0, + [SPECIES_OLD_UNOWN_E] = 0, + [SPECIES_OLD_UNOWN_F] = 0, + [SPECIES_OLD_UNOWN_G] = 0, + [SPECIES_OLD_UNOWN_H] = 0, + [SPECIES_OLD_UNOWN_I] = 0, + [SPECIES_OLD_UNOWN_J] = 0, + [SPECIES_OLD_UNOWN_K] = 0, + [SPECIES_OLD_UNOWN_L] = 0, + [SPECIES_OLD_UNOWN_M] = 0, + [SPECIES_OLD_UNOWN_N] = 0, + [SPECIES_OLD_UNOWN_O] = 0, + [SPECIES_OLD_UNOWN_P] = 0, + [SPECIES_OLD_UNOWN_Q] = 0, + [SPECIES_OLD_UNOWN_R] = 0, + [SPECIES_OLD_UNOWN_S] = 0, + [SPECIES_OLD_UNOWN_T] = 0, + [SPECIES_OLD_UNOWN_U] = 0, + [SPECIES_OLD_UNOWN_V] = 0, + [SPECIES_OLD_UNOWN_W] = 0, + [SPECIES_OLD_UNOWN_X] = 0, + [SPECIES_OLD_UNOWN_Y] = 0, + [SPECIES_OLD_UNOWN_Z] = 0, + [SPECIES_TREECKO] = 1, + [SPECIES_GROVYLE] = 0, + [SPECIES_SCEPTILE] = 1, + [SPECIES_TORCHIC] = 0, + [SPECIES_COMBUSKEN] = 0, + [SPECIES_BLAZIKEN] = 0, + [SPECIES_MUDKIP] = 0, + [SPECIES_MARSHTOMP] = 0, + [SPECIES_SWAMPERT] = 0, + [SPECIES_POOCHYENA] = 2, + [SPECIES_MIGHTYENA] = 2, + [SPECIES_ZIGZAGOON] = 2, + [SPECIES_LINOONE] = 2, + [SPECIES_WURMPLE] = 0, + [SPECIES_SILCOON] = 2, + [SPECIES_BEAUTIFLY] = 0, + [SPECIES_CASCOON] = 2, + [SPECIES_DUSTOX] = 1, + [SPECIES_LOTAD] = 1, + [SPECIES_LOMBRE] = 1, + [SPECIES_LUDICOLO] = 1, + [SPECIES_SEEDOT] = 1, + [SPECIES_NUZLEAF] = 1, + [SPECIES_SHIFTRY] = 0, + [SPECIES_NINCADA] = 1, + [SPECIES_NINJASK] = 1, + [SPECIES_SHEDINJA] = 1, + [SPECIES_TAILLOW] = 2, + [SPECIES_SWELLOW] = 2, + [SPECIES_SHROOMISH] = 1, + [SPECIES_BRELOOM] = 1, + [SPECIES_SPINDA] = 1, + [SPECIES_WINGULL] = 0, + [SPECIES_PELIPPER] = 0, + [SPECIES_SURSKIT] = 2, + [SPECIES_MASQUERAIN] = 0, + [SPECIES_WAILMER] = 2, + [SPECIES_WAILORD] = 0, + [SPECIES_SKITTY] = 0, + [SPECIES_DELCATTY] = 2, + [SPECIES_KECLEON] = 1, + [SPECIES_BALTOY] = 1, + [SPECIES_CLAYDOL] = 0, + [SPECIES_NOSEPASS] = 0, + [SPECIES_TORKOAL] = 1, + [SPECIES_SABLEYE] = 2, + [SPECIES_BARBOACH] = 0, + [SPECIES_WHISCASH] = 0, + [SPECIES_LUVDISC] = 0, + [SPECIES_CORPHISH] = 0, + [SPECIES_CRAWDAUNT] = 0, + [SPECIES_FEEBAS] = 2, + [SPECIES_MILOTIC] = 0, + [SPECIES_CARVANHA] = 0, + [SPECIES_SHARPEDO] = 0, + [SPECIES_TRAPINCH] = 1, + [SPECIES_VIBRAVA] = 1, + [SPECIES_FLYGON] = 1, + [SPECIES_MAKUHITA] = 2, + [SPECIES_HARIYAMA] = 1, + [SPECIES_ELECTRIKE] = 1, + [SPECIES_MANECTRIC] = 0, + [SPECIES_NUMEL] = 1, + [SPECIES_CAMERUPT] = 0, + [SPECIES_SPHEAL] = 2, + [SPECIES_SEALEO] = 2, + [SPECIES_WALREIN] = 0, + [SPECIES_CACNEA] = 1, + [SPECIES_CACTURNE] = 1, + [SPECIES_SNORUNT] = 2, + [SPECIES_GLALIE] = 0, + [SPECIES_LUNATONE] = 1, + [SPECIES_SOLROCK] = 0, + [SPECIES_AZURILL] = 2, + [SPECIES_SPOINK] = 0, + [SPECIES_GRUMPIG] = 2, + [SPECIES_PLUSLE] = 0, + [SPECIES_MINUN] = 0, + [SPECIES_MAWILE] = 2, + [SPECIES_MEDITITE] = 0, + [SPECIES_MEDICHAM] = 0, + [SPECIES_SWABLU] = 0, + [SPECIES_ALTARIA] = 0, + [SPECIES_WYNAUT] = 0, + [SPECIES_DUSKULL] = 0, + [SPECIES_DUSCLOPS] = 0, + [SPECIES_ROSELIA] = 0, + [SPECIES_SLAKOTH] = 2, + [SPECIES_VIGOROTH] = 2, + [SPECIES_SLAKING] = 1, + [SPECIES_GULPIN] = 1, + [SPECIES_SWALOT] = 2, + [SPECIES_TROPIUS] = 1, + [SPECIES_WHISMUR] = 0, + [SPECIES_LOUDRED] = 2, + [SPECIES_EXPLOUD] = 2, + [SPECIES_CLAMPERL] = 0, + [SPECIES_HUNTAIL] = 0, + [SPECIES_GOREBYSS] = 0, + [SPECIES_ABSOL] = 0, + [SPECIES_SHUPPET] = 0, + [SPECIES_BANETTE] = 0, + [SPECIES_SEVIPER] = 2, + [SPECIES_ZANGOOSE] = 0, + [SPECIES_RELICANTH] = 1, + [SPECIES_ARON] = 2, + [SPECIES_LAIRON] = 2, + [SPECIES_AGGRON] = 2, + [SPECIES_CASTFORM] = 0, + [SPECIES_VOLBEAT] = 0, + [SPECIES_ILLUMISE] = 2, + [SPECIES_LILEEP] = 2, + [SPECIES_CRADILY] = 0, + [SPECIES_ANORITH] = 0, + [SPECIES_ARMALDO] = 0, + [SPECIES_RALTS] = 1, + [SPECIES_KIRLIA] = 1, + [SPECIES_GARDEVOIR] = 1, + [SPECIES_BAGON] = 2, + [SPECIES_SHELGON] = 2, + [SPECIES_SALAMENCE] = 0, + [SPECIES_BELDUM] = 0, + [SPECIES_METANG] = 0, + [SPECIES_METAGROSS] = 0, + [SPECIES_REGIROCK] = 2, + [SPECIES_REGICE] = 2, + [SPECIES_REGISTEEL] = 2, + [SPECIES_KYOGRE] = 2, + [SPECIES_GROUDON] = 0, + [SPECIES_RAYQUAZA] = 1, + [SPECIES_LATIAS] = 0, + [SPECIES_LATIOS] = 2, + [SPECIES_JIRACHI] = 0, + [SPECIES_DEOXYS] = 0, + [SPECIES_CHIMECHO] = 0, + [SPECIES_EGG] = 1, + [SPECIES_UNOWN_B] = 0, + [SPECIES_UNOWN_C] = 0, + [SPECIES_UNOWN_D] = 0, + [SPECIES_UNOWN_E] = 0, + [SPECIES_UNOWN_F] = 0, + [SPECIES_UNOWN_G] = 0, + [SPECIES_UNOWN_H] = 0, + [SPECIES_UNOWN_I] = 0, + [SPECIES_UNOWN_J] = 0, + [SPECIES_UNOWN_K] = 0, + [SPECIES_UNOWN_L] = 0, + [SPECIES_UNOWN_M] = 0, + [SPECIES_UNOWN_N] = 0, + [SPECIES_UNOWN_O] = 0, + [SPECIES_UNOWN_P] = 0, + [SPECIES_UNOWN_Q] = 0, + [SPECIES_UNOWN_R] = 0, + [SPECIES_UNOWN_S] = 0, + [SPECIES_UNOWN_T] = 0, + [SPECIES_UNOWN_U] = 0, + [SPECIES_UNOWN_V] = 0, + [SPECIES_UNOWN_W] = 0, + [SPECIES_UNOWN_X] = 0, + [SPECIES_UNOWN_Y] = 0, + [SPECIES_UNOWN_Z] = 0, + [SPECIES_UNOWN_EMARK] = 0, + [SPECIES_UNOWN_QMARK] = 0, }; const struct SpritePalette gMonIconPaletteTable[] = -- cgit v1.2.3 From 0f82e5caf7461f797c376da8e2ce375ed3947c3d Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Sat, 8 Dec 2018 15:15:52 +0530 Subject: Intial commit for decomp fire --- src/fire.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src') diff --git a/src/fire.c b/src/fire.c index 02c0db81c..09bdd8d02 100644 --- a/src/fire.c +++ b/src/fire.c @@ -436,3 +436,17 @@ const s8 gUnknown_08595694[16] = { -1, 0, 1, 0, -1, 1, 0, -1, 0, 1, 0, -1, 0, 1, 0, 1, }; + +void sub_8108EC8(struct Sprite *sprite) +{ + sprite->data[0] = gBattleAnimArgs[0]; + sprite->data[1] = 0x3C; + sprite->data[2] = 0x9; + sprite->data[3] = 0x1E; + sprite->data[4] = 0xFE00; + + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); + + sprite->callback = sub_80A634C; + sprite->callback(sprite); +} \ No newline at end of file -- cgit v1.2.3 From 5630ab2b1ebe6b2ceacbe79aec4f10c2404f5761 Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Sat, 8 Dec 2018 17:55:17 +0530 Subject: Fully decompile fire --- src/fire.c | 915 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 896 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/fire.c b/src/fire.c index 09bdd8d02..c5db6dbce 100644 --- a/src/fire.c +++ b/src/fire.c @@ -1,24 +1,51 @@ #include "global.h" #include "battle_anim.h" #include "constants/rgb.h" +#include "constants/songs.h" +#include "sound.h" +#include "util.h" +#include "task.h" +#include "trig.h" -extern void sub_8108EC8(struct Sprite *); -extern void sub_8108F08(struct Sprite *); -extern void sub_8108FBC(struct Sprite *); -extern void sub_8108F4C(struct Sprite *); -extern void sub_8109064(struct Sprite *); -extern void sub_810916C(struct Sprite *); +//battle anim +extern void sub_80A7E6C(u8 spriteId); +extern void sub_80A805C(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); +extern u8 sub_80A80C8(struct Task *task); + +extern void sub_80A653C(struct Sprite *); +static void sub_8108EC8(struct Sprite *); +static void sub_8108F08(struct Sprite *); +static void sub_8108F4C(struct Sprite *); +static void sub_8108FBC(struct Sprite *); +static void sub_8109028(struct Sprite *); +static void sub_8109064(struct Sprite *); +static void sub_81090D8(struct Sprite *); +static void sub_810916C(struct Sprite *); extern void TranslateAnimSpriteToTargetMonLocation(struct Sprite *); -extern void sub_8109198(struct Sprite *); -extern void sub_8109200(struct Sprite *); -extern void sub_810921C(struct Sprite *); -extern void sub_8109364(struct Sprite *); -extern void sub_81093A4(struct Sprite *); +static void AnimEmberFlare(struct Sprite *); +static void sub_8109200(struct Sprite *); +static void AnimFireRing(struct Sprite *); +static void AnimFireRingStep1(struct Sprite *); +static void AnimFireRingStep2(struct Sprite *); +static void AnimFireRingStep3(struct Sprite *); +static void UpdateFireRingCircleOffset(struct Sprite *); +static void AnimFireCross(struct Sprite *); +static void sub_81093A4(struct Sprite *); +static void sub_81093E4(struct Sprite *); +static void sub_810940C(struct Sprite *); +static void sub_81094D0(u8 taskId); +static void sub_81097B4(u8 spriteId, u8 taskId, u8 a3); extern void sub_80A8EE4(struct Sprite *); -extern void sub_81098EC(struct Sprite *); -extern void sub_8109A10(struct Sprite *); -extern void sub_8109AFC(struct Sprite *); -extern void sub_8109CB0(struct Sprite *); +static void sub_81098EC(struct Sprite *); +static u16 sub_8109930(u8 spriteId); +static void sub_8109984(struct Sprite *sprite, s16 x, s16 y); +static void sub_81099A0(struct Sprite *); +static void sub_8109A10(struct Sprite *); +static void sub_8109A64(struct Sprite *); +static void sub_8109AFC(struct Sprite *); +static void sub_8109C4C(struct Sprite *); +static void sub_8109CB0(struct Sprite *); +static void sub_8109E2C(u8 taskId); const union AnimCmd gUnknown_08595340[] = { @@ -234,7 +261,7 @@ const struct SpriteTemplate gEmberFlareSpriteTemplate = .anims = gUnknown_085954D0, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8109198, + .callback = AnimEmberFlare, }; const struct SpriteTemplate gUnknown_08595504 = @@ -256,7 +283,7 @@ const struct SpriteTemplate gUnknown_0859551C = .anims = gUnknown_085954D0, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_810921C, + .callback = AnimFireRing, }; const union AnimCmd gUnknown_08595534[] = @@ -297,7 +324,7 @@ const struct SpriteTemplate gUnknown_0859556C = .anims = gUnknown_08595540, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8109364, + .callback = AnimFireCross, }; const struct SpriteTemplate gBattleAnimSpriteTemplate_8595584 = @@ -437,7 +464,7 @@ const s8 gUnknown_08595694[16] = -1, 0, 1, 0, -1, 1, 0, -1, 0, 1, 0, -1, 0, 1, 0, 1, }; -void sub_8108EC8(struct Sprite *sprite) +static void sub_8108EC8(struct Sprite *sprite) { sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = 0x3C; @@ -449,4 +476,854 @@ void sub_8108EC8(struct Sprite *sprite) sprite->callback = sub_80A634C; sprite->callback(sprite); +} + +static void sub_8108F08(struct Sprite *sprite) +{ + sub_80A6864(sprite, gBattleAnimArgs[0]); + + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[1] = gBattleAnimArgs[2]; + sprite->data[2] = gBattleAnimArgs[3]; + + sprite->callback = sub_80A656C; + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); +} + +static void sub_8108F4C(struct Sprite *sprite) +{ + sub_80A6838(sprite); + + if (GetBattlerSide(gBattleAnimAttacker)) + { + sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[2] = -gBattleAnimArgs[4]; + } + else + { + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[2] = gBattleAnimArgs[4]; + } + + sprite->data[1] = gBattleAnimArgs[2]; + sprite->data[4] = gBattleAnimArgs[3]; + sprite->data[3] = gBattleAnimArgs[5]; + + sprite->callback = sub_8109028; +} + +static void sub_8108FBC(struct Sprite *sprite) +{ + if (GetBattlerSide(gBattleAnimAttacker)) + { + sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[2] = gBattleAnimArgs[4]; + } + else + { + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[2] = -gBattleAnimArgs[4]; + } + + sprite->data[1] = gBattleAnimArgs[2]; + sprite->data[4] = gBattleAnimArgs[3]; + sprite->data[3] = gBattleAnimArgs[5]; + + sprite->callback = sub_8109028; +} + +static void sub_8109028(struct Sprite *sprite) +{ + if (++sprite->data[0] < sprite->data[4]) + { + sprite->pos2.x += sprite->data[2]; + sprite->pos2.y += sprite->data[3]; + } + + if (sprite->data[0] == sprite->data[1]) + move_anim_8074EE0(sprite); +} + +static void sub_8109064(struct Sprite *sprite) +{ + sub_80A6838(sprite); + + if (GetBattlerSide(gBattleAnimAttacker)) + { + sprite->pos1.x -= gBattleAnimArgs[0]; + } + else + { + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->subpriority = 8; + } + + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[2] = gBattleAnimArgs[4]; + sprite->data[3] = gBattleAnimArgs[5]; + sprite->data[4] = gBattleAnimArgs[6]; + sprite->data[5] = 0; + + sprite->callback = sub_81090D8; +} + +static void sub_81090D8(struct Sprite *sprite) +{ + if (sprite->data[3]) + { + if(sprite->data[5] > 10000) + sprite->subpriority = 1; + + sprite->pos2.x = Sin(sprite->data[0], sprite->data[1] + (sprite->data[5] >> 8)); + sprite->pos2.y = Cos(sprite->data[0], sprite->data[1] + (sprite->data[5] >> 8)); + + sprite->data[0] += sprite->data[2]; + sprite->data[5] += sprite->data[4]; + + if (sprite->data[0] > 255) + sprite->data[0] -= 256; + else if (sprite->data[0] < 0) + sprite->data[0] += 256; + + sprite->data[3]--; + } + else + { + move_anim_8074EE0(sprite); + } +} + +//sunlight +static void sub_810916C(struct Sprite *sprite) +{ + sprite->pos1.x = 0; + sprite->pos1.y = 0; + sprite->data[0] = 60; + sprite->data[2] = 140; + sprite->data[4] = 80; + sprite->callback = StartAnimLinearTranslation; + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); +} + +//fire 2 + +// Animates the secondary effect of MOVE_EMBER, where the flames grow and slide +// horizontally a bit. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: target x pixel offset +// arg 3: target y pixel offset +// arg 4: duration +// arg 5: ? (todo: something related to which mon the pixel offsets are based on) +// arg 6: ? (todo: something related to which mon the pixel offsets are based on) +static void AnimEmberFlare(struct Sprite *sprite) +{ + if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget) + && (gBattleAnimAttacker == GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT) + || gBattleAnimAttacker == GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT))) + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + + sprite->callback = sub_80A7938; + sprite->callback(sprite); +} + +static void sub_8109200(struct Sprite *sprite) +{ + gBattleAnimArgs[0] = -gBattleAnimArgs[0]; + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + + sprite->callback = sub_80A7938; +} + +// Animates the a fire sprite in the first-half of the MOVE_FIRE_BLAST +// animation. The fire sprite first moves in a circle around the mon, +// and then it is translated towards the target mon, while still rotating. +// Lastly, it moves in a circle around the target mon. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: initial wave offset +//void AnimFireRing(struct Sprite *sprite) +void AnimFireRing(struct Sprite *sprite) +{ + InitAnimSpritePos(sprite, 1); + + sprite->data[7] = gBattleAnimArgs[2]; + sprite->data[0] = 0; + + sprite->callback = AnimFireRingStep1; +} + +static void AnimFireRingStep1(struct Sprite *sprite) +{ + UpdateFireRingCircleOffset(sprite); + + if (++sprite->data[0] == 0x12) + { + sprite->data[0] = 0x19; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + + InitAnimLinearTranslation(sprite); + + sprite->callback = AnimFireRingStep2; + } +} + +static void AnimFireRingStep2(struct Sprite *sprite) +{ + if (TranslateAnimLinear(sprite)) + { + sprite->data[0] = 0; + + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->pos2.y = 0; + sprite->pos2.x = 0; + + sprite->callback = AnimFireRingStep3; + sprite->callback(sprite); + } + else + { + sprite->pos2.x += Sin(sprite->data[7], 28); + sprite->pos2.y += Cos(sprite->data[7], 28); + + sprite->data[7] = (sprite->data[7] + 20) & 0xFF; + } +} + +static void AnimFireRingStep3(struct Sprite *sprite) +{ + UpdateFireRingCircleOffset(sprite); + + if (++sprite->data[0] == 0x1F) + DestroyAnimSprite(sprite); +} + +static void UpdateFireRingCircleOffset(struct Sprite *sprite) +{ + sprite->pos2.x = Sin(sprite->data[7], 28); + sprite->pos2.y = Cos(sprite->data[7], 28); + + sprite->data[7] = (sprite->data[7] + 20) & 0xFF; +} + +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: duration +// arg 3: x delta +// arg 4: y delta +// AnimFireCross(struct Sprite *sprite) +static void AnimFireCross(struct Sprite *sprite) +{ + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[2] = gBattleAnimArgs[4]; + + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); + + sprite->callback = sub_80A653C; //TranslateSpriteOverDuration +} + +static void sub_81093A4(struct Sprite *sprite) +{ + InitAnimSpritePos(sprite, 1); + + sprite->data[1] = gBattleAnimArgs[2]; + sprite->data[0] = gBattleAnimArgs[3]; + + sprite->invisible = TRUE; + sprite->callback = WaitAnimForDuration; + + StoreSpriteCallbackInData6(sprite, sub_81093E4); +} + +static void sub_81093E4(struct Sprite *sprite) +{ + sprite->invisible = FALSE; + + sprite->data[0] = sprite->data[1]; + sprite->data[1] = 0; + + sprite->callback = sub_810940C; + sprite->callback(sprite); +} + +static void sub_810940C(struct Sprite *sprite) +{ + sprite->pos2.x = Sin(sprite->data[1], sprite->data[2] >> 8); + sprite->pos2.y = Cos(sprite->data[1], sprite->data[2] >> 8); + + sprite->data[1] = (sprite->data[1] + 10) & 0xFF; + sprite->data[2] += 0xD0; + + if (--sprite->data[0] == -1) + DestroyAnimSprite(sprite); +} + +void sub_8109460(u8 taskId) // initialize animation task for Move_ERUPTION? +{ + struct Task *task = &gTasks[taskId]; + + task->data[15] = GetAnimBattlerSpriteId(0); + + task->data[0] = 0; + task->data[1] = 0; + task->data[2] = 0; + task->data[3] = 0; + task->data[4] = gSprites[task->data[15]].pos1.y; + task->data[5] = GetBattlerSide(gBattleAnimAttacker); + task->data[6] = 0; + + sub_80A7270(task->data[15], 0); + + task->func = sub_81094D0; +} + +static void sub_81094D0(u8 taskId) // animate Move_ERUPTION? +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + sub_80A805C(task, task->data[15], 0x100, 0x100, 0xE0, 0x200, 0x20); + + task->data[0]++; + case 1: + if (++task->data[1] > 1) + { + task->data[1] = 0; + + if (++task->data[2] & 0x1) + gSprites[task->data[15]].pos2.x = 3; + else + gSprites[task->data[15]].pos2.x = -3; + } + + if (task->data[5]) + { + if (++task->data[3] > 4) + { + task->data[3] = 0; + gSprites[task->data[15]].pos1.y++; + } + } + + if(!sub_80A80C8(task)) + { + sub_80A7E6C(task->data[15]); + gSprites[task->data[15]].pos2.x = 0; + + task->data[1] = 0; + task->data[2] = 0; + task->data[3] = 0; + task->data[0]++; + } + break; + case 2: + if (++task->data[1] > 4) + { + if (task->data[5]) + sub_80A805C(task, task->data[15], 0xE0, 0x200, 0x180, 0xF0, 0x6); + else + sub_80A805C(task, task->data[15], 0xE0, 0x200, 0x180, 0xC0, 0x6); + + task->data[1] = 0; + task->data[0]++; + } + break; + case 3: + if (!sub_80A80C8(task)) + { + sub_81097B4(task->data[15], taskId, 6); + + task->data[0]++; + } + break; + case 4: + if (++task->data[1] > 1) + { + task->data[1] = 0; + + if (++task->data[2] & 1) + gSprites[task->data[15]].pos2.y += 3; + else + gSprites[task->data[15]].pos2.y -= 3; + } + + if (++task->data[3] > 0x18) + { + if (task->data[5]) + sub_80A805C(task, task->data[15], 0x180, 0xF0, 0x100, 0x100, 0x8); + else + sub_80A805C(task, task->data[15], 0x180, 0xC0, 0x100, 0x100, 0x8); + + if (task->data[2] & 1) + gSprites[task->data[15]].pos2.y -= 3; + + task->data[1] = 0; + task->data[2] = 0; + task->data[3] = 0; + task->data[0]++; + } + break; + case 5: + if (task->data[5]) + gSprites[task->data[15]].pos1.y--; + + if (!sub_80A80C8(task)) + { + gSprites[task->data[15]].pos1.y = task->data[4]; + sub_80A7344(task->data[15]); + + task->data[2] = 0; + task->data[0]++; + } + break; + case 6: + if (!task->data[6]) + DestroyAnimVisualTask(taskId); + + break; + default: + } +} + +static void sub_81097B4(u8 spriteId, u8 taskId, u8 a3) +{ + u16 i, j; + s8 sign; + + u16 y = sub_8109930(spriteId); + u16 x = gSprites[spriteId].pos1.x; + + if(!GetBattlerSide(gBattleAnimAttacker)) + { + x -= 0xC; + sign = 1; + } + else + { + x += 0x10; + sign = -1; + } + + for (i = 0, j = 0; i <= 6; i++) + { + u8 spriteId = CreateSprite(&gUnknown_085955B4, x, y, 2); + + if (spriteId != 0x40) + { + gSprites[spriteId].oam.tileNum += j * 4 + 0x40; + + if (++j >= 5) + j = 0; + //gHeatedRockCoords + sub_8109984(&gSprites[spriteId], gUnknown_085955CC[i][0] * sign, gUnknown_085955CC[i][1]); + gSprites[spriteId].data[6] = taskId; + gSprites[spriteId].data[7] = a3; + + gTasks[taskId].data[a3]++; + } + } +} + +static void sub_81098EC(struct Sprite *sprite) +{ + sub_81099A0(sprite); + + if (sprite->invisible) + { + gTasks[sprite->data[6]].data[sprite->data[7]]--; + DestroySprite(sprite); + } +} + +static u16 sub_8109930(u8 spriteId) +{ + u16 var1 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY; + + if (GetBattlerSide(gBattleAnimAttacker) == 0) + { + var1 = ((var1 << 16) + 0x4A0000) >> 16; + } + else + { + var1 = ((var1 << 16) + 0x2C0000) >> 16; + } + + return var1; +} + +static void sub_8109984(struct Sprite *sprite, s16 x, s16 y) +{ + sprite->data[0] = 0; + sprite->data[1] = 0; + sprite->data[2] = (u16)sprite->pos1.x * 8; + sprite->data[3] = (u16)sprite->pos1.y * 8; + sprite->data[4] = x * 8; + sprite->data[5] = y * 8; +} + +static void sub_81099A0(struct Sprite *sprite) +{ + int var1; + if (++sprite->data[0] > 2) + { + sprite->data[0] = 0; + ++sprite->data[1]; + var1 = (u16)sprite->data[1] * (u16)sprite->data[1]; + sprite->data[3] += var1; + } + + sprite->data[2] += sprite->data[4]; + sprite->pos1.x = sprite->data[2] >> 3; + sprite->data[3] += sprite->data[5]; + sprite->pos1.y = sprite->data[3] >> 3; + + if (sprite->pos1.x < -8 || sprite->pos1.x > 0xf8 || sprite->pos1.y < -8 || sprite->pos1.y > 120) + sprite->invisible = TRUE; +} + +static void sub_8109A10(struct Sprite *sprite) +{ + sprite->pos1.x = gBattleAnimArgs[0]; + sprite->pos1.y = gBattleAnimArgs[1]; + + sprite->data[0] = 0; + sprite->data[1] = 0; + sprite->data[2] = 0; + sprite->data[6] = gBattleAnimArgs[2]; + sprite->data[7] = gBattleAnimArgs[3]; + + sprite->oam.tileNum += gBattleAnimArgs[4] * 16; + sprite->callback = sub_8109A64; +} + +static void sub_8109A64(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + if (sprite->data[6] != 0) + { + sprite->data[6]--; + return; + } + + sprite->data[0]++; + // fall through + case 1: + sprite->pos1.y += 8; + if (sprite->pos1.y >= sprite->data[7]) + { + sprite->pos1.y = sprite->data[7]; + sprite->data[0]++; + } + break; + case 2: + if (++sprite->data[1] > 1) + { + sprite->data[1] = 0; + if ((++sprite->data[2] & 1) != 0) + { + sprite->pos2.y = -3; + } + else + { + sprite->pos2.y = 3; + } + } + + if (++sprite->data[3] > 16) + { + DestroyAnimSprite(sprite); + } + break; + } +} + +//wisp orb +static void sub_8109AFC(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + InitAnimSpritePos(sprite, 0); + StartSpriteAnim(sprite, gBattleAnimArgs[2]); + sprite->data[7] = gBattleAnimArgs[2]; + + if (GetBattlerSide(gBattleAnimAttacker) != 0) + { + sprite->data[4] = 4; + } + else + { + sprite->data[4] = -4; + } + + sprite->oam.priority = sub_80A8328(gBattleAnimTarget); + sprite->data[0]++; + break; + case 1: + sprite->data[1] += 192; + if (GetBattlerSide(gBattleAnimAttacker) != 0) + { + sprite->pos2.y = -(sprite->data[1] >> 8); + } + else + { + sprite->pos2.y = sprite->data[1] >> 8; + } + + sprite->pos2.x = Sin(sprite->data[2], sprite->data[4]); + sprite->data[2] = (sprite->data[2] + 4) & 0xFF; + + if (++sprite->data[3] == 1) + { + sprite->data[3] = 0; + sprite->data[0]++; + } + break; + case 2: + sprite->pos2.x = Sin(sprite->data[2], sprite->data[4]); + sprite->data[2] = (sprite->data[2] + 4) & 0xFF; + + if (++sprite->data[3] == 31) + { + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.y = 0; + sprite->pos2.x = 0; + + sprite->data[0] = 256; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + + sub_80A6FD4(sprite); + sprite->callback = sub_8109C4C; + } + break; + } +} + +static void sub_8109C4C(struct Sprite *sprite) +{ + s16 initialData5; + s16 newData5; + + if (!TranslateAnimLinear(sprite)) + { + sprite->pos2.x += Sin(sprite->data[5], 16); + initialData5 = sprite->data[5]; + sprite->data[5] = (sprite->data[5] + 4) & 0xFF; + newData5 = sprite->data[5]; + + if ((initialData5 == 0 || initialData5 > 196) && newData5 > 0 && sprite->data[7] == 0) + { + PlaySE12WithPanning(SE_W172, gUnknown_02038440); + } + } + else + { + DestroyAnimSprite(sprite); + } +} + +//wisp fire +void sub_8109CB0(struct Sprite *sprite) +{ + if (!sprite->data[0]) + { + sprite->data[1] = gBattleAnimArgs[0]; + sprite->data[0] += 1; + } + + sprite->data[3] += 0xC0 * 2; + sprite->data[4] += 0xA0; + + sprite->pos2.x = Sin(sprite->data[1], sprite->data[3] >> 8); + sprite->pos2.y = Cos(sprite->data[1], sprite->data[4] >> 8); + + sprite->data[1] = (sprite->data[1] + 7) & 0xFF; + + if (!IsContest()) + { + if (sprite->data[1] < 64 || sprite->data[1] > 195) + sprite->oam.priority = sub_80A8328(gBattleAnimTarget); + else + sprite->oam.priority = sub_80A8328(gBattleAnimTarget) + 1; + } + else + { + if (sprite->data[1] < 64 || sprite->data[1] > 195) + sprite->subpriority = 0x1D; + else + sprite->subpriority = 0x1F; + } + + if (++sprite->data[2] > 0x14) + sprite->invisible ^= 1; + + if (sprite->data[2] == 0x1E) + DestroyAnimSprite(sprite); +} + +void sub_8109DBC(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + task->data[12] = !GetBattlerSide(gBattleAnimAttacker) ? 1 : -1; + task->data[13] = IsBattlerSpriteVisible(gBattleAnimTarget ^ 2) + 1; + task->data[14] = GetAnimBattlerSpriteId(1); + task->data[15] = GetAnimBattlerSpriteId(3); + + task->func = sub_8109E2C; +} + +static void sub_8109E2C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + task->data[10] += task->data[12] * 2; + if (++task->data[1] >= 2) + { + task->data[1] = 0; + task->data[2]++; + if (task->data[2] & 1) + task->data[11] = 2; + else + task->data[11] = -2; + } + + for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) + { + gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11]; + } + + if (++task->data[9] == 16) + { + task->data[9] = 0; + task->data[0]++; + } + break; + case 1: + if (++task->data[1] >= 5) + { + task->data[1] = 0; + task->data[2]++; + + if (task->data[2] & 1) + task->data[11] = 2; + else + task->data[11] = -2; + } + + for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) + { + gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11]; + } + + if (++task->data[9] == 96) + { + task->data[9] = 0; + task->data[0]++; + } + break; + case 2: + task->data[10] -= task->data[12] * 2; + + if (++task->data[1] >= 2) + { + task->data[1] = 0; + task->data[2]++; + + if (task->data[2] & 1) + task->data[11] = 2; + else + task->data[11] = -2; + } + + for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) + { + gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11]; + } + + if (++task->data[9] == 16) + { + task->data[0]++; + } + break; + case 3: + for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) + { + gSprites[task->data[task->data[3] + 14]].pos2.x = 0; + } + + DestroyAnimVisualTask(taskId); + break; + } +} + +// Used to add a color mask to the battle interface / HUD in Heat Wave. +// arg 0: opacity +// arg 1: color code +void AnimTask_BlendBackground(u8 taskId) +{ + struct UnknownAnimStruct2 unk; + sub_80A6B30(&unk); + BlendPalette(unk.unk8 << 4, 16, gBattleAnimArgs[0], gBattleAnimArgs[1]); // u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor + DestroyAnimVisualTask(taskId); +} + +void sub_810A094(u8 taskId) +{ + s8 unk; + u8 spriteId; + + if (gTasks[taskId].data[0] == 0) + { + gTasks[taskId].data[1] = gBattleAnimArgs[0]; + gTasks[taskId].data[2] = gBattleAnimArgs[1]; + gTasks[taskId].data[3] = gBattleAnimArgs[2]; + gTasks[taskId].data[4] = gBattleAnimArgs[3]; + } + gTasks[taskId].data[0]++; + + spriteId = gBattlerSpriteIds[gBattleAnimTarget]; + + if (!gTasks[taskId].data[4]) + unk = gUnknown_08595684[gTasks[taskId].data[0] % 10]; + else + unk = gUnknown_08595694[gTasks[taskId].data[0] % 10]; + + if (gTasks[taskId].data[3] == 1) + gSprites[spriteId].pos2.y = gBattleAnimArgs[1] * unk < 0 ? -(gBattleAnimArgs[1] * unk) : gBattleAnimArgs[1] * unk; + else + gSprites[spriteId].pos2.x = gBattleAnimArgs[1] * unk; + + if (gTasks[taskId].data[0] == gTasks[taskId].data[1]) + { + gSprites[spriteId].pos2.x = 0; + gSprites[spriteId].pos2.y = 0; + DestroyAnimVisualTask(taskId); + } } \ No newline at end of file -- cgit v1.2.3 From f3a25f83cf48868b64c7758e52a03445b55fdea5 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 8 Dec 2018 11:56:59 -0600 Subject: Decompile roulette_util.c (#434) --- src/fldeff_groundshake.c | 14 +- src/roulette_util.c | 700 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 712 insertions(+), 2 deletions(-) create mode 100755 src/roulette_util.c (limited to 'src') diff --git a/src/fldeff_groundshake.c b/src/fldeff_groundshake.c index e9a46bb86..73d72c8b6 100644 --- a/src/fldeff_groundshake.c +++ b/src/fldeff_groundshake.c @@ -32,7 +32,17 @@ static void sub_81BEA20(void); static void sub_81BEAD8(struct Sprite* sprite); // rodata -static const u8 gUnknown_08617E18[] = {0x3b, 0x43, 0x61, 0x00, 0x0f, 0x05, 0xff, 0x9b}; +const struct InnerStruct203CF18_3 gUnknown_08617E18 = { + .unk0 = 0x433b, + .unk2 = 0x61, + .unk4 = 0x0F, + .unk5 = 0x05, + .unk6 = 0xFF, + .unk7_0 = 0xB, + .unk7_4 = 0x1, + .unk7_6 = 0, + .unk7_7 = 1, +}; static const union AnimCmd gSpriteAnim_8617E20[] = { @@ -131,7 +141,7 @@ void sub_81BE6B8(void) gUnknown_0203CF18 = (struct Struct203CF18 *)AllocZeroed(sizeof(struct Struct203CF18)); sub_8151B3C(&(gUnknown_0203CF18->unk4)); - sub_8151B68(&(gUnknown_0203CF18->unk4), gUnknown_08617E18); + sub_8151B68(&(gUnknown_0203CF18->unk4), &gUnknown_08617E18); sub_8151CA8(&(gUnknown_0203CF18->unk4), 1, 1); gUnknown_0203CF18->taskId = CreateTask(sub_81BE698, 0xFF); } diff --git a/src/roulette_util.c b/src/roulette_util.c new file mode 100755 index 000000000..a197cfa09 --- /dev/null +++ b/src/roulette_util.c @@ -0,0 +1,700 @@ +#include "global.h" +#include "palette.h" +#include "roulette.h" +#include "roulette_util.h" +#include "util.h" + +void sub_8151678(struct UnkStruct0 *r0) +{ + r0->var00 = 0; + r0->var02 = 0; + memset(&r0->var04, 0, sizeof(r0->var04)); +} + +u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, struct UnkStruct1 *r2) +{ + if (!(r1 < 16) || (r0->var04[r1].var00_7)) + return 0xFF; + + r0->var04[r1].var04.var00 = r2->var00; + r0->var04[r1].var04.var02 = r2->var02; + r0->var04[r1].var04.var04 = r2->var04; + r0->var04[r1].var04.var05 = r2->var05; + r0->var04[r1].var04.var06 = r2->var06; + r0->var04[r1].var04.var07_0 = r2->var07_0; + r0->var04[r1].var04.var07_5 = r2->var07_5; + r0->var04[r1].var04.var07_7 = r2->var07_7; + r0->var04[r1].var00_0 = 0; + r0->var04[r1].var00_7 = 1; + r0->var04[r1].var02 = 0; + r0->var04[r1].var01 = 0; + if (r0->var04[r1].var04.var07_7 < 0) + r0->var04[r1].var03 = 0xFF; + else + r0->var04[r1].var03 = 1; + + return r1; +} + +u8 sub_8151710(struct UnkStruct0 *r0, u8 r1) +{ + if (r1 >= 16) + return 0xFF; + if (!r0->var04[r1].var00_7) + return 0xFF; + + memset(&r0->var04[r1], 0, sizeof(r0->var04[r1])); + return r1; +} + +u8 sub_8151744(struct UnkStruct3 *r0) +{ + u8 i; + u8 returnval; + + for (i = 0; i < r0->var04.var04; i++) + { + struct PlttData *faded = (struct PlttData *)&gPlttBufferFaded[r0->var04.var02 + i]; + struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[r0->var04.var02 + i]; + + switch (r0->var00_0) + { + case 1: + if (faded->r + r0->var03 >= 0 && faded->r + r0->var03 < 32) + faded->r += r0->var03; + if (faded->g + r0->var03 >= 0 && faded->g + r0->var03 < 32) + faded->g += r0->var03; + if (faded->b + r0->var03 >= 0 && faded->b + r0->var03 < 32) + faded->b += r0->var03; + break; + case 2: + if (r0->var03 < 0) + { + if (faded->r + r0->var03 >= unfaded->r) + faded->r += r0->var03; + if (faded->g + r0->var03 >= unfaded->g) + faded->g += r0->var03; + if (faded->b + r0->var03 >= unfaded->b) + faded->b += r0->var03; + } + else + { + if (faded->r + r0->var03 <= unfaded->r) + faded->r += r0->var03; + if (faded->g + r0->var03 <= unfaded->g) + faded->g += r0->var03; + if (faded->b + r0->var03 <= unfaded->b) + faded->b += r0->var03; + } + break; + } + } + if ((u32)r0->var02++ != r0->var04.var07_0) + { + returnval = 0; + } + else + { + r0->var02 = 0; + r0->var03 *= -1; + if (r0->var00_0 == 1) + r0->var00_0++; + else + r0->var00_0--; + returnval = 1; + } + return returnval; +} + +u8 sub_815194C(struct UnkStruct3 *r0) +{ + u8 rg2 = 0; + + switch (r0->var00_0) + { + case 1: + for (rg2 = 0; rg2 < r0->var04.var04; rg2++) + gPlttBufferFaded[r0->var04.var02 + rg2] = r0->var04.var00; + r0->var00_0++; + break; + case 2: + for (rg2 = 0; rg2 < r0->var04.var04; rg2++) + gPlttBufferFaded[r0->var04.var02 + rg2] = gPlttBufferUnfaded[r0->var04.var02 + rg2]; + r0->var00_0--; + break; + } + return 1; +} + +void task_tutorial_controls_fadein(struct UnkStruct0 *r0) +{ + u8 i = 0; + + if (r0->var00) + { + for (i = 0; i < 16; i++) + { + if ((r0->var02 >> i) & 1) + { + if (--r0->var04[i].var01 == 0xFF) // if underflow ? + { + if (r0->var04[i].var04.var00 & 0x8000) // PlttData->unused_15 ? + sub_8151744(&r0->var04[i]); + else + sub_815194C(&r0->var04[i]); + + r0->var04[i].var01 = r0->var04[i].var04.var05; + } + } + } + } +} + +void sub_8151A48(struct UnkStruct0 *r0, u16 r1) +{ + u8 i = 0; + + r0->var00++; + for (i = 0; i < 16; i++) + { + if ((r1 >> i) & 1) + { + if (r0->var04[i].var00_7) + { + r0->var02 |= 1 << i; + r0->var04[i].var00_0 = 1; + } + } + } +} + +void sub_8151A9C(struct UnkStruct0 *r0, u16 r1) +{ + u8 i; + + for (i = 0; i < 16; i++) + { + if ((r0->var02 >> i) & 1) + { + if (r0->var04[i].var00_7) + { + if ((r1 >> i) & 1) + { + u32 offset = r0->var04[i].var04.var02; + u16 *faded = &gPlttBufferFaded[offset]; + u16 *unfaded = &gPlttBufferUnfaded[offset]; + memcpy(faded, unfaded, r0->var04[i].var04.var04 * 2); + r0->var04[i].var00_0 = 0; + r0->var04[i].var02 = 0; + r0->var04[i].var01 = 0; + if (r0->var04[i].var04.var07_7 < 0) + r0->var04[i].var03 = 0xFF; + else + r0->var04[i].var03 = 0x1; + } + } + } + } + if (r1 == 0xFFFF) + { + r0->var00 = 0; + r0->var02 = 0; + } + else + { + r0->var02 = r0->var02 & ~r1; + } +} + +void sub_8151B3C(struct InnerStruct203CF18 *arg0) +{ + u8 i = 0; + arg0->unk0 = 0; + memset(&arg0->unk4, 0, sizeof(arg0->unk4)); + for (; i < 16; i++) + { + arg0->unk4[i].unk0 = i; + } +} + +int sub_8151B68(struct InnerStruct203CF18 *arg0, const struct InnerStruct203CF18_3 *arg1) +{ + u8 i = 0; + struct InnerStruct203CF18_2 *r4 = NULL; + + if (!arg0->unk4[0].unk1_7) + { + r4 = &arg0->unk4[0]; + } + else + { + while (++i < 16) + { + if (!arg0->unk4[i].unk1_7) + { + r4 = &arg0->unk4[i]; + break; + } + } + } + + if (r4 == 0) + return 0xFF; + + r4->unk1_0 = 0; + r4->unk1_4 = 0; + r4->unk1_6 = 1; + r4->unk1_7 = 1; + r4->unk2 = 0; + r4->unk3 = 0; + memcpy(&r4->unk4, arg1, sizeof(*arg1)); + return i; +} + +void sub_8151BD4(struct InnerStruct203CF18_2 *arg0) +{ + u16 i; + + if (!arg0->unk1_6 && arg0->unk4.unk7_6) + { + for (i = arg0->unk4.unk2; i < arg0->unk4.unk2 + arg0->unk4.unk4; i++) + gPlttBufferFaded[i] = gPlttBufferUnfaded[i]; + } + + memset(&arg0->unk4, 0, sizeof(arg0->unk4)); + arg0->unk1_0 = 0; + arg0->unk1_4 = 0; + arg0->unk1_5 = 0; + arg0->unk1_6 = 1; + arg0->unk1_7 = 0; + arg0->unk3 = 0; + arg0->unk2 = 0; +} + +void sub_8151C50(struct InnerStruct203CF18 *arg0, u16 arg1, u8 arg2) +{ + u16 i = 0; + + if (!arg2) + { + sub_8151BD4(&arg0->unk4[arg1 & 0xF]); + } + else + { + for (i = 0; i < 16; i++) + { + if ((arg1 & 1) && arg0->unk4[i].unk1_7) + sub_8151BD4(&arg0->unk4[i]); + + arg1 >>= 1; + } + } +} + +// there seems to be a temp var involved inside the first if block +void sub_8151CA8(struct InnerStruct203CF18 *arg0, u16 arg1, u8 arg2) +{ + u8 i = 0; + + if (!arg2) + { + i = arg1 & 0xF; + arg0->unk4[i].unk1_6 = 0; + arg0->unk0 |= 1 << i; + } + else + { + for (i = 0; i < 16; i++) + { + if (!(arg1 & 1) || !arg0->unk4[i].unk1_7 || !arg0->unk4[i].unk1_6) + { + arg1 <<= 1; + } + else + { + arg0->unk4[i].unk1_6 = 0; + arg0->unk0 |= 1 << i; + } + } + } +} + +void sub_8151D28(struct InnerStruct203CF18 *arg0, u16 arg1, u8 arg2) +{ + u16 i; + struct InnerStruct203CF18_2 *var0; + u8 j = 0; + + if (!arg2) + { + var0 = &arg0->unk4[arg1 & 0xF]; + if (!var0->unk1_6 && var0->unk1_7) + { + if (var0->unk4.unk7_6) + { + for (i = var0->unk4.unk2; i < var0->unk4.unk2 + var0->unk4.unk4; i++) + gPlttBufferFaded[i] = gPlttBufferUnfaded[i]; + } + + var0->unk1_6 = 1; + arg0->unk0 &= ~(1 << j); + } + } + else + { + for (j = 0; j < 16; j++) + { + var0 = &arg0->unk4[j]; + if (!(arg1 & 1) || var0->unk1_6 || !var0->unk1_7) + { + arg1 <<= 1; + } + else + { + if (var0->unk4.unk7_6) + { + for (i = var0->unk4.unk2; i < var0->unk4.unk2 + var0->unk4.unk4; i++) + gPlttBufferFaded[i] = gPlttBufferUnfaded[i]; + } + + var0->unk1_6 = 1; + arg0->unk0 &= ~(1 << j); + } + } + } +} + +#ifdef NONMATCHING +void sub_8151E50(struct InnerStruct203CF18 *arg0) +{ + struct InnerStruct203CF18_2 *var0; + u8 i = 0; + + if (arg0->unk0) + { + for (i = 0; i < 16; i++) + { + var0 = &arg0->unk4[i]; + if ((!var0->unk1_6 && var0->unk1_7) && (!gPaletteFade.active || !var0->unk4.unk7_7)) + { + if (--var0->unk2 == 0xFF) + { + var0->unk2 = var0->unk4.unk5; + BlendPalette(var0->unk4.unk2, var0->unk4.unk4, var0->unk1_0, var0->unk4.unk0); + switch (var0->unk4.unk7_4) + { + case 0: + if (var0->unk1_0++ == var0->unk4.unk7_0) + { + var0->unk3++; + var0->unk1_0 = 0; + } + break; + case 1: + if (var0->unk1_4) + { + if (--var0->unk1_0 == 0) + { + var0->unk3++; + var0->unk1_4 ^= 1; + } + } + else + { + if (var0->unk1_0++ == var0->unk4.unk7_0 - 1) + { + var0->unk3++; + var0->unk1_4 ^= 1; + } + } + break; + case 2: + if (var0->unk1_4) + var0->unk1_0 = 0; + else + var0->unk1_0 = var0->unk4.unk7_0; + + var0->unk1_4 ^= 1; + var0->unk3++; + break; + } + + if (var0->unk4.unk6 != 0xFF && var0->unk3 == 0xFF) + sub_8151D28(arg0, var0->unk0, 0); + } + } + } + } +} +#else +NAKED +void sub_8151E50(struct InnerStruct203CF18 *arg0) +{ + asm_unified("\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x4\n\ + str r0, [sp]\n\ + movs r0, 0\n\ + mov r10, r0\n\ + ldr r1, [sp]\n\ + ldrh r0, [r1]\n\ + cmp r0, 0\n\ + bne _08151E6C\n\ + b _08151FF6\n\ +_08151E6C:\n\ + movs r2, 0xF\n\ + mov r9, r2\n\ + movs r3, 0x10\n\ + negs r3, r3\n\ + mov r8, r3\n\ + movs r7, 0x1\n\ +_08151E78:\n\ + mov r5, r10\n\ + lsls r0, r5, 1\n\ + add r0, r10\n\ + lsls r0, 2\n\ + adds r0, 0x4\n\ + ldr r1, [sp]\n\ + adds r4, r1, r0\n\ + ldrb r2, [r4, 0x1]\n\ + movs r3, 0xC0\n\ + ands r3, r2\n\ + cmp r3, 0x80\n\ + beq _08151E92\n\ + b _08151FE6\n\ +_08151E92:\n\ + ldr r0, =gPaletteFade\n\ + ldrb r1, [r0, 0x7]\n\ + adds r0, r3, 0\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _08151EA8\n\ + ldrb r0, [r4, 0xB]\n\ + ands r3, r0\n\ + cmp r3, 0\n\ + beq _08151EA8\n\ + b _08151FE6\n\ +_08151EA8:\n\ + ldrb r0, [r4, 0x2]\n\ + subs r0, 0x1\n\ + strb r0, [r4, 0x2]\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + cmp r0, 0xFF\n\ + beq _08151EB8\n\ + b _08151FE6\n\ +_08151EB8:\n\ + ldrb r0, [r4, 0x9]\n\ + strb r0, [r4, 0x2]\n\ + ldrh r0, [r4, 0x6]\n\ + ldrb r1, [r4, 0x8]\n\ + lsls r2, 28\n\ + lsrs r2, 28\n\ + ldrh r3, [r4, 0x4]\n\ + bl BlendPalette\n\ + ldrb r5, [r4, 0xB]\n\ + lsls r0, r5, 26\n\ + asrs r0, 30\n\ + cmp r0, 0x1\n\ + beq _08151F16\n\ + cmp r0, 0x1\n\ + bgt _08151EE4\n\ + cmp r0, 0\n\ + beq _08151EEA\n\ + b _08151FD0\n\ + .pool\n\ +_08151EE4:\n\ + cmp r0, 0x2\n\ + beq _08151F92\n\ + b _08151FD0\n\ +_08151EEA:\n\ + ldrb r2, [r4, 0x1]\n\ + lsls r1, r2, 28\n\ + lsrs r0, r1, 28\n\ + adds r0, 0x1\n\ + mov r3, r9\n\ + ands r0, r3\n\ + mov r6, r8\n\ + adds r3, r6, 0\n\ + ands r3, r2\n\ + orrs r3, r0\n\ + strb r3, [r4, 0x1]\n\ + lsrs r1, 28\n\ + lsls r0, r5, 28\n\ + asrs r0, 28\n\ + cmp r1, r0\n\ + bne _08151FD0\n\ + ldrb r0, [r4, 0x3]\n\ + adds r0, 0x1\n\ + strb r0, [r4, 0x3]\n\ + ands r3, r6\n\ + strb r3, [r4, 0x1]\n\ + b _08151FD0\n\ +_08151F16:\n\ + ldrb r3, [r4, 0x1]\n\ + movs r0, 0x10\n\ + ands r0, r3\n\ + cmp r0, 0\n\ + beq _08151F54\n\ + lsls r0, r3, 28\n\ + lsrs r0, 28\n\ + subs r0, 0x1\n\ + mov r5, r9\n\ + ands r0, r5\n\ + mov r2, r8\n\ + ands r2, r3\n\ + orrs r2, r0\n\ + strb r2, [r4, 0x1]\n\ + cmp r0, 0\n\ + bne _08151FD0\n\ + ldrb r0, [r4, 0x3]\n\ + adds r0, 0x1\n\ + strb r0, [r4, 0x3]\n\ + lsls r0, r2, 27\n\ + lsrs r0, 31\n\ + eors r0, r7\n\ + ands r0, r7\n\ + lsls r0, 4\n\ + movs r3, 0x11\n\ + negs r3, r3\n\ + adds r1, r3, 0\n\ + ands r2, r1\n\ + orrs r2, r0\n\ + strb r2, [r4, 0x1]\n\ + b _08151FD0\n\ +_08151F54:\n\ + lsls r0, r5, 28\n\ + asrs r0, 28\n\ + subs r0, 0x1\n\ + mov r5, r9\n\ + ands r0, r5\n\ + lsls r2, r3, 28\n\ + lsrs r1, r2, 28\n\ + adds r1, 0x1\n\ + ands r1, r5\n\ + mov r5, r8\n\ + ands r3, r5\n\ + orrs r3, r1\n\ + strb r3, [r4, 0x1]\n\ + lsrs r2, 28\n\ + cmp r2, r0\n\ + bne _08151FD0\n\ + ldrb r0, [r4, 0x3]\n\ + adds r0, 0x1\n\ + strb r0, [r4, 0x3]\n\ + lsls r0, r3, 27\n\ + lsrs r0, 31\n\ + eors r0, r7\n\ + ands r0, r7\n\ + lsls r0, 4\n\ + movs r2, 0x11\n\ + negs r2, r2\n\ + adds r1, r2, 0\n\ + ands r3, r1\n\ + orrs r3, r0\n\ + strb r3, [r4, 0x1]\n\ + b _08151FD0\n\ +_08151F92:\n\ + ldrb r2, [r4, 0x1]\n\ + movs r0, 0x10\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _08151FA2\n\ + mov r0, r8\n\ + ands r0, r2\n\ + b _08151FB0\n\ +_08151FA2:\n\ + lsls r1, r5, 28\n\ + asrs r1, 28\n\ + mov r3, r9\n\ + ands r1, r3\n\ + mov r0, r8\n\ + ands r0, r2\n\ + orrs r0, r1\n\ +_08151FB0:\n\ + strb r0, [r4, 0x1]\n\ + ldrb r2, [r4, 0x1]\n\ + lsls r0, r2, 27\n\ + lsrs r0, 31\n\ + eors r0, r7\n\ + ands r0, r7\n\ + lsls r0, 4\n\ + movs r5, 0x11\n\ + negs r5, r5\n\ + adds r1, r5, 0\n\ + ands r2, r1\n\ + orrs r2, r0\n\ + strb r2, [r4, 0x1]\n\ + ldrb r0, [r4, 0x3]\n\ + adds r0, 0x1\n\ + strb r0, [r4, 0x3]\n\ +_08151FD0:\n\ + ldrb r1, [r4, 0xA]\n\ + cmp r1, 0xFF\n\ + beq _08151FE6\n\ + ldrb r0, [r4, 0x3]\n\ + cmp r0, r1\n\ + bne _08151FE6\n\ + ldrb r1, [r4]\n\ + ldr r0, [sp]\n\ + movs r2, 0\n\ + bl sub_8151D28\n\ +_08151FE6:\n\ + mov r0, r10\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r10, r0\n\ + cmp r0, 0xF\n\ + bhi _08151FF6\n\ + b _08151E78\n\ +_08151FF6:\n\ + add sp, 0x4\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0"); +} +#endif // NONMATCHING + +void sub_8152008(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height) +{ + u16 *_dest; + u8 i; + u8 j; + i = 0; + dest = &dest[top * 32 + left]; + for (; i < height; i++) + { + _dest = dest + i * 32; + for (j = 0; j < width; j++) + { + *_dest++ = src; + } + } +} + +void sub_8152058(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height) +{ + u16 *_dest; + u16 *_src = src; + u8 i; + u8 j; + i = 0; + dest = &dest[top * 32 + left]; + for (; i < height; i++) + { + _dest = dest + i * 32; + for (j = 0; j < width; j++) + { + *_dest++ = *_src++; + } + } +} -- cgit v1.2.3 From 6babb97182c9210373f50f3a4c66102ae13bd9a4 Mon Sep 17 00:00:00 2001 From: Meowsy <40091248+Meowsy@users.noreply.github.com> Date: Sat, 8 Dec 2018 12:57:19 -0500 Subject: Fix typo "ggText_DexSortSmallestDescription". (#433) Should be "gText_DexSortSmallestDescription". --- src/pokedex.c | 2 +- src/strings.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/pokedex.c b/src/pokedex.c index fa74b073a..d13a87f54 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1083,7 +1083,7 @@ static const struct PokedexOption gDexSortOptions[] = {gText_DexSortHeaviestDescription, gText_DexSortHeaviestTitle}, {gText_DexSortLightestDescription, gText_DexSortLightestTitle}, {gText_DexSortTallestDescription, gText_DexSortTallestTitle}, - {ggText_DexSortSmallestDescription, gText_DexSortSmallestTitle}, + {gText_DexSortSmallestDescription, gText_DexSortSmallestTitle}, {NULL, NULL}, }; diff --git a/src/strings.c b/src/strings.c index 7b3df0eca..3ac6fa36c 100644 --- a/src/strings.c +++ b/src/strings.c @@ -155,7 +155,7 @@ const u8 gText_DexSortAtoZDescription[] = _("Spotted and owned POKéMON are list const u8 gText_DexSortHeaviestDescription[] = _("Owned POKéMON are listed from the\nheaviest to the lightest."); const u8 gText_DexSortLightestDescription[] = _("Owned POKéMON are listed from the\nlightest to the heaviest."); const u8 gText_DexSortTallestDescription[] = _("Owned POKéMON are listed from the\ntallest to the smallest."); -const u8 ggText_DexSortSmallestDescription[] = _("Owned POKéMON are listed from the\nsmallest to the tallest."); +const u8 gText_DexSortSmallestDescription[] = _("Owned POKéMON are listed from the\nsmallest to the tallest."); const u8 gText_DexEmptyString[] = _(""); const u8 gText_DexSearchDontSpecify[] = _("DON'T SPECIFY."); const u8 gText_DexSearchTypeNone[] = _("NONE"); -- cgit v1.2.3 From 4c23adb5f53a61d0e7426376aba9a04de5c8f2b3 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 8 Dec 2018 19:05:03 +0100 Subject: Decompile field weather --- src/battle_transition.c | 4 +- src/battle_util.c | 6 +- src/egg_hatch.c | 4 +- src/field_screen.c | 15 - src/field_weather.c | 1152 ++++++++++++++++++++ src/field_weather_effect.c | 2484 ++++++++++++++++++++++++++++++++++++++++++++ src/fldeff_sweetscent.c | 3 +- src/overworld.c | 4 +- src/start_menu.c | 18 +- 9 files changed, 3656 insertions(+), 34 deletions(-) delete mode 100644 src/field_screen.c create mode 100644 src/field_weather.c create mode 100644 src/field_weather_effect.c (limited to 'src') diff --git a/src/battle_transition.c b/src/battle_transition.c index 94b9e78f9..aa8877148 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -59,7 +59,7 @@ typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite); extern const struct OamData gEventObjectBaseOam_32x32; -extern void sub_80AC3D0(void); +extern void SetWeatherScreenFadeOut(void); // this file's functions static void LaunchBattleTransitionTask(u8 transitionId); @@ -981,7 +981,7 @@ static void Task_BattleTransitionMain(u8 taskId) static bool8 Transition_Phase1(struct Task *task) { - sub_80AC3D0(); + SetWeatherScreenFadeOut(); CpuCopy32(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); if (sPhase1_Tasks[task->tTransitionId] != NULL) { diff --git a/src/battle_util.c b/src/battle_util.c index 4c9ef75d9..94aaea66c 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -23,7 +23,7 @@ #include "link.h" #include "berry.h" -extern u8 weather_get_current(void); +extern u8 GetCurrentWeather(void); // rom const data static const u16 sSoundMovesTable[] = @@ -1827,7 +1827,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA case ABILITYEFFECT_SWITCH_IN_WEATHER: if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED)) { - switch (weather_get_current()) + switch (GetCurrentWeather()) { case 3: case 5: @@ -1862,7 +1862,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA } if (effect) { - gBattleCommunication[MULTISTRING_CHOOSER] = weather_get_current(); + gBattleCommunication[MULTISTRING_CHOOSER] = GetCurrentWeather(); BattleScriptPushCursorAndCallback(BattleScript_OverworldWeatherStarts); } break; diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 4b7ee9a61..28386528a 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -60,7 +60,7 @@ extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle extern const u8 gText_HatchedFromEgg[]; extern const u8 gText_NickHatchPrompt[]; -extern void play_some_sound(void); +extern void PlayRainSoundEffect(void); extern u16 sub_80D22D0(void); extern u8 CountPartyAliveNonEggMonsExcept(u8); @@ -581,7 +581,7 @@ static void Task_EggHatchPlayBGM(u8 taskID) if (gTasks[taskID].data[0] == 0) { StopMapMusic(); - play_some_sound(); + PlayRainSoundEffect(); } if (gTasks[taskID].data[0] == 1) PlayBGM(MUS_ME_SHINKA); diff --git a/src/field_screen.c b/src/field_screen.c deleted file mode 100644 index 2d33d237f..000000000 --- a/src/field_screen.c +++ /dev/null @@ -1,15 +0,0 @@ - -// Includes -#include "global.h" - -// Static type declarations - -// Static RAM declarations -IWRAM_DATA u8 *gUnknown_03000F50; -IWRAM_DATA u32 filler_03000f54; - -// Static ROM declarations - -// .rodata - -// .text diff --git a/src/field_weather.c b/src/field_weather.c new file mode 100644 index 000000000..0be584d51 --- /dev/null +++ b/src/field_weather.c @@ -0,0 +1,1152 @@ +#include "global.h" +#include "constants/songs.h" +#include "constants/weather.h" +#include "constants/rgb.h" +#include "util.h" +#include "event_object_movement.h" +#include "field_weather.h" +#include "main.h" +#include "menu.h" +#include "palette.h" +#include "random.h" +#include "script.h" +#include "start_menu.h" +#include "sound.h" +#include "sprite.h" +#include "task.h" +#include "trig.h" +#include "gpu_regs.h" + +#define MACRO1(color) ((((color) >> 1) & 0xF) | (((color) >> 2) & 0xF0) | (((color) >> 3) & 0xF00)) + +enum +{ + GAMMA_NONE, + GAMMA_NORMAL, + GAMMA_ALT, +}; + +struct RGBColor +{ + u16 r:5; + u16 g:5; + u16 b:5; +}; + +struct WeatherPaletteData +{ + u16 gammaShiftColors[8][0x1000]; // 0x1000 is the number of bytes that make up all palettes. +}; + +struct WeatherCallbacks +{ + void (*initVars)(void); + void (*main)(void); + void (*initAll)(void); + bool8 (*finish)(void); +}; + +// This file's functions. +/*static*/ bool8 LightenSpritePaletteInFog(u8); +/*static*/ void BuildGammaShiftTables(void); +/*static*/ void UpdateWeatherGammaShift(void); +/*static*/ void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex); +/*static*/ void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor); +/*static*/ void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor); +/*static*/ void ApplyFogBlend(u8 blendCoeff, u16 blendColor); +/*static*/ bool8 FadeInScreen_RainShowShade(void); +/*static*/ bool8 FadeInScreen_Drought(void); +/*static*/ bool8 FadeInScreen_Fog1(void); +/*static*/ void FadeInScreenWithWeather(void); +/*static*/ void DoNothing(void); +void None_Init(void); +void None_Main(void); +bool8 None_Finish(void); +void Clouds_InitVars(void); +void Clouds_Main(void); +void Clouds_InitAll(void); +bool8 Clouds_Finish(void); +void Weather2_InitVars(void); +void Weather2_Main(void); +void Weather2_InitAll(void); +bool8 Weather2_Finish(void); +void LightRain_InitVars(void); +void LightRain_Main(void); +void LightRain_InitAll(void); +bool8 LightRain_Finish(void); +void Snow_InitVars(void); +void Snow_Main(void); +void Snow_InitAll(void); +bool8 Snow_Finish(void); +void MedRain_InitVars(void); +void Rain_Main(void); +void MedRain_InitAll(void); +bool8 Rain_Finish(void); +void Fog1_InitVars(void); +void Fog1_Main(void); +void Fog1_InitAll(void); +bool8 Fog1_Finish(void); +void Ash_InitVars(void); +void Ash_Main(void); +void Ash_InitAll(void); +bool8 Ash_Finish(void); +void Sandstorm_InitVars(void); +void Sandstorm_Main(void); +void Sandstorm_InitAll(void); +bool8 Sandstorm_Finish(void); +void Fog2_InitVars(void); +void Fog2_Main(void); +void Fog2_InitAll(void); +bool8 Fog2_Finish(void); +void Fog1_InitVars(void); +void Fog1_Main(void); +void Fog1_InitAll(void); +bool8 Fog1_Finish(void); +void Shade_InitVars(void); +void Shade_Main(void); +void Shade_InitAll(void); +bool8 Shade_Finish(void); +void Drought_InitVars(void); +void Drought_Main(void); +void Drought_InitAll(void); +bool8 Drought_Finish(void); +void HeavyRain_InitVars(void); +void Rain_Main(void); +void HeavyRain_InitAll(void); +bool8 Rain_Finish(void); +void Bubbles_InitVars(void); +void Bubbles_Main(void); +void Bubbles_InitAll(void); +bool8 Bubbles_Finish(void); + +// Const rom data + +// This is a pointer to gWeather. All code in this file accesses gWeather directly, +// while code in other field weather files accesses gWeather through this pointer. +// This is likely the result of compiler optimization, since using the pointer in +// this file produces the same result as accessing gWeather directly. +struct Weather *const gWeatherPtr = &gWeather; + +/*static*/ const struct WeatherCallbacks sWeatherFuncs[] = +{ + {None_Init, None_Main, None_Init, None_Finish}, + {Clouds_InitVars, Clouds_Main, Clouds_InitAll, Clouds_Finish}, + {Weather2_InitVars, Weather2_Main, Weather2_InitAll, Weather2_Finish}, + {LightRain_InitVars, LightRain_Main, LightRain_InitAll, LightRain_Finish}, + {Snow_InitVars, Snow_Main, Snow_InitAll, Snow_Finish}, + {MedRain_InitVars, Rain_Main, MedRain_InitAll, Rain_Finish}, + {Fog1_InitVars, Fog1_Main, Fog1_InitAll, Fog1_Finish}, + {Ash_InitVars, Ash_Main, Ash_InitAll, Ash_Finish}, + {Sandstorm_InitVars, Sandstorm_Main, Sandstorm_InitAll, Sandstorm_Finish}, + {Fog2_InitVars, Fog2_Main, Fog2_InitAll, Fog2_Finish}, + {Fog1_InitVars, Fog1_Main, Fog1_InitAll, Fog1_Finish}, + {Shade_InitVars, Shade_Main, Shade_InitAll, Shade_Finish}, + {Drought_InitVars, Drought_Main, Drought_InitAll, Drought_Finish}, + {HeavyRain_InitVars, Rain_Main, HeavyRain_InitAll, Rain_Finish}, + {Bubbles_InitVars, Bubbles_Main, Bubbles_InitAll, Bubbles_Finish}, +}; + +void (*const gWeatherPalStateFuncs[])(void) = +{ + UpdateWeatherGammaShift, // WEATHER_PAL_STATE_CHANGING_WEATHER + FadeInScreenWithWeather, // WEATHER_PAL_STATE_SCREEN_FADING_IN + DoNothing, // WEATHER_PAL_STATE_SCREEN_FADING_OUT + DoNothing, // WEATHER_PAL_STATE_IDLE +}; + +// This table specifies which of the gamma shift tables should be +// applied to each of the background and sprite palettes. +/*static*/ const u8 sBasePaletteGammaTypes[32] = +{ + // background palettes + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NONE, + GAMMA_NONE, + // sprite palettes + GAMMA_ALT, + GAMMA_NORMAL, + GAMMA_ALT, + GAMMA_ALT, + GAMMA_ALT, + GAMMA_ALT, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_ALT, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, +}; + + +// EWRAM +EWRAM_DATA struct Weather gWeather = {0}; +EWRAM_DATA u8 gFieldEffectPaletteGammaTypes[32] = {0}; + +// IWRAM bss +IWRAM_DATA const u8 *sPaletteGammaTypes; +IWRAM_DATA u32 filler_03000f54; + +// const +extern const u16 gUnknown_083970E8[]; +extern const u16 gUnknown_0854014C[][4096]; + +// code +void StartWeather(void) +{ + if (!FuncIsActiveTask(Task_WeatherMain)) + { + u8 index = AllocSpritePalette(0x1200); + CpuCopy32(gUnknown_083970E8, &gPlttBufferUnfaded[0x100 + index * 16], 32); + BuildGammaShiftTables(); + gWeather.altGammaSpritePalIndex = index; + gWeather.weatherPicSpritePalIndex = AllocSpritePalette(0x1201); + gWeather.rainSpriteCount = 0; + gWeather.unknown_6D8 = 0; + gWeather.cloudSpritesCreated = 0; + gWeather.snowflakeSpriteCount = 0; + gWeather.ashSpritesCreated = 0; + gWeather.fog1SpritesCreated = 0; + gWeather.fog2SpritesCreated = 0; + gWeather.sandstormSprites1Created = 0; + gWeather.sandstormSprites2Created = 0; + gWeather.unknown_72E = 0; + gWeather.lightenedFogSpritePalsCount = 0; + Weather_SetBlendCoeffs(16, 0); + gWeather.currWeather = 0; + gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeather.readyForInit = FALSE; + gWeather.weatherChangeComplete = TRUE; + gWeather.taskId = CreateTask(Task_WeatherInit, 80); + } +} + +void ChangeWeather(u8 weather) +{ + if (weather != WEATHER_RAIN_LIGHT && weather != WEATHER_RAIN_MED && weather != WEATHER_RAIN_HEAVY) + { + PlayRainSoundEffect(); + } + + if (gWeather.nextWeather != weather && gWeather.currWeather == weather) + { + sWeatherFuncs[weather].initVars(); + } + + gWeather.weatherChangeComplete = FALSE; + gWeather.nextWeather = weather; + gWeather.finishStep = 0; +} + +void sub_80AB104(u8 weather) +{ + PlayRainSoundEffect(); + gWeather.currWeather = weather; + gWeather.nextWeather = weather; +} + +void sub_80AB130(u8 weather) +{ + PlayRainSoundEffect(); + gWeather.currWeather = weather; + gWeather.nextWeather = weather; + gWeather.readyForInit = TRUE; +} + +void Task_WeatherInit(u8 taskId) +{ + // Waits until it's ok to initialize weather. + // When the screen fades in, this is set to TRUE. + if (gWeather.readyForInit) + { + sWeatherFuncs[gWeather.currWeather].initAll(); + gTasks[taskId].func = Task_WeatherMain; + } +} + +void Task_WeatherMain(u8 taskId) +{ + if (gWeather.currWeather != gWeather.nextWeather) + { + if (!sWeatherFuncs[gWeather.currWeather].finish() && gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) + { + // Finished cleaning up previous weather. Now transition to next weather. + sWeatherFuncs[gWeather.nextWeather].initVars(); + gWeather.gammaStepFrameCounter = 0; + gWeather.palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; + gWeather.currWeather = gWeather.nextWeather; + gWeather.weatherChangeComplete = TRUE; + } + } + else + { + sWeatherFuncs[gWeather.currWeather].main(); + } + + gWeatherPalStateFuncs[gWeather.palProcessingState](); +} + +void None_Init(void) +{ + gWeather.gammaTargetIndex = 0; + gWeather.gammaStepDelay = 0; +} + +void None_Main(void) +{ +} + +u8 None_Finish(void) +{ + return 0; +} + +// Builds two tables that contain gamma shifts for palette colors. +// It's unclear why the two tables aren't declared as const arrays, since +// this function always builds the same two tables. +/*static*/ void BuildGammaShiftTables(void) +{ + u16 v0; + u8 (*v1)[32]; + u16 v2; + u16 v4; + u16 v5; + u16 v6; + u16 v9; + u32 v10; + u16 v11; + s16 dunno; + + sPaletteGammaTypes = sBasePaletteGammaTypes; + for (v0 = 0; v0 <= 1; v0++) + { + if (v0 == 0) + v1 = gWeather.gammaShifts; + else + v1 = gWeather.altGammaShifts; + + for (v2 = 0; v2 < 32; v2++) + { + v4 = v2 << 8; + if (v0 == 0) + v5 = (v2 << 8) / 16; + else + v5 = 0; + for (v6 = 0; v6 <= 2; v6++) + { + v4 = (v4 - v5); + v1[v6][v2] = v4 >> 8; + } + v9 = v4; + v10 = 0x1f00 - v4; + if ((0x1f00 - v4) < 0) + { + v10 += 0xf; + } + v11 = v10 >> 4; + if (v2 < 12) + { + for (; v6 < 19; v6++) + { + v4 += v11; + dunno = v4 - v9; + if (dunno > 0) + v4 -= (dunno + ((u16)dunno >> 15)) >> 1; + v1[v6][v2] = v4 >> 8; + if (v1[v6][v2] > 0x1f) + v1[v6][v2] = 0x1f; + } + } + else + { + for (; v6 < 19; v6++) + { + v4 += v11; + v1[v6][v2] = v4 >> 8; + if (v1[v6][v2] > 0x1f) + v1[v6][v2] = 0x1f; + } + } + } + } +} + +// When the weather is changing, it gradually updates the palettes +// towards the desired gamma shift. +/*static*/ void UpdateWeatherGammaShift(void) +{ + if (gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) + { + if (gWeather.gammaIndex == gWeather.gammaTargetIndex) + { + gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + } + else + { + if (++gWeather.gammaStepFrameCounter >= gWeather.gammaStepDelay) + { + gWeather.gammaStepFrameCounter = 0; + if (gWeather.gammaIndex < gWeather.gammaTargetIndex) + gWeather.gammaIndex++; + else + gWeather.gammaIndex--; + + ApplyGammaShift(0, 32, gWeather.gammaIndex); + } + } + } +} + +/*static*/ void FadeInScreenWithWeather(void) +{ + if (++gWeather.unknown_6CB > 1) + gWeather.unknown_6CA = 0; + + switch (gWeather.currWeather) + { + case WEATHER_RAIN_LIGHT: + case WEATHER_RAIN_MED: + case WEATHER_RAIN_HEAVY: + case WEATHER_SNOW: + case WEATHER_SHADE: + if (FadeInScreen_RainShowShade() == FALSE) + { + gWeather.gammaIndex = 3; + gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + } + break; + case WEATHER_DROUGHT: + if (FadeInScreen_Drought() == FALSE) + { + gWeather.gammaIndex = -6; + gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + } + break; + case WEATHER_FOG_1: + if (FadeInScreen_Fog1() == FALSE) + { + gWeather.gammaIndex = 0; + gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + } + break; + case WEATHER_ASH: + case WEATHER_SANDSTORM: + case WEATHER_FOG_2: + case WEATHER_FOG_3: + default: + if (!gPaletteFade.active) + { + gWeather.gammaIndex = gWeather.gammaTargetIndex; + gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + } + break; + } +} + +bool8 FadeInScreen_RainShowShade(void) +{ + if (gWeather.fadeScreenCounter == 16) + return FALSE; + + if (++gWeather.fadeScreenCounter >= 16) + { + ApplyGammaShift(0, 32, 3); + gWeather.fadeScreenCounter = 16; + return FALSE; + } + + ApplyGammaShiftWithBlend(0, 32, 3, 16 - gWeather.fadeScreenCounter, gWeather.fadeDestColor); + return TRUE; +} + +bool8 FadeInScreen_Drought(void) +{ + if (gWeather.fadeScreenCounter == 16) + return FALSE; + + if (++gWeather.fadeScreenCounter >= 16) + { + ApplyGammaShift(0, 32, -6); + gWeather.fadeScreenCounter = 16; + return FALSE; + } + + ApplyDroughtGammaShiftWithBlend(-6, 16 - gWeather.fadeScreenCounter, gWeather.fadeDestColor); + return TRUE; +} + +bool8 FadeInScreen_Fog1(void) +{ + if (gWeather.fadeScreenCounter == 16) + return FALSE; + + gWeather.fadeScreenCounter++; + ApplyFogBlend(16 - gWeather.fadeScreenCounter, gWeather.fadeDestColor); + return TRUE; +} + +/*static*/ void DoNothing(void) +{ } + +/*static*/ void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex) +{ + u16 curPalIndex; + u16 palOffset; + u8 *gammaTable; + u16 i; + + if (gammaIndex > 0) + { + gammaIndex--; + palOffset = startPalIndex * 16; + numPalettes += startPalIndex; + curPalIndex = startPalIndex; + + // Loop through the speficied palette range and apply necessary gamma shifts to the colors. + while (curPalIndex < numPalettes) + { + if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE) + { + // No palette change. + CpuFastCopy(gPlttBufferUnfaded + palOffset, gPlttBufferFaded + palOffset, 16 * sizeof(u16)); + palOffset += 16; + } + else + { + u8 r, g, b; + + if (sPaletteGammaTypes[curPalIndex] == GAMMA_ALT || curPalIndex - 16 == gWeather.altGammaSpritePalIndex) + gammaTable = gWeather.altGammaShifts[gammaIndex]; + else + gammaTable = gWeather.gammaShifts[gammaIndex]; + + for (i = 0; i < 16; i++) + { + // Apply gamma shift to the original color. + struct RGBColor baseColor = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; + r = gammaTable[baseColor.r]; + g = gammaTable[baseColor.g]; + b = gammaTable[baseColor.b]; + gPlttBufferFaded[palOffset++] = (b << 10) | (g << 5) | r; + } + } + + curPalIndex++; + } + } + else if (gammaIndex < 0) + { + // A negative gammIndex value means that the blending will come from the special Drought weather's palette tables. + gammaIndex = -gammaIndex - 1; + palOffset = startPalIndex * 16; + numPalettes += startPalIndex; + curPalIndex = startPalIndex; + + while (curPalIndex < numPalettes) + { + if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE) + { + // No palette change. + CpuFastCopy(gPlttBufferUnfaded + palOffset, gPlttBufferFaded + palOffset, 16 * sizeof(u16)); + palOffset += 16; + } + else + { + for (i = 0; i < 16; i++) + { + gPlttBufferFaded[palOffset] = gUnknown_0854014C[gammaIndex][MACRO1(gPlttBufferUnfaded[palOffset])]; + palOffset++; + } + } + + curPalIndex++; + } + } + else + { + // No palette blending. + CpuFastCopy(gPlttBufferUnfaded + startPalIndex * 16, gPlttBufferFaded + startPalIndex * 16, numPalettes * 16 * sizeof(u16)); + } +} + +/*static*/ void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor) +{ + u16 palOffset; + u16 curPalIndex; + u16 i; + struct RGBColor color = *(struct RGBColor *)&blendColor; + u8 rBlend = color.r; + u8 gBlend = color.g; + u8 bBlend = color.b; + + palOffset = startPalIndex * 16; + numPalettes += startPalIndex; + gammaIndex--; + curPalIndex = startPalIndex; + + while (curPalIndex < numPalettes) + { + if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE) + { + // No gamma shift. Simply blend the colors. + BlendPalette(palOffset, 16, blendCoeff, blendColor); + palOffset += 16; + } + else + { + u8 *gammaTable; + + if (sPaletteGammaTypes[curPalIndex] == GAMMA_NORMAL) + gammaTable = gWeather.gammaShifts[gammaIndex]; + else + gammaTable = gWeather.altGammaShifts[gammaIndex]; + + for (i = 0; i < 16; i++) + { + struct RGBColor baseColor = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; + u8 r = gammaTable[baseColor.r]; + u8 g = gammaTable[baseColor.g]; + u8 b = gammaTable[baseColor.b]; + + // Apply gamma shift and target blend color to the original color. + r += ((rBlend - r) * blendCoeff) >> 4; + g += ((gBlend - g) * blendCoeff) >> 4; + b += ((bBlend - b) * blendCoeff) >> 4; + gPlttBufferFaded[palOffset++] = (b << 10) | (g << 5) | r; + } + } + + curPalIndex++; + } +} + +void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor) +{ + struct RGBColor color; + u8 rBlend; + u8 gBlend; + u8 bBlend; + u16 curPalIndex; + u16 palOffset; + u16 i; + + gammaIndex = -gammaIndex - 1; + color = *(struct RGBColor *)&blendColor; + rBlend = color.r; + gBlend = color.g; + bBlend = color.b; + palOffset = 0; + for (curPalIndex = 0; curPalIndex < 32; curPalIndex++) + { + if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE) + { + // No gamma shift. Simply blend the colors. + BlendPalette(palOffset, 16, blendCoeff, blendColor); + palOffset += 16; + } + else + { + for (i = 0; i < 16; i++) + { + u32 offset; + struct RGBColor color1; + struct RGBColor color2; + u8 r1, g1, b1; + u8 r2, g2, b2; + + color1 = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; + r1 = color1.r; + g1 = color1.g; + b1 = color1.b; + + offset = ((b1 & 0x1E) << 7) | ((g1 & 0x1E) << 3) | ((r1 & 0x1E) >> 1); + color2 = *(struct RGBColor *)&gUnknown_0854014C[gammaIndex][offset]; + r2 = color2.r; + g2 = color2.g; + b2 = color2.b; + + r2 += ((rBlend - r2) * blendCoeff) >> 4; + g2 += ((gBlend - g2) * blendCoeff) >> 4; + b2 += ((bBlend - b2) * blendCoeff) >> 4; + + gPlttBufferFaded[palOffset++] = (b2 << 10) | (g2 << 5) | r2; + } + } + } +} + +void ApplyFogBlend(u8 blendCoeff, u16 blendColor) +{ + struct RGBColor color; + u8 rBlend; + u8 gBlend; + u8 bBlend; + u16 curPalIndex; + + BlendPalette(0, 256, blendCoeff, blendColor); + color = *(struct RGBColor *)&blendColor; + rBlend = color.r; + gBlend = color.g; + bBlend = color.b; + + for (curPalIndex = 16; curPalIndex < 32; curPalIndex++) + { + if (LightenSpritePaletteInFog(curPalIndex)) + { + u16 palEnd = (curPalIndex + 1) * 16; + u16 palOffset = curPalIndex * 16; + + while (palOffset < palEnd) + { + struct RGBColor color = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; + u8 r = color.r; + u8 g = color.g; + u8 b = color.b; + + r += ((28 - r) * 3) >> 2; + g += ((31 - g) * 3) >> 2; + b += ((28 - b) * 3) >> 2; + + r += ((rBlend - r) * blendCoeff) >> 4; + g += ((gBlend - g) * blendCoeff) >> 4; + b += ((bBlend - b) * blendCoeff) >> 4; + + gPlttBufferFaded[palOffset] = (b << 10) | (g << 5) | r; + palOffset++; + } + } + else + { + BlendPalette(curPalIndex * 16, 16, blendCoeff, blendColor); + } + } +} + +/*static*/ void MarkFogSpritePalToLighten(u8 paletteIndex) +{ + if (gWeather.lightenedFogSpritePalsCount < 6) + { + gWeather.lightenedFogSpritePals[gWeather.lightenedFogSpritePalsCount] = paletteIndex; + gWeather.lightenedFogSpritePalsCount++; + } +} + +/*static*/ bool8 LightenSpritePaletteInFog(u8 paletteIndex) +{ + u16 i; + + for (i = 0; i < gWeather.lightenedFogSpritePalsCount; i++) + { + if (gWeather.lightenedFogSpritePals[i] == paletteIndex) + return TRUE; + } + + return FALSE; +} + +void sub_80ABC48(s8 gammaIndex) +{ + if (gWeather.palProcessingState == WEATHER_PAL_STATE_IDLE) + { + ApplyGammaShift(0, 32, gammaIndex); + gWeather.gammaIndex = gammaIndex; + } +} + +void sub_80ABC7C(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay) +{ + if (gWeather.palProcessingState == WEATHER_PAL_STATE_IDLE) + { + gWeather.palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; + gWeather.gammaIndex = gammaIndex; + gWeather.gammaTargetIndex = gammaTargetIndex; + gWeather.gammaStepFrameCounter = 0; + gWeather.gammaStepDelay = gammaStepDelay; + sub_80ABC48(gammaIndex); + } +} + +void FadeScreen(u8 mode, s8 delay) +{ + u32 fadeColor; + bool8 fadeOut; + bool8 useWeatherPal; + + switch (mode) + { + case FADE_FROM_BLACK: + fadeColor = 0; + fadeOut = FALSE; + break; + case FADE_FROM_WHITE: + fadeColor = 0xFFFF; + fadeOut = FALSE; + break; + case FADE_TO_BLACK: + fadeColor = 0; + fadeOut = TRUE; + break; + case FADE_TO_WHITE: + fadeColor = 0xFFFF; + fadeOut = TRUE; + break; + default: + return; + } + + switch (gWeather.currWeather) + { + case WEATHER_RAIN_LIGHT: + case WEATHER_RAIN_MED: + case WEATHER_RAIN_HEAVY: + case WEATHER_SNOW: + case WEATHER_FOG_1: + case WEATHER_SHADE: + case WEATHER_DROUGHT: + useWeatherPal = TRUE; + break; + default: + useWeatherPal = FALSE; + break; + } + + if (fadeOut) + { + if (useWeatherPal) + CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); + + BeginNormalPaletteFade(0xFFFFFFFF, delay, 0, 16, fadeColor); + gWeather.palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; + } + else + { + gWeather.fadeDestColor = fadeColor; + if (useWeatherPal) + gWeather.fadeScreenCounter = 0; + else + BeginNormalPaletteFade(0xFFFFFFFF, delay, 16, 0, fadeColor); + + gWeather.palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_IN; + gWeather.unknown_6CA = 1; + gWeather.unknown_6CB = 0; + Weather_SetBlendCoeffs(gWeather.currBlendEVA, gWeather.currBlendEVB); + gWeather.readyForInit = TRUE; + } +} + +bool8 IsWeatherNotFadingIn(void) +{ + return (gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_IN); +} + +void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) +{ + u16 paletteIndex = 16 + spritePaletteIndex; + u16 i; + + switch (gWeather.palProcessingState) + { + case WEATHER_PAL_STATE_SCREEN_FADING_IN: + if (gWeather.unknown_6CA != 0) + { + if (gWeather.currWeather == WEATHER_FOG_1) + MarkFogSpritePalToLighten(paletteIndex); + paletteIndex *= 16; + for (i = 0; i < 16; i++) + gPlttBufferFaded[paletteIndex + i] = gWeather.fadeDestColor; + } + break; + case WEATHER_PAL_STATE_SCREEN_FADING_OUT: + paletteIndex *= 16; + CpuFastCopy(gPlttBufferFaded + paletteIndex, gPlttBufferUnfaded + paletteIndex, 32); + BlendPalette(paletteIndex, 16, gPaletteFade.y, gPaletteFade.blendColor); + break; + // WEATHER_PAL_STATE_CHANGING_WEATHER + // WEATHER_PAL_STATE_CHANGING_IDLE + default: + if (gWeather.currWeather != WEATHER_FOG_1) + { + ApplyGammaShift(paletteIndex, 1, gWeather.gammaIndex); + } + else + { + paletteIndex *= 16; + BlendPalette(paletteIndex, 16, 12, RGB(28, 31, 28)); + } + break; + } +} + +void ApplyWeatherGammaShiftToPal(u8 paletteIndex) +{ + ApplyGammaShift(paletteIndex, 1, gWeather.gammaIndex); +} + +u8 sub_80ABF20(void) +{ + if (gWeather.palProcessingState == WEATHER_PAL_STATE_SCREEN_FADING_IN) + return gWeather.unknown_6CA; + else + return 0; +} + +void LoadCustomWeatherSpritePalette(const u16 *palette) +{ + LoadPalette(palette, 0x100 + gWeather.weatherPicSpritePalIndex * 16, 32); + UpdateSpritePaletteWithWeather(gWeather.weatherPicSpritePalIndex); +} + +void LoadDroughtWeatherPalette(u8 *gammaIndexPtr, u8 *a1) +{ + *gammaIndexPtr = 0x20; + *a1 = 0x20; +} + +void ResetDroughtWeatherPaletteLoading(void) +{ + gWeather.loadDroughtPalsIndex = 1; + gWeather.loadDroughtPalsOffset = 1; +} + +bool8 LoadDroughtWeatherPalettes(void) +{ + if (gWeather.loadDroughtPalsIndex < 32) + { + LoadDroughtWeatherPalette(&gWeather.loadDroughtPalsIndex, &gWeather.loadDroughtPalsOffset); + if (gWeather.loadDroughtPalsIndex < 32) + return TRUE; + } + return FALSE; +} + +void sub_80ABFE0(s8 gammaIndex) +{ + sub_80ABC48(-gammaIndex - 1); +} + +void sub_80ABFF0(void) +{ + gWeather.unknown_73C = 0; + gWeather.unknown_740 = 0; + gWeather.unknown_742 = 0; + gWeather.unknown_73E = 0; +} + +void sub_80AC01C(void) +{ + switch (gWeather.unknown_742) + { + case 0: + if (++gWeather.unknown_740 > 5) + { + gWeather.unknown_740 = 0; + sub_80ABFE0(gWeather.unknown_73C++); + if (gWeather.unknown_73C > 5) + { + gWeather.unknown_73E = gWeather.unknown_73C; + gWeather.unknown_742 = 1; + gWeather.unknown_740 = 0x3C; + } + } + break; + case 1: + gWeather.unknown_740 = (gWeather.unknown_740 + 3) & 0x7F; + gWeather.unknown_73C = ((gSineTable[gWeather.unknown_740] - 1) >> 6) + 2; + if (gWeather.unknown_73C != gWeather.unknown_73E) + sub_80ABFE0(gWeather.unknown_73C); + gWeather.unknown_73E = gWeather.unknown_73C; + break; + case 2: + if (++gWeather.unknown_740 > 5) + { + gWeather.unknown_740 = 0; + sub_80ABFE0(--gWeather.unknown_73C); + if (gWeather.unknown_73C == 3) + gWeather.unknown_742 = 0; + } + break; + } +} + +void Weather_SetBlendCoeffs(u8 eva, u8 evb) +{ + gWeather.currBlendEVA = eva; + gWeather.currBlendEVB = evb; + gWeather.targetBlendEVA = eva; + gWeather.targetBlendEVB = evb; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(eva, evb)); +} + +void Weather_SetTargetBlendCoeffs(u8 eva, u8 evb, int delay) +{ + gWeather.targetBlendEVA = eva; + gWeather.targetBlendEVB = evb; + gWeather.blendDelay = delay; + gWeather.blendFrameCounter = 0; + gWeather.blendUpdateCounter = 0; +} + +bool8 Weather_UpdateBlend(void) +{ + if (gWeather.currBlendEVA == gWeather.targetBlendEVA + && gWeather.currBlendEVB == gWeather.targetBlendEVB) + return TRUE; + + if (++gWeather.blendFrameCounter > gWeather.blendDelay) + { + gWeather.blendFrameCounter = 0; + gWeather.blendUpdateCounter++; + + // Update currBlendEVA and currBlendEVB on alternate frames + if (gWeather.blendUpdateCounter & 1) + { + if (gWeather.currBlendEVA < gWeather.targetBlendEVA) + gWeather.currBlendEVA++; + else if (gWeather.currBlendEVA > gWeather.targetBlendEVA) + gWeather.currBlendEVA--; + } + else + { + if (gWeather.currBlendEVB < gWeather.targetBlendEVB) + gWeather.currBlendEVB++; + else if (gWeather.currBlendEVB > gWeather.targetBlendEVB) + gWeather.currBlendEVB--; + } + } + + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gWeather.currBlendEVA, gWeather.currBlendEVB)); + + if (gWeather.currBlendEVA == gWeather.targetBlendEVA + && gWeather.currBlendEVB == gWeather.targetBlendEVB) + return TRUE; + + return FALSE; +} + +void sub_80AC274(u8 a) +{ + switch (a) + { + case 1: + SetWeather(WEATHER_CLOUDS); + break; + case 2: + SetWeather(WEATHER_SUNNY); + break; + case 3: + SetWeather(WEATHER_RAIN_LIGHT); + break; + case 4: + SetWeather(WEATHER_SNOW); + break; + case 5: + SetWeather(WEATHER_RAIN_MED); + break; + case 6: + SetWeather(WEATHER_FOG_1); + break; + case 7: + SetWeather(WEATHER_FOG_2); + break; + case 8: + SetWeather(WEATHER_ASH); + break; + case 9: + SetWeather(WEATHER_SANDSTORM); + break; + case 10: + SetWeather(WEATHER_SHADE); + break; + } +} + +u8 GetCurrentWeather(void) +{ + return gWeather.currWeather; +} + +void SetRainStrengthFromSoundEffect(u16 soundEffect) +{ + if (gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) + { + switch (soundEffect) + { + case SE_T_KOAME: + gWeather.rainStrength = 0; + break; + case SE_T_OOAME: + gWeather.rainStrength = 1; + break; + case SE_T_AME: + gWeather.rainStrength = 2; + break; + default: + return; + } + + PlaySE(soundEffect); + } +} + +void PlayRainSoundEffect(void) +{ + if (IsSpecialSEPlaying()) + { + switch (gWeather.rainStrength) + { + case 0: + PlaySE(SE_T_KOAME_E); + break; + case 1: + PlaySE(SE_T_OOAME_E); + break; + case 2: + default: + PlaySE(SE_T_AME_E); + break; + } + } +} + +u8 IsWeatherChangeComplete(void) +{ + return gWeather.weatherChangeComplete; +} + +void SetWeatherScreenFadeOut(void) +{ + gWeather.palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; +} + +void sub_80AC3E4(void) +{ + gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; +} + +void PreservePaletteInWeather(u8 preservedPalIndex) +{ + CpuCopy16(sBasePaletteGammaTypes, gFieldEffectPaletteGammaTypes, 32); + gFieldEffectPaletteGammaTypes[preservedPalIndex] = GAMMA_NONE; + sPaletteGammaTypes = gFieldEffectPaletteGammaTypes; +} + +void ResetPreservedPalettesInWeather(void) +{ + sPaletteGammaTypes = sBasePaletteGammaTypes; +} diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c new file mode 100644 index 000000000..ad3e80cfa --- /dev/null +++ b/src/field_weather_effect.c @@ -0,0 +1,2484 @@ +#include "global.h" +#include "event_object_movement.h" +#include "field_weather.h" +#include "overworld.h" +#include "random.h" +#include "script.h" +#include "constants/weather.h" +#include "constants/songs.h" +#include "sound.h" +#include "sprite.h" +#include "task.h" +#include "trig.h" +#include "gpu_regs.h" + +const u16 gUnknown_083970E8[] = INCBIN_U16("graphics/weather/0.gbapal"); +const u16 gUnknown_0854C290[] = INCBIN_U16("graphics/weather/1.gbapal"); +const u16 gUnknown_0854C2B0[] = INCBIN_U16("graphics/weather/2.gbapal"); +const u8 gWeatherFog2Tiles[] = INCBIN_U8("graphics/weather/fog2.4bpp"); +const u8 gWeatherFog1Tiles[] = INCBIN_U8("graphics/weather/fog1.4bpp"); +const u8 gWeatherCloudTiles[] = INCBIN_U8("graphics/weather/cloud.4bpp"); +const u8 gWeatherSnow1Tiles[] = INCBIN_U8("graphics/weather/snow0.4bpp"); +const u8 gWeatherSnow2Tiles[] = INCBIN_U8("graphics/weather/snow1.4bpp"); +const u8 gWeatherBubbleTiles[] = INCBIN_U8("graphics/weather/bubble.4bpp"); +const u8 gWeatherAshTiles[] = INCBIN_U8("graphics/weather/ash.4bpp"); +const u8 gWeatherRainTiles[] = INCBIN_U8("graphics/weather/rain.4bpp"); +const u8 gWeatherSandstormTiles[] = INCBIN_U8("graphics/weather/sandstorm.4bpp"); + +/*static*/ const struct Coords16 gUnknown_0854FB50[] = +{ + { 0, 66}, + { 5, 73}, + {10, 78}, +}; + +/*static*/ const struct SpriteSheet sCloudSpriteSheet = {gWeatherCloudTiles, sizeof(gWeatherCloudTiles), 0x1200}; + +/*static*/ const struct OamData gOamData_839A9DC = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 3, + .paletteNum = 0, + .affineParam = 0, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839A9E4[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd *const gSpriteAnimTable_839A9EC[] = +{ + gSpriteAnim_839A9E4, +}; + +void sub_80AC6B4(struct Sprite *); +/*static*/ const struct SpriteTemplate sCloudSpriteTemplate = +{ + .tileTag = 4608, + .paletteTag = 4609, + .oam = &gOamData_839A9DC, + .anims = gSpriteAnimTable_839A9EC, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80AC6B4, +}; + +extern void sub_80ABC48(s8 gammaIndex); +extern void sub_80ABFF0(void); +extern void sub_80AC01C(void); +extern void Weather_SetTargetBlendCoeffs(u8 a, u8 b, int c); +extern bool8 Weather_UpdateBlend(void); +extern void SetRainStrengthFromSoundEffect(u16 sndEff); +extern void sub_80ABC7C(u8 a, u8 b, u8 c); +extern void sub_80AB104(u8); + +//------------------------------------------------------------------------------ +// Clouds +//------------------------------------------------------------------------------ + +void Clouds_InitVars(void) +{ + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->initStep = 0; + if (gWeatherPtr->cloudSpritesCreated == FALSE) + Weather_SetBlendCoeffs(0, 16); +} + +void Clouds_Main(void); + +void Clouds_InitAll(void) +{ + Clouds_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Clouds_Main(); +} + +void CreateCloudSprites(void); + +void Clouds_Main(void) +{ + switch (gWeatherPtr->initStep) + { + case 0: + CreateCloudSprites(); + gWeatherPtr->initStep++; + break; + case 1: + Weather_SetTargetBlendCoeffs(12, 8, 1); + gWeatherPtr->initStep++; + break; + case 2: + if (Weather_UpdateBlend()) + { + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + } + break; + } +} + +void sub_807E0A0(void); + +bool8 Clouds_Finish(void) +{ + switch (gWeatherPtr->finishStep) + { + case 0: + Weather_SetTargetBlendCoeffs(0, 16, 1); + gWeatherPtr->finishStep++; + return TRUE; + case 1: + if (Weather_UpdateBlend()) + { + sub_807E0A0(); + gWeatherPtr->finishStep++; + } + return TRUE; + } + return FALSE; +} + +//------------------------------------------------------------------------------ +// Weather 2 +//------------------------------------------------------------------------------ + +void Weather2_InitVars(void) +{ + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; +} + +void Weather2_InitAll(void) +{ + Weather2_InitVars(); +} + +void Weather2_Main(void) +{ +} + +int Weather2_Finish(void) +{ + return 0; +} + +void CreateCloudSprites(void) +{ + u16 i; + + if (gWeatherPtr->cloudSpritesCreated == TRUE) + return; + LoadSpriteSheet(&sCloudSpriteSheet); + LoadCustomWeatherSpritePalette(gUnknown_0854C290); + for (i = 0; i < 3; i++) + { + u8 spriteId = CreateSprite(&sCloudSpriteTemplate, 0, 0, 0xFF); + + if (spriteId != 64) + { + struct Sprite *sprite; + + gWeatherPtr->sprites.s1.cloudSprites[i] = &gSprites[spriteId]; + sprite = gWeatherPtr->sprites.s1.cloudSprites[i]; + sub_8093038(gUnknown_0854FB50[i].x + 7, gUnknown_0854FB50[i].y + 7, &sprite->pos1.x, &sprite->pos1.y); + sprite->coordOffsetEnabled = TRUE; + } + else + { + gWeatherPtr->sprites.s1.cloudSprites[i] = NULL; + } + } + gWeatherPtr->cloudSpritesCreated = TRUE; +} + +void sub_807E0A0(void) +{ + u16 i; + + if (gWeatherPtr->cloudSpritesCreated == FALSE) + return; + for (i = 0; i < 3; i++) + { + if (gWeatherPtr->sprites.s1.cloudSprites[i] != NULL) + DestroySprite(gWeatherPtr->sprites.s1.cloudSprites[i]); + } + FreeSpriteTilesByTag(0x1200); + gWeatherPtr->cloudSpritesCreated = FALSE; +} + +void sub_80AC6B4(struct Sprite *sprite) +{ + sprite->data[0] = (sprite->data[0] + 1) & 1; + if (sprite->data[0] != 0) + sprite->pos1.x--; +} + +//------------------------------------------------------------------------------ +// Drought +//------------------------------------------------------------------------------ + +void Drought_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 0; +} + +void Drought_Main(void); + +void Drought_InitAll(void) +{ + Drought_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Drought_Main(); +} + +void Drought_Main(void) +{ + switch (gWeatherPtr->initStep) + { + case 0: + if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_CHANGING_WEATHER) + gWeatherPtr->initStep++; + break; + case 1: + ResetDroughtWeatherPaletteLoading(); + gWeatherPtr->initStep++; + break; + case 2: + if (LoadDroughtWeatherPalettes() == FALSE) + gWeatherPtr->initStep++; + break; + case 3: + sub_80ABFF0(); + gWeatherPtr->initStep++; + break; + case 4: + sub_80AC01C(); + if (gWeatherPtr->unknown_73C == 6) + { + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + } + break; + default: + sub_80AC01C(); + break; + } +} + +int Drought_Finish(void) +{ + return 0; +} + +void task50_0807B6D4(u8); + +void sub_80AC81C(void) +{ + CreateTask(task50_0807B6D4, 0x50); +} + +#define tState data[0] +#define tBlendY data[1] +#define tBlendDelay data[2] +#define tWinRange data[3] + +void task50_0807B6D4(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->tState) + { + case 0: + task->tBlendY = 0; + task->tBlendDelay = 0; + task->tWinRange = REG_WININ; + SetGpuReg(REG_OFFSET_WININ, WIN_RANGE(63, 63)); + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_EFFECT_LIGHTEN); + SetGpuReg(REG_OFFSET_BLDY, 0); + task->tState++; + // fall through + case 1: + task->tBlendY += 3; + if (task->tBlendY > 16) + task->tBlendY = 16; + SetGpuReg(REG_OFFSET_BLDY, task->tBlendY); + if (task->tBlendY >= 16) + task->tState++; + break; + case 2: + task->tBlendDelay++; + if (task->tBlendDelay > 9) + { + task->tBlendDelay = 0; + task->tBlendY--; + if (task->tBlendY <= 0) + { + task->tBlendY = 0; + task->tState++; + } + SetGpuReg(REG_OFFSET_BLDY, task->tBlendY); + } + break; + case 3: + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDY, 0); + SetGpuReg(REG_OFFSET_WININ, task->tWinRange); + task->tState++; + break; + case 4: + EnableBothScriptContexts(); + DestroyTask(taskId); + break; + } +} + +#undef tState +#undef tBlendY +#undef tBlendDelay +#undef tWinRange + +//------------------------------------------------------------------------------ +// Light Rain +//------------------------------------------------------------------------------ + +void LightRain_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->unknown_6D6 = 0; + gWeatherPtr->unknown_6DB = 8; + gWeatherPtr->unknown_6DC = 0; + gWeatherPtr->unknown_6D9 = 10; + gWeatherPtr->gammaTargetIndex = 3; + gWeatherPtr->gammaStepDelay = 20; + SetRainStrengthFromSoundEffect(SE_T_KOAME); +} + +void LightRain_Main(void); + +void LightRain_InitAll(void) +{ + LightRain_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + LightRain_Main(); +} + +void LoadRainSpriteSheet(void); +u8 CreateRainSprite(void); +u8 sub_807E8E8(void); + +void LightRain_Main(void) +{ + switch (gWeatherPtr->initStep) + { + case 0: + LoadRainSpriteSheet(); + gWeatherPtr->initStep++; + break; + case 1: + if (CreateRainSprite() == 0) + gWeatherPtr->initStep++; + break; + case 2: + if (sub_807E8E8() == FALSE) + { + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + } + break; + } +} + +void DestroyRainSprites(void); + +bool8 LightRain_Finish(void) +{ + switch (gWeatherPtr->finishStep) + { + case 0: + if (gWeatherPtr->nextWeather == WEATHER_RAIN_LIGHT + || gWeatherPtr->nextWeather == WEATHER_RAIN_MED + || gWeatherPtr->nextWeather == WEATHER_RAIN_HEAVY) + { + gWeatherPtr->finishStep = 0xFF; + return FALSE; + } + else + { + gWeatherPtr->unknown_6D9 = 0; + gWeatherPtr->finishStep++; + } + // fall through + case 1: + if (sub_807E8E8() == FALSE) + { + DestroyRainSprites(); + gWeatherPtr->finishStep++; + return FALSE; + } + return TRUE; + } + return FALSE; +} + +// defined below +extern const s16 gUnknown_0839AABC[][2]; +extern const u16 gUnknown_0839AAC4[][2]; + +void sub_807E4EC(struct Sprite *sprite) +{ + u32 randVal; + u16 r6; + s32 r4; + s32 r0; + + if (sprite->data[1] == 0) + sprite->data[1] = 361; + randVal = sprite->data[1] * 1103515245 + 12345; + sprite->data[1] = ((randVal & 0x7FFF0000) >> 16) % 600; + + r6 = gUnknown_0839AAC4[gWeatherPtr->unknown_6DC][0]; + + r4 = sprite->data[1] % 30; + sprite->data[2] = r4 * 8; // useless assignment + + r0 = sprite->data[1] / 30; + sprite->data[3] = r0 * 8; // useless assignment + + sprite->data[2] = r4; + sprite->data[2] <<= 7; + + sprite->data[3] = r0; + sprite->data[3] <<= 7; + + sprite->data[2] -= gUnknown_0839AABC[gWeatherPtr->unknown_6DC][0] * r6; + sprite->data[3] -= gUnknown_0839AABC[gWeatherPtr->unknown_6DC][1] * r6; + + StartSpriteAnim(sprite, 0); + sprite->data[4] = 0; + sprite->coordOffsetEnabled = FALSE; + sprite->data[0] = r6; +} + +void sub_807E5C0(struct Sprite *sprite) +{ + if (sprite->data[4] == 0) + { + sprite->data[2] += gUnknown_0839AABC[gWeatherPtr->unknown_6DC][0]; + sprite->data[3] += gUnknown_0839AABC[gWeatherPtr->unknown_6DC][1]; + sprite->pos1.x = sprite->data[2] >> 4; + sprite->pos1.y = sprite->data[3] >> 4; + + if (sprite->data[5] != 0 + && (sprite->pos1.x >= -8 && sprite->pos1.x <= 248) + && sprite->pos1.y >= -16 && sprite->pos1.y <= 176) + sprite->invisible = FALSE; + else + sprite->invisible = TRUE; + + sprite->data[0]--; + if (sprite->data[0] == 0) + { + StartSpriteAnim(sprite, gWeatherPtr->unknown_6DC + 1); + sprite->data[4] = 1; + sprite->pos1.x -= gSpriteCoordOffsetX; + sprite->pos1.y -= gSpriteCoordOffsetY; + sprite->coordOffsetEnabled = TRUE; + } + } + else if (sprite->animEnded) + { + sprite->invisible = TRUE; + sub_807E4EC(sprite); + } +} + +void sub_807E6C4(struct Sprite *sprite) +{ + if (sprite->data[0] == 0) + { + sub_807E4EC(sprite); + sprite->callback = sub_807E5C0; + } + else + { + sprite->data[0]--; + } +} + +void sub_807E6F0(struct Sprite *sprite, u16 b) +{ + u16 r8 = gUnknown_0839AAC4[gWeatherPtr->unknown_6DC][0]; + u16 r6 = b / (gUnknown_0839AAC4[gWeatherPtr->unknown_6DC][1] + r8); + u16 r4 = b % (gUnknown_0839AAC4[gWeatherPtr->unknown_6DC][1] + r8); + + while (--r6 != 0xFFFF) + sub_807E4EC(sprite); + if (r4 < r8) + { + while (--r4 != 0xFFFF) + sub_807E5C0(sprite); + sprite->data[6] = 0; + } + else + { + sprite->data[0] = r4 - r8; + sprite->invisible = TRUE; + sprite->data[6] = 1; + } +} + +extern const struct SpriteSheet sRainSpriteSheet; // defined below + +void LoadRainSpriteSheet(void) +{ + LoadSpriteSheet(&sRainSpriteSheet); +} + +/*static*/ const struct Coords16 sRainSpriteCoords[] = +{ + { 0, 0}, + { 0, 160}, + { 0, 64}, + {144, 224}, + {144, 128}, + { 32, 32}, + { 32, 192}, + { 32, 96}, + { 72, 128}, + { 72, 32}, + { 72, 192}, + {216, 96}, + {216, 0}, + {104, 160}, + {104, 64}, + {104, 224}, + {144, 0}, + {144, 160}, + {144, 64}, + { 32, 224}, + { 32, 128}, + { 72, 32}, + { 72, 192}, + { 48, 96}, +}; + +/*static*/ const struct OamData gOamData_839AA68 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 1, + .paletteNum = 2, + .affineParam = 0, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AA70[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_JUMP(0), +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AA78[] = +{ + ANIMCMD_FRAME(8, 3), + ANIMCMD_FRAME(32, 2), + ANIMCMD_FRAME(40, 2), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AA88[] = +{ + ANIMCMD_FRAME(8, 3), + ANIMCMD_FRAME(16, 3), + ANIMCMD_FRAME(24, 4), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd *const gSpriteAnimTable_839AA98[] = +{ + gSpriteAnim_839AA70, + gSpriteAnim_839AA78, + gSpriteAnim_839AA88, +}; + +/*static*/ const struct SpriteTemplate sRainSpriteTemplate = +{ + .tileTag = 4614, + .paletteTag = 4608, + .oam = &gOamData_839AA68, + .anims = gSpriteAnimTable_839AA98, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_807E5C0, +}; + + +const s16 gUnknown_0839AABC[][2] = +{ + {-104, 208}, + {-160, 320}, +}; + +const u16 gUnknown_0839AAC4[][2] = +{ + {18, 7}, + {12, 10}, +}; + +/*static*/ const struct SpriteSheet sRainSpriteSheet = {gWeatherRainTiles, sizeof(gWeatherRainTiles), 0x1206}; + +/*static*/ const struct OamData gOamData_839AAD4 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +/*static*/ const struct SpriteFrameImage gSpriteImageTable_839AADC[] = +{ + {gWeatherSnow1Tiles, sizeof(gWeatherSnow1Tiles)}, + {gWeatherSnow2Tiles, sizeof(gWeatherSnow2Tiles)}, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AAEC[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AAF4[] = +{ + ANIMCMD_FRAME(1, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd *const gSpriteAnimTable_839AAFC[] = +{ + gSpriteAnim_839AAEC, + gSpriteAnim_839AAF4, +}; + +void sub_807ED48(struct Sprite *); +/*static*/ const struct SpriteTemplate sSnowflakeSpriteTemplate = +{ + .tileTag = 0xFFFF, + .paletteTag = 4608, + .oam = &gOamData_839AAD4, + .anims = gSpriteAnimTable_839AAFC, + .images = gSpriteImageTable_839AADC, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_807ED48, +}; + +// unused data +/*static*/ const u16 unusedData_839AB1C[] = {0, 6, 6, 12, 18, 42, 300, 300}; + +/*static*/ const struct OamData gOamData_839AB2C = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AB34[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AB3C[] = +{ + ANIMCMD_FRAME(32, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AB44[] = +{ + ANIMCMD_FRAME(64, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AB4C[] = +{ + ANIMCMD_FRAME(96, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AB54[] = +{ + ANIMCMD_FRAME(128, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AB5C[] = +{ + ANIMCMD_FRAME(160, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd *const gSpriteAnimTable_839AB64[] = +{ + gSpriteAnim_839AB34, + gSpriteAnim_839AB3C, + gSpriteAnim_839AB44, + gSpriteAnim_839AB4C, + gSpriteAnim_839AB54, + gSpriteAnim_839AB5C, +}; + +/*static*/ const union AffineAnimCmd gSpriteAffineAnim_839AB7C[] = +{ + AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0), + AFFINEANIMCMD_END, +}; + +/*static*/ const union AffineAnimCmd *const gSpriteAffineAnimTable_839AB8C[] = +{ + gSpriteAffineAnim_839AB7C, +}; + +/*static*/ void Fog1SpriteCallback(struct Sprite *); +/*static*/ const struct SpriteTemplate sFog1SpriteTemplate = +{ + .tileTag = 4609, + .paletteTag = 4608, + .oam = &gOamData_839AB2C, + .anims = gSpriteAnimTable_839AB64, + .images = NULL, + .affineAnims = gSpriteAffineAnimTable_839AB8C, + .callback = Fog1SpriteCallback, +}; + +bool8 CreateRainSprite(void) +{ + u8 spriteNum; + u8 spriteId; + + if (gWeatherPtr->rainSpriteCount == 24) + return FALSE; + + spriteNum = gWeatherPtr->rainSpriteCount; + spriteId = CreateSpriteAtEnd(&sRainSpriteTemplate, + sRainSpriteCoords[spriteNum].x, sRainSpriteCoords[spriteNum].y, 78); + if (spriteId != 64) + { + gSprites[spriteId].data[5] = 0; + gSprites[spriteId].data[1] = spriteNum * 145; + while (gSprites[spriteId].data[1] >= 600) + gSprites[spriteId].data[1] -= 600; + sub_807E4EC(&gSprites[spriteId]); + sub_807E6F0(&gSprites[spriteId], spriteNum * 9); + gSprites[spriteId].invisible = TRUE; + gWeatherPtr->sprites.s1.rainSprites[spriteNum] = &gSprites[spriteId]; + } + else + { + gWeatherPtr->sprites.s1.rainSprites[spriteNum] = NULL; + } + + if (++gWeatherPtr->rainSpriteCount == 24) + { + u16 i; + + for (i = 0; i < 24; i++) + { + if (gWeatherPtr->sprites.s1.rainSprites[i] != NULL) + { + if (gWeatherPtr->sprites.s1.rainSprites[i]->data[6] == 0) + gWeatherPtr->sprites.s1.rainSprites[i]->callback = sub_807E5C0; + else + gWeatherPtr->sprites.s1.rainSprites[i]->callback = sub_807E6C4; + } + } + return FALSE; + } + return TRUE; +} + +bool8 sub_807E8E8(void) +{ + if (gWeatherPtr->unknown_6D8 == gWeatherPtr->unknown_6D9) + return FALSE; + + if (++gWeatherPtr->unknown_6D6 > gWeatherPtr->unknown_6DB) + { + gWeatherPtr->unknown_6D6 = 0; + if (gWeatherPtr->unknown_6D8 < gWeatherPtr->unknown_6D9) + { + gWeatherPtr->sprites.s1.rainSprites[gWeatherPtr->unknown_6D8++]->data[5] = 1; + } + else + { + gWeatherPtr->unknown_6D8--; + gWeatherPtr->sprites.s1.rainSprites[gWeatherPtr->unknown_6D8]->data[5] = 0; + gWeatherPtr->sprites.s1.rainSprites[gWeatherPtr->unknown_6D8]->invisible = TRUE; + } + } + return TRUE; +} + +void DestroyRainSprites(void) +{ + u16 i; + + for (i = 0; i < gWeatherPtr->rainSpriteCount; i++) + { + if (gWeatherPtr->sprites.s1.rainSprites[i] != NULL) + DestroySprite(gWeatherPtr->sprites.s1.rainSprites[i]); + } + gWeatherPtr->rainSpriteCount = 0; + FreeSpriteTilesByTag(0x1206); +} + +//------------------------------------------------------------------------------ +// Snow +//------------------------------------------------------------------------------ + +void Snow_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->gammaTargetIndex = 3; + gWeatherPtr->gammaStepDelay = 20; + gWeatherPtr->unknown_6E5 = 16; + gWeatherPtr->unknown_6E0 = 0; +} + +void Snow_Main(void); +void sub_807ED48(struct Sprite *); + +void Snow_InitAll(void) +{ + Snow_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + { + u16 i; + + Snow_Main(); + for (i = 0; i < gWeatherPtr->snowflakeSpriteCount; i++) + { + sub_807ED48(gWeatherPtr->sprites.s1.snowflakeSprites[i]); + } + } +} + +u8 snowflakes_progress(void); + +void Snow_Main(void) +{ + if (gWeatherPtr->initStep == 0 && snowflakes_progress() == FALSE) + { + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + } +} + +bool8 Snow_Finish(void) +{ + switch (gWeatherPtr->finishStep) + { + case 0: + gWeatherPtr->unknown_6E5 = 0; + gWeatherPtr->unknown_6E0 = 0; + gWeatherPtr->finishStep++; + // fall through + case 1: + if (snowflakes_progress() == FALSE) + { + gWeatherPtr->finishStep++; + return FALSE; + } + return TRUE; + } + return FALSE; +} + +bool8 CreateSnowflakeSprite(void); +bool8 RemoveSnowflakeSprite(void); + +bool8 snowflakes_progress(void) +{ + if (gWeatherPtr->snowflakeSpriteCount == gWeatherPtr->unknown_6E5) + return FALSE; + + gWeatherPtr->unknown_6E0++; + if (gWeatherPtr->unknown_6E0 > 36) + { + gWeatherPtr->unknown_6E0 = 0; + if (gWeatherPtr->snowflakeSpriteCount < gWeatherPtr->unknown_6E5) + CreateSnowflakeSprite(); + else + RemoveSnowflakeSprite(); + } + return (gWeatherPtr->snowflakeSpriteCount != gWeatherPtr->unknown_6E5); +} + +void sub_807EC40(struct Sprite *); + +bool8 CreateSnowflakeSprite(void) +{ + u8 spriteId = CreateSpriteAtEnd(&sSnowflakeSpriteTemplate, 0, 0, 78); + + if (spriteId == 64) + return FALSE; + gSprites[spriteId].data[4] = gWeatherPtr->snowflakeSpriteCount; + sub_807EC40(&gSprites[spriteId]); + gSprites[spriteId].coordOffsetEnabled = TRUE; + gWeatherPtr->sprites.s1.snowflakeSprites[gWeatherPtr->snowflakeSpriteCount++] = &gSprites[spriteId]; + return TRUE; +} + +bool8 RemoveSnowflakeSprite(void) +{ + if (gWeatherPtr->snowflakeSpriteCount != 0) + { + DestroySprite(gWeatherPtr->sprites.s1.snowflakeSprites[--gWeatherPtr->snowflakeSpriteCount]); + return TRUE; + } + return FALSE; +} + +void sub_807EC40(struct Sprite *sprite) +{ + u16 r4 = ((sprite->data[4] * 5) & 7) * 30 + (Random() % 30); + u16 r6; + + sprite->pos1.y = -3 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY); + sprite->pos1.x = r4 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX); + sprite->data[0] = sprite->pos1.y * 128; + sprite->pos2.x = 0; + r6 = Random(); + sprite->data[1] = (r6 & 3) * 5 + 64; + sprite->data[7] = (r6 & 3) * 5 + 64; + StartSpriteAnim(sprite, (r6 & 1) ? 0 : 1); + sprite->data[3] = 0; + sprite->data[2] = ((r6 & 3) == 0) ? 2 : 1; + sprite->data[6] = (r6 & 0x1F) + 210; + sprite->data[5] = 0; +} + +void sub_807ECEC(struct Sprite *sprite) +{ + if (gWeatherPtr->unknown_6E2 > 18) + { + sprite->invisible = FALSE; + sprite->callback = sub_807ED48; + sprite->pos1.y = 0xFA - (gSpriteCoordOffsetY + sprite->centerToCornerVecY); + sprite->data[0] = sprite->pos1.y * 128; + gWeatherPtr->unknown_6E2 = 0; + } +} + +void sub_807ED48(struct Sprite *sprite) +{ + s16 r3; + s16 r2; + + sprite->data[0] += sprite->data[1]; + sprite->pos1.y = sprite->data[0] >> 7; + sprite->data[3] = (sprite->data[3] + sprite->data[2]) & 0xFF; + sprite->pos2.x = gSineTable[sprite->data[3]] / 64; + + r3 = (sprite->pos1.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX) & 0x1FF; + if (r3 & 0x100) + r3 = -0x100 | r3; // hmm... what is this? + if (r3 < -3) + sprite->pos1.x = 242 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX); + else if (r3 > 242) + sprite->pos1.x = -3 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX); + + r2 = (sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY) & 0xFF; + if (r2 > 163 && r2 < 171) + { + sprite->pos1.y = 250 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY); + sprite->data[0] = sprite->pos1.y * 128; + sprite->data[5] = 0; + sprite->data[6] = 220; + } + else if (r2 > 242 && r2 < 250) + { + sprite->pos1.y = 163; + sprite->data[0] = sprite->pos1.y * 128; + sprite->data[5] = 0; + sprite->data[6] = 220; + sprite->invisible = TRUE; + sprite->callback = sub_807ECEC; + } + + sprite->data[5]++; + if (sprite->data[5] == sprite->data[6]) + { + sub_807EC40(sprite); + sprite->pos1.y = 250; + sprite->invisible = TRUE; + sprite->callback = sub_807ECEC; + } +} + +//------------------------------------------------------------------------------ +// Medium Rain +//------------------------------------------------------------------------------ + +void MedRain_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->unknown_6D6 = 0; + gWeatherPtr->unknown_6DB = 4; + gWeatherPtr->unknown_6DC = 0; + gWeatherPtr->unknown_6D9 = 16; + gWeatherPtr->gammaTargetIndex = 3; + gWeatherPtr->gammaStepDelay = 20; + gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment + gWeatherPtr->unknown_6ED = 0; + SetRainStrengthFromSoundEffect(SE_T_AME); +} + +void Rain_Main(void); + +void MedRain_InitAll(void) +{ + MedRain_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Rain_Main(); +} + +//------------------------------------------------------------------------------ +// Heavy Rain +//------------------------------------------------------------------------------ + +void HeavyRain_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->unknown_6D6 = 0; + gWeatherPtr->unknown_6DB = 4; + gWeatherPtr->unknown_6DC = 1; + gWeatherPtr->unknown_6D9 = 24; + gWeatherPtr->gammaTargetIndex = 3; + gWeatherPtr->gammaStepDelay = 20; + gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment + SetRainStrengthFromSoundEffect(SE_T_OOAME); +} + +void HeavyRain_InitAll(void) +{ + HeavyRain_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Rain_Main(); +} + +void UpdateThunderSound(void); +void SetThunderCounter(u16); + +void Rain_Main(void) +{ + UpdateThunderSound(); + switch (gWeatherPtr->initStep) + { + case 0: + LoadRainSpriteSheet(); + gWeatherPtr->initStep++; + break; + case 1: + if (CreateRainSprite()) + break; + gWeatherPtr->initStep++; + break; + case 2: + if (sub_807E8E8()) + break; + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + break; + case 3: + if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_CHANGING_WEATHER) + break; + gWeatherPtr->initStep = 6; + break; + case 4: + gWeatherPtr->unknown_6EA = 1; + gWeatherPtr->unknown_6E6 = (Random() % 360) + 360; + gWeatherPtr->initStep++; + // fall through + case 5: + if (--gWeatherPtr->unknown_6E6 != 0) + break; + gWeatherPtr->initStep++; + break; + case 6: + gWeatherPtr->unknown_6EA = 1; + gWeatherPtr->unknown_6EB = Random() % 2; + gWeatherPtr->initStep++; + break; + case 7: + gWeatherPtr->unknown_6EC = (Random() & 1) + 1; + gWeatherPtr->initStep++; + // fall through + case 8: + sub_80ABC48(19); + if (gWeatherPtr->unknown_6EB == 0 && gWeatherPtr->unknown_6EC == 1) + SetThunderCounter(20); + gWeatherPtr->unknown_6E6 = (Random() % 3) + 6; + gWeatherPtr->initStep++; + break; + case 9: + if (--gWeatherPtr->unknown_6E6 != 0) + break; + sub_80ABC48(3); + gWeatherPtr->unknown_6EA = 1; + if (--gWeatherPtr->unknown_6EC != 0) + { + gWeatherPtr->unknown_6E6 = (Random() % 16) + 60; + gWeatherPtr->initStep = 10; + } + else if (gWeatherPtr->unknown_6EB == 0) + { + gWeatherPtr->initStep = 4; + } + else + { + gWeatherPtr->initStep = 11; + } + break; + case 10: + if (--gWeatherPtr->unknown_6E6 != 0) + break; + gWeatherPtr->initStep = 8; + break; + case 11: + gWeatherPtr->unknown_6E6 = (Random() % 16) + 60; + gWeatherPtr->initStep++; + break; + case 12: + if (--gWeatherPtr->unknown_6E6 != 0) + break; + SetThunderCounter(100); + sub_80ABC48(19); + // Why use "% 16" everywhere else and "& 0xF" here. So dumb. + gWeatherPtr->unknown_6E6 = (Random() & 0xF) + 30; + gWeatherPtr->initStep++; + break; + case 13: + if (--gWeatherPtr->unknown_6E6 != 0) + break; + sub_80ABC7C(19, 3, 5); + gWeatherPtr->initStep++; + break; + case 14: + if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_IDLE) + break; + gWeatherPtr->unknown_6EA = 1; + gWeatherPtr->initStep = 4; + break; + } +} + +bool8 Rain_Finish(void) +{ + switch (gWeatherPtr->finishStep) + { + case 0: + gWeatherPtr->unknown_6EA = 0; + gWeatherPtr->finishStep++; + // fall through + case 1: + Rain_Main(); + if (gWeatherPtr->unknown_6EA != 0) + { + if (gWeatherPtr->nextWeather == WEATHER_RAIN_LIGHT + || gWeatherPtr->nextWeather == WEATHER_RAIN_MED + || gWeatherPtr->nextWeather == WEATHER_RAIN_HEAVY) + return FALSE; + gWeatherPtr->unknown_6D9 = 0; + gWeatherPtr->finishStep++; + } + break; + case 2: + if (sub_807E8E8()) + break; + DestroyRainSprites(); + gWeatherPtr->unknown_6ED = 0; + gWeatherPtr->finishStep++; + return FALSE; + default: + return FALSE; + } + return TRUE; +} + +void SetThunderCounter(u16 max) +{ + if (gWeatherPtr->unknown_6ED == 0) + { + gWeatherPtr->thunderCounter = Random() % max; + gWeatherPtr->unknown_6ED = 1; + } +} + +void UpdateThunderSound(void) +{ + if (gWeatherPtr->unknown_6ED == 1) + { + if (gWeatherPtr->thunderCounter == 0) + { + if (IsSEPlaying()) + return; + if (Random() & 1) + PlaySE(SE_T_KAMI); + else + PlaySE(SE_T_KAMI2); + gWeatherPtr->unknown_6ED = 0; + } + else + { + gWeatherPtr->thunderCounter--; + } + } +} + +//------------------------------------------------------------------------------ +// Fog 1 +//------------------------------------------------------------------------------ + +void Fog1_Main(void); +/*static*/ void CreateFog1Sprites(void); +/*static*/ void DestroyFog1Sprites(void); + +void Fog1_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; + if (gWeatherPtr->fog1SpritesCreated == 0) + { + gWeatherPtr->unknown_6F0 = 0; + gWeatherPtr->unknown_6F2 = 0; + gWeatherPtr->fog1ScrollPosX = 0; + Weather_SetBlendCoeffs(0, 16); + } +} + +void Fog1_InitAll(void) +{ + Fog1_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Fog1_Main(); +} + +void Fog1_Main(void) +{ + gWeatherPtr->fog1ScrollPosX = (gSpriteCoordOffsetX - gWeatherPtr->unknown_6F2) & 0xFF; + if (++gWeatherPtr->unknown_6F0 > 3) + { + gWeatherPtr->unknown_6F0 = 0; + gWeatherPtr->unknown_6F2++; + } + switch (gWeatherPtr->initStep) + { + case 0: + CreateFog1Sprites(); + if (gWeatherPtr->currWeather == WEATHER_FOG_1) + Weather_SetTargetBlendCoeffs(12, 8, 3); + else + Weather_SetTargetBlendCoeffs(4, 16, 0); + gWeatherPtr->initStep++; + break; + case 1: + if (Weather_UpdateBlend()) + { + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + } + break; + } +} + +bool8 Fog1_Finish(void) +{ + gWeatherPtr->fog1ScrollPosX = (gSpriteCoordOffsetX - gWeatherPtr->unknown_6F2) & 0xFF; + if (++gWeatherPtr->unknown_6F0 > 3) + { + gWeatherPtr->unknown_6F0 = 0; + gWeatherPtr->unknown_6F2++; + } + switch (gWeatherPtr->finishStep) + { + case 0: + Weather_SetTargetBlendCoeffs(0, 16, 3); + gWeatherPtr->finishStep++; + break; + case 1: + if (!Weather_UpdateBlend()) + break; + gWeatherPtr->finishStep++; + break; + case 2: + DestroyFog1Sprites(); + gWeatherPtr->finishStep++; + break; + default: + return FALSE; + } + return TRUE; +} + +#define sprColumn data[0] + +/*static*/ void Fog1SpriteCallback(struct Sprite *sprite) +{ + sprite->pos2.y = (u8)gSpriteCoordOffsetY; + sprite->pos1.x = gWeatherPtr->fog1ScrollPosX + 32 + sprite->sprColumn * 64; + if (sprite->pos1.x > 0x10F) + { + sprite->pos1.x = 480 + gWeatherPtr->fog1ScrollPosX - (4 - sprite->sprColumn) * 64; + sprite->pos1.x &= 0x1FF; + } +} + +/*static*/ void CreateFog1Sprites(void) +{ + u16 i; + + if (!gWeatherPtr->fog1SpritesCreated) + { + struct SpriteSheet fog1SpriteSheet = {gWeatherFog1Tiles, sizeof(gWeatherFog1Tiles), 0x1201}; + + LoadSpriteSheet(&fog1SpriteSheet); + for (i = 0; i < 20; i++) + { + u8 spriteId = CreateSpriteAtEnd(&sFog1SpriteTemplate, 0, 0, 0xFF); + + if (spriteId != MAX_SPRITES) + { + struct Sprite *sprite = &gSprites[spriteId]; + + sprite->sprColumn = i % 5; + sprite->pos1.x = (i % 5) * 64 + 32; + sprite->pos1.y = (i / 5) * 64 + 32; + gWeatherPtr->sprites.s2.fog1Sprites[i] = sprite; + } + else + { + gWeatherPtr->sprites.s2.fog1Sprites[i] = NULL; + } + } + gWeatherPtr->fog1SpritesCreated = TRUE; + } +} + +#undef sprColumn + +/*static*/ void DestroyFog1Sprites(void) +{ + u16 i; + + if (gWeatherPtr->fog1SpritesCreated) + { + for (i = 0; i < 20; i++) + { + if (gWeatherPtr->sprites.s2.fog1Sprites[i] != NULL) + DestroySprite(gWeatherPtr->sprites.s2.fog1Sprites[i]); + } + FreeSpriteTilesByTag(0x1201); + gWeatherPtr->fog1SpritesCreated = 0; + } +} + +//------------------------------------------------------------------------------ +// Volcanic ash +//------------------------------------------------------------------------------ + +void Ash_Main(void); +void LoadAshSpriteSheet(void); +void CreateAshSprites(void); +void DestroyAshSprites(void); + +void Ash_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; + gWeatherPtr->unknown_6FE = 20; + if (!gWeatherPtr->ashSpritesCreated) + { + Weather_SetBlendCoeffs(0, 16); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(64, 63)); // Those aren't even valid coefficients! + } +} + +void Ash_InitAll(void) +{ + Ash_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Ash_Main(); +} + +void Ash_Main(void) +{ + gWeatherPtr->unknown_6FC = gSpriteCoordOffsetX & 0x1FF; + while (gWeatherPtr->unknown_6FC > 0xEF) + gWeatherPtr->unknown_6FC -= 0xF0; + switch (gWeatherPtr->initStep) + { + case 0: + LoadAshSpriteSheet(); + gWeatherPtr->initStep++; + break; + case 1: + if (!gWeatherPtr->ashSpritesCreated) + CreateAshSprites(); + Weather_SetTargetBlendCoeffs(16, 0, 1); + gWeatherPtr->initStep++; + break; + case 2: + if (!Weather_UpdateBlend()) + break; + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + break; + default: + Weather_UpdateBlend(); + break; + } +} + +bool8 Ash_Finish(void) +{ + switch (gWeatherPtr->finishStep) + { + case 0: + Weather_SetTargetBlendCoeffs(0, 16, 1); + gWeatherPtr->finishStep++; + break; + case 1: + if (!Weather_UpdateBlend()) + break; + DestroyAshSprites(); + gWeatherPtr->finishStep++; + break; + case 2: + SetGpuReg(REG_OFFSET_BLDALPHA, 0); + gWeatherPtr->finishStep++; + return FALSE; + default: + return FALSE; + } + return TRUE; +} + +/*static*/ const struct SpriteSheet sAshSpriteSheet = {gWeatherAshTiles, sizeof(gWeatherAshTiles), 0x1202}; + +void LoadAshSpriteSheet(void) +{ + LoadSpriteSheet(&sAshSpriteSheet); +} + +const struct OamData gOamData_839ABB8 = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 1, + .paletteNum = 15, + .affineParam = 0, +}; + +const union AnimCmd gSpriteAnim_839ABC0[] = +{ + ANIMCMD_FRAME(0, 60), + ANIMCMD_FRAME(64, 60), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gSpriteAnimTable_839ABCC[] = +{ + gSpriteAnim_839ABC0, +}; + +void sub_807FAA8(struct Sprite *); +/*static*/ const struct SpriteTemplate sAshSpriteTemplate = +{ + .tileTag = 4610, + .paletteTag = 4608, + .oam = &gOamData_839ABB8, + .anims = gSpriteAnimTable_839ABCC, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_807FAA8, +}; + +void CreateAshSprites(void) +{ + u8 i; + + if (!gWeatherPtr->ashSpritesCreated) + { + for (i = 0; i < 20; i++) + { + u8 spriteId = CreateSpriteAtEnd(&sAshSpriteTemplate, 0, 0, 0x4E); + + if (spriteId != MAX_SPRITES) + { + struct Sprite *sprite = &gSprites[spriteId]; + + sprite->data[1] = 0; + sprite->data[2] = (u8)(i % 5); + sprite->data[3] = (u8)(i / 5); + sprite->data[0] = sprite->data[3] * 64 + 32; + gWeatherPtr->sprites.s2.ashSprites[i] = sprite; + } + else + { + gWeatherPtr->sprites.s2.ashSprites[i] = NULL; + } + } + gWeatherPtr->ashSpritesCreated = TRUE; + } +} + +void DestroyAshSprites(void) +{ + u16 i; + + if (gWeatherPtr->ashSpritesCreated) + { + for (i = 0; i < 20; i++) + { + if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL) + DestroySprite(gWeatherPtr->sprites.s2.ashSprites[i]); + } + FreeSpriteTilesByTag(0x1202); + gWeatherPtr->ashSpritesCreated = FALSE; + } +} + +void sub_807FAA8(struct Sprite *sprite) +{ + sprite->data[1]++; + if (sprite->data[1] > 5) + { + sprite->data[1] = 0; + sprite->data[0]++; + } + sprite->pos1.y = gSpriteCoordOffsetY + sprite->data[0]; + sprite->pos1.x = gWeatherPtr->unknown_6FC + 32 + sprite->data[2] * 64; + if (sprite->pos1.x > 271) + { + sprite->pos1.x = gWeatherPtr->unknown_6FC + 0x1E0 - (4 - sprite->data[2]) * 64; + sprite->pos1.x &= 0x1FF; + } +} + +//------------------------------------------------------------------------------ +// Fog 2 +//------------------------------------------------------------------------------ + +void Fog2_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = 0; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; + gWeatherPtr->unknown_6F0 = 0; + gWeatherPtr->unknown_6F2 = 1; + if (gWeatherPtr->fog2SpritesCreated == 0) + { + gWeatherPtr->unknown_71C = 0; + gWeatherPtr->unknown_71E = 0; + gWeatherPtr->unknown_720 = 0; + gWeatherPtr->unknown_722 = 0; + gWeatherPtr->unknown_718 = 0; + gWeatherPtr->unknown_71A = 0; + Weather_SetBlendCoeffs(0, 16); + } +} + +void Fog2_Main(void); + +void Fog2_InitAll(void) +{ + Fog2_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Fog2_Main(); +} + +void sub_807FC9C(void); +void CreateFog2Sprites(void); + +void Fog2_Main(void) +{ + sub_807FC9C(); + switch (gWeatherPtr->initStep) + { + case 0: + CreateFog2Sprites(); + gWeatherPtr->initStep++; + break; + case 1: + Weather_SetTargetBlendCoeffs(12, 8, 8); + gWeatherPtr->initStep++; + break; + case 2: + if (!Weather_UpdateBlend()) + break; + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + break; + } +} + +void DestroyFog2Sprites(void); + +bool8 Fog2_Finish(void) +{ + sub_807FC9C(); + switch (gWeatherPtr->finishStep) + { + case 0: + Weather_SetTargetBlendCoeffs(0, 16, 1); + gWeatherPtr->finishStep++; + break; + case 1: + if (!Weather_UpdateBlend()) + break; + gWeatherPtr->finishStep++; + break; + case 2: + DestroyFog2Sprites(); + gWeatherPtr->finishStep++; + break; + default: + return FALSE; + } + return TRUE; +} + +void sub_807FC9C(void) +{ + if (++gWeatherPtr->unknown_71C > 2) + { + gWeatherPtr->unknown_720++; + gWeatherPtr->unknown_71C = 0; + } + + if (++gWeatherPtr->unknown_71E > 4) + { + gWeatherPtr->unknown_722++; + gWeatherPtr->unknown_71E = 0; + } + + gWeatherPtr->unknown_718 = (gSpriteCoordOffsetX - gWeatherPtr->unknown_720) & 0xFF; + gWeatherPtr->unknown_71A = gSpriteCoordOffsetY + gWeatherPtr->unknown_722; +} + +extern const struct SpriteTemplate sFog2SpriteTemplate; // defined below + +void CreateFog2Sprites(void) +{ + u16 i; + + if (!gWeatherPtr->fog2SpritesCreated) + { + struct SpriteSheet fog2SpriteSheet = {gWeatherFog2Tiles, sizeof(gWeatherFog2Tiles), 0x1203}; + + LoadSpriteSheet(&fog2SpriteSheet); + for (i = 0; i < 20; i++) + { + u8 spriteId = CreateSpriteAtEnd(&sFog2SpriteTemplate, 0, (i / 5) * 64, 0xFF); + + if (spriteId != MAX_SPRITES) + { + struct Sprite *sprite = &gSprites[spriteId]; + + sprite->data[0] = i % 5; + sprite->data[1] = i / 5; + gWeatherPtr->sprites.s2.fog2Sprites[i] = sprite; + } + else + { + gWeatherPtr->sprites.s2.fog2Sprites[i] = NULL; + } + } + gWeatherPtr->fog2SpritesCreated = TRUE; + } +} + +const struct OamData gOamData_839ABF0 = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const union AnimCmd gSpriteAnim_839ABF8[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_END, +}; + +const union AnimCmd *const gSpriteAnimTable_839AC00[] = +{ + gSpriteAnim_839ABF8, +}; + +void Fog2SpriteCallback(struct Sprite *); +const struct SpriteTemplate sFog2SpriteTemplate = +{ + .tileTag = 4611, + .paletteTag = 4608, + .oam = &gOamData_839ABF0, + .anims = gSpriteAnimTable_839AC00, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = Fog2SpriteCallback, +}; + +void DestroyFog2Sprites(void) +{ + u16 i; + + if (gWeatherPtr->fog2SpritesCreated) + { + for (i = 0; i < 20; i++) + { + if (gWeatherPtr->sprites.s2.fog2Sprites[i] != NULL) + DestroySprite(gWeatherPtr->sprites.s2.fog2Sprites[i]); + } + FreeSpriteTilesByTag(0x1203); + gWeatherPtr->fog2SpritesCreated = FALSE; + } +} + +void Fog2SpriteCallback(struct Sprite *sprite) +{ + sprite->pos2.y = gWeatherPtr->unknown_71A; + sprite->pos1.x = gWeatherPtr->unknown_718 + 32 + sprite->data[0] * 64; + if (sprite->pos1.x > 271) + { + sprite->pos1.x = gWeatherPtr->unknown_718 + 0x1E0 - (4 - sprite->data[0]) * 64; + sprite->pos1.x &= 0x1FF; + } +} + +//------------------------------------------------------------------------------ +// Sandstorm +//------------------------------------------------------------------------------ + +void Sandstorm_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = 0; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; + if (gWeatherPtr->sandstormSprites1Created == 0) + { + gWeatherPtr->unknown_704 = gWeatherPtr->unknown_708 = 0; + gWeatherPtr->unknown_712 = 8; + gWeatherPtr->unknown_714 = 0; + // Dead code. How does the compiler not optimize this out? + if (gWeatherPtr->unknown_712 > 0x5F) + gWeatherPtr->unknown_712 = 0x80 - gWeatherPtr->unknown_712; + Weather_SetBlendCoeffs(0, 16); + } +} + +void Sandstorm_Main(void); + +void Sandstorm_InitAll(void) +{ + Sandstorm_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Sandstorm_Main(); +} + +void sub_808002C(void); +void sub_8080064(void); +void CreateSandstormSprites_1(void); +void CreateSandstormSprites_2(void); + +void Sandstorm_Main(void) +{ + sub_8080064(); + sub_808002C(); + if (gWeatherPtr->unknown_712 > 0x5F) + gWeatherPtr->unknown_712 = 32; + switch (gWeatherPtr->initStep) + { + case 0: + CreateSandstormSprites_1(); + CreateSandstormSprites_2(); + gWeatherPtr->initStep++; + break; + case 1: + Weather_SetTargetBlendCoeffs(16, 0, 0); + gWeatherPtr->initStep++; + break; + case 2: + if (!Weather_UpdateBlend()) + break; + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + break; + } +} + +void sub_80800E4(void); + +bool8 Sandstorm_Finish(void) +{ + sub_8080064(); + sub_808002C(); + switch (gWeatherPtr->finishStep) + { + case 0: + Weather_SetTargetBlendCoeffs(0, 16, 0); + gWeatherPtr->finishStep++; + break; + case 1: + if (!Weather_UpdateBlend()) + break; + gWeatherPtr->finishStep++; + break; + case 2: + sub_80800E4(); + gWeatherPtr->finishStep++; + break; + default: + return FALSE; + } + return TRUE; +} + +void sub_808002C(void) +{ + if (gWeatherPtr->unknown_714++ > 4) + { + gWeatherPtr->unknown_712++; + gWeatherPtr->unknown_714 = 0; + } +} + +void sub_8080064(void) +{ + gWeatherPtr->unknown_704 -= gSineTable[gWeatherPtr->unknown_712] * 4; + gWeatherPtr->unknown_708 -= gSineTable[gWeatherPtr->unknown_712]; + gWeatherPtr->unknown_70E = (gSpriteCoordOffsetX + (gWeatherPtr->unknown_704 >> 8)) & 0xFF; + gWeatherPtr->unknown_710 = gSpriteCoordOffsetY + (gWeatherPtr->unknown_708 >> 8); +} + +void sub_80800E4(void) +{ + u16 i; + + if (gWeatherPtr->sandstormSprites1Created) + { + for (i = 0; i < 20; i++) + { + if (gWeatherPtr->sprites.s2.sandstormSprites1[i] != NULL) + DestroySprite(gWeatherPtr->sprites.s2.sandstormSprites1[i]); + } + gWeatherPtr->sandstormSprites1Created = FALSE; + FreeSpriteTilesByTag(0x1204); + } + + if (gWeatherPtr->sandstormSprites2Created) + { + for (i = 0; i < 5; i++) + { + if (gWeatherPtr->sprites.s2.sandstormSprites2[i] != NULL) + DestroySprite(gWeatherPtr->sprites.s2.sandstormSprites2[i]); + } + gWeatherPtr->sandstormSprites2Created = FALSE; + } +} + +const struct OamData gOamData_839AC1C = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +const union AnimCmd gSpriteAnim_839AC24[] = +{ + ANIMCMD_FRAME(0, 3), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_839AC2C[] = +{ + ANIMCMD_FRAME(64, 3), + ANIMCMD_END, +}; + +const union AnimCmd *const gSpriteAnimTable_839AC34[] = +{ + gSpriteAnim_839AC24, + gSpriteAnim_839AC2C, +}; + +void SandstormSpriteCallback1(struct Sprite *); +const struct SpriteTemplate sSandstormSpriteTemplate = +{ + .tileTag = 4612, + .paletteTag = 4609, + .oam = &gOamData_839AC1C, + .anims = gSpriteAnimTable_839AC34, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SandstormSpriteCallback1, +}; + +/*static*/ const struct SpriteSheet sSandstormSpriteSheet = {gWeatherSandstormTiles, sizeof(gWeatherSandstormTiles), 0x1204}; + +void CreateSandstormSprites_1(void) +{ + u16 i; + + if (!gWeatherPtr->sandstormSprites1Created) + { + LoadSpriteSheet(&sSandstormSpriteSheet); + LoadCustomWeatherSpritePalette(gUnknown_0854C2B0); + for (i = 0; i < 20; i++) + { + u8 spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, 0, (i / 5) * 64, 1); + + if (spriteId != MAX_SPRITES) + { + gWeatherPtr->sprites.s2.sandstormSprites1[i] = &gSprites[spriteId]; + gWeatherPtr->sprites.s2.sandstormSprites1[i]->data[0] = i % 5; + gWeatherPtr->sprites.s2.sandstormSprites1[i]->data[1] = i / 5; + } + else + { + gWeatherPtr->sprites.s2.sandstormSprites1[i] = NULL; + } + } + gWeatherPtr->sandstormSprites1Created = TRUE; + } +} + +const u16 gUnknown_0839AC5C[] = {0, 120, 80, 160, 40, 0}; + +void SandstormSpriteCallback2(struct Sprite *); + +void CreateSandstormSprites_2(void) +{ + u16 i; + + if (!gWeatherPtr->sandstormSprites2Created) + { + for (i = 0; i < 5; i++) + { + u8 spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, i * 48 + 0x18, 0xD0, 1); + + if (spriteId != MAX_SPRITES) + { + gWeatherPtr->sprites.s2.sandstormSprites2[i] = &gSprites[spriteId]; + gWeatherPtr->sprites.s2.sandstormSprites2[i]->oam.size = 2; + gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[1] = i * 51; + gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[0] = 8; + gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[2] = 0; + gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[4] = 0x6730; + gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[3] = gUnknown_0839AC5C[i]; + StartSpriteAnim(gWeatherPtr->sprites.s2.sandstormSprites2[i], 1); + CalcCenterToCornerVec(gWeatherPtr->sprites.s2.sandstormSprites2[i], 0, 2, 0); + gWeatherPtr->sprites.s2.sandstormSprites2[i]->callback = SandstormSpriteCallback2; + } + else + { + gWeatherPtr->sprites.s2.sandstormSprites2[i] = NULL; + } + gWeatherPtr->sandstormSprites2Created = TRUE; + } + } +} + +void SandstormSpriteCallback1(struct Sprite *sprite) +{ + sprite->pos2.y = gWeatherPtr->unknown_710; + sprite->pos1.x = gWeatherPtr->unknown_70E + 32 + sprite->data[0] * 64; + if (sprite->pos1.x > 271) + { + sprite->pos1.x = gWeatherPtr->unknown_70E + 0x1E0 - (4 - sprite->data[0]) * 64; + sprite->pos1.x &= 0x1FF; + } +} + +void SandstormSpriteCallback3(struct Sprite *); + +void SandstormSpriteCallback2(struct Sprite *sprite) +{ + if (--sprite->data[3] == -1) + sprite->callback = SandstormSpriteCallback3; +} + +void SandstormSpriteCallback3(struct Sprite *sprite) +{ + u32 x; + u32 y; + + if (--sprite->pos1.y < -48) + { + sprite->pos1.y = 208; + sprite->data[0] = 4; + } + x = sprite->data[0] * gSineTable[sprite->data[1]]; + y = sprite->data[0] * gSineTable[sprite->data[1] + 64]; + sprite->pos2.x = x >> 8; + sprite->pos2.y = y >> 8; + sprite->data[1] = (sprite->data[1] + 10) & 0xFF; + if (++sprite->data[2] > 8) + { + sprite->data[2] = 0; + sprite->data[0]++; + } +} + +//------------------------------------------------------------------------------ +// Shade +//------------------------------------------------------------------------------ + +void Shade_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->gammaTargetIndex = 3; + gWeatherPtr->gammaStepDelay = 20; +} + +void Shade_InitAll(void) +{ + Shade_InitVars(); +} + +void Shade_Main(void) +{ +} + +bool8 Shade_Finish(void) +{ + return FALSE; +} + +//------------------------------------------------------------------------------ +// Weather 14 +//------------------------------------------------------------------------------ + +const u8 gUnknown_0839AC68[] = {40, 90, 60, 90, 2, 60, 40, 30}; + +const struct SpriteSheet gWeatherBubbleSpriteSheet = {gWeatherBubbleTiles, sizeof(gWeatherBubbleTiles), 0x1205}; + +void Bubbles_InitVars(void) +{ + Fog1_InitVars(); + if (gWeatherPtr->unknown_72E == 0) + { + LoadSpriteSheet(&gWeatherBubbleSpriteSheet); + gWeatherPtr->unknown_728 = 0; + gWeatherPtr->unknown_726 = gUnknown_0839AC68[0]; + gWeatherPtr->unknown_72A = 0; + gWeatherPtr->unknown_72C = 0; + } +} + +void Bubbles_Main(void); + +void Bubbles_InitAll(void) +{ + Bubbles_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Bubbles_Main(); +} + +void sub_8080588(u16); + +void Bubbles_Main(void) +{ + Fog1_Main(); + if (++gWeatherPtr->unknown_726 > gUnknown_0839AC68[gWeatherPtr->unknown_728]) + { + gWeatherPtr->unknown_726 = 0; + if (++gWeatherPtr->unknown_728 > 7) + gWeatherPtr->unknown_728 = 0; + sub_8080588(gWeatherPtr->unknown_72A); + if (++gWeatherPtr->unknown_72A > 12) + gWeatherPtr->unknown_72A = 0; + } +} + +void sub_8080610(void); + +bool8 Bubbles_Finish(void) +{ + if (!Fog1_Finish()) + { + sub_8080610(); + return FALSE; + } + return TRUE; +} + +const s16 gUnknown_0839AC78[][2] = +{ + {120, 160}, + {376, 160}, + { 40, 140}, + {296, 140}, + {180, 130}, + {436, 130}, + { 60, 160}, + {436, 160}, + {220, 180}, + {476, 180}, + { 10, 90}, + {266, 90}, + {256, 160}, +}; + +const union AnimCmd gSpriteAnim_839ACAC[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_END, +}; + +const union AnimCmd *const gSpriteAnimTable_839ACB8[] = +{ + gSpriteAnim_839ACAC, +}; + +extern const struct OamData gUnknown_08524904; + +void unc_0807DAB4(struct Sprite *); +const struct SpriteTemplate gSpriteTemplate_839ACBC = +{ + .tileTag = 4613, + .paletteTag = 4608, + .oam = &gUnknown_08524904, + .anims = gSpriteAnimTable_839ACB8, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = unc_0807DAB4, +}; + +void sub_8080588(u16 a) +{ + s16 x = gUnknown_0839AC78[a][0]; + s16 y = gUnknown_0839AC78[a][1] - gSpriteCoordOffsetY; + u8 spriteId = CreateSpriteAtEnd( + &gSpriteTemplate_839ACBC, + x, + y, + 0); + + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 1; + gSprites[spriteId].coordOffsetEnabled = TRUE; + gSprites[spriteId].data[0] = 0; + gSprites[spriteId].data[1] = 0; + gSprites[spriteId].data[2] = 0; + gWeatherPtr->unknown_72C++; + } +} + +void sub_8080610(void) +{ + u16 i; + + if (gWeatherPtr->unknown_72C != 0) + { + for (i = 0; i < 64; i++) + { + if (gSprites[i].template == &gSpriteTemplate_839ACBC) + DestroySprite(&gSprites[i]); + } + FreeSpriteTilesByTag(0x1205); + gWeatherPtr->unknown_72C = 0; + } +} + +void unc_0807DAB4(struct Sprite *sprite) +{ + ++sprite->data[0]; + if (++sprite->data[0] > 8) // double increment + { + sprite->data[0] = 0; + if (sprite->data[1] == 0) + { + if (++sprite->pos2.x > 4) + sprite->data[1] = 1; + } + else + { + if (--sprite->pos2.x <= 0) + sprite->data[1] = 0; + } + } + sprite->pos1.y -= 3; + if (++sprite->data[2] > 0x77) + DestroySprite(sprite); +} + +// New Emerald functions. +extern u8 gUnknown_02038BC4; +extern u16 gUnknown_02038BC6; +void sub_80AEC94(u32 a0, u32 a1) +{ + gUnknown_02038BC4 = a0; + gUnknown_02038BC6 = a1; +} + +void sub_80AECA8(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + if (data[15]-- <= 0) + { + ChangeWeather(data[1]); + gUnknown_02038BC4 = data[1]; + data[15] = 600; + data[0]++; + } + break; + case 1: + if (data[15]-- <= 0) + { + ChangeWeather(data[2]); + gUnknown_02038BC4 = data[2]; + data[15] = 600; + data[0] = 0; + } + break; + } +} + +void sub_80AED28(void) +{ + u8 taskId = CreateTask(sub_80AECA8, 0); + s16 *data = gTasks[taskId].data; + + data[15] = 600; + if (gUnknown_02038BC4 == 13) + { + data[1] = 12; + data[2] = 13; + } + else if (gUnknown_02038BC4 == 12) + { + data[1] = 13; + data[2] = 12; + } + else + { + gUnknown_02038BC4 = 13; + data[1] = 12; + data[2] = 13; + } +} + +//------------------------------------------------------------------------------ + +/*static*/ u8 TranslateWeatherNum(u8); +/*static*/ void UpdateRainCounter(u8, u8); + +void SetSav1Weather(u32 weather) +{ + u8 oldWeather = gSaveBlock1Ptr->weather; + gSaveBlock1Ptr->weather = TranslateWeatherNum(weather); + UpdateRainCounter(gSaveBlock1Ptr->weather, oldWeather); +} + +u8 GetSav1Weather(void) +{ + return gSaveBlock1Ptr->weather; +} + +void SetSav1WeatherFromCurrMapHeader(void) +{ + u8 oldWeather = gSaveBlock1Ptr->weather; + gSaveBlock1Ptr->weather = TranslateWeatherNum(gMapHeader.weather); + UpdateRainCounter(gSaveBlock1Ptr->weather, oldWeather); +} + +void SetWeather(u32 weather) +{ + SetSav1Weather(weather); + ChangeWeather(GetSav1Weather()); +} + +void SetWeather_Unused(u32 weather) +{ + SetSav1Weather(weather); + sub_80AB104(GetSav1Weather()); +} + +void DoCurrentWeather(void) +{ + u8 weather = GetSav1Weather(); + + if (weather == 15) + { + if (!FuncIsActiveTask(sub_80AECA8)) + sub_80AED28(); + weather = gUnknown_02038BC4; + } + else + { + if (FuncIsActiveTask(sub_80AECA8)) + DestroyTask(FindTaskIdByFunc(sub_80AECA8)); + gUnknown_02038BC4 = 13; + } + ChangeWeather(weather); +} + +void sub_80AEE84(void) +{ + u8 weather = GetSav1Weather(); + + if (weather == 15) + { + if (!FuncIsActiveTask(sub_80AECA8)) + sub_80AED28(); + weather = gUnknown_02038BC4; + } + else + { + if (FuncIsActiveTask(sub_80AECA8)) + DestroyTask(FindTaskIdByFunc(sub_80AECA8)); + gUnknown_02038BC4 = 13; + } + sub_80AB104(weather); +} + +/*static*/ const u8 sWeatherCycleRoute119[] = +{ + WEATHER_SUNNY, + WEATHER_RAIN_LIGHT, + WEATHER_RAIN_MED, + WEATHER_RAIN_LIGHT, +}; +/*static*/ const u8 sWeatherCycleRoute123[] = +{ + WEATHER_SUNNY, + WEATHER_SUNNY, + WEATHER_RAIN_LIGHT, + WEATHER_SUNNY, +}; + +/*static*/ u8 TranslateWeatherNum(u8 weather) +{ + switch (weather) + { + case WEATHER_NONE: return WEATHER_NONE; + case WEATHER_CLOUDS: return WEATHER_CLOUDS; + case WEATHER_SUNNY: return WEATHER_SUNNY; + case WEATHER_RAIN_LIGHT: return WEATHER_RAIN_LIGHT; + case WEATHER_SNOW: return WEATHER_SNOW; + case WEATHER_RAIN_MED: return WEATHER_RAIN_MED; + case WEATHER_FOG_1: return WEATHER_FOG_1; + case WEATHER_ASH: return WEATHER_ASH; + case WEATHER_SANDSTORM: return WEATHER_SANDSTORM; + case WEATHER_FOG_2: return WEATHER_FOG_2; + case WEATHER_FOG_3: return WEATHER_FOG_3; + case WEATHER_SHADE: return WEATHER_SHADE; + case WEATHER_DROUGHT: return WEATHER_DROUGHT; + case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY; + case WEATHER_BUBBLES: return WEATHER_BUBBLES; + case 15: return 15; + case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage]; + case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage]; + default: return WEATHER_NONE; + } +} + +void UpdateWeatherPerDay(u16 increment) +{ + u16 weatherStage = gSaveBlock1Ptr->weatherCycleStage + increment; + weatherStage %= 4; + gSaveBlock1Ptr->weatherCycleStage = weatherStage; +} + +/*static*/ void UpdateRainCounter(u8 newWeather, u8 oldWeather) +{ + if (newWeather != oldWeather + && (newWeather == WEATHER_RAIN_LIGHT || newWeather == WEATHER_RAIN_MED)) + IncrementGameStat(GAME_STAT_GOT_RAINED_ON); +} diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 9951fe581..bc62ac2af 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -4,6 +4,7 @@ #include "field_effect.h" #include "field_player_avatar.h" #include "field_screen.h" +#include "field_weather.h" #include "palette.h" #include "party_menu.h" #include "rom6.h" @@ -40,7 +41,7 @@ bool8 FldEff_SweetScent(void) { u8 taskId; - sub_80AC3D0(); + SetWeatherScreenFadeOut(); taskId = oei_task_add(); gTasks[taskId].data[8] = (u32)StartSweetScentFieldEffect >> 16; gTasks[taskId].data[9] = (u32)StartSweetScentFieldEffect; diff --git a/src/overworld.c b/src/overworld.c index 3193ec0d3..470e27ffc 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -148,7 +148,7 @@ extern void ResetAllPicSprites(void); extern void FieldEffectActiveListClear(void); extern void SetUpFieldTasks(void); extern void sub_81BE6B8(void); -extern void sub_80AAFA4(void); +extern void StartWeather(void); extern void ShowStartMenu(void); extern void sub_80AEE84(void); extern void mapldr_default(void); @@ -2160,7 +2160,7 @@ static void sub_8086988(u32 a1) InitEventObjectPalettes(1); FieldEffectActiveListClear(); - sub_80AAFA4(); + StartWeather(); sub_80AEE84(); if (!a1) SetUpFieldTasks(); diff --git a/src/start_menu.c b/src/start_menu.c index 079f05be0..0e52f05fb 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -88,7 +88,7 @@ extern void sub_80AF688(void); extern void var_800D_set_xB(void); extern void sub_808B864(void); extern void CB2_Pokedex(void); -extern void play_some_sound(void); +extern void PlayRainSoundEffect(void); extern void CB2_PartyMenuFromStartMenu(void); extern void CB2_PokeNav(void); extern void sub_80C4DDC(void (*)(void)); @@ -621,7 +621,7 @@ static bool8 StartMenuPokedexCallback(void) if (!gPaletteFade.active) { IncrementGameStat(GAME_STAT_CHECKED_POKEDEX); - play_some_sound(); + PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(CB2_Pokedex); @@ -636,7 +636,7 @@ static bool8 StartMenuPokemonCallback(void) { if (!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(CB2_PartyMenuFromStartMenu); // Display party menu @@ -651,7 +651,7 @@ static bool8 StartMenuBagCallback(void) { if (!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(CB2_BagMenuFromStartMenu); // Display bag menu @@ -666,7 +666,7 @@ static bool8 StartMenuPokeNavCallback(void) { if (!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(CB2_PokeNav); // Display PokeNav @@ -681,7 +681,7 @@ static bool8 StartMenuPlayerNameCallback(void) { if (!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); @@ -720,7 +720,7 @@ static bool8 StartMenuOptionCallback(void) { if (!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(CB2_InitOptionMenu); // Display option menu @@ -753,7 +753,7 @@ static bool8 StartMenuLinkModePlayerNameCallback(void) { if (!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); overworld_free_bg_tilemaps(); TrainerCard_ShowLinkCard(gUnknown_03005DB4, CB2_ReturnToFieldWithOpenMenu); @@ -782,7 +782,7 @@ static bool8 StartMenuBattlePyramidBagCallback(void) { if (!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(CB2_PyramidBagMenuFromStartMenu); -- cgit v1.2.3 From 2dfbe75b05cd6ec6e686d5e58de9a0a58e5af408 Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Sat, 8 Dec 2018 23:52:52 +0530 Subject: Shift externs to header file --- src/fire.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src') diff --git a/src/fire.c b/src/fire.c index c5db6dbce..c054f154e 100644 --- a/src/fire.c +++ b/src/fire.c @@ -7,12 +7,6 @@ #include "task.h" #include "trig.h" -//battle anim -extern void sub_80A7E6C(u8 spriteId); -extern void sub_80A805C(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); -extern u8 sub_80A80C8(struct Task *task); - -extern void sub_80A653C(struct Sprite *); static void sub_8108EC8(struct Sprite *); static void sub_8108F08(struct Sprite *); static void sub_8108F4C(struct Sprite *); @@ -21,7 +15,6 @@ static void sub_8109028(struct Sprite *); static void sub_8109064(struct Sprite *); static void sub_81090D8(struct Sprite *); static void sub_810916C(struct Sprite *); -extern void TranslateAnimSpriteToTargetMonLocation(struct Sprite *); static void AnimEmberFlare(struct Sprite *); static void sub_8109200(struct Sprite *); static void AnimFireRing(struct Sprite *); @@ -35,7 +28,6 @@ static void sub_81093E4(struct Sprite *); static void sub_810940C(struct Sprite *); static void sub_81094D0(u8 taskId); static void sub_81097B4(u8 spriteId, u8 taskId, u8 a3); -extern void sub_80A8EE4(struct Sprite *); static void sub_81098EC(struct Sprite *); static u16 sub_8109930(u8 spriteId); static void sub_8109984(struct Sprite *sprite, s16 x, s16 y); -- cgit v1.2.3 From 5caca7a4d628dec45a5a9326db024aa1c4ffd98f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 8 Dec 2018 19:43:21 +0100 Subject: Clean up field weather --- src/battle_util.c | 14 +- src/clock.c | 2 +- src/field_weather.c | 513 ++++++++++++++++++++------------------------- src/field_weather_effect.c | 165 +++++++-------- 4 files changed, 312 insertions(+), 382 deletions(-) (limited to 'src') diff --git a/src/battle_util.c b/src/battle_util.c index 94aaea66c..2ddd4f550 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -17,13 +17,13 @@ #include "string_util.h" #include "battle_message.h" #include "constants/battle_string_ids.h" +#include "constants/weather.h" #include "battle_ai_script_commands.h" #include "battle_controllers.h" #include "event_data.h" #include "link.h" #include "berry.h" - -extern u8 GetCurrentWeather(void); +#include "field_weather.h" // rom const data static const u16 sSoundMovesTable[] = @@ -1829,9 +1829,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA { switch (GetCurrentWeather()) { - case 3: - case 5: - case 13: + case WEATHER_RAIN_LIGHT: + case WEATHER_RAIN_MED: + case WEATHER_RAIN_HEAVY: if (!(gBattleWeather & WEATHER_RAIN_ANY)) { gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT); @@ -1840,7 +1840,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA effect++; } break; - case 8: + case WEATHER_SANDSTORM: if (!(gBattleWeather & WEATHER_SANDSTORM_ANY)) { gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY); @@ -1849,7 +1849,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA effect++; } break; - case 12: + case WEATHER_DROUGHT: if (!(gBattleWeather & WEATHER_SUN_ANY)) { gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY); diff --git a/src/clock.c b/src/clock.c index 91eb5f16d..aea6c2088 100644 --- a/src/clock.c +++ b/src/clock.c @@ -5,7 +5,7 @@ #include "lottery_corner.h" #include "dewford_trend.h" #include "tv.h" -#include "field_screen.h" +#include "field_weather.h" #include "berry.h" #include "main.h" #include "overworld.h" diff --git a/src/field_weather.c b/src/field_weather.c index 0be584d51..be3396c63 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -47,87 +47,41 @@ struct WeatherCallbacks }; // This file's functions. -/*static*/ bool8 LightenSpritePaletteInFog(u8); -/*static*/ void BuildGammaShiftTables(void); -/*static*/ void UpdateWeatherGammaShift(void); -/*static*/ void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex); -/*static*/ void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor); -/*static*/ void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor); -/*static*/ void ApplyFogBlend(u8 blendCoeff, u16 blendColor); -/*static*/ bool8 FadeInScreen_RainShowShade(void); -/*static*/ bool8 FadeInScreen_Drought(void); -/*static*/ bool8 FadeInScreen_Fog1(void); -/*static*/ void FadeInScreenWithWeather(void); -/*static*/ void DoNothing(void); -void None_Init(void); -void None_Main(void); -bool8 None_Finish(void); -void Clouds_InitVars(void); -void Clouds_Main(void); -void Clouds_InitAll(void); -bool8 Clouds_Finish(void); -void Weather2_InitVars(void); -void Weather2_Main(void); -void Weather2_InitAll(void); -bool8 Weather2_Finish(void); -void LightRain_InitVars(void); -void LightRain_Main(void); -void LightRain_InitAll(void); -bool8 LightRain_Finish(void); -void Snow_InitVars(void); -void Snow_Main(void); -void Snow_InitAll(void); -bool8 Snow_Finish(void); -void MedRain_InitVars(void); -void Rain_Main(void); -void MedRain_InitAll(void); -bool8 Rain_Finish(void); -void Fog1_InitVars(void); -void Fog1_Main(void); -void Fog1_InitAll(void); -bool8 Fog1_Finish(void); -void Ash_InitVars(void); -void Ash_Main(void); -void Ash_InitAll(void); -bool8 Ash_Finish(void); -void Sandstorm_InitVars(void); -void Sandstorm_Main(void); -void Sandstorm_InitAll(void); -bool8 Sandstorm_Finish(void); -void Fog2_InitVars(void); -void Fog2_Main(void); -void Fog2_InitAll(void); -bool8 Fog2_Finish(void); -void Fog1_InitVars(void); -void Fog1_Main(void); -void Fog1_InitAll(void); -bool8 Fog1_Finish(void); -void Shade_InitVars(void); -void Shade_Main(void); -void Shade_InitAll(void); -bool8 Shade_Finish(void); -void Drought_InitVars(void); -void Drought_Main(void); -void Drought_InitAll(void); -bool8 Drought_Finish(void); -void HeavyRain_InitVars(void); -void Rain_Main(void); -void HeavyRain_InitAll(void); -bool8 Rain_Finish(void); -void Bubbles_InitVars(void); -void Bubbles_Main(void); -void Bubbles_InitAll(void); -bool8 Bubbles_Finish(void); - -// Const rom data - -// This is a pointer to gWeather. All code in this file accesses gWeather directly, +static bool8 LightenSpritePaletteInFog(u8); +static void BuildGammaShiftTables(void); +static void UpdateWeatherGammaShift(void); +static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex); +static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor); +static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor); +static void ApplyFogBlend(u8 blendCoeff, u16 blendColor); +static bool8 FadeInScreen_RainShowShade(void); +static bool8 FadeInScreen_Drought(void); +static bool8 FadeInScreen_Fog1(void); +static void FadeInScreenWithWeather(void); +static void DoNothing(void); +static void Task_WeatherInit(u8 taskId); +static void Task_WeatherMain(u8 taskId); +static void None_Init(void); +static void None_Main(void); +static u8 None_Finish(void); + +// EWRAM +EWRAM_DATA struct Weather gWeather = {0}; +EWRAM_DATA static u8 sFieldEffectPaletteGammaTypes[32] = {0}; + +// IWRAM bss +IWRAM_DATA static const u8 *sPaletteGammaTypes; + +// CONST +extern const u16 gUnknown_0854014C[][4096]; + +// This is a pointer to gWeatherPtr. All code in this file accesses gWeather directly, // while code in other field weather files accesses gWeather through this pointer. // This is likely the result of compiler optimization, since using the pointer in // this file produces the same result as accessing gWeather directly. struct Weather *const gWeatherPtr = &gWeather; -/*static*/ const struct WeatherCallbacks sWeatherFuncs[] = +static const struct WeatherCallbacks sWeatherFuncs[] = { {None_Init, None_Main, None_Init, None_Finish}, {Clouds_InitVars, Clouds_Main, Clouds_InitAll, Clouds_Finish}, @@ -156,7 +110,7 @@ void (*const gWeatherPalStateFuncs[])(void) = // This table specifies which of the gamma shift tables should be // applied to each of the background and sprite palettes. -/*static*/ const u8 sBasePaletteGammaTypes[32] = +static const u8 sBasePaletteGammaTypes[32] = { // background palettes GAMMA_NORMAL, @@ -194,18 +148,7 @@ void (*const gWeatherPalStateFuncs[])(void) = GAMMA_NORMAL, }; - -// EWRAM -EWRAM_DATA struct Weather gWeather = {0}; -EWRAM_DATA u8 gFieldEffectPaletteGammaTypes[32] = {0}; - -// IWRAM bss -IWRAM_DATA const u8 *sPaletteGammaTypes; -IWRAM_DATA u32 filler_03000f54; - -// const -extern const u16 gUnknown_083970E8[]; -extern const u16 gUnknown_0854014C[][4096]; +const u16 gUnknown_083970E8[] = INCBIN_U16("graphics/weather/0.gbapal"); // code void StartWeather(void) @@ -215,25 +158,25 @@ void StartWeather(void) u8 index = AllocSpritePalette(0x1200); CpuCopy32(gUnknown_083970E8, &gPlttBufferUnfaded[0x100 + index * 16], 32); BuildGammaShiftTables(); - gWeather.altGammaSpritePalIndex = index; - gWeather.weatherPicSpritePalIndex = AllocSpritePalette(0x1201); - gWeather.rainSpriteCount = 0; - gWeather.unknown_6D8 = 0; - gWeather.cloudSpritesCreated = 0; - gWeather.snowflakeSpriteCount = 0; - gWeather.ashSpritesCreated = 0; - gWeather.fog1SpritesCreated = 0; - gWeather.fog2SpritesCreated = 0; - gWeather.sandstormSprites1Created = 0; - gWeather.sandstormSprites2Created = 0; - gWeather.unknown_72E = 0; - gWeather.lightenedFogSpritePalsCount = 0; + gWeatherPtr->altGammaSpritePalIndex = index; + gWeatherPtr->weatherPicSpritePalIndex = AllocSpritePalette(0x1201); + gWeatherPtr->rainSpriteCount = 0; + gWeatherPtr->unknown_6D8 = 0; + gWeatherPtr->cloudSpritesCreated = 0; + gWeatherPtr->snowflakeSpriteCount = 0; + gWeatherPtr->ashSpritesCreated = 0; + gWeatherPtr->fog1SpritesCreated = 0; + gWeatherPtr->fog2SpritesCreated = 0; + gWeatherPtr->sandstormSprites1Created = 0; + gWeatherPtr->sandstormSprites2Created = 0; + gWeatherPtr->unknown_72E = 0; + gWeatherPtr->lightenedFogSpritePalsCount = 0; Weather_SetBlendCoeffs(16, 0); - gWeather.currWeather = 0; - gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; - gWeather.readyForInit = FALSE; - gWeather.weatherChangeComplete = TRUE; - gWeather.taskId = CreateTask(Task_WeatherInit, 80); + gWeatherPtr->currWeather = 0; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeatherPtr->readyForInit = FALSE; + gWeatherPtr->weatherChangeComplete = TRUE; + gWeatherPtr->taskId = CreateTask(Task_WeatherInit, 80); } } @@ -244,75 +187,75 @@ void ChangeWeather(u8 weather) PlayRainSoundEffect(); } - if (gWeather.nextWeather != weather && gWeather.currWeather == weather) + if (gWeatherPtr->nextWeather != weather && gWeatherPtr->currWeather == weather) { sWeatherFuncs[weather].initVars(); } - gWeather.weatherChangeComplete = FALSE; - gWeather.nextWeather = weather; - gWeather.finishStep = 0; + gWeatherPtr->weatherChangeComplete = FALSE; + gWeatherPtr->nextWeather = weather; + gWeatherPtr->finishStep = 0; } void sub_80AB104(u8 weather) { PlayRainSoundEffect(); - gWeather.currWeather = weather; - gWeather.nextWeather = weather; + gWeatherPtr->currWeather = weather; + gWeatherPtr->nextWeather = weather; } void sub_80AB130(u8 weather) { PlayRainSoundEffect(); - gWeather.currWeather = weather; - gWeather.nextWeather = weather; - gWeather.readyForInit = TRUE; + gWeatherPtr->currWeather = weather; + gWeatherPtr->nextWeather = weather; + gWeatherPtr->readyForInit = TRUE; } -void Task_WeatherInit(u8 taskId) +static void Task_WeatherInit(u8 taskId) { // Waits until it's ok to initialize weather. // When the screen fades in, this is set to TRUE. - if (gWeather.readyForInit) + if (gWeatherPtr->readyForInit) { - sWeatherFuncs[gWeather.currWeather].initAll(); + sWeatherFuncs[gWeatherPtr->currWeather].initAll(); gTasks[taskId].func = Task_WeatherMain; } } -void Task_WeatherMain(u8 taskId) +static void Task_WeatherMain(u8 taskId) { - if (gWeather.currWeather != gWeather.nextWeather) + if (gWeatherPtr->currWeather != gWeatherPtr->nextWeather) { - if (!sWeatherFuncs[gWeather.currWeather].finish() && gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) + if (!sWeatherFuncs[gWeatherPtr->currWeather].finish() && gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) { // Finished cleaning up previous weather. Now transition to next weather. - sWeatherFuncs[gWeather.nextWeather].initVars(); - gWeather.gammaStepFrameCounter = 0; - gWeather.palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; - gWeather.currWeather = gWeather.nextWeather; - gWeather.weatherChangeComplete = TRUE; + sWeatherFuncs[gWeatherPtr->nextWeather].initVars(); + gWeatherPtr->gammaStepFrameCounter = 0; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; + gWeatherPtr->currWeather = gWeatherPtr->nextWeather; + gWeatherPtr->weatherChangeComplete = TRUE; } } else { - sWeatherFuncs[gWeather.currWeather].main(); + sWeatherFuncs[gWeatherPtr->currWeather].main(); } - gWeatherPalStateFuncs[gWeather.palProcessingState](); + gWeatherPalStateFuncs[gWeatherPtr->palProcessingState](); } -void None_Init(void) +static void None_Init(void) { - gWeather.gammaTargetIndex = 0; - gWeather.gammaStepDelay = 0; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 0; } -void None_Main(void) +static void None_Main(void) { } -u8 None_Finish(void) +static u8 None_Finish(void) { return 0; } @@ -320,7 +263,7 @@ u8 None_Finish(void) // Builds two tables that contain gamma shifts for palette colors. // It's unclear why the two tables aren't declared as const arrays, since // this function always builds the same two tables. -/*static*/ void BuildGammaShiftTables(void) +static void BuildGammaShiftTables(void) { u16 v0; u8 (*v1)[32]; @@ -337,9 +280,9 @@ u8 None_Finish(void) for (v0 = 0; v0 <= 1; v0++) { if (v0 == 0) - v1 = gWeather.gammaShifts; + v1 = gWeatherPtr->gammaShifts; else - v1 = gWeather.altGammaShifts; + v1 = gWeatherPtr->altGammaShifts; for (v2 = 0; v2 < 32; v2++) { @@ -389,36 +332,36 @@ u8 None_Finish(void) // When the weather is changing, it gradually updates the palettes // towards the desired gamma shift. -/*static*/ void UpdateWeatherGammaShift(void) +static void UpdateWeatherGammaShift(void) { - if (gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) + if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) { - if (gWeather.gammaIndex == gWeather.gammaTargetIndex) + if (gWeatherPtr->gammaIndex == gWeatherPtr->gammaTargetIndex) { - gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } else { - if (++gWeather.gammaStepFrameCounter >= gWeather.gammaStepDelay) + if (++gWeatherPtr->gammaStepFrameCounter >= gWeatherPtr->gammaStepDelay) { - gWeather.gammaStepFrameCounter = 0; - if (gWeather.gammaIndex < gWeather.gammaTargetIndex) - gWeather.gammaIndex++; + gWeatherPtr->gammaStepFrameCounter = 0; + if (gWeatherPtr->gammaIndex < gWeatherPtr->gammaTargetIndex) + gWeatherPtr->gammaIndex++; else - gWeather.gammaIndex--; + gWeatherPtr->gammaIndex--; - ApplyGammaShift(0, 32, gWeather.gammaIndex); + ApplyGammaShift(0, 32, gWeatherPtr->gammaIndex); } } } } -/*static*/ void FadeInScreenWithWeather(void) +static void FadeInScreenWithWeather(void) { - if (++gWeather.unknown_6CB > 1) - gWeather.unknown_6CA = 0; + if (++gWeatherPtr->unknown_6CB > 1) + gWeatherPtr->unknown_6CA = 0; - switch (gWeather.currWeather) + switch (gWeatherPtr->currWeather) { case WEATHER_RAIN_LIGHT: case WEATHER_RAIN_MED: @@ -427,22 +370,22 @@ u8 None_Finish(void) case WEATHER_SHADE: if (FadeInScreen_RainShowShade() == FALSE) { - gWeather.gammaIndex = 3; - gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeatherPtr->gammaIndex = 3; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } break; case WEATHER_DROUGHT: if (FadeInScreen_Drought() == FALSE) { - gWeather.gammaIndex = -6; - gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeatherPtr->gammaIndex = -6; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } break; case WEATHER_FOG_1: if (FadeInScreen_Fog1() == FALSE) { - gWeather.gammaIndex = 0; - gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeatherPtr->gammaIndex = 0; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } break; case WEATHER_ASH: @@ -452,59 +395,59 @@ u8 None_Finish(void) default: if (!gPaletteFade.active) { - gWeather.gammaIndex = gWeather.gammaTargetIndex; - gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeatherPtr->gammaIndex = gWeatherPtr->gammaTargetIndex; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } break; } } -bool8 FadeInScreen_RainShowShade(void) +static bool8 FadeInScreen_RainShowShade(void) { - if (gWeather.fadeScreenCounter == 16) + if (gWeatherPtr->fadeScreenCounter == 16) return FALSE; - if (++gWeather.fadeScreenCounter >= 16) + if (++gWeatherPtr->fadeScreenCounter >= 16) { ApplyGammaShift(0, 32, 3); - gWeather.fadeScreenCounter = 16; + gWeatherPtr->fadeScreenCounter = 16; return FALSE; } - ApplyGammaShiftWithBlend(0, 32, 3, 16 - gWeather.fadeScreenCounter, gWeather.fadeDestColor); + ApplyGammaShiftWithBlend(0, 32, 3, 16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor); return TRUE; } -bool8 FadeInScreen_Drought(void) +static bool8 FadeInScreen_Drought(void) { - if (gWeather.fadeScreenCounter == 16) + if (gWeatherPtr->fadeScreenCounter == 16) return FALSE; - if (++gWeather.fadeScreenCounter >= 16) + if (++gWeatherPtr->fadeScreenCounter >= 16) { ApplyGammaShift(0, 32, -6); - gWeather.fadeScreenCounter = 16; + gWeatherPtr->fadeScreenCounter = 16; return FALSE; } - ApplyDroughtGammaShiftWithBlend(-6, 16 - gWeather.fadeScreenCounter, gWeather.fadeDestColor); + ApplyDroughtGammaShiftWithBlend(-6, 16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor); return TRUE; } -bool8 FadeInScreen_Fog1(void) +static bool8 FadeInScreen_Fog1(void) { - if (gWeather.fadeScreenCounter == 16) + if (gWeatherPtr->fadeScreenCounter == 16) return FALSE; - gWeather.fadeScreenCounter++; - ApplyFogBlend(16 - gWeather.fadeScreenCounter, gWeather.fadeDestColor); + gWeatherPtr->fadeScreenCounter++; + ApplyFogBlend(16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor); return TRUE; } -/*static*/ void DoNothing(void) +static void DoNothing(void) { } -/*static*/ void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex) +static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex) { u16 curPalIndex; u16 palOffset; @@ -531,10 +474,10 @@ bool8 FadeInScreen_Fog1(void) { u8 r, g, b; - if (sPaletteGammaTypes[curPalIndex] == GAMMA_ALT || curPalIndex - 16 == gWeather.altGammaSpritePalIndex) - gammaTable = gWeather.altGammaShifts[gammaIndex]; + if (sPaletteGammaTypes[curPalIndex] == GAMMA_ALT || curPalIndex - 16 == gWeatherPtr->altGammaSpritePalIndex) + gammaTable = gWeatherPtr->altGammaShifts[gammaIndex]; else - gammaTable = gWeather.gammaShifts[gammaIndex]; + gammaTable = gWeatherPtr->gammaShifts[gammaIndex]; for (i = 0; i < 16; i++) { @@ -585,7 +528,7 @@ bool8 FadeInScreen_Fog1(void) } } -/*static*/ void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor) +static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor) { u16 palOffset; u16 curPalIndex; @@ -613,9 +556,9 @@ bool8 FadeInScreen_Fog1(void) u8 *gammaTable; if (sPaletteGammaTypes[curPalIndex] == GAMMA_NORMAL) - gammaTable = gWeather.gammaShifts[gammaIndex]; + gammaTable = gWeatherPtr->gammaShifts[gammaIndex]; else - gammaTable = gWeather.altGammaShifts[gammaIndex]; + gammaTable = gWeatherPtr->altGammaShifts[gammaIndex]; for (i = 0; i < 16; i++) { @@ -636,7 +579,7 @@ bool8 FadeInScreen_Fog1(void) } } -void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor) +static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor) { struct RGBColor color; u8 rBlend; @@ -691,7 +634,7 @@ void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColo } } -void ApplyFogBlend(u8 blendCoeff, u16 blendColor) +static void ApplyFogBlend(u8 blendCoeff, u16 blendColor) { struct RGBColor color; u8 rBlend; @@ -738,22 +681,22 @@ void ApplyFogBlend(u8 blendCoeff, u16 blendColor) } } -/*static*/ void MarkFogSpritePalToLighten(u8 paletteIndex) +static void MarkFogSpritePalToLighten(u8 paletteIndex) { - if (gWeather.lightenedFogSpritePalsCount < 6) + if (gWeatherPtr->lightenedFogSpritePalsCount < 6) { - gWeather.lightenedFogSpritePals[gWeather.lightenedFogSpritePalsCount] = paletteIndex; - gWeather.lightenedFogSpritePalsCount++; + gWeatherPtr->lightenedFogSpritePals[gWeatherPtr->lightenedFogSpritePalsCount] = paletteIndex; + gWeatherPtr->lightenedFogSpritePalsCount++; } } -/*static*/ bool8 LightenSpritePaletteInFog(u8 paletteIndex) +static bool8 LightenSpritePaletteInFog(u8 paletteIndex) { u16 i; - for (i = 0; i < gWeather.lightenedFogSpritePalsCount; i++) + for (i = 0; i < gWeatherPtr->lightenedFogSpritePalsCount; i++) { - if (gWeather.lightenedFogSpritePals[i] == paletteIndex) + if (gWeatherPtr->lightenedFogSpritePals[i] == paletteIndex) return TRUE; } @@ -762,22 +705,22 @@ void ApplyFogBlend(u8 blendCoeff, u16 blendColor) void sub_80ABC48(s8 gammaIndex) { - if (gWeather.palProcessingState == WEATHER_PAL_STATE_IDLE) + if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_IDLE) { ApplyGammaShift(0, 32, gammaIndex); - gWeather.gammaIndex = gammaIndex; + gWeatherPtr->gammaIndex = gammaIndex; } } void sub_80ABC7C(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay) { - if (gWeather.palProcessingState == WEATHER_PAL_STATE_IDLE) + if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_IDLE) { - gWeather.palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; - gWeather.gammaIndex = gammaIndex; - gWeather.gammaTargetIndex = gammaTargetIndex; - gWeather.gammaStepFrameCounter = 0; - gWeather.gammaStepDelay = gammaStepDelay; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; + gWeatherPtr->gammaIndex = gammaIndex; + gWeatherPtr->gammaTargetIndex = gammaTargetIndex; + gWeatherPtr->gammaStepFrameCounter = 0; + gWeatherPtr->gammaStepDelay = gammaStepDelay; sub_80ABC48(gammaIndex); } } @@ -810,7 +753,7 @@ void FadeScreen(u8 mode, s8 delay) return; } - switch (gWeather.currWeather) + switch (gWeatherPtr->currWeather) { case WEATHER_RAIN_LIGHT: case WEATHER_RAIN_MED: @@ -832,27 +775,27 @@ void FadeScreen(u8 mode, s8 delay) CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); BeginNormalPaletteFade(0xFFFFFFFF, delay, 0, 16, fadeColor); - gWeather.palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; } else { - gWeather.fadeDestColor = fadeColor; + gWeatherPtr->fadeDestColor = fadeColor; if (useWeatherPal) - gWeather.fadeScreenCounter = 0; + gWeatherPtr->fadeScreenCounter = 0; else BeginNormalPaletteFade(0xFFFFFFFF, delay, 16, 0, fadeColor); - gWeather.palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_IN; - gWeather.unknown_6CA = 1; - gWeather.unknown_6CB = 0; - Weather_SetBlendCoeffs(gWeather.currBlendEVA, gWeather.currBlendEVB); - gWeather.readyForInit = TRUE; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_IN; + gWeatherPtr->unknown_6CA = 1; + gWeatherPtr->unknown_6CB = 0; + Weather_SetBlendCoeffs(gWeatherPtr->currBlendEVA, gWeatherPtr->currBlendEVB); + gWeatherPtr->readyForInit = TRUE; } } bool8 IsWeatherNotFadingIn(void) { - return (gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_IN); + return (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_IN); } void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) @@ -860,16 +803,16 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) u16 paletteIndex = 16 + spritePaletteIndex; u16 i; - switch (gWeather.palProcessingState) + switch (gWeatherPtr->palProcessingState) { case WEATHER_PAL_STATE_SCREEN_FADING_IN: - if (gWeather.unknown_6CA != 0) + if (gWeatherPtr->unknown_6CA != 0) { - if (gWeather.currWeather == WEATHER_FOG_1) + if (gWeatherPtr->currWeather == WEATHER_FOG_1) MarkFogSpritePalToLighten(paletteIndex); paletteIndex *= 16; for (i = 0; i < 16; i++) - gPlttBufferFaded[paletteIndex + i] = gWeather.fadeDestColor; + gPlttBufferFaded[paletteIndex + i] = gWeatherPtr->fadeDestColor; } break; case WEATHER_PAL_STATE_SCREEN_FADING_OUT: @@ -880,9 +823,9 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) // WEATHER_PAL_STATE_CHANGING_WEATHER // WEATHER_PAL_STATE_CHANGING_IDLE default: - if (gWeather.currWeather != WEATHER_FOG_1) + if (gWeatherPtr->currWeather != WEATHER_FOG_1) { - ApplyGammaShift(paletteIndex, 1, gWeather.gammaIndex); + ApplyGammaShift(paletteIndex, 1, gWeatherPtr->gammaIndex); } else { @@ -895,24 +838,24 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) void ApplyWeatherGammaShiftToPal(u8 paletteIndex) { - ApplyGammaShift(paletteIndex, 1, gWeather.gammaIndex); + ApplyGammaShift(paletteIndex, 1, gWeatherPtr->gammaIndex); } u8 sub_80ABF20(void) { - if (gWeather.palProcessingState == WEATHER_PAL_STATE_SCREEN_FADING_IN) - return gWeather.unknown_6CA; + if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_SCREEN_FADING_IN) + return gWeatherPtr->unknown_6CA; else return 0; } void LoadCustomWeatherSpritePalette(const u16 *palette) { - LoadPalette(palette, 0x100 + gWeather.weatherPicSpritePalIndex * 16, 32); - UpdateSpritePaletteWithWeather(gWeather.weatherPicSpritePalIndex); + LoadPalette(palette, 0x100 + gWeatherPtr->weatherPicSpritePalIndex * 16, 32); + UpdateSpritePaletteWithWeather(gWeatherPtr->weatherPicSpritePalIndex); } -void LoadDroughtWeatherPalette(u8 *gammaIndexPtr, u8 *a1) +static void LoadDroughtWeatherPalette(u8 *gammaIndexPtr, u8 *a1) { *gammaIndexPtr = 0x20; *a1 = 0x20; @@ -920,16 +863,16 @@ void LoadDroughtWeatherPalette(u8 *gammaIndexPtr, u8 *a1) void ResetDroughtWeatherPaletteLoading(void) { - gWeather.loadDroughtPalsIndex = 1; - gWeather.loadDroughtPalsOffset = 1; + gWeatherPtr->loadDroughtPalsIndex = 1; + gWeatherPtr->loadDroughtPalsOffset = 1; } bool8 LoadDroughtWeatherPalettes(void) { - if (gWeather.loadDroughtPalsIndex < 32) + if (gWeatherPtr->loadDroughtPalsIndex < 32) { - LoadDroughtWeatherPalette(&gWeather.loadDroughtPalsIndex, &gWeather.loadDroughtPalsOffset); - if (gWeather.loadDroughtPalsIndex < 32) + LoadDroughtWeatherPalette(&gWeatherPtr->loadDroughtPalsIndex, &gWeatherPtr->loadDroughtPalsOffset); + if (gWeatherPtr->loadDroughtPalsIndex < 32) return TRUE; } return FALSE; @@ -942,43 +885,43 @@ void sub_80ABFE0(s8 gammaIndex) void sub_80ABFF0(void) { - gWeather.unknown_73C = 0; - gWeather.unknown_740 = 0; - gWeather.unknown_742 = 0; - gWeather.unknown_73E = 0; + gWeatherPtr->unknown_73C = 0; + gWeatherPtr->unknown_740 = 0; + gWeatherPtr->unknown_742 = 0; + gWeatherPtr->unknown_73E = 0; } void sub_80AC01C(void) { - switch (gWeather.unknown_742) + switch (gWeatherPtr->unknown_742) { case 0: - if (++gWeather.unknown_740 > 5) + if (++gWeatherPtr->unknown_740 > 5) { - gWeather.unknown_740 = 0; - sub_80ABFE0(gWeather.unknown_73C++); - if (gWeather.unknown_73C > 5) + gWeatherPtr->unknown_740 = 0; + sub_80ABFE0(gWeatherPtr->unknown_73C++); + if (gWeatherPtr->unknown_73C > 5) { - gWeather.unknown_73E = gWeather.unknown_73C; - gWeather.unknown_742 = 1; - gWeather.unknown_740 = 0x3C; + gWeatherPtr->unknown_73E = gWeatherPtr->unknown_73C; + gWeatherPtr->unknown_742 = 1; + gWeatherPtr->unknown_740 = 0x3C; } } break; case 1: - gWeather.unknown_740 = (gWeather.unknown_740 + 3) & 0x7F; - gWeather.unknown_73C = ((gSineTable[gWeather.unknown_740] - 1) >> 6) + 2; - if (gWeather.unknown_73C != gWeather.unknown_73E) - sub_80ABFE0(gWeather.unknown_73C); - gWeather.unknown_73E = gWeather.unknown_73C; + gWeatherPtr->unknown_740 = (gWeatherPtr->unknown_740 + 3) & 0x7F; + gWeatherPtr->unknown_73C = ((gSineTable[gWeatherPtr->unknown_740] - 1) >> 6) + 2; + if (gWeatherPtr->unknown_73C != gWeatherPtr->unknown_73E) + sub_80ABFE0(gWeatherPtr->unknown_73C); + gWeatherPtr->unknown_73E = gWeatherPtr->unknown_73C; break; case 2: - if (++gWeather.unknown_740 > 5) + if (++gWeatherPtr->unknown_740 > 5) { - gWeather.unknown_740 = 0; - sub_80ABFE0(--gWeather.unknown_73C); - if (gWeather.unknown_73C == 3) - gWeather.unknown_742 = 0; + gWeatherPtr->unknown_740 = 0; + sub_80ABFE0(--gWeatherPtr->unknown_73C); + if (gWeatherPtr->unknown_73C == 3) + gWeatherPtr->unknown_742 = 0; } break; } @@ -986,54 +929,54 @@ void sub_80AC01C(void) void Weather_SetBlendCoeffs(u8 eva, u8 evb) { - gWeather.currBlendEVA = eva; - gWeather.currBlendEVB = evb; - gWeather.targetBlendEVA = eva; - gWeather.targetBlendEVB = evb; + gWeatherPtr->currBlendEVA = eva; + gWeatherPtr->currBlendEVB = evb; + gWeatherPtr->targetBlendEVA = eva; + gWeatherPtr->targetBlendEVB = evb; SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(eva, evb)); } void Weather_SetTargetBlendCoeffs(u8 eva, u8 evb, int delay) { - gWeather.targetBlendEVA = eva; - gWeather.targetBlendEVB = evb; - gWeather.blendDelay = delay; - gWeather.blendFrameCounter = 0; - gWeather.blendUpdateCounter = 0; + gWeatherPtr->targetBlendEVA = eva; + gWeatherPtr->targetBlendEVB = evb; + gWeatherPtr->blendDelay = delay; + gWeatherPtr->blendFrameCounter = 0; + gWeatherPtr->blendUpdateCounter = 0; } bool8 Weather_UpdateBlend(void) { - if (gWeather.currBlendEVA == gWeather.targetBlendEVA - && gWeather.currBlendEVB == gWeather.targetBlendEVB) + if (gWeatherPtr->currBlendEVA == gWeatherPtr->targetBlendEVA + && gWeatherPtr->currBlendEVB == gWeatherPtr->targetBlendEVB) return TRUE; - if (++gWeather.blendFrameCounter > gWeather.blendDelay) + if (++gWeatherPtr->blendFrameCounter > gWeatherPtr->blendDelay) { - gWeather.blendFrameCounter = 0; - gWeather.blendUpdateCounter++; + gWeatherPtr->blendFrameCounter = 0; + gWeatherPtr->blendUpdateCounter++; // Update currBlendEVA and currBlendEVB on alternate frames - if (gWeather.blendUpdateCounter & 1) + if (gWeatherPtr->blendUpdateCounter & 1) { - if (gWeather.currBlendEVA < gWeather.targetBlendEVA) - gWeather.currBlendEVA++; - else if (gWeather.currBlendEVA > gWeather.targetBlendEVA) - gWeather.currBlendEVA--; + if (gWeatherPtr->currBlendEVA < gWeatherPtr->targetBlendEVA) + gWeatherPtr->currBlendEVA++; + else if (gWeatherPtr->currBlendEVA > gWeatherPtr->targetBlendEVA) + gWeatherPtr->currBlendEVA--; } else { - if (gWeather.currBlendEVB < gWeather.targetBlendEVB) - gWeather.currBlendEVB++; - else if (gWeather.currBlendEVB > gWeather.targetBlendEVB) - gWeather.currBlendEVB--; + if (gWeatherPtr->currBlendEVB < gWeatherPtr->targetBlendEVB) + gWeatherPtr->currBlendEVB++; + else if (gWeatherPtr->currBlendEVB > gWeatherPtr->targetBlendEVB) + gWeatherPtr->currBlendEVB--; } } - SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gWeather.currBlendEVA, gWeather.currBlendEVB)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gWeatherPtr->currBlendEVA, gWeatherPtr->currBlendEVB)); - if (gWeather.currBlendEVA == gWeather.targetBlendEVA - && gWeather.currBlendEVB == gWeather.targetBlendEVB) + if (gWeatherPtr->currBlendEVA == gWeatherPtr->targetBlendEVA + && gWeatherPtr->currBlendEVB == gWeatherPtr->targetBlendEVB) return TRUE; return FALSE; @@ -1078,23 +1021,23 @@ void sub_80AC274(u8 a) u8 GetCurrentWeather(void) { - return gWeather.currWeather; + return gWeatherPtr->currWeather; } void SetRainStrengthFromSoundEffect(u16 soundEffect) { - if (gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) + if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) { switch (soundEffect) { case SE_T_KOAME: - gWeather.rainStrength = 0; + gWeatherPtr->rainStrength = 0; break; case SE_T_OOAME: - gWeather.rainStrength = 1; + gWeatherPtr->rainStrength = 1; break; case SE_T_AME: - gWeather.rainStrength = 2; + gWeatherPtr->rainStrength = 2; break; default: return; @@ -1108,7 +1051,7 @@ void PlayRainSoundEffect(void) { if (IsSpecialSEPlaying()) { - switch (gWeather.rainStrength) + switch (gWeatherPtr->rainStrength) { case 0: PlaySE(SE_T_KOAME_E); @@ -1126,24 +1069,24 @@ void PlayRainSoundEffect(void) u8 IsWeatherChangeComplete(void) { - return gWeather.weatherChangeComplete; + return gWeatherPtr->weatherChangeComplete; } void SetWeatherScreenFadeOut(void) { - gWeather.palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; } void sub_80AC3E4(void) { - gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } void PreservePaletteInWeather(u8 preservedPalIndex) { - CpuCopy16(sBasePaletteGammaTypes, gFieldEffectPaletteGammaTypes, 32); - gFieldEffectPaletteGammaTypes[preservedPalIndex] = GAMMA_NONE; - sPaletteGammaTypes = gFieldEffectPaletteGammaTypes; + CpuCopy16(sBasePaletteGammaTypes, sFieldEffectPaletteGammaTypes, 32); + sFieldEffectPaletteGammaTypes[preservedPalIndex] = GAMMA_NONE; + sPaletteGammaTypes = sFieldEffectPaletteGammaTypes; } void ResetPreservedPalettesInWeather(void) diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index ad3e80cfa..88ebb1936 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -12,7 +12,14 @@ #include "trig.h" #include "gpu_regs.h" -const u16 gUnknown_083970E8[] = INCBIN_U16("graphics/weather/0.gbapal"); +// This file's functions. +void sub_80AC6B4(struct Sprite *); + +// EWRAM +EWRAM_DATA static u8 gUnknown_02038BC4 = 0; +EWRAM_DATA static u16 gUnknown_02038BC6 = 0; + +// CONST const u16 gUnknown_0854C290[] = INCBIN_U16("graphics/weather/1.gbapal"); const u16 gUnknown_0854C2B0[] = INCBIN_U16("graphics/weather/2.gbapal"); const u8 gWeatherFog2Tiles[] = INCBIN_U8("graphics/weather/fog2.4bpp"); @@ -25,16 +32,16 @@ const u8 gWeatherAshTiles[] = INCBIN_U8("graphics/weather/ash.4bpp"); const u8 gWeatherRainTiles[] = INCBIN_U8("graphics/weather/rain.4bpp"); const u8 gWeatherSandstormTiles[] = INCBIN_U8("graphics/weather/sandstorm.4bpp"); -/*static*/ const struct Coords16 gUnknown_0854FB50[] = +static const struct Coords16 gUnknown_0854FB50[] = { { 0, 66}, { 5, 73}, {10, 78}, }; -/*static*/ const struct SpriteSheet sCloudSpriteSheet = {gWeatherCloudTiles, sizeof(gWeatherCloudTiles), 0x1200}; +static const struct SpriteSheet sCloudSpriteSheet = {gWeatherCloudTiles, sizeof(gWeatherCloudTiles), 0x1200}; -/*static*/ const struct OamData gOamData_839A9DC = +static const struct OamData gOamData_839A9DC = { .y = 0, .affineMode = 0, @@ -51,19 +58,18 @@ const u8 gWeatherSandstormTiles[] = INCBIN_U8("graphics/weather/sandstorm.4bpp") .affineParam = 0, }; -/*static*/ const union AnimCmd gSpriteAnim_839A9E4[] = +static const union AnimCmd gSpriteAnim_839A9E4[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd *const gSpriteAnimTable_839A9EC[] = +static const union AnimCmd *const gSpriteAnimTable_839A9EC[] = { gSpriteAnim_839A9E4, }; -void sub_80AC6B4(struct Sprite *); -/*static*/ const struct SpriteTemplate sCloudSpriteTemplate = +static const struct SpriteTemplate sCloudSpriteTemplate = { .tileTag = 4608, .paletteTag = 4609, @@ -74,15 +80,6 @@ void sub_80AC6B4(struct Sprite *); .callback = sub_80AC6B4, }; -extern void sub_80ABC48(s8 gammaIndex); -extern void sub_80ABFF0(void); -extern void sub_80AC01C(void); -extern void Weather_SetTargetBlendCoeffs(u8 a, u8 b, int c); -extern bool8 Weather_UpdateBlend(void); -extern void SetRainStrengthFromSoundEffect(u16 sndEff); -extern void sub_80ABC7C(u8 a, u8 b, u8 c); -extern void sub_80AB104(u8); - //------------------------------------------------------------------------------ // Clouds //------------------------------------------------------------------------------ @@ -97,8 +94,6 @@ void Clouds_InitVars(void) Weather_SetBlendCoeffs(0, 16); } -void Clouds_Main(void); - void Clouds_InitAll(void) { Clouds_InitVars(); @@ -170,7 +165,7 @@ void Weather2_Main(void) { } -int Weather2_Finish(void) +bool8 Weather2_Finish(void) { return 0; } @@ -238,8 +233,6 @@ void Drought_InitVars(void) gWeatherPtr->gammaStepDelay = 0; } -void Drought_Main(void); - void Drought_InitAll(void) { Drought_InitVars(); @@ -281,7 +274,7 @@ void Drought_Main(void) } } -int Drought_Finish(void) +bool8 Drought_Finish(void) { return 0; } @@ -370,8 +363,6 @@ void LightRain_InitVars(void) SetRainStrengthFromSoundEffect(SE_T_KOAME); } -void LightRain_Main(void); - void LightRain_InitAll(void) { LightRain_InitVars(); @@ -551,7 +542,7 @@ void LoadRainSpriteSheet(void) LoadSpriteSheet(&sRainSpriteSheet); } -/*static*/ const struct Coords16 sRainSpriteCoords[] = +static const struct Coords16 sRainSpriteCoords[] = { { 0, 0}, { 0, 160}, @@ -579,7 +570,7 @@ void LoadRainSpriteSheet(void) { 48, 96}, }; -/*static*/ const struct OamData gOamData_839AA68 = +static const struct OamData gOamData_839AA68 = { .y = 0, .affineMode = 0, @@ -596,13 +587,13 @@ void LoadRainSpriteSheet(void) .affineParam = 0, }; -/*static*/ const union AnimCmd gSpriteAnim_839AA70[] = +static const union AnimCmd gSpriteAnim_839AA70[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_JUMP(0), }; -/*static*/ const union AnimCmd gSpriteAnim_839AA78[] = +static const union AnimCmd gSpriteAnim_839AA78[] = { ANIMCMD_FRAME(8, 3), ANIMCMD_FRAME(32, 2), @@ -610,7 +601,7 @@ void LoadRainSpriteSheet(void) ANIMCMD_END, }; -/*static*/ const union AnimCmd gSpriteAnim_839AA88[] = +static const union AnimCmd gSpriteAnim_839AA88[] = { ANIMCMD_FRAME(8, 3), ANIMCMD_FRAME(16, 3), @@ -618,14 +609,14 @@ void LoadRainSpriteSheet(void) ANIMCMD_END, }; -/*static*/ const union AnimCmd *const gSpriteAnimTable_839AA98[] = +static const union AnimCmd *const gSpriteAnimTable_839AA98[] = { gSpriteAnim_839AA70, gSpriteAnim_839AA78, gSpriteAnim_839AA88, }; -/*static*/ const struct SpriteTemplate sRainSpriteTemplate = +static const struct SpriteTemplate sRainSpriteTemplate = { .tileTag = 4614, .paletteTag = 4608, @@ -636,7 +627,6 @@ void LoadRainSpriteSheet(void) .callback = sub_807E5C0, }; - const s16 gUnknown_0839AABC[][2] = { {-104, 208}, @@ -649,9 +639,9 @@ const u16 gUnknown_0839AAC4[][2] = {12, 10}, }; -/*static*/ const struct SpriteSheet sRainSpriteSheet = {gWeatherRainTiles, sizeof(gWeatherRainTiles), 0x1206}; +static const struct SpriteSheet sRainSpriteSheet = {gWeatherRainTiles, sizeof(gWeatherRainTiles), 0x1206}; -/*static*/ const struct OamData gOamData_839AAD4 = +static const struct OamData gOamData_839AAD4 = { .y = 0, .affineMode = 0, @@ -668,32 +658,32 @@ const u16 gUnknown_0839AAC4[][2] = .affineParam = 0, }; -/*static*/ const struct SpriteFrameImage gSpriteImageTable_839AADC[] = +static const struct SpriteFrameImage gSpriteImageTable_839AADC[] = { {gWeatherSnow1Tiles, sizeof(gWeatherSnow1Tiles)}, {gWeatherSnow2Tiles, sizeof(gWeatherSnow2Tiles)}, }; -/*static*/ const union AnimCmd gSpriteAnim_839AAEC[] = +static const union AnimCmd gSpriteAnim_839AAEC[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd gSpriteAnim_839AAF4[] = +static const union AnimCmd gSpriteAnim_839AAF4[] = { ANIMCMD_FRAME(1, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd *const gSpriteAnimTable_839AAFC[] = +static const union AnimCmd *const gSpriteAnimTable_839AAFC[] = { gSpriteAnim_839AAEC, gSpriteAnim_839AAF4, }; void sub_807ED48(struct Sprite *); -/*static*/ const struct SpriteTemplate sSnowflakeSpriteTemplate = +static const struct SpriteTemplate sSnowflakeSpriteTemplate = { .tileTag = 0xFFFF, .paletteTag = 4608, @@ -705,9 +695,9 @@ void sub_807ED48(struct Sprite *); }; // unused data -/*static*/ const u16 unusedData_839AB1C[] = {0, 6, 6, 12, 18, 42, 300, 300}; +static const u16 unusedData_839AB1C[] = {0, 6, 6, 12, 18, 42, 300, 300}; -/*static*/ const struct OamData gOamData_839AB2C = +static const struct OamData gOamData_839AB2C = { .y = 0, .affineMode = 0, @@ -724,43 +714,43 @@ void sub_807ED48(struct Sprite *); .affineParam = 0, }; -/*static*/ const union AnimCmd gSpriteAnim_839AB34[] = +static const union AnimCmd gSpriteAnim_839AB34[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd gSpriteAnim_839AB3C[] = +static const union AnimCmd gSpriteAnim_839AB3C[] = { ANIMCMD_FRAME(32, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd gSpriteAnim_839AB44[] = +static const union AnimCmd gSpriteAnim_839AB44[] = { ANIMCMD_FRAME(64, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd gSpriteAnim_839AB4C[] = +static const union AnimCmd gSpriteAnim_839AB4C[] = { ANIMCMD_FRAME(96, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd gSpriteAnim_839AB54[] = +static const union AnimCmd gSpriteAnim_839AB54[] = { ANIMCMD_FRAME(128, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd gSpriteAnim_839AB5C[] = +static const union AnimCmd gSpriteAnim_839AB5C[] = { ANIMCMD_FRAME(160, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd *const gSpriteAnimTable_839AB64[] = +static const union AnimCmd *const gSpriteAnimTable_839AB64[] = { gSpriteAnim_839AB34, gSpriteAnim_839AB3C, @@ -770,19 +760,19 @@ void sub_807ED48(struct Sprite *); gSpriteAnim_839AB5C, }; -/*static*/ const union AffineAnimCmd gSpriteAffineAnim_839AB7C[] = +static const union AffineAnimCmd gSpriteAffineAnim_839AB7C[] = { AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0), AFFINEANIMCMD_END, }; -/*static*/ const union AffineAnimCmd *const gSpriteAffineAnimTable_839AB8C[] = +static const union AffineAnimCmd *const gSpriteAffineAnimTable_839AB8C[] = { gSpriteAffineAnim_839AB7C, }; -/*static*/ void Fog1SpriteCallback(struct Sprite *); -/*static*/ const struct SpriteTemplate sFog1SpriteTemplate = +static void Fog1SpriteCallback(struct Sprite *); +static const struct SpriteTemplate sFog1SpriteTemplate = { .tileTag = 4609, .paletteTag = 4608, @@ -1286,8 +1276,8 @@ void UpdateThunderSound(void) //------------------------------------------------------------------------------ void Fog1_Main(void); -/*static*/ void CreateFog1Sprites(void); -/*static*/ void DestroyFog1Sprites(void); +static void CreateFog1Sprites(void); +static void DestroyFog1Sprites(void); void Fog1_InitVars(void) { @@ -1370,7 +1360,7 @@ bool8 Fog1_Finish(void) #define sprColumn data[0] -/*static*/ void Fog1SpriteCallback(struct Sprite *sprite) +static void Fog1SpriteCallback(struct Sprite *sprite) { sprite->pos2.y = (u8)gSpriteCoordOffsetY; sprite->pos1.x = gWeatherPtr->fog1ScrollPosX + 32 + sprite->sprColumn * 64; @@ -1381,7 +1371,7 @@ bool8 Fog1_Finish(void) } } -/*static*/ void CreateFog1Sprites(void) +static void CreateFog1Sprites(void) { u16 i; @@ -1414,7 +1404,7 @@ bool8 Fog1_Finish(void) #undef sprColumn -/*static*/ void DestroyFog1Sprites(void) +static void DestroyFog1Sprites(void) { u16 i; @@ -1513,7 +1503,7 @@ bool8 Ash_Finish(void) return TRUE; } -/*static*/ const struct SpriteSheet sAshSpriteSheet = {gWeatherAshTiles, sizeof(gWeatherAshTiles), 0x1202}; +static const struct SpriteSheet sAshSpriteSheet = {gWeatherAshTiles, sizeof(gWeatherAshTiles), 0x1202}; void LoadAshSpriteSheet(void) { @@ -1550,7 +1540,7 @@ const union AnimCmd *const gSpriteAnimTable_839ABCC[] = }; void sub_807FAA8(struct Sprite *); -/*static*/ const struct SpriteTemplate sAshSpriteTemplate = +static const struct SpriteTemplate sAshSpriteTemplate = { .tileTag = 4610, .paletteTag = 4608, @@ -2003,7 +1993,7 @@ const struct SpriteTemplate sSandstormSpriteTemplate = .callback = SandstormSpriteCallback1, }; -/*static*/ const struct SpriteSheet sSandstormSpriteSheet = {gWeatherSandstormTiles, sizeof(gWeatherSandstormTiles), 0x1204}; +static const struct SpriteSheet sSandstormSpriteSheet = {gWeatherSandstormTiles, sizeof(gWeatherSandstormTiles), 0x1204}; void CreateSandstormSprites_1(void) { @@ -2294,16 +2284,15 @@ void unc_0807DAB4(struct Sprite *sprite) DestroySprite(sprite); } -// New Emerald functions. -extern u8 gUnknown_02038BC4; -extern u16 gUnknown_02038BC6; -void sub_80AEC94(u32 a0, u32 a1) +//------------------------------------------------------------------------------ + +static void sub_80AEC94(u32 a0, u32 a1) { gUnknown_02038BC4 = a0; gUnknown_02038BC6 = a1; } -void sub_80AECA8(u8 taskId) +static void sub_80AECA8(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -2330,34 +2319,32 @@ void sub_80AECA8(u8 taskId) } } -void sub_80AED28(void) +static void sub_80AED28(void) { u8 taskId = CreateTask(sub_80AECA8, 0); s16 *data = gTasks[taskId].data; data[15] = 600; - if (gUnknown_02038BC4 == 13) + if (gUnknown_02038BC4 == WEATHER_RAIN_HEAVY) { - data[1] = 12; - data[2] = 13; + data[1] = WEATHER_DROUGHT; + data[2] = WEATHER_RAIN_HEAVY; } - else if (gUnknown_02038BC4 == 12) + else if (gUnknown_02038BC4 == WEATHER_DROUGHT) { - data[1] = 13; - data[2] = 12; + data[1] = WEATHER_RAIN_HEAVY; + data[2] = WEATHER_DROUGHT; } else { - gUnknown_02038BC4 = 13; - data[1] = 12; - data[2] = 13; + gUnknown_02038BC4 = WEATHER_RAIN_HEAVY; + data[1] = WEATHER_DROUGHT; + data[2] = WEATHER_RAIN_HEAVY; } } -//------------------------------------------------------------------------------ - -/*static*/ u8 TranslateWeatherNum(u8); -/*static*/ void UpdateRainCounter(u8, u8); +static u8 TranslateWeatherNum(u8); +static void UpdateRainCounter(u8, u8); void SetSav1Weather(u32 weather) { @@ -2394,7 +2381,7 @@ void DoCurrentWeather(void) { u8 weather = GetSav1Weather(); - if (weather == 15) + if (weather == WEATHER_15) { if (!FuncIsActiveTask(sub_80AECA8)) sub_80AED28(); @@ -2404,7 +2391,7 @@ void DoCurrentWeather(void) { if (FuncIsActiveTask(sub_80AECA8)) DestroyTask(FindTaskIdByFunc(sub_80AECA8)); - gUnknown_02038BC4 = 13; + gUnknown_02038BC4 = WEATHER_RAIN_HEAVY; } ChangeWeather(weather); } @@ -2413,7 +2400,7 @@ void sub_80AEE84(void) { u8 weather = GetSav1Weather(); - if (weather == 15) + if (weather == WEATHER_15) { if (!FuncIsActiveTask(sub_80AECA8)) sub_80AED28(); @@ -2423,19 +2410,19 @@ void sub_80AEE84(void) { if (FuncIsActiveTask(sub_80AECA8)) DestroyTask(FindTaskIdByFunc(sub_80AECA8)); - gUnknown_02038BC4 = 13; + gUnknown_02038BC4 = WEATHER_RAIN_HEAVY; } sub_80AB104(weather); } -/*static*/ const u8 sWeatherCycleRoute119[] = +static const u8 sWeatherCycleRoute119[] = { WEATHER_SUNNY, WEATHER_RAIN_LIGHT, WEATHER_RAIN_MED, WEATHER_RAIN_LIGHT, }; -/*static*/ const u8 sWeatherCycleRoute123[] = +static const u8 sWeatherCycleRoute123[] = { WEATHER_SUNNY, WEATHER_SUNNY, @@ -2443,7 +2430,7 @@ void sub_80AEE84(void) WEATHER_SUNNY, }; -/*static*/ u8 TranslateWeatherNum(u8 weather) +static u8 TranslateWeatherNum(u8 weather) { switch (weather) { @@ -2462,7 +2449,7 @@ void sub_80AEE84(void) case WEATHER_DROUGHT: return WEATHER_DROUGHT; case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY; case WEATHER_BUBBLES: return WEATHER_BUBBLES; - case 15: return 15; + case WEATHER_15: return WEATHER_15; case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage]; case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage]; default: return WEATHER_NONE; @@ -2476,7 +2463,7 @@ void UpdateWeatherPerDay(u16 increment) gSaveBlock1Ptr->weatherCycleStage = weatherStage; } -/*static*/ void UpdateRainCounter(u8 newWeather, u8 oldWeather) +static void UpdateRainCounter(u8 newWeather, u8 oldWeather) { if (newWeather != oldWeather && (newWeather == WEATHER_RAIN_LIGHT || newWeather == WEATHER_RAIN_MED)) -- cgit v1.2.3 From 58c4cec9462cef154e75d12181ebe6d42c0f3e9e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 8 Dec 2018 21:42:36 +0100 Subject: decompile field screen --- src/field_effect.c | 24 +- src/field_fadetransition.c | 1258 ++++++++++++++++++++++++++++++++++++++++++++ src/fldeff_flash.c | 4 +- src/overworld.c | 6 +- 4 files changed, 1275 insertions(+), 17 deletions(-) create mode 100644 src/field_fadetransition.c (limited to 'src') diff --git a/src/field_effect.c b/src/field_effect.c index 935501130..6bfa4facf 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -244,7 +244,7 @@ extern void pal_fill_for_maplights(void); extern void sub_80E1558(u8); extern void sub_80E1570(void); extern bool8 sub_80E1584(void); -extern void sub_80AF0B4(void); +extern void WarpFadeScreen(void); // .rodata const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp"); @@ -1593,8 +1593,8 @@ static void sub_80B7004(struct Task *task) static void sub_80B7050(void) { - music_something(); - sub_80AF0B4(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); } static void sub_80B7060(void) @@ -1943,8 +1943,8 @@ static bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, str static bool8 sub_80B77F8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { - music_something(); - sub_80AF0B4(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); task->data[0]++; return FALSE; } @@ -2099,8 +2099,8 @@ static bool8 sub_80B7BCC(struct Task *task, struct EventObject *eventObject, str { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { - music_something(); - sub_80AF0B4(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); task->data[0]++; } return FALSE; @@ -2161,8 +2161,8 @@ static void EscapeRopeFieldEffect_Step1(struct Task *task) u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; if (task->data[14] != 0 && (--task->data[14]) == 0) { - music_something(); - sub_80AF0B4(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); } eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) @@ -2314,8 +2314,8 @@ static void TeleportFieldEffectTask3(struct Task *task) if (task->data[4] >= 0xa8) { task->data[0]++; - music_something(); - sub_80AF0B4(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); } } @@ -3123,7 +3123,7 @@ static void sub_80B9474(struct Task *task) { if (sub_80B9508(task->data[1])) { - sub_80AF0B4(); + WarpFadeScreen(); task->data[0]++; } } diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c new file mode 100644 index 000000000..2d8a6c303 --- /dev/null +++ b/src/field_fadetransition.c @@ -0,0 +1,1258 @@ +#include "global.h" +#include "cable_club.h" +#include "event_data.h" +#include "fieldmap.h" +#include "field_camera.h" +#include "field_door.h" +#include "field_effect.h" +#include "field_fadetransition.h" +#include "event_object_movement.h" +#include "field_player_avatar.h" +#include "field_special_scene.h" +#include "field_weather.h" +// #include "fldeff_flash.h" +#include "gpu_regs.h" +#include "link.h" +#include "link_rfu.h" +#include "load_save.h" +#include "main.h" +#include "menu.h" +#include "event_obj_lock.h" +#include "metatile_behavior.h" +#include "palette.h" +#include "overworld.h" +#include "scanline_effect.h" +#include "script.h" +#include "sound.h" +#include "start_menu.h" +#include "task.h" +#include "text.h" +#include "constants/event_object_movement_constants.h" +#include "constants/songs.h" +#include "constants/rgb.h" + +extern bool32 sub_81D6534(void); +extern bool8 walkrun_is_standing_still(void); +extern void ScriptUnfreezeEventObjects(void); +extern void sub_81BE72C(void); +extern void sub_80FB768(void); +extern void sub_808D194(void); +extern void sub_808D1C8(void); +extern bool32 sub_808D1B4(void); +extern bool32 sub_808D1E8(void); + +extern const u16 gUnknown_82EC7CC[]; + +void sub_8080B9C(u8); +void task_map_chg_seq_0807E20C(u8); +void task_map_chg_seq_0807E2CC(u8); +void task0A_fade_n_map_maybe(u8); +void sub_808115C(u8); +void palette_bg_faded_fill_white(void); +u8 GetMapPairFadeToType(u8, u8); +u8 GetMapPairFadeFromType(u8, u8); +void sub_808C0A8(u8); +void sub_80AF438(u8); +bool32 sub_80AF71C(void); +void task0A_mpl_807E31C(u8 taskId); +void sub_80AFA0C(u8 taskId); +void sub_80AFA88(u8 taskId); +void sub_80B6B68(void); +void sub_80B6E4C(u8, u8); +void sub_80B75D8(u8); +void sub_80B7A74(u8); +/*static*/ void task50_0807F0C8(u8); + +const u16 sFlashLevelPixelRadii[] = { 200, 72, 64, 56, 48, 40, 32, 24, 0 }; +const s32 gMaxFlashLevel = 8; + +const struct ScanlineEffectParams sFlashEffectParams = +{ + (void *)REG_ADDR_WIN0H, + ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1, + 1 +}; + +void palette_bg_faded_fill_white(void) +{ + CpuFastFill16(RGB_WHITE, gPlttBufferFaded, PLTT_SIZE); +} + +void palette_bg_faded_fill_black(void) +{ + CpuFastFill16(RGB_BLACK, gPlttBufferFaded, PLTT_SIZE); +} + +void pal_fill_for_maplights(void) +{ + u8 previousMapType = GetLastUsedWarpMapType(); + switch (GetMapPairFadeFromType(previousMapType, Overworld_GetMapTypeOfSaveblockLocation())) + { + case 0: + palette_bg_faded_fill_black(); + FadeScreen(FADE_FROM_BLACK, 0); + break; + case 1: + palette_bg_faded_fill_white(); + FadeScreen(FADE_FROM_WHITE, 0); + } +} + +void sub_80AF08C(void) +{ + palette_bg_faded_fill_white(); + FadeScreen(FADE_FROM_WHITE, 8); +} + +void pal_fill_black(void) +{ + palette_bg_faded_fill_black(); + FadeScreen(FADE_FROM_BLACK, 0); +} + +void WarpFadeScreen(void) +{ + u8 currentMapType = Overworld_GetMapTypeOfSaveblockLocation(); + switch (GetMapPairFadeToType(currentMapType, GetDestinationWarpMapHeader()->mapType)) + { + case 0: + FadeScreen(FADE_TO_BLACK, 0); + break; + case 1: + FadeScreen(FADE_TO_WHITE, 0); + } +} + +void sub_80AF0F4(u8 arg) +{ + sub_808C0A8(!arg); +} + +void task0A_nop_for_a_while(u8 taskId) +{ + if (sub_80AF71C() == TRUE) + DestroyTask(taskId); +} + +void sub_80AF128(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + CreateTask(task0A_nop_for_a_while, 10); +} + +void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskID) +{ + if (sub_80AF71C() == TRUE) + { + DestroyTask(taskID); + EnableBothScriptContexts(); + } +} + +void sub_80AF168(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); +} + +void sub_80AF188(void) +{ + ScriptContext2_Enable(); + pal_fill_black(); + CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); +} + +void task_mpl_807DD60(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + task->data[1] = sub_80B3050(); + task->data[0]++; + break; + case 1: + if (gTasks[task->data[1]].isActive != TRUE) + { + pal_fill_for_maplights(); + task->data[0]++; + } + break; + case 2: + if (sub_80AF71C() == TRUE) + { + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +void sub_80AF214(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + palette_bg_faded_fill_black(); + CreateTask(task_mpl_807DD60, 10); +} + +void sub_80AF234(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + sub_800ADF8(); + task->data[0]++; + break; + case 1: + if (!sub_800A520()) + { + if (++task->data[1] > 1800) + sub_8011170(0x6000); + } + else + { + pal_fill_for_maplights(); + task->data[0]++; + } + break; + case 2: + if (sub_80AF71C() == TRUE) + { + sub_8009F18(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +void sub_80AF2B4(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + sub_800ADF8(); + task->data[0]++; + break; + case 1: + if (sub_800A520()) + { + task->data[0]++; + } + break; + case 2: + sub_8009F18(); + sub_8086C2C(); + ScriptContext2_Disable(); + DestroyTask(taskId); + break; + } +} + +void sub_80AF314(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + palette_bg_faded_fill_black(); + CreateTask(sub_80AF234, 10); +} + +void sub_80AF334(void) +{ + s16 x, y; + u8 behavior; + TaskFunc func; + + PlayerGetDestCoords(&x, &y); + behavior = MapGridGetMetatileBehaviorAt(x, y); + if (MetatileBehavior_IsDoor(behavior) == TRUE) + func = sub_80AF438; + else if (MetatileBehavior_IsNonAnimDoor(behavior) == TRUE) + func = task_map_chg_seq_0807E20C; + else + func = task_map_chg_seq_0807E2CC; + CreateTask(func, 10); +} + +void mapldr_default(void) +{ + Overworld_PlaySpecialMapMusic(); + pal_fill_for_maplights(); + sub_80AF334(); + ScriptContext2_Enable(); +} + +void sub_80AF3B0(void) +{ + Overworld_PlaySpecialMapMusic(); + sub_80AF08C(); + sub_80AF334(); + ScriptContext2_Enable(); +} + +void sub_80AF3C8(void) +{ + if (!sub_81D6534()) + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + sub_80AF334(); + ScriptContext2_Enable(); +} + +void sub_80AF3E8(void) +{ + Overworld_PlaySpecialMapMusic(); + pal_fill_for_maplights(); + PlaySE(SE_TK_WARPOUT); + CreateTask(task0A_mpl_807E31C, 10); + ScriptContext2_Enable(); +} + +void sub_80AF40C(void) +{ + Overworld_PlaySpecialMapMusic(); + pal_fill_for_maplights(); + PlaySE(SE_TK_WARPOUT); + CreateTask(task_map_chg_seq_0807E2CC, 10); + ScriptContext2_Enable(); + sub_8085540(0xE); +} + +void sub_80AF438(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + s16 *x = &task->data[2]; + s16 *y = &task->data[3]; + + switch (task->data[0]) + { + case 0: + sub_80AF0F4(0); + FreezeEventObjects(); + PlayerGetDestCoords(x, y); + FieldSetDoorOpened(*x, *y); + task->data[0] = 1; + break; + case 1: + if (sub_80AF71C()) + { + u8 eventObjId; + sub_80AF0F4(1); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); + task->data[0] = 2; + } + break; + case 2: + if (walkrun_is_standing_still()) + { + u8 eventObjId; + task->data[1] = FieldAnimateDoorClose(*x, *y); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + task->data[0] = 3; + } + break; + case 3: + if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) + { + UnfreezeEventObjects(); + task->data[0] = 4; + } + break; + case 4: + ScriptContext2_Disable(); + DestroyTask(taskId); + break; + } +} + +void task_map_chg_seq_0807E20C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + s16 *x = &task->data[2]; + s16 *y = &task->data[3]; + + switch (task->data[0]) + { + case 0: + sub_80AF0F4(0); + FreezeEventObjects(); + PlayerGetDestCoords(x, y); + task->data[0] = 1; + break; + case 1: + if (sub_80AF71C()) + { + u8 eventObjId; + sub_80AF0F4(1); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectSetHeldMovement(&gEventObjects[eventObjId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); + task->data[0] = 2; + } + break; + case 2: + if (walkrun_is_standing_still()) + { + UnfreezeEventObjects(); + task->data[0] = 3; + } + break; + case 3: + ScriptContext2_Disable(); + DestroyTask(taskId); + break; + } +} + +void task_map_chg_seq_0807E2CC(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + gTasks[taskId].data[0]++; + break; + case 1: + if (sub_80AF71C()) + { + UnfreezeEventObjects(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +void sub_80AF660(u8 taskId) +{ + if (sub_80AF71C() == TRUE) + { + DestroyTask(taskId); + CreateTask(sub_809FA34, 80); + } +} + +void sub_80AF688(void) +{ + pal_fill_black(); + CreateTask(sub_80AF660, 0x50); + ScriptContext2_Enable(); +} + +bool32 sub_80AF6A4(void) +{ + sub_809FA18(); + return FALSE; +} + +void task_mpl_807E3C8(u8 taskId) +{ + if (sub_80AF71C() == 1) + { + ScriptContext2_Disable(); + DestroyTask(taskId); + ScriptUnfreezeEventObjects(); + } +} + +void sub_80AF6D4(void) +{ + ScriptContext2_Enable(); + pal_fill_black(); + CreateTask(task_mpl_807E3C8, 10); +} + +void sub_80AF6F0(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + CreateTask(task_mpl_807E3C8, 10); +} + +bool32 PaletteFadeActive(void) +{ + return gPaletteFade.active; +} + +bool32 sub_80AF71C(void) +{ + if (IsWeatherNotFadingIn() == TRUE) + return TRUE; + else + return FALSE; +} + +void sub_80AF734(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + PlaySE(SE_KAIDAN); + gFieldCallback = mapldr_default; + CreateTask(sub_80AFA0C, 10); +} + +void sp13E_warp_to_last_warp(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + gFieldCallback = mapldr_default; + CreateTask(sub_80AFA0C, 10); +} + +void sub_80AF79C(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + FadeScreen(FADE_TO_WHITE, 8); + PlayRainSoundEffect(); + gFieldCallback = sub_80AF3B0; + CreateTask(sub_80AFA0C, 10); +} + +void sub_80AF7D0(void) +{ + ScriptContext2_Enable(); + gFieldCallback = mapldr_default; + CreateTask(sub_80AFA88, 10); +} + +void sp13F_fall_to_last_warp(void) +{ + sp13E_warp_to_last_warp(); + gFieldCallback = sub_80B6B68; +} + +void sub_80AF80C(u8 metatileBehavior) +{ + ScriptContext2_Enable(); + sub_80B6E4C(metatileBehavior, 10); +} + +void sub_80AF828(void) +{ + ScriptContext2_Enable(); + sub_80B75D8(10); +} + +void sub_80AF838(void) +{ + ScriptContext2_Enable(); + sub_80B7A74(10); +} + +void sub_80AF848(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlaySE(SE_TK_WARPIN); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80AF3E8; +} + +void sub_80AF87C(void) +{ + sub_8085540(1); + ScriptContext2_Enable(); + SaveEventObjects(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlaySE(SE_TK_WARPIN); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80AF40C; +} + +void sub_80AF8B8(void) +{ + ScriptContext2_Enable(); + WarpFadeScreen(); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80FB768; +} + +void sub_80AF8E0(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + ScriptContext2_Enable(); + task->data[0]++; + break; + case 1: + if (!PaletteFadeActive() && BGMusicStopped()) + task->data[0]++; + break; + case 2: + WarpIntoMap(); + SetMainCallback2(sub_8086074); + DestroyTask(taskId); + break; + } +} + +void sub_80AF948(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlaySE(SE_KAIDAN); + CreateTask(sub_80AF8E0, 10); +} + +void sub_80AF96C(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + ClearLinkCallback_2(); + FadeScreen(FADE_TO_BLACK, 0); + TryFadeOutOldMapMusic(); + PlaySE(SE_KAIDAN); + data[0]++; + break; + case 1: + if (!PaletteFadeActive() && BGMusicStopped()) + { + sub_800AC34(); + data[0]++; + } + break; + case 2: + if (!gReceivedRemoteLinkPlayers) + { + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + } + break; + } +} + +void sub_80AF9F8(void) +{ + CreateTask(sub_80AF96C, 10); +} + +void sub_80AFA0C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + task->data[0]++; + break; + case 1: + if (!PaletteFadeActive()) + { + if (task->data[1] == 0) + { + sub_81BE72C(); + task->data[1] = 1; + } + if (BGMusicStopped()) + task->data[0]++; + } + break; + case 2: + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + break; + } +} + +void sub_80AFA88(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + s16 *x = &task->data[2]; + s16 *y = &task->data[3]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + PlayerGetDestCoords(x, y); + PlaySE(GetDoorSoundEffect(*x, *y - 1)); + task->data[1] = FieldAnimateDoorOpen(*x, *y - 1); + task->data[0] = 1; + break; + case 1: + if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) + { + u8 eventObjId; + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearHeldMovementIfActive(&gEventObjects[eventObjId]); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_UP); + task->data[0] = 2; + } + break; + case 2: + if (walkrun_is_standing_still()) + { + u8 eventObjId; + task->data[1] = FieldAnimateDoorClose(*x, *y - 1); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + sub_80AF0F4(0); + task->data[0] = 3; + } + break; + case 3: + if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) + { + task->data[0] = 4; + } + break; + case 4: + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + task->data[0] = 0; + task->func = sub_80AFA0C; + break; + } +} + +void task0A_fade_n_map_maybe(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + task->data[0]++; + break; + case 1: + if (!PaletteFadeActive() && BGMusicStopped()) + { + task->data[0]++; + } + break; + case 2: + WarpIntoMap(); + SetMainCallback2(sub_8086024); + DestroyTask(taskId); + break; + } +} + +void sub_80AFC60(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + PlaySE(SE_KAIDAN); + gFieldCallback = sub_80AF3C8; + CreateTask(task0A_fade_n_map_maybe, 10); +} + +/*static*/ void SetFlashScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right) +{ + if (y <= 160) + { + if (left < 0) + left = 0; + if (left > 255) + left = 255; + if (right < 0) + right = 0; + if (right > 255) + right = 255; + dest[y] = (left << 8) | right; + } +} + +/*static*/ void SetFlashScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius) +{ + s32 r = radius; + s32 v2 = radius; + s32 v3 = 0; + while (r >= v3) + { + SetFlashScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r); + SetFlashScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r); + SetFlashScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3); + SetFlashScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3); + v2 -= (v3 * 2) - 1; + v3++; + if (v2 < 0) + { + v2 += 2 * (r - 1); + r--; + } + } +} + +/*static*/ void SetFlash2ScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right) +{ + if (y <= 160) + { + if (left < 0) + left = 0; + if (left > 240) + left = 240; + if (right < 0) + right = 0; + if (right > 240) + right = 240; + dest[y] = (left << 8) | right; + } +} + +/*static*/ void SetFlash2ScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius) +{ + s32 r = radius; + s32 v2 = radius; + s32 v3 = 0; + while (r >= v3) + { + SetFlash2ScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r); + SetFlash2ScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r); + SetFlash2ScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3); + SetFlash2ScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3); + v2 -= (v3 * 2) - 1; + v3++; + if (v2 < 0) + { + v2 += 2 * (r - 1); + r--; + } + } +} + +#define tFlashCenterX data[1] +#define tFlashCenterY data[2] +#define tCurFlashRadius data[3] +#define tDestFlashRadius data[4] +#define tFlashRadiusDelta data[5] +#define tClearScanlineEffect data[6] + +/*static*/ void UpdateFlashLevelEffect(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + SetFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 1; + break; + case 1: + SetFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 0; + tCurFlashRadius += tFlashRadiusDelta; + if (tCurFlashRadius > tDestFlashRadius) + { + if (tClearScanlineEffect == 1) + { + ScanlineEffect_Stop(); + data[0] = 2; + } + else + { + DestroyTask(taskId); + } + } + break; + case 2: + ScanlineEffect_Clear(); + DestroyTask(taskId); + break; + } +} + +/*static*/ void UpdateFlash2LevelEffect(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 1; + break; + case 1: + SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 0; + tCurFlashRadius += tFlashRadiusDelta; + if (tCurFlashRadius > tDestFlashRadius) + { + if (tClearScanlineEffect == 1) + { + ScanlineEffect_Stop(); + data[0] = 2; + } + else + { + DestroyTask(taskId); + } + } + break; + case 2: + ScanlineEffect_Clear(); + DestroyTask(taskId); + break; + } +} + +/*static*/ void sub_80AFF90(u8 taskId) +{ + if (!FuncIsActiveTask(UpdateFlashLevelEffect)) + { + EnableBothScriptContexts(); + DestroyTask(taskId); + } +} + +/*static*/ void sub_80AFFB8(void) +{ + if (!FuncIsActiveTask(sub_80AFF90)) + CreateTask(sub_80AFF90, 80); +} + +/*static*/ u8 sub_80AFFDC(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) +{ + u8 taskId = CreateTask(UpdateFlashLevelEffect, 80); + s16 *data = gTasks[taskId].data; + + tCurFlashRadius = initialFlashRadius; + tDestFlashRadius = destFlashRadius; + tFlashCenterX = centerX; + tFlashCenterY = centerY; + tClearScanlineEffect = clearScanlineEffect; + + if (initialFlashRadius < destFlashRadius) + tFlashRadiusDelta = delta; + else + tFlashRadiusDelta = -delta; + + return taskId; +} + +/*static*/ u8 sub_80B003C(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) +{ + u8 taskId = CreateTask(UpdateFlash2LevelEffect, 80); + s16 *data = gTasks[taskId].data; + + tCurFlashRadius = initialFlashRadius; + tDestFlashRadius = destFlashRadius; + tFlashCenterX = centerX; + tFlashCenterY = centerY; + tClearScanlineEffect = clearScanlineEffect; + + if (initialFlashRadius < destFlashRadius) + tFlashRadiusDelta = delta; + else + tFlashRadiusDelta = -delta; + + return taskId; +} + +#undef tCurFlashRadius +#undef tDestFlashRadius +#undef tFlashRadiusDelta +#undef tClearScanlineEffect + +void sub_80B009C(u8 flashLevel) +{ + u8 curFlashLevel = Overworld_GetFlashLevel(); + u8 value = 0; + if (!flashLevel) + value = 1; + sub_80AFFDC(120, 80, sFlashLevelPixelRadii[curFlashLevel], sFlashLevelPixelRadii[flashLevel], value, 1); + sub_80AFFB8(); + ScriptContext2_Enable(); +} + +void WriteFlashScanlineEffectBuffer(u8 flashLevel) +{ + if (flashLevel) + { + SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, sFlashLevelPixelRadii[flashLevel]); + CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); + } +} + +void door_upload_tiles(void) +{ + SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, gSaveBlock2Ptr->frontier.field_E68); + CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); +} + +void task0A_mpl_807E31C(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + sub_808D194(); + gTasks[taskId].data[0]++; + break; + case 1: + if (sub_80AF71C() && sub_808D1B4() != TRUE) + { + UnfreezeEventObjects(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +void sub_80B01BC(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + PlaySE(SE_TK_WARPIN); + sub_808D1C8(); + task->data[0]++; + break; + case 1: + if (!sub_808D1E8()) + { + WarpFadeScreen(); + task->data[0]++; + } + break; + case 2: + if (!PaletteFadeActive() && BGMusicStopped()) + task->data[0]++; + break; + case 3: + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + break; + } +} + +void sub_80B0244(void) +{ + ScriptContext2_Enable(); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80AF3E8; +} + +void sub_80B0268(void) +{ + ScriptContext2_Enable(); + gFieldCallback = mapldr_default; + CreateTask(sub_80B01BC, 10); +} + +/*static*/ void sub_80B028C(u8 a1) +{ + int i; + u16 color[1]; + + if (!a1) + color[0] = 0x1F; + else + color[0] = 0x7C00; + + for (i = 0; i < 16; i++) + { + LoadPalette(color, 0xF0 + i, 2); + } +} + +/*static*/ bool8 sub_80B02C8(u16 a1) +{ + u8 lo = REG_BLDALPHA & 0xFF; + u8 hi = REG_BLDALPHA >> 8; + + if (a1) + { + if (lo) + { + lo--; + } + } + else + { + if (hi < 0x10) + { + hi++; + } + } + + SetGpuReg(REG_OFFSET_BLDALPHA, (hi << 8) | lo); + + if (lo == 0 && hi == 0x10) + return TRUE; + else + return FALSE; +} + +/*static*/ void sub_80B0318(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + data[6] = REG_DISPCNT; + data[7] = REG_BLDCNT; + data[8] = REG_BLDALPHA; + data[9] = REG_WININ; + data[10] = REG_WINOUT; + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON); + SetGpuRegBits(REG_OFFSET_BLDCNT, gUnknown_82EC7CC[0]); + SetGpuReg(REG_OFFSET_BLDALPHA, 1804); + SetGpuReg(REG_OFFSET_WININ, 63); + SetGpuReg(REG_OFFSET_WINOUT, 30); + sub_8199C30(0, 0, 0, 0x1E, 0x14, 0xF); + schedule_bg_copy_tilemap_to_vram(0); + SetFlash2ScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], data[2], data[3], 1); + CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); + ScanlineEffect_SetParams(sFlashEffectParams); + data[0] = 1; + break; + case 1: + sub_8199DF0(0, 17, 0, 1); + sub_80B028C(data[1]); + sub_80B003C(data[2], data[3], 1, 160, 1, 2); + data[0] = 2; + break; + case 2: + if (!FuncIsActiveTask(UpdateFlash2LevelEffect)) + { + EnableBothScriptContexts(); + data[0] = 3; + } + break; + case 3: + InstallCameraPanAheadCallback(); + SetCameraPanningCallback(NULL); + data[5] = 0; + data[4] = 4; + data[0] = 4; + break; + case 4: + data[4]--; + if (!data[4]) + { + s32 panning; + data[4] = 4; + data[5] ^= 1; + if (data[5]) + panning = 4; + else + panning = -4; + SetCameraPanning(0, panning); + } + break; + case 6: + InstallCameraPanAheadCallback(); + data[4] = 8; + data[0] = 7; + break; + case 7: + data[4]--; + if (!data[4]) + { + data[4] = 8; + data[5] ^= 1; + if (sub_80B02C8(data[5]) == TRUE) + { + data[0] = 5; + sub_8199DF0(0, 0, 0, 1); + } + } + break; + case 5: + SetGpuReg(REG_OFFSET_WIN0H, 255); + SetGpuReg(REG_OFFSET_DISPCNT, data[6]); + SetGpuReg(REG_OFFSET_BLDCNT, data[7]); + SetGpuReg(REG_OFFSET_BLDALPHA, data[8]); + SetGpuReg(REG_OFFSET_WININ, data[9]); + SetGpuReg(REG_OFFSET_WINOUT, data[10]); + EnableBothScriptContexts(); + DestroyTask(taskId); + break; + } +} + +void sub_80B0534(void) +{ + u8 taskId = CreateTask(sub_80B0318, 80); + s16 *data = gTasks[taskId].data; + + if (gSpecialVar_Result == 0) + { + data[1] = 0; + data[2] = 104; + } + else if (gSpecialVar_Result == 1) + { + data[1] = 1; + data[2] = 136; + } + else if (gSpecialVar_Result == 2) + { + data[1] = 0; + data[2] = 120; + } + else + { + data[1] = 1; + data[2] = 120; + } + + data[3] = 80; +} + +void sub_80B058C(void) +{ + u8 taskId = FindTaskIdByFunc(sub_80B0318); + gTasks[taskId].data[0] = 6; +} + +void sub_80B05B4(void) +{ + Overworld_FadeOutMapMusic(); + CreateTask(task50_0807F0C8, 80); +} + +/*static*/ void task50_0807F0C8(u8 taskId) +{ + if (BGMusicStopped() == TRUE) + { + DestroyTask(taskId); + EnableBothScriptContexts(); + } +} diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 9771232f2..8862caa9f 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -170,7 +170,7 @@ static bool8 sub_8137304(void) return FALSE; } -bool8 sub_8137360(u8 a1, u8 a2) +bool8 GetMapPairFadeToType(u8 a1, u8 a2) { u8 i; u8 v0 = a1; @@ -187,7 +187,7 @@ bool8 sub_8137360(u8 a1, u8 a2) return FALSE; } -bool8 fade_type_for_given_maplight_pair(u8 a1, u8 a2) +bool8 GetMapPairFadeFromType(u8 a1, u8 a2) { u8 i; u8 v0 = a1; diff --git a/src/overworld.c b/src/overworld.c index 470e27ffc..a60ac9a54 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -129,7 +129,7 @@ extern void sub_80A0A38(void); extern void trainer_hill_map_load_related(void); extern void sub_8087D74(void); extern void battle_pyramid_map_load_related(u8); -extern void sub_80B00E8(u8); +extern void WriteFlashScanlineEffectBuffer(u8); extern void sub_80E9238(u8); extern void sub_81AA2F8(void); extern void sub_8195E10(void); @@ -1241,7 +1241,7 @@ u8 GetMapMusicFadeoutSpeed(void) return 4; } -void music_something(void) +void TryFadeOutOldMapMusic(void) { u16 currentMusic = GetCurrentMapMusic(); u16 warpMusic = GetWarpDestinationMusic(); @@ -1819,7 +1819,7 @@ static void InitCurrentFlashLevelScanlineEffect(void) } else if ((flashLevel = Overworld_GetFlashLevel())) { - sub_80B00E8(flashLevel); + WriteFlashScanlineEffectBuffer(flashLevel); ScanlineEffect_SetParams(sFlashEffectParams); } } -- cgit v1.2.3 From 4ec14b3d431f61309e33ca58c7702678bd25ae7a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 8 Dec 2018 22:05:11 +0100 Subject: Finish field screen --- src/decoration.c | 2 +- src/egg_hatch.c | 2 +- src/field_control_avatar.c | 3 +- src/field_effect.c | 2 +- src/field_fadetransition.c | 1258 ----------------------------------------- src/field_screen_effect.c | 1261 ++++++++++++++++++++++++++++++++++++++++++ src/field_specials.c | 2 +- src/item_use.c | 2 +- src/learn_move.c | 34 +- src/overworld.c | 7 +- src/player_pc.c | 3 +- src/pokemon_storage_system.c | 2 +- src/record_mixing.c | 2 +- src/rom_8011DC0.c | 2 +- src/scrcmd.c | 1 - src/secret_base.c | 4 +- src/shop.c | 2 +- 17 files changed, 1293 insertions(+), 1296 deletions(-) delete mode 100644 src/field_fadetransition.c create mode 100644 src/field_screen_effect.c (limited to 'src') diff --git a/src/decoration.c b/src/decoration.c index eb85b4f5c..4e3e0a2d3 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -16,7 +16,7 @@ #include "field_weather.h" #include "field_player_avatar.h" #include "field_camera.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "event_object_movement.h" #include "list_menu.h" #include "menu_helpers.h" diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 28386528a..a8238253e 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -30,7 +30,7 @@ #include "field_weather.h" #include "international_string_util.h" #include "naming_screen.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "battle.h" // to get rid of later struct EggHatchData diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index c52f5190f..829d72c34 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -8,10 +8,9 @@ #include "event_scripts.h" #include "fieldmap.h" #include "field_control_avatar.h" -#include "field_fadetransition.h" #include "field_player_avatar.h" #include "field_poison.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_specials.h" #include "fldeff_80F9BCC.h" #include "item_menu.h" diff --git a/src/field_effect.c b/src/field_effect.c index 6bfa4facf..58f4f03df 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -6,7 +6,7 @@ #include "field_effect.h" #include "field_effect_helpers.h" #include "field_player_avatar.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_weather.h" #include "fieldmap.h" #include "fldeff_groundshake.h" diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c deleted file mode 100644 index 2d8a6c303..000000000 --- a/src/field_fadetransition.c +++ /dev/null @@ -1,1258 +0,0 @@ -#include "global.h" -#include "cable_club.h" -#include "event_data.h" -#include "fieldmap.h" -#include "field_camera.h" -#include "field_door.h" -#include "field_effect.h" -#include "field_fadetransition.h" -#include "event_object_movement.h" -#include "field_player_avatar.h" -#include "field_special_scene.h" -#include "field_weather.h" -// #include "fldeff_flash.h" -#include "gpu_regs.h" -#include "link.h" -#include "link_rfu.h" -#include "load_save.h" -#include "main.h" -#include "menu.h" -#include "event_obj_lock.h" -#include "metatile_behavior.h" -#include "palette.h" -#include "overworld.h" -#include "scanline_effect.h" -#include "script.h" -#include "sound.h" -#include "start_menu.h" -#include "task.h" -#include "text.h" -#include "constants/event_object_movement_constants.h" -#include "constants/songs.h" -#include "constants/rgb.h" - -extern bool32 sub_81D6534(void); -extern bool8 walkrun_is_standing_still(void); -extern void ScriptUnfreezeEventObjects(void); -extern void sub_81BE72C(void); -extern void sub_80FB768(void); -extern void sub_808D194(void); -extern void sub_808D1C8(void); -extern bool32 sub_808D1B4(void); -extern bool32 sub_808D1E8(void); - -extern const u16 gUnknown_82EC7CC[]; - -void sub_8080B9C(u8); -void task_map_chg_seq_0807E20C(u8); -void task_map_chg_seq_0807E2CC(u8); -void task0A_fade_n_map_maybe(u8); -void sub_808115C(u8); -void palette_bg_faded_fill_white(void); -u8 GetMapPairFadeToType(u8, u8); -u8 GetMapPairFadeFromType(u8, u8); -void sub_808C0A8(u8); -void sub_80AF438(u8); -bool32 sub_80AF71C(void); -void task0A_mpl_807E31C(u8 taskId); -void sub_80AFA0C(u8 taskId); -void sub_80AFA88(u8 taskId); -void sub_80B6B68(void); -void sub_80B6E4C(u8, u8); -void sub_80B75D8(u8); -void sub_80B7A74(u8); -/*static*/ void task50_0807F0C8(u8); - -const u16 sFlashLevelPixelRadii[] = { 200, 72, 64, 56, 48, 40, 32, 24, 0 }; -const s32 gMaxFlashLevel = 8; - -const struct ScanlineEffectParams sFlashEffectParams = -{ - (void *)REG_ADDR_WIN0H, - ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1, - 1 -}; - -void palette_bg_faded_fill_white(void) -{ - CpuFastFill16(RGB_WHITE, gPlttBufferFaded, PLTT_SIZE); -} - -void palette_bg_faded_fill_black(void) -{ - CpuFastFill16(RGB_BLACK, gPlttBufferFaded, PLTT_SIZE); -} - -void pal_fill_for_maplights(void) -{ - u8 previousMapType = GetLastUsedWarpMapType(); - switch (GetMapPairFadeFromType(previousMapType, Overworld_GetMapTypeOfSaveblockLocation())) - { - case 0: - palette_bg_faded_fill_black(); - FadeScreen(FADE_FROM_BLACK, 0); - break; - case 1: - palette_bg_faded_fill_white(); - FadeScreen(FADE_FROM_WHITE, 0); - } -} - -void sub_80AF08C(void) -{ - palette_bg_faded_fill_white(); - FadeScreen(FADE_FROM_WHITE, 8); -} - -void pal_fill_black(void) -{ - palette_bg_faded_fill_black(); - FadeScreen(FADE_FROM_BLACK, 0); -} - -void WarpFadeScreen(void) -{ - u8 currentMapType = Overworld_GetMapTypeOfSaveblockLocation(); - switch (GetMapPairFadeToType(currentMapType, GetDestinationWarpMapHeader()->mapType)) - { - case 0: - FadeScreen(FADE_TO_BLACK, 0); - break; - case 1: - FadeScreen(FADE_TO_WHITE, 0); - } -} - -void sub_80AF0F4(u8 arg) -{ - sub_808C0A8(!arg); -} - -void task0A_nop_for_a_while(u8 taskId) -{ - if (sub_80AF71C() == TRUE) - DestroyTask(taskId); -} - -void sub_80AF128(void) -{ - ScriptContext2_Enable(); - Overworld_PlaySpecialMapMusic(); - pal_fill_black(); - CreateTask(task0A_nop_for_a_while, 10); -} - -void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskID) -{ - if (sub_80AF71C() == TRUE) - { - DestroyTask(taskID); - EnableBothScriptContexts(); - } -} - -void sub_80AF168(void) -{ - ScriptContext2_Enable(); - Overworld_PlaySpecialMapMusic(); - pal_fill_black(); - CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); -} - -void sub_80AF188(void) -{ - ScriptContext2_Enable(); - pal_fill_black(); - CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); -} - -void task_mpl_807DD60(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - switch (task->data[0]) - { - case 0: - task->data[1] = sub_80B3050(); - task->data[0]++; - break; - case 1: - if (gTasks[task->data[1]].isActive != TRUE) - { - pal_fill_for_maplights(); - task->data[0]++; - } - break; - case 2: - if (sub_80AF71C() == TRUE) - { - ScriptContext2_Disable(); - DestroyTask(taskId); - } - break; - } -} - -void sub_80AF214(void) -{ - ScriptContext2_Enable(); - Overworld_PlaySpecialMapMusic(); - palette_bg_faded_fill_black(); - CreateTask(task_mpl_807DD60, 10); -} - -void sub_80AF234(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - switch (task->data[0]) - { - case 0: - sub_800ADF8(); - task->data[0]++; - break; - case 1: - if (!sub_800A520()) - { - if (++task->data[1] > 1800) - sub_8011170(0x6000); - } - else - { - pal_fill_for_maplights(); - task->data[0]++; - } - break; - case 2: - if (sub_80AF71C() == TRUE) - { - sub_8009F18(); - ScriptContext2_Disable(); - DestroyTask(taskId); - } - break; - } -} - -void sub_80AF2B4(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - switch (task->data[0]) - { - case 0: - sub_800ADF8(); - task->data[0]++; - break; - case 1: - if (sub_800A520()) - { - task->data[0]++; - } - break; - case 2: - sub_8009F18(); - sub_8086C2C(); - ScriptContext2_Disable(); - DestroyTask(taskId); - break; - } -} - -void sub_80AF314(void) -{ - ScriptContext2_Enable(); - Overworld_PlaySpecialMapMusic(); - palette_bg_faded_fill_black(); - CreateTask(sub_80AF234, 10); -} - -void sub_80AF334(void) -{ - s16 x, y; - u8 behavior; - TaskFunc func; - - PlayerGetDestCoords(&x, &y); - behavior = MapGridGetMetatileBehaviorAt(x, y); - if (MetatileBehavior_IsDoor(behavior) == TRUE) - func = sub_80AF438; - else if (MetatileBehavior_IsNonAnimDoor(behavior) == TRUE) - func = task_map_chg_seq_0807E20C; - else - func = task_map_chg_seq_0807E2CC; - CreateTask(func, 10); -} - -void mapldr_default(void) -{ - Overworld_PlaySpecialMapMusic(); - pal_fill_for_maplights(); - sub_80AF334(); - ScriptContext2_Enable(); -} - -void sub_80AF3B0(void) -{ - Overworld_PlaySpecialMapMusic(); - sub_80AF08C(); - sub_80AF334(); - ScriptContext2_Enable(); -} - -void sub_80AF3C8(void) -{ - if (!sub_81D6534()) - Overworld_PlaySpecialMapMusic(); - pal_fill_black(); - sub_80AF334(); - ScriptContext2_Enable(); -} - -void sub_80AF3E8(void) -{ - Overworld_PlaySpecialMapMusic(); - pal_fill_for_maplights(); - PlaySE(SE_TK_WARPOUT); - CreateTask(task0A_mpl_807E31C, 10); - ScriptContext2_Enable(); -} - -void sub_80AF40C(void) -{ - Overworld_PlaySpecialMapMusic(); - pal_fill_for_maplights(); - PlaySE(SE_TK_WARPOUT); - CreateTask(task_map_chg_seq_0807E2CC, 10); - ScriptContext2_Enable(); - sub_8085540(0xE); -} - -void sub_80AF438(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - s16 *x = &task->data[2]; - s16 *y = &task->data[3]; - - switch (task->data[0]) - { - case 0: - sub_80AF0F4(0); - FreezeEventObjects(); - PlayerGetDestCoords(x, y); - FieldSetDoorOpened(*x, *y); - task->data[0] = 1; - break; - case 1: - if (sub_80AF71C()) - { - u8 eventObjId; - sub_80AF0F4(1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); - task->data[0] = 2; - } - break; - case 2: - if (walkrun_is_standing_still()) - { - u8 eventObjId; - task->data[1] = FieldAnimateDoorClose(*x, *y); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); - task->data[0] = 3; - } - break; - case 3: - if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) - { - UnfreezeEventObjects(); - task->data[0] = 4; - } - break; - case 4: - ScriptContext2_Disable(); - DestroyTask(taskId); - break; - } -} - -void task_map_chg_seq_0807E20C(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - s16 *x = &task->data[2]; - s16 *y = &task->data[3]; - - switch (task->data[0]) - { - case 0: - sub_80AF0F4(0); - FreezeEventObjects(); - PlayerGetDestCoords(x, y); - task->data[0] = 1; - break; - case 1: - if (sub_80AF71C()) - { - u8 eventObjId; - sub_80AF0F4(1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); - task->data[0] = 2; - } - break; - case 2: - if (walkrun_is_standing_still()) - { - UnfreezeEventObjects(); - task->data[0] = 3; - } - break; - case 3: - ScriptContext2_Disable(); - DestroyTask(taskId); - break; - } -} - -void task_map_chg_seq_0807E2CC(u8 taskId) -{ - switch (gTasks[taskId].data[0]) - { - case 0: - FreezeEventObjects(); - ScriptContext2_Enable(); - gTasks[taskId].data[0]++; - break; - case 1: - if (sub_80AF71C()) - { - UnfreezeEventObjects(); - ScriptContext2_Disable(); - DestroyTask(taskId); - } - break; - } -} - -void sub_80AF660(u8 taskId) -{ - if (sub_80AF71C() == TRUE) - { - DestroyTask(taskId); - CreateTask(sub_809FA34, 80); - } -} - -void sub_80AF688(void) -{ - pal_fill_black(); - CreateTask(sub_80AF660, 0x50); - ScriptContext2_Enable(); -} - -bool32 sub_80AF6A4(void) -{ - sub_809FA18(); - return FALSE; -} - -void task_mpl_807E3C8(u8 taskId) -{ - if (sub_80AF71C() == 1) - { - ScriptContext2_Disable(); - DestroyTask(taskId); - ScriptUnfreezeEventObjects(); - } -} - -void sub_80AF6D4(void) -{ - ScriptContext2_Enable(); - pal_fill_black(); - CreateTask(task_mpl_807E3C8, 10); -} - -void sub_80AF6F0(void) -{ - ScriptContext2_Enable(); - Overworld_PlaySpecialMapMusic(); - pal_fill_black(); - CreateTask(task_mpl_807E3C8, 10); -} - -bool32 PaletteFadeActive(void) -{ - return gPaletteFade.active; -} - -bool32 sub_80AF71C(void) -{ - if (IsWeatherNotFadingIn() == TRUE) - return TRUE; - else - return FALSE; -} - -void sub_80AF734(void) -{ - ScriptContext2_Enable(); - TryFadeOutOldMapMusic(); - WarpFadeScreen(); - PlayRainSoundEffect(); - PlaySE(SE_KAIDAN); - gFieldCallback = mapldr_default; - CreateTask(sub_80AFA0C, 10); -} - -void sp13E_warp_to_last_warp(void) -{ - ScriptContext2_Enable(); - TryFadeOutOldMapMusic(); - WarpFadeScreen(); - PlayRainSoundEffect(); - gFieldCallback = mapldr_default; - CreateTask(sub_80AFA0C, 10); -} - -void sub_80AF79C(void) -{ - ScriptContext2_Enable(); - TryFadeOutOldMapMusic(); - FadeScreen(FADE_TO_WHITE, 8); - PlayRainSoundEffect(); - gFieldCallback = sub_80AF3B0; - CreateTask(sub_80AFA0C, 10); -} - -void sub_80AF7D0(void) -{ - ScriptContext2_Enable(); - gFieldCallback = mapldr_default; - CreateTask(sub_80AFA88, 10); -} - -void sp13F_fall_to_last_warp(void) -{ - sp13E_warp_to_last_warp(); - gFieldCallback = sub_80B6B68; -} - -void sub_80AF80C(u8 metatileBehavior) -{ - ScriptContext2_Enable(); - sub_80B6E4C(metatileBehavior, 10); -} - -void sub_80AF828(void) -{ - ScriptContext2_Enable(); - sub_80B75D8(10); -} - -void sub_80AF838(void) -{ - ScriptContext2_Enable(); - sub_80B7A74(10); -} - -void sub_80AF848(void) -{ - ScriptContext2_Enable(); - TryFadeOutOldMapMusic(); - WarpFadeScreen(); - PlaySE(SE_TK_WARPIN); - CreateTask(sub_80AFA0C, 10); - gFieldCallback = sub_80AF3E8; -} - -void sub_80AF87C(void) -{ - sub_8085540(1); - ScriptContext2_Enable(); - SaveEventObjects(); - TryFadeOutOldMapMusic(); - WarpFadeScreen(); - PlaySE(SE_TK_WARPIN); - CreateTask(sub_80AFA0C, 10); - gFieldCallback = sub_80AF40C; -} - -void sub_80AF8B8(void) -{ - ScriptContext2_Enable(); - WarpFadeScreen(); - CreateTask(sub_80AFA0C, 10); - gFieldCallback = sub_80FB768; -} - -void sub_80AF8E0(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - switch (task->data[0]) - { - case 0: - ScriptContext2_Enable(); - task->data[0]++; - break; - case 1: - if (!PaletteFadeActive() && BGMusicStopped()) - task->data[0]++; - break; - case 2: - WarpIntoMap(); - SetMainCallback2(sub_8086074); - DestroyTask(taskId); - break; - } -} - -void sub_80AF948(void) -{ - ScriptContext2_Enable(); - TryFadeOutOldMapMusic(); - WarpFadeScreen(); - PlaySE(SE_KAIDAN); - CreateTask(sub_80AF8E0, 10); -} - -void sub_80AF96C(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - - switch (data[0]) - { - case 0: - ClearLinkCallback_2(); - FadeScreen(FADE_TO_BLACK, 0); - TryFadeOutOldMapMusic(); - PlaySE(SE_KAIDAN); - data[0]++; - break; - case 1: - if (!PaletteFadeActive() && BGMusicStopped()) - { - sub_800AC34(); - data[0]++; - } - break; - case 2: - if (!gReceivedRemoteLinkPlayers) - { - WarpIntoMap(); - SetMainCallback2(CB2_LoadMap); - DestroyTask(taskId); - } - break; - } -} - -void sub_80AF9F8(void) -{ - CreateTask(sub_80AF96C, 10); -} - -void sub_80AFA0C(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - switch (task->data[0]) - { - case 0: - FreezeEventObjects(); - ScriptContext2_Enable(); - task->data[0]++; - break; - case 1: - if (!PaletteFadeActive()) - { - if (task->data[1] == 0) - { - sub_81BE72C(); - task->data[1] = 1; - } - if (BGMusicStopped()) - task->data[0]++; - } - break; - case 2: - WarpIntoMap(); - SetMainCallback2(CB2_LoadMap); - DestroyTask(taskId); - break; - } -} - -void sub_80AFA88(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - s16 *x = &task->data[2]; - s16 *y = &task->data[3]; - - switch (task->data[0]) - { - case 0: - FreezeEventObjects(); - PlayerGetDestCoords(x, y); - PlaySE(GetDoorSoundEffect(*x, *y - 1)); - task->data[1] = FieldAnimateDoorOpen(*x, *y - 1); - task->data[0] = 1; - break; - case 1: - if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) - { - u8 eventObjId; - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfActive(&gEventObjects[eventObjId]); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_UP); - task->data[0] = 2; - } - break; - case 2: - if (walkrun_is_standing_still()) - { - u8 eventObjId; - task->data[1] = FieldAnimateDoorClose(*x, *y - 1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); - sub_80AF0F4(0); - task->data[0] = 3; - } - break; - case 3: - if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) - { - task->data[0] = 4; - } - break; - case 4: - TryFadeOutOldMapMusic(); - WarpFadeScreen(); - PlayRainSoundEffect(); - task->data[0] = 0; - task->func = sub_80AFA0C; - break; - } -} - -void task0A_fade_n_map_maybe(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - switch (task->data[0]) - { - case 0: - FreezeEventObjects(); - ScriptContext2_Enable(); - task->data[0]++; - break; - case 1: - if (!PaletteFadeActive() && BGMusicStopped()) - { - task->data[0]++; - } - break; - case 2: - WarpIntoMap(); - SetMainCallback2(sub_8086024); - DestroyTask(taskId); - break; - } -} - -void sub_80AFC60(void) -{ - ScriptContext2_Enable(); - TryFadeOutOldMapMusic(); - WarpFadeScreen(); - PlayRainSoundEffect(); - PlaySE(SE_KAIDAN); - gFieldCallback = sub_80AF3C8; - CreateTask(task0A_fade_n_map_maybe, 10); -} - -/*static*/ void SetFlashScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right) -{ - if (y <= 160) - { - if (left < 0) - left = 0; - if (left > 255) - left = 255; - if (right < 0) - right = 0; - if (right > 255) - right = 255; - dest[y] = (left << 8) | right; - } -} - -/*static*/ void SetFlashScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius) -{ - s32 r = radius; - s32 v2 = radius; - s32 v3 = 0; - while (r >= v3) - { - SetFlashScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r); - SetFlashScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r); - SetFlashScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3); - SetFlashScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3); - v2 -= (v3 * 2) - 1; - v3++; - if (v2 < 0) - { - v2 += 2 * (r - 1); - r--; - } - } -} - -/*static*/ void SetFlash2ScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right) -{ - if (y <= 160) - { - if (left < 0) - left = 0; - if (left > 240) - left = 240; - if (right < 0) - right = 0; - if (right > 240) - right = 240; - dest[y] = (left << 8) | right; - } -} - -/*static*/ void SetFlash2ScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius) -{ - s32 r = radius; - s32 v2 = radius; - s32 v3 = 0; - while (r >= v3) - { - SetFlash2ScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r); - SetFlash2ScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r); - SetFlash2ScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3); - SetFlash2ScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3); - v2 -= (v3 * 2) - 1; - v3++; - if (v2 < 0) - { - v2 += 2 * (r - 1); - r--; - } - } -} - -#define tFlashCenterX data[1] -#define tFlashCenterY data[2] -#define tCurFlashRadius data[3] -#define tDestFlashRadius data[4] -#define tFlashRadiusDelta data[5] -#define tClearScanlineEffect data[6] - -/*static*/ void UpdateFlashLevelEffect(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - - switch (data[0]) - { - case 0: - SetFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); - data[0] = 1; - break; - case 1: - SetFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); - data[0] = 0; - tCurFlashRadius += tFlashRadiusDelta; - if (tCurFlashRadius > tDestFlashRadius) - { - if (tClearScanlineEffect == 1) - { - ScanlineEffect_Stop(); - data[0] = 2; - } - else - { - DestroyTask(taskId); - } - } - break; - case 2: - ScanlineEffect_Clear(); - DestroyTask(taskId); - break; - } -} - -/*static*/ void UpdateFlash2LevelEffect(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - - switch (data[0]) - { - case 0: - SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); - data[0] = 1; - break; - case 1: - SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); - data[0] = 0; - tCurFlashRadius += tFlashRadiusDelta; - if (tCurFlashRadius > tDestFlashRadius) - { - if (tClearScanlineEffect == 1) - { - ScanlineEffect_Stop(); - data[0] = 2; - } - else - { - DestroyTask(taskId); - } - } - break; - case 2: - ScanlineEffect_Clear(); - DestroyTask(taskId); - break; - } -} - -/*static*/ void sub_80AFF90(u8 taskId) -{ - if (!FuncIsActiveTask(UpdateFlashLevelEffect)) - { - EnableBothScriptContexts(); - DestroyTask(taskId); - } -} - -/*static*/ void sub_80AFFB8(void) -{ - if (!FuncIsActiveTask(sub_80AFF90)) - CreateTask(sub_80AFF90, 80); -} - -/*static*/ u8 sub_80AFFDC(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) -{ - u8 taskId = CreateTask(UpdateFlashLevelEffect, 80); - s16 *data = gTasks[taskId].data; - - tCurFlashRadius = initialFlashRadius; - tDestFlashRadius = destFlashRadius; - tFlashCenterX = centerX; - tFlashCenterY = centerY; - tClearScanlineEffect = clearScanlineEffect; - - if (initialFlashRadius < destFlashRadius) - tFlashRadiusDelta = delta; - else - tFlashRadiusDelta = -delta; - - return taskId; -} - -/*static*/ u8 sub_80B003C(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) -{ - u8 taskId = CreateTask(UpdateFlash2LevelEffect, 80); - s16 *data = gTasks[taskId].data; - - tCurFlashRadius = initialFlashRadius; - tDestFlashRadius = destFlashRadius; - tFlashCenterX = centerX; - tFlashCenterY = centerY; - tClearScanlineEffect = clearScanlineEffect; - - if (initialFlashRadius < destFlashRadius) - tFlashRadiusDelta = delta; - else - tFlashRadiusDelta = -delta; - - return taskId; -} - -#undef tCurFlashRadius -#undef tDestFlashRadius -#undef tFlashRadiusDelta -#undef tClearScanlineEffect - -void sub_80B009C(u8 flashLevel) -{ - u8 curFlashLevel = Overworld_GetFlashLevel(); - u8 value = 0; - if (!flashLevel) - value = 1; - sub_80AFFDC(120, 80, sFlashLevelPixelRadii[curFlashLevel], sFlashLevelPixelRadii[flashLevel], value, 1); - sub_80AFFB8(); - ScriptContext2_Enable(); -} - -void WriteFlashScanlineEffectBuffer(u8 flashLevel) -{ - if (flashLevel) - { - SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, sFlashLevelPixelRadii[flashLevel]); - CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); - } -} - -void door_upload_tiles(void) -{ - SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, gSaveBlock2Ptr->frontier.field_E68); - CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); -} - -void task0A_mpl_807E31C(u8 taskId) -{ - switch (gTasks[taskId].data[0]) - { - case 0: - FreezeEventObjects(); - ScriptContext2_Enable(); - sub_808D194(); - gTasks[taskId].data[0]++; - break; - case 1: - if (sub_80AF71C() && sub_808D1B4() != TRUE) - { - UnfreezeEventObjects(); - ScriptContext2_Disable(); - DestroyTask(taskId); - } - break; - } -} - -void sub_80B01BC(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - switch (task->data[0]) - { - case 0: - FreezeEventObjects(); - ScriptContext2_Enable(); - PlaySE(SE_TK_WARPIN); - sub_808D1C8(); - task->data[0]++; - break; - case 1: - if (!sub_808D1E8()) - { - WarpFadeScreen(); - task->data[0]++; - } - break; - case 2: - if (!PaletteFadeActive() && BGMusicStopped()) - task->data[0]++; - break; - case 3: - WarpIntoMap(); - SetMainCallback2(CB2_LoadMap); - DestroyTask(taskId); - break; - } -} - -void sub_80B0244(void) -{ - ScriptContext2_Enable(); - CreateTask(sub_80AFA0C, 10); - gFieldCallback = sub_80AF3E8; -} - -void sub_80B0268(void) -{ - ScriptContext2_Enable(); - gFieldCallback = mapldr_default; - CreateTask(sub_80B01BC, 10); -} - -/*static*/ void sub_80B028C(u8 a1) -{ - int i; - u16 color[1]; - - if (!a1) - color[0] = 0x1F; - else - color[0] = 0x7C00; - - for (i = 0; i < 16; i++) - { - LoadPalette(color, 0xF0 + i, 2); - } -} - -/*static*/ bool8 sub_80B02C8(u16 a1) -{ - u8 lo = REG_BLDALPHA & 0xFF; - u8 hi = REG_BLDALPHA >> 8; - - if (a1) - { - if (lo) - { - lo--; - } - } - else - { - if (hi < 0x10) - { - hi++; - } - } - - SetGpuReg(REG_OFFSET_BLDALPHA, (hi << 8) | lo); - - if (lo == 0 && hi == 0x10) - return TRUE; - else - return FALSE; -} - -/*static*/ void sub_80B0318(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - - switch (data[0]) - { - case 0: - data[6] = REG_DISPCNT; - data[7] = REG_BLDCNT; - data[8] = REG_BLDALPHA; - data[9] = REG_WININ; - data[10] = REG_WINOUT; - ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON); - SetGpuRegBits(REG_OFFSET_BLDCNT, gUnknown_82EC7CC[0]); - SetGpuReg(REG_OFFSET_BLDALPHA, 1804); - SetGpuReg(REG_OFFSET_WININ, 63); - SetGpuReg(REG_OFFSET_WINOUT, 30); - sub_8199C30(0, 0, 0, 0x1E, 0x14, 0xF); - schedule_bg_copy_tilemap_to_vram(0); - SetFlash2ScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], data[2], data[3], 1); - CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); - ScanlineEffect_SetParams(sFlashEffectParams); - data[0] = 1; - break; - case 1: - sub_8199DF0(0, 17, 0, 1); - sub_80B028C(data[1]); - sub_80B003C(data[2], data[3], 1, 160, 1, 2); - data[0] = 2; - break; - case 2: - if (!FuncIsActiveTask(UpdateFlash2LevelEffect)) - { - EnableBothScriptContexts(); - data[0] = 3; - } - break; - case 3: - InstallCameraPanAheadCallback(); - SetCameraPanningCallback(NULL); - data[5] = 0; - data[4] = 4; - data[0] = 4; - break; - case 4: - data[4]--; - if (!data[4]) - { - s32 panning; - data[4] = 4; - data[5] ^= 1; - if (data[5]) - panning = 4; - else - panning = -4; - SetCameraPanning(0, panning); - } - break; - case 6: - InstallCameraPanAheadCallback(); - data[4] = 8; - data[0] = 7; - break; - case 7: - data[4]--; - if (!data[4]) - { - data[4] = 8; - data[5] ^= 1; - if (sub_80B02C8(data[5]) == TRUE) - { - data[0] = 5; - sub_8199DF0(0, 0, 0, 1); - } - } - break; - case 5: - SetGpuReg(REG_OFFSET_WIN0H, 255); - SetGpuReg(REG_OFFSET_DISPCNT, data[6]); - SetGpuReg(REG_OFFSET_BLDCNT, data[7]); - SetGpuReg(REG_OFFSET_BLDALPHA, data[8]); - SetGpuReg(REG_OFFSET_WININ, data[9]); - SetGpuReg(REG_OFFSET_WINOUT, data[10]); - EnableBothScriptContexts(); - DestroyTask(taskId); - break; - } -} - -void sub_80B0534(void) -{ - u8 taskId = CreateTask(sub_80B0318, 80); - s16 *data = gTasks[taskId].data; - - if (gSpecialVar_Result == 0) - { - data[1] = 0; - data[2] = 104; - } - else if (gSpecialVar_Result == 1) - { - data[1] = 1; - data[2] = 136; - } - else if (gSpecialVar_Result == 2) - { - data[1] = 0; - data[2] = 120; - } - else - { - data[1] = 1; - data[2] = 120; - } - - data[3] = 80; -} - -void sub_80B058C(void) -{ - u8 taskId = FindTaskIdByFunc(sub_80B0318); - gTasks[taskId].data[0] = 6; -} - -void sub_80B05B4(void) -{ - Overworld_FadeOutMapMusic(); - CreateTask(task50_0807F0C8, 80); -} - -/*static*/ void task50_0807F0C8(u8 taskId) -{ - if (BGMusicStopped() == TRUE) - { - DestroyTask(taskId); - EnableBothScriptContexts(); - } -} diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c new file mode 100644 index 000000000..0de86d4f4 --- /dev/null +++ b/src/field_screen_effect.c @@ -0,0 +1,1261 @@ +#include "global.h" +#include "cable_club.h" +#include "event_data.h" +#include "fieldmap.h" +#include "field_camera.h" +#include "field_door.h" +#include "field_effect.h" +#include "event_object_movement.h" +#include "field_player_avatar.h" +#include "field_screen_effect.h" +#include "field_special_scene.h" +#include "field_weather.h" +// #include "fldeff_flash.h" +#include "gpu_regs.h" +#include "link.h" +#include "link_rfu.h" +#include "load_save.h" +#include "main.h" +#include "menu.h" +#include "event_obj_lock.h" +#include "metatile_behavior.h" +#include "palette.h" +#include "overworld.h" +#include "scanline_effect.h" +#include "script.h" +#include "sound.h" +#include "start_menu.h" +#include "task.h" +#include "text.h" +#include "constants/event_object_movement_constants.h" +#include "constants/songs.h" +#include "constants/rgb.h" + +extern bool32 sub_81D6534(void); +extern bool8 walkrun_is_standing_still(void); +extern void ScriptUnfreezeEventObjects(void); +extern void sub_81BE72C(void); +extern void sub_80FB768(void); +extern void sub_808D194(void); +extern void sub_808D1C8(void); +extern bool32 sub_808D1B4(void); +extern bool32 sub_808D1E8(void); +extern void sub_80B6B68(void); +extern void sub_80B6E4C(u8, u8); +extern void sub_80B75D8(u8); +extern void sub_80B7A74(u8); +extern void sub_808C0A8(u8); +extern u8 GetMapPairFadeToType(u8, u8); +extern u8 GetMapPairFadeFromType(u8, u8); + +extern const u16 gUnknown_82EC7CC[]; + +// This file's functions. +static void sub_8080B9C(u8); +static void task_map_chg_seq_0807E20C(u8); +static void task_map_chg_seq_0807E2CC(u8); +static void task0A_fade_n_map_maybe(u8); +static void sub_808115C(u8); +static void palette_bg_faded_fill_white(void); +static void sub_80AF438(u8); +static bool32 sub_80AF71C(void); +static void task0A_mpl_807E31C(u8 taskId); +static void sub_80AFA0C(u8 taskId); +static void sub_80AFA88(u8 taskId); +static void task50_0807F0C8(u8); + +// const +const u16 sFlashLevelPixelRadii[] = { 200, 72, 64, 56, 48, 40, 32, 24, 0 }; +const s32 gMaxFlashLevel = 8; + +const struct ScanlineEffectParams sFlashEffectParams = +{ + (void *)REG_ADDR_WIN0H, + ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1, + 1 +}; + +// code +static void palette_bg_faded_fill_white(void) +{ + CpuFastFill16(RGB_WHITE, gPlttBufferFaded, PLTT_SIZE); +} + +static void palette_bg_faded_fill_black(void) +{ + CpuFastFill16(RGB_BLACK, gPlttBufferFaded, PLTT_SIZE); +} + +void pal_fill_for_maplights(void) +{ + u8 previousMapType = GetLastUsedWarpMapType(); + switch (GetMapPairFadeFromType(previousMapType, Overworld_GetMapTypeOfSaveblockLocation())) + { + case 0: + palette_bg_faded_fill_black(); + FadeScreen(FADE_FROM_BLACK, 0); + break; + case 1: + palette_bg_faded_fill_white(); + FadeScreen(FADE_FROM_WHITE, 0); + } +} + +static void sub_80AF08C(void) +{ + palette_bg_faded_fill_white(); + FadeScreen(FADE_FROM_WHITE, 8); +} + +void pal_fill_black(void) +{ + palette_bg_faded_fill_black(); + FadeScreen(FADE_FROM_BLACK, 0); +} + +void WarpFadeScreen(void) +{ + u8 currentMapType = Overworld_GetMapTypeOfSaveblockLocation(); + switch (GetMapPairFadeToType(currentMapType, GetDestinationWarpMapHeader()->mapType)) + { + case 0: + FadeScreen(FADE_TO_BLACK, 0); + break; + case 1: + FadeScreen(FADE_TO_WHITE, 0); + } +} + +static void sub_80AF0F4(u8 arg) +{ + sub_808C0A8(!arg); +} + +static void task0A_nop_for_a_while(u8 taskId) +{ + if (sub_80AF71C() == TRUE) + DestroyTask(taskId); +} + +void sub_80AF128(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + CreateTask(task0A_nop_for_a_while, 10); +} + +static void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskID) +{ + if (sub_80AF71C() == TRUE) + { + DestroyTask(taskID); + EnableBothScriptContexts(); + } +} + +void sub_80AF168(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); +} + +void sub_80AF188(void) +{ + ScriptContext2_Enable(); + pal_fill_black(); + CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); +} + +static void task_mpl_807DD60(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + task->data[1] = sub_80B3050(); + task->data[0]++; + break; + case 1: + if (gTasks[task->data[1]].isActive != TRUE) + { + pal_fill_for_maplights(); + task->data[0]++; + } + break; + case 2: + if (sub_80AF71C() == TRUE) + { + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +void sub_80AF214(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + palette_bg_faded_fill_black(); + CreateTask(task_mpl_807DD60, 10); +} + +static void sub_80AF234(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + sub_800ADF8(); + task->data[0]++; + break; + case 1: + if (!sub_800A520()) + { + if (++task->data[1] > 1800) + sub_8011170(0x6000); + } + else + { + pal_fill_for_maplights(); + task->data[0]++; + } + break; + case 2: + if (sub_80AF71C() == TRUE) + { + sub_8009F18(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +void sub_80AF2B4(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + sub_800ADF8(); + task->data[0]++; + break; + case 1: + if (sub_800A520()) + { + task->data[0]++; + } + break; + case 2: + sub_8009F18(); + sub_8086C2C(); + ScriptContext2_Disable(); + DestroyTask(taskId); + break; + } +} + +void sub_80AF314(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + palette_bg_faded_fill_black(); + CreateTask(sub_80AF234, 10); +} + +static void sub_80AF334(void) +{ + s16 x, y; + u8 behavior; + TaskFunc func; + + PlayerGetDestCoords(&x, &y); + behavior = MapGridGetMetatileBehaviorAt(x, y); + if (MetatileBehavior_IsDoor(behavior) == TRUE) + func = sub_80AF438; + else if (MetatileBehavior_IsNonAnimDoor(behavior) == TRUE) + func = task_map_chg_seq_0807E20C; + else + func = task_map_chg_seq_0807E2CC; + CreateTask(func, 10); +} + +void mapldr_default(void) +{ + Overworld_PlaySpecialMapMusic(); + pal_fill_for_maplights(); + sub_80AF334(); + ScriptContext2_Enable(); +} + +void sub_80AF3B0(void) +{ + Overworld_PlaySpecialMapMusic(); + sub_80AF08C(); + sub_80AF334(); + ScriptContext2_Enable(); +} + +void sub_80AF3C8(void) +{ + if (!sub_81D6534()) + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + sub_80AF334(); + ScriptContext2_Enable(); +} + +void sub_80AF3E8(void) +{ + Overworld_PlaySpecialMapMusic(); + pal_fill_for_maplights(); + PlaySE(SE_TK_WARPOUT); + CreateTask(task0A_mpl_807E31C, 10); + ScriptContext2_Enable(); +} + +void sub_80AF40C(void) +{ + Overworld_PlaySpecialMapMusic(); + pal_fill_for_maplights(); + PlaySE(SE_TK_WARPOUT); + CreateTask(task_map_chg_seq_0807E2CC, 10); + ScriptContext2_Enable(); + sub_8085540(0xE); +} + +static void sub_80AF438(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + s16 *x = &task->data[2]; + s16 *y = &task->data[3]; + + switch (task->data[0]) + { + case 0: + sub_80AF0F4(0); + FreezeEventObjects(); + PlayerGetDestCoords(x, y); + FieldSetDoorOpened(*x, *y); + task->data[0] = 1; + break; + case 1: + if (sub_80AF71C()) + { + u8 eventObjId; + sub_80AF0F4(1); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); + task->data[0] = 2; + } + break; + case 2: + if (walkrun_is_standing_still()) + { + u8 eventObjId; + task->data[1] = FieldAnimateDoorClose(*x, *y); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + task->data[0] = 3; + } + break; + case 3: + if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) + { + UnfreezeEventObjects(); + task->data[0] = 4; + } + break; + case 4: + ScriptContext2_Disable(); + DestroyTask(taskId); + break; + } +} + +static void task_map_chg_seq_0807E20C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + s16 *x = &task->data[2]; + s16 *y = &task->data[3]; + + switch (task->data[0]) + { + case 0: + sub_80AF0F4(0); + FreezeEventObjects(); + PlayerGetDestCoords(x, y); + task->data[0] = 1; + break; + case 1: + if (sub_80AF71C()) + { + u8 eventObjId; + sub_80AF0F4(1); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectSetHeldMovement(&gEventObjects[eventObjId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); + task->data[0] = 2; + } + break; + case 2: + if (walkrun_is_standing_still()) + { + UnfreezeEventObjects(); + task->data[0] = 3; + } + break; + case 3: + ScriptContext2_Disable(); + DestroyTask(taskId); + break; + } +} + +static void task_map_chg_seq_0807E2CC(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + gTasks[taskId].data[0]++; + break; + case 1: + if (sub_80AF71C()) + { + UnfreezeEventObjects(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +static void sub_80AF660(u8 taskId) +{ + if (sub_80AF71C() == TRUE) + { + DestroyTask(taskId); + CreateTask(sub_809FA34, 80); + } +} + +void sub_80AF688(void) +{ + pal_fill_black(); + CreateTask(sub_80AF660, 0x50); + ScriptContext2_Enable(); +} + +bool8 sub_80AF6A4(void) +{ + sub_809FA18(); + return FALSE; +} + +static void task_mpl_807E3C8(u8 taskId) +{ + if (sub_80AF71C() == 1) + { + ScriptContext2_Disable(); + DestroyTask(taskId); + ScriptUnfreezeEventObjects(); + } +} + +void sub_80AF6D4(void) +{ + ScriptContext2_Enable(); + pal_fill_black(); + CreateTask(task_mpl_807E3C8, 10); +} + +void sub_80AF6F0(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + CreateTask(task_mpl_807E3C8, 10); +} + +static bool32 PaletteFadeActive(void) +{ + return gPaletteFade.active; +} + +static bool32 sub_80AF71C(void) +{ + if (IsWeatherNotFadingIn() == TRUE) + return TRUE; + else + return FALSE; +} + +void sub_80AF734(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + PlaySE(SE_KAIDAN); + gFieldCallback = mapldr_default; + CreateTask(sub_80AFA0C, 10); +} + +void sp13E_warp_to_last_warp(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + gFieldCallback = mapldr_default; + CreateTask(sub_80AFA0C, 10); +} + +void sub_80AF79C(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + FadeScreen(FADE_TO_WHITE, 8); + PlayRainSoundEffect(); + gFieldCallback = sub_80AF3B0; + CreateTask(sub_80AFA0C, 10); +} + +void sub_80AF7D0(void) +{ + ScriptContext2_Enable(); + gFieldCallback = mapldr_default; + CreateTask(sub_80AFA88, 10); +} + +void sp13F_fall_to_last_warp(void) +{ + sp13E_warp_to_last_warp(); + gFieldCallback = sub_80B6B68; +} + +void sub_80AF80C(u8 metatileBehavior) +{ + ScriptContext2_Enable(); + sub_80B6E4C(metatileBehavior, 10); +} + +void sub_80AF828(void) +{ + ScriptContext2_Enable(); + sub_80B75D8(10); +} + +void sub_80AF838(void) +{ + ScriptContext2_Enable(); + sub_80B7A74(10); +} + +void sub_80AF848(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlaySE(SE_TK_WARPIN); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80AF3E8; +} + +void sub_80AF87C(void) +{ + sub_8085540(1); + ScriptContext2_Enable(); + SaveEventObjects(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlaySE(SE_TK_WARPIN); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80AF40C; +} + +void sub_80AF8B8(void) +{ + ScriptContext2_Enable(); + WarpFadeScreen(); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80FB768; +} + +static void sub_80AF8E0(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + ScriptContext2_Enable(); + task->data[0]++; + break; + case 1: + if (!PaletteFadeActive() && BGMusicStopped()) + task->data[0]++; + break; + case 2: + WarpIntoMap(); + SetMainCallback2(sub_8086074); + DestroyTask(taskId); + break; + } +} + +void sub_80AF948(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlaySE(SE_KAIDAN); + CreateTask(sub_80AF8E0, 10); +} + +static void sub_80AF96C(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + ClearLinkCallback_2(); + FadeScreen(FADE_TO_BLACK, 0); + TryFadeOutOldMapMusic(); + PlaySE(SE_KAIDAN); + data[0]++; + break; + case 1: + if (!PaletteFadeActive() && BGMusicStopped()) + { + sub_800AC34(); + data[0]++; + } + break; + case 2: + if (!gReceivedRemoteLinkPlayers) + { + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + } + break; + } +} + +void sub_80AF9F8(void) +{ + CreateTask(sub_80AF96C, 10); +} + +static void sub_80AFA0C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + task->data[0]++; + break; + case 1: + if (!PaletteFadeActive()) + { + if (task->data[1] == 0) + { + sub_81BE72C(); + task->data[1] = 1; + } + if (BGMusicStopped()) + task->data[0]++; + } + break; + case 2: + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + break; + } +} + +static void sub_80AFA88(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + s16 *x = &task->data[2]; + s16 *y = &task->data[3]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + PlayerGetDestCoords(x, y); + PlaySE(GetDoorSoundEffect(*x, *y - 1)); + task->data[1] = FieldAnimateDoorOpen(*x, *y - 1); + task->data[0] = 1; + break; + case 1: + if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) + { + u8 eventObjId; + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearHeldMovementIfActive(&gEventObjects[eventObjId]); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_UP); + task->data[0] = 2; + } + break; + case 2: + if (walkrun_is_standing_still()) + { + u8 eventObjId; + task->data[1] = FieldAnimateDoorClose(*x, *y - 1); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + sub_80AF0F4(0); + task->data[0] = 3; + } + break; + case 3: + if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) + { + task->data[0] = 4; + } + break; + case 4: + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + task->data[0] = 0; + task->func = sub_80AFA0C; + break; + } +} + +static void task0A_fade_n_map_maybe(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + task->data[0]++; + break; + case 1: + if (!PaletteFadeActive() && BGMusicStopped()) + { + task->data[0]++; + } + break; + case 2: + WarpIntoMap(); + SetMainCallback2(sub_8086024); + DestroyTask(taskId); + break; + } +} + +void sub_80AFC60(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + PlaySE(SE_KAIDAN); + gFieldCallback = sub_80AF3C8; + CreateTask(task0A_fade_n_map_maybe, 10); +} + +static void SetFlashScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right) +{ + if (y <= 160) + { + if (left < 0) + left = 0; + if (left > 255) + left = 255; + if (right < 0) + right = 0; + if (right > 255) + right = 255; + dest[y] = (left << 8) | right; + } +} + +static void SetFlashScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius) +{ + s32 r = radius; + s32 v2 = radius; + s32 v3 = 0; + while (r >= v3) + { + SetFlashScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r); + SetFlashScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r); + SetFlashScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3); + SetFlashScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3); + v2 -= (v3 * 2) - 1; + v3++; + if (v2 < 0) + { + v2 += 2 * (r - 1); + r--; + } + } +} + +static void SetFlash2ScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right) +{ + if (y <= 160) + { + if (left < 0) + left = 0; + if (left > 240) + left = 240; + if (right < 0) + right = 0; + if (right > 240) + right = 240; + dest[y] = (left << 8) | right; + } +} + +static void SetFlash2ScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius) +{ + s32 r = radius; + s32 v2 = radius; + s32 v3 = 0; + while (r >= v3) + { + SetFlash2ScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r); + SetFlash2ScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r); + SetFlash2ScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3); + SetFlash2ScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3); + v2 -= (v3 * 2) - 1; + v3++; + if (v2 < 0) + { + v2 += 2 * (r - 1); + r--; + } + } +} + +#define tFlashCenterX data[1] +#define tFlashCenterY data[2] +#define tCurFlashRadius data[3] +#define tDestFlashRadius data[4] +#define tFlashRadiusDelta data[5] +#define tClearScanlineEffect data[6] + +static void UpdateFlashLevelEffect(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + SetFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 1; + break; + case 1: + SetFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 0; + tCurFlashRadius += tFlashRadiusDelta; + if (tCurFlashRadius > tDestFlashRadius) + { + if (tClearScanlineEffect == 1) + { + ScanlineEffect_Stop(); + data[0] = 2; + } + else + { + DestroyTask(taskId); + } + } + break; + case 2: + ScanlineEffect_Clear(); + DestroyTask(taskId); + break; + } +} + +static void UpdateFlash2LevelEffect(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 1; + break; + case 1: + SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 0; + tCurFlashRadius += tFlashRadiusDelta; + if (tCurFlashRadius > tDestFlashRadius) + { + if (tClearScanlineEffect == 1) + { + ScanlineEffect_Stop(); + data[0] = 2; + } + else + { + DestroyTask(taskId); + } + } + break; + case 2: + ScanlineEffect_Clear(); + DestroyTask(taskId); + break; + } +} + +static void sub_80AFF90(u8 taskId) +{ + if (!FuncIsActiveTask(UpdateFlashLevelEffect)) + { + EnableBothScriptContexts(); + DestroyTask(taskId); + } +} + +static void sub_80AFFB8(void) +{ + if (!FuncIsActiveTask(sub_80AFF90)) + CreateTask(sub_80AFF90, 80); +} + +static u8 sub_80AFFDC(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) +{ + u8 taskId = CreateTask(UpdateFlashLevelEffect, 80); + s16 *data = gTasks[taskId].data; + + tCurFlashRadius = initialFlashRadius; + tDestFlashRadius = destFlashRadius; + tFlashCenterX = centerX; + tFlashCenterY = centerY; + tClearScanlineEffect = clearScanlineEffect; + + if (initialFlashRadius < destFlashRadius) + tFlashRadiusDelta = delta; + else + tFlashRadiusDelta = -delta; + + return taskId; +} + +static u8 sub_80B003C(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) +{ + u8 taskId = CreateTask(UpdateFlash2LevelEffect, 80); + s16 *data = gTasks[taskId].data; + + tCurFlashRadius = initialFlashRadius; + tDestFlashRadius = destFlashRadius; + tFlashCenterX = centerX; + tFlashCenterY = centerY; + tClearScanlineEffect = clearScanlineEffect; + + if (initialFlashRadius < destFlashRadius) + tFlashRadiusDelta = delta; + else + tFlashRadiusDelta = -delta; + + return taskId; +} + +#undef tCurFlashRadius +#undef tDestFlashRadius +#undef tFlashRadiusDelta +#undef tClearScanlineEffect + +void sub_80B009C(u8 flashLevel) +{ + u8 curFlashLevel = Overworld_GetFlashLevel(); + u8 value = 0; + if (!flashLevel) + value = 1; + sub_80AFFDC(120, 80, sFlashLevelPixelRadii[curFlashLevel], sFlashLevelPixelRadii[flashLevel], value, 1); + sub_80AFFB8(); + ScriptContext2_Enable(); +} + +void WriteFlashScanlineEffectBuffer(u8 flashLevel) +{ + if (flashLevel) + { + SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, sFlashLevelPixelRadii[flashLevel]); + CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); + } +} + +void door_upload_tiles(void) +{ + SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, gSaveBlock2Ptr->frontier.field_E68); + CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); +} + +static void task0A_mpl_807E31C(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + sub_808D194(); + gTasks[taskId].data[0]++; + break; + case 1: + if (sub_80AF71C() && sub_808D1B4() != TRUE) + { + UnfreezeEventObjects(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +static void sub_80B01BC(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + PlaySE(SE_TK_WARPIN); + sub_808D1C8(); + task->data[0]++; + break; + case 1: + if (!sub_808D1E8()) + { + WarpFadeScreen(); + task->data[0]++; + } + break; + case 2: + if (!PaletteFadeActive() && BGMusicStopped()) + task->data[0]++; + break; + case 3: + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + break; + } +} + +void sub_80B0244(void) +{ + ScriptContext2_Enable(); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80AF3E8; +} + +void sub_80B0268(void) +{ + ScriptContext2_Enable(); + gFieldCallback = mapldr_default; + CreateTask(sub_80B01BC, 10); +} + +static void sub_80B028C(u8 a1) +{ + int i; + u16 color[1]; + + if (!a1) + color[0] = 0x1F; + else + color[0] = 0x7C00; + + for (i = 0; i < 16; i++) + { + LoadPalette(color, 0xF0 + i, 2); + } +} + +static bool8 sub_80B02C8(u16 a1) +{ + u8 lo = REG_BLDALPHA & 0xFF; + u8 hi = REG_BLDALPHA >> 8; + + if (a1) + { + if (lo) + { + lo--; + } + } + else + { + if (hi < 0x10) + { + hi++; + } + } + + SetGpuReg(REG_OFFSET_BLDALPHA, (hi << 8) | lo); + + if (lo == 0 && hi == 0x10) + return TRUE; + else + return FALSE; +} + +static void sub_80B0318(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + data[6] = REG_DISPCNT; + data[7] = REG_BLDCNT; + data[8] = REG_BLDALPHA; + data[9] = REG_WININ; + data[10] = REG_WINOUT; + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON); + SetGpuRegBits(REG_OFFSET_BLDCNT, gUnknown_82EC7CC[0]); + SetGpuReg(REG_OFFSET_BLDALPHA, 1804); + SetGpuReg(REG_OFFSET_WININ, 63); + SetGpuReg(REG_OFFSET_WINOUT, 30); + sub_8199C30(0, 0, 0, 0x1E, 0x14, 0xF); + schedule_bg_copy_tilemap_to_vram(0); + SetFlash2ScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], data[2], data[3], 1); + CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); + ScanlineEffect_SetParams(sFlashEffectParams); + data[0] = 1; + break; + case 1: + sub_8199DF0(0, 17, 0, 1); + sub_80B028C(data[1]); + sub_80B003C(data[2], data[3], 1, 160, 1, 2); + data[0] = 2; + break; + case 2: + if (!FuncIsActiveTask(UpdateFlash2LevelEffect)) + { + EnableBothScriptContexts(); + data[0] = 3; + } + break; + case 3: + InstallCameraPanAheadCallback(); + SetCameraPanningCallback(NULL); + data[5] = 0; + data[4] = 4; + data[0] = 4; + break; + case 4: + data[4]--; + if (!data[4]) + { + s32 panning; + data[4] = 4; + data[5] ^= 1; + if (data[5]) + panning = 4; + else + panning = -4; + SetCameraPanning(0, panning); + } + break; + case 6: + InstallCameraPanAheadCallback(); + data[4] = 8; + data[0] = 7; + break; + case 7: + data[4]--; + if (!data[4]) + { + data[4] = 8; + data[5] ^= 1; + if (sub_80B02C8(data[5]) == TRUE) + { + data[0] = 5; + sub_8199DF0(0, 0, 0, 1); + } + } + break; + case 5: + SetGpuReg(REG_OFFSET_WIN0H, 255); + SetGpuReg(REG_OFFSET_DISPCNT, data[6]); + SetGpuReg(REG_OFFSET_BLDCNT, data[7]); + SetGpuReg(REG_OFFSET_BLDALPHA, data[8]); + SetGpuReg(REG_OFFSET_WININ, data[9]); + SetGpuReg(REG_OFFSET_WINOUT, data[10]); + EnableBothScriptContexts(); + DestroyTask(taskId); + break; + } +} + +void sub_80B0534(void) +{ + u8 taskId = CreateTask(sub_80B0318, 80); + s16 *data = gTasks[taskId].data; + + if (gSpecialVar_Result == 0) + { + data[1] = 0; + data[2] = 104; + } + else if (gSpecialVar_Result == 1) + { + data[1] = 1; + data[2] = 136; + } + else if (gSpecialVar_Result == 2) + { + data[1] = 0; + data[2] = 120; + } + else + { + data[1] = 1; + data[2] = 120; + } + + data[3] = 80; +} + +void sub_80B058C(void) +{ + u8 taskId = FindTaskIdByFunc(sub_80B0318); + gTasks[taskId].data[0] = 6; +} + +void sub_80B05B4(void) +{ + Overworld_FadeOutMapMusic(); + CreateTask(task50_0807F0C8, 80); +} + +static void task50_0807F0C8(u8 taskId) +{ + if (BGMusicStopped() == TRUE) + { + DestroyTask(taskId); + EnableBothScriptContexts(); + } +} diff --git a/src/field_specials.c b/src/field_specials.c index 4da751b27..0842555b9 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -12,7 +12,7 @@ #include "field_effect.h" #include "field_message_box.h" #include "field_player_avatar.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_specials.h" #include "field_weather.h" #include "international_string_util.h" diff --git a/src/item_use.c b/src/item_use.c index 4ab9f6e23..8399a1861 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -10,7 +10,7 @@ #include "fieldmap.h" #include "event_object_movement.h" #include "field_player_avatar.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_weather.h" #include "item.h" #include "item_menu.h" diff --git a/src/learn_move.c b/src/learn_move.c index 7717a5193..38e081a38 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -5,7 +5,7 @@ #include "contest_effect.h" #include "data2.h" #include "event_data.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "gpu_regs.h" #include "learn_move.h" #include "list_menu.h" @@ -52,7 +52,7 @@ static EWRAM_DATA struct { const u16 gUnknown_085CE9F8[] = INCBIN_U16("graphics/interface/ui_learn_move.gbapal"); const u8 gUnknown_085CEA18[] = INCBIN_U8("graphics/interface/ui_learn_move.4bpp"); -const struct OamData gUnknown_085CEB98 = +const struct OamData gUnknown_085CEB98 = { .y = 0, .affineMode = 0, @@ -69,7 +69,7 @@ const struct OamData gUnknown_085CEB98 = .affineParam = 0, }; -const struct OamData gUnknown_085CEBA0 = +const struct OamData gUnknown_085CEBA0 = { .y = 0, .affineMode = 0, @@ -86,7 +86,7 @@ const struct OamData gUnknown_085CEBA0 = .affineParam = 0, }; -const struct OamData gUnknown_085CEBA8 = +const struct OamData gUnknown_085CEBA8 = { .y = 0, .affineMode = 0, @@ -103,20 +103,20 @@ const struct OamData gUnknown_085CEBA8 = .affineParam = 0, }; -const struct SpriteSheet gUnknown_085CEBB0 = +const struct SpriteSheet gUnknown_085CEBB0 = { .data = gUnknown_085CEA18, .size = 0x180, .tag = 5525 }; -const struct SpritePalette gUnknown_085CEBB8 = +const struct SpritePalette gUnknown_085CEBB8 = { .data = gUnknown_085CE9F8, .tag = 5526 }; -const struct ScrollArrowsTemplate gUnknown_085CEBC0 = +const struct ScrollArrowsTemplate gUnknown_085CEBC0 = { .firstArrowType = 0, .firstX = 27, @@ -131,7 +131,7 @@ const struct ScrollArrowsTemplate gUnknown_085CEBC0 = .palNum = 0, }; -const struct ScrollArrowsTemplate gUnknown_085CEBD0 = +const struct ScrollArrowsTemplate gUnknown_085CEBD0 = { .firstArrowType = 2, .firstX = 192, @@ -146,31 +146,31 @@ const struct ScrollArrowsTemplate gUnknown_085CEBD0 = .palNum = 0, }; -const union AnimCmd gUnknown_085CEBE0[] = +const union AnimCmd gUnknown_085CEBE0[] = { ANIMCMD_FRAME(8, 5, FALSE, FALSE), ANIMCMD_END }; -const union AnimCmd gUnknown_085CEBE8[] = +const union AnimCmd gUnknown_085CEBE8[] = { ANIMCMD_FRAME(9, 5, FALSE, FALSE), ANIMCMD_END }; -const union AnimCmd gUnknown_085CEBF0[] = +const union AnimCmd gUnknown_085CEBF0[] = { ANIMCMD_FRAME(10, 5, FALSE, FALSE), ANIMCMD_END }; -const union AnimCmd gUnknown_085CEBF8[] = +const union AnimCmd gUnknown_085CEBF8[] = { ANIMCMD_FRAME(11, 5, FALSE, FALSE), ANIMCMD_END }; -const union AnimCmd *const gUnknown_085CEC00[] = +const union AnimCmd *const gUnknown_085CEC00[] = { gUnknown_085CEBE0, gUnknown_085CEBE8, @@ -178,7 +178,7 @@ const union AnimCmd *const gUnknown_085CEC00[] = gUnknown_085CEBF8, }; -const struct SpriteTemplate gUnknown_085CEC10 = +const struct SpriteTemplate gUnknown_085CEC10 = { .tileTag = 5525, .paletteTag = 5526, @@ -707,7 +707,7 @@ static void CreateHearts(void) sLearnMoveStruct->scrollArrowTaskId2 = -1; sLearnMoveStruct->scrollArrowTaskId1 = -1; AddScrollArrows(); - + for (i = 0; i < 8; i++) { sLearnMoveStruct->spriteIds[i] = CreateSprite(&gUnknown_085CEC10, (i - (i / 4) * 4) * 8 + 104, (i / 4) * 8 + 36, 0); @@ -791,7 +791,7 @@ void ShowHideHearts(s32 item) else { numHearts = (u8)(gContestEffects[gContestMoves[item].effect].appeal / 10); - + if (numHearts == 0xFF) { numHearts = 0; @@ -811,7 +811,7 @@ void ShowHideHearts(s32 item) } numHearts = (u8)(gContestEffects[gContestMoves[item].effect].jam / 10); - + if (numHearts == 0xFF) { numHearts = 0; diff --git a/src/overworld.c b/src/overworld.c index a60ac9a54..8d8675487 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -4,18 +4,17 @@ #include "battle_setup.h" #include "berry.h" #include "bg.h" -// #include "cable_club.h" +#include "cable_club.h" #include "clock.h" #include "event_data.h" #include "field_camera.h" #include "field_control_avatar.h" #include "field_effect.h" -#include "field_fadetransition.h" #include "event_object_movement.h" #include "field_message_box.h" #include "field_player_avatar.h" #include "field_screen_effect.h" -// #include "field_special_scene.h" +#include "field_special_scene.h" #include "field_specials.h" #include "field_tasks.h" #include "field_weather.h" @@ -38,7 +37,7 @@ #include "play_time.h" #include "random.h" #include "roamer.h" -// #include "rotating_gate.h" +#include "rotating_gate.h" #include "safari_zone.h" #include "save.h" #include "save_location.h" diff --git a/src/player_pc.c b/src/player_pc.c index 59ba36350..864c13acd 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -3,9 +3,8 @@ #include "bg.h" #include "decoration.h" #include "event_scripts.h" -#include "field_fadetransition.h" #include "event_object_movement.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_weather.h" #include "international_string_util.h" #include "item.h" diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 465b97da2..ad56b1678 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1,7 +1,7 @@ #include "global.h" #include "bg.h" #include "event_data.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_weather.h" #include "gpu_regs.h" #include "international_string_util.h" diff --git a/src/record_mixing.c b/src/record_mixing.c index df4a1a720..a497f9cd8 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -22,7 +22,7 @@ #include "constants/songs.h" #include "menu.h" #include "overworld.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "fldeff_80F9BCC.h" #include "script.h" #include "event_data.h" diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index a197598de..af4e031dc 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -32,7 +32,7 @@ #include "decompress.h" #include "start_menu.h" #include "data2.h" -#include "field_screen.h" +#include "field_screen_effect.h" extern void HealPlayerParty(void); diff --git a/src/scrcmd.c b/src/scrcmd.c index 310387337..579f804e2 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -13,7 +13,6 @@ #include "event_data.h" #include "field_door.h" #include "field_effect.h" -#include "field_fadetransition.h" #include "event_object_movement.h" #include "field_message_box.h" #include "field_player_avatar.h" diff --git a/src/secret_base.c b/src/secret_base.c index 8436d8520..84d70061e 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1,5 +1,3 @@ - -// Includes #include "global.h" #include "constants/bg_event_constants.h" #include "constants/decorations.h" @@ -19,7 +17,7 @@ #include "fieldmap.h" #include "field_camera.h" #include "field_player_avatar.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_weather.h" #include "event_object_movement.h" #include "field_effect.h" diff --git a/src/shop.c b/src/shop.c index a0eddee01..9b78878bd 100755 --- a/src/shop.c +++ b/src/shop.c @@ -6,7 +6,7 @@ #include "decoration_inventory.h" #include "event_object_movement.h" #include "field_player_avatar.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_weather.h" #include "fieldmap.h" #include "gpu_regs.h" -- cgit v1.2.3 From 4d2f1bad7f5f4ed9170420724ecad61f24e61755 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 8 Dec 2018 22:12:44 +0100 Subject: fix header --- src/fldeff_sweetscent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index bc62ac2af..cd8fa400d 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -3,7 +3,7 @@ #include "event_scripts.h" #include "field_effect.h" #include "field_player_avatar.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_weather.h" #include "palette.h" #include "party_menu.h" -- cgit v1.2.3 From cceb8ac3314c9ba5a48d0b69bc39c41080335119 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Sun, 9 Dec 2018 11:32:58 +0800 Subject: Remove trailing whitespace --- src/battle_ai_script_commands.c | 2 +- src/battle_main.c | 2 +- src/battle_pyramid.c | 4 ++-- src/pokemon_icon.c | 2 +- src/rotating_gate.c | 2 +- src/wallclock.c | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 687d81419..a88189870 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -464,7 +464,7 @@ static u8 ChooseMoveOrAction_Doubles(void) if (i == sBattler_AI || gBattleMons[i].hp == 0) { actionOrMoveIndex[i] = 0xFF; - bestMovePointsForTarget[i] = -1 ; + bestMovePointsForTarget[i] = -1; } else { diff --git a/src/battle_main.c b/src/battle_main.c index e275eee9e..9b7f58023 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -5594,7 +5594,7 @@ bool8 TryRunFromBattle(u8 battler) if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN) { - gLastUsedItem = gBattleMons[battler].item ; + gLastUsedItem = gBattleMons[battler].item; gProtectStructs[battler].fleeFlag = 1; effect++; } diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index f27af2615..6cc09d713 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -1458,7 +1458,7 @@ static u16 sub_81A9F90(u8 count) do { trainerId = sub_8162548(challengeNum + 1, battleNum); - for (i = 0 ; i < count; i++) + for (i = 0; i < count; i++) { if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) break; @@ -1470,7 +1470,7 @@ static u16 sub_81A9F90(u8 count) do { trainerId = sub_8162548(challengeNum, battleNum); - for (i = 0 ; i < count; i++) + for (i = 0; i < count; i++) { if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) break; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index e1e446007..c24c8a898 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1211,7 +1211,7 @@ void sub_80D304C(u16 offset) if(offset <= 0xA0) { monIconPalettePtr = gMonIconPaletteTable; - for(i = 5; i >= 0 ; i--) + for(i = 5; i >= 0; i--) { LoadPalette(monIconPalettePtr->data, offset, 0x20); offset += 0x10; diff --git a/src/rotating_gate.c b/src/rotating_gate.c index f617321af..3513f092e 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -871,7 +871,7 @@ static s32 RotatingGate_CanRotate(u8 gateId, s32 rotationDirection) y = gRotatingGate_PuzzleConfig[gateId].y + 7; // Loop through the gate's "arms" clockwise (north, south, east, west) - for (i = GATE_ARM_NORTH ; i <= GATE_ARM_WEST; i++) + for (i = GATE_ARM_NORTH; i <= GATE_ARM_WEST; i++) { // Ensure that no part of the arm collides with the map for (j = 0; j < GATE_ARM_MAX_LENGTH; j++) diff --git a/src/wallclock.c b/src/wallclock.c index e2e03ecba..5c8d920e7 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -890,13 +890,13 @@ static u16 CalcNewMinHandAngle(u16 angle, u8 direction, u8 speed) { case MVMT_BACKWARD: if (angle) - angle -= delta ; + angle -= delta; else - angle = 360 - delta ; + angle = 360 - delta; break; case MVMT_FORWARD: - if (angle < 360 - delta ) - angle += delta ; + if (angle < 360 - delta) + angle += delta; else angle = 0; break; -- cgit v1.2.3 From f8838491f6c46df771c5414f8b6da781294300b7 Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Sun, 9 Dec 2018 13:44:07 +0530 Subject: Initial commit for ghost --- src/ghost.c | 1126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 1121 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/ghost.c b/src/ghost.c index ce57df7e8..526e4e519 100644 --- a/src/ghost.c +++ b/src/ghost.c @@ -1,11 +1,23 @@ #include "global.h" #include "battle_anim.h" +#include "gpu_regs.h" #include "constants/rgb.h" +#include "constants/songs.h" +#include "sound.h" +#include "trig.h" -extern void sub_811160C(struct Sprite *); -extern void sub_81117F4(struct Sprite *); -extern void sub_81119E0(struct Sprite *); -extern void sub_8111B9C(struct Sprite *); +static void sub_811160C(struct Sprite *); +static void sub_8111674(struct Sprite *); +static void sub_81116E8(struct Sprite *); +static void sub_8111764(struct Sprite *); +static void sub_81117F4(struct Sprite *); +static void sub_8111814(struct Sprite *); +static void sub_8111914(u8 taskId); +static void sub_811196C(u8 taskId); +static void InitAnimShadowBall(struct Sprite *); +static void AnimShadowBallStep(struct Sprite *); +static void sub_8111B9C(struct Sprite *); +static void sub_8111BB4(struct Sprite *); extern void sub_8112264(struct Sprite *); extern void sub_81129F0(struct Sprite *); extern void sub_8112B78(struct Sprite *); @@ -65,7 +77,7 @@ const struct SpriteTemplate gUnknown_08596D58 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gUnknown_08596D54, - .callback = sub_81119E0, + .callback = InitAnimShadowBall, }; const union AnimCmd gUnknown_08596D70[] = @@ -184,3 +196,1107 @@ const struct SpriteTemplate gUnknown_08596E48 = .affineAnims = gDummySpriteAffineAnimTable, .callback = sub_8112F60, }; + +static void sub_811160C(struct Sprite *sprite) +{ + InitAnimSpritePos(sprite, 1); + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sub_80A6FD4(sprite); + sprite->callback = sub_8111674; + sprite->data[6] = 16; + SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); + SetGpuReg(REG_OFFSET_BLDALPHA, sprite->data[6]); +} + +static void sub_8111674(struct Sprite *sprite) +{ + s16 r0; + s16 r2; + sub_8111764(sprite); + if (TranslateAnimLinear(sprite)) + { + sprite->callback = sub_81116E8; + return; + } + + sprite->pos2.x += Sin(sprite->data[5], 10); + sprite->pos2.y += Cos(sprite->data[5], 15); + r2 = sprite->data[5]; + sprite->data[5] = (sprite->data[5] + 5) & 0xFF; + r0 = sprite->data[5]; + if (r2 != 0 && r2 <= 196) + return; + if (r0 <= 0) + return; + PlaySE12WithPanning(SE_W109, gUnknown_02038440); +} + +static void sub_81116E8(struct Sprite *sprite) +{ + s16 r2; + s16 r0; + sprite->data[0] = 1; + TranslateAnimLinear(sprite); + sprite->pos2.x += Sin(sprite->data[5], 10); + sprite->pos2.y += Cos(sprite->data[5], 15); + + r2 = sprite->data[5]; + sprite->data[5] = (sprite->data[5] + 5) & 0xFF; + r0 = sprite->data[5]; + + if (r2 == 0 || r2 > 196) + { + if (r0 > 0) + PlaySE(SE_W109); + } + + if (sprite->data[6] == 0) + { + sprite->invisible = TRUE; + sprite->callback = sub_80A67F4; + } + else + sub_8111764(sprite); +} + +static void sub_8111764(struct Sprite *sprite) +{ + + s16 r0; + if (sprite->data[6] > 0xFF) + { + if (++sprite->data[6] == 0x10d) + sprite->data[6] = 0; + return; + } + + r0 = sprite->data[7]; + sprite->data[7]++; + + if ((r0 & 0xFF) == 0) + { + sprite->data[7] &= 0xff00; + if ((sprite->data[7] & 0x100) != 0) + sprite->data[6]++; + else + sprite->data[6]--; + + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(sprite->data[6], 16 - sprite->data[6])); + if (sprite->data[6] == 0 || sprite->data[6] == 16) + sprite->data[7] ^= 0x100; + if (sprite->data[6] == 0) + sprite->data[6] = 0x100; + } +} + +static void sub_81117F4(struct Sprite *sprite) +{ + sub_80A6980(sprite, TRUE); + sprite->callback = sub_8111814; + sprite->callback(sprite); +} + +static void sub_8111814(struct Sprite *sprite) +{ + u16 temp1; + sprite->pos2.x = Sin(sprite->data[0], 32); + sprite->pos2.y = Cos(sprite->data[0], 8); + temp1 = sprite->data[0] - 65; + if (temp1 <= 130) + sprite->oam.priority = 2; + else + sprite->oam.priority = 1; + sprite->data[0] = (sprite->data[0] + 19) & 0xFF; + sprite->data[2] += 80; + sprite->pos2.y += sprite->data[2] >> 8; + sprite->data[7] += 1; + if (sprite->data[7] == 61) + DestroyAnimSprite(sprite); +} + +void sub_811188C(u8 taskId) +{ + u8 spriteId; + SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); + SetGpuReg(REG_OFFSET_BLDALPHA, 0x1000); + spriteId = GetAnimBattlerSpriteId(0); + sub_80A7270(spriteId, 1); + obj_id_set_rotscale(spriteId, 128, 128, 0); + gSprites[spriteId].invisible = FALSE; + gTasks[taskId].data[0] = 128; + gTasks[taskId].data[1] = *gBattleAnimArgs; + gTasks[taskId].data[2] = 0; + gTasks[taskId].data[3] = 16; + gTasks[taskId].func = sub_8111914; +} + +static void sub_8111914(u8 taskId) +{ + gTasks[taskId].data[10] += 1; + if (gTasks[taskId].data[10] == 3) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[2] += 1; + gTasks[taskId].data[3] -= 1; + SetGpuReg(REG_OFFSET_BLDALPHA, gTasks[taskId].data[3] << 8 | gTasks[taskId].data[2]); + if (gTasks[taskId].data[2] != 9) + return; + + gTasks[taskId].func = sub_811196C; + } +} + +static void sub_811196C(u8 taskId) +{ + u8 spriteId; + if (gTasks[taskId].data[1] > 0) + { + gTasks[taskId].data[1] -= 1; + return; + } + + spriteId = GetAnimBattlerSpriteId(0); + gTasks[taskId].data[0] += 8; + if (gTasks[taskId].data[0] <= 0xFF) + { + obj_id_set_rotscale(spriteId, gTasks[taskId].data[0], gTasks[taskId].data[0], 0); + } + else + { + sub_80A7344(spriteId); + DestroyAnimVisualTask(taskId); + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); + } +} + +// Spins a sprite towards the target, pausing in the middle. +// Used in Shadow Ball. +// arg 0: duration step 1 (attacker -> center) +// arg 1: duration step 2 (spin center) +// arg 2: duration step 3 (center -> target) +static void InitAnimShadowBall(struct Sprite *sprite) +{ + u16 r5, r6; + r5 = sprite->pos1.x; + r6 = sprite->pos1.y; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->data[0] = 0; + sprite->data[1] = gBattleAnimArgs[0]; + sprite->data[2] = gBattleAnimArgs[1]; + sprite->data[3] = gBattleAnimArgs[2]; + sprite->data[4] = sprite->pos1.x << 4; + sprite->data[5] = sprite->pos1.y << 4; + sprite->data[6] = (((s16)r5 - sprite->pos1.x) << 4) / (gBattleAnimArgs[0] << 1); + sprite->data[7] = (((s16)r6 - sprite->pos1.y) << 4) / (gBattleAnimArgs[0] << 1); + sprite->callback = AnimShadowBallStep; +} + +static void AnimShadowBallStep(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + sprite->data[4] += sprite->data[6]; + sprite->data[5] += sprite->data[7]; + sprite->pos1.x = sprite->data[4] >> 4; + sprite->pos1.y = sprite->data[5] >> 4; + sprite->data[1] -= 1; + if (sprite->data[1] > 0) + break; + sprite->data[0] += 1; + break; + case 1: + sprite->data[2] -= 1; + if (sprite->data[2] > 0) + break; + sprite->data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->data[4] = sprite->pos1.x << 4; + sprite->data[5] = sprite->pos1.y << 4; + sprite->data[6] = ((sprite->data[1] - sprite->pos1.x) << 4) / sprite->data[3]; + sprite->data[7] = ((sprite->data[2] - sprite->pos1.y) << 4) / sprite->data[3]; + sprite->data[0] += 1; + break; + case 2: + sprite->data[4] += sprite->data[6]; + sprite->data[5] += sprite->data[7]; + sprite->pos1.x = sprite->data[4] >> 4; + sprite->pos1.y = sprite->data[5] >> 4; + sprite->data[3] -= 1; + if (sprite->data[3] > 0) + break; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->data[0] += 1; + break; + case 3: + move_anim_8074EE0(sprite); + break; + } +} + +static void sub_8111B9C(struct Sprite *sprite) +{ + sub_80A6980(sprite, TRUE); + sprite->callback = sub_8111BB4; +} + +static void sub_8111BB4(struct Sprite *sprite) { + + s8 r5 = FALSE; + bool8 r6 = FALSE; + if(sprite->animEnded) + { + if(!(sprite->invisible)) + sprite->invisible=TRUE; + switch(sprite->data[0]) + { + case 0: + if((sprite->data[1]) != 2) + break; + goto loc_08111C06; + case 1: + if((sprite->data[1]) == 4) + r5 = TRUE; + break; + default: + r6 = TRUE; + } + if(r5) + { + loc_08111C06: + sprite->invisible ^= 1; + sprite->data[2]++; + sprite->data[1] = 0; + if(sprite->data[2] == 5) + { + sprite->data[2] = 0; + sprite->data[0]++; + } + } + else if(r6) + DestroyAnimSprite(sprite); + else + sprite->data[1]++; + } +} + +/* + +void sub_80DE1B0(u8 taskId) +{ + struct Task *task; + + task = &gTasks[taskId]; + task->data[0] = duplicate_obj_of_side_rel2move_in_transparent_mode(1); + if (task->data[0] < 0) + { + DestroyAnimVisualTask(taskId); + return; + } + task->data[1] = 0; + task->data[2] = 15; + task->data[3] = 2; + task->data[4] = 0; + REG_BLDCNT = 0x3F40; + REG_BLDALPHA = (task->data[3] << 8) | task->data[2]; + gSprites[task->data[0]].data[0] = 80; + if (GetBattlerSide(gAnimBankTarget) == 0) + { + gSprites[task->data[0]].data[1] = -144; + gSprites[task->data[0]].data[2] = 112; + } + else + { + gSprites[task->data[0]].data[1] = 144; + gSprites[task->data[0]].data[2] = -112; + } + gSprites[task->data[0]].data[3] = 0; + gSprites[task->data[0]].data[4] = 0; + StoreSpriteCallbackInData(&gSprites[task->data[0]], SpriteCallbackDummy); + gSprites[task->data[0]].callback = sub_8078394; + task->func = sub_80DE2DC; +} + +static void sub_80DE2DC(u8 taskId) +{ + struct Task *task; + + task = &gTasks[taskId]; + switch (task->data[4]) + { + case 0: + task->data[1] += 1; + task->data[5] = task->data[1] & 3; + if (task->data[5] == 1) + if (task->data[2] > 0) + task->data[2] -= 1; + if (task->data[5] == 3) + if (task->data[3] <= 15) + task->data[3] += 1; + REG_BLDALPHA = (task->data[3] << 8) | task->data[2]; + if (task->data[3] != 16 || task->data[2] != 0) + break; + if (task->data[1] <= 80) + break; + obj_delete_but_dont_free_vram(&gSprites[task->data[0]]); + task->data[4] = 1; + break; + case 1: + if (++task->data[6] <= 1) + break; + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + task->data[4] += 1; + break; + case 2: + DestroyAnimVisualTask(taskId); + } +} + +void sub_80DE3AC(u8 taskId) +{ + struct Task *task; + + task = &gTasks[taskId]; + task->data[15] = 0; + task->func = sub_80DE3D4; + task->func(taskId); +} + +static void sub_80DE3D4(u8 taskId) +{ + s16 startLine; + struct Task *task = &gTasks[taskId]; + u8 position = GetBattlerPosition_permutated(gAnimBankTarget); + + switch (task->data[15]) + { + case 0: + task->data[14] = AllocSpritePalette(0x2771); + if (task->data[14] == 0xFF) + { + DestroyAnimVisualTask(taskId); + } + else + { + task->data[0] = duplicate_obj_of_side_rel2move_in_transparent_mode(1); + if (task->data[0] < 0) + { + FreeSpritePaletteByTag(0x2771); + DestroyAnimVisualTask(taskId); + } + else + { + gSprites[task->data[0]].oam.paletteNum = task->data[14]; + gSprites[task->data[0]].oam.objMode = ST_OAM_OBJ_NORMAL; + gSprites[task->data[0]].oam.priority = 3; + task->data[1] = 0; + task->data[2] = 0; + task->data[3] = 16; + task->data[13] = GetAnimBattlerSpriteId(1); + task->data[4] = (gSprites[task->data[13]].oam.paletteNum + 16) * 16; + if (position == 1) + REG_DISPCNT &= 0xFDFF; + else + REG_DISPCNT &= 0xFBFF; + + task->data[15]++; + } + } + break; + case 1: + task->data[14] = (task->data[14] + 16) * 16; + CpuSet(&gPlttBufferUnfaded[task->data[4]], &gPlttBufferFaded[task->data[14]], 0x4000008); + BlendPalette(task->data[4], 16, 10, RGB(13, 0, 15)); + task->data[15]++; + break; + case 2: + startLine = gSprites[task->data[13]].pos1.y + gSprites[task->data[13]].pos2.y - 32; + if (startLine < 0) + startLine = 0; + + if (position == 1) + task->data[10] = ScanlineEffect_InitWave(startLine, startLine + 64, 2, 6, 0, 4, 1); + else + task->data[10] = ScanlineEffect_InitWave(startLine, startLine + 64, 2, 6, 0, 8, 1); + + task->data[15]++; + break; + case 3: + if (position == 1) + REG_BLDCNT = 0x3F42; + else + REG_BLDCNT = 0x3F44; + + REG_BLDALPHA = 0x1000; + task->data[15]++; + break; + case 4: + if (position == 1) + REG_DISPCNT |= DISPCNT_BG1_ON; + else + REG_DISPCNT |= DISPCNT_BG2_ON; + + task->func = sub_80DE61C; + task->data[15]++; + break; + default: + task->data[15]++; + break; + } +} + +static void sub_80DE61C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + task->data[1]++; + task->data[5] = task->data[1] & 1; + if (task->data[5] == 0) + task->data[2] = gSineTable[task->data[1]] / 18; + + if (task->data[5] == 1) + task->data[3] = 16 - (gSineTable[task->data[1]] / 18); + + REG_BLDALPHA = (task->data[3] << 8) | task->data[2]; + if (task->data[1] == 128) + { + task->data[15] = 0; + task->func = sub_80DE6B0; + task->func(taskId); + } +} + +static void sub_80DE6B0(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + u8 position = GetBattlerPosition_permutated(gAnimBankTarget); + + switch (task->data[15]) + { + case 0: + gScanlineEffect.state = 3; + task->data[14] = GetAnimBattlerSpriteId(1); + if (position == 1) + REG_DISPCNT &= 0xFDFF; + else + REG_DISPCNT &= 0xFBFF; + break; + case 1: + BlendPalette(task->data[4], 16, 0, RGB(13, 0, 15)); + break; + case 2: + gSprites[task->data[14]].invisible = 1; + obj_delete_but_dont_free_vram(&gSprites[task->data[0]]); + FreeSpritePaletteByTag(0x2771); + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + if (position == 1) + REG_DISPCNT |= DISPCNT_BG1_ON; + else + REG_DISPCNT |= DISPCNT_BG2_ON; + + DestroyAnimVisualTask(taskId); + break; + } + + task->data[15]++; +} + +static void sub_80DE7B8(struct Sprite *sprite) +{ + s16 battler1X, battler1Y; + s16 battler2X, battler2Y; + s16 yDiff; + + if (gBattleAnimArgs[0] == 0) + { + battler1X = GetBattlerSpriteCoord(gAnimBankAttacker, 0); + battler1Y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 28; + battler2X = GetBattlerSpriteCoord(gAnimBankTarget, 0); + battler2Y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 28; + } + else + { + battler1X = GetBattlerSpriteCoord(gAnimBankTarget, 0); + battler1Y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 28; + battler2X = GetBattlerSpriteCoord(gAnimBankAttacker, 0); + battler2Y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 28; + } + + yDiff = battler2Y - battler1Y; + sprite->data[0] = battler1X * 16; + sprite->data[1] = battler1Y * 16; + sprite->data[2] = ((battler2X - battler1X) * 16) / gBattleAnimArgs[1]; + sprite->data[3] = (yDiff * 16) / gBattleAnimArgs[1]; + sprite->data[4] = gBattleAnimArgs[1]; + sprite->data[5] = battler2X; + sprite->data[6] = battler2Y; + sprite->data[7] = sprite->data[4] / 2; + sprite->oam.priority = 2; + sprite->pos1.x = battler1X; + sprite->pos1.y = battler1Y; + sprite->callback = sub_80DE8D8; + sprite->invisible = 1; +} + +static void sub_80DE8D8(struct Sprite *sprite) +{ + if (sprite->data[4]) + { + sprite->data[0] += sprite->data[2]; + sprite->data[1] += sprite->data[3]; + sprite->pos1.x = sprite->data[0] >> 4; + sprite->pos1.y = sprite->data[1] >> 4; + if (--sprite->data[4] == 0) + sprite->data[0] = 0; + } +} + +void sub_80DE918(u8 taskId) +{ + struct Task *task; + s16 battler; + u8 spriteId; + s16 baseX, baseY; + s16 x, y; + + task = &gTasks[taskId]; + REG_BLDCNT = 0x3F40; + REG_BLDALPHA = 0x1000; + task->data[5] = 0; + task->data[6] = 0; + task->data[7] = 0; + task->data[8] = 0; + task->data[9] = 16; + task->data[10] = gBattleAnimArgs[0]; + + baseX = GetBattlerSpriteCoord(gAnimBankAttacker, 2); + baseY = sub_807A100(gAnimBankAttacker, 3); + if (!IsContest()) + { + for (battler = 0; battler < 4; battler++) + { + if (battler != gAnimBankAttacker + && battler != (gAnimBankAttacker ^ 2) + && IsAnimBankSpriteVisible(battler)) + { + spriteId = CreateSprite(&gSpriteTemplate_83DAF08, baseX, baseY, 55); + if (spriteId != MAX_SPRITES) + { + x = GetBattlerSpriteCoord(battler, 2); + y = sub_807A100(battler, 3); + gSprites[spriteId].data[0] = baseX << 4; + gSprites[spriteId].data[1] = baseY << 4; + gSprites[spriteId].data[2] = ((x - baseX) << 4) / gBattleAnimArgs[1]; + gSprites[spriteId].data[3] = ((y - baseY) << 4) / gBattleAnimArgs[1]; + gSprites[spriteId].data[4] = gBattleAnimArgs[1]; + gSprites[spriteId].data[5] = x; + gSprites[spriteId].data[6] = y; + gSprites[spriteId].callback = sub_80DE8D8; + + task->data[task->data[12] + 13] = spriteId; + task->data[12]++; + } + } + } + } + else + { + spriteId = CreateSprite(&gSpriteTemplate_83DAF08, baseX, baseY, 55); + if (spriteId != MAX_SPRITES) + { + x = 48; + y = 40; + gSprites[spriteId].data[0] = baseX << 4; + gSprites[spriteId].data[1] = baseY << 4; + gSprites[spriteId].data[2] = ((x - baseX) << 4) / gBattleAnimArgs[1]; + gSprites[spriteId].data[3] = ((y - baseY) << 4) / gBattleAnimArgs[1]; + gSprites[spriteId].data[4] = gBattleAnimArgs[1]; + gSprites[spriteId].data[5] = x; + gSprites[spriteId].data[6] = y; + gSprites[spriteId].callback = sub_80DE8D8; + + task->data[13] = spriteId; + task->data[12] = 1; + } + } + + task->func = sub_80DEB38; +} + +static void sub_80DEB38(u8 taskId) +{ + u16 i; + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + if (task->data[6] == 0) + { + if (++task->data[5] > 1) + { + task->data[5] = 0; + task->data[7]++; + if (task->data[7] & 1) + { + if (task->data[8] < 16) + task->data[8]++; + } + else + { + if (task->data[9]) + task->data[9]--; + } + + REG_BLDALPHA = (task->data[9] << 8) | task->data[8]; + if (task->data[7] >= 24) + { + task->data[7] = 0; + task->data[6] = 1; + } + } + } + + if (task->data[10]) + task->data[10]--; + else if (task->data[6]) + task->data[0]++; + break; + case 1: + if (++task->data[5] > 1) + { + task->data[5] = 0; + task->data[7]++; + if (task->data[7] & 1) + { + if (task->data[8]) + task->data[8]--; + } + else + { + if (task->data[9] < 16) + task->data[9]++; + } + + REG_BLDALPHA = (task->data[9] << 8) | task->data[8]; + if (task->data[8] == 0 && task->data[9] == 16) + { + for (i = 0; i < task->data[12]; i++) + DestroySprite(&gSprites[task->data[i + 13]]); + + task->data[0]++; + } + } + break; + case 2: + if (++task->data[5] > 0) + task->data[0]++; + break; + case 3: + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_80DECB0(u8 taskId) +{ + s16 startX, startY; + s16 leftDistance, topDistance, bottomDistance, rightDistance; + + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + REG_WININ = 0x3F3F; + REG_WINOUT = 0x3F1F; + REG_BLDCNT = 0xC8; + REG_BLDY = 0x10; + + if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER || IsContest()) + startX = 40; + else + startX = 200; + + gBattle_WIN0H = (startX << 8) | startX; + startY = 40; + gBattle_WIN0V = (startY << 8) | startY; + + leftDistance = startX; + rightDistance = 240 - startX; + topDistance = startY; + bottomDistance = 72; + gTasks[taskId].data[1] = leftDistance; + gTasks[taskId].data[2] = rightDistance; + gTasks[taskId].data[3] = topDistance; + gTasks[taskId].data[4] = bottomDistance; + gTasks[taskId].data[5] = startX; + gTasks[taskId].data[6] = startY; + gTasks[taskId].func = sub_80DED60; +} + +static void sub_80DED60(u8 taskId) +{ + s16 step; + s16 leftDistance, rightDistance, topDistance, bottomDistance; + s16 startX, startY; + u16 left, right, top, bottom; + u16 selectedPalettes; + + step = gTasks[taskId].data[0]; + gTasks[taskId].data[0]++; + leftDistance = gTasks[taskId].data[1]; + rightDistance = gTasks[taskId].data[2]; + topDistance = gTasks[taskId].data[3]; + bottomDistance = gTasks[taskId].data[4]; + startX = gTasks[taskId].data[5]; + startY = gTasks[taskId].data[6]; + + if (step < 16) + { + left = startX - (leftDistance * 0.0625) * step; + right = startX + (rightDistance * 0.0625) * step; + top = startY - (topDistance * 0.0625) * step; + bottom = startY + (bottomDistance * 0.0625) * step; + } + else + { + left = 0; + right = 240; + top = 0; + bottom = 112; + selectedPalettes = sub_80791A8(1, 0, 0, 0, 0, 0, 0); + BeginNormalPaletteFade(selectedPalettes, 0, 16, 16, RGB(0, 0, 0)); + gTasks[taskId].func = sub_80DEEE8; + } + + gBattle_WIN0H = (left << 8) | right; + gBattle_WIN0V = (top << 8) | bottom; +} + +static void sub_80DEEE8(u8 taskId) +{ + if (!gPaletteFade.active) + { + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + REG_WININ = 0x3F3F; + REG_WINOUT = 0x3F3F; + REG_BLDCNT = 0; + REG_BLDY = 0; + DestroyAnimVisualTask(taskId); + } +} + +static void sub_80DEF3C(struct Sprite *sprite) +{ + s16 xDelta; + s16 xDelta2; + + InitAnimSpritePos(sprite, 1); + if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + { + xDelta = 24; + xDelta2 = -2; + sprite->oam.matrixNum = 8; + } + else + { + xDelta = -24; + xDelta2 = 2; + } + + sprite->pos1.x += xDelta; + sprite->data[1] = xDelta2; + sprite->data[0] = 60; + sprite->callback = sub_80DEF98; +} + +static void sub_80DEF98(struct Sprite *sprite) +{ + u16 var0; + + if (sprite->data[0] > 0) + { + sprite->data[0]--; + } + else + { + sprite->pos2.x += sprite->data[1]; + var0 = sprite->pos2.x + 7; + if (var0 > 14) + { + sprite->pos1.x += sprite->pos2.x; + sprite->pos2.x = 0; + sprite->oam.tileNum += 8; + if (++sprite->data[2] == 3) + { + sprite->data[0] = 30; + sprite->callback = WaitAnimForDuration; + StoreSpriteCallbackInData(sprite, sub_80DF018); + } + else + { + sprite->data[0] = 40; + } + } + } +} + +static void sub_80DF018(struct Sprite *sprite) +{ + if (sprite->data[0] == 0) + { + REG_BLDCNT = 0x3F40; + REG_BLDALPHA = 0x0010; + sprite->data[0]++; + sprite->data[1] = 0; + sprite->data[2] = 0; + } + else if (sprite->data[1] < 2) + { + sprite->data[1]++; + } + else + { + sprite->data[1] = 0; + sprite->data[2]++; + REG_BLDALPHA = (16 - sprite->data[2]) | (sprite->data[2] << 8); + if (sprite->data[2] == 16) + { + sprite->invisible = 1; + sprite->callback = sub_80DF090; + } + } +} + +static void sub_80DF090(struct Sprite *sprite) +{ + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + DestroyAnimSprite(sprite); +} + +static void sub_80DF0B8(struct Sprite *sprite) +{ + u16 coeffB; + u16 coeffA; + + sprite->pos2.x = Sin(sprite->data[0], 12); + if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + sprite->pos2.x = -sprite->pos2.x; + + sprite->data[0] = (sprite->data[0] + 6) & 0xFF; + sprite->data[1] += 0x100; + sprite->pos2.y = -(sprite->data[1] >> 8); + + sprite->data[7]++; + if (sprite->data[7] == 1) + { + sprite->data[6] = 0x050B; + REG_BLDCNT = 0x3F40; + REG_BLDALPHA = sprite->data[6]; + } + else if (sprite->data[7] > 30) + { + sprite->data[2]++; + coeffB = sprite->data[6] >> 8; + coeffA = sprite->data[6] & 0xFF; + + if (++coeffB > 16) + coeffB = 16; + if (--(s16)coeffA < 0) + coeffA = 0; + + REG_BLDALPHA = (coeffB << 8) | coeffA; + sprite->data[6] = (coeffB << 8) | coeffA; + if (coeffB == 16 && coeffA == 0) + { + sprite->invisible = 1; + sprite->callback = sub_80DF18C; + } + } +} + +static void sub_80DF18C(struct Sprite *sprite) +{ + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + DestroyAnimSprite(sprite); +} + +void sub_80DF1A4(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + task->data[0] = 0; + task->data[1] = 16; + task->data[9] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); + task->data[10] = sub_8077FC0(gAnimBankAttacker); + task->data[11] = (sub_807A100(gAnimBankAttacker, 1) / 2) + 8; + task->data[7] = 0; + task->data[5] = sub_8079ED4(gAnimBankAttacker); + task->data[6] = GetBattlerSubpriority(gAnimBankAttacker) - 2; + task->data[3] = 0; + task->data[4] = 16; + REG_BLDCNT = 0x3F40; + REG_BLDALPHA = 0x1000; + task->data[8] = 0; + task->func = sub_80DF24C; +} + +static void sub_80DF24C(u8 taskId) +{ + u16 i; + u8 spriteId; + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + for (i = 0; i < 6; i++) + { + spriteId = CreateSprite(&gSpriteTemplate_83DAF80, task->data[9], task->data[10], task->data[6]); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER; + + gSprites[spriteId].data[2] = (i * 42) & 0xFF; + gSprites[spriteId].data[3] = task->data[11]; + gSprites[spriteId].data[5] = i * 6; + task->data[7]++; + } + } + + task->data[0]++; + break; + case 1: + if (++task->data[1] & 1) + { + if (task->data[3] < 14) + task->data[3]++; + } + else + { + if (task->data[4] > 4) + task->data[4]--; + } + + if (task->data[3] == 14 && task->data[4] == 4) + { + task->data[1] = 0; + task->data[0]++; + } + + REG_BLDALPHA = (task->data[4] << 8) | task->data[3]; + break; + case 2: + if (++task->data[1] > 30) + { + task->data[1] = 0; + task->data[0]++; + } + break; + case 3: + if (++task->data[1] & 1) + { + if (task->data[3] > 0) + task->data[3]--; + } + else + { + if (task->data[4] < 16) + task->data[4]++; + } + + if (task->data[3] == 0 && task->data[4] == 16) + { + task->data[8] = 1; + task->data[0]++; + } + + REG_BLDALPHA = (task->data[4] << 8) | task->data[3]; + break; + case 4: + if (task->data[7] == 0) + task->data[0]++; + break; + case 5: + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + DestroyAnimVisualTask(taskId); + break; + } +} + +static void sub_80DF3D8(struct Sprite *sprite) +{ + u16 index; + + if (sprite->data[1] == 0) + sprite->data[2] += 2; + else + sprite->data[2] -= 2; + + sprite->data[2] &= 0xFF; + sprite->pos2.x = Sin(sprite->data[2], sprite->data[3]); + + index = sprite->data[2] - 65; + if (index < 127) + sprite->oam.priority = gTasks[sprite->data[0]].data[5] + 1; + else + sprite->oam.priority = gTasks[sprite->data[0]].data[5]; + + sprite->data[5]++; + sprite->data[6] = (sprite->data[5] * 8) & 0xFF; + sprite->pos2.y = Sin(sprite->data[6], 7); + if (gTasks[sprite->data[0]].data[8]) + { + gTasks[sprite->data[0]].data[7]--; + DestroySprite(sprite); + } +} + +static void sub_80DF49C(struct Sprite *sprite) +{ + sprite->invisible = 1; + sprite->data[5] = gBankSpriteIds[gAnimBankAttacker]; + sprite->data[0] = 128; + sprite->data[1] = 10; + sprite->data[2] = gBattleAnimArgs[0]; + sprite->data[3] = gBattleAnimArgs[1]; + sprite->callback = sub_80DF4F4; + + gSprites[sprite->data[5]].pos1.y += 8; +} + +static void sub_80DF4F4(struct Sprite *sprite) +{ + if (sprite->data[3]) + { + sprite->data[3]--; + gSprites[sprite->data[5]].pos2.x = Sin(sprite->data[0], sprite->data[1]); + gSprites[sprite->data[5]].pos2.y = Cos(sprite->data[0], sprite->data[1]); + sprite->data[0] += sprite->data[2]; + if (sprite->data[0] > 255) + sprite->data[0] -= 256; + } + else + { + gSprites[sprite->data[5]].pos2.x = 0; + gSprites[sprite->data[5]].pos2.y = 0; + gSprites[sprite->data[5]].pos1.y -= 8; + sprite->callback = move_anim_8074EE0; + } +}*/ + -- cgit v1.2.3 From c46499b05c81f1d1a872a33ce5b2fd9a20964dc7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 9 Dec 2018 12:16:01 +0100 Subject: field screen review changes --- src/field_screen_effect.c | 12 ++++++------ src/field_weather.c | 38 +++++++++++++++++++------------------- src/field_weather_effect.c | 10 +++++----- 3 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src') diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 0de86d4f4..b0572b393 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -1083,9 +1083,9 @@ static void sub_80B028C(u8 a1) u16 color[1]; if (!a1) - color[0] = 0x1F; + color[0] = RGB_RED; else - color[0] = 0x7C00; + color[0] = RGB_BLUE; for (i = 0; i < 16; i++) { @@ -1113,7 +1113,7 @@ static bool8 sub_80B02C8(u16 a1) } } - SetGpuReg(REG_OFFSET_BLDALPHA, (hi << 8) | lo); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(lo, hi)); if (lo == 0 && hi == 0x10) return TRUE; @@ -1135,9 +1135,9 @@ static void sub_80B0318(u8 taskId) data[10] = REG_WINOUT; ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON); SetGpuRegBits(REG_OFFSET_BLDCNT, gUnknown_82EC7CC[0]); - SetGpuReg(REG_OFFSET_BLDALPHA, 1804); - SetGpuReg(REG_OFFSET_WININ, 63); - SetGpuReg(REG_OFFSET_WINOUT, 30); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(12, 7)); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3 | WINOUT_WIN01_OBJ); sub_8199C30(0, 0, 0, 0x1E, 0x14, 0xF); schedule_bg_copy_tilemap_to_vram(0); SetFlash2ScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], data[2], data[3], 1); diff --git a/src/field_weather.c b/src/field_weather.c index be3396c63..f0615dabf 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -75,7 +75,7 @@ IWRAM_DATA static const u8 *sPaletteGammaTypes; // CONST extern const u16 gUnknown_0854014C[][4096]; -// This is a pointer to gWeatherPtr. All code in this file accesses gWeather directly, +// This is a pointer to gWeather. All code in this file accesses gWeather directly, // while code in other field weather files accesses gWeather through this pointer. // This is likely the result of compiler optimization, since using the pointer in // this file produces the same result as accessing gWeather directly. @@ -266,11 +266,11 @@ static u8 None_Finish(void) static void BuildGammaShiftTables(void) { u16 v0; - u8 (*v1)[32]; + u8 (*gammaTable)[32]; u16 v2; u16 v4; u16 v5; - u16 v6; + u16 gammaIndex; u16 v9; u32 v10; u16 v11; @@ -280,9 +280,9 @@ static void BuildGammaShiftTables(void) for (v0 = 0; v0 <= 1; v0++) { if (v0 == 0) - v1 = gWeatherPtr->gammaShifts; + gammaTable = gWeatherPtr->gammaShifts; else - v1 = gWeatherPtr->altGammaShifts; + gammaTable = gWeatherPtr->altGammaShifts; for (v2 = 0; v2 < 32; v2++) { @@ -291,10 +291,10 @@ static void BuildGammaShiftTables(void) v5 = (v2 << 8) / 16; else v5 = 0; - for (v6 = 0; v6 <= 2; v6++) + for (gammaIndex = 0; gammaIndex <= 2; gammaIndex++) { v4 = (v4 - v5); - v1[v6][v2] = v4 >> 8; + gammaTable[gammaIndex][v2] = v4 >> 8; } v9 = v4; v10 = 0x1f00 - v4; @@ -305,25 +305,25 @@ static void BuildGammaShiftTables(void) v11 = v10 >> 4; if (v2 < 12) { - for (; v6 < 19; v6++) + for (; gammaIndex < 19; gammaIndex++) { v4 += v11; dunno = v4 - v9; if (dunno > 0) v4 -= (dunno + ((u16)dunno >> 15)) >> 1; - v1[v6][v2] = v4 >> 8; - if (v1[v6][v2] > 0x1f) - v1[v6][v2] = 0x1f; + gammaTable[gammaIndex][v2] = v4 >> 8; + if (gammaTable[gammaIndex][v2] > 0x1f) + gammaTable[gammaIndex][v2] = 0x1f; } } else { - for (; v6 < 19; v6++) + for (; gammaIndex < 19; gammaIndex++) { v4 += v11; - v1[v6][v2] = v4 >> 8; - if (v1[v6][v2] > 0x1f) - v1[v6][v2] = 0x1f; + gammaTable[gammaIndex][v2] = v4 >> 8; + if (gammaTable[gammaIndex][v2] > 0x1f) + gammaTable[gammaIndex][v2] = 0x1f; } } } @@ -734,19 +734,19 @@ void FadeScreen(u8 mode, s8 delay) switch (mode) { case FADE_FROM_BLACK: - fadeColor = 0; + fadeColor = RGB_BLACK; fadeOut = FALSE; break; case FADE_FROM_WHITE: - fadeColor = 0xFFFF; + fadeColor = RGB_WHITEALPHA; fadeOut = FALSE; break; case FADE_TO_BLACK: - fadeColor = 0; + fadeColor = RGB_BLACK; fadeOut = TRUE; break; case FADE_TO_WHITE: - fadeColor = 0xFFFF; + fadeColor = RGB_WHITEALPHA; fadeOut = TRUE; break; default: diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index 88ebb1936..2ec51a722 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -182,7 +182,7 @@ void CreateCloudSprites(void) { u8 spriteId = CreateSprite(&sCloudSpriteTemplate, 0, 0, 0xFF); - if (spriteId != 64) + if (spriteId != MAX_SPRITES) { struct Sprite *sprite; @@ -794,7 +794,7 @@ bool8 CreateRainSprite(void) spriteNum = gWeatherPtr->rainSpriteCount; spriteId = CreateSpriteAtEnd(&sRainSpriteTemplate, sRainSpriteCoords[spriteNum].x, sRainSpriteCoords[spriteNum].y, 78); - if (spriteId != 64) + if (spriteId != MAX_SPRITES) { gSprites[spriteId].data[5] = 0; gSprites[spriteId].data[1] = spriteNum * 145; @@ -953,7 +953,7 @@ bool8 CreateSnowflakeSprite(void) { u8 spriteId = CreateSpriteAtEnd(&sSnowflakeSpriteTemplate, 0, 0, 78); - if (spriteId == 64) + if (spriteId == MAX_SPRITES) return FALSE; gSprites[spriteId].data[4] = gWeatherPtr->snowflakeSpriteCount; sub_807EC40(&gSprites[spriteId]); @@ -1015,7 +1015,7 @@ void sub_807ED48(struct Sprite *sprite) r3 = (sprite->pos1.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX) & 0x1FF; if (r3 & 0x100) - r3 = -0x100 | r3; // hmm... what is this? + r3 |= -0x100; // hmm... what is this? if (r3 < -3) sprite->pos1.x = 242 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX); else if (r3 > 242) @@ -2034,7 +2034,7 @@ void CreateSandstormSprites_2(void) { for (i = 0; i < 5; i++) { - u8 spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, i * 48 + 0x18, 0xD0, 1); + u8 spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, i * 48 + 24, 208, 1); if (spriteId != MAX_SPRITES) { -- cgit v1.2.3 From 4233ae50c38c44923bdd0d31ae99de0903ac86cf Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Sun, 9 Dec 2018 18:38:15 +0530 Subject: Finish decompile ghost --- src/ghost.c | 307 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 166 insertions(+), 141 deletions(-) (limited to 'src') diff --git a/src/ghost.c b/src/ghost.c index 526e4e519..0464d1491 100644 --- a/src/ghost.c +++ b/src/ghost.c @@ -1,10 +1,14 @@ #include "global.h" +#include "battle.h" #include "battle_anim.h" #include "gpu_regs.h" +#include "palette.h" #include "constants/rgb.h" +#include "scanline_effect.h" #include "constants/songs.h" #include "sound.h" #include "trig.h" +#include "util.h" static void sub_811160C(struct Sprite *); static void sub_8111674(struct Sprite *); @@ -18,11 +22,25 @@ static void InitAnimShadowBall(struct Sprite *); static void AnimShadowBallStep(struct Sprite *); static void sub_8111B9C(struct Sprite *); static void sub_8111BB4(struct Sprite *); -extern void sub_8112264(struct Sprite *); -extern void sub_81129F0(struct Sprite *); -extern void sub_8112B78(struct Sprite *); -extern void sub_8112E9C(struct Sprite *); -extern void sub_8112F60(struct Sprite *); +static void sub_8111D78(u8 taskId); +static void sub_8111E78(u8 taskId); +static void sub_81120DC(u8 taskId); +static void sub_8112170(u8 taskId); +static void sub_8112264(struct Sprite *); +static void sub_8112384(struct Sprite *); +static void sub_81125E0(u8 taskId); +static void sub_811280C(u8 taskId); +static void sub_8112994(u8 taskId); +static void sub_81129F0(struct Sprite *); +static void sub_8112A4C(struct Sprite *); +static void sub_8112ACC(struct Sprite *); +static void sub_8112B44(struct Sprite *); +static void sub_8112B78(struct Sprite *); +static void sub_8112C4C(struct Sprite *); +static void sub_8112D10(u8 taskId); +static void sub_8112E9C(struct Sprite *); +static void sub_8112F60(struct Sprite *); +static void sub_8112FB8(struct Sprite *); const union AffineAnimCmd gUnknown_08596CF8[] = { @@ -208,7 +226,7 @@ static void sub_811160C(struct Sprite *sprite) sub_80A6FD4(sprite); sprite->callback = sub_8111674; sprite->data[6] = 16; - SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); SetGpuReg(REG_OFFSET_BLDALPHA, sprite->data[6]); } @@ -321,8 +339,8 @@ static void sub_8111814(struct Sprite *sprite) void sub_811188C(u8 taskId) { u8 spriteId; - SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); - SetGpuReg(REG_OFFSET_BLDALPHA, 0x1000); + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0x10)); spriteId = GetAnimBattlerSpriteId(0); sub_80A7270(spriteId, 1); obj_id_set_rotscale(spriteId, 128, 128, 0); @@ -342,7 +360,7 @@ static void sub_8111914(u8 taskId) gTasks[taskId].data[10] = 0; gTasks[taskId].data[2] += 1; gTasks[taskId].data[3] -= 1; - SetGpuReg(REG_OFFSET_BLDALPHA, gTasks[taskId].data[3] << 8 | gTasks[taskId].data[2]); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[2], gTasks[taskId].data[3])); if (gTasks[taskId].data[2] != 9) return; @@ -487,9 +505,7 @@ static void sub_8111BB4(struct Sprite *sprite) { } } -/* - -void sub_80DE1B0(u8 taskId) +void sub_8111C50(u8 taskId) { struct Task *task; @@ -504,10 +520,10 @@ void sub_80DE1B0(u8 taskId) task->data[2] = 15; task->data[3] = 2; task->data[4] = 0; - REG_BLDCNT = 0x3F40; - REG_BLDALPHA = (task->data[3] << 8) | task->data[2]; + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[2], task->data[3])); gSprites[task->data[0]].data[0] = 80; - if (GetBattlerSide(gAnimBankTarget) == 0) + if (GetBattlerSide(gBattleAnimTarget) == 0) { gSprites[task->data[0]].data[1] = -144; gSprites[task->data[0]].data[2] = 112; @@ -519,12 +535,12 @@ void sub_80DE1B0(u8 taskId) } gSprites[task->data[0]].data[3] = 0; gSprites[task->data[0]].data[4] = 0; - StoreSpriteCallbackInData(&gSprites[task->data[0]], SpriteCallbackDummy); - gSprites[task->data[0]].callback = sub_8078394; - task->func = sub_80DE2DC; + StoreSpriteCallbackInData6(&gSprites[task->data[0]], SpriteCallbackDummy); + gSprites[task->data[0]].callback = sub_80A656C; + task->func = sub_8111D78; } -static void sub_80DE2DC(u8 taskId) +static void sub_8111D78(u8 taskId) { struct Task *task; @@ -540,7 +556,7 @@ static void sub_80DE2DC(u8 taskId) if (task->data[5] == 3) if (task->data[3] <= 15) task->data[3] += 1; - REG_BLDALPHA = (task->data[3] << 8) | task->data[2]; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[2], task->data[3])); if (task->data[3] != 16 || task->data[2] != 0) break; if (task->data[1] <= 80) @@ -551,8 +567,8 @@ static void sub_80DE2DC(u8 taskId) case 1: if (++task->data[6] <= 1) break; - REG_BLDCNT = 0; - REG_BLDALPHA = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); task->data[4] += 1; break; case 2: @@ -560,27 +576,27 @@ static void sub_80DE2DC(u8 taskId) } } -void sub_80DE3AC(u8 taskId) +void sub_8111E50(u8 taskId) { struct Task *task; task = &gTasks[taskId]; task->data[15] = 0; - task->func = sub_80DE3D4; + task->func = sub_8111E78; task->func(taskId); } -static void sub_80DE3D4(u8 taskId) +static void sub_8111E78(u8 taskId) { s16 startLine; struct Task *task = &gTasks[taskId]; - u8 position = GetBattlerPosition_permutated(gAnimBankTarget); + u8 position = sub_80A8364(gBattleAnimTarget); switch (task->data[15]) { case 0: task->data[14] = AllocSpritePalette(0x2771); - if (task->data[14] == 0xFF) + if (task->data[14] == 0xFF || task->data[14] == 0xF) { DestroyAnimVisualTask(taskId); } @@ -594,19 +610,25 @@ static void sub_80DE3D4(u8 taskId) } else { + s16 mask2; gSprites[task->data[0]].oam.paletteNum = task->data[14]; gSprites[task->data[0]].oam.objMode = ST_OAM_OBJ_NORMAL; gSprites[task->data[0]].oam.priority = 3; + gSprites[task->data[0]].invisible = (gBattleSpritesDataPtr->battlerData[gBattleAnimTarget].invisible); task->data[1] = 0; task->data[2] = 0; task->data[3] = 16; task->data[13] = GetAnimBattlerSpriteId(1); task->data[4] = (gSprites[task->data[13]].oam.paletteNum + 16) * 16; - if (position == 1) - REG_DISPCNT &= 0xFDFF; - else - REG_DISPCNT &= 0xFBFF; - + if (position == 1) { + u16 mask = DISPCNT_BG1_ON; + mask2 = mask; + } + else { + u16 mask = DISPCNT_BG2_ON; + mask2 = mask; + } + ClearGpuRegBits(REG_OFFSET_DISPCNT, mask2); task->data[15]++; } } @@ -631,20 +653,20 @@ static void sub_80DE3D4(u8 taskId) break; case 3: if (position == 1) - REG_BLDCNT = 0x3F42; + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL | BLDCNT_TGT1_BG1)); else - REG_BLDCNT = 0x3F44; + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL | BLDCNT_TGT1_BG2)); - REG_BLDALPHA = 0x1000; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0x10)); task->data[15]++; break; case 4: if (position == 1) - REG_DISPCNT |= DISPCNT_BG1_ON; + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG1_ON); else - REG_DISPCNT |= DISPCNT_BG2_ON; + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); - task->func = sub_80DE61C; + task->func = sub_81120DC; task->data[15]++; break; default: @@ -653,7 +675,7 @@ static void sub_80DE3D4(u8 taskId) } } -static void sub_80DE61C(u8 taskId) +static void sub_81120DC(u8 taskId) { struct Task *task = &gTasks[taskId]; task->data[1]++; @@ -664,19 +686,19 @@ static void sub_80DE61C(u8 taskId) if (task->data[5] == 1) task->data[3] = 16 - (gSineTable[task->data[1]] / 18); - REG_BLDALPHA = (task->data[3] << 8) | task->data[2]; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[2], task->data[3])); if (task->data[1] == 128) { task->data[15] = 0; - task->func = sub_80DE6B0; + task->func = sub_8112170; task->func(taskId); } } -static void sub_80DE6B0(u8 taskId) +static void sub_8112170(u8 taskId) { struct Task *task = &gTasks[taskId]; - u8 position = GetBattlerPosition_permutated(gAnimBankTarget); + u8 position = sub_80A8364(gBattleAnimTarget); switch (task->data[15]) { @@ -684,9 +706,9 @@ static void sub_80DE6B0(u8 taskId) gScanlineEffect.state = 3; task->data[14] = GetAnimBattlerSpriteId(1); if (position == 1) - REG_DISPCNT &= 0xFDFF; + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG1_ON); else - REG_DISPCNT &= 0xFBFF; + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); break; case 1: BlendPalette(task->data[4], 16, 0, RGB(13, 0, 15)); @@ -695,12 +717,12 @@ static void sub_80DE6B0(u8 taskId) gSprites[task->data[14]].invisible = 1; obj_delete_but_dont_free_vram(&gSprites[task->data[0]]); FreeSpritePaletteByTag(0x2771); - REG_BLDCNT = 0; - REG_BLDALPHA = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); if (position == 1) - REG_DISPCNT |= DISPCNT_BG1_ON; + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG1_ON); else - REG_DISPCNT |= DISPCNT_BG2_ON; + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); DestroyAnimVisualTask(taskId); break; @@ -709,7 +731,7 @@ static void sub_80DE6B0(u8 taskId) task->data[15]++; } -static void sub_80DE7B8(struct Sprite *sprite) +static void sub_8112264(struct Sprite *sprite) { s16 battler1X, battler1Y; s16 battler2X, battler2Y; @@ -717,17 +739,17 @@ static void sub_80DE7B8(struct Sprite *sprite) if (gBattleAnimArgs[0] == 0) { - battler1X = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - battler1Y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 28; - battler2X = GetBattlerSpriteCoord(gAnimBankTarget, 0); - battler2Y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 28; + battler1X = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + battler1Y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 28; + battler2X = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + battler2Y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 28; } else { - battler1X = GetBattlerSpriteCoord(gAnimBankTarget, 0); - battler1Y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 28; - battler2X = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - battler2Y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 28; + battler1X = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + battler1Y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 28; + battler2X = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + battler2Y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 28; } yDiff = battler2Y - battler1Y; @@ -742,11 +764,11 @@ static void sub_80DE7B8(struct Sprite *sprite) sprite->oam.priority = 2; sprite->pos1.x = battler1X; sprite->pos1.y = battler1Y; - sprite->callback = sub_80DE8D8; + sprite->callback = sub_8112384; sprite->invisible = 1; } -static void sub_80DE8D8(struct Sprite *sprite) +static void sub_8112384(struct Sprite *sprite) { if (sprite->data[4]) { @@ -759,7 +781,7 @@ static void sub_80DE8D8(struct Sprite *sprite) } } -void sub_80DE918(u8 taskId) +void sub_81123C4(u8 taskId) { struct Task *task; s16 battler; @@ -768,8 +790,8 @@ void sub_80DE918(u8 taskId) s16 x, y; task = &gTasks[taskId]; - REG_BLDCNT = 0x3F40; - REG_BLDALPHA = 0x1000; + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0x10)); task->data[5] = 0; task->data[6] = 0; task->data[7] = 0; @@ -777,21 +799,21 @@ void sub_80DE918(u8 taskId) task->data[9] = 16; task->data[10] = gBattleAnimArgs[0]; - baseX = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - baseY = sub_807A100(gAnimBankAttacker, 3); + baseX = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + baseY = sub_80A861C(gBattleAnimAttacker, 3); if (!IsContest()) { for (battler = 0; battler < 4; battler++) { - if (battler != gAnimBankAttacker - && battler != (gAnimBankAttacker ^ 2) - && IsAnimBankSpriteVisible(battler)) + if (battler != gBattleAnimAttacker + && battler != (gBattleAnimAttacker ^ 2) + && IsBattlerSpriteVisible(battler)) { - spriteId = CreateSprite(&gSpriteTemplate_83DAF08, baseX, baseY, 55); + spriteId = CreateSprite(&gUnknown_08596DB8, baseX, baseY, 55); if (spriteId != MAX_SPRITES) { x = GetBattlerSpriteCoord(battler, 2); - y = sub_807A100(battler, 3); + y = sub_80A861C(battler, 3); gSprites[spriteId].data[0] = baseX << 4; gSprites[spriteId].data[1] = baseY << 4; gSprites[spriteId].data[2] = ((x - baseX) << 4) / gBattleAnimArgs[1]; @@ -799,7 +821,7 @@ void sub_80DE918(u8 taskId) gSprites[spriteId].data[4] = gBattleAnimArgs[1]; gSprites[spriteId].data[5] = x; gSprites[spriteId].data[6] = y; - gSprites[spriteId].callback = sub_80DE8D8; + gSprites[spriteId].callback = sub_8112384; task->data[task->data[12] + 13] = spriteId; task->data[12]++; @@ -809,7 +831,7 @@ void sub_80DE918(u8 taskId) } else { - spriteId = CreateSprite(&gSpriteTemplate_83DAF08, baseX, baseY, 55); + spriteId = CreateSprite(&gUnknown_08596DB8, baseX, baseY, 55); if (spriteId != MAX_SPRITES) { x = 48; @@ -821,17 +843,17 @@ void sub_80DE918(u8 taskId) gSprites[spriteId].data[4] = gBattleAnimArgs[1]; gSprites[spriteId].data[5] = x; gSprites[spriteId].data[6] = y; - gSprites[spriteId].callback = sub_80DE8D8; + gSprites[spriteId].callback = sub_8112384; task->data[13] = spriteId; task->data[12] = 1; } } - task->func = sub_80DEB38; + task->func = sub_81125E0; } -static void sub_80DEB38(u8 taskId) +static void sub_81125E0(u8 taskId) { u16 i; struct Task *task = &gTasks[taskId]; @@ -856,7 +878,7 @@ static void sub_80DEB38(u8 taskId) task->data[9]--; } - REG_BLDALPHA = (task->data[9] << 8) | task->data[8]; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[8], task->data[9])); if (task->data[7] >= 24) { task->data[7] = 0; @@ -886,7 +908,7 @@ static void sub_80DEB38(u8 taskId) task->data[9]++; } - REG_BLDALPHA = (task->data[9] << 8) | task->data[8]; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[8], task->data[9])); if (task->data[8] == 0 && task->data[9] == 16) { for (i = 0; i < task->data[12]; i++) @@ -901,26 +923,28 @@ static void sub_80DEB38(u8 taskId) task->data[0]++; break; case 3: - REG_BLDCNT = 0; - REG_BLDALPHA = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); DestroyAnimVisualTask(taskId); break; } } -void sub_80DECB0(u8 taskId) +void sub_8112758(u8 taskId) { s16 startX, startY; s16 leftDistance, topDistance, bottomDistance, rightDistance; gBattle_WIN0H = 0; gBattle_WIN0V = 0; - REG_WININ = 0x3F3F; - REG_WINOUT = 0x3F1F; - REG_BLDCNT = 0xC8; - REG_BLDY = 0x10; - - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER || IsContest()) + SetGpuReg(REG_OFFSET_WININ, ((WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR) | + (WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR))); + SetGpuReg(REG_OFFSET_WINOUT, ((WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ) | + (WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR))); + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_DARKEN)); + SetGpuReg(REG_OFFSET_BLDY, 0x10); + + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER || IsContest()) startX = 40; else startX = 200; @@ -939,10 +963,10 @@ void sub_80DECB0(u8 taskId) gTasks[taskId].data[4] = bottomDistance; gTasks[taskId].data[5] = startX; gTasks[taskId].data[6] = startY; - gTasks[taskId].func = sub_80DED60; + gTasks[taskId].func = sub_811280C; } -static void sub_80DED60(u8 taskId) +static void sub_811280C(u8 taskId) { s16 step; s16 leftDistance, rightDistance, topDistance, bottomDistance; @@ -972,36 +996,38 @@ static void sub_80DED60(u8 taskId) right = 240; top = 0; bottom = 112; - selectedPalettes = sub_80791A8(1, 0, 0, 0, 0, 0, 0); + selectedPalettes = sub_80A75AC(1, 0, 0, 0, 0, 0, 0); BeginNormalPaletteFade(selectedPalettes, 0, 16, 16, RGB(0, 0, 0)); - gTasks[taskId].func = sub_80DEEE8; + gTasks[taskId].func = sub_8112994; } gBattle_WIN0H = (left << 8) | right; gBattle_WIN0V = (top << 8) | bottom; } -static void sub_80DEEE8(u8 taskId) +static void sub_8112994(u8 taskId) { if (!gPaletteFade.active) { gBattle_WIN0H = 0; gBattle_WIN0V = 0; - REG_WININ = 0x3F3F; - REG_WINOUT = 0x3F3F; - REG_BLDCNT = 0; - REG_BLDY = 0; + SetGpuReg(REG_OFFSET_WININ, ((WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR) | + (WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR))); + SetGpuReg(REG_OFFSET_WINOUT, ((WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR) | + (WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR))); + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDY, 0); DestroyAnimVisualTask(taskId); } } -static void sub_80DEF3C(struct Sprite *sprite) +static void sub_81129F0(struct Sprite *sprite) { s16 xDelta; s16 xDelta2; InitAnimSpritePos(sprite, 1); - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { xDelta = 24; xDelta2 = -2; @@ -1016,10 +1042,10 @@ static void sub_80DEF3C(struct Sprite *sprite) sprite->pos1.x += xDelta; sprite->data[1] = xDelta2; sprite->data[0] = 60; - sprite->callback = sub_80DEF98; + sprite->callback = sub_8112A4C; } -static void sub_80DEF98(struct Sprite *sprite) +static void sub_8112A4C(struct Sprite *sprite) { u16 var0; @@ -1040,7 +1066,7 @@ static void sub_80DEF98(struct Sprite *sprite) { sprite->data[0] = 30; sprite->callback = WaitAnimForDuration; - StoreSpriteCallbackInData(sprite, sub_80DF018); + StoreSpriteCallbackInData6(sprite, sub_8112ACC); } else { @@ -1050,12 +1076,12 @@ static void sub_80DEF98(struct Sprite *sprite) } } -static void sub_80DF018(struct Sprite *sprite) +static void sub_8112ACC(struct Sprite *sprite) { if (sprite->data[0] == 0) { - REG_BLDCNT = 0x3F40; - REG_BLDALPHA = 0x0010; + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0x10, 0)); sprite->data[0]++; sprite->data[1] = 0; sprite->data[2] = 0; @@ -1068,31 +1094,31 @@ static void sub_80DF018(struct Sprite *sprite) { sprite->data[1] = 0; sprite->data[2]++; - REG_BLDALPHA = (16 - sprite->data[2]) | (sprite->data[2] << 8); + SetGpuReg(REG_OFFSET_BLDALPHA, (16 - sprite->data[2]) | (sprite->data[2] << 8)); if (sprite->data[2] == 16) { sprite->invisible = 1; - sprite->callback = sub_80DF090; + sprite->callback = sub_8112B44; } } } -static void sub_80DF090(struct Sprite *sprite) +static void sub_8112B44(struct Sprite *sprite) { - REG_BLDCNT = 0; - REG_BLDALPHA = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); gBattle_WIN0H = 0; gBattle_WIN0V = 0; DestroyAnimSprite(sprite); } -static void sub_80DF0B8(struct Sprite *sprite) +static void sub_8112B78(struct Sprite *sprite) { u16 coeffB; u16 coeffA; sprite->pos2.x = Sin(sprite->data[0], 12); - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) sprite->pos2.x = -sprite->pos2.x; sprite->data[0] = (sprite->data[0] + 6) & 0xFF; @@ -1103,8 +1129,8 @@ static void sub_80DF0B8(struct Sprite *sprite) if (sprite->data[7] == 1) { sprite->data[6] = 0x050B; - REG_BLDCNT = 0x3F40; - REG_BLDALPHA = sprite->data[6]; + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); + SetGpuReg(REG_OFFSET_BLDALPHA, sprite->data[6]); } else if (sprite->data[7] > 30) { @@ -1117,44 +1143,44 @@ static void sub_80DF0B8(struct Sprite *sprite) if (--(s16)coeffA < 0) coeffA = 0; - REG_BLDALPHA = (coeffB << 8) | coeffA; - sprite->data[6] = (coeffB << 8) | coeffA; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(coeffA, coeffB)); + sprite->data[6] = BLDALPHA_BLEND(coeffA, coeffB); if (coeffB == 16 && coeffA == 0) { sprite->invisible = 1; - sprite->callback = sub_80DF18C; + sprite->callback = sub_8112C4C; } } } -static void sub_80DF18C(struct Sprite *sprite) +static void sub_8112C4C(struct Sprite *sprite) { - REG_BLDCNT = 0; - REG_BLDALPHA = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); DestroyAnimSprite(sprite); } -void sub_80DF1A4(u8 taskId) +void sub_8112C6C(u8 taskId) { struct Task *task = &gTasks[taskId]; task->data[0] = 0; task->data[1] = 16; - task->data[9] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - task->data[10] = sub_8077FC0(gAnimBankAttacker); - task->data[11] = (sub_807A100(gAnimBankAttacker, 1) / 2) + 8; + task->data[9] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + task->data[10] = GetBattlerYCoordWithElevation(gBattleAnimAttacker); + task->data[11] = (sub_80A861C(gBattleAnimAttacker, 1) / 2) + 8; task->data[7] = 0; - task->data[5] = sub_8079ED4(gAnimBankAttacker); - task->data[6] = GetBattlerSubpriority(gAnimBankAttacker) - 2; + task->data[5] = sub_80A8328(gBattleAnimAttacker); + task->data[6] = sub_80A82E4(gBattleAnimAttacker) - 2; task->data[3] = 0; task->data[4] = 16; - REG_BLDCNT = 0x3F40; - REG_BLDALPHA = 0x1000; + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0x10)); task->data[8] = 0; - task->func = sub_80DF24C; + task->func = sub_8112D10; } -static void sub_80DF24C(u8 taskId) +static void sub_8112D10(u8 taskId) { u16 i; u8 spriteId; @@ -1165,11 +1191,11 @@ static void sub_80DF24C(u8 taskId) case 0: for (i = 0; i < 6; i++) { - spriteId = CreateSprite(&gSpriteTemplate_83DAF80, task->data[9], task->data[10], task->data[6]); + spriteId = CreateSprite(&gUnknown_08596E30, task->data[9], task->data[10], task->data[6]); if (spriteId != MAX_SPRITES) { gSprites[spriteId].data[0] = taskId; - gSprites[spriteId].data[1] = GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER; + gSprites[spriteId].data[1] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER; gSprites[spriteId].data[2] = (i * 42) & 0xFF; gSprites[spriteId].data[3] = task->data[11]; @@ -1198,7 +1224,7 @@ static void sub_80DF24C(u8 taskId) task->data[0]++; } - REG_BLDALPHA = (task->data[4] << 8) | task->data[3]; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[3], task->data[4])); break; case 2: if (++task->data[1] > 30) @@ -1225,21 +1251,21 @@ static void sub_80DF24C(u8 taskId) task->data[0]++; } - REG_BLDALPHA = (task->data[4] << 8) | task->data[3]; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[3], task->data[4])); break; case 4: if (task->data[7] == 0) task->data[0]++; break; case 5: - REG_BLDCNT = 0; - REG_BLDALPHA = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); DestroyAnimVisualTask(taskId); break; } } -static void sub_80DF3D8(struct Sprite *sprite) +static void sub_8112E9C(struct Sprite *sprite) { u16 index; @@ -1267,20 +1293,20 @@ static void sub_80DF3D8(struct Sprite *sprite) } } -static void sub_80DF49C(struct Sprite *sprite) +static void sub_8112F60(struct Sprite *sprite) { sprite->invisible = 1; - sprite->data[5] = gBankSpriteIds[gAnimBankAttacker]; + sprite->data[5] = gBattlerSpriteIds[gBattleAnimAttacker]; sprite->data[0] = 128; sprite->data[1] = 10; sprite->data[2] = gBattleAnimArgs[0]; sprite->data[3] = gBattleAnimArgs[1]; - sprite->callback = sub_80DF4F4; + sprite->callback = sub_8112FB8; gSprites[sprite->data[5]].pos1.y += 8; } -static void sub_80DF4F4(struct Sprite *sprite) +static void sub_8112FB8(struct Sprite *sprite) { if (sprite->data[3]) { @@ -1298,5 +1324,4 @@ static void sub_80DF4F4(struct Sprite *sprite) gSprites[sprite->data[5]].pos1.y -= 8; sprite->callback = move_anim_8074EE0; } -}*/ - +} -- cgit v1.2.3 From a7722a0b936132527ff0bf8fd8213ab0bbd25e44 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 9 Dec 2018 13:41:52 -0600 Subject: Decompile cable_car.c (#438) --- src/cable_car.c | 1006 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/overworld.c | 1 - 2 files changed, 1006 insertions(+), 1 deletion(-) create mode 100755 src/cable_car.c (limited to 'src') diff --git a/src/cable_car.c b/src/cable_car.c new file mode 100755 index 000000000..00606c905 --- /dev/null +++ b/src/cable_car.c @@ -0,0 +1,1006 @@ +#include "global.h" +#include "bg.h" +#include "decompress.h" +#include "event_data.h" +#include "event_object_movement.h" +#include "field_weather.h" +#include "gpu_regs.h" +#include "graphics.h" +#include "alloc.h" +#include "main.h" +#include "menu.h" +#include "overworld.h" +#include "palette.h" +#include "random.h" +#include "scanline_effect.h" +#include "script.h" +#include "sound.h" +#include "sprite.h" +#include "task.h" +#include "constants/event_objects.h" +#include "constants/rgb.h" +#include "constants/songs.h" +#include "constants/weather.h" + +struct CableCar +{ + u8 taskId; + u8 state; + u8 weather; + u16 unk4; + u16 timer; + u8 bg0HorizontalOffset; + u8 bg0VerticalOffset; + u8 fillerA[0x2]; + u8 bg1HorizontalOffset; + u8 bg1VerticalOffset; + u8 fillerE[0x6]; + u8 bg3HorizontalOffset; + u8 bg3VerticalOffset; + u8 filler16[0x2]; + u8 unk18; + u8 unk19; + u8 unk1A; + u8 unk1B; + u8 unk1C; + u8 unk1D; + u8 unk1E; + u8 unk1F; + u8 unk20; + u16 unk22[9][12]; + u8 fillerFA[0x2]; + /*0x00FC*/ u16 bgTilemapBuffers[4][0x800]; + /*0x40FC*/ u16 *mtChimneyTilemap; + /*0x4100*/ u16 *treeTilemap; + /*0x4104*/ u16 *mountainTilemap; + /*0x4108*/ const u16 *pylonHookTilemapEntries; + /*0x410C*/ u8 *pylonStemTilemap; +}; + +static EWRAM_DATA struct CableCar *sCableCar = NULL; +EWRAM_DATA u8 gUnknown_0203ABB0 = 0; +EWRAM_DATA u8 gUnknown_0203ABB1 = 0; +EWRAM_DATA u8 gUnknown_0203ABB2 = 0; +EWRAM_DATA u8 gUnknown_0203ABB3 = 0; +EWRAM_DATA u8 gUnknown_0203ABB4 = 0; +EWRAM_DATA u8 gUnknown_0203ABB5 = 0; + +static void CableCarMainCallback_Setup(void); +static void sub_8150B6C(u8); +static void LoadCableCarSprites(void); +static void sub_81514C8(u8); +static void sub_81503E4(u8); +static void sub_8150550(u8); +static void sub_8150664(u8); +static void CableCarVblankCallback(void); +static void CableCarMainCallback_Run(void); +static void sub_815115C(void); +static void sub_81511B8(void); +static void sub_8150868(struct Sprite *); +static void nullsub_58(struct Sprite *); +static void sub_8151214(void); +static void sub_8151388(void); + +const struct BgTemplate gCableCarBgTemplates[4] = { + { + .bg = 0, + .charBaseIndex = 0, + .mapBaseIndex = 28, + .screenSize = 0, + .paletteMode = 0, + .priority = 1, + .baseTile = 0 + }, + { + .bg = 1, + .charBaseIndex = 0, + .mapBaseIndex = 29, + .screenSize = 0, + .paletteMode = 0, + .priority = 2, + .baseTile = 0 + }, + { + .bg = 2, + .charBaseIndex = 0, + .mapBaseIndex = 30, + .screenSize = 0, + .paletteMode = 0, + .priority = 3, + .baseTile = 0 + }, + { + .bg = 3, + .charBaseIndex = 0, + .mapBaseIndex = 31, + .screenSize = 0, + .paletteMode = 0, + .priority = 0, + .baseTile = 0 + }, +}; + +const u8 gCableCarMtChimneyTilemap[] = INCBIN_U8("graphics/misc/cable_car_mt_chimney_map.bin.lz"); +const u8 gCableCarTreeTilemap[] = INCBIN_U8("graphics/misc/cable_car_tree_map.bin.lz"); +const u8 gCableCarMountainTilemap[] = INCBIN_U8("graphics/misc/cable_car_mountain_map.bin.lz"); + +const u16 gCableCarPylonHookTilemapEntries[] = { + 0x3000, + 0x3001, + 0x3002, + 0x3003, + 0x3004, + 0x3005, + 0x3006, + 0x3007, + 0x3008, + 0x3009, +}; + +const u8 gCableCarPylonStemTilemap[] = INCBIN_U8("graphics/misc/cable_car_pylon_stem_map.bin.lz"); + +const struct CompressedSpriteSheet gUnknown_085CDB54[] = { + { gCableCar_Gfx, 0x800, 1 }, + { gCableCarDoor_Gfx, 0x40, 2 }, + { gCableCarCord_Gfx, 0x80, 3 }, + { }, +}; + +const struct SpritePalette gUnknown_085CDB74[] = { + { gCableCar_Pal, 1 }, + { } +}; + +const struct OamData gOamData_85CDB84 = { + .affineMode = ST_OAM_AFFINE_DOUBLE, + .size = 3, + .priority = 2 +}; + +const struct OamData gOamData_85CDB8C = { + .affineMode = ST_OAM_AFFINE_DOUBLE, + .shape = ST_OAM_H_RECTANGLE, + .priority = 2 +}; + +const struct OamData gOamData_85CDB94 = { + .affineMode = ST_OAM_AFFINE_DOUBLE, + .size = 1, + .priority = 2 +}; + +const struct SpriteTemplate gSpriteTemplate_85CDB9C[] = +{ + { + .tileTag = 1, + .paletteTag = 1, + .oam = &gOamData_85CDB84, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8150868, + }, + { + .tileTag = 2, + .paletteTag = 1, + .oam = &gOamData_85CDB8C, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8150868, + }, +}; + +const struct SpriteTemplate gSpriteTemplate_85CDBCC = { + .tileTag = 3, + .paletteTag = 1, + .oam = &gOamData_85CDB94, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = nullsub_58, +}; + +static void CableCarTask1(u8 taskId) +{ + if (!gPaletteFade.active) + { + SetMainCallback2(CableCarMainCallback_Setup); + DestroyTask(taskId); + } +} + +void CableCar(void) +{ + ScriptContext2_Enable(); + CreateTask(CableCarTask1, 1); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); +} + +static void CableCarMainCallback_Setup(void) +{ + u16 imebak; + u8 i = 0; + int sizeOut = 0; + + switch (gMain.state) + { + case 0: + default: + SetVBlankCallback(NULL); + sub_8150B6C(0); + ScanlineEffect_Stop(); + DmaFillLarge16(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000); + DmaFill32Defvars(3, 0, (void *)OAM, OAM_SIZE); + DmaFill16Defvars(3, 0, (void *)PLTT, PLTT_SIZE); + sCableCar = AllocZeroed(sizeof(*sCableCar)); + gMain.state++; + break; + case 1: + ResetSpriteData(); + ResetTasks(); + FreeAllSpritePalettes(); + ResetPaletteFade(); + reset_temp_tile_data_buffers(); + StartWeather(); + for (i = 0; i < 20; i++) + gWeatherPtr->sprites.s2.ashSprites[i] = NULL; + + InitMapMusic(); + ResetMapMusic(); + ResetBgsAndClearDma3BusyFlags(0); + InitBgsFromTemplates(0, gCableCarBgTemplates, ARRAY_COUNT(gCableCarBgTemplates)); + SetBgTilemapBuffer(0, sCableCar->bgTilemapBuffers[0]); + SetBgTilemapBuffer(1, sCableCar->bgTilemapBuffers[1]); + SetBgTilemapBuffer(2, sCableCar->bgTilemapBuffers[2]); + SetBgTilemapBuffer(3, sCableCar->bgTilemapBuffers[3]); + gSpriteCoordOffsetX = gSpriteCoordOffsetY = 0; + gMain.state++; + break; + case 2: + for (i = 0; i < 3; i++) + LoadCompressedObjectPic(&gUnknown_085CDB54[i]); + + LoadSpritePalettes(gUnknown_085CDB74); + sCableCar->mtChimneyTilemap = malloc_and_decompress(gCableCarMtChimneyTilemap, &sizeOut); + sCableCar->treeTilemap = malloc_and_decompress(gCableCarTreeTilemap, &sizeOut); + sCableCar->mountainTilemap = malloc_and_decompress(gCableCarMountainTilemap, &sizeOut); + sCableCar->pylonStemTilemap = malloc_and_decompress(gCableCarPylonStemTilemap, &sizeOut); + sCableCar->pylonHookTilemapEntries = gCableCarPylonHookTilemapEntries; + decompress_and_copy_tile_data_to_vram(0, gUnknown_08DBA5B8, 0, 0, 0); + gMain.state++; + break; + case 3: + if (!free_temp_tile_data_buffers_if_possible()) + { + LoadPalette(gUnknown_08DBA518, 0, 0x80); + gMain.state++; + } + break; + case 4: + LoadCableCarSprites(); + RunTasks(); + gMain.state++; + break; + case 5: + if (sCableCar->weather == WEATHER_ASH) + { + gMain.state++; + } + else if (gWeatherPtr->sprites.s2.ashSprites[0]) + { + for (i = 0; i < 20; i++) + { + if (gWeatherPtr->sprites.s2.ashSprites[i]) + gWeatherPtr->sprites.s2.ashSprites[i]->oam.priority = 0; + } + + gMain.state++; + } + break; + case 6: + CopyToBgTilemapBufferRect_ChangePalette(1, sCableCar->treeTilemap, 0, 17, 32, 15, 17); + CopyToBgTilemapBufferRect_ChangePalette(2, sCableCar->mountainTilemap, 0, 0, 30, 20, 17); + CopyToBgTilemapBufferRect_ChangePalette(3, sCableCar->pylonHookTilemapEntries, 0, 0, 5, 2, 17); + CopyToBgTilemapBufferRect_ChangePalette(3, sCableCar->pylonStemTilemap, 0, 2, 2, 20, 17); + gMain.state++; + break; + case 7: + sub_81514C8(gSpecialVar_0x8004); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x48, 0, 14, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x6C, 12, 17, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x90, 24, 20, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x0, 0, 17, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 0, 20, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x0, 12, 20, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 12, 23, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x0, 24, 23, 12, 3, 17); + gMain.state++; + break; + case 8: + BeginNormalPaletteFade(0xFFFFFFFF, 3, 16, 0, RGB(0, 0, 0)); + FadeInNewBGM(MUS_ROPEWAY, 1); + sub_8150B6C(1); + gMain.state++; + break; + case 9: + imebak = REG_IME; + REG_IME = 0; + REG_IE |= INTR_FLAG_VBLANK; + REG_IME = imebak; + SetVBlankCallback(CableCarVblankCallback); + SetMainCallback2(CableCarMainCallback_Run); + CreateTask(sub_81503E4, 0); + if (gSpecialVar_0x8004 == 0) + sCableCar->taskId = CreateTask(sub_8150550, 1); + else + sCableCar->taskId = CreateTask(sub_8150664, 1); + break; + } +} + +static void CableCarMainCallback_Run(void) +{ + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); + MapMusicMain(); +} + +static void CleanupCableCar(void) +{ + u8 i = 0; + + HideBg(0); + HideBg(1); + HideBg(2); + HideBg(3); + sub_8150B6C(0); + gSpriteCoordOffsetX = 0; + sub_80AB130(WEATHER_NONE); + for (i = 0; i < 20; i++) + gWeatherPtr->sprites.s2.ashSprites[i] = NULL; + + ResetTasks(); + ResetSpriteData(); + ResetPaletteFade(); + UnsetBgTilemapBuffer(0); + UnsetBgTilemapBuffer(1); + UnsetBgTilemapBuffer(2); + UnsetBgTilemapBuffer(3); + ResetBgsAndClearDma3BusyFlags(0); + sCableCar->pylonHookTilemapEntries = NULL; + FREE_AND_SET_NULL(sCableCar->pylonStemTilemap); + FREE_AND_SET_NULL(sCableCar->mountainTilemap); + FREE_AND_SET_NULL(sCableCar->treeTilemap); + FREE_AND_SET_NULL(sCableCar->mtChimneyTilemap); + FREE_AND_SET_NULL(sCableCar); + DmaFillLarge16(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000); + DmaFill32Defvars(3, 0, (void *)OAM, OAM_SIZE); + DmaFill16Defvars(3, 0, (void *)PLTT, PLTT_SIZE); + WarpIntoMap(); + gFieldCallback = NULL; + SetMainCallback2(CB2_LoadMap); +} + +static void sub_81503E4(u8 taskId) +{ + u8 i = 0; + + sCableCar->timer++; + switch (sCableCar->state) + { + case 0: + if (sCableCar->timer == sCableCar->unk4) + { + ChangeWeather(sCableCar->weather); + sCableCar->state = 1; + } + break; + case 1: + switch (sCableCar->weather) + { + case WEATHER_ASH: + if (gWeatherPtr->sprites.s2.ashSprites[0] != NULL && gWeatherPtr->sprites.s2.ashSprites[0]->oam.priority != 0) + { + for (; i < 20; i++) + { + if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL) + { + gWeatherPtr->sprites.s2.ashSprites[i]->oam.priority = 0; + } + } + sCableCar->state = 2; + } + break; + case WEATHER_SUNNY: + if (gWeatherPtr->currWeather == WEATHER_SUNNY) + { + sCableCar->state = 2; + } + else if (sCableCar->timer >= sCableCar->unk4 + 8) + { + for (; i < 20; i++) + { + if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL) + { + gWeatherPtr->sprites.s2.ashSprites[i]->invisible ^= TRUE; + } + } + } + break; + } + break; + case 2: + if (sCableCar->timer == 570) + { + sCableCar->state = 3; + BeginNormalPaletteFade(0xFFFFFFFF, 3, 0, 16, RGB(0, 0, 0)); + FadeOutBGM(4); + } + break; + case 3: + if (!gPaletteFade.active) + { + sCableCar->state = 0xFF; + } + break; + case 0xFF: + SetVBlankCallback(NULL); + DestroyTask(taskId); + DestroyTask(sCableCar->taskId); + SetMainCallback2(CleanupCableCar); + break; + } +} + +static void sub_8150550(u8 taskId) +{ + if (sCableCar->state != 0xFF) + { + sCableCar->bg3HorizontalOffset--; + if ((sCableCar->timer % 2) == 0) + sCableCar->bg3VerticalOffset--; + + if ((sCableCar->timer % 8) == 0) + { + sCableCar->bg1HorizontalOffset--; + sCableCar->bg1VerticalOffset--; + } + + switch (sCableCar->bg3HorizontalOffset) + { + case 175: + FillBgTilemapBufferRect(3, 0, 0, 22, 2, 10, 17); + break; + case 40: + FillBgTilemapBufferRect(3, 0, 3, 0, 2, 2, 17); + break; + case 32: + FillBgTilemapBufferRect(3, 0, 2, 0, 1, 2, 17); + break; + case 16: + CopyToBgTilemapBufferRect_ChangePalette(3, sCableCar->pylonHookTilemapEntries, 0, 0, 5, 2, 17); + CopyToBgTilemapBufferRect_ChangePalette(3, sCableCar->pylonStemTilemap, 0, 2, 2, 30, 17); + sCableCar->bg3VerticalOffset = 64; + break; + } + } + + sub_815115C(); + gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 1) % 128; +} + +static void sub_8150664(u8 taskId) +{ + if (sCableCar->state != 0xFF) + { + sCableCar->bg3HorizontalOffset++; + if ((sCableCar->timer % 2) == 0) + sCableCar->bg3VerticalOffset++; + + if ((sCableCar->timer % 8) == 0) + { + sCableCar->bg1HorizontalOffset++; + sCableCar->bg1VerticalOffset++; + } + + switch (sCableCar->bg3HorizontalOffset) + { + case 176: + CopyToBgTilemapBufferRect_ChangePalette(3, sCableCar->pylonStemTilemap, 0, 2, 2, 30, 17); + break; + case 16: + FillBgTilemapBufferRect(3, 0, 2, 0, 3, 2, 17); + FillBgTilemapBufferRect(3, 0, 0, 22, 2, 10, 17); + sCableCar->bg3VerticalOffset = 192; + break; + case 32: + FillBgTilemapBufferRect(3, sCableCar->pylonHookTilemapEntries[2], 2, 0, 1, 1, 17); + FillBgTilemapBufferRect(3, sCableCar->pylonHookTilemapEntries[3], 3, 0, 1, 1, 17); + FillBgTilemapBufferRect(3, sCableCar->pylonHookTilemapEntries[7], 2, 1, 1, 1, 17); + FillBgTilemapBufferRect(3, sCableCar->pylonHookTilemapEntries[8], 3, 1, 1, 1, 17); + break; + case 40: + FillBgTilemapBufferRect(3, sCableCar->pylonHookTilemapEntries[4], 4, 0, 1, 1, 17); + FillBgTilemapBufferRect(3, sCableCar->pylonHookTilemapEntries[9], 4, 1, 1, 1, 17); + break; + } + } + + sub_81511B8(); + if (sCableCar->timer < sCableCar->unk4) + gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 247) % 248; + else + gWeatherPtr->unknown_6FC = (gWeatherPtr->unknown_6FC + 247) % 248; +} + +static void CableCarVblankCallback(void) +{ + CopyBgTilemapBufferToVram(0); + CopyBgTilemapBufferToVram(3); + SetGpuReg(REG_OFFSET_BG3HOFS, sCableCar->bg3HorizontalOffset); + SetGpuReg(REG_OFFSET_BG3VOFS, sCableCar->bg3VerticalOffset); + SetGpuReg(REG_OFFSET_BG1HOFS, sCableCar->bg1HorizontalOffset); + SetGpuReg(REG_OFFSET_BG1VOFS, sCableCar->bg1VerticalOffset); + SetGpuReg(REG_OFFSET_BG0HOFS, sCableCar->bg0HorizontalOffset); + SetGpuReg(REG_OFFSET_BG0VOFS, sCableCar->bg0VerticalOffset); + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); +} + +static void nullsub_58(struct Sprite *sprite) +{ +} + +static void sub_8150868(struct Sprite *sprite) +{ + if (sCableCar->state != 0xFF) + { + if (gSpecialVar_0x8004 == 0) + { + sprite->pos1.x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); + } + else + { + sprite->pos1.x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); + } + } +} + +void sub_8150948(struct Sprite *sprite) +{ + if (sCableCar->state != 255) + { + if (!gSpecialVar_0x8004) + { + sprite->pos1.x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); + } + else + { + sprite->pos1.x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); + } + + switch (sprite->data[2]) + { + case 0: + sprite->pos2.y = 17; + if (sprite->data[3] ++ > 9) + { + sprite->data[3] = 0; + sprite->data[2] ++; + } + break; + default: + sprite->pos2.y = 16; + if (sprite->data[3] ++ > 9) + { + sprite->data[3] = 0; + sprite->data[2] = 0; + } + break; + } + } +} + +static void sub_8150A68(struct Sprite *sprite) +{ + if (sprite->data[0] == 0) + { + sprite->pos1.x += 2 * sprite->centerToCornerVecX; + sprite->pos1.y += 16 + sprite->centerToCornerVecY; + } + + if (++sprite->data[0] >= sprite->data[2]) + { + switch (sprite->data[1]) + { + case 0: + sprite->pos1.x++; + if ((sprite->data[0] % 4) == 0) + sprite->pos1.y++; + break; + case 1: + if ((sprite->data[0] % 2) != 0) + { + sprite->pos1.x++; + if ((sprite->pos1.x % 4) == 0) + sprite->pos1.y++; + } + break; + } + + if (sprite->pos1.y > 160) + DestroySprite(sprite); + } +} + +static void sub_8150AF4(struct Sprite *sprite) +{ + if (sprite->data[0] == 0) + sprite->pos1.y += 16 + sprite->centerToCornerVecY; + + if (++sprite->data[0] >= sprite->data[2]) + { + switch (sprite->data[1]) + { + case 0: + sprite->pos1.x--; + if ((sprite->data[0] % 4) == 0) + sprite->pos1.y--; + break; + case 1: + if ((sprite->data[0] % 2) != 0) + { + sprite->pos1.x--; + if ((sprite->pos1.x % 4) == 0) + sprite->pos1.y--; + } + break; + } + + if (sprite->pos1.y < 80) + DestroySprite(sprite); + } +} + +static void sub_8150B6C(bool8 which) +{ + switch (which) + { + case FALSE: + default: + SetGpuReg(REG_OFFSET_WININ, 0); + SetGpuReg(REG_OFFSET_WINOUT, 0); + SetGpuReg(REG_OFFSET_WIN0H, 0); + SetGpuReg(REG_OFFSET_WIN1H, 0); + SetGpuReg(REG_OFFSET_WIN0V, 0); + SetGpuReg(REG_OFFSET_WIN1V, 0); + SetGpuReg(REG_OFFSET_DISPCNT, 0); + SetGpuReg(REG_OFFSET_BG3CNT, 0); + SetGpuReg(REG_OFFSET_BG2CNT, 0); + SetGpuReg(REG_OFFSET_BG1CNT, 0); + SetGpuReg(REG_OFFSET_BG0CNT, 0); + SetGpuReg(REG_OFFSET_BG3HOFS, 0); + SetGpuReg(REG_OFFSET_BG3VOFS, 0); + SetGpuReg(REG_OFFSET_BG2HOFS, 0); + SetGpuReg(REG_OFFSET_BG2VOFS, 0); + SetGpuReg(REG_OFFSET_BG1HOFS, 0); + SetGpuReg(REG_OFFSET_BG1VOFS, 0); + SetGpuReg(REG_OFFSET_BG0HOFS, 0); + SetGpuReg(REG_OFFSET_BG0VOFS, 0); + SetGpuReg(REG_OFFSET_BLDCNT, 0); + break; + case TRUE: + SetGpuReg(REG_OFFSET_WININ, 0); + SetGpuReg(REG_OFFSET_WINOUT, 0); + SetGpuReg(REG_OFFSET_WIN0H, 0); + SetGpuReg(REG_OFFSET_WIN1H, 0); + SetGpuReg(REG_OFFSET_WIN0V, 0); + SetGpuReg(REG_OFFSET_WIN1V, 0); + if (gSpecialVar_0x8004 == 0) + { + sCableCar->bg3HorizontalOffset = 176; + sCableCar->bg3VerticalOffset = 16; + sCableCar->bg1HorizontalOffset = 0; + sCableCar->bg1VerticalOffset = 80; + sCableCar->bg0VerticalOffset = 0; + sCableCar->bg0VerticalOffset = 0; + } + else + { + sCableCar->bg3HorizontalOffset = 96; + sCableCar->bg3VerticalOffset = 232; + sCableCar->bg1HorizontalOffset = 0; + sCableCar->bg1VerticalOffset = 4; + sCableCar->bg0VerticalOffset = 0; + sCableCar->bg0VerticalOffset = 0; + } + + SetGpuReg(REG_OFFSET_BG3HOFS, sCableCar->bg3HorizontalOffset); + SetGpuReg(REG_OFFSET_BG3VOFS, sCableCar->bg3VerticalOffset); + SetGpuReg(REG_OFFSET_BG2HOFS, 0); + SetGpuReg(REG_OFFSET_BG2VOFS, 0); + SetGpuReg(REG_OFFSET_BG1HOFS, sCableCar->bg1HorizontalOffset); + SetGpuReg(REG_OFFSET_BG1VOFS, sCableCar->bg1VerticalOffset); + SetGpuReg(REG_OFFSET_BG0HOFS, sCableCar->bg0HorizontalOffset); + SetGpuReg(REG_OFFSET_BG0VOFS, sCableCar->bg0VerticalOffset); + SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); + CopyBgTilemapBufferToVram(1); + CopyBgTilemapBufferToVram(2); + ShowBg(0); + ShowBg(1); + ShowBg(2); + ShowBg(3); + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL); + break; + } +} + +static void LoadCableCarSprites(void) +{ + u8 spriteId; + u8 i; + + u8 playerGraphicsIds[2] = { + EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, + EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + }; + u16 rval = Random(); + u8 hikerGraphicsIds[4] = { + EVENT_OBJ_GFX_HIKER, + EVENT_OBJ_GFX_CAMPER, + EVENT_OBJ_GFX_PICNICKER, + EVENT_OBJ_GFX_ZIGZAGOON_1 + }; + s16 hikerCoords[2][2] = { + { 0, 80 }, + { 240, 146 } + }; + u8 hikerMovementDelayTable[4] = { + 0, + 60, + 120, + 170 + }; + void (*callbacks[2])(struct Sprite *) = { + sub_8150A68, + sub_8150AF4 + }; + + switch (gSpecialVar_0x8004) + { + case 0: + default: + spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 200, 73, 102); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 2; + gSprites[spriteId].pos2.x = 8; + gSprites[spriteId].pos2.y = 16; + gSprites[spriteId].data[0] = 0xc8; + gSprites[spriteId].data[1] = 0x49; + } + spriteId = CreateSprite(&gSpriteTemplate_85CDB9C[0], 176, 43, 0x67); + gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = 32; + gSprites[spriteId].data[0] = 176; + gSprites[spriteId].data[1] = 43; + spriteId = CreateSprite(&gSpriteTemplate_85CDB9C[1], 200, 99, 0x65); + gSprites[spriteId].pos2.x = 8; + gSprites[spriteId].pos2.y = 4; + gSprites[spriteId].data[0] = 200; + gSprites[spriteId].data[1] = 99; + sCableCar->weather = WEATHER_ASH; + sCableCar->unk4 = 0x15e; + sub_80AB130(WEATHER_SUNNY); + break; + case 1: + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 24, 26, 12, 3, 17); + spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 128, 39, 102); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 2; + gSprites[spriteId].pos2.x = 8; + gSprites[spriteId].pos2.y = 16; + gSprites[spriteId].data[0] = 0x80; + gSprites[spriteId].data[1] = 0x27; + } + spriteId = CreateSprite(&gSpriteTemplate_85CDB9C[0], 104, 9, 0x67); + gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = 0x20; + gSprites[spriteId].data[0] = 104; + gSprites[spriteId].data[1] = 9; + spriteId = CreateSprite(&gSpriteTemplate_85CDB9C[1], 128, 65, 0x65); + gSprites[spriteId].pos2.x = 8; + gSprites[spriteId].pos2.y = 4; + gSprites[spriteId].data[0] = 0x80; + gSprites[spriteId].data[1] = 0x41; + sCableCar->weather = WEATHER_SUNNY; + sCableCar->unk4 = 0x109; + sub_80AB130(WEATHER_ASH); + break; + } + for (i = 0; i < 9; i++) + { + spriteId = CreateSprite(&gSpriteTemplate_85CDBCC, 16 * i + 96, 8 * i - 8, 0x68); + gSprites[spriteId].pos2.x = 8; + gSprites[spriteId].pos2.y = 8; + } + if ((rval % 64) == 0) + { + spriteId = AddPseudoEventObject(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 2; + gSprites[spriteId].pos2.x = -gSprites[spriteId].centerToCornerVecX; + gSprites[spriteId].pos2.y = -gSprites[spriteId].centerToCornerVecY; + if (gSpecialVar_0x8004 == 0) + { + if (rval % 2) + { + StartSpriteAnim(&gSprites[spriteId], 6); + gSprites[spriteId].data[1] = 1; + gSprites[spriteId].pos1.y += 2; + } + else + { + StartSpriteAnim(&gSprites[spriteId], 7); + gSprites[spriteId].data[1] = 0; + } + } + else + { + if (rval % 2) + { + StartSpriteAnim(&gSprites[spriteId], 7); + gSprites[spriteId].data[1] = 1; + gSprites[spriteId].pos1.y += 2; + } + else + { + StartSpriteAnim(&gSprites[spriteId], 6); + gSprites[spriteId].data[1] = 0; + } + } + gSprites[spriteId].data[2] = hikerMovementDelayTable[rval % 4]; + } + } +} + +void sub_8151088(void) +{ + u8 i; + u8 j; + u8 k; + u8 offset; + + for (i = 0, k = 0, offset = 0x24 * (sCableCar->unk1B + 2); i < 3; i++) + { + for (j = 0; j < 12; j++) + { + sCableCar->unk22[i][j] = sCableCar->mtChimneyTilemap[offset++]; + sCableCar->unk22[i + 3][j] = sCableCar->mtChimneyTilemap[k]; + sCableCar->unk22[i + 6][j] = (sCableCar->mtChimneyTilemap + 0x24)[k]; + k++; + } + } + + sCableCar->unk1B = (sCableCar->unk1B + 1) % 3; +} + +static void sub_815115C(void) +{ + sCableCar->unk1C = (sCableCar->unk1C + 1) % 0x60; + sCableCar->bg0HorizontalOffset = sCableCar->unk1F - sCableCar->unk1D; + sCableCar->bg0VerticalOffset = sCableCar->unk20 - sCableCar->unk1E; + sCableCar->unk1D++; + if ((sCableCar->unk1D % 4) == 0) + sCableCar->unk1E++; + + if (sCableCar->unk1D > 16) + sub_8151214(); +} + +static void sub_81511B8(void) +{ + sCableCar->unk1C = (sCableCar->unk1C + 1) % 0x60; + sCableCar->bg0HorizontalOffset = sCableCar->unk1F + sCableCar->unk1D; + sCableCar->bg0VerticalOffset = sCableCar->unk20 + sCableCar->unk1E; + sCableCar->unk1D++; + if ((sCableCar->unk1D % 4) == 0) + sCableCar->unk1E++; + + if (sCableCar->unk1D > 16) + sub_8151388(); +} + +static void sub_8151214(void) +{ + u8 i = 0; + + sCableCar->unk1D = sCableCar->unk1E = 0; + sCableCar->unk1F = sCableCar->bg0HorizontalOffset; + sCableCar->unk20 = sCableCar->bg0VerticalOffset; + sCableCar->unk19 = (sCableCar->unk19 + 30) % 32; + sCableCar->unk18 -= 2; + gUnknown_0203ABB2 = (sCableCar->unk1A + 23) % 32; + for (i = 0; i < 9; i++) + { + gUnknown_0203ABB0 = sCableCar->unk19; + gUnknown_0203ABB1 = (gUnknown_0203ABB2 + i) % 32; + FillBgTilemapBufferRect(0, sCableCar->unk22[i][sCableCar->unk18], gUnknown_0203ABB0, gUnknown_0203ABB1, 1, 1, 17); + gUnknown_0203ABB0 = (gUnknown_0203ABB0 + 1) % 32; + FillBgTilemapBufferRect(0, sCableCar->unk22[i][sCableCar->unk18 + 1], gUnknown_0203ABB0, gUnknown_0203ABB1, 1, 1, 17); + } + + gUnknown_0203ABB0 = (sCableCar->unk19 + 30) % 32; + FillBgTilemapBufferRect(0, 0, gUnknown_0203ABB0, 0, 2, 32, 17); + if (sCableCar->unk18 == 0) + { + sCableCar->unk1A = (sCableCar->unk1A + 29) % 32; + sCableCar->unk18 = 12; + sub_8151088(); + gUnknown_0203ABB0 = (sCableCar->unk1A + 1) % 32; + FillBgTilemapBufferRect(0, 0, 0, gUnknown_0203ABB0, 32, 9, 17); + } +} + +static void sub_8151388(void) +{ + u8 i = 0; + + sCableCar->unk1D = sCableCar->unk1E = 0; + sCableCar->unk1F = sCableCar->bg0HorizontalOffset; + sCableCar->unk20 = sCableCar->bg0VerticalOffset; + sCableCar->unk19 = (sCableCar->unk19 + 2) % 32; + sCableCar->unk18 += 2; + gUnknown_0203ABB5 = sCableCar->unk1A; + for (i = 0; i < 9; i++) + { + gUnknown_0203ABB3 = sCableCar->unk19; + gUnknown_0203ABB4 = (gUnknown_0203ABB5 + i) % 32; + FillBgTilemapBufferRect(0, sCableCar->unk22[i][sCableCar->unk18], gUnknown_0203ABB3, gUnknown_0203ABB4, 1, 1, 17); + gUnknown_0203ABB3 = (gUnknown_0203ABB3 + 1) % 32; + FillBgTilemapBufferRect(0, sCableCar->unk22[i][sCableCar->unk18 + 1], gUnknown_0203ABB3, gUnknown_0203ABB4, 1, 1, 17); + } + + gUnknown_0203ABB4 = (sCableCar->unk1A + 23) % 32; + FillBgTilemapBufferRect(0, 0, sCableCar->unk19, gUnknown_0203ABB4, 2, 9, 17); + if (sCableCar->unk18 == 10) + { + sCableCar->unk1A = (sCableCar->unk1A + 3) % 32; + sCableCar->unk18 = 0xfe; + sub_8151088(); + } +} + +static void sub_81514C8(u8 arg0) +{ + switch (arg0) + { + case 0: + default: + sCableCar->unk1B = 2; + sCableCar->unk19 = 0; + sCableCar->unk1A = 20; + sCableCar->unk18 = 12; + sub_8151088(); + sub_8151214(); + break; + case 1: + sCableCar->unk1B = 2; + sCableCar->unk19 = 28; + sCableCar->unk1A = 20; + sCableCar->unk18 = 4; + sub_8151088(); + sub_8151388(); + break; + } + + sCableCar->unk1C = 0; +} diff --git a/src/overworld.c b/src/overworld.c index 417c52a9e..6998c9d98 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -147,7 +147,6 @@ extern void ResetAllPicSprites(void); extern void FieldEffectActiveListClear(void); extern void SetUpFieldTasks(void); extern void sub_81BE6B8(void); -extern void StartWeather(void); extern void ShowStartMenu(void); extern void sub_80AEE84(void); extern void mapldr_default(void); -- 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') 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 e143804af010b52d5723be3b583435e71e99f07f Mon Sep 17 00:00:00 2001 From: Meowsy Date: Mon, 10 Dec 2018 04:32:00 -0500 Subject: Document pocket magic numbers. --- src/item_menu.c | 86 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'src') diff --git a/src/item_menu.c b/src/item_menu.c index 1744a1bfa..a7d101651 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -432,8 +432,8 @@ struct ListBuffer2 { struct TempWallyStruct { struct ItemSlot bagPocket_Items[30]; struct ItemSlot bagPocket_PokeBalls[16]; - u16 cursorPosition[5]; - u16 scrollPosition[5]; + u16 cursorPosition[POCKETS_COUNT]; + u16 scrollPosition[POCKETS_COUNT]; u8 filler[0x2]; u16 pocket; }; @@ -455,60 +455,60 @@ extern const u16 gUnknown_0860F074[]; void ResetBagScrollPositions(void) { - gUnknown_0203CE58.pocket = 0; + gUnknown_0203CE58.pocket = ITEMS_POCKET; memset(gUnknown_0203CE58.cursorPosition, 0, 10); memset(gUnknown_0203CE58.scrollPosition, 0, 10); } void CB2_BagMenuFromStartMenu(void) { - GoToBagMenu(0, 5, CB2_ReturnToFieldWithOpenMenu); + GoToBagMenu(0, POCKETS_COUNT, CB2_ReturnToFieldWithOpenMenu); } void sub_81AABB0(void) { if (!InBattlePyramid()) - GoToBagMenu(1, 5, SetCB2ToReshowScreenAfterMenu2); + GoToBagMenu(1, POCKETS_COUNT, SetCB2ToReshowScreenAfterMenu2); else sub_81C4F98(1, SetCB2ToReshowScreenAfterMenu2); } void CB2_ChooseBerry(void) { - GoToBagMenu(4, 3, CB2_ReturnToFieldContinueScript); + GoToBagMenu(4, BERRIES_POCKET, CB2_ReturnToFieldContinueScript); } void sub_81AABF0(void(*callback)(void)) { - GoToBagMenu(5, 3, callback); + GoToBagMenu(5, BERRIES_POCKET, callback); } void CB2_GoToSellMenu(void) { - GoToBagMenu(3, 5, CB2_ExitSellMenu); + GoToBagMenu(3, POCKETS_COUNT, CB2_ExitSellMenu); } void sub_81AAC14(void) { - GoToBagMenu(6, 5, sub_816B31C); + GoToBagMenu(6, POCKETS_COUNT, sub_816B31C); } void sub_81AAC28(void) { - GoToBagMenu(9, 5, bag_menu_leave_maybe_3); + GoToBagMenu(9, POCKETS_COUNT, bag_menu_leave_maybe_3); gSpecialVar_0x8005 = 0; gSpecialVar_Result = 0; } void sub_81AAC50(void) { - GoToBagMenu(7, 5, bag_menu_leave_maybe_2); + GoToBagMenu(7, POCKETS_COUNT, bag_menu_leave_maybe_2); gSpecialVar_Result = 0; } void sub_81AAC70(void) { - GoToBagMenu(8, 5, bag_menu_leave_maybe); + GoToBagMenu(8, POCKETS_COUNT, bag_menu_leave_maybe); gSpecialVar_Result = 0; } @@ -526,9 +526,9 @@ void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2) gUnknown_0203CE58.location = bagMenuType; if (postExitMenuMainCallback2) gUnknown_0203CE58.bagCallback = postExitMenuMainCallback2; - if (pocketId <= 4) + if (pocketId <= POCKETS_COUNT - 1) gUnknown_0203CE58.pocket = pocketId; - temp = gUnknown_0203CE58.location - 4; + temp = gUnknown_0203CE58.location - (POCKETS_COUNT - 1); if (temp <= 1) gUnknown_0203CE54->unk81B = 1; gUnknown_0203CE54->unk0 = 0; @@ -788,7 +788,7 @@ void get_name(s8 *dest, u16 itemId) { switch (gUnknown_0203CE58.pocket) { - case 2: + case TMHM_POCKET: StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(itemId)]); if (itemId >= ITEM_HM01) { @@ -801,7 +801,7 @@ void get_name(s8 *dest, u16 itemId) StringExpandPlaceholders(dest, gText_UnkF908Var1Clear7Var2); } break; - case 3: + case BERRIES_POCKET: ConvertIntToDecimalStringN(gStringVar1, itemId - ITEM_CHERI_BERRY + 1, 2, 2); CopyItemName(itemId, gStringVar2); StringExpandPlaceholders(dest, gText_UnkF908Var1Clear7Var2); @@ -851,14 +851,14 @@ void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a) itemQuantity = BagGetQuantityByPocketPosition(gUnknown_0203CE58.pocket + 1, item_index_in_pocket); if (itemId >= ITEM_HM01 && itemId <= ITEM_HM08) BlitBitmapToWindow(rboxId, gBagMenuHMIcon_Gfx, 8, a - 1, 16, 16); - if (gUnknown_0203CE58.pocket == 3) + if (gUnknown_0203CE58.pocket == BERRIES_POCKET) { ConvertIntToDecimalStringN(gStringVar1, itemQuantity, 1, 3); StringExpandPlaceholders(gStringVar4, gText_xVar1); offset = GetStringRightAlignXOffset(7, gStringVar4, 0x77); bag_menu_print(rboxId, 7, gStringVar4, offset, a, 0, 0, -1, 0); } - else if (gUnknown_0203CE58.pocket != 4 && (unique = ItemId_GetImportance(itemId)) == FALSE) + else if (gUnknown_0203CE58.pocket != KEYITEMS_POCKET && (unique = ItemId_GetImportance(itemId)) == FALSE) { ConvertIntToDecimalStringN(gStringVar1, itemQuantity, 1, 2); StringExpandPlaceholders(gStringVar4, gText_xVar1); @@ -973,8 +973,8 @@ void sub_81AB9A8(u8 pocketId) struct BagPocket *pocket = &gBagPockets[pocketId]; switch (pocketId) { - case 2: - case 3: + case TMHM_POCKET: + case BERRIES_POCKET: SortBerriesOrTMHMs(pocket); break; default: @@ -995,7 +995,7 @@ void sub_81AB9A8(u8 pocketId) void sub_81ABA6C(void) { u8 i; - for (i = 0; i < 5; i++) + for (i = 0; i < POCKETS_COUNT; i++) sub_81AB9A8(i); } @@ -1007,14 +1007,14 @@ void sub_81ABA88(u8 a) void sub_81ABAC4(void) { u8 i; - for (i = 0; i < 5; i++) + for (i = 0; i < POCKETS_COUNT; i++) sub_81ABA88(i); } void sub_81ABAE0(void) { u8 i; - for (i = 0; i < 5; i++) + for (i = 0; i < POCKETS_COUNT; i++) sub_8122298(&gUnknown_0203CE58.scrollPosition[i], &gUnknown_0203CE58.cursorPosition[i], gUnknown_0203CE54->unk82E[i], gUnknown_0203CE54->unk829[i], 8); } @@ -1055,7 +1055,7 @@ void sub_81ABC3C(u8 a) void sub_81ABC54(u8 a, s16 b) { - u8 r3 = (gUnknown_0203CE58.pocket == 3) ? 3 : 2; + u8 r3 = (gUnknown_0203CE58.pocket == BERRIES_POCKET) ? 3 : 2; ConvertIntToDecimalStringN(gStringVar1, b, 2, r3); StringExpandPlaceholders(gStringVar4, gText_xVar1); AddTextPrinterParameterized(a, 1, gStringVar4, GetStringCenterAlignXOffset(1, gStringVar4, 0x28), 2, 0, 0); @@ -1063,7 +1063,7 @@ void sub_81ABC54(u8 a, s16 b) void sub_81ABCC0(int a, int b, int c) { - u8 r3 = (gUnknown_0203CE58.pocket == 3) ? 3 : 2; + u8 r3 = (gUnknown_0203CE58.pocket == BERRIES_POCKET) ? 3 : 2; ConvertIntToDecimalStringN(gStringVar1, b, 2, r3); StringExpandPlaceholders(gStringVar4, gText_xVar1); AddTextPrinterParameterized(a, 1, gStringVar4, 0, 1, -1, 0); @@ -1164,10 +1164,10 @@ u8 GetSwitchBagPocketDirection(void) void ChangeBagPocketId(u8 *bagPocketId, s8 deltaBagPocketId) { - if (deltaBagPocketId == 1 && *bagPocketId == 4) + if (deltaBagPocketId == 1 && *bagPocketId == POCKETS_COUNT - 1) *bagPocketId = 0; else if (deltaBagPocketId == -1 && *bagPocketId == 0) - *bagPocketId = 4; + *bagPocketId = POCKETS_COUNT - 1; else *bagPocketId += deltaBagPocketId; } @@ -1444,7 +1444,7 @@ void sub_81AC644(u8 unused) default: if (sub_81221AC() == TRUE || InUnionRoom() == TRUE) { - if (gUnknown_0203CE58.pocket == 4 || !sub_8122148(gSpecialVar_ItemId)) + if (gUnknown_0203CE58.pocket == KEYITEMS_POCKET || !sub_8122148(gSpecialVar_ItemId)) { gUnknown_0203CE54->unk820 = &gUnknown_08614046; gUnknown_0203CE54->unk828 = 1; @@ -1459,14 +1459,14 @@ void sub_81AC644(u8 unused) { switch (gUnknown_0203CE58.pocket) { - case 0: + case ITEMS_POCKET: gUnknown_0203CE54->unk820 = &gUnknown_0203CE54->unk824; gUnknown_0203CE54->unk828 = 4; memcpy(&gUnknown_0203CE54->unk824, &gUnknown_0861402C, 4); if (ItemIsMail(gSpecialVar_ItemId) == TRUE) gUnknown_0203CE54->unk824 = 6; break; - case 4: + case KEYITEMS_POCKET: gUnknown_0203CE54->unk820 = &gUnknown_0203CE54->unk824; gUnknown_0203CE54->unk828 = 4; memcpy(&gUnknown_0203CE54->unk824, &gUnknown_08614030, 4); @@ -1478,22 +1478,22 @@ void sub_81AC644(u8 unused) gUnknown_0203CE54->unk824 = 7; } break; - case 1: + case BALLS_POCKET: gUnknown_0203CE54->unk820 = gUnknown_08614034; gUnknown_0203CE54->unk828 = 4; break; - case 2: + case TMHM_POCKET: gUnknown_0203CE54->unk820 = gUnknown_08614038; gUnknown_0203CE54->unk828 = 4; break; - case 3: + case BERRIES_POCKET: gUnknown_0203CE54->unk820 = gUnknown_0861403C; gUnknown_0203CE54->unk828 = 6; break; } } } - if (gUnknown_0203CE58.pocket == 2) + if (gUnknown_0203CE58.pocket == TMHM_POCKET) { ClearWindowTilemap(1); PrintTMHMMoveData(gSpecialVar_ItemId); @@ -1624,17 +1624,17 @@ bool8 sub_81ACDFC(s8 a) void bag_menu_remove_some_window(void) { if (gUnknown_0203CE54->unk828 == 1) - bag_menu_remove_window(0); + bag_menu_remove_window(0); else if (gUnknown_0203CE54->unk828 == 2) { - bag_menu_remove_window(1); + bag_menu_remove_window(1); } else if (gUnknown_0203CE54->unk828 == 4) { - bag_menu_remove_window(2); + bag_menu_remove_window(2); } else - bag_menu_remove_window(3); + bag_menu_remove_window(3); } void ItemMenu_UseOutOfBattle(u8 taskId) @@ -1648,7 +1648,7 @@ void ItemMenu_UseOutOfBattle(u8 taskId) { FillWindowPixelBuffer(1, 0); schedule_bg_copy_tilemap_to_vram(0); - if (gUnknown_0203CE58.pocket != 3) + if (gUnknown_0203CE58.pocket != BERRIES_POCKET) ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId); else sub_80FDD10(taskId); @@ -1842,7 +1842,7 @@ void ItemMenu_UseInBattle(u8 taskId) void bag_menu_mail_related(void) { - GoToBagMenu(12, 5, NULL); + GoToBagMenu(12, POCKETS_COUNT, NULL); } void item_menu_type_2(u8 taskId) @@ -1857,7 +1857,7 @@ void item_menu_type_2(u8 taskId) StringExpandPlaceholders(gStringVar4, gText_Var1CantBeHeldHere); DisplayItemMessage(taskId, 1, gStringVar4, sub_81AD350); } - else if (gUnknown_0203CE58.pocket != 4 && !ItemId_GetImportance(gSpecialVar_ItemId)) + else if (gUnknown_0203CE58.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId)) { unknown_ItemMenu_Confirm(taskId); } @@ -1871,7 +1871,7 @@ void item_menu_type_b(u8 taskId) { if (ItemIsMail(gSpecialVar_ItemId) == TRUE) DisplayItemMessage(taskId, 1, gText_CantWriteMail, sub_81AD350); - else if (gUnknown_0203CE58.pocket != 4 && !ItemId_GetImportance(gSpecialVar_ItemId)) + else if (gUnknown_0203CE58.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId)) gTasks[taskId].func = unknown_ItemMenu_Confirm; else bag_menu_print_cant_be_held_msg(taskId); @@ -2157,7 +2157,7 @@ void DoWallyTutorialBagMenu(void) PrepareBagForWallyTutorial(); AddBagItem(ITEM_POTION, 1); AddBagItem(ITEM_POKE_BALL, 1); - GoToBagMenu(10, 0, SetCB2ToReshowScreenAfterMenu2); + GoToBagMenu(10, ITEMS_POCKET, SetCB2ToReshowScreenAfterMenu2); } void Task_WallyTutorialBagMenu(u8 taskId) -- 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') 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') 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 0aa41ad6472a095864dc97649ae18bbd261383bb Mon Sep 17 00:00:00 2001 From: Meowsy Date: Mon, 10 Dec 2018 11:38:27 -0500 Subject: Fix whitespace to be consistent. --- src/strings.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/strings.c b/src/strings.c index 7b3df0eca..7b0178fa1 100644 --- a/src/strings.c +++ b/src/strings.c @@ -255,25 +255,25 @@ const u8 gText_ThePC[] = _("the PC"); const u8 *const gReturnToXStringsTable[] = { gText_TheField, - gText_TheBattle, - gText_ThePokemonList, - gText_TheShop, - gText_TheField, - gText_TheField, - gText_ThePC, - gText_TheField, - gText_TheField, - gText_TheField, - gText_TheBattle, - gText_ThePC + gText_TheBattle, + gText_ThePokemonList, + gText_TheShop, + gText_TheField, + gText_TheField, + gText_ThePC, + gText_TheField, + gText_TheField, + gText_TheField, + gText_TheBattle, + gText_ThePC }; const u8 *const gReturnToXStringsTable2[] = { gText_TheField, - gText_TheBattle, - gText_ThePokemonList, - gText_TheField + gText_TheBattle, + gText_ThePokemonList, + gText_TheField }; const u8 gText_ReturnToVar1[] = _("Return to\n{STR_VAR_1}."); @@ -286,10 +286,10 @@ const u8 gText_KeyItemsPocket[] = _("KEY ITEMS"); const u8 *const gPocketNamesStringsTable[] = { gText_ItemsPocket, - gText_PokeBallsPocket, - gText_TMHMPocket, - gText_BerriesPocket, - gText_KeyItemsPocket + gText_PokeBallsPocket, + gText_TMHMPocket, + gText_BerriesPocket, + gText_KeyItemsPocket }; const u8 gText_UnkF908Var1Clear7Var2[] = _("{NO}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}"); -- cgit v1.2.3 From 2f008e866b2d0541e864e3c2c14c5b4437720fe4 Mon Sep 17 00:00:00 2001 From: Meowsy Date: Mon, 10 Dec 2018 11:39:57 -0500 Subject: Document return locations. --- src/item_menu.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/item_menu.c b/src/item_menu.c index a7d101651..bc2bfb3b7 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -462,53 +462,53 @@ void ResetBagScrollPositions(void) void CB2_BagMenuFromStartMenu(void) { - GoToBagMenu(0, POCKETS_COUNT, CB2_ReturnToFieldWithOpenMenu); + GoToBagMenu(RETURN_LOCATION_FIELD, POCKETS_COUNT, CB2_ReturnToFieldWithOpenMenu); } void sub_81AABB0(void) { if (!InBattlePyramid()) - GoToBagMenu(1, POCKETS_COUNT, SetCB2ToReshowScreenAfterMenu2); + GoToBagMenu(RETURN_LOCATION_BATTLE, POCKETS_COUNT, SetCB2ToReshowScreenAfterMenu2); else sub_81C4F98(1, SetCB2ToReshowScreenAfterMenu2); } void CB2_ChooseBerry(void) { - GoToBagMenu(4, BERRIES_POCKET, CB2_ReturnToFieldContinueScript); + GoToBagMenu(RETURN_LOCATION_FIELD_2, BERRIES_POCKET, CB2_ReturnToFieldContinueScript); } void sub_81AABF0(void(*callback)(void)) { - GoToBagMenu(5, BERRIES_POCKET, callback); + GoToBagMenu(RETURN_LOCATION_FIELD_3, BERRIES_POCKET, callback); } void CB2_GoToSellMenu(void) { - GoToBagMenu(3, POCKETS_COUNT, CB2_ExitSellMenu); + GoToBagMenu(RETURN_LOCATION_SHOP, POCKETS_COUNT, CB2_ExitSellMenu); } void sub_81AAC14(void) { - GoToBagMenu(6, POCKETS_COUNT, sub_816B31C); + GoToBagMenu(RETURN_LOCATION_PC, POCKETS_COUNT, sub_816B31C); } void sub_81AAC28(void) { - GoToBagMenu(9, POCKETS_COUNT, bag_menu_leave_maybe_3); + GoToBagMenu(RETURN_LOCATION_FIELD_6, POCKETS_COUNT, bag_menu_leave_maybe_3); gSpecialVar_0x8005 = 0; gSpecialVar_Result = 0; } void sub_81AAC50(void) { - GoToBagMenu(7, POCKETS_COUNT, bag_menu_leave_maybe_2); + GoToBagMenu(RETURN_LOCATION_FIELD_4, POCKETS_COUNT, bag_menu_leave_maybe_2); gSpecialVar_Result = 0; } void sub_81AAC70(void) { - GoToBagMenu(8, POCKETS_COUNT, bag_menu_leave_maybe); + GoToBagMenu(RETURN_LOCATION_FIELD_5, POCKETS_COUNT, bag_menu_leave_maybe); gSpecialVar_Result = 0; } @@ -522,11 +522,11 @@ void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2) } else { - if (bagMenuType != 12) + if (bagMenuType != RETURN_LOCATION_UNCHANGED) gUnknown_0203CE58.location = bagMenuType; if (postExitMenuMainCallback2) gUnknown_0203CE58.bagCallback = postExitMenuMainCallback2; - if (pocketId <= POCKETS_COUNT - 1) + if (pocketId < POCKETS_COUNT) gUnknown_0203CE58.pocket = pocketId; temp = gUnknown_0203CE58.location - (POCKETS_COUNT - 1); if (temp <= 1) @@ -1842,7 +1842,7 @@ void ItemMenu_UseInBattle(u8 taskId) void bag_menu_mail_related(void) { - GoToBagMenu(12, POCKETS_COUNT, NULL); + GoToBagMenu(RETURN_LOCATION_UNCHANGED, POCKETS_COUNT, NULL); } void item_menu_type_2(u8 taskId) @@ -2157,7 +2157,7 @@ void DoWallyTutorialBagMenu(void) PrepareBagForWallyTutorial(); AddBagItem(ITEM_POTION, 1); AddBagItem(ITEM_POKE_BALL, 1); - GoToBagMenu(10, ITEMS_POCKET, SetCB2ToReshowScreenAfterMenu2); + GoToBagMenu(RETURN_LOCATION_BATTLE_2, ITEMS_POCKET, SetCB2ToReshowScreenAfterMenu2); } void Task_WallyTutorialBagMenu(u8 taskId) -- cgit v1.2.3 From 170b6ef44992f4b7decb31451a3756b6bd4e2d46 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 12 Dec 2018 23:18:25 -0600 Subject: Decompile battle_intro.c (#444) --- src/battle_anim_utility_funcs.c | 8 +- src/battle_intro.c | 746 +++++++++++++++++++++++++++++++++++++++- src/battle_main.c | 4 +- src/easy_chat.c | 3 + 4 files changed, 738 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index c3d0fe90f..85ff692b3 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -40,10 +40,10 @@ static void sub_8117FD0(u8); const u16 gUnknown_08597418 = RGB(31, 31, 31); -// no clue what these are... -// possibly some register offsets -const u8 gUnknown_0859741A[] = {0x08, 0x0a, 0x0c, 0x0e}; -const u8 gUnknown_0859741E[] = {0x08, 0x0a, 0x0c, 0x0e}; +// These belong in battle_intro.c, but there putting them there causes 2 bytes of alignment padding +// between the two .rodata segments. Perhaps battle_intro.c actually belongs in this file, too. +const u8 gUnknown_0859741A[] = {REG_OFFSET_BG0CNT, REG_OFFSET_BG1CNT, REG_OFFSET_BG2CNT, REG_OFFSET_BG3CNT}; +const u8 gUnknown_0859741E[] = {REG_OFFSET_BG0CNT, REG_OFFSET_BG1CNT, REG_OFFSET_BG2CNT, REG_OFFSET_BG3CNT}; void sub_8116620(u8 taskId) { diff --git a/src/battle_intro.c b/src/battle_intro.c index 0ccc7e828..91e7c8ea0 100644 --- a/src/battle_intro.c +++ b/src/battle_intro.c @@ -1,21 +1,733 @@ #include "global.h" +#include "battle.h" +#include "battle_anim.h" +#include "battle_main.h" +#include "battle_setup.h" +#include "bg.h" +#include "gpu_regs.h" +#include "main.h" +#include "scanline_effect.h" #include "task.h" +#include "trig.h" +#include "constants/trainers.h" -extern void task_battle_intro_80BC47C(u8); -extern void task00_battle_intro_80BC6C8(u8); -extern void task_battle_intro_80BC47C(u8); -extern void task_battle_intro_anim(u8); - -const TaskFunc gUnknown_08597424[] = -{ - task_battle_intro_80BC47C, - task_battle_intro_80BC47C, - task00_battle_intro_80BC6C8, - task00_battle_intro_80BC6C8, - task00_battle_intro_80BC6C8, - task_battle_intro_80BC47C, - task_battle_intro_80BC47C, - task_battle_intro_80BC47C, - task_battle_intro_anim, - task_battle_intro_anim, +static EWRAM_DATA u16 sBgCnt = 0; + +extern const u8 gUnknown_0859741A[]; +extern const u8 gUnknown_0859741E[]; + +static void BattleIntroSlide1(u8); +static void BattleIntroSlide2(u8); +static void BattleIntroSlide3(u8); +static void BattleIntroSlideLink(u8); +static void BattleIntroSlidePartner(u8); + +static const TaskFunc sBattleIntroSlideFuncs[] = +{ + BattleIntroSlide1, // BATTLE_TERRAIN_GRASS + BattleIntroSlide1, // BATTLE_TERRAIN_LONG_GRASS + BattleIntroSlide2, // BATTLE_TERRAIN_SAND + BattleIntroSlide2, // BATTLE_TERRAIN_UNDERWATER + BattleIntroSlide2, // BATTLE_TERRAIN_WATER + BattleIntroSlide1, // BATTLE_TERRAIN_POND + BattleIntroSlide1, // BATTLE_TERRAIN_MOUNTAIN + BattleIntroSlide1, // BATTLE_TERRAIN_CAVE + BattleIntroSlide3, // BATTLE_TERRAIN_BUILDING + BattleIntroSlide3, // BATTLE_TERRAIN_PLAIN }; + +void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value) +{ + if (bgId < 4) + { + sBgCnt = GetGpuReg(gUnknown_0859741A[bgId]); + switch (attributeId) + { + case BG_ANIM_SCREEN_SIZE: + ((struct BgCnt *)&sBgCnt)->screenSize = value; + break; + case BG_ANIM_AREA_OVERFLOW_MODE: + ((struct BgCnt *)&sBgCnt)->areaOverflowMode = value; + break; + case BG_ANIM_MOSAIC: + ((struct BgCnt *)&sBgCnt)->mosaic = value; + break; + case BG_ANIM_CHAR_BASE_BLOCK: + ((struct BgCnt *)&sBgCnt)->charBaseBlock = value; + break; + case BG_ANIM_PRIORITY: + ((struct BgCnt *)&sBgCnt)->priority = value; + break; + case BG_ANIM_PALETTES_MODE: + ((struct BgCnt *)&sBgCnt)->palettes = value; + break; + case BG_ANIM_SCREEN_BASE_BLOCK: + ((struct BgCnt *)&sBgCnt)->screenBaseBlock = value; + break; + } + + SetGpuReg(gUnknown_0859741A[bgId], sBgCnt); + } +} + +int GetAnimBgAttribute(u8 bgId, u8 attributeId) +{ + u16 bgCnt; + + if (bgId < 4) + { + bgCnt = GetGpuReg(gUnknown_0859741E[bgId]); + switch (attributeId) + { + case BG_ANIM_SCREEN_SIZE: + return ((struct BgCnt *)&bgCnt)->screenSize; + case BG_ANIM_AREA_OVERFLOW_MODE: + return ((struct BgCnt *)&bgCnt)->areaOverflowMode; + case BG_ANIM_MOSAIC: + return ((struct BgCnt *)&bgCnt)->mosaic; + case BG_ANIM_CHAR_BASE_BLOCK: + return ((struct BgCnt *)&bgCnt)->charBaseBlock; + case BG_ANIM_PRIORITY: + return ((struct BgCnt *)&bgCnt)->priority; + case BG_ANIM_PALETTES_MODE: + return ((struct BgCnt *)&bgCnt)->palettes; + case BG_ANIM_SCREEN_BASE_BLOCK: + return ((struct BgCnt *)&bgCnt)->screenBaseBlock; + } + } + + return 0; +} + +void HandleIntroSlide(u8 terrain) +{ + u8 taskId; + + if ((gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) && gPartnerTrainerId != TRAINER_STEVEN_PARTNER) + { + taskId = CreateTask(BattleIntroSlidePartner, 0); + } + else if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + taskId = CreateTask(BattleIntroSlideLink, 0); + } + else if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) + { + taskId = CreateTask(BattleIntroSlide3, 0); + } + else if ((gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) && gGameVersion != VERSION_RUBY) + { + terrain = BATTLE_TERRAIN_UNDERWATER; + taskId = CreateTask(BattleIntroSlide2, 0); + } + else + { + taskId = CreateTask(sBattleIntroSlideFuncs[terrain], 0); + } + + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = terrain; + gTasks[taskId].data[2] = 0; + gTasks[taskId].data[3] = 0; + gTasks[taskId].data[4] = 0; + gTasks[taskId].data[5] = 0; + gTasks[taskId].data[6] = 0; +} + +void sub_811828C(u8 taskId) +{ + DestroyTask(taskId); + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); + SetGpuReg(REG_OFFSET_BLDY, 0); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR | WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR); +} + +static void BattleIntroSlide1(u8 taskId) +{ + int i; + + gBattle_BG1_X += 6; + switch (gTasks[taskId].data[0]) + { + case 0: + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + gTasks[taskId].data[2] = 16; + gTasks[taskId].data[0]++; + } + else + { + gTasks[taskId].data[2] = 1; + gTasks[taskId].data[0]++; + } + break; + case 1: + if (--gTasks[taskId].data[2] == 0) + { + gTasks[taskId].data[0]++; + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); + } + break; + case 2: + gBattle_WIN0V -= 0xFF; + if ((gBattle_WIN0V & 0xFF00) == 0x3000) + { + gTasks[taskId].data[0]++; + gTasks[taskId].data[2] = 240; + gTasks[taskId].data[3] = 32; + gIntroSlideFlags &= ~1; + } + break; + case 3: + if (gTasks[taskId].data[3]) + { + gTasks[taskId].data[3]--; + } + else + { + if (gTasks[taskId].data[1] == 1) + { + if (gBattle_BG1_Y != 0xFFB0) + gBattle_BG1_Y -= 2; + } + else + { + if (gBattle_BG1_Y != 0xFFC8) + gBattle_BG1_Y -= 1; + } + } + + if (gBattle_WIN0V & 0xFF00) + gBattle_WIN0V -= 0x3FC; + + if (gTasks[taskId].data[2]) + gTasks[taskId].data[2] -= 2; + + // Scanline settings have already been set in CB2_InitBattleInternal() + for (i = 0; i < 80; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; + + for (; i < 160; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + + if (!gTasks[taskId].data[2]) + { + gScanlineEffect.state = 3; + gTasks[taskId].data[0]++; + CpuFill32(0, (void *)BG_SCREEN_ADDR(28), BG_SCREEN_SIZE); + SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0); + SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0); + SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT256x512); + SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256); + } + break; + case 4: + sub_811828C(taskId); + break; + } +} + +static void BattleIntroSlide2(u8 taskId) +{ + int i; + + switch (gTasks[taskId].data[1]) + { + case 2: + case 4: + gBattle_BG1_X += 8; + break; + case 3: + gBattle_BG1_X += 6; + break; + } + + if (gTasks[taskId].data[1] == 4) + { + u16 *bg1Y = &gBattle_BG1_Y; + int cos = Cos2(gTasks[taskId].data[6]); + if (cos < 0) + cos += 0x1FF; + *bg1Y = (cos >> 9) - 8; + + if (gTasks[taskId].data[6] < 180) + gTasks[taskId].data[6] += 4; + else + gTasks[taskId].data[6] += 6; + + if (gTasks[taskId].data[6] == 360) + gTasks[taskId].data[6] = 0; + } + + switch (gTasks[taskId].data[0]) + { + case 0: + gTasks[taskId].data[4] = 16; + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + gTasks[taskId].data[2] = 16; + gTasks[taskId].data[0]++; + } + else + { + gTasks[taskId].data[2] = 1; + gTasks[taskId].data[0]++; + } + break; + case 1: + if (--gTasks[taskId].data[2] == 0) + { + gTasks[taskId].data[0]++; + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); + } + break; + case 2: + gBattle_WIN0V -= 0xFF; + if ((gBattle_WIN0V & 0xFF00) == 0x3000) + { + gTasks[taskId].data[0]++; + gTasks[taskId].data[2] = 240; + gTasks[taskId].data[3] = 32; + gTasks[taskId].data[5] = 1; + gIntroSlideFlags &= ~1; + } + break; + case 3: + if (gTasks[taskId].data[3]) + { + if (--gTasks[taskId].data[3] == 0) + { + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(15, 0)); + SetGpuReg(REG_OFFSET_BLDY, 0); + } + } + else + { + if ((gTasks[taskId].data[4] & 0x1F) && --gTasks[taskId].data[5] == 0) + { + gTasks[taskId].data[4] += 0xFF; + gTasks[taskId].data[5] = 4; + } + } + + if (gBattle_WIN0V & 0xFF00) + gBattle_WIN0V -= 0x3FC; + + if (gTasks[taskId].data[2]) + gTasks[taskId].data[2] -= 2; + + // Scanline settings have already been set in CB2_InitBattleInternal() + for (i = 0; i < 80; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; + + for (; i < 160; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + + if (!gTasks[taskId].data[2]) + { + gScanlineEffect.state = 3; + gTasks[taskId].data[0]++; + CpuFill32(0, (void *)BG_SCREEN_ADDR(28), BG_SCREEN_SIZE); + SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0); + SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0); + SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT256x512); + SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256); + } + break; + case 4: + sub_811828C(taskId); + break; + } + + if (gTasks[taskId].data[0] != 4) + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[4], 0)); +} + +static void BattleIntroSlide3(u8 taskId) +{ + int i; + + gBattle_BG1_X += 8; + switch (gTasks[taskId].data[0]) + { + case 0: + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(8, 8)); + SetGpuReg(REG_OFFSET_BLDY, 0); + gTasks[taskId].data[4] = BLDALPHA_BLEND(8, 8); + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + { + gTasks[taskId].data[2] = 16; + gTasks[taskId].data[0]++; + } + else + { + gTasks[taskId].data[2] = 1; + gTasks[taskId].data[0]++; + } + break; + case 1: + if (--gTasks[taskId].data[2] == 0) + { + gTasks[taskId].data[0]++; + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); + } + break; + case 2: + gBattle_WIN0V -= 0xFF; + if ((gBattle_WIN0V & 0xFF00) == 0x3000) + { + gTasks[taskId].data[0]++; + gTasks[taskId].data[2] = 240; + gTasks[taskId].data[3] = 32; + gTasks[taskId].data[5] = 1; + gIntroSlideFlags &= ~1; + } + break; + case 3: + if (gTasks[taskId].data[3]) + { + gTasks[taskId].data[3]--; + } + else + { + if ((gTasks[taskId].data[4] & 0xF) && --gTasks[taskId].data[5] == 0) + { + gTasks[taskId].data[4] += 0xFF; + gTasks[taskId].data[5] = 6; + } + } + + if (gBattle_WIN0V & 0xFF00) + gBattle_WIN0V -= 0x3FC; + + if (gTasks[taskId].data[2]) + gTasks[taskId].data[2] -= 2; + + // Scanline settings have already been set in CB2_InitBattleInternal() + for (i = 0; i < 80; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; + + for (; i < 160; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + + if (!gTasks[taskId].data[2]) + { + gScanlineEffect.state = 3; + gTasks[taskId].data[0]++; + CpuFill32(0, (void *)BG_SCREEN_ADDR(28), BG_SCREEN_SIZE); + SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0); + SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0); + SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT256x512); + SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256); + } + break; + case 4: + sub_811828C(taskId); + break; + } + + if (gTasks[taskId].data[0] != 4) + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[4], 0)); +} + +static void BattleIntroSlideLink(u8 taskId) +{ + int i; + + if (gTasks[taskId].data[0] > 1 && !gTasks[taskId].data[4]) + { + u16 var0 = gBattle_BG1_X & 0x8000; + if (var0 || gBattle_BG1_X < 80) + { + gBattle_BG1_X += 3; + gBattle_BG2_X -= 3; + } + else + { + CpuFill32(0, (void *)BG_SCREEN_ADDR(28), BG_SCREEN_SIZE); + CpuFill32(0, (void *)BG_SCREEN_ADDR(30), BG_SCREEN_SIZE); + gTasks[taskId].data[4] = 1; + } + } + + switch (gTasks[taskId].data[0]) + { + case 0: + gTasks[taskId].data[2] = 32; + gTasks[taskId].data[0]++; + break; + case 1: + if (--gTasks[taskId].data[2] == 0) + { + gTasks[taskId].data[0]++; + gSprites[gBattleStruct->field_7D].oam.objMode = ST_OAM_OBJ_WINDOW; + gSprites[gBattleStruct->field_7D].callback = sub_8038B74; + gSprites[gBattleStruct->field_7E].oam.objMode = ST_OAM_OBJ_WINDOW; + gSprites[gBattleStruct->field_7E].callback = sub_8038B74; + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2); + } + break; + case 2: + gBattle_WIN0V -= 0xFF; + if ((gBattle_WIN0V & 0xFF00) == 0x3000) + { + gTasks[taskId].data[0]++; + gTasks[taskId].data[2] = 240; + gTasks[taskId].data[3] = 32; + gIntroSlideFlags &= ~1; + } + break; + case 3: + if (gBattle_WIN0V & 0xFF00) + gBattle_WIN0V -= 0x3FC; + + if (gTasks[taskId].data[2]) + gTasks[taskId].data[2] -= 2; + + // Scanline settings have already been set in CB2_InitBattleInternal() + for (i = 0; i < 80; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; + + for (; i < 160; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + + if (!gTasks[taskId].data[2]) + { + gScanlineEffect.state = 3; + gTasks[taskId].data[0]++; + SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0); + SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0); + SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT256x512); + SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256); + } + break; + case 4: + sub_811828C(taskId); + break; + } +} + +static void BattleIntroSlidePartner(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + gTasks[taskId].data[2] = 1; + gTasks[taskId].data[0]++; + break; + case 1: + if (--gTasks[taskId].data[2] == 0) + { + gTasks[taskId].data[0]++; + SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(2) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT512x256); + SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(2) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256); + SetGpuReg(REG_OFFSET_DISPCNT, GetGpuReg(REG_OFFSET_DISPCNT) | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON | DISPCNT_WIN1_ON | DISPCNT_OBJWIN_ON); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN1_BG1 | WININ_WIN1_BG2 | WININ_WIN1_BG3 | WININ_WIN1_OBJ | WININ_WIN1_CLR); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR | WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR); + gBattle_BG0_Y = -48; + gBattle_BG1_X = 240; + gBattle_BG2_X = -240; + } + break; + case 2: + gBattle_WIN0V += 0x100; + if ((gBattle_WIN0V & 0xFF00) != 0x100) + gBattle_WIN0V--; + + if ((gBattle_WIN0V & 0xFF00) == 0x2000) + { + gTasks[taskId].data[0]++; + gTasks[taskId].data[2] = 240; + gIntroSlideFlags &= ~1; + } + break; + case 3: + if ((gBattle_WIN0V & 0xFF00) != 0x4C00) + gBattle_WIN0V += 0x3FC; + + if (gTasks[taskId].data[2]) + gTasks[taskId].data[2] -= 2; + + gBattle_BG1_X = gTasks[taskId].data[2]; + gBattle_BG2_X = -gTasks[taskId].data[2]; + if (!gTasks[taskId].data[2]) + gTasks[taskId].data[0]++; + break; + case 4: + gBattle_BG0_Y += 2; + gBattle_BG2_Y += 2; + if ((gBattle_WIN0V & 0xFF00) != 0x5000) + gBattle_WIN0V += 0xFF; + + if (!gBattle_BG0_Y) + { + CpuFill32(0, (void *)BG_SCREEN_ADDR(28), BG_SCREEN_SIZE * 4); + SetGpuReg(REG_OFFSET_DISPCNT, GetGpuReg(REG_OFFSET_DISPCNT) & ~DISPCNT_WIN1_ON); + SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0); + SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0); + SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT256x512); + SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256); + gScanlineEffect.state = 3; + gTasks[taskId].data[0]++; + } + break; + case 5: + sub_811828C(taskId); + break; + } +} + +void sub_8118FBC(int bgId, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, u8 *arg5, u16 *arg6, u16 tilesOffset) +{ + int i, j; + u8 battler = GetBattlerAtPosition(battlerPosition); + int offset = tilesOffset; + CpuCopy16(gMonSpritesGfxPtr->sprites[battlerPosition] + BG_SCREEN_SIZE * gBattleMonForms[battler], arg5, BG_SCREEN_SIZE); + LoadBgTiles(bgId, arg5, 0x1000, tilesOffset); + for (i = arg2; i < arg2 + 8; i++) + { + for (j = arg1; j < arg1 + 8; j++) + { + arg6[i * 32 + j] = offset | (arg4 << 12); + offset++; + } + } + + LoadBgTilemap(bgId, arg6, BG_SCREEN_SIZE, 0); +} + +#ifdef NONMATCHING +void unref_sub_8119094(u8 arg0, u8 arg1, u8 battlerPosition, u8 arg3, u8 arg4, u16 arg5, u8 arg6, u8 arg7) +{ + int i, j; + int offset; + DmaCopy16(3, gMonSpritesGfxPtr->sprites[battlerPosition] + BG_SCREEN_SIZE * arg3, (void *)BG_SCREEN_ADDR(0) + arg5, BG_SCREEN_SIZE); + offset = (arg5 >> 5) - (arg7 << 9); + for (i = arg1; i < arg1 + 8; i++) + { + for (j = arg0; j < arg0 + 8; j++) + { + ((u16 *)BG_VRAM)[i * 32 + j + (arg6 * 0x400) + arg0] = offset | (arg4 << 12); + offset++; + } + } +} +#else +NAKED +void unref_sub_8119094(u8 arg0, u8 arg1, u8 battlerPosition, u8 arg3, u8 arg4, u16 arg5, u8 arg6, u8 arg7) +{ + asm_unified("\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x4\n\ + ldr r4, [sp, 0x24]\n\ + ldr r5, [sp, 0x28]\n\ + mov r8, r5\n\ + ldr r5, [sp, 0x2C]\n\ + ldr r6, [sp, 0x30]\n\ + mov r9, r6\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r12, r0\n\ + lsls r1, 24\n\ + lsls r2, 24\n\ + lsls r3, 24\n\ + lsls r4, 24\n\ + lsrs r4, 24\n\ + mov r10, r4\n\ + mov r7, r8\n\ + lsls r7, 16\n\ + lsrs r6, r7, 16\n\ + lsls r5, 24\n\ + lsrs r5, 24\n\ + mov r0, r9\n\ + lsls r0, 24\n\ + mov r9, r0\n\ + ldr r4, =0x040000d4\n\ + ldr r0, =gMonSpritesGfxPtr\n\ + ldr r0, [r0]\n\ + lsrs r2, 22\n\ + adds r0, 0x4\n\ + adds r0, r2\n\ + lsrs r3, 13\n\ + ldr r0, [r0]\n\ + adds r0, r3\n\ + str r0, [r4]\n\ + movs r0, 0xC0\n\ + lsls r0, 19\n\ + adds r6, r0\n\ + str r6, [r4, 0x4]\n\ + ldr r0, =0x80000400\n\ + str r0, [r4, 0x8]\n\ + ldr r0, [r4, 0x8]\n\ + adds r2, r7, 0\n\ + lsrs r2, 21\n\ + mov r6, r9\n\ + lsrs r6, 15\n\ + subs r4, r2, r6\n\ + lsrs r0, r1, 24\n\ + adds r1, r0, 0\n\ + adds r1, 0x8\n\ + cmp r0, r1\n\ + bge _08119148\n\ + mov r9, r1\n\ + mov r7, r12\n\ + lsls r7, 1\n\ + mov r8, r7\n\ + lsls r5, 11\n\ + str r5, [sp]\n\ +_08119110:\n\ + mov r2, r12\n\ + adds r3, r2, 0\n\ + adds r3, 0x8\n\ + adds r5, r0, 0x1\n\ + cmp r2, r3\n\ + bge _08119142\n\ + mov r1, r10\n\ + lsls r6, r1, 12\n\ + lsls r0, 6\n\ + movs r7, 0xC0\n\ + lsls r7, 19\n\ + adds r0, r7\n\ + ldr r1, [sp]\n\ + adds r0, r1, r0\n\ + mov r7, r8\n\ + adds r1, r7, r0\n\ + subs r2, r3, r2\n\ +_08119132:\n\ + adds r0, r4, 0\n\ + orrs r0, r6\n\ + strh r0, [r1]\n\ + adds r4, 0x1\n\ + adds r1, 0x2\n\ + subs r2, 0x1\n\ + cmp r2, 0\n\ + bne _08119132\n\ +_08119142:\n\ + adds r0, r5, 0\n\ + cmp r0, r9\n\ + blt _08119110\n\ +_08119148:\n\ + add sp, 0x4\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool"); +} +#endif diff --git a/src/battle_main.c b/src/battle_main.c index 9b7f58023..fb2e5105a 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -81,7 +81,7 @@ extern const u8 *const gBattlescriptsForBallThrow[]; extern const u8 *const gBattlescriptsForRunningByItem[]; extern const u8 *const gBattlescriptsForUsingItem[]; extern const u8 *const gBattlescriptsForSafariActions[]; -extern const struct ScanlineEffectParams gUnknown_0831AC70; +extern const struct ScanlineEffectParams gBattleIntroSlideScanlineEffectParams; // strings extern const u8 gText_LinkStandby3[]; @@ -633,7 +633,7 @@ static void CB2_InitBattleInternal(void) gScanlineEffectRegBuffers[1][i] = 0xFF10; } - ScanlineEffect_SetParams(gUnknown_0831AC70); + ScanlineEffect_SetParams(gBattleIntroSlideScanlineEffectParams); } ResetPaletteFade(); diff --git a/src/easy_chat.c b/src/easy_chat.c index 25ef069e4..c4bc02e42 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -51,6 +51,9 @@ EWRAM_DATA struct u16 ecWordBuffer[9]; } *gUnknown_0203A118 = NULL; +EWRAM_DATA void *gUnknown_0203A11C = 0; +EWRAM_DATA void *gUnknown_0203A120 = 0; + // Static ROM declarations static void sub_811A2C0(u8); -- cgit v1.2.3