aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/silph_co_5f_2.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/silph_co_5f_2.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/silph_co_5f_2.asm')
-rw-r--r--text/maps/silph_co_5f_2.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/text/maps/silph_co_5f_2.asm b/text/maps/silph_co_5f_2.asm
index 999b7358..bb94eb6b 100644
--- a/text/maps/silph_co_5f_2.asm
+++ b/text/maps/silph_co_5f_2.asm
@@ -1,32 +1,32 @@
-_SilphCo5EndBattleText4: ; 84000 (21:4000)
+_SilphCo5EndBattleText4:: ; 84000 (21:4000)
text "Oh"
line "goodness!"
prompt
-_SilphCo5AfterBattleText4: ; 8400e (21:400e)
+_SilphCo5AfterBattleText4:: ; 8400e (21:400e)
text "You're only on 5F."
line "It's a long way"
cont "to my BOSS!"
done
-_SilphCo5BattleText5: ; 8403c (21:403c)
+_SilphCo5BattleText5:: ; 8403c (21:403c)
text "Show TEAM ROCKET"
line "a little respect!"
done
-_SilphCo5EndBattleText5: ; 84060 (21:4060)
+_SilphCo5EndBattleText5:: ; 84060 (21:4060)
text "Cough..."
line "Cough..."
prompt
-_SilphCo5AfterBattleText5: ; 84073 (21:4073)
+_SilphCo5AfterBattleText5:: ; 84073 (21:4073)
text "Which reminds me."
para "KOFFING evolves"
line "into WEEZING!"
done
-_SilphCo5Text9: ; 840a4 (21:40a4)
+_SilphCo5Text9:: ; 840a4 (21:40a4)
text "It's a #MON"
line "REPORT!"
@@ -36,7 +36,7 @@ _SilphCo5Text9: ; 840a4 (21:40a4)
cont "reality #MON."
done
-_SilphCo5Text10: ; 840f2 (21:40f2)
+_SilphCo5Text10:: ; 840f2 (21:40f2)
text "It's a #MON"
line "REPORT!"
@@ -45,7 +45,7 @@ _SilphCo5Text10: ; 840f2 (21:40f2)
cont "been confirmed."
done
-_SilphCo5Text11: ; 84134 (21:4134)
+_SilphCo5Text11:: ; 84134 (21:4134)
text "It's a #MON"
line "REPORT!"