Sync with pokered

author: dannye <33dannye@gmail.com> 2020-11-04 00:06:44 -0600
committer: dannye <33dannye@gmail.com> 2020-11-04 00:06:44 -0600
commit: 5647ca687b92954dcf37a6ea6bfbc9a341c32de4 (patch)
tree: dde1937a1bfdb3a835f4155e1c2eb8f1aaf86f63 /text
parent: 53fcd05aa24693093d8af1dc8ec4fedd3957decc (diff)
218 files changed, 348 insertions, 2726 deletions
diff --git a/text/maps/AgathasRoom.asm b/text/AgathasRoom.asm
index 82cbcd81..82cbcd81 100644
--- a/text/maps/AgathasRoom.asm
+++ b/text/AgathasRoom.asm
diff --git a/text/maps/BeachHouse.asm b/text/BeachHouse.asm
index bc50b837..d15e0b9a 100644
--- a/text/maps/BeachHouse.asm
+++ b/text/BeachHouse.asm
@@ -73,11 +73,13 @@ _BeachHouseSign3Text2::
 
 _BeachHousePrinterText1::
 	text "It's some sort of"
-	line "a machine...@@"
+	line "a machine...@"
+	text_end
 
 _BeachHousePrinterText2::
 	text "SUMMER BEACH HOUSE"
-	line "PRINTER, it says.@@"
+	line "PRINTER, it says.@"
+	text_end
 
 _BeachHousePrinterText3::
 	text "The Hi-Score is"
@@ -97,7 +99,9 @@ _BeachHousePrinterText4::
 	done
 
 _BeachHousePrinterText5::
-	text "PRINT completed.@@"
+	text "PRINT completed.@"
+	text_end
 
 _BeachHousePrinterText6::
-	text "PRINT error!@@"
+	text "PRINT error!@"
+	text_end
diff --git a/text/maps/BikeShop.asm b/text/BikeShop.asm
index 1717c552..254da08c 100644
--- a/text/maps/BikeShop.asm
+++ b/text/BikeShop.asm
@@ -27,7 +27,8 @@ _BikeShopText_1d81f::
 _BikeShopText_1d824::
 	text "<PLAYER> exchanged"
 	line "the BIKE VOUCHER"
-	cont "for a BICYCLE.@@"
+	cont "for a BICYCLE.@"
+	text_end
 
 _BikeShopComeAgainText::
 	text "Come back again"
diff --git a/text/maps/BillsHouse.asm b/text/BillsHouse.asm
index 858dfe80..2ad5748a 100644
--- a/text/maps/BillsHouse.asm
+++ b/text/BillsHouse.asm
@@ -61,8 +61,9 @@ _BillThankYouText::
 _SSTicketReceivedText::
 	text "<PLAYER> received"
 	line "an @"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _SSTicketNoRoomText::
 	text "You've got too"
diff --git a/text/maps/BluesHouse.asm b/text/BluesHouse.asm
index 8f1d8ecf..d799b9ed 100644
--- a/text/maps/BluesHouse.asm
+++ b/text/BluesHouse.asm
@@ -14,8 +14,9 @@ _DaisyOfferMapText::
 _GotMapText::
 	text "<PLAYER> got a"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _DaisyBagFullText::
 	text "You have too much"
@@ -28,14 +29,14 @@ _DaisyUseMapText::
 	cont "you are."
 	done
 
-_BluesHouseText2::
+_BluesHouseDaisyWalkingText::
 	text "Spending time"
 	line "with your #MON"
 	cont "makes them more"
 	cont "friendly to you."
 	done
 
-_BluesHouseText3::
+_BluesHouseTownMapText::
 	text "It's a big map!"
 	line "This is useful!"
 	done
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 1bf76470..6ec80e66 100644
--- a/text/maps/CeladonCity.asm
+++ b/text/CeladonCity.asm
@@ -42,8 +42,9 @@ _TM41PreText::
 _ReceivedTM41Text::
 	text "<PLAYER> received"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _TM41ExplanationText::
 	text "TM41 teaches"
@@ -72,7 +73,8 @@ _CeladonCityText6::
 
 _CeladonCityText7::
 	text "POLIWRATH: Ribi"
-	line "ribit!@@"
+	line "ribit!@"
+	text_end
 
 _CeladonCityText8::
 	text "What are you"
diff --git a/text/maps/CeladonDiner.asm b/text/CeladonDiner.asm
index dc5e9350..dd86a0c1 100644
--- a/text/maps/CeladonDiner.asm
+++ b/text/CeladonDiner.asm
@@ -44,8 +44,9 @@ _CeladonDinerText_491a7::
 _ReceivedCoinCaseText::
 	text "<PLAYER> received"
 	line "a @"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _CoinCaseNoRoomText::
 	text "Make room for"
diff --git a/text/maps/CeladonGym.asm b/text/CeladonGym.asm
index d6586035..5d354bbb 100644
--- a/text/maps/CeladonGym.asm
+++ b/text/CeladonGym.asm
@@ -64,11 +64,12 @@ _CeladonGymText9::
 _ReceivedTM21Text::
 	text "<PLAYER> received"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _TM21ExplanationText::
-	text ""
+	text_start
 
 	para "TM21 contains"
 	line "MEGA DRAIN."
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 23123892..52946a41 100644
--- a/text/maps/CeladonMansion1F.asm
+++ b/text/CeladonMansion1F.asm
@@ -1,13 +1,16 @@
 _CeladonMansion1Text1::
-	text "MEOWTH: Meow!@@"
+	text "MEOWTH: Meow!@"
+	text_end
 
 _CeladonMansion1Text3::
 	text "CLEFAIRY: Pi"
-	line "pippippi!@@"
+	line "pippippi!@"
+	text_end
 
 _CeladonMansion1Text4::
 	text "NIDORAN: Kya"
-	line "kyaoo!@@"
+	line "kyaoo!@"
+	text_end
 
 _CeladonMansion1Text5::
 	text "CELADON MANSION"
@@ -25,7 +28,8 @@ _CeladonMansion1Text2::
 _CeladonMansion1Text6::
 	text "Oh, you have an"
 	line "adorable PIKACHU"
-	cont "with you.@@"
+	cont "with you.@"
+	text_end
 
 _CeladonMansion1Text7::
 	text "It seems like it"
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 baf86186..4381c60f 100644
--- a/text/maps/CeladonMansion3F.asm
+++ b/text/CeladonMansion3F.asm
@@ -83,7 +83,8 @@ _CompletedDexText::
 	line "You completed"
 	cont "your #DEX!"
 	cont "Congratulations!"
-	cont "...@@"
+	cont "...@"
+	text_end
 
 _CompletedDexText2::
 	text "Go show off your"
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 7de4a826..633f1d3b 100644
--- a/text/maps/CeladonMart3F.asm
+++ b/text/CeladonMart3F.asm
@@ -82,8 +82,9 @@ _TM18PreReceiveText::
 _ReceivedTM18Text::
 	text "<PLAYER> received"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _TM18ExplanationText::
 	text "TM18 is COUNTER!"
diff --git a/text/maps/CeladonMart4F.asm b/text/CeladonMart4F.asm
index c17483c1..c17483c1 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 cfeddaf6..fa6f1f64 100644
--- a/text/maps/CeladonMartRoof.asm
+++ b/text/CeladonMartRoof.asm
@@ -11,24 +11,27 @@ _CeladonMartRoofText_484f3::
 	para "Thank you!"
 
 	para "You can have this"
-	line "from me!@@"
+	line "from me!@"
+	text_end
 
 _CeladonMartRoofText_484f9::
 	text "<PLAYER> received"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _CeladonMartRoofText_484fe::
-	text ""
+	text_start
 
 	para "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " contains"
 	line "ICE BEAM!"
 
 	para "It can freeze the"
-	line "target sometimes!@@"
+	line "target sometimes!@"
+	text_end
 
 _CeladonMartRoofText_48504::
 	text "Yay!"
@@ -38,21 +41,24 @@ _CeladonMartRoofText_48504::
 	para "Thank you!"
 
 	para "You can have this"
-	line "from me!@@"
+	line "from me!@"
+	text_end
 
 _CeladonMartRoofText_4850a::
 	text "<PLAYER> received"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _CeladonMartRoofText_4850f::
-	text ""
+	text_start
 
 	para "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " contains"
-	line "ROCK SLIDE!@@"
+	line "ROCK SLIDE!@"
+	text_end
 
 _CeladonMartRoofText_48515::
 	text "Yay!"
@@ -62,26 +68,31 @@ _CeladonMartRoofText_48515::
 	para "Thank you!"
 
 	para "You can have this"
-	line "from me!@@"
+	line "from me!@"
+	text_end
 
 _ReceivedTM49Text::
 	text "<PLAYER> received"
-	line "TM49!@@"
+	line "TM49!@"
+	text_end
 
 _CeladonMartRoofText_48520::
-	text ""
+	text_start
 
 	para "TM49 contains"
-	line "TRI ATTACK!@@"
+	line "TRI ATTACK!@"
+	text_end
 
 _CeladonMartRoofText_48526::
 	text "You don't have"
-	line "space for this!@@"
+	line "space for this!@"
+	text_end
 
 _CeladonMartRoofText_4852c::
 	text "No thank you!"
 	line "I'm not thirsty"
-	cont "after all!@@"
+	cont "after all!@"
+	text_end
 
 _CeladonMartRoofText1::
 	text "My sister is a"
@@ -123,8 +134,8 @@ _VendingMachineText4::
 	done
 
 _VendingMachineText5::
-	TX_RAM wcf4b
-	text ""
+	text_ram wcf4b
+	text_start
 	line "popped out!"
 	done
 
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 4bba10cd..4bba10cd 100644
--- a/text/maps/CeruleanBadgeHouse.asm
+++ b/text/CeruleanBadgeHouse.asm
diff --git a/text/maps/CeruleanBadgeHouse_2.asm b/text/CeruleanBadgeHouse_2.asm
index e5da0622..e5da0622 100755..100644
--- a/text/maps/CeruleanBadgeHouse_2.asm
+++ b/text/CeruleanBadgeHouse_2.asm
diff --git a/text/CeruleanCaveB1F.asm b/text/CeruleanCaveB1F.asm
new file mode 100644
index 00000000..cb407c60
--- /dev/null
+++ b/text/CeruleanCaveB1F.asm
@@ -0,0 +1,3 @@
+_MewtwoBattleText::
+	text "Mew!@"
+	text_end
diff --git a/text/maps/CeruleanCity.asm b/text/CeruleanCity.asm
index 4bc16e7d..955dca89 100644
--- a/text/maps/CeruleanCity.asm
+++ b/text/CeruleanCity.asm
@@ -70,13 +70,15 @@ _CeruleanCityText_196d9::
 
 _ReceivedTM28Text::
 	text "<PLAYER> recovered"
-	line "TM28!@@"
+	line "TM28!@"
+	text_end
 
 _ReceivedTM28Text2::
-	text ""
+	text_start
 
 	para "I better get"
-	line "moving! Bye!@@"
+	line "moving! Bye!@"
+	text_end
 
 _TM28NoRoomText::
 	text "Make room for"
diff --git a/text/maps/CeruleanGym.asm b/text/CeruleanGym.asm
index 9f2c4694..4f8d5ab2 100644
--- a/text/maps/CeruleanGym.asm
+++ b/text/CeruleanGym.asm
@@ -49,7 +49,8 @@ _CeruleanGymText_5c7c8::
 
 _ReceivedTM11Text::
 	text "<PLAYER> received"
-	line "TM11!@@"
+	line "TM11!@"
+	text_end
 
 _CeruleanGymText_5c7d3::
 	text "You better make"
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 791c11d5..d50a4ac4 100644
--- a/text/maps/CeruleanTradeHouse.asm
+++ b/text/CeruleanTradeHouse.asm
@@ -8,7 +8,8 @@ MelanieText1::
 
 	para "It needs a good"
 	line "trainer to take"
-	cont "care of it now.@@"
+	cont "care of it now.@"
+	text_end
 
 MelanieText2::
 	text "I know! Would you"
@@ -18,22 +19,28 @@ MelanieText2::
 
 MelanieText3::
 	text "Please take care"
-	line "of BULBASAUR!@@"
+	line "of BULBASAUR!@"
+	text_end
 
 MelanieText4::
 	text "Is BULBASAUR"
-	line "doing well?@@"
+	line "doing well?@"
+	text_end
 
 MelanieText5::
 	text "Oh..."
-	line "That's too bad...@@"
+	line "That's too bad...@"
+	text_end
 
 MelanieBulbasaurText::
 	text "BULBASAUR: Bubba!"
-	line "Zoar!@@"
+	line "Zoar!@"
+	text_end
 
 MelanieOddishText::
-	text "ODDISH: Orddissh!@@"
+	text "ODDISH: Orddissh!@"
+	text_end
 
 MelanieSandshrewText::
-	text "SANDSHREW: Pikii!@@"
+	text "SANDSHREW: Pikii!@"
+	text_end
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..575b7da4 100644
--- a/text/maps/ChampionsRoom.asm
+++ b/text/ChampionsRoom.asm
@@ -96,7 +96,7 @@ _GaryText_76120::
 	line "much since you"
 	cont "first left with"
 	cont "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 
 	para "<PLAYER>, you have"
diff --git a/text/maps/CinnabarGym.asm b/text/CinnabarGym.asm
index ee1fc31a..a59dbeaa 100644
--- a/text/maps/CinnabarGym.asm
+++ b/text/CinnabarGym.asm
@@ -18,7 +18,8 @@ _BlaineEndBattleText::
 	line "burnt out!"
 
 	para "You have earned"
-	line "the VOLCANOBADGE!@@"
+	line "the VOLCANOBADGE!@"
+	text_end
 
 _BlaineFireBlastText::
 	text "FIRE BLAST is the"
@@ -44,11 +45,12 @@ _BlaineBadgeText::
 _ReceivedTM38Text::
 	text "<PLAYER> received"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _TM38ExplanationText::
-	text ""
+	text_start
 
 	para "TM38 contains"
 	line "FIRE BLAST!"
diff --git a/text/maps/CinnabarIsland.asm b/text/CinnabarIsland.asm
index 54552a46..54552a46 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..e7983fe9 100644
--- a/text/maps/CinnabarLabFossilRoom.asm
+++ b/text/CinnabarLabFossilRoom.asm
@@ -30,20 +30,20 @@ _Lab4Text_75dd5::
 	line "back to life!"
 
 	para "It was @"
-	TX_RAM wcf4b
-	text ""
+	text_ram wcf4b
+	text_start
 	line "like I think!"
 	prompt
 
 _Lab4Text_610ae::
 	text "Oh! That is"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 
 	para "It is fossil of"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text ", a"
 	cont "#MON that is"
 	cont "already extinct!"
@@ -60,7 +60,7 @@ _Lab4Text_610b3::
 
 	para "<PLAYER> handed"
 	line "over @"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 	prompt
 
diff --git a/text/maps/CinnabarLabMetronomeRoom.asm b/text/CinnabarLabMetronomeRoom.asm
index fa04677f..f9b2c5d5 100644
--- a/text/maps/CinnabarLabMetronomeRoom.asm
+++ b/text/CinnabarLabMetronomeRoom.asm
@@ -9,8 +9,9 @@ _TM35PreReceiveText::
 _ReceivedTM35Text::
 	text "<PLAYER> received "
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _TM35ExplanationText::
 	text "Tch-tch-tch!"
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 bd3029fd..d2d1f42a 100644
--- a/text/maps/CopycatsHouse1F.asm
+++ b/text/CopycatsHouse1F.asm
@@ -17,4 +17,5 @@ _CopycatsHouse1FText2::
 
 _CopycatsHouse1FText3::
 	text "CHANSEY: Chaaan"
