thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Next Evolution Batch

Browse source 
Kingdra, Lickilicky, Magnezone and Porygon2.
This commit is contained in:
emaskyesmogon 2022-09-02 11:05:54 -06:00
parent 48f71027f7
commit 198c9c8255
16 changed files with 373 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
constants/pokedex_constants.asm
View file

@ -28,6 +28,7 @@
const DEX_FEAROW ; 22
const DEX_EKANS ; 23
const DEX_ARBOK ; 24
;const DEX_PICHU
const DEX_PIKACHU ; 25
const DEX_RAICHU ; 26
const DEX_GOROCHU
@ -40,11 +41,13 @@
const DEX_NIDORINO ; 33
const DEX_NIDOKING ; 34
const DEX_NIDOREIGN
;const DEX_CLEFFA
const DEX_CLEFAIRY ; 35
const DEX_CLEFABLE ; 36
const DEX_MIKON
const DEX_VULPIX ; 37
const DEX_NINETALES ; 38
;const DEX_IGGLYBUFF
const DEX_JIGGLYPUFF ; 39
const DEX_WIGGLYTUFF ; 40
const DEX_BITTYBAT
@ -107,7 +110,7 @@
const DEX_MAGNEMITE ; 81
const DEX_MAGNETITE
const DEX_MAGNETON ; 82
; const DEX_MAGNEZONE
const DEX_MAGNEZONE
const DEX_BARUNDA
const DEX_FARFETCHD ; 83
const DEX_MADAAMU
@ -146,26 +149,29 @@
const DEX_MAROWAK ; 105
const DEX_GUARDIA
const DEX_KANGASKHAN ; 115
;const DEX_TYROGUE
const DEX_HITMONLEE ; 106
const DEX_HITMONCHAN ; 107
const DEX_HITMONTOP
const DEX_LICKITUNG ; 108
; const DEX_LICKILICKY
const DEX_LICKILICKY
const DEX_KOFFING ; 109
const DEX_WEEZING ; 110
const DEX_RHYHORN ; 111
const DEX_RHYDON ; 112
const DEX_RHYPERIOR
;const DEX_HAPPINY
const DEX_CHANSEY ; 113
const DEX_BLISSEY
const DEX_MONJA
const DEX_TANGELA ; 114
const DEX_TANGROWTH
const DEX_DECILLA
const DEX_GYAOON
const DEX_OMEGA
const DEX_HORSEA ; 116
const DEX_SEADRA ; 117
; const DEX_KINGDRA
const DEX_KINGDRA
const DEX_GYOPIN
const DEX_GOLDEEN ; 118
const DEX_SEAKING ; 119
@ -175,15 +181,22 @@
const DEX_STARYU ; 120
const DEX_STARMIE ; 121
const DEX_JAGG
;const DEX_MIMEJR
const DEX_MR_MIME ; 122
const DEX_SCYTHER ; 123
const DEX_SCIZOR
const DEX_KLEAVOR
const DEX_PINSIR ; 127
const DEX_PURAKKUSU
const DEX_PURAKKUSU
;const DEX_SMOOCHUM
const DEX_JYNX ; 124
const DEX_BUU
;const DEX_ELEKID
const DEX_ELECTABUZZ ; 125
const DEX_ELECTIVIRE
;const DEX_MAGBY
const DEX_MAGMAR ; 126
const DEX_MAGMORTAR
const DEX_TRAMPEL ;
const DEX_TAUROS ; 128
const DEX_MAGIKARP ; 129
@ -201,13 +214,18 @@
const DEX_GLACEON
const DEX_SYLVEON
const DEX_PORYGON ; 137
; const DEX_PORYGON2
const DEX_PORYGON2
const DEX_PORYGONZ
const DEX_OMANYTE ; 138
const DEX_OMASTAR ; 139
const DEX_KABUTO ; 140
const DEX_KABUTOPS ; 141
const DEX_AERODACTYL ; 142
;const DEX_MUNCHLAX
const DEX_SNORLAX ; 143
;const DEX_PERRSERKER
;const DEX_SIRFETCHD
;const DEX_MRRIME
const DEX_ARTICUNO ; 144
const DEX_ZAPDOS ; 145
const DEX_MOLTRES ; 146

18
constants/pokemon_constants.asm
View file

