Finally adding Meltan and Melmetal!

Also had to remove Mr. Mime-G since I forgot to add Alolan Persian and Raichu. Oops.
This commit is contained in:
MementoMartha 2023-04-04 09:34:23 +01:00
parent fc597000fb
commit c4d780b8c7
13 changed files with 311 additions and 288 deletions

View file

@ -262,11 +262,11 @@ EvosMovesPointerTable:
dw PerrserkerEvosMoves
dw SirfetchdEvosMoves
dw MrRimeEvosMoves
dw MeltanEvosMoves
dw MelmetalEvosMoves
dw ArticunoGEvosMoves
dw ZapdosGEvosMoves
dw MoltresGEvosMoves
; dw MeltanEvosMoves
; dw MelmetalEvosMoves
dw MissingNoEvosMoves
assert_table_length NUM_POKEMON_INDEXES
@ -3240,6 +3240,36 @@ MrRimeEvosMoves:
db 44, PSYCHIC_M
db 50, FEINT_ATTACK
db 0
MeltanEvosMoves:
; Evolutions
db EV_ITEM, CANDY_JAR, 1, MELMETAL
db 0
; Learnset
db 8, TAIL_WHIP
db 16, HEADBUTT
db 24, THUNDER_WAVE
db 32, ACID_ARMOR
db 40, IRON_HEAD
db 0
MelmetalEvosMoves:
; Evolutions
db 0
; Learnset
db 9, TAIL_WHIP
db 16, HEADBUTT
db 18, THUNDER_WAVE
db 20, THUNDERSHOCK
db 27, THUNDERPUNCH
db 36, ACID_ARMOR
db 45, MAGNET_BOMB
db 51, MEGA_PUNCH
; db 63, SMART_STRIKE
db 72, IRON_HEAD
db 81, SUBMISSION
db 90, HYPER_BEAM
db 0
ArticunoGEvosMoves:
; Evolutions
@ -3282,36 +3312,6 @@ MoltresGEvosMoves:
db 70, SKY_ATTACK
db 0
;MeltanEvosMoves:
; Evolutions
; db EV_ITEM, CANDY_JAR, 1, MELMETAL
; db 0
; Learnset
; db 8, TAIL_WHIP
; db 16, HEADBUTT
; db 24, THUNDER_WAVE
; db 32, ACID_ARMOR
; db 40, IRON_HEAD
; db 0
;MelmetalEvosMoves:
; Evolutions
; db 0
; Learnset
; db 9, TAIL_WHIP
; db 16, HEADBUTT
; db 18, THUNDER_WAVE
; db 20, THUNDERPUNCH
; db 27, THUNDERSHOCK
; db 36, ACID_ARMOR
; db 45, MAGNET_BOMB
; db 51, MEGA_PUNCH
; db 63, SMART_STRIKE
; db 72, IRON_HEAD
; db 81, SUBMISSION
; db 90, HYPER_BEAM
; db 0
MissingNoEvosMoves:
; Evolutions
db 0