From 8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Sat, 6 Jun 2015 13:51:06 -0500 Subject: Build only Yellow Conflicts: gfx/intro_nido_1.6x6.png gfx/intro_nido_2.6x6.png gfx/intro_nido_3.6x6.png gfx/redgreenversion.png text.asm text/maps/cerulean_trade_house.asm text/maps/copycats_house_1f.asm text/maps/daycare_2.asm text/maps/museum_2f.asm text/maps/oaks_lab.asm text/maps/pewter_gym.asm text/maps/route_9_1.asm text/maps/school.asm text/maps/vermilion_gym_1.asm yellow/main.asm --- text/maps/route_6.asm | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'text/maps/route_6.asm') diff --git a/text/maps/route_6.asm b/text/maps/route_6.asm index 3a54f461..2e6a7c6a 100644 --- a/text/maps/route_6.asm +++ b/text/maps/route_6.asm @@ -1,4 +1,3 @@ -IF DEF(_YELLOW) _Route6BattleText1:: text "I'm doing this" line "out of love." @@ -32,34 +31,6 @@ _Route6AfterBattleText2:: cont "about calculated" cont "numbers." done -ELSE -_Route6BattleText1:: ; 8dc38 (23:5c38) - text "Who's there?" - line "Quit listening in" - cont "on us!" - done - -_Route6EndBattleText1:: ; 8dc5e (23:5c5e) - text "I" - line "just can't win!" - prompt - -_Route6AfterBattleText1:: ; 8dc70 (23:5c70) - text "Whisper..." - line "whisper..." - done - -_Route6BattleText2:: ; 8dc87 (23:5c87) - text "Excuse me! This" - line "is a private" - cont "conversation!" - done - -_Route6EndBattleText2:: ; 8dcb3 (23:5cb3) - text "Ugh!" - line "I hate losing!" - prompt -ENDC _Route6BattleText3:: ; 8dcc8 (23:5cc8) text "There aren't many" -- cgit v1.3.1-sl0p