diff options
| -rw-r--r-- | include/region_map.h | 107 | ||||
| -rw-r--r-- | include/trainer_classes.h | 168 |
2 files changed, 106 insertions, 169 deletions
diff --git a/include/region_map.h b/include/region_map.h index 93ad5541d..5c264e97d 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -8,94 +8,6 @@ // Exported type declarations enum { - MAPSEC_LITTLEROOT_TOWN, - MAPSEC_OLDALE_TOWN, - MAPSEC_DEWFORD_TOWN, - MAPSEC_LAVARIDGE_TOWN, - MAPSEC_FALLARBOR_TOWN, - MAPSEC_VERDANTURF_TOWN, - MAPSEC_PACIFIDLOG_TOWN, - MAPSEC_PETALBURG_CITY, - MAPSEC_SLATEPORT_CITY, - MAPSEC_MAUVILLE_CITY, - MAPSEC_RUSTBORO_CITY, - MAPSEC_FORTREE_CITY, - MAPSEC_LILYCOVE_CITY, - MAPSEC_MOSSDEEP_CITY, - MAPSEC_SOOTOPOLIS_CITY, - MAPSEC_EVER_GRANDE_CITY, - MAPSEC_ROUTE_101, - MAPSEC_ROUTE_102, - MAPSEC_ROUTE_103, - MAPSEC_ROUTE_104, - MAPSEC_ROUTE_105, - MAPSEC_ROUTE_106, - MAPSEC_ROUTE_107, - MAPSEC_ROUTE_108, - MAPSEC_ROUTE_109, - MAPSEC_ROUTE_110, - MAPSEC_ROUTE_111, - MAPSEC_ROUTE_112, - MAPSEC_ROUTE_113, - MAPSEC_ROUTE_114, - MAPSEC_ROUTE_115, - MAPSEC_ROUTE_116, - MAPSEC_ROUTE_117, - MAPSEC_ROUTE_118, - MAPSEC_ROUTE_119, - MAPSEC_ROUTE_120, - MAPSEC_ROUTE_121, - MAPSEC_ROUTE_122, - MAPSEC_ROUTE_123, - MAPSEC_ROUTE_124, - MAPSEC_ROUTE_125, - MAPSEC_ROUTE_126, - MAPSEC_ROUTE_127, - MAPSEC_ROUTE_128, - MAPSEC_ROUTE_129, - MAPSEC_ROUTE_130, - MAPSEC_ROUTE_131, - MAPSEC_ROUTE_132, - MAPSEC_ROUTE_133, - MAPSEC_ROUTE_134, - MAPSEC_UNDERWATER_124, - MAPSEC_UNDERWATER_125, - MAPSEC_UNDERWATER_126, - MAPSEC_UNDERWATER_127, - MAPSEC_UNDERWATER_SOOTOPOLIS, - MAPSEC_GRANITE_CAVE, - MAPSEC_MT_CHIMNEY, - MAPSEC_SAFARI_ZONE, - MAPSEC_BATTLE_FRONTIER, - MAPSEC_PETALBURG_WOODS, - MAPSEC_RUSTURF_TUNNEL, - MAPSEC_ABANDONED_SHIP, - MAPSEC_NEW_MAUVILLE, - MAPSEC_METEOR_FALLS, - MAPSEC_METEOR_FALLS2, - MAPSEC_MT_PYRE, - MAPSEC_AQUA_HIDEOUT_OLD, - MAPSEC_SHOAL_CAVE, - MAPSEC_SEAFLOOR_CAVERN, - MAPSEC_UNDERWATER_128, - MAPSEC_VICTORY_ROAD, - MAPSEC_MIRAGE_ISLAND, - MAPSEC_CAVE_OF_ORIGIN, - MAPSEC_SOUTHERN_ISLAND, - MAPSEC_FIERY_PATH, - MAPSEC_FIERY_PATH2, - MAPSEC_JAGGED_PASS, - MAPSEC_JAGGED_PASS2, - MAPSEC_SEALED_CHAMBER, - MAPSEC_UNDERWATER_SEALED_CHAMBER, - MAPSEC_SCORCHED_SLAB, - MAPSEC_ISLAND_CAVE, - MAPSEC_DESERT_RUINS, - MAPSEC_ANCIENT_TOMB, - MAPSEC_INSIDE_OF_TRUCK, - MAPSEC_SKY_PILLAR, - MAPSEC_SECRET_BASE, - MAPSEC_DYNAMIC, MAPSEC_PALLET_TOWN, MAPSEC_VIRIDIAN_CITY, MAPSEC_PEWTER_CITY, @@ -187,7 +99,7 @@ enum { MAPSEC_BERRY_FOREST, MAPSEC_ICEFALL_CAVE, MAPSEC_ROCKET_WAREHOUSE, - MAPSEC_TRAINER_TOWER_2, + MAPSEC_TRAINER_TOWER, MAPSEC_DOTTED_HOLE, MAPSEC_LOST_CAVE, MAPSEC_PATTERN_BUSH, @@ -204,23 +116,6 @@ enum { MAPSEC_RIXY_CHAMBER, MAPSEC_VIAPOIS_CHAMBER, MAPSEC_EMBER_SPA, - MAPSEC_SPECIAL_AREA, - MAPSEC_AQUA_HIDEOUT, - MAPSEC_MAGMA_HIDEOUT, - MAPSEC_MIRAGE_TOWER, - MAPSEC_BIRTH_ISLAND_2, - MAPSEC_FARAWAY_ISLAND, - MAPSEC_ARTISAN_CAVE, - MAPSEC_MARINE_CAVE, - MAPSEC_UNDERWATER_MARINE_CAVE, - MAPSEC_TERRA_CAVE, - MAPSEC_UNDERWATER_TERRA_CAVE, - MAPSEC_UNDERWATER_UNK1, - MAPSEC_UNDERWATER_129, - MAPSEC_DESERT_UNDERPASS, - MAPSEC_ALTERING_CAVE_2, - MAPSEC_NAVEL_ROCK2, - MAPSEC_TRAINER_HILL, MAPSEC_NONE }; diff --git a/include/trainer_classes.h b/include/trainer_classes.h index 3b93c3814..aea2623d7 100644 --- a/include/trainer_classes.h +++ b/include/trainer_classes.h @@ -7,70 +7,112 @@ enum { CLASS_PKMN_TRAINER0, // 0 CLASS_PKMN_TRAINER1, // 1 - CLASS_HIKER, // 2 + CLASS_AQUA_LEADER, // 2 CLASS_TEAM_AQUA, // 3 - CLASS_PKMN_BREEDER, // 4 - CLASS_COOLTRAINER, // 5 - CLASS_BIRDKEEPER, // 6 - CLASS_COLLECTOR, // 7 - CLASS_SWIMMER_MALE, // 8 - CLASS_TEAM_MAGMA, // 9 - CLASS_EXPERT, // 0xA - CLASS_AQUA_ADMIN, // 0xB - CLASS_BLACK_BELT, // 0xC - CLASS_AQUA_LEADER, // 0xD - CLASS_HEX_MANIAC, // 0xE - CLASS_AROMA_LADY, // 0xF - CLASS_RUIN_MANIAC, // 0x10 - CLASS_INTERVIEWER, // 0x11 - CLASS_TUBER_FEMALE, // 0x12 - CLASS_TUBER_MALE, // 0x13 - CLASS_LADY, // 0x14 - CLASS_BEAUTY, // 0x15 - CLASS_RICH_BOY, // 0x16 - CLASS_POKEMANIAC, // 0x17 - CLASS_GUITARIST, // 0x18 - CLASS_KINDLER, // 0x19 - CLASS_CAMPER, // 0x1A - CLASS_PICKNICKER, // 0x1B - CLASS_BUG_MANIAC, // 0x1C - CLASS_PSYCHIC, // 0x1D - CLASS_GENTLEMAN, // 0x1E - CLASS_ELITE_FOUR, // 0x1F - CLASS_LEADER, // 0x20 - CLASS_SCHOOL_KID, // 0x21 - CLASS_SCHOOL_SR_JR, // 0x22 - CLASS_WINSTRATE, // 0x23 - CLASS_POKE_FAN, // 0x24 - CLASS_YOUNGSTER, // 0x25 - CLASS_CHAMPION, // 0x26 - CLASS_FISHERMAN, // 0x27 - CLASS_TRIATHLETE, // 0x28 - CLASS_DRAGON_TAMER, // 0x29 - CLASS_NINJA_BOY, // 0x2A - CLASS_BATTLE_GIRL, // 0x2B - CLASS_PARASOL_LADY, // 0x2C - CLASS_SWIMMER_FEMALE, // 0x2D - CLASS_TWINS, // 0x2E - CLASS_SAILOR, // 0x2F - CLASS_COOLTRAINER_2, // 0x30 - CLASS_MAGMA_ADMIN, // 0x31 - CLASS_PKMN_TRAINER_RIVAL, // 0x32 - CLASS_BUG_CATCHER, // 0x33 - CLASS_PKMN_RANGER, // 0x34 - CLASS_MAGMA_LEADER, // 0x35 - CLASS_LASS, // 0x36 - CLASS_YOUNG_COUPLE, // 0x37 - CLASS_OLD_COUPLE, // 0x38 - CLASS_SIS_AND_BRO, // 0x39 - CLASS_SALON_MAIDEN, // 0x3A - CLASS_DOME_ACE, // 0x3B - CLASS_PALACE_MAVEN, // 0x3C - CLASS_ARENA_TYCOON, // 0x3D - CLASS_FACTORY_HEAD, // 0x3E - CLASS_PIKE_QUEEN, // 0x3F - CLASS_PYRAMID_KING, // 0x40 - CLASS_PKMN_TRAINER2, // 0x41 + CLASS_AROMA_LADY, // 4 + CLASS_RUIN_MANIAC, // 5 + CLASS_INTERVIEWER, // 6 + CLASS_TUBER_FEMALE, // 7 + CLASS_TUBER_MALE, // 8 + CLASS_COOLTRAINER_2, // 9 + CLASS_HEX_MANIAC, // 0xA + CLASS_LADY, // 0xB + CLASS_BEAUTY, // 0xC + CLASS_RICH_BOY, // 0xD + CLASS_POKEMANIAC, // 0xE + CLASS_SWIMMER_MALE, // 0xF + CLASS_BLACK_BELT, // 0x10 + CLASS_GUITARIST, // 0x11 + CLASS_KINDLER, // 0x12 + CLASS_CAMPER, // 0x13 + CLASS_BUG_MANIAC, // 0x14 + CLASS_PSYCHIC, // 0x15 + CLASS_GENTLEMAN, // 0x16 + CLASS_ELITE_FOUR, // 0x17 + CLASS_LEADER, // 0x18 + CLASS_SCHOOL_KID, // 0x19 + CLASS_SCHOOL_SR_JR, // 0x1A + CLASS_POKE_FAN, // 0x1B + CLASS_EXPERT, // 0x1C + CLASS_YOUNGSTER, // 0x1D + CLASS_CHAMPION, // 0x1E + CLASS_FISHERMAN, // 0x1F + CLASS_TRIATHLETE, // 0x20 + CLASS_DRAGON_TAMER, // 0x21 + CLASS_BIRD_KEEPER, // 0x22 + CLASS_NINJA_BOY, // 0x23 + CLASS_BATTLE_GIRL, // 0x24 + CLASS_PARASOL_LADY, // 0x25 + CLASS_SWIMMER_FEMALE, // 0x26 + CLASS_PICKNICKER, // 0x27 + CLASS_TWINS, // 0x28 + CLASS_SAILOR, // 0x29 + CLASS_BOARDER, // 0x2A + CLASS_COLLECTOR, // 0x2B + CLASS_PKMN_TRAINER2, // 0x2C + CLASS_PKMN_BREEDER, // 0x2D + CLASS_PKMN_RANGER, // 0x2E + CLASS_MAGMA_LEADER, // 0x2F + CLASS_TEAM_MAGMA, // 0x30 + CLASS_LASS, // 0x31 + CLASS_BUG_CATCHER, // 0x32 + CLASS_HIKER, // 0x33 + CLASS_YOUNG_COUPLE, // 0x34 + CLASS_OLD_COUPLE, // 0x35 + CLASS_SIS_AND_BRO, // 0x36 + CLASS_AQUA_ADMIN, // 0x37 + CLASS_MAGMA_ADMIN, // 0x38 + CLASS_YOUNGSTER, // 0x39 + CLASS_BUG_CATCHER, // 0x3A + CLASS_LASS, // 0x3B + CLASS_SAILER, // 0x3C + CLASS_CAMPER, // 0x3D + CLASS_PICKNICKER, // 0x3E + CLASS_POKEMANIAC, // 0x3F + CLASS_SUPER_NERD, // 0x40 + CLASS_HIKER, // 0x41 + CLASS_BIKER, // 0x42 + CLASS_BURGLAR, // 0x43 + CLASS_ENGINEER, // 0x44 + CLASS_FISHERMAN, // 0x45 + CLASS_SWIMMER_MALE, // 0x46 + CLASS_CUE_BALL, // 0x47 + CLASS_GAMER, // 0x48 + CLASS_BEAUTY, // 0x49 + CLASS_SWIMMER_FEMALE, // 0x4A + CLASS_PSYCHIC, // 0x4B + CLASS_ROCKER, // 0x4C + CLASS_JUGGLER, // 0x4D + CLASS_TAMER, // 0x4E + CLASS_BIRD_KEEPER, // 0x4F + CLASS_BLACK_BELT, // 0X50 + CLASS_PKMN_TRAINER_RIVAL, // 0X51 + CLASS_SCIENTIST, // 0X52 + CLASS_BOSS, // 0X53 + CLASS_LEADER, // 0X54 + CLASS_TEAM_ROCKET, // 0X55 + CLASS_COOLTRAINER, // 0X56 + CLASS_ELITE_FOUR, // 0X57 + CLASS_GENTLEMAN, // 0X58 + CLASS_PKMN_TRAINER_RIVAL, // 0X59 + CLASS_CHAMPION, // 0X5A + CLASS_CHANNERLER, // 0X5B + CLASS_TWINS, // 0X5C + CLASS_COOL_COUPLE, // 0X5D + CLASS_YOUNG_COUPLE, // 0X5E + CLASS_CRUSH_KIN, // 0X5F + CLASS_SIS_AND_BRO, // 0X60 + CLASS_PROFESSOR, // 0X61 + CLASS_PLAYER, // 0X62 + CLASS_CRUSH_GIRL, // 0X63 + CLASS_TUBER2, // 0X64 + CLASS_PKMN_BREEDER, // 0X65 + CLASS_PKMN_RANGER, // 0X66 + CLASS_AROMA_LADY, // 0X67 + CLASS_RUIN_MANIAC, // 0X68 + CLASS_LADY, // 0X69 + CLASS_PAINTER, // 0X6A + }; #endif // GUARD_TRAINER_CLASSES_H |