Kill version.asm.

16 files changed, 58 insertions, 73 deletions

diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm
index dfea0c68..2ee79e6f 100755
--- a/data/baseStats/alakazam.asm
+++ b/data/baseStats/alakazam.asm
@@ -14,13 +14,12 @@ dw AlakazamPicFront
 dw AlakazamPicBack
 ; attacks known at lvl 0
 db TELEPORT
-IF !_YELLOW
-	db CONFUSION
-	db DISABLE
-ENDC
-IF _YELLOW
+IF DEF(_YELLOW)
 	db KINESIS
 	db 0
+ELSE
+	db CONFUSION
+	db DISABLE
 ENDC
 db 0
 db 3 ; growth rate
diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm
index 1c9231f0..593d5f78 100755
--- a/data/baseStats/butterfree.asm
+++ b/data/baseStats/butterfree.asm
@@ -25,10 +25,9 @@ db %00111000
 db %11110000
 db %01000011
 db %00101000
-IF !_YELLOW
-	db %00000010
-ENDC
-IF _YELLOW
+IF DEF(_YELLOW)
 	db %01000010
+ELSE
+	db %00000010
 ENDC
 db 0 ; padding
diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm
index 351de4cf..130a3d00 100755
--- a/data/baseStats/chansey.asm
+++ b/data/baseStats/chansey.asm
@@ -14,11 +14,10 @@ dw ChanseyPicFront
 dw ChanseyPicBack
 ; attacks known at lvl 0
 db POUND
-IF !_YELLOW
-	db DOUBLESLAP
-ENDC
-IF _YELLOW
+IF DEF(_YELLOW)
 	db TAIL_WHIP
+ELSE
+	db DOUBLESLAP
 ENDC
 db 0
 db 0
diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm
index b6f65175..5cbecb91 100755
--- a/data/baseStats/charizard.asm
+++ b/data/baseStats/charizard.asm
@@ -25,10 +25,9 @@ db %01001111
 db %11001110
 db %11100011
 db %00001000
-IF !_YELLOW
-	db %00100110
-ENDC
-IF _YELLOW
+IF DEF(_YELLOW)
 	db %00101110
+ELSE
+	db %00100110
 ENDC
 db 0 ; padding
diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm
index 7e8a3bbb..4944572b 100755
--- a/data/baseStats/diglett.asm
+++ b/data/baseStats/diglett.asm
@@ -25,10 +25,9 @@ db %00001000
 db %11001110
 db %00000010
 db %10001000
-IF !_YELLOW
-	db %00000010
-ENDC
-IF _YELLOW
+IF DEF(_YELLOW)
 	db %00000110
+ELSE
+	db %00000010
 ENDC
 db 0 ; padding
diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm
index dfdd0eb9..0c4bad3b 100755
--- a/data/baseStats/dugtrio.asm
+++ b/data/baseStats/dugtrio.asm
@@ -25,10 +25,9 @@ db %00001000
 db %11001110
 db %00000010
 db %10001000
-IF !_YELLOW
-	db %00000010
-ENDC
-IF _YELLOW
+IF DEF(_YELLOW)
 	db %00000110
+ELSE
+	db %00000010
 ENDC
 db 0 ; padding
diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm
index 3632eef1..978aa4bb 100755
--- a/data/baseStats/eevee.asm
+++ b/data/baseStats/eevee.asm
@@ -14,11 +14,10 @@ dw EeveePicFront
 dw EeveePicBack
 ; attacks known at lvl 0
 db TACKLE
-IF !_YELLOW
-	db SAND_ATTACK
-ENDC
-IF _YELLOW
+IF DEF(_YELLOW)
 	db TAIL_WHIP
+ELSE
+	db SAND_ATTACK
 ENDC
 db 0
 db 0
diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm
index 219c7e7c..ce4a8f0a 100755
--- a/data/baseStats/flareon.asm
+++ b/data/baseStats/flareon.asm
@@ -14,11 +14,10 @@ dw FlareonPicFront
 dw FlareonPicBack
 ; attacks known at lvl 0
 db TACKLE
-IF !_YELLOW
-	db SAND_ATTACK
-ENDC
-IF _YELLOW
+IF DEF(_YELLOW)
 	db TAIL_WHIP
+ELSE
+	db SAND_ATTACK
 ENDC
 db QUICK_ATTACK
 db EMBER
diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm
index 0d23564f..c9e6dc31 100755
--- a/data/baseStats/gyarados.asm
+++ b/data/baseStats/gyarados.asm
@@ -13,17 +13,16 @@ INCBIN "pic/bmon/gyarados.pic",0,1 ; 77, sprite dimensions
 dw GyaradosPicFront
 dw GyaradosPicBack
 ; attacks known at lvl 0
