Merge pull request #257 from Rangi42/master

More reorganization

227 files changed, 220 insertions, 3204 deletions

diff --git a/text/stat_names.asm b/data/battle/stat_names.asm
index 854780c6..854780c6 100644
--- a/text/stat_names.asm
+++ b/data/battle/stat_names.asm
diff --git a/text/credits_text.asm b/data/credits/credits_text.asm
index a68c33d3..a68c33d3 100755
--- a/text/credits_text.asm
+++ b/data/credits/credits_text.asm
diff --git a/text/item_names.asm b/data/items/names.asm
index 0c07fe5d..0c07fe5d 100755
--- a/text/item_names.asm
+++ b/data/items/names.asm
diff --git a/text/map_names.asm b/data/maps/names.asm
index c2642942..c2642942 100755
--- a/text/map_names.asm
+++ b/data/maps/names.asm
diff --git a/text/move_names.asm b/data/moves/names.asm
index f8706ee3..f8706ee3 100644
--- a/text/move_names.asm
+++ b/data/moves/names.asm
diff --git a/text/player_names.asm b/data/player_names.asm
index f57c9877..f57c9877 100644
--- a/text/player_names.asm
+++ b/data/player_names.asm
diff --git a/text/player_names_list.asm b/data/player_names_list.asm
index 56075df0..56075df0 100644
--- a/text/player_names_list.asm
+++ b/data/player_names_list.asm
diff --git a/text/pokedex.asm b/data/pokemon/dex_text.asm
index 65f3d89d..65f3d89d 100644
--- a/text/pokedex.asm
+++ b/data/pokemon/dex_text.asm
diff --git a/text/monster_names.asm b/data/pokemon/names.asm
index 83a45b77..83a45b77 100755
--- a/text/monster_names.asm
+++ b/data/pokemon/names.asm
diff --git a/text/alphabets.asm b/data/text/alphabets.asm
index 9799a7e6..9799a7e6 100644
--- a/text/alphabets.asm
+++ b/data/text/alphabets.asm
diff --git a/text/dakutens.asm b/data/text/dakutens.asm
index f3bf4854..f3bf4854 100644
--- a/text/dakutens.asm
+++ b/data/text/dakutens.asm
diff --git a/text/trainer_name_pointers.asm b/data/trainers/name_pointers.asm
index aa5e72d3..aa5e72d3 100644
--- a/text/trainer_name_pointers.asm
+++ b/data/trainers/name_pointers.asm
diff --git a/text/trainer_names.asm b/data/trainers/names.asm
index d8e1f550..d8e1f550 100755
--- a/text/trainer_names.asm
+++ b/data/trainers/names.asm
diff --git a/text/type_names.asm b/data/types/names.asm
index d94675b8..d94675b8 100755
--- a/text/type_names.asm
+++ b/data/types/names.asm
diff --git a/text.asm b/text.asm
index a426de39..d15f258a 100644
--- a/text.asm
+++ b/text.asm
@@ -1,3189 +1,280 @@
-INCLUDE "macros.asm"
-INCLUDE "charmap.asm"
-
-INCLUDE "hram.asm"
-
-INCLUDE "constants/text_constants.asm"
+INCLUDE "constants.asm"
 
 
 SECTION "Text 1", ROMX
 
-_CardKeySuccessText1::
-	text "Bingo!@@"
-
-_CardKeySuccessText2::
-	text ""
-	line "The CARD KEY"
-	cont "opened the door!"
-	done
-
-_CardKeyFailText::
-	text "Darn! It needs a"
-	line "CARD KEY!"
-	done
-
-_TrainerNameText::
-	TX_RAM wcd6d
-	text ": @@"
-
-_NoNibbleText::
-	text "Not even a nibble!"
-	prompt
-
-_NothingHereText::
-	text "Looks like there's"
-	line "nothing here."
-	prompt
-
-_ItsABiteText::
-	text "Oh!"
-	line "It's a bite!"
-	prompt
-
-_ExclamationText::
-	text "!"
-	done
-
-_GroundRoseText::
-	text "Ground rose up"
-	line "somewhere!"
-	done
-
-_BoulderText::
-	text "This requires"
-	line "STRENGTH to move!"
-	done
-
-_MartSignText::
-	text "All your item"
-	line "needs fulfilled!"
-	cont "#MON MART"
-	done
-
-_PokeCenterSignText::
-	text "Heal Your #MON!"
-	line "#MON CENTER"
-	done
-
-_FoundItemText::
-	text "<PLAYER> found"
-	line "@"
-	TX_RAM wcf4b
-	text "!@@"
-
-_NoMoreRoomForItemText::
-	text "No more room for"
-	line "items!"
-	done
-
-_OaksAideHiText::
-	text "Hi! Remember me?"
-	line "I'm PROF.OAK's"
-	cont "AIDE!"
-
-	para "If you caught @"
-	TX_NUM hOaksAideRequirement, 1, 3
-	text ""
-	line "kinds of #MON,"
-	cont "I'm supposed to"
-	cont "give you an"
-	cont "@"
-	TX_RAM wOaksAideRewardItemName
-	text "!"
-
-	para "So, <PLAYER>! Have"
-	line "you caught at"
-	cont "least @"
-	TX_NUM hOaksAideRequirement, 1, 3
-	text " kinds of"
-	cont "#MON?"
-	done
+INCLUDE "data/text/text_1.asm"
 
-_OaksAideUhOhText::
-	text "Let's see..."
-	line "Uh-oh! You have"
-	cont "caught only @"
-	TX_NUM hOaksAideNumMonsOwned, 1, 3
-	text ""
-	cont "kinds of #MON!"
-
-	para "You need @"
-	TX_NUM hOaksAideRequirement, 1, 3
-	text " kinds"
-	line "if you want the"
-	cont "@"
-	TX_RAM wOaksAideRewardItemName
-	text "."
-	done
-
-_OaksAideComeBackText::
-	text "Oh. I see."
-
-	para "When you get @"
-	TX_NUM hOaksAideRequirement, 1, 3
-	text ""
-	line "kinds, come back"
-	cont "for @"
-	TX_RAM wOaksAideRewardItemName
-	text "."
-	done
-
-_OaksAideHereYouGoText::
-	text "Great! You have"
-	line "caught @"
-	TX_NUM hOaksAideNumMonsOwned, 1, 3
-	text " kinds "
-	cont "of #MON!"
-	cont "Congratulations!"
-
-	para "Here you go!"
-	prompt
-
-_OaksAideGotItemText::
-	text "<PLAYER> got the"
-	line "@"
-	TX_RAM wOaksAideRewardItemName
-	text "!@@"
-
-_OaksAideNoRoomText::
-	text "Oh! I see you"
-	line "don't have any"
-	cont "room for the"
-	cont "@"
-	TX_RAM wOaksAideRewardItemName
-	text "."
-	done
-
-INCLUDE "text/maps/ViridianForest.asm"
-INCLUDE "text/maps/MtMoon1F.asm"
-INCLUDE "text/maps/MtMoonB1F.asm"
-INCLUDE "text/maps/MtMoonB2F.asm"
-INCLUDE "text/maps/SSAnne1F.asm"
-INCLUDE "text/maps/SSAnne2F.asm"
-INCLUDE "text/maps/SSAnne3F.asm"
-INCLUDE "text/maps/SSAnneBow.asm"
-INCLUDE "text/maps/SSAnneKitchen.asm"
-INCLUDE "text/maps/SSAnneCaptainsRoom.asm"
-INCLUDE "text/maps/SSAnne1FRooms.asm"
-INCLUDE "text/maps/SSAnne2FRooms.asm"
-INCLUDE "text/maps/SSAnneB1FRooms.asm"
-INCLUDE "text/maps/VictoryRoad3F.asm"
-INCLUDE "text/maps/RocketHideoutB1F.asm"
-INCLUDE "text/maps/RocketHideoutB2F.asm"
-INCLUDE "text/maps/RocketHideoutB3F.asm"
-INCLUDE "text/maps/RocketHideoutB4F.asm"
-INCLUDE "text/maps/RocketHideoutElevator.asm"
-INCLUDE "text/maps/SilphCo2F.asm"
-INCLUDE "text/maps/SilphCo3F.asm"
-INCLUDE "text/maps/SilphCo4F.asm"
-INCLUDE "text/maps/SilphCo5F.asm"
+INCLUDE "text/ViridianForest.asm"
+INCLUDE "text/MtMoon1F.asm"
+INCLUDE "text/MtMoonB1F.asm"
+INCLUDE "text/MtMoonB2F.asm"
+INCLUDE "text/SSAnne1F.asm"
+INCLUDE "text/SSAnne2F.asm"
+INCLUDE "text/SSAnne3F.asm"
+INCLUDE "text/SSAnneBow.asm"
+INCLUDE "text/SSAnneKitchen.asm"
+INCLUDE "text/SSAnneCaptainsRoom.asm"
+INCLUDE "text/SSAnne1FRooms.asm"
+INCLUDE "text/SSAnne2FRooms.asm"
+INCLUDE "text/SSAnneB1FRooms.asm"
+INCLUDE "text/VictoryRoad3F.asm"
+INCLUDE "text/RocketHideoutB1F.asm"
+INCLUDE "text/RocketHideoutB2F.asm"
+INCLUDE "text/RocketHideoutB3F.asm"
+INCLUDE "text/RocketHideoutB4F.asm"
+INCLUDE "text/RocketHideoutElevator.asm"
+INCLUDE "text/SilphCo2F.asm"
+INCLUDE "text/SilphCo3F.asm"
+INCLUDE "text/SilphCo4F.asm"
+INCLUDE "text/SilphCo5F.asm"
 
 
 SECTION "Text 2", ROMX
 
-INCLUDE "text/maps/SilphCo5F_2.asm"
-INCLUDE "text/maps/SilphCo6F.asm"
-INCLUDE "text/maps/SilphCo7F.asm"
-INCLUDE "text/maps/SilphCo8F.asm"
-INCLUDE "text/maps/SilphCo9F.asm"
-INCLUDE "text/maps/SilphCo10F.asm"
-INCLUDE "text/maps/SilphCo11F.asm"
-INCLUDE "text/maps/PokemonMansion2F.asm"
-INCLUDE "text/maps/PokemonMansion3F.asm"
-INCLUDE "text/maps/PokemonMansionB1F.asm"
-INCLUDE "text/maps/SafariZoneEast.asm"
-INCLUDE "text/maps/SafariZoneNorth.asm"
-INCLUDE "text/maps/SafariZoneWest.asm"
-INCLUDE "text/maps/SafariZoneCenter.asm"
-INCLUDE "text/maps/SafariZoneCenterRestHouse.asm"
-INCLUDE "text/maps/SafariZoneSecretHouse.asm"
-INCLUDE "text/maps/SafariZoneWestRestHouse.asm"
-INCLUDE "text/maps/SafariZoneEastRestHouse.asm"
-INCLUDE "text/maps/SafariZoneNorthRestHouse.asm"
-INCLUDE "text/maps/CeruleanCaveB1F.asm"
-INCLUDE "text/maps/VictoryRoad1F.asm"
-INCLUDE "text/maps/LancesRoom.asm"
-INCLUDE "text/maps/HallOfFame.asm"
-INCLUDE "text/maps/ChampionsRoom.asm"
-INCLUDE "text/maps/LoreleisRoom.asm"
-INCLUDE "text/maps/BrunosRoom.asm"
-INCLUDE "text/maps/AgathasRoom.asm"
-INCLUDE "text/maps/RockTunnelB1F.asm"
+INCLUDE "text/SilphCo5F_2.asm"
+INCLUDE "text/SilphCo6F.asm"
+INCLUDE "text/SilphCo7F.asm"
+INCLUDE "text/SilphCo8F.asm"
+INCLUDE "text/SilphCo9F.asm"
+INCLUDE "text/SilphCo10F.asm"
+INCLUDE "text/SilphCo11F.asm"
+INCLUDE "text/PokemonMansion2F.asm"
+INCLUDE "text/PokemonMansion3F.asm"
+INCLUDE "text/PokemonMansionB1F.asm"
+INCLUDE "text/SafariZoneEast.asm"
+INCLUDE "text/SafariZoneNorth.asm"
+INCLUDE "text/SafariZoneWest.asm"
+INCLUDE "text/SafariZoneCenter.asm"
+INCLUDE "text/SafariZoneCenterRestHouse.asm"
+INCLUDE "text/SafariZoneSecretHouse.asm"
+INCLUDE "text/SafariZoneWestRestHouse.asm"
+INCLUDE "text/SafariZoneEastRestHouse.asm"
+INCLUDE "text/SafariZoneNorthRestHouse.asm"
+INCLUDE "text/CeruleanCaveB1F.asm"
+INCLUDE "text/VictoryRoad1F.asm"
+INCLUDE "text/LancesRoom.asm"
+INCLUDE "text/HallOfFame.asm"
+INCLUDE "text/ChampionsRoom.asm"
+INCLUDE "text/LoreleisRoom.asm"
+INCLUDE "text/BrunosRoom.asm"
+INCLUDE "text/AgathasRoom.asm"
+INCLUDE "text/RockTunnelB1F.asm"
 
 
 SECTION "Text 3", ROMX
 
