aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/viridian_forest.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2014-10-10 01:46:06 -0600
committerIIMarckus <iimarckus@gmail.com>2014-10-10 01:46:06 -0600
commit6e14461fa6d5085349e4746b61c526f3c94be19f (patch)
tree63db9e0cfa395f6dd00566c6dcdbb492bb6526ca /text/maps/viridian_forest.asm
parentAdd Yellow player/rival names. (diff)
downloadpokeyellow-6e14461fa6d5085349e4746b61c526f3c94be19f.tar.gz
pokeyellow-6e14461fa6d5085349e4746b61c526f3c94be19f.tar.xz
pokeyellow-6e14461fa6d5085349e4746b61c526f3c94be19f.zip
Add a lot of Yellow text changes.
Diffstat (limited to 'text/maps/viridian_forest.asm')
-rw-r--r--text/maps/viridian_forest.asm40
1 files changed, 40 insertions, 0 deletions
diff --git a/text/maps/viridian_forest.asm b/text/maps/viridian_forest.asm
index 9b0f6d99..aa6ab4ab 100644
--- a/text/maps/viridian_forest.asm
+++ b/text/maps/viridian_forest.asm
@@ -9,7 +9,11 @@ _ViridianForestText1:: ; 8031d (20:431d)
_ViridianForestBattleText1:: ; 80359 (20:4359)
text "Hey! You have"
line "#MON! Come on!"
+IF DEF(_YELLOW)
+ cont "Let's battle 'em!"
+ELSE
cont "Let's battle'em!"
+ENDC
done
_ViridianForestEndBattleText1:: ; 80387 (20:4387)
@@ -62,6 +66,42 @@ _ViridianFrstAfterBattleText3:: ; 80475 (20:4475)
cont "dropped!"
done
+if DEF(_YELLOW)
+_ViridianForestBattleTextPikaGirl::
+ text "Hi, do you have a"
+ line "PIKACHU?"
+ done
+
+_ViridianForestEndBattleTextPikaGirl::
+ text "Oh no,"
+ line "really?"
+ prompt
+
+_ViridianForestAfterBattleTextPikaGirl::
+ text "I looked forever,"
+ line "but I never found"
+ cont "a PIKACHU here!"
+ done
+
+_ViridianForestBattleTextSamurai::
+ text "I'm gonna be the"
+ line "best. You just"
+ cont "can't beat me!"
+ done
+
+_ViridianForestEndBattleTextSamurai::
+ text "After"
+ line "all I did..."
+ prompt
+
+_ViridianForestAfterBattleTextSamurai::
+ text "A METAPOD is cool"
+ line "because its"
+ cont "attack is its"
+ cont "defense!"
+ done
+ENDC
+
_ViridianForestText8:: ; 804c7 (20:44c7)
text "I ran out of #"
line "BALLs to catch"