From 8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Sat, 6 Jun 2015 13:51:06 -0500 Subject: 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 --- engine/intro.asm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'engine/intro.asm') diff --git a/engine/intro.asm b/engine/intro.asm index 7c0464d3..5b03f23a 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -428,16 +428,7 @@ FightIntroBackMon: ; 41a99 (10:5a99) INCBIN "gfx/intro_fight.2bpp" FightIntroFrontMon: ; 42099 (10:6099) - -IF DEF(_RED) - INCBIN "gfx/red/intro_nido_1.6x6.2bpp" - INCBIN "gfx/red/intro_nido_2.6x6.2bpp" - INCBIN "gfx/red/intro_nido_3.6x6.2bpp" - ds $10 ; blank tile -ENDC -IF DEF(_BLUE) - INCBIN "gfx/blue/intro_purin_1.6x6.2bpp" - INCBIN "gfx/blue/intro_purin_2.6x6.2bpp" - INCBIN "gfx/blue/intro_purin_3.6x6.2bpp" + INCBIN "gfx/intro_nido_1.6x6.2bpp" + INCBIN "gfx/intro_nido_2.6x6.2bpp" + INCBIN "gfx/intro_nido_3.6x6.2bpp" ds $10 ; blank tile -ENDC -- cgit v1.3.1-sl0p