aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/rocket_hideout_b2f.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/rocket_hideout_b2f.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/rocket_hideout_b2f.asm')
-rw-r--r--text/maps/rocket_hideout_b2f.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/text/maps/rocket_hideout_b2f.asm b/text/maps/rocket_hideout_b2f.asm
index 01833603..abbdf646 100644
--- a/text/maps/rocket_hideout_b2f.asm
+++ b/text/maps/rocket_hideout_b2f.asm
@@ -1,15 +1,15 @@
-_RocketHideout2BattleText2: ; 820bb (20:60bb)
+_RocketHideout2BattleText2:: ; 820bb (20:60bb)
text "BOSS said you can"
line "see GHOSTs with"
cont "the SILPH SCOPE!"
done
-_RocketHideout2EndBattleText2: ; 820ef (20:60ef)
+_RocketHideout2EndBattleText2:: ; 820ef (20:60ef)
text "I"
line "surrender!"
prompt
-_RocketHideout2AfterBattleTxt2: ; 820fd (20:60fd)
+_RocketHideout2AfterBattleTxt2:: ; 820fd (20:60fd)
text "The TEAM ROCKET"
line "HQ has 4 basement"
cont "floors. Can you"