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/sgb_border.asm | 38 ++------------------------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

(limited to 'data/sgb_border.asm')

diff --git a/data/sgb_border.asm b/data/sgb_border.asm
index e1da84ac..5beaa65f 100755
--- a/data/sgb_border.asm
+++ b/data/sgb_border.asm
@@ -1,62 +1,28 @@
 BorderPalettes: ; 72788 (1c:6788)
-IF DEF(_RED)
-	INCBIN "gfx/red/sgbborder.map"
-ENDC
-IF DEF(_BLUE)
-	INCBIN "gfx/blue/sgbborder.map"
-ENDC
+	INCBIN "gfx/tilemaps/sgbborder.map"
 
 	ds $100
 
-IF DEF(_RED)
 	RGB 30,29,29 ; PAL_SGB1
 	RGB 25,22,25
 	RGB 25,17,21
 	RGB 24,14,12
-ENDC
-IF DEF(_BLUE)
-	RGB 0,0,0 ; PAL_SGB1 (the first color is not defined, but if used, turns up as 30,29,29... o_O)
-	RGB 10,17,26
-	RGB 5,9,20
-	RGB 16,20,27
-ENDC
 
 	ds $18
 
-IF DEF(_RED)
 	RGB 30,29,29 ; PAL_SGB2
 	RGB 22,31,16
 	RGB 27,20,6
 	RGB 15,15,15
-ENDC
-IF DEF(_BLUE)
-	RGB 30,29,29 ; PAL_SGB2
-	RGB 27,11,6
-	RGB 5,9,20
-	RGB 28,25,15
-ENDC
 
 	ds $18
 
-IF DEF(_RED)
 	RGB 30,29,29 ; PAL_SGB3
 	RGB 31,31,17
 	RGB 18,21,29
 	RGB 15,15,15
-ENDC
-IF DEF(_BLUE)
-	RGB 30,29,29 ; PAL_SGB3
-	RGB 12,15,11
-	RGB 5,9,20
-	RGB 14,22,17
-ENDC
 
 	ds $18
 
 SGBBorderGraphics: ; 72fe8 (1c:6fe8)
-IF DEF(_RED)
-	INCBIN "gfx/red/sgbborder.2bpp"
-ENDC
-IF DEF(_BLUE)
-	INCBIN "gfx/blue/sgbborder.2bpp"
-ENDC
+	INCBIN "gfx/sgbborder.2bpp"
-- 
cgit v1.3.1-sl0p