aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/museum_2f.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/museum_2f.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/museum_2f.asm')
-rw-r--r--text/maps/museum_2f.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/text/maps/museum_2f.asm b/text/maps/museum_2f.asm
index e1183648..b986d823 100644
--- a/text/maps/museum_2f.asm
+++ b/text/maps/museum_2f.asm
@@ -1,11 +1,11 @@
-_MuseumF2Text1: ; 96841 (25:6841)
+_MuseumF2Text1:: ; 96841 (25:6841)
text "MOON STONE?"
para "What's so special"
line "about it?"
done
-_MuseumF2Text2: ; 96869 (25:6869)
+_MuseumF2Text2:: ; 96869 (25:6869)
text "July 20, 1969!"
para "The 1st lunar"
@@ -15,12 +15,12 @@ _MuseumF2Text2: ; 96869 (25:6869)
line "TV to watch it!"
done
-_MuseumF2Text3: ; 968b1 (25:68b1)
+_MuseumF2Text3:: ; 968b1 (25:68b1)
text "We have a space"
line "exhibit now."
done
-_MuseumF2Text4: ; 968cf (25:68cf)
+_MuseumF2Text4:: ; 968cf (25:68cf)
text "I want a PIKACHU!"
line "It's so cute!"
@@ -28,17 +28,17 @@ _MuseumF2Text4: ; 968cf (25:68cf)
line "to catch me one!"
done
-_MuseumF2Text5: ; 96911 (25:6911)
+_MuseumF2Text5:: ; 96911 (25:6911)
text "Yeah, a PIKACHU"
line "soon, I promise!"
done
-_MuseumF2Text6: ; 96933 (25:6933)
+_MuseumF2Text6:: ; 96933 (25:6933)
text "SPACE SHUTTLE"
line "COLUMBIA"
done
-_MuseumF2Text7: ; 9694b (25:694b)
+_MuseumF2Text7:: ; 9694b (25:694b)
text "Meteorite that"
line "fell on MT.MOON."
cont "(MOON STONE?)"