Kill version.asm.

54 files changed, 449 insertions, 491 deletions

diff --git a/data/wildPokemon/mansion1.asm b/data/wildPokemon/mansion1.asm
index 82547896..e96b9d42 100755
--- a/data/wildPokemon/mansion1.asm
+++ b/data/wildPokemon/mansion1.asm
@@ -1,6 +1,6 @@
 MansionMons1:
 	db $0A
-	IF _RED
+	IF DEF(_RED)
 		db 32,KOFFING
 		db 30,KOFFING
 		db 34,PONYTA
@@ -13,7 +13,7 @@ MansionMons1:
 		db 39,MUK
 	ENDC
 
-	IF _GREEN || _BLUE
+	IF DEF(_GREEN) || DEF(_BLUE)
 		db 32,GRIMER
 		db 30,GRIMER
 		db 34,PONYTA
@@ -26,7 +26,7 @@ MansionMons1:
 		db 39,WEEZING
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 34,RATTATA
 		db 34,RATICATE
 		db 23,GRIMER
diff --git a/data/wildPokemon/mansion2.asm b/data/wildPokemon/mansion2.asm
index 8ebbb414..77cce408 100755
--- a/data/wildPokemon/mansion2.asm
+++ b/data/wildPokemon/mansion2.asm
@@ -1,6 +1,6 @@
 MansionMons2:
 	db $0A
-	IF _RED
+	IF DEF(_RED)
 		db 32,GROWLITHE
 		db 34,KOFFING
 		db 34,KOFFING
@@ -13,7 +13,7 @@ MansionMons2:
 		db 37,MUK
 	ENDC
 
-	IF _GREEN || !_JAPAN && _BLUE
+	IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
 		db 32,VULPIX
 		db 34,GRIMER
 		db 34,GRIMER
@@ -26,7 +26,7 @@ MansionMons2:
 		db 37,WEEZING
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 32,GROWLITHE
 		db 34,GRIMER
 		db 34,GRIMER
@@ -39,7 +39,7 @@ MansionMons2:
 		db 37,WEEZING
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 37,RATTATA
 		db 37,RATICATE
 		db 26,GRIMER
diff --git a/data/wildPokemon/mansion3.asm b/data/wildPokemon/mansion3.asm
index a1b126ac..eceb0296 100755
--- a/data/wildPokemon/mansion3.asm
+++ b/data/wildPokemon/mansion3.asm
@@ -1,6 +1,6 @@
 MansionMons3:
 	db $0A
-	IF _RED
+	IF DEF(_RED)
 		db 31,KOFFING
 		db 33,GROWLITHE
 		db 35,KOFFING
@@ -13,7 +13,7 @@ MansionMons3:
 		db 42,MUK
 	ENDC
 
-	IF _GREEN || !_JAPAN && _BLUE
+	IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
 		db 31,GRIMER
 		db 33,VULPIX
 		db 35,GRIMER
@@ -26,7 +26,7 @@ MansionMons3:
 		db 42,WEEZING
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 31,GRIMER
 		db 33,GROWLITHE
 		db 35,GRIMER
@@ -39,7 +39,7 @@ MansionMons3:
 		db 42,WEEZING
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 40,RATTATA
 		db 40,RATICATE
 		db 32,GRIMER
diff --git a/data/wildPokemon/mansionb1.asm b/data/wildPokemon/mansionb1.asm
index 23831eeb..9dcd9893 100755
--- a/data/wildPokemon/mansionb1.asm
+++ b/data/wildPokemon/mansionb1.asm
@@ -1,6 +1,6 @@
 MansionMonsB1:
 	db $0A
-	IF _RED
+	IF DEF(_RED)
 		db 33,KOFFING
 		db 31,KOFFING
 		db 35,GROWLITHE
@@ -13,7 +13,7 @@ MansionMonsB1:
 		db 42,MUK
 	ENDC
 
-	IF _GREEN || !_JAPAN && _BLUE
+	IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
 		db 33,GRIMER
 		db 31,GRIMER
 		db 35,VULPIX
@@ -26,7 +26,7 @@ MansionMonsB1:
 		db 42,WEEZING
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 33,GRIMER
 		db 31,GRIMER
 		db 35,GROWLITHE
@@ -39,7 +39,7 @@ MansionMonsB1:
 		db 42,WEEZING
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 35,GRIMER
 		db 38,GRIMER
 		db 37,RATICATE
@@ -53,4 +53,3 @@ MansionMonsB1:
 	ENDC
 
 	db $00
-
diff --git a/data/wildPokemon/mtmoon1.asm b/data/wildPokemon/mtmoon1.asm
index 5ba1d030..a8018b82 100755
--- a/data/wildPokemon/mtmoon1.asm
+++ b/data/wildPokemon/mtmoon1.asm
@@ -1,28 +1,27 @@
 MoonMons1:
 	db $0A
-	IF !_YELLOW
+	IF DEF(_YELLOW)
 		db 8,ZUBAT
-		db 7,ZUBAT
 		db 9,ZUBAT
-		db 8,GEODUDE
+		db 10,GEODUDE
 		db 6,ZUBAT
+		db 7,ZUBAT
 		db 10,ZUBAT
 		db 10,GEODUDE
-		db 8,PARAS
 		db 11,ZUBAT
-		db 8,CLEFAIRY
-	ENDC
-	IF _YELLOW
+		db 12,SANDSHREW
+		db 11,CLEFAIRY
+	ELSE
 		db 8,ZUBAT
+		db 7,ZUBAT
 		db 9,ZUBAT
-		db 10,GEODUDE
+		db 8,GEODUDE
 		db 6,ZUBAT
-		db 7,ZUBAT
 		db 10,ZUBAT
 		db 10,GEODUDE
+		db 8,PARAS
 		db 11,ZUBAT
-		db 12,SANDSHREW
-		db 11,CLEFAIRY
+		db 8,CLEFAIRY
 	ENDC
 	db $00
 
diff --git a/data/wildPokemon/mtmoonb1.asm b/data/wildPokemon/mtmoonb1.asm
index 0f3639c1..c78b8471 100755
--- a/data/wildPokemon/mtmoonb1.asm
+++ b/data/wildPokemon/mtmoonb1.asm
@@ -1,18 +1,6 @@
 MoonMonsB1:
 	db $0A
-	IF !_YELLOW
-		db 8,ZUBAT
-		db 7,ZUBAT
-		db 7,GEODUDE
-		db 8,GEODUDE
-		db 9,ZUBAT
-		db 10,PARAS
-		db 10,ZUBAT
-		db 11,ZUBAT
-		db 9,CLEFAIRY
-		db 9,GEODUDE
-	ENDC
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 8,ZUBAT
 		db 9,ZUBAT
 		db 10,GEODUDE
@@ -23,6 +11,17 @@ MoonMonsB1:
 		db 11,ZUBAT
 		db 12,SANDSHREW
 		db 11,CLEFAIRY
+	ELSE
+		db 8,ZUBAT
+		db 7,ZUBAT
+		db 7,GEODUDE
+		db 8,GEODUDE
+		db 9,ZUBAT
+		db 10,PARAS
+		db 10,ZUBAT
+		db 11,ZUBAT
+		db 9,CLEFAIRY
+		db 9,GEODUDE
 	ENDC
 	db $00
 
diff --git a/data/wildPokemon/mtmoonb2.asm b/data/wildPokemon/mtmoonb2.asm
index 34966cd8..0118a898 100755
--- a/data/wildPokemon/mtmoonb2.asm
+++ b/data/wildPokemon/mtmoonb2.asm
@@ -1,18 +1,6 @@
 MoonMonsB2:
 	db $0A
-	IF !_YELLOW
-		db 9,ZUBAT
-		db 9,GEODUDE
-		db 10,ZUBAT
-		db 10,GEODUDE
-		db 11,ZUBAT
-		db 10,PARAS
-		db 12,PARAS
-		db 10,CLEFAIRY
-		db 12,ZUBAT
-		db 12,CLEFAIRY
-	ENDC
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 10,ZUBAT
 		db 11,GEODUDE
 		db 13,PARAS
@@ -23,6 +11,17 @@ MoonMonsB2:
 		db 9,CLEFAIRY
 		db 11,CLEFAIRY
 		db 13,CLEFAIRY
+	ELSE
+		db 9,ZUBAT
+		db 9,GEODUDE
+		db 10,ZUBAT
+		db 10,GEODUDE
+		db 11,ZUBAT
+		db 10,PARAS
+		db 12,PARAS
+		db 10,CLEFAIRY
+		db 12,ZUBAT
+		db 12,CLEFAIRY
 	ENDC
 	db $00
 