@ -218,15 +218,15 @@
const STEELIX ; $D1
const HITMONTOP ; $D2
const BLISSEY ; $D3
; const PORYGON2 ; $D4
; const KINGDRA ; $D5
; const LICKILICKY ; $D3
; const MAGNEZONE ; $D4
; const TANGROWTH ; $D6
; const ELECTIVIRE ; $D8
; const MAGMORTAR ; $D9
; const PORYGON-Z ; $DB
; const KLEAVOR ; $DC
const PORYGON2 ; $D4
const KINGDRA ; $D5
const LICKILICKY ; $D3
const MAGNEZONE ; $D4
const TANGROWTH ; $D6
const ELECTIVIRE ; $D8
const MAGMORTAR ; $D9
const PORYGONZ ; $DB
const KLEAVOR ; $DC
; const SIRFETCHD ; $DD
; const MR_RIME ; $DE
; const PERRSERKER ; $DF

26
data/pokemon/base_stats.asm
View file

@ -24,6 +24,7 @@ INCLUDE "data/pokemon/base_stats/spearow.asm"
INCLUDE "data/pokemon/base_stats/fearow.asm"
INCLUDE "data/pokemon/base_stats/ekans.asm"
INCLUDE "data/pokemon/base_stats/arbok.asm"
;INCLUDE "data/pokemon/base_stats/pichu.asm"
INCLUDE "data/pokemon/base_stats/pikachu.asm"
INCLUDE "data/pokemon/base_stats/raichu.asm"
INCLUDE "data/pokemon/base_stats/gorochu.asm"
@ -36,11 +37,13 @@ INCLUDE "data/pokemon/base_stats/nidoranm.asm"
INCLUDE "data/pokemon/base_stats/nidorino.asm"
INCLUDE "data/pokemon/base_stats/nidoking.asm"
INCLUDE "data/pokemon/base_stats/nidoreign.asm"
;INCLUDE "data/pokemon/base_stats/cleffa.asm"
INCLUDE "data/pokemon/base_stats/clefairy.asm"
INCLUDE "data/pokemon/base_stats/clefable.asm"
INCLUDE "data/pokemon/base_stats/mikon.asm"
INCLUDE "data/pokemon/base_stats/vulpix.asm"
INCLUDE "data/pokemon/base_stats/ninetales.asm"
INCLUDE "data/pokemon/base_stats/igglybuff.asm"
INCLUDE "data/pokemon/base_stats/jigglypuff.asm"
INCLUDE "data/pokemon/base_stats/wigglytuff.asm"
INCLUDE "data/pokemon/base_stats/bittybat.asm"
@ -103,7 +106,7 @@ INCLUDE "data/pokemon/base_stats/slowking.asm"
INCLUDE "data/pokemon/base_stats/magnemite.asm"
INCLUDE "data/pokemon/base_stats/magnetite.asm"
INCLUDE "data/pokemon/base_stats/magneton.asm"
;INCLUDE "data/pokemon/base_stats/magnezone.asm"
INCLUDE "data/pokemon/base_stats/magnezone.asm"
INCLUDE "data/pokemon/base_stats/barunda.asm"
INCLUDE "data/pokemon/base_stats/farfetchd.asm"
INCLUDE "data/pokemon/base_stats/madaamu.asm"
@ -142,26 +145,29 @@ INCLUDE "data/pokemon/base_stats/cubone.asm"
INCLUDE "data/pokemon/base_stats/marowak.asm"
INCLUDE "data/pokemon/base_stats/guardia.asm"
INCLUDE "data/pokemon/base_stats/kangaskhan.asm"
INCLUDE "data/pokemon/base_stats/tyrogue.asm"
INCLUDE "data/pokemon/base_stats/hitmonlee.asm"
INCLUDE "data/pokemon/base_stats/hitmonchan.asm"
INCLUDE "data/pokemon/base_stats/hitmontop.asm"
INCLUDE "data/pokemon/base_stats/lickitung.asm"
;INCLUDE "data/pokemon/base_stats/lickilicky.asm"
INCLUDE "data/pokemon/base_stats/lickilicky.asm"
INCLUDE "data/pokemon/base_stats/koffing.asm"
INCLUDE "data/pokemon/base_stats/weezing.asm"
INCLUDE "data/pokemon/base_stats/rhyhorn.asm"
INCLUDE "data/pokemon/base_stats/rhydon.asm"
INCLUDE "data/pokemon/base_stats/rhyperior.asm"
INCLUDE "data/pokemon/base_stats/happiny.asm"
INCLUDE "data/pokemon/base_stats/chansey.asm"
INCLUDE "data/pokemon/base_stats/blissey.asm"
INCLUDE "data/pokemon/base_stats/monja.asm"
INCLUDE "data/pokemon/base_stats/tangela.asm"
INCLUDE "data/pokemon/base_stats/tangrowth.asm"
INCLUDE "data/pokemon/base_stats/decilla.asm"
INCLUDE "data/pokemon/base_stats/gyaoon.asm"
INCLUDE "data/pokemon/base_stats/omega.asm"
INCLUDE "data/pokemon/base_stats/horsea.asm"
INCLUDE "data/pokemon/base_stats/seadra.asm"
;INCLUDE "data/pokemon/base_stats/kingdra.asm"
INCLUDE "data/pokemon/base_stats/kingdra.asm"
INCLUDE "data/pokemon/base_stats/gyopin.asm"
INCLUDE "data/pokemon/base_stats/goldeen.asm"
INCLUDE "data/pokemon/base_stats/seaking.asm"
@ -171,15 +177,22 @@ INCLUDE "data/pokemon/base_stats/cryithan.asm"
INCLUDE "data/pokemon/base_stats/staryu.asm"
INCLUDE "data/pokemon/base_stats/starmie.asm"
INCLUDE "data/pokemon/base_stats/jagg.asm"
INCLUDE "data/pokemon/base_stats/mimejr.asm"
INCLUDE "data/pokemon/base_stats/mrmime.asm"
INCLUDE "data/pokemon/base_stats/scyther.asm"
INCLUDE "data/pokemon/base_stats/scizor.asm"
INCLUDE "data/pokemon/base_stats/kleavor.asm"
INCLUDE "data/pokemon/base_stats/pinsir.asm"
INCLUDE "data/pokemon/base_stats/purakkusu.asm"
INCLUDE "data/pokemon/base_stats/smoochum.asm"
INCLUDE "data/pokemon/base_stats/jynx.asm"
INCLUDE "data/pokemon/base_stats/buu.asm"
;INCLUDE "data/pokemon/base_stats/elekid.asm"
INCLUDE "data/pokemon/base_stats/electabuzz.asm"
INCLUDE "data/pokemon/base_stats/electivire.asm"
;INCLUDE "data/pokemon/base_stats/magby.asm"
INCLUDE "data/pokemon/base_stats/magmar.asm"
INCLUDE "data/pokemon/base_stats/magmortar.asm"
INCLUDE "data/pokemon/base_stats/trampel.asm"
INCLUDE "data/pokemon/base_stats/tauros.asm"
INCLUDE "data/pokemon/base_stats/magikarp.asm"
@ -197,13 +210,18 @@ INCLUDE "data/pokemon/base_stats/leafeon.asm"
INCLUDE "data/pokemon/base_stats/glaceon.asm"
INCLUDE "data/pokemon/base_stats/sylveon.asm"
INCLUDE "data/pokemon/base_stats/porygon.asm"
;INCLUDE "data/pokemon/base_stats/porygon2.asm"
INCLUDE "data/pokemon/base_stats/porygon2.asm"
INCLUDE "data/pokemon/base_stats/porygonz.asm"
INCLUDE "data/pokemon/base_stats/omanyte.asm"
INCLUDE "data/pokemon/base_stats/omastar.asm"
INCLUDE "data/pokemon/base_stats/kabuto.asm"
INCLUDE "data/pokemon/base_stats/kabutops.asm"
INCLUDE "data/pokemon/base_stats/aerodactyl.asm"
;INCLUDE "data/pokemon/base_stats/munchlax.asm"
INCLUDE "data/pokemon/base_stats/snorlax.asm"
;INCLUDE "data/pokemon/base_stats/perrserker.asm"
;INCLUDE "data/pokemon/base_stats/sirfetchd.asm"
;INCLUDE "data/pokemon/base_stats/mrrime.asm
INCLUDE "data/pokemon/base_stats/articuno.asm"
INCLUDE "data/pokemon/base_stats/zapdos.asm"
INCLUDE "data/pokemon/base_stats/moltres.asm"

