2 files changed, 34 insertions, 446 deletions

diff --git a/data/text/quest_log.inc b/data/text/quest_log.inc
index 62315aed3..7a605b239 100644
--- a/data/text/quest_log.inc
+++ b/data/text/quest_log.inc
@@ -378,104 +378,104 @@ gUnknown_841B073:: @ 841B073
 	.string "And {PLAYER} saved the game at this\n"
 	.string "location: {STR_VAR_1}.$"
 
-gUnknown_841B09F:: @ 841B09F
+gQuestLogString_Home:: @ 841B09F
 	.string "HOME$"
 
-gUnknown_841B0A4:: @ 841B0A4
+gQuestLogString_OakResearchLab:: @ 841B0A4
 	.string "OAK RESEARCH LAB$"
 
-gUnknown_841B0B5:: @ 841B0B5
+gQuestLogString_Gym:: @ 841B0B5
 	.string "GYM$"
 
-gUnknown_841B0B9:: @ 841B0B9
+gQuestLogString_PokemonLeagueGate:: @ 841B0B9
 	.string "POKéMON LEAGUE GATE$"
 
-gUnknown_841B0CD:: @ 841B0CD
+gQuestLogString_ViridianForest:: @ 841B0CD
 	.string "VIRIDIAN FOREST$"
 
-gUnknown_841B0DD:: @ 841B0DD
+gQuestLogString_PewterMuseumOfScience:: @ 841B0DD
 	.string "PEWTER MUSEUM OF SCIENCE$"
 
-gUnknown_841B0F6:: @ 841B0F6
+gQuestLogString_MtMoon:: @ 841B0F6
 	.string "MT. MOON$"
 
-gUnknown_841B0FF:: @ 841B0FF
+gQuestLogString_BikeShop:: @ 841B0FF
 	.string "BIKE SHOP$"
 
-gUnknown_841B109:: @ 841B109
+gQuestLogString_BillSHouse:: @ 841B109
 	.string "BILL'S HOUSE$"
 
-gUnknown_841B116:: @ 841B116
+gQuestLogString_DayCare:: @ 841B116
 	.string "DAY CARE$"
 
-gUnknown_841B11F:: @ 841B11F
+gQuestLogString_UndergroundPath:: @ 841B11F
 	.string "UNDERGROUND PATH$"
 
-gUnknown_841B130:: @ 841B130
+gQuestLogString_PokemonFanClub:: @ 841B130
 	.string "POKéMON FAN CLUB$"
 
-gUnknown_841B141:: @ 841B141
+gQuestLogString_SSAnne:: @ 841B141
 	.string "S.S. ANNE$"
 
-gUnknown_841B14B:: @ 841B14B
+gQuestLogString_DiglettSCave:: @ 841B14B
 	.string "DIGLETT'S CAVE$"
 
-gUnknown_841B15A:: @ 841B15A
+gQuestLogString_RockTunnel:: @ 841B15A
 	.string "ROCK TUNNEL$"
 
-gUnknown_841B166:: @ 841B166
+gQuestLogString_PowerPlant:: @ 841B166
 	.string "POWER PLANT$"
 
-gUnknown_841B172:: @ 841B172
+gQuestLogString_PokemonTower:: @ 841B172
 	.string "POKéMON TOWER$"
 
-gUnknown_841B180:: @ 841B180
+gQuestLogString_VolunteerHouse:: @ 841B180
 	.string "VOLUNTEER HOUSE$"
 
-gUnknown_841B190:: @ 841B190
+gQuestLogString_NameRaterSHouse:: @ 841B190
 	.string "NAME RATER'S HOUSE$"
 
-gUnknown_841B1A3:: @ 841B1A3
+gQuestLogString_CeladonDeptStore:: @ 841B1A3
 	.string "CELADON DEPT. STORE$"
 
-gUnknown_841B1B7:: @ 841B1B7
+gQuestLogString_CeladonMansion:: @ 841B1B7
 	.string "CELADON MANSION$"
 
-gUnknown_841B1C7:: @ 841B1C7
+gQuestLogString_RocketGameCorner:: @ 841B1C7
 	.string "ROCKET GAME CORNER$"
 
-gUnknown_841B1DA:: @ 841B1DA
+gQuestLogString_Restaurant:: @ 841B1DA
 	.string "RESTAURANT$"
 
-gUnknown_841B1E5:: @ 841B1E5
+gQuestLogString_RocketHideout:: @ 841B1E5
 	.string "ROCKET HIDEOUT$"
 