diff --git a/data/wildPokemon/pokemontower3.asm b/data/wildPokemon/pokemontower3.asm
index e2b39398..4e3a7c62 100755
--- a/data/wildPokemon/pokemontower3.asm
+++ b/data/wildPokemon/pokemontower3.asm
@@ -1,29 +1,27 @@
 TowerMons3:
 	db $0A
 
-	IF !_YELLOW
+	IF DEF(_YELLOW)
 		db 20,GASTLY
 		db 21,GASTLY
 		db 22,GASTLY
 		db 23,GASTLY
+		db 24,GASTLY
 		db 19,GASTLY
 		db 18,GASTLY
-		db 24,GASTLY
-		db 20,CUBONE
-		db 22,CUBONE
+		db 25,GASTLY
+		db 20,HAUNTER
 		db 25,HAUNTER
-	ENDC
-
-	IF _YELLOW
+	ELSE
 		db 20,GASTLY
 		db 21,GASTLY
 		db 22,GASTLY
 		db 23,GASTLY
-		db 24,GASTLY
 		db 19,GASTLY
 		db 18,GASTLY
-		db 25,GASTLY
-		db 20,HAUNTER
+		db 24,GASTLY
+		db 20,CUBONE
+		db 22,CUBONE
 		db 25,HAUNTER
 	ENDC
 
diff --git a/data/wildPokemon/pokemontower4.asm b/data/wildPokemon/pokemontower4.asm
index 3f38af20..e0de809f 100755
--- a/data/wildPokemon/pokemontower4.asm
+++ b/data/wildPokemon/pokemontower4.asm
@@ -1,30 +1,28 @@
 TowerMons4:
 	db $0A
 
-	IF !_YELLOW
+	IF DEF(_YELLOW)
 		db 20,GASTLY
 		db 21,GASTLY
 		db 22,GASTLY
 		db 23,GASTLY
+		db 24,GASTLY
 		db 19,GASTLY
 		db 18,GASTLY
+		db 25,GASTLY
+		db 20,HAUNTER
 		db 25,HAUNTER
-		db 20,CUBONE
-		db 22,CUBONE
-		db 24,GASTLY
-	ENDC
-
-	IF _YELLOW
+	ELSE
 		db 20,GASTLY
 		db 21,GASTLY
 		db 22,GASTLY
 		db 23,GASTLY
-		db 24,GASTLY
 		db 19,GASTLY
 		db 18,GASTLY
-		db 25,GASTLY
-		db 20,HAUNTER
 		db 25,HAUNTER
+		db 20,CUBONE
+		db 22,CUBONE
+		db 24,GASTLY
 	ENDC
 
 	db $00
diff --git a/data/wildPokemon/pokemontower5.asm b/data/wildPokemon/pokemontower5.asm
index 97098448..9f97b98e 100755
--- a/data/wildPokemon/pokemontower5.asm
+++ b/data/wildPokemon/pokemontower5.asm
@@ -1,20 +1,7 @@
 TowerMons5:
 	db $0A
 
-	IF !_YELLOW
-		db 20,GASTLY
-		db 21,GASTLY
-		db 22,GASTLY
-		db 23,GASTLY
-		db 19,GASTLY
-		db 18,GASTLY
-		db 25,HAUNTER
-		db 20,CUBONE
-		db 22,CUBONE
-		db 24,GASTLY
-	ENDC
-
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 22,GASTLY
 		db 23,GASTLY
 		db 24,GASTLY
@@ -25,6 +12,17 @@ TowerMons5:
 		db 27,GASTLY
 		db 22,HAUNTER
 		db 27,HAUNTER
+	ELSE
+		db 20,GASTLY
+		db 21,GASTLY
+		db 22,GASTLY
+		db 23,GASTLY
+		db 19,GASTLY
+		db 18,GASTLY
+		db 25,HAUNTER
+		db 20,CUBONE
+		db 22,CUBONE
+		db 24,GASTLY
 	ENDC
 
 	db $00
diff --git a/data/wildPokemon/pokemontower6.asm b/data/wildPokemon/pokemontower6.asm
index abd2969a..b97e2ddd 100755
--- a/data/wildPokemon/pokemontower6.asm
+++ b/data/wildPokemon/pokemontower6.asm
@@ -1,20 +1,7 @@
 TowerMons6:
 	db $0F
 
-	IF !_YELLOW
-		db 21,GASTLY
-		db 22,GASTLY
-		db 23,GASTLY
-		db 24,GASTLY
-		db 20,GASTLY
-		db 19,GASTLY
-		db 26,HAUNTER
-		db 22,CUBONE
-		db 24,CUBONE
-		db 28,HAUNTER
-	ENDC
-
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 22,GASTLY
 		db 23,GASTLY
 		db 24,GASTLY
@@ -25,6 +12,17 @@ TowerMons6:
 		db 27,GASTLY
 		db 22,HAUNTER
 		db 27,HAUNTER
+	ELSE
+		db 21,GASTLY
+		db 22,GASTLY
+		db 23,GASTLY
+		db 24,GASTLY
+		db 20,GASTLY
+		db 19,GASTLY
+		db 26,HAUNTER
+		db 22,CUBONE
+		db 24,CUBONE
+		db 28,HAUNTER
 	ENDC
 
 	db $00
diff --git a/data/wildPokemon/pokemontower7.asm b/data/wildPokemon/pokemontower7.asm
index 2daf3a2d..b0d94534 100755
--- a/data/wildPokemon/pokemontower7.asm
+++ b/data/wildPokemon/pokemontower7.asm
@@ -1,21 +1,7 @@
 TowerMons7:
 	db $0F
 
-	IF !_YELLOW
-		db 21,GASTLY
-		db 22,GASTLY
-		db 23,GASTLY
-		db 24,GASTLY
-		db 20,GASTLY
-		db 28,HAUNTER
-		db 22,CUBONE
-		db 24,CUBONE
-		db 28,HAUNTER
-		db 30,HAUNTER
-
-	ENDC
-
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 24,GASTLY
 		db 25,GASTLY
 		db 26,GASTLY
@@ -26,6 +12,17 @@ TowerMons7:
 		db 29,GASTLY
 		db 24,HAUNTER
 		db 29,HAUNTER
+	ELSE
+		db 21,GASTLY
+		db 22,GASTLY
+		db 23,GASTLY
+		db 24,GASTLY
+		db 20,GASTLY
+		db 28,HAUNTER
+		db 22,CUBONE
+		db 24,CUBONE
+		db 28,HAUNTER
+		db 30,HAUNTER
 	ENDC
 
 	db $00
diff --git a/data/wildPokemon/powerplant.asm b/data/wildPokemon/powerplant.asm
index a67ab2e9..f956fcf2 100755
--- a/data/wildPokemon/powerplant.asm
+++ b/data/wildPokemon/powerplant.asm
@@ -1,7 +1,18 @@
 PowerPlantMons:
 	db $0A
-	IF !_YELLOW
-	
+
+	IF DEF(_YELLOW)
+		db 30,MAGNEMITE
+		db 35,MAGNEMITE
+		db 33,MAGNETON
+		db 33,VOLTORB
+		db 37,VOLTORB
+		db 33,GRIMER
+		db 37,GRIMER
+		db 38,MAGNETON
+		db 33,MUK
+		db 37,MUK
+	ELSE
 		db 21,VOLTORB
 		db 21,MAGNEMITE
 		db 20,PIKACHU
@@ -10,28 +21,14 @@ PowerPlantMons:
 		db 23,VOLTORB
 		db 32,MAGNETON
 		db 35,MAGNETON
-		IF _RED
+		IF DEF(_RED)
 			db 33,ELECTABUZZ
 			db 36,ELECTABUZZ
 		ENDC
-		IF _GREEN || _BLUE
+		IF DEF(_GREEN) || DEF(_BLUE)
 			db 33,RAICHU
 			db 36,RAICHU
 		ENDC
 	ENDC
 
-	IF _YELLOW
-		db 30,MAGNEMITE
-		db 35,MAGNEMITE
-		db 33,MAGNETON
-		db 33,VOLTORB
-		db 37,VOLTORB
-		db 33,GRIMER
-		db 37,GRIMER
-		db 38,MAGNETON
-		db 33,MUK
-		db 37,MUK
-	ENDC
-
 	db $00
-
diff --git a/data/wildPokemon/rocktunnel1.asm b/data/wildPokemon/rocktunnel1.asm
index e8904043..992a4e73 100755
--- a/data/wildPokemon/rocktunnel1.asm
+++ b/data/wildPokemon/rocktunnel1.asm
@@ -1,16 +1,27 @@
 TunnelMonsB1:
 	db $0F
 
