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/celadon_city.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/celadon_city.asm')
| -rw-r--r-- | text/maps/celadon_city.asm | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm index 0a4c5333..b84cd345 100644 --- a/text/maps/celadon_city.asm +++ b/text/maps/celadon_city.asm @@ -1,18 +1,10 @@ _CeladonCityText1:: ; a59fb (29:59fb) text "I got my KOFFING" -IF DEF(_YELLOW) line "from my friend!" para "We get along now," line "because I was" cont "very nice to it!" -ELSE - line "in CINNABAR!" - - para "It's nice, but it" - line "breathes poison" - cont "when it's angry!" -ENDC done _CeladonCityText2:: ; a5a4b (29:5a4b) @@ -103,11 +95,7 @@ _CeladonCityText13:: ; a5d41 (29:5d41) line "#MON GYM" cont "LEADER: ERIKA" -IF DEF(_YELLOW) para "The Nature-Loving" -ELSE - para "The Nature Loving" -ENDC line "Princess!" done @@ -144,11 +132,7 @@ _CeladonCityText17:: ; a5e3e (29:5e3e) _CeladonCityText18:: ; a5e6a (29:5e6a) text "ROCKET GAME CORNER" line "The playground" -IF DEF(_YELLOW) cont "for grownups!" -ELSE - cont "for grown-ups!" -ENDC done _CeladonCityText10:: ; a5c82 (29:5c82) |