-	line "sey!@@"
+	line "sey!@"
+	text_end
diff --git a/text/maps/CopycatsHouse2F.asm b/text/CopycatsHouse2F.asm
index 561b2ac5..7d1aa0ad 100644
--- a/text/maps/CopycatsHouse2F.asm
+++ b/text/CopycatsHouse2F.asm
@@ -29,17 +29,19 @@ _TM31PreReceiveText::
 _ReceivedTM31Text::
 	text "<PLAYER> received"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _TM31ExplanationText1::
-	text ""
+	text_start
 
 	para "TM31 contains my"
 	line "favorite, MIMIC!"
 
 	para "Use it on a good"
-	line "#MON!@@"
+	line "#MON!@"
+	text_end
 
 _TM31ExplanationText2::
 	text "<PLAYER>: Hi!"
@@ -57,7 +59,8 @@ _TM31ExplanationText2::
 
 _TM31NoRoomText::
 	text "Don't you want"
-	line "this?@@"
+	line "this?@"
+	text_end
 
 _CopycatsHouse2FText2::
 	text "DODUO: Giiih!"
diff --git a/text/maps/Daycare.asm b/text/Daycare.asm
index 479898c8..aa1e5bc5 100644
--- a/text/maps/Daycare.asm
+++ b/text/Daycare.asm
@@ -13,8 +13,8 @@ _DayCareWhichMonText::
 _DayCareWillLookAfterMonText::
 	text "Fine, I'll look"
 	line "after @"
-	TX_RAM wcd6d
-	text ""
+	text_ram wcd6d
+	text_start
 	cont "for a while."
 	prompt
 
@@ -25,13 +25,13 @@ _DayCareComeSeeMeInAWhileText::
 
 _DayCareMonHasGrownText::
 	text "Your @"
-	TX_RAM wcd6d
-	text ""
+	text_ram wcd6d
+	text_start
 	line "has grown a lot!"
 
 	para "By level, it's"
 	line "grown by @"
-	TX_NUM wDayCareNumLevelsGrown,$1,$3
+	text_decimal wDayCareNumLevelsGrown, 1, 3
 	text "!"
 
 	para "Aren't I great?"
@@ -39,8 +39,8 @@ _DayCareMonHasGrownText::
 
 _DayCareOweMoneyText::
 	text "You owe me ¥@"
-	TX_BCD wDayCareTotalCost, $c2
-	text ""
+	text_bcd wDayCareTotalCost, 2 | LEADING_ZEROES | LEFT_ALIGN
+	text_start
 	line "for the return"
 	cont "of this #MON."
 	done
@@ -48,22 +48,23 @@ _DayCareOweMoneyText::
 _DayCareGotMonBackText::
 	text "<PLAYER> got"
 	line "@"
-	TX_RAM wDayCareMonName
+	text_ram wDayCareMonName
 	text " back!"
 	done
 
 _DayCareMonNeedsMoreTimeText::
 	text "Back already?"
 	line "Your @"
-	TX_RAM wcd6d
-	text ""
+	text_ram wcd6d
+	text_start
 	cont "needs some more"
 	cont "time with me."
 	prompt
 
 _DayCareAllRightThenText::
 	text "All right then,"
-	line "@@"
+	line "@"
+	text_end
 
 _DayCareComeAgainText::
 	text "Come again."
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 a6ccc8c3..a6ccc8c3 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 0392a1ed..0392a1ed 100644
--- a/text/maps/FuchsiaCity.asm
+++ b/text/FuchsiaCity.asm
diff --git a/text/maps/FuchsiaGoodRodHouse.asm b/text/FuchsiaGoodRodHouse.asm
index b1b8b2f2..142c2837 100644
--- a/text/maps/FuchsiaGoodRodHouse.asm
+++ b/text/FuchsiaGoodRodHouse.asm
@@ -19,8 +19,9 @@ _FuchsiaHouse3Text_561c2::
 
 	para "<PLAYER> received"
 	line "a @"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _FuchsiaHouse3Text_56212::
 	text "Oh... That's so"
diff --git a/text/maps/FuchsiaGym.asm b/text/FuchsiaGym.asm
index fc4e8f59..587af1a1 100644
--- a/text/maps/FuchsiaGym.asm
+++ b/text/FuchsiaGym.asm
@@ -54,11 +54,12 @@ _FuchsiaGymText9::
 _ReceivedTM06Text::
 	text "<PLAYER> received"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _TM06ExplanationText::
-	text ""
+	text_start
 	para "TM06 contains"
 	line "TOXIC!"
 
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 c3e4f88e..a65043d9 100644
--- a/text/maps/GameCorner.asm
+++ b/text/GameCorner.asm
@@ -65,7 +65,8 @@ _CeladonGameCornerText_48d9c::
 
 _Received10CoinsText::
 	text "<PLAYER> received"
-	line "10 coins!@@"
+	line "10 coins!@"
+	text_end
 
 _CeladonGameCornerText_48da7::
 	text "You don't need my"
@@ -122,7 +123,8 @@ _CeladonGameCornerText_48e26::
 
 _Received20CoinsText::
 	text "<PLAYER> received"
-	line "20 coins!@@"
+	line "20 coins!@"
+	text_end
 
 _CeladonGameCornerText_48e31::
 	text "You have lots of"
@@ -144,7 +146,8 @@ _CeladonGameCornerText_48e88::
 
 _CeladonGameCornerText_48e8d::
 	text "<PLAYER> received"
-	line "20 coins!@@"
+	line "20 coins!@"
+	text_end
 
 _CeladonGameCornerText_48e93::
 	text "You've got your"
@@ -178,4 +181,5 @@ _CeladonGameCornerText_48f09::
 
 	para "A switch behind"
 	line "the poster!?"
-	cont "Let's push it!@@"
+	cont "Let's push it!@"
+	text_end
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/GameCorner_2.asm b/text/GameCorner_2.asm
index c288464d..c288464d 100755..100644
--- a/text/maps/GameCorner_2.asm
+++ b/text/GameCorner_2.asm
diff --git a/text/maps/HallOfFame.asm b/text/HallOfFame.asm
index 8faefd3f..8faefd3f 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 e47b006e..224db0b3 100644
--- a/text/maps/LancesRoom.asm
+++ b/text/LancesRoom.asm
@@ -60,4 +60,5 @@ _LanceAfterBattleText::
 
 	para "He is the real"
 	line "#MON LEAGUE"
-	cont "champion!@@"
+	cont "champion!@"
+	text_end
diff --git a/text/maps/LavenderCuboneHouse.asm b/text/LavenderCuboneHouse.asm
index 66cc85a5..77b8598d 100644
--- a/text/maps/LavenderCuboneHouse.asm
+++ b/text/LavenderCuboneHouse.asm
@@ -1,5 +1,6 @@
 _LavenderHouse2Text1::
-	text "CUBONE: Kyarugoo!@@"
+	text "CUBONE: Kyarugoo!@"
+	text_end
 
 _LavenderHouse2Text_1d9dc::
 	text "I hate those"
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..2f76ad94 100644
--- a/text/maps/MrFujisHouse.asm
+++ b/text/MrFujisHouse.asm
@@ -28,10 +28,12 @@ _LavenderHouse1Text_1d8f9::
 	done
 
 _LavenderHouse1Text3::
-	text "PSYDUCK: Gwappa!@@"
+	text "PSYDUCK: Gwappa!@"
+	text_end
 
 _LavenderHouse1Text4::
-	text "NIDORINO: Gaoo!@@"
+	text "NIDORINO: Gaoo!@"
+	text_end
 
 _LavenderHouse1Text_1d94c::
 	text "MR.FUJI: <PLAYER>."
@@ -48,11 +50,12 @@ _LavenderHouse1Text_1d94c::
 _ReceivedFluteText::
 	text "<PLAYER> received"
 	line "a @"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _FluteExplanationText::
-	text ""
+	text_start
 
 	para "Upon hearing #"
 	line "FLUTE, sleeping"
diff --git a/text/maps/MrPsychicsHouse.asm b/text/MrPsychicsHouse.asm
index 7be2e11e..5ac2c9af 100644
--- a/text/maps/MrPsychicsHouse.asm
+++ b/text/MrPsychicsHouse.asm
@@ -8,8 +8,9 @@ _TM29PreReceiveText::
 _ReceivedTM29Text::
 	text "<PLAYER> received"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _TM29ExplanationText::
 	text "TM29 is PSYCHIC!"
diff --git a/text/maps/MtMoon1F.asm b/text/MtMoon1F.asm
index 2e8c960e..2e8c960e 100644
--- a/text/maps/MtMoon1F.asm
+++ b/text/MtMoon1F.asm
diff --git a/text/maps/MtMoonB1F.asm b/text/MtMoonB1F.asm
index 755fa583..968b845f 100644
--- a/text/maps/MtMoonB1F.asm
+++ b/text/MtMoonB1F.asm
@@ -1,3 +1,3 @@
 _MtMoonText1::
-	text ""
+	text_start
 	done
diff --git a/text/maps/MtMoonB2F.asm b/text/MtMoonB2F.asm
index ab5da5a6..e0098791 100644
--- a/text/maps/MtMoonB2F.asm
+++ b/text/MtMoonB2F.asm
@@ -1,5 +1,6 @@
 _MtMoonJessieJamesText1::
-	text "Stop right there!@@"
+	text "Stop right there!@"
+	text_end
 
 _MtMoonJessieJamesText2::
 	text "That fossil is"
@@ -17,7 +18,8 @@ _MtMoonJessieJamesText3::
 _MtMoonJessieJamesText4::
 	text "TEAM ROCKET, blast"
 	line "off at the speed"
-	cont "of light!@@"
+	cont "of light!@"
+	text_end
 
 _MtMoon3Text_49f24::
 	text "You want the"
@@ -32,12 +34,14 @@ _MtMoon3Text_49f64::
 _MtMoon3Text_49f6f::
 	text "<PLAYER> got the"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _MtMoon3Text_49f7f::
 	text "Look, you've got"
-	line "no room for this.@@"
+	line "no room for this.@"
+	text_end
 
 _MtMoon3Text_49f85::
 	text "Hey, stop!"
@@ -71,7 +75,8 @@ _MtMoon3Text_49f94::
 
 _MtMoon3Text_49f99::
 	text "All right. Then"
-	line "this is mine!@@"
+	line "this is mine!@"
+	text_end
 
 _MtMoon3BattleText3::
 	text "We, TEAM ROCKET,"
diff --git a/text/maps/MtMoonPokecenter.asm b/text/MtMoonPokecenter.asm
index ab3cf6ed..052dd85b 100644
--- a/text/maps/MtMoonPokecenter.asm
+++ b/text/MtMoonPokecenter.asm
@@ -17,7 +17,7 @@ _MtMoonPokecenterText3::
 	done
 
 _MtMoonPokecenterText5::
-	text ""
+	text_start
 	done
 
 _MagikarpSalesmanText1::
diff --git a/text/maps/Museum1F.asm b/text/Museum1F.asm
index ecb511aa..e7b6ce53 100644
--- a/text/maps/Museum1F.asm
+++ b/text/Museum1F.asm
@@ -82,7 +82,8 @@ _Museum1FText_5c28e::
 
 _ReceivedOldAmberText::
 	text "<PLAYER> received"
-	line "OLD AMBER!@@"
+	line "OLD AMBER!@"
+	text_end
 
 _Museum1FText_5c299::
 	text "Ssh! Get the OLD"
diff --git a/text/maps/Museum2F.asm b/text/Museum2F.asm
index 12cfe8b2..12cfe8b2 100644
--- a/text/maps/Museum2F.asm
+++ b/text/Museum2F.asm
diff --git a/text/maps/NameRatersHouse.asm b/text/NameRatersHouse.asm
index 7194a927..49637b6d 100644
--- a/text/maps/NameRatersHouse.asm
+++ b/text/NameRatersHouse.asm
@@ -14,7 +14,7 @@ _NameRaterText_1dab8::
 	prompt
 
 _NameRaterText_1dabd::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text ", is it?"
 	line "That is a decent"
 	cont "nickname!"
@@ -35,7 +35,7 @@ _NameRaterText_1dac7::
 	text "OK! This #MON"
 	line "has been renamed"
 	cont "@"
-	TX_RAM wBuffer
+	text_ram wBuffer
 	text "!"
 
 	para "That's a better"
@@ -48,13 +48,13 @@ _NameRaterText_1dacc::
 	done
 
 _NameRaterText_1dad1::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text ", is it?"
 	line "That is a truly"
 	cont "impeccable name!"
 
 	para "Take good care of"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 	done
diff --git a/text/maps/OaksLab.asm b/text/OaksLab.asm
index 097fa931..7e78f8f5 100644
--- a/text/maps/OaksLab.asm
+++ b/text/OaksLab.asm
@@ -64,10 +64,11 @@ _OaksLabDeliverParcelText1::
 	line "something for me?"
 
 	para "<PLAYER> delivered"
-	line "OAK's PARCEL.@@"
+	line "OAK's PARCEL.@"
+	text_end
 
 _OaksLabDeliverParcelText2::
-	text ""
+	text_start
 	para "Ah! This is the"
 	line "custom # BALL"
 	cont "I ordered!"
@@ -96,10 +97,11 @@ _OaksLabGivePokeballsText1::
 	cont "#MON."
 
 	para "<PLAYER> got 5"
-	line "# BALLs!@@"
+	line "# BALLs!@"
+	text_end
 
 _OaksLabGivePokeballsText2::
-	text ""
+	text_start
 	para "When a wild"
 	line "#MON appears,"
 	cont "it's fair game."
@@ -203,7 +205,8 @@ _OaksLabRivalTakesText1::
 
 _OaksLabRivalTakesText2::
 	text "<RIVAL> snatched"
-	line "the #MON!@@"
+	line "the #MON!@"
+	text_end
 
 _OaksLabRivalTakesText3::
 	text "OAK: <RIVAL>! What"
@@ -243,8 +246,9 @@ _OaksLabOakGivesText::
 _OaksLabReceivedText::
 	text "<PLAYER> received"
 	line "a @"
-	TX_RAM wcd6d
-	text "!@@"
+	text_ram wcd6d
+	text "!@"
+	text_end
 
 _OaksLabLeavingText::
 	text "OAK: Hey! Don't go"
@@ -347,7 +351,8 @@ _OaksLabText25::
 	cont "these with you!"
 
 	para "<PLAYER> got"
-	line "#DEX from OAK!@@"
+	line "#DEX from OAK!@"
+	text_end
 
 _OaksLabText26::
 	text "To make a complete"
diff --git a/text/maps/PalletTown.asm b/text/PalletTown.asm
index 9ca8dc93..ec6ec630 100644
--- a/text/maps/PalletTown.asm
+++ b/text/PalletTown.asm
@@ -1,6 +1,7 @@
 _OakAppearsText::
 	text "OAK: Hey! Wait!"
-	line "Don't go out!@@"
+	line "Don't go out!@"
+	text_end
 
 _OakWalksUpText::
 	text "OAK: That was"
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 0e156577..03626f7d 100644
--- a/text/maps/PewterGym.asm
+++ b/text/PewterGym.asm
@@ -45,10 +45,11 @@ _TM34PreReceiveText::
 
 _ReceivedTM34Text::
 	text "<PLAYER> received"
-	line "TM34!@@"
+	line "TM34!@"
+	text_end
 
 _TM34ExplanationText::
-	text ""
+	text_start
 
 	para "A TM contains a"
 	line "technique that"
@@ -85,10 +86,11 @@ _PewterGymText_5c4bc::
 	cont "the BOULDERBADGE!"
 
 	para "<PLAYER> received"
-	line "the BOULDERBADGE!@@"
+	line "the BOULDERBADGE!@"
+	text_end
 
 _PewterGymText_5c4c1::
