diff options
Diffstat (limited to 'data/pokemon/base_stats/marill.asm')
| -rw-r--r-- | data/pokemon/base_stats/marill.asm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/data/pokemon/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm index b6fcc62e5..f57d0e577 100644 --- a/data/pokemon/base_stats/marill.asm +++ b/data/pokemon/base_stats/marill.asm @@ -3,20 +3,19 @@ db 70, 20, 50, 40, 20, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 58 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/marill/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMPHIBIAN, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_WATER_1, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end |