-	IF !_YELLOW
+	IF DEF(_YELLOW)
+		db 15,ZUBAT
+		db 16,GEODUDE
+		db 17,ZUBAT
+		db 19,ZUBAT
+		db 18,GEODUDE
+		db 20,GEODUDE
+		db 21,ZUBAT
+		db 17,MACHOP
+		db 19,MACHOP
+		db 21,MACHOP
+	ELSE
 		db 16,ZUBAT
 		db 17,ZUBAT
 		db 17,GEODUDE
 		db 15,MACHOP
 		db 16,GEODUDE
-		IF _RED || _GREEN || (_BLUE && !_JAPAN)
+		IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN))
 			db 18,ZUBAT
 		ENDC
-		IF (_BLUE && _JAPAN)
+		IF (DEF(_BLUE) && DEF(_JAPAN))
 			db 18,DITTO
 		ENDC
 		db 15,ZUBAT
@@ -19,18 +30,5 @@ TunnelMonsB1:
 		db 15,ONIX
 	ENDC
 
-	IF _YELLOW
-		db 15,ZUBAT
-		db 16,GEODUDE
-		db 17,ZUBAT
-		db 19,ZUBAT
-		db 18,GEODUDE
-		db 20,GEODUDE
-		db 21,ZUBAT
-		db 17,MACHOP
-		db 19,MACHOP
-		db 21,MACHOP
-	ENDC
-
 	db $00
 
diff --git a/data/wildPokemon/rocktunnel2.asm b/data/wildPokemon/rocktunnel2.asm
index f158453e..0a47d984 100755
--- a/data/wildPokemon/rocktunnel2.asm
+++ b/data/wildPokemon/rocktunnel2.asm
@@ -1,15 +1,27 @@
 TunnelMonsB2:
 	db $0F
-	IF !_YELLOW
+
+	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 _RED || _GREEN || (_BLUE && !_JAPAN)
+		IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN))
 			db 18,ZUBAT
 		ENDC
-		IF (_BLUE && _JAPAN)
+		IF DEF(_BLUE) && DEF(_JAPAN)
 			db 18,DITTO
 		ENDC
 		db 17,MACHOP
@@ -18,18 +30,5 @@ TunnelMonsB2:
 		db 18,GEODUDE
 	ENDC
 
-	IF _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
-	ENDC
-
 	db $00
 
diff --git a/data/wildPokemon/route1.asm b/data/wildPokemon/route1.asm
index bbad3c9e..8e5b6897 100755
--- a/data/wildPokemon/route1.asm
+++ b/data/wildPokemon/route1.asm
@@ -1,18 +1,6 @@
 Route1Mons:
 	db $19
-	IF !_YELLOW
-		db 3,PIDGEY
-		db 3,RATTATA
-		db 3,RATTATA
-		db 2,RATTATA
-		db 2,PIDGEY
-		db 3,PIDGEY
-		db 3,PIDGEY
-		db 4,RATTATA
-		db 4,PIDGEY
-		db 5,PIDGEY
-	ENDC
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 3,PIDGEY
 		db 4,PIDGEY
 		db 2,RATTATA
@@ -23,6 +11,17 @@ Route1Mons:
 		db 4,RATTATA
 		db 6,PIDGEY
 		db 7,PIDGEY
+	ELSE
+		db 3,PIDGEY
+		db 3,RATTATA
+		db 3,RATTATA
+		db 2,RATTATA
+		db 2,PIDGEY
+		db 3,PIDGEY
+		db 3,PIDGEY
+		db 4,RATTATA
+		db 4,PIDGEY
+		db 5,PIDGEY
 	ENDC
 	db $00
 
diff --git a/data/wildPokemon/route10.asm b/data/wildPokemon/route10.asm
index 185e41fe..7cfaf25c 100755
--- a/data/wildPokemon/route10.asm
+++ b/data/wildPokemon/route10.asm
@@ -1,7 +1,7 @@
 Route10Mons:
 	db $0F
 
-	IF _RED
+	IF DEF(_RED)
 		db 16,VOLTORB
 		db 16,SPEAROW
 		db 14,VOLTORB
@@ -14,7 +14,7 @@ Route10Mons:
 		db 17,EKANS
 	ENDC
 
-	IF !_RED
+	IF DEF(_BLUE) || DEF(_GREEN)
 		db 16,VOLTORB
 		db 16,SPEAROW
 		db 14,VOLTORB
@@ -27,7 +27,7 @@ Route10Mons:
 		db 17,SANDSHREW
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 16,MAGNEMITE
 		db 18,RATTATA
 		db 18,MAGNEMITE
diff --git a/data/wildPokemon/route11.asm b/data/wildPokemon/route11.asm
index 6f724e80..66c52c20 100755
--- a/data/wildPokemon/route11.asm
+++ b/data/wildPokemon/route11.asm
@@ -1,7 +1,7 @@
 Route11Mons:
 	db $0F
 
-	IF _RED
+	IF DEF(_RED)
 		db 14,EKANS
 		db 15,SPEAROW
 		db 12,EKANS
@@ -14,7 +14,7 @@ Route11Mons:
 		db 15,DROWZEE
 	ENDC
 
-	IF _GREEN || _BLUE
+	IF DEF(_GREEN) || DEF(_BLUE)
 		db 14,SANDSHREW
 		db 15,SPEAROW
 		db 12,SANDSHREW
@@ -27,7 +27,7 @@ Route11Mons:
 		db 15,DROWZEE
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 16,PIDGEY
 		db 15,RATTATA
 		db 18,PIDGEY
diff --git a/data/wildPokemon/route12.asm b/data/wildPokemon/route12.asm
index b15a2223..7f5e47fe 100755
--- a/data/wildPokemon/route12.asm
+++ b/data/wildPokemon/route12.asm
@@ -1,7 +1,7 @@
 Route12Mons:
 	db $0F
 
-	IF _RED || (_JAPAN && _BLUE)
+	IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
 		db 24,ODDISH
 		db 25,PIDGEY
 		db 23,PIDGEY
@@ -15,7 +15,7 @@ Route12Mons:
 		db $00
 	ENDC
 
-	IF _GREEN || (!_JAPAN && _BLUE)
+	IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
 		db 24,BELLSPROUT
 		db 25,PIDGEY
 		db 23,PIDGEY
@@ -29,7 +29,7 @@ Route12Mons:
 		db $00
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 25,ODDISH
 		db 25,BELLSPROUT
 		db 28,PIDGEY
diff --git a/data/wildPokemon/route13.asm b/data/wildPokemon/route13.asm
index 5293bf21..1b694f36 100755
--- a/data/wildPokemon/route13.asm
+++ b/data/wildPokemon/route13.asm
@@ -1,5 +1,5 @@
 Route13Mons:
-	IF _RED || (_JAPAN && _BLUE)
+	IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
 		db $14
 		db 24,ODDISH
 		db 25,PIDGEY
@@ -14,7 +14,7 @@ Route13Mons:
 		db $00
 	ENDC
 
-	IF _GREEN || (!_JAPAN && _BLUE)
+	IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
 		db $14
 		db 24,BELLSPROUT
 		db 25,PIDGEY
@@ -29,7 +29,7 @@ Route13Mons:
 		db $00
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db $0F
 		db 25,ODDISH
 		db 25,BELLSPROUT
diff --git a/data/wildPokemon/route14.asm b/data/wildPokemon/route14.asm
index 76d9118f..999981af 100755
--- a/data/wildPokemon/route14.asm
+++ b/data/wildPokemon/route14.asm
@@ -1,6 +1,6 @@
 Route14Mons:
 	db $0F
-	IF _RED || (_JAPAN && _BLUE)
+	IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
 		db 24,ODDISH
 		db 26,PIDGEY
 		db 23,DITTO
@@ -13,7 +13,7 @@ Route14Mons:
 		db 30,PIDGEOTTO
 	ENDC
 
-	IF _GREEN || (!_JAPAN && _BLUE)
+	IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
 		db 24,BELLSPROUT
 		db 26,PIDGEY
 		db 23,DITTO
@@ -26,7 +26,7 @@ Route14Mons:
 		db 30,PIDGEOTTO
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 26,ODDISH
 		db 26,BELLSPROUT
 		db 24,VENONAT
diff --git a/data/wildPokemon/route15.asm b/data/wildPokemon/route15.asm
index 4a0d3fc3..d924052a 100755
--- a/data/wildPokemon/route15.asm
+++ b/data/wildPokemon/route15.asm
@@ -1,6 +1,6 @@
 Route15Mons:
 	db $0F
