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/wildPokemon/rocktunnel2.asm | 40 ++++++++++------------------------------
 1 file changed, 10 insertions(+), 30 deletions(-)

(limited to 'data/wildPokemon/rocktunnel2.asm')

diff --git a/data/wildPokemon/rocktunnel2.asm b/data/wildPokemon/rocktunnel2.asm
index 0a47d984..41111909 100755
--- a/data/wildPokemon/rocktunnel2.asm
+++ b/data/wildPokemon/rocktunnel2.asm
@@ -1,34 +1,14 @@
 TunnelMonsB2:
 	db $0F
-
-	IF DEF(_YELLOW)
-		db 20,ZUBAT
-		db 17,GEODUDE
-		db 18,MACHOP
-		db 21,ZUBAT
-		db 22,ZUBAT
-		db 21,GEODUDE
-		db 20,MACHOP
-		db 14,ONIX
-		db 18,ONIX
-		db 22,ONIX
-	ELSE
-		db 16,ZUBAT
-		db 17,ZUBAT
-		db 17,GEODUDE
-		db 15,MACHOP
-		db 16,GEODUDE
-		IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN))
-			db 18,ZUBAT
-		ENDC
-		IF DEF(_BLUE) && DEF(_JAPAN)
-			db 18,DITTO
-		ENDC
-		db 17,MACHOP
-		db 17,ONIX
-		db 13,ONIX
-		db 18,GEODUDE
-	ENDC
-
+	db 20,ZUBAT
+	db 17,GEODUDE
+	db 18,MACHOP
+	db 21,ZUBAT
+	db 22,ZUBAT
+	db 21,GEODUDE
+	db 20,MACHOP
+	db 14,ONIX
+	db 18,ONIX
+	db 22,ONIX
 	db $00
 
-- 
cgit v1.3.1-sl0p