thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-06 16:15:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Misty 2023-10-29 18:08:50 -04:00
commit 5d1bf81944
154 changed files with 1200 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

17
data/pokemon/base_stats.asm
View file

@ -42,6 +42,13 @@ INCLUDE "data/pokemon/base_stats/butterfree.asm"
INCLUDE "data/pokemon/base_stats/weedle.asm"
INCLUDE "data/pokemon/base_stats/kakuna.asm"
INCLUDE "data/pokemon/base_stats/beedrill.asm"
INCLUDE "data/pokemon/base_stats/gentlarva.asm"
INCLUDE "data/pokemon/base_stats/pupal.asm"
INCLUDE "data/pokemon/base_stats/carapthor.asm"
INCLUDE "data/pokemon/base_stats/kotora.asm"
INCLUDE "data/pokemon/base_stats/gaotora.asm"
INCLUDE "data/pokemon/base_stats/gorotora.asm"
INCLUDE "data/pokemon/base_stats/raitora.asm"
INCLUDE "data/pokemon/base_stats/pidgey.asm"
INCLUDE "data/pokemon/base_stats/pidgeotto.asm"
INCLUDE "data/pokemon/base_stats/pidgeot.asm"
@ -65,27 +72,34 @@ INCLUDE "data/pokemon/base_stats/nidoking.asm"
INCLUDE "data/pokemon/base_stats/nidoreign.asm"
INCLUDE "data/pokemon/base_stats/clefairy.asm"
INCLUDE "data/pokemon/base_stats/clefable.asm"
INCLUDE "data/pokemon/base_stats/vulpiii.asm"
INCLUDE "data/pokemon/base_stats/vulpix.asm"
INCLUDE "data/pokemon/base_stats/ninetales.asm"
INCLUDE "data/pokemon/base_stats/jigglypuff.asm"
INCLUDE "data/pokemon/base_stats/wigglytuff.asm"
INCLUDE "data/pokemon/base_stats/bittybat.asm"
INCLUDE "data/pokemon/base_stats/zubat.asm"
INCLUDE "data/pokemon/base_stats/golbat.asm"
INCLUDE "data/pokemon/base_stats/oddish.asm"
INCLUDE "data/pokemon/base_stats/gloom.asm"
INCLUDE "data/pokemon/base_stats/vileplume.asm"
INCLUDE "data/pokemon/base_stats/paraspor.asm"
INCLUDE "data/pokemon/base_stats/paras.asm"
INCLUDE "data/pokemon/base_stats/parasect.asm"
INCLUDE "data/pokemon/base_stats/venonat.asm"
INCLUDE "data/pokemon/base_stats/venomoth.asm"
INCLUDE "data/pokemon/base_stats/diglett.asm"
INCLUDE "data/pokemon/base_stats/dugtrio.asm"
INCLUDE "data/pokemon/base_stats/coinpur.asm"
INCLUDE "data/pokemon/base_stats/meowth.asm"
INCLUDE "data/pokemon/base_stats/persian.asm"
INCLUDE "data/pokemon/base_stats/perrserker.asm"
INCLUDE "data/pokemon/base_stats/psyduck.asm"
INCLUDE "data/pokemon/base_stats/golduck.asm"
INCLUDE "data/pokemon/base_stats/mankey.asm"
INCLUDE "data/pokemon/base_stats/primeape.asm"
INCLUDE "data/pokemon/base_stats/annihilape.asm"
INCLUDE "data/pokemon/base_stats/pupperon.asm"
INCLUDE "data/pokemon/base_stats/growlithe.asm"
INCLUDE "data/pokemon/base_stats/arcanine.asm"
INCLUDE "data/pokemon/base_stats/poliwag.asm"
@ -237,6 +251,9 @@ INCLUDE "data/pokemon/base_stats/wooper.asm"
INCLUDE "data/pokemon/base_stats/quagsire.asm"
INCLUDE "data/pokemon/base_stats/espeon.asm"
INCLUDE "data/pokemon/base_stats/umbreon.asm"
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/murkrow.asm"
INCLUDE "data/pokemon/base_stats/slowking.asm"
INCLUDE "data/pokemon/base_stats/misdreavus.asm"

21
data/pokemon/base_stats/vulpiii.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 28, 31, 30, 60, 45, 60
; hp atk def spd sat sdf
db FIRE, FIRE ; type
db 190 ; catch rate
db 63 ; base exp
db BURNT_BERRY, BURNT_BERRY ; items
db GENDER_F75 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/vulpix/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_GROUND, EGG_GROUND ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
; end

17
data/pokemon/cries.asm
View file

@ -21,6 +21,13 @@ PokemonCries::
mon_cry CRY_WEEDLE, 238, 129 ; WEEDLE
mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA
mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL
mon_cry CRY_NIDORAN_M, 0, 0 ; GENTLARVA (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; PUPAL (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; CARAPTHOR (incomplete)
mon_cry CRY_KANGASKHAN, 163, 129 ; KOTORA
mon_cry CRY_KANGASKHAN, 45, 129 ; GAOTORA
mon_cry CRY_KANGASKHAN, 5, 129 ; GOROTORA
mon_cry CRY_KANGASKHAN, 5, 129 ; RAITORA (Clone of Gorotora's for nowtm)
mon_cry CRY_PIDGEY, 223, 132 ; PIDGEY
mon_cry CRY_PIDGEOTTO, 40, 320 ; PIDGEOTTO
mon_cry CRY_PIDGEOTTO, 17, 383 ; PIDGEOT
@ -44,27 +51,34 @@ PokemonCries::
mon_cry CRY_NIDOQUEEN, 44, 256 ; NIDOREIGN
mon_cry CRY_CLEFAIRY, 204, 129 ; CLEFAIRY
mon_cry CRY_CLEFAIRY, 170, 160 ; CLEFABLE
mon_cry CRY_PIDGEY, 224, 224 ; VULPIII
mon_cry CRY_VULPIX, 79, 144 ; VULPIX
mon_cry CRY_VULPIX, 136, 224 ; NINETALES
mon_cry CRY_PIDGEY, 255, 181 ; JIGGLYPUFF
mon_cry CRY_PIDGEY, 104, 224 ; WIGGLYTUFF
mon_cry CRY_SQUIRTLE, 224, 256 ; BITTYBAT (need to recover the old one from before it was removed from KEP)
mon_cry CRY_SQUIRTLE, 224, 256 ; ZUBAT
mon_cry CRY_SQUIRTLE, 250, 256 ; GOLBAT
mon_cry CRY_ODDISH, 221, 129 ; ODDISH
mon_cry CRY_ODDISH, 170, 192 ; GLOOM
mon_cry CRY_VILEPLUME, 34, 383 ; VILEPLUME
mon_cry CRY_PARAS, 32, 352 ; PARASPOR (see bittybat)
mon_cry CRY_PARAS, 32, 352 ; PARAS
mon_cry CRY_PARAS, 66, 383 ; PARASECT
mon_cry CRY_VENONAT, 68, 192 ; VENONAT
mon_cry CRY_VENONAT, 41, 256 ; VENOMOTH
mon_cry CRY_DIGLETT, 170, 129 ; DIGLETT
mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO
mon_cry CRY_CLEFAIRY, 193, 156 ; COINPUR
mon_cry CRY_CLEFAIRY, 119, 144 ; MEOWTH
mon_cry CRY_CLEFAIRY, 153, 383 ; PERSIAN
mon_cry CRY_CLEFAIRY, 26, 192 ; PERRSERKER (may revise)
mon_cry CRY_PSYDUCK, 32, 224 ; PSYDUCK
mon_cry CRY_PSYDUCK, 255, 192 ; GOLDUCK
mon_cry CRY_NIDOQUEEN, 221, 224 ; MANKEY
mon_cry CRY_NIDOQUEEN, 175, 192 ; PRIMEAPE
mon_cry CRY_NIDOQUEEN, -1280, 512 ; ANNIHILAPE
mon_cry CRY_GROWLITHE, 32, 192 ; PUPPERON (see bittybat)
mon_cry CRY_GROWLITHE, 32, 192 ; GROWLITHE
mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE
mon_cry CRY_PIDGEY, 255, 383 ; POLIWAG
@ -216,6 +230,9 @@ PokemonCries::
mon_cry CRY_WOOPER, -198, 320 ; QUAGSIRE
mon_cry CRY_AIPOM, 162, 320 ; ESPEON
mon_cry CRY_VENONAT, -233, 240 ; UMBREON
mon_cry CRY_NIDORAN_M, 0, 0 ; LEAFEON (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; GLACEON (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; SYLVEON (incomplete)
mon_cry CRY_MARILL, -31, 384 ; MURKROW
mon_cry CRY_SLOWKING, 260, 512 ; SLOWKING
mon_cry CRY_HOOTHOOT, 304, 232 ; MISDREAVUS

17
data/pokemon/dex_entries.asm
View file

@ -15,6 +15,13 @@ ButterfreePokedexEntry:: INCLUDE "data/pokemon/dex_entries/butterfree.asm"
WeedlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/weedle.asm"
KakunaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kakuna.asm"
BeedrillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/beedrill.asm"
KotoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kotora.asm"
GaotoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gaotora.asm"
GorotoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gorotora.asm"
RaitoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raitora.asm"
GentlarvaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gentlarva.asm"
PupalPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pupal.asm"
CarapthorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/carapthor.asm"
PidgeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgey.asm"
PidgeottoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgeotto.asm"
PidgeotPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgeot.asm"
@ -38,27 +45,34 @@ NidokingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoking.asm"
NidoreignPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoreign.asm"
ClefairyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefairy.asm"
ClefablePokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefable.asm"
VulpiiiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/vulpiii.asm"
VulpixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/vulpix.asm"
NinetalesPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ninetales.asm"
JigglypuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jigglypuff.asm"
WigglytuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wigglytuff.asm"
BittybatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bittybat.asm"
ZubatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/zubat.asm"
GolbatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/golbat.asm"
OddishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/oddish.asm"
GloomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gloom.asm"
VileplumePokedexEntry:: INCLUDE "data/pokemon/dex_entries/vileplume.asm"
ParasporPokedexEntry:: INCLUDE "data/pokemon/dex_entries/paraspor.asm"
ParasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/paras.asm"
ParasectPokedexEntry:: INCLUDE "data/pokemon/dex_entries/parasect.asm"
VenonatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venonat.asm"
VenomothPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venomoth.asm"
DiglettPokedexEntry:: INCLUDE "data/pokemon/dex_entries/diglett.asm"
DugtrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dugtrio.asm"
CoinpurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/coinpur.asm"
MeowthPokedexEntry:: INCLUDE "data/pokemon/dex_entries/meowth.asm"
PerrserkerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/perrserker.asm"
PersianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/persian.asm"
PsyduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/psyduck.asm"
GolduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/golduck.asm"
MankeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mankey.asm"
PrimeapePokedexEntry:: INCLUDE "data/pokemon/dex_entries/primeape.asm"
AnnihilapePokedexEntry:: INCLUDE "data/pokemon/dex_entries/annihilape.asm"
PupperonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pupperon.asm"
GrowlithePokedexEntry:: INCLUDE "data/pokemon/dex_entries/growlithe.asm"
ArcaninePokedexEntry:: INCLUDE "data/pokemon/dex_entries/arcanine.asm"
PoliwagPokedexEntry:: INCLUDE "data/pokemon/dex_entries/poliwag.asm"
@ -222,6 +236,9 @@ WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wooper.asm"
QuagsirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/quagsire.asm"
EspeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/espeon.asm"
UmbreonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/umbreon.asm"
LeafeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/leafeon.asm"
GlaceonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/glaceon.asm"
SylveonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sylveon.asm"
MurkrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/murkrow.asm"
SlowkingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/slowking.asm"
MisdreavusPokedexEntry:: INCLUDE "data/pokemon/dex_entries/misdreavus.asm"

12
data/pokemon/dex_entries/annihilape.asm Normal file
View file

@ -0,0 +1,12 @@
db "RAGEMONKEY@" ; species name
dw 311, 1235 ; height, weight
db "ANNIHILAPE has"
next "abandoned its"
next "physical body,"
page "using its rage"
next "to deform its"
next "body in combat.@" ; Reference to its expanding unshackled arm.
; could be revised.

10
data/pokemon/dex_entries/bittybat.asm Normal file
View file

@ -0,0 +1,10 @@
db "TINY BAT@" ; species name
dw 107, 85 ; height, weight
db "Flits about in"
next "dark caves. A"
next "swarm of BITTYBAT"
page "can overwhelm"
next "even significantly"
next "larger #MON.@"

10
data/pokemon/dex_entries/carapthor.asm Normal file
View file

@ -0,0 +1,10 @@
db "DAPPER@" ; species name
dw 311, 760 ; height, weight
db "Thanks to its"
next "trademark jog,"
next "CARAPTHOR is a"
page "common sight on"
next "old television"
next "shows.@"

10
data/pokemon/dex_entries/coinpur.asm Normal file
View file

@ -0,0 +1,10 @@
db "BIG EATER@" ; species name
dw 102, 45 ; height, weight
db "Due to its poor"
next "eyesight, it's"
next "often distracted"
page "by city lights."
next "Even shiny coins"
next "transfix it.@" ; Vague reference to nighttime pollinators raiding people's homes, but applied to magpie-like behaviours.

10
data/pokemon/dex_entries/gaotora.asm Normal file
View file

@ -0,0 +1,10 @@
db "SHOCK CAT@" ; species name
dw 307, 1620 ; height, weight
db "As GAOTORA grows,"
next "it becomes more"
next "rebellious. It"
page "loves to shock"
next "its owners as"
next "a prank.@"

10
data/pokemon/dex_entries/gentlarva.asm Normal file
View file

@ -0,0 +1,10 @@
db "GRUB@" ; species name
dw 100, 80 ; height, weight
db "Adored by the"
next "elderly, it's"
next "seen as a symbol"
page "of a simpler"
next "time. Feeds on"
next "tree sap.@"

10
data/pokemon/dex_entries/glaceon.asm Normal file
View file

@ -0,0 +1,10 @@
db "FRESH SNOW@" ; species name
dw 207, 571 ; height, weight
db "With a mere cry,"
next "diamond dust will"
next "fill the air."
page "This makes it a"
next "popular #MON"
next "at ski resorts.@"

10
data/pokemon/dex_entries/gorotora.asm Normal file
View file

@ -0,0 +1,10 @@
db "GOROTORA@" ; species name
dw 511, 3870 ; height, weight
db "Lives in wooded"
next "areas. Completely"
next "wild, it strikes"
page "all who enter its"
next "domain with bolts"
next "of THUNDER.@"

10
data/pokemon/dex_entries/kotora.asm Normal file
View file

@ -0,0 +1,10 @@
db "SHOCK CAT@" ; species name
dw 200, 620 ; height, weight
db "Its rotund looks"
next "make it a popular"
next "first pet with"
page "kids. However,"
next "neglect quickly"
next "makes it feral.@"

10
data/pokemon/dex_entries/leafeon.asm Normal file
View file

@ -0,0 +1,10 @@
db "VERDANT@" ; species name
dw 303, 562 ; height, weight
db "Thanks to its"
next "photosynthesis," ; Don't ask about how long it took to make this fit in a reasonable manner. Please.
next "forests with"
page "LEAFEON have"
next "pristine air." ; Reference to the Lental Pokedex entry.
next "Hides in bushes.@"

10
data/pokemon/dex_entries/paraspor.asm Normal file
View file

@ -0,0 +1,10 @@
db "MUSHROOM@" ; species name
dw 50, 100 ; height, weight
db "Unable to move"
next "quickly, it lulls"
next "hungry WEEDLE"
page "into gnawing its"
next "mushroom before"
next "ambushing them.@"

10
data/pokemon/dex_entries/perrserker.asm Normal file
View file

@ -0,0 +1,10 @@
db "BIG EATER@" ; species name
dw 207, 617 ; height, weight
db "PERSIAN is its"
next "archenemy. Their"
next "mutual disdain"
page "have led to"
next "large-scale"
next "wars in cities.@" ; Could easily be revised.

10
data/pokemon/dex_entries/pupal.asm Normal file
View file

@ -0,0 +1,10 @@
db "PUPA@" ; species name
dw 207, 220 ; height, weight
db "Dislikes fights."
next "As PUPAL awaits"
next "evolution, a"
page "rhythmic hum can"
next "be heard from"
next "within.@"

10
data/pokemon/dex_entries/pupperon.asm Normal file
View file

@ -0,0 +1,10 @@
db "PUPPY@" ; species name
dw 102, 210 ; height, weight
db "Popular with rich"
next "women, PUPPERON's"
next "cute looks stop"
page "even the coldest"
next "hearts in the"
next "street.@" ; If you know, you know.

10
data/pokemon/dex_entries/raitora.asm Normal file
View file

@ -0,0 +1,10 @@
db "SHOCK CAT@" ; species name
dw 511, 4070 ; height, weight
db "A domesticated"
next "KOTORA becomes"
next "this #MON."
page "It loves to"
next "play with kids"
next "who groom it.@"

10
data/pokemon/dex_entries/sylveon.asm Normal file
View file

@ -0,0 +1,10 @@
db "INTERTWINING@" ; species name
dw 303, 518 ; height, weight
db "Even against a"
next "dragon #MON,"
next "SYLVEON will"
page "fight valiantly."
next "This founded many"
next "fairy tales.@"

10
data/pokemon/dex_entries/vulpiii.asm Normal file
View file

@ -0,0 +1,10 @@
db "FOX@" ; species name
dw 120, 110 ; height, weight
db "Small and weak,"
next "VULPIII prefers"
next "to pacify foes by"
page "by shaking its"
next "3 tails instead"
next "of fighting.@" ; Reference to Tail Whip overuse by Gen 1 AI

17
data/pokemon/dex_entry_pointers.asm
View file

@ -16,6 +16,13 @@ PokedexDataPointerTable:
dba WeedlePokedexEntry
dba KakunaPokedexEntry
dba BeedrillPokedexEntry
dba GentlarvaPokedexEntry
dba PupalPokedexEntry
dba CarapthorPokedexEntry
dba KotoraPokedexEntry
dba GaotoraPokedexEntry
dba GorotoraPokedexEntry
dba RaitoraPokedexEntry
dba PidgeyPokedexEntry
dba PidgeottoPokedexEntry
dba PidgeotPokedexEntry
@ -39,27 +46,34 @@ PokedexDataPointerTable:
dba NidoreignPokedexEntry
dba ClefairyPokedexEntry
dba ClefablePokedexEntry
dba VulpiiiPokedexEntry
dba VulpixPokedexEntry
dba NinetalesPokedexEntry
dba JigglypuffPokedexEntry
dba WigglytuffPokedexEntry
dba BittybatPokedexEntry
dba ZubatPokedexEntry
dba GolbatPokedexEntry
dba OddishPokedexEntry
dba GloomPokedexEntry
dba VileplumePokedexEntry
dba ParasporPokedexEntry
dba ParasPokedexEntry
dba ParasectPokedexEntry
dba VenonatPokedexEntry
dba VenomothPokedexEntry
dba DiglettPokedexEntry
dba DugtrioPokedexEntry
dba CoinpurPokedexEntry
dba MeowthPokedexEntry
dba PersianPokedexEntry
dba PerrserkerPokedexEntry
dba PsyduckPokedexEntry
dba GolduckPokedexEntry
dba MankeyPokedexEntry
dba PrimeapePokedexEntry
dba AnnihilapePokedexEntry
dba PupperonPokedexEntry
dba GrowlithePokedexEntry
dba ArcaninePokedexEntry
dba PoliwagPokedexEntry
@ -211,6 +225,9 @@ PokedexDataPointerTable:
dba QuagsirePokedexEntry
dba EspeonPokedexEntry
dba UmbreonPokedexEntry
dba LeafeonPokedexEntry
dba GlaceonPokedexEntry
dba SylveonPokedexEntry
dba MurkrowPokedexEntry
dba SlowkingPokedexEntry
dba MisdreavusPokedexEntry

17
data/pokemon/dex_order_alpha.asm
View file

@ -7,6 +7,7 @@ AlphabeticalPokedexOrder:
dw AIPOM
dw ALAKAZAM
dw AMPHAROS
dw ANNIHILAPE
dw ARBOK
dw ARCANINE
dw ARIADOS
@ -17,12 +18,14 @@ AlphabeticalPokedexOrder:
dw BELLIGNAN
dw BELLOSSOM
dw BELLSPROUT
dw BITTYBAT
dw BLASTOISE
dw BLASTYKE
dw BLISSEY
dw BULBASAUR
dw BURGELA
dw BUTTERFREE
dw CARAPTHOR
dw CATERPIE
dw CELEBI
dw CHANSEY
@ -35,6 +38,7 @@ AlphabeticalPokedexOrder:
dw CLEFAIRY
dw CLEFFA
dw CLOYSTER
dw COINPUR
dw CORSOLA
dw CROBAT
dw CROCONAW
@ -70,9 +74,12 @@ AlphabeticalPokedexOrder:
dw FORRETRESS
dw FURRET
dw GASTLY
dw GAOTORA
dw GENGAR
dw GENTLARVA
dw GEODUDE
dw GIRAFARIG
dw GLACEON
dw GLIGAR
dw GLOOM
dw GOLBAT
@ -80,6 +87,7 @@ AlphabeticalPokedexOrder:
dw GOLDUCK
dw GOLEM
dw GOROCHU
dw GOROTORA
dw GRANBULL
dw GRAVELER
dw GRIMER
@ -113,10 +121,12 @@ AlphabeticalPokedexOrder:
dw KINGLER
dw KLEAVOR
dw KOFFING
dw KOTORA
dw KRABBY
dw LANTURN
dw LAPRAS
dw LARVITAR
dw LEAFEON
dw LEDIAN
dw LEDYBA
dw LICKILICKY
@ -166,6 +176,8 @@ AlphabeticalPokedexOrder:
dw ONIX
dw PARAS
dw PARASECT
dw PARASPOR
dw PERRSERKER
dw PERSIAN
dw PHANPY
dw PICHU
@ -185,11 +197,14 @@ AlphabeticalPokedexOrder:
dw PORYGON2
dw PRIMEAPE
dw PSYDUCK
dw PUPAL
dw PUPITAR
dw PUPPERON
dw QUAGSIRE
dw QUILAVA
dw QWILFISH
dw RAICHU
dw RAITORA
dw RAIKOU
dw RAPIDASH
dw RATICATE
@ -231,6 +246,7 @@ AlphabeticalPokedexOrder:
dw SUNFLORA
dw SUNKERN
dw SWINUB
dw SYLVEON
dw TANGELA
dw TANGROWTH
dw TAUROS
@ -255,6 +271,7 @@ AlphabeticalPokedexOrder:
dw VICTREEBEL
dw VILEPLUME
dw VOLTORB
dw VULPIII
dw VULPIX
dw WALKING_WAKE
dw WARTORTLE

17
data/pokemon/dex_order_new.asm
View file

@ -32,6 +32,13 @@ NewPokedexOrder:
dw WEEDLE
dw KAKUNA
dw BEEDRILL
dw GENTLARVA
dw PUPAL
dw CARAPTHOR
dw KOTORA
dw GAOTORA
dw GOROTORA
dw RAITORA
dw LEDYBA
dw LEDIAN
dw SPINARAK
@ -39,6 +46,7 @@ NewPokedexOrder:
dw GEODUDE
dw GRAVELER
dw GOLEM
dw BITTYBAT
dw ZUBAT
dw GOLBAT
dw CROBAT
@ -73,6 +81,7 @@ NewPokedexOrder:
dw HOPPIP
dw SKIPLOOM
dw JUMPLUFF
dw PARASPOR
dw PARAS
dw PARASECT
dw POLIWAG
@ -131,8 +140,10 @@ NewPokedexOrder:
dw AIPOM
dw SNUBBULL
dw GRANBULL
dw VULPIII
dw VULPIX
dw NINETALES
dw PUPPERON
dw GROWLITHE
dw ARCANINE
dw STANTLER
@ -142,8 +153,11 @@ NewPokedexOrder:
dw DUGTRIO
dw MANKEY
dw PRIMEAPE
dw ANNIHILAPE
dw COINPUR
dw MEOWTH
dw PERSIAN
dw PERRSERKER
dw PSYDUCK
dw GOLDUCK
dw MACHOP
@ -197,6 +211,9 @@ NewPokedexOrder:
dw FLAREON
dw ESPEON
dw UMBREON
dw LEAFEON
dw GLACEON
dw SYLVEON
dw HORSEA
dw SEADRA
dw KINGDRA

7
data/pokemon/egg_moves_johto.asm
View file

@ -47,12 +47,17 @@ EggMovePointers2::
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2 ; Leafeon
dw NoEggMoves2 ; Glaceon
dw NoEggMoves2 ; Sylveon
dw MurkrowEggMoves
; dw NoEggMoves2 ; Honchkrow
dw NoEggMoves2
dw MisdreavusEggMoves
; dw NoEggMoves2 ; Mismagius
dw NoEggMoves2
dw NoEggMoves2
dw GirafarigEggMoves
dw GirafarigEggMoves ; This'll need a lot of stuff. Calfalc, Tsuinzu, Farigiraf...
dw PinecoEggMoves
dw NoEggMoves2
dw DunsparceEggMoves

46
data/pokemon/egg_moves_kanto.asm
View file

@ -16,6 +16,13 @@ EggMovePointers1:
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1 ; Gentlarva
dw NoEggMoves1 ; Pupal
dw NoEggMoves1 ; Carapthor
dw KotoraEggMoves
dw NoEggMoves1 ; Gaotora
dw NoEggMoves1 ; Gorotora
dw NoEggMoves1 ; Raitora
dw PidgeyEggMoves
dw NoEggMoves1
dw NoEggMoves1
@ -39,28 +46,35 @@ EggMovePointers1:
dw NoEggMoves1 ; Nidoreign
dw NoEggMoves1
dw NoEggMoves1
dw VulpixEggMoves
dw VulpiiiEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
dw ZubatEggMoves
dw NoEggMoves1
dw BittybatEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw OddishEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw ParasEggMoves
dw ParasporEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw VenonatEggMoves
dw NoEggMoves1
dw DiglettEggMoves
dw NoEggMoves1
dw MeowthEggMoves
dw CoinpurEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1 ; Perrserker
dw PsyduckEggMoves
dw NoEggMoves1
dw MankeyEggMoves
dw NoEggMoves1
dw GrowlitheEggMoves
dw NoEggMoves1 ; Annihilape
dw PupperonEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw PoliwagEggMoves
dw NoEggMoves1
@ -156,7 +170,7 @@ EggMovePointers1:
dw NoEggMoves1
dw AerodactylEggMoves
dw MunchlaxEggMoves ; Munchlax
dw SnorlaxEggMoves ; Should this even exist?
dw NoEggMoves1 ; Should this even exist?
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
@ -193,6 +207,12 @@ SquirtleEggMoves:
dw FLAIL
dw -1 ; end
KotoraEggMoves:
dw SCREECH
dw CHARM
dw CRUNCH
dw -1 ; end
PidgeyEggMoves:
dw PURSUIT
dw FAINT_ATTACK
@ -252,7 +272,7 @@ NidoranMEggMoves:
dw BEAT_UP
dw -1 ; end
VulpixEggMoves:
VulpiiiEggMoves:
dw FAINT_ATTACK
dw HYPNOSIS
dw FLAIL
@ -260,7 +280,7 @@ VulpixEggMoves:
dw DISABLE
dw -1 ; end
ZubatEggMoves:
BittybatEggMoves:
dw QUICK_ATTACK
dw PURSUIT
dw FAINT_ATTACK
@ -275,7 +295,7 @@ OddishEggMoves:
dw SYNTHESIS
dw -1 ; end
ParasEggMoves:
ParasporEggMoves:
dw FALSE_SWIPE
dw SCREECH
dw COUNTER
@ -300,7 +320,7 @@ DiglettEggMoves:
dw BEAT_UP
dw -1 ; end
MeowthEggMoves:
CoinpurEggMoves:
dw SPITE
dw CHARM
dw HYPNOSIS
@ -327,7 +347,7 @@ MankeyEggMoves:
dw BEAT_UP
dw -1 ; end
GrowlitheEggMoves:
PupperonEggMoves:
dw BODY_SLAM
dw SAFEGUARD
dw CRUNCH
@ -604,10 +624,6 @@ MunchlaxEggMoves:
dw LICK
dw -1 ; end
SnorlaxEggMoves:
dw LICK
dw -1 ; end
DratiniEggMoves:
dw LIGHT_SCREEN
dw MIST

45
data/pokemon/evos_attacks_johto.asm
View file

@ -47,6 +47,9 @@ EvosAttacksPointers2::
dw QuagsireEvosAttacks
dw EspeonEvosAttacks
dw UmbreonEvosAttacks
dw LeafeonEvosAttacks
dw GlaceonEvosAttacks
dw SylveonEvosAttacks
dw MurkrowEvosAttacks
dw SlowkingEvosAttacks
dw MisdreavusEvosAttacks
@ -718,6 +721,48 @@ UmbreonEvosAttacks:
dbw 52, MOONLIGHT
db 0 ; no more level-up moves
LeafeonEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, TAIL_WHIP
dbw 8, SAND_ATTACK
dbw 16, ABSORB
dbw 23, QUICK_ATTACK
dbw 30, GROWTH
dbw 36, RAZOR_LEAF
dbw 42, TAKE_DOWN
dbw 47, SYNTHESIS
dbw 52, SOLARBEAM
db 0 ; no more level-up moves
GlaceonEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, TAIL_WHIP
dbw 8, SAND_ATTACK
dbw 16, AURORA_BEAM
dbw 23, QUICK_ATTACK
dbw 30, MIST
dbw 36, HAZE
dbw 42, TAKE_DOWN
dbw 47, BLIZZARD
dbw 52, BARRIER
db 0 ; no more level-up moves
SylveonEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, TAIL_WHIP
dbw 8, SAND_ATTACK
dbw 16, POUND ; DISARMING_VOICE
dbw 23, QUICK_ATTACK
dbw 30, POUND ; DRAINING_KISS
dbw 36, POUND ; DAZZLING_GLEAM
dbw 42, SWIFT
dbw 47, CHARM
dbw 52, LIGHT_SCREEN
db 0 ; no more level-up moves
MurkrowEvosAttacks:
db 0 ; no more evolutions
dbw 1, PECK

209
data/pokemon/evos_attacks_kanto.asm
View file

@ -16,6 +16,13 @@ EvosAttacksPointers1::
dw WeedleEvosAttacks
dw KakunaEvosAttacks
dw BeedrillEvosAttacks
dw GentlarvaEvosAttacks
dw PupalEvosAttacks
dw CarapthorEvosAttacks
dw KotoraEvosAttacks
dw GaotoraEvosAttacks
dw GorotoraEvosAttacks
dw RaitoraEvosAttacks
dw PidgeyEvosAttacks
dw PidgeottoEvosAttacks
dw PidgeotEvosAttacks
@ -39,27 +46,34 @@ EvosAttacksPointers1::
dw NidoreignEvosAttacks
dw ClefairyEvosAttacks
dw ClefableEvosAttacks
dw VulpiiiEvosAttacks
dw VulpixEvosAttacks
dw NinetalesEvosAttacks
dw JigglypuffEvosAttacks
dw WigglytuffEvosAttacks
dw BittybatEvosAttacks
dw ZubatEvosAttacks
dw GolbatEvosAttacks
dw OddishEvosAttacks
dw GloomEvosAttacks
dw VileplumeEvosAttacks
dw ParasporEvosAttacks
dw ParasEvosAttacks
dw ParasectEvosAttacks
dw VenonatEvosAttacks
dw VenomothEvosAttacks
dw DiglettEvosAttacks
dw DugtrioEvosAttacks
dw CoinpurEvosAttacks
dw MeowthEvosAttacks
dw PersianEvosAttacks
dw PerrserkerEvosAttacks
dw PsyduckEvosAttacks
dw GolduckEvosAttacks
dw MankeyEvosAttacks
dw PrimeapeEvosAttacks
dw AnnihilapeEvosAttacks
dw PupperonEvosAttacks
dw GrowlitheEvosAttacks
dw ArcanineEvosAttacks
dw PoliwagEvosAttacks
@ -375,6 +389,98 @@ BeedrillEvosAttacks:
dbw 40, AGILITY
db 0 ; no more level-up moves
GentlarvaEvosAttacks:
dbbw EVOLVE_LEVEL, 7, PUPAL
db 0 ; no more evolutions
dbw 1, LEECH_LIFE
dbw 1, STRING_SHOT
db 0 ; no more level-up moves
PupalEvosAttacks:
dbbw EVOLVE_LEVEL, 10, CARAPTHOR
db 0 ; no more evolutions
dbw 1, HARDEN
dbw 7, HARDEN
db 0 ; no more level-up moves
CarapthorEvosAttacks:
db 0 ; no more evolutions
dbw 1, COMET_PUNCH
dbw 10, COMET_PUNCH
dbw 15, PIN_MISSILE
dbw 20, DEFENSE_CURL
dbw 25, SWIFT
dbw 30, MEGA_PUNCH
dbw 35, SUBSTITUTE
dbw 40, SWAGGER
db 0 ; no more level-up moves
KotoraEvosAttacks:
dbbw EVOLVE_LEVEL, 16, GAOTORA
dbbw EVOLVE_ITEM, THUNDERSTONE, RAITORA
db 0 ; no more evolutions
dbw 1, THUNDERSHOCK
dbw 3, TACKLE
dbw 7, LEER
dbw 13, ROAR
dbw 18, QUICK_ATTACK
dbw 23, PURSUIT
dbw 27, SPARK
dbw 31, BITE
dbw 34, SCARY_FACE
dbw 42, THUNDER
dbw 49, AGILITY
db 0 ; no more level-up moves
GaotoraEvosAttacks:
dbbw EVOLVE_LEVEL, 36, GAOTORA
db 0 ; no more evolutions
dbw 1, THUNDERSHOCK
dbw 3, TACKLE
dbw 7, LEER
dbw 13, ROAR
dbw 20, QUICK_ATTACK
dbw 27, PURSUIT
dbw 33, SPARK
dbw 39, BITE
dbw 44, SCARY_FACE
dbw 49, THRASH
dbw 54, THUNDER
dbw 49, AGILITY
db 0 ; no more level-up moves
GorotoraEvosAttacks:
db 0 ; no more evolutions
dbw 1, THUNDERSHOCK
dbw 3, TACKLE
dbw 7, LEER
dbw 13, ROAR
dbw 20, QUICK_ATTACK
dbw 27, PURSUIT
dbw 33, SPARK
dbw 36, BODY_SLAM
dbw 42, BITE
dbw 50, SCARY_FACE
dbw 58, THRASH
dbw 66, THUNDER
dbw 78, AGILITY
db 0 ; no more level-up moves
RaitoraEvosAttacks:
db 0 ; no more evolutions
dbw 1, THUNDERSHOCK
dbw 3, TACKLE
dbw 7, LEER
dbw 13, ROAR
dbw 20, QUICK_ATTACK
dbw 27, PURSUIT
dbw 33, SPARK
dbw 39, BITE
dbw 44, SCARY_FACE
dbw 54, THUNDER
dbw 63, AGILITY
db 0 ; no more level-up moves
PidgeyEvosAttacks:
dbbw EVOLVE_LEVEL, 18, PIDGEOTTO
db 0 ; no more evolutions
@ -666,6 +772,19 @@ ClefableEvosAttacks:
dbw 1, MOONLIGHT
db 0 ; no more level-up moves
VulpiiiEvosAttacks:
dbbw EVOLVE_LEVEL, 15, VULPIX
db 0 ; no more evolutions
dbw 1, EMBER
dbw 1, TAIL_WHIP
dbw 7, QUICK_ATTACK
dbw 13, ROAR
dbw 17, CONFUSE_RAY
dbw 21, SAFEGUARD
dbw 25, FLAMETHROWER
dbw 29, FIRE_SPIN
db 0 ; no more level-up moves
VulpixEvosAttacks:
dbbw EVOLVE_ITEM, FIRE_STONE, NINETALES
db 0 ; no more evolutions
@ -710,6 +829,18 @@ WigglytuffEvosAttacks:
dbw 1, DOUBLESLAP
db 0 ; no more level-up moves
BittybatEvosAttacks:
dbbw EVOLVE_LEVEL, 15, ZUBAT
db 0 ; no more evolutions
dbw 1, LEECH_LIFE
dbw 6, SUPERSONIC
dbw 12, BITE
dbw 17, CONFUSE_RAY
dbw 23, WING_ATTACK
dbw 30, MEAN_LOOK
dbw 38, HAZE
db 0 ; no more level-up moves
ZubatEvosAttacks:
dbbw EVOLVE_LEVEL, 22, GOLBAT
db 0 ; no more evolutions
@ -724,7 +855,7 @@ ZubatEvosAttacks:
GolbatEvosAttacks:
dbbw EVOLVE_HAPPINESS, TR_ANYTIME, CROBAT
dbbw EVOLVE_LEVEL, 44, CROBAT
dbbw EVOLVE_LEVEL, 44, CROBAT ; do we need it this time?
db 0 ; no more evolutions
dbw 1, SCREECH
dbw 1, LEECH_LIFE
@ -774,6 +905,20 @@ VileplumeEvosAttacks:
dbw 1, PETAL_DANCE
db 0 ; no more level-up moves
ParasporEvosAttacks:
dbbw EVOLVE_LEVEL, 15, PARAS
db 0 ; no more evolutions
dbw 1, ABSORB
dbw 1, SCRATCH
dbw 7, STUN_SPORE
dbw 13, POISONPOWDER
dbw 17, LEECH_LIFE
dbw 21, SPORE
dbw 25, SLASH
dbw 29, GROWTH
dbw 33, GIGA_DRAIN
db 0 ; no more level-up moves
ParasEvosAttacks:
dbbw EVOLVE_LEVEL, 24, PARASECT
db 0 ; no more evolutions
@ -862,6 +1007,19 @@ DugtrioEvosAttacks:
dbw 61, FISSURE
db 0 ; no more level-up moves
CoinpurEvosAttacks:
dbbw EVOLVE_LEVEL, 14, MEOWTH ; Consideration: Day, Meowth, night, Moibelle. May be excessive.
db 0 ; no more evolutions
dbw 1, SCRATCH
dbw 1, GROWL
dbw 11, BITE
dbw 19, PAY_DAY ; I remember having it learn this way earlier in later KEP versions...
dbw 25, FAINT_ATTACK
dbw 30, SCREECH
dbw 34, FURY_SWIPES
dbw 37, SLASH ; Seems a bit late, but Meowth gets it at L46, so...
db 0 ; no more level-up moves
MeowthEvosAttacks:
dbbw EVOLVE_LEVEL, 28, PERSIAN
db 0 ; no more evolutions
@ -888,6 +1046,19 @@ PersianEvosAttacks:
dbw 53, SLASH
db 0 ; no more level-up moves
PerrserkerEvosAttacks:
db 0 ; no more evolutions
dbw 1, SCRATCH
dbw 1, GROWL
dbw 11, METAL_CLAW
dbw 20, PAY_DAY
dbw 29, SWAGGER
dbw 38, SCREECH
dbw 46, FURY_SWIPES
dbw 53, SLASH
dbw 63, THRASH
db 0 ; no more level-up moves
PsyduckEvosAttacks:
dbbw EVOLVE_LEVEL, 33, GOLDUCK
db 0 ; no more evolutions
@ -933,6 +1104,7 @@ MankeyEvosAttacks:
db 0 ; no more level-up moves
PrimeapeEvosAttacks:
dbbw EVOLVE_TRADE, -1, ANNIHILAPE ; funny
db 0 ; no more evolutions
dbw 1, SCRATCH
dbw 1, LEER
@ -950,6 +1122,38 @@ PrimeapeEvosAttacks:
dbw 63, THRASH
db 0 ; no more level-up moves
AnnihilapeEvosAttacks:
db 0 ; no more evolutions
dbw 1, SCRATCH
dbw 1, LEER
dbw 1, LOW_KICK
dbw 1, RAGE
dbw 9, LOW_KICK
dbw 15, KARATE_CHOP
dbw 21, FURY_SWIPES
dbw 24, ROCK_HEAD
dbw 27, FOCUS_ENERGY
dbw 28, RAGE
dbw 36, SEISMIC_TOSS
dbw 45, CROSS_CHOP
dbw 54, SCREECH
dbw 63, THRASH
dbw 72, SPITE
db 0 ; no more level-up moves
PupperonEvosAttacks:
dbbw EVOLVE_LEVEL, 15, GROWLITHE
db 0 ; no more evolutions
dbw 1, BITE
dbw 1, ROAR
dbw 9, EMBER
dbw 16, LEER
dbw 22, TAKE_DOWN
dbw 28, FLAME_WHEEL
dbw 34, AGILITY
dbw 40, FLAMETHROWER
db 0 ; no more level-up moves
GrowlitheEvosAttacks:
dbbw EVOLVE_ITEM, FIRE_STONE, ARCANINE
db 0 ; no more evolutions
@ -2132,6 +2336,9 @@ EeveeEvosAttacks:
dbbw EVOLVE_ITEM, FIRE_STONE, FLAREON
dbbw EVOLVE_HAPPINESS, TR_MORNDAY, ESPEON
dbbw EVOLVE_HAPPINESS, TR_NITE, UMBREON
dbbw EVOLVE_ITEM, LEAF_STONE, LEAFEON
dbbw EVOLVE_ITEM, ICE_STONE, GLACEON
dbbw EVOLVE_ITEM, MOON_STONE, SYLVEON
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, TAIL_WHIP

39
data/pokemon/first_stages.asm
View file

@ -16,6 +16,13 @@ FirstEvoStages::
dw WEEDLE
dw WEEDLE
dw WEEDLE
dw GENTLARVA
dw GENTLARVA
dw GENTLARVA
dw KOTORA
dw KOTORA
dw KOTORA
dw KOTORA
dw PIDGEY ;10
dw PIDGEY
dw PIDGEY
@ -39,29 +46,36 @@ FirstEvoStages::
dw NIDORAN_F ; Nidoreign, tentative
dw CLEFFA
dw CLEFFA
dw VULPIX
dw VULPIX
dw VULPIII
dw VULPIII
dw VULPIII
dw IGGLYBUFF
dw IGGLYBUFF ;28
dw ZUBAT
dw ZUBAT
dw BITTYBAT
dw BITTYBAT
dw BITTYBAT
dw ODDISH
dw ODDISH
dw ODDISH
dw PARAS
dw PARAS
dw PARASPOR
dw PARASPOR
dw PARASPOR
dw VENONAT ;30
dw VENONAT
dw DIGLETT
dw DIGLETT
dw MEOWTH
dw MEOWTH
dw COINPUR
dw COINPUR
dw COINPUR
dw MEOWTH ; Perrserker, should be MEOWTH_G
dw PSYDUCK
dw PSYDUCK
dw MANKEY ;38
dw MANKEY
dw GROWLITHE
dw GROWLITHE
dw ANNIHILAPE
dw PUPPERON
dw PUPPERON
dw PUPPERON
dw POLIWAG
dw POLIWAG
dw POLIWAG
@ -182,7 +196,7 @@ FirstEvoStages::
dw LEDYBA
dw SPINARAK
dw SPINARAK ;a8
dw ZUBAT
dw BITTYBAT
dw CHINCHOU
dw CHINCHOU
dw PICHU
@ -211,6 +225,9 @@ FirstEvoStages::
dw WOOPER
dw EEVEE
dw EEVEE
dw EEVEE
dw EEVEE
dw EEVEE
dw MURKROW
dw SLOWPOKE
dw MISDREAVUS ;c8

14
data/pokemon/gen1_base_special.asm
View file

@ -17,6 +17,13 @@ KantoMonSpecials:
db 20 ; WEEDLE
db 25 ; KAKUNA
db 45 ; BEEDRILL
db 25 ; GENTLARVA
db 30 ; PUPAL
db 60 ; CARAPTHOR
db 55 ; KOTORA
db 75 ; GAOTORA
db 95 ; GOROTORA
db 105 ; RAITORA, technically not meant to be here but stay with me
db 35 ; PIDGEY
db 50 ; PIDGEOTTO
db 70 ; PIDGEOT
@ -40,27 +47,34 @@ KantoMonSpecials:
db 75 ; NIDOREIGN
db 60 ; CLEFAIRY
db 85 ; CLEFABLE
db 60 ; VULPIII
db 65 ; VULPIX
db 100 ; NINETALES
db 25 ; JIGGLYPUFF
db 50 ; WIGGLYTUFF
db 35 ; BITTYBAT
db 40 ; ZUBAT
db 75 ; GOLBAT
db 75 ; ODDISH
db 85 ; GLOOM
db 100 ; VILEPLUME
db 45 ; PARASPOR
db 55 ; PARAS
db 80 ; PARASECT
db 40 ; VENONAT
db 90 ; VENOMOTH
db 45 ; DIGLETT
db 70 ; DUGTRIO
db 35 ; COINPUR
db 40 ; MEOWTH
db 65 ; PERSIAN
db 50 ; PERRSERKER
db 50 ; PSYDUCK
db 80 ; GOLDUCK
db 35 ; MANKEY
db 60 ; PRIMEAPE
db 50 ; ANNIHILAPE
db 40 ; PUPPERON
db 50 ; GROWLITHE
db 80 ; ARCANINE
db 40 ; POLIWAG

17
data/pokemon/gen1_order.asm
View file

@ -261,6 +261,23 @@ Pokered_MonIndices:
db MUNCHLAX
db KLEAVOR
db GOROCHU
db GENTLARVA
db PUPAL
db CARAPTHOR
db KOTORA
db GAOTORA
db GOROTORA
db RAITORA
db BITTYBAT
db VULPIII
db PARASPOR
db ANNIHILAPE
db PUPPERON
db COINPUR
db PERRSERKER
db LEAFEON
db GLACEON
db SYLVEON
db LICKILICKY
db LICKILORD
db BURGELA

17
data/pokemon/menu_icons.asm
View file

@ -17,6 +17,13 @@ MonMenuIcons:
db ICON_CATERPILLAR ; WEEDLE
db ICON_CATERPILLAR ; KAKUNA
db ICON_BUG ; BEEDRILL
db ICON_CATERPILLAR ; GENTLARVA
db ICON_CATERPILLAR ; PUPAL
db ICON_BUG ; CARAPTHOR
db ICON_FOX ; KOTORA
db ICON_FOX ; GAOTORA
db ICON_FOX ; GOROTORA
db ICON_FOX ; RAITORA
db ICON_BIRD ; PIDGEY
db ICON_BIRD ; PIDGEOTTO
db ICON_BIRD ; PIDGEOT
@ -40,27 +47,34 @@ MonMenuIcons:
db ICON_MONSTER ; NIDOREIGN
db ICON_CLEFAIRY ; CLEFAIRY
db ICON_CLEFAIRY ; CLEFABLE
db ICON_FOX ; VULPIII
db ICON_FOX ; VULPIX
db ICON_FOX ; NINETALES
db ICON_JIGGLYPUFF ; JIGGLYPUFF
db ICON_JIGGLYPUFF ; WIGGLYTUFF
db ICON_BAT ; BITTYBAT
db ICON_BAT ; ZUBAT
db ICON_BAT ; GOLBAT
db ICON_ODDISH ; ODDISH
db ICON_ODDISH ; GLOOM
db ICON_ODDISH ; VILEPLUME
db ICON_BUG ; PARASPOR
db ICON_BUG ; PARAS
db ICON_BUG ; PARASECT
db ICON_CATERPILLAR ; VENONAT
db ICON_MOTH ; VENOMOTH
db ICON_DIGLETT ; DIGLETT
db ICON_DIGLETT ; DUGTRIO
db ICON_FOX ; COINPUR
db ICON_FOX ; MEOWTH
db ICON_FOX ; PERSIAN
db ICON_FOX ; PERRSERKER
db ICON_MONSTER ; PSYDUCK
db ICON_MONSTER ; GOLDUCK
db ICON_FIGHTER ; MANKEY
db ICON_FIGHTER ; PRIMEAPE
db ICON_FIGHTER ; ANNIHILAPE
db ICON_FOX ; PUPPERON
db ICON_FOX ; GROWLITHE
db ICON_FOX ; ARCANINE
db ICON_POLIWAG ; POLIWAG
@ -212,6 +226,9 @@ MonMenuIcons:
db ICON_MONSTER ; QUAGSIRE
db ICON_FOX ; ESPEON
db ICON_FOX ; UMBREON
db ICON_FOX ; LEAFEON
db ICON_FOX ; GLACEON
db ICON_FOX ; SYLVEON
db ICON_BIRD ; MURKROW
db ICON_SLOWPOKE ; SLOWKING
db ICON_GHOST ; MISDREAVUS

17
data/pokemon/names.asm
View file

@ -19,6 +19,13 @@ PokemonNames::
db "WEEDLE@@@@"
db "KAKUNA@@@@"
db "BEEDRILL@@"
db "GENTLARVA@"
db "PUPAL@@@@@"
db "CARAPTHOR@"
db "KOTORA@@@@"
db "GAOTORA@@@"
db "GOROTORA@@"
db "RAITORA@@@"
db "PIDGEY@@@@"
db "PIDGEOTTO@"
db "PIDGEOT@@@"
@ -42,27 +49,34 @@ PokemonNames::
db "NIDOREIGN@"
db "CLEFAIRY@@"
db "CLEFABLE@@"
db "VULPIII@@@"
db "VULPIX@@@@"
db "NINETALES@"
db "JIGGLYPUFF"
db "WIGGLYTUFF"
db "BITTYBAT@@"
db "ZUBAT@@@@@"
db "GOLBAT@@@@"
db "ODDISH@@@@"
db "GLOOM@@@@@"
db "VILEPLUME@"
db "PARASPOR@@"
db "PARAS@@@@@"
db "PARASECT@@"
db "VENONAT@@@"
db "VENOMOTH@@"
db "DIGLETT@@@"
db "DUGTRIO@@@"
db "COINPUR@@@"
db "MEOWTH@@@@"
db "PERSIAN@@@"
db "PERRSERKER"
db "PSYDUCK@@@"
db "GOLDUCK@@@"
db "MANKEY@@@@"
db "PRIMEAPE@@"
db "ANNIHILAPE"
db "PUPPERON@@"
db "GROWLITHE@"
db "ARCANINE@@"
db "POLIWAG@@@"
@ -214,6 +228,9 @@ PokemonNames::
db "QUAGSIRE@@"
db "ESPEON@@@@"
db "UMBREON@@@"
db "LEAFEON@@@"
db "GLACEON@@@"
db "SYLVEON@@@"
db "MURKROW@@@"
db "SLOWKING@@"
db "MISDREAVUS"

34
data/pokemon/palettes.asm
View file

@ -63,6 +63,20 @@ INCBIN "gfx/pokemon/kakuna/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/kakuna/shiny.pal"
INCBIN "gfx/pokemon/beedrill/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/beedrill/shiny.pal"
INCBIN "gfx/pokemon/gentlarva/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/gentlarva/shiny.pal"
INCBIN "gfx/pokemon/pupal/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/pupal/shiny.pal"
INCBIN "gfx/pokemon/carapthor/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/carapthor/shiny.pal"
INCBIN "gfx/pokemon/kotora/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/kotora/shiny.pal"
INCBIN "gfx/pokemon/gaotora/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/gaotora/shiny.pal"
INCBIN "gfx/pokemon/gorotora/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/gorotora/shiny.pal"
INCBIN "gfx/pokemon/raitora/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/raitora/shiny.pal"
INCBIN "gfx/pokemon/pidgey/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/pidgey/shiny.pal"
INCBIN "gfx/pokemon/pidgeotto/front.gbcpal", middle_colors
@ -109,6 +123,8 @@ INCBIN "gfx/pokemon/clefairy/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/clefairy/shiny.pal"
INCBIN "gfx/pokemon/clefable/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/clefable/shiny.pal"
INCBIN "gfx/pokemon/vulpiii/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/vulpiii/shiny.pal"
INCBIN "gfx/pokemon/vulpix/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/vulpix/shiny.pal"
INCBIN "gfx/pokemon/ninetales/front.gbcpal", middle_colors
@ -117,6 +133,8 @@ INCBIN "gfx/pokemon/jigglypuff/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/jigglypuff/shiny.pal"
INCBIN "gfx/pokemon/wigglytuff/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/wigglytuff/shiny.pal"
INCBIN "gfx/pokemon/bittybat/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/bittybat/shiny.pal"
INCBIN "gfx/pokemon/zubat/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/zubat/shiny.pal"
INCBIN "gfx/pokemon/golbat/front.gbcpal", middle_colors
@ -127,6 +145,8 @@ INCBIN "gfx/pokemon/gloom/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/gloom/shiny.pal"
INCBIN "gfx/pokemon/vileplume/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/vileplume/shiny.pal"
INCBIN "gfx/pokemon/paraspor/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/paraspor/shiny.pal"
INCBIN "gfx/pokemon/paras/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/paras/shiny.pal"
INCBIN "gfx/pokemon/parasect/front.gbcpal", middle_colors
@ -139,10 +159,14 @@ INCBIN "gfx/pokemon/diglett/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/diglett/shiny.pal"
INCBIN "gfx/pokemon/dugtrio/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/dugtrio/shiny.pal"
INCBIN "gfx/pokemon/coinpur/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/coinpur/shiny.pal"
INCBIN "gfx/pokemon/meowth/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/meowth/shiny.pal"
INCBIN "gfx/pokemon/persian/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/persian/shiny.pal"
INCBIN "gfx/pokemon/perrserker/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/perrserker/shiny.pal"
INCBIN "gfx/pokemon/psyduck/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/psyduck/shiny.pal"
INCBIN "gfx/pokemon/golduck/front.gbcpal", middle_colors
@ -151,6 +175,10 @@ INCBIN "gfx/pokemon/mankey/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/mankey/shiny.pal"
INCBIN "gfx/pokemon/primeape/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/primeape/shiny.pal"
INCBIN "gfx/pokemon/annihilape/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/annihilape/shiny.pal"
INCBIN "gfx/pokemon/pupperon/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/pupperon/shiny.pal"
INCBIN "gfx/pokemon/growlithe/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/growlithe/shiny.pal"
INCBIN "gfx/pokemon/arcanine/front.gbcpal", middle_colors
@ -453,6 +481,12 @@ INCBIN "gfx/pokemon/espeon/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/espeon/shiny.pal"
INCBIN "gfx/pokemon/umbreon/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/umbreon/shiny.pal"
INCBIN "gfx/pokemon/leafeon/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/leafeon/shiny.pal"
INCBIN "gfx/pokemon/glaceon/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/glaceon/shiny.pal"
INCBIN "gfx/pokemon/sylveon/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/sylveon/shiny.pal"
INCBIN "gfx/pokemon/murkrow/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/murkrow/shiny.pal"
INCBIN "gfx/pokemon/slowking/front.gbcpal", middle_colors

34
data/pokemon/pic_pointers.asm
View file

@ -43,6 +43,20 @@ PokemonPicPointers::
dba KakunaBackpic
dba BeedrillFrontpic
dba BeedrillBackpic
dba GentlarvaFrontpic
dba GentlarvaBackpic
dba PupalFrontpic
dba PupalBackpic
dba CarapthorFrontpic
dba CarapthorBackpic
dba KotoraFrontpic
dba KotoraBackpic
dba GaotoraFrontpic
dba GaotoraBackpic
dba GorotoraFrontpic
dba GorotoraBackpic
dba RaitoraFrontpic
dba RaitoraBackpic
dba PidgeyFrontpic
dba PidgeyBackpic
dba PidgeottoFrontpic
@ -89,6 +103,8 @@ PokemonPicPointers::
dba ClefairyBackpic
dba ClefableFrontpic
dba ClefableBackpic
dba VulpiiiFrontpic
dba VulpiiiBackpic
dba VulpixFrontpic
dba VulpixBackpic
dba NinetalesFrontpic
@ -97,6 +113,8 @@ PokemonPicPointers::
dba JigglypuffBackpic
dba WigglytuffFrontpic
dba WigglytuffBackpic
dba BittybatFrontpic
dba BittybatBackpic
dba ZubatFrontpic
dba ZubatBackpic
dba GolbatFrontpic
@ -107,6 +125,8 @@ PokemonPicPointers::
dba GloomBackpic
dba VileplumeFrontpic
dba VileplumeBackpic
dba ParasporFrontpic
dba ParasporBackpic
dba ParasFrontpic
dba ParasBackpic
dba ParasectFrontpic
@ -119,10 +139,14 @@ PokemonPicPointers::
dba DiglettBackpic
dba DugtrioFrontpic
dba DugtrioBackpic
dba CoinpurFrontpic
dba CoinpurBackpic
dba MeowthFrontpic
dba MeowthBackpic
dba PersianFrontpic
dba PersianBackpic
dba PerrserkerFrontpic
dba PerrserkerBackpic
dba PsyduckFrontpic
dba PsyduckBackpic
dba GolduckFrontpic
@ -131,6 +155,10 @@ PokemonPicPointers::
dba MankeyBackpic
dba PrimeapeFrontpic
dba PrimeapeBackpic
dba AnnihilapeFrontpic
dba AnnihilapeBackpic
dba PupperonFrontpic
dba PupperonBackpic
dba GrowlitheFrontpic
dba GrowlitheBackpic
dba ArcanineFrontpic
@ -433,6 +461,12 @@ PokemonPicPointers::
dba EspeonBackpic
dba UmbreonFrontpic
dba UmbreonBackpic
dba LeafeonFrontpic
dba LeafeonBackpic
dba GlaceonFrontpic
dba GlaceonBackpic
dba SylveonFrontpic
dba SylveonBackpic
dba MurkrowFrontpic
dba MurkrowBackpic
dba SlowkingFrontpic

215
data/wild/johto_grass.asm
View file

@ -24,10 +24,10 @@ JohtoGrassWildMons:
dbw 3, GASTLY
dbw 4, GASTLY
dbw 5, GASTLY
dbw 3, RATTATA
dbw 3, COINPUR
dbw 6, GASTLY
dbw 5, RATTATA
dbw 5, RATTATA
dbw 5, COINPUR
dbw 5, COINPUR
end_grass_wildmons
def_grass_wildmons SPROUT_TOWER_3F
@ -52,10 +52,10 @@ JohtoGrassWildMons:
dbw 3, GASTLY
dbw 4, GASTLY
dbw 5, GASTLY
dbw 3, RATTATA
dbw 3, COINPUR
dbw 6, GASTLY
dbw 5, RATTATA
dbw 5, RATTATA
dbw 5, COINPUR
dbw 5, COINPUR
end_grass_wildmons
def_grass_wildmons TIN_TOWER_2F
@ -80,10 +80,10 @@ JohtoGrassWildMons:
dbw 20, GASTLY
dbw 21, GASTLY
dbw 22, GASTLY
dbw 22, RATTATA
dbw 23, RATTATA
dbw 24, RATTATA
dbw 24, RATTATA
dbw 22, MEOWTH ; MOIBELLE?
dbw 23, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
end_grass_wildmons
def_grass_wildmons TIN_TOWER_3F
@ -108,10 +108,10 @@ JohtoGrassWildMons:
dbw 20, GASTLY
dbw 21, GASTLY
dbw 22, GASTLY
dbw 22, RATTATA
dbw 23, RATTATA
dbw 24, RATTATA
dbw 24, RATTATA
dbw 22, MEOWTH ; MOIBELLE?
dbw 23, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
end_grass_wildmons
def_grass_wildmons TIN_TOWER_4F
@ -136,10 +136,10 @@ JohtoGrassWildMons:
dbw 20, GASTLY
dbw 21, GASTLY
dbw 22, GASTLY
dbw 22, RATTATA
dbw 23, RATTATA
dbw 24, RATTATA
dbw 24, RATTATA
dbw 22, MEOWTH ; MOIBELLE?
dbw 23, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
end_grass_wildmons
def_grass_wildmons TIN_TOWER_5F
@ -164,10 +164,10 @@ JohtoGrassWildMons:
dbw 20, GASTLY
dbw 21, GASTLY
dbw 22, GASTLY
dbw 22, RATTATA
dbw 23, RATTATA
dbw 24, RATTATA
dbw 24, RATTATA
dbw 22, MEOWTH ; MOIBELLE?
dbw 23, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
end_grass_wildmons
def_grass_wildmons TIN_TOWER_6F
@ -192,10 +192,10 @@ JohtoGrassWildMons:
dbw 20, GASTLY
dbw 21, GASTLY
dbw 22, GASTLY
dbw 22, RATTATA
dbw 23, RATTATA
dbw 24, RATTATA
dbw 24, RATTATA
dbw 22, MEOWTH ; MOIBELLE?
dbw 23, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
end_grass_wildmons
def_grass_wildmons TIN_TOWER_7F
@ -220,10 +220,10 @@ JohtoGrassWildMons:
dbw 20, GASTLY
dbw 21, GASTLY
dbw 22, GASTLY
dbw 22, RATTATA
dbw 23, RATTATA
dbw 24, RATTATA
dbw 24, RATTATA
dbw 22, MEOWTH ; MOIBELLE?
dbw 23, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
end_grass_wildmons
def_grass_wildmons TIN_TOWER_8F
@ -248,10 +248,10 @@ JohtoGrassWildMons:
dbw 20, GASTLY
dbw 21, GASTLY
dbw 22, GASTLY
dbw 22, RATTATA
dbw 23, RATTATA
dbw 24, RATTATA
dbw 24, RATTATA
dbw 22, MEOWTH ; MOIBELLE?
dbw 23, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
end_grass_wildmons
def_grass_wildmons TIN_TOWER_9F
@ -276,39 +276,39 @@ JohtoGrassWildMons:
dbw 20, GASTLY
dbw 21, GASTLY
dbw 22, GASTLY
dbw 22, RATTATA
dbw 23, RATTATA
dbw 24, RATTATA
dbw 24, RATTATA
dbw 22, MEOWTH ; MOIBELLE?
dbw 23, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
dbw 24, MEOWTH ; MOIBELLE?
end_grass_wildmons
; Reworked to be way more Fire-type themed.
; The Burned Tower isn't very useful because stuff like Rattata can be found anywhere.
; They're good for worldbuilding but little else.
; Did you know they removed Magmar in B1F in Crystal? For Weezing??
; The Rattata could possibly be replaced with Vulpiii later.
; The Rattata have been replaced with Vulpiii in 1F, and Pupperon in B1F.
def_grass_wildmons BURNED_TOWER_1F
db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
dbw 13, RATTATA
dbw 13, VULPIII
dbw 14, KOFFING
dbw 15, RATTATA
dbw 15, VULPIII
dbw 14, ZUBAT
dbw 16, KOFFING
dbw 15, HOUNDOUR
dbw 15, HOUNDOUR
; day
dbw 13, RATTATA
dbw 13, VULPIII
dbw 14, KOFFING
dbw 15, RATTATA
dbw 15, VULPIII
dbw 14, ZUBAT
dbw 16, KOFFING
dbw 15, HOUNDOUR
dbw 15, HOUNDOUR
; nite
dbw 13, RATTATA
dbw 13, VULPIII
dbw 14, KOFFING
dbw 15, RATTATA
dbw 15, VULPIII
dbw 14, ZUBAT
dbw 16, KOFFING
dbw 15, HOUNDOUR
@ -318,26 +318,26 @@ JohtoGrassWildMons:
def_grass_wildmons BURNED_TOWER_B1F
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
dbw 14, RATTATA
dbw 14, PUPPERON
dbw 14, SLUGMA
dbw 16, SLUGMA
dbw 16, RATTATA
dbw 16, PUPPERON
dbw 15, ZUBAT
dbw 14, MAGBY
dbw 14, MAGBY
; day
dbw 14, RATTATA
dbw 14, PUPPERON
dbw 14, SLUGMA
dbw 16, SLUGMA
dbw 16, RATTATA
dbw 16, PUPPERON
dbw 15, ZUBAT
dbw 14, MAGBY
dbw 14, MAGBY
; nite
dbw 14, RATTATA
dbw 14, PUPPERON
dbw 14, SLUGMA
dbw 16, SLUGMA
dbw 16, RATTATA
dbw 16, PUPPERON
dbw 15, ZUBAT
dbw 14, MAGMAR
dbw 14, MAGMAR
@ -432,7 +432,7 @@ JohtoGrassWildMons:
; morn
dbw 6, GEODUDE
dbw 6, SANDSHREW
dbw 5, ZUBAT
dbw 5, BITTYBAT
dbw 4, RATTATA
dbw 7, ZUBAT
dbw 6, ONIX
@ -440,7 +440,7 @@ JohtoGrassWildMons:
; day
dbw 6, GEODUDE
dbw 6, SANDSHREW
dbw 5, ZUBAT
dbw 5, BITTYBAT
dbw 4, RATTATA
dbw 7, ZUBAT
dbw 6, ONIX
@ -450,7 +450,7 @@ JohtoGrassWildMons:
dbw 6, RATTATA
dbw 5, WOOPER
dbw 4, RATTATA
dbw 7, ZUBAT
dbw 7, BITTYBAT
dbw 6, ONIX
dbw 6, ONIX
end_grass_wildmons
@ -459,7 +459,7 @@ JohtoGrassWildMons:
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
dbw 8, GEODUDE
dbw 6, ZUBAT
dbw 6, BITTYBAT
dbw 8, ZUBAT
dbw 8, ONIX
dbw 6, RATTATA
@ -467,15 +467,15 @@ JohtoGrassWildMons:
dbw 8, RATTATA
; day
dbw 8, GEODUDE
dbw 6, ZUBAT
dbw 8, ZUBAT
dbw 6, BITTYBAT
dbw 8, BITTYBAT
dbw 8, ONIX
dbw 6, RATTATA
dbw 8, RATTATA
dbw 8, RATTATA
; nite
dbw 8, GEODUDE
dbw 6, ZUBAT
dbw 6, BITTYBAT
dbw 8, WOOPER
dbw 8, ONIX
dbw 6, RATTATA
@ -514,27 +514,27 @@ JohtoGrassWildMons:
def_grass_wildmons SLOWPOKE_WELL_B1F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
dbw 5, ZUBAT
dbw 6, ZUBAT
dbw 7, ZUBAT
dbw 5, BITTYBAT
dbw 6, BITTYBAT
dbw 7, BITTYBAT
dbw 6, SLOWPOKE
dbw 8, ZUBAT
dbw 8, BITTYBAT
dbw 8, SLOWPOKE
dbw 8, SLOWPOKE
; day
dbw 5, ZUBAT
dbw 6, ZUBAT
dbw 7, ZUBAT
dbw 5, BITTYBAT
dbw 6, BITTYBAT
dbw 7, BITTYBAT
dbw 6, SLOWPOKE
dbw 8, ZUBAT
dbw 8, BITTYBAT
dbw 8, SLOWPOKE
dbw 8, SLOWPOKE
; nite
dbw 5, ZUBAT
dbw 6, ZUBAT
dbw 7, ZUBAT
dbw 5, BITTYBAT
dbw 6, BITTYBAT
dbw 7, BITTYBAT
dbw 6, SLOWPOKE
dbw 8, ZUBAT
dbw 8, BITTYBAT
dbw 8, SLOWPOKE
dbw 8, SLOWPOKE
end_grass_wildmons
@ -570,8 +570,9 @@ JohtoGrassWildMons:
; With Viridian Forest existing, much of this wild data no longer made sense.
; Changed to feature Yanma, Ledyba, etc.
; Yanma gives easier Yanmega access, Ledyba and Spinarak are nice flavour.
; Paras remains accessible for HM usage. It should be Paraspor, though.
; Paraspor remains accessible for HM usage.
; Shuckle, Pineco, and Heracross should be made more common Headbutt tree Pokemon.
; Gentlarva appears less than the other bugs, as usual, replacing Pidgey. Yanma is the new predator.
def_grass_wildmons ILEX_FOREST
db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
@ -579,7 +580,7 @@ JohtoGrassWildMons:
dbw 5, WEEDLE
dbw 7, LEDYBA
dbw 7, LEDYBA
dbw 7, PIDGEY
dbw 7, GENTLARVA
dbw 6, YANMA
dbw 6, YANMA
; day
@ -587,7 +588,7 @@ JohtoGrassWildMons:
dbw 5, WEEDLE
dbw 7, LEDYBA
dbw 7, LEDYBA
dbw 7, PIDGEY
dbw 7, GENTLARVA
dbw 6, YANMA
dbw 6, YANMA
; nite
@ -596,26 +597,27 @@ JohtoGrassWildMons:
dbw 7, SPINARAK
dbw 7, PSYDUCK
dbw 7, HOOTHOOT
dbw 6, PARAS ; PARASPOR
dbw 6, PARAS ; PARASPOR
dbw 6, PARASPOR
dbw 6, PARASPOR
end_grass_wildmons
; Mt. Mortar now has consistent Marill access like GS.
; Zubats and Golbats are no longer outside during the day as their Pokedex data often says they hate light. Also, Kotora.
def_grass_wildmons MOUNT_MORTAR_1F_OUTSIDE
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
dbw 14, RATTATA
dbw 13, ZUBAT
dbw 13, KOTORA
dbw 14, MACHOP
dbw 13, GOLBAT
dbw 13, KOTORA
dbw 14, GEODUDE
dbw 16, RATICATE
dbw 16, RATICATE
; day
dbw 14, RATTATA
dbw 13, ZUBAT
dbw 13, KOTORA
dbw 14, MACHOP
dbw 13, GOLBAT
dbw 13, KOTORA
dbw 14, GEODUDE
dbw 16, RATICATE
dbw 16, RATICATE
@ -1198,28 +1200,28 @@ JohtoGrassWildMons:
def_grass_wildmons DARK_CAVE_VIOLET_ENTRANCE
db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
dbw 3, GEODUDE
dbw 2, ZUBAT
dbw 2, GEODUDE
dbw 4, GEODUDE
dbw 3, PHANPY
dbw 2, BITTYBAT
dbw 2, PHANPY
dbw 4, PHANPY
dbw 2, TEDDIURSA
dbw 4, ZUBAT
dbw 4, BITTYBAT
dbw 4, DUNSPARCE
; day
dbw 3, GEODUDE
dbw 2, ZUBAT
dbw 2, GEODUDE
dbw 4, GEODUDE
dbw 2, ZUBAT
dbw 4, ZUBAT
dbw 3, PHANPY
dbw 2, BITTYBAT
dbw 2, PHANPY
dbw 4, PHANPY
dbw 2, BITTYBAT
dbw 4, BITTYBAT
dbw 4, DUNSPARCE
; nite
dbw 3, GEODUDE
dbw 2, ZUBAT
dbw 2, BITTYBAT
dbw 2, GEODUDE
dbw 4, GEODUDE
dbw 2, ZUBAT
dbw 4, ZUBAT
dbw 2, BITTYBAT
dbw 4, BITTYBAT
dbw 4, DUNSPARCE
end_grass_wildmons
@ -1358,7 +1360,7 @@ JohtoGrassWildMons:
dbw 7, HOPPIP
; nite
dbw 4, WOOPER
dbw 5, RATTATA
dbw 5, COINPUR
dbw 7, BELLSPROUT
dbw 6, MAREEP ; From Gold
dbw 7, HOOTHOOT
@ -1385,13 +1387,13 @@ JohtoGrassWildMons:
dbw 7, HOPPIP
dbw 7, HOPPIP
; nite
dbw 6, RATTATA
dbw 6, COINPUR
dbw 6, ZUBAT
dbw 6, GEODUDE
dbw 6, ZUBAT
dbw 7, RATTATA
dbw 7, RATTATA
dbw 7, RATTATA
dbw 7, COINPUR
dbw 7, COINPUR
dbw 7, COINPUR
end_grass_wildmons
def_grass_wildmons ROUTE_34
@ -1414,7 +1416,7 @@ JohtoGrassWildMons:
dbw 10, DITTO
; nite
dbw 12, DROWZEE
dbw 11, RATTATA
dbw 11, COINPUR
dbw 12, HOOTHOOT
dbw 10, ABRA
dbw 12, JIGGLYPUFF
@ -1456,7 +1458,7 @@ JohtoGrassWildMons:
dbw 4, LEDYBA
dbw 4, PIDGEY
dbw 5, BELLSPROUT
dbw 5, GROWLITHE
dbw 5, PUPPERON
dbw 5, PIDGEY
dbw 6, PIDGEY
dbw 6, PIDGEY
@ -1464,7 +1466,7 @@ JohtoGrassWildMons:
dbw 4, PIDGEY
dbw 4, PIDGEY
dbw 5, BELLSPROUT
dbw 5, GROWLITHE
dbw 5, PUPPERON
dbw 5, PIDGEY
dbw 6, PIDGEY
dbw 6, PIDGEY
@ -1472,7 +1474,7 @@ JohtoGrassWildMons:
dbw 4, SPINARAK
dbw 4, HOOTHOOT
dbw 5, BELLSPROUT
dbw 5, HOOTHOOT
dbw 5, VULPIII ; Silver data, but specifically at night
dbw 5, HOOTHOOT
dbw 5, MISDREAVUS
dbw 5, MISDREAVUS
@ -1484,7 +1486,7 @@ JohtoGrassWildMons:
def_grass_wildmons ROUTE_37
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
dbw 13, LEDYBA
dbw 13, PUPPERON
dbw 14, STANTLER
dbw 15, PIDGEY
dbw 16, GROWLITHE
@ -1492,7 +1494,7 @@ JohtoGrassWildMons:
dbw 15, LEDIAN
dbw 15, LEDIAN
; day
dbw 13, PIDGEY
dbw 13, PUPPERON
dbw 14, STANTLER
dbw 15, PIDGEY
dbw 16, GROWLITHE
@ -1685,6 +1687,7 @@ JohtoGrassWildMons:
; Ports the 5% Jigglypuff all-day encounter from GS.
; Makes Hoothoot replace a Rattata at night to have continuity with Spearow.
; Overall, increased Johto frequency that matches early advertising for the game.
; Coinpur replaces Rattatas at night.
def_grass_wildmons ROUTE_46
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
@ -1707,8 +1710,8 @@ JohtoGrassWildMons:
dbw 2, GEODUDE
dbw 2, HOOTHOOT
dbw 3, GEODUDE
dbw 3, RATTATA
dbw 2, RATTATA
dbw 3, COINPUR
dbw 2, COINPUR
dbw 2, JIGGLYPUFF
dbw 2, JIGGLYPUFF
end_grass_wildmons

96
data/wild/kanto_grass.asm
View file

@ -338,60 +338,62 @@ KantoGrassWildMons:
dbw 35, RATICATE
end_grass_wildmons
; Gold Data, but with Snubbull in the day, vaguely like Crystal.
def_grass_wildmons ROUTE_7
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
dbw 37, RATTATA
dbw 37, SPEAROW
dbw 38, SNUBBULL
dbw 38, RATICATE
dbw 38, JIGGLYPUFF
dbw 36, ABRA
dbw 36, ABRA
db 37, RATTATA
db 37, SPEAROW
db 38, GROWLITHE
db 39, RATICATE
db 39, RATTATA
db 35, SNUBBULL
db 35, SNUBBULL
; day
dbw 37, RATTATA
dbw 37, SPEAROW
dbw 38, SNUBBULL
dbw 38, RATICATE
dbw 38, JIGGLYPUFF
dbw 36, ABRA
dbw 36, ABRA
db 37, RATTATA
db 37, SPEAROW
db 38, GROWLITHE
db 39, RATICATE
db 39, RATTATA
db 35, GROWLITHE
db 35, GROWLITHE
; nite
dbw 37, MEOWTH
dbw 37, MURKROW
dbw 38, HOUNDOUR
dbw 38, PERSIAN
dbw 38, JIGGLYPUFF
dbw 36, ABRA
dbw 36, ABRA
db 37, RATTATA
db 37, MURKROW
db 38, GROWLITHE
db 39, RATICATE
db 39, MURKROW
db 35, HOUNDOUR
db 35, HOUNDOUR
end_grass_wildmons
; Silver Data, contrasting with Route 7's Gold Data.
def_grass_wildmons ROUTE_8
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
dbw 37, SNUBBULL
dbw 39, PIDGEOTTO
dbw 36, ABRA
dbw 37, GROWLITHE
dbw 36, JIGGLYPUFF
dbw 38, KADABRA
dbw 38, KADABRA
db 37, MEOWTH
db 39, PIDGEOTTO
db 35, ABRA
db 38, VULPIX
db 37, PIDGEOTTO
db 35, KADABRA
db 35, KADABRA
; day
dbw 37, SNUBBULL
dbw 39, PIDGEOTTO
dbw 36, ABRA
dbw 37, GROWLITHE
dbw 36, JIGGLYPUFF
dbw 38, KADABRA
dbw 38, KADABRA
db 37, MEOWTH
db 39, PIDGEOTTO
db 35, ABRA
db 38, VULPIX
db 37, PIDGEOTTO
db 35, KADABRA
db 35, KADABRA
; nite
dbw 37, MEOWTH
dbw 30, NOCTOWL
dbw 36, ABRA
dbw 37, HAUNTER
dbw 36, JIGGLYPUFF
dbw 38, KADABRA
dbw 38, KADABRA
db 37, MEOWTH
db 30, HAUNTER
db 35, ABRA
db 39, NOCTOWL
db 38, VULPIX
db 35, KADABRA
db 35, KADABRA
end_grass_wildmons
def_grass_wildmons ROUTE_9
@ -879,7 +881,7 @@ KantoGrassWildMons:
dbw 36, METAPOD
dbw 36, CATERPIE
dbw 35, PARAS
dbw 35, ZUBAT ; KOKANA
dbw 35, GENTLARVA
dbw 36, PARAS
dbw 36, PIKACHU
; day
@ -887,15 +889,15 @@ KantoGrassWildMons:
dbw 36, CATERPIE
dbw 35, METAPOD
dbw 36, METAPOD
dbw 35, ZUBAT ; KOKANA
dbw 35, GENTLARVA
dbw 36, PARAS
dbw 36, PIKACHU
; nite
dbw 35, ODDISH ; KOTORA
dbw 36, ODDISH ; KOTORA
dbw 35, KOTORA
dbw 36, KOTORA
dbw 36, ZUBAT
dbw 35, PARAS
dbw 35, ZUBAT ; KOKANA
dbw 35, GENTLARVA
dbw 36, PARAS
dbw 36, PIKACHU
end_grass_wildmons