-INCLUDE "text/maps/RockTunnelB1F_2.asm"
-INCLUDE "text/maps/SeafoamIslandsB4F.asm"
-
-_AIBattleWithdrawText::
-	TX_RAM wTrainerName
-	text " with-"
-	line "drew @"
-	TX_RAM wEnemyMonNick
-	text "!"
-	prompt
-
-_AIBattleUseItemText::
-	TX_RAM wTrainerName
-	text ""
-	line "used @"
-	TX_RAM wcd6d
-	text ""
-	cont "on @"
-	TX_RAM wEnemyMonNick
-	text "!"
-	prompt
-
-_TradeWentToText::
-	TX_RAM wcf4b
-	text " went"
-	line "to @"
-	TX_RAM wLinkEnemyTrainerName
-	text "."
-	done
-
-_TradeForText::
-	text "For <PLAYER>'s"
-	line "@"
-	TX_RAM wcf4b
-	text ","
-	done
-
-_TradeSendsText::
-	TX_RAM wLinkEnemyTrainerName
-	text " sends"
-	line "@"
-	TX_RAM wcd6d
-	text "."
-	done
-
-_TradeWavesFarewellText::
-	TX_RAM wLinkEnemyTrainerName
-	text " waves"
-	line "farewell as"
-	done
-
-_TradeTransferredText::
-	TX_RAM wcd6d
-	text " is"
-	line "transferred."
-	done
-
-_TradeTakeCareText::
-	text "Take good care of"
-	line "@"
-	TX_RAM wcd6d
-	text "."
-	done
-
-_TradeWillTradeText::
-	TX_RAM wLinkEnemyTrainerName
-	text " will"
-	line "trade @"
-	TX_RAM wcd6d
-	text ""
-	done
-
-_TradeforText::
-	text "for <PLAYER>'s"
-	line "@"
-	TX_RAM wcf4b
-	text "."
-	done
-
-_PlaySlotMachineText::
-	text "A slot machine!"
-	line "Want to play?"
-	done
-
-_OutOfCoinsSlotMachineText::
-	text "Darn!"
-	line "Ran out of coins!"
-	done
-
-_BetHowManySlotMachineText::
-	text "Bet how many"
-	line "coins?"
-	done
-
-_StartSlotMachineText::
-	text "Start!"
-	done
-
-_NotEnoughCoinsSlotMachineText::
-	text "Not enough"
-	line "coins!"
-	prompt
-
-_OneMoreGoSlotMachineText::
-	text "One more "
-	line "go?"
-	done
-
-_LinedUpText::
-	text " lined up!"
-	line "Scored @"
-	TX_RAM wcf4b
-	text " coins!"
-	done
-
-_NotThisTimeText::
-	text "Not this time!"
-	prompt
-
-_YeahText::
-	text "Yeah!@@"
-
-_DexSeenOwnedText::
-	text "#DEX   Seen:@"
-	TX_NUM wDexRatingNumMonsSeen, 1, 3
-	text ""
-	line "         Owned:@"
-	TX_NUM wDexRatingNumMonsOwned, 1, 3
-	db "@"
-
-_DexRatingText::
-	text "#DEX Rating", $6d
-	done
-
-_GymStatueText1::
-	TX_RAM wGymCityName
-	text ""
-	line "#MON GYM"
-	cont "LEADER: @"
-	TX_RAM wGymLeaderName
-	text ""
-
-	para "WINNING TRAINERS:"
-	line "<RIVAL>"
-	done
-
-_GymStatueText2::
-	TX_RAM wGymCityName
-	text ""
-	line "#MON GYM"
-	cont "LEADER: @"
-	TX_RAM wGymLeaderName
-	text ""
-
-	para "WINNING TRAINERS:"
-	line "<RIVAL>"
-	cont "<PLAYER>"
-	done
-
-_ViridianCityPokecenterGuyText::
-	text "#MON CENTERs"
-	line "heal your tired,"
-	cont "hurt or fainted"
-	cont "#MON!"
-	done
-
-_PewterCityPokecenterGuyText::
-	text "Yawn!"
-
-	para "When JIGGLYPUFF"
-	line "sings, #MON"
-	cont "get drowsy..."
-
-	para "...Me too..."
-	line "Snore..."
-	done
-
-_CeruleanPokecenterGuyText::
-	text "BILL has lots of"
-	line "#MON!"
-
-	para "He collects rare"
-	line "ones too!"
-	done
-
-_LavenderPokecenterGuyText::
-	text "CUBONEs wear"
-	line "skulls, right?"
-
-	para "People will pay a"
-	line "lot for one!"
-	done
-
-_MtMoonPokecenterBenchGuyText::
-	text "If you have too"
-	line "many #MON, you"
-	cont "should store them"
-	cont "via PC!"
-	done
-
-_RockTunnelPokecenterGuyText::
-	text "I heard that"
-	line "GHOSTs haunt"
-	cont "LAVENDER TOWN!"
-	done
-
-_UnusedBenchGuyText1::
-	text "I wish I could"
-	line "catch #MON."
-	done
-
-_UnusedBenchGuyText2::
-	text "I'm tired from"
-	line "all the fun..."
-	done
-
-_UnusedBenchGuyText3::
-	text "SILPH's manager"
-	line "is hiding in the"
-	cont "SAFARI ZONE."
-	done
-
-_VermilionPokecenterGuyText::
-	text "It is true that a"
-	line "higher level"
-	cont "#MON will be"
-	cont "more powerful..."
-
-	para "But, all #MON"
-	line "will have weak"
-	cont "points against"
-	cont "specific types."
-
-	para "So, there is no"
-	line "universally"
-	cont "strong #MON."
-	done
-
-_CeladonCityPokecenterGuyText::
-	text "If I had a BIKE,"
-	line "I would go to"
-	cont "CYCLING ROAD!"
-	done
-
-_FuchsiaCityPokecenterGuyText::
-	text "If you're studying "
-	line "#MON, visit"
-	cont "the SAFARI ZONE."
-
-	para "It has all sorts"
-	line "of rare #MON."
-	done
-
-_CinnabarPokecenterGuyText::
-	text "#MON can still"
-	line "learn techniques"
-	cont "after canceling"
-	cont "evolution."
-
-	para "Evolution can wait"
-	line "until new moves"
-	cont "have been learned."
-	done
-
-_SaffronCityPokecenterGuyText1::
-	text "It would be great"
-	line "if the ELITE FOUR"
-	cont "came and stomped"
-	cont "TEAM ROCKET!"
-	done
-
-_SaffronCityPokecenterGuyText2::
-	text "TEAM ROCKET took"
-	line "off! We can go"
-	cont "out safely again!"
-	cont "That's great!"
-	done
-
-_CeladonCityHotelText::
-	text "My sis brought me"
-	line "on this vacation!"
-	done
-
-_BookcaseText::
-	text "Crammed full of"
-	line "#MON books!"
-	done
-
-_NewBicycleText::
-	text "A shiny new"
-	line "BICYCLE!"
-	done
-
-_PushStartText::
-	text "Push START to"
-	line "open the MENU!"
-	done
-
-_SaveOptionText::
-	text "The SAVE option is"
-	line "on the MENU"
-	cont "screen."
-	done
-
-_StrengthsAndWeaknessesText::
-	text "All #MON types"
-	line "have strong and"
-	cont "weak points"
-	cont "against others."
-	done
-
-_TimesUpText::
-	text "PA: Ding-dong!"
-
-	para "Time's up!"
-	prompt
-
-_GameOverText::
-	text "PA: Your SAFARI"
-	line "GAME is over!"
-	done
-
-_CinnabarGymQuizIntroText::
-	text "#MON Quiz!"
-
-	para "Get it right and"
-	line "the door opens to"
-	cont "the next room!"
-
-	para "Get it wrong and"
-	line "face a trainer!"
-
-	para "If you want to"
-	line "conserve your"
-	cont "#MON for the"
-	cont "GYM LEADER..."
-
-	para "Then get it right!"
-	line "Here we go!"
-	prompt
-
-_CinnabarQuizQuestionsText1::
-	text "CATERPIE evolves"
-	line "into BUTTERFREE?"
-	done
-
-_CinnabarQuizQuestionsText2::
-	text "There are 9"
-	line "certified #MON"
-	cont "LEAGUE BADGEs?"
-	done
-
-_CinnabarQuizQuestionsText3::
-	text "POLIWAG evolves 3"
-	line "times?"
-	done
-
-_CinnabarQuizQuestionsText4::
-	text "Are thunder moves"
-	line "effective against"
-	cont "ground element-"
-	cont "type #MON?"
-	done
-
-_CinnabarQuizQuestionsText5::
-	text "#MON of the"
-	line "same kind and"
-	cont "level are not"
-	cont "identical?"
-	done
-
-_CinnabarQuizQuestionsText6::
-	text "TM28 contains"
-	line "TOMBSTONER?"
-	done
-
-_CinnabarGymQuizCorrectText::
-	text "You're absolutely"
-	line "correct!"
-
-	para "Go on through!@@"
-
-_CinnabarGymQuizIncorrectText::
-	text "Sorry! Bad call!"
-	prompt
-
-_MagazinesText::
-	text "#MON magazines!"
-
-	para "#MON notebooks!"
-
-	para "#MON graphs!"
-	done
-
-_BillsHouseMonitorText::
-	text "TELEPORTER is"
-	line "displayed on the"
-	cont "PC monitor."
-	done
-
-_BillsHouseInitiatedText::
-	text "<PLAYER> initiated"
-	line "TELEPORTER's Cell"
-	cont "Separator!@@"
-
-_BillsHousePokemonListText1::
-	text "BILL's favorite"
-	line "#MON list!"
-	prompt
-
-_BillsHousePokemonListText2::
-	text "Which #MON do"
-	line "you want to see?"
-	done
-
-_OakLabEmailText::
-	text "There's an e-mail"
-	line "message here!"
-
-	para "..."
-
-	para "Calling all"
-	line "#MON trainers!"
-
-	para "The elite trainers"
-	line "of #MON LEAGUE"
-	cont "are ready to take"
-	cont "on all comers!"
-
-	para "Bring your best"
-	line "#MON and see"
-	cont "how you rate as a"
-	cont "trainer!"
-
-	para "#MON LEAGUE HQ"
-	line "INDIGO PLATEAU"
-
-	para "PS: PROF.OAK,"
-	line "please visit us!"
-	cont "..."
-	done
-
-_GameCornerCoinCaseText::
-	text "A COIN CASE is"
-	line "required!"
-	done
-
-_GameCornerNoCoinsText::
-	text "You don't have"
-	line "any coins!"
-	done
-
-_GameCornerOutOfOrderText::
-	text "OUT OF ORDER"
-	line "This is broken."
-	done
-
-_GameCornerOutToLunchText::
-	text "OUT TO LUNCH"
-	line "This is reserved."
-	done
-
-_GameCornerSomeonesKeysText::
-	text "Someone's keys!"
-	line "They'll be back."
-	done
-
-_JustAMomentText::
-	text "Just a moment."
-	done
-
-TMNotebookText::
-	text "It's a pamphlet"
-	line "on TMs."
-
-	para "..."
-
-	para "There are 50 TMs"
-	line "in all."
-
-	para "There are also 5"
-	line "HMs that can be"
-	cont "used repeatedly."
-
-	para "SILPH CO.@@"
-
-_TurnPageText::
-	text "Turn the page?"
-	done
-
-_ViridianSchoolNotebookText5::
-	text "GIRL: Hey! Don't"
-	line "look at my notes!@@"
-
-_ViridianSchoolNotebookText1::
-	text "Looked at the"
-	line "notebook!"
-
-	para "First page..."
-
-	para "# BALLs are"
-	line "used to catch"
-	cont "#MON."
-
-	para "Up to 6 #MON"
-	line "can be carried."
-
-	para "People who raise"
-	line "and make #MON"
-	cont "fight are called"
-	cont "#MON trainers."
-	prompt
-
-_ViridianSchoolNotebookText2::
-	text "Second page..."
-
-	para "A healthy #MON"
-	line "may be hard to"
-	cont "catch, so weaken"
-	cont "it first!"
-
-	para "Poison, burns and"
-	line "other damage are"
-	cont "effective!"
-	prompt
-
-_ViridianSchoolNotebookText3::
-	text "Third page..."
-
-	para "#MON trainers"
-	line "seek others to"
-	cont "engage in #MON"
-	cont "fights."
-
-	para "Battles are"
-	line "constantly fought"
-	cont "at #MON GYMs."
-	prompt
-
-_ViridianSchoolNotebookText4::
-	text "Fourth page..."
-
-	para "The goal for"
-	line "#MON trainers"
-	cont "is to beat the "
-	cont "top 8 #MON"
-	cont "GYM LEADERs."
-
-	para "Do so to earn the"
-	line "right to face..."
-
-	para "The ELITE FOUR of"
-	line "#MON LEAGUE!"
-	prompt
-
-_EnemiesOnEverySideText::
-	text "Enemies on every"
-	line "side!"
-	done
-
-_WhatGoesAroundComesAroundText::
-	text "What goes around"
-	line "comes around!"
-	done
-
-_FightingDojoText::
-	text "FIGHTING DOJO"
-	done
-
-_IndigoPlateauHQText::
-	text "INDIGO PLATEAU"
-	line "#MON LEAGUE HQ"
-	done
-
-_RedBedroomSNESText::
-	text "<PLAYER> is"
-	line "playing the SNES!"
-	cont "...Okay!"
-	cont "It's time to go!"
-	done
-
-_Route15UpstairsBinocularsText::
-	text "Looked into the"
-	line "binoculars..."
-
-	para "A large, shining"
-	line "bird is flying"
-	cont "toward the sea."
-	done
-
-_AerodactylFossilText::
-	text "AERODACTYL Fossil"
-	line "A primitive and"
-	cont "rare #MON."
-	done
-
-_KabutopsFossilText::
-	text "KABUTOPS Fossil"
-	line "A primitive and"
-	cont "rare #MON."
-	done
-
-_LinkCableHelpText1::
-	text "TRAINER TIPS"
-
-	para "Using a Game Link"
-	line "Cable"
-	prompt
-
-_LinkCableHelpText2::
-	text "Which heading do"
-	line "you want to read?"
-	done
-
-_LinkCableInfoText1::
-	text "When you have"
-	line "linked your GAME"
-	cont "BOY with another"
-	cont "GAME BOY, talk to"
-	cont "the attendant on"
-	cont "the right in any"
-	cont "#MON CENTER."
-	prompt
-
-_LinkCableInfoText2::
-	text "COLOSSEUM lets"
-	line "you play against"
-	cont "a friend."
-	prompt
-
-_LinkCableInfoText3::
-	text "TRADE CENTER is"
-	line "used for trading"
-	cont "#MON."
-	prompt
-
-_ViridianSchoolBlackboardText1::
-	text "The blackboard"
-	line "describes #MON"
-	cont "STATUS changes"
-	cont "during battles."
-	prompt
-
-_ViridianSchoolBlackboardText2::
-	text "Which heading do"
-	line "you want to read?"
-	done
-
-_ViridianBlackboardSleepText::
-	text "A #MON can't"
-	line "attack if it's"
-	cont "asleep!"
-
-	para "#MON will stay"
-	line "asleep even after"
-	cont "battles."
-
-	para "Use AWAKENING to"
-	line "wake them up!"
-	prompt
-
-_ViridianBlackboardPoisonText::
-	text "When poisoned, a"
-	line "#MON's health"
-	cont "steadily drops."
-
-	para "Poison lingers"
-	line "after battles."
-
-	para "Use an ANTIDOTE"
-	line "to cure poison!"
-	prompt
-
-_ViridianBlackboardPrlzText::
-	text "Paralysis could"
-	line "make #MON"
-	cont "moves misfire!"
-
-	para "Paralysis remains"
-	line "after battles."
-
-	para "Use PARLYZ HEAL"
-	line "for treatment!"
-	prompt
-
-_ViridianBlackboardBurnText::
-	text "A burn reduces"
-	line "power and speed."
-	cont "It also causes"
-	cont "ongoing damage."
-
-	para "Burns remain"
-	line "after battles."
-
-	para "Use BURN HEAL to"
-	line "cure a burn!"
-	prompt
-
-_ViridianBlackboardFrozenText::
-	text "If frozen, a"
-	line "#MON becomes"
-	cont "totally immobile!"
-
-	para "It stays frozen"
-	line "even after the"
-	cont "battle ends."
-
-	para "Use ICE HEAL to"
-	line "thaw out #MON!"
-	prompt
-
-_VermilionGymTrashText::
-	text "Nope, there's"
-	line "only trash here."
-	done
-
-_VermilionGymTrashSuccessText1::
-	text "Hey! There's a"
-	line "switch under the"
-	cont "trash!"
-	cont "Turn it on!"
-
-	para "The 1st electric"
-	line "lock opened!@@"
-
-_VermilionGymTrashSuccessText2::
-	text "Hey! There's"
-	line "another switch"
-	cont "under the trash!"
-	cont "Turn it on!"
-	prompt
-
-_VermilionGymTrashSuccessText3::
-	text "The 2nd electric"
-	line "lock opened!"
-
-	para "The motorized door"
-	line "opened!@@"
-
-_VermilionGymTrashFailText::
-	text "Nope! There's"
-	line "only trash here."
-	cont "Hey! The electric"
-	cont "locks were reset!@@"
-
-_FoundHiddenItemText::
-	text "<PLAYER> found"
-	line "@"
-	TX_RAM wcd6d
-	text "!@@"
-
-_HiddenItemBagFullText::
-	text "But, <PLAYER> has"
-	line "no more room for"
-	cont "other items!"
-	done
-
-_FoundHiddenCoinsText::
-	text "<PLAYER> found"
-	line "@"
-	TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
-	text " coins!@@"
-
-_FoundHiddenCoins2Text::
-	text "<PLAYER> found"
-	line "@"
-	TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
-	text " coins!@@"
-
-_DroppedHiddenCoinsText::
-	text ""
-	para "Oops! Dropped"
-	line "some coins!"
-	done
-
-_IndigoPlateauStatuesText1::
-	text "INDIGO PLATEAU"
-	prompt
-
-_IndigoPlateauStatuesText2::
-	text "The ultimate goal"
-	line "of trainers!"
-	cont "#MON LEAGUE HQ"
-	done
-
-_IndigoPlateauStatuesText3::
-	text "The highest"
-	line "#MON authority"
-	cont "#MON LEAGUE HQ"
-	done
-
-_PokemonBooksText::
-	text "Crammed full of"
-	line "#MON books!"
-	done
-
-_DiglettSculptureText::
-	text "It's a sculpture"
-	line "of DIGLETT."
-	done
-
-_ElevatorText::
-	text "This is an"
-	line "elevator."
-	done
-
-_TownMapText::
-	text "A TOWN MAP.@@"
-
-_PokemonStuffText::
-	text "Wow! Tons of"
-	line "#MON stuff!"
-	done
-
-_OutOfSafariBallsText::
-	text "PA: Ding-dong!"
-
-	para "You are out of"
-	line "SAFARI BALLs!"
-	prompt
-
-_WildRanText::
-	text "Wild @"
-	TX_RAM wEnemyMonNick
-	text ""
-	line "ran!"
-	prompt
-
-_EnemyRanText::
-	text "Enemy @"
-	TX_RAM wEnemyMonNick
-	text ""
-	line "ran!"
-	prompt
-
-_HurtByPoisonText::
-	text "<USER>'s"
-	line "hurt by poison!"
-	prompt
-
-_HurtByBurnText::
-	text "<USER>'s"
-	line "hurt by the burn!"
-	prompt
-
-_HurtByLeechSeedText::
-	text "LEECH SEED saps"
-	line "<USER>!"
-	prompt
-
-_EnemyMonFaintedText::
-	text "Enemy @"
-	TX_RAM wEnemyMonNick
-	text ""
-	line "fainted!"
-	prompt
-
-_MoneyForWinningText::
-	text "<PLAYER> got ¥@"
-	TX_BCD wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN
-	text ""
-	line "for winning!"
-	prompt
-
-_TrainerDefeatedText::
-	text "<PLAYER> defeated"
-	line "@"
-	TX_RAM wTrainerName
-	text "!"
-	prompt
-
-_PlayerMonFaintedText::
-	TX_RAM wBattleMonNick
-	text ""
-	line "fainted!"
-	prompt
-
-_UseNextMonText::
-	text "Use next #MON?"
-	done
-
-_Sony1WinText::
-	text "<RIVAL>: Yeah! Am"
-	line "I great or what?"
-	prompt
-
-_PlayerBlackedOutText2::
-	text "<PLAYER> is out of"
-	line "useable #MON!"
-
-	para "<PLAYER> blacked"
-	line "out!"
-	prompt
-
-_LinkBattleLostText::
-	text "<PLAYER> lost to"
-	line "@"
-	TX_RAM wTrainerName
-	text "!"
-	prompt
-
-_TrainerAboutToUseText::
-	TX_RAM wTrainerName
-	text " is"
-	line "about to use"
-	cont"@"
-	TX_RAM wEnemyMonNick
-	text "!"
-
-	para "Will <PLAYER>"
-	line "change #MON?"
-	done
-
-_TrainerSentOutText::
-	TX_RAM wTrainerName
-	text " sent"
-	line "out @"
-	TX_RAM wEnemyMonNick
-	text "!"
-	done
-
-_NoWillText::
-	text "There's no will"
-	line "to fight!"
-	prompt
-
-_CantEscapeText::
-	text "Can't escape!"
-	prompt
-
-_NoRunningText::
-	text "No! There's no"
-	line "running from a"
-	cont "trainer battle!"
-	prompt
-
-_GotAwayText::
-	text "Got away safely!"
-	prompt
-
-_ItemsCantBeUsedHereText::
-	text "Items can't be"
-	line "used here."
-	prompt
-
-_AlreadyOutText::
-	TX_RAM wBattleMonNick
-	text " is"
-	line "already out!"
-	prompt
-
-_MoveNoPPText::
-	text "No PP left for"
-	line "this move!"
-	prompt
-
-_MoveDisabledText::
-	text "The move is"
-	line "disabled!"
-	prompt
-
-_NoMovesLeftText::
-	TX_RAM wBattleMonNick
-	text " has no"
-	line "moves left!"
-	done
-
-_MultiHitText::
-	text "Hit the enemy"
-	line "@"
-	TX_NUM wPlayerNumHits,1,1
-	text " times!"
-	prompt
-
-_ScaredText::
-	TX_RAM wBattleMonNick
-	text " is too"
-	line "scared to move!"
-	prompt
-
-_GetOutText::
-	text "GHOST: Get out..."
-	line "Get out..."
-	prompt
-
-_FastAsleepText::
-	text "<USER>"
-	line "is fast asleep!"
-	prompt
-
-_WokeUpText::
-	text "<USER>"
-	line "woke up!"
-	prompt
-
-_IsFrozenText::
-	text "<USER>"
-	line "is frozen solid!"
-	prompt
-
-_FullyParalyzedText::
-	text "<USER>'s"
-	line "fully paralyzed!"
-	prompt
-
-_FlinchedText::
-	text "<USER>"
-	line "flinched!"
-	prompt
-
-_MustRechargeText::
-	text "<USER>"
-	line "must recharge!"
-	prompt
-
-_DisabledNoMoreText::
-	text "<USER>'s"
-	line "disabled no more!"
-	prompt
-
-_IsConfusedText::
-	text "<USER>"
-	line "is confused!"
-	prompt
-
-_HurtItselfText::
-	text "It hurt itself in"
-	line "its confusion!"
-	prompt
-
-_ConfusedNoMoreText::
-	text "<USER>'s"
-	line "confused no more!"
-	prompt
-
-_SavingEnergyText::
-	text "<USER>"
-	line "is saving energy!"
-	prompt
-
-_UnleashedEnergyText::
-	text "<USER>"
-	line "unleashed energy!"
-	prompt
-
-_ThrashingAboutText::
-	text "<USER>'s"
-	line "thrashing about!"
-	done
-
-_AttackContinuesText::
-	text "<USER>'s"
-	line "attack continues!"
-	done
-
-_CantMoveText::
-	text "<USER>"
-	line "can't move!"
-	prompt
-
-_MoveIsDisabledText::
-	text "<USER>'s"
-	line "@"
-	TX_RAM wcd6d
-	text " is"
-	cont "disabled!"
-	prompt
-
-_MonName1Text::
-	text "<USER>@@"
-
-_Used1Text::
-	text ""
-	line "used @@"
-
-_Used2Text::
-	text ""
-	line "used @@"
-
-_InsteadText::
-	text "instead,"
-	cont "@@"
-
-_CF4BText::
-	TX_RAM wcf4b
-	text "@"
-
-_ExclamationPoint1Text::
-	text "!"
-	done
-
-_ExclamationPoint2Text::
-	text "!"
-	done
-
-_ExclamationPoint3Text::
-	text "!"
-	done
-
-_ExclamationPoint4Text::
-	text "!"
-	done
-
-_ExclamationPoint5Text::
-	text "!"
-	done
-
-_AttackMissedText::
-	text "<USER>'s"
-	line "attack missed!"
-	prompt
-
-_KeptGoingAndCrashedText::
-	text "<USER>"
-	line "kept going and"
-	cont "crashed!"
-	prompt
-
-_UnaffectedText::
-	text "<TARGET>'s"
-	line "unaffected!"
-	prompt
-
-_DoesntAffectMonText::
-	text "It doesn't affect"
-	line "<TARGET>!"
-	prompt
-
-_CriticalHitText::
-	text "Critical hit!"
-	prompt
-
-_OHKOText::
-	text "One-hit KO!"
-	prompt
-
-_LoafingAroundText::
-	TX_RAM wBattleMonNick
-	text " is"
-	line "loafing around."
-	prompt
-
-_BeganToNapText::
-	TX_RAM wBattleMonNick
-	text " began"
-	line "to nap!"
-	prompt
-
-_WontObeyText::
-	TX_RAM wBattleMonNick
-	text " won't"
-	line "obey!"
-	prompt
-
-_TurnedAwayText::
-	TX_RAM wBattleMonNick
-	text " turned"
-	line "away!"
-	prompt
-
-_IgnoredOrdersText::
-	TX_RAM wBattleMonNick
-	text ""
-	line "ignored orders!"
-	prompt
-
-_SubstituteTookDamageText::
-	text "The SUBSTITUTE"
-	line "took damage for"
-	cont "<TARGET>!"
-	prompt
-
-_SubstituteBrokeText::
-	text "<TARGET>'s"
-	line "SUBSTITUTE broke!"
-	prompt
-
-_BuildingRageText::
-	text "<USER>'s"
-	line "RAGE is building!"
-	prompt
-
-_MirrorMoveFailedText::
-	text "The MIRROR MOVE"
-	next "failed!"
-	prompt
-
-_HitXTimesText::
-	text "Hit @"
-	TX_NUM wEnemyNumHits, 1, 1
-	text " times!"
-	prompt
-
-_GainedText::
-	TX_RAM wcd6d
-	text " gained"
-	line "@@"
-
-_WithExpAllText::
-	text "with EXP.ALL,"
-	cont "@@"
-
-_BoostedText::
-	text "a boosted"
-	cont "@@"
-
-_ExpPointsText::
-	TX_NUM wExpAmountGained, 2, 4
-	text " EXP. Points!"
-	prompt
-
-_GrewLevelText::
-	TX_RAM wcd6d
-	text " grew"
-	line "to level @"
-	TX_NUM wCurEnemyLVL, 1, 3
-	text "!@@"
-
-_WildMonAppearedText::
-	text "Wild @"
-	TX_RAM wEnemyMonNick
-	text ""
-	line "appeared!"
-	prompt
-
-_HookedMonAttackedText::
-	text "The hooked"
-	line "@"
-	TX_RAM wEnemyMonNick
-	text ""
-	cont "attacked!"
-	prompt
-
-_EnemyAppearedText::
-	TX_RAM wEnemyMonNick
-	text ""
-	line "appeared!"
-	prompt
-
-_TrainerWantsToFightText::
-	TX_RAM wTrainerName
-	text " wants"
-	line "to fight!"
-	prompt
-
-_UnveiledGhostText::
-	text "SILPH SCOPE"
-	line "unveiled the"
-	cont "GHOST's identity!"
-	prompt
-
-_GhostCantBeIDdText::
-	text "Darn! The GHOST"
-	line "can't be ID'd!"
-	prompt
-
-_GoText::
-	text "Go! @@"
-
-_DoItText::
-	text "Do it! @@"
-
-_GetmText::
-	text "Get'm! @@"
-
-_EnemysWeakText::
-	text "The enemy's weak!"
-	line "Get'm! @@"
-
-_PlayerMon1Text::
-	TX_RAM wBattleMonNick
-	text "!"
-	done
-
-_PlayerMon2Text::
-	TX_RAM wBattleMonNick
-	text " @@"
+INCLUDE "text/RockTunnelB1F_2.asm"
+INCLUDE "text/SeafoamIslandsB4F.asm"
 
