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/fighting_dojo.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/fighting_dojo.asm')
| -rw-r--r-- | text/maps/fighting_dojo.asm | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/text/maps/fighting_dojo.asm b/text/maps/fighting_dojo.asm index 9cf7ba4e..334346b1 100644 --- a/text/maps/fighting_dojo.asm +++ b/text/maps/fighting_dojo.asm @@ -114,21 +114,13 @@ _FightingDojoAfterBattleText4:: ; a1b1a (28:5b1a) _WantHitmonleeText:: ; a1b4a (28:5b4a) text "You want the" -IF DEF(_YELLOW) line "hard-kicking" -ELSE - line "hard kicking" -ENDC cont "HITMONLEE?" done _WantHitmonchanText:: ; a1b70 (28:5b70) text "You want the" -IF DEF(_YELLOW) line "piston-punching" -ELSE - line "piston punching" -ENDC cont "HITMONCHAN?" done |