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 --- main.asm | 7 ------- 1 file changed, 7 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index fc41fa9f..bac33564 100755 --- a/main.asm +++ b/main.asm @@ -4874,12 +4874,10 @@ INCLUDE "data/mapHeaders/billshouse.asm" INCLUDE "scripts/billshouse.asm" INCLUDE "data/mapObjects/billshouse.asm" BillsHouseBlocks: INCBIN "maps/billshouse.blk" -IF DEF(_OPTION_BEACH_HOUSE) INCLUDE "data/mapHeaders/beach_house.asm" INCLUDE "scripts/beach_house.asm" BeachHouseBlockdata: INCBIN "maps/beach_house.blk" INCLUDE "data/mapObjects/beach_house.asm" -ENDC INCLUDE "engine/menu/oaks_pc.asm" @@ -5794,11 +5792,7 @@ Route17Blocks: INCBIN "maps/route17.blk" INCLUDE "data/mapHeaders/route19.asm" INCLUDE "data/mapObjects/route19.asm" -IF DEF(_OPTION_BEACH_HOUSE) Route19Blocks: INCBIN "maps/route19-yellow.blk" -ELSE -Route19Blocks: INCBIN "maps/route19.blk" -ENDC INCLUDE "data/mapHeaders/route21.asm" INCLUDE "data/mapObjects/route21.asm" @@ -6148,7 +6142,6 @@ INCLUDE "scripts/pokemontower7.asm" INCLUDE "data/mapObjects/pokemontower7.asm" PokemonTower7Blocks: INCBIN "maps/pokemontower7.blk" -<<<<<<< HEAD INCLUDE "data/mapHeaders/celadonmart1.asm" INCLUDE "scripts/celadonmart1.asm" INCLUDE "data/mapObjects/celadonmart1.asm" -- cgit v1.3.1-sl0p