TM stuff pt2

JustRegularLuna · Mar 21, 2015 · e351447 · e351447
1 parent 47528c5
commit e351447
Show file tree

Hide file tree

Showing 129 changed files with 179 additions and 235 deletions.
diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm
@@ -24,6 +24,6 @@ db %00000011
 db %00001111
 db %11110000
 db %10000111
-db %00111000
+db %00111001
 db %01000011
 db BANK(AbraPicFront)
diff --git a/data/baseStats/aerodactyl.asm b/data/baseStats/aerodactyl.asm
@@ -23,7 +23,7 @@ db %00101010
 db %01000011
 db %01001000
 db %11000000
-db %01100011
-db %00001100
+db %01111011
+db %00001000
 db %00001010
 db BANK(AerodactylPicFront)
diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm
@@ -14,13 +14,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
@@ -29,6 +24,6 @@ db %01000011
 db %00001111
 db %11111000
 db %10000111
-db %00111000
+db %00111001
 db %01000011
 db BANK(AlakazamPicFront)
diff --git a/data/baseStats/arbok.asm b/data/baseStats/arbok.asm
@@ -23,7 +23,7 @@ db %10100000
 db %01000011
 db %00011000
 db %11001110
-db %10000010
-db %10001000
+db %10001010
+db %10001100
 db %00100010
 db BANK(ArbokPicFront)
diff --git a/data/baseStats/arcanine.asm b/data/baseStats/arcanine.asm
@@ -23,7 +23,7 @@ db %10100000
 db %01000011
 db %01001000
 db %11101000
-db %11100011
+db %11110011
 db %00001000
 db %00000010
 db BANK(ArcaninePicFront)
diff --git a/data/baseStats/articuno.asm b/data/baseStats/articuno.asm
@@ -24,6 +24,6 @@ db %01111111
 db %00001000
 db %11000000
 db %01000011
-db %00001100
+db %00001000
 db %00001010
 db BANK(ArticunoPicFront)
diff --git a/data/baseStats/blastoise.asm b/data/baseStats/blastoise.asm
@@ -23,7 +23,7 @@ db %10110001
 db %01111111
 db %00001111
 db %11001110
-db %10000011
-db %00001000
+db %10001011
+db %00001100
 db %00110010
 db BANK(BlastoisePicFront)
diff --git a/data/baseStats/blissey.asm b/data/baseStats/blissey.asm
@@ -23,7 +23,7 @@ db %10110001
 db %01111111
 db %10101111
 db %11110001
-db %10110111
+db %10111111
 db %00111001
 db %01100011
 db BANK(BlisseyPicFront)
diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm
@@ -24,10 +24,6 @@ db %01000011
 db %00111000
 db %11110000
 db %01000011
-db %00101000
-IF DEF(_YELLOW)
-	db %01000010
-ELSE
-	db %00000010
-ENDC
+db %00101001
+db %01000010
 db BANK(ButterfreePicFront)
diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm
@@ -23,7 +23,7 @@ db %10110001
 db %01111111
 db %10101111
 db %11110001
-db %10110111
+db %10111111
 db %00111001
 db %01100011
 db BANK(ChanseyPicFront)
diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm
@@ -23,7 +23,7 @@ db %10110101
 db %01000011
 db %01001111
 db %11001110
-db %11100011
+db %11111011
 db %00001000
 db %00101110
 db BANK(CharizardPicFront)
diff --git a/data/baseStats/charmander.asm b/data/baseStats/charmander.asm
@@ -23,7 +23,7 @@ db %10110101
 db %00000011
 db %01001111
 db %11001000
-db %11100011
+db %11111011
 db %00001000
 db %00100110
 db BANK(CharmanderPicFront)
diff --git a/data/baseStats/charmeleon.asm b/data/baseStats/charmeleon.asm
@@ -23,7 +23,7 @@ db %10110101
 db %00000011
 db %01001111
 db %11001000
-db %11100011
+db %11111011
 db %00001000
 db %00100110
 db BANK(CharmeleonPicFront)