-_EnoughText::
-	text "enough!@@"
+INCLUDE "data/text/text_2.asm"
 
-_OKExclamationText::
-	text "OK!@@"
-
-_GoodText::
-	text "good!@@"
-
-_ComeBackText::
-	text ""
-	line "Come back!"
-	done
-
-_SuperEffectiveText::
-	text "It's super"
-	line "effective!"
-	prompt
-
-_NotVeryEffectiveText::
-	text "It's not very"
-	line "effective..."
-	prompt
-
-_SafariZoneEatingText::
-	text "Wild @"
-	TX_RAM wEnemyMonNick
-	text ""
-	line "is eating!"
-	prompt
-
-_SafariZoneAngryText::
-	text "Wild @"
-	TX_RAM wEnemyMonNick
-	text ""
-	line "is angry!"
-	prompt
-
-; money related
-_PickUpPayDayMoneyText::
-	text "<PLAYER> picked up"
-	line "¥@"
-	TX_BCD wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
-	text "!"
-	prompt
-
-_ClearSaveDataText::
-	text "Clear all saved"
-	line "data?"
-	done
-
-_WhichFloorText::
-	text "Which floor do"
-	line "you want? "
-	done
-
-_PartyMenuNormalText::
-	text "Choose a #MON."
-	done
-
-_PartyMenuItemUseText::
-	text "Use item on which"
-	line "#MON?"
-	done
-
-_PartyMenuBattleText::
-	text "Bring out which"
-	line "#MON?"
-	done
-
-_PartyMenuUseTMText::
-	text "Use TM on which"
-	line "#MON?"
-	done
-
-_PartyMenuSwapMonText::
-	text "Move #MON"
-	line "where?"
-	done
-
-_PotionText::
-	TX_RAM wcd6d
-	text ""
-	line "recovered by @"
-	TX_NUM wHPBarHPDifference, 2, 3
-	text "!"
-	done
-
-_AntidoteText::
-	TX_RAM wcd6d
-	text " was"
-	line "cured of poison!"
-	done
-
-_ParlyzHealText::
-	TX_RAM wcd6d
-	text "'s"
-	line "rid of paralysis!"
-	done
-
-_BurnHealText::
-	TX_RAM wcd6d
-	text "'s"
-	line "burn was healed!"
-	done
-
-_IceHealText::
-	TX_RAM wcd6d
-	text " was"
-	line "defrosted!"
-	done
-
-_AwakeningText::
-	TX_RAM wcd6d
-	text ""
-	line "woke up!"
-	done
-
-_FullHealText::
-	TX_RAM wcd6d
-	text "'s"
-	line "health returned!"
-	done
-
-_ReviveText::
-	TX_RAM wcd6d
-	text ""
-	line "is revitalized!"
-	done
-
-_RareCandyText::
-	TX_RAM wcd6d
-	text " grew"
-	line "to level @"
-	TX_NUM wCurEnemyLVL, 1, 3
-	text "!@@"
-
-_TurnedOnPC1Text::
-	text "<PLAYER> turned on"
-	line "the PC."
-	prompt
-
-_AccessedBillsPCText::
-	text "Accessed BILL's"
-	line "PC."
-
-	para "Accessed #MON"
-	line "Storage System."
-	prompt
-
-_AccessedSomeonesPCText::
-	text "Accessed someone's"
-	line "PC."
-
-	para "Accessed #MON"
-	line "Storage System."
-	prompt
-
-_AccessedMyPCText::
-	text "Accessed my PC."
-
-	para "Accessed Item"
-	line "Storage System."
-	prompt
-
-_TurnedOnPC2Text::
-	text "<PLAYER> turned on"
-	line "the PC."
-	prompt
-
-_WhatDoYouWantText::
-	text "What do you want"
-	line "to do?"
-	done
-
-_WhatToDepositText::
-	text "What do you want"
-	line "to deposit?"
-	done
-
-_DepositHowManyText::
-	text "How many?"
-	done
-
-_ItemWasStoredText::
-	TX_RAM wcd6d
-	text " was"
-	line "stored via PC."
-	prompt
-
-_NothingToDepositText::
-	text "You have nothing"
-	line "to deposit."
-	prompt
-
-_NoRoomToStoreText::
-	text "No room left to"
-	line "store items."
-	prompt
-
-_WhatToWithdrawText::
-	text "What do you want"
-	line "to withdraw?"
-	done
-
-_WithdrawHowManyText::
-	text "How many?"
-	done
-
-_WithdrewItemText::
-	text "Withdrew"
-	line "@"
-	TX_RAM wcd6d
-	text "."
-	prompt
-
-_NothingStoredText::
-	text "There is nothing"
-	line "stored."
-	prompt
-
-_CantCarryMoreText::
-	text "You can't carry"
-	line "any more items."
-	prompt
-
-_WhatToTossText::
-	text "What do you want"
-	line "to toss away?"
-	done
-
-_TossHowManyText::
-	text "How many?"
-	done
-
-_AccessedHoFPCText::
-	text "Accessed #MON"
-	line "LEAGUE's site."
-
-	para "Accessed the HALL"
-	line "OF FAME List."
-	prompt
-
-_SwitchOnText::
-	text "Switch on!"
-	prompt
-
-_WhatText::
-	text "What?"
-	done
-
-_DepositWhichMonText::
-	text "Deposit which"
-	line "#MON?"
-	done
-
-_MonWasStoredText::
-	TX_RAM wcf4b
-	text " was"
-	line "stored in Box @"
-	TX_RAM wBoxNumString
-	text "."
-	prompt
-
-_CantDepositLastMonText::
-	text "You can't deposit"
-	line "the last #MON!"
-	prompt
-
-_BoxFullText::
-	text "Oops! This Box is"
-	line "full of #MON."
-	prompt
-
-_MonIsTakenOutText::
-	TX_RAM wcf4b
-	text " is"
-	line "taken out."
-	cont "Got @"
-	TX_RAM wcf4b
-	text "."
-	prompt
-
-_NoMonText::
-	text "What? There are"
-	line "no #MON here!"
-	prompt
-
-_CantTakeMonText::
-	text "You can't take"
-	line "any more #MON."
-
-	para "Deposit #MON"
-	line "first."
-	prompt
-
-_ReleaseWhichMonText::
-	text "Release which"
-	line "#MON?"
-	done
-
-_OnceReleasedText::
-	text "Once released,"
-	line "@"
-	TX_RAM wcf4b
-	text " is"
-	cont "gone forever. OK?"
-	done
-
-_MonWasReleasedText::
-	TX_RAM wcf4b
-	text " was"
-	line "released outside."
-	cont "Bye @"
-
-_CF4BExclamationText::
-	TX_RAM wcf4b
-	text "!"
-	prompt
-
-_RequireCoinCaseText::
-	text "A COIN CASE is"
-	line "required!@@"
-
-_ExchangeCoinsForPrizesText::
-	text "We exchange your"
-	line "coins for prizes."
-	prompt
-
-_WhichPrizeText::
-	text "Which prize do"
-	line "you want?"
-	done
-
-_HereYouGoText::
-	text "Here you go!@@"
-
-_SoYouWantPrizeText::
-	text "So, you want"
-	line "@"
-	TX_RAM wcd6d
-	text "?"
-	done
-
-_SorryNeedMoreCoinsText::
-	text "Sorry, you need"
-	line "more coins.@@"
-
-_OopsYouDontHaveEnoughRoomText::
-	text "Oops! You don't"
-	line "have enough room.@@"
-
-_OhFineThenText::
-	text "Oh, fine then.@@"
-
-_GetDexRatedText::
-	text "Want to get your"
-	line "#DEX rated?"
-	done
-
-_ClosedOaksPCText::
-	text "Closed link to"
-	line "PROF.OAK's PC.@@"
-
-_AccessedOaksPCText::
-	text "Accessed PROF."
-	line "OAK's PC."
-
-	para "Accessed #DEX"
-	line "Rating System."
-	prompt
-
-_WhereWouldYouLikeText::
-	text "Where would you"
-	line "like to go?"
-	done
-
-_PleaseWaitText::
-	text "OK, please wait"
-	line "just a moment."
-	done
-
-_LinkCanceledText::
-	text "The link was"
-	line "canceled."
-	done
-
-INCLUDE "text/oakspeech.asm"
-
-_DoYouWantToNicknameText::
-	text "Do you want to"
-	line "give a nickname"
-	cont "to @"
-	TX_RAM wcd6d
-	text "?"
-	done
-
-_YourNameIsText::
-	text "Right! So your"
-	line "name is <PLAYER>!"
-	prompt
-
-_HisNameIsText::
-	text "That's right! I"
-	line "remember now! His"
-	cont "name is <RIVAL>!"
-	prompt
-
-_WillBeTradedText::
-	TX_RAM wNameOfPlayerMonToBeTraded
-	text " and"
-	line "@"
-	TX_RAM wcd6d
-	text " will"
-	cont "be traded."
-	done
-
-_Char00Text::
-	TX_NUM hSpriteIndexOrTextID,1,2
-	text " ERROR."
-	done
-
-_Char55Text::
-	text $4B,"@@"
-
-INCLUDE "text/maps/DiglettsCaveRoute2.asm"
-INCLUDE "text/maps/ViridianForestNorthGate.asm"
-INCLUDE "text/maps/Route2TradeHouse.asm"
-INCLUDE "text/maps/Route2Gate.asm"
-INCLUDE "text/maps/ViridianForestSouthGate.asm"
-INCLUDE "text/maps/MtMoonPokecenter.asm"
-INCLUDE "text/maps/SaffronGates.asm"
-INCLUDE "text/maps/Daycare.asm"
+INCLUDE "text/DiglettsCaveRoute2.asm"
+INCLUDE "text/ViridianForestNorthGate.asm"
+INCLUDE "text/Route2TradeHouse.asm"
+INCLUDE "text/Route2Gate.asm"
+INCLUDE "text/ViridianForestSouthGate.asm"
+INCLUDE "text/MtMoonPokecenter.asm"
+INCLUDE "text/SaffronGates.asm"
+INCLUDE "text/Daycare.asm"
 
 
 SECTION "Text 4", ROMX
 
-INCLUDE "text/maps/Daycare_2.asm"
-INCLUDE "text/maps/UndergroundPathRoute6.asm"
-INCLUDE "text/maps/UndergroundPathRoute7.asm"
-INCLUDE "text/maps/UndergroundPathRoute7Copy.asm"
-INCLUDE "text/maps/UndergroundPathRoute8.asm"
-INCLUDE "text/maps/RockTunnelPokecenter.asm"
-INCLUDE "text/maps/RockTunnel1F.asm"
-INCLUDE "text/maps/PowerPlant.asm"
-INCLUDE "text/maps/Route11Gate1F.asm"
-INCLUDE "text/maps/Route11Gate2F.asm"
-INCLUDE "text/maps/DiglettsCaveRoute11.asm"
-INCLUDE "text/maps/Route12Gate1F.asm"
-INCLUDE "text/maps/Route12Gate2F.asm"
-INCLUDE "text/maps/Route12SuperRodHouse.asm"
-INCLUDE "text/maps/Route15Gate1F.asm"
-INCLUDE "text/maps/Route15Gate2F.asm"
-INCLUDE "text/maps/Route16Gate1F.asm"
-INCLUDE "text/maps/Route16Gate2F.asm"
-INCLUDE "text/maps/Route16FlyHouse.asm"
-INCLUDE "text/maps/Route18Gate1F.asm"
-INCLUDE "text/maps/Route18Gate2F.asm"
-INCLUDE "text/maps/Route22Gate.asm"
-INCLUDE "text/maps/VictoryRoad2F.asm"
-INCLUDE "text/maps/BillsHouse.asm"
-INCLUDE "text/maps/Route1.asm"
-INCLUDE "text/maps/Route2.asm"
-INCLUDE "text/maps/Route3.asm"
-INCLUDE "text/maps/Route4.asm"
-INCLUDE "text/maps/Route5.asm"
-INCLUDE "text/maps/Route6.asm"
-INCLUDE "text/maps/Route7.asm"
-INCLUDE "text/maps/Route8.asm"
-INCLUDE "text/maps/Route9.asm"
-INCLUDE "text/maps/Route10.asm"
-INCLUDE "text/maps/Route11.asm"
+INCLUDE "text/Daycare_2.asm"
+INCLUDE "text/UndergroundPathRoute6.asm"
+INCLUDE "text/UndergroundPathRoute7.asm"
+INCLUDE "text/UndergroundPathRoute7Copy.asm"
+INCLUDE "text/UndergroundPathRoute8.asm"
+INCLUDE "text/RockTunnelPokecenter.asm"
+INCLUDE "text/RockTunnel1F.asm"
+INCLUDE "text/PowerPlant.asm"
+INCLUDE "text/Route11Gate1F.asm"
+INCLUDE "text/Route11Gate2F.asm"
+INCLUDE "text/DiglettsCaveRoute11.asm"
+INCLUDE "text/Route12Gate1F.asm"
+INCLUDE "text/Route12Gate2F.asm"
+INCLUDE "text/Route12SuperRodHouse.asm"
+INCLUDE "text/Route15Gate1F.asm"
+INCLUDE "text/Route15Gate2F.asm"
+INCLUDE "text/Route16Gate1F.asm"
+INCLUDE "text/Route16Gate2F.asm"
+INCLUDE "text/Route16FlyHouse.asm"
+INCLUDE "text/Route18Gate1F.asm"
+INCLUDE "text/Route18Gate2F.asm"
+INCLUDE "text/Route22Gate.asm"
+INCLUDE "text/VictoryRoad2F.asm"
+INCLUDE "text/BillsHouse.asm"
+INCLUDE "text/Route1.asm"
+INCLUDE "text/Route2.asm"
+INCLUDE "text/Route3.asm"
+INCLUDE "text/Route4.asm"
+INCLUDE "text/Route5.asm"
+INCLUDE "text/Route6.asm"
+INCLUDE "text/Route7.asm"
+INCLUDE "text/Route8.asm"
+INCLUDE "text/Route9.asm"
+INCLUDE "text/Route10.asm"
+INCLUDE "text/Route11.asm"
 
 
 SECTION "Text 5", ROMX
 