-	text ""
+	text_start
 
 	para "That's an official"
 	line "#MON LEAGUE"
diff --git a/text/maps/PewterMart.asm b/text/PewterMart.asm
index 4dbc3c02..4dbc3c02 100644
--- a/text/maps/PewterMart.asm
+++ b/text/PewterMart.asm
diff --git a/text/maps/PewterNidoranHouse.asm b/text/PewterNidoranHouse.asm
index 450e8372..d4a092c8 100644
--- a/text/maps/PewterNidoranHouse.asm
+++ b/text/PewterNidoranHouse.asm
@@ -1,5 +1,6 @@
 _PewterHouse1Text1::
-	text "NIDORAN: Bowbow!@@"
+	text "NIDORAN: Bowbow!@"
+	text_end
 
 _PewterHouse1Text2::
 	text "NIDORAN sit!"
diff --git a/text/maps/PewterPokecenter.asm b/text/PewterPokecenter.asm
index 968f6af0..968f6af0 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 5fcd469d..c3858e1c 100644
--- a/text/maps/PokemonFanClub.asm
+++ b/text/PokemonFanClub.asm
@@ -102,11 +102,12 @@ FanClubChairStoryText::
 ReceivedBikeVoucherText::
 	text "<PLAYER> received"
 	line "a @"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 ExplainBikeVoucherText::
-	text ""
+	text_start
 	para "Exchange that for"
 	line "a BICYCLE!"
 
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 652cf37a..86f05445 100644
--- a/text/maps/PokemonTower7F.asm
+++ b/text/PokemonTower7F.asm
@@ -1,5 +1,6 @@
 _PokemonTowerJessieJamesText1::
-	text "Stop right there!@@"
+	text "Stop right there!@"
+	text_end
 
 _PokemonTowerJessieJamesText2::
 	text "Grampa here wanted"
@@ -20,7 +21,8 @@ _PokemonTowerJessieJamesText3::
 _PokemonTowerJessieJamesText4::
 	text "Looks like TEAM"
 	line "ROCKET's blasting"
-	cont "off again!@@"
+	cont "off again!@"
+	text_end
 
 _TowerRescueFujiText::
 	text "MR.FUJI: Heh? You"
diff --git a/text/maps/PowerPlant.asm b/text/PowerPlant.asm
index e5df6674..dcdcd739 100644
--- a/text/maps/PowerPlant.asm
+++ b/text/PowerPlant.asm
@@ -3,4 +3,5 @@ _VoltorbBattleText::
 	done
 
 _ZapdosBattleText::
-	text "Gyaoo!@@"
+	text "Gyaoo!@"
+	text_end
diff --git a/text/maps/RedsHouse1F.asm b/text/RedsHouse1F.asm
index 633075bb..633075bb 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 d0437de7..d0437de7 100644
--- a/text/maps/RockTunnelB1F.asm
+++ b/text/RockTunnelB1F.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..c4fcb4b1 100644
--- a/text/maps/RocketHideoutB1F.asm
+++ b/text/RocketHideoutB1F.asm
@@ -1,5 +1,6 @@
 _RocketHideout1EndBattleText6::
-	text "Why...?@@"
+	text "Why...?@"
+	text_end
 
 _RocketHideout1BattleText2::
 	text "Who are you? How"
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 d9e13457..099045bc 100644
--- a/text/maps/RocketHideoutB4F.asm
+++ b/text/RocketHideoutB4F.asm
@@ -1,6 +1,7 @@
 _RocketHideoutJessieJamesText1::
 	text "Not another step,"
-	line "brat!@@"
+	line "brat!@"
+	text_end
 
 _RocketHideoutJessieJamesText2::
 	text "How dare you"
@@ -19,7 +20,8 @@ _RocketHideoutJessieJamesText3::
 _RocketHideoutJessieJamesText4::
 	text "Looks like TEAM"
 	line "ROCKET's blasting"
-	cont "off again!@@"
+	cont "off again!@"
+	text_end
 
 _RocketHideout4Text_4557a::
 	text "So! I must say, I"
diff --git a/text/maps/RocketHideoutElevator.asm b/text/RocketHideoutElevator.asm
index 6f2aa638..1b8ba561 100644
--- a/text/maps/RocketHideoutElevator.asm
+++ b/text/RocketHideoutElevator.asm
@@ -1,3 +1,4 @@
 _RocketElevatorText_4578b::
 	text "It appears to"
-	line "need a key.@@"
+	line "need a key.@"
+	text_end
diff --git a/text/maps/Route1.asm b/text/Route1.asm
index 73188f09..bf32af26 100644
--- a/text/maps/Route1.asm
+++ b/text/Route1.asm
@@ -15,8 +15,9 @@ _Route1ViridianMartSampleText::
 _Route1Text_1cae8::
 	text "<PLAYER> got"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _Route1Text_1caee::
 	text "We also carry"
diff --git a/text/maps/Route10.asm b/text/Route10.asm
index a56018f0..a56018f0 100644
--- a/text/maps/Route10.asm
+++ b/text/Route10.asm
diff --git a/text/maps/Route11.asm b/text/Route11.asm
index 451d2bec..451d2bec 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/Route12.asm b/text/Route12.asm
index 27befda5..27befda5 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 5994b5ff..adaf22cd 100644
--- a/text/maps/Route12Gate2F.asm
+++ b/text/Route12Gate2F.asm
@@ -10,7 +10,8 @@ _TM39PreReceiveText::
 
 _ReceivedTM39Text::
 	text "<PLAYER> received"
-	line "TM39!@@"
+	line "TM39!@"
+	text_end
 
 _TM39ExplanationText::
 	text "TM39 is a move"
diff --git a/text/maps/Route12SuperRodHouse.asm b/text/Route12SuperRodHouse.asm
index 7dfaa74f..ff633d3a 100644
--- a/text/maps/Route12SuperRodHouse.asm
+++ b/text/Route12SuperRodHouse.asm
@@ -18,11 +18,12 @@ _Route12HouseText_564c5::
 
 	para "<PLAYER> received"
 	line "a @"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _Route12HouseText_564ca::
-	text ""
+	text_start
 
 	para "Fishing is a way"
 	line "of life!"
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 9a9de78c..9a9de78c 100644
--- a/text/maps/Route14.asm
+++ b/text/Route14.asm
diff --git a/text/maps/Route15.asm b/text/Route15.asm
index a23b8500..9dc0e6ba 100644
--- a/text/maps/Route15.asm
+++ b/text/Route15.asm
@@ -162,7 +162,8 @@ _Route15EndBattleText10::
 
 _Route15AfterBattleText10::
 	text "I'll go train with"
-	line "weaker people.@@"
+	line "weaker people.@"
+	text_end
 
 _Route15Text12::
 	text "ROUTE 15"
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 2ef6b02a..2ef6b02a 100644
--- a/text/maps/Route16.asm
+++ b/text/Route16.asm
diff --git a/text/maps/Route16FlyHouse.asm b/text/Route16FlyHouse.asm
index 77efde87..89f76e51 100644
--- a/text/maps/Route16FlyHouse.asm
+++ b/text/Route16FlyHouse.asm
@@ -10,7 +10,8 @@ _Route16HouseText3::
 
 _ReceivedHM02Text::
 	text "<PLAYER> received"
-	line "HM02!@@"
+	line "HM02!@"
+	text_end
 
 _HM02ExplanationText::
 	text "HM02 is FLY."
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 f7f59683..f7f59683 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 1754627f..1754627f 100644
--- a/text/maps/Route22.asm
+++ b/text/Route22.asm
diff --git a/text/maps/Route22Gate.asm b/text/Route22Gate.asm
index ce3f6824..33893d6e 100644
--- a/text/maps/Route22Gate.asm
+++ b/text/Route22Gate.asm
@@ -4,10 +4,11 @@ _Route22GateText_1e704::
 	cont "allowed through."
 
 	para "You don't have the"
-	line "BOULDERBADGE yet!@@"
+	line "BOULDERBADGE yet!@"
+	text_end
 
 _Route22GateText_1e715::
-	text ""
+	text_start
 
 	para "The rules are"
 	line "rules. I can't"
@@ -17,4 +18,5 @@ _Route22GateText_1e715::
 _Route22GateText_1e71a::
 	text "Oh! That is the"
 	line "BOULDERBADGE!"
-	cont "Go right ahead!@@"
+	cont "Go right ahead!@"
+	text_end
diff --git a/text/maps/Route23.asm b/text/Route23.asm
index a7e534de..f21857b3 100644
--- a/text/maps/Route23.asm
+++ b/text/Route23.asm
@@ -2,32 +2,34 @@ _VictoryRoadGuardText1::
 	text "You can pass here"
 	line "only if you have"
 	cont "the @"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 
 	para "You don't have the"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " yet!"
 
 	para "You have to have"
 	line "it to get to"
-	cont "#MON LEAGUE!@@"
+	cont "#MON LEAGUE!@"
+	text_end
 
 _VictoryRoadGuardText2::
 	text "You can pass here"
 	line "only if you have"
 	cont "the @"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 
 	para "Oh! That is the"
 	line "@"
-	TX_RAM wcd6d
-	text "!@@"
+	text_ram wcd6d
+	text "!@"
+	text_end
 
 _VictoryRoadGuardText_513a3::
-	text ""
+	text_start
 
 	para "OK then! Please,"
 	line "go right ahead!"
diff --git a/text/maps/Route24.asm b/text/Route24.asm
index 0771aea3..411a4d91 100644
--- a/text/maps/Route24.asm
+++ b/text/Route24.asm
@@ -1,10 +1,11 @@
 _Route24Text_51510::
 	text "Congratulations!"
 	line "You beat our 5"
-	cont "contest trainers!@@"
+	cont "contest trainers!@"
+	text_end
 
 _Route24Text_51515::
-	text ""
+	text_start
 
 	para "You just earned a"
 	line "fabulous prize!"
@@ -13,8 +14,9 @@ _Route24Text_51515::
 _Route24Text_5151a::
 	text "<PLAYER> received"
 	line "a @"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _Route24Text_51521::
 	text "You don't have"
@@ -171,7 +173,8 @@ _Route24DamianText1::
 
 _Route24DamianText2::
 	text "Take good care of"
-	line "my CHARMANDER!@@"
+	line "my CHARMANDER!@"
+	text_end
 
 _Route24DamianText3::
 	text "Oh... I'd better"
diff --git a/text/maps/Route25.asm b/text/Route25.asm
index 4786d830..4786d830 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 14d44e64..14d44e64 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 71760449..71760449 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 c0988d70..c0988d70 100644
--- a/text/maps/Route8.asm
+++ b/text/Route8.asm
diff --git a/text/maps/Route9.asm b/text/Route9.asm
index 741c990c..741c990c 100644
--- a/text/maps/Route9.asm
+++ b/text/Route9.asm
diff --git a/text/maps/Route9_2.asm b/text/Route9_2.asm
index f3803618..f3803618 100755..100644
--- a/text/maps/Route9_2.asm
+++ b/text/Route9_2.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..da672f8d 100644
--- a/text/maps/SSAnne1FRooms.asm
+++ b/text/SSAnne1FRooms.asm
@@ -1,6 +1,7 @@
 _SSAnne8Text8::
 	text "WIGGLYTUFF: Puup"
-	line "pupuu!@@"
+	line "pupuu!@"
+	text_end
 
 _SSAnne8BattleText1::
 	text "I travel alone"
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 c9b29119..c9b29119 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..8072fc85 100644
--- a/text/maps/SSAnneB1FRooms.asm
+++ b/text/SSAnneB1FRooms.asm
@@ -1,6 +1,7 @@
 _SSAnne10Text8::
 	text "MACHOKE: Gwoh!"
-	line "Goggoh!@@"
+	line "Goggoh!@"
+	text_end
 
 _SSAnne10BattleText1::
 	text "You know what they"
@@ -52,7 +53,8 @@ _SSAnne10AfterBattleText3::
 
 _SSAnne10BattleText4::
 	text "I like feisty"
-	line "kids like you!@@"
+	line "kids like you!@"
+	text_end
 
 _SSAnne10EndBattleText4::
 	text "Argh!"
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 bbc52bd7..5bd86e17 100644
--- a/text/maps/SSAnneCaptainsRoom.asm
+++ b/text/SSAnneCaptainsRoom.asm
@@ -8,7 +8,8 @@ _SSAnne7RubText::
 	cont "back!"
 
 	para "Rub-rub..."
-	line "Rub-rub...@@"
+	line "Rub-rub...@"
+	text_end
 
 _ReceivingHM01Text::
 	text "CAPTAIN: Whew!"
@@ -33,8 +34,9 @@ _ReceivingHM01Text::
 _ReceivedHM01Text::
 	text "<PLAYER> got"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _SSAnne7Text_61932::
 	text "CAPTAIN: Whew!"
diff --git a/text/maps/SSAnneKitchen.asm b/text/SSAnneKitchen.asm
index b7784019..b7784019 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 a426d132..bd7e8de4 100644
--- a/text/maps/SafariZoneGate.asm
+++ b/text/SafariZoneGate.asm
@@ -4,7 +4,8 @@ _SafariZoneEntranceText1::
 	done
 
 SafariZoneEntranceText_9e814::
-	text "Leaving early?@@"
+	text "Leaving early?@"
+	text_end
 
 _SafariZoneEntranceText_753bb::
 	text "Please return any"
@@ -29,11 +30,12 @@ SafariZoneEntranceText_9e6e4::
 	cont "want in the park!"
 
 	para "Would you like to"
-	line "join the hunt?@@"
+	line "join the hunt?@"
+	text_end
 
 SafariZoneEntranceText_9e747::
 	text "That'll be ¥@"
-	TX_BCD wPriceTemp, $c3
+	text_bcd wPriceTemp, $c3
 	text ","
 	line "please!"
 
@@ -42,10 +44,11 @@ SafariZoneEntranceText_9e747::
 	cont "here."
 
 	para "<PLAYER> received"
-	line "30 SAFARI BALLs!@@"
+	line "30 SAFARI BALLs!@"
+	text_end
 
 _SafariZoneEntranceText_75360::
-	text ""
+	text_start
 
 	para "We'll call you on"
 	line "the PA when you"
@@ -96,7 +99,7 @@ _SafariZoneEntranceText_753f0::
 	done
 
 _SafariZoneLowCostText1::
-	text ""
+	text_start
 
 	para "Oh, all right, pay"
 	line "me what you have."
@@ -108,17 +111,18 @@ _SafariZoneLowCostText2::
 	done
 
 _SafariZoneLowCostText3::
-	text ""
+	text_start
 
 	para "You're persistent,"
 	line "aren't you?"
 
 	para "OK, you can go in"
 	line "for free, but"
-	cont "just this once!@@"
+	cont "just this once!@"
+	text_end
 
 _SafariZoneLowCostText4::
-	text ""
+	text_start
 	done
 
 _SafariZoneLowCostText5::
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..8aff18b7 100644
--- a/text/maps/SafariZoneSecretHouse.asm
+++ b/text/SafariZoneSecretHouse.asm
@@ -17,8 +17,9 @@ _SecretHouseText_4a350::
 _ReceivedHM03Text::
 	text "<PLAYER> received"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _HM03ExplanationText::
 	text "HM03 is SURF!"
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..ae9c44f2 100644
--- a/text/maps/SaffronCity.asm
+++ b/text/SaffronCity.asm
@@ -65,7 +65,8 @@ _SaffronCityText11::
 	done
 
 _SaffronCityText12::
-	text "PIDGEOT: Bi bibii!@@"
+	text "PIDGEOT: Bi bibii!@"
+	text_end
 
 _SaffronCityText13::
 	text "I saw ROCKET"