diff --git a/data/baseStats/clefable.asm b/data/baseStats/clefable.asm
@@ -23,7 +23,7 @@ db %10110001
 db %01111111
 db %10101111
 db %11110001
-db %10100111
-db %00111000
+db %10110111
+db %00111001
 db %01100011
 db BANK(ClefablePicFront)
diff --git a/data/baseStats/clefairy.asm b/data/baseStats/clefairy.asm
@@ -23,7 +23,7 @@ db %10110001
 db %00111111
 db %10101111
 db %11110001
-db %10100111
-db %00111000
+db %10110111
+db %00111001
 db %01100011
 db BANK(ClefairyPicFront)
diff --git a/data/baseStats/cloyster.asm b/data/baseStats/cloyster.asm
@@ -23,7 +23,7 @@ db %00100000
 db %01111111
 db %00001000
 db %11100000
-db %01001011
+db %01000011
 db %01001000
 db %00010011
 db BANK(CloysterPicFront)
diff --git a/data/baseStats/crobat.asm b/data/baseStats/crobat.asm
@@ -24,6 +24,6 @@ db %01000011
 db %00011000
 db %11000000
 db %01000010
-db %00001000
+db %00001101
 db %00000010
 db BANK(CrobatPicFront)
diff --git a/data/baseStats/cubone.asm b/data/baseStats/cubone.asm
@@ -23,7 +23,7 @@ db %10110001
 db %00111111
 db %00001111
 db %11001110
-db %10100010
+db %10111010
 db %00001000
 db %00100010
 db BANK(CubonePicFront)
diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm
@@ -23,11 +23,7 @@ db %10100000
 db %00000011
 db %00001000
 db %11001110
-db %00000010
+db %00001010
 db %10001000
-IF DEF(_YELLOW)
-	db %00000110
-ELSE
-	db %00000010
-ENDC
+db %00000110
 db BANK(DiglettPicFront)
diff --git a/data/baseStats/dodrio.asm b/data/baseStats/dodrio.asm
@@ -24,6 +24,6 @@ db %01000011
 db %00001000
 db %11000000
 db %10000011
-db %00001100
+db %00001000
 db %00001011
 db BANK(DodrioPicFront)
diff --git a/data/baseStats/doduo.asm b/data/baseStats/doduo.asm
@@ -24,6 +24,6 @@ db %00000011
 db %00001000
 db %11000000
 db %10000011
-db %00001100
+db %00001000
 db %00001011
 db BANK(DoduoPicFront)
diff --git a/data/baseStats/dragonair.asm b/data/baseStats/dragonair.asm
@@ -23,7 +23,7 @@ db %11100000
 db %00111111
 db %11001000
 db %11000001
-db %11100011
+db %11110011
 db %00011000
 db %00010010
 db BANK(DragonairPicFront)
diff --git a/data/baseStats/dragonite.asm b/data/baseStats/dragonite.asm
@@ -23,7 +23,7 @@ db %11100010
 db %01111111
 db %11001000
 db %11000001
-db %11100011
+db %11111011
 db %00011000
 db %00111010
 db BANK(DragonitePicFront)
diff --git a/data/baseStats/dratini.asm b/data/baseStats/dratini.asm
@@ -23,7 +23,7 @@ db %10100000
 db %00111111
 db %11001000
 db %11000001
-db %11100011
+db %11110011
 db %00011000
 db %00010010
 db BANK(DratiniPicFront)
diff --git a/data/baseStats/drowzee.asm b/data/baseStats/drowzee.asm
@@ -24,6 +24,6 @@ db %00000011
 db %00001111
 db %11110000
 db %10000111
-db %00111010
+db %00111011
 db %01000011
 db BANK(DrowzeePicFront)
diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm
@@ -23,11 +23,7 @@ db %10100000
 db %01000011
 db %00001000
 db %11001110
-db %00000010
+db %00001010
 db %10001000