24
data/pokemon/base_stats/kingdra.asm Normal file
View file

@ -0,0 +1,24 @@
db DEX_KINGDRA ; pokedex id
db 55, 65, 95, 85, 95
; hp atk def spd spc
db WATER, WATER ; type
db 75 ; catch rate
db 155 ; base exp
INCBIN "gfx/pokemon/front/seadra.pic", 0, 1 ; sprite dimensions
dw SeadraPicFront, SeadraPicBack
db BUBBLE, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset
tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \
ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, MIMIC, \
DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \
SUBSTITUTE, SURF
; end
db BANK(SeadraPicFront)
assert BANK(SeadraPicFront) == BANK(SeadraPicBack)

26
data/pokemon/base_stats/lickilicky.asm Normal file
View file

@ -0,0 +1,26 @@
db DEX_LICKILICKY ; pokedex id
db 90, 55, 75, 30, 60
; hp atk def spd spc
db NORMAL, NORMAL ; type
db 45 ; catch rate
db 127 ; base exp
INCBIN "gfx/pokemon/front/lickitung.pic", 0, 1 ; sprite dimensions
dw LickitungPicFront, LickitungPicBack
db WRAP, SUPERSONIC, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset
tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \
TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \
BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \
RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \
MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \
REST, SUBSTITUTE, CUT, SURF, STRENGTH
; end
db BANK(LickitungPicFront)
assert BANK(LickitungPicFront) == BANK(LickitungPicBack)

