aboutsummaryrefslogtreecommitdiffstats
path: root/data/pokemon/base_stats/tentacool.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-06 11:52:24 -0400
committerGitHub <noreply@github.com>2020-07-06 11:52:24 -0400
commit122d715484b79aba71d79caf148bac4a2ec441a5 (patch)
treea13bdf621fa8d3f3836ecb6e8d3a269ccc5d61cc /data/pokemon/base_stats/tentacool.asm
parentMerge pull request #259 from Rangi42/master (diff)
parentAvoid repeating the NUM_TMS value (diff)
downloadpokeyellow-122d715484b79aba71d79caf148bac4a2ec441a5.tar.gz
pokeyellow-122d715484b79aba71d79caf148bac4a2ec441a5.tar.xz
pokeyellow-122d715484b79aba71d79caf148bac4a2ec441a5.zip
Merge pull request #261 from Rangi42/master
Port pokecrystal's base data and tmhm structure
Diffstat (limited to 'data/pokemon/base_stats/tentacool.asm')
-rw-r--r--data/pokemon/base_stats/tentacool.asm51
1 files changed, 23 insertions, 28 deletions
diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm
index 0b1b840d..82b4afdd 100644
--- a/data/pokemon/base_stats/tentacool.asm
+++ b/data/pokemon/base_stats/tentacool.asm
@@ -1,28 +1,23 @@
-db DEX_TENTACOOL ; pokedex id
-db 40 ; base hp
-db 40 ; base attack
-db 35 ; base defense
-db 70 ; base speed
-db 100 ; base special
-db WATER ; species type 1
-db POISON ; species type 2
-db 190 ; catch rate
-db 105 ; base exp yield
-INCBIN "gfx/pokemon/front/tentacool.pic",0,1 ; 55, sprite dimensions
-dw TentacoolPicFront
-dw TentacoolPicBack
-; attacks known at lvl 0
-db ACID
-db 0
-db 0
-db 0
-db 5 ; growth rate
-; learnset
- tmlearn 3,6
- tmlearn 9,10,11,12,13,14
- tmlearn 20,21
- tmlearn 31,32
- tmlearn 33,34,40
- tmlearn 44
- tmlearn 50,51,53
-db 0 ; padding
+ db DEX_TENTACOOL ; pokedex id
+
+ db 40, 40, 35, 70, 100
+ ; hp atk def spd spc
+
+ db WATER, POISON ; type
+ db 190 ; catch rate
+ db 105 ; base exp
+
+ INCBIN "gfx/pokemon/front/tentacool.pic", 0, 1 ; sprite dimensions
+ dw TentacoolPicFront, TentacoolPicBack
+
+ db ACID, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+ db 5 ; growth rate
+
+ ; tm/hm learnset
+ tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \
+ WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MEGA_DRAIN, \
+ MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \
+ REST, SUBSTITUTE, CUT, SURF
+ ; end
+
+ db 0 ; padding