-IF DEF(_YELLOW)
-	db %00000110
-ELSE
-	db %00000010
-ENDC
+db %00000110
 db BANK(DugtrioPicFront)
diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm
@@ -14,11 +14,7 @@ dw EeveePicFront
 dw EeveePicBack
 ; attacks known at lvl 0
 db TACKLE
-IF DEF(_YELLOW)
-	db TAIL_WHIP
-ELSE
-	db SAND_ATTACK
-ENDC
+db TAIL_WHIP
 db 0
 db 0
 db 0 ; growth rate
@@ -28,6 +24,6 @@ db %00000011
 db %00001000
 db %11000000
 db %11000011
-db %00001000
+db %00001001
 db %00000010
 db BANK(EeveePicFront)
diff --git a/data/baseStats/ekans.asm b/data/baseStats/ekans.asm
@@ -23,7 +23,7 @@ db %10100000
 db %00000011
 db %00011000
 db %11001110
-db %10000010
-db %10001000
+db %10001010
+db %10001100
 db %00100010
 db BANK(EkansPicFront)
diff --git a/data/baseStats/electivire.asm b/data/baseStats/electivire.asm
@@ -23,7 +23,7 @@ db %10110001
 db %01000011
 db %10001111
 db %11110001
-db %11000111
+db %11010111
 db %00111000
 db %01100010
 db BANK(ElectivirePicFront)
diff --git a/data/baseStats/electrode.asm b/data/baseStats/electrode.asm
@@ -23,7 +23,7 @@ db %00100000
 db %01000001
 db %10001000
 db %11100001
-db %11001011
+db %11000011
 db %01011000
 db %01000010
 db BANK(ElectrodePicFront)
diff --git a/data/baseStats/espeon.asm b/data/baseStats/espeon.asm
@@ -24,6 +24,6 @@ db %01111111
 db %00001000
 db %11000000
 db %11000011
-db %00001000
+db %00001001
 db %00010010
 db BANK(EspeonPicFront)
diff --git a/data/baseStats/exeggcute.asm b/data/baseStats/exeggcute.asm
@@ -23,7 +23,7 @@ db %00100000
 db %00000011
 db %00001000
 db %11110000
-db %00011011
+db %00000011
 db %01101000
 db %00000010
 db BANK(ExeggcutePicFront)
diff --git a/data/baseStats/exeggutor.asm b/data/baseStats/exeggutor.asm
@@ -23,7 +23,7 @@ db %00100000
 db %01000011
 db %00111000
 db %11110000
-db %00011011
+db %00000011
 db %01101000
 db %00100010
 db BANK(ExeggutorPicFront)
diff --git a/data/baseStats/fearow.asm b/data/baseStats/fearow.asm
@@ -24,6 +24,6 @@ db %01000011
 db %00001000
 db %11000000
 db %01000010
-db %00001100
+db %00001000
 db %00001010
 db BANK(FearowPicFront)
diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm
@@ -14,11 +14,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
@@ -27,7 +23,7 @@ db %10100000
 db %01000011
 db %00001000
 db %11000000
-db %11100011
-db %00001000
+db %11110011
+db %00001001
 db %00000010
 db BANK(FlareonPicFront)
diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm
@@ -23,7 +23,7 @@ db %00100000
 db %00000000
 db %10011000
 db %11010001
-db %00001010
-db %01101010
+db %00000010
+db %01101111
 db %00000010
 db BANK(GastlyPicFront)
diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm
@@ -23,7 +23,7 @@ db %10110001
 db %01000011
 db %10011111
 db %11010001
-db %10001110
-db %01101010
+db %10000110
+db %01101111
 db %00100010
 db BANK(GengarPicFront)
diff --git a/data/baseStats/geodude.asm b/data/baseStats/geodude.asm
@@ -23,7 +23,7 @@ db %10100001
 db %00000011
 db %00001111
 db %11001110
-db %00101110
+db %00111110
 db %11001000
 db %00100010
 db BANK(GeodudePicFront)