diff options
| -rw-r--r-- | data/btl_attrs.s | 3 | ||||
| -rw-r--r-- | data/text/trainer_class_names.inc | 59 | ||||
| -rw-r--r-- | src/battle/battle_1.c | 6 | ||||
| -rw-r--r-- | src/data/text/trainer_class_names_de.h | 60 | ||||
| -rw-r--r-- | src/data/text/trainer_class_names_en.h | 65 |
5 files changed, 131 insertions, 62 deletions
diff --git a/data/btl_attrs.s b/data/btl_attrs.s index 93fe8a399..3456df0cb 100644 --- a/data/btl_attrs.s +++ b/data/btl_attrs.s @@ -8,9 +8,6 @@ .section .rodata -@ 81F0208 - .include "data/text/trainer_class_names.inc" - @ 81F04FC .include "data/trainers.inc" diff --git a/data/text/trainer_class_names.inc b/data/text/trainer_class_names.inc deleted file mode 100644 index 8678a29a6..000000000 --- a/data/text/trainer_class_names.inc +++ /dev/null @@ -1,59 +0,0 @@ -gTrainerClassNames:: @ 81F0208 - .string "{PKMN} TRAINER$", 13 - .string "{PKMN} TRAINER$", 13 - .string "AQUA LEADER$", 13 - .string "TEAM AQUA$", 13 - .string "AQUA ADMIN$", 13 - .string "AROMA LADY$", 13 - .string "RUIN MANIAC$", 13 - .string "INTERVIEWER$", 13 - .string "TUBER$", 13 @ うきわガール (Inner Tube Girl) in Japanese - .string "TUBER$", 13 @ うきわボーイ (Inner Tube Boy) in Japanese - .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 "WINSTRATE$", 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 "MAGMA ADMIN$", 13 - .string "LASS$", 13 - .string "BUG CATCHER$", 13 - .string "HIKER$", 13 - .string "YOUNG COUPLE$", 13 - .string "OLD COUPLE$", 13 - .string "SIS AND BRO$", 13 diff --git a/src/battle/battle_1.c b/src/battle/battle_1.c index bbcc74eb9..3c6cee457 100644 --- a/src/battle/battle_1.c +++ b/src/battle/battle_1.c @@ -446,3 +446,9 @@ const u8 gEnemyMonElevation[] = { }; #include "../data/trainer_parties.h" + +#if ENGLISH +#include "../data/text/trainer_class_names_en.h" +#elif GERMAN +#include "../data/text/trainer_class_names_de.h" +#endif diff --git a/src/data/text/trainer_class_names_de.h b/src/data/text/trainer_class_names_de.h new file mode 100644 index 000000000..4b5d6491b --- /dev/null +++ b/src/data/text/trainer_class_names_de.h @@ -0,0 +1,60 @@ +const u8 gTrainerClassNames[][13] = { + _("{PKMN}-TRAINER"), + _("{PKMN}-TRAINER"), + _("AQUA BOSS"), + _("TEAM AQUA"), + _("AQUA VORS."), + _("AROMALADY"), + _("RUINENMANIAC"), + _("INTERVIEWER"), + _("PLANSCHER"), // うきわガール (Inner Tube Girl) in Ja + _("PLANSCHER"), // うきわボーイ (Inner Tube Boy) in Ja + _("ASS-TRAINER"), + _("HEXE"), + _("LADY"), + _("SCHÖNHEIT"), + _("SCHNÖSEL"), + _("POKéMANIAC"), + _("SCHWIMMER"), + _("SCHWARZGURT"), + _("GITARRIST"), + _("HITZKOPF"), + _("CAMPER"), + _("KÄFERMANIAC"), + _("PSYCHO"), + _("GENTLEMAN"), + _("TOP VIER"), + _("LEITER"), + _("SCHULKIND"), + _("SEN. & JUN."), + _("SIHGERS,"), + _("POKéFAN"), + _("EXPERTE"), + _("TEENAGER"), + _("CHAMP"), + _("ANGLER"), + _("TRIATHLET"), + _("DRACHENPROFI"), + _("VOGELFÄNGER"), + _("NINJAJUNGE"), + _("KÄMPFERIN"), + _("SCHIRMDAME"), + _("SCHWIMMERIN"), + _("PICKNICKER"), + _("ZWIL."), + _("MATROSE"), + _("SNOWBOARDER"), + _("{PKMN}-SAMMLER"), + _("{PKMN}-TRAINER"), + _("{PKMN}-ZÜCHTER"), + _("{PKMN}-RANGER"), + _("MAGMA BOSS"), + _("TEAM MAGMA"), + _("MAGMA VORS."), + _("GÖRE"), + _("KÄFERSAMMLER"), + _("WANDERER"), + _("JUNGES GLÜCK"), + _("ALTES PAAR"), + _("GESCHWISTER"), +}; diff --git a/src/data/text/trainer_class_names_en.h b/src/data/text/trainer_class_names_en.h new file mode 100644 index 000000000..1e2a8f754 --- /dev/null +++ b/src/data/text/trainer_class_names_en.h @@ -0,0 +1,65 @@ +#ifndef GUARD_TRAINER_CLASS_NAMES_H +#define GUARD_TRAINER_CLASS_NAMES_H + +const u8 gTrainerClassNames[][13] = { + _("{PKMN} TRAINER"), + _("{PKMN} TRAINER"), + _("AQUA LEADER"), + _("TEAM AQUA"), + _("AQUA ADMIN"), + _("AROMA LADY"), + _("RUIN MANIAC"), + _("INTERVIEWER"), + _("TUBER"), // うきわガール (Inner Tube Girl) in Ja + _("TUBER"), // うきわボーイ (Inner Tube Boy) in Ja + _("COOLTRAINER"), + _("HEX MANIAC"), + _("LADY"), + _("BEAUTY"), + _("RICH BOY"), + _("POKéMANIAC"), + _("SWIMMER♂"), + _("BLACK BELT"), + _("GUITARIST"), + _("KINDLER"), + _("CAMPER"), + _("BUG MANIAC"), + _("PSYCHIC"), + _("GENTLEMAN"), + _("ELITE FOUR"), + _("LEADER"), + _("SCHOOL KID"), + _("SR. AND JR."), + _("WINSTRATE"), + _("POKéFAN"), + _("EXPERT"), + _("YOUNGSTER"), + _("CHAMPION"), + _("FISHERMAN"), + _("TRIATHLETE"), + _("DRAGON TAMER"), + _("BIRD KEEPER"), + _("NINJA BOY"), + _("BATTLE GIRL"), + _("PARASOL LADY"), + _("SWIMMER♀"), + _("PICNICKER"), + _("TWINS"), + _("SAILOR"), + _("BOARDER"), + _("COLLECTOR"), + _("{PKMN} TRAINER"), + _("{PKMN} BREEDER"), + _("{PKMN} RANGER"), + _("MAGMA LEADER"), + _("TEAM MAGMA"), + _("MAGMA ADMIN"), + _("LASS"), + _("BUG CATCHER"), + _("HIKER"), + _("YOUNG COUPLE"), + _("OLD COUPLE"), + _("SIS AND BRO") +}; + +#endif |