diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-14 16:36:53 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-14 16:36:53 +0200 |
| commit | 3037f37cc669bec7580fe2623ce2c6ea1c4ebe76 (patch) | |
| tree | 5ee0dc775f6a4b6dda46baa8852ef78dd464528e /data/text | |
| parent | 943931f86f50b946145548b0bee9663724e14980 (diff) | |
| parent | a2e49c4d5c275b28b6485d404e305a98c935d022 (diff) | |
merge upstream, fix non-conflict in trade.s
Diffstat (limited to 'data/text')
| -rw-r--r-- | data/text/trainer_class_names.inc | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/data/text/trainer_class_names.inc b/data/text/trainer_class_names.inc new file mode 100644 index 000000000..3c4955064 --- /dev/null +++ b/data/text/trainer_class_names.inc @@ -0,0 +1,107 @@ + .string "{PKMN} TRAINER$", 13 + .string "{PKMN} TRAINER$", 13 + .string "AQUA LEADER$", 13 + .string "TEAM AQUA$", 13 + .string "AROMA LADY$", 13 + .string "RUIN MANIAC$", 13 + .string "INTERVIEWER$", 13 + .string "TUBER$", 13 + .string "TUBER$", 13 + .string "COOLTRAINER$", 13 + .string "HEX MANIAC$", 13 + .string "LADY$", 13 + .string "BEAUTY$", 13 + .string "RICH BOY$", 13 + .string "POKéMANIAC$", 13 + .string "SWIMMER♂$", 13 + .string "BLACK BELT$", 13 + .string "GUITARIST$", 13 + .string "KINDLER$", 13 + .string "CAMPER$", 13 + .string "BUG MANIAC$", 13 + .string "PSYCHIC$", 13 + .string "GENTLEMAN$", 13 + .string "ELITE FOUR$", 13 + .string "LEADER$", 13 + .string "SCHOOL KID$", 13 + .string "SR. AND JR.$", 13 + .string "POKéFAN$", 13 + .string "EXPERT$", 13 + .string "YOUNGSTER$", 13 + .string "CHAMPION$", 13 + .string "FISHERMAN$", 13 + .string "TRIATHLETE$", 13 + .string "DRAGON TAMER$", 13 + .string "BIRD KEEPER$", 13 + .string "NINJA BOY$", 13 + .string "BATTLE GIRL$", 13 + .string "PARASOL LADY$", 13 + .string "SWIMMER♀$", 13 + .string "PICNICKER$", 13 + .string "TWINS$", 13 + .string "SAILOR$", 13 + .string "BOARDER$", 13 + .string "COLLECTOR$", 13 + .string "{PKMN} TRAINER$", 13 + .string "{PKMN} BREEDER$", 13 + .string "{PKMN} RANGER$", 13 + .string "MAGMA LEADER$", 13 + .string "TEAM MAGMA$", 13 + .string "LASS$", 13 + .string "BUG CATCHER$", 13 + .string "HIKER$", 13 + .string "YOUNG COUPLE$", 13 + .string "OLD COUPLE$", 13 + .string "SIS AND BRO$", 13 + .string "AQUA ADMIN$", 13 + .string "MAGMA ADMIN$", 13 + .string "YOUNGSTER$", 13 + .string "BUG CATCHER$", 13 + .string "LASS$", 13 + .string "SAILOR$", 13 + .string "CAMPER$", 13 + .string "PICNICKER$", 13 + .string "POKéMANIAC$", 13 + .string "SUPER NERD$", 13 + .string "HIKER$", 13 + .string "BIKER$", 13 + .string "BURGLAR$", 13 + .string "ENGINEER$", 13 + .string "FISHERMAN$", 13 + .string "SWIMMER♂$", 13 + .string "CUE BALL$", 13 + .string "GAMER$", 13 + .string "BEAUTY$", 13 + .string "SWIMMER♀$", 13 + .string "PSYCHIC$", 13 + .string "ROCKER$", 13 + .string "JUGGLER$", 13 + .string "TAMER$", 13 + .string "BIRD KEEPER$", 13 + .string "BLACK BELT$", 13 + .string "RIVAL$", 13 + .string "SCIENTIST$", 13 + .string "BOSS$", 13 + .string "LEADER$", 13 + .string "TEAM ROCKET$", 13 + .string "COOLTRAINER$", 13 + .string "ELITE FOUR$", 13 + .string "GENTLEMAN$", 13 + .string "RIVAL$", 13 + .string "CHAMPION$", 13 + .string "CHANNELER$", 13 + .string "TWINS$", 13 + .string "COOL COUPLE$", 13 + .string "YOUNG COUPLE$", 13 + .string "CRUSH KIN$", 13 + .string "SIS AND BRO$", 13 + .string "{PKMN} PROF.$", 13 + .string "PLAYER$", 13 + .string "CRUSH GIRL$", 13 + .string "TUBER$", 13 + .string "{PKMN} BREEDER$", 13 + .string "{PKMN} RANGER$", 13 + .string "AROMA LADY$", 13 + .string "RUIN MANIAC$", 13 + .string "LADY$", 13 + .string "PAINTER$", 13 |