aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/lorelei.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/lorelei.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/lorelei.asm')
-rw-r--r--text/maps/lorelei.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/text/maps/lorelei.asm b/text/maps/lorelei.asm
index 9679626b..cb007464 100644
--- a/text/maps/lorelei.asm
+++ b/text/maps/lorelei.asm
@@ -1,4 +1,4 @@
-_LoreleiBeforeBattleText: ; 865ef (21:65ef)
+_LoreleiBeforeBattleText:: ; 865ef (21:65ef)
text "Welcome to"
line "#MON LEAGUE!"
@@ -21,12 +21,12 @@ _LoreleiBeforeBattleText: ; 865ef (21:65ef)
line "Are you ready?"
done
-_LoreleiEndBattleText: ; 866c4 (21:66c4)
+_LoreleiEndBattleText:: ; 866c4 (21:66c4)
text "How"
line "dare you!"
prompt
-_LoreleiAfterBattleText: ; 866d3 (21:66d3)
+_LoreleiAfterBattleText:: ; 866d3 (21:66d3)
text "You're better"
line "than I thought!"
cont "Go on ahead!"
@@ -36,7 +36,7 @@ _LoreleiAfterBattleText: ; 866d3 (21:66d3)
cont "LEAGUE power!"
done
-_UnnamedText_7627b: ; 86729 (21:6729)
+_UnnamedText_7627b:: ; 86729 (21:6729)
text "Someone's voice:"
line "Don't run away!"
done