aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/rocket_hideout_b3f.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_b3f.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_b3f.asm')
-rw-r--r--text/maps/rocket_hideout_b3f.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/text/maps/rocket_hideout_b3f.asm b/text/maps/rocket_hideout_b3f.asm
index fbd78399..78f0656b 100644
--- a/text/maps/rocket_hideout_b3f.asm
+++ b/text/maps/rocket_hideout_b3f.asm
@@ -1,33 +1,33 @@
-_RocketHideout3BattleText2: ; 82140 (20:6140)
+_RocketHideout3BattleText2:: ; 82140 (20:6140)
text "Stop meddling in"
line "TEAM ROCKET's"
cont "affairs!"
done
-_RocketHideout3EndBattleText2: ; 82168 (20:6168)
+_RocketHideout3EndBattleText2:: ; 82168 (20:6168)
text "Oof!"
line "Taken down!"
prompt
-_RocketHideout3AfterBattleTxt2: ; 8217a (20:617a)
+_RocketHideout3AfterBattleTxt2:: ; 8217a (20:617a)
text "SILPH SCOPE?"
line "The machine the"
cont "BOSS stole. It's"
cont "here somewhere."
done
-_RocketHideout3BattleTxt: ; 821b8 (20:61b8)
+_RocketHideout3BattleTxt:: ; 821b8 (20:61b8)
text "We got word from"
line "upstairs that you"
cont "were coming!"
done
-_RocketHideout3EndBattleText3: ; 821e9 (20:61e9)
+_RocketHideout3EndBattleText3:: ; 821e9 (20:61e9)
text "What?"
line "I lost? No!"
prompt
-_RocketHide3AfterBattleText3: ; 821fc (20:61fc)
+_RocketHide3AfterBattleText3:: ; 821fc (20:61fc)
text "Go ahead and go!"
line "But, you need the"
cont "LIFT KEY to run"