diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-03 17:56:36 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-03 17:56:36 +0100 |
| commit | 0d122bc8311857329745c03d924e80ffe3853ff8 (patch) | |
| tree | e35a6bbb2b00db51da182d71e3f21471ffd16aa1 /src/data/text | |
| parent | e1829c40abf547830d72b857db19de135be77e67 (diff) | |
| parent | ffa8655f4cd2cb8d6b1bdacc0a5568259eb60a72 (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/data/text')
| -rw-r--r-- | src/data/text/trainer_class_names.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/data/text/trainer_class_names.h b/src/data/text/trainer_class_names.h index 9d201193c..dd750b354 100644 --- a/src/data/text/trainer_class_names.h +++ b/src/data/text/trainer_class_names.h @@ -4,7 +4,7 @@ const u8 gTrainerClassNames[][13] = { [TRAINER_CLASS_HIKER] = _("HIKER"), [TRAINER_CLASS_TEAM_AQUA] = _("TEAM AQUA"), [TRAINER_CLASS_PKMN_BREEDER] = _("{PKMN} BREEDER"), - [TRAINER_CLASS_COOLTRAINER_1] = _("COOLTRAINER"), + [TRAINER_CLASS_COOLTRAINER] = _("COOLTRAINER"), [TRAINER_CLASS_BIRD_KEEPER] = _("BIRD KEEPER"), [TRAINER_CLASS_COLLECTOR] = _("COLLECTOR"), [TRAINER_CLASS_SWIMMER_M] = _("SWIMMER♂"), @@ -17,8 +17,8 @@ const u8 gTrainerClassNames[][13] = { [TRAINER_CLASS_AROMA_LADY] = _("AROMA LADY"), [TRAINER_CLASS_RUIN_MANIAC] = _("RUIN MANIAC"), [TRAINER_CLASS_INTERVIEWER] = _("INTERVIEWER"), - [TRAINER_CLASS_TUBER_1] = _("TUBER"), - [TRAINER_CLASS_TUBER_2] = _("TUBER"), + [TRAINER_CLASS_TUBER_F] = _("TUBER"), + [TRAINER_CLASS_TUBER_M] = _("TUBER"), [TRAINER_CLASS_LADY] = _("LADY"), [TRAINER_CLASS_BEAUTY] = _("BEAUTY"), [TRAINER_CLASS_RICH_BOY] = _("RICH BOY"), @@ -47,7 +47,7 @@ const u8 gTrainerClassNames[][13] = { [TRAINER_CLASS_SWIMMER_F] = _("SWIMMER♀"), [TRAINER_CLASS_TWINS] = _("TWINS"), [TRAINER_CLASS_SAILOR] = _("SAILOR"), - [TRAINER_CLASS_COOLTRAINER_2] = _("COOLTRAINER"), + [TRAINER_CLASS_COOLTRAINER_UNUSED] = _("COOLTRAINER"), [TRAINER_CLASS_MAGMA_ADMIN] = _("MAGMA ADMIN"), [TRAINER_CLASS_PKMN_TRAINER_3] = _("{PKMN} TRAINER"), [TRAINER_CLASS_BUG_CATCHER] = _("BUG CATCHER"), |