diff --git a/text/maps/SaffronGates.asm b/text/SaffronGates.asm
index 35bcadbb..50e88a01 100644
--- a/text/maps/SaffronGates.asm
+++ b/text/SaffronGates.asm
@@ -13,10 +13,11 @@ _SaffronGateText_8aaa9::
 	cont "..."
 	cont "Huh? I can have"
 	cont "this drink?"
-	cont "Gee, thanks!@@"
+	cont "Gee, thanks!@"
+	text_end
 
 _SaffronGateText_1dff1::
-	text ""
+	text_start
 
 	para "..."
 	line "Glug, glug..."
diff --git a/text/maps/SaffronGym.asm b/text/SaffronGym.asm
index 52ea321b..a42a6932 100644
--- a/text/maps/SaffronGym.asm
+++ b/text/SaffronGym.asm
@@ -27,7 +27,8 @@ _SaffronGymText_5d167::
 	cont "to win!"
 
 	para "You earned the"
-	line "MARSHBADGE!@@"
+	line "MARSHBADGE!@"
+	text_end
 
 _SaffronGymText_5d16e::
 	text "Everyone has"
@@ -56,10 +57,11 @@ _SaffronGymText_5d173::
 
 ReceivedTM46Text::
 	text "<PLAYER> received"
-	line "TM46!@@"
+	line "TM46!@"
+	text_end
 
 _TM46ExplanationText::
-	text ""
+	text_start
 
 	para "TM46 is PSYWAVE!"
 	line "It uses powerful"
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..d8666a07 100644
--- a/text/maps/SaffronPidgeyHouse.asm
+++ b/text/SaffronPidgeyHouse.asm
@@ -8,7 +8,8 @@ _SaffronHouse1Text1::
 	done
 
 _SaffronHouse1Text2::
-	text "PIDGEY: Kurukkoo!@@"
+	text "PIDGEY: Kurukkoo!@"
+	text_end
 
 _SaffronHouse1Text3::
 	text "The COPYCAT is"
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..ea7eeaa2 100644
--- a/text/maps/SeafoamIslandsB4F.asm
+++ b/text/SeafoamIslandsB4F.asm
@@ -1,5 +1,6 @@
 _ArticunoBattleText::
-	text "Gyaoo!@@"
+	text "Gyaoo!@"
+	text_end
 
 _SeafoamIslands5Text4::
 	text "Boulders might"
diff --git a/text/maps/SilphCo10F.asm b/text/SilphCo10F.asm
index 09894764..fd4d4c7c 100644
--- a/text/maps/SilphCo10F.asm
+++ b/text/SilphCo10F.asm
@@ -43,7 +43,8 @@ _SilphCo10AfterBattleText2::
 
 _SilphCoJessieJamesText1::
 	text "Hold it right"
-	line "there, brat!@@"
+	line "there, brat!@"
+	text_end
 
 _SilphCoJessieJamesText2::
 	text "Our BOSS is in a"
@@ -63,4 +64,5 @@ _SilphCoJessieJamesText4::
 	line "off at the speed"
 	cont "of light!"
 
-	para "Again...@@"
+	para "Again...@"
+	text_end
diff --git a/text/maps/SilphCo11F.asm b/text/SilphCo11F.asm
index d2bbde7d..51033d72 100644
--- a/text/maps/SilphCo11F.asm
+++ b/text/SilphCo11F.asm
@@ -22,8 +22,9 @@ _SilphCoPresidentText::
 _ReceivedSilphCoMasterBallText::
 	text "<PLAYER> got a"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _SilphCo10Text_6231c::
 	text "PRESIDENT: You"
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 912bdef9..817b4142 100644
--- a/text/maps/SilphCo2F.asm
+++ b/text/SilphCo2F.asm
@@ -12,8 +12,9 @@ _SilphCo2Text_59ded::
 _ReceivedTM36Text::
 	text "<PLAYER> got"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _TM36ExplanationText::
 	text "TM36 is"
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 9c8bfd41..9c8bfd41 100644
--- a/text/maps/SilphCo5F.asm
+++ b/text/SilphCo5F.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 8f7b6ca2..8f7b6ca2 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 742d0c5d..c65063cc 100644
--- a/text/maps/VermilionCity.asm
+++ b/text/VermilionCity.asm
@@ -68,10 +68,11 @@ _VermilionCityText4::
 
 _VermilionCityText5::
 	text "MACHOP: Guoh!"
-	line "Gogogoh!@@"
+	line "Gogogoh!@"
+	text_end
 
 _VermilionCityText15::
-	text ""
+	text_start
 	para "A MACHOP is"
 	line "stomping the land"
 	cont "flat."
@@ -115,7 +116,8 @@ _OfficerJennyText2::
 
 _OfficerJennyText3::
 	text "OK! Please treat"
-	line "SQUIRTLE right!@@"
+	line "SQUIRTLE right!@"
+	text_end
 
 _OfficerJennyText4::
 	text "Oh... What am I"
diff --git a/text/maps/VermilionDock.asm b/text/VermilionDock.asm
index 5d998e82..aaf1ed34 100644
--- a/text/maps/VermilionDock.asm
+++ b/text/VermilionDock.asm
@@ -1,3 +1,3 @@
 _VermilionDockText1::
-	text ""
+	text_start
 	done
diff --git a/text/maps/VermilionGym.asm b/text/VermilionGym.asm
index 2d9654c8..de548eca 100644
--- a/text/maps/VermilionGym.asm
+++ b/text/VermilionGym.asm
@@ -48,11 +48,12 @@ _LTSurgeThunderbadgeInfoText::
 _ReceivedTM24Text::
 	text "<PLAYER> received "
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _TM24ExplanationText::
-	text ""
+	text_start
 
 	para "TM24 contains"
 	line "THUNDERBOLT!"
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..d9a94cd4 100644
--- a/text/maps/VermilionOldRodHouse.asm
+++ b/text/VermilionOldRodHouse.asm
@@ -18,11 +18,12 @@ _VermilionHouse2Text_560b6::
 
 	para "<PLAYER> received"
 	line "an @"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _VermilionHouse2Text_560bb::
-	text ""
+	text_start
 
 	para "Fishing is a way"
 	line "of life!"
diff --git a/text/maps/VermilionPidgeyHouse.asm b/text/VermilionPidgeyHouse.asm
index 91c18708..858e84f3 100644
--- a/text/maps/VermilionPidgeyHouse.asm
+++ b/text/VermilionPidgeyHouse.asm
@@ -6,7 +6,8 @@ _VermilionHouse1Text1::
 	done
 
 _VermilionHouse1Text2::
-	text "PIDGEY: Kurukkoo!@@"
+	text "PIDGEY: Kurukkoo!@"
+	text_end
 
 _VermilionHouse1Text3::
 	text "Dear PIPPI, I hope"
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..ff72afaa 100644
--- a/text/maps/VictoryRoad2F.asm
+++ b/text/VictoryRoad2F.asm
@@ -1,5 +1,6 @@
 _MoltresBattleText::
-	text "Gyaoo!@@"
+	text "Gyaoo!@"
+	text_end
 
 _VictoryRoad2BattleText1::
 	text "VICTORY ROAD is"
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 22d5d7ba..2ffee596 100644
--- a/text/maps/ViridianCity.asm
+++ b/text/ViridianCity.asm
@@ -121,7 +121,8 @@ _ViridianCityText_191ca::
 
 _ReceivedTM42Text::
 	text "<PLAYER> received"
-	line "TM42!@@"
+	line "TM42!@"
+	text_end
 
 _TM42Explanation::
 	text "TM42 contains"
diff --git a/text/maps/ViridianForest.asm b/text/ViridianForest.asm
index f88a484c..f88a484c 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 a5278742..a5278742 100644
--- a/text/maps/ViridianForestSouthGate.asm
+++ b/text/ViridianForestSouthGate.asm
diff --git a/text/maps/ViridianGym.asm b/text/ViridianGym.asm
index 53b78a0f..66c889df 100644
--- a/text/maps/ViridianGym.asm
+++ b/text/ViridianGym.asm
@@ -24,7 +24,8 @@ _ViridianGymText_74ad3::
 	cont "intense fight!"
 	cont "You have won!"
 	cont "As proof, here is"
-	cont "the EARTHBADGE!@@"
+	cont "the EARTHBADGE!@"
+	text_end
 
 _ViridianGymText_74ad9::
 	text "Having lost, I"
@@ -39,7 +40,8 @@ _ViridianGymText_74ad9::
 
 	para "Let us meet again"
 	line "someday!"
-	cont "Farewell!@@"
+	cont "Farewell!@"
+	text_end
 
 _ViridianGymText12::
 	text "The EARTHBADGE"
@@ -61,10 +63,11 @@ _ViridianGymText12::
 
 _ReceivedTM27Text::
 	text "<PLAYER> received"
-	line "TM27!@@"
+	line "TM27!@"
+	text_end
 
 _TM27ExplanationText::
-	text ""
+	text_start
 
 	para "TM27 is FISSURE!"
 	line "It will take out"
diff --git a/text/maps/ViridianMart.asm b/text/ViridianMart.asm
index 31a843ae..0152ea4c 100644
--- a/text/maps/ViridianMart.asm
+++ b/text/ViridianMart.asm
@@ -17,7 +17,8 @@ ViridianMartParcelQuestText::
 	cont "to him?"
 
 	para "<PLAYER> got"
-	line "OAK's PARCEL!@@"
+	line "OAK's PARCEL!@"
+	text_end
 
 _ViridianMartText2::
 	text "This shop sells a"
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 100755
--- a/text/maps/ViridianPokecenter.asm
+++ b/text/ViridianPokecenter.asm
diff --git a/text/maps/ViridianSchoolHouse.asm b/text/ViridianSchoolHouse.asm
index 3c5f6379..3c5f6379 100644
--- a/text/maps/ViridianSchoolHouse.asm
+++ b/text/ViridianSchoolHouse.asm
diff --git a/text/maps/WardensHouse.asm b/text/WardensHouse.asm
index 7efddb90..47612904 100644
--- a/text/maps/WardensHouse.asm
+++ b/text/WardensHouse.asm
@@ -20,10 +20,11 @@ _WardenGibberishText3::
 _WardenTeethText1::
 	text "<PLAYER> gave the"
 	line "GOLD TEETH to the"
-	cont "WARDEN!@@"
+	cont "WARDEN!@"
+	text_end
 
 _WardenTeethText2::
-	text ""
+	text_start
 
 	para "The WARDEN popped"
 	line "in his teeth!"
@@ -45,8 +46,9 @@ _WardenThankYouText::
 _ReceivedHM04Text::
 	text "<PLAYER> received"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _HM04ExplanationText::
 	text "WARDEN: HM04"