-gUnknown_841B1F4:: @ 841B1F4
+gQuestLogString_SafariZone:: @ 841B1F4
 	.string "SAFARI ZONE$"
 
-gUnknown_841B200:: @ 841B200
+gQuestLogString_WardenSHome:: @ 841B200
 	.string "WARDEN'S HOME$"
 
-gUnknown_841B20E:: @ 841B20E
+gQuestLogString_FightingDojo:: @ 841B20E
 	.string "FIGHTING DOJO$"
 
-gUnknown_841B21C:: @ 841B21C
+gQuestLogString_SilphCo:: @ 841B21C
 	.string "SILPH CO.$"
 
-gUnknown_841B226:: @ 841B226
+gQuestLogString_SeafoamIslands:: @ 841B226
 	.string "SEAFOAM ISLANDS$"
 
-gUnknown_841B236:: @ 841B236
+gQuestLogString_PokemonMansion:: @ 841B236
 	.string "POKéMON MANSION$"
 
-gUnknown_841B246:: @ 841B246
+gQuestLogString_PokemonResearchLab:: @ 841B246
 	.string "POKéMON RESEARCH LAB$"
 
-gUnknown_841B25B:: @ 841B25B
+gQuestLogString_VictoryRoad:: @ 841B25B
 	.string "VICTORY ROAD$"
 
-gUnknown_841B268:: @ 841B268
+gQuestLogString_PokemonLeague:: @ 841B268
 	.string "POKéMON LEAGUE$"
 
-gUnknown_841B277:: @ 841B277
+gQuestLogString_CeruleanCave:: @ 841B277
 	.string "CERULEAN CAVE$"