24
data/pokemon/base_stats/magnezone.asm Normal file
View file

@ -0,0 +1,24 @@
db DEX_MAGNEZONE ; pokedex id
db 50, 60, 95, 70, 120
; hp atk def spd spc
db ELECTRIC, ELECTRIC ; type
db 60 ; catch rate
db 161 ; base exp
INCBIN "gfx/pokemon/front/magneton.pic", 0, 1 ; sprite dimensions
dw MagnetonPicFront, MagnetonPicBack
db TACKLE, SONICBOOM, THUNDERSHOCK, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset
tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \
THUNDERBOLT, THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, \
REFLECT, BIDE, SWIFT, REST, THUNDER_WAVE, \
SUBSTITUTE, FLASH
; end
db BANK(MagnetonPicFront)
assert BANK(MagnetonPicFront) == BANK(MagnetonPicBack)

25
data/pokemon/base_stats/porygon2.asm Normal file
View file

@ -0,0 +1,25 @@
db DEX_PORYGON2 ; pokedex id
db 65, 60, 70, 40, 75
; hp atk def spd spc
db NORMAL, NORMAL ; type
db 45 ; catch rate
db 130 ; base exp
INCBIN "gfx/pokemon/front/porygon.pic", 0, 1 ; sprite dimensions
dw PorygonPicFront, PorygonPicBack
db TACKLE, SHARPEN, CONVERSION, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset
tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, ICE_BEAM, BLIZZARD, \
HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, \
TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \
SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \
TRI_ATTACK, SUBSTITUTE, FLASH
; end
db BANK(PorygonPicFront)
assert BANK(PorygonPicFront) == BANK(PorygonPicBack)

26
data/pokemon/cries.asm
View file

@ -217,8 +217,26 @@ CryData::
mon_cry SFX_CRY_00, $00, $00 ; Steelix
mon_cry SFX_CRY_00, $00, $00 ; Hitmontop
mon_cry SFX_CRY_00, $00, $00 ; Blissey
; mon_cry SFX_CRY_00, $00, $00 ; Porygon2
; mon_cry SFX_CRY_00, $00, $00 ; Kingdra
; mon_cry SFX_CRY_00, $00, $00 ; Lickilicky
; mon_cry SFX_CRY_00, $00, $00 ; Magnezone
mon_cry SFX_CRY_00, $00, $00 ; Porygon2
mon_cry SFX_CRY_00, $00, $00 ; Kingdra
mon_cry SFX_CRY_00, $00, $00 ; Lickilicky
mon_cry SFX_CRY_00, $00, $00 ; Magnezone
mon_cry SFX_CRY_00, $00, $00 ; Tangrowth
mon_cry SFX_CRY_00, $00, $00 ; Electivire
mon_cry SFX_CRY_00, $00, $00 ; Magmortar
mon_cry SFX_CRY_00, $00, $00 ; PorygonZ
mon_cry SFX_CRY_00, $00, $00 ; Kleavor
;mon_cry SFX_CRY_00, $00, $00 ; Sirfetchd
;mon_cry SFX_CRY_00, $00, $00 ; Mr. Rime
;mon_cry SFX_CRY_00, $00, $00 ; Perrserker
;mon_cry SFX_CRY_00, $00, $00 ; Cleffa
;mon_cry SFX_CRY_00, $00, $00 ; Igglybuff
;mon_cry SFX_CRY_00, $00, $00 ; Smoochum
;mon_cry SFX_CRY_00, $00, $00 ; Happiny
;mon_cry SFX_CRY_00, $00, $00 ; Munchlax
;mon_cry SFX_CRY_00, $00, $00 ; Elekid
;mon_cry SFX_CRY_00, $00, $00 ; Magby
;mon_cry SFX_CRY_00, $00, $00 ; Mime Jr
;mon_cry SFX_CRY_00, $00, $00 ; Pichu
;mon_cry SFX_CRY_00, $00, $00 ; Tyrogue
assert_table_length NUM_POKEMON_INDEXES