-	IF _RED || (_JAPAN && _BLUE)
+	IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
 		db 24,ODDISH
 		db 26,DITTO
 		db 23,PIDGEY
@@ -13,7 +13,7 @@ Route15Mons:
 		db 30,PIDGEOTTO
 	ENDC
 
-	IF _GREEN || (!_JAPAN && _BLUE)
+	IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
 		db 24,BELLSPROUT
 		db 26,DITTO
 		db 23,PIDGEY
@@ -26,7 +26,7 @@ Route15Mons:
 		db 30,PIDGEOTTO
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 26,ODDISH
 		db 26,BELLSPROUT
 		db 24,VENONAT
diff --git a/data/wildPokemon/route16.asm b/data/wildPokemon/route16.asm
index 34408164..468e3777 100755
--- a/data/wildPokemon/route16.asm
+++ b/data/wildPokemon/route16.asm
@@ -1,19 +1,6 @@
 Route16Mons:
 	db $19
-	IF !_YELLOW
-		db 20,SPEAROW
-		db 22,SPEAROW
-		db 18,RATTATA
-		db 20,DODUO
-		db 20,RATTATA
-		db 18,DODUO
-		db 22,DODUO
-		db 22,RATTATA
-		db 23,RATICATE
-		db 25,RATICATE
-	ENDC
-
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 22,SPEAROW
 		db 22,DODUO
 		db 23,RATTATA
@@ -24,6 +11,17 @@ Route16Mons:
 		db 24,FEAROW
 		db 25,RATICATE
 		db 26,RATICATE
+	ELSE
+		db 20,SPEAROW
+		db 22,SPEAROW
+		db 18,RATTATA
+		db 20,DODUO
+		db 20,RATTATA
+		db 18,DODUO
+		db 22,DODUO
+		db 22,RATTATA
+		db 23,RATICATE
+		db 25,RATICATE
 	ENDC
 
 	db $00
diff --git a/data/wildPokemon/route17.asm b/data/wildPokemon/route17.asm
index 75882ec5..36283a99 100755
--- a/data/wildPokemon/route17.asm
+++ b/data/wildPokemon/route17.asm
@@ -1,19 +1,7 @@
 Route17Mons:
 	db $19
-	IF !_YELLOW
-		db 20,SPEAROW
-		db 22,SPEAROW
-		db 25,RATICATE
-		db 24,DODUO
-		db 27,RATICATE
-		db 26,DODUO
-		db 28,DODUO
-		db 29,RATICATE
-		db 25,FEAROW
-		db 27,FEAROW
-	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 26,DODUO
 		db 27,FEAROW
 		db 27,DODUO
@@ -24,6 +12,17 @@ Route17Mons:
 		db 28,DODUO
 		db 32,PONYTA
 		db 29,DODRIO
+	ELSE
+		db 20,SPEAROW
+		db 22,SPEAROW
+		db 25,RATICATE
+		db 24,DODUO
+		db 27,RATICATE
+		db 26,DODUO
+		db 28,DODUO
+		db 29,RATICATE
+		db 25,FEAROW
+		db 27,FEAROW
 	ENDC
 
 	db $00
diff --git a/data/wildPokemon/route18.asm b/data/wildPokemon/route18.asm
index 8820f045..e16fc8ac 100755
--- a/data/wildPokemon/route18.asm
+++ b/data/wildPokemon/route18.asm
@@ -1,19 +1,7 @@
 Route18Mons:
 	db $19
-	IF !_YELLOW
-		db 20,SPEAROW
-		db 22,SPEAROW
-		db 25,RATICATE
-		db 24,DODUO
-		db 25,FEAROW
-		db 26,DODUO
-		db 28,DODUO
-		db 29,RATICATE
-		db 27,FEAROW
-		db 29,FEAROW
-	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 22,SPEAROW
 		db 22,DODUO
 		db 23,RATTATA
@@ -24,6 +12,17 @@ Route18Mons:
 		db 24,FEAROW
 		db 25,RATICATE
 		db 26,RATICATE
+	ELSE
+		db 20,SPEAROW
+		db 22,SPEAROW
+		db 25,RATICATE
+		db 24,DODUO
+		db 25,FEAROW
+		db 26,DODUO
+		db 28,DODUO
+		db 29,RATICATE
+		db 27,FEAROW
+		db 29,FEAROW
 	ENDC
 
 	db $00
diff --git a/data/wildPokemon/route2.asm b/data/wildPokemon/route2.asm
index 57d7f87f..8f9eb4e5 100755
--- a/data/wildPokemon/route2.asm
+++ b/data/wildPokemon/route2.asm
@@ -1,40 +1,39 @@
 Route2Mons:
 	db $19
 
-	IF !_YELLOW
+	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 _RED
+		if DEF(_RED)
 			db 3,WEEDLE
 		ENDC
-		if _BLUE
+		if DEF(_BLUE)
 			db 3,CATERPIE
 		ENDC
 		db 2,RATTATA
 		db 5,RATTATA
-		if _RED
+		if DEF(_RED)
 			db 4,WEEDLE
 			db 5,WEEDLE
 		ENDC
-		if _BLUE
+		if DEF(_BLUE)
 			db 4,CATERPIE
 			db 5,CATERPIE
 		ENDC
 	ENDC
-	IF _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
-	ENDC
 	db $00
 
diff --git a/data/wildPokemon/route21.asm b/data/wildPokemon/route21.asm
index a29753eb..7017081d 100755
--- a/data/wildPokemon/route21.asm
+++ b/data/wildPokemon/route21.asm
@@ -1,19 +1,7 @@
 Route21Mons:
 	db $19
-	IF !_YELLOW
-		db 21,RATTATA
-		db 23,PIDGEY
-		db 30,RATICATE
-		db 23,RATTATA
-		db 21,PIDGEY
-		db 30,PIDGEOTTO
-		db 32,PIDGEOTTO
-		db 28,TANGELA
-		db 30,TANGELA
-		db 32,TANGELA
-	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 15,PIDGEY
 		db 13,RATTATA
 		db 13,PIDGEY
@@ -24,6 +12,17 @@ Route21Mons:
 		db 17,PIDGEOTTO
 		db 19,PIDGEOTTO
 		db 15,PIDGEOTTO
+	ELSE
+		db 21,RATTATA
+		db 23,PIDGEY
+		db 30,RATICATE
+		db 23,RATTATA
+		db 21,PIDGEY
+		db 30,PIDGEOTTO
+		db 32,PIDGEOTTO
+		db 28,TANGELA
+		db 30,TANGELA
+		db 32,TANGELA
 	ENDC
 
 	db $05
diff --git a/data/wildPokemon/route22.asm b/data/wildPokemon/route22.asm
index 36ff9a57..78c5631a 100755
--- a/data/wildPokemon/route22.asm
+++ b/data/wildPokemon/route22.asm
@@ -1,6 +1,6 @@
 Route22Mons:
 	db $19
-	IF _RED || (_JAPAN && _BLUE)
+	IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
 		db 3,RATTATA
 		db 3,NIDORAN_M
 		db 4,RATTATA
@@ -12,7 +12,7 @@ Route22Mons:
 		db 3,NIDORAN_F
 		db 4,NIDORAN_F
 	ENDC
-	IF _GREEN || (!_JAPAN && _BLUE)
+	IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
 		db 3,RATTATA
 		db 3,NIDORAN_F
 		db 4,RATTATA
@@ -24,7 +24,7 @@ Route22Mons:
 		db 3,NIDORAN_M
 		db 4,NIDORAN_M
 	ENDC
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 2,NIDORAN_M
 		db 2,NIDORAN_F
 		db 3,MANKEY
diff --git a/data/wildPokemon/route23.asm b/data/wildPokemon/route23.asm
index cfdd8eff..1320868c 100755
--- a/data/wildPokemon/route23.asm
+++ b/data/wildPokemon/route23.asm
@@ -1,10 +1,22 @@
 Route23Mons:
 	db $0A
-	IF !_YELLOW
-		IF _RED
+
+	IF DEF(_YELLOW)
+		db 41,NIDORINO
+		db 41,NIDORINA
+		db 36,MANKEY
+		db 44,NIDORINO
+		db 44,NIDORINA
+		db 40,FEAROW
+		db 41,MANKEY
+		db 45,FEAROW
+		db 41,PRIMEAPE
+		db 46,PRIMEAPE
+	ELSE
+		IF DEF(_RED)
 			db 26,EKANS
 		ENDC