diff --git a/data/text/species_names.inc b/data/text/species_names.inc
deleted file mode 100644
index 04907c86e..000000000
--- a/data/text/species_names.inc
+++ /dev/null
@@ -1,412 +0,0 @@
-	.string "??????????$", 11
-	.string "BULBASAUR$", 11
-	.string "IVYSAUR$", 11
-	.string "VENUSAUR$", 11
-	.string "CHARMANDER$", 11
-	.string "CHARMELEON$", 11
-	.string "CHARIZARD$", 11
-	.string "SQUIRTLE$", 11
-	.string "WARTORTLE$", 11
-	.string "BLASTOISE$", 11
-	.string "CATERPIE$", 11
-	.string "METAPOD$", 11
-	.string "BUTTERFREE$", 11
-	.string "WEEDLE$", 11
-	.string "KAKUNA$", 11
-	.string "BEEDRILL$", 11
-	.string "PIDGEY$", 11
-	.string "PIDGEOTTO$", 11
-	.string "PIDGEOT$", 11
-	.string "RATTATA$", 11
-	.string "RATICATE$", 11
-	.string "SPEAROW$", 11
-	.string "FEAROW$", 11
-	.string "EKANS$", 11
-	.string "ARBOK$", 11
-	.string "PIKACHU$", 11
-	.string "RAICHU$", 11
-	.string "SANDSHREW$", 11
-	.string "SANDSLASH$", 11
-	.string "NIDORAN♀$", 11
-	.string "NIDORINA$", 11
-	.string "NIDOQUEEN$", 11
-	.string "NIDORAN♂$", 11
-	.string "NIDORINO$", 11
-	.string "NIDOKING$", 11
-	.string "CLEFAIRY$", 11
-	.string "CLEFABLE$", 11
-	.string "VULPIX$", 11
-	.string "NINETALES$", 11
-	.string "JIGGLYPUFF$", 11
-	.string "WIGGLYTUFF$", 11
-	.string "ZUBAT$", 11
-	.string "GOLBAT$", 11
-	.string "ODDISH$", 11
-	.string "GLOOM$", 11
-	.string "VILEPLUME$", 11
-	.string "PARAS$", 11
-	.string "PARASECT$", 11
-	.string "VENONAT$", 11
-	.string "VENOMOTH$", 11
-	.string "DIGLETT$", 11
-	.string "DUGTRIO$", 11
-	.string "MEOWTH$", 11
-	.string "PERSIAN$", 11
-	.string "PSYDUCK$", 11
-	.string "GOLDUCK$", 11
-	.string "MANKEY$", 11
-	.string "PRIMEAPE$", 11
-	.string "GROWLITHE$", 11
-	.string "ARCANINE$", 11
-	.string "POLIWAG$", 11
-	.string "POLIWHIRL$", 11
-	.string "POLIWRATH$", 11
-	.string "ABRA$", 11
-	.string "KADABRA$", 11
-	.string "ALAKAZAM$", 11
-	.string "MACHOP$", 11
-	.string "MACHOKE$", 11
-	.string "MACHAMP$", 11
-	.string "BELLSPROUT$", 11
-	.string "WEEPINBELL$", 11
-	.string "VICTREEBEL$", 11
-	.string "TENTACOOL$", 11
-	.string "TENTACRUEL$", 11
-	.string "GEODUDE$", 11
-	.string "GRAVELER$", 11
-	.string "GOLEM$", 11
-	.string "PONYTA$", 11
-	.string "RAPIDASH$", 11
-	.string "SLOWPOKE$", 11
-	.string "SLOWBRO$", 11
-	.string "MAGNEMITE$", 11
-	.string "MAGNETON$", 11
-	.string "FARFETCH'D$", 11
-	.string "DODUO$", 11
-	.string "DODRIO$", 11
-	.string "SEEL$", 11
-	.string "DEWGONG$", 11
-	.string "GRIMER$", 11
-	.string "MUK$", 11
-	.string "SHELLDER$", 11
-	.string "CLOYSTER$", 11
-	.string "GASTLY$", 11
-	.string "HAUNTER$", 11
-	.string "GENGAR$", 11
-	.string "ONIX$", 11
-	.string "DROWZEE$", 11
-	.string "HYPNO$", 11
-	.string "KRABBY$", 11
-	.string "KINGLER$", 11
-	.string "VOLTORB$", 11
-	.string "ELECTRODE$", 11
-	.string "EXEGGCUTE$", 11
-	.string "EXEGGUTOR$", 11
-	.string "CUBONE$", 11
-	.string "MAROWAK$", 11
-	.string "HITMONLEE$", 11
-	.string "HITMONCHAN$", 11
-	.string "LICKITUNG$", 11
-	.string "KOFFING$", 11
-	.string "WEEZING$", 11
-	.string "RHYHORN$", 11
-	.string "RHYDON$", 11
-	.string "CHANSEY$", 11
-	.string "TANGELA$", 11
-	.string "KANGASKHAN$", 11
-	.string "HORSEA$", 11
-	.string "SEADRA$", 11
-	.string "GOLDEEN$", 11
-	.string "SEAKING$", 11
-	.string "STARYU$", 11
-	.string "STARMIE$", 11
-	.string "MR. MIME$", 11
-	.string "SCYTHER$", 11
-	.string "JYNX$", 11
-	.string "ELECTABUZZ$", 11
-	.string "MAGMAR$", 11
-	.string "PINSIR$", 11
-	.string "TAUROS$", 11
-	.string "MAGIKARP$", 11
-	.string "GYARADOS$", 11
-	.string "LAPRAS$", 11
-	.string "DITTO$", 11
-	.string "EEVEE$", 11
-	.string "VAPOREON$", 11
-	.string "JOLTEON$", 11
-	.string "FLAREON$", 11
-	.string "PORYGON$", 11
-	.string "OMANYTE$", 11
-	.string "OMASTAR$", 11
-	.string "KABUTO$", 11
-	.string "KABUTOPS$", 11
-	.string "AERODACTYL$", 11
-	.string "SNORLAX$", 11
-	.string "ARTICUNO$", 11
-	.string "ZAPDOS$", 11
-	.string "MOLTRES$", 11
-	.string "DRATINI$", 11
-	.string "DRAGONAIR$", 11
-	.string "DRAGONITE$", 11
-	.string "MEWTWO$", 11
-	.string "MEW$", 11
-	.string "CHIKORITA$", 11
-	.string "BAYLEEF$", 11
-	.string "MEGANIUM$", 11
-	.string "CYNDAQUIL$", 11
-	.string "QUILAVA$", 11
-	.string "TYPHLOSION$", 11
-	.string "TOTODILE$", 11
-	.string "CROCONAW$", 11
-	.string "FERALIGATR$", 11
-	.string "SENTRET$", 11
-	.string "FURRET$", 11
-	.string "HOOTHOOT$", 11
-	.string "NOCTOWL$", 11
-	.string "LEDYBA$", 11
-	.string "LEDIAN$", 11
-	.string "SPINARAK$", 11
-	.string "ARIADOS$", 11
-	.string "CROBAT$", 11
-	.string "CHINCHOU$", 11
-	.string "LANTURN$", 11
-	.string "PICHU$", 11
-	.string "CLEFFA$", 11
-	.string "IGGLYBUFF$", 11
-	.string "TOGEPI$", 11
-	.string "TOGETIC$", 11
-	.string "NATU$", 11
-	.string "XATU$", 11
-	.string "MAREEP$", 11
-	.string "FLAAFFY$", 11
-	.string "AMPHAROS$", 11
-	.string "BELLOSSOM$", 11
-	.string "MARILL$", 11
-	.string "AZUMARILL$", 11
-	.string "SUDOWOODO$", 11
-	.string "POLITOED$", 11
-	.string "HOPPIP$", 11
-	.string "SKIPLOOM$", 11
-	.string "JUMPLUFF$", 11
-	.string "AIPOM$", 11
-	.string "SUNKERN$", 11
-	.string "SUNFLORA$", 11
-	.string "YANMA$", 11
-	.string "WOOPER$", 11
-	.string "QUAGSIRE$", 11
-	.string "ESPEON$", 11
-	.string "UMBREON$", 11
-	.string "MURKROW$", 11
-	.string "SLOWKING$", 11
-	.string "MISDREAVUS$", 11
-	.string "UNOWN$", 11
-	.string "WOBBUFFET$", 11
-	.string "GIRAFARIG$", 11
-	.string "PINECO$", 11
-	.string "FORRETRESS$", 11
-	.string "DUNSPARCE$", 11
-	.string "GLIGAR$", 11
-	.string "STEELIX$", 11
-	.string "SNUBBULL$", 11
-	.string "GRANBULL$", 11
-	.string "QWILFISH$", 11
-	.string "SCIZOR$", 11
-	.string "SHUCKLE$", 11
-	.string "HERACROSS$", 11
-	.string "SNEASEL$", 11
-	.string "TEDDIURSA$", 11
-	.string "URSARING$", 11
-	.string "SLUGMA$", 11
-	.string "MAGCARGO$", 11
-	.string "SWINUB$", 11
-	.string "PILOSWINE$", 11
-	.string "CORSOLA$", 11
-	.string "REMORAID$", 11
-	.string "OCTILLERY$", 11
-	.string "DELIBIRD$", 11
-	.string "MANTINE$", 11
-	.string "SKARMORY$", 11
-	.string "HOUNDOUR$", 11
-	.string "HOUNDOOM$", 11
-	.string "KINGDRA$", 11
-	.string "PHANPY$", 11
-	.string "DONPHAN$", 11
-	.string "PORYGON2$", 11
-	.string "STANTLER$", 11
-	.string "SMEARGLE$", 11
-	.string "TYROGUE$", 11
-	.string "HITMONTOP$", 11
-	.string "SMOOCHUM$", 11
-	.string "ELEKID$", 11
-	.string "MAGBY$", 11
-	.string "MILTANK$", 11
-	.string "BLISSEY$", 11
-	.string "RAIKOU$", 11
-	.string "ENTEI$", 11
-	.string "SUICUNE$", 11
-	.string "LARVITAR$", 11
-	.string "PUPITAR$", 11
-	.string "TYRANITAR$", 11
-	.string "LUGIA$", 11
-	.string "HO-OH$", 11
-	.string "CELEBI$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "?$", 11
-	.string "TREECKO$", 11
-	.string "GROVYLE$", 11
-	.string "SCEPTILE$", 11
-	.string "TORCHIC$", 11
-	.string "COMBUSKEN$", 11
-	.string "BLAZIKEN$", 11
-	.string "MUDKIP$", 11
-	.string "MARSHTOMP$", 11
-	.string "SWAMPERT$", 11
-	.string "POOCHYENA$", 11
-	.string "MIGHTYENA$", 11
-	.string "ZIGZAGOON$", 11
-	.string "LINOONE$", 11
-	.string "WURMPLE$", 11
-	.string "SILCOON$", 11
-	.string "BEAUTIFLY$", 11
-	.string "CASCOON$", 11
-	.string "DUSTOX$", 11
-	.string "LOTAD$", 11
-	.string "LOMBRE$", 11
-	.string "LUDICOLO$", 11
-	.string "SEEDOT$", 11
-	.string "NUZLEAF$", 11
-	.string "SHIFTRY$", 11
-	.string "NINCADA$", 11
-	.string "NINJASK$", 11
-	.string "SHEDINJA$", 11
-	.string "TAILLOW$", 11
-	.string "SWELLOW$", 11
-	.string "SHROOMISH$", 11
-	.string "BRELOOM$", 11
-	.string "SPINDA$", 11
-	.string "WINGULL$", 11
-	.string "PELIPPER$", 11
-	.string "SURSKIT$", 11
-	.string "MASQUERAIN$", 11
-	.string "WAILMER$", 11
-	.string "WAILORD$", 11
-	.string "SKITTY$", 11
-	.string "DELCATTY$", 11
-	.string "KECLEON$", 11
-	.string "BALTOY$", 11
-	.string "CLAYDOL$", 11
-	.string "NOSEPASS$", 11
-	.string "TORKOAL$", 11
-	.string "SABLEYE$", 11
-	.string "BARBOACH$", 11
-	.string "WHISCASH$", 11
-	.string "LUVDISC$", 11
-	.string "CORPHISH$", 11
-	.string "CRAWDAUNT$", 11
-	.string "FEEBAS$", 11
-	.string "MILOTIC$", 11
-	.string "CARVANHA$", 11
-	.string "SHARPEDO$", 11
-	.string "TRAPINCH$", 11
-	.string "VIBRAVA$", 11
-	.string "FLYGON$", 11
-	.string "MAKUHITA$", 11
-	.string "HARIYAMA$", 11
-	.string "ELECTRIKE$", 11
-	.string "MANECTRIC$", 11
-	.string "NUMEL$", 11
-	.string "CAMERUPT$", 11
-	.string "SPHEAL$", 11
-	.string "SEALEO$", 11
-	.string "WALREIN$", 11
-	.string "CACNEA$", 11
-	.string "CACTURNE$", 11
-	.string "SNORUNT$", 11
-	.string "GLALIE$", 11
-	.string "LUNATONE$", 11
-	.string "SOLROCK$", 11
-	.string "AZURILL$", 11
-	.string "SPOINK$", 11
-	.string "GRUMPIG$", 11
-	.string "PLUSLE$", 11
-	.string "MINUN$", 11
-	.string "MAWILE$", 11
-	.string "MEDITITE$", 11
-	.string "MEDICHAM$", 11
-	.string "SWABLU$", 11
-	.string "ALTARIA$", 11
-	.string "WYNAUT$", 11
-	.string "DUSKULL$", 11
-	.string "DUSCLOPS$", 11
-	.string "ROSELIA$", 11
-	.string "SLAKOTH$", 11
-	.string "VIGOROTH$", 11
-	.string "SLAKING$", 11
-	.string "GULPIN$", 11
-	.string "SWALOT$", 11
-	.string "TROPIUS$", 11
-	.string "WHISMUR$", 11
-	.string "LOUDRED$", 11
-	.string "EXPLOUD$", 11
-	.string "CLAMPERL$", 11
-	.string "HUNTAIL$", 11
-	.string "GOREBYSS$", 11
-	.string "ABSOL$", 11
-	.string "SHUPPET$", 11
-	.string "BANETTE$", 11
-	.string "SEVIPER$", 11
-	.string "ZANGOOSE$", 11
-	.string "RELICANTH$", 11
-	.string "ARON$", 11
-	.string "LAIRON$", 11
-	.string "AGGRON$", 11
-	.string "CASTFORM$", 11
-	.string "VOLBEAT$", 11
-	.string "ILLUMISE$", 11
-	.string "LILEEP$", 11
-	.string "CRADILY$", 11
-	.string "ANORITH$", 11
-	.string "ARMALDO$", 11
-	.string "RALTS$", 11
-	.string "KIRLIA$", 11
-	.string "GARDEVOIR$", 11
-	.string "BAGON$", 11
-	.string "SHELGON$", 11
-	.string "SALAMENCE$", 11
-	.string "BELDUM$", 11
-	.string "METANG$", 11
-	.string "METAGROSS$", 11
-	.string "REGIROCK$", 11
-	.string "REGICE$", 11
-	.string "REGISTEEL$", 11
-	.string "KYOGRE$", 11
-	.string "GROUDON$", 11
-	.string "RAYQUAZA$", 11
-	.string "LATIAS$", 11
-	.string "LATIOS$", 11
-	.string "JIRACHI$", 11
-	.string "DEOXYS$", 11
-	.string "CHIMECHO$", 11