Port pokecrystal's base data and tmhm structure

To do: TM/HM constants named after moves

1 files changed, 20 insertions, 28 deletions

diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm
index 303a33c1..caca5e77 100644
--- a/data/pokemon/base_stats/scyther.asm
+++ b/data/pokemon/base_stats/scyther.asm
@@ -1,28 +1,20 @@
-db DEX_SCYTHER ; pokedex id
-db 70 ; base hp
-db 110 ; base attack
-db 80 ; base defense
-db 105 ; base speed
-db 55 ; base special
-db BUG ; species type 1
-db FLYING ; species type 2
-db 45 ; catch rate
-db 187 ; base exp yield
-INCBIN "gfx/pokemon/front/scyther.pic",0,1 ; 77, sprite dimensions
-dw ScytherPicFront
-dw ScytherPicBack
-; attacks known at lvl 0
-db QUICK_ATTACK
-db 0
-db 0
-db 0
-db 0 ; growth rate
-; learnset
-	tmlearn 3,6
-	tmlearn 9,10,15
-	tmlearn 20
-	tmlearn 31,32
-	tmlearn 34,39,40
-	tmlearn 44
-	tmlearn 50,51
-db 0 ; padding
+	db DEX_SCYTHER ; pokedex id
+
+	db  70, 110,  80, 105,  55
+	;   hp  atk  def  spd  spc
+
+	db BUG, FLYING ; type
+	db 45 ; catch rate
+	db 187 ; base exp
+
+	INCBIN "gfx/pokemon/front/scyther.pic", 0, 1 ; sprite dimensions
+	dw ScytherPicFront, ScytherPicBack
+
+	db QUICK_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db 0 ; growth rate
+
+	; tm/hm learnset
+	tmhm 3, 6, 9, 10, 15, 20, 31, 32, 34, 39, 40, 44, 50, 51
+	; end
+
+	db 0 ; padding