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

Violet Waters and Lush Trees! (#19)

Browse source
This commit is contained in:
Misty 2024-07-04 05:28:47 -04:00 • committed by GitHub
parent a03a7e4f7a
commit afbd0f7680
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
169 changed files with 1340 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/items/attributes.asm
View file

@ -213,7 +213,7 @@ ItemAttributes:
; BLACKGLASSES
item_attribute 100, HELD_DARK_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; SLOWPOKETAIL
item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; PINK_BOW
item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; STICK

4
data/items/descriptions.asm
View file

@ -635,8 +635,8 @@ BlackGlassesDesc:
next "type moves. (HOLD)@"
SlowpokeTailDesc:
db "Very tasty. Sell"
next "high.@"
db "Evolves certain"
next "kinds of #MON.@"
PinkBowDesc:
db "Powers up NORMAL-"

18
data/pokemon/base_stats.asm
View file

@ -126,6 +126,10 @@ INCLUDE "data/pokemon/base_stats/slowpoke.asm"
INCLUDE "data/pokemon/base_stats/slowbro.asm"
INCLUDE "data/pokemon/base_stats/magnemite.asm"
INCLUDE "data/pokemon/base_stats/magneton.asm"
INCLUDE "data/pokemon/base_stats/cheep.asm"
INCLUDE "data/pokemon/base_stats/jabetta.asm"
INCLUDE "data/pokemon/base_stats/ribbito.asm"
INCLUDE "data/pokemon/base_stats/croakozuna.asm"
INCLUDE "data/pokemon/base_stats/farfetch_d.asm"
INCLUDE "data/pokemon/base_stats/doduo.asm"
INCLUDE "data/pokemon/base_stats/dodrio.asm"
@ -135,6 +139,7 @@ INCLUDE "data/pokemon/base_stats/grimer.asm"
INCLUDE "data/pokemon/base_stats/muk.asm"
INCLUDE "data/pokemon/base_stats/shellder.asm"
INCLUDE "data/pokemon/base_stats/cloyster.asm"
INCLUDE "data/pokemon/base_stats/disturban.asm"
INCLUDE "data/pokemon/base_stats/gastly.asm"
INCLUDE "data/pokemon/base_stats/haunter.asm"
INCLUDE "data/pokemon/base_stats/gengar.asm"
@ -234,6 +239,7 @@ INCLUDE "data/pokemon/base_stats/barreau.asm"
INCLUDE "data/pokemon/base_stats/crobat.asm"
INCLUDE "data/pokemon/base_stats/chinchou.asm"
INCLUDE "data/pokemon/base_stats/lanturn.asm"
INCLUDE "data/pokemon/base_stats/reroad.asm"
INCLUDE "data/pokemon/base_stats/pichu.asm"
INCLUDE "data/pokemon/base_stats/cleffa.asm"
INCLUDE "data/pokemon/base_stats/igglybuff.asm"
@ -241,6 +247,7 @@ INCLUDE "data/pokemon/base_stats/togepi.asm"
INCLUDE "data/pokemon/base_stats/togetic.asm"
INCLUDE "data/pokemon/base_stats/togekiss.asm"
INCLUDE "data/pokemon/base_stats/natu.asm"
INCLUDE "data/pokemon/base_stats/qatu.asm"
INCLUDE "data/pokemon/base_stats/xatu.asm"
INCLUDE "data/pokemon/base_stats/moibelle.asm"
INCLUDE "data/pokemon/base_stats/belledam.asm"
@ -248,6 +255,7 @@ INCLUDE "data/pokemon/base_stats/mareep.asm"
INCLUDE "data/pokemon/base_stats/flaaffy.asm"
INCLUDE "data/pokemon/base_stats/ampharos.asm"
INCLUDE "data/pokemon/base_stats/bellossom.asm"
INCLUDE "data/pokemon/base_stats/azurill.asm"
INCLUDE "data/pokemon/base_stats/marill.asm"
INCLUDE "data/pokemon/base_stats/azumarill.asm"
INCLUDE "data/pokemon/base_stats/sudowoodo.asm"
@ -256,10 +264,15 @@ INCLUDE "data/pokemon/base_stats/hoppip.asm"
INCLUDE "data/pokemon/base_stats/skiploom.asm"
INCLUDE "data/pokemon/base_stats/jumpluff.asm"
INCLUDE "data/pokemon/base_stats/aipom.asm"
INCLUDE "data/pokemon/base_stats/ambipom.asm"
INCLUDE "data/pokemon/base_stats/sunkern.asm"
INCLUDE "data/pokemon/base_stats/sunbud.asm"
INCLUDE "data/pokemon/base_stats/sunflora.asm"
INCLUDE "data/pokemon/base_stats/hippunk.asm"
INCLUDE "data/pokemon/base_stats/aercrow.asm"
INCLUDE "data/pokemon/base_stats/foxfire.asm"
INCLUDE "data/pokemon/base_stats/yanma.asm"
INCLUDE "data/pokemon/base_stats/yanmega.asm"
INCLUDE "data/pokemon/base_stats/wooper.asm"
INCLUDE "data/pokemon/base_stats/quagsire.asm"
INCLUDE "data/pokemon/base_stats/espeon.asm"
@ -289,6 +302,8 @@ INCLUDE "data/pokemon/base_stats/steelix.asm"
INCLUDE "data/pokemon/base_stats/snubbull.asm"
INCLUDE "data/pokemon/base_stats/granbull.asm"
INCLUDE "data/pokemon/base_stats/qwilfish.asm"
INCLUDE "data/pokemon/base_stats/kazeppelin.asm"
INCLUDE "data/pokemon/base_stats/qwilfather.asm"
INCLUDE "data/pokemon/base_stats/scizor.asm"
INCLUDE "data/pokemon/base_stats/shuckle.asm"
INCLUDE "data/pokemon/base_stats/pockle.asm"
@ -304,7 +319,10 @@ INCLUDE "data/pokemon/base_stats/piloswine.asm"
INCLUDE "data/pokemon/base_stats/corsola.asm"
INCLUDE "data/pokemon/base_stats/remoraid.asm"
INCLUDE "data/pokemon/base_stats/octillery.asm"
INCLUDE "data/pokemon/base_stats/stricheel.asm"
INCLUDE "data/pokemon/base_stats/lurreel.asm"
INCLUDE "data/pokemon/base_stats/delibird.asm"
INCLUDE "data/pokemon/base_stats/mantyke.asm"
INCLUDE "data/pokemon/base_stats/mantine.asm"
INCLUDE "data/pokemon/base_stats/skarmory.asm"
INCLUDE "data/pokemon/base_stats/houndour.asm"

2
data/pokemon/base_stats/croakozuna.asm
View file

@ -17,5 +17,5 @@
dn EGG_WATER_1, EGG_WATER_1 ; egg groups
; tm/hm learnset
tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, CUT, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM
tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, CUT, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL
; end

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

@ -0,0 +1,21 @@
db MANTYKE ; species ID placeholder
db 45, 20, 50, 50, 60, 120
; hp atk def spd sat sdf
db WATER, FLYING ; type
db 25 ; catch rate
db 108 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 25 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/mantyke/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate
dn EGG_WATER_1, EGG_WATER_1 ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
; end

2
data/pokemon/base_stats/reroad.asm
View file

@ -17,5 +17,5 @@
dn EGG_WATER_1, EGG_WATER_1 ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FURY_ATTACK, CUT, SURF, WHIRLPOOL, ICE_BEAM
tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, WHIRLPOOL, ICE_BEAM
; end

2
data/pokemon/base_stats/ribbito.asm
View file

@ -17,5 +17,5 @@
dn EGG_WATER_1, EGG_WATER_1 ; egg groups
; tm/hm learnset
tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, CUT, SURF, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM
tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, CUT, SURF, FLASH, WHIRLPOOL, WATERFALL
; end

18
data/pokemon/cries.asm
View file

@ -105,6 +105,10 @@ PokemonCries::
mon_cry CRY_GROWLITHE, 0, 256 ; SLOWBRO
mon_cry CRY_METAPOD, 128, 224 ; MAGNEMITE
mon_cry CRY_METAPOD, 32, 320 ; MAGNETON
mon_cry CRY_NIDORAN_M, 0, 0 ; CHEEP (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; JABETTA (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; RIBBITO (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; CROAKOZUNA (incomplete)
mon_cry CRY_SPEAROW, 221, 129 ; FARFETCH_D
mon_cry CRY_DIGLETT, 187, 129 ; DODUO
mon_cry CRY_DIGLETT, 153, 160 ; DODRIO
@ -114,6 +118,7 @@ PokemonCries::
mon_cry CRY_MUK, 239, 383 ; MUK
mon_cry CRY_FEAROW, 0, 256 ; SHELLDER
mon_cry CRY_FEAROW, 111, 352 ; CLOYSTER
mon_cry CRY_NIDORAN_M, 0, 0 ; DISTURBAN (incomplete)
mon_cry CRY_METAPOD, 0, 256 ; GASTLY
mon_cry CRY_METAPOD, 48, 192 ; HAUNTER
mon_cry CRY_MUK, 0, 383 ; GENGAR
@ -213,6 +218,7 @@ PokemonCries::
mon_cry CRY_SQUIRTLE, -16, 320 ; CROBAT
mon_cry CRY_CYNDAQUIL, 969, 320 ; CHINCHOU
mon_cry CRY_CYNDAQUIL, 720, 272 ; LANTURN
mon_cry CRY_NIDORAN_M, 0, 0 ; REROAD (incomplete)
mon_cry CRY_PICHU, 0, 320 ; PICHU
mon_cry CRY_CLEFFA, 97, 145 ; CLEFFA
mon_cry CRY_CHIKORITA, 232, 232 ; IGGLYBUFF
@ -220,6 +226,7 @@ PokemonCries::
mon_cry CRY_TOGETIC, 59, 56 ; TOGETIC
mon_cry CRY_TOGETIC, 59, 56 ; TOGEKISS (incomplete)
mon_cry CRY_NATU, -103, 256 ; NATU
mon_cry CRY_NIDORAN_M, 0, 0 ; QATU (incomplete)
mon_cry CRY_NATU, -167, 360 ; XATU
mon_cry CRY_NIDORAN_M, 0, 0 ; MOIBELLE (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; BELLEDAM (incomplete)
@ -227,6 +234,7 @@ PokemonCries::
mon_cry CRY_MAREEP, -7, 384 ; FLAAFFY
mon_cry CRY_AMPHAROS, -124, 232 ; AMPHAROS
mon_cry CRY_CLEFFA, 132, 336 ; BELLOSSOM
mon_cry CRY_NIDORAN_M, 0, 0 ; AZURILL (incomplete)
mon_cry CRY_MARILL, 283, 288 ; MARILL
mon_cry CRY_MARILL, 182, 384 ; AZUMARILL
mon_cry CRY_CLEFFA, 3904, 384 ; SUDOWOODO
@ -235,10 +243,15 @@ PokemonCries::
mon_cry CRY_CLEFFA, 39, 312 ; SKIPLOOM
mon_cry CRY_CLEFFA, 0, 384 ; JUMPLUFF
mon_cry CRY_AIPOM, -81, 232 ; AIPOM
mon_cry CRY_NIDORAN_M, 0, 0 ; AMBIPOM (incomplete)
mon_cry CRY_MARILL, 299, 184 ; SUNKERN
mon_cry CRY_NIDORAN_M, 0, 0 ; SUNBUD (incomplete)
mon_cry CRY_SUNFLORA, -32, 384 ; SUNFLORA
mon_cry CRY_NIDORAN_M, 0, 0 ; HIPPUNK (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; AERCROW (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; FOXFIRE (incomplete)
mon_cry CRY_TOTODILE, 49, 200 ; YANMA
mon_cry CRY_NIDORAN_M, 0, 0 ; YANMEGA (incomplete)
mon_cry CRY_WOOPER, 147, 175 ; WOOPER
mon_cry CRY_WOOPER, -198, 320 ; QUAGSIRE
mon_cry CRY_AIPOM, 162, 320 ; ESPEON
@ -268,6 +281,8 @@ PokemonCries::
mon_cry CRY_DUNSPARCE, 274, 232 ; SNUBBULL
mon_cry CRY_DUNSPARCE, 0, 384 ; GRANBULL
mon_cry CRY_SLOWKING, 352, 224 ; QWILFISH
mon_cry CRY_NIDORAN_M, 0, 0 ; KAZEPPELIN (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; QWILFATHER (incomplete)
mon_cry CRY_AMPHAROS, 0, 352 ; SCIZOR
mon_cry CRY_DUNSPARCE, 656, 168 ; SHUCKLE
mon_cry CRY_DUNSPARCE, 640, 208 ; POCKLE
@ -283,7 +298,10 @@ PokemonCries::
mon_cry CRY_MAGCARGO, 161, 232 ; CORSOLA
mon_cry CRY_SUNFLORA, 13, 256 ; REMORAID
mon_cry CRY_TOTODILE, 0, 384 ; OCTILLERY
mon_cry CRY_NIDORAN_M, 0, 0 ; STRICHEEL (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; LURREEL (incomplete)
mon_cry CRY_TEDDIURSA, 2, 106 ; DELIBIRD
mon_cry CRY_NIDORAN_M, 0, 0 ; MANTYKE (incomplete)
mon_cry CRY_MANTINE, -190, 240 ; MANTINE
mon_cry CRY_AMPHAROS, 2217, 384 ; SKARMORY
mon_cry CRY_CYNDAQUIL, 57, 320 ; HOUNDOUR

18
data/pokemon/dex_entries.asm
View file

@ -103,6 +103,10 @@ SlowpokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/slowpoke.asm"
SlowbroPokedexEntry:: INCLUDE "data/pokemon/dex_entries/slowbro.asm"
MagnemitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnemite.asm"
MagnetonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magneton.asm"
CheepPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cheep.asm"
JabettaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jabetta.asm"
RibbitoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ribbito.asm"
CroakozunaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/croakozuna.asm"
FarfetchDPokedexEntry:: INCLUDE "data/pokemon/dex_entries/farfetch_d.asm"
DoduoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/doduo.asm"
DodrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dodrio.asm"
@ -112,6 +116,7 @@ GrimerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/grimer.asm"
MukPokedexEntry:: INCLUDE "data/pokemon/dex_entries/muk.asm"
ShellderPokedexEntry:: INCLUDE "data/pokemon/dex_entries/shellder.asm"
CloysterPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cloyster.asm"
DisturbanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/disturban.asm"
GastlyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gastly.asm"
HaunterPokedexEntry:: INCLUDE "data/pokemon/dex_entries/haunter.asm"
GengarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gengar.asm"
@ -215,6 +220,7 @@ BarreauPokedexEntry:: INCLUDE "data/pokemon/dex_entries/barreau.asm"
CrobatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/crobat.asm"
ChinchouPokedexEntry:: INCLUDE "data/pokemon/dex_entries/chinchou.asm"
LanturnPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lanturn.asm"
ReroadPokedexEntry:: INCLUDE "data/pokemon/dex_entries/reroad.asm"
PichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pichu.asm"
CleffaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cleffa.asm"
IgglybuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/igglybuff.asm"
@ -222,6 +228,7 @@ TogepiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/togepi.asm"
TogeticPokedexEntry:: INCLUDE "data/pokemon/dex_entries/togetic.asm"
TogekissPokedexEntry:: INCLUDE "data/pokemon/dex_entries/togekiss.asm"
NatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/natu.asm"
QatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/qatu.asm"
XatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/xatu.asm"
MoibellePokedexEntry:: INCLUDE "data/pokemon/dex_entries/moibelle.asm"
BelledamPokedexEntry:: INCLUDE "data/pokemon/dex_entries/belledam.asm"
@ -229,6 +236,7 @@ MareepPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mareep.asm"
FlaaffyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/flaaffy.asm"
AmpharosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ampharos.asm"
BellossomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bellossom.asm"
AzurillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/azurill.asm"
MarillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/marill.asm"
AzumarillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/azumarill.asm"
SudowoodoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sudowoodo.asm"
@ -237,14 +245,19 @@ HoppipPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hoppip.asm"
SkiploomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/skiploom.asm"
JumpluffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jumpluff.asm"
AipomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/aipom.asm"
AmbipomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ambipom.asm"
SunkernPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunkern.asm"
SunbudPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunbud.asm"
SunfloraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunflora.asm"
HippunkPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hippunk.asm"
AercrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/aercrow.asm"
FoxfirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/foxfire.asm"
SECTION "Pokedex Entries 193-251", ROMX
YanmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/yanma.asm"
YanmegaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magneton.asm"
WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wooper.asm"
QuagsirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/quagsire.asm"
EspeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/espeon.asm"
@ -274,6 +287,8 @@ SteelixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/steelix.asm"
SnubbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/snubbull.asm"
GranbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/granbull.asm"
QwilfishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/qwilfish.asm"
KazeppelinPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kazeppelin.asm"
QwilfatherPokedexEntry:: INCLUDE "data/pokemon/dex_entries/qwilfather.asm"
ScizorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/scizor.asm"
ShucklePokedexEntry:: INCLUDE "data/pokemon/dex_entries/shuckle.asm"
PocklePokedexEntry:: INCLUDE "data/pokemon/dex_entries/pockle.asm"
@ -289,7 +304,10 @@ PiloswinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/piloswine.asm"
CorsolaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/corsola.asm"
RemoraidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/remoraid.asm"
OctilleryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/octillery.asm"
StricheelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/stricheel.asm"
LurreelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lurreel.asm"
DelibirdPokedexEntry:: INCLUDE "data/pokemon/dex_entries/delibird.asm"
MantykePokedexEntry:: INCLUDE "data/pokemon/dex_entries/mantyke.asm"
MantinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/mantine.asm"
SkarmoryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/skarmory.asm"
HoundourPokedexEntry:: INCLUDE "data/pokemon/dex_entries/houndour.asm"

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

@ -0,0 +1,10 @@
db "LONG TAIL@" ; species name
dw 311, 448 ; height, weight
db "It loves to swing"
next "from vines and"
next "ropes, and even"
page "makes games of"
next "it for other"
next "#MON to play.@"

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

@ -0,0 +1,10 @@
db "POLKA DOT@" ; species name
dw 8, 44 ; height, weight
db "Despite living by"
next "water, AZURILL"
next "can't swim yet,"
page "relying on its"
next "bouyant tail"
next "for support.@"

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

@ -0,0 +1,10 @@
db "FLYING FISH@" ; species name
dw 10, 120 ; height, weight
db "FISHERs are often"
next "surprised by"
next "CHEEP's strength,"
page "sometimes losing"
next "bait or rods when"
next "one is hooked.@"

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

@ -0,0 +1,10 @@
db "SUMO@" ; species name
dw 411, 4150 ; height, weight
db "Most CROAKOZUNA"
next "wrestle each other"
next "constantly, with"
page "both trying to"
next "out-cheat their"
next "opponent.@"

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

@ -0,0 +1,10 @@
db "SPIRAL@" ; species name
dw 403, 1530 ; height, weight
db "A clever TRAINER"
next "tricked it into"
next "evolving with a"
page "SLOWPOKETAIL."
next "It looks dejected"
next "about this.@"

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

@ -0,0 +1,10 @@
db "FENNEC@" ; species name
dw 211, 310 ; height, weight
db "It dashes swiftly"
next "across open"
next "fields, leaving"
page "trails of smol-"
next "-dering pawprints"
next "in its wake.@"

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

@ -0,0 +1,10 @@
db "PUNK@" ; species name
dw 304, 2117 ; height, weight
db "It disturbs"
next "SLOWPOKE from"
next "their slumber with"
page "high pitched"
next "squeals before"
next "attacking.@"

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

@ -0,0 +1,10 @@
db "COMBATIVE@" ; species name
dw 53, 950 ; height, weight
db "It leaps from the"
next "water with its"
next "powerful legs,"
page "catching SAILWING"
next "mid-flight in its"
next "sharp beak.@"

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

@ -0,0 +1,10 @@
db "MINE@" ; species name
dw 509, 1684 ; height, weight
db "The current that"
next "runs through"
next "KAZEPPELIN is"
page "incredibly strong,"
next "paralyzing with"
next "just a touch.@"

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

@ -0,0 +1,10 @@
db "GULPING@" ; species name
dw 703, 2267 ; height, weight
db "Its huge, gaping"
next "maw can stretch up"
next "to 3 feet,"
page "allowing it to"
next "swallow OCTILLERY"
next "whole.@"

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

@ -0,0 +1,10 @@
db "KITE@" ; species name
dw 303, 1433 ; height, weight
db "The patterns on"
next "MANTYKE's back"
next "vary by region."
page "It swims with"
next "REMORAID schools"
next "to protect them.@"

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

@ -0,0 +1,10 @@
db "SOOTHSAYER@" ; species name
dw 24, 160 ; height, weight
db "Tribal groups"
next "often use QATU"
next "as a lookout,"
page "as it is said"
next "to be able to"
next "see the future.@"

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

@ -0,0 +1,10 @@
db "BIG BALLOON@" ; species name
dw 601, 2099 ; height, weight
db "HONCHKROW's mortal"
next "enemy. They vie"
next "for supremacy for"
page "the beaches by"
next "commanding their"
next "underlings.@"

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

@ -0,0 +1,10 @@
db "HORNED TOAD@" ; species name
dw 205, 342 ; height, weight
db "Its croaking can"
next "trick POLIWAG into"
next "serving it, but"
page "POLITOED is swift"
next "to strike down"
next "this usurper.@"

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

@ -0,0 +1,10 @@
db "SUMO@" ; species name
dw 23, 1020 ; height, weight
db "Despite their"
next "cheery attitude,"
next "they tend to fight"
page "dirty, often"
next "ambushing foes"
next "in dark caves.@"

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

@ -0,0 +1,10 @@
db "DEEP SEA@" ; species name
dw 401, 602 ; height, weight
db "Its large eyes"
next "are sensitive to"
next "light, so it is"
page "rarely seen"
next "outside of the"
next "ocean's depths.@"

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

@ -0,0 +1,10 @@
db "BUD@" ; species name
dw 202, 165 ; height, weight
db "Although usually"
next "rooted in one"
next "place to absorb"
page "sunlight, some"
next "say it wanders"
next "in the night.@"

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

@ -0,0 +1,10 @@
db "OGRE DARNER@" ; species name
dw 603, 1135 ; height, weight
db "Filled with"
next "primeval power,"
next "the sound of its"
page "wings is often"
next "mistaken for that"
next "of a helicopter.@"

18
data/pokemon/dex_entry_pointers.asm
View file

@ -100,6 +100,10 @@ PokedexDataPointerTable:
dba SlowbroPokedexEntry
dba MagnemitePokedexEntry
dba MagnetonPokedexEntry
dba CheepPokedexEntry
dba JabettaPokedexEntry
dba RibbitoPokedexEntry
dba CroakozunaPokedexEntry
dba FarfetchDPokedexEntry
dba DoduoPokedexEntry
dba DodrioPokedexEntry
@ -109,6 +113,7 @@ PokedexDataPointerTable:
dba MukPokedexEntry
dba ShellderPokedexEntry
dba CloysterPokedexEntry
dba DisturbanPokedexEntry
dba GastlyPokedexEntry
dba HaunterPokedexEntry
dba GengarPokedexEntry
@ -208,6 +213,7 @@ PokedexDataPointerTable:
dba CrobatPokedexEntry
dba ChinchouPokedexEntry
dba LanturnPokedexEntry
dba ReroadPokedexEntry
dba PichuPokedexEntry
dba CleffaPokedexEntry
dba IgglybuffPokedexEntry
@ -215,6 +221,7 @@ PokedexDataPointerTable:
dba TogeticPokedexEntry
dba TogekissPokedexEntry
dba NatuPokedexEntry
dba QatuPokedexEntry
dba XatuPokedexEntry
dba MoibellePokedexEntry
dba BelledamPokedexEntry
@ -222,6 +229,7 @@ PokedexDataPointerTable:
dba FlaaffyPokedexEntry
dba AmpharosPokedexEntry
dba BellossomPokedexEntry
dba AzurillPokedexEntry
dba MarillPokedexEntry
dba AzumarillPokedexEntry
dba SudowoodoPokedexEntry
@ -230,10 +238,15 @@ PokedexDataPointerTable:
dba SkiploomPokedexEntry
dba JumpluffPokedexEntry
dba AipomPokedexEntry
dba AmbipomPokedexEntry
dba SunkernPokedexEntry
dba SunbudPokedexEntry
dba SunfloraPokedexEntry
dba HippunkPokedexEntry
dba AercrowPokedexEntry
dba FoxfirePokedexEntry
dba YanmaPokedexEntry
dba YanmegaPokedexEntry
dba WooperPokedexEntry
dba QuagsirePokedexEntry
dba EspeonPokedexEntry
@ -263,6 +276,8 @@ PokedexDataPointerTable:
dba SnubbullPokedexEntry
dba GranbullPokedexEntry
dba QwilfishPokedexEntry
dba KazeppelinPokedexEntry
dba QwilfatherPokedexEntry
dba ScizorPokedexEntry
dba ShucklePokedexEntry
dba PocklePokedexEntry
@ -278,7 +293,10 @@ PokedexDataPointerTable:
dba CorsolaPokedexEntry
dba RemoraidPokedexEntry
dba OctilleryPokedexEntry
dba StricheelPokedexEntry
dba LurreelPokedexEntry
dba DelibirdPokedexEntry
dba MantykePokedexEntry
dba MantinePokedexEntry
dba SkarmoryPokedexEntry
dba HoundourPokedexEntry

19
data/pokemon/dex_order_alpha.asm
View file

@ -8,6 +8,7 @@ AlphabeticalPokedexOrder:
dw AIPOM
dw ALAKAZAM
dw AMANOBI
dw AMBIPOM
dw AMPHAROS
dw ANGORE
dw ANNIHILAPE
@ -16,6 +17,7 @@ AlphabeticalPokedexOrder:
dw ARIADOS
dw ARTICUNO
dw AZUMARILL
dw AZURILL
dw BARREAU
dw BAYLEEF
dw BEEDRILL
@ -41,6 +43,7 @@ AlphabeticalPokedexOrder:
dw CHARIZARD
dw CHARMANDER
dw CHARMELEON
dw CHEEP
dw CHIKORITA
dw CHINCHOU
dw CLEFABLE
@ -50,6 +53,7 @@ AlphabeticalPokedexOrder:
dw COATL
dw COINPUR
dw CORSOLA
dw CROAKOZUNA
dw CROBAT
dw CROCONAW
dw CUBBURN
@ -59,6 +63,7 @@ AlphabeticalPokedexOrder:
dw DELIBIRD
dw DEWGONG
dw DIGLETT
dw DISTURBAN
dw DITTO
dw DODRIO
dw DODUO
@ -92,6 +97,7 @@ AlphabeticalPokedexOrder:
dw FLUTTER_MANE
dw FOLAGE
dw FORRETRESS
dw FOXFIRE
dw FURRET
dw GASTLY
dw GAOTORA
@ -118,6 +124,7 @@ AlphabeticalPokedexOrder:
dw GYARADOS
dw HAUNTER
dw HERACROSS
dw HIPPUNK
dw HITMONCHAN
dw HITMONLEE
dw HITMONTOP
@ -134,6 +141,7 @@ AlphabeticalPokedexOrder:
dw IRON_BUNDLE
dw IRON_THORNS
dw IVYSAUR
dw JABETTA
dw JIGGLYPUFF
dw JOLTEON
dw JUMPLUFF
@ -144,6 +152,7 @@ AlphabeticalPokedexOrder:
dw KADABRA
dw KAKUNA
dw KANGASKHAN
dw KAZEPPELIN
dw KINGDRA
dw KINGLER
dw KITSEN
@ -164,6 +173,7 @@ AlphabeticalPokedexOrder:
dw LICKITUNG
dw LUANBO
dw LUGIA
dw LURREEL
dw MACHAMP
dw MACHOKE
dw MACHOP
@ -175,6 +185,7 @@ AlphabeticalPokedexOrder:
dw MAGNETON
dw MANKEY
dw MANTINE
dw MANTYKE
dw MAREEP
dw MARILL
dw MAROWAK
@ -240,8 +251,10 @@ AlphabeticalPokedexOrder:
dw PUPAL
dw PUPITAR
dw PUPPERON
dw QATU
dw QUAGSIRE
dw QUILAVA
dw QWILFATHER
dw QWILFISH
dw RAGING_BOLT
dw RAICHU
@ -251,9 +264,11 @@ AlphabeticalPokedexOrder:
dw RATICATE
dw RATTATA
dw REMORAID
dw REROAD
dw RHYDON
dw RHYHORN
; dw RHYPERIOR
dw RIBBITO
dw RUDDERNAUT
dw SAKURAZE
dw SANDSHREW
@ -288,9 +303,11 @@ AlphabeticalPokedexOrder:
dw STARMIE
dw STARYU
dw STEELIX
dw STRICHEEL
dw STROMEN
dw SUDOWOODO
dw SUICUNE
dw SUNBUD
dw SUNFLORA
dw SUNKERN
dw SWINUB
@ -341,7 +358,7 @@ AlphabeticalPokedexOrder:
dw XYLODON
dw XYLOFIN
dw YANMA
; dw YANMEGA
dw YANMEGA
dw ZAPDOS
dw ZUBAT
assert_table_length NUM_POKEMON

18
data/pokemon/dex_order_new.asm
View file

@ -98,6 +98,7 @@ NewPokedexOrder:
dw POLIWHIRL
dw POLIWRATH
dw POLITOED
dw REROAD
dw MAGIKARP
dw GYARADOS
dw ORFRY
@ -106,6 +107,7 @@ NewPokedexOrder:
dw SLOWPOKE
dw SLOWBRO
dw SLOWKING
dw HIPPUNK
dw ODDISH
dw GLOOM
dw VILEPLUME
@ -126,7 +128,9 @@ NewPokedexOrder:
dw NIDOKING
dw NIDOREIGN
dw YANMA
dw YANMEGA
dw SUNKERN
dw SUNBUD
dw SUNFLORA
dw EXEGGCUTE
dw EXEGGUTOR
@ -150,6 +154,7 @@ NewPokedexOrder:
dw VOLTORB
dw ELECTRODE
dw AIPOM
dw AMBIPOM
dw SNUBBULL
dw GRANBULL
dw VULPIII
@ -159,6 +164,7 @@ NewPokedexOrder:
dw GROWLITHE
dw ARCANINE
dw STANTLER
dw AZURILL
dw MARILL
dw AZUMARILL
dw DIGLETT
@ -197,22 +203,33 @@ NewPokedexOrder:
dw SMEARGLE
dw FARFETCH_D
dw NATU
dw QATU
dw XATU
dw AERCROW
dw FOXFIRE
dw QWILFISH
dw KAZEPPELIN
dw QWILFATHER
dw TENTACOOL
dw TENTACRUEL
dw KRABBY
dw KINGLER
dw RIBBITO
dw CROAKOZUNA
dw CHEEP
dw JABETTA
dw SHUCKLE
dw POCKLE
dw STARYU
dw STARMIE
dw SHELLDER
dw CLOYSTER
dw DISTURBAN
dw CORSOLA
dw REMORAID
dw OCTILLERY
dw STRICHEEL
dw LURREEL
dw CHINCHOU
dw LANTURN
dw SEEL
@ -247,6 +264,7 @@ NewPokedexOrder:
dw URSALUNA
dw PHANPY
dw DONPHAN
dw MANTYKE
dw MANTINE
dw SKARMORY
dw DODUO

67
data/pokemon/egg_moves_johto.asm
View file

@ -29,6 +29,7 @@ EggMovePointers2::
dw NoEggMoves2
dw ChinchouEggMoves
dw NoEggMoves2
dw ReroadEggMoves
dw PichuEggMoves
dw CleffaEggMoves
dw IgglybuffEggMoves
@ -36,6 +37,7 @@ EggMovePointers2::
dw NoEggMoves2
dw NoEggMoves2
dw NatuEggMoves
dw NoEggMoves2 ; Qatu
dw NoEggMoves2
dw MoibelleEggMoves
dw NoEggMoves2 ; Belledam
@ -43,18 +45,24 @@ EggMovePointers2::
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw MarillEggMoves
dw AzurillEggMoves
dw NoEggMoves2
dw NoEggMoves2
dw SudowoodoEggMoves
dw NoEggMoves2
dw HoppipEggMoves
dw NoEggMoves2
dw NoEggMoves2
dw AercrowEggMoves
dw AipomEggMoves
dw NoEggMoves2 ; Ambipom
dw NoEggMoves2
dw NoEggMoves2 ; Sunbud
dw NoEggMoves2
dw HippunkEggMoves
dw AercrowEggMoves
dw FoxfireEggMoves
dw YanmaEggMoves
dw NoEggMoves2 ; Yanmega
dw WooperEggMoves
dw NoEggMoves2
dw NoEggMoves2
@ -85,6 +93,8 @@ EggMovePointers2::
dw SnubbullEggMoves
dw NoEggMoves2
dw QwilfishEggMoves
dw NoEggMoves2 ; Kazeppelin
dw NoEggMoves2 ; Qwilfather
dw NoEggMoves2
dw ShuckleEggMoves
dw NoEggMoves2
@ -100,8 +110,11 @@ EggMovePointers2::
dw CorsolaEggMoves
dw RemoraidEggMoves
dw NoEggMoves2
dw StricheelEggMoves
dw NoEggMoves2 ; Lurreel
dw DelibirdEggMoves
dw MantineEggMoves
dw MantykeEggMoves
dw NoEggMoves2 ; Mantine
dw SkarmoryEggMoves
dw HoundourEggMoves
dw NoEggMoves2
@ -245,6 +258,13 @@ ChinchouEggMoves:
dw SUPERSONIC
dw SCREECH
dw -1 ; end
ReroadEggMoves:
dw FAINT_ATTACK
dw HYPNOSIS
dw MIND_READER
dw SLUDGE
dw -1 ; end
PichuEggMoves:
dw REVERSAL
@ -300,7 +320,7 @@ MareepEggMoves:
dw REFLECT
dw -1 ; end
MarillEggMoves:
AzurillEggMoves:
dw LIGHT_SCREEN
dw PRESENT
dw AMNESIA
@ -324,13 +344,6 @@ HoppipEggMoves:
dw AMNESIA
dw PAY_DAY
dw -1 ; end
AercrowEggMoves:
dw DRILL_PECK
dw FUTURE_SIGHT
dw SAFEGUARD
dw WHIRLWIND
dw -1 ; end
AipomEggMoves:
dw COUNTER
@ -343,6 +356,29 @@ AipomEggMoves:
dw BEAT_UP
dw -1 ; end
HippunkEggMoves:
dw ACID
dw BELLY_DRUM
dw BODY_SLAM
dw SCREECH
dw SING
dw -1 ; end
AercrowEggMoves:
dw DRILL_PECK
dw FUTURE_SIGHT
dw SAFEGUARD
dw WHIRLWIND
dw -1 ; end
FoxfireEggMoves:
dw CONFUSE_RAY
dw DISABLE
dw FAINT_ATTACK
dw HYPNOSIS
dw QUICK_ATTACK
dw -1 ; end
YanmaEggMoves:
dw WHIRLWIND
dw REVERSAL
@ -478,6 +514,13 @@ RemoraidEggMoves:
dw HAZE
dw SCREECH
dw -1 ; end
StricheelEggMoves:
dw BEAT_UP
dw FLAIL
dw SCREECH
dw SUPERSONIC
dw -1 ; end
DelibirdEggMoves:
dw AURORA_BEAM
@ -487,7 +530,7 @@ DelibirdEggMoves:
dw RAPID_SPIN
dw -1 ; end
MantineEggMoves:
MantykeEggMoves:
dw TWISTER
dw HYDRO_PUMP
dw HAZE

19
data/pokemon/egg_moves_kanto.asm
View file

@ -100,6 +100,10 @@ EggMovePointers1:
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
dw CheepEggMoves
dw NoEggMoves1 ; Jabetta
dw RibbitoEggMoves
dw NoEggMoves1 ; Croakozuna
dw FarfetchDEggMoves
dw DoduoEggMoves
dw NoEggMoves1
@ -109,6 +113,7 @@ EggMovePointers1:
dw NoEggMoves1
dw ShellderEggMoves
dw NoEggMoves1
dw NoEggMoves1 ; Disturban
dw GastlyEggMoves
dw NoEggMoves1
dw NoEggMoves1
@ -415,6 +420,20 @@ SlowpokeEggMoves:
dw STOMP
dw -1 ; end
CheepEggMoves:
dw AGILITY
dw AURORA_BEAM
dw MEDITATE
dw WING_ATTACK
dw -1 ; end
RibbitoEggMoves:
dw LOW_KICK
dw HAZE
dw CROSS_CHOP
dw TOXIC
dw -1 ; end
FarfetchDEggMoves:
dw FORESIGHT
dw MIRROR_MOVE

202
data/pokemon/evos_attacks_johto.asm
View file

@ -29,6 +29,7 @@ EvosAttacksPointers2::
dw CrobatEvosAttacks
dw ChinchouEvosAttacks
dw LanturnEvosAttacks
dw ReroadEvosAttacks
dw PichuEvosAttacks
dw CleffaEvosAttacks
dw IgglybuffEvosAttacks
@ -36,6 +37,7 @@ EvosAttacksPointers2::
dw TogeticEvosAttacks
dw TogekissEvosAttacks
dw NatuEvosAttacks
dw QatuEvosAttacks
dw XatuEvosAttacks
dw MoibelleEvoAttacks
dw BelledamEvoAttacks
@ -43,6 +45,7 @@ EvosAttacksPointers2::
dw FlaaffyEvosAttacks
dw AmpharosEvosAttacks
dw BellossomEvosAttacks
dw AzurillEvosAttacks
dw MarillEvosAttacks
dw AzumarillEvosAttacks
dw SudowoodoEvosAttacks
@ -51,10 +54,15 @@ EvosAttacksPointers2::
dw SkiploomEvosAttacks
dw JumpluffEvosAttacks
dw AipomEvosAttacks
dw AmbipomEvosAttacks
dw SunkernEvosAttacks
dw SunbudEvosAttacks
dw SunfloraEvosAttacks
dw HippunkEvosAttacks
dw AercrowEvosAttacks
dw FoxfireEvosAttacks
dw YanmaEvosAttacks
dw YanmegaEvosAttacks
dw WooperEvosAttacks
dw QuagsireEvosAttacks
dw EspeonEvosAttacks
@ -84,6 +92,8 @@ EvosAttacksPointers2::
dw SnubbullEvosAttacks
dw GranbullEvosAttacks
dw QwilfishEvosAttacks
dw KazeppelinEvosAttacks
dw QwilfatherEvosAttacks
dw ScizorEvosAttacks
dw ShuckleEvosAttacks
dw PockleEvosAttacks
@ -99,7 +109,10 @@ EvosAttacksPointers2::
dw CorsolaEvosAttacks
dw RemoraidEvosAttacks
dw OctilleryEvosAttacks
dw StricheelEvosAttacks
dw LurreelEvosAttacks
dw DelibirdEvosAttacks
dw MantykeEvosAttacks
dw MantineEvosAttacks
dw SkarmoryEvosAttacks
dw HoundourEvosAttacks
@ -561,6 +574,18 @@ LanturnEvosAttacks:
dbw 45, TAKE_DOWN
dbw 53, HYDRO_PUMP
db 0 ; no more level-up moves
ReroadEvosAttacks:
db 0 ; no more evolutions
dbw 1, BUBBLE
dbw 1, MEGAPHONE
dbw 7, LICK
dbw 14, HORN_ATTACK
dbw 20, RAIN_DANCE
dbw 27, FURY_ATTACK
dbw 34, ENCORE
dbw 43, HORN_DRILL
db 0 ; no more level-up moves
PichuEvosAttacks:
dbbw EVOLVE_HAPPINESS, TR_ANYTIME, PIKACHU
@ -625,7 +650,7 @@ TogekissEvosAttacks:
db 0
NatuEvosAttacks:
dbbw EVOLVE_LEVEL, 25, XATU
dbbw EVOLVE_LEVEL, 20, QATU
db 0 ; no more evolutions
dbw 1, PECK
dbw 1, LEER
@ -635,6 +660,18 @@ NatuEvosAttacks:
dbw 40, CONFUSE_RAY
dbw 50, PSYCHIC_M
db 0 ; no more level-up moves
QatuEvosAttacks:
dbbw EVOLVE_ITEM, HEART_STONE, XATU
db 0 ; no more evolutions
dbw 1, PECK
dbw 1, LEER
dbw 10, NIGHT_SHADE
dbw 20, TELEPORT
dbw 35, FUTURE_SIGHT ; Synchronize
dbw 50, CONFUSE_RAY
dbw 65, PSYCHIC_M
db 0 ; no more level-up moves
XatuEvosAttacks:
db 0 ; no more evolutions
@ -643,7 +680,7 @@ XatuEvosAttacks:
dbw 1, NIGHT_SHADE
dbw 10, NIGHT_SHADE
dbw 20, TELEPORT
dbw 35, FUTURE_SIGHT
dbw 35, FUTURE_SIGHT ; Synchronize
dbw 50, CONFUSE_RAY
dbw 65, PSYCHIC_M
db 0 ; no more level-up moves
@ -725,6 +762,17 @@ BellossomEvosAttacks:
dbw 55, SOLARBEAM
db 0 ; no more level-up moves
AzurillEvosAttacks:
dbbw EVOLVE_HAPPINESS, TR_ANYTIME, MARILL
db 0 ; no more evolutions
dbw 1, SPLASH
dbw 3, CHARM
dbw 6, TAIL_WHIP
dbw 10, BUBBLE
dbw 15, SLAM
dbw 21, WATER_GUN
db 0 ; no more level-up moves
MarillEvosAttacks:
dbbw EVOLVE_LEVEL, 18, AZUMARILL
db 0 ; no more evolutions
@ -825,6 +873,7 @@ JumpluffEvosAttacks:
db 0 ; no more level-up moves
AipomEvosAttacks:
dbbw EVOLVE_LEVEL, 32, AMBIPOM
db 0 ; no more evolutions
dbw 1, SCRATCH
dbw 1, TAIL_WHIP
@ -835,9 +884,21 @@ AipomEvosAttacks:
dbw 36, SCREECH
dbw 46, AGILITY
db 0 ; no more level-up moves
AmbipomEvosAttacks:
db 0 ; no more evolutions
dbw 1, SCRATCH
dbw 1, TAIL_WHIP
dbw 6, SAND_ATTACK
dbw 12, BATON_PASS
dbw 19, FURY_SWIPES
dbw 27, SWIFT
dbw 39, SCREECH
dbw 52, AGILITY
db 0 ; no more level-up moves
SunkernEvosAttacks:
dbbw EVOLVE_ITEM, SUN_STONE, SUNFLORA
dbbw EVOLVE_LEVEL, 15, SUNBUD
db 0 ; no more evolutions
dbw 1, ABSORB
dbw 4, GROWTH
@ -846,6 +907,19 @@ SunkernEvosAttacks:
dbw 31, SYNTHESIS
dbw 46, GIGA_DRAIN
db 0 ; no more level-up moves
SunbudEvosAttacks:
dbbw EVOLVE_ITEM, SUN_STONE, SUNFLORA
db 0 ; no more evolutions
dbw 1, ABSORB
dbw 1, POUND
dbw 4, GROWTH
dbw 10, RAZOR_LEAF
dbw 21, SUNNY_DAY
dbw 28, SYNTHESIS
dbw 35, PETAL_DANCE
dbw 52, SOLARBEAM
db 0 ; no more level-up moves
SunfloraEvosAttacks:
db 0 ; no more evolutions
@ -853,11 +927,23 @@ SunfloraEvosAttacks:
dbw 1, POUND
dbw 4, GROWTH
dbw 10, RAZOR_LEAF
dbw 19, SUNNY_DAY
dbw 31, PETAL_DANCE
dbw 46, SOLARBEAM
dbw 21, SUNNY_DAY
dbw 35, PETAL_DANCE
dbw 52, SOLARBEAM
db 0 ; no more level-up moves
HippunkEvosAttacks:
db 0; no more evolutions
dbw 1, CONFUSION
dbw 1, GROWL
dbw 7, BITE
dbw 14, STOMP
dbw 21, AMNESIA
dbw 28, ENCORE
dbw 35, FUTURE_SIGHT
dbw 42, CRUNCH
db 0 ; no more level-up moves
AercrowEvosAttacks:
db 0; no more evolutions
dbw 1, PECK
@ -870,8 +956,21 @@ AercrowEvosAttacks:
dbw 42, FORESIGHT
dbw 50, RAZOR_WIND
db 0 ; no more level-up moves
FoxfireEvosAttacks:
db 0; no more evolutions
dbw 1, EMBER
dbw 1, LEER
dbw 12, FLAME_WHEEL
dbw 17, ROAR
dbw 21, BITE
dbw 28, MORNING_SUN
dbw 34, FIRE_SPIN
dbw 40, FLAMETHROWER
db 0 ; no more level-up moves
YanmaEvosAttacks:
dbbw EVOLVE_LEVEL, 34, YANMEGA ; to be changed
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, FORESIGHT
@ -879,7 +978,24 @@ YanmaEvosAttacks:
dbw 13, DOUBLE_TEAM
dbw 19, SONICBOOM
dbw 25, DETECT
dbw 31, SUPERSONIC
dbw 29, SUPERSONIC
dbw 33, ANCIENTPOWER
dbw 37, SWIFT
dbw 37, WING_ATTACK
dbw 43, SCREECH
db 0 ; no more level-up moves
YanmegaEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, FORESIGHT
dbw 7, QUICK_ATTACK
dbw 13, DOUBLE_TEAM
dbw 19, SONICBOOM
dbw 25, DETECT
dbw 29, SUPERSONIC
dbw 33, ANCIENTPOWER
dbw 37, SLASH
dbw 37, WING_ATTACK
dbw 43, SCREECH
db 0 ; no more level-up moves
@ -1242,6 +1358,33 @@ GranbullEvosAttacks:
db 0 ; no more level-up moves
QwilfishEvosAttacks:
dbbw EVOLVE_ITEM, THUNDERSTONE, KAZEPPELIN
dbbw EVOLVE_ITEM, POISON_STONE, QWILFATHER
db 0 ; no more evolutions
dbw 1, SPIKES
dbw 1, TACKLE
dbw 1, POISON_STING
dbw 10, HARDEN
dbw 10, MINIMIZE
dbw 19, WATER_GUN
dbw 28, PIN_MISSILE
dbw 37, TAKE_DOWN
dbw 46, HYDRO_PUMP
db 0 ; no more level-up moves
KazeppelinEvosAttacks:
db 0 ; no more evolutions
dbw 1, POISON_STING
dbw 7, TAIL_WHIP
dbw 14, WATER_GUN
dbw 22, MINIMIZE
dbw 31, THUNDER_WAVE
dbw 41, PIN_MISSILE
dbw 52, TAKE_DOWN
dbw 64, HYDRO_PUMP
db 0 ; no more level-up moves
QwilfatherEvosAttacks:
db 0 ; no more evolutions
dbw 1, SPIKES
dbw 1, TACKLE
@ -1454,12 +1597,55 @@ OctilleryEvosAttacks:
dbw 54, ICE_BEAM
dbw 70, HYPER_BEAM
db 0 ; no more level-up moves
StricheelEvosAttacks:
dbbw EVOLVE_LEVEL, 30, LURREEL
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 6, LEER
dbw 12, WRAP
dbw 18, WATER_GUN
dbw 24, SLAM
dbw 30, FAINT_ATTACK
dbw 36, SCARY_FACE
dbw 42, PURSUIT
dbw 48, SPARK
dbw 54, HYDRO_PUMP
db 0 ; no more level-up moves
LurreelEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 6, LEER
dbw 12, WRAP
dbw 18, WATER_GUN
dbw 24, SLAM
dbw 30, FAINT_ATTACK
dbw 30, CRUNCH
dbw 39, SCARY_FACE
dbw 48, PURSUIT
dbw 57, SPARK
dbw 66, HYDRO_PUMP
db 0 ; no more level-up moves
DelibirdEvosAttacks:
db 0 ; no more evolutions
dbw 1, PRESENT
db 0 ; no more level-up moves
MantykeEvosAttacks:
dbbw EVOLVE_LEVEL, 30, MANTINE ; to be changed
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, BUBBLE
dbw 10, SUPERSONIC
dbw 18, BUBBLEBEAM
dbw 25, TAKE_DOWN
dbw 32, AGILITY
dbw 40, WING_ATTACK
dbw 49, CONFUSE_RAY
db 0 ; no more level-up moves
MantineEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE

78
data/pokemon/evos_attacks_kanto.asm
View file

@ -100,6 +100,10 @@ EvosAttacksPointers1::
dw SlowbroEvosAttacks
dw MagnemiteEvosAttacks
dw MagnetonEvosAttacks
dw CheepEvosAttacks
dw JabettaEvosAttacks
dw RibbitoEvosAttacks
dw CroakozunaEvosAttacks
dw FarfetchDEvosAttacks
dw DoduoEvosAttacks
dw DodrioEvosAttacks
@ -109,6 +113,7 @@ EvosAttacksPointers1::
dw MukEvosAttacks
dw ShellderEvosAttacks
dw CloysterEvosAttacks
dw DisturbanEvosAttacks
dw GastlyEvosAttacks
dw HaunterEvosAttacks
dw GengarEvosAttacks
@ -1519,6 +1524,68 @@ MagnetonEvosAttacks:
dbw 43, SCREECH
dbw 53, ZAP_CANNON
db 0 ; no more level-up moves
CheepEvosAttacks:
dbbw EVOLVE_LEVEL, 30, JABETTA
db 0 ; no more evolutions
dbw 1, BUBBLE
dbw 1, PECK
dbw 5, DOUBLE_KICK
dbw 11, COUNTER
dbw 16, BUBBLEBEAM
dbw 20, LOW_KICK
dbw 26, JUMP_KICK
dbw 31, SEISMIC_TOSS
dbw 36, WATERFALL
dbw 40, HI_JUMP_KICK
dbw 45, HYDRO_PUMP
dbw 49, DRILL_PECK
db 0 ; no more level-up moves
JabettaEvosAttacks:
db 0 ; no more evolutions
dbw 1, BUBBLE
dbw 1, PECK
dbw 5, DOUBLE_KICK
dbw 11, COUNTER
dbw 16, BUBBLEBEAM
dbw 20, LOW_KICK
dbw 26, JUMP_KICK
dbw 33, SEISMIC_TOSS
dbw 40, WATERFALL
dbw 46, HI_JUMP_KICK
dbw 53, HYDRO_PUMP
dbw 59, DRILL_PECK
db 0 ; no more level-up moves
RibbitoEvosAttacks:
dbbw EVOLVE_LEVEL, 30, CROAKOZUNA
db 0 ; no more evolutions
dbw 1, DOUBLE_TEAM
dbw 1, DOUBLESLAP
dbw 7, BUBBLE
dbw 13, MEDITATE
dbw 19, WATER_GUN
dbw 24, FAINT_ATTACK
dbw 31, SUBSTITUTE
dbw 35, VITAL_THROW
dbw 42, BELLY_DRUM
dbw 48, HYDRO_PUMP
db 0 ; no more level-up moves
CroakozunaEvosAttacks:
db 0 ; no more evolutions
dbw 1, DOUBLE_TEAM
dbw 1, DOUBLESLAP
dbw 7, BUBBLE
dbw 13, MEDITATE
dbw 19, WATER_GUN
dbw 24, FAINT_ATTACK
dbw 34, SUBSTITUTE
dbw 41, VITAL_THROW
dbw 51, BELLY_DRUM
dbw 60, HYDRO_PUMP
db 0 ; no more level-up moves
FarfetchDEvosAttacks:
db 0 ; no more evolutions
@ -1614,6 +1681,7 @@ MukEvosAttacks:
ShellderEvosAttacks:
dbbw EVOLVE_ITEM, WATER_STONE, CLOYSTER
dbbw EVOLVE_ITEM, SLOWPOKETAIL, DISTURBAN
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, WITHDRAW
@ -1634,6 +1702,16 @@ CloysterEvosAttacks:
dbw 33, SPIKES
dbw 41, SPIKE_CANNON
db 0 ; no more level-up moves
DisturbanEvosAttacks:
db 0 ; no more evolutions
dbw 1, WITHDRAW
dbw 1, SUPERSONIC
dbw 1, BITE
dbw 1, POISON_GAS
dbw 33, SPIKES
dbw 41, CRUNCH
db 0 ; no more level-up moves
GastlyEvosAttacks:
dbbw EVOLVE_LEVEL, 25, HAUNTER

24
data/pokemon/first_stages.asm
View file

@ -100,6 +100,10 @@ FirstEvoStages::
dw SLOWPOKE ;50
dw MAGNEMITE
dw MAGNEMITE
dw CHEEP
dw CHEEP
dw RIBBITO
dw RIBBITO
dw FARFETCH_D
dw DODUO
dw DODUO
@ -109,6 +113,7 @@ FirstEvoStages::
dw GRIMER
dw SHELLDER
dw SHELLDER
dw SHELLDER
dw GASTLY
dw GASTLY
dw GASTLY
@ -208,6 +213,7 @@ FirstEvoStages::
dw BITTYBAT
dw CHINCHOU
dw CHINCHOU
dw REROAD
dw PICHU
dw CLEFFA
dw IGGLYBUFF
@ -216,23 +222,30 @@ FirstEvoStages::
dw TOGEPI
dw NATU
dw NATU
dw NATU
dw MOIBELLE
dw MOIBELLE
dw MAREEP
dw MAREEP
dw MAREEP
dw ODDISH
dw MARILL
dw MARILL ;b8
dw AZURILL
dw AZURILL
dw AZURILL ;b8
dw SUDOWOODO
dw POLIWAG
dw HOPPIP
dw HOPPIP
dw HOPPIP
dw AIPOM
dw AIPOM
dw SUNKERN
dw SUNKERN
dw SUNKERN ;c0
dw HIPPUNK
dw AERCROW
dw FOXFIRE
dw YANMA
dw YANMA
dw WOOPER
dw WOOPER
@ -263,6 +276,8 @@ FirstEvoStages::
dw SNUBBULL
dw SNUBBULL
dw QWILFISH
dw QWILFISH
dw QWILFISH
dw SCYTHER
dw SHUCKLE
dw SHUCKLE
@ -278,8 +293,11 @@ FirstEvoStages::
dw CORSOLA
dw REMORAID
dw REMORAID ;e0
dw STRICHEEL
dw STRICHEEL
dw DELIBIRD
dw MANTINE
dw MANTYKE
dw MANTYKE
dw SKARMORY
dw HOUNDOUR
dw HOUNDOUR

5
data/pokemon/gen1_base_special.asm
View file

@ -101,6 +101,10 @@ KantoMonSpecials:
db 80 ; SLOWBRO
db 95 ; MAGNEMITE
db 120 ; MAGNETON
db 40 ; CHEEP
db 80 ; JABETTA
db 55 ; RIBBITO
db 75 ; CROAKOZUNA
db 58 ; FARFETCH_D
db 35 ; DODUO
db 60 ; DODRIO
@ -110,6 +114,7 @@ KantoMonSpecials:
db 65 ; MUK
db 45 ; SHELLDER
db 85 ; CLOYSTER
db 70 ; DISTURBAN
db 100 ; GASTLY
db 115 ; HAUNTER
db 130 ; GENGAR

18
data/pokemon/gen1_order.asm
View file

@ -340,4 +340,22 @@ Pokered_MonIndices:
db IRON_BUNDLE
db IRON_THORNS
db ORFRY
db CHEEP
db JABETTA
db RIBBITO
db CROAKOZUNA
db DISTURBAN
db REROAD
db QATU
db AZURILL
db AMBIPOM
db SUNBUD
db HIPPUNK
db FOXFIRE
db YANMEGA
db KAZEPPELIN
db QWILFATHER
db STRICHEEL
db LURREEL
db MANTYKE
assert_table_length NUM_POKEMON - 1

18
data/pokemon/menu_icons.asm
View file

@ -101,6 +101,10 @@ MonMenuIcons:
db ICON_SLOWPOKE ; SLOWBRO
db ICON_VOLTORB ; MAGNEMITE
db ICON_VOLTORB ; MAGNETON
db ICON_FISH ; CHEEP
db ICON_FISH ; JABETTA
db ICON_POLIWAG ; RIBBITO
db ICON_POLIWAG ; CROAKOZUNA
db ICON_BIRD ; FARFETCH_D
db ICON_BIRD ; DODUO
db ICON_BIRD ; DODRIO
@ -110,6 +114,7 @@ MonMenuIcons:
db ICON_BLOB ; MUK
db ICON_SHELL ; SHELLDER
db ICON_SHELL ; CLOYSTER
db ICON_SHELL ; DISTURBAN
db ICON_GHOST ; GASTLY
db ICON_GHOST ; HAUNTER
db ICON_GHOST ; GENGAR
@ -209,6 +214,7 @@ MonMenuIcons:
db ICON_BAT ; CROBAT
db ICON_FISH ; CHINCHOU
db ICON_FISH ; LANTURN
db ICON_POLIWAG ; REROAD
db ICON_PIKACHU ; PICHU
db ICON_CLEFAIRY ; CLEFFA
db ICON_JIGGLYPUFF ; IGGLYBUFF
@ -216,6 +222,7 @@ MonMenuIcons:
db ICON_BIRD ; TOGETIC
db ICON_BIRD ; TOGEKISS
db ICON_BIRD ; NATU
db ICON_BIRD ; QATU
db ICON_BIRD ; XATU
db ICON_FOX ; MOIBELLE
db ICON_FOX ; BELLEDAM
@ -223,6 +230,7 @@ MonMenuIcons:
db ICON_MONSTER ; FLAAFFY
db ICON_MONSTER ; AMPHAROS
db ICON_ODDISH ; BELLOSSOM
db ICON_JIGGLYPUFF ; AZURILL
db ICON_JIGGLYPUFF ; MARILL
db ICON_JIGGLYPUFF ; AZUMARILL
db ICON_SUDOWOODO ; SUDOWOODO
@ -231,10 +239,15 @@ MonMenuIcons:
db ICON_ODDISH ; SKIPLOOM
db ICON_ODDISH ; JUMPLUFF
db ICON_MONSTER ; AIPOM
db ICON_MONSTER ; AMBIPOM
db ICON_ODDISH ; SUNKERN
db ICON_ODDISH ; SUNBUD
db ICON_ODDISH ; SUNFLORA
db ICON_SLOWPOKE ; HIPPUNK
db ICON_BIRD ; AERCROW
db ICON_FOX ; FOXFIRE
db ICON_BUG ; YANMA
db ICON_BUG ; YANMEGA
db ICON_MONSTER ; WOOPER
db ICON_MONSTER ; QUAGSIRE
db ICON_FOX ; ESPEON
@ -264,6 +277,8 @@ MonMenuIcons:
db ICON_MONSTER ; SNUBBULL
db ICON_MONSTER ; GRANBULL
db ICON_FISH ; QWILFISH
db ICON_FISH ; KAZEPPELIN
db ICON_FISH ; QWILFATHER
db ICON_BUG ; SCIZOR
db ICON_BUG ; SHUCKLE
db ICON_BUG ; POCKLE
@ -279,7 +294,10 @@ MonMenuIcons:
db ICON_SHELL ; CORSOLA
db ICON_FISH ; REMORAID
db ICON_FISH ; OCTILLERY
db ICON_FISH ; STRICHEEL
db ICON_FISH ; LURREEL
db ICON_MONSTER ; DELIBIRD
db ICON_FISH ; MANTYKE
db ICON_FISH ; MANTINE
db ICON_BIRD ; SKARMORY
db ICON_FOX ; HOUNDOUR

18
data/pokemon/names.asm
View file

@ -103,6 +103,10 @@ PokemonNames::
db "SLOWBRO@@@"
db "MAGNEMITE@"
db "MAGNETON@@"
db "CHEEP@@@@@"
db "JABETTA@@@"
db "RIBBITO@@@"
db "CROAKOZUNA"
db "FARFETCH'D"
db "DODUO@@@@@"
db "DODRIO@@@@"
@ -112,6 +116,7 @@ PokemonNames::
db "MUK@@@@@@@"
db "SHELLDER@@"
db "CLOYSTER@@"
db "DISTURBAN@"
db "GASTLY@@@@"
db "HAUNTER@@@"
db "GENGAR@@@@"
@ -211,6 +216,7 @@ PokemonNames::
db "CROBAT@@@@"
db "CHINCHOU@@"
db "LANTURN@@@"
db "REROAD@@@@"
db "PICHU@@@@@"
db "CLEFFA@@@@"
db "IGGLYBUFF@"
@ -218,6 +224,7 @@ PokemonNames::
db "TOGETIC@@@"
db "TOGEKISS@@"
db "NATU@@@@@@"
db "QATU@@@@@@"
db "XATU@@@@@@"
db "MOIBELLE@@"
db "BELLEDAM@@"
@ -225,6 +232,7 @@ PokemonNames::
db "FLAAFFY@@@"
db "AMPHAROS@@"
db "BELLOSSOM@"
db "AZURILL@@@"
db "MARILL@@@@"
db "AZUMARILL@"
db "SUDOWOODO@"
@ -233,10 +241,15 @@ PokemonNames::
db "SKIPLOOM@@"
db "JUMPLUFF@@"
db "AIPOM@@@@@"
db "AMBIPOM@@@"
db "SUNKERN@@@"
db "SUNBUD@@@@"
db "SUNFLORA@@"
db "HIPPUNK@@@"
db "AERCROW@@@"
db "FOXFIRE@@@"
db "YANMA@@@@@"
db "YANMEGA@@@"
db "WOOPER@@@@"
db "QUAGSIRE@@"
db "ESPEON@@@@"
@ -266,6 +279,8 @@ PokemonNames::
db "SNUBBULL@@"
db "GRANBULL@@"
db "QWILFISH@@"
db "KAZEPPELIN"
db "QWILFATHER"
db "SCIZOR@@@@"
db "SHUCKLE@@@"
db "POCKLE@@@@"
@ -281,7 +296,10 @@ PokemonNames::
db "CORSOLA@@@"
db "REMORAID@@"
db "OCTILLERY@"
db "STRICHEEL@"
db "LURREEL@@@"
db "DELIBIRD@@"
db "MANTYKE@@@"
db "MANTINE@@@"
db "SKARMORY@@"
db "HOUNDOUR@@"

36
data/pokemon/palettes.asm
View file

@ -231,6 +231,14 @@ INCBIN "gfx/pokemon/magnemite/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/magnemite/shiny.pal"
INCBIN "gfx/pokemon/magneton/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/magneton/shiny.pal"
INCBIN "gfx/pokemon/cheep/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/cheep/shiny.pal"
INCBIN "gfx/pokemon/jabetta/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/jabetta/shiny.pal"
INCBIN "gfx/pokemon/ribbito/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/ribbito/shiny.pal"
INCBIN "gfx/pokemon/croakozuna/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/croakozuna/shiny.pal"
INCBIN "gfx/pokemon/farfetch_d/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/farfetch_d/shiny.pal"
INCBIN "gfx/pokemon/doduo/front.gbcpal", middle_colors
@ -249,6 +257,8 @@ INCBIN "gfx/pokemon/shellder/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/shellder/shiny.pal"
INCBIN "gfx/pokemon/cloyster/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/cloyster/shiny.pal"
INCBIN "gfx/pokemon/disturban/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/disturban/shiny.pal"
INCBIN "gfx/pokemon/gastly/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/gastly/shiny.pal"
INCBIN "gfx/pokemon/haunter/front.gbcpal", middle_colors
@ -447,6 +457,8 @@ INCBIN "gfx/pokemon/chinchou/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/chinchou/shiny.pal"
INCBIN "gfx/pokemon/lanturn/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/lanturn/shiny.pal"
INCBIN "gfx/pokemon/reroad/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/reroad/shiny.pal"
INCBIN "gfx/pokemon/pichu/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/pichu/shiny.pal"
INCBIN "gfx/pokemon/cleffa/front.gbcpal", middle_colors
@ -461,6 +473,8 @@ INCBIN "gfx/pokemon/togekiss/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/togekiss/shiny.pal"
INCBIN "gfx/pokemon/natu/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/natu/shiny.pal"
INCBIN "gfx/pokemon/qatu/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/qatu/shiny.pal"
INCBIN "gfx/pokemon/xatu/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/xatu/shiny.pal"
INCBIN "gfx/pokemon/moibelle/front.gbcpal", middle_colors
@ -475,6 +489,8 @@ INCBIN "gfx/pokemon/ampharos/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/ampharos/shiny.pal"
INCBIN "gfx/pokemon/bellossom/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/bellossom/shiny.pal"
INCBIN "gfx/pokemon/azurill/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/azurill/shiny.pal"
INCBIN "gfx/pokemon/marill/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/marill/shiny.pal"
INCBIN "gfx/pokemon/azumarill/front.gbcpal", middle_colors
@ -491,14 +507,24 @@ INCBIN "gfx/pokemon/jumpluff/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/jumpluff/shiny.pal"
INCBIN "gfx/pokemon/aipom/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/aipom/shiny.pal"
INCBIN "gfx/pokemon/ambipom/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/ambipom/shiny.pal"
INCBIN "gfx/pokemon/sunkern/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/sunkern/shiny.pal"
INCBIN "gfx/pokemon/sunbud/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/sunbud/shiny.pal"
INCBIN "gfx/pokemon/sunflora/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/sunflora/shiny.pal"
INCBIN "gfx/pokemon/hippunk/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/hippunk/shiny.pal"
INCBIN "gfx/pokemon/aercrow/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/aercrow/shiny.pal"
INCBIN "gfx/pokemon/foxfire/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/foxfire/shiny.pal"
INCBIN "gfx/pokemon/yanma/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/yanma/shiny.pal"
INCBIN "gfx/pokemon/yanmega/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/yanmega/shiny.pal"
INCBIN "gfx/pokemon/wooper/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/wooper/shiny.pal"
INCBIN "gfx/pokemon/quagsire/front.gbcpal", middle_colors
@ -557,6 +583,10 @@ INCBIN "gfx/pokemon/granbull/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/granbull/shiny.pal"
INCBIN "gfx/pokemon/qwilfish/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/qwilfish/shiny.pal"
INCBIN "gfx/pokemon/kazeppelin/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/kazeppelin/shiny.pal"
INCBIN "gfx/pokemon/qwilfather/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/qwilfather/shiny.pal"
INCBIN "gfx/pokemon/scizor/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/scizor/shiny.pal"
INCBIN "gfx/pokemon/shuckle/front.gbcpal", middle_colors
@ -587,8 +617,14 @@ INCBIN "gfx/pokemon/remoraid/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/remoraid/shiny.pal"
INCBIN "gfx/pokemon/octillery/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/octillery/shiny.pal"
INCBIN "gfx/pokemon/stricheel/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/stricheel/shiny.pal"
INCBIN "gfx/pokemon/lurreel/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/lurreel/shiny.pal"
INCBIN "gfx/pokemon/delibird/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/delibird/shiny.pal"
INCBIN "gfx/pokemon/mantyke/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/mantyke/shiny.pal"
INCBIN "gfx/pokemon/mantine/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/mantine/shiny.pal"
INCBIN "gfx/pokemon/skarmory/front.gbcpal", middle_colors

36
data/pokemon/pic_pointers.asm
View file

@ -211,6 +211,14 @@ PokemonPicPointers::
dba MagnemiteBackpic
dba MagnetonFrontpic
dba MagnetonBackpic
dba CheepFrontpic
dba CheepBackpic
dba JabettaFrontpic
dba JabettaBackpic
dba RibbitoFrontpic
dba RibbitoBackpic
dba CroakozunaFrontpic
dba CroakozunaBackpic
dba FarfetchDFrontpic
dba FarfetchDBackpic
dba DoduoFrontpic
@ -229,6 +237,8 @@ PokemonPicPointers::
dba ShellderBackpic
dba CloysterFrontpic
dba CloysterBackpic
dba DisturbanFrontpic
dba DisturbanBackpic
dba GastlyFrontpic
dba GastlyBackpic
dba HaunterFrontpic
@ -427,6 +437,8 @@ PokemonPicPointers::
dba ChinchouBackpic
dba LanturnFrontpic
dba LanturnBackpic
dba ReroadFrontpic
dba ReroadBackpic
dba PichuFrontpic
dba PichuBackpic
dba CleffaFrontpic
@ -441,6 +453,8 @@ PokemonPicPointers::
dba TogekissBackpic
dba NatuFrontpic
dba NatuBackpic
dba QatuFrontpic
dba QatuBackpic
dba XatuFrontpic
dba XatuBackpic
dba MoibelleFrontpic
@ -455,6 +469,8 @@ PokemonPicPointers::
dba AmpharosBackpic
dba BellossomFrontpic
dba BellossomBackpic
dba AzurillFrontpic
dba AzurillBackpic
dba MarillFrontpic
dba MarillBackpic
dba AzumarillFrontpic
@ -471,14 +487,24 @@ PokemonPicPointers::
dba JumpluffBackpic
dba AipomFrontpic
dba AipomBackpic
dba AmbipomFrontpic
dba AmbipomBackpic
dba SunkernFrontpic
dba SunkernBackpic
dba SunbudFrontpic
dba SunbudBackpic
dba SunfloraFrontpic
dba SunfloraBackpic
dba HippunkFrontpic
dba HippunkBackpic
dba AercrowFrontpic
dba AercrowBackpic
dba FoxfireFrontpic
dba FoxfireBackpic
dba YanmaFrontpic
dba YanmaBackpic
dba YanmegaFrontpic
dba YanmegaBackpic
dba WooperFrontpic
dba WooperBackpic
dba QuagsireFrontpic
@ -540,6 +566,10 @@ PokemonPicPointers::
dba GranbullBackpic
dba QwilfishFrontpic
dba QwilfishBackpic
dba KazeppelinFrontpic
dba KazeppelinBackpic
dba QwilfatherFrontpic
dba QwilfatherBackpic
dba ScizorFrontpic
dba ScizorBackpic
dba ShuckleFrontpic
@ -570,8 +600,14 @@ PokemonPicPointers::
dba RemoraidBackpic
dba OctilleryFrontpic
dba OctilleryBackpic
dba StricheelFrontpic
dba StricheelBackpic
dba LurreelFrontpic
dba LurreelBackpic
dba DelibirdFrontpic
dba DelibirdBackpic
dba MantykeFrontpic
dba MantykeBackpic
dba MantineFrontpic
dba MantineBackpic
dba SkarmoryFrontpic

73
data/wild/fish.asm
View file

@ -31,12 +31,12 @@ FishGroups:
.Shore_Good:
dbbw 35 percent, 20, MAGIKARP
dbbw 70 percent, 20, KRABBY
dbbw 90 percent + 1, 20, KRABBY
dbbw 90 percent + 1, 20, MANTYKE
dbbw 100 percent, 0, TIME_GROUP
.Shore_Super:
dbbw 40 percent, 40, KRABBY
dbbw 70 percent, 1, TIME_GROUP
dbbw 90 percent + 1, 40, KRABBY
dbbw 90 percent + 1, 40, MANTYKE
dbbw 100 percent, 40, KINGLER
.Ocean_Old:
@ -56,8 +56,8 @@ FishGroups:
.Lake_Old:
dbbw 70 percent + 1, 10, MAGIKARP
dbbw 85 percent + 1, 10, MAGIKARP
dbbw 100 percent, 10, GOLDEEN
dbbw 85 percent + 1, 10, ORFRY
dbbw 100 percent, 10, ORFRY
.Lake_Good:
dbbw 35 percent, 20, MAGIKARP
dbbw 70 percent, 20, GOLDEEN
@ -66,7 +66,7 @@ FishGroups:
.Lake_Super:
dbbw 40 percent, 40, GOLDEEN
dbbw 70 percent, 5, TIME_GROUP
dbbw 90 percent + 1, 40, MAGIKARP
dbbw 90 percent + 1, 40, GYARADOS
dbbw 100 percent, 40, SEAKING
.Pond_Old:
@ -76,27 +76,27 @@ FishGroups:
.Pond_Good:
dbbw 35 percent, 20, MAGIKARP
dbbw 70 percent, 20, POLIWAG
dbbw 90 percent + 1, 20, POLIWAG
dbbw 90 percent + 1, 20, REROAD
dbbw 100 percent, 6, TIME_GROUP
.Pond_Super:
dbbw 40 percent, 40, POLIWAG
dbbw 70 percent, 7, TIME_GROUP
dbbw 90 percent + 1, 40, MAGIKARP
dbbw 100 percent, 40, POLIWAG
dbbw 90 percent + 1, 40, MARILL
dbbw 100 percent, 40, POLIWHIRL
.Dratini_Old:
dbbw 70 percent + 1, 10, MAGIKARP
dbbw 85 percent + 1, 10, MAGIKARP
dbbw 100 percent, 10, MAGIKARP
dbbw 100 percent, 10, HORSEA
.Dratini_Good:
dbbw 35 percent, 20, MAGIKARP
dbbw 70 percent, 20, MAGIKARP
dbbw 90 percent + 1, 20, MAGIKARP
dbbw 70 percent, 20, HORSEA
dbbw 90 percent + 1, 20, HORSEA
dbbw 100 percent, 8, TIME_GROUP
.Dratini_Super:
dbbw 40 percent, 40, MAGIKARP
dbbw 40 percent, 40, GYARADOS
dbbw 70 percent, 9, TIME_GROUP
dbbw 90 percent + 1, 40, MAGIKARP
dbbw 90 percent + 1, 40, SEADRA
dbbw 100 percent, 40, DRAGONAIR
.Qwilfish_Swarm_Old:
@ -142,7 +142,7 @@ FishGroups:
dbbw 40 percent, 40, MAGIKARP
dbbw 70 percent, 15, TIME_GROUP
dbbw 90 percent + 1, 40, MAGIKARP
dbbw 100 percent, 40, MAGIKARP
dbbw 100 percent, 40, GYARADOS
.Dratini_2_Old:
dbbw 70 percent + 1, 10, MAGIKARP
@ -164,15 +164,15 @@ FishGroups:
dbbw 85 percent + 1, 10, MAGIKARP
dbbw 100 percent, 10, KRABBY
.WhirlIslands_Good:
dbbw 35 percent, 20, MAGIKARP
dbbw 70 percent, 20, KRABBY
dbbw 90 percent + 1, 20, KRABBY
dbbw 35 percent, 20, KRABBY
dbbw 70 percent, 20, MANTYKE
dbbw 90 percent + 1, 20, CORSOLA
dbbw 100 percent, 18, TIME_GROUP
.WhirlIslands_Super:
dbbw 40 percent, 40, KRABBY
dbbw 40 percent, 40, KINGLER
dbbw 70 percent, 19, TIME_GROUP
dbbw 90 percent + 1, 40, KINGLER
dbbw 100 percent, 40, SEADRA
dbbw 90 percent + 1, 40, CORSOLA
dbbw 100 percent, 40, MANTINE
.Qwilfish_NoSwarm_Old:
.Qwilfish_Old:
@ -189,7 +189,7 @@ FishGroups:
.Qwilfish_Super:
dbbw 40 percent, 40, TENTACOOL
dbbw 70 percent, 21, TIME_GROUP
dbbw 90 percent + 1, 40, MAGIKARP
dbbw 90 percent + 1, 40, TENTACRUEL
dbbw 100 percent, 40, QWILFISH
.Remoraid_Old:
@ -200,23 +200,23 @@ FishGroups:
dbbw 35 percent, 20, MAGIKARP
dbbw 70 percent, 20, POLIWAG
dbbw 90 percent + 1, 20, REMORAID
dbbw 100 percent, 6, TIME_GROUP
dbbw 100 percent, 22, TIME_GROUP
.Remoraid_Super:
dbbw 40 percent, 40, POLIWAG
dbbw 70 percent, 7, TIME_GROUP
dbbw 90 percent + 1, 40, MAGIKARP
dbbw 100 percent, 40, REMORAID
dbbw 70 percent, 23, TIME_GROUP
dbbw 90 percent + 1, 40, POLIWHIRL
dbbw 100 percent, 40, OCTILLERY
TimeFishGroups:
; day nite
dbwbw 20, CORSOLA, 20, STARYU ; 0
dbwbw 40, CORSOLA, 40, STARYU ; 1
dbwbw 20, SHELLDER, 20, SHELLDER ; 2
dbwbw 40, SHELLDER, 40, SHELLDER ; 3
dbwbw 20, GOLDEEN, 20, GOLDEEN ; 4
dbwbw 40, GOLDEEN, 40, GOLDEEN ; 5
dbwbw 20, POLIWAG, 20, POLIWAG ; 6
dbwbw 40, POLIWAG, 40, POLIWAG ; 7
dbwbw 20, SHELLDER, 20, STRICHEEL ; 2
dbwbw 40, SHELLDER, 40, LURREEL ; 3
dbwbw 20, CHEEP, 20, WOOPER ; 4
dbwbw 40, JABETTA, 40, QUAGSIRE ; 5
dbwbw 20, POLIWAG, 20, REROAD ; 6
dbwbw 40, POLIWHIRL, 40, REROAD ; 7
dbwbw 20, DRATINI, 20, DRATINI ; 8
dbwbw 40, DRATINI, 40, DRATINI ; 9
dbwbw 20, QWILFISH, 20, QWILFISH ; 10
@ -227,7 +227,10 @@ TimeFishGroups:
dbwbw 40, GYARADOS, 40, GYARADOS ; 15
dbwbw 10, DRATINI, 10, DRATINI ; 16
dbwbw 10, DRATINI, 10, DRATINI ; 17
dbwbw 20, HORSEA, 20, HORSEA ; 18
dbwbw 40, HORSEA, 40, HORSEA ; 19
dbwbw 20, TENTACOOL, 20, TENTACOOL ; 20
dbwbw 40, TENTACOOL, 40, TENTACOOL ; 21
dbwbw 20, HORSEA, 20, STRICHEEL ; 18
dbwbw 40, SEADRA, 40, LURREEL ; 19
dbwbw 20, QWILFISH, 20, QWILFISH ; 20
dbwbw 40, QWILFISH, 40, QWILFISH ; 21
dbwbw 20, REMORAID, 20, REMORAID ; 21
dbwbw 40, REMORAID, 40, REMORAID ; 21

280
data/wild/johto_grass.asm
View file

@ -374,57 +374,57 @@ JohtoGrassWildMons:
def_grass_wildmons RUINS_OF_ALPH_OUTSIDE
db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
dbw 20, NATU
dbw 22, NATU
dbw 18, NATU
dbw 24, NATU
dbw 20, SMEARGLE
dbw 22, SMEARGLE
dbw 22, SMEARGLE
dbw 24, SMEARGLE
dbw 26, QATU
dbw 24, CALFLAC
dbw 27, QATU
dbw 25, SMEARGLE
dbw 25, CALFLAC
dbw 26, CALFLAC
; day
dbw 20, NATU
dbw 22, NATU
dbw 18, NATU
dbw 24, NATU
dbw 20, SMEARGLE
dbw 22, SMEARGLE
dbw 22, SMEARGLE
dbw 24, SMEARGLE
dbw 26, QATU
dbw 24, CALFLAC
dbw 27, QATU
dbw 25, SMEARGLE
dbw 25, CALFLAC
dbw 26, CALFLAC
; nite
dbw 20, NATU
dbw 22, NATU
dbw 18, NATU
dbw 24, NATU
dbw 22, WOOPER
dbw 22, QUAGSIRE
dbw 22, QUAGSIRE
dbw 24, QUAGSIRE
dbw 26, QATU
dbw 24, WOOPER
dbw 27, QATU
dbw 25, QUAGSIRE
dbw 25, MISDREAVUS
dbw 26, MISDREAVUS
end_grass_wildmons
def_grass_wildmons RUINS_OF_ALPH_INNER_CHAMBER
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
dbw 5, UNOWN
dbw 5, UNOWN
dbw 5, UNOWN
dbw 5, UNOWN
dbw 5, UNOWN
dbw 5, UNOWN
dbw 5, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
; day
dbw 5, UNOWN
dbw 5, UNOWN
dbw 5, UNOWN
dbw 5, UNOWN
dbw 5, UNOWN
dbw 5, UNOWN
dbw 5, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
; nite
dbw 5, UNOWN
dbw 5, UNOWN
dbw 5, UNOWN
dbw 5, UNOWN
dbw 5, UNOWN
dbw 5, UNOWN
dbw 5, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
dbw 10, UNOWN
end_grass_wildmons
def_grass_wildmons UNION_CAVE_1F
@ -433,26 +433,26 @@ JohtoGrassWildMons:
dbw 6, GEODUDE
dbw 6, SANDSHREW
dbw 6, BITTYBAT
dbw 7, MARILL ; AZURILL
dbw 7, ZUBAT
dbw 7, AZURILL
dbw 8, AZURILL
dbw 8, ONIX
dbw 9, ONIX
dbw 10, ONIX
; day
dbw 6, GEODUDE
dbw 6, SANDSHREW
dbw 6, BITTYBAT
dbw 7, MARILL ; AZURILL
dbw 7, ZUBAT
dbw 7, AZURILL
dbw 8, AZURILL
dbw 8, ONIX
dbw 9, ONIX
dbw 10, ONIX
; nite
dbw 6, GEODUDE
dbw 6, RATTATA
dbw 6, AZURILL
dbw 6, WOOPER
dbw 7, MARILL ; AZURILL
dbw 7, BITTYBAT
dbw 7, AZURILL
dbw 8, BITTYBAT
dbw 8, ONIX
dbw 9, ONIX
dbw 10, ONIX
end_grass_wildmons
def_grass_wildmons UNION_CAVE_B1F
@ -461,79 +461,79 @@ JohtoGrassWildMons:
dbw 8, GEODUDE
dbw 7, BITTYBAT
dbw 8, ZUBAT
dbw 8, ONIX
dbw 10, ONIX
dbw 7, WOOPER
dbw 8, WOOPER
dbw 9, MARILL ; AZURILL
dbw 9, AZURILL
; day
dbw 8, GEODUDE
dbw 7, BITTYBAT
dbw 8, BITTYBAT
dbw 8, ONIX
dbw 10, ONIX
dbw 7, WOOPER
dbw 8, WOOPER
dbw 9, MARILL ; AZURILL
dbw 9, AZURILL
; nite
dbw 8, GEODUDE
dbw 7, BITTYBAT
dbw 8, WOOPER
dbw 8, ONIX
dbw 10, ONIX
dbw 7, WOOPER
dbw 8, WOOPER
dbw 9, MARILL ; AZURILL
dbw 9, AZURILL
end_grass_wildmons
def_grass_wildmons UNION_CAVE_B2F
db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn
dbw 22, ZUBAT
dbw 22, GOLBAT
dbw 22, ZUBAT
dbw 21, AZUMARILL
dbw 20, GEODUDE
dbw 23, ONIX
dbw 23, ONIX
dbw 26, GRAVELER
dbw 25, GOLBAT
dbw 24, RIBBITO
dbw 26, AZUMARILL
dbw 25, GRAVELER
dbw 26, ONIX
dbw 27, ONIX
; day
dbw 22, ZUBAT
dbw 22, GOLBAT
dbw 22, ZUBAT
dbw 21, AZUMARILL
dbw 20, GEODUDE
dbw 23, ONIX
dbw 23, ONIX
dbw 26, GRAVELER
dbw 25, GOLBAT
dbw 24, RIBBITO
dbw 26, AZUMARILL
dbw 25, GRAVELER
dbw 26, ONIX
dbw 27, ONIX
; nite
dbw 22, ZUBAT
dbw 22, GOLBAT
dbw 22, QUAGSIRE
dbw 21, AZUMARILL
dbw 20, GEODUDE
dbw 23, ONIX
dbw 23, ONIX
dbw 26, GRAVELER
dbw 25, GOLBAT
dbw 24, QUAGSIRE
dbw 26, AZUMARILL
dbw 25, GRAVELER
dbw 26, ONIX
dbw 27, ONIX
end_grass_wildmons
def_grass_wildmons SLOWPOKE_WELL_B1F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
dbw 8, BITTYBAT
dbw 8, BITTYBAT
dbw 8, SLOWPOKE
dbw 9, SLOWPOKE
dbw 8, SLOWPOKE
dbw 9, SHELLDER
dbw 8, BITTYBAT
dbw 10, SLOWPOKE
dbw 10, SHELLDER
; day
dbw 8, BITTYBAT
dbw 8, BITTYBAT
dbw 8, SLOWPOKE
dbw 9, SLOWPOKE
dbw 8, SLOWPOKE
dbw 9, SHELLDER
dbw 8, BITTYBAT
dbw 10, SLOWPOKE
dbw 10, SHELLDER
; nite
dbw 8, BITTYBAT
dbw 8, BITTYBAT
dbw 8, SLOWPOKE
dbw 9, SLOWPOKE
dbw 8, SLOWPOKE
dbw 9, SHELLDER
dbw 8, BITTYBAT
dbw 10, SLOWPOKE
dbw 10, SHELLDER
@ -542,29 +542,29 @@ JohtoGrassWildMons:
def_grass_wildmons SLOWPOKE_WELL_B2F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
dbw 21, ZUBAT
dbw 25, GOLBAT
dbw 23, SHELLDER
dbw 19, ZUBAT
dbw 21, SLOWPOKE
dbw 23, GOLBAT
dbw 23, SHELLDER ; DISTURBAN
dbw 23, SLOWKING
dbw 24, SLOWPOKE
dbw 23, GOLBAT
dbw 26, DISTURBAN
dbw 26, SLOWKING
; day
dbw 21, ZUBAT
dbw 25, GOLBAT
dbw 23, SHELLDER
dbw 19, ZUBAT
dbw 21, SLOWPOKE
dbw 23, GOLBAT
dbw 23, SHELLDER ; DISTURBAN
dbw 23, SLOWKING
dbw 24, SLOWPOKE
dbw 23, GOLBAT
dbw 26, DISTURBAN
dbw 26, SLOWKING
; nite
dbw 21, ZUBAT
dbw 25, GOLBAT
dbw 23, SHELLDER
dbw 19, ZUBAT
dbw 21, SLOWPOKE
dbw 23, GOLBAT
dbw 23, SHELLDER ; DISTURBAN
dbw 23, SLOWKING
dbw 24, SLOWPOKE
dbw 23, GOLBAT
dbw 26, DISTURBAN
dbw 26, SLOWKING
end_grass_wildmons
; With Viridian Forest existing, much of this wild data no longer made sense.
@ -1203,7 +1203,7 @@ JohtoGrassWildMons:
dbw 5, PHANPY
dbw 5, BITTYBAT
dbw 6, PHANPY
dbw 7, PHANPY
dbw 7, BIPULLA
dbw 6, TEDDIURSA
dbw 6, BITTYBAT
dbw 7, DUNSPARCE
@ -1211,7 +1211,7 @@ JohtoGrassWildMons:
dbw 5, PHANPY
dbw 5, BITTYBAT
dbw 6, PHANPY
dbw 7, PHANPY
dbw 7, BIPULLA
dbw 6, BITTYBAT
dbw 7, BITTYBAT
dbw 7, DUNSPARCE
@ -1344,57 +1344,57 @@ JohtoGrassWildMons:
def_grass_wildmons ROUTE_32
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
dbw 4, EKANS
dbw 5, RATTATA
dbw 6, MAREEP ; From Gold
dbw 6, NATU
dbw 7, MAREEP
dbw 5, EKANS
dbw 6, SENTRET
dbw 7, MAREEP ; From Gold
dbw 7, NATU
dbw 7, MARILL ; AZURILL
dbw 8, MAREEP
dbw 7, AZURILL
dbw 8, AZURILL
; day
dbw 4, EKANS
dbw 5, RATTATA
dbw 6, MAREEP ; From Gold
dbw 6, NATU
dbw 7, MAREEP
dbw 5, EKANS
dbw 6, SENTRET
dbw 7, MAREEP ; From Gold
dbw 7, NATU
dbw 7, MARILL ; AZURILL
dbw 8, MAREEP
dbw 7, AZURILL
dbw 8, AZURILL
; nite
dbw 4, WOOPER
dbw 5, COINPUR
dbw 7, WOOPER
dbw 6, MAREEP ; From Gold
dbw 7, HOOTHOOT
dbw 7, MISDREAVUS
dbw 5, WOOPER
dbw 6, MOIBELLE
dbw 8, WOOPER
dbw 7, MAREEP ; From Gold
dbw 8, HOOTHOOT
dbw 7, MISDREAVUS
dbw 8, MISDREAVUS
end_grass_wildmons
def_grass_wildmons ROUTE_33
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
dbw 6, RATTATA
dbw 6, SPEAROW
dbw 6, GEODUDE
dbw 6, SUNKERN
dbw 7, EKANS
dbw 7, MARILL ; AZURILL
dbw 7, MARILL ; AZURILL
dbw 7, RATTATA
dbw 8, SPEAROW
dbw 7, GEODUDE
dbw 9, SUNKERN
dbw 8, EKANS
dbw 8, AZURILL
dbw 9, AZURILL
; day
dbw 6, RATTATA
dbw 6, SPEAROW
dbw 6, GEODUDE
dbw 6, SUNKERN
dbw 7, EKANS
dbw 7, MARILL ; AZURILL
dbw 7, MARILL ; AZURILL
dbw 7, RATTATA
dbw 8, SPEAROW
dbw 7, GEODUDE
dbw 9, SUNKERN
dbw 8, EKANS
dbw 8, AZURILL
dbw 9, AZURILL
; nite
dbw 6, MOIBELLE
dbw 6, ZUBAT
dbw 6, GEODUDE
dbw 6, ZUBAT
dbw 7, MOIBELLE
dbw 7, BIPULLA
dbw 7, SLOWPOKE ; HIPPUNK
dbw 7, BITTYBAT
dbw 7, GEODUDE
dbw 8, BIPULLA
dbw 8, MOIBELLE
dbw 9, HIPPUNK
dbw 10, HIPPUNK
end_grass_wildmons
def_grass_wildmons ROUTE_34

73
data/wild/treemons.asm
View file

@ -22,6 +22,23 @@ TreeMons:
; db %, species, level
TreeMonSet_City:
; common
dbbw 50, 10, PIDGEY
dbbw 15, 10, MEOWTH
dbbw 15, 10, MEOWTH
dbbw 10, 10, HOPPIP
dbbw 5, 10, HOPPIP
dbbw 5, 10, HOPPIP
db -1
; rare
dbbw 50, 10, PIDGEY
dbbw 15, 10, MOIBELLE
dbbw 15, 10, MOIBELLE
dbbw 10, 10, MURKROW
dbbw 5, 10, MURKROW
dbbw 5, 10, MURKROW
db -1
TreeMonSet_Canyon:
; common
dbbw 50, 10, SPEAROW
@ -35,16 +52,16 @@ TreeMonSet_Canyon:
dbbw 50, 10, SPEAROW
dbbw 15, 10, HERACROSS
dbbw 15, 10, HERACROSS
dbbw 10, 10, AIPOM
dbbw 5, 10, AIPOM
dbbw 5, 10, AIPOM
dbbw 10, 10, GLIGAR
dbbw 5, 10, GLIGAR
dbbw 5, 10, GLIGAR
db -1
TreeMonSet_Town:
; common
dbbw 50, 10, SPEAROW
dbbw 15, 10, SHUCKLE
dbbw 15, 10, FOLAGE
dbbw 15, 10, SPEAROW
dbbw 10, 10, AIPOM
dbbw 5, 10, AIPOM
dbbw 5, 10, AIPOM
@ -53,9 +70,9 @@ TreeMonSet_Town:
dbbw 50, 10, SPEAROW
dbbw 15, 10, HERACROSS
dbbw 15, 10, HERACROSS
dbbw 10, 10, AIPOM
dbbw 5, 10, AIPOM
dbbw 5, 10, AIPOM
dbbw 10, 10, PINSIR
dbbw 5, 10, PINSIR
dbbw 5, 10, PINSIR
db -1
TreeMonSet_Route:
@ -72,26 +89,26 @@ TreeMonSet_Route:
dbbw 15, 10, PINECO
dbbw 15, 10, PINECO
dbbw 10, 10, FOLAGE
dbbw 5, 10, FOLAGE
dbbw 5, 10, EXEGGCUTE
dbbw 5, 10, BURGELA
dbbw 5, 10, BURGELA
db -1
TreeMonSet_Kanto:
; common
dbbw 50, 10, HOOTHOOT
dbbw 50, 10, HOOTHOOT ; DODAERIE
dbbw 15, 10, EKANS
dbbw 15, 10, HOOTHOOT
dbbw 10, 10, EXEGGCUTE
dbbw 5, 10, EXEGGCUTE
dbbw 5, 10, EXEGGCUTE
dbbw 10, 10, FOLAGE ; BALUMBA
dbbw 5, 10, FOLAGE ; BALUMBA
dbbw 5, 10, FOLAGE ; BALUMBA
db -1
; rare
dbbw 50, 10, HOOTHOOT
dbbw 15, 10, PINECO
dbbw 15, 10, PINECO
dbbw 10, 10, FOLAGE
dbbw 5, 10, FOLAGE
dbbw 5, 10, EXEGGCUTE
dbbw 50, 10, HOOTHOOT ; DODAERIE
dbbw 15, 10, EXEGGCUTE
dbbw 15, 10, EXEGGCUTE
dbbw 10, 10, PINSIR
dbbw 5, 10, PINSIR
dbbw 5, 10, PINSIR
db -1
TreeMonSet_Lake:
@ -107,27 +124,27 @@ TreeMonSet_Lake:
dbbw 50, 10, HOOTHOOT
dbbw 15, 10, PINECO
dbbw 15, 10, PINECO
dbbw 10, 10, FOLAGE
dbbw 5, 10, FOLAGE
dbbw 5, 10, EXEGGCUTE
dbbw 10, 10, HERACROSS
dbbw 5, 10, HERACROSS
dbbw 5, 10, HERACROSS
db -1
TreeMonSet_Forest:
; common
dbbw 50, 10, HOOTHOOT
dbbw 15, 10, PINECO
dbbw 15, 10, PINECO
dbbw 10, 10, FOLAGE
dbbw 15, 10, FOLAGE
dbbw 10, 10, CARAPTHOR
dbbw 5, 10, BUTTERFREE
dbbw 5, 10, BEEDRILL
db -1
; rare
dbbw 50, 10, HOOTHOOT
dbbw 15, 10, CATERPIE
dbbw 15, 10, FOLAGE
dbbw 10, 10, HOOTHOOT
dbbw 5, 10, METAPOD
dbbw 5, 10, KAKUNA
dbbw 15, 10, WEEDLE
dbbw 10, 10, GENTLARVA
dbbw 5, 10, HERACROSS
dbbw 5, 10, PINSIR
db -1
; Rock Smash begins here.