27
data/pokemon/dex_entries.asm
View file

@ -211,10 +211,29 @@ PokedexEntryPointers:
dw SteelixDexEntry
dw HitmontopDexEntry
dw BlisseyDexEntry
; dw Porygon2DexEntry
; dw KingdraDexEntry
; dw LickilickyDexEntry
; dw MagnezoneDexEntry
dw Porygon2DexEntry
dw KingdraDexEntry
dw LickilickyDexEntry
dw MagnezoneDexEntry
dw TangrowthDexEntry
dw ElectivireDexEntry
dw MagmortarDexEntry
dw PorygonZDexEntry
dw KleavorDexEntry
; dw SirfetchdDexEntry
; dw MrRimeDexEntry
; dw PerrserkerDexEntry
; dw CleffaDexEntry
; dw IgglybuffDexEntry
; dw SmoochumDexEntry
; dw HappinyDexEntry
; dw MunchlaxDexEntry
; dw ElekidDexEntry
; dw MagbyDexEntry
; dw MimeJrDexEntry
; dw PichuDexEntry
; dw TyrogueDexEntry
assert_table_length NUM_POKEMON_INDEXES
; string: species name

26
data/pokemon/dex_order.asm
View file

@ -211,8 +211,26 @@ PokedexOrder:
db DEX_STEELIX
db DEX_HITMONTOP
db DEX_BLISSEY
; db DEX_PORYGON2
; db DEX_KINGDRA
; db DEX_LICKILICKY
; db DEX_MAGNEZONE
db DEX_PORYGON2
db DEX_KINGDRA
db DEX_LICKILICKY
db DEX_MAGNEZONE
db DEX_TANGROWTH
db DEX_ELECTIVIRE
db DEX_MAGMORTAR
db DEX_PORYGONZ
db DEX_KLEAVOR
;db DEX_SIRFETCHD
;db DEX_MRRIME
;db DEX_PERRSERKER
;db DEX_CLEFFA
;db DEX_IGGLYBUFF
;db DEX_SMOOCHUM
;db DEX_HAPPINY
;db DEX_MUNCHLAX
;db DEX_ELEKID
;db DEX_MAGBY
;db DEX_MIMEJR
;db DEX_PICHU
;db DEX_TYROGUE
assert_table_length NUM_POKEMON_INDEXES

86
data/pokemon/evos_moves.asm
View file

@ -214,10 +214,28 @@ EvosMovesPointerTable:
dw SteelixEvosMoves
dw HitmontopEvosMoves
dw BlisseyEvosMoves
; dw Porygon2EvosMoves
; dw KingdraEvosMoves
; dw LickilickyEvosMoves
; dw MagnezoneEvosMoves
dw Porygon2EvosMoves
dw KingdraEvosMoves
dw LickilickyEvosMoves
dw MagnezoneEvosMoves
dw TangrowthEvosMoves
dw ElectivireEvosMoves
dw MagmortarEvosMoves
dw PorygonZEvosMoves
dw KleavorEvosMoves
;dw SirfetchdEvosMoves
;dw MrRimeEvosMoves
;dw PerrserkerEvosMoves
;dw CleffaEvosMoves
;dw IgglybuffEvosMoves
;dw SmoochumEvosMoves
;dw HappinyEvosMoves
;dw MunchlaxEvosMoves
;dw ElekidEvosMoves
;dw MagbyEvosMoves
;dw MimeJrEvosMoves
;dw PichuEvosMoves
;dw TyrogueEvosMoves
assert_table_length NUM_POKEMON_INDEXES
RhydonEvosMoves:
@ -2754,3 +2772,63 @@ MagnezoneEvosMoves:
db 46, SWIFT
db 54, SCREECH
db 0
TangrowthEvosMoves:
; Evolutions
db 0
; Learnset
db 24, BIND
db 27, ABSORB
db 29, VINE_WHIP
db 32, POISONPOWDER
db 36, STUN_SPORE
db 39, SLEEP_POWDER
db 45, SLAM
db 48, GROWTH
db 0
ElectivireEvosMoves:
; Evolutions
db 0
; Learnset
db 34, THUNDERSHOCK
db 37, SCREECH
db 42, THUNDERPUNCH
db 49, LIGHT_SCREEN
db 54, THUNDER
db 0
MagmortarEvosMoves:
; Evolutions
db 0
; Learnset
db 36, LEER
db 39, CONFUSE_RAY
db 43, FIRE_PUNCH
db 48, SMOKESCREEN
db 52, SMOG
db 55, FLAMETHROWER
db 0
PorygonZEvosMoves:
; Evolutions
db 0
; Learnset
db 23, PSYBEAM
db 28, RECOVER
db 35, AGILITY
db 42, TRI_ATTACK
db 0
KleavorEvosMoves:
; Evolutions
db 0
; Learnset
db 17, LEER
db 20, FOCUS_ENERGY
db 24, DOUBLE_TEAM
db 29, SLASH
db 35, SWORDS_DANCE
db 42, AGILITY
db 50, ROCK_SLIDE
db 0

