diff --git a/data/pokemon_names.asm b/data/pokemon_names.asm
new file mode 100644
index 000000000..06b1a6e55
--- /dev/null
+++ b/data/pokemon_names.asm
@@ -0,0 +1,256 @@
+	db "BULBASAUR@"
+	db "IVYSAUR@@@"
+	db "VENUSAUR@@"
+	db "CHARMANDER"
+	db "CHARMELEON"
+	db "CHARIZARD@"
+	db "SQUIRTLE@@"
+	db "WARTORTLE@"
+	db "BLASTOISE@"
+	db "CATERPIE@@"
+	db "METAPOD@@@"
+	db "BUTTERFREE"
+	db "WEEDLE@@@@"
+	db "KAKUNA@@@@"
+	db "BEEDRILL@@"
+	db "PIDGEY@@@@"
+	db "PIDGEOTTO@"
+	db "PIDGEOT@@@"
+	db "RATTATA@@@"
+	db "RATICATE@@"
+	db "SPEAROW@@@"
+	db "FEAROW@@@@"
+	db "EKANS@@@@@"
+	db "ARBOK@@@@@"
+	db "PIKACHU@@@"
+	db "RAICHU@@@@"
+	db "SANDSHREW@"
+	db "SANDSLASH@"
+	db "NIDORAN♀@@"
+	db "NIDORINA@@"
+	db "NIDOQUEEN@"
+	db "NIDORAN♂@@"
+	db "NIDORINO@@"
+	db "NIDOKING@@"
+	db "CLEFAIRY@@"
+	db "CLEFABLE@@"
+	db "VULPIX@@@@"
+	db "NINETALES@"
+	db "JIGGLYPUFF"
+	db "WIGGLYTUFF"
+	db "ZUBAT@@@@@"
+	db "GOLBAT@@@@"
+	db "ODDISH@@@@"
+	db "GLOOM@@@@@"
+	db "VILEPLUME@"
+	db "PARAS@@@@@"
+	db "PARASECT@@"
+	db "VENONAT@@@"
+	db "VENOMOTH@@"
+	db "DIGLETT@@@"
+	db "DUGTRIO@@@"
+	db "MEOWTH@@@@"
+	db "PERSIAN@@@"
+	db "PSYDUCK@@@"
+	db "GOLDUCK@@@"
+	db "MANKEY@@@@"
+	db "PRIMEAPE@@"
+	db "GROWLITHE@"
+	db "ARCANINE@@"
+	db "POLIWAG@@@"
+	db "POLIWHIRL@"
+	db "POLIWRATH@"
+	db "ABRA@@@@@@"
+	db "KADABRA@@@"
+	db "ALAKAZAM@@"
+	db "MACHOP@@@@"
+	db "MACHOKE@@@"
+	db "MACHAMP@@@"
+	db "BELLSPROUT"
+	db "WEEPINBELL"
+	db "VICTREEBEL"
+	db "TENTACOOL@"
+	db "TENTACRUEL"
+	db "GEODUDE@@@"
+	db "GRAVELER@@"
+	db "GOLEM@@@@@"
+	db "PONYTA@@@@"
+	db "RAPIDASH@@"
+	db "SLOWPOKE@@"
+	db "SLOWBRO@@@"
+	db "MAGNEMITE@"
+	db "MAGNETON@@"
+	db "FARFETCH'D"
+	db "DODUO@@@@@"
+	db "DODRIO@@@@"
+	db "SEEL@@@@@@"
+	db "DEWGONG@@@"
+	db "GRIMER@@@@"
+	db "MUK@@@@@@@"
+	db "SHELLDER@@"
+	db "CLOYSTER@@"
+	db "GASTLY@@@@"
+	db "HAUNTER@@@"
+	db "GENGAR@@@@"
+	db "ONIX@@@@@@"
+	db "DROWZEE@@@"
+	db "HYPNO@@@@@"
+	db "KRABBY@@@@"
+	db "KINGLER@@@"
+	db "VOLTORB@@@"
+	db "ELECTRODE@"
+	db "EXEGGCUTE@"
+	db "EXEGGUTOR@"
+	db "CUBONE@@@@"
+	db "MAROWAK@@@"
+	db "HITMONLEE@"
+	db "HITMONCHAN"
+	db "LICKITUNG@"
+	db "KOFFING@@@"
+	db "WEEZING@@@"
+	db "RHYHORN@@@"
+	db "RHYDON@@@@"
+	db "CHANSEY@@@"
+	db "TANGELA@@@"
+	db "KANGASKHAN"
+	db "HORSEA@@@@"
+	db "SEADRA@@@@"
+	db "GOLDEEN@@@"
+	db "SEAKING@@@"
+	db "STARYU@@@@"
+	db "STARMIE@@@"
+	db "MR.MIME@@@"
+	db "SCYTHER@@@"
+	db "JYNX@@@@@@"
+	db "ELECTABUZZ"
+	db "MAGMAR@@@@"
+	db "PINSIR@@@@"
+	db "TAUROS@@@@"
+	db "MAGIKARP@@"
+	db "GYARADOS@@"
+	db "LAPRAS@@@@"
+	db "DITTO@@@@@"
+	db "EEVEE@@@@@"
+	db "VAPOREON@@"
+	db "JOLTEON@@@"
+	db "FLAREON@@@"
+	db "PORYGON@@@"
+	db "OMANYTE@@@"
+	db "OMASTAR@@@"
+	db "KABUTO@@@@"
+	db "KABUTOPS@@"
+	db "AERODACTYL"
+	db "SNORLAX@@@"
+	db "ARTICUNO@@"
+	db "ZAPDOS@@@@"
+	db "MOLTRES@@@"
+	db "DRATINI@@@"
+	db "DRAGONAIR@"
+	db "DRAGONITE@"
+	db "MEWTWO@@@@"
+	db "MEW@@@@@@@"
+	db "CHIKORITA@"
+	db "BAYLEEF@@@"
+	db "MEGANIUM@@"
+	db "CYNDAQUIL@"
+	db "QUILAVA@@@"
+	db "TYPHLOSION"
+	db "TOTODILE@@"
+	db "CROCONAW@@"
+	db "FERALIGATR"
+	db "SENTRET@@@"
+	db "FURRET@@@@"
+	db "HOOTHOOT@@"
+	db "NOCTOWL@@@"
+	db "LEDYBA@@@@"
+	db "LEDIAN@@@@"
+	db "SPINARAK@@"
+	db "ARIADOS@@@"
+	db "CROBAT@@@@"
+	db "CHINCHOU@@"
+	db "LANTURN@@@"
+	db "PICHU@@@@@"
+	db "CLEFFA@@@@"
+	db "IGGLYBUFF@"
+	db "TOGEPI@@@@"
+	db "TOGETIC@@@"
+	db "NATU@@@@@@"
+	db "XATU@@@@@@"
+	db "MAREEP@@@@"
+	db "FLAAFFY@@@"
+	db "AMPHAROS@@"
+	db "BELLOSSOM@"
+	db "MARILL@@@@"
+	db "AZUMARILL@"
+	db "SUDOWOODO@"
+	db "POLITOED@@"
+	db "HOPPIP@@@@"
+	db "SKIPLOOM@@"
+	db "JUMPLUFF@@"
+	db "AIPOM@@@@@"
+	db "SUNKERN@@@"
+	db "SUNFLORA@@"
+	db "YANMA@@@@@"
+	db "WOOPER@@@@"
+	db "QUAGSIRE@@"
+	db "ESPEON@@@@"
+	db "UMBREON@@@"
+	db "MURKROW@@@"
+	db "SLOWKING@@"
+	db "MISDREAVUS"
+	db "UNOWN@@@@@"
+	db "WOBBUFFET@"
+	db "GIRAFARIG@"
+	db "PINECO@@@@"
+	db "FORRETRESS"
+	db "DUNSPARCE@"
+	db "GLIGAR@@@@"
+	db "STEELIX@@@"
+	db "SNUBBULL@@"
+	db "GRANBULL@@"
+	db "QWILFISH@@"
+	db "SCIZOR@@@@"
+	db "SHUCKLE@@@"
+	db "HERACROSS@"
+	db "SNEASEL@@@"
+	db "TEDDIURSA@"
+	db "URSARING@@"
+	db "SLUGMA@@@@"
+	db "MAGCARGO@@"
+	db "SWINUB@@@@"
+	db "PILOSWINE@"
+	db "CORSOLA@@@"
+	db "REMORAID@@"
+	db "OCTILLERY@"
+	db "DELIBIRD@@"
+	db "MANTINE@@@"
+	db "SKARMORY@@"
+	db "HOUNDOUR@@"
+	db "HOUNDOOM@@"
+	db "KINGDRA@@@"
+	db "PHANPY@@@@"
+	db "DONPHAN@@@"
+	db "PORYGON2@@"
+	db "STANTLER@@"
+	db "SMEARGLE@@"
+	db "TYROGUE@@@"
+	db "HITMONTOP@"
+	db "SMOOCHUM@@"
+	db "ELEKID@@@@"
+	db "MAGBY@@@@@"
+	db "MILTANK@@@"
+	db "BLISSEY@@@"
+	db "RAIKOU@@@@"
+	db "ENTEI@@@@@"
+	db "SUICUNE@@@"
+	db "LARVITAR@@"
+	db "PUPITAR@@@"
+	db "TYRANITAR@"
+	db "LUGIA@@@@@"
+	db "HO-OH@@@@@"
+	db "CELEBI@@@@"
+	db "?????@@@@@"
+	db "EGG@@@@@@@"
+	db "?????@@@@@"
+	db "?????@@@@@"
+	db "?????@@@@@"
diff --git a/main.asm b/main.asm
index 362325315..42decd6cd 100644
--- a/main.asm
+++ b/main.asm
@@ -7689,267 +7689,12 @@ INCBIN "baserom.gbc",$50A28, $51424 - $50A28
 BaseStats:
 INCLUDE "data/base_stats.asm"
 
