diff options
Diffstat (limited to 'data/baseStats')
-rw-r--r-- | data/baseStats/alakazam.asm | 9 | ||||
-rw-r--r-- | data/baseStats/butterfree.asm | 4 | ||||
-rw-r--r-- | data/baseStats/chansey.asm | 6 | ||||
-rw-r--r-- | data/baseStats/charizard.asm | 4 | ||||
-rw-r--r-- | data/baseStats/diglett.asm | 4 | ||||
-rw-r--r-- | data/baseStats/dugtrio.asm | 4 | ||||
-rw-r--r-- | data/baseStats/eevee.asm | 6 | ||||
-rw-r--r-- | data/baseStats/flareon.asm | 6 | ||||
-rw-r--r-- | data/baseStats/gyarados.asm | 7 | ||||
-rw-r--r-- | data/baseStats/jolteon.asm | 6 | ||||
-rw-r--r-- | data/baseStats/kadabra.asm | 9 | ||||
-rw-r--r-- | data/baseStats/marowak.asm | 12 | ||||
-rw-r--r-- | data/baseStats/primeape.asm | 7 | ||||
-rw-r--r-- | data/baseStats/vaporeon.asm | 6 | ||||
-rw-r--r-- | data/baseStats/venomoth.asm | 9 | ||||
-rw-r--r-- | data/baseStats/venonat.asm | 7 |
16 files changed, 15 insertions, 91 deletions
diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm index 6762eb83..c20b6c41 100644 --- a/data/baseStats/alakazam.asm +++ b/data/baseStats/alakazam.asm @@ -13,13 +13,8 @@ dw AlakazamPicFront dw AlakazamPicBack ; attacks known at lvl 0 db TELEPORT -IF DEF(_YELLOW) - db KINESIS - db 0 -ELSE - db CONFUSION - db DISABLE -ENDC +db CONFUSION +db DISABLE db 0 db 3 ; growth rate ; learnset diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm index 75a0ee02..c0fb5f6c 100644 --- a/data/baseStats/butterfree.asm +++ b/data/baseStats/butterfree.asm @@ -24,9 +24,5 @@ db 0 ; growth rate tmlearn 29,30,31,32 tmlearn 33,34,39 tmlearn 44,46 -IF DEF(_YELLOW) - tmlearn 50,55 -ELSE tmlearn 50 -ENDC db 0 ; padding diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm index d9b8513d..434b1c26 100644 --- a/data/baseStats/chansey.asm +++ b/data/baseStats/chansey.asm @@ -13,11 +13,7 @@ dw ChanseyPicFront dw ChanseyPicBack ; attacks known at lvl 0 db POUND -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db DOUBLESLAP -ENDC +db DOUBLESLAP db 0 db 0 db 4 ; growth rate diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm index ea978159..2479a60c 100644 --- a/data/baseStats/charizard.asm +++ b/data/baseStats/charizard.asm @@ -24,9 +24,5 @@ db 3 ; growth rate tmlearn 26,27,28,31,32 tmlearn 33,34,38,39,40 tmlearn 44 -IF DEF(_YELLOW) - tmlearn 50,51,52,54 -ELSE tmlearn 50,51,54 -ENDC db 0 ; padding diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm index 173dfa3d..8ef6e381 100644 --- a/data/baseStats/diglett.asm +++ b/data/baseStats/diglett.asm @@ -24,9 +24,5 @@ db 0 ; growth rate tmlearn 26,27,28,31,32 tmlearn 34 tmlearn 44,48 -IF DEF(_YELLOW) - tmlearn 50,51 -ELSE tmlearn 50 -ENDC db 0 ; padding diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm index b70b5383..c763680f 100644 --- a/data/baseStats/dugtrio.asm +++ b/data/baseStats/dugtrio.asm @@ -24,9 +24,5 @@ db 0 ; growth rate tmlearn 26,27,28,31,32 tmlearn 34 tmlearn 44,48 -IF DEF(_YELLOW) - tmlearn 50,51 -ELSE tmlearn 50 -ENDC db 0 ; padding diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm index 0fa869fe..51e36621 100644 --- a/data/baseStats/eevee.asm +++ b/data/baseStats/eevee.asm @@ -13,11 +13,7 @@ dw EeveePicFront dw EeveePicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db 0 db 0 db 0 ; growth rate diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm index c6c0c060..70621a6a 100644 --- a/data/baseStats/flareon.asm +++ b/data/baseStats/flareon.asm @@ -13,11 +13,7 @@ dw FlareonPicFront dw FlareonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db QUICK_ATTACK db EMBER db 0 ; growth rate diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm index 21214d0b..6bfc34a0 100644 --- a/data/baseStats/gyarados.asm +++ b/data/baseStats/gyarados.asm @@ -12,17 +12,10 @@ INCBIN "pic/bmon/gyarados.pic",0,1 ; 77, sprite dimensions dw GyaradosPicFront dw GyaradosPicBack ; attacks known at lvl 0 -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 tmlearn 6,8 diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm index eb0bf305..b33d6327 100644 --- a/data/baseStats/jolteon.asm +++ b/data/baseStats/jolteon.asm @@ -13,11 +13,7 @@ dw JolteonPicFront dw JolteonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db QUICK_ATTACK db THUNDERSHOCK db 0 ; growth rate diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm index ad4ac7f7..472cc4c5 100644 --- a/data/baseStats/kadabra.asm +++ b/data/baseStats/kadabra.asm @@ -13,13 +13,8 @@ dw KadabraPicFront dw KadabraPicBack ; attacks known at lvl 0 db TELEPORT -IF DEF(_YELLOW) - DB KINESIS - db 0 -ELSE - db CONFUSION - db DISABLE -ENDC +db CONFUSION +db DISABLE db 0 db 3 ; growth rate ; learnset diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm index 152b4aaf..3b90dbb1 100644 --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -13,15 +13,9 @@ dw MarowakPicFront dw MarowakPicBack ; attacks known at lvl 0 db BONE_CLUB -IF DEF(_YELLOW) - db TAIL_WHIP - db 0 - db 0 -ELSE - db GROWL - db LEER - db FOCUS_ENERGY -ENDC +db GROWL +db LEER +db FOCUS_ENERGY db 0 ; growth rate ; learnset tmlearn 1,5,6,8 diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm index 389aa7f7..659edefd 100644 --- a/data/baseStats/primeape.asm +++ b/data/baseStats/primeape.asm @@ -13,14 +13,9 @@ dw PrimeapePicFront dw PrimeapePicBack ; attacks known at lvl 0 db SCRATCH -IF !DEF(_YELLOW) - db LEER -ENDC +db LEER db KARATE_CHOP db FURY_SWIPES -IF DEF(_YELLOW) - db LOW_KICK -ENDC db 0 ; growth rate ; learnset tmlearn 1,5,6,8 diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm index 7243a39f..e22b3185 100644 --- a/data/baseStats/vaporeon.asm +++ b/data/baseStats/vaporeon.asm @@ -13,11 +13,7 @@ dw VaporeonPicFront dw VaporeonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db QUICK_ATTACK db WATER_GUN db 0 ; growth rate diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm index 01a6c3d0..7a5bd981 100644 --- a/data/baseStats/venomoth.asm +++ b/data/baseStats/venomoth.asm @@ -14,13 +14,8 @@ dw VenomothPicBack ; attacks known at lvl 0 db TACKLE db DISABLE -IF DEF(_YELLOW) - db SUPERSONIC - db CONFUSION -ELSE - db POISONPOWDER - db LEECH_LIFE -ENDC +db POISONPOWDER +db LEECH_LIFE db 0 ; growth rate ; learnset tmlearn 2,4,6 diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm index bc643c77..aeadc6cd 100644 --- a/data/baseStats/venonat.asm +++ b/data/baseStats/venonat.asm @@ -21,15 +21,8 @@ db 0 ; growth rate tmlearn 6 tmlearn 9,10 tmlearn 20,21,22 -IF DEF(_YELLOW) - tmlearn 29,30,31,32 - tmlearn 33,34,39 - tmlearn 44,46 - tmlearn 50,55 -ELSE tmlearn 29,31,32 tmlearn 33,34 tmlearn 44,46 tmlearn 50 -ENDC db 0 ; padding |