-INCLUDE "text/maps/Route11_2.asm"
-INCLUDE "text/maps/Route12.asm"
-INCLUDE "text/maps/Route13.asm"
-INCLUDE "text/maps/Route14.asm"
-INCLUDE "text/maps/Route15.asm"
-INCLUDE "text/maps/Route16.asm"
-INCLUDE "text/maps/Route17.asm"
-INCLUDE "text/maps/Route18.asm"
-INCLUDE "text/maps/Route19.asm"
-INCLUDE "text/maps/Route20.asm"
-INCLUDE "text/maps/Route21.asm"
-INCLUDE "text/maps/Route22.asm"
-INCLUDE "text/maps/Route23.asm"
-INCLUDE "text/maps/Route24.asm"
+INCLUDE "text/Route11_2.asm"
+INCLUDE "text/Route12.asm"
+INCLUDE "text/Route13.asm"
+INCLUDE "text/Route14.asm"
+INCLUDE "text/Route15.asm"
+INCLUDE "text/Route16.asm"
+INCLUDE "text/Route17.asm"
+INCLUDE "text/Route18.asm"
+INCLUDE "text/Route19.asm"
+INCLUDE "text/Route20.asm"
+INCLUDE "text/Route21.asm"
+INCLUDE "text/Route22.asm"
+INCLUDE "text/Route23.asm"
+INCLUDE "text/Route24.asm"
 
 
 SECTION "Text 6", ROMX
 
-INCLUDE "text/maps/Route24_2.asm"
-INCLUDE "text/maps/Route25.asm"
-
-_FileDataDestroyedText::
-	text "The file data is"
-	line "destroyed!"
-	prompt
-
-_WouldYouLikeToSaveText::
-	text "Would you like to"
-	line "SAVE the game?"
-	done
-
-_GameSavedText::
-	text "<PLAYER> saved"
-	line "the game!"
-	done
-
-_OlderFileWillBeErasedText::
-	text "The older file"
-	line "will be erased to"
-	cont "save. Okay?"
-	done
-
-_WhenYouChangeBoxText::
-	text "When you change a"
-	line "#MON BOX, data"
-	cont "will be saved."
-
-	para "Is that okay?"
-	done
-
-_ChooseABoxText::
-	text "Choose a"
-	line "<pkmn> BOX.@@"
-
-_EvolvedText::
-	TX_RAM wcf4b
-	text " evolved"
-	done
-
-_IntoText::
-	text ""
-	line "into @"
-	TX_RAM wcd6d
-	text "!"
-	done
-
-_StoppedEvolvingText::
-	text "Huh? @"
-	TX_RAM wcf4b
-	text ""
-	line "stopped evolving!"
-	prompt
-
-_IsEvolvingText::
-	text "What? @"
-	TX_RAM wcf4b
-	text ""
-	line "is evolving!"
-	done
-
-_FellAsleepText::
-	text "<TARGET>"
-	line "fell asleep!"
-	prompt
-
-_AlreadyAsleepText::
-	text "<TARGET>'s"
-	line "already asleep!"
-	prompt
-
-_PoisonedText::
-	text "<TARGET>"
-	line "was poisoned!"
-	prompt
-
-_BadlyPoisonedText::
-	text "<TARGET>'s"
-	line "badly poisoned!"
-	prompt
-
-_BurnedText::
-	text "<TARGET>"
-	line "was burned!"
-	prompt
-
-_FrozenText::
-	text "<TARGET>"
-	line "was frozen solid!"
-	prompt
-
-_FireDefrostedText::
-	text "Fire defrosted"
-	line "<TARGET>!"
-	prompt
-
-_MonsStatsRoseText::
-	text "<USER>'s"
-	line "@"
-	TX_RAM wcf4b
-	text "@@"
-
-_GreatlyRoseText::
-	text $4c, "greatly@@"
-
-_RoseText::
-	text " rose!"
-	prompt
-
-_MonsStatsFellText::
-	text "<TARGET>'s"
-	line "@"
-	TX_RAM wcf4b
-	text "@@"
-
-_GreatlyFellText::
-	text $4c, "greatly@@"
-
-_FellText::
-	text " fell!"
-	prompt
-
-_RanFromBattleText::
-	text "<USER>"
-	line "ran from battle!"
-	prompt
-
-_RanAwayScaredText::
-	text "<TARGET>"
-	line "ran away scared!"
-	prompt
-
-_WasBlownAwayText::
-	text "<TARGET>"
-	line "was blown away!"
-	prompt
-
-_ChargeMoveEffectText::
-	text "<USER>@@"
-
-_MadeWhirlwindText::
-	text ""
-	line "made a whirlwind!"
-	prompt
-
-_TookInSunlightText::
-	text ""
-	line "took in sunlight!"
-	prompt
-
-_LoweredItsHeadText::
-	text ""
-	line "lowered its head!"
-	prompt
-
-_SkyAttackGlowingText::
-	text ""
-	line "is glowing!"
-	prompt
-
-_FlewUpHighText::
-	text ""
-	line "flew up high!"
-	prompt
-
-_DugAHoleText::
-	text ""
-	line "dug a hole!"
-	prompt
-
-_BecameConfusedText::
-	text "<TARGET>"
-	line "became confused!"
-	prompt
-
-_MimicLearnedMoveText::
-	text "<USER>"
-	line "learned"
-	cont "@"
-	TX_RAM wcd6d
-	text "!"
-	prompt
-
-_MoveWasDisabledText::
-	text "<TARGET>'s"
-	line "@"
-	TX_RAM wcd6d
-	text " was"
-	cont "disabled!"
-	prompt
-
-_NothingHappenedText::
-	text "Nothing happened!"
-	prompt
-
-_NoEffectText::
-	text "No effect!"
-	prompt
-
-_ButItFailedText::
-	text "But, it failed! "
-	prompt
-
-_DidntAffectText::
-	text "It didn't affect"
-	line "<TARGET>!"
-	prompt
-
-_IsUnaffectedText::
-	text "<TARGET>"
-	line "is unaffected!"
-	prompt
-
-_ParalyzedMayNotAttackText::
-	text "<TARGET>'s"
-	line "paralyzed! It may"
-	cont "not attack!"
-	prompt
-
-_SubstituteText::
-	text "It created a"
-	line "SUBSTITUTE!"
-	prompt
-
-_HasSubstituteText::
-	text "<USER>"
-	line "has a SUBSTITUTE!"
-	prompt
-
-_TooWeakSubstituteText::
-	text "Too weak to make"
-	line "a SUBSTITUTE!"
-	prompt
-
-_CoinsScatteredText::
-	text "Coins scattered"
-	line "everywhere!"
-	prompt
-
-_GettingPumpedText::
-	text "<USER>'s"
-	line "getting pumped!"
-	prompt
-
-_WasSeededText::
-	text "<TARGET>"
-	line "was seeded!"
-	prompt
-
-_EvadedAttackText::
-	text "<TARGET>"
-	line "evaded attack!"
-	prompt
-
-_HitWithRecoilText::
-	text "<USER>'s"
-	line "hit with recoil!"
-	prompt
-
-_ConvertedTypeText::
-	text "Converted type to"
-	line "<TARGET>'s!"
-	prompt
-
-_StatusChangesEliminatedText::
-	text "All STATUS changes"
-	line "are eliminated!"
-	prompt
-
-_StartedSleepingEffect::
-	text "<USER>"
-	line "started sleeping!"
-	done
-
-_FellAsleepBecameHealthyText::
-	text "<USER>"
-	line "fell asleep and"
-	cont "became healthy!"
-	done
-
-_RegainedHealthText::
-	text "<USER>"
-	line "regained health!"
-	prompt
-
-_TransformedText::
-	text "<USER>"
-	line "transformed into"
-	cont "@"
-	TX_RAM wcd6d
-	text "!"
-	prompt
-
-_LightScreenProtectedText::
-	text "<USER>'s"
-	line "protected against"
-	cont "special attacks!"
-	prompt
+INCLUDE "text/Route24_2.asm"
+INCLUDE "text/Route25.asm"
 
-_ReflectGainedArmorText::
-	text "<USER>"
-	line "gained armor!"
-	prompt
+INCLUDE "data/text/text_3.asm"
 
-_ShroudedInMistText::
-	text "<USER>'s"
-	line "shrouded in mist!"
-	prompt
-
-_SuckedHealthText::
-	text "Sucked health from"
-	line "<TARGET>!"
-	prompt
-
-_DreamWasEatenText::
-	text "<TARGET>'s"
-	line "dream was eaten!"
-	prompt
-
-_TradeCenterText1::
-	text "!"
-	done
-
-_ColosseumText1::
-	text "!"
-	done
-
-INCLUDE "text/maps/RedsHouse1F.asm"
-INCLUDE "text/maps/BluesHouse.asm"
-INCLUDE "text/maps/OaksLab.asm"
-INCLUDE "text/maps/ViridianPokecenter.asm"
-INCLUDE "text/maps/ViridianMart.asm"
-INCLUDE "text/maps/ViridianSchoolHouse.asm"
-INCLUDE "text/maps/ViridianNicknameHouse.asm"
-INCLUDE "text/maps/ViridianGym.asm"
-INCLUDE "text/maps/Museum1F.asm"
-INCLUDE "text/maps/Museum2F.asm"
-INCLUDE "text/maps/PewterGym.asm"
+INCLUDE "text/RedsHouse1F.asm"
+INCLUDE "text/BluesHouse.asm"
+INCLUDE "text/OaksLab.asm"
+INCLUDE "text/ViridianPokecenter.asm"
+INCLUDE "text/ViridianMart.asm"
+INCLUDE "text/ViridianSchoolHouse.asm"
+INCLUDE "text/ViridianNicknameHouse.asm"
+INCLUDE "text/ViridianGym.asm"
+INCLUDE "text/Museum1F.asm"
+INCLUDE "text/Museum2F.asm"
+INCLUDE "text/PewterGym.asm"
 
 
 SECTION "Text 7", ROMX
 
-INCLUDE "text/maps/PewterGym_2.asm"
-INCLUDE "text/maps/PewterNidoranHouse.asm"
-INCLUDE "text/maps/PewterMart.asm"
-INCLUDE "text/maps/PewterSpeechHouse.asm"
-INCLUDE "text/maps/PewterPokecenter.asm"
-INCLUDE "text/maps/CeruleanTrashedHouse.asm"
-INCLUDE "text/maps/CeruleanTradeHouse.asm"
-INCLUDE "text/maps/CeruleanPokecenter.asm"
-INCLUDE "text/maps/CeruleanGym.asm"
-INCLUDE "text/maps/BikeShop.asm"
-INCLUDE "text/maps/CeruleanMart.asm"
-INCLUDE "text/maps/CeruleanBadgeHouse.asm"
-INCLUDE "text/maps/LavenderPokecenter.asm"
-INCLUDE "text/maps/PokemonTower1F.asm"
-INCLUDE "text/maps/PokemonTower2F.asm"
-INCLUDE "text/maps/PokemonTower3F.asm"
-INCLUDE "text/maps/PokemonTower4F.asm"
-INCLUDE "text/maps/PokemonTower5F.asm"
-INCLUDE "text/maps/PokemonTower6F.asm"
-INCLUDE "text/maps/PokemonTower7F.asm"
-INCLUDE "text/maps/MrFujisHouse.asm"
-INCLUDE "text/maps/LavenderMart.asm"
-INCLUDE "text/maps/LavenderCuboneHouse.asm"
-INCLUDE "text/maps/NameRatersHouse.asm"
-INCLUDE "text/maps/VermilionPokecenter.asm"
-INCLUDE "text/maps/PokemonFanClub.asm"
-INCLUDE "text/maps/VermilionMart.asm"
-INCLUDE "text/maps/VermilionGym.asm"
+INCLUDE "text/PewterGym_2.asm"
+INCLUDE "text/PewterNidoranHouse.asm"
+INCLUDE "text/PewterMart.asm"
+INCLUDE "text/PewterSpeechHouse.asm"
+INCLUDE "text/PewterPokecenter.asm"
+INCLUDE "text/CeruleanTrashedHouse.asm"
+INCLUDE "text/CeruleanTradeHouse.asm"
+INCLUDE "text/CeruleanPokecenter.asm"
+INCLUDE "text/CeruleanGym.asm"
+INCLUDE "text/BikeShop.asm"
+INCLUDE "text/CeruleanMart.asm"
+INCLUDE "text/CeruleanBadgeHouse.asm"
+INCLUDE "text/LavenderPokecenter.asm"
+INCLUDE "text/PokemonTower1F.asm"
+INCLUDE "text/PokemonTower2F.asm"
+INCLUDE "text/PokemonTower3F.asm"
+INCLUDE "text/PokemonTower4F.asm"
+INCLUDE "text/PokemonTower5F.asm"
+INCLUDE "text/PokemonTower6F.asm"
+INCLUDE "text/PokemonTower7F.asm"
+INCLUDE "text/MrFujisHouse.asm"
+INCLUDE "text/LavenderMart.asm"
+INCLUDE "text/LavenderCuboneHouse.asm"
+INCLUDE "text/NameRatersHouse.asm"
+INCLUDE "text/VermilionPokecenter.asm"
+INCLUDE "text/PokemonFanClub.asm"
+INCLUDE "text/VermilionMart.asm"
+INCLUDE "text/VermilionGym.asm"
 
 
 SECTION "Text 8", ROMX
 
-INCLUDE "text/maps/VermilionGym_2.asm"
-INCLUDE "text/maps/VermilionPidgeyHouse.asm"
-INCLUDE "text/maps/VermilionDock.asm"
-INCLUDE "text/maps/VermilionOldRodHouse.asm"
-INCLUDE "text/maps/CeladonMart1F.asm"
-INCLUDE "text/maps/CeladonMart2F.asm"
-INCLUDE "text/maps/CeladonMart3F.asm"
-INCLUDE "text/maps/CeladonMart4F.asm"
-INCLUDE "text/maps/CeladonMartRoof.asm"
-INCLUDE "text/maps/CeladonMansion1F.asm"
-INCLUDE "text/maps/CeladonMansion2F.asm"
-INCLUDE "text/maps/CeladonMansion3F.asm"
-INCLUDE "text/maps/CeladonMansionRoof.asm"
-INCLUDE "text/maps/CeladonMansionRoofHouse.asm"
-INCLUDE "text/maps/CeladonPokecenter.asm"
-INCLUDE "text/maps/CeladonGym.asm"
-INCLUDE "text/maps/GameCorner.asm"
-INCLUDE "text/maps/CeladonMart5F.asm"
-INCLUDE "text/maps/GameCornerPrizeRoom.asm"
-INCLUDE "text/maps/CeladonDiner.asm"
-INCLUDE "text/maps/CeladonChiefHouse.asm"
-INCLUDE "text/maps/CeladonHotel.asm"
-INCLUDE "text/maps/FuchsiaMart.asm"
-INCLUDE "text/maps/FuchsiaBillsGrandpasHouse.asm"
-INCLUDE "text/maps/FuchsiaPokecenter.asm"
-INCLUDE "text/maps/WardensHouse.asm"
-INCLUDE "text/maps/SafariZoneGate.asm"
-INCLUDE "text/maps/FuchsiaGym.asm"
+INCLUDE "text/VermilionGym_2.asm"
+INCLUDE "text/VermilionPidgeyHouse.asm"
+INCLUDE "text/VermilionDock.asm"
+INCLUDE "text/VermilionOldRodHouse.asm"
+INCLUDE "text/CeladonMart1F.asm"
+INCLUDE "text/CeladonMart2F.asm"
+INCLUDE "text/CeladonMart3F.asm"
+INCLUDE "text/CeladonMart4F.asm"
+INCLUDE "text/CeladonMartRoof.asm"
+INCLUDE "text/CeladonMansion1F.asm"
+INCLUDE "text/CeladonMansion2F.asm"
+INCLUDE "text/CeladonMansion3F.asm"
+INCLUDE "text/CeladonMansionRoof.asm"
+INCLUDE "text/CeladonMansionRoofHouse.asm"
+INCLUDE "text/CeladonPokecenter.asm"
+INCLUDE "text/CeladonGym.asm"
+INCLUDE "text/GameCorner.asm"
+INCLUDE "text/CeladonMart5F.asm"
+INCLUDE "text/GameCornerPrizeRoom.asm"
+INCLUDE "text/CeladonDiner.asm"
+INCLUDE "text/CeladonChiefHouse.asm"
+INCLUDE "text/CeladonHotel.asm"
+INCLUDE "text/FuchsiaMart.asm"
+INCLUDE "text/FuchsiaBillsGrandpasHouse.asm"
+INCLUDE "text/FuchsiaPokecenter.asm"
+INCLUDE "text/WardensHouse.asm"
+INCLUDE "text/SafariZoneGate.asm"
+INCLUDE "text/FuchsiaGym.asm"
 
 
 SECTION "Text 9", ROMX
 
