Remove trainer_constants.inc, which is causing problems

2 files changed, 1 insertions, 244 deletions

diff --git a/constants/constants.inc b/constants/constants.inc
index 4365e90e1..4a513c355 100644
--- a/constants/constants.inc
+++ b/constants/constants.inc
@@ -4,7 +4,7 @@
 	.include "constants/contest_constants.inc"
 @	.include "constants/item_data_constants.inc"
 	.include "constants/battle_move_constants.inc"
-	.include "constants/trainer_constants.inc"
+@	.include "constants/trainer_constants.inc"
 	.include "constants/berry_constants.inc"
 	.include "constants/version.inc"
 	.include "constants/battle.inc"
diff --git a/constants/trainer_constants.inc b/constants/trainer_constants.inc
deleted file mode 100644
index 48ed3036e..000000000
--- a/constants/trainer_constants.inc
+++ /dev/null
@@ -1,243 +0,0 @@
-	.set TRAINER_CLASS_AQUA_LEADER,            0
-	.set TRAINER_CLASS_TEAM_AQUA_M,            1
-	.set TRAINER_CLASS_TEAM_AQUA_F,            2
-	.set TRAINER_CLASS_AROMA_LADY,             3
-	.set TRAINER_CLASS_RUIN_MANIAC,            4
-	.set TRAINER_CLASS_INTERVIEWER,            5
-	.set TRAINER_CLASS_TUBER_F,                6
-	.set TRAINER_CLASS_TUBER_M,                7
-	.set TRAINER_CLASS_COOL_TRAINER_M,         8
-	.set TRAINER_CLASS_COOL_TRAINER_F,         9
-	.set TRAINER_CLASS_HEX_MANIAC,            10
-	.set TRAINER_CLASS_LADY,                  11
-	.set TRAINER_CLASS_BEAUTY,                12
-	.set TRAINER_CLASS_RICH_BOY,              13
-	.set TRAINER_CLASS_POKEMANIAC,            14
-	.set TRAINER_CLASS_SWIMMER_M,             15
-	.set TRAINER_CLASS_BLACK_BELT,            16
-	.set TRAINER_CLASS_GUITARIST,             17
-	.set TRAINER_CLASS_KINDLER,               18
-	.set TRAINER_CLASS_CAMPER,                19
-	.set TRAINER_CLASS_BUG_MANIAC,            20
-	.set TRAINER_CLASS_PSYCHIC_M,             21
-	.set TRAINER_CLASS_PSYCHIC_F,             22
-	.set TRAINER_CLASS_GENTLEMAN,             23
-	.set TRAINER_CLASS_ELITE_FOUR_M,          24
-	.set TRAINER_CLASS_ELITE_FOUR_F,          25
-	.set TRAINER_CLASS_LEADER_F,              26
-	.set TRAINER_CLASS_LEADER_M,              27
-	.set TRAINER_CLASS_LEADER_MF,             28
-	.set TRAINER_CLASS_SCHOOL_KID_M,          29
-	.set TRAINER_CLASS_SCHOOL_KID_F,          30
-	.set TRAINER_CLASS_SR_AND_JR,             31
-	.set TRAINER_CLASS_POKEFAN_M,             32
-	.set TRAINER_CLASS_POKEFAN_F,             33
-	.set TRAINER_CLASS_EXPERT_M,              34
-	.set TRAINER_CLASS_EXPERT_F,              35
-	.set TRAINER_CLASS_YOUNGSTER,             36
-	.set TRAINER_CLASS_CHAMPION,              37
-	.set TRAINER_CLASS_FISHERMAN,             38
-	.set TRAINER_CLASS_CYCLING_TRIATHLETE_M,  39
-	.set TRAINER_CLASS_CYCLING_TRIATHLETE_F,  40
-	.set TRAINER_CLASS_RUNNING_TRIATHLETE_M,  41
-	.set TRAINER_CLASS_RUNNING_TRIATHLETE_F,  42
-	.set TRAINER_CLASS_SWIMMING_TRIATHLETE_M, 43
-	.set TRAINER_CLASS_SWIMMING_TRIATHLETE_F, 44
-	.set TRAINER_CLASS_DRAGON_TAMER,          45
-	.set TRAINER_CLASS_BIRD_KEEPER,           46
-	.set TRAINER_CLASS_NINJA_BOY,             47
-	.set TRAINER_CLASS_BATTLE_GIRL,           48
-	.set TRAINER_CLASS_PARASOL_LADY,          49
-	.set TRAINER_CLASS_SWIMMER_F,             50
-	.set TRAINER_CLASS_PICNICKER,             51
-	.set TRAINER_CLASS_TWINS,                 52
-	.set TRAINER_CLASS_SAILOR,                53
-	.set TRAINER_CLASS_BOARDER_1,             54
-	.set TRAINER_CLASS_BOARDER_2,             55
-	.set TRAINER_CLASS_COLLECTOR,             56
-	.set TRAINER_CLASS_WALLY,                 57
-	.set TRAINER_CLASS_BRENDAN_1,             58
-	.set TRAINER_CLASS_BRENDAN_2,             59
-	.set TRAINER_CLASS_BRENDAN_3,             60
-	.set TRAINER_CLASS_MAY_1,                 61
-	.set TRAINER_CLASS_MAY_2,                 62
-	.set TRAINER_CLASS_MAY_3,                 63
-	.set TRAINER_CLASS_POKEMON_BREEDER_M,     64
-	.set TRAINER_CLASS_POKEMON_BREEDER_F,     65
-	.set TRAINER_CLASS_POKEMON_RANGER_M,      66
-	.set TRAINER_CLASS_POKEMON_RANGER_F,      67
-	.set TRAINER_CLASS_MAGMA_LEADER,          68
-	.set TRAINER_CLASS_TEAM_MAGMA_M,          69
-	.set TRAINER_CLASS_TEAM_MAGMA_F,          70
-	.set TRAINER_CLASS_LASS,                  71
-	.set TRAINER_CLASS_BUG_CATCHER,           72
-	.set TRAINER_CLASS_HIKER,                 73
-	.set TRAINER_CLASS_YOUNG_COUPLE,          74
-	.set TRAINER_CLASS_OLD_COUPLE,            75
-	.set TRAINER_CLASS_SIS_AND_BRO,           76
-
-	.set TRAINER_PIC_BRENDAN,                0
-	.set TRAINER_PIC_MAY,                    1
-	.set TRAINER_PIC_LASS,                   2
-	.set TRAINER_PIC_YOUNGSTER,              3
-	.set TRAINER_PIC_HIKER,                  4
-	.set TRAINER_PIC_BEAUTY,                 5
-	.set TRAINER_PIC_FISHERMAN,              6
-	.set TRAINER_PIC_LADY,                   7
-	.set TRAINER_PIC_CYCLING_TRIATHLETE_M,   8
-	.set TRAINER_PIC_AQUA_GRUNT_M,           9
-	.set TRAINER_PIC_TWINS,                 10
-	.set TRAINER_PIC_SWIMMER_F,             11
-	.set TRAINER_PIC_BUG_CATCHER,           12
-	.set TRAINER_PIC_SCHOOL_KID_M,          13
-	.set TRAINER_PIC_RICH_BOY,              14
-	.set TRAINER_PIC_SR_AND_JR,             15
-	.set TRAINER_PIC_BLACK_BELT,            16
-	.set TRAINER_PIC_WALLY,                 17
-	.set TRAINER_PIC_AQUA_GRUNT_F,          18
-	.set TRAINER_PIC_TUBER_F,               19
-	.set TRAINER_PIC_HEX_MANIAC,            20
-	.set TRAINER_PIC_POKEMON_BREEDER_F,     21
-	.set TRAINER_PIC_MAGMA_GRUNT_M,         22
-	.set TRAINER_PIC_MAGMA_GRUNT_F,         23
-	.set TRAINER_PIC_INTERVIEWER,           24
-	.set TRAINER_PIC_TUBER_M,               25
-	.set TRAINER_PIC_YOUNG_COUPLE,          26
-	.set TRAINER_PIC_GUITARIST,             27
-	.set TRAINER_PIC_GENTLEMAN,             28
-	.set TRAINER_PIC_STEVEN,                29
-	.set TRAINER_PIC_MAXIE,                 30
-	.set TRAINER_PIC_RUNNING_TRIATHLETE_F,  31
-	.set TRAINER_PIC_RUNNING_TRIATHLETE_M,  32
-	.set TRAINER_PIC_BATTLE_GIRL,           33
-	.set TRAINER_PIC_CYCLING_TRIATHLETE_F,  34
-	.set TRAINER_PIC_SWIMMER_M,             35
-	.set TRAINER_PIC_POKEFAN_F,             36
-	.set TRAINER_PIC_EXPERT_M,              37
-	.set TRAINER_PIC_EXPERT_F,              38
-	.set TRAINER_PIC_SWIMMING_TRIATHLETE_M, 39
-	.set TRAINER_PIC_SWIMMING_TRIATHLETE_F, 40
-	.set TRAINER_PIC_DRAGON_TAMER,          41
-	.set TRAINER_PIC_BIRD_KEEPER,           42
-	.set TRAINER_PIC_NINJA_BOY,             43
-	.set TRAINER_PIC_PARASOL_LADY,          44
-	.set TRAINER_PIC_BUG_MANIAC,            45
-	.set TRAINER_PIC_SAILOR,                46
-	.set TRAINER_PIC_COLLECTOR,             47
-	.set TRAINER_PIC_POKEMON_BREEDER_M,     48
-	.set TRAINER_PIC_POKEMON_RANGER_M,      49
-	.set TRAINER_PIC_POKEMON_RANGER_F,      50
-	.set TRAINER_PIC_MAGMA_ADMIN_M,         51
-	.set TRAINER_PIC_MAGMA_ADMIN_F,         52
-	.set TRAINER_PIC_AROMA_LADY,            53
-	.set TRAINER_PIC_RUIN_MANIAC,           54
-	.set TRAINER_PIC_COOL_TRAINER_M,        55
-	.set TRAINER_PIC_COOL_TRAINER_F,        56
-	.set TRAINER_PIC_POKEMANIAC,            57
-	.set TRAINER_PIC_KINDLER,               58
-	.set TRAINER_PIC_CAMPER,                59
-	.set TRAINER_PIC_PICNICKER,             60
-	.set TRAINER_PIC_PSYCHIC_M,             61
-	.set TRAINER_PIC_PSYCHIC_F,             62
-	.set TRAINER_PIC_SCHOOL_KID_F,          63
-	.set TRAINER_PIC_POKEFAN_M,             64
-	.set TRAINER_PIC_SIS_AND_BRO,           65
-	.set TRAINER_PIC_OLD_COUPLE,            66
-	.set TRAINER_PIC_AQUA_ADMIN_M,          67
-	.set TRAINER_PIC_AQUA_ADMIN_F,          68
-	.set TRAINER_PIC_UNUSED_AQUA,           69
-	.set TRAINER_PIC_ARCHIE,                70
-	.set TRAINER_PIC_ROXANNE,               71
-	.set TRAINER_PIC_BRAWLY,                72
-	.set TRAINER_PIC_WATTSON,               73
-	.set TRAINER_PIC_FLANNERY,              74
-	.set TRAINER_PIC_NORMAN,                75
-	.set TRAINER_PIC_WINONA,                76
-	.set TRAINER_PIC_TATE_AND_LIZA,         77
-	.set TRAINER_PIC_WALLACE,               78
-	.set TRAINER_PIC_SIDNEY,                79
-	.set TRAINER_PIC_PHOEBE,                80
-	.set TRAINER_PIC_GLACIA,                81
-	.set TRAINER_PIC_DRAKE,                 82
-
-	.set TRAINER_CLASS_NAME_POKEMON_TRAINER_1,  0
-	.set TRAINER_CLASS_NAME_POKEMON_TRAINER_2,  1
-	.set TRAINER_CLASS_NAME_AQUA_LEADER,        2
-	.set TRAINER_CLASS_NAME_TEAM_AQUA,          3
-	.set TRAINER_CLASS_NAME_AQUA_ADMIN,         4
-	.set TRAINER_CLASS_NAME_AROMA_LADY,         5
-	.set TRAINER_CLASS_NAME_RUIN_MANIAC,        6
-	.set TRAINER_CLASS_NAME_INTERVIEWER,        7
-	.set TRAINER_CLASS_NAME_TUBER_F,            8
-	.set TRAINER_CLASS_NAME_TUBER_M,            9
-	.set TRAINER_CLASS_NAME_COOL_TRAINER,      10
-	.set TRAINER_CLASS_NAME_HEX_MANIAC,        11
-	.set TRAINER_CLASS_NAME_LADY,              12
-	.set TRAINER_CLASS_NAME_BEAUTY,            13
-	.set TRAINER_CLASS_NAME_RICH_BOY,          14
-	.set TRAINER_CLASS_NAME_POKEMANIAC,        15
-	.set TRAINER_CLASS_NAME_SWIMMER_M,         16
-	.set TRAINER_CLASS_NAME_BLACK_BELT,        17
-	.set TRAINER_CLASS_NAME_GUITARIST,         18
-	.set TRAINER_CLASS_NAME_KINDLER,           19
-	.set TRAINER_CLASS_NAME_CAMPER,            20
-	.set TRAINER_CLASS_NAME_BUG_MANIAC,        21
-	.set TRAINER_CLASS_NAME_PSYCHIC,           22
-	.set TRAINER_CLASS_NAME_GENTLEMAN,         23
-	.set TRAINER_CLASS_NAME_ELITE_FOUR,        24
-	.set TRAINER_CLASS_NAME_LEADER,            25
-	.set TRAINER_CLASS_NAME_SCHOOL_KID,        26
-	.set TRAINER_CLASS_NAME_SR_AND_JR,         27
-	.set TRAINER_CLASS_NAME_WINSTRATE,         28
-	.set TRAINER_CLASS_NAME_POKEFAN,           29
-	.set TRAINER_CLASS_NAME_EXPERT,            30
-	.set TRAINER_CLASS_NAME_YOUNGSTER,         31
-	.set TRAINER_CLASS_NAME_CHAMPION,          32
-	.set TRAINER_CLASS_NAME_FISHERMAN,         33
-	.set TRAINER_CLASS_NAME_TRIATHLETE,        34
-	.set TRAINER_CLASS_NAME_DRAGON_TAMER,      35
-	.set TRAINER_CLASS_NAME_BIRD_KEEPER,       36
-	.set TRAINER_CLASS_NAME_NINJA_BOY,         37
-	.set TRAINER_CLASS_NAME_BATTLE_GIRL,       38
-	.set TRAINER_CLASS_NAME_PARASOL_LADY,      39
-	.set TRAINER_CLASS_NAME_SWIMMER_F,         40
-	.set TRAINER_CLASS_NAME_PICNICKER,         41
-	.set TRAINER_CLASS_NAME_TWINS,             42
-	.set TRAINER_CLASS_NAME_SAILOR,            43
-	.set TRAINER_CLASS_NAME_BOARDER,           44
-	.set TRAINER_CLASS_NAME_COLLECTOR,         45
-	.set TRAINER_CLASS_NAME_POKEMON_TRAINER_3, 46
-	.set TRAINER_CLASS_NAME_POKEMON_BREEDER,   47
-	.set TRAINER_CLASS_NAME_POKEMON_RANGER,    48
-	.set TRAINER_CLASS_NAME_MAGMA_LEADER,      49
-	.set TRAINER_CLASS_NAME_TEAM_MAGMA,        50
-	.set TRAINER_CLASS_NAME_MAGMA_ADMIN,       51
-	.set TRAINER_CLASS_NAME_LASS,              52
-	.set TRAINER_CLASS_NAME_BUG_CATCHER,       53
-	.set TRAINER_CLASS_NAME_HIKER,             54
-	.set TRAINER_CLASS_NAME_YOUNG_COUPLE,      55
-	.set TRAINER_CLASS_NAME_OLD_COUPLE,        56
-	.set TRAINER_CLASS_NAME_SIS_AND_BRO,       57
-
-	.set TRAINER_ENCOUNTER_MUSIC_MALE,         0 @ standard male encounter music
-	.set TRAINER_ENCOUNTER_MUSIC_FEMALE,       1 @ standard female encounter music
-	.set TRAINER_ENCOUNTER_MUSIC_GIRL,         2 @ used for male Tubers and Young Couples too
-	.set TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,   3
-	.set TRAINER_ENCOUNTER_MUSIC_INTENSE,      4
-	.set TRAINER_ENCOUNTER_MUSIC_COOL,         5
-	.set TRAINER_ENCOUNTER_MUSIC_AQUA,         6
-	.set TRAINER_ENCOUNTER_MUSIC_MAGMA,        7
-	.set TRAINER_ENCOUNTER_MUSIC_SWIMMER,      8
-	.set TRAINER_ENCOUNTER_MUSIC_TWINS,        9 @ used for other trainer classes too
-	.set TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,  10
-	.set TRAINER_ENCOUNTER_MUSIC_HIKER,       11 @ used for other trainer classes too
-	.set TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, 12
-	.set TRAINER_ENCOUNTER_MUSIC_RICH,        13 @ Rich Boys and Gentlemen
-
-	.set F_TRAINER_FEMALE, 1 << 7
-
-@ All trainer parties specify the IV, level, and species for each Pokémon in the
-@ party. Some trainer parties also specify held items and custom moves for each
-@ Pokémon.
-	.set F_TRAINER_PARTY_CUSTOM_MOVESET, 1 << 0
-	.set F_TRAINER_PARTY_HELD_ITEM,      1 << 1