diff --git a/text/credits_text.asm b/text/credits_text.asm
deleted file mode 100755
index 0010b93a..00000000
--- a/text/credits_text.asm
+++ /dev/null
@@ -1,264 +0,0 @@
-CreditsTextPointers:
-	dw CreditsText_Version
-	dw CreditsText_Tajiri
-	dw CreditsText_Oota
-	dw CreditsText_Morimoto
-	dw CreditsText_Watanabe
-	dw CreditsText_Masuda
-	dw CreditsText_Nishino
-	dw CreditsText_Sugimori
-	dw CreditsText_Nishida
-	dw CreditsText_Miyamoto
-	dw CreditsText_Kawaguchi
-	dw CreditsText_Ishihara
-	dw CreditsText_Yamauchi
-	dw CreditsText_Zinnai
-	dw CreditsText_Hishida
-	dw CreditsText_Sakai
-	dw CreditsText_Yamaguchi
-	dw CreditsText_Yamamoto
-	dw CreditsText_Taniguchi
-	dw CreditsText_Nonomura
-	dw CreditsText_Fuziwara
-	dw CreditsText_Matsusima
-	dw CreditsText_Tomisawa
-	dw CreditsText_Kawamoto
-	dw CreditsText_Kakei
-	dw CreditsText_Tsuchiya
-	dw CreditsText_Nakamura
-	dw CreditsText_Yuda
-	dw CreditsText_Pokemon
-	dw CreditsText_Director
-	dw CreditsText_Programmers
-	dw CreditsText_CharacterDesign
-	dw CreditsText_Music
-	dw CreditsText_SoundEffects
-	dw CreditsText_GameDesign
-	dw CreditsText_MonsterDesign
-	dw CreditsText_GameScenario
-	dw CreditsText_ParametricDesign
-	dw CreditsText_MapDesign
-	dw CreditsText_Testing
-	dw CreditsText_SpecialThanks
-	dw CreditsText_Producer
-	dw CreditsText_ExecutiveProducer
-	dw CreditsText_Tamada
-	dw CreditsText_Oota2
-	dw CreditsText_Yoshikawa
-	dw CreditsText_Oota23
-	dw CreditsText_Yoshida
-	dw CreditsText_Matsumita
-	dw CreditsText_Seya
-	dw CreditsText_Sekine
-	dw CreditsText_Shimamura
-	dw CreditsText_Shimoyamada
-	dw CreditsText_SuperMarioClub
-	dw CreditsText_Izushi
-	dw CreditsText_Nomura
-	dw CreditsText_Harada
-	dw CreditsText_Yamagami
-	dw CreditsText_Nishimura
-	dw CreditsText_Saeki
-	dw CreditsText_Fuzii
-	dw CreditsText_Shogakukan
-	dw CreditsText_Ootani
-	dw CreditsText_PikachuVoice
-	dw CreditsText_USStaff
-	dw CreditsText_USCoord
-	dw CreditsText_Tilden
-	dw CreditsText_Kawakami
-	dw CreditsText_Nakamura2
-	dw CreditsText_Shoemake
-	dw CreditsText_Osborne
-	dw CreditsText_Translation
-	dw CreditsText_Ogasawara
-	dw CreditsText_Iwata
-	dw CreditsText_Izushi2
-	dw CreditsText_Harada2
-	dw CreditsText_Murakawa
-	dw CreditsText_Fukui
-	dw CreditsText_SuperMarioClub2
-	dw CreditsText_Paad
-	dw CreditsText_Producers
-	dw CreditsText_Hosokawa
-	dw CreditsText_Okubo
-	dw CreditsText_Nakamichi
-	dw CreditsText_Yoshimura
-	dw CreditsText_Yamazaki
-
-CreditsText_Version:
-	db -6, "YELLOW VERSION"
-	next   "    STAFF@"
-CreditsText_Tajiri:
-	db -6, "SATOSHI TAJIRI@"
-CreditsText_Oota:
-	db -6, "TAKENORI OOTA@"
-CreditsText_Morimoto:
-	db -7, "SHIGEKI MORIMOTO@"
-CreditsText_Watanabe:
-	db -7, "TETSUYA WATANABE@"
-CreditsText_Masuda:
-	db -6, "JUNICHI MASUDA@"
-CreditsText_Nishino:
-	db -5, "KOHJI NISHINO@"
-CreditsText_Sugimori:
-	db -5, "KEN SUGIMORI@"
-CreditsText_Nishida:
-	db -6, "ATSUKO NISHIDA@"
-CreditsText_Miyamoto:
-	db -7, "SHIGERU MIYAMOTO@"
-CreditsText_Kawaguchi:
-	db -8, "TAKASHI KAWAGUCHI@"
-CreditsText_Ishihara:
-	db -8, "TSUNEKAZU ISHIHARA@"
-CreditsText_Yamauchi:
-	db -7, "HIROSHI YAMAUCHI@"
-CreditsText_Zinnai:
-	db -7, "HIROYUKI ZINNAI@"
-CreditsText_Hishida:
-	db -7, "TATSUYA HISHIDA@"
-CreditsText_Sakai:
-	db -6, "YASUHIRO SAKAI@"
-CreditsText_Yamaguchi:
-	db -7, "WATARU YAMAGUCHI@"
-CreditsText_Yamamoto:
-	db -8, "KAZUYUKI YAMAMOTO@"
-CreditsText_Taniguchi:
-	db -8, "RYOHSUKE TANIGUCHI@"
-CreditsText_Nonomura:
-	db -8, "FUMIHIRO NONOMURA@"
-CreditsText_Fuziwara:
-	db -7, "MOTOFUMI FUZIWARA@"
-CreditsText_Matsusima:
-	db -7, "KENJI MATSUSIMA@"
-CreditsText_Tomisawa:
-	db -7, "AKIHITO TOMISAWA@"
-CreditsText_Kawamoto:
-	db -7, "HIROSHI KAWAMOTO@"
-CreditsText_Kakei:
-	db -6, "AKIYOSHI KAKEI@"
-CreditsText_Tsuchiya:
-	db -7, "KAZUKI TSUCHIYA@"
-CreditsText_Nakamura:
-	db -6, "TAKEO NAKAMURA@"
-CreditsText_Yuda:
-	db -6, "MASAMITSU YUDA@"
-CreditsText_Pokemon:
-	db -3, "#MON@"
-CreditsText_Director:
-	db -3, "DIRECTOR@"
-CreditsText_Programmers:
-	db -5, "PROGRAMMERS@"
-CreditsText_CharacterDesign:
-	db -7, "CHARACTER DESIGN@"
-CreditsText_Music:
-	db -2, "MUSIC@"
-CreditsText_SoundEffects:
-	db -6, "SOUND EFFECTS@"
-CreditsText_GameDesign:
-	db -5, "GAME DESIGN@"
-CreditsText_MonsterDesign:
-	db -6, "MONSTER DESIGN@"
-CreditsText_GameScenario:
-	db -6, "GAME SCENARIO@"
-CreditsText_ParametricDesign:
-	db -7, "PARAMETRIC DESIGN@"
-CreditsText_MapDesign:
-	db -4, "MAP DESIGN@"
-CreditsText_Testing:
-	db -6, "PRODUCT TESTING@"
-CreditsText_SpecialThanks:
-	db -6, "SPECIAL THANKS@"
-CreditsText_Producers:
-	db -4, "PRODUCERS@"
-CreditsText_Producer:
-	db -3, "PRODUCER@"
-CreditsText_ExecutiveProducer:
-	db -8, "EXECUTIVE PRODUCER@"
-CreditsText_Tamada:
-	db -6, "SOUSUKE TAMADA@"
-CreditsText_Oota2:
-	db -5, "SATOSHI OOTA@"
-CreditsText_Yoshikawa:
-	db -6, "RENA YOSHIKAWA@"
-CreditsText_Oota23:
-	db -6, "TOMOMICHI OOTA@"
-CreditsText_Matsumita:
-	db -8, "TOSHINOBU MATSUMIYA@"
-CreditsText_Seya:
-	db -5, "NOBUHIRO SEYA@"
-CreditsText_Yoshida:
-	db -7, "HIRONOBU YOSHIDA@"
-CreditsText_Sekine:
-	db -6, "KAZUHITO SEKINE@"
-CreditsText_Shimamura:
-	db -7, "KAZUSHI SHIMAMURA@"
-CreditsText_Shimoyamada:
-	db -9, "TERUYUKI SHIMOYAMADA@"
-CreditsText_SuperMarioClub:
-	db -9, "NCL SUPER MARIO CLUB@"
-CreditsText_Izushi:
-	db -7, "TAKEHIRO IZUSHI@"
-CreditsText_Nomura:
-	db -5, "FUZIKO NOMURA@"
-CreditsText_Harada:
-	db -6, "TAKAHIRO HARADA@"
-CreditsText_Yamagami:
-	db -7, "HITOSHI YAMAGAMI@"
-CreditsText_Nishimura:
-	db -8, "KENTAROU NISHIMURA@"
-CreditsText_Saeki:
-	db -5, "NAOKO SAEKI@"
-CreditsText_Fuzii:
-	db -5, "TAKAYA FUZII@"
-CreditsText_Shogakukan:
-	db -4, "SHOGAKUKAN"
-	next   "PRODUCTION@"
-CreditsText_Ootani:
-	db -5, "IKUE OOTANI@"
-CreditsText_PikachuVoice:
-	db -6, "PIKACHU VOICE@"
-
-	db -3, "××××××××@"
-CreditsText_USStaff:
-	db -7, "US VERSION STAFF@"
-CreditsText_USCoord:
-	db -7, "US COORDINATION@"
-CreditsText_Tilden:
-	db -5, "GAIL TILDEN@"
-CreditsText_Kawakami:
-	db -6, "NAOKO KAWAKAMI@"
-CreditsText_Nakamura2:
-	db -6, "HIRO NAKAMURA@"
-CreditsText_Shoemake:
-	db -6, "RANDY SHOEMAKE@"
-CreditsText_Osborne:
-	db -5, "SARA OSBORNE@"
-CreditsText_Translation:
-	db -7, "TEXT TRANSLATION@"
-CreditsText_Ogasawara:
-	db -6, "NOB OGASAWARA@"
-CreditsText_Iwata:
-	db -5, "SATORU IWATA@"
-CreditsText_Izushi2:
-	db -7, "TAKEHIRO IZUSHI@"
-CreditsText_Harada2:
-	db -7, "TAKAHIRO HARADA@"
-CreditsText_Murakawa:
-	db -7, "TERUKI MURAKAWA@"
-CreditsText_Fukui:
-	db -5, "KOHTA FUKUI@"
-CreditsText_SuperMarioClub2:
-	db -9, "NCL SUPER MARIO CLUB@"
-CreditsText_Paad:
-	db -5, "PAAD TESTING@"
-CreditsText_Hosokawa:
-	db -8, "TAKEHIKO HOSOKAWA@"
-CreditsText_Okubo:
-	db -5, "KENJI OKUBO@"
-CreditsText_Nakamichi:
-	db -7, "KIMIKO NAKAMICHI@"
-CreditsText_Yoshimura:
-	db -6, "KAMON YOSHIMURA@"
-CreditsText_Yamazaki:
-	db -6, "SAKAE YAMAZAKI@"
diff --git a/text/item_names.asm b/text/item_names.asm
deleted file mode 100755
index e436d74d..00000000
--- a/text/item_names.asm
+++ /dev/null
@@ -1,98 +0,0 @@
-ItemNames:
-	db "MASTER BALL@"
-	db "ULTRA BALL@"
-	db "GREAT BALL@"
-	db "POKé BALL@"
-	db "TOWN MAP@"
-	db "BICYCLE@"
-	db "?????@"
-	db "SAFARI BALL@"
-	db "POKéDEX@"
-	db "MOON STONE@"
-	db "ANTIDOTE@"
-	db "BURN HEAL@"
-	db "ICE HEAL@"
-	db "AWAKENING@"
-	db "PARLYZ HEAL@"
-	db "FULL RESTORE@"
-	db "MAX POTION@"
-	db "HYPER POTION@"
-	db "SUPER POTION@"
-	db "POTION@"
-	db "BOULDERBADGE@"
-	db "CASCADEBADGE@"
-	db "THUNDERBADGE@"
-	db "RAINBOWBADGE@"
-	db "SOULBADGE@"
-	db "MARSHBADGE@"
-	db "VOLCANOBADGE@"
-	db "EARTHBADGE@"
-	db "ESCAPE ROPE@"
-	db "REPEL@"
-	db "OLD AMBER@"
-	db "FIRE STONE@"
-	db "THUNDERSTONE@"
-	db "WATER STONE@"
-	db "HP UP@"
-	db "PROTEIN@"
-	db "IRON@"
-	db "CARBOS@"
-	db "CALCIUM@"
-	db "RARE CANDY@"
-	db "DOME FOSSIL@"
-	db "HELIX FOSSIL@"
-	db "SECRET KEY@"
-	db "?????@"
-	db "BIKE VOUCHER@"
-	db "X ACCURACY@"
-	db "LEAF STONE@"
-	db "CARD KEY@"
-	db "NUGGET@"
-	db "PP UP@"
-	db "POKé DOLL@"
-	db "FULL HEAL@"
-	db "REVIVE@"
-	db "MAX REVIVE@"
-	db "GUARD SPEC.@"
-	db "SUPER REPEL@"
-	db "MAX REPEL@"
-	db "DIRE HIT@"
-	db "COIN@"
-	db "FRESH WATER@"
-	db "SODA POP@"
-	db "LEMONADE@"
-	db "S.S.TICKET@"
-	db "GOLD TEETH@"
-	db "X ATTACK@"
-	db "X DEFEND@"
-	db "X SPEED@"
-	db "X SPECIAL@"
-	db "COIN CASE@"
-	db "OAK's PARCEL@"
-	db "ITEMFINDER@"
-	db "SILPH SCOPE@"
-	db "POKé FLUTE@"
-	db "LIFT KEY@"
-	db "EXP.ALL@"
-	db "OLD ROD@"
-	db "GOOD ROD@"
-	db "SUPER ROD@"
-	db "PP UP@"
-	db "ETHER@"
-	db "MAX ETHER@"
-	db "ELIXER@"
-	db "MAX ELIXER@"
-	db "B2F@"
-	db "B1F@"
-	db "1F@"
-	db "2F@"
-	db "3F@"
-	db "4F@"
-	db "5F@"
-	db "6F@"
-	db "7F@"
-	db "8F@"
-	db "9F@"
-	db "10F@"
-	db "11F@"
-	db "B4F@"
diff --git a/text/map_names.asm b/text/map_names.asm
deleted file mode 100755
index c2642942..00000000
--- a/text/map_names.asm
+++ /dev/null
@@ -1,107 +0,0 @@
-MapNames:
-PalletTownName:
-	db "PALLET TOWN@"
-ViridianCityName:
-	db "VIRIDIAN CITY@"
-PewterCityName:
-	db "PEWTER CITY@"
-CeruleanCityName:
-	db "CERULEAN CITY@"
-LavenderTownName:
-	db "LAVENDER TOWN@"
-VermilionCityName:
-	db "VERMILION CITY@"
-CeladonCityName:
-	db "CELADON CITY@"
-FuchsiaCityName:
-	db "FUCHSIA CITY@"
-CinnabarIslandName:
-	db "CINNABAR ISLAND@"
-IndigoPlateauName:
-	db "INDIGO PLATEAU@"
-SaffronCityName:
-	db "SAFFRON CITY@"
-Route1Name:
-	db "ROUTE 1@"
-Route2Name:
-	db "ROUTE 2@"
-Route3Name:
-	db "ROUTE 3@"
-Route4Name:
-	db "ROUTE 4@"
-Route5Name:
-	db "ROUTE 5@"
-Route6Name:
-	db "ROUTE 6@"
-Route7Name:
-	db "ROUTE 7@"
-Route8Name:
-	db "ROUTE 8@"
-Route9Name:
-	db "ROUTE 9@"
-Route10Name:
-	db "ROUTE 10@"
-Route11Name:
-	db "ROUTE 11@"
-Route12Name:
-	db "ROUTE 12@"
-Route13Name:
-	db "ROUTE 13@"
-Route14Name:
-	db "ROUTE 14@"
-Route15Name:
-	db "ROUTE 15@"
-Route16Name:
-	db "ROUTE 16@"
-Route17Name:
-	db "ROUTE 17@"
-Route18Name:
-	db "ROUTE 18@"
-Route19Name:
-	db "SEA ROUTE 19@"
-Route20Name:
-	db "SEA ROUTE 20@"
-Route21Name:
-	db "SEA ROUTE 21@"
-Route22Name:
-	db "ROUTE 22@"
-Route23Name:
-	db "ROUTE 23@"
-Route24Name:
-	db "ROUTE 24@"
-Route25Name:
-	db "ROUTE 25@"
-ViridianForestName:
-	db "VIRIDIAN FOREST@"
-MountMoonName:
-	db "MT.MOON@"
-RockTunnelName:
-	db "ROCK TUNNEL@"
-SeaCottageName:
-	db "SEA COTTAGE@"
-SSAnneName:
-	db "S.S.ANNE@"
-PokemonLeagueName:
-	db "#MON LEAGUE@"
-UndergroundPathName:
-	db "UNDERGROUND PATH@"
-PokemonTowerName:
-	db "#MON TOWER@"
-SeafoamIslandsName:
-	db "SEAFOAM ISLANDS@"
-VictoryRoadName:
-	db "VICTORY ROAD@"
-DiglettsCaveName:
-	db "DIGLETT's CAVE@"
-RocketHQName:
-	db "ROCKET HQ@"
-SilphCoName:
-	db "SILPH CO.@"
-PokemonMansionName:
-	db "<pkmn> MANSION@"
-SafariZoneName:
-	db "SAFARI ZONE@"
-CeruleanCaveName:
-	db "CERULEAN CAVE@"
-PowerPlantName:
-	db "POWER PLANT@"
diff --git a/text/maps/CeruleanCaveB1F.asm b/text/maps/CeruleanCaveB1F.asm
deleted file mode 100644
index 0918a3ce..00000000
--- a/text/maps/CeruleanCaveB1F.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-_MewtwoBattleText::
-	text "Mew!@@"
diff --git a/text/monster_names.asm b/text/monster_names.asm
deleted file mode 100755
index a62b1bd9..00000000
--- a/text/monster_names.asm
+++ /dev/null
@@ -1,191 +0,0 @@
-MonsterNames:
-	db "RHYDON@@@@"
-	db "KANGASKHAN"
-	db "NIDORAN♂@@"
-	db "CLEFAIRY@@"
-	db "SPEAROW@@@"
-	db "VOLTORB@@@"
-	db "NIDOKING@@"
-	db "SLOWBRO@@@"
-	db "IVYSAUR@@@"
-	db "EXEGGUTOR@"
-	db "LICKITUNG@"
-	db "EXEGGCUTE@"
-	db "GRIMER@@@@"
-	db "GENGAR@@@@"
-	db "NIDORAN♀@@"
-	db "NIDOQUEEN@"
-	db "CUBONE@@@@"
-	db "RHYHORN@@@"
-	db "LAPRAS@@@@"
-	db "ARCANINE@@"
-	db "MEW@@@@@@@"
-	db "GYARADOS@@"
-	db "SHELLDER@@"
-	db "TENTACOOL@"
-	db "GASTLY@@@@"
-	db "SCYTHER@@@"
-	db "STARYU@@@@"
-	db "BLASTOISE@"
-	db "PINSIR@@@@"
-	db "TANGELA@@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "GROWLITHE@"
-	db "ONIX@@@@@@"
-	db "FEAROW@@@@"
-	db "PIDGEY@@@@"
-	db "SLOWPOKE@@"
-	db "KADABRA@@@"
-	db "GRAVELER@@"
-	db "CHANSEY@@@"
-	db "MACHOKE@@@"
-	db "MR.MIME@@@"
-	db "HITMONLEE@"
-	db "HITMONCHAN"
-	db "ARBOK@@@@@"
-	db "PARASECT@@"
-	db "PSYDUCK@@@"
-	db "DROWZEE@@@"
-	db "GOLEM@@@@@"
-	db "MISSINGNO."
-	db "MAGMAR@@@@"
-	db "MISSINGNO."
-	db "ELECTABUZZ"
-	db "MAGNETON@@"
-	db "KOFFING@@@"
-	db "MISSINGNO."
-	db "MANKEY@@@@"
-	db "SEEL@@@@@@"
-	db "DIGLETT@@@"
-	db "TAUROS@@@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "FARFETCH'D"
-	db "VENONAT@@@"
-	db "DRAGONITE@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "DODUO@@@@@"
-	db "POLIWAG@@@"
-	db "JYNX@@@@@@"
-	db "MOLTRES@@@"
-	db "ARTICUNO@@"
-	db "ZAPDOS@@@@"
-	db "DITTO@@@@@"
-	db "MEOWTH@@@@"
-	db "KRABBY@@@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "VULPIX@@@@"
-	db "NINETALES@"
-	db "PIKACHU@@@"
-	db "RAICHU@@@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "DRATINI@@@"
-	db "DRAGONAIR@"
-	db "KABUTO@@@@"
-	db "KABUTOPS@@"
-	db "HORSEA@@@@"
-	db "SEADRA@@@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "SANDSHREW@"
-	db "SANDSLASH@"
-	db "OMANYTE@@@"
-	db "OMASTAR@@@"
-	db "JIGGLYPUFF"
-	db "WIGGLYTUFF"
-	db "EEVEE@@@@@"
-	db "FLAREON@@@"
-	db "JOLTEON@@@"
-	db "VAPOREON@@"
-	db "MACHOP@@@@"
-	db "ZUBAT@@@@@"
-	db "EKANS@@@@@"
-	db "PARAS@@@@@"
-	db "POLIWHIRL@"
-	db "POLIWRATH@"
-	db "WEEDLE@@@@"
-	db "KAKUNA@@@@"
-	db "BEEDRILL@@"
-	db "MISSINGNO."
-	db "DODRIO@@@@"
-	db "PRIMEAPE@@"
-	db "DUGTRIO@@@"
-	db "VENOMOTH@@"
-	db "DEWGONG@@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "CATERPIE@@"
-	db "METAPOD@@@"
-	db "BUTTERFREE"
-	db "MACHAMP@@@"
-	db "MISSINGNO."
-	db "GOLDUCK@@@"
-	db "HYPNO@@@@@"
-	db "GOLBAT@@@@"
-	db "MEWTWO@@@@"
-	db "SNORLAX@@@"
-	db "MAGIKARP@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MUK@@@@@@@"
-	db "MISSINGNO."
-	db "KINGLER@@@"
-	db "CLOYSTER@@"
-	db "MISSINGNO."
-	db "ELECTRODE@"
-	db "CLEFABLE@@"
-	db "WEEZING@@@"
-	db "PERSIAN@@@"
-	db "MAROWAK@@@"
-	db "MISSINGNO."
-	db "HAUNTER@@@"
-	db "ABRA@@@@@@"
-	db "ALAKAZAM@@"
-	db "PIDGEOTTO@"
-	db "PIDGEOT@@@"
-	db "STARMIE@@@"
-	db "BULBASAUR@"
-	db "VENUSAUR@@"
-	db "TENTACRUEL"
-	db "MISSINGNO."
-	db "GOLDEEN@@@"
-	db "SEAKING@@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "PONYTA@@@@"
-	db "RAPIDASH@@"
-	db "RATTATA@@@"
-	db "RATICATE@@"
-	db "NIDORINO@@"
-	db "NIDORINA@@"
-	db "GEODUDE@@@"
-	db "PORYGON@@@"
-	db "AERODACTYL"
-	db "MISSINGNO."
-	db "MAGNEMITE@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "CHARMANDER"
-	db "SQUIRTLE@@"
-	db "CHARMELEON"
-	db "WARTORTLE@"
-	db "CHARIZARD@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "ODDISH@@@@"
-	db "GLOOM@@@@@"
-	db "VILEPLUME@"
-	db "BELLSPROUT"
-	db "WEEPINBELL"
-	db "VICTREEBEL"
diff --git a/text/move_names.asm b/text/move_names.asm
deleted file mode 100644
index cbb1a322..00000000
--- a/text/move_names.asm
+++ /dev/null
@@ -1,166 +0,0 @@
-MoveNames::
-	db "POUND@"
-	db "KARATE CHOP@"
-	db "DOUBLESLAP@"
-	db "COMET PUNCH@"
-	db "MEGA PUNCH@"
-	db "PAY DAY@"
-	db "FIRE PUNCH@"
-	db "ICE PUNCH@"
-	db "THUNDERPUNCH@"
-	db "SCRATCH@"
-	db "VICEGRIP@"
-	db "GUILLOTINE@"
-	db "RAZOR WIND@"
-	db "SWORDS DANCE@"
-	db "CUT@"
-	db "GUST@"
-	db "WING ATTACK@"
-	db "WHIRLWIND@"
-	db "FLY@"
-	db "BIND@"
-	db "SLAM@"
-	db "VINE WHIP@"
-	db "STOMP@"
-	db "DOUBLE KICK@"
-	db "MEGA KICK@"
-	db "JUMP KICK@"
-	db "ROLLING KICK@"
-	db "SAND-ATTACK@"
-	db "HEADBUTT@"
-	db "HORN ATTACK@"
-	db "FURY ATTACK@"
-	db "HORN DRILL@"
-	db "TACKLE@"
-	db "BODY SLAM@"
-	db "WRAP@"
-	db "TAKE DOWN@"
-	db "THRASH@"
-	db "DOUBLE-EDGE@"
-	db "TAIL WHIP@"
-	db "POISON STING@"
-	db "TWINEEDLE@"
-	db "PIN MISSILE@"
-	db "LEER@"
-	db "BITE@"
-	db "GROWL@"
-	db "ROAR@"
-	db "SING@"
-	db "SUPERSONIC@"
-	db "SONICBOOM@"
-	db "DISABLE@"
-	db "ACID@"
-	db "EMBER@"
-	db "FLAMETHROWER@"
-	db "MIST@"
-	db "WATER GUN@"
-	db "HYDRO PUMP@"
-	db "SURF@"
-	db "ICE BEAM@"
-	db "BLIZZARD@"
-	db "PSYBEAM@"
-	db "BUBBLEBEAM@"
-	db "AURORA BEAM@"
-	db "HYPER BEAM@"
-	db "PECK@"
-	db "DRILL PECK@"
-	db "SUBMISSION@"
-	db "LOW KICK@"
-	db "COUNTER@"
-	db "SEISMIC TOSS@"
-	db "STRENGTH@"
-	db "ABSORB@"
-	db "MEGA DRAIN@"
-	db "LEECH SEED@"
-	db "GROWTH@"
-	db "RAZOR LEAF@"
-	db "SOLARBEAM@"
-	db "POISONPOWDER@"
-	db "STUN SPORE@"
-	db "SLEEP POWDER@"
-	db "PETAL DANCE@"
-	db "STRING SHOT@"
-	db "DRAGON RAGE@"
-	db "FIRE SPIN@"
-	db "THUNDERSHOCK@"
-	db "THUNDERBOLT@"
-	db "THUNDER WAVE@"
-	db "THUNDER@"
-	db "ROCK THROW@"
-	db "EARTHQUAKE@"
-	db "FISSURE@"
-	db "DIG@"
-	db "TOXIC@"
-	db "CONFUSION@"
-	db "PSYCHIC@"
-	db "HYPNOSIS@"
-	db "MEDITATE@"
-	db "AGILITY@"
-	db "QUICK ATTACK@"
-	db "RAGE@"
-	db "TELEPORT@"
-	db "NIGHT SHADE@"
-	db "MIMIC@"
-	db "SCREECH@"
-	db "DOUBLE TEAM@"
-	db "RECOVER@"
-	db "HARDEN@"
-	db "MINIMIZE@"
-	db "SMOKESCREEN@"
-	db "CONFUSE RAY@"
-	db "WITHDRAW@"
-	db "DEFENSE CURL@"
-	db "BARRIER@"
-	db "LIGHT SCREEN@"
-	db "HAZE@"
-	db "REFLECT@"
-	db "FOCUS ENERGY@"
-	db "BIDE@"
-	db "METRONOME@"
-	db "MIRROR MOVE@"
-	db "SELFDESTRUCT@"
-	db "EGG BOMB@"
-	db "LICK@"
-	db "SMOG@"
-	db "SLUDGE@"
-	db "BONE CLUB@"
-	db "FIRE BLAST@"
-	db "WATERFALL@"
-	db "CLAMP@"
-	db "SWIFT@"
-	db "SKULL BASH@"
-	db "SPIKE CANNON@"
-	db "CONSTRICT@"
-	db "AMNESIA@"
-	db "KINESIS@"
-	db "SOFTBOILED@"
-	db "HI JUMP KICK@"
-	db "GLARE@"
-	db "DREAM EATER@"
-	db "POISON GAS@"
-	db "BARRAGE@"
-	db "LEECH LIFE@"
-	db "LOVELY KISS@"
-	db "SKY ATTACK@"
-	db "TRANSFORM@"
-	db "BUBBLE@"
-	db "DIZZY PUNCH@"
-	db "SPORE@"
-	db "FLASH@"
-	db "PSYWAVE@"
-	db "SPLASH@"
-	db "ACID ARMOR@"
-	db "CRABHAMMER@"
-	db "EXPLOSION@"
-	db "FURY SWIPES@"
-	db "BONEMERANG@"
-	db "REST@"
-	db "ROCK SLIDE@"
-	db "HYPER FANG@"
-	db "SHARPEN@"
-	db "CONVERSION@"
-	db "TRI ATTACK@"
-	db "SUPER FANG@"
-	db "SLASH@"
-	db "SUBSTITUTE@"
-	db "STRUGGLE@"
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/pokedex.asm b/text/pokedex.asm
deleted file mode 100644
index 7e84a83d..00000000
--- a/text/pokedex.asm
+++ /dev/null
@@ -1,1508 +0,0 @@
-_BulbasaurDexEntry::
-	text "It can go for days"
-	next "without eating a"
-	next "single morsel."
-
-	page "In the bulb on"
-	next "its back, it"
-	next "stores energy"
-	dex
-
-_IvysaurDexEntry::
-	text "The bulb on its"
-	next "back grows by"
-	next "drawing energy."
-
-	page "It gives off an"
-	next "aroma when it is"
-	next "ready to bloom"
-	dex
-
-_VenusaurDexEntry::
-	text "The flower on its"
-	next "back catches the"
-	next "sun's rays."
-
-	page "The sunlight is"
-	next "then absorbed and"
-	next "used for energy"
-	dex
-
-_CharmanderDexEntry::
-	text "The flame at the"
-	next "tip of its tail"
-	next "makes a sound as"
-
-	page "it burns. You can"
-	next "only hear it in"
-	next "quiet places"
-	dex
-
-_CharmeleonDexEntry::
-	text "Tough fights could"
-	next "excite this"
-	next "#MON. When"
-
-	page "excited, it may"
-	next "blow out bluish-"
-	next "white flames"
-	dex
-
-_CharizardDexEntry::
-	text "When expelling a"
-	next "blast of super"
-	next "hot fire, the red"
-
-	page "flame at the tip"
-	next "of its tail burns"
-	next "more intensely"
-	dex
-
-_SquirtleDexEntry::
-	text "Shoots water at"
-	next "prey while in the"
-	next "water."
-
-	page "Withdraws into"
-	next "its shell when in"
-	next "danger"
-	dex
-
-_WartortleDexEntry::
-	text "When tapped, this"
-	next "#MON will pull"
-	next "in its head, but"
-
-	page "its tail will"
-	next "still stick out a"
-	next "little bit"
-	dex
-
-_BlastoiseDexEntry::
-	text "Once it takes aim"
-	next "at its enemy, it"
-	next "blasts out water"
-
-	page "with even more"
-	next "force than a fire"
-	next "hose"
-	dex
-
-_CaterpieDexEntry::
-	text "If you touch the"
-	next "feeler on top of"
-	next "its head, it will"
-
-	page "release a horrible"
-	next "stink to protect"
-	next "itself"
-	dex
-
-_MetapodDexEntry::
-	text "Hardens its shell"
-	next "to protect itself."
-	next "However, a large"
-
-	page "impact may cause"
-	next "it to pop out of"
-	next "its shell"
-	dex
-
-_ButterfreeDexEntry::
-	text "Its wings, covered"
-	next "with poisonous"
-	next "powders, repel"
-
-	page "water. This"
-	next "allows it to fly"
-	next "in the rain"
-	dex
-
-_WeedleDexEntry::
-	text "Beware of the"
-	next "sharp stinger on"
-	next "its head. It"
-
-	page "hides in grass"
-	next "and bushes where"
-	next "it eats leaves"
-	dex
-
-_KakunaDexEntry::
-	text "Able to move only"
-	next "slightly. When"
-	next "endangered, it"
-
-	page "may stick out its"
-	next "stinger and poison"
-	next "its enemy"
-	dex
-
-_BeedrillDexEntry::
-	text "It has 3 poisonous"
-	next "stingers on its"
-	next "forelegs and its"
-
-	page "tail. They are"
-	next "used to jab its"
-	next "enemy repeatedly"
-	dex
-
-_PidgeyDexEntry::
-	text "Very docile. If"
-	next "attacked, it will"
-	next "often kick up"
-
-	page "sand to protect"
-	next "itself rather"
-	next "than fight back"
-	dex
-
-_PidgeottoDexEntry::
-	text "This #MON is"
-	next "full of vitality."
-	next "It constantly"
-
-	page "flies around its"
-	next "large territory in"
-	next "search of prey"
-	dex
-
-_PidgeotDexEntry::
-	text "This #MON flies"
-	next "at Mach 2 speed,"
-	next "seeking prey."
-
-	page "Its large talons"
-	next "are feared as"
-	next "wicked weapons"
-	dex
-
-_RattataDexEntry::
-	text "Will chew on any-"
-	next "thing with its"
-	next "fangs. If you see"
-
-	page "one, it is certain"
-	next "that 40 more live"
-	next "in the area"
-	dex
-
-_RaticateDexEntry::
-	text "Its hind feet are"
-	next "webbed. They act"
-	next "as flippers, so"
-
-	page "it can swim in"
-	next "rivers and hunt"
-	next "for prey"
-	dex
-
-_SpearowDexEntry::
-	text "Inept at flying"
-	next "high. However, it"
-	next "can fly around"
-
-	page "very fast to"
-	next "protect its ter-"
-	next "ritory"
-	dex
-
-_FearowDexEntry::
-	text "A #MON that"
-	next "dates back many"
-	next "years. If it"
-
-	page "senses danger, it"
-	next "flies high and"
-	next "away, instantly"
-	dex
-
-_EkansDexEntry::
-	text "The older it gets,"
-	next "the longer it"
-	next "grows. At night,"
-
-	page "it wraps its long"
-	next "body around tree"
-	next "branches to rest"
-	dex
-
-_ArbokDexEntry::
-	text "The frightening"
-	next "patterns on its"
-	next "belly have been"
-
-	page "studied. Six"
-	next "variations have"
-	next "been confirmed"
-	dex
-
-_PikachuDexEntry::
-	text "It keeps its tail"
-	next "raised to monitor"
-	next "its surroundings."
-
-	page "If you yank its"
-	next "tail, it will try"
-	next "to bite you"
-	dex
-
-_RaichuDexEntry::
-	text "When electricity"
-	next "builds up inside"
-	next "its body, it"
-
-	page "becomes feisty."
-	next "It also glows in"
-	next "the dark"
-	dex
-
-_SandshrewDexEntry::
-	text "Its body is dry."
-	next "When it gets cold"
-	next "at night, its"
-
-	page "hide is said to"
-	next "become coated with"
-	next "a fine dew"
-	dex
-
-_SandslashDexEntry::
-	text "It is skilled at"
-	next "slashing enemies"
-	next "with its claws."
-
-	page "If broken, they"
-	next "start to grow back"
-	next "in a day"
-	dex
-
-_NidoranFDexEntry::
-	text "A mild-mannered"
-	next "#MON that does"
-	next "not like to"
-
-	page "fight. Beware, its"
-	next "small horns"
-	next "secrete venom"
-	dex
-
-_NidorinaDexEntry::
-	text "When resting deep"
-	next "in its burrow, its"
-	next "thorns always"
-
-	page "retract."
-	next "This is proof that"
-	next "it is relaxed"
-	dex
-
-_NidoqueenDexEntry::
-	text "Tough scales cover"
-	next "the sturdy body"
-	next "of this #MON."
-
-	page "It appears that"
-	next "the scales grow"
-	next "in cycles"
-	dex
-
-_NidoranMDexEntry::
-	text "Its large ears"
-	next "are always kept"
-	next "upright. If it"
-
-	page "senses danger, it"
-	next "will attack with a"
-	next "poisonous sting"
-	dex
-
-_NidorinoDexEntry::
-	text "Its horns contain"
-	next "venom. If they"
-	next "are stabbed into"
-
-	page "an enemy, the"
-	next "impact makes the"
-	next "poison leak out"
-	dex
-
-_NidokingDexEntry::
-	text "Its steel-like"
-	next "hide adds to its"
-	next "powerful tackle."
-
-	page "Its horns are so"
-	next "hard, they can"
-	next "pierce a diamond"
-	dex
-
-_ClefairyDexEntry::
-	text "Adored for their"
-	next "cute looks and"
-	next "playfulness. They"
-
-	page "are thought to be"
-	next "rare, as they do"
-	next "not appear often"
-	dex
-
-_ClefableDexEntry::
-	text "They appear to be"
-	next "very protective of"
-	next "their own world."
-
-	page "It is a kind of"
-	next "fairy, rarely seen"
-	next "by people"
-	dex
-
-_VulpixDexEntry::
-	text "Both its fur and"
-	next "its tails are"
-	next "beautiful. As it"
-
-	page "grows, the tails"
-	next "split and form"
-	next "more tails"
-	dex
-
-_NinetalesDexEntry::
-	text "According to an"
-	next "enduring legend,"
-	next "9 noble saints"
-
-	page "were united and"
-	next "reincarnated as"
-	next "this #MON"
-	dex
-
-_JigglypuffDexEntry::
-	text "Uses its alluring"
-	next "eyes to enrapture"
-	next "its foe. It then"
-
-	page "sings a pleasing"
-	next "melody that lulls"
-	next "the foe to sleep"
-	dex
-
-_WigglytuffDexEntry::
-	text "Its body is full"
-	next "of elasticity. By"
-	next "inhaling deeply,"
-
-	page "it can continue"
-	next "to inflate itself"
-	next "without limit"
-	dex
-
-_ZubatDexEntry::
-	text "Emits ultrasonic"
-	next "cries while it"
-	next "flies. They act"
-
-	page "as a sonar used"
-	next "to check for ob-"
-	next "jects in its way"
-	dex
-
-_GolbatDexEntry::
-	text "It attacks in a"
-	next "stealthy manner,"
-	next "without warning."
-
-	page "Its sharp fangs"
-	next "are used to bite"
-	next "and suck blood"
-	dex
-
-_OddishDexEntry::
-	text "It may be mistaken"
-	next "for a clump of"
-	next "weeds. If you try"
-
-	page "to yank it out of"
-	next "the ground, it"
-	next "shrieks horribly"
-	dex
-
-_GloomDexEntry::
-	text "Smells incredibly"
-	next "foul! However,"
-	next "around 1 out of"
-
-	page "1,000 people enjoy"
-	next "sniffing its nose-"
-	next "bending stink"
-	dex
-
-_VileplumeDexEntry::
-	text "Flaps its broad"
-	next "flower petals to"
-	next "scatter its"
-
-	page "poisonous pollen."
-	next "The flapping sound"
-	next "is very loud"
-	dex
-
-_ParasDexEntry::
-	text "Burrows under the"
-	next "ground to gnaw on"
-	next "tree roots. The"
-
-	page "mushrooms on its"
-	next "back absorb most"
-	next "of the nutrition"
-	dex
-
-_ParasectDexEntry::
-	text "The bug host is"
-	next "drained of energy"
-	next "by the mushrooms"
-
-	page "on its back. They"
-	next "appear to do all"
-	next "the thinking"
-	dex
-
-_VenonatDexEntry::
-	text "Its large eyes act"
-	next "as radars. In a"
-	next "bright place, you"
-
-	page "can see that they"
-	next "are clusters of"
-	next "many tiny eyes"
-	dex
-
-_VenomothDexEntry::
-	text "The powdery scales"
-	next "on its wings are"
-	next "hard to remove."
-
-	page "They also contain"
-	next "poison that leaks"
-	next "out on contact"
-	dex
-
-_DiglettDexEntry::
-	text "It prefers dark"
-	next "places. It spends"
-	next "most of its time"
-
-	page "underground,"
-	next "though it may pop"
-	next "up in caves"
-	dex
-
-_DugtrioDexEntry::
-	text "A team of triplets"
-	next "that can burrow"
-	next "over 60 MPH."
-
-	page "Due to this, some"
-	next "people think it's"
-	next "an earthquake"
-	dex
-
-_MeowthDexEntry::
-	text "Appears to be more"
-	next "active at night."
-	next "It loves round"
-
-	page "and shiny things."
-	next "It can't stop from"
-	next "picking them up"
-	dex
-
-_PersianDexEntry::
-	text "The gem in its"
-	next "forehead glows on"
-	next "its own! It walks"
-
-	page "with all the grace"
-	next "and elegance of a"
-	next "proud queen"
-	dex
-
-_PsyduckDexEntry::
-	text "Always tormented"
-	next "by headaches."
-	next "It uses psychic"
-
-	page "powers, but it is"
-	next "not known if it"
-	next "intends to do so"
-	dex
-
-_GolduckDexEntry::
-	text "Its slim and long"
-	next "limbs end in broad"
-	next "flippers. They"
-
-	page "are used for swim-"
-	next "ming gracefully"
-	next "in lakes"
-	dex
-
-_MankeyDexEntry::
-	text "An agile #MON"
-	next "that lives in"
-	next "trees. It angers"
-
-	page "easily and will"
-	next "not hesitate to"
-	next "attack anything"
-	dex
-
-_PrimeapeDexEntry::
-	text "It stops being"
-	next "angry only when"
-	next "nobody else is"
-
-	page "around. To view"
-	next "this moment is"
-	next "very difficult"
-	dex
-
-_GrowlitheDexEntry::
-	text "A #MON with a"
-	next "friendly nature."
-	next "However, it will"
-
-	page "bark fiercely at"
-	next "anything invading"
-	next "its territory"
-	dex
-
-_ArcanineDexEntry::
-	text "A legendary #-"
-	next "MON in China."
-	next "Many people are"
-
-	page "charmed by its"
-	next "grace and beauty"
-	next "while running"
-	dex
-
-_PoliwagDexEntry::
-	text "The direction of"
-	next "the spiral on the"
-	next "belly differs by"
-
-	page "area. It is more"
-	next "adept at swimming"
-	next "than walking"
-	dex
-
-_PoliwhirlDexEntry::
-	text "Under attack, it"
-	next "uses its belly "
-	next "spiral to put the"
-
-	page "foe to sleep. It"
-	next "then makes its"
-	next "escape"
-	dex
-
-_PoliwrathDexEntry::
-	text "Swims powerfully"
-	next "using all the"
-	next "muscles in its"
-
-	page "body. It can even"
-	next "overtake champion"
-	next "swimmers"
-	dex
-
-_AbraDexEntry::
-	text "Sleeps 18 hours a"
-	next "day. If it senses"
-	next "danger, it will"
-
-	page "teleport itself to"
-	next "safety even as it"
-	next "sleeps"
-	dex
-
-_KadabraDexEntry::
-	text "Many odd things"
-	next "happen if this"
-	next "#MON is close"
-
-	page "by. For example,"
-	next "it makes clocks"
-	next "run backwards"
-	dex
-
-_AlakazamDexEntry::
-	text "A #MON that can"
-	next "memorize anything."
-	next "It never forgets"
-
-	page "what it learns--"
-	next "that's why this"
-	next "#MON is smart"
-	dex
-
-_MachopDexEntry::
-	text "Very powerful in"
-	next "spite of its small"
-	next "size. Its mastery"
-
-	page "of many types of"
-	next "martial arts makes"
-	next "it very tough"
-	dex
-
-_MachokeDexEntry::
-	text "The belt around"
-	next "its waist holds"
-	next "back its energy."
-
-	page "Without it, this"
-	next "#MON would be"
-	next "unstoppable"
-	dex
-
-_MachampDexEntry::
-	text "One arm alone can"
-	next "move mountains."
-	next "Using all four"
-
-	page "arms, this #MON"
-	next "fires off awesome"
-	next "punches"
-	dex
-
-_BellsproutDexEntry::
-	text "Prefers hot and"
-	next "humid places."
-	next "It ensnares tiny"
-
-	page "insects with its"
-	next "vines and devours"
-	next "them"
-	dex
-
-_WeepinbellDexEntry::
-	text "When hungry, it"
-	next "swallows anything"
-	next "that moves. Its"
-
-	page "hapless prey is"
-	next "melted inside by"
-	next "strong acids"
-	dex
-
-_VictreebelDexEntry::
-	text "Lures prey with"
-	next "the sweet aroma of"
-	next "honey. Swallowed"
-
-	page "whole, the prey is"
-	next "melted in a day,"
-	next "bones and all"
-	dex
-
-_TentacoolDexEntry::
-	text "It can sometimes"
-	next "be found all dry"
-	next "and shriveled up"
-
-	page "on a beach. Toss"
-	next "it back into the"
-	next "sea to revive it"
-	dex
-
-_TentacruelDexEntry::
-	text "Its 80 tentacles"
-	next "can stretch and"
-	next "contract freely."
-
-	page "They wrap around"
-	next "prey and weaken"
-	next "it with poison"
-	dex
-
-_GeodudeDexEntry::
-	text "Commonly found"
-	next "near mountain"
-	next "trails, etc."
-
-	page "If you step on"
-	next "one by accident,"
-	next "it gets angry"
-	dex
-
-_GravelerDexEntry::
-	text "Often seen rolling"
-	next "down mountain"
-	next "trails. Obstacles"
-
-	page "are just things to"
-	next "roll straight"
-	next "over, not avoid"
-	dex
-
-_GolemDexEntry::
-	text "Once it sheds its"
-	next "skin, its body"
-	next "turns tender and"
-
-	page "whitish. Its hide"
-	next "hardens when it's"
-	next "exposed to air"
-	dex
-
-_PonytaDexEntry::
-	text "Capable of jumping"
-	next "incredibly high."
-	next "Its hooves and"
-
-	page "sturdy legs absorb"
-	next "the impact of a"
-	next "hard landing"
-	dex
-
-_RapidashDexEntry::
-	text "Just loves to run."
-	next "If it sees some-"
-	next "thing faster than"
-
-	page "itself, it will"
-	next "give chase at top"
-	next "speed"
-	dex
-
-_SlowpokeDexEntry::
-	text "Incredibly slow"
-	next "and sluggish. It"
-	next "is quite content"
-
-	page "to loll about"
-	next "without worrying"
-	next "about the time"
-	dex
-
-_SlowbroDexEntry::
-	text "Lives lazily by"
-	next "the sea. If the"
-	next "SHELLDER on its"
-
-	page "tail comes off,"
-	next "it becomes a"
-	next "SLOWPOKE again"
-	dex
-
-_MagnemiteDexEntry::
-	text "It is born with"
-	next "the ability to"
-	next "defy gravity. It"
-
-	page "floats in air on"
-	next "powerful electro-"
-	next "magnetic waves"
-	dex
-
-_MagnetonDexEntry::
-	text "Generates strange"
-	next "radio signals. It"
-	next "raises the tem-"
-
-	page "perature by 3.6F"
-	next "degrees within"
-	next "3,300 feet"
-	dex
-
-_FarfetchdDexEntry::
-	text "Lives where reedy"
-	next "plants grow. They"
-	next "are rarely seen,"
-
-	page "so it's thought"
-	next "their numbers are"
-	next "decreasing"
-	dex
-
-_DoduoDexEntry::
-	text "Its short wings"
-	next "make flying dif-"
-	next "ficult. Instead,"
-
-	page "this #MON runs"
-	next "at high speed on"
-	next "developed legs"
-	dex
-
-_DodrioDexEntry::
-	text "One of DODUO's 2"
-	next "heads splits to"
-	next "form a unique"
-
-	page "species. It runs"
-	next "close to 40 MPH"
-	next "in prairies"
-	dex
-
-_SeelDexEntry::
-	text "Loves freezing"
-	next "cold conditions."
-	next "Relishes swimming"
-
-	page "in a frigid cli-"
-	next "mate of around 14F"
-	next "degrees"
-	dex
-
-_DewgongDexEntry::
-	text "Its entire body is"
-	next "a snowy-white."
-	next "Unharmed by even"
-
-	page "intense cold, it"
-	next "swims powerfully"
-	next "in icy waters"
-	dex
-
-_GrimerDexEntry::
-	text "Made of hardened"
-	next "sludge. It smells"
-	next "too putrid to"
-
-	page "touch."
-	next "Even weeds won't"
-	next "grow in its path"
-	dex
-
-_MukDexEntry::
-	text "Smells so awful,"
-	next "it can cause"
-	next "fainting. Through"
-
-	page "degeneration, it"
-	next "lost its sense of"
-	next "smell"
-	dex
-
-_ShellderDexEntry::
-	text "The shell can"
-	next "withstand any"
-	next "attack. However,"
-
-	page "when it is open,"
-	next "the tender body"
-	next "is exposed"
-	dex
-
-_CloysterDexEntry::
-	text "For protection, it"
-	next "uses its harder-"
-	next "than-diamonds"
-
-	page "shell. It also"
-	next "shoots spikes from"
-	next "the shell"
-	dex
-
-_GastlyDexEntry::
-	text "Said to appear in"
-	next "decrepit, deserted"
-	next "buildings. It has"
-
-	page "no real shape as"
-	next "it appears to be"
-	next "made of a gas"
-	dex
-
-_HaunterDexEntry::
-	text "By licking, it"
-	next "saps the victim's"
-	next "life. It causes"
-
-	page "shaking that won't"
-	next "stop until the"
-	next "victim's demise"
-	dex
-
-_GengarDexEntry::
-	text "A GENGAR is close"
-	next "by if you feel a"
-	next "sudden chill."
-
-	page "It may be trying"
-	next "to lay a curse"
-	next "on you"
-	dex
-
-_OnixDexEntry::
-	text "Burrows at high"
-	next "speed in search"
-	next "of food. The"
-
-	page "tunnels it leaves"
-	next "are used as homes"
-	next "by DIGLETTs"
-	dex
-
-_DrowzeeDexEntry::
-	text "If you sleep by"
-	next "it all the time,"
-	next "it will sometimes"
-
-	page "show you dreams"
-	next "it has eaten in"
-	next "the past"
-	dex
-
-_HypnoDexEntry::
-	text "Avoid eye contact"
-	next "if you come across"
-	next "one. It will try"
-
-	page "to put you to"
-	next "sleep by using"
-	next "its pendulum"
-	dex
-
-_KrabbyDexEntry::
-	text "Its pincers are"
-	next "superb weapons."
-	next "They sometimes"
-
-	page "break off during"
-	next "battle, but they"
-	next "grow back fast"
-	dex
-
-_KinglerDexEntry::
-	text "One claw grew"
-	next "massively and as"
-	next "hard as steel."
-
-	page "It has 10,000-HP"
-	next "strength. However,"
-	next "it is too heavy"
-	dex
-
-_VoltorbDexEntry::
-	text "It is said to"
-	next "camouflage itself"
-	next "as a # BALL. It"
-
-	page "will self-destruct"
-	next "with very little"
-	next "stimulus"
-	dex
-
-_ElectrodeDexEntry::
-	text "Stores electrical"
-	next "energy inside its"
-	next "body. Even the"
-
-	page "slightest shock"
-	next "could trigger a"
-	next "huge explosion"
-	dex
-
-_ExeggcuteDexEntry::
-	text "The heads attract"
-	next "each other and"
-	next "spin around."
-
-	page "There must be 6"
-	next "heads for it to"
-	next "maintain balance"
-	dex
-
-_ExeggutorDexEntry::
-	text "Its cries are very"
-	next "noisy. This is"
-	next "because each of"
-
-	page "the 3 heads thinks"
-	next "about whatever it"
-	next "likes"
-	dex
-
-_CuboneDexEntry::
-	text "Wears the skull"
-	next "of its deceased"
-	next "mother. Its cries"
-
-	page "echo inside the"
-	next "skull and come out"
-	next "as a sad melody"
-	dex
-
-_MarowakDexEntry::
-	text "Small and weak,"
-	next "this #MON is"
-	next "adept with its"
-
-	page "bone club. It has"
-	next "grown more vicious"
-	next "over the ages"
-	dex
-
-_HitmonleeDexEntry::
-	text "When kicking, the"
-	next "sole of its foot"
-	next "turns as hard as"
-
-	page "a diamond on im-"
-	next "pact and destroys"
-	next "its enemy"
-	dex
-
-_HitmonchanDexEntry::
-	text "Punches in cork-"
-	next "screw fashion. It"
-	next "can punch its way"
-
-	page "through a concrete"
-	next "wall in the same"
-	next "way as a drill"
-	dex
-
-_LickitungDexEntry::
-	text "Its tongue spans"
-	next "almost 7 feet and"
-	next "moves more freely"
-
-	page "than its forelegs."
-	next "Its licks can"
-	next "cause paralysis"
-	dex
-
-_KoffingDexEntry::
-	text "In hot places, its"
-	next "internal gases"
-	next "could expand and"
-
-	page "explode without"
-	next "any warning. Be"
-	next "very careful!@@"
-
-_WeezingDexEntry::
-	text "It lives and grows"
-	next "by absorbing dust,"
-	next "germs and poison"
-
-	page "gases that are"
-	next "contained in toxic"
-	next "waste and garbage"
-	dex
-
-_RhyhornDexEntry::
-	text "A #MON with a"
-	next "one-track mind."
-	next "Once it charges, "
-
-	page "it won't stop"
-	next "running until it"
-	next "falls asleep"
-	dex
-
-_RhydonDexEntry::
-	text "Walks on its hind"
-	next "legs. Shows signs"
-	next "of intelligence."
-
-	page "Its armor-like"
-	next "hide even repels"
-	next "molten lava"
-	dex
-
-_ChanseyDexEntry::
-	text "A gentle and kind-"
-	next "hearted #MON"
-	next "that shares its"
-
-	page "nutritious eggs"
-	next "if it sees an"
-	next "injured #MON"
-	dex
-
-_TangelaDexEntry::
-	text "Its identity is"
-	next "obscured by masses"
-	next "of thick, blue"
-
-	page "vines. The vines"
-	next "are said to never"
-	next "stop growing"
-	dex
-
-_KangaskhanDexEntry::
-	text "Raises its young"
-	next "in its belly"
-	next "pouch. Won't run"
-
-	page "from any fight"
-	next "to keep its young"
-	next "protected"
-	dex
-
-_HorseaDexEntry::
-	text "If it senses any"
-	next "danger, it will"
-	next "vigorously spray"
-
-	page "water or a special"
-	next "type of ink from"
-	next "its mouth"
-	dex
-
-_SeadraDexEntry::
-	text "Touching the back"
-	next "fin causes numb-"
-	next "ness. It hooks"
-
-	page "its tail to coral"
-	next "to stay in place"
-	next "while sleeping"
-	dex
-
-_GoldeenDexEntry::
-	text "When it is time"
-	next "for them to lay"
-	next "eggs, they can be"
-
-	page "seen swimming up"
-	next "rivers and falls"
-	next "in large groups"
-	dex
-
-_SeakingDexEntry::
-	text "It is the male's"
-	next "job to make a"
-	next "nest by carving"
-
-	page "out boulders in a"
-	next "stream using the"
-	next "horn on its head"
-	dex
-
-_StaryuDexEntry::
-	text "As long as the"
-	next "center section is"
-	next "unharmed, it can"
-
-	page "grow back fully"
-	next "even if it is"
-	next "chopped to bits"
-	dex
-
-_StarmieDexEntry::
-	text "The center section"
-	next "is named the core."
-	next "People think it"
-
-	page "is communicating"
-	next "when it glows in"
-	next "7 colors"
-	dex
-
-_MrMimeDexEntry::
-	text "Always practices"
-	next "its pantomime act."
-	next "It makes enemies"
-
-	page "believe something"
-	next "exists that"
-	next "really doesn't"
-	dex
-
-_ScytherDexEntry::
-	text "Leaps out of tall"
-	next "grass and slices"
-	next "prey with its"
-
-	page "scythes. The move-"
-	next "ment looks like"
-	next "that of a ninja"
-	dex
-
-_JynxDexEntry::
-	text "Appears to move"
-	next "to a rhythm of"
-	next "its own, as if it"
-
-	page "were dancing. It"
-	next "wiggles its hips"
-	next "as it walks"
-	dex
-
-_ElectabuzzDexEntry::
-	text "If a major power"
-	next "outage occurs, it"
-	next "is certain that"
-
-	page "this #MON has"
-	next "eaten electricity"
-	next "at a power plant"
-	dex
-
-_MagmarDexEntry::
-	text "Born in an active"
-	next "volcano. Its body"
-	next "is always cloaked"
-
-	page "in flames, so it"
-	next "looks like a big"
-	next "ball of fire"
-	dex
-
-_PinsirDexEntry::
-	text "Grips its prey in"
-	next "its pincers and"
-	next "squeezes hard! It"
-
-	page "can't move if it's"
-	next "cold, so it lives"
-	next "in warm places"
-	dex
-
-_TaurosDexEntry::
-	text "A rowdy #MON"
-	next "with a lot of"
-	next "stamina. Once"
-
-	page "running, it won't"
-	next "stop until it hits"
-	next "something"
-	dex
-
-_MagikarpDexEntry::
-	text "Famous for being"
-	next "very unreliable."
-	next "It can be found"
-
-	page "swimming in seas,"
-	next "lakes, rivers and"
-	next "shallow puddles"
-	dex
-
-_GyaradosDexEntry::
-	text "Brutally vicious"
-	next "and enormously"
-	next "destructive."
-
-	page "Known for totally"
-	next "destroying cities"
-	next "in ancient times"
-	dex
-
-_LaprasDexEntry::
-	text "A gentle soul that"
-	next "can read the minds"
-	next "of people. It can"
-
-	page "ferry people"
-	next "across the sea on"
-	next "its back"
-	dex
-
-_DittoDexEntry::
-	text "When it spots an"
-	next "enemy, its body"
-	next "transfigures into"
-
-	page "an almost perfect"
-	next "copy of its oppo-"
-	next "nent"
-	dex
-
-_EeveeDexEntry::
-	text "Its genetic code"
-	next "is unstable, so it"
-	next "could evolve in"
-
-	page "a variety of ways."
-	next "There are only a"
-	next "few alive"
-	dex
-
-_VaporeonDexEntry::
-	text "Its cell structure"
-	next "is similar to"
-	next "water molecules."
-
-	page "It will melt away"
-	next "and become invis-"
-	next "ible in water"
-	dex
-
-_JolteonDexEntry::
-	text "A sensitive #-"
-	next "MON that easily"
-	next "becomes sad or"
-
-	page "angry. Every time"
-	next "its mood changes,"
-	next "it charges power"
-	dex
-
-_FlareonDexEntry::
-	text "It has a flame"
-	next "chamber inside its"
-	next "body. It inhales,"
-
-	page "then blows out"
-	next "fire that is over"
-	next "3,000F degrees"
-	dex
-
-_PorygonDexEntry::
-	text "The only #MON"
-	next "people anticipate"
-	next "can fly into"
-
-	page "space. None has"
-	next "managed the feat"
-	next "yet, however"
-	dex
-
-_OmanyteDexEntry::
-	text "An ancient #MON"
-	next "that was recovered"
-	next "from a fossil. It"
-
-	page "swims by cleverly"
-	next "twisting its 10"
-	next "tentacles about"
-	dex
-
-_OmastarDexEntry::
-	text "Sharp beaks ring"
-	next "its mouth. Its"
-	next "shell was too big"
-
-	page "for it to move"
-	next "freely, so it"
-	next "became extinct"
-	dex
-
-_KabutoDexEntry::
-	text "A #MON that was"
-	next "recovered from a"
-	next "fossil. It uses"
-
-	page "the eyes on its"
-	next "back while hiding"
-	next "on the sea floor"
-	dex
-
-_KabutopsDexEntry::
-	text "A slim and fast"
-	next "swimmer. It slices"
-	next "its prey with its"
-
-	page "sharp sickles and"
-	next "drinks the body"
-	next "fluids"
-	dex
-
-_AerodactylDexEntry::
-	text "A savage #MON"
-	next "that died out in"
-	next "ancient times. It"
-
-	page "was resurrected"
-	next "using DNA taken"
-	next "from amber"
-	dex
-
-_SnorlaxDexEntry::
-	text "Will eat anything,"
-	next "even if the food"
-	next "happens to be a"
-
-	page "little moldy. It"
-	next "never gets an"
-	next "upset stomach"
-	dex
-
-_ArticunoDexEntry::
-	text "A legendary bird"
-	next "#MON. It"
-	next "freezes water"
-
-	page "that is contained"
-	next "in winter air and"
-	next "makes it snow"
-	dex
-
-_ZapdosDexEntry::
-	text "This legendary"
-	next "bird #MON is"
-	next "said to appear"
-
-	page "when the sky turns"
-	next "dark and lightning"
-	next "showers down"
-	dex
-
-_MoltresDexEntry::
-	text "A legendary bird"
-	next "#MON. As it"
-	next "flaps its flaming"
-
-	page "wings, even the"
-	next "night sky will"
-	next "turn red"
-	dex
-
-_DratiniDexEntry::
-	text "The existence of"
-	next "this mythical"
-	next "#MON was only"
-
-	page "recently confirmed"
-	next "by a fisherman"
-	next "who caught one"
-	dex
-
-_DragonairDexEntry::
-	text "According to a"
-	next "witness, its body"
-	next "was surrounded by"
-
-	page "a strange aura"
-	next "that gave it a"
-	next "mystical look"
-	dex
-
-_DragoniteDexEntry::
-	text "It is said that"
-	next "this #MON lives"
-	next "somewhere in the"
-
-	page "sea and that it"
-	next "flies. However, it"
-	next "is only a rumor"
-	dex
-
-_MewtwoDexEntry::
-	text "Its DNA is almost"
-	next "the same as MEW's."
-	next "However, its size"
-
-	page "and disposition"
-	next "are vastly dif-"
-	next "ferent"
-	dex
-
-_MewDexEntry::
-	text "When viewed"
-	next "through a micro-"
-	next "scope, this"
-
-	page "#MON's short,"
-	next "fine, delicate"
-	next "hair can be seen"
-	dex
diff --git a/text/pokedex_ratings.asm b/text/pokedex_ratings.asm
index b94a9868..ce701f8a 100644
--- a/text/pokedex_ratings.asm
+++ b/text/pokedex_ratings.asm
@@ -3,10 +3,10 @@ _DexCompletionText::
 	line "letion is:"
 
 	para "@"
