aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/silph_co_10f.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_10f.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_10f.asm')
-rw-r--r--text/maps/silph_co_10f.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/text/maps/silph_co_10f.asm b/text/maps/silph_co_10f.asm
index e56fcdd9..6c9727de 100644
--- a/text/maps/silph_co_10f.asm
+++ b/text/maps/silph_co_10f.asm
@@ -1,41 +1,41 @@
-_UnnamedText_5a1d3: ; 84d8d (21:4d8d)
+_UnnamedText_5a1d3:: ; 84d8d (21:4d8d)
text "Waaaaa!"
cont "I'm scared!"
done
-_UnnamedText_5a1d8: ; 84da1 (21:4da1)
+_UnnamedText_5a1d8:: ; 84da1 (21:4da1)
text "Please keep quiet"
line "about my crying!"
done
-_SilphCo10BattleText1: ; 84dc5 (21:4dc5)
+_SilphCo10BattleText1:: ; 84dc5 (21:4dc5)
text "Welcome to the"
line "10F! So good of"
cont "you to join me!"
done
-_SilphCo10EndBattleText1: ; 84df5 (21:4df5)
+_SilphCo10EndBattleText1:: ; 84df5 (21:4df5)
text "I'm"
line "stunned!"
prompt
-_SilphCo10AfterBattleText1: ; 84e02 (21:4e02)
+_SilphCo10AfterBattleText1:: ; 84e02 (21:4e02)
text "Nice try, but the"
line "boardroom is up"
cont "one more floor!"
done
-_SilphCo10BattleText2: ; 84e35 (21:4e35)
+_SilphCo10BattleText2:: ; 84e35 (21:4e35)
text "Enough of your"
line "silly games!"
done
-_SilphCo10EndBattleText2: ; 84e52 (21:4e52)
+_SilphCo10EndBattleText2:: ; 84e52 (21:4e52)
text "No"
line "continues left!"
prompt
-_SilphCo10AfterBattleText2: ; 84e66 (21:4e66)
+_SilphCo10AfterBattleText2:: ; 84e66 (21:4e66)
text "Are you satisfied"
line "with beating me?"
cont "Then go on home!"