-INCLUDE "text/maps/FuchsiaGym_2.asm"
-INCLUDE "text/maps/FuchsiaMeetingRoom.asm"
-INCLUDE "text/maps/FuchsiaGoodRodHouse.asm"
-INCLUDE "text/maps/PokemonMansion1F.asm"
-INCLUDE "text/maps/CinnabarGym.asm"
-INCLUDE "text/maps/CinnabarLab.asm"
-INCLUDE "text/maps/CinnabarLabTradeRoom.asm"
-INCLUDE "text/maps/CinnabarLabMetronomeRoom.asm"
-INCLUDE "text/maps/CinnabarLabFossilRoom.asm"
-INCLUDE "text/maps/CinnabarPokecenter.asm"
-INCLUDE "text/maps/CinnabarMart.asm"
-INCLUDE "text/maps/IndigoPlateauLobby.asm"
-INCLUDE "text/maps/CopycatsHouse1F.asm"
-INCLUDE "text/maps/CopycatsHouse2F.asm"
-INCLUDE "text/maps/FightingDojo.asm"
-INCLUDE "text/maps/SaffronGym.asm"
-INCLUDE "text/maps/SaffronPidgeyHouse.asm"
-INCLUDE "text/maps/SaffronMart.asm"
-INCLUDE "text/maps/SilphCo1F.asm"
-INCLUDE "text/maps/SaffronPokecenter.asm"
-INCLUDE "text/maps/MrPsychicsHouse.asm"
-
-_PokemartGreetingText::
-	text "Hi there!"
-	next "May I help you?"
-	done
-
-_PokemonFaintedText::
-	TX_RAM wcd6d
-	text ""
-	line "fainted!"
-	done
-
-_PlayerBlackedOutText::
-	text "<PLAYER> is out of"
-	line "useable #MON!"
-
-	para "<PLAYER> blacked"
-	line "out!"
-	prompt
-
-_RepelWoreOffText::
-	text "REPEL's effect"
-	line "wore off."
-	done
-
-_PokemartBuyingGreetingText::
-	text "Take your time."
-	done
-
-_PokemartTellBuyPriceText::
-	TX_RAM wcf4b
-	text "?"
-	line "That will be"
-	cont "¥@"
-	TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
-	text ". OK?"
-	done
-
-_PokemartBoughtItemText::
-	text "Here you are!"
-	line "Thank you!"
-	prompt
-
-_PokemartNotEnoughMoneyText::
-	text "You don't have"
-	line "enough money."
-	prompt
-
-_PokemartItemBagFullText::
-	text "You can't carry"
-	line "any more items."
-	prompt
-
-_PokemonSellingGreetingText::
-	text "What would you"
-	line "like to sell?"
-	done
-
-_PokemartTellSellPriceText::
-	text "I can pay you"
-	line "¥@"
-	TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
-	text " for that."
-	done
-
-_PokemartItemBagEmptyText::
-	text "You don't have"
-	line "anything to sell."
-	prompt
-
-_PokemartUnsellableItemText::
-	text "I can't put a"
-	line "price on that."
-	prompt
-
-_PokemartThankYouText::
-	text "Thank you!"
-	done
-
-_PokemartAnythingElseText::
-	text "Is there anything"
-	line "else I can do?"
-	done
-
-_LearnedMove1Text::
-	TX_RAM wLearnMoveMonName
-	text " learned"
-	line "@"
-	TX_RAM wcf4b
-	text "!@@"
-
-_WhichMoveToForgetText::
-	text "Which move should"
-	next "be forgotten?"
-	done
-
-_AbandonLearningText::
-	text "Abandon learning"
-	line "@"
-	TX_RAM wcf4b
-	text "?"
-	done
-
-_DidNotLearnText::
-	TX_RAM wLearnMoveMonName
-	text ""
-	line "did not learn"
-	cont "@"
-	TX_RAM wcf4b
-	text "!"
-	prompt
-
-_TryingToLearnText::
-	TX_RAM wLearnMoveMonName
-	text " is"
-	line "trying to learn"
-	cont "@"
-	TX_RAM wcf4b
-	text "!"
-
-	para "But, @"
-	TX_RAM wLearnMoveMonName
-	text ""
-	line "can't learn more"
-	cont "than 4 moves!"
-
-	para "Delete an older"
-	line "move to make room"
-	cont "for @"
-	TX_RAM wcf4b
-	text "?"
-	done
-
-_OneTwoAndText::
-	text "1, 2 and...@@"
-
-_PoofText::
-	text " Poof!@@"
-
-_ForgotAndText::
-	text ""
-	para "@"
-	TX_RAM wLearnMoveMonName
-	text " forgot"
-	line "@"
-	TX_RAM wcd6d
-	text "!"
-
-	para "And..."
-	prompt
-
-_HMCantDeleteText::
-	text "HM techniques"
-	line "can't be deleted!"
-	prompt
-
-_PokemonCenterWelcomeText::
-	text "Welcome to our"
-	line "#MON CENTER!"
-
-	para "We heal your"
-	line "#MON back to"
-	cont "perfect health!"
-	prompt
+INCLUDE "text/FuchsiaGym_2.asm"
+INCLUDE "text/FuchsiaMeetingRoom.asm"
+INCLUDE "text/FuchsiaGoodRodHouse.asm"
+INCLUDE "text/PokemonMansion1F.asm"
+INCLUDE "text/CinnabarGym.asm"
+INCLUDE "text/CinnabarLab.asm"
+INCLUDE "text/CinnabarLabTradeRoom.asm"
+INCLUDE "text/CinnabarLabMetronomeRoom.asm"
+INCLUDE "text/CinnabarLabFossilRoom.asm"
+INCLUDE "text/CinnabarPokecenter.asm"
+INCLUDE "text/CinnabarMart.asm"
+INCLUDE "text/IndigoPlateauLobby.asm"
+INCLUDE "text/CopycatsHouse1F.asm"
+INCLUDE "text/CopycatsHouse2F.asm"
+INCLUDE "text/FightingDojo.asm"
+INCLUDE "text/SaffronGym.asm"
+INCLUDE "text/SaffronPidgeyHouse.asm"
+INCLUDE "text/SaffronMart.asm"
+INCLUDE "text/SilphCo1F.asm"
+INCLUDE "text/SaffronPokecenter.asm"
+INCLUDE "text/MrPsychicsHouse.asm"
 
-_ShallWeHealYourPokemonText::
-	text "Shall we heal your"
-	line "#MON?"
-	done
-
-_NeedYourPokemonText::
-	text "OK. We'll need"
-	line "your #MON."
-	done
-
-_PokemonFightingFitText::
-	text "Thank you!"
-	line "Your #MON are"
-	cont "fighting fit!"
-	prompt
-
-_PokemonCenterFarewellText::
-	text "We hope to see"
-	line "you again!"
-	done
-
-_CableClubNPCAreaReservedFor2FriendsLinkedByCableText::
-	text "This area is"
-	line "reserved for 2"
-	cont "friends who are"
-	cont "linked by cable."
-	done
-
-_CableClubNPCWelcomeText::
-	text "Welcome to the"
-	line "Cable Club!"
-	done
-
-_CableClubNPCPleaseApplyHereHaveToSaveText::
-	text "Please apply here."
-
-	para "Before opening"
-	line "the link, we have"
-	cont "to save the game."
-	done
-
-_CableClubNPCPleaseWaitText::
-	text "Please wait.@@"
-
-_CableClubNPCLinkClosedBecauseOfInactivityText::
-	text "The link has been"
-	line "closed because of"
-	cont "inactivity."
-
-	para "Please contact"
-	line "your friend and"
-	cont "come again!"
-	done
+INCLUDE "data/text/text_4.asm"
 
 
 SECTION "Text 10", ROMX
 
-_CableClubNPCPleaseComeAgainText::
-	text "Please come again!"
-	done
-
-_CableClubNPCMakingPreparationsText::
-	text "We're making"
-	line "preparations."
-	cont "Please wait."
-	done
-
-_UsedStrengthText::
-	TX_RAM wcd6d
-	text " used"
-	line "STRENGTH.@@"
-
-_CanMoveBouldersText::
-	TX_RAM wcd6d
-	text " can"
-	line "move boulders."
-	prompt
-
-_CurrentTooFastText::
-	text "The current is"
-	line "much too fast!"
-	prompt
-
-_CyclingIsFunText::
-	text "Cycling is fun!"
-	line "Forget SURFing!"
-	prompt
-
-_FlashLightsAreaText::
-	text "A blinding FLASH"
-	line "lights the area!"
-	prompt
-
-_WarpToLastPokemonCenterText::
-	text "Warp to the last"
-	line "#MON CENTER."
-	done
-
-_CannotUseTeleportNowText::
-	TX_RAM wcd6d
-	text " can't"
-	line "use TELEPORT now."
-	prompt
-
-_CannotFlyHereText::
-	TX_RAM wcd6d
-	text " can't"
-	line "FLY here."
-	prompt
-
-_NotHealthyEnoughText::
-	text "Not healthy"
-	line "enough."
-	prompt
-
-_NewBadgeRequiredText::
-	text "No! A new BADGE"
-	line "is required."
-	prompt
-
-_CannotUseItemsHereText::
-	text "You can't use items"
-	line "here."
-	prompt
-
-_CannotGetOffHereText::
-	text "You can't get off"
-	line "here."
-	prompt
-
-_GotMonText::
-	text "<PLAYER> got"
-	line "@"
-	TX_RAM wcd6d
-	text "!@@"
-
-_SentToBoxText::
-	text "There's no more"
-	line "room for #MON!"
-	cont "@"
-	TX_RAM wBoxMonNicks
-	text " was"
-	cont "sent to #MON"
-	cont "BOX @"
-	TX_RAM wcf4b
-	text " on PC!"
-	done
-
-_BoxIsFullText::
-	text "There's no more"
-	line "room for #MON!"
-
-	para "The #MON BOX"
-	line "is full and can't"
-	cont "accept any more!"
-
-	para "Change the BOX at"
-	line "a #MON CENTER!"
-	done
-
-INCLUDE "text/maps/PalletTown.asm"
-INCLUDE "text/maps/ViridianCity.asm"
-INCLUDE "text/maps/PewterCity.asm"
-INCLUDE "text/maps/CeruleanCity.asm"
-INCLUDE "text/maps/LavenderTown.asm"
-INCLUDE "text/maps/VermilionCity.asm"
-INCLUDE "text/maps/CeladonCity.asm"
-INCLUDE "text/maps/FuchsiaCity.asm"
-INCLUDE "text/maps/CinnabarIsland.asm"
-INCLUDE "text/maps/SaffronCity.asm"
-
-_ItemUseBallText00::
-	text "It dodged the"
-	line "thrown BALL!"
-
-	para "This #MON"
-	line "can't be caught!"
-	prompt
-
-_ItemUseBallText01::
-	text "You missed the"
-	line "#MON!"
-	prompt
-
-_ItemUseBallText02::
-	text "Darn! The #MON"
-	line "broke free!"
-	prompt
-
-_ItemUseBallText03::
-	text "Aww! It appeared"
-	line "to be caught! "
-	prompt
-
-_ItemUseBallText04::
-	text "Shoot! It was so"
-	line "close too!"
-	prompt
+INCLUDE "data/text/text_5.asm"
 
-_ItemUseBallText05::
-	text "All right!"
-	line "@"
-	TX_RAM wEnemyMonNick
-	text " was"
-	cont "caught!@@"
+INCLUDE "text/PalletTown.asm"
+INCLUDE "text/ViridianCity.asm"
+INCLUDE "text/PewterCity.asm"
+INCLUDE "text/CeruleanCity.asm"
+INCLUDE "text/LavenderTown.asm"
+INCLUDE "text/VermilionCity.asm"
+INCLUDE "text/CeladonCity.asm"
+INCLUDE "text/FuchsiaCity.asm"
+INCLUDE "text/CinnabarIsland.asm"
+INCLUDE "text/SaffronCity.asm"
 
-_ItemUseBallText07::
-	TX_RAM wBoxMonNicks
-	text " was"
-	line "transferred to"
-	cont "BILL's PC!"
-	prompt
-
-_ItemUseBallText08::
-	TX_RAM wBoxMonNicks
-	text " was"
-	line "transferred to"
-	cont "someone's PC!"
-	prompt
-
-_ItemUseBallText06::
-	text "New #DEX data"
-	line "will be added for"
-	cont "@"
-	TX_RAM wEnemyMonNick
-	text "!@@"
-
-_SurfingGotOnText::
-	text "<PLAYER> got on"
-	line "@"
-	TX_RAM wcd6d
-	text "!"
-	prompt
-
-_SurfingNoPlaceToGetOffText::
-	text "There's no place"
-	line "to get off!"
-	prompt
-
-_VitaminStatRoseText::
-	TX_RAM wcd6d
-	text "'s"
-	line "@"
-	TX_RAM wcf4b
-	text " rose."
-	prompt
-
-_VitaminNoEffectText::
-	text "It won't have any"
-	line "effect."
-	prompt
-
-_ThrewBaitText::
-	text "<PLAYER> threw"
-	line "some BAIT."
-	done
-
-_ThrewRockText::
-	text "<PLAYER> threw a"
-	line "ROCK."
-	done
-
-_PlayedFluteNoEffectText::
-	text "Played the #"
-	line "FLUTE."
-
-	para "Now, that's a"
-	line "catchy tune!"
-	prompt
-
-_FluteWokeUpText::
-	text "All sleeping"
-	line "#MON woke up."
-	prompt
-
-_PlayedFluteHadEffectText::
-	text "<PLAYER> played the"
-	line "# FLUTE.@@"
-
-_CoinCaseNumCoinsText::
-	text "Coins"
-	line "@"
-	TX_BCD wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
-	text " "
-	prompt
-
-_ItemfinderFoundItemText::
-	text "Yes! ITEMFINDER"
-	line "indicates there's"
-	cont "an item nearby."
-	prompt
-
-_ItemfinderFoundNothingText::
-	text "Nope! ITEMFINDER"
-	line "isn't responding."
-	prompt
-
-_RaisePPWhichTechniqueText::
-	text "Raise PP of which"
-	line "technique?"
-	done
-
-_RestorePPWhichTechniqueText::
-	text "Restore PP of"
-	line "which technique?"
-	done
-
-_PPMaxedOutText::
-	TX_RAM wcf4b
-	text "'s PP"
-	line "is maxed out."
-	prompt
-
-_PPIncreasedText::
-	TX_RAM wcf4b
-	text "'s PP"
-	line "increased."
-	prompt
-
-_PPRestoredText::
-	text "PP was restored."
-	prompt
-
-_BootedUpTMText::
-	text "Booted up a TM!"
-	prompt
-
-_BootedUpHMText::
-	text "Booted up an HM!"
-	prompt
-
-_TeachMachineMoveText::
-	text "It contained"
-	line "@"
-	TX_RAM wcf4b
-	text "!"
-
-	para "Teach @"
-	TX_RAM wcf4b
-	text ""
-	line "to a #MON?"
-	done
-
-_MonCannotLearnMachineMoveText::
-	TX_RAM wcd6d
-	text " is not"
-	line "compatible with"
-	cont "@"
-	TX_RAM wcf4b
-	text "."
-
-	para "It can't learn"
-	line "@"
-	TX_RAM wcf4b
-	text "."
-	prompt
-
-_ItemUseNotTimeText::
-	text "OAK: <PLAYER>!"
-	line "This isn't the"
-	cont "time to use that! "
-	prompt
-
-_ItemUseNotYoursToUseText::
-	text "This isn't yours"
-	line "to use!"
-	prompt
-
-_ItemUseNoEffectText::
-	text "It won't have any"
-	line "effect."
-	prompt
-
-_ThrowBallAtTrainerMonText1::
-	text "The trainer"
-	line "blocked the BALL!"
-	prompt
-
-_ThrowBallAtTrainerMonText2::
-	text "Don't be a thief!"
-	prompt
-
-_NoCyclingAllowedHereText::
-	text "No cycling"
-	next "allowed here."
-	prompt
-
-_NoSurfingHereText::
-	text "No SURFing on"
-	line "@"
-	TX_RAM wcd6d
-	text " here!"
-	prompt
-
-_BoxFullCannotThrowBallText::
-	text "The #MON BOX"
-	line "is full! Can't"
-	cont "use that item!"
-	prompt
+INCLUDE "data/text/text_6.asm"
 
 
 SECTION "Text 11", ROMX
 