25
data/pokemon/menu_icons.asm
View file

@ -24,6 +24,7 @@ MonPartyData:
nybble ICON_BIRD ; Fearow
nybble ICON_SNAKE ; Ekans
nybble ICON_SNAKE ; Arbok
;nybble ICON_FAIRY ; Pichu
nybble ICON_FAIRY ; Pikachu
nybble ICON_FAIRY ; Raichu
nybble ICON_FAIRY ; Gorochu
@ -36,11 +37,13 @@ MonPartyData:
nybble ICON_MON ; Nidorino
nybble ICON_MON ; Nidoking
nybble ICON_MON ; Nidoreign
;nybble ICON_FAIRY ; Cleffa
nybble ICON_FAIRY ; Clefairy
nybble ICON_FAIRY ; Clefable
nybble ICON_QUADRUPED ; Mikon
nybble ICON_QUADRUPED ; Vulpix
nybble ICON_QUADRUPED ; Ninetales
;nybble ICON_FAIRY ; Igglybuff
nybble ICON_FAIRY ; Jigglypuff
nybble ICON_FAIRY ; Wigglytuff
nybble ICON_MON ; Bittybat
@ -103,7 +106,7 @@ MonPartyData:
nybble ICON_BALL ; Magnemite
nybble ICON_BALL ; Magnetite
nybble ICON_BALL ; Magneton
; nybble ICON_BALL ; Magnezone
nybble ICON_BALL ; Magnezone
nybble ICON_BALL ; Barunda
nybble ICON_BIRD ; Farfetch'd
nybble ICON_BIRD ; Madaamu
@ -142,26 +145,29 @@ MonPartyData:
nybble ICON_MON ; Marowak
nybble ICON_MON ; Guardia
nybble ICON_MON ; Kangaskhan
;nybble ICON_FAIRY ; Tyrogue
nybble ICON_MON ; Hitmonlee
nybble ICON_MON ; Hitmonchan
nybble ICON_MON ; Hitmontop
nybble ICON_MON ; Lickitung
; nybble ICON_MON ; Lickilicky
nybble ICON_MON ; Lickilicky
nybble ICON_MON ; Koffing
nybble ICON_MON ; Weezing
nybble ICON_QUADRUPED ; Rhyhorn
nybble ICON_MON ; Rhydon
nybble ICON_MON ; Rhyperior
;nybble ICON_FAIRY ; Happiny
nybble ICON_FAIRY ; Chansey
nybble ICON_FAIRY ; Blissey
nybble ICON_GRASS ; Monja
nybble ICON_GRASS ; Tangela
nybble ICON_GRASS ; Tangrowth
nybble ICON_MON ; Decilla
nybble ICON_MON ; Gyaoon
nybble ICON_MON ; Omega
nybble ICON_WATER ; Horsea
nybble ICON_WATER ; Seadra
; nybble ICON_WATER ; Kingdra
nybble ICON_WATER ; Kingdra
nybble ICON_WATER ; Gyopin
nybble ICON_WATER ; Goldeen
nybble ICON_WATER ; Seaking
@ -171,15 +177,22 @@ MonPartyData:
nybble ICON_HELIX ; Staryu
nybble ICON_HELIX ; Starmie
nybble ICON_WATER ; Jagg
;nybble ICON_FAIRY ; Mime Jr.
nybble ICON_MON ; Mr.Mime
nybble ICON_BUG ; Scyther
nybble ICON_BUG ; Scizor
nybble ICON_BUG ; Kleavor
nybble ICON_BUG ; Pinsir
nybble ICON_BUG ; Purakkusu
;nybble ICON_FAIRY ; Smoochum
nybble ICON_MON ; Jynx
nybble ICON_MON ; Buu
;nybble ICON_FAIRY ; Elekid
nybble ICON_MON ; Electabuzz
nybble ICON_MON ; Electivire
;nybble ICON_FAIRY ; Magby
nybble ICON_MON ; Magmar
nybble ICON_MON ; Magmortar
nybble ICON_MON ; Trampel
nybble ICON_QUADRUPED ; Tauros
nybble ICON_WATER ; Magikarp
@ -197,13 +210,17 @@ MonPartyData:
nybble ICON_QUADRUPED ; Glaceon
nybble ICON_QUADRUPED ; Sylveon
nybble ICON_MON ; Porygon
; nybble ICON_MON ; Porygon2
nybble ICON_MON ; Porygon2
nybble ICON_BIRD ; PorygonZ
nybble ICON_HELIX ; Omanyte
nybble ICON_HELIX ; Omastar
nybble ICON_HELIX ; Kabuto
nybble ICON_HELIX ; Kabutops
nybble ICON_BIRD ; Aerodactyl
;nybble ICON_FAIRY ; Munchlax
nybble ICON_MON ; Snorlax
;nybble ICON_MON ; Perrserker
;nybble ICON_BIRD ; Mr. Rime
nybble ICON_BIRD ; Articuno
nybble ICON_BIRD ; Zapdos
nybble ICON_BIRD ; Moltres