-	TX_NUM hDexRatingNumMonsSeen, 1, 3
+	text_decimal hDexRatingNumMonsSeen, 1, 3
 	text " #MON seen"
 	line "@"
-	TX_NUM hDexRatingNumMonsOwned, 1, 3
+	text_decimal hDexRatingNumMonsOwned, 1, 3
 	text " #MON owned"
 
 	para "PROF.OAK's"
diff --git a/text/trainer_names.asm b/text/trainer_names.asm
deleted file mode 100755
index 7736738b..00000000
--- a/text/trainer_names.asm
+++ /dev/null
@@ -1,48 +0,0 @@
-TrainerNames:
-	db "YOUNGSTER@"
-	db "BUG CATCHER@"
-	db "LASS@"
-	db "SAILOR@"
-	db "JR.TRAINER♂@"
-	db "JR.TRAINER♀@"
-	db "POKéMANIAC@"
-	db "SUPER NERD@"
-	db "HIKER@"
-	db "BIKER@"
-	db "BURGLAR@"
-	db "ENGINEER@"
-	db "JUGGLER@"
-	db "FISHERMAN@"
-	db "SWIMMER@"
-	db "CUE BALL@"
-	db "GAMBLER@"
-	db "BEAUTY@"
-	db "PSYCHIC@"
-	db "ROCKER@"
-	db "JUGGLER@"
-	db "TAMER@"
-	db "BIRD KEEPER@"
-	db "BLACKBELT@"
-	db "RIVAL1@"
-	db "PROF.OAK@"
-	db "CHIEF@"
-	db "SCIENTIST@"
-	db "GIOVANNI@"
-	db "ROCKET@"
-	db "COOLTRAINER♂@"
-	db "COOLTRAINER♀@"
-	db "BRUNO@"
-	db "BROCK@"
-	db "MISTY@"
-	db "LT.SURGE@"
-	db "ERIKA@"
-	db "KOGA@"
-	db "BLAINE@"
-	db "SABRINA@"
-	db "GENTLEMAN@"
-	db "RIVAL2@"
-	db "RIVAL3@"
-	db "LORELEI@"
-	db "CHANNELER@"
-	db "AGATHA@"
-	db "LANCE@"
diff --git a/text/type_names.asm b/text/type_names.asm
deleted file mode 100755
index d94675b8..00000000
--- a/text/type_names.asm
+++ /dev/null
@@ -1,48 +0,0 @@
-TypeNames:
-
-	dw .Normal
-	dw .Fighting
-	dw .Flying
-	dw .Poison
-	dw .Ground
-	dw .Rock
-	dw .Bird
-	dw .Bug
-	dw .Ghost
-
-	dw .Normal
-	dw .Normal
-	dw .Normal
-	dw .Normal
-	dw .Normal
-	dw .Normal
-	dw .Normal
-	dw .Normal
-	dw .Normal
-	dw .Normal
-	dw .Normal
-
-	dw .Fire
-	dw .Water
-	dw .Grass
-	dw .Electric
-	dw .Psychic
-	dw .Ice
-	dw .Dragon
-
-.Normal:   db "NORMAL@"
-.Fighting: db "FIGHTING@"
-.Flying:   db "FLYING@"
-.Poison:   db "POISON@"
-.Fire:     db "FIRE@"
-.Water:    db "WATER@"
-.Grass:    db "GRASS@"
-.Electric: db "ELECTRIC@"
-.Psychic:  db "PSYCHIC@"
-.Ice:      db "ICE@"
-.Ground:   db "GROUND@"
-.Rock:     db "ROCK@"
-.Bird:     db "BIRD@"
-.Bug:      db "BUG@"
-.Ghost:    db "GHOST@"
-.Dragon:   db "DRAGON@"
diff --git a/text/unused_names.asm b/text/unused_names.asm
deleted file mode 100644
index dd4c9a12..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 "エクセレント" ; note the lack of a terminator
author	dannye <33dannye@gmail.com>	2020-11-04 00:06:44 -0600
committer	dannye <33dannye@gmail.com>	2020-11-04 00:06:44 -0600
commit	5647ca687b92954dcf37a6ea6bfbc9a341c32de4 (patch)
tree	dde1937a1bfdb3a835f4155e1c2eb8f1aaf86f63 /text
parent	53fcd05aa24693093d8af1dc8ec4fedd3957decc (diff)