diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-06 13:51:06 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 17:32:39 -0400 |
| commit | 8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 (patch) | |
| tree | 08106f9eec9cff1137269c20ccf848cfeffa71c6 /text/maps/route_25.asm | |
| parent | text.o (diff) | |
| download | pokeyellow-8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951.tar.gz pokeyellow-8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951.tar.xz pokeyellow-8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951.zip | |
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
Diffstat (limited to 'text/maps/route_25.asm')
| -rw-r--r-- | text/maps/route_25.asm | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/text/maps/route_25.asm b/text/maps/route_25.asm index d73611f2..4ee90dc0 100644 --- a/text/maps/route_25.asm +++ b/text/maps/route_25.asm @@ -1,4 +1,3 @@ -IF DEF(_YELLOW) _Route25DamianText1:: text "I'm not good at" line "raising #MON." @@ -26,7 +25,6 @@ _Route25DamianText4:: text "How's CHARMANDER" line "doing?" done -ENDC _Route25BattleText1:: ; 9421e (25:421e) text "Local trainers" @@ -86,13 +84,8 @@ _Route25BattleText4:: ; 94369 (25:4369) done _Route25EndBattleText4:: ; 94385 (25:4385) -IF DEF(_YELLOW) text "I'm in" line "a slump!" -ELSE - text "I was in" - line "bad condition!" -ENDC prompt _Route25AfterBattleText4:: ; 9439e (25:439e) |