Port pokecrystal's base data and tmhm structure

To do: TM/HM constants named after moves

data/pokemon/base_stats/machoke.asm

@@ -1,28 +1,20 @@
-db DEX_MACHOKE ; pokedex id
-db 80 ; base hp
-db 100 ; base attack
-db 70 ; base defense
-db 45 ; base speed
-db 50 ; base special
-db FIGHTING ; species type 1
-db FIGHTING ; species type 2
-db 90 ; catch rate
-db 146 ; base exp yield
-INCBIN "gfx/pokemon/front/machoke.pic",0,1 ; 77, sprite dimensions
-dw MachokePicFront
-dw MachokePicBack
-; attacks known at lvl 0
-db KARATE_CHOP
-db LOW_KICK
-db LEER
-db 0
-db 3 ; growth rate
-; learnset
-	tmlearn 1,5,6,8
-	tmlearn 9,10
-	tmlearn 17,18,19,20
-	tmlearn 26,27,28,31,32
-	tmlearn 34,35,38,40
-	tmlearn 44,48
-	tmlearn 50,54
-db 0 ; padding
+	db DEX_MACHOKE ; pokedex id
+
+	db  80, 100,  70,  45,  50
+	;   hp  atk  def  spd  spc
+
+	db FIGHTING, FIGHTING ; type
+	db 90 ; catch rate
+	db 146 ; base exp
+
+	INCBIN "gfx/pokemon/front/machoke.pic", 0, 1 ; sprite dimensions
+	dw MachokePicFront, MachokePicBack
+
+	db KARATE_CHOP, LOW_KICK, LEER, NO_MOVE ; level 1 learnset
+	db 3 ; growth rate
+
+	; tm/hm learnset
+	tmhm 1, 5, 6, 8, 9, 10, 17, 18, 19, 20, 26, 27, 28, 31, 32, 34, 35, 38, 40, 44, 48, 50, 54
+	; end
+
+	db 0 ; padding