diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-31 19:36:25 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-31 19:36:25 +0100 |
| commit | 6cb1c4fd6e7c52e528f36e3511ac4b4db4dbb2ee (patch) | |
| tree | c5d4f93c251472daa4cded616da3141448a37e6b /include/trainer_classes.h | |
| parent | 665734d689fbd6da708e482b1cb9fdf3ee2345bc (diff) | |
| parent | 4cb8528d94216f69c4a37d470c1d5f3487a87239 (diff) | |
fix merge conflicts, evo scene
Diffstat (limited to 'include/trainer_classes.h')
| -rw-r--r-- | include/trainer_classes.h | 51 |
1 files changed, 36 insertions, 15 deletions
diff --git a/include/trainer_classes.h b/include/trainer_classes.h index 3f13dfc37..e5e26b359 100644 --- a/include/trainer_classes.h +++ b/include/trainer_classes.h @@ -3,16 +3,16 @@ enum { - CLASS_PKMN_TRAINER0, //0 - CLASS_PKMN_TRAINER1, //1 - CLASS_HIKER, //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_PKMN_TRAINER0, // 0 + CLASS_PKMN_TRAINER1, // 1 + CLASS_HIKER, // 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 @@ -36,11 +36,32 @@ enum CLASS_GENTLEMAN, // 0x1E CLASS_ELITE_FOUR, // 0x1F CLASS_LEADER, // 0x20 - CLASS_CHAMPION = 0x26, - CLASS_MAGMA_ADMIN = 0x31, - CLASS_PKMN_TRAINER_RIVAL = 0x32, - CLASS_MAGMA_LEADER = 0x35, - CLASS_SALON_MAIDEN = 0x3A, + 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 |