27
data/pokemon/names.asm
View file

@ -211,8 +211,27 @@ MonsterNames::
db "STEELIX@@@"
db "HITMONTOP@"
db "BLISSEY@@@"
; db "PORYGON2@@"
; db "KINGDRA@@@"
; db "LICKILICKY"
; db "MAGNEZONE@"
db "PORYGON2@@"
db "KINGDRA@@@"
db "LICKILICKY"
db "MAGNEZONE@"
db "TANGROWTH@"
db "ELECTIVIRE"
db "MAGMORTAR@"
db "PORYGONZ@@"
db "KLEAVOR@@@"
;db "SIRFETCH'D"
;db "MR.RIME@@@"
;db "PERRSERKER"
;db "CLEFFA@@@@"
;db "IGGLYBUFF@"
;db "SMOOCHUM@@"
;db "HAPPINY@@@"
;db "MUNCHLAX@@"
;db "ELEKID@@@@"
;db "MAGBY@@@@@"
;db "MIME JR@@@"
;db "PICHU@@@@@"
;db "TYROGUE@@@"
assert_table_length NUM_POKEMON_INDEXES

28
data/pokemon/palettes.asm
View file

@ -25,6 +25,7 @@ MonsterPalettes:
db PAL_BROWNMON ; FEAROW
db PAL_PURPLEMON ; EKANS
db PAL_PURPLEMON ; ARBOK
; db PAL_YELLOWMON ; PICHU
db PAL_YELLOWMON ; PIKACHU
db PAL_YELLOWMON ; RAICHU
db PAL_YELLOWMON ; GOROCHU
@ -37,11 +38,13 @@ MonsterPalettes:
db PAL_PURPLEMON ; NIDORINO
db PAL_PURPLEMON ; NIDOKING
db PAL_GREYMON ; NIDOREIGN
; db PAL_PINKMON ; CLEFFA
db PAL_PINKMON ; CLEFAIRY
db PAL_PINKMON ; CLEFABLE
db PAL_REDMON ; MIKON
db PAL_REDMON ; VULPIX
db PAL_YELLOWMON ; NINETALES
; db PAL_PINKMON ; IGGLYBUFF
db PAL_PINKMON ; JIGGLYPUFF
db PAL_PINKMON ; WIGGLYTUFF
db PAL_BLUEMON ; BITTYBAT
@ -104,7 +107,7 @@ MonsterPalettes:
db PAL_GREYMON ; MAGNEMITE
db PAL_GREYMON ; MAGNETITE
db PAL_GREYMON ; MAGNETON
; db PAL_GREYMON ; MAGNEZONE
db PAL_GREYMON ; MAGNEZONE
db PAL_PINKMON ; BARUNDA
db PAL_BROWNMON ; FARFETCHD
db PAL_BROWNMON ; MADAAMU
@ -143,26 +146,29 @@ MonsterPalettes:
db PAL_BROWNMON ; MAROWAK
db PAL_BROWNMON ; GUARDIA
db PAL_BROWNMON ; KANGASKHAN
;db PAL_BROWNMON ; TYROGUE
db PAL_BROWNMON ; HITMONLEE
db PAL_BROWNMON ; HITMONCHAN
db PAL_BROWNMON ; HITMONTOP
db PAL_PINKMON ; LICKITUNG
; db PAL_PINKMON ; LICKILICKY
db PAL_PINKMON ; LICKILICKY
db PAL_PURPLEMON ; KOFFING
db PAL_PURPLEMON ; WEEZING
db PAL_GREYMON ; RHYHORN
db PAL_GREYMON ; RHYDON
db PAL_BROWNMON ; RHYPERIOR
;db PAL_PINKMON ; HAPPINY
db PAL_PINKMON ; CHANSEY
db PAL_PINKMON ; BLISSEY
db PAL_BLUEMON ; MONJA
db PAL_BLUEMON ; TANGELA
db PAL_BLUEMON ; TANGROWTH
db PAL_GREENMON ; DECILLA
db PAL_GREENMON ; GYAOON
db PAL_GREYMON ; OMEGA
db PAL_CYANMON ; HORSEA
db PAL_CYANMON ; SEADRA
; db PAL_CYANMON ; KINGDRA
db PAL_CYANMON ; KINGDRA
db PAL_REDMON ; GYOPIN
db PAL_REDMON ; GOLDEEN
db PAL_REDMON ; SEAKING
@ -172,15 +178,22 @@ MonsterPalettes:
db PAL_REDMON ; STARYU
db PAL_PURPLEMON ; STARMIE
db PAL_BLUEMON ; JAGG
;db PAL_BLUEMON ; MIME JR
db PAL_PINKMON ; MR_MIME
db PAL_GREENMON ; SCYTHER
db PAL_GREENMON ; SCIZOR
db PAL_BROWNMON ; KLEAVOR
db PAL_BROWNMON ; PINSIR
db PAL_BROWNMON ; PURAKKUSU
db PAL_REDBAR ; JYNX
;db PAL_BLUEMON ; SMOOCHUM
db PAL_REDMON ; JYNX
db PAL_BLUEMON ; BUU
;db PAL_YELLOWMON ; ELEKID
db PAL_YELLOWMON ; ELECTABUZZ
db PAL_YELLOWMON ; ELECTIVIRE
;db PAL_REDMON ; MAGBY
db PAL_REDMON ; MAGMAR
db PAL_REDMON ; MAGMORTAR
db PAL_GREYMON ; TRAMPEL
db PAL_BROWNMON ; TAUROS
db PAL_REDMON ; MAGIKARP
@ -198,13 +211,18 @@ MonsterPalettes:
db PAL_CYANMON ; GLACEON
db PAL_MEWMON ; SYLVEON
db PAL_MEWMON ; PORYGON
; db PAL_MEWMON ; PORYGON2
db PAL_MEWMON ; PORYGON2
db PAL_MEWMON ; PORYGONZ
db PAL_BLUEMON ; OMANYTE
db PAL_BLUEMON ; OMASTAR
db PAL_BROWNMON ; KABUTO
db PAL_BROWNMON ; KABUTOPS
db PAL_GREYMON ; AERODACTYL
;db PAL_MEWMON ; MUNCHLAX
db PAL_MEWMON ; SNORLAX
;db PAL_GREENMON ; PERRSERKER
;db PAL_REDMON ; SIRFETCHD
;db PAL_CYANMON ; MR. RIME
db PAL_BLUEMON ; ARTICUNO
db PAL_YELLOWMON ; ZAPDOS
db PAL_REDMON ; MOLTRES

3
layout.link
View file

@ -194,7 +194,7 @@ WRAM0
"Party Data"
"Main Data"
"Current Box Data"
org $df00
org $df04
"Stack"
VRAM
"VRAM"
@ -209,3 +209,4 @@ SRAM $3
HRAM
"OAM DMA"
"HRAM"

7
ram/wram.asm
View file

@ -1731,7 +1731,6 @@ wPartyMonNicksEnd::
wPartyDataEnd::
SECTION "Main Data", WRAM0
wMainDataStart::
@ -2298,7 +2297,6 @@ wDayCareMon:: box_struct wDayCareMon
wMainDataEnd::
SECTION "Current Box Data", WRAM0
wBoxDataStart::
@ -2327,9 +2325,8 @@ wBoxMonNicksEnd::
wBoxDataEnd::
SECTION "Stack", WRAM0
; the stack grows downward
ds $100 - 1
wStack:: db
ds $7D5 - 1
wStack:: db