summaryrefslogtreecommitdiff
path: root/text/maps/lance.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/lance.asm
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'text/maps/lance.asm')
-rw-r--r--text/maps/lance.asm10
1 files changed, 3 insertions, 7 deletions
diff --git a/text/maps/lance.asm b/text/maps/lance.asm
index 35ef3546..f6890896 100644
--- a/text/maps/lance.asm
+++ b/text/maps/lance.asm
@@ -1,10 +1,6 @@
-_LanceBeforeBattleText:: ; 85d3c (21:5d3c)
+_LanceBeforeBattleText::
text "Ah! I heard about"
-IF DEF(_YELLOW)
- line "you, ", $52, "!"
-ELSE
line "you ", $52, "!"
-ENDC
para "I lead the ELITE"
line "FOUR! You can"
@@ -31,7 +27,7 @@ ENDC
cont "with me, ", $52, "!"
done
-_LanceEndBattleText:: ; 85e64 (21:5e64)
+_LanceEndBattleText::
text "That's it!"
para "I hate to admit"
@@ -39,7 +35,7 @@ _LanceEndBattleText:: ; 85e64 (21:5e64)
cont "#MON master!"
prompt
-_LanceAfterBattleText:: ; 85e9e (21:5e9e)
+_LanceAfterBattleText::
text "I still can't"
line "believe my"
cont "dragons lost to"