aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/silph_co_3f.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_3f.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_3f.asm')
-rw-r--r--text/maps/silph_co_3f.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/text/maps/silph_co_3f.asm b/text/maps/silph_co_3f.asm
index 057c6683..34116b5a 100644
--- a/text/maps/silph_co_3f.asm
+++ b/text/maps/silph_co_3f.asm
@@ -1,42 +1,42 @@
-_UnnamedText_59ff9: ; 826b9 (20:66b9)
+_UnnamedText_59ff9:: ; 826b9 (20:66b9)
text "I work for SILPH."
line "What should I do?"
done
-_UnnamedText_59ffe: ; 826de (20:66de)
+_UnnamedText_59ffe:: ; 826de (20:66de)
text $52, "! You and"
line "your #MON"
cont "saved us!"
done
-_SilphCo3BattleText1: ; 826fe (20:66fe)
+_SilphCo3BattleText1:: ; 826fe (20:66fe)
text "Quit messing with"
line "us, kid!"
done
-_SilphCo3EndBattleText1: ; 8271a (20:671a)
+_SilphCo3EndBattleText1:: ; 8271a (20:671a)
text "I give"
line "up!"
prompt
-_SilphCo3AfterBattleText1: ; 82726 (20:6726)
+_SilphCo3AfterBattleText1:: ; 82726 (20:6726)
text "A hint? You can"
line "open doors with a"
cont "CARD KEY!"
done
-_SilphCo3BattleText2: ; 82753 (20:6753)
+_SilphCo3BattleText2:: ; 82753 (20:6753)
text "I support TEAM"
line "ROCKET more than"
cont "I support SILPH!"
done
-_SilphCo3EndBattleText2: ; 82785 (20:6785)
+_SilphCo3EndBattleText2:: ; 82785 (20:6785)
text "You"
line "really got me!"
prompt
-_SilphCo3AfterBattleText2: ; 82799 (20:6799)
+_SilphCo3AfterBattleText2:: ; 82799 (20:6799)
text "Humph..."
para "TEAM ROCKET said"