-_ItemUseText001::
-	text "<PLAYER> used@@"
-
-_ItemUseText002::
-	TX_RAM wcf4b
-	text "!"
-	done
-
-_GotOnBicycleText1::
-	text "<PLAYER> got on the@@"
-
-_GotOnBicycleText2::
-	TX_RAM wcf4b
-	text "!"
-	prompt
-
-_GotOffBicycleText1::
-	text "<PLAYER> got off@@"
-
-_GotOffBicycleText2::
-	text "the @"
-	TX_RAM wcf4b
-	text "."
-	prompt
-
-_ThrewAwayItemText::
-	text "Threw away"
-	line "@"
-	TX_RAM wcd6d
-	text "."
-	prompt
-
-_IsItOKToTossItemText::
-	text "Is it OK to toss"
-	line "@"
-	TX_RAM wcf4b
-	text "?"
-	prompt
-
-_TooImportantToTossText::
-	text "That's too impor-"
-	line "tant to toss!"
-	prompt
-
-_AlreadyKnowsText::
-	TX_RAM wcd6d
-	text " knows"
-	line "@"
-	TX_RAM wcf4b
-	text "!"
-	prompt
-
-_ConnectCableText::
-	text "Okay, connect the"
-	line "cable like so!"
-	prompt
-
-_TradedForText::
-	text "<PLAYER> traded"
-	line "@"
-	TX_RAM wInGameTradeGiveMonName
-	text " for"
-	cont "@"
-	TX_RAM wInGameTradeReceiveMonName
-	text "!@@"
-
-_WannaTrade1Text::
-	text "I'm looking for"
-	line "@"
-	TX_RAM wInGameTradeGiveMonName
-	text "! Wanna"
-
-	para "trade one for"
-	line "@"
-	TX_RAM wInGameTradeReceiveMonName
-	text "? "
-	done
-
-_NoTrade1Text::
-	text "Awww!"
-	line "Oh well..."
-	done
-
-_WrongMon1Text::
-	text "What? That's not"
-	line "@"
-	TX_RAM wInGameTradeGiveMonName
-	text "!"
-
-	para "If you get one,"
-	line "come back here!"
-	done
-
-_Thanks1Text::
-	text "Hey thanks!"
-	done
-
-_AfterTrade1Text::
-	text "Isn't my old"
-	line "@"
-	TX_RAM wInGameTradeReceiveMonName
-	text " great?"
-	done
-
-_WannaTrade2Text::
-	text "Hello there! Do"
-	line "you want to trade"
-
-	para "your @"
-	TX_RAM wInGameTradeGiveMonName
-	text ""
-	line "for @"
-	TX_RAM wInGameTradeReceiveMonName
-	text "?"
-	done
-
-_NoTrade2Text::
-	text "Well, if you"
-	line "don't want to..."
-	done
-
-_WrongMon2Text::
-	text "Hmmm? This isn't"
-	line "@"
-	TX_RAM wInGameTradeGiveMonName
-	text "."
-
-	para "Think of me when"
-	line "you get one."
-	done
-
-_Thanks2Text::
-	text "Thanks!"
-	done
-
-_AfterTrade2Text::
-	text "The @"
-	TX_RAM wInGameTradeGiveMonName
-	text " you"
-	line "traded to me"
-
-	para "went and evolved!"
-	done
-
-_WannaTrade3Text::
-	text "Hi! Do you have"
-	line "@"
-	TX_RAM wInGameTradeGiveMonName
-	text "?"
-
-	para "Want to trade it"
-	line "for @"
-	TX_RAM wInGameTradeReceiveMonName
-	text "?"
-	done
-
-_NoTrade3Text::
-	text "That's too bad."
-	done
-
-_WrongMon3Text::
-	text "...This is no"
-	line "@"
-	TX_RAM wInGameTradeGiveMonName
-	text "."
-
-	para "If you get one,"
-	line "trade it with me!"
-	done
-
-_Thanks3Text::
-	text "Thanks pal!"
-	done
-
-_AfterTrade3Text::
-	text "How is my old"
-	line "@"
-	TX_RAM wInGameTradeReceiveMonName
-	text "?"
-
-	para "My @"
-	TX_RAM wInGameTradeGiveMonName
-	text " is"
-	line "doing great!"
-	done
-
-_NothingToCutText::
-	text "There isn't"
-	line "anything to CUT!"
-	prompt
-
-_UsedCutText::
-	TX_RAM wcd6d
-	text " hacked"
-	line "away with CUT!"
-	prompt
+INCLUDE "data/text/text_7.asm"
 
 
 SECTION "Pokedex Text", ROMX
 
-INCLUDE "text/pokedex.asm"
+INCLUDE "data/pokemon/dex_text.asm"
 
 
 SECTION "Move Names", ROMX
 
