aboutsummaryrefslogtreecommitdiffstats
path: root/text/maps/route_22.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/route_22.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/route_22.asm')
-rw-r--r--text/maps/route_22.asm6
1 files changed, 6 insertions, 0 deletions
diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm
index 5ce0b879..9935ce80 100644
--- a/text/maps/route_22.asm
+++ b/text/maps/route_22.asm
@@ -59,9 +59,15 @@ _Route22RivalBeforeBattleText2:: ; 92450 (24:6450)
line "the BADGEs too?"
cont "That's cool!"
+IF DEF(_YELLOW)
+ para "Then I'll whip"
+ line "you, ", $52, ", as"
+ cont "a warmup for"
+ELSE
para "Then I'll whip you"
line $52, " as a"
cont "warm up for"
+ENDC
cont "#MON LEAGUE!"
para "Come on!"