From 66ebe56adc7a6a742a413eb2adbdc369b86183d5 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 5 Jul 2020 21:59:32 -0400
Subject: Port pokecrystal's base data and tmhm structure

To do: TM/HM constants named after moves
---
 data/pokemon/base_stats/psyduck.asm | 48 ++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

(limited to 'data/pokemon/base_stats/psyduck.asm')

diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm
index 163f851e..86468364 100644
--- a/data/pokemon/base_stats/psyduck.asm
+++ b/data/pokemon/base_stats/psyduck.asm
@@ -1,28 +1,20 @@
-db DEX_PSYDUCK ; pokedex id
-db 50 ; base hp
-db 52 ; base attack
-db 48 ; base defense
-db 55 ; base speed
-db 50 ; base special
-db WATER ; species type 1
-db WATER ; species type 2
-db 190 ; catch rate
-db 80 ; base exp yield
-INCBIN "gfx/pokemon/front/psyduck.pic",0,1 ; 55, sprite dimensions
-dw PsyduckPicFront
-dw PsyduckPicBack
-; attacks known at lvl 0
-db SCRATCH
-db 0
-db 0
-db 0
-db 0 ; growth rate
-; learnset
-	tmlearn 1,5,6,8
-	tmlearn 9,10,11,12,13,14,16
-	tmlearn 17,18,19,20
-	tmlearn 28,31,32
-	tmlearn 34,39,40
-	tmlearn 44
-	tmlearn 50,53,54
-db 0 ; padding
+	db DEX_PSYDUCK ; pokedex id
+
+	db  50,  52,  48,  55,  50
+	;   hp  atk  def  spd  spc
+
+	db WATER, WATER ; type
+	db 190 ; catch rate
+	db 80 ; base exp
+
+	INCBIN "gfx/pokemon/front/psyduck.pic", 0, 1 ; sprite dimensions
+	dw PsyduckPicFront, PsyduckPicBack
+
+	db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db 0 ; growth rate
+
+	; tm/hm learnset
+	tmhm 1, 5, 6, 8, 9, 10, 11, 12, 13, 14, 16, 17, 18, 19, 20, 28, 31, 32, 34, 39, 40, 44, 50, 53, 54
+	; end
+
+	db 0 ; padding
-- 
cgit v1.3.1-sl0p