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_dept_store_4f.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_dept_store_4f.asm')
| -rw-r--r-- | text/maps/celadon_dept_store_4f.asm | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/text/maps/celadon_dept_store_4f.asm b/text/maps/celadon_dept_store_4f.asm index de33021b..514d4921 100644 --- a/text/maps/celadon_dept_store_4f.asm +++ b/text/maps/celadon_dept_store_4f.asm @@ -1,16 +1,11 @@ _CeladonMart4Text2:: ; 9cad4 (27:4ad4) text "I'm getting a" -IF DEF(_YELLOW) line "gift for COPYCAT" cont "in CERULEAN CITY." para "It's got to be a" line "# DOLL. They" cont "are trendy!" -ELSE - line "# DOLL for my" - cont "girl friend!" -ENDC done _CeladonMart4Text3:: ; 9cafd (27:4afd) |