-		IF !_RED
+		IF !DEF(_RED)
 			db 26,SANDSHREW
 		ENDC
 		db 33,DITTO
@@ -12,10 +24,10 @@ Route23Mons:
 		db 38,FEAROW
 		db 38,DITTO
 		db 38,FEAROW
-		IF _RED
+		IF DEF(_RED)
 			db 41,ARBOK
 		ENDC
-		IF !_RED
+		IF !DEF(_RED)
 			db 41,SANDSLASH
 		ENDC
 		db 43,DITTO
@@ -23,18 +35,5 @@ Route23Mons:
 		db 43,FEAROW
 	ENDC
 
-	IF _YELLOW
-		db 41,NIDORINO
-		db 41,NIDORINA
-		db 36,MANKEY
-		db 44,NIDORINO
-		db 44,NIDORINA
-		db 40,FEAROW
-		db 41,MANKEY
-		db 45,FEAROW
-		db 41,PRIMEAPE
-		db 46,PRIMEAPE
-	ENDC
-
 	db $00
 
diff --git a/data/wildPokemon/route24.asm b/data/wildPokemon/route24.asm
index e4ff986a..d586927f 100755
--- a/data/wildPokemon/route24.asm
+++ b/data/wildPokemon/route24.asm
@@ -1,7 +1,7 @@
 Route24Mons:
 	db $19
 
-	IF _RED
+	IF DEF(_RED)
 		db 7,WEEDLE
 		db 8,KAKUNA
 		db 12,PIDGEY
@@ -14,7 +14,7 @@ Route24Mons:
 		db 12,ABRA
 	ENDC
 
-	IF _GREEN || !_JAPAN && _BLUE
+	IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
 		db 7,CATERPIE
 		db 8,METAPOD
 		db 12,PIDGEY
@@ -27,7 +27,7 @@ Route24Mons:
 		db 12,ABRA
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 7,CATERPIE
 		db 8,METAPOD
 		db 12,PIDGEY
@@ -40,7 +40,7 @@ Route24Mons:
 		db 12,ABRA
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 12,ODDISH
 		db 12,BELLSPROUT
 		db 13,PIDGEY
diff --git a/data/wildPokemon/route25.asm b/data/wildPokemon/route25.asm
index 3d225473..4609c7cd 100755
--- a/data/wildPokemon/route25.asm
+++ b/data/wildPokemon/route25.asm
@@ -1,7 +1,7 @@
 Route25Mons:
 	db $0F
 
-	IF _RED
+	IF DEF(_RED)
 		db 8,WEEDLE
 		db 9,KAKUNA
 		db 13,PIDGEY
@@ -14,7 +14,7 @@ Route25Mons:
 		db 8,CATERPIE
 	ENDC
 
-	IF _GREEN || !_JAPAN && _BLUE
+	IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
 		db 8,CATERPIE
 		db 9,METAPOD
 		db 13,PIDGEY
@@ -27,7 +27,7 @@ Route25Mons:
 		db 8,WEEDLE
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 8,CATERPIE
 		db 9,METAPOD
 		db 13,PIDGEY
@@ -40,7 +40,7 @@ Route25Mons:
 		db 8,WEEDLE
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 12,ODDISH
 	db 12,BELLSPROUT
 	db 13,PIDGEY
diff --git a/data/wildPokemon/route3.asm b/data/wildPokemon/route3.asm
index 21230f42..fe7c5da9 100755
--- a/data/wildPokemon/route3.asm
+++ b/data/wildPokemon/route3.asm
@@ -1,18 +1,6 @@
 Route3Mons:
 	db $14
-	IF !_YELLOW
-		db 6,PIDGEY
-		db 5,SPEAROW
-		db 7,PIDGEY
-		db 6,SPEAROW
-		db 7,SPEAROW
-		db 8,PIDGEY
-		db 8,SPEAROW
-		db 3,JIGGLYPUFF
-		db 5,JIGGLYPUFF
-		db 7,JIGGLYPUFF
-	ENDC
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 8,SPEAROW
 		db 9,SPEAROW
 		db 9,MANKEY
@@ -23,6 +11,17 @@ Route3Mons:
 		db 12,RATTATA
 		db 11,SPEAROW
 		db 12,SPEAROW
+	ELSE
+		db 6,PIDGEY
+		db 5,SPEAROW
+		db 7,PIDGEY
+		db 6,SPEAROW
+		db 7,SPEAROW
+		db 8,PIDGEY
+		db 8,SPEAROW
+		db 3,JIGGLYPUFF
+		db 5,JIGGLYPUFF
+		db 7,JIGGLYPUFF
 	ENDC
 	db $00
 
diff --git a/data/wildPokemon/route4.asm b/data/wildPokemon/route4.asm
index f7eb80ee..40c3b7b5 100755
--- a/data/wildPokemon/route4.asm
+++ b/data/wildPokemon/route4.asm
@@ -1,7 +1,7 @@
 Route4Mons:
 	db $14
 
-	IF _RED
+	IF DEF(_RED)
 		db 10,RATTATA
 		db 10,SPEAROW
 		db 8,RATTATA
@@ -14,7 +14,7 @@ Route4Mons:
 		db 12,EKANS
 	ENDC
 
-	IF !_RED
+	IF DEF(_BLUE) || DEF(_GREEN)
 		db 10,RATTATA
 		db 10,SPEAROW
 		db 8,RATTATA
@@ -27,7 +27,7 @@ Route4Mons:
 		db 12,SANDSHREW
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 8,SPEAROW
 		db 9,SPEAROW
 		db 9,MANKEY
diff --git a/data/wildPokemon/route5.asm b/data/wildPokemon/route5.asm
index 4b018cd6..aa67ca87 100755
--- a/data/wildPokemon/route5.asm
+++ b/data/wildPokemon/route5.asm
@@ -1,7 +1,7 @@
 Route5Mons:
 	db $0F
 
-	IF _RED
+	IF DEF(_RED)
 		db 13,ODDISH
 		db 13,PIDGEY
 		db 15,PIDGEY
@@ -14,7 +14,7 @@ Route5Mons:
 		db 16,MANKEY
 	ENDC
 
-	IF _GREEN || !_JAPAN && _BLUE
+	IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
 		db 13,BELLSPROUT
 		db 13,PIDGEY
 		db 15,PIDGEY
@@ -27,7 +27,7 @@ Route5Mons:
 		db 16,MEOWTH
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 13,ODDISH
 		db 13,PIDGEY
 		db 15,PIDGEY
@@ -40,7 +40,7 @@ Route5Mons:
 		db 16,MEOWTH
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 15,PIDGEY
 		db 14,RATTATA
 		db 7,ABRA
diff --git a/data/wildPokemon/route6.asm b/data/wildPokemon/route6.asm
index 253a5943..86e0c05f 100755
--- a/data/wildPokemon/route6.asm
+++ b/data/wildPokemon/route6.asm
@@ -1,7 +1,7 @@
 Route6Mons:
 	db $0F
 
-	IF _RED
+	IF DEF(_RED)
 		db 13,ODDISH
 		db 13,PIDGEY
 		db 15,PIDGEY
@@ -15,7 +15,7 @@ Route6Mons:
 		db $00
 	ENDC
 
-	IF _GREEN || !_JAPAN && _BLUE
+	IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
 		db 13,BELLSPROUT
 		db 13,PIDGEY
 		db 15,PIDGEY
@@ -29,7 +29,7 @@ Route6Mons:
 		db $00
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 13,ODDISH
 		db 13,PIDGEY
 		db 15,PIDGEY
@@ -43,7 +43,7 @@ Route6Mons:
 		db $00
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 15,PIDGEY
 		db 14,RATTATA
 		db 7,ABRA
diff --git a/data/wildPokemon/route7.asm b/data/wildPokemon/route7.asm
index 42073d11..505b632b 100755
--- a/data/wildPokemon/route7.asm
+++ b/data/wildPokemon/route7.asm
@@ -1,7 +1,7 @@
 Route7Mons:
 	db $0F
 
-	IF _RED
+	IF DEF(_RED)
 		db 19,PIDGEY
 		db 19,ODDISH
 		db 17,MANKEY
@@ -14,7 +14,7 @@ Route7Mons:
 		db 20,MANKEY
 	ENDC
 
-	IF _GREEN || !_JAPAN && _BLUE
+	IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
 		db 19,PIDGEY
 		db 19,BELLSPROUT
 		db 17,MEOWTH
