From 8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 Mon Sep 17 00:00:00 2001
From: "U-Daniel-PC\\Daniel" <corrnondacqb@yahoo.com>
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
---
 data/mapObjects/pokemontower7.asm |  8 --------
 data/mapObjects/route19.asm       | 25 +++----------------------
 2 files changed, 3 insertions(+), 30 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm
index ca5aa669..a3e72093 100755
--- a/data/mapObjects/pokemontower7.asm
+++ b/data/mapObjects/pokemontower7.asm
@@ -6,18 +6,10 @@ PokemonTower7Object: ; 0x60ef6 (size=42)
 
 	db $0 ; signs
 
-IF DEF(_YELLOW)
 	db 3 ; people
 	db SPRITE_JESSIE, 8 + 4, $a + 4, $ff, $d0, 1
 	db SPRITE_JAMES, 8 + 4, $b + 4, $ff, $d0, 2
 	db SPRITE_MR_FUJI, 3 + 4, $a + 4, $ff, $d0, 3
-ELSE
-	db $4 ; people
-	db SPRITE_ROCKET, $b + 4, $9 + 4, $ff, $d3, TRAINER | $1, ROCKET + $C8, $13
-	db SPRITE_ROCKET, $9 + 4, $c + 4, $ff, $d2, TRAINER | $2, ROCKET + $C8, $14
-	db SPRITE_ROCKET, $7 + 4, $9 + 4, $ff, $d3, TRAINER | $3, ROCKET + $C8, $15
-	db SPRITE_MR_FUJI, $3 + 4, $a + 4, $ff, $d0, $4 ; person
-ENDC
 
 	; warp-to
 	EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6
diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm
index c6f80b6c..41f0f260 100755
--- a/data/mapObjects/route19.asm
+++ b/data/mapObjects/route19.asm
@@ -1,42 +1,23 @@
 Route19Object: ; 0x54e9a (size=87)
 	db $43 ; border block
 
-	IF DEF(_OPTION_BEACH_HOUSE)
-		db $1 ; warps
-		db $9, $5, $0, BEACH_HOUSE
-	ELSE
-		db $0 ; warps
-	ENDC
+	db $1 ; warps
+	db $9, $5, $0, BEACH_HOUSE
 
 	db $1 ; signs
-IF DEF(_OPTION_BEACH_HOUSE)
 	db $b,$b,$b
-ELSE
-	db $9, $b, $b ; Route19Text11
-ENDC
 
 	db $a ; people
-IF DEF(_OPTION_BEACH_HOUSE)
 	db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $9 + 4, $ff, $d3, TRAINER | 1, SWIMMER + $C8, 2
 	db SPRITE_BLACK_HAIR_BOY_1, $9 + 4, $c + 4, $ff, $d2, TRAINER | 2, SWIMMER + $C8, 3
-ELSE
-	db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $8 + 4, $ff, $d2, TRAINER | 1, SWIMMER + $C8, 2
-	db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $d + 4, $ff, $d2, TRAINER | 2, SWIMMER + $C8, 3
-ENDC
 	db SPRITE_SWIMMER, $19 + 4, $d + 4, $ff, $d2, TRAINER | $3, SWIMMER + $C8, $4
 	db SPRITE_SWIMMER, $1b + 4, $4 + 4, $ff, $d3, TRAINER | $4, SWIMMER + $C8, $5
 	db SPRITE_SWIMMER, $1f + 4, $10 + 4, $ff, $d1, TRAINER | $5, SWIMMER + $C8, $6
-IF DEF(_OPTION_BEACH_HOUSE)
 	db SPRITE_SWIMMER, $d + 4, $9 + 4, $ff, $d0, TRAINER | $6, SWIMMER + $C8, $7
-ELSE
-	db SPRITE_SWIMMER, $b + 4, $9 + 4, $ff, $d0, TRAINER | $6, SWIMMER + $C8, $7
-ENDC
 	db SPRITE_SWIMMER, $2b + 4, $8 + 4, $ff, $d2, TRAINER | $7, BEAUTY + $C8, $c
 	db SPRITE_SWIMMER, $2b + 4, $b + 4, $ff, $d3, TRAINER | $8, BEAUTY + $C8, $d
 	db SPRITE_SWIMMER, $2a + 4, $9 + 4, $ff, $d1, TRAINER | $9, SWIMMER + $C8, $8
 	db SPRITE_SWIMMER, $2c + 4, $a + 4, $ff, $d0, TRAINER | $a, BEAUTY + $C8, $e
 
 	; warp-to
-	IF DEF(_OPTION_BEACH_HOUSE)
-		EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE
-	ENDC
+	EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE
-- 
cgit v1.2.3