aboutsummaryrefslogtreecommitdiffstats
path: root/data/pokemon/base_stats/omanyte.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/omanyte.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/omanyte.asm')
-rw-r--r--data/pokemon/base_stats/omanyte.asm51
1 files changed, 23 insertions, 28 deletions
diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm
index 33541539..f37447e1 100644
--- a/data/pokemon/base_stats/omanyte.asm
+++ b/data/pokemon/base_stats/omanyte.asm
@@ -1,28 +1,23 @@
-db DEX_OMANYTE ; pokedex id
-db 35 ; base hp
-db 40 ; base attack
-db 100 ; base defense
-db 35 ; base speed
-db 90 ; base special
-db ROCK ; species type 1
-db WATER ; species type 2
-db 45 ; catch rate
-db 120 ; base exp yield
-INCBIN "gfx/pokemon/front/omanyte.pic",0,1 ; 55, sprite dimensions
-dw OmanytePicFront
-dw OmanytePicBack
-; attacks known at lvl 0
-db WATER_GUN
-db WITHDRAW
-db 0
-db 0
-db 0 ; growth rate
-; learnset
- tmlearn 6,8
- tmlearn 9,10,11,12,13,14
- tmlearn 20
- tmlearn 31,32
- tmlearn 33,34
- tmlearn 44
- tmlearn 50,53
-db 0 ; padding
+ db DEX_OMANYTE ; pokedex id
+
+ db 35, 40, 100, 35, 90
+ ; hp atk def spd spc
+
+ db ROCK, WATER ; type
+ db 45 ; catch rate
+ db 120 ; base exp
+
+ INCBIN "gfx/pokemon/front/omanyte.pic", 0, 1 ; sprite dimensions
+ dw OmanytePicFront, OmanytePicBack
+
+ db WATER_GUN, WITHDRAW, NO_MOVE, NO_MOVE ; level 1 learnset
+ db 0 ; growth rate
+
+ ; tm/hm learnset
+ tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \
+ WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \
+ DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \
+ SURF
+ ; end
+
+ db 0 ; padding