-INCLUDE "text/move_names.asm"
+INCLUDE "data/moves/names.asm"
diff --git a/text/maps/AgathasRoom.asm b/text/AgathasRoom.asm
index 9ef5059a..9ef5059a 100644
--- a/text/maps/AgathasRoom.asm
+++ b/text/AgathasRoom.asm
diff --git a/text/maps/BikeShop.asm b/text/BikeShop.asm
index 86799865..86799865 100644
--- a/text/maps/BikeShop.asm
+++ b/text/BikeShop.asm
diff --git a/text/maps/BillsHouse.asm b/text/BillsHouse.asm
index 5ece48d7..5ece48d7 100644
--- a/text/maps/BillsHouse.asm
+++ b/text/BillsHouse.asm
diff --git a/text/maps/BluesHouse.asm b/text/BluesHouse.asm
index 1898636a..1898636a 100644
--- a/text/maps/BluesHouse.asm
+++ b/text/BluesHouse.asm
diff --git a/text/maps/BrunosRoom.asm b/text/BrunosRoom.asm
index 9c493c4a..9c493c4a 100644
--- a/text/maps/BrunosRoom.asm
+++ b/text/BrunosRoom.asm
diff --git a/text/maps/CeladonChiefHouse.asm b/text/CeladonChiefHouse.asm
index 19e59bd6..19e59bd6 100644
--- a/text/maps/CeladonChiefHouse.asm
+++ b/text/CeladonChiefHouse.asm
diff --git a/text/maps/CeladonCity.asm b/text/CeladonCity.asm
index 1dbd5cdf..1dbd5cdf 100644
--- a/text/maps/CeladonCity.asm
+++ b/text/CeladonCity.asm
diff --git a/text/maps/CeladonDiner.asm b/text/CeladonDiner.asm
index dc5e9350..dc5e9350 100644
--- a/text/maps/CeladonDiner.asm
+++ b/text/CeladonDiner.asm
diff --git a/text/maps/CeladonGym.asm b/text/CeladonGym.asm
index d6586035..d6586035 100644
--- a/text/maps/CeladonGym.asm
+++ b/text/CeladonGym.asm
diff --git a/text/maps/CeladonHotel.asm b/text/CeladonHotel.asm
index f2eb059e..f2eb059e 100644
--- a/text/maps/CeladonHotel.asm
+++ b/text/CeladonHotel.asm
diff --git a/text/maps/CeladonMansion1F.asm b/text/CeladonMansion1F.asm
index fc175cd5..fc175cd5 100644
--- a/text/maps/CeladonMansion1F.asm
+++ b/text/CeladonMansion1F.asm
diff --git a/text/maps/CeladonMansion2F.asm b/text/CeladonMansion2F.asm
index b2ecb4fa..b2ecb4fa 100644
--- a/text/maps/CeladonMansion2F.asm
+++ b/text/CeladonMansion2F.asm
diff --git a/text/maps/CeladonMansion3F.asm b/text/CeladonMansion3F.asm
index c8858281..c8858281 100644
--- a/text/maps/CeladonMansion3F.asm
+++ b/text/CeladonMansion3F.asm
diff --git a/text/maps/CeladonMansionRoof.asm b/text/CeladonMansionRoof.asm
index c8fd7ec8..c8fd7ec8 100644
--- a/text/maps/CeladonMansionRoof.asm
+++ b/text/CeladonMansionRoof.asm
diff --git a/text/maps/CeladonMansionRoofHouse.asm b/text/CeladonMansionRoofHouse.asm
index dab81a8d..dab81a8d 100644
--- a/text/maps/CeladonMansionRoofHouse.asm
+++ b/text/CeladonMansionRoofHouse.asm
diff --git a/text/maps/CeladonMart1F.asm b/text/CeladonMart1F.asm
index 8d805edc..8d805edc 100644
--- a/text/maps/CeladonMart1F.asm
+++ b/text/CeladonMart1F.asm
diff --git a/text/maps/CeladonMart2F.asm b/text/CeladonMart2F.asm
index 74869902..74869902 100644
--- a/text/maps/CeladonMart2F.asm
+++ b/text/CeladonMart2F.asm
diff --git a/text/maps/CeladonMart3F.asm b/text/CeladonMart3F.asm
index 8211750d..8211750d 100644
--- a/text/maps/CeladonMart3F.asm
+++ b/text/CeladonMart3F.asm
diff --git a/text/maps/CeladonMart4F.asm b/text/CeladonMart4F.asm
index 78fa0b66..78fa0b66 100644
--- a/text/maps/CeladonMart4F.asm
+++ b/text/CeladonMart4F.asm
diff --git a/text/maps/CeladonMart5F.asm b/text/CeladonMart5F.asm
index 1871194b..1871194b 100644
--- a/text/maps/CeladonMart5F.asm
+++ b/text/CeladonMart5F.asm
diff --git a/text/maps/CeladonMartRoof.asm b/text/CeladonMartRoof.asm
index 1ed52e86..1ed52e86 100644
--- a/text/maps/CeladonMartRoof.asm
+++ b/text/CeladonMartRoof.asm
diff --git a/text/maps/CeladonPokecenter.asm b/text/CeladonPokecenter.asm
index a04f51c9..a04f51c9 100644
--- a/text/maps/CeladonPokecenter.asm
+++ b/text/CeladonPokecenter.asm
diff --git a/text/maps/CeruleanBadgeHouse.asm b/text/CeruleanBadgeHouse.asm
index 9d701443..9d701443 100644
--- a/text/maps/CeruleanBadgeHouse.asm
+++ b/text/CeruleanBadgeHouse.asm
diff --git a/text/maps/CeruleanCaveB1F.asm b/text/CeruleanCaveB1F.asm
index 0918a3ce..0918a3ce 100644
--- a/text/maps/CeruleanCaveB1F.asm
+++ b/text/CeruleanCaveB1F.asm
diff --git a/text/maps/CeruleanCity.asm b/text/CeruleanCity.asm
index f0d2c29e..f0d2c29e 100644
--- a/text/maps/CeruleanCity.asm
+++ b/text/CeruleanCity.asm
diff --git a/text/maps/CeruleanGym.asm b/text/CeruleanGym.asm
index 1d1d6d1c..1d1d6d1c 100644
--- a/text/maps/CeruleanGym.asm
+++ b/text/CeruleanGym.asm
diff --git a/text/maps/CeruleanMart.asm b/text/CeruleanMart.asm
index 86a74588..86a74588 100644
--- a/text/maps/CeruleanMart.asm
+++ b/text/CeruleanMart.asm
diff --git a/text/maps/CeruleanPokecenter.asm b/text/CeruleanPokecenter.asm
index 497fbce3..497fbce3 100644
--- a/text/maps/CeruleanPokecenter.asm
+++ b/text/CeruleanPokecenter.asm
diff --git a/text/maps/CeruleanTradeHouse.asm b/text/CeruleanTradeHouse.asm
index b606613b..b606613b 100644
--- a/text/maps/CeruleanTradeHouse.asm
+++ b/text/CeruleanTradeHouse.asm
diff --git a/text/maps/CeruleanTrashedHouse.asm b/text/CeruleanTrashedHouse.asm
index f79540ae..f79540ae 100644
--- a/text/maps/CeruleanTrashedHouse.asm
+++ b/text/CeruleanTrashedHouse.asm
diff --git a/text/maps/ChampionsRoom.asm b/text/ChampionsRoom.asm
index 61050565..61050565 100644
--- a/text/maps/ChampionsRoom.asm
+++ b/text/ChampionsRoom.asm
diff --git a/text/maps/CinnabarGym.asm b/text/CinnabarGym.asm
index 1b531571..1b531571 100644
--- a/text/maps/CinnabarGym.asm
+++ b/text/CinnabarGym.asm
diff --git a/text/maps/CinnabarIsland.asm b/text/CinnabarIsland.asm
index 352ab8ea..352ab8ea 100644
--- a/text/maps/CinnabarIsland.asm
+++ b/text/CinnabarIsland.asm
diff --git a/text/maps/CinnabarLab.asm b/text/CinnabarLab.asm
index a93a484d..a93a484d 100644
--- a/text/maps/CinnabarLab.asm
+++ b/text/CinnabarLab.asm
diff --git a/text/maps/CinnabarLabFossilRoom.asm b/text/CinnabarLabFossilRoom.asm
index 95bde685..95bde685 100644
--- a/text/maps/CinnabarLabFossilRoom.asm
+++ b/text/CinnabarLabFossilRoom.asm
diff --git a/text/maps/CinnabarLabMetronomeRoom.asm b/text/CinnabarLabMetronomeRoom.asm
index fa04677f..fa04677f 100644
--- a/text/maps/CinnabarLabMetronomeRoom.asm
+++ b/text/CinnabarLabMetronomeRoom.asm
diff --git a/text/maps/CinnabarLabTradeRoom.asm b/text/CinnabarLabTradeRoom.asm
index 196124e7..196124e7 100644
--- a/text/maps/CinnabarLabTradeRoom.asm
+++ b/text/CinnabarLabTradeRoom.asm
diff --git a/text/maps/CinnabarMart.asm b/text/CinnabarMart.asm
index 42a41d06..42a41d06 100644
--- a/text/maps/CinnabarMart.asm
+++ b/text/CinnabarMart.asm
diff --git a/text/maps/CinnabarPokecenter.asm b/text/CinnabarPokecenter.asm
index cf481764..cf481764 100644
--- a/text/maps/CinnabarPokecenter.asm
+++ b/text/CinnabarPokecenter.asm
diff --git a/text/maps/CopycatsHouse1F.asm b/text/CopycatsHouse1F.asm
index 3ec2b151..3ec2b151 100644
--- a/text/maps/CopycatsHouse1F.asm
+++ b/text/CopycatsHouse1F.asm
diff --git a/text/maps/CopycatsHouse2F.asm b/text/CopycatsHouse2F.asm
index 561b2ac5..561b2ac5 100644
--- a/text/maps/CopycatsHouse2F.asm
+++ b/text/CopycatsHouse2F.asm
diff --git a/text/maps/Daycare.asm b/text/Daycare.asm
index 2759c798..2759c798 100644
--- a/text/maps/Daycare.asm
+++ b/text/Daycare.asm
diff --git a/text/maps/Daycare_2.asm b/text/Daycare_2.asm
index 20c0e5ad..20c0e5ad 100644
--- a/text/maps/Daycare_2.asm
+++ b/text/Daycare_2.asm
diff --git a/text/maps/DiglettsCaveRoute11.asm b/text/DiglettsCaveRoute11.asm
index ecd3225e..ecd3225e 100644
--- a/text/maps/DiglettsCaveRoute11.asm
+++ b/text/DiglettsCaveRoute11.asm
diff --git a/text/maps/DiglettsCaveRoute2.asm b/text/DiglettsCaveRoute2.asm
index a04bbef7..a04bbef7 100644
--- a/text/maps/DiglettsCaveRoute2.asm
+++ b/text/DiglettsCaveRoute2.asm
diff --git a/text/maps/FightingDojo.asm b/text/FightingDojo.asm
index 3df069c1..3df069c1 100644
--- a/text/maps/FightingDojo.asm
+++ b/text/FightingDojo.asm
diff --git a/text/maps/FuchsiaBillsGrandpasHouse.asm b/text/FuchsiaBillsGrandpasHouse.asm
index 7b6556b1..7b6556b1 100644
--- a/text/maps/FuchsiaBillsGrandpasHouse.asm
+++ b/text/FuchsiaBillsGrandpasHouse.asm
diff --git a/text/maps/FuchsiaCity.asm b/text/FuchsiaCity.asm
index a90d0021..a90d0021 100644
--- a/text/maps/FuchsiaCity.asm
+++ b/text/FuchsiaCity.asm
diff --git a/text/maps/FuchsiaGoodRodHouse.asm b/text/FuchsiaGoodRodHouse.asm
index b1b8b2f2..b1b8b2f2 100644
--- a/text/maps/FuchsiaGoodRodHouse.asm
+++ b/text/FuchsiaGoodRodHouse.asm
diff --git a/text/maps/FuchsiaGym.asm b/text/FuchsiaGym.asm
index 9108fc79..9108fc79 100644
--- a/text/maps/FuchsiaGym.asm
+++ b/text/FuchsiaGym.asm
diff --git a/text/maps/FuchsiaGym_2.asm b/text/FuchsiaGym_2.asm
index f7b39d9c..f7b39d9c 100644
--- a/text/maps/FuchsiaGym_2.asm
+++ b/text/FuchsiaGym_2.asm
diff --git a/text/maps/FuchsiaMart.asm b/text/FuchsiaMart.asm
index 574898ce..574898ce 100644
--- a/text/maps/FuchsiaMart.asm
+++ b/text/FuchsiaMart.asm
diff --git a/text/maps/FuchsiaMeetingRoom.asm b/text/FuchsiaMeetingRoom.asm
index 10675ead..10675ead 100644
--- a/text/maps/FuchsiaMeetingRoom.asm
+++ b/text/FuchsiaMeetingRoom.asm
diff --git a/text/maps/FuchsiaPokecenter.asm b/text/FuchsiaPokecenter.asm
index a0def7eb..a0def7eb 100644
--- a/text/maps/FuchsiaPokecenter.asm
+++ b/text/FuchsiaPokecenter.asm
diff --git a/text/maps/GameCorner.asm b/text/GameCorner.asm
index 1e59f83e..1e59f83e 100644
--- a/text/maps/GameCorner.asm
+++ b/text/GameCorner.asm
diff --git a/text/maps/GameCornerPrizeRoom.asm b/text/GameCornerPrizeRoom.asm
index 6b2bb537..6b2bb537 100644
--- a/text/maps/GameCornerPrizeRoom.asm
+++ b/text/GameCornerPrizeRoom.asm
diff --git a/text/maps/HallOfFame.asm b/text/HallOfFame.asm
index c799268b..c799268b 100644
--- a/text/maps/HallOfFame.asm
+++ b/text/HallOfFame.asm
diff --git a/text/maps/IndigoPlateauLobby.asm b/text/IndigoPlateauLobby.asm
index 8487e29a..8487e29a 100644
--- a/text/maps/IndigoPlateauLobby.asm
+++ b/text/IndigoPlateauLobby.asm
diff --git a/text/maps/LancesRoom.asm b/text/LancesRoom.asm
index ed3dcada..ed3dcada 100644
--- a/text/maps/LancesRoom.asm
+++ b/text/LancesRoom.asm
diff --git a/text/maps/LavenderCuboneHouse.asm b/text/LavenderCuboneHouse.asm
index 66cc85a5..66cc85a5 100644
--- a/text/maps/LavenderCuboneHouse.asm
+++ b/text/LavenderCuboneHouse.asm
diff --git a/text/maps/LavenderMart.asm b/text/LavenderMart.asm
index 222712c6..222712c6 100644
--- a/text/maps/LavenderMart.asm
+++ b/text/LavenderMart.asm
diff --git a/text/maps/LavenderPokecenter.asm b/text/LavenderPokecenter.asm
index 3aa7b67d..3aa7b67d 100644
--- a/text/maps/LavenderPokecenter.asm
+++ b/text/LavenderPokecenter.asm
diff --git a/text/maps/LavenderTown.asm b/text/LavenderTown.asm
index 19b6c8c8..19b6c8c8 100644
--- a/text/maps/LavenderTown.asm
+++ b/text/LavenderTown.asm
diff --git a/text/maps/LoreleisRoom.asm b/text/LoreleisRoom.asm
index fdbb55b4..fdbb55b4 100644
--- a/text/maps/LoreleisRoom.asm
+++ b/text/LoreleisRoom.asm
diff --git a/text/maps/MrFujisHouse.asm b/text/MrFujisHouse.asm
index f903eb6a..f903eb6a 100644
--- a/text/maps/MrFujisHouse.asm
+++ b/text/MrFujisHouse.asm
diff --git a/text/maps/MrPsychicsHouse.asm b/text/MrPsychicsHouse.asm
index 7be2e11e..7be2e11e 100644
--- a/text/maps/MrPsychicsHouse.asm
+++ b/text/MrPsychicsHouse.asm
diff --git a/text/maps/MtMoon1F.asm b/text/MtMoon1F.asm
index 761a5240..761a5240 100644
--- a/text/maps/MtMoon1F.asm
+++ b/text/MtMoon1F.asm
diff --git a/text/maps/MtMoonB1F.asm b/text/MtMoonB1F.asm
index 755fa583..755fa583 100644
--- a/text/maps/MtMoonB1F.asm
+++ b/text/MtMoonB1F.asm
diff --git a/text/maps/MtMoonB2F.asm b/text/MtMoonB2F.asm
index 472649b9..472649b9 100644
--- a/text/maps/MtMoonB2F.asm
+++ b/text/MtMoonB2F.asm
diff --git a/text/maps/MtMoonPokecenter.asm b/text/MtMoonPokecenter.asm
index 7bc99dae..7bc99dae 100644
--- a/text/maps/MtMoonPokecenter.asm
+++ b/text/MtMoonPokecenter.asm
diff --git a/text/maps/Museum1F.asm b/text/Museum1F.asm
index 16431bda..16431bda 100644
--- a/text/maps/Museum1F.asm
+++ b/text/Museum1F.asm
diff --git a/text/maps/Museum2F.asm b/text/Museum2F.asm
index 4f34a249..4f34a249 100644
--- a/text/maps/Museum2F.asm
+++ b/text/Museum2F.asm
diff --git a/text/maps/NameRatersHouse.asm b/text/NameRatersHouse.asm
index 65d3e8a4..65d3e8a4 100644
--- a/text/maps/NameRatersHouse.asm
+++ b/text/NameRatersHouse.asm
diff --git a/text/maps/OaksLab.asm b/text/OaksLab.asm
index 7a6f57b7..7a6f57b7 100644
--- a/text/maps/OaksLab.asm
+++ b/text/OaksLab.asm
diff --git a/text/maps/PalletTown.asm b/text/PalletTown.asm
index d5eda74f..d5eda74f 100644
--- a/text/maps/PalletTown.asm
+++ b/text/PalletTown.asm
diff --git a/text/maps/PewterCity.asm b/text/PewterCity.asm
index 14240c9e..14240c9e 100644
--- a/text/maps/PewterCity.asm
+++ b/text/PewterCity.asm
diff --git a/text/maps/PewterGym.asm b/text/PewterGym.asm
index 6426dd72..6426dd72 100644
--- a/text/maps/PewterGym.asm
+++ b/text/PewterGym.asm
diff --git a/text/maps/PewterGym_2.asm b/text/PewterGym_2.asm
index 5312e4f2..5312e4f2 100644
--- a/text/maps/PewterGym_2.asm
+++ b/text/PewterGym_2.asm
diff --git a/text/maps/PewterMart.asm b/text/PewterMart.asm
index 0d5b07a2..0d5b07a2 100644
--- a/text/maps/PewterMart.asm
+++ b/text/PewterMart.asm
diff --git a/text/maps/PewterNidoranHouse.asm b/text/PewterNidoranHouse.asm
index 450e8372..450e8372 100644
--- a/text/maps/PewterNidoranHouse.asm
+++ b/text/PewterNidoranHouse.asm
diff --git a/text/maps/PewterPokecenter.asm b/text/PewterPokecenter.asm
index 6a1b373e..6a1b373e 100644
--- a/text/maps/PewterPokecenter.asm
+++ b/text/PewterPokecenter.asm
diff --git a/text/maps/PewterSpeechHouse.asm b/text/PewterSpeechHouse.asm
index 615536f7..615536f7 100644
--- a/text/maps/PewterSpeechHouse.asm
+++ b/text/PewterSpeechHouse.asm
diff --git a/text/maps/PokemonFanClub.asm b/text/PokemonFanClub.asm
index 4827f2e8..4827f2e8 100644
--- a/text/maps/PokemonFanClub.asm
+++ b/text/PokemonFanClub.asm
diff --git a/text/maps/PokemonMansion1F.asm b/text/PokemonMansion1F.asm
index a3c517fb..a3c517fb 100644
--- a/text/maps/PokemonMansion1F.asm
+++ b/text/PokemonMansion1F.asm
diff --git a/text/maps/PokemonMansion2F.asm b/text/PokemonMansion2F.asm
index 378efb30..378efb30 100644
--- a/text/maps/PokemonMansion2F.asm
+++ b/text/PokemonMansion2F.asm
diff --git a/text/maps/PokemonMansion3F.asm b/text/PokemonMansion3F.asm
index 70331fdf..70331fdf 100644
--- a/text/maps/PokemonMansion3F.asm
+++ b/text/PokemonMansion3F.asm
diff --git a/text/maps/PokemonMansionB1F.asm b/text/PokemonMansionB1F.asm
index 1bc1ef89..1bc1ef89 100644
--- a/text/maps/PokemonMansionB1F.asm
+++ b/text/PokemonMansionB1F.asm
diff --git a/text/maps/PokemonTower1F.asm b/text/PokemonTower1F.asm
index 50a2cd29..50a2cd29 100644
--- a/text/maps/PokemonTower1F.asm
+++ b/text/PokemonTower1F.asm
diff --git a/text/maps/PokemonTower2F.asm b/text/PokemonTower2F.asm
index 79323001..79323001 100644
--- a/text/maps/PokemonTower2F.asm
+++ b/text/PokemonTower2F.asm
diff --git a/text/maps/PokemonTower3F.asm b/text/PokemonTower3F.asm
index 67098e6b..67098e6b 100644
--- a/text/maps/PokemonTower3F.asm
+++ b/text/PokemonTower3F.asm
diff --git a/text/maps/PokemonTower4F.asm b/text/PokemonTower4F.asm
index 771325a0..771325a0 100644
--- a/text/maps/PokemonTower4F.asm
+++ b/text/PokemonTower4F.asm
diff --git a/text/maps/PokemonTower5F.asm b/text/PokemonTower5F.asm
index b329118d..b329118d 100644
--- a/text/maps/PokemonTower5F.asm
+++ b/text/PokemonTower5F.asm
diff --git a/text/maps/PokemonTower6F.asm b/text/PokemonTower6F.asm
index 7532d56d..7532d56d 100644
--- a/text/maps/PokemonTower6F.asm
+++ b/text/PokemonTower6F.asm
diff --git a/text/maps/PokemonTower7F.asm b/text/PokemonTower7F.asm
index 704a71eb..704a71eb 100644
--- a/text/maps/PokemonTower7F.asm
+++ b/text/PokemonTower7F.asm
diff --git a/text/maps/PowerPlant.asm b/text/PowerPlant.asm
index e5df6674..e5df6674 100644
--- a/text/maps/PowerPlant.asm
+++ b/text/PowerPlant.asm
diff --git a/text/maps/RedsHouse1F.asm b/text/RedsHouse1F.asm
index 07768af9..07768af9 100644
--- a/text/maps/RedsHouse1F.asm
+++ b/text/RedsHouse1F.asm
diff --git a/text/maps/RockTunnel1F.asm b/text/RockTunnel1F.asm
index 472c52f8..472c52f8 100644
--- a/text/maps/RockTunnel1F.asm
+++ b/text/RockTunnel1F.asm
diff --git a/text/maps/RockTunnelB1F.asm b/text/RockTunnelB1F.asm
index 1a565eb3..1a565eb3 100644
--- a/text/maps/RockTunnelB1F.asm
+++ b/text/RockTunnelB1F.asm
diff --git a/text/maps/RockTunnelB1F_2.asm b/text/RockTunnelB1F_2.asm
index e8e45a7f..e8e45a7f 100644
--- a/text/maps/RockTunnelB1F_2.asm
+++ b/text/RockTunnelB1F_2.asm
diff --git a/text/maps/RockTunnelPokecenter.asm b/text/RockTunnelPokecenter.asm
index 0fc249ff..0fc249ff 100644
--- a/text/maps/RockTunnelPokecenter.asm
+++ b/text/RockTunnelPokecenter.asm
diff --git a/text/maps/RocketHideoutB1F.asm b/text/RocketHideoutB1F.asm
index 36117804..36117804 100644
--- a/text/maps/RocketHideoutB1F.asm
+++ b/text/RocketHideoutB1F.asm
diff --git a/text/maps/RocketHideoutB2F.asm b/text/RocketHideoutB2F.asm
index c13c3593..c13c3593 100644
--- a/text/maps/RocketHideoutB2F.asm
+++ b/text/RocketHideoutB2F.asm
diff --git a/text/maps/RocketHideoutB3F.asm b/text/RocketHideoutB3F.asm
index a146a383..a146a383 100644
--- a/text/maps/RocketHideoutB3F.asm
+++ b/text/RocketHideoutB3F.asm
diff --git a/text/maps/RocketHideoutB4F.asm b/text/RocketHideoutB4F.asm
index f3ba43f3..f3ba43f3 100644
--- a/text/maps/RocketHideoutB4F.asm
+++ b/text/RocketHideoutB4F.asm
diff --git a/text/maps/RocketHideoutElevator.asm b/text/RocketHideoutElevator.asm
index 6f2aa638..6f2aa638 100644
--- a/text/maps/RocketHideoutElevator.asm
+++ b/text/RocketHideoutElevator.asm
diff --git a/text/maps/Route1.asm b/text/Route1.asm
index 73188f09..73188f09 100644
--- a/text/maps/Route1.asm
+++ b/text/Route1.asm
diff --git a/text/maps/Route10.asm b/text/Route10.asm
index 057ddcb5..057ddcb5 100644
--- a/text/maps/Route10.asm
+++ b/text/Route10.asm
diff --git a/text/maps/Route11.asm b/text/Route11.asm
index 13e37bdf..13e37bdf 100644
--- a/text/maps/Route11.asm
+++ b/text/Route11.asm
diff --git a/text/maps/Route11Gate1F.asm b/text/Route11Gate1F.asm
index ef371d06..ef371d06 100644
--- a/text/maps/Route11Gate1F.asm
+++ b/text/Route11Gate1F.asm
diff --git a/text/maps/Route11Gate2F.asm b/text/Route11Gate2F.asm
index 10236081..10236081 100644
--- a/text/maps/Route11Gate2F.asm
+++ b/text/Route11Gate2F.asm
diff --git a/text/maps/Route11_2.asm b/text/Route11_2.asm
index b9b68d6d..b9b68d6d 100644
--- a/text/maps/Route11_2.asm
+++ b/text/Route11_2.asm
diff --git a/text/maps/Route12.asm b/text/Route12.asm
index 82696fda..82696fda 100644
--- a/text/maps/Route12.asm
+++ b/text/Route12.asm
diff --git a/text/maps/Route12Gate1F.asm b/text/Route12Gate1F.asm
index 51d75539..51d75539 100644
--- a/text/maps/Route12Gate1F.asm
+++ b/text/Route12Gate1F.asm
diff --git a/text/maps/Route12Gate2F.asm b/text/Route12Gate2F.asm
index 95a89527..95a89527 100644
--- a/text/maps/Route12Gate2F.asm
+++ b/text/Route12Gate2F.asm
diff --git a/text/maps/Route12SuperRodHouse.asm b/text/Route12SuperRodHouse.asm
index 7dfaa74f..7dfaa74f 100644
--- a/text/maps/Route12SuperRodHouse.asm
+++ b/text/Route12SuperRodHouse.asm
diff --git a/text/maps/Route13.asm b/text/Route13.asm
index e2718919..e2718919 100644
--- a/text/maps/Route13.asm
+++ b/text/Route13.asm
diff --git a/text/maps/Route14.asm b/text/Route14.asm
index 18e85ed4..18e85ed4 100644
--- a/text/maps/Route14.asm
+++ b/text/Route14.asm
diff --git a/text/maps/Route15.asm b/text/Route15.asm
index a23b8500..a23b8500 100644
--- a/text/maps/Route15.asm
+++ b/text/Route15.asm
diff --git a/text/maps/Route15Gate1F.asm b/text/Route15Gate1F.asm
index 0a526142..0a526142 100644
--- a/text/maps/Route15Gate1F.asm
+++ b/text/Route15Gate1F.asm
diff --git a/text/maps/Route15Gate2F.asm b/text/Route15Gate2F.asm
index ade4a358..ade4a358 100644
--- a/text/maps/Route15Gate2F.asm
+++ b/text/Route15Gate2F.asm
diff --git a/text/maps/Route16.asm b/text/Route16.asm
index 45265829..45265829 100644
--- a/text/maps/Route16.asm
+++ b/text/Route16.asm
diff --git a/text/maps/Route16FlyHouse.asm b/text/Route16FlyHouse.asm
index 77efde87..77efde87 100644
--- a/text/maps/Route16FlyHouse.asm
+++ b/text/Route16FlyHouse.asm
diff --git a/text/maps/Route16Gate1F.asm b/text/Route16Gate1F.asm
index f548977f..f548977f 100644
--- a/text/maps/Route16Gate1F.asm
+++ b/text/Route16Gate1F.asm
diff --git a/text/maps/Route16Gate2F.asm b/text/Route16Gate2F.asm
index d76b70ca..d76b70ca 100644
--- a/text/maps/Route16Gate2F.asm
+++ b/text/Route16Gate2F.asm
diff --git a/text/maps/Route17.asm b/text/Route17.asm
index a0affd90..a0affd90 100644
--- a/text/maps/Route17.asm
+++ b/text/Route17.asm
diff --git a/text/maps/Route18.asm b/text/Route18.asm
index d09caf82..d09caf82 100644
--- a/text/maps/Route18.asm
+++ b/text/Route18.asm
diff --git a/text/maps/Route18Gate1F.asm b/text/Route18Gate1F.asm
index f2f51039..f2f51039 100644
--- a/text/maps/Route18Gate1F.asm
+++ b/text/Route18Gate1F.asm
diff --git a/text/maps/Route18Gate2F.asm b/text/Route18Gate2F.asm
index 0fd2de09..0fd2de09 100644
--- a/text/maps/Route18Gate2F.asm
+++ b/text/Route18Gate2F.asm
diff --git a/text/maps/Route19.asm b/text/Route19.asm
index 244e31d0..244e31d0 100644
--- a/text/maps/Route19.asm
+++ b/text/Route19.asm
diff --git a/text/maps/Route2.asm b/text/Route2.asm
index dd7becc0..dd7becc0 100644
--- a/text/maps/Route2.asm
+++ b/text/Route2.asm
diff --git a/text/maps/Route20.asm b/text/Route20.asm
index 1ccf0b6c..1ccf0b6c 100644
--- a/text/maps/Route20.asm
+++ b/text/Route20.asm
diff --git a/text/maps/Route21.asm b/text/Route21.asm
index 3451953f..3451953f 100644
--- a/text/maps/Route21.asm
+++ b/text/Route21.asm
diff --git a/text/maps/Route22.asm b/text/Route22.asm
index 3a1d28f0..3a1d28f0 100644
--- a/text/maps/Route22.asm
+++ b/text/Route22.asm
diff --git a/text/maps/Route22Gate.asm b/text/Route22Gate.asm
index ce3f6824..ce3f6824 100644
--- a/text/maps/Route22Gate.asm
+++ b/text/Route22Gate.asm
diff --git a/text/maps/Route23.asm b/text/Route23.asm
index a7e534de..a7e534de 100644
--- a/text/maps/Route23.asm
+++ b/text/Route23.asm
diff --git a/text/maps/Route24.asm b/text/Route24.asm
index c14b689a..c14b689a 100644
--- a/text/maps/Route24.asm
+++ b/text/Route24.asm
diff --git a/text/maps/Route24_2.asm b/text/Route24_2.asm
index 325dea13..325dea13 100644
--- a/text/maps/Route24_2.asm
+++ b/text/Route24_2.asm
diff --git a/text/maps/Route25.asm b/text/Route25.asm
index 325ab348..325ab348 100644
--- a/text/maps/Route25.asm
+++ b/text/Route25.asm
diff --git a/text/maps/Route2Gate.asm b/text/Route2Gate.asm
index 566830f8..566830f8 100644
--- a/text/maps/Route2Gate.asm
+++ b/text/Route2Gate.asm
diff --git a/text/maps/Route2TradeHouse.asm b/text/Route2TradeHouse.asm
index 46fc1062..46fc1062 100644
--- a/text/maps/Route2TradeHouse.asm
+++ b/text/Route2TradeHouse.asm
diff --git a/text/maps/Route3.asm b/text/Route3.asm
index 966a0786..966a0786 100644
--- a/text/maps/Route3.asm
+++ b/text/Route3.asm
diff --git a/text/maps/Route4.asm b/text/Route4.asm
index 0a36f4cd..0a36f4cd 100644
--- a/text/maps/Route4.asm
+++ b/text/Route4.asm
diff --git a/text/maps/Route5.asm b/text/Route5.asm
index 54ff0f84..54ff0f84 100644
--- a/text/maps/Route5.asm
+++ b/text/Route5.asm
diff --git a/text/maps/Route6.asm b/text/Route6.asm
index c48b5d3d..c48b5d3d 100644
--- a/text/maps/Route6.asm
+++ b/text/Route6.asm
diff --git a/text/maps/Route7.asm b/text/Route7.asm
index 6500be96..6500be96 100644
--- a/text/maps/Route7.asm
+++ b/text/Route7.asm
diff --git a/text/maps/Route8.asm b/text/Route8.asm
index 57a9a5f9..57a9a5f9 100644
--- a/text/maps/Route8.asm
+++ b/text/Route8.asm
diff --git a/text/maps/Route9.asm b/text/Route9.asm
index 9975000d..9975000d 100644
--- a/text/maps/Route9.asm
+++ b/text/Route9.asm
diff --git a/text/maps/SSAnne1F.asm b/text/SSAnne1F.asm
index 2bbdcbac..2bbdcbac 100644
--- a/text/maps/SSAnne1F.asm
+++ b/text/SSAnne1F.asm
diff --git a/text/maps/SSAnne1FRooms.asm b/text/SSAnne1FRooms.asm
index 7a09303e..7a09303e 100644
--- a/text/maps/SSAnne1FRooms.asm
+++ b/text/SSAnne1FRooms.asm
diff --git a/text/maps/SSAnne2F.asm b/text/SSAnne2F.asm
index 58d804ba..58d804ba 100644
--- a/text/maps/SSAnne2F.asm
+++ b/text/SSAnne2F.asm
diff --git a/text/maps/SSAnne2FRooms.asm b/text/SSAnne2FRooms.asm
index a9be8cee..a9be8cee 100644
--- a/text/maps/SSAnne2FRooms.asm
+++ b/text/SSAnne2FRooms.asm
diff --git a/text/maps/SSAnne3F.asm b/text/SSAnne3F.asm
index 76490594..76490594 100644
--- a/text/maps/SSAnne3F.asm
+++ b/text/SSAnne3F.asm
diff --git a/text/maps/SSAnneB1FRooms.asm b/text/SSAnneB1FRooms.asm
index 7df629b5..7df629b5 100644
--- a/text/maps/SSAnneB1FRooms.asm
+++ b/text/SSAnneB1FRooms.asm
diff --git a/text/maps/SSAnneBow.asm b/text/SSAnneBow.asm
index 76cd5631..76cd5631 100644
--- a/text/maps/SSAnneBow.asm
+++ b/text/SSAnneBow.asm
diff --git a/text/maps/SSAnneCaptainsRoom.asm b/text/SSAnneCaptainsRoom.asm
index 7bf004da..7bf004da 100644
--- a/text/maps/SSAnneCaptainsRoom.asm
+++ b/text/SSAnneCaptainsRoom.asm
diff --git a/text/maps/SSAnneKitchen.asm b/text/SSAnneKitchen.asm
index 7fcc9973..7fcc9973 100644
--- a/text/maps/SSAnneKitchen.asm
+++ b/text/SSAnneKitchen.asm
diff --git a/text/maps/SafariZoneCenter.asm b/text/SafariZoneCenter.asm
index 09918f93..09918f93 100644
--- a/text/maps/SafariZoneCenter.asm
+++ b/text/SafariZoneCenter.asm
diff --git a/text/maps/SafariZoneCenterRestHouse.asm b/text/SafariZoneCenterRestHouse.asm
index b6c87818..b6c87818 100644
--- a/text/maps/SafariZoneCenterRestHouse.asm
+++ b/text/SafariZoneCenterRestHouse.asm
diff --git a/text/maps/SafariZoneEast.asm b/text/SafariZoneEast.asm
index eebe5de7..eebe5de7 100644
--- a/text/maps/SafariZoneEast.asm
+++ b/text/SafariZoneEast.asm
diff --git a/text/maps/SafariZoneEastRestHouse.asm b/text/SafariZoneEastRestHouse.asm
index d5f7abc8..d5f7abc8 100644
--- a/text/maps/SafariZoneEastRestHouse.asm
+++ b/text/SafariZoneEastRestHouse.asm
diff --git a/text/maps/SafariZoneGate.asm b/text/SafariZoneGate.asm
index 5c143891..5c143891 100644
--- a/text/maps/SafariZoneGate.asm
+++ b/text/SafariZoneGate.asm
diff --git a/text/maps/SafariZoneNorth.asm b/text/SafariZoneNorth.asm
index 1e148f0b..1e148f0b 100644
--- a/text/maps/SafariZoneNorth.asm
+++ b/text/SafariZoneNorth.asm
diff --git a/text/maps/SafariZoneNorthRestHouse.asm b/text/SafariZoneNorthRestHouse.asm
index 93f02c8f..93f02c8f 100644
--- a/text/maps/SafariZoneNorthRestHouse.asm
+++ b/text/SafariZoneNorthRestHouse.asm
diff --git a/text/maps/SafariZoneSecretHouse.asm b/text/SafariZoneSecretHouse.asm
index 3df79d90..3df79d90 100644
--- a/text/maps/SafariZoneSecretHouse.asm
+++ b/text/SafariZoneSecretHouse.asm
diff --git a/text/maps/SafariZoneWest.asm b/text/SafariZoneWest.asm
index dcb2fe6c..dcb2fe6c 100644
--- a/text/maps/SafariZoneWest.asm
+++ b/text/SafariZoneWest.asm
diff --git a/text/maps/SafariZoneWestRestHouse.asm b/text/SafariZoneWestRestHouse.asm
index 94802b13..94802b13 100644
--- a/text/maps/SafariZoneWestRestHouse.asm
+++ b/text/SafariZoneWestRestHouse.asm
diff --git a/text/maps/SaffronCity.asm b/text/SaffronCity.asm
index a0422c8c..a0422c8c 100644
--- a/text/maps/SaffronCity.asm
+++ b/text/SaffronCity.asm
diff --git a/text/maps/SaffronGates.asm b/text/SaffronGates.asm
index 9bb4601f..9bb4601f 100644
--- a/text/maps/SaffronGates.asm
+++ b/text/SaffronGates.asm
diff --git a/text/maps/SaffronGym.asm b/text/SaffronGym.asm
index 6f49a331..6f49a331 100644
--- a/text/maps/SaffronGym.asm
+++ b/text/SaffronGym.asm
diff --git a/text/maps/SaffronMart.asm b/text/SaffronMart.asm
index a43b0d94..a43b0d94 100644
--- a/text/maps/SaffronMart.asm
+++ b/text/SaffronMart.asm
diff --git a/text/maps/SaffronPidgeyHouse.asm b/text/SaffronPidgeyHouse.asm
index 214bf089..214bf089 100644
--- a/text/maps/SaffronPidgeyHouse.asm
+++ b/text/SaffronPidgeyHouse.asm
diff --git a/text/maps/SaffronPokecenter.asm b/text/SaffronPokecenter.asm
index 6548aff8..6548aff8 100644
--- a/text/maps/SaffronPokecenter.asm
+++ b/text/SaffronPokecenter.asm
diff --git a/text/maps/SeafoamIslandsB4F.asm b/text/SeafoamIslandsB4F.asm
index 608d165f..608d165f 100644
--- a/text/maps/SeafoamIslandsB4F.asm
+++ b/text/SeafoamIslandsB4F.asm
diff --git a/text/maps/SilphCo10F.asm b/text/SilphCo10F.asm
index e916c64a..e916c64a 100644
--- a/text/maps/SilphCo10F.asm
+++ b/text/SilphCo10F.asm
diff --git a/text/maps/SilphCo11F.asm b/text/SilphCo11F.asm
index fbaa6086..fbaa6086 100644
--- a/text/maps/SilphCo11F.asm
+++ b/text/SilphCo11F.asm
diff --git a/text/maps/SilphCo1F.asm b/text/SilphCo1F.asm
index 1ef80189..1ef80189 100644
--- a/text/maps/SilphCo1F.asm
+++ b/text/SilphCo1F.asm
diff --git a/text/maps/SilphCo2F.asm b/text/SilphCo2F.asm
index bd87630a..bd87630a 100644
--- a/text/maps/SilphCo2F.asm
+++ b/text/SilphCo2F.asm
diff --git a/text/maps/SilphCo3F.asm b/text/SilphCo3F.asm
index b6a023f9..b6a023f9 100644
--- a/text/maps/SilphCo3F.asm
+++ b/text/SilphCo3F.asm
diff --git a/text/maps/SilphCo4F.asm b/text/SilphCo4F.asm
index 5b484ec7..5b484ec7 100644
--- a/text/maps/SilphCo4F.asm
+++ b/text/SilphCo4F.asm
diff --git a/text/maps/SilphCo5F.asm b/text/SilphCo5F.asm
index dab42539..dab42539 100644
--- a/text/maps/SilphCo5F.asm
+++ b/text/SilphCo5F.asm
diff --git a/text/maps/SilphCo5F_2.asm b/text/SilphCo5F_2.asm
index 3c1b8ead..3c1b8ead 100644
--- a/text/maps/SilphCo5F_2.asm
+++ b/text/SilphCo5F_2.asm
diff --git a/text/maps/SilphCo6F.asm b/text/SilphCo6F.asm
index 90456b5c..90456b5c 100644
--- a/text/maps/SilphCo6F.asm
+++ b/text/SilphCo6F.asm
diff --git a/text/maps/SilphCo7F.asm b/text/SilphCo7F.asm
index 1cc2bc30..1cc2bc30 100644
--- a/text/maps/SilphCo7F.asm
+++ b/text/SilphCo7F.asm
diff --git a/text/maps/SilphCo8F.asm b/text/SilphCo8F.asm
index fabae5e6..fabae5e6 100644
--- a/text/maps/SilphCo8F.asm
+++ b/text/SilphCo8F.asm
diff --git a/text/maps/SilphCo9F.asm b/text/SilphCo9F.asm
index fd1aa91c..fd1aa91c 100644
--- a/text/maps/SilphCo9F.asm
+++ b/text/SilphCo9F.asm
diff --git a/text/maps/UndergroundPathRoute6.asm b/text/UndergroundPathRoute6.asm
index dacc44f7..dacc44f7 100644
--- a/text/maps/UndergroundPathRoute6.asm
+++ b/text/UndergroundPathRoute6.asm
diff --git a/text/maps/UndergroundPathRoute7.asm b/text/UndergroundPathRoute7.asm
index 5cde3614..5cde3614 100644
--- a/text/maps/UndergroundPathRoute7.asm
+++ b/text/UndergroundPathRoute7.asm
diff --git a/text/maps/UndergroundPathRoute7Copy.asm b/text/UndergroundPathRoute7Copy.asm
index 4e0dc3ca..4e0dc3ca 100644
--- a/text/maps/UndergroundPathRoute7Copy.asm
+++ b/text/UndergroundPathRoute7Copy.asm
diff --git a/text/maps/UndergroundPathRoute8.asm b/text/UndergroundPathRoute8.asm
index da785c8e..da785c8e 100644
--- a/text/maps/UndergroundPathRoute8.asm
+++ b/text/UndergroundPathRoute8.asm
diff --git a/text/maps/VermilionCity.asm b/text/VermilionCity.asm
index 1cbc535c..1cbc535c 100644
--- a/text/maps/VermilionCity.asm
+++ b/text/VermilionCity.asm
diff --git a/text/maps/VermilionDock.asm b/text/VermilionDock.asm
index 5d998e82..5d998e82 100644
--- a/text/maps/VermilionDock.asm
+++ b/text/VermilionDock.asm
diff --git a/text/maps/VermilionGym.asm b/text/VermilionGym.asm
index 14e0bcea..14e0bcea 100644
--- a/text/maps/VermilionGym.asm
+++ b/text/VermilionGym.asm
diff --git a/text/maps/VermilionGym_2.asm b/text/VermilionGym_2.asm
index 50da9719..50da9719 100644
--- a/text/maps/VermilionGym_2.asm
+++ b/text/VermilionGym_2.asm
diff --git a/text/maps/VermilionMart.asm b/text/VermilionMart.asm
index 10743989..10743989 100644
--- a/text/maps/VermilionMart.asm
+++ b/text/VermilionMart.asm
diff --git a/text/maps/VermilionOldRodHouse.asm b/text/VermilionOldRodHouse.asm
index 32526e36..32526e36 100644
--- a/text/maps/VermilionOldRodHouse.asm
+++ b/text/VermilionOldRodHouse.asm
diff --git a/text/maps/VermilionPidgeyHouse.asm b/text/VermilionPidgeyHouse.asm
index 91c18708..91c18708 100644
--- a/text/maps/VermilionPidgeyHouse.asm
+++ b/text/VermilionPidgeyHouse.asm
diff --git a/text/maps/VermilionPokecenter.asm b/text/VermilionPokecenter.asm
index c9e9a581..c9e9a581 100644
--- a/text/maps/VermilionPokecenter.asm
+++ b/text/VermilionPokecenter.asm
diff --git a/text/maps/VictoryRoad1F.asm b/text/VictoryRoad1F.asm
index 1523db88..1523db88 100644
--- a/text/maps/VictoryRoad1F.asm
+++ b/text/VictoryRoad1F.asm
diff --git a/text/maps/VictoryRoad2F.asm b/text/VictoryRoad2F.asm
index ec9dcf4f..ec9dcf4f 100644
--- a/text/maps/VictoryRoad2F.asm
+++ b/text/VictoryRoad2F.asm
diff --git a/text/maps/VictoryRoad3F.asm b/text/VictoryRoad3F.asm
index 07e0be70..07e0be70 100644
--- a/text/maps/VictoryRoad3F.asm
+++ b/text/VictoryRoad3F.asm
diff --git a/text/maps/ViridianCity.asm b/text/ViridianCity.asm
index 67ab5c40..67ab5c40 100644
--- a/text/maps/ViridianCity.asm
+++ b/text/ViridianCity.asm
diff --git a/text/maps/ViridianForest.asm b/text/ViridianForest.asm
index 813b193a..813b193a 100644
--- a/text/maps/ViridianForest.asm
+++ b/text/ViridianForest.asm
diff --git a/text/maps/ViridianForestNorthGate.asm b/text/ViridianForestNorthGate.asm
index ab6a5a1d..ab6a5a1d 100644
--- a/text/maps/ViridianForestNorthGate.asm
+++ b/text/ViridianForestNorthGate.asm
diff --git a/text/maps/ViridianForestSouthGate.asm b/text/ViridianForestSouthGate.asm
index c1a8df22..c1a8df22 100644
--- a/text/maps/ViridianForestSouthGate.asm
+++ b/text/ViridianForestSouthGate.asm
diff --git a/text/maps/ViridianGym.asm b/text/ViridianGym.asm
index 4c7b5207..4c7b5207 100644
--- a/text/maps/ViridianGym.asm
+++ b/text/ViridianGym.asm
diff --git a/text/maps/ViridianMart.asm b/text/ViridianMart.asm
index 61750afe..61750afe 100644
--- a/text/maps/ViridianMart.asm
+++ b/text/ViridianMart.asm
diff --git a/text/maps/ViridianNicknameHouse.asm b/text/ViridianNicknameHouse.asm
index 757f597a..757f597a 100644
--- a/text/maps/ViridianNicknameHouse.asm
+++ b/text/ViridianNicknameHouse.asm
diff --git a/text/maps/ViridianPokecenter.asm b/text/ViridianPokecenter.asm
index 4ac18bf6..4ac18bf6 100644
--- a/text/maps/ViridianPokecenter.asm
+++ b/text/ViridianPokecenter.asm
diff --git a/text/maps/ViridianSchoolHouse.asm b/text/ViridianSchoolHouse.asm
index f6041e0d..f6041e0d 100644
--- a/text/maps/ViridianSchoolHouse.asm
+++ b/text/ViridianSchoolHouse.asm
diff --git a/text/maps/WardensHouse.asm b/text/WardensHouse.asm
index 7efddb90..7efddb90 100644
--- a/text/maps/WardensHouse.asm
+++ b/text/WardensHouse.asm
diff --git a/text/oakspeech.asm b/text/oakspeech.asm
deleted file mode 100644
index e006d16f..00000000
--- a/text/oakspeech.asm
+++ /dev/null
@@ -1,55 +0,0 @@
-_OakSpeechText1::
-	text "Hello there!"
-	line "Welcome to the"
-	cont "world of #MON!"
-
-	para "My name is OAK!"
-	line "People call me"
-	cont "the #MON PROF!"
-	prompt
-
-_OakSpeechText2A::
-	text "This world is"
-	line "inhabited by"
-	cont "creatures called"
-	cont "#MON!@@"
-
-_OakSpeechText2B::
-	text $51,"For some people,"
-	line "#MON are"
-	cont "pets. Others use"
-	cont "them for fights."
-
-	para "Myself..."
-
-	para "I study #MON"
-	line "as a profession."
-	prompt
-
-_IntroducePlayerText::
-	text "First, what is"
-	line "your name?"
-	prompt
-
-_IntroduceRivalText::
-	text "This is my grand-"
-	line "son. He's been"
-	cont "your rival since"
-	cont "you were a baby."
-
-	para "...Erm, what is"
-	line "his name again?"
-	prompt
-
-_OakSpeechText3::
-	text "<PLAYER>!"
-
-	para "Your very own"
-	line "#MON legend is"
-	cont "about to unfold!"
-
-	para "A world of dreams"
-	line "and adventures"
-	cont "with #MON"
-	cont "awaits! Let's go!"
-	done
diff --git a/text/unused_names.asm b/text/unused_names.asm
deleted file mode 100644
index 4aca7ca2..00000000
--- a/text/unused_names.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-UnusedNames::
-	db "かみなりバッヂ@"
-	db "かいがらバッヂ@"
-	db "おじぞうバッヂ@"
-	db "はやぶさバッヂ@"
-	db "ひんやりバッヂ@"
-	db "なかよしバッヂ@"
-	db "バラバッヂ@"
-	db "ひのたまバッヂ@"
-	db "ゴールドバッヂ@"
-	db "たまご@"
-	db "ひよこ@"
-	db "ブロンズ@"
-	db "シルバー@"
-	db "ゴールド@"
-	db "プチキャプテン@"
-	db "キャプテン@"
-	db "プチマスター@"
-	db "マスター@"
-	db "エクセレント"