summaryrefslogtreecommitdiff
path: root/include/constants/opponents.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/constants/opponents.h')
-rw-r--r--include/constants/opponents.h146
1 files changed, 74 insertions, 72 deletions
diff --git a/include/constants/opponents.h b/include/constants/opponents.h
index 6262ab817..6c6081ef0 100644
--- a/include/constants/opponents.h
+++ b/include/constants/opponents.h
@@ -2,83 +2,84 @@
#define GUARD_CONSTANTS_OPPONENTS_H
#define TRAINER_NONE 0
-#define TRAINER_AQUA_LEADER_1 1
-#define TRAINER_TEAM_AQUA_1 2
-#define TRAINER_TEAM_AQUA_2 3
-#define TRAINER_AROMA_LADY_1 4
-#define TRAINER_RUIN_MANIAC_1 5
-#define TRAINER_INTERVIEWER_1 6
-#define TRAINER_TUBER_1 7
-#define TRAINER_TUBER_2 8
-#define TRAINER_COOLTRAINER_1 9
-#define TRAINER_COOLTRAINER_2 10
-#define TRAINER_HEX_MANIAC_1 11
-#define TRAINER_LADY_1 12
-#define TRAINER_BEAUTY_1 13
-#define TRAINER_RICH_BOY_1 14
-#define TRAINER_POKEMANIAC_1 15
-#define TRAINER_SWIMMER_MALE_1 16
-#define TRAINER_BLACK_BELT_1 17
-#define TRAINER_GUITARIST_1 18
-#define TRAINER_KINDLER_1 19
-#define TRAINER_CAMPER_1 20
-#define TRAINER_BUG_MANIAC_1 21
-#define TRAINER_PSYCHIC_1 22
-#define TRAINER_PSYCHIC_2 23
-#define TRAINER_GENTLEMAN_1 24
+// Dummy trainers for all the RS trainer classes
+#define TRAINER_AQUA_LEADER 1
+#define TRAINER_AQUA_GRUNT_M 2
+#define TRAINER_AQUA_GRUNT_F 3
+#define TRAINER_RS_AROMA_LADY 4
+#define TRAINER_RS_RUIN_MANIAC 5
+#define TRAINER_INTERVIEWER 6
+#define TRAINER_RS_TUBER_F 7
+#define TRAINER_RS_TUBER_M 8
+#define TRAINER_RS_COOLTRAINER_M 9
+#define TRAINER_RS_COOLTRAINER_F 10
+#define TRAINER_HEX_MANIAC 11
+#define TRAINER_RS_LADY 12
+#define TRAINER_RS_BEAUTY 13
+#define TRAINER_RICH_BOY 14
+#define TRAINER_RS_POKEMANIAC 15
+#define TRAINER_RS_SWIMMER_M 16
+#define TRAINER_RS_BLACK_BELT 17
+#define TRAINER_GUITARIST 18
+#define TRAINER_KINDLER 19
+#define TRAINER_RS_CAMPER 20
+#define TRAINER_BUG_MANIAC 21
+#define TRAINER_RS_PSYCHIC_M 22
+#define TRAINER_RS_PSYCHIC_F 23
+#define TRAINER_RS_GENTLEMAN 24
#define TRAINER_ELITE_FOUR_SIDNEY 25
#define TRAINER_ELITE_FOUR_PHOEBE 26
#define TRAINER_LEADER_ROXANNE 27
#define TRAINER_LEADER_BRAWLY 28
#define TRAINER_LEADER_TATE_LIZA 29
-#define TRAINER_SCHOOL_KID_1 30
-#define TRAINER_SCHOOL_KID_2 31
-#define TRAINER_SR_AND_JR_1 32
-#define TRAINER_POKEFAN_1 33
-#define TRAINER_POKEFAN_2 34
-#define TRAINER_EXPERT_1 35
-#define TRAINER_EXPERT_2 36
-#define TRAINER_YOUNGSTER_1 37
-#define TRAINER_CHAMPION_1 38
-#define TRAINER_FISHERMAN_1 39
-#define TRAINER_TRIATHLETE_1 40
-#define TRAINER_TRIATHLETE_2 41
-#define TRAINER_TRIATHLETE_3 42
-#define TRAINER_TRIATHLETE_4 43
-#define TRAINER_TRIATHLETE_5 44
-#define TRAINER_TRIATHLETE_6 45
-#define TRAINER_DRAGON_TAMER_1 46
-#define TRAINER_BIRD_KEEPER_1 47
-#define TRAINER_NINJA_BOY_1 48
-#define TRAINER_BATTLE_GIRL_1 49
-#define TRAINER_PARASOL_LADY_1 50
-#define TRAINER_SWIMMER_FEMALE_1 51
-#define TRAINER_PICNICKER_1 52
-#define TRAINER_TWINS_1 53
-#define TRAINER_SAILOR_1 54
-#define TRAINER_BOARDER_1 55
-#define TRAINER_BOARDER_2 56
-#define TRAINER_COLLECTOR_1 57
-#define TRAINER_PKMN_TRAINER_2 58
-#define TRAINER_PKMN_TRAINER_3 59
-#define TRAINER_PKMN_TRAINER_4 60
-#define TRAINER_PKMN_TRAINER_5 61
-#define TRAINER_PKMN_TRAINER_6 62
-#define TRAINER_PKMN_TRAINER_7 63
-#define TRAINER_PKMN_TRAINER_8 64
-#define TRAINER_PKMN_BREEDER_1 65
-#define TRAINER_PKMN_BREEDER_2 66
-#define TRAINER_PKMN_RANGER_1 67
-#define TRAINER_PKMN_RANGER_2 68
-#define TRAINER_MAGMA_LEADER_1 69
-#define TRAINER_TEAM_MAGMA_1 70
-#define TRAINER_TEAM_MAGMA_2 71
-#define TRAINER_LASS_1 72
-#define TRAINER_BUG_CATCHER_1 73
-#define TRAINER_HIKER_1 74
-#define TRAINER_YOUNG_COUPLE_1 75
-#define TRAINER_OLD_COUPLE_1 76
-#define TRAINER_SIS_AND_BRO_1 77
+#define TRAINER_SCHOOL_KID_M 30
+#define TRAINER_SCHOOL_KID_F 31
+#define TRAINER_SR_AND_JR 32
+#define TRAINER_POKEFAN_M 33
+#define TRAINER_POKEFAN_F 34
+#define TRAINER_EXPERT_M 35
+#define TRAINER_EXPERT_F 36
+#define TRAINER_RS_YOUNGSTER 37
+#define TRAINER_RS_CHAMPION 38
+#define TRAINER_RS_FISHERMAN 39
+#define TRAINER_CYCLING_TRIATHLETE_M 40
+#define TRAINER_CYCLING_TRIATHLETE_F 41
+#define TRAINER_RUNNING_TRIATHLETE_M 42
+#define TRAINER_RUNNING_TRIATHLETE_F 43
+#define TRAINER_SWIMMING_TRIATHLETE_M 44
+#define TRAINER_SWIMMING_TRIATHLETE_F 45
+#define TRAINER_DRAGON_TAMER 46
+#define TRAINER_RS_BIRD_KEEPER 47
+#define TRAINER_NINJA_BOY 48
+#define TRAINER_BATTLE_GIRL 49
+#define TRAINER_PARASOL_LADY 50
+#define TRAINER_RS_SWIMMER_F 51
+#define TRAINER_RS_PICNICKER 52
+#define TRAINER_RS_TWINS 53
+#define TRAINER_RS_SAILOR 54
+#define TRAINER_BOARDER_M 55
+#define TRAINER_BOARDER_F 56
+#define TRAINER_COLLECTOR 57
+#define TRAINER_WALLY 58
+#define TRAINER_BRENDAN 59
+#define TRAINER_BRENDAN_2 60
+#define TRAINER_BRENDAN_3 61
+#define TRAINER_MAY 62
+#define TRAINER_MAY_2 63
+#define TRAINER_MAY_3 64
+#define TRAINER_RS_PKMN_BREEDER_M 65
+#define TRAINER_RS_PKMN_BREEDER_F 66
+#define TRAINER_RS_PKMN_RANGER_M 67
+#define TRAINER_RS_PKMN_RANGER_F 68
+#define TRAINER_MAGMA_LEADER 69
+#define TRAINER_MAGMA_GRUNT_M 70
+#define TRAINER_MAMGA_GRUNT_F 71
+#define TRAINER_RS_LASS 72
+#define TRAINER_RS_BUG_CATCHER 73
+#define TRAINER_RS_HIKER 74
+#define TRAINER_RS_YOUNG_COUPLE 75
+#define TRAINER_OLD_COUPLE 76
+#define TRAINER_RS_SIS_AND_BRO 77
#define TRAINER_AQUA_ADMIN_MATT 78
#define TRAINER_AQUA_ADMIN_SHELLY 79
#define TRAINER_MAGMA_ADMIN_TABITHA 80
@@ -90,6 +91,7 @@
#define TRAINER_LEADER_WALLACE 86
#define TRAINER_ELITE_FOUR_GLACIA 87
#define TRAINER_ELITE_FOUR_DRAKE 88
+// Actual FRLG trainers start here
#define TRAINER_YOUNGSTER_BEN 89
#define TRAINER_YOUNGSTER_CALVIN 90
#define TRAINER_YOUNGSTER_JOSH 91