-IF !_YELLOW
-db BITE
-db DRAGON_RAGE
-db LEER
-db HYDRO_PUMP
-ENDC
-IF _YELLOW
+IF DEF(_YELLOW)
 db TACKLE
 db 0
 db 0
 db 0
+ELSE
+db BITE
+db DRAGON_RAGE
+db LEER
+db HYDRO_PUMP
 ENDC
 db 5 ; growth rate
 ; learnset
diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm
index d9ef0440..5dc3532a 100755
--- a/data/baseStats/jolteon.asm
+++ b/data/baseStats/jolteon.asm
@@ -14,11 +14,10 @@ dw JolteonPicFront
 dw JolteonPicBack
 ; attacks known at lvl 0
 db TACKLE
-IF !_YELLOW
-	db SAND_ATTACK
-ENDC
-IF _YELLOW
+IF DEF(_YELLOW)
 	db TAIL_WHIP
+ELSE
+	db SAND_ATTACK
 ENDC
 db QUICK_ATTACK
 db THUNDERSHOCK
diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm
index 1f1fe61a..85ee8a35 100755
--- a/data/baseStats/kadabra.asm
+++ b/data/baseStats/kadabra.asm
@@ -14,13 +14,12 @@ dw KadabraPicFront
 dw KadabraPicBack
 ; attacks known at lvl 0
 db TELEPORT
-IF !_YELLOW
-	db CONFUSION
-	db DISABLE
-ENDC
-IF _YELLOW
+IF DEF(_YELLOW)
 	DB KINESIS
 	db 0
+ELSE
+	db CONFUSION
+	db DISABLE
 ENDC
 db 0
 db 3 ; growth rate
diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm
index 3b101fde..64bfb0d6 100755
--- a/data/baseStats/marowak.asm
+++ b/data/baseStats/marowak.asm
@@ -14,15 +14,14 @@ dw MarowakPicFront
 dw MarowakPicBack
 ; attacks known at lvl 0
 db BONE_CLUB
-IF !_YELLOW
-	db GROWL
-	db LEER
-	db FOCUS_ENERGY
-ENDC
-IF _YELLOW
+IF DEF(_YELLOW)
 	db TAIL_WHIP
 	db 0
 	db 0
+ELSE
+	db GROWL
+	db LEER
+	db FOCUS_ENERGY
 ENDC
 db 0 ; growth rate
 ; learnset
diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm
index f88511df..eeab800b 100755
--- a/data/baseStats/primeape.asm
+++ b/data/baseStats/primeape.asm
@@ -14,12 +14,12 @@ dw PrimeapePicFront
 dw PrimeapePicBack
 ; attacks known at lvl 0
 db SCRATCH
-IF !_YELLOW
+IF !DEF(_YELLOW)
 	db LEER
 ENDC
 db KARATE_CHOP
 db FURY_SWIPES
-IF _YELLOW
+IF DEF(_YELLOW)
 	db LOW_KICK
 ENDC
 db 0 ; growth rate
diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm
index 33ccc517..ed4b7a1e 100755
--- a/data/baseStats/vaporeon.asm
+++ b/data/baseStats/vaporeon.asm
@@ -14,11 +14,10 @@ dw VaporeonPicFront
 dw VaporeonPicBack
 ; attacks known at lvl 0
 db TACKLE
-IF !_YELLOW
-	db SAND_ATTACK
-ENDC
-IF _YELLOW
+IF DEF(_YELLOW)
 	db TAIL_WHIP
+ELSE
+	db SAND_ATTACK
 ENDC
 db QUICK_ATTACK
 db WATER_GUN
diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm
index 0a4d4461..f38be71c 100755
--- a/data/baseStats/venomoth.asm
+++ b/data/baseStats/venomoth.asm
@@ -15,13 +15,12 @@ dw VenomothPicBack
 ; attacks known at lvl 0
 db TACKLE
 db DISABLE
-IF !_YELLOW
-	db POISONPOWDER
-	db LEECH_LIFE
-ENDC
-IF _YELLOW
+IF DEF(_YELLOW)
 	db SUPERSONIC
 	db CONFUSION
+ELSE
+	db POISONPOWDER
+	db LEECH_LIFE
 ENDC
 db 0 ; growth rate
 ; learnset
diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm
index 4543a730..62e8aaef 100755
--- a/data/baseStats/venonat.asm
+++ b/data/baseStats/venonat.asm
@@ -22,17 +22,16 @@ db 0 ; growth rate
 db %00100000
 db %00000011
 db %00111000
-IF !_YELLOW
-	db %11010000
-	db %00000011
-	db %00101000
-	db %00000010
-ENDC
-IF _YELLOW
+IF DEF(_YELLOW)
 	db %11110000
 	db %01000011
 	db %00101000
 	db %00100010
+ELSE
+	db %11010000
+	db %00000011
+	db %00101000
+	db %00000010
 ENDC
 
 db 0 ; padding