summaryrefslogtreecommitdiff
path: root/text.asm
diff options
context:
space:
mode:
Diffstat (limited to 'text.asm')
-rw-r--r--text.asm81
1 files changed, 35 insertions, 46 deletions
diff --git a/text.asm b/text.asm
index be17bfc6..3f76cc98 100644
--- a/text.asm
+++ b/text.asm
@@ -28,16 +28,15 @@ INCLUDE "text/SilphCo2F.asm"
INCLUDE "text/SilphCo3F.asm"
INCLUDE "text/SilphCo4F.asm"
INCLUDE "text/SilphCo5F.asm"
-
-
-SECTION "Text 2", ROMX
-
-INCLUDE "text/SilphCo5F_2.asm"
INCLUDE "text/SilphCo6F.asm"
INCLUDE "text/SilphCo7F.asm"
INCLUDE "text/SilphCo8F.asm"
INCLUDE "text/SilphCo9F.asm"
INCLUDE "text/SilphCo10F.asm"
+
+
+SECTION "Text 2", ROMX
+
INCLUDE "text/SilphCo11F.asm"
INCLUDE "text/PokemonMansion2F.asm"
INCLUDE "text/PokemonMansion3F.asm"
@@ -60,14 +59,14 @@ INCLUDE "text/LoreleisRoom.asm"
INCLUDE "text/BrunosRoom.asm"
INCLUDE "text/AgathasRoom.asm"
INCLUDE "text/RockTunnelB1F.asm"
+INCLUDE "text/SeafoamIslandsB4F.asm"
+INCLUDE "data/text/text_2.asm"
-SECTION "Text 3", ROMX
-INCLUDE "text/RockTunnelB1F_2.asm"
-INCLUDE "text/SeafoamIslandsB4F.asm"
+SECTION "Text 3", ROMX
-INCLUDE "data/text/text_2.asm"
+INCLUDE "data/text/text_3.asm"
INCLUDE "text/DiglettsCaveRoute2.asm"
INCLUDE "text/ViridianForestNorthGate.asm"
@@ -77,11 +76,6 @@ INCLUDE "text/ViridianForestSouthGate.asm"
INCLUDE "text/MtMoonPokecenter.asm"
INCLUDE "text/SaffronGates.asm"
INCLUDE "text/Daycare.asm"
-
-
-SECTION "Text 4", ROMX
-
-INCLUDE "text/Daycare_2.asm"
INCLUDE "text/UndergroundPathRoute6.asm"
INCLUDE "text/UndergroundPathRoute7.asm"
INCLUDE "text/UndergroundPathRoute7Copy.asm"
@@ -102,6 +96,7 @@ INCLUDE "text/Route16Gate2F.asm"
INCLUDE "text/Route16FlyHouse.asm"
INCLUDE "text/Route18Gate1F.asm"
INCLUDE "text/Route18Gate2F.asm"
+INCLUDE "text/BeachHouse.asm"
INCLUDE "text/Route22Gate.asm"
INCLUDE "text/VictoryRoad2F.asm"
INCLUDE "text/BillsHouse.asm"
@@ -114,13 +109,13 @@ INCLUDE "text/Route6.asm"
INCLUDE "text/Route7.asm"
INCLUDE "text/Route8.asm"
INCLUDE "text/Route9.asm"
-INCLUDE "text/Route10.asm"
-INCLUDE "text/Route11.asm"
-SECTION "Text 5", ROMX
+SECTION "Text 4", ROMX
-INCLUDE "text/Route11_2.asm"
+INCLUDE "text/Route9_2.asm"
+INCLUDE "text/Route10.asm"
+INCLUDE "text/Route11.asm"
INCLUDE "text/Route12.asm"
INCLUDE "text/Route13.asm"
INCLUDE "text/Route14.asm"
@@ -134,18 +129,19 @@ INCLUDE "text/Route21.asm"
INCLUDE "text/Route22.asm"
INCLUDE "text/Route23.asm"
INCLUDE "text/Route24.asm"
+INCLUDE "text/Route25.asm"
+INCLUDE "data/text/text_4.asm"
-SECTION "Text 6", ROMX
-INCLUDE "text/Route24_2.asm"
-INCLUDE "text/Route25.asm"
+SECTION "Text 5", ROMX
-INCLUDE "data/text/text_3.asm"
+INCLUDE "data/text/text_5.asm"
INCLUDE "text/RedsHouse1F.asm"
INCLUDE "text/BluesHouse.asm"
INCLUDE "text/OaksLab.asm"
+INCLUDE "text/pokedex_ratings.asm"
INCLUDE "text/ViridianPokecenter.asm"
INCLUDE "text/ViridianMart.asm"
INCLUDE "text/ViridianSchoolHouse.asm"
@@ -154,11 +150,6 @@ INCLUDE "text/ViridianGym.asm"
INCLUDE "text/Museum1F.asm"
INCLUDE "text/Museum2F.asm"
INCLUDE "text/PewterGym.asm"
-
-
-SECTION "Text 7", ROMX
-
-INCLUDE "text/PewterGym_2.asm"
INCLUDE "text/PewterNidoranHouse.asm"
INCLUDE "text/PewterMart.asm"
INCLUDE "text/PewterSpeechHouse.asm"
@@ -170,6 +161,11 @@ INCLUDE "text/CeruleanGym.asm"
INCLUDE "text/BikeShop.asm"
INCLUDE "text/CeruleanMart.asm"
INCLUDE "text/CeruleanBadgeHouse.asm"
+
+
+SECTION "Text 6", ROMX
+
+INCLUDE "text/CeruleanBadgeHouse_2.asm"
INCLUDE "text/LavenderPokecenter.asm"
INCLUDE "text/PokemonTower1F.asm"
INCLUDE "text/PokemonTower2F.asm"
@@ -186,13 +182,11 @@ INCLUDE "text/VermilionPokecenter.asm"
INCLUDE "text/PokemonFanClub.asm"
INCLUDE "text/VermilionMart.asm"
INCLUDE "text/VermilionGym.asm"
-
-
-SECTION "Text 8", ROMX
-
-INCLUDE "text/VermilionGym_2.asm"
INCLUDE "text/VermilionPidgeyHouse.asm"
INCLUDE "text/VermilionDock.asm"
+
+INCLUDE "data/text/text_6.asm"
+
INCLUDE "text/VermilionOldRodHouse.asm"
INCLUDE "text/CeladonMart1F.asm"
INCLUDE "text/CeladonMart2F.asm"
@@ -207,6 +201,11 @@ INCLUDE "text/CeladonMansionRoofHouse.asm"
INCLUDE "text/CeladonPokecenter.asm"
INCLUDE "text/CeladonGym.asm"
INCLUDE "text/GameCorner.asm"
+
+
+SECTION "Text 7", ROMX
+
+INCLUDE "text/GameCorner_2.asm"
INCLUDE "text/CeladonMart5F.asm"
INCLUDE "text/GameCornerPrizeRoom.asm"
INCLUDE "text/CeladonDiner.asm"
@@ -218,11 +217,6 @@ INCLUDE "text/FuchsiaPokecenter.asm"
INCLUDE "text/WardensHouse.asm"
INCLUDE "text/SafariZoneGate.asm"
INCLUDE "text/FuchsiaGym.asm"
-
-
-SECTION "Text 9", ROMX
-
-INCLUDE "text/FuchsiaGym_2.asm"
INCLUDE "text/FuchsiaMeetingRoom.asm"
INCLUDE "text/FuchsiaGoodRodHouse.asm"
INCLUDE "text/PokemonMansion1F.asm"
@@ -244,12 +238,12 @@ INCLUDE "text/SilphCo1F.asm"
INCLUDE "text/SaffronPokecenter.asm"
INCLUDE "text/MrPsychicsHouse.asm"
-INCLUDE "data/text/text_4.asm"
+INCLUDE "data/text/text_7.asm"
-SECTION "Text 10", ROMX
+SECTION "Text 8", ROMX
-INCLUDE "data/text/text_5.asm"
+INCLUDE "data/text/text_8.asm"
INCLUDE "text/PalletTown.asm"
INCLUDE "text/ViridianCity.asm"
@@ -262,12 +256,7 @@ INCLUDE "text/FuchsiaCity.asm"
INCLUDE "text/CinnabarIsland.asm"
INCLUDE "text/SaffronCity.asm"
-INCLUDE "data/text/text_6.asm"
-
-
-SECTION "Text 11", ROMX
-
-INCLUDE "data/text/text_7.asm"
+INCLUDE "data/text/text_9.asm"
SECTION "Pokédex Text", ROMX