aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/route_4.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-01-27 16:22:41 -0500
committeryenatch <yenatch@gmail.com>2014-01-27 16:24:13 -0500
commit1b9ee46af9f8baac0d266a54130115a719788377 (patch)
tree8ac61c0752dc74da0677cb26fe4db6362db5b2b7 /text/maps/route_4.asm
parentadded a couple of new moves constants (diff)
downloadpokeyellow-1b9ee46af9f8baac0d266a54130115a719788377.tar.gz
pokeyellow-1b9ee46af9f8baac0d266a54130115a719788377.tar.xz
pokeyellow-1b9ee46af9f8baac0d266a54130115a719788377.zip
Get rid of globals.asm. Use ::s to export labels between objects.
globals.asm was a hack that: - gave rgbasm an extra 100k lines to read - increased reliance on the python preprocessor - made the makefile a mess - gave object creation an extra step - wasn't even necessary This speeds up build time by at least a third.
Diffstat (limited to 'text/maps/route_4.asm')
-rw-r--r--text/maps/route_4.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/text/maps/route_4.asm b/text/maps/route_4.asm
index 5a81d24a..15fced31 100644
--- a/text/maps/route_4.asm
+++ b/text/maps/route_4.asm
@@ -1,20 +1,20 @@
-_Route4Text1: ; 8db1e (23:5b1e)
+_Route4Text1:: ; 8db1e (23:5b1e)
text "Ouch! I tripped"
line "over a rocky"
cont "#MON, GEODUDE!"
done
-_Route4BattleText1: ; 8db4b (23:5b4b)
+_Route4BattleText1:: ; 8db4b (23:5b4b)
text "I came to get my"
line "mushroom #MON!"
done
-_Route4EndBattleText1: ; 8db6c (23:5b6c)
+_Route4EndBattleText1:: ; 8db6c (23:5b6c)
text "Oh! My cute"
line "mushroom #MON!"
prompt
-_Route4AfterBattleText1: ; 8db88 (23:5b88)
+_Route4AfterBattleText1:: ; 8db88 (23:5b88)
text "There might not"
line "be any more"
cont "mushrooms here."
@@ -23,12 +23,12 @@ _Route4AfterBattleText1: ; 8db88 (23:5b88)
line "them all."
done
-_Route4Text5: ; 8dbcd (23:5bcd)
+_Route4Text5:: ; 8dbcd (23:5bcd)
text "MT.MOON"
line "Tunnel Entrance"
done
-_Route4Text6: ; 8dbe6 (23:5be6)
+_Route4Text6:: ; 8dbe6 (23:5be6)
text "ROUTE 4"
line "MT.MOON -"
cont "CERULEAN CITY"