@@ -27,7 +27,7 @@ Route7Mons:
 		db 20,MEOWTH
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 19,PIDGEY
 		db 19,ODDISH
 		db 17,MEOWTH
@@ -40,7 +40,7 @@ Route7Mons:
 		db 20,MEOWTH
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 20,PIDGEY
 		db 22,PIDGEY
 		db 20,RATTATA
diff --git a/data/wildPokemon/route8.asm b/data/wildPokemon/route8.asm
index 59c3082d..67905134 100755
--- a/data/wildPokemon/route8.asm
+++ b/data/wildPokemon/route8.asm
@@ -1,7 +1,7 @@
 Route8Mons:
 	db $0F
 
-	IF _RED
+	IF DEF(_RED)
 		db 18,PIDGEY
 		db 18,MANKEY
 		db 17,EKANS
@@ -14,7 +14,7 @@ Route8Mons:
 		db 18,GROWLITHE
 	ENDC
 
-	IF _GREEN || !_JAPAN && _BLUE
+	IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
 		db 18,PIDGEY
 		db 18,MEOWTH
 		db 17,SANDSHREW
@@ -27,7 +27,7 @@ Route8Mons:
 		db 18,VULPIX
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 18,PIDGEY
 		db 18,MEOWTH
 		db 17,SANDSHREW
@@ -40,7 +40,7 @@ Route8Mons:
 		db 18,GROWLITHE
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 20,PIDGEY
 		db 22,PIDGEY
 		db 20,RATTATA
diff --git a/data/wildPokemon/route9.asm b/data/wildPokemon/route9.asm
index 03523e4f..d563aa2b 100755
--- a/data/wildPokemon/route9.asm
+++ b/data/wildPokemon/route9.asm
@@ -1,7 +1,7 @@
 Route9Mons:
 	db $0F
 
-	IF _RED
+	IF DEF(_RED)
 		db 16,RATTATA
 		db 16,SPEAROW
 		db 14,RATTATA
@@ -14,7 +14,7 @@ Route9Mons:
 		db 17,EKANS
 	ENDC
 
-	IF !_RED && !_YELLOW
+	IF DEF(_GREEN) || DEF(_BLUE)
 		db 16,RATTATA
 		db 16,SPEAROW
 		db 14,RATTATA
@@ -27,7 +27,7 @@ Route9Mons:
 		db 17,SANDSHREW
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 16,NIDORAN_M
 		db 16,NIDORAN_F
 		db 18,RATTATA
diff --git a/data/wildPokemon/safarizone1.asm b/data/wildPokemon/safarizone1.asm
index 29e3f29b..3781af0e 100755
--- a/data/wildPokemon/safarizone1.asm
+++ b/data/wildPokemon/safarizone1.asm
@@ -1,6 +1,6 @@
 ZoneMons1:
 	db $1E
-	IF _RED || (_JAPAN && _BLUE)
+	IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
 		db 24,NIDORAN_M
 		db 26,DODUO
 		db 22,PARAS
@@ -9,16 +9,16 @@ ZoneMons1:
 		db 23,EXEGGCUTE
 		db 24,NIDORAN_F
 		db 25,PARASECT
-		IF _RED
+		IF DEF(_RED)
 			db 25,KANGASKHAN
 		ENDC
-		IF _JAPAN && _BLUE
+		IF DEF(_JAPAN) && DEF(_BLUE)
 			db 25,LICKITUNG
 		ENDC
 		db 28,SCYTHER
 	ENDC
 
-	IF _GREEN || (!_JAPAN && _BLUE)
+	IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
 		db 24,NIDORAN_F
 		db 26,DODUO
 		db 22,PARAS
@@ -31,7 +31,7 @@ ZoneMons1:
 		db 28,PINSIR
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 21,NIDORAN_M
 		db 29,NIDORAN_F
 		db 22,EXEGGCUTE
diff --git a/data/wildPokemon/safarizone2.asm b/data/wildPokemon/safarizone2.asm
index 2adb18ed..5de4ad00 100755
--- a/data/wildPokemon/safarizone2.asm
+++ b/data/wildPokemon/safarizone2.asm
@@ -1,50 +1,48 @@
 ZoneMons2:
 	db $1E
-	IF !_YELLOW
-		IF _RED || (_JAPAN && _BLUE)
+	IF DEF(_YELLOW)
+		db 36,NIDORAN_M
+		db 14,NIDORAN_F
+		db 20,EXEGGCUTE
+		db 25,RHYHORN
+		db 23,NIDORINA
+		db 28,KANGASKHAN
+		db 16,CUBONE
+		db 33,KANGASKHAN
+		db 25,SCYTHER
+		db 15,PINSIR
+	ELSE
+		IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
 			db 22,NIDORAN_M
 		ENDC
-		IF _GREEN || (!_JAPAN && _BLUE)
+		IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
 			db 22,NIDORAN_F
 		ENDC
 		db 26,RHYHORN
 		db 23,PARAS
 		db 25,EXEGGCUTE
-		IF _RED || (_JAPAN && _BLUE)
+		IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
 			db 30,NIDORINO
 		ENDC
-		IF _GREEN || (!_JAPAN && _BLUE)
+		IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
 			db 30,NIDORINA
 		ENDC
 		db 27,EXEGGCUTE
-		IF _RED || (_JAPAN && _BLUE)
+		IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
 			db 30,NIDORINA
 		ENDC
-		IF _GREEN || (!_JAPAN && _BLUE)
+		IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
 			db 30,NIDORINO
 		ENDC
 		db 32,VENOMOTH
 		db 26,CHANSEY
-		IF _RED || _GREEN || (!_JAPAN && _BLUE)
+		IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
 			db 28,TAUROS
 		ENDC
-		IF (_JAPAN && _BLUE)
+		IF (DEF(_JAPAN) && DEF(_BLUE))
 			db 28,PINSIR
 		ENDC
 	ENDC
 
-	IF _YELLOW
-		db 36,NIDORAN_M
-		db 14,NIDORAN_F
-		db 20,EXEGGCUTE
-		db 25,RHYHORN
-		db 23,NIDORINA
-		db 28,KANGASKHAN
-		db 16,CUBONE
-		db 33,KANGASKHAN
-		db 25,SCYTHER
-		db 15,PINSIR
-	ENDC
-
 	db $00
 
diff --git a/data/wildPokemon/safarizone3.asm b/data/wildPokemon/safarizone3.asm
index 436ab937..c13cd378 100755
--- a/data/wildPokemon/safarizone3.asm
+++ b/data/wildPokemon/safarizone3.asm
@@ -1,6 +1,6 @@
 ZoneMons3:
 	db $1E
-	IF _RED
+	IF DEF(_RED)
 		db 25,NIDORAN_M
 		db 26,DODUO
 		db 23,VENONAT
@@ -13,7 +13,7 @@ ZoneMons3:
 		db 28,KANGASKHAN
 	ENDC
 
-	IF _GREEN || (!_JAPAN && _BLUE)
+	IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
 		db 25,NIDORAN_F
 		db 26,DODUO
 		db 23,VENONAT
@@ -26,7 +26,7 @@ ZoneMons3:
 		db 28,KANGASKHAN
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 25,NIDORAN_M
 		db 26,DODUO
 		db 23,VENONAT
@@ -39,7 +39,7 @@ ZoneMons3:
 		db 28,LICKITUNG
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 29,NIDORAN_M
 		db 21,NIDORAN_F
 		db 22,EXEGGCUTE
diff --git a/data/wildPokemon/safarizonecenter.asm b/data/wildPokemon/safarizonecenter.asm
index 35eb7fd4..7b50e5b9 100755
--- a/data/wildPokemon/safarizonecenter.asm
+++ b/data/wildPokemon/safarizonecenter.asm
@@ -1,6 +1,6 @@
 ZoneMonsCenter:
 	db $1E
-	IF _RED
+	IF DEF(_RED)
 		db 22,NIDORAN_M
 		db 25,RHYHORN
 		db 22,VENONAT
@@ -13,7 +13,7 @@ ZoneMonsCenter:
 		db 23,CHANSEY
 	ENDC
 
-	IF _GREEN || (!_JAPAN && _BLUE)
+	IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
 		db 22,NIDORAN_F
 		db 25,RHYHORN
 		db 22,VENONAT
@@ -26,7 +26,7 @@ ZoneMonsCenter:
 		db 23,CHANSEY
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 22,NIDORAN_M
 		db 25,RHYHORN
 		db 22,VENONAT
@@ -39,7 +39,7 @@ ZoneMonsCenter:
 		db 23,CHANSEY
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 14,NIDORAN_M
 		db 36,NIDORAN_F
 		db 24,EXEGGCUTE
