mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-06 15:45:24 +13:00
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:
parent
fc597000fb
commit
c4d780b8c7
13 changed files with 311 additions and 288 deletions
|
|
@ -37,6 +37,7 @@ INCLUDE "data/pokemon/base_stats/beedrill.asm"
|
|||
INCLUDE "data/pokemon/base_stats/konya.asm"
|
||||
INCLUDE "data/pokemon/base_stats/meowth.asm"
|
||||
INCLUDE "data/pokemon/base_stats/persian.asm"
|
||||
; INCLUDE "data/pokemon/base_stats/persiana.asm"
|
||||
INCLUDE "data/pokemon/base_stats/perrserker.asm"
|
||||
INCLUDE "data/pokemon/base_stats/spearow.asm"
|
||||
INCLUDE "data/pokemon/base_stats/fearow.asm"
|
||||
|
|
@ -98,26 +99,26 @@ INCLUDE "data/pokemon/base_stats/jabetta.asm"
|
|||
INCLUDE "data/pokemon/base_stats/psyduck.asm"
|
||||
INCLUDE "data/pokemon/base_stats/weirduck.asm"
|
||||
INCLUDE "data/pokemon/base_stats/golduck.asm"
|
||||
INCLUDE "data/pokemon/base_stats/abra.asm"
|
||||
INCLUDE "data/pokemon/base_stats/kadabra.asm"
|
||||
INCLUDE "data/pokemon/base_stats/alakazam.asm"
|
||||
INCLUDE "data/pokemon/base_stats/poliwag.asm"
|
||||
INCLUDE "data/pokemon/base_stats/poliwhirl.asm"
|
||||
INCLUDE "data/pokemon/base_stats/poliwrath.asm"
|
||||
INCLUDE "data/pokemon/base_stats/politoed.asm"
|
||||
INCLUDE "data/pokemon/base_stats/ribbito.asm"
|
||||
INCLUDE "data/pokemon/base_stats/croakozuna.asm"
|
||||
INCLUDE "data/pokemon/base_stats/drowzee.asm"
|
||||
INCLUDE "data/pokemon/base_stats/hypno.asm"
|
||||
INCLUDE "data/pokemon/base_stats/lickitung.asm"
|
||||
INCLUDE "data/pokemon/base_stats/lickilicky.asm"
|
||||
INCLUDE "data/pokemon/base_stats/onix.asm"
|
||||
INCLUDE "data/pokemon/base_stats/steelix.asm"
|
||||
INCLUDE "data/pokemon/base_stats/abra.asm"
|
||||
INCLUDE "data/pokemon/base_stats/kadabra.asm"
|
||||
INCLUDE "data/pokemon/base_stats/alakazam.asm"
|
||||
INCLUDE "data/pokemon/base_stats/diglett.asm"
|
||||
INCLUDE "data/pokemon/base_stats/dugtrio.asm"
|
||||
; INCLUDE "data/pokemon/base_stats/dugtrioa.asm"
|
||||
INCLUDE "data/pokemon/base_stats/wiglett.asm"
|
||||
INCLUDE "data/pokemon/base_stats/wugtrio.asm"
|
||||
INCLUDE "data/pokemon/base_stats/drowzee.asm"
|
||||
INCLUDE "data/pokemon/base_stats/hypno.asm"
|
||||
INCLUDE "data/pokemon/base_stats/onix.asm"
|
||||
INCLUDE "data/pokemon/base_stats/steelix.asm"
|
||||
INCLUDE "data/pokemon/base_stats/kotora.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gaotora.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gorotora.asm"
|
||||
|
|
@ -215,7 +216,6 @@ INCLUDE "data/pokemon/base_stats/skimper.asm"
|
|||
INCLUDE "data/pokemon/base_stats/bawligua.asm"
|
||||
INCLUDE "data/pokemon/base_stats/cryithan.asm"
|
||||
INCLUDE "data/pokemon/base_stats/mrmime.asm"
|
||||
; INCLUDE "data/pokemon/base_stats/mrmimeg.asm"
|
||||
INCLUDE "data/pokemon/base_stats/mrrime.asm"
|
||||
INCLUDE "data/pokemon/base_stats/jynx.asm"
|
||||
INCLUDE "data/pokemon/base_stats/buu.asm"
|
||||
|
|
@ -249,8 +249,8 @@ INCLUDE "data/pokemon/base_stats/moltres.asm"
|
|||
INCLUDE "data/pokemon/base_stats/moltresg.asm"
|
||||
INCLUDE "data/pokemon/base_stats/mewtwo.asm"
|
||||
INCLUDE "data/pokemon/base_stats/mew.asm"
|
||||
; INCLUDE "data/pokemon/base_stats/meltan.asm"
|
||||
; INCLUDE "data/pokemon/base_stats/melmetal.asm"
|
||||
INCLUDE "data/pokemon/base_stats/meltan.asm"
|
||||
INCLUDE "data/pokemon/base_stats/melmetal.asm"
|
||||
assert_table_length NUM_POKEMON - 1 ; discount MissingNo
|
||||
|
||||
MissingnoBaseStats::
|
||||
|
|
|
|||
|
|
@ -14,10 +14,8 @@ CryData::
|
|||
mon_cry SFX_CRY_06, $ED, $80 ; Voltorb
|
||||
mon_cry SFX_CRY_09, $00, $80 ; Nidoking
|
||||
mon_cry SFX_CRY_1F, $00, $80 ; Slowbro
|
||||
; mon_cry SFX_CRY_1F, $00, $80 ; Slowbro-G
|
||||
mon_cry SFX_CRY_0F, $20, $80 ; Ivysaur
|
||||
mon_cry SFX_CRY_0D, $00, $80 ; Exeggutor
|
||||
; mon_cry SFX_CRY_0D, $00, $80 ; Exeggutor-A
|
||||
mon_cry SFX_CRY_0C, $00, $80 ; Lickitung
|
||||
mon_cry SFX_CRY_0B, $00, $80 ; Exeggcute
|
||||
mon_cry SFX_CRY_05, $00, $80 ; Grimer
|
||||
|
|
@ -28,7 +26,6 @@ CryData::
|
|||
mon_cry SFX_CRY_04, $00, $80 ; Rhyhorn
|
||||
mon_cry SFX_CRY_1B, $00, $80 ; Lapras
|
||||
mon_cry SFX_CRY_15, $00, $80 ; Arcanine
|
||||
; mon_cry SFX_CRY_15, $00, $80 ; Arcanine-H
|
||||
mon_cry SFX_CRY_1E, $EE, $FF ; Mew
|
||||
mon_cry SFX_CRY_17, $00, $80 ; Gyarados
|
||||
mon_cry SFX_CRY_18, $00, $80 ; Shellder
|
||||
|
|
@ -51,7 +48,6 @@ CryData::
|
|||
mon_cry SFX_CRY_14, $0A, $C0 ; Chansey
|
||||
mon_cry SFX_CRY_1F, $48, $60 ; Machoke
|
||||
mon_cry SFX_CRY_20, $08, $40 ; Mr.Mime
|
||||
; mon_cry SFX_CRY_20, $08, $40 ; Mr.Mime-G
|
||||
mon_cry SFX_CRY_12, $80, $C0 ; Hitmonlee
|
||||
mon_cry SFX_CRY_0C, $EE, $C0 ; Hitmonchan
|
||||
mon_cry SFX_CRY_17, $E0, $10 ; Arbok
|
||||
|
|
@ -59,7 +55,6 @@ CryData::
|
|||
mon_cry SFX_CRY_21, $20, $60 ; Psyduck
|
||||
mon_cry SFX_CRY_0D, $88, $20 ; Drowzee
|
||||
mon_cry SFX_CRY_12, $E0, $40 ; Golem
|
||||
; mon_cry SFX_CRY_12, $E0, $40 ; Golem-A
|
||||
mon_cry SFX_CRY_0E, $00, $80 ; Barunda
|
||||
mon_cry SFX_CRY_04, $FF, $30 ; Magmar
|
||||
mon_cry SFX_CRY_0D, $2E, $E0 ; Buu
|
||||
|
|
@ -71,9 +66,6 @@ CryData::
|
|||
mon_cry SFX_CRY_0C, $88, $C0 ; Seel
|
||||
mon_cry SFX_CRY_0B, $AA, $01 ; Diglett
|
||||
mon_cry SFX_CRY_1D, $11, $40 ; Tauros
|
||||
; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-P
|
||||
; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PB
|
||||
; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PA
|
||||
mon_cry SFX_CRY_03, $90, $B0 ; Trampel
|
||||
mon_cry SFX_CRY_1C, $C6, $F0 ; Crocky
|
||||
mon_cry SFX_CRY_13, $93, $00 ; Blottle
|
||||
|
|
@ -97,10 +89,8 @@ CryData::
|
|||
mon_cry SFX_CRY_0E, $E0, $60 ; Mikon
|
||||
mon_cry SFX_CRY_24, $4F, $10 ; Vulpix
|
||||
mon_cry SFX_CRY_24, $88, $60 ; Ninetales
|
||||
; mon_cry SFX_CRY_24, $88, $60 ; Ninetales-A
|
||||
mon_cry SFX_CRY_0F, $EE, $01 ; Pikachu
|
||||
mon_cry SFX_CRY_09, $EE, $08 ; Raichu
|
||||
; mon_cry SFX_CRY_09, $EE, $08 ; Raichu-A
|
||||
mon_cry SFX_CRY_12, $93, $60 ; Ribbito
|
||||
mon_cry SFX_CRY_12, $25, $FF ; Croakozuna
|
||||
mon_cry SFX_CRY_0F, $60, $40 ; Dratini
|
||||
|
|
@ -113,7 +103,6 @@ CryData::
|
|||
mon_cry SFX_CRY_0F, $20, $C0 ; Cryithan
|
||||
mon_cry SFX_CRY_00, $20, $40 ; Sandshrew
|
||||
mon_cry SFX_CRY_00, $FF, $FF ; Sandslash
|
||||
; mon_cry SFX_CRY_00, $FF, $FF ; Sandslash-A
|
||||
mon_cry SFX_CRY_1F, $F0, $01 ; Omanyte
|
||||
mon_cry SFX_CRY_1F, $FF, $40 ; Omastar
|
||||
mon_cry SFX_CRY_0E, $FF, $35 ; Jigglypuff
|
||||
|
|
@ -135,7 +124,6 @@ CryData::
|
|||
mon_cry SFX_CRY_0B, $99, $20 ; Dodrio
|
||||
mon_cry SFX_CRY_0A, $AF, $40 ; Primeape
|
||||
mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio
|
||||
; mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio-A
|
||||
mon_cry SFX_CRY_1A, $29, $80 ; Venomoth
|
||||
mon_cry SFX_CRY_0C, $23, $FF ; Dewgong
|
||||
mon_cry SFX_CRY_09, $FF, $20 ; Purakkusu
|
||||
|
|
@ -154,20 +142,15 @@ CryData::
|
|||
mon_cry SFX_CRY_19, $C1, $1C ; Konya
|
||||
mon_cry SFX_CRY_13, $00, $00 ; Omega
|
||||
mon_cry SFX_CRY_07, $EF, $FF ; Muk
|
||||
; mon_cry SFX_CRY_07, $EF, $FF ; Muk-A
|
||||
mon_cry SFX_CRY_0F, $40, $80 ; Decilla
|
||||
mon_cry SFX_CRY_20, $EE, $E0 ; Kingler
|
||||
mon_cry SFX_CRY_18, $6F, $E0 ; Cloyster
|
||||
mon_cry SFX_CRY_1C, $B1, $90 ; Magnetite
|
||||
mon_cry SFX_CRY_06, $A8, $90 ; Electrode
|
||||
; mon_cry SFX_CRY_06, $A8, $90 ; Electrode-H
|
||||
mon_cry SFX_CRY_19, $AA, $20 ; Clefable
|
||||
mon_cry SFX_CRY_12, $FF, $FF ; Weezing
|
||||
; mon_cry SFX_CRY_12, $FF, $FF ; Weezing-G
|
||||
mon_cry SFX_CRY_19, $99, $FF ; Persian
|
||||
; mon_cry SFX_CRY_19, $99, $FF ; Persian-A
|
||||
mon_cry SFX_CRY_08, $4F, $60 ; Marowak
|
||||
; mon_cry SFX_CRY_08, $4F, $60 ; Marowak-A
|
||||
mon_cry SFX_CRY_08, $00, $FF ; Guardia
|
||||
mon_cry SFX_CRY_1C, $30, $40 ; Haunter
|
||||
mon_cry SFX_CRY_1C, $C0, $01 ; Abra
|
||||
|
|
@ -187,10 +170,8 @@ CryData::
|
|||
mon_cry SFX_CRY_25, $37, $10 ; Puchikoon
|
||||
mon_cry SFX_CRY_25, $00, $80 ; Ponyta
|
||||
mon_cry SFX_CRY_25, $20, $C0 ; Rapidash
|
||||
; mon_cry SFX_CRY_25, $20, $C0 ; Rapidash-G
|
||||
mon_cry SFX_CRY_22, $00, $80 ; Rattata
|
||||
mon_cry SFX_CRY_22, $20, $FF ; Raticate
|
||||
; mon_cry SFX_CRY_22, $20, $FF ; Raticate-A
|
||||
mon_cry SFX_CRY_00, $2C, $C0 ; Nidorino
|
||||
mon_cry SFX_CRY_01, $2C, $E0 ; Nidorina
|
||||
mon_cry SFX_CRY_24, $F0, $10 ; Geodude
|
||||
|
|
@ -206,9 +187,9 @@ CryData::
|
|||
mon_cry SFX_CRY_1D, $20, $40 ; Wartortle
|
||||
mon_cry SFX_CRY_04, $00, $80 ; Charizard
|
||||
mon_cry SFX_CRY_1D, $00, $80 ; Totartle
|
||||
mon_cry SFX_CRY_00, $00, $00 ; MissingNo. (Ghost)
|
||||
mon_cry SFX_CRY_00, $00, $00 ; MissingNo. (Aerodactyl Fossil)
|
||||
mon_cry SFX_CRY_00, $00, $00 ; MissingNo. (Kabutops Fossil)
|
||||
mon_cry SFX_CRY_00, $00, $00 ; MissingNo. (Aerodactyl Fossil)
|
||||
mon_cry SFX_CRY_00, $00, $00 ; MissingNo. (Ghost)
|
||||
mon_cry SFX_CRY_08, $DD, $01 ; Oddish
|
||||
mon_cry SFX_CRY_08, $AA, $40 ; Gloom
|
||||
mon_cry SFX_CRY_23, $22, $FF ; Vileplume
|
||||
|
|
@ -238,7 +219,6 @@ CryData::
|
|||
mon_cry SFX_CRY_00, $00, $00 ; Kingdra
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Politoed
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Slowking
|
||||
; mon_cry SFX_CRY_00, $00, $00 ; Slowking-G
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Electivire
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Magmortar
|
||||
mon_cry SFX_CRY_1E, $79, $40 ; Para
|
||||
|
|
@ -256,8 +236,27 @@ CryData::
|
|||
mon_cry SFX_CRY_19, $1A, $40 ; Perrserker
|
||||
mon_cry SFX_CRY_10, $64, $40 ; Sirfetch'd
|
||||
mon_cry SFX_CRY_20, $00, $90 ; Mr. Rime
|
||||
; mon_cry SFX_CRY_00, $00, $00 ; Meltan
|
||||
; mon_cry SFX_CRY_00, $00, $00 ; Melmetal
|
||||
mon_cry SFX_CRY_0E, $FF, $1C ; Meltan
|
||||
mon_cry SFX_CRY_11, $F0, $60 ; Melmetal
|
||||
; mon_cry SFX_CRY_15, $00, $80 ; Arcanine-H
|
||||
; mon_cry SFX_CRY_06, $A8, $90 ; Electrode-H
|
||||
; mon_cry SFX_CRY_22, $20, $FF ; Raticate-A
|
||||
; mon_cry SFX_CRY_09, $EE, $08 ; Raichu-A
|
||||
; mon_cry SFX_CRY_00, $FF, $FF ; Sandslash-A
|
||||
; mon_cry SFX_CRY_24, $88, $60 ; Ninetales-A
|
||||
; mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio-A
|
||||
; mon_cry SFX_CRY_19, $99, $FF ; Persian-A
|
||||
; mon_cry SFX_CRY_12, $E0, $40 ; Golem-A
|
||||
; mon_cry SFX_CRY_25, $20, $C0 ; Rapidash-G
|
||||
; mon_cry SFX_CRY_1F, $00, $80 ; Slowbro-G
|
||||
; mon_cry SFX_CRY_00, $00, $00 ; Slowking-G
|
||||
; mon_cry SFX_CRY_07, $EF, $FF ; Muk-A
|
||||
; mon_cry SFX_CRY_0D, $00, $80 ; Exeggutor-A
|
||||
; mon_cry SFX_CRY_08, $4F, $60 ; Marowak-A
|
||||
; mon_cry SFX_CRY_12, $FF, $FF ; Weezing-G
|
||||
; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-P
|
||||
; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PA
|
||||
; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PB
|
||||
mon_cry SFX_CRY_09, $80, $40 ; Articuno-G
|
||||
mon_cry SFX_CRY_18, $FF, $80 ; Zapdos-G
|
||||
mon_cry SFX_CRY_09, $F8, $40 ; Moltres-G
|
||||
|
|
|
|||
|
|
@ -230,6 +230,8 @@ PokedexEntryPointers:
|
|||
dw PerrserkerDexEntry
|
||||
dw SirfetchdDexEntry
|
||||
dw MrRimeDexEntry
|
||||
dw MeltanDexEntry
|
||||
dw MelmetalDexEntry
|
||||
dw ArticunoGDexEntry
|
||||
dw ZapdosGDexEntry
|
||||
dw MoltresGDexEntry
|
||||
|
|
@ -1837,6 +1839,20 @@ MrRimeDexEntry:
|
|||
text_far _MrRimeDexEntry
|
||||
text_end
|
||||
|
||||
MeltanDexEntry:
|
||||
db "HEX NUT@"
|
||||
db 0,8
|
||||
dw 180
|
||||
text_far _MeltanDexEntry
|
||||
text_end
|
||||
|
||||
MelmetalDexEntry:
|
||||
db "HEX NUT@"
|
||||
db 8,2
|
||||
dw 17640
|
||||
text_far _MelmetalDexEntry
|
||||
text_end
|
||||
|
||||
ArticunoGDexEntry:
|
||||
db "CRUEL@"
|
||||
db 5,7
|
||||
|
|
|
|||
|
|
@ -230,8 +230,8 @@ PokedexOrder:
|
|||
db DEX_PERRSERKER
|
||||
db DEX_SIRFETCHD
|
||||
db DEX_MR_RIME
|
||||
; db DEX_MELTAN
|
||||
; db DEX_MELMETAL
|
||||
db DEX_MELTAN
|
||||
db DEX_MELMETAL
|
||||
db DEX_ARTICUNO_G
|
||||
db DEX_ZAPDOS_G
|
||||
db DEX_MOLTRES_G
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ MonPartyData:
|
|||
nybble ICON_MON ; Konya
|
||||
nybble ICON_MON ; Meowth
|
||||
nybble ICON_MON ; Persian
|
||||
; nybble ICON_MON ; Persian-A
|
||||
nybble ICON_MON ; Perrserker
|
||||
nybble ICON_BIRD ; Spearow
|
||||
nybble ICON_BIRD ; Fearow
|
||||
|
|
@ -98,26 +99,26 @@ MonPartyData:
|
|||
nybble ICON_MON ; Psyduck
|
||||
nybble ICON_MON ; Weirduck
|
||||
nybble ICON_MON ; Golduck
|
||||
nybble ICON_MON ; Abra
|
||||
nybble ICON_MON ; Kadabra
|
||||
nybble ICON_MON ; Alakazam
|
||||
nybble ICON_MON ; Poliwag
|
||||
nybble ICON_MON ; Poliwhirl
|
||||
nybble ICON_MON ; Poliwrath
|
||||
nybble ICON_MON ; Politoed
|
||||
nybble ICON_MON ; Ribbito
|
||||
nybble ICON_MON ; Croakozuna
|
||||
nybble ICON_MON ; Drowzee
|
||||
nybble ICON_MON ; Hypno
|
||||
nybble ICON_MON ; Lickitung
|
||||
nybble ICON_MON ; Lickilicky
|
||||
nybble ICON_SNAKE ; Onix
|
||||
nybble ICON_SNAKE ; Steelix
|
||||
nybble ICON_MON ; Abra
|
||||
nybble ICON_MON ; Kadabra
|
||||
nybble ICON_MON ; Alakazam
|
||||
nybble ICON_MON ; Diglett
|
||||
nybble ICON_MON ; Dugtrio
|
||||
; nybble ICON_MON ; Dugtrio-A
|
||||
nybble ICON_WATER ; Wiglett
|
||||
nybble ICON_WATER ; Wugtrio
|
||||
nybble ICON_MON ; Drowzee
|
||||
nybble ICON_MON ; Hypno
|
||||
nybble ICON_SNAKE ; Onix
|
||||
nybble ICON_SNAKE ; Steelix
|
||||
nybble ICON_QUADRUPED ; Kotora
|
||||
nybble ICON_QUADRUPED ; Gaotora
|
||||
nybble ICON_QUADRUPED ; Gorotora
|
||||
|
|
@ -249,6 +250,6 @@ MonPartyData:
|
|||
nybble ICON_BIRD ; Moltres-G
|
||||
nybble ICON_MON ; Mewtwo
|
||||
nybble ICON_MON ; Mew
|
||||
; nybble ICON_BALL ; Meltan
|
||||
; nybble ICON_BALL ; Melmetal
|
||||
nybble ICON_BALL ; Meltan
|
||||
nybble ICON_BALL ; Melmetal
|
||||
end_nybble_array NUM_POKEMON - 1
|
||||
|
|
|
|||
|
|
@ -250,11 +250,11 @@ MonsterNames::
|
|||
db "PERRSERKER"
|
||||
db "SIRFETCH'D"
|
||||
db "MR.RIME@@@"
|
||||
db "MELTAN@@@@"
|
||||
db "MELMETAL@@"
|
||||
db "ARTICUNO-G"
|
||||
db "ZAPDOS-G@@"
|
||||
db "MOLTRES-G@"
|
||||
; db "MELTAN@@@@"
|
||||
; db "MELMETAL@@"
|
||||
db "MISSINGNO."
|
||||
|
||||
assert_table_length NUM_POKEMON_INDEXES
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ MonsterPalettes:
|
|||
db PAL_YELLOWMON ; KONYA
|
||||
db PAL_YELLOWMON ; MEOWTH
|
||||
db PAL_YELLOWMON ; PERSIAN
|
||||
; db PAL_BLUEMON ; PERSIAN_A
|
||||
db PAL_GREYMON ; PERRSEKRER
|
||||
db PAL_BROWNMON ; SPEAROW
|
||||
db PAL_BROWNMON ; FEAROW
|
||||
|
|
@ -99,26 +100,26 @@ MonsterPalettes:
|
|||
db PAL_YELLOWMON ; PSYDUCK
|
||||
db PAL_GREENMON ; WEIRDUCK
|
||||
db PAL_CYANMON ; GOLDUCK
|
||||
db PAL_YELLOWMON ; ABRA
|
||||
db PAL_YELLOWMON ; KADABRA
|
||||
db PAL_YELLOWMON ; ALAKAZAM
|
||||
db PAL_BLUEMON ; POLIWAG
|
||||
db PAL_BLUEMON ; POLIWHIRL
|
||||
db PAL_BLUEMON ; POLIWRATH
|
||||
db PAL_GREENMON ; POLITOED
|
||||
db PAL_GREENMON ; RIBBITO
|
||||
db PAL_GREENMON ; CROAKOZUNA
|
||||
db PAL_YELLOWMON ; DROWZEE
|
||||
db PAL_YELLOWMON ; HYPNO
|
||||
db PAL_PINKMON ; LICKITUNG
|
||||
db PAL_PINKMON ; LICKILICKY
|
||||
db PAL_GREYMON ; ONIX
|
||||
db PAL_GREYMON ; STEELIX
|
||||
db PAL_YELLOWMON ; ABRA
|
||||
db PAL_YELLOWMON ; KADABRA
|
||||
db PAL_YELLOWMON ; ALAKAZAM
|
||||
db PAL_BROWNMON ; DIGLETT
|
||||
db PAL_BROWNMON ; DUGTRIO
|
||||
; db PAL_BROWNMON ; DUGTRIO_A
|
||||
db PAL_PINKMON ; WIGLETT
|
||||
db PAL_PINKMON ; WUGTRIO
|
||||
db PAL_YELLOWMON ; DROWZEE
|
||||
db PAL_YELLOWMON ; HYPNO
|
||||
db PAL_GREYMON ; ONIX
|
||||
db PAL_GREYMON ; STEELIX
|
||||
db PAL_YELLOWMON ; KOTORA
|
||||
db PAL_YELLOWMON ; GAOTORA
|
||||
db PAL_YELLOWMON ; GOROTORA
|
||||
|
|
@ -250,6 +251,6 @@ MonsterPalettes:
|
|||
db PAL_PINKMON ; MOLTRES_G
|
||||
db PAL_MEWMON ; MEWTWO
|
||||
db PAL_MEWMON ; MEW
|
||||
; db PAL_YELLOWMON ; MELTAN
|
||||
; db PAL_YELLOWMON ; MELMETAL
|
||||
db PAL_YELLOWMON ; MELTAN
|
||||
db PAL_YELLOWMON ; MELMETAL
|
||||
assert_table_length NUM_POKEMON
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue