From 757114cad28d59eacdf22f26cd175aca17cb5407 Mon Sep 17 00:00:00 2001
From: IIMarckus <iimarckus@gmail.com>
Date: Fri, 12 Feb 2016 21:10:58 -0700
Subject: Get rid of yellow ifdefs in wild Pokémon.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/wildPokemon/route2.asm | 55 +++++++++++++++++----------------------------
 1 file changed, 20 insertions(+), 35 deletions(-)

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

diff --git a/data/wildPokemon/route2.asm b/data/wildPokemon/route2.asm
index 8f9eb4e5..fb3a5e82 100755
--- a/data/wildPokemon/route2.asm
+++ b/data/wildPokemon/route2.asm
@@ -1,39 +1,24 @@
 Route2Mons:
 	db $19
-
-	IF DEF(_YELLOW)
-		db 3,RATTATA
-		db 3,PIDGEY
-		db 4,RATTATA
-		db 4,NIDORAN_M
-		db 4,NIDORAN_F
-		db 5,PIDGEY
-		db 6,NIDORAN_M
-		db 6,NIDORAN_F
-		db 7,PIDGEY
-		db 7,PIDGEY
-	ELSE
-		db 3,RATTATA
-		db 3,PIDGEY
-		db 4,PIDGEY
-		db 4,RATTATA
-		db 5,PIDGEY
-		if DEF(_RED)
-			db 3,WEEDLE
-		ENDC
-		if DEF(_BLUE)
-			db 3,CATERPIE
-		ENDC
-		db 2,RATTATA
-		db 5,RATTATA
-		if DEF(_RED)
-			db 4,WEEDLE
-			db 5,WEEDLE
-		ENDC
-		if DEF(_BLUE)
-			db 4,CATERPIE
-			db 5,CATERPIE
-		ENDC
+	db 3,RATTATA
+	db 3,PIDGEY
+	db 4,PIDGEY
+	db 4,RATTATA
+	db 5,PIDGEY
+	if DEF(_RED)
+		db 3,WEEDLE
+	ENDC
+	if DEF(_BLUE)
+		db 3,CATERPIE
+	ENDC
+	db 2,RATTATA
+	db 5,RATTATA
+	if DEF(_RED)
+		db 4,WEEDLE
+		db 5,WEEDLE
+	ENDC
+	if DEF(_BLUE)
+		db 4,CATERPIE
+		db 5,CATERPIE
 	ENDC
 	db $00
-
-- 
cgit v1.3.1-sl0p