dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
DizzyEggg
2018-12-03 17:56:36 +01:00
parent e1829c40ab ffa8655f4c
commit 0d122bc831
19 changed files with 994 additions and 990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/data/text/trainer_class_names.h
View File

@@ -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"),