aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/silph_co_7f.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_7f.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_7f.asm')
-rw-r--r--text/maps/silph_co_7f.asm44
1 files changed, 22 insertions, 22 deletions
diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm
index f196332f..fbde5045 100644
--- a/text/maps/silph_co_7f.asm
+++ b/text/maps/silph_co_7f.asm
@@ -1,4 +1,4 @@
-_UnnamedText_51dd3: ; 84430 (21:4430)
+_UnnamedText_51dd3:: ; 84430 (21:4430)
text "Oh! Hi! You're"
line "not a ROCKET! You"
cont "came to save us?"
@@ -9,7 +9,7 @@ _UnnamedText_51dd3: ; 84430 (21:4430)
cont "for saving us."
prompt
-_UnnamedText_51dd8: ; 8449e (21:449e)
+_UnnamedText_51dd8:: ; 8449e (21:449e)
text "It's LAPRAS. It's"
line "very intelligent."
@@ -27,118 +27,118 @@ _UnnamedText_51dd8: ; 8449e (21:449e)
cont "give you a lift!"
done
-_UnnamedText_51ddd: ; 8455a (21:455a)
+_UnnamedText_51ddd:: ; 8455a (21:455a)
text "TEAM ROCKET's"
line "BOSS went to the"
cont "boardroom! Is our"
cont "PRESIDENT OK?"
done
-_UnnamedText_51de2: ; 84599 (21:4599)
+_UnnamedText_51de2:: ; 84599 (21:4599)
text "Saved at last!"
line "Thank you!"
done
-_UnnamedText_51e00: ; 845b4 (21:45b4)
+_UnnamedText_51e00:: ; 845b4 (21:45b4)
text "TEAM ROCKET was"
line "after the MASTER"
cont "BALL which will"
cont "catch any #MON!"
done
-_UnnamedText_51e05: ; 845f6 (21:45f6)
+_UnnamedText_51e05:: ; 845f6 (21:45f6)
text "We canceled the"
line "MASTER BALL"
cont "project because"
cont "of TEAM ROCKET."
done
-_UnnamedText_51e23: ; 84633 (21:4633)
+_UnnamedText_51e23:: ; 84633 (21:4633)
text "It would be bad"
line "if TEAM ROCKET"
cont "took over SILPH"
cont "or our #MON!"
done
-_UnnamedText_51e28: ; 84670 (21:4670)
+_UnnamedText_51e28:: ; 84670 (21:4670)
text "Wow! You chased"
line "off TEAM ROCKET"
cont "all by yourself?"
done
-_UnnamedText_51e46: ; 846a2 (21:46a2)
+_UnnamedText_51e46:: ; 846a2 (21:46a2)
text "You! It's really"
line "dangerous here!"
cont "You came to save"
cont "me? You can't!"
done
-_UnnamedText_51e4b: ; 846e2 (21:46e2)
+_UnnamedText_51e4b:: ; 846e2 (21:46e2)
text "Safe at last!"
line "Oh thank you!"
done
-_SilphCo7BattleText1: ; 846ff (21:46ff)
+_SilphCo7BattleText1:: ; 846ff (21:46ff)
text "Oh ho! I smell a"
line "little rat!"
done
-_SilphCo7EndBattleText1: ; 8471d (21:471d)
+_SilphCo7EndBattleText1:: ; 8471d (21:471d)
text "Lights"
line "out!"
prompt
-_SilphCo7AfterBattleText1: ; 8472a (21:472a)
+_SilphCo7AfterBattleText1:: ; 8472a (21:472a)
text "You won't find my"
line "BOSS by just"
cont "scurrying around!"
done
-_SilphCo7BattleText2: ; 8475b (21:475b)
+_SilphCo7BattleText2:: ; 8475b (21:475b)
text "Heheh!"
para "You mistook me for"
line "a SILPH worker?"
done
-_SilphCo7EndBattleText2: ; 84786 (21:4786)
+_SilphCo7EndBattleText2:: ; 84786 (21:4786)
text "I'm"
line "done!"
prompt
-_SilphCo7AfterBattleText2: ; 84790 (21:4790)
+_SilphCo7AfterBattleText2:: ; 84790 (21:4790)
text "Despite your age,"
line "you are a skilled"
cont "trainer!"
done
-_SilphCo7BattleText3: ; 847be (21:47be)
+_SilphCo7BattleText3:: ; 847be (21:47be)
text "I am one of the 4"
line "ROCKET BROTHERS!"
done
-_SilphCo7EndBattleText3: ; 847e2 (21:47e2)
+_SilphCo7EndBattleText3:: ; 847e2 (21:47e2)
text "Aack!"
line "Brothers, I lost!"
prompt
-_SilphCo7AfterBattleText3: ; 847fb (21:47fb)
+_SilphCo7AfterBattleText3:: ; 847fb (21:47fb)
text "Doesn't matter."
line "My brothers will"
cont "repay the favor!"
done
-_SilphCo7BattleText4: ; 8482d (21:482d)
+_SilphCo7BattleText4:: ; 8482d (21:482d)
text "A child intruder?"
line "That must be you!"
done
-_SilphCo7EndBattleText4: ; 84852 (21:4852)
+_SilphCo7EndBattleText4:: ; 84852 (21:4852)
text "Fine!"
line "I lost!"
prompt
-_SilphCo7AfterBattleText4: ; 84861 (21:4861)
+_SilphCo7AfterBattleText4:: ; 84861 (21:4861)
text "Go on home"
line "before my BOSS"
cont "gets ticked off!"