Merge branch 'master' into battle

3 files changed, 880 insertions, 0 deletions

diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h
new file mode 100644
index 000000000..d45972d51
--- /dev/null
+++ b/src/data/text/move_names.h
@@ -0,0 +1,357 @@
+const u8 gMoveNames[][13] = {
+    _("-$$$$$$"),
+    _("POUND"),
+    _("KARATE CHOP"),
+    _("DOUBLESLAP"),
+    _("COMET PUNCH"),
+    _("MEGA PUNCH"),
+    _("PAY DAY"),
+    _("FIRE PUNCH"),
+    _("ICE PUNCH"),
+    _("THUNDERPUNCH"),
+    _("SCRATCH"),
+    _("VICEGRIP"),
+    _("GUILLOTINE"),
+    _("RAZOR WIND"),
+    _("SWORDS DANCE"),
+    _("CUT"),
+    _("GUST"),
+    _("WING ATTACK"),
+    _("WHIRLWIND"),
+    _("FLY"),
+    _("BIND"),
+    _("SLAM"),
+    _("VINE WHIP"),
+    _("STOMP"),
+    _("DOUBLE KICK"),
+    _("MEGA KICK"),
+    _("JUMP KICK"),
+    _("ROLLING KICK"),
+    _("SAND-ATTACK"),
+    _("HEADBUTT"),
+    _("HORN ATTACK"),
+    _("FURY ATTACK"),
+    _("HORN DRILL"),
+    _("TACKLE"),
+    _("BODY SLAM"),
+    _("WRAP"),
+    _("TAKE DOWN"),
+    _("THRASH"),
+    _("DOUBLE-EDGE"),
+    _("TAIL WHIP"),
+    _("POISON STING"),
+    _("TWINEEDLE"),
+    _("PIN MISSILE"),
+    _("LEER"),
+    _("BITE"),
+    _("GROWL"),
+    _("ROAR"),
+    _("SING"),
+    _("SUPERSONIC"),
+    _("SONICBOOM"),
+    _("DISABLE"),
+    _("ACID"),
+    _("EMBER"),
+    _("FLAMETHROWER"),
+    _("MIST"),
+    _("WATER GUN"),
+    _("HYDRO PUMP"),
+    _("SURF"),
+    _("ICE BEAM"),
+    _("BLIZZARD"),
+    _("PSYBEAM"),
+    _("BUBBLEBEAM"),
+    _("AURORA BEAM"),
+    _("HYPER BEAM"),
+    _("PECK"),
+    _("DRILL PECK"),
+    _("SUBMISSION"),
+    _("LOW KICK"),
+    _("COUNTER"),
+    _("SEISMIC TOSS"),
+    _("STRENGTH"),
+    _("ABSORB"),
+    _("MEGA DRAIN"),
+    _("LEECH SEED"),
+    _("GROWTH"),
+    _("RAZOR LEAF"),
+    _("SOLARBEAM"),
+    _("POISONPOWDER"),
+    _("STUN SPORE"),
+    _("SLEEP POWDER"),
+    _("PETAL DANCE"),
+    _("STRING SHOT"),
+    _("DRAGON RAGE"),
+    _("FIRE SPIN"),
+    _("THUNDERSHOCK"),
+    _("THUNDERBOLT"),
+    _("THUNDER WAVE"),
+    _("THUNDER"),
+    _("ROCK THROW"),
+    _("EARTHQUAKE"),
+    _("FISSURE"),
+    _("DIG"),
+    _("TOXIC"),
+    _("CONFUSION"),
+    _("PSYCHIC"),
+    _("HYPNOSIS"),
+    _("MEDITATE"),
+    _("AGILITY"),
+    _("QUICK ATTACK"),
+    _("RAGE"),
+    _("TELEPORT"),
+    _("NIGHT SHADE"),
+    _("MIMIC"),
+    _("SCREECH"),
+    _("DOUBLE TEAM"),
+    _("RECOVER"),
+    _("HARDEN"),
+    _("MINIMIZE"),
+    _("SMOKESCREEN"),
+    _("CONFUSE RAY"),
+    _("WITHDRAW"),
+    _("DEFENSE CURL"),
+    _("BARRIER"),
+    _("LIGHT SCREEN"),
+    _("HAZE"),
+    _("REFLECT"),
+    _("FOCUS ENERGY"),
+    _("BIDE"),
+    _("METRONOME"),
+    _("MIRROR MOVE"),
+    _("SELFDESTRUCT"),
+    _("EGG BOMB"),
+    _("LICK"),
+    _("SMOG"),
+    _("SLUDGE"),
+    _("BONE CLUB"),
+    _("FIRE BLAST"),
+    _("WATERFALL"),
+    _("CLAMP"),
+    _("SWIFT"),
+    _("SKULL BASH"),
+    _("SPIKE CANNON"),
+    _("CONSTRICT"),
+    _("AMNESIA"),
+    _("KINESIS"),
+    _("SOFTBOILED"),
+    _("HI JUMP KICK"),
+    _("GLARE"),
+    _("DREAM EATER"),
+    _("POISON GAS"),
+    _("BARRAGE"),
+    _("LEECH LIFE"),
+    _("LOVELY KISS"),
+    _("SKY ATTACK"),
+    _("TRANSFORM"),
+    _("BUBBLE"),
+    _("DIZZY PUNCH"),
+    _("SPORE"),
+    _("FLASH"),
+    _("PSYWAVE"),
+    _("SPLASH"),
+    _("ACID ARMOR"),
+    _("CRABHAMMER"),
+    _("EXPLOSION"),
+    _("FURY SWIPES"),
+    _("BONEMERANG"),
+    _("REST"),
+    _("ROCK SLIDE"),
+    _("HYPER FANG"),
+    _("SHARPEN"),
+    _("CONVERSION"),
+    _("TRI ATTACK"),
+    _("SUPER FANG"),
+    _("SLASH"),
+    _("SUBSTITUTE"),
+    _("STRUGGLE"),
+    _("SKETCH"),
+    _("TRIPLE KICK"),
+    _("THIEF"),
+    _("SPIDER WEB"),
+    _("MIND READER"),
+    _("NIGHTMARE"),
+    _("FLAME WHEEL"),
+    _("SNORE"),
+    _("CURSE"),
+    _("FLAIL"),
+    _("CONVERSION 2"),
+    _("AEROBLAST"),
+    _("COTTON SPORE"),
+    _("REVERSAL"),
+    _("SPITE"),
+    _("POWDER SNOW"),
+    _("PROTECT"),
+    _("MACH PUNCH"),
+    _("SCARY FACE"),
+    _("FAINT ATTACK"),
+    _("SWEET KISS"),
+    _("BELLY DRUM"),
+    _("SLUDGE BOMB"),
+    _("MUD-SLAP"),
+    _("OCTAZOOKA"),
+    _("SPIKES"),
+    _("ZAP CANNON"),
+    _("FORESIGHT"),
+    _("DESTINY BOND"),
+    _("PERISH SONG"),
+    _("ICY WIND"),
+    _("DETECT"),
+    _("BONE RUSH"),
+    _("LOCK-ON"),
+    _("OUTRAGE"),
+    _("SANDSTORM"),
+    _("GIGA DRAIN"),
+    _("ENDURE"),
+    _("CHARM"),
+    _("ROLLOUT"),
+    _("FALSE SWIPE"),
+    _("SWAGGER"),
+    _("MILK DRINK"),
+    _("SPARK"),
+    _("FURY CUTTER"),
+    _("STEEL WING"),
+    _("MEAN LOOK"),
+    _("ATTRACT"),
+    _("SLEEP TALK"),
+    _("HEAL BELL"),
+    _("RETURN"),
+    _("PRESENT"),
+    _("FRUSTRATION"),
+    _("SAFEGUARD"),
+    _("PAIN SPLIT"),
+    _("SACRED FIRE"),
+    _("MAGNITUDE"),
+    _("DYNAMICPUNCH"),
+    _("MEGAHORN"),
+    _("DRAGONBREATH"),
+    _("BATON PASS"),
+    _("ENCORE"),
+    _("PURSUIT"),
+    _("RAPID SPIN"),
+    _("SWEET SCENT"),
+    _("IRON TAIL"),
+    _("METAL CLAW"),
+    _("VITAL THROW"),
+    _("MORNING SUN"),
+    _("SYNTHESIS"),
+    _("MOONLIGHT"),
+    _("HIDDEN POWER"),
+    _("CROSS CHOP"),
+    _("TWISTER"),
+    _("RAIN DANCE"),
+    _("SUNNY DAY"),
+    _("CRUNCH"),
+    _("MIRROR COAT"),
+    _("PSYCH UP"),
+    _("EXTREMESPEED"),
+    _("ANCIENTPOWER"),
+    _("SHADOW BALL"),
+    _("FUTURE SIGHT"),
+    _("ROCK SMASH"),
+    _("WHIRLPOOL"),
+    _("BEAT UP"),
+    _("FAKE OUT"),
+    _("UPROAR"),
+    _("STOCKPILE"),
+    _("SPIT UP"),
+    _("SWALLOW"),
+    _("HEAT WAVE"),
+    _("HAIL"),
+    _("TORMENT"),
+    _("FLATTER"),
+    _("WILL-O-WISP"),
+    _("MEMENTO"),
+    _("FACADE"),
+    _("FOCUS PUNCH"),
+    _("SMELLINGSALT"),
+    _("FOLLOW ME"),
+    _("NATURE POWER"),
+    _("CHARGE"),
+    _("TAUNT"),
+    _("HELPING HAND"),
+    _("TRICK"),
+    _("ROLE PLAY"),
+    _("WISH"),
+    _("ASSIST"),
+    _("INGRAIN"),
+    _("SUPERPOWER"),
+    _("MAGIC COAT"),
+    _("RECYCLE"),
+    _("REVENGE"),
+    _("BRICK BREAK"),
+    _("YAWN"),
+    _("KNOCK OFF"),
+    _("ENDEAVOR"),
+    _("ERUPTION"),
+    _("SKILL SWAP"),
+    _("IMPRISON"),
+    _("REFRESH"),
+    _("GRUDGE"),
+    _("SNATCH"),
+    _("SECRET POWER"),
+    _("DIVE"),
+    _("ARM THRUST"),
+    _("CAMOUFLAGE"),
+    _("TAIL GLOW"),
+    _("LUSTER PURGE"),
+    _("MIST BALL"),
+    _("FEATHERDANCE"),
+    _("TEETER DANCE"),
+    _("BLAZE KICK"),
+    _("MUD SPORT"),
+    _("ICE BALL"),
+    _("NEEDLE ARM"),
+    _("SLACK OFF"),
+    _("HYPER VOICE"),
+    _("POISON FANG"),
+    _("CRUSH CLAW"),
+    _("BLAST BURN"),
+    _("HYDRO CANNON"),
+    _("METEOR MASH"),
+    _("ASTONISH"),
+    _("WEATHER BALL"),
+    _("AROMATHERAPY"),
+    _("FAKE TEARS"),
+    _("AIR CUTTER"),
+    _("OVERHEAT"),
+    _("ODOR SLEUTH"),
+    _("ROCK TOMB"),
+    _("SILVER WIND"),
+    _("METAL SOUND"),
+    _("GRASSWHISTLE"),
+    _("TICKLE"),
+    _("COSMIC POWER"),
+    _("WATER SPOUT"),
+    _("SIGNAL BEAM"),
+    _("SHADOW PUNCH"),
+    _("EXTRASENSORY"),
+    _("SKY UPPERCUT"),
+    _("SAND TOMB"),
+    _("SHEER COLD"),
+    _("MUDDY WATER"),
+    _("BULLET SEED"),
+    _("AERIAL ACE"),
+    _("ICICLE SPEAR"),
+    _("IRON DEFENSE"),
+    _("BLOCK"),
+    _("HOWL"),
+    _("DRAGON CLAW"),
+    _("FRENZY PLANT"),
+    _("BULK UP"),
+    _("BOUNCE"),
+    _("MUD SHOT"),
+    _("POISON TAIL"),
+    _("COVET"),
+    _("VOLT TACKLE"),
+    _("MAGICAL LEAF"),
+    _("WATER SPORT"),
+    _("CALM MIND"),
+    _("LEAF BLADE"),
+    _("DRAGON DANCE"),
+    _("ROCK BLAST"),
+    _("SHOCK WAVE"),
+    _("WATER PULSE"),
+    _("DOOM DESIRE"),
+    _("PSYCHO BOOST")
+};
diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h
new file mode 100644
index 000000000..f30fe2969
--- /dev/null
+++ b/src/data/text/species_names.h
@@ -0,0 +1,414 @@
+const u8 gSpeciesNames[][11] = {
+    _("??????????"),
+    _("BULBASAUR"),
+    _("IVYSAUR"),
+    _("VENUSAUR"),
+    _("CHARMANDER"),
+    _("CHARMELEON"),
+    _("CHARIZARD"),
+    _("SQUIRTLE"),
+    _("WARTORTLE"),
+    _("BLASTOISE"),
+    _("CATERPIE"),
+    _("METAPOD"),
+    _("BUTTERFREE"),
+    _("WEEDLE"),
+    _("KAKUNA"),
+    _("BEEDRILL"),
+    _("PIDGEY"),
+    _("PIDGEOTTO"),
+    _("PIDGEOT"),
+    _("RATTATA"),
+    _("RATICATE"),
+    _("SPEAROW"),
+    _("FEAROW"),
+    _("EKANS"),
+    _("ARBOK"),
+    _("PIKACHU"),
+    _("RAICHU"),
+    _("SANDSHREW"),
+    _("SANDSLASH"),
+    _("NIDORAN♀"),
+    _("NIDORINA"),
+    _("NIDOQUEEN"),
+    _("NIDORAN♂"),
+    _("NIDORINO"),
+    _("NIDOKING"),
+    _("CLEFAIRY"),
+    _("CLEFABLE"),
+    _("VULPIX"),
+    _("NINETALES"),
+    _("JIGGLYPUFF"),
+    _("WIGGLYTUFF"),
+    _("ZUBAT"),
+    _("GOLBAT"),
+    _("ODDISH"),
+    _("GLOOM"),
+    _("VILEPLUME"),
+    _("PARAS"),
+    _("PARASECT"),
+    _("VENONAT"),
+    _("VENOMOTH"),
+    _("DIGLETT"),
+    _("DUGTRIO"),
+    _("MEOWTH"),
+    _("PERSIAN"),
+    _("PSYDUCK"),
+    _("GOLDUCK"),
+    _("MANKEY"),
+    _("PRIMEAPE"),
+    _("GROWLITHE"),
+    _("ARCANINE"),
+    _("POLIWAG"),
+    _("POLIWHIRL"),
+    _("POLIWRATH"),
+    _("ABRA"),
+    _("KADABRA"),
+    _("ALAKAZAM"),
+    _("MACHOP"),
+    _("MACHOKE"),
+    _("MACHAMP"),
+    _("BELLSPROUT"),
+    _("WEEPINBELL"),
+    _("VICTREEBEL"),
+    _("TENTACOOL"),
+    _("TENTACRUEL"),
+    _("GEODUDE"),
+    _("GRAVELER"),
+    _("GOLEM"),
+    _("PONYTA"),
+    _("RAPIDASH"),
+    _("SLOWPOKE"),
+    _("SLOWBRO"),
+    _("MAGNEMITE"),
+    _("MAGNETON"),
+    _("FARFETCH'D"),
+    _("DODUO"),
+    _("DODRIO"),
+    _("SEEL"),
+    _("DEWGONG"),
+    _("GRIMER"),
+    _("MUK"),
+    _("SHELLDER"),
+    _("CLOYSTER"),
+    _("GASTLY"),
+    _("HAUNTER"),
+    _("GENGAR"),
+    _("ONIX"),
+    _("DROWZEE"),
+    _("HYPNO"),
+    _("KRABBY"),
+    _("KINGLER"),
+    _("VOLTORB"),
+    _("ELECTRODE"),
+    _("EXEGGCUTE"),
+    _("EXEGGUTOR"),
+    _("CUBONE"),
+    _("MAROWAK"),
+    _("HITMONLEE"),
+    _("HITMONCHAN"),
+    _("LICKITUNG"),
+    _("KOFFING"),
+    _("WEEZING"),
+    _("RHYHORN"),
+    _("RHYDON"),
+    _("CHANSEY"),
+    _("TANGELA"),
+    _("KANGASKHAN"),
+    _("HORSEA"),
+    _("SEADRA"),
+    _("GOLDEEN"),
+    _("SEAKING"),
+    _("STARYU"),
+    _("STARMIE"),
+    _("MR. MIME"),
+    _("SCYTHER"),
+    _("JYNX"),
+    _("ELECTABUZZ"),
+    _("MAGMAR"),
+    _("PINSIR"),
+    _("TAUROS"),
+    _("MAGIKARP"),
+    _("GYARADOS"),
+    _("LAPRAS"),
+    _("DITTO"),
+    _("EEVEE"),
+    _("VAPOREON"),
+    _("JOLTEON"),
+    _("FLAREON"),
+    _("PORYGON"),
+    _("OMANYTE"),
+    _("OMASTAR"),
+    _("KABUTO"),
+    _("KABUTOPS"),
+    _("AERODACTYL"),
+    _("SNORLAX"),
+    _("ARTICUNO"),
+    _("ZAPDOS"),
+    _("MOLTRES"),
+    _("DRATINI"),
+    _("DRAGONAIR"),
+    _("DRAGONITE"),
+    _("MEWTWO"),
+    _("MEW"),
+    _("CHIKORITA"),
+    _("BAYLEEF"),
+    _("MEGANIUM"),
+    _("CYNDAQUIL"),
+    _("QUILAVA"),
+    _("TYPHLOSION"),
+    _("TOTODILE"),
+    _("CROCONAW"),
+    _("FERALIGATR"),
+    _("SENTRET"),
+    _("FURRET"),
+    _("HOOTHOOT"),
+    _("NOCTOWL"),
+    _("LEDYBA"),
+    _("LEDIAN"),
+    _("SPINARAK"),
+    _("ARIADOS"),
+    _("CROBAT"),
+    _("CHINCHOU"),
+    _("LANTURN"),
+    _("PICHU"),
+    _("CLEFFA"),
+    _("IGGLYBUFF"),
+    _("TOGEPI"),
+    _("TOGETIC"),
+    _("NATU"),
+    _("XATU"),
+    _("MAREEP"),
+    _("FLAAFFY"),
+    _("AMPHAROS"),
+    _("BELLOSSOM"),
+    _("MARILL"),
+    _("AZUMARILL"),
+    _("SUDOWOODO"),
+    _("POLITOED"),
+    _("HOPPIP"),
+    _("SKIPLOOM"),
+    _("JUMPLUFF"),
+    _("AIPOM"),
+    _("SUNKERN"),
+    _("SUNFLORA"),
+    _("YANMA"),
+    _("WOOPER"),
+    _("QUAGSIRE"),
+    _("ESPEON"),
+    _("UMBREON"),
+    _("MURKROW"),
+    _("SLOWKING"),
+    _("MISDREAVUS"),
+    _("UNOWN"),
+    _("WOBBUFFET"),
+    _("GIRAFARIG"),
+    _("PINECO"),
+    _("FORRETRESS"),
+    _("DUNSPARCE"),
+    _("GLIGAR"),
+    _("STEELIX"),
+    _("SNUBBULL"),
+    _("GRANBULL"),
+    _("QWILFISH"),
+    _("SCIZOR"),
+    _("SHUCKLE"),
+    _("HERACROSS"),
+    _("SNEASEL"),
+    _("TEDDIURSA"),
+    _("URSARING"),
+    _("SLUGMA"),
+    _("MAGCARGO"),
+    _("SWINUB"),
+    _("PILOSWINE"),
+    _("CORSOLA"),
+    _("REMORAID"),
+    _("OCTILLERY"),
+    _("DELIBIRD"),
+    _("MANTINE"),
+    _("SKARMORY"),
+    _("HOUNDOUR"),
+    _("HOUNDOOM"),
+    _("KINGDRA"),
+    _("PHANPY"),
+    _("DONPHAN"),
+    _("PORYGON2"),
+    _("STANTLER"),
+    _("SMEARGLE"),
+    _("TYROGUE"),
+    _("HITMONTOP"),
+    _("SMOOCHUM"),
+    _("ELEKID"),
+    _("MAGBY"),
+    _("MILTANK"),
+    _("BLISSEY"),
+    _("RAIKOU"),
+    _("ENTEI"),
+    _("SUICUNE"),
+    _("LARVITAR"),
+    _("PUPITAR"),
+    _("TYRANITAR"),
+    _("LUGIA"),
+    _("HO-OH"),
+    _("CELEBI"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("?"),
+    _("TREECKO"),
+    _("GROVYLE"),
+    _("SCEPTILE"),
+    _("TORCHIC"),
+    _("COMBUSKEN"),
+    _("BLAZIKEN"),
+    _("MUDKIP"),
+    _("MARSHTOMP"),
+    _("SWAMPERT"),
+    _("POOCHYENA"),
+    _("MIGHTYENA"),
+    _("ZIGZAGOON"),
+    _("LINOONE"),
+    _("WURMPLE"),
+    _("SILCOON"),
+    _("BEAUTIFLY"),
+    _("CASCOON"),
+    _("DUSTOX"),
+    _("LOTAD"),
+    _("LOMBRE"),
+    _("LUDICOLO"),
+    _("SEEDOT"),
+    _("NUZLEAF"),
+    _("SHIFTRY"),
+    _("NINCADA"),
+    _("NINJASK"),
+    _("SHEDINJA"),
+    _("TAILLOW"),
+    _("SWELLOW"),
+    _("SHROOMISH"),
+    _("BRELOOM"),
+    _("SPINDA"),
+    _("WINGULL"),
+    _("PELIPPER"),
+    _("SURSKIT"),
+    _("MASQUERAIN"),
+    _("WAILMER"),
+    _("WAILORD"),
+    _("SKITTY"),
+    _("DELCATTY"),
+    _("KECLEON"),
+    _("BALTOY"),
+    _("CLAYDOL"),
+    _("NOSEPASS"),
+    _("TORKOAL"),
+    _("SABLEYE"),
+    _("BARBOACH"),
+    _("WHISCASH"),
+    _("LUVDISC"),
+    _("CORPHISH"),
+    _("CRAWDAUNT"),
+    _("FEEBAS"),
+    _("MILOTIC"),
+    _("CARVANHA"),
+    _("SHARPEDO"),
+    _("TRAPINCH"),
+    _("VIBRAVA"),
+    _("FLYGON"),
+    _("MAKUHITA"),
+    _("HARIYAMA"),
+    _("ELECTRIKE"),
+    _("MANECTRIC"),
+    _("NUMEL"),
+    _("CAMERUPT"),
+    _("SPHEAL"),
+    _("SEALEO"),
+    _("WALREIN"),
+    _("CACNEA"),
+    _("CACTURNE"),
+    _("SNORUNT"),
+    _("GLALIE"),
+    _("LUNATONE"),
+    _("SOLROCK"),
+    _("AZURILL"),
+    _("SPOINK"),
+    _("GRUMPIG"),
+    _("PLUSLE"),
+    _("MINUN"),
+    _("MAWILE"),
+    _("MEDITITE"),
+    _("MEDICHAM"),
+    _("SWABLU"),
+    _("ALTARIA"),
+    _("WYNAUT"),
+    _("DUSKULL"),
+    _("DUSCLOPS"),
+    _("ROSELIA"),
+    _("SLAKOTH"),
+    _("VIGOROTH"),
+    _("SLAKING"),
+    _("GULPIN"),
+    _("SWALOT"),
+    _("TROPIUS"),
+    _("WHISMUR"),
+    _("LOUDRED"),
+    _("EXPLOUD"),
+    _("CLAMPERL"),
+    _("HUNTAIL"),
+    _("GOREBYSS"),
+    _("ABSOL"),
+    _("SHUPPET"),
+    _("BANETTE"),
+    _("SEVIPER"),
+    _("ZANGOOSE"),
+    _("RELICANTH"),
+    _("ARON"),
+    _("LAIRON"),
+    _("AGGRON"),
+    _("CASTFORM"),
+    _("VOLBEAT"),
+    _("ILLUMISE"),
+    _("LILEEP"),
+    _("CRADILY"),
+    _("ANORITH"),
+    _("ARMALDO"),
+    _("RALTS"),
+    _("KIRLIA"),
+    _("GARDEVOIR"),
+    _("BAGON"),
+    _("SHELGON"),
+    _("SALAMENCE"),
+    _("BELDUM"),
+    _("METANG"),
+    _("METAGROSS"),
+    _("REGIROCK"),
+    _("REGICE"),
+    _("REGISTEEL"),
+    _("KYOGRE"),
+    _("GROUDON"),
+    _("RAYQUAZA"),
+    _("LATIAS"),
+    _("LATIOS"),
+    _("JIRACHI"),
+    _("DEOXYS"),
+    _("CHIMECHO")
+};
diff --git a/src/data/text/trainer_class_names.h b/src/data/text/trainer_class_names.h
new file mode 100644
index 000000000..4faae43f4
--- /dev/null
+++ b/src/data/text/trainer_class_names.h
@@ -0,0 +1,109 @@
+const u8 gTrainerClassNames[][13] = {
+    _("{PKMN} TRAINER"),
+    _("{PKMN} TRAINER"),
+    _("AQUA LEADER"),
+    _("TEAM AQUA"),
+    _("AROMA LADY"),
+    _("RUIN MANIAC"),
+    _("INTERVIEWER"),
+    _("TUBER"),
+    _("TUBER"),
+    _("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."),
+    _("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"),
+    _("LASS"),
+    _("BUG CATCHER"),
+    _("HIKER"),
+    _("YOUNG COUPLE"),
+    _("OLD COUPLE"),
+    _("SIS AND BRO"),
+    _("AQUA ADMIN"),
+    _("MAGMA ADMIN"),
+    _("YOUNGSTER"),
+    _("BUG CATCHER"),
+    _("LASS"),
+    _("SAILOR"),
+    _("CAMPER"),
+    _("PICNICKER"),
+    _("POKéMANIAC"),
+    _("SUPER NERD"),
+    _("HIKER"),
+    _("BIKER"),
+    _("BURGLAR"),
+    _("ENGINEER"),
+    _("FISHERMAN"),
+    _("SWIMMER♂"),
+    _("CUE BALL"),
+    _("GAMER"),
+    _("BEAUTY"),
+    _("SWIMMER♀"),
+    _("PSYCHIC"),
+    _("ROCKER"),
+    _("JUGGLER"),
+    _("TAMER"),
+    _("BIRD KEEPER"),
+    _("BLACK BELT"),
+    _("RIVAL"),
+    _("SCIENTIST"),
+    _("BOSS"),
+    _("LEADER"),
+    _("TEAM ROCKET"),
+    _("COOLTRAINER"),
+    _("ELITE FOUR"),
+    _("GENTLEMAN"),
+    _("RIVAL"),
+    _("CHAMPION"),
+    _("CHANNELER"),
+    _("TWINS"),
+    _("COOL COUPLE"),
+    _("YOUNG COUPLE"),
+    _("CRUSH KIN"),
+    _("SIS AND BRO"),
+    _("{PKMN} PROF."),
+    _("PLAYER"),
+    _("CRUSH GIRL"),
+    _("TUBER"),
+    _("{PKMN} BREEDER"),
+    _("{PKMN} RANGER"),
+    _("AROMA LADY"),
+    _("RUIN MANIAC"),
+    _("LADY"),
+    _("PAINTER"),
+};