aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/rocket_hideout_b1f.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_b1f.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_b1f.asm')
-rw-r--r--text/maps/rocket_hideout_b1f.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/text/maps/rocket_hideout_b1f.asm b/text/maps/rocket_hideout_b1f.asm
index 093a1395..bb75bb08 100644
--- a/text/maps/rocket_hideout_b1f.asm
+++ b/text/maps/rocket_hideout_b1f.asm
@@ -1,73 +1,73 @@
-_RocketHideout1EndBattleText6: ; 81f2a (20:5f2a)
+_RocketHideout1EndBattleText6:: ; 81f2a (20:5f2a)
text "Why...?@@"
-_RocketHideout1BattleText2: ; 81f34 (20:5f34)
+_RocketHideout1BattleText2:: ; 81f34 (20:5f34)
text "Who are you? How"
line "did you get here?"
done
-_RocketHideout1EndBattleText2: ; 81f58 (20:5f58)
+_RocketHideout1EndBattleText2:: ; 81f58 (20:5f58)
text "Oww!"
line "Beaten!"
prompt
-_RocketHideout1AfterBattleTxt2: ; 81f66 (20:5f66)
+_RocketHideout1AfterBattleTxt2:: ; 81f66 (20:5f66)
text "Are you dissing"
line "TEAM ROCKET?"
done
-_RocketHideout1BattleText3: ; 81f84 (20:5f84)
+_RocketHideout1BattleText3:: ; 81f84 (20:5f84)
text "You broke into"
line "our operation?"
done
-_RocketHideout1EndBattleText3: ; 81fa3 (20:5fa3)
+_RocketHideout1EndBattleText3:: ; 81fa3 (20:5fa3)
text "Burnt!"
prompt
-_RocketHideout1AfterBattleTxt3: ; 81fab (20:5fab)
+_RocketHideout1AfterBattleTxt3:: ; 81fab (20:5fab)
text "You're not going"
line "to get away with"
cont "this, brat!"
done
-_RocketHideout1BattleText4: ; 81fd9 (20:5fd9)
+_RocketHideout1BattleText4:: ; 81fd9 (20:5fd9)
text "Intruder alert!"
done
-_RocketHideout1EndBattleText4: ; 81fea (20:5fea)
+_RocketHideout1EndBattleText4:: ; 81fea (20:5fea)
text "I"
line "can't do it!"
prompt
-_RocketHideout1AfterBattleTxt4: ; 81ff9 (20:5ff9)
+_RocketHideout1AfterBattleTxt4:: ; 81ff9 (20:5ff9)
text "SILPH SCOPE?"
line "I don't know"
cont "where it is!"
done
-_RocketHideout1BattleText5: ; 82020 (20:6020)
+_RocketHideout1BattleText5:: ; 82020 (20:6020)
text "Why did you come"
line "here?"
done
-_RocketHideout1EndBattleText5: ; 82038 (20:6038)
+_RocketHideout1EndBattleText5:: ; 82038 (20:6038)
text "This"
line "won't do!"
prompt
-_RocketHideout1AfterBattleTxt5: ; 82047 (20:6047)
+_RocketHideout1AfterBattleTxt5:: ; 82047 (20:6047)
text "OK, I'll talk!"
line "Take the elevator"
cont "to see my BOSS!"
done
-_RocketHideout1BattleText6: ; 82078 (20:6078)
+_RocketHideout1BattleText6:: ; 82078 (20:6078)
text "Are you lost, you"
line "little rat?"
done
-_RocketHideout1AfterBattleTxt6: ; 82097 (20:6097)
+_RocketHideout1AfterBattleTxt6:: ; 82097 (20:6097)
text "Uh-oh, that fight"
line "opened the door!"
done