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/viridian_forest.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/viridian_forest.asm')
| -rw-r--r-- | text/maps/viridian_forest.asm | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/text/maps/viridian_forest.asm b/text/maps/viridian_forest.asm index aa6ab4ab..47c12e9b 100644 --- a/text/maps/viridian_forest.asm +++ b/text/maps/viridian_forest.asm @@ -9,11 +9,7 @@ _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) @@ -66,7 +62,6 @@ _ViridianFrstAfterBattleText3:: ; 80475 (20:4475) cont "dropped!" done -if DEF(_YELLOW) _ViridianForestBattleTextPikaGirl:: text "Hi, do you have a" line "PIKACHU?" @@ -100,7 +95,6 @@ _ViridianForestAfterBattleTextSamurai:: cont "attack is its" cont "defense!" done -ENDC _ViridianForestText8:: ; 804c7 (20:44c7) text "I ran out of #" |