summaryrefslogtreecommitdiff
path: root/text/maps/agatha.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-01-12 18:45:02 -0600
committerdannye <corrnondacqb@yahoo.com>2016-01-12 18:45:02 -0600
commit5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch)
treea1ce27018f39d98f49d89468df426d0291e18560 /text/maps/agatha.asm
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'text/maps/agatha.asm')
-rw-r--r--text/maps/agatha.asm12
1 files changed, 4 insertions, 8 deletions
diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm
index e78aeeab..158dbb63 100644
--- a/text/maps/agatha.asm
+++ b/text/maps/agatha.asm
@@ -1,4 +1,4 @@
-_AgathaBeforeBattleText:: ; 8686b (21:686b)
+_AgathaBeforeBattleText::
text "I am AGATHA of"
line "the ELITE FOUR!"
@@ -22,17 +22,13 @@ _AgathaBeforeBattleText:: ; 8686b (21:686b)
cont "trainer fights!"
done
-_AgathaEndBattleText:: ; 86970 (21:6970)
-IF DEF(_YELLOW)
- text "Woo-hoo!"
-ELSE
+_AgathaEndBattleText::
text "Oh ho!"
-ENDC
line "You're something"
cont "special, child!"
prompt
-_AgathaAfterBattleText:: ; 86998 (21:6998)
+_AgathaAfterBattleText::
text "You win! I see"
line "what the old duff"
cont "sees in you now!"
@@ -42,7 +38,7 @@ _AgathaAfterBattleText:: ; 86998 (21:6998)
cont "along now, child!"
done
-_AgathaDontRunAwayText:: ; 869fd (21:69fd)
+_AgathaDontRunAwayText::
text "Someone's voice:"
line "Don't run away!"
done