diff --git a/data/wildPokemon/seafoamisland1.asm b/data/wildPokemon/seafoamisland1.asm
index 506dd98e..45d0a707 100755
--- a/data/wildPokemon/seafoamisland1.asm
+++ b/data/wildPokemon/seafoamisland1.asm
@@ -1,6 +1,6 @@
 IslandMons1:
 	db $0F
-	IF _RED
+	IF DEF(_RED)
 		db 30,SEEL
 		db 30,SLOWPOKE
 		db 30,SHELLDER
@@ -13,7 +13,7 @@ IslandMons1:
 		db 38,GOLDUCK
 	ENDC
 
-	IF _GREEN || !_JAPAN && _BLUE
+	IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
 		db 30,SEEL
 		db 30,PSYDUCK
 		db 30,STARYU
@@ -26,7 +26,7 @@ IslandMons1:
 		db 38,SLOWBRO
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 30,SEEL
 		db 30,HORSEA
 		db 30,STARYU
@@ -39,7 +39,7 @@ IslandMons1:
 		db 38,SLOWBRO
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 18,ZUBAT
 		db 25,KRABBY
 		db 27,KRABBY
diff --git a/data/wildPokemon/seafoamislandb1.asm b/data/wildPokemon/seafoamislandb1.asm
index 044753b4..3f6ef7b6 100755
--- a/data/wildPokemon/seafoamislandb1.asm
+++ b/data/wildPokemon/seafoamislandb1.asm
@@ -1,6 +1,6 @@
 IslandMonsB1:
 	db $0A
-	IF _RED
+	IF DEF(_RED)
 		db 30,STARYU
 		db 30,HORSEA
 		db 32,SHELLDER
@@ -13,7 +13,7 @@ IslandMonsB1:
 		db 37,SEADRA
 	ENDC
 
-	IF _GREEN || !_JAPAN && _BLUE
+	IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
 		db 30,SHELLDER
 		db 30,KRABBY
 		db 32,STARYU
@@ -26,7 +26,7 @@ IslandMonsB1:
 		db 37,KINGLER
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 30,SHELLDER
 		db 30,KRABBY
 		db 32,STARYU
@@ -39,7 +39,7 @@ IslandMonsB1:
 		db 37,KINGLER
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 27,ZUBAT
 		db 26,KRABBY
 		db 36,ZUBAT
diff --git a/data/wildPokemon/seafoamislandb2.asm b/data/wildPokemon/seafoamislandb2.asm
index 2b7a3ef8..5df1cca9 100755
--- a/data/wildPokemon/seafoamislandb2.asm
+++ b/data/wildPokemon/seafoamislandb2.asm
@@ -1,6 +1,6 @@
 IslandMonsB2:
 	db $0A
-	IF _RED
+	IF DEF(_RED)
 		db 30,SEEL
 		db 30,SLOWPOKE
 		db 32,SEEL
@@ -13,7 +13,7 @@ IslandMonsB2:
 		db 37,SLOWBRO
 	ENDC
 
-	IF _GREEN || !_JAPAN && _BLUE
+	IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
 		db 30,SEEL
 		db 30,PSYDUCK
 		db 32,SEEL
@@ -26,7 +26,7 @@ IslandMonsB2:
 		db 37,GOLDUCK
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 30,SEEL
 		db 30,HORSEA
 		db 32,SEEL
@@ -39,7 +39,7 @@ IslandMonsB2:
 		db 37,JYNX
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 27,ZUBAT
 		db 27,KRABBY
 		db 36,ZUBAT
diff --git a/data/wildPokemon/seafoamislandb3.asm b/data/wildPokemon/seafoamislandb3.asm
index ac9769b4..e8560c9a 100755
--- a/data/wildPokemon/seafoamislandb3.asm
+++ b/data/wildPokemon/seafoamislandb3.asm
@@ -1,6 +1,6 @@
 IslandMonsB3:
 	db $0A
-	IF _RED
+	IF DEF(_RED)
 		db 31,SLOWPOKE
 		db 31,SEEL
 		db 33,SLOWPOKE
@@ -13,7 +13,7 @@ IslandMonsB3:
 		db 37,DEWGONG
 	ENDC
 
-	IF _GREEN || !_JAPAN && _BLUE
+	IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
 		db 31,PSYDUCK
 		db 31,SEEL
 		db 33,PSYDUCK
@@ -26,7 +26,7 @@ IslandMonsB3:
 		db 37,DEWGONG
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 31,HORSEA
 		db 31,SEEL
 		db 33,HORSEA
@@ -39,7 +39,7 @@ IslandMonsB3:
 		db 37,DEWGONG
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 27,GOLBAT
 		db 36,ZUBAT
 		db 29,KRABBY
diff --git a/data/wildPokemon/seafoamislandb4.asm b/data/wildPokemon/seafoamislandb4.asm
index af5c7e02..7f8977d6 100755
--- a/data/wildPokemon/seafoamislandb4.asm
+++ b/data/wildPokemon/seafoamislandb4.asm
@@ -1,6 +1,6 @@
 IslandMonsB4:
 	db $0A
-	IF _RED
+	IF DEF(_RED)
 		db 31,HORSEA
 		db 31,SHELLDER
 		db 33,HORSEA
@@ -13,7 +13,7 @@ IslandMonsB4:
 		db 32,GOLBAT
 	ENDC
 
-	IF _GREEN || !_JAPAN && _BLUE
+	IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
 		db 31,KRABBY
 		db 31,STARYU
 		db 33,KRABBY
@@ -26,7 +26,7 @@ IslandMonsB4:
 		db 32,GOLBAT
 	ENDC
 
-	IF _JAPAN && _BLUE
+	IF DEF(_JAPAN) && DEF(_BLUE)
 		db 31,KRABBY
 		db 31,STARYU
 		db 33,KRABBY
@@ -39,7 +39,7 @@ IslandMonsB4:
 		db 32,GOLBAT
 	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 36,GOLBAT
 		db 36,ZUBAT
 		db 30,KRABBY
diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/unknowndungeon1.asm
index 4feb568c..504d32f1 100755
--- a/data/wildPokemon/unknowndungeon1.asm
+++ b/data/wildPokemon/unknowndungeon1.asm
@@ -1,20 +1,31 @@
 DungeonMons1:
 	db $0A
-	IF !_YELLOW
+	IF DEF(_YELLOW)
+		db 50,GOLBAT
+		db 55,GOLBAT
+		db 45,GRAVELER
+		db 55,GLOOM
+		db 55,WEEPINBELL
+		db 52,SANDSLASH
+		db 54,VENOMOTH
+		db 54,PARASECT
+		db 55,DITTO
+		db 60,DITTO
+	ELSE
 		db 46,GOLBAT
 		db 46,HYPNO
 		db 46,MAGNETON
-		IF _RED || _GREEN || (!_JAPAN && _BLUE)
+		IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
 			db 49,DODRIO
 		ENDC
-		IF _JAPAN && _BLUE
+		IF DEF(_JAPAN) && DEF(_BLUE)
 			db 49,RAPIDASH
 		ENDC
 		db 49,VENOMOTH
-		IF _RED
+		IF DEF(_RED)
 			db 52,ARBOK
 		ENDC
-		IF !_RED
+		IF !DEF(_RED)
 			db 52,SANDSLASH
 		ENDC
 		db 49,KADABRA
@@ -23,18 +34,5 @@ DungeonMons1:
 		db 53,DITTO
 	ENDC
 
-	IF _YELLOW
-		db 50,GOLBAT
-		db 55,GOLBAT
-		db 45,GRAVELER
-		db 55,GLOOM
-		db 55,WEEPINBELL
-		db 52,SANDSLASH
-		db 54,VENOMOTH
-		db 54,PARASECT
-		db 55,DITTO
-		db 60,DITTO
-	ENDC
-
 	db $00
 
diff --git a/data/wildPokemon/unknowndungeon2.asm b/data/wildPokemon/unknowndungeon2.asm
index a09c985c..9422f3a0 100755
--- a/data/wildPokemon/unknowndungeon2.asm
+++ b/data/wildPokemon/unknowndungeon2.asm
@@ -1,14 +1,25 @@
 DungeonMons2:
 	db $0F
-	IF !_YELLOW
+	IF DEF(_YELLOW)
+		db 52,GOLBAT
+		db 57,GOLBAT
+		db 50,GRAVELER
+		db 56,SANDSLASH
+		db 50,RHYHORN
+		db 60,DITTO
+		db 58,GLOOM
+		db 58,WEEPINBELL
+		db 60,RHYDON
+		db 58,RHYDON
+	ELSE
 		db 51,DODRIO
 		db 51,VENOMOTH
 		db 51,KADABRA
 		db 52,RHYDON
