diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_tower.c | 250 |
1 files changed, 125 insertions, 125 deletions
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[] = |