aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/bruno.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/bruno.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/bruno.asm')
-rw-r--r--text/maps/bruno.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/text/maps/bruno.asm b/text/maps/bruno.asm
index 600d9b51..f704a4a6 100644
--- a/text/maps/bruno.asm
+++ b/text/maps/bruno.asm
@@ -1,4 +1,4 @@
-_BrunoBeforeBattleText: ; 86749 (21:6749)
+_BrunoBeforeBattleText:: ; 86749 (21:6749)
text "I am BRUNO of"
line "the ELITE FOUR!"
@@ -20,18 +20,18 @@ _BrunoBeforeBattleText: ; 86749 (21:6749)
para "Hoo hah!"
done
-_BrunoEndBattleText: ; 86805 (21:6805)
+_BrunoEndBattleText:: ; 86805 (21:6805)
text "Why?"
line "How could I lose?"
prompt
-_BrunoAfterBattleText: ; 8681d (21:681d)
+_BrunoAfterBattleText:: ; 8681d (21:681d)
text "My job is done!"
line "Go face your next"
cont "challenge!"
done
-_UnnamedText_763d2: ; 8684b (21:684b)
+_UnnamedText_763d2:: ; 8684b (21:684b)
text "Someone's voice:"
line "Don't run away!"
done