-		IF _RED || _GREEN || (_BLUE && !_JAPAN)
+		IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN))
 			db 52,MAROWAK
 		ENDC
-		IF (_BLUE && _JAPAN)
+		IF (DEF(_BLUE) && DEF(_JAPAN))
 			db 52,MAROWAK
 		ENDC
 		db 52,ELECTRODE
@@ -18,18 +29,5 @@ DungeonMons2:
 		db 60,DITTO
 	ENDC
 
-	IF _YELLOW
-		db 52,GOLBAT
-		db 57,GOLBAT
-		db 50,GRAVELER
-		db 56,SANDSLASH
-		db 50,RHYHORN
-		db 60,DITTO
-		db 58,GLOOM
-		db 58,WEEPINBELL
-		db 60,RHYDON
-		db 58,RHYDON
-	ENDC
-
 	db $00
 
diff --git a/data/wildPokemon/unknowndungeonb1.asm b/data/wildPokemon/unknowndungeonb1.asm
index 7ab1c964..6a88edb2 100755
--- a/data/wildPokemon/unknowndungeonb1.asm
+++ b/data/wildPokemon/unknowndungeonb1.asm
@@ -1,16 +1,27 @@
 DungeonMonsB1:
 	db $19
-	IF !_YELLOW
+	IF DEF(_YELLOW)
+		db 54,GOLBAT
+		db 59,GOLBAT
+		db 55,GRAVELER
+		db 52,RHYHORN
+		db 62,RHYDON
+		db 60,DITTO
+		db 56,CHANSEY
+		db 65,DITTO
+		db 55,LICKITUNG
+		db 50,LICKITUNG
+	ELSE
 		db 55,RHYDON
 		db 55,MAROWAK
 		db 55,ELECTRODE
 		db 64,CHANSEY
 		db 64,PARASECT
 		db 64,RAICHU
-		IF _RED
+		IF DEF(_RED)
 			db 57,ARBOK
 		ENDC
-		IF !_RED
+		IF DEF(_BLUE) || DEF(_GREEN)
 			db 57,SANDSLASH
 		ENDC
 		db 65,DITTO
@@ -18,18 +29,5 @@ DungeonMonsB1:
 		db 67,DITTO
 	ENDC
 
-	IF _YELLOW
-		db 54,GOLBAT
-		db 59,GOLBAT
-		db 55,GRAVELER
-		db 52,RHYHORN
-		db 62,RHYDON
-		db 60,DITTO
-		db 56,CHANSEY
-		db 65,DITTO
-		db 55,LICKITUNG
-		db 50,LICKITUNG
-	ENDC
-
 	db $00
 
diff --git a/data/wildPokemon/victoryroad1.asm b/data/wildPokemon/victoryroad1.asm
index 1ec65cf5..98914a91 100755
--- a/data/wildPokemon/victoryroad1.asm
+++ b/data/wildPokemon/victoryroad1.asm
@@ -1,19 +1,7 @@
 PlateauMons1:
 	db $0F
-	IF !_YELLOW
-		db 24,MACHOP
-		db 26,GEODUDE
-		db 22,ZUBAT
-		db 36,ONIX
-		db 39,ONIX
-		db 42,ONIX
-		db 41,GRAVELER
-		db 41,GOLBAT
-		db 42,MACHOKE
-		db 43,MAROWAK
-	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 26,GEODUDE
 		db 31,GEODUDE
 		db 36,GEODUDE
@@ -24,6 +12,17 @@ PlateauMons1:
 		db 45,ONIX
 		db 41,GRAVELER
 		db 47,GRAVELER
+	ELSE
+		db 24,MACHOP
+		db 26,GEODUDE
+		db 22,ZUBAT
+		db 36,ONIX
+		db 39,ONIX
+		db 42,ONIX
+		db 41,GRAVELER
+		db 41,GOLBAT
+		db 42,MACHOKE
+		db 43,MAROWAK
 	ENDC
 
 	db $00
diff --git a/data/wildPokemon/victoryroad2.asm b/data/wildPokemon/victoryroad2.asm
index 87159e96..ffe117bc 100755
--- a/data/wildPokemon/victoryroad2.asm
+++ b/data/wildPokemon/victoryroad2.asm
@@ -1,19 +1,7 @@
 PlateauMons2:
 	db $0A
-	IF !_YELLOW
-		db 22,MACHOP
-		db 24,GEODUDE
-		db 26,ZUBAT
-		db 36,ONIX
-		db 39,ONIX
-		db 42,ONIX
-		db 41,MACHOKE
-		db 40,GOLBAT
-		db 40,MAROWAK
-		db 43,GRAVELER
-	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 31,GEODUDE
 		db 36,GEODUDE
 		db 41,GEODUDE
@@ -24,6 +12,17 @@ PlateauMons2:
 		db 47,ONIX
 		db 39,MACHOKE
 		db 42,MACHOKE
+	ELSE
+		db 22,MACHOP
+		db 24,GEODUDE
+		db 26,ZUBAT
+		db 36,ONIX
+		db 39,ONIX
+		db 42,ONIX
+		db 41,MACHOKE
+		db 40,GOLBAT
+		db 40,MAROWAK
+		db 43,GRAVELER
 	ENDC
 
 	db $00
diff --git a/data/wildPokemon/victoryroad3.asm b/data/wildPokemon/victoryroad3.asm
index ae52eeb6..7c1b2c1c 100755
--- a/data/wildPokemon/victoryroad3.asm
+++ b/data/wildPokemon/victoryroad3.asm
@@ -1,19 +1,7 @@
 PlateauMons3:
 	db $0F
-	IF !_YELLOW
-		db 24,MACHOP
-		db 26,GEODUDE
-		db 22,ZUBAT
-		db 42,ONIX
-		db 40,VENOMOTH
-		db 45,ONIX
-		db 43,GRAVELER
-		db 41,GOLBAT
-		db 42,MACHOKE
-		db 45,MACHOKE
-	ENDC
 
-	IF _YELLOW
+	IF DEF(_YELLOW)
 		db 36,GEODUDE
 		db 44,GOLBAT
 		db 41,GEODUDE
@@ -24,6 +12,17 @@ PlateauMons3:
 		db 45,MACHOKE
 		db 47,GRAVELER
 		db 47,GRAVELER
+	ELSE
+		db 24,MACHOP
+		db 26,GEODUDE
+		db 22,ZUBAT
+		db 42,ONIX
+		db 40,VENOMOTH
+		db 45,ONIX
+		db 43,GRAVELER
+		db 41,GOLBAT
+		db 42,MACHOKE
+		db 45,MACHOKE
 	ENDC
 
 	db $00
diff --git a/data/wildPokemon/viridianforest.asm b/data/wildPokemon/viridianforest.asm
index 2ca828eb..bac991c5 100755
--- a/data/wildPokemon/viridianforest.asm
+++ b/data/wildPokemon/viridianforest.asm
@@ -1,7 +1,19 @@
 ForestMons:
-	IF !_YELLOW
+	IF DEF(_YELLOW)
+		db $19
+		db 3,CATERPIE
+		db 4,METAPOD
+		db 4,CATERPIE
+		db 5,CATERPIE
+		db 4,PIDGEY
+		db 6,PIDGEY
+		db 6,CATERPIE
+		db 6,METAPOD
+		db 8,PIDGEY
+		db 9,PIDGEOTTO
+	ELSE
 		db $08
-		IF _RED
+		IF DEF(_RED)
 			db 4,WEEDLE
 			db 5,KAKUNA
 			db 3,WEEDLE
@@ -11,7 +23,7 @@ ForestMons:
 			db 4,METAPOD
 			db 3,CATERPIE
 		ENDC
-		IF _BLUE || _GREEN
+		IF DEF(_BLUE) || DEF(_GREEN)
 			db 4,CATERPIE
 			db 5,METAPOD
 			db 3,CATERPIE
@@ -26,19 +38,6 @@ ForestMons:
 		db 5,PIKACHU
 	ENDC
 
-	IF _YELLOW
-		db $19
-		db 3,CATERPIE
-		db 4,METAPOD
-		db 4,CATERPIE
-		db 5,CATERPIE
-		db 4,PIDGEY
-		db 6,PIDGEY
-		db 6,CATERPIE
-		db 6,METAPOD
-		db 8,PIDGEY
-		db 9,PIDGEOTTO
-	ENDC
 
 	db $00