aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/agatha.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/agatha.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/agatha.asm')
-rw-r--r--text/maps/agatha.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm
index 38a49edd..cd0b1bb5 100644
--- a/text/maps/agatha.asm
+++ b/text/maps/agatha.asm
@@ -1,4 +1,4 @@
-_AgathaBeforeBattleText: ; 8686b (21:686b)
+_AgathaBeforeBattleText:: ; 8686b (21:686b)
text "I am AGATHA of"
line "the ELITE FOUR!"
@@ -22,13 +22,13 @@ _AgathaBeforeBattleText: ; 8686b (21:686b)
cont "trainer fights!"
done
-_AgathaEndBattleText: ; 86970 (21:6970)
+_AgathaEndBattleText:: ; 86970 (21:6970)
text "Oh ho!"
line "You're something"
cont "special, child!"
prompt
-_AgathaAfterBattleText: ; 86998 (21:6998)
+_AgathaAfterBattleText:: ; 86998 (21:6998)
text "You win! I see"
line "what the old duff"
cont "sees in you now!"
@@ -38,7 +38,7 @@ _AgathaAfterBattleText: ; 86998 (21:6998)
cont "along now, child!"
done
-_AgathaText2: ; 869fd (21:69fd)
+_AgathaText2:: ; 869fd (21:69fd)
text "Someone's voice:"
line "Don't run away!"
done