-
 PokemonNames:
-	db "BULBASAUR@"
-	db "IVYSAUR@@@"
-	db "VENUSAUR@@"
-	db "CHARMANDER"
-	db "CHARMELEON"
-	db "CHARIZARD@"
-	db "SQUIRTLE@@"
-	db "WARTORTLE@"
-	db "BLASTOISE@"
-	db "CATERPIE@@"
-	db "METAPOD@@@"
-	db "BUTTERFREE"
-	db "WEEDLE@@@@"
-	db "KAKUNA@@@@"
-	db "BEEDRILL@@"
-	db "PIDGEY@@@@"
-	db "PIDGEOTTO@"
-	db "PIDGEOT@@@"
-	db "RATTATA@@@"
-	db "RATICATE@@"
-	db "SPEAROW@@@"
-	db "FEAROW@@@@"
-	db "EKANS@@@@@"
-	db "ARBOK@@@@@"
-	db "PIKACHU@@@"
-	db "RAICHU@@@@"
-	db "SANDSHREW@"
-	db "SANDSLASH@"
-	db "NIDORAN♀@@"
-	db "NIDORINA@@"
-	db "NIDOQUEEN@"
-	db "NIDORAN♂@@"
-	db "NIDORINO@@"
-	db "NIDOKING@@"
-	db "CLEFAIRY@@"
-	db "CLEFABLE@@"
-	db "VULPIX@@@@"
-	db "NINETALES@"
-	db "JIGGLYPUFF"
-	db "WIGGLYTUFF"
-	db "ZUBAT@@@@@"
-	db "GOLBAT@@@@"
-	db "ODDISH@@@@"
-	db "GLOOM@@@@@"
-	db "VILEPLUME@"
-	db "PARAS@@@@@"
-	db "PARASECT@@"
-	db "VENONAT@@@"
-	db "VENOMOTH@@"
-	db "DIGLETT@@@"
-	db "DUGTRIO@@@"
-	db "MEOWTH@@@@"
-	db "PERSIAN@@@"
-	db "PSYDUCK@@@"
-	db "GOLDUCK@@@"
-	db "MANKEY@@@@"
-	db "PRIMEAPE@@"
-	db "GROWLITHE@"
-	db "ARCANINE@@"
-	db "POLIWAG@@@"
-	db "POLIWHIRL@"
-	db "POLIWRATH@"
-	db "ABRA@@@@@@"
-	db "KADABRA@@@"
-	db "ALAKAZAM@@"
-	db "MACHOP@@@@"
-	db "MACHOKE@@@"
-	db "MACHAMP@@@"
-	db "BELLSPROUT"
-	db "WEEPINBELL"
-	db "VICTREEBEL"
-	db "TENTACOOL@"
-	db "TENTACRUEL"
-	db "GEODUDE@@@"
-	db "GRAVELER@@"
-	db "GOLEM@@@@@"
-	db "PONYTA@@@@"
-	db "RAPIDASH@@"
-	db "SLOWPOKE@@"
-	db "SLOWBRO@@@"
-	db "MAGNEMITE@"
-	db "MAGNETON@@"
-	db "FARFETCH'D"
-	db "DODUO@@@@@"
-	db "DODRIO@@@@"
-	db "SEEL@@@@@@"
-	db "DEWGONG@@@"
-	db "GRIMER@@@@"
-	db "MUK@@@@@@@"
-	db "SHELLDER@@"
-	db "CLOYSTER@@"
-	db "GASTLY@@@@"
-	db "HAUNTER@@@"
-	db "GENGAR@@@@"
-	db "ONIX@@@@@@"
-	db "DROWZEE@@@"
-	db "HYPNO@@@@@"
-	db "KRABBY@@@@"
-	db "KINGLER@@@"
-	db "VOLTORB@@@"
-	db "ELECTRODE@"
-	db "EXEGGCUTE@"
-	db "EXEGGUTOR@"
-	db "CUBONE@@@@"
-	db "MAROWAK@@@"
-	db "HITMONLEE@"
-	db "HITMONCHAN"
-	db "LICKITUNG@"
-	db "KOFFING@@@"
-	db "WEEZING@@@"
-	db "RHYHORN@@@"
-	db "RHYDON@@@@"
-	db "CHANSEY@@@"
-	db "TANGELA@@@"
-	db "KANGASKHAN"
-	db "HORSEA@@@@"
-	db "SEADRA@@@@"
-	db "GOLDEEN@@@"
-	db "SEAKING@@@"
-	db "STARYU@@@@"
-	db "STARMIE@@@"
-	db "MR.MIME@@@"
-	db "SCYTHER@@@"
-	db "JYNX@@@@@@"
-	db "ELECTABUZZ"
-	db "MAGMAR@@@@"
-	db "PINSIR@@@@"
-	db "TAUROS@@@@"
-	db "MAGIKARP@@"
-	db "GYARADOS@@"
-	db "LAPRAS@@@@"
-	db "DITTO@@@@@"
-	db "EEVEE@@@@@"
-	db "VAPOREON@@"
-	db "JOLTEON@@@"
-	db "FLAREON@@@"
-	db "PORYGON@@@"
-	db "OMANYTE@@@"
-	db "OMASTAR@@@"
-	db "KABUTO@@@@"
-	db "KABUTOPS@@"
-	db "AERODACTYL"
-	db "SNORLAX@@@"
-	db "ARTICUNO@@"
-	db "ZAPDOS@@@@"
-	db "MOLTRES@@@"
-	db "DRATINI@@@"
-	db "DRAGONAIR@"
-	db "DRAGONITE@"
-	db "MEWTWO@@@@"
-	db "MEW@@@@@@@"
-	db "CHIKORITA@"
-	db "BAYLEEF@@@"
-	db "MEGANIUM@@"
-	db "CYNDAQUIL@"
-	db "QUILAVA@@@"
-	db "TYPHLOSION"
-	db "TOTODILE@@"
-	db "CROCONAW@@"
-	db "FERALIGATR"
-	db "SENTRET@@@"
-	db "FURRET@@@@"
-	db "HOOTHOOT@@"
-	db "NOCTOWL@@@"
-	db "LEDYBA@@@@"
-	db "LEDIAN@@@@"
-	db "SPINARAK@@"
-	db "ARIADOS@@@"
-	db "CROBAT@@@@"
-	db "CHINCHOU@@"
-	db "LANTURN@@@"
-	db "PICHU@@@@@"
-	db "CLEFFA@@@@"
-	db "IGGLYBUFF@"
-	db "TOGEPI@@@@"
-	db "TOGETIC@@@"
-	db "NATU@@@@@@"
-	db "XATU@@@@@@"
-	db "MAREEP@@@@"
-	db "FLAAFFY@@@"
-	db "AMPHAROS@@"
-	db "BELLOSSOM@"
-	db "MARILL@@@@"
-	db "AZUMARILL@"
-	db "SUDOWOODO@"
-	db "POLITOED@@"
-	db "HOPPIP@@@@"
-	db "SKIPLOOM@@"
-	db "JUMPLUFF@@"
-	db "AIPOM@@@@@"
-	db "SUNKERN@@@"
-	db "SUNFLORA@@"
-	db "YANMA@@@@@"
-	db "WOOPER@@@@"
-	db "QUAGSIRE@@"
-	db "ESPEON@@@@"
-	db "UMBREON@@@"
-	db "MURKROW@@@"
-	db "SLOWKING@@"
-	db "MISDREAVUS"
-	db "UNOWN@@@@@"
-	db "WOBBUFFET@"
-	db "GIRAFARIG@"
-	db "PINECO@@@@"
-	db "FORRETRESS"
-	db "DUNSPARCE@"
-	db "GLIGAR@@@@"
-	db "STEELIX@@@"
-	db "SNUBBULL@@"
-	db "GRANBULL@@"
-	db "QWILFISH@@"
-	db "SCIZOR@@@@"
-	db "SHUCKLE@@@"
-	db "HERACROSS@"
-	db "SNEASEL@@@"
-	db "TEDDIURSA@"
-	db "URSARING@@"
-	db "SLUGMA@@@@"
-	db "MAGCARGO@@"
-	db "SWINUB@@@@"
-	db "PILOSWINE@"
-	db "CORSOLA@@@"
-	db "REMORAID@@"
-	db "OCTILLERY@"
-	db "DELIBIRD@@"
-	db "MANTINE@@@"
-	db "SKARMORY@@"
-	db "HOUNDOUR@@"
-	db "HOUNDOOM@@"
-	db "KINGDRA@@@"
-	db "PHANPY@@@@"
-	db "DONPHAN@@@"
-	db "PORYGON2@@"
-	db "STANTLER@@"
-	db "SMEARGLE@@"
-	db "TYROGUE@@@"
-	db "HITMONTOP@"
-	db "SMOOCHUM@@"
-	db "ELEKID@@@@"
-	db "MAGBY@@@@@"
-	db "MILTANK@@@"
-	db "BLISSEY@@@"
-	db "RAIKOU@@@@"
-	db "ENTEI@@@@@"
-	db "SUICUNE@@@"
-	db "LARVITAR@@"
-	db "PUPITAR@@@"
-	db "TYRANITAR@"
-	db "LUGIA@@@@@"
-	db "HO-OH@@@@@"
-	db "CELEBI@@@@"
-	db "?????@@@@@"
-	db "EGG@@@@@@@"
-	db "?????@@@@@"
-	db "?????@@@@@"
-	db "?????@@@@@"
+INCLUDE "data/pokemon_names.asm"
 
 INCBIN "baserom.gbc",$53D84,$54000 - $53D84
 
+
 SECTION "bank15",DATA,BANK[$15]
 
 GoldenrodGym_MapScriptHeader: ; 0x54000