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

Goodbye Para, hello Taaban

Browse source
This commit is contained in:
MementoMartha 2023-04-18 14:57:43 +01:00
parent c92b422b62
commit bfcc8de9f4
21 changed files with 342 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

55
data/pokemon/base_stats.asm
View file

@ -28,17 +28,20 @@ INCLUDE "data/pokemon/base_stats/raticatea.asm"
INCLUDE "data/pokemon/base_stats/pidgey.asm"
INCLUDE "data/pokemon/base_stats/pidgeotto.asm"
INCLUDE "data/pokemon/base_stats/pidgeot.asm"
INCLUDE "data/pokemon/base_stats/konya.asm"
INCLUDE "data/pokemon/base_stats/meowth.asm"
INCLUDE "data/pokemon/base_stats/persian.asm"
INCLUDE "data/pokemon/base_stats/persiana.asm"
INCLUDE "data/pokemon/base_stats/perrserker.asm"
INCLUDE "data/pokemon/base_stats/caterpie.asm"
INCLUDE "data/pokemon/base_stats/metapod.asm"
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/konya.asm"
INCLUDE "data/pokemon/base_stats/meowth.asm"
INCLUDE "data/pokemon/base_stats/persian.asm"
INCLUDE "data/pokemon/base_stats/persiana.asm"
INCLUDE "data/pokemon/base_stats/perrserker.asm"
; INCLUDE "data/pokemon/base_stats/kokana.asm"
; INCLUDE "data/pokemon/base_stats/kasanagi.asm"
; INCLUDE "data/pokemon/base_stats/carapthor.asm"
INCLUDE "data/pokemon/base_stats/spearow.asm"
INCLUDE "data/pokemon/base_stats/fearow.asm"
INCLUDE "data/pokemon/base_stats/ekans.asm"
@ -61,7 +64,6 @@ INCLUDE "data/pokemon/base_stats/geodude.asm"
INCLUDE "data/pokemon/base_stats/graveler.asm"
INCLUDE "data/pokemon/base_stats/golem.asm"
INCLUDE "data/pokemon/base_stats/golema.asm"
INCLUDE "data/pokemon/base_stats/para.asm"
INCLUDE "data/pokemon/base_stats/paras.asm"
INCLUDE "data/pokemon/base_stats/parasect.asm"
INCLUDE "data/pokemon/base_stats/clefairy.asm"
@ -103,15 +105,13 @@ INCLUDE "data/pokemon/base_stats/poliwag.asm"
INCLUDE "data/pokemon/base_stats/poliwhirl.asm"
INCLUDE "data/pokemon/base_stats/poliwrath.asm"
INCLUDE "data/pokemon/base_stats/politoed.asm"
INCLUDE "data/pokemon/base_stats/ribbito.asm"
INCLUDE "data/pokemon/base_stats/croakozuna.asm"
INCLUDE "data/pokemon/base_stats/drowzee.asm"
INCLUDE "data/pokemon/base_stats/hypno.asm"
INCLUDE "data/pokemon/base_stats/lickitung.asm"
INCLUDE "data/pokemon/base_stats/lickilicky.asm"
INCLUDE "data/pokemon/base_stats/abra.asm"
INCLUDE "data/pokemon/base_stats/kadabra.asm"
INCLUDE "data/pokemon/base_stats/alakazam.asm"
INCLUDE "data/pokemon/base_stats/lickitung.asm"
INCLUDE "data/pokemon/base_stats/lickilicky.asm"
INCLUDE "data/pokemon/base_stats/drowzee.asm"
INCLUDE "data/pokemon/base_stats/hypno.asm"
INCLUDE "data/pokemon/base_stats/diglett.asm"
INCLUDE "data/pokemon/base_stats/dugtrio.asm"
INCLUDE "data/pokemon/base_stats/dugtrioa.asm"
@ -129,6 +129,8 @@ INCLUDE "data/pokemon/base_stats/tentacool.asm"
INCLUDE "data/pokemon/base_stats/tentacruel.asm"
INCLUDE "data/pokemon/base_stats/toedscool.asm"
INCLUDE "data/pokemon/base_stats/toedscruel.asm"
INCLUDE "data/pokemon/base_stats/ribbito.asm"
INCLUDE "data/pokemon/base_stats/croakozuna.asm"
INCLUDE "data/pokemon/base_stats/magnemite.asm"
INCLUDE "data/pokemon/base_stats/magnetite.asm"
INCLUDE "data/pokemon/base_stats/magneton.asm"
@ -137,9 +139,6 @@ INCLUDE "data/pokemon/base_stats/machop.asm"
INCLUDE "data/pokemon/base_stats/machoke.asm"
INCLUDE "data/pokemon/base_stats/machamp.asm"
INCLUDE "data/pokemon/base_stats/crocky.asm"
INCLUDE "data/pokemon/base_stats/farfetchd.asm"
INCLUDE "data/pokemon/base_stats/madaamu.asm"
INCLUDE "data/pokemon/base_stats/sirfetchd.asm"
INCLUDE "data/pokemon/base_stats/krabby.asm"
INCLUDE "data/pokemon/base_stats/kingler.asm"
INCLUDE "data/pokemon/base_stats/slowpoke.asm"
@ -151,12 +150,10 @@ INCLUDE "data/pokemon/base_stats/puchikoon.asm"
INCLUDE "data/pokemon/base_stats/ponyta.asm"
INCLUDE "data/pokemon/base_stats/rapidash.asm"
INCLUDE "data/pokemon/base_stats/rapidashg.asm"
INCLUDE "data/pokemon/base_stats/deer.asm"
INCLUDE "data/pokemon/base_stats/monja.asm"
INCLUDE "data/pokemon/base_stats/tangela.asm"
INCLUDE "data/pokemon/base_stats/tangrowth.asm"
INCLUDE "data/pokemon/base_stats/hinaazu.asm"
INCLUDE "data/pokemon/base_stats/doduo.asm"
INCLUDE "data/pokemon/base_stats/dodrio.asm"
INCLUDE "data/pokemon/base_stats/barunda.asm"
INCLUDE "data/pokemon/base_stats/gastly.asm"
INCLUDE "data/pokemon/base_stats/haunter.asm"
@ -165,6 +162,12 @@ INCLUDE "data/pokemon/base_stats/cubone.asm"
INCLUDE "data/pokemon/base_stats/marowak.asm"
INCLUDE "data/pokemon/base_stats/marowaka.asm"
INCLUDE "data/pokemon/base_stats/guardia.asm"
INCLUDE "data/pokemon/base_stats/farfetchd.asm"
INCLUDE "data/pokemon/base_stats/madaamu.asm"
INCLUDE "data/pokemon/base_stats/sirfetchd.asm"
INCLUDE "data/pokemon/base_stats/hinaazu.asm"
INCLUDE "data/pokemon/base_stats/doduo.asm"
INCLUDE "data/pokemon/base_stats/dodrio.asm"
INCLUDE "data/pokemon/base_stats/betobebii.asm"
INCLUDE "data/pokemon/base_stats/grimer.asm"
INCLUDE "data/pokemon/base_stats/muk.asm"
@ -172,23 +175,25 @@ INCLUDE "data/pokemon/base_stats/muka.asm"
INCLUDE "data/pokemon/base_stats/koffing.asm"
INCLUDE "data/pokemon/base_stats/weezing.asm"
INCLUDE "data/pokemon/base_stats/weezingg.asm"
INCLUDE "data/pokemon/base_stats/blastyke.asm"
INCLUDE "data/pokemon/base_stats/blastoise.asm"
INCLUDE "data/pokemon/base_stats/ditto.asm"
INCLUDE "data/pokemon/base_stats/animon.asm"
INCLUDE "data/pokemon/base_stats/deer.asm"
INCLUDE "data/pokemon/base_stats/mrmime.asm"
INCLUDE "data/pokemon/base_stats/mrrime.asm"
INCLUDE "data/pokemon/base_stats/cactus.asm"
INCLUDE "data/pokemon/base_stats/hitmonlee.asm"
INCLUDE "data/pokemon/base_stats/hitmonchan.asm"
INCLUDE "data/pokemon/base_stats/hitmontop.asm"
INCLUDE "data/pokemon/base_stats/cactus.asm"
INCLUDE "data/pokemon/base_stats/shellder.asm"
INCLUDE "data/pokemon/base_stats/cloyster.asm"
INCLUDE "data/pokemon/base_stats/blottle.asm"
INCLUDE "data/pokemon/base_stats/pendraken.asm"
INCLUDE "data/pokemon/base_stats/shellder.asm"
INCLUDE "data/pokemon/base_stats/cloyster.asm"
INCLUDE "data/pokemon/base_stats/taaban.asm"
INCLUDE "data/pokemon/base_stats/staryu.asm"
INCLUDE "data/pokemon/base_stats/starmie.asm"
INCLUDE "data/pokemon/base_stats/seel.asm"
INCLUDE "data/pokemon/base_stats/dewgong.asm"
INCLUDE "data/pokemon/base_stats/blastyke.asm"
INCLUDE "data/pokemon/base_stats/blastoise.asm"
INCLUDE "data/pokemon/base_stats/horsea.asm"
INCLUDE "data/pokemon/base_stats/seadra.asm"
INCLUDE "data/pokemon/base_stats/kingdra.asm"
@ -215,8 +220,6 @@ INCLUDE "data/pokemon/base_stats/blissey.asm"
INCLUDE "data/pokemon/base_stats/skimper.asm"
INCLUDE "data/pokemon/base_stats/bawligua.asm"
INCLUDE "data/pokemon/base_stats/cryithan.asm"
INCLUDE "data/pokemon/base_stats/mrmime.asm"
INCLUDE "data/pokemon/base_stats/mrrime.asm"
INCLUDE "data/pokemon/base_stats/jynx.asm"
INCLUDE "data/pokemon/base_stats/buu.asm"
INCLUDE "data/pokemon/base_stats/electabuzz.asm"

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

@ -0,0 +1,25 @@
db DEX_TAABAN ; pokedex id
db 70, 125, 145, 50, 70
; hp atk def spd spc
db WATER, WATER ; type
db 60 ; catch rate
db 203 ; base exp
INCBIN "gfx/pokemon/front/taaban.pic", 0, 1 ; sprite dimensions
dw TaabanPicFront, TaabanPicBack
db TACKLE, WITHDRAW, BITE, WATER_GUN ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset
tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \
ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, EARTHQUAKE, \
FISSURE, DIG, TELEPORT, MIMIC, DOUBLE_TEAM, \
REFLECT, BIDE, SELFDESTRUCT, SWIFT, REST, \
EXPLOSION, TRI_ATTACK, SUBSTITUTE, SURF, STRENGTH
; end
db BANK(TaabanPicFront)
assert BANK(TaabanPicFront) == BANK(TaabanPicBack)

3
data/pokemon/cries.asm
View file

@ -221,7 +221,8 @@ CryData::
mon_cry SFX_CRY_00, $00, $00 ; Slowking
mon_cry SFX_CRY_00, $00, $00 ; Electivire
mon_cry SFX_CRY_00, $00, $00 ; Magmortar
mon_cry SFX_CRY_1E, $79, $40 ; Para
mon_cry SFX_CRY_07, $20, $FF ; Taaban
; mon_cry SFX_CRY_1E, $79, $40 ; Para
mon_cry SFX_CRY_00, $00, $00 ; Hinaazu
mon_cry SFX_CRY_05, $FF, $40 ; Betobebii
mon_cry SFX_CRY_00, $00, $00 ; Magnezone

12
data/pokemon/dex_entries.asm
View file

@ -215,7 +215,7 @@ PokedexEntryPointers:
dw SlowkingDexEntry
dw ElectivireDexEntry
dw MagmortarDexEntry
dw ParaDexEntry
dw TaabanDexEntry
dw HinaazuDexEntry
dw BetobebiiDexEntry
dw MagnezoneDexEntry
@ -1752,11 +1752,11 @@ MagmortarDexEntry:
text_far _MagmortarDexEntry
text_end
ParaDexEntry:
db "MUSHROOM@"
db 0,8
dw 40
text_far _ParaDexEntry
TaabanDexEntry:
db "SPIRAL@"
db 4,3
dw 1530
text_far _TaabanDexEntry
text_end
BetobebiiDexEntry:

2
data/pokemon/dex_order.asm
View file

@ -215,7 +215,7 @@ PokedexOrder:
db DEX_SLOWKING
db DEX_ELECTIVIRE
db DEX_MAGMORTAR
db DEX_PARA
db DEX_TAABAN
db DEX_HINAAZU
db DEX_BETOBEBII
db DEX_MAGNEZONE

6
data/pokemon/dex_text.asm
View file

@ -73,9 +73,9 @@ _SlowbroDexEntry:: ; new entry
next "goes out to sea,"
next "it may get bit"
page "by a spiral"
next "SHELLDER and"
next "become a SLOWBRO"
page "by a TAABAN and"
next "evolve into"
next "a SLOWBRO"
dex
_IvysaurDexEntry::

16
data/pokemon/evos_moves.asm
View file

@ -227,7 +227,7 @@ EvosMovesPointerTable:
dw SlowkingEvosMoves
dw ElectivireEvosMoves
dw MagmortarEvosMoves
dw ParaEvosMoves
dw TaabanEvosMoves
dw HinaazuEvosMoves
dw BetobebiiEvosMoves
dw MagnezoneEvosMoves
@ -522,7 +522,8 @@ GyaradosEvosMoves:
ShellderEvosMoves:
; Evolutions
db EV_ITEM, WATER_STONE, 1, CLOYSTER
db EV_ITEM, WATER_STONE, 1, TAABAN
db EV_ITEM, ICE_STONE, 1, CLOYSTER
db 0
; Learnset
db 18, SUPERSONIC
@ -2833,18 +2834,11 @@ MagmortarEvosMoves:
db 55, FLAMETHROWER
db 0
ParaEvosMoves:
TaabanEvosMoves:
; Evolutions
db EV_LEVEL, 12, PARAS
db 0
; Learnset
db 3, STUN_SPORE
db 6, LEECH_LIFE
db 10, POISONPOWDER
db 15, FURY_SWIPES
db 21, SPORE
db 25, GROWTH
db 29, SLASH
db 50, POISON_GAS
db 0
HinaazuEvosMoves:

55
data/pokemon/menu_icons.asm
View file

@ -28,17 +28,20 @@ MonPartyData:
nybble ICON_BIRD ; Pidgey
nybble ICON_BIRD ; Pidgeotto
nybble ICON_BIRD ; Pidgeot
nybble ICON_MON ; Konya
nybble ICON_MON ; Meowth
nybble ICON_MON ; Persian
nybble ICON_MON ; Persian-A
nybble ICON_MON ; Perrserker
nybble ICON_BUG ; Caterpie
nybble ICON_BUG ; Metapod
nybble ICON_BUG ; Butterfree
nybble ICON_BUG ; Weedle
nybble ICON_BUG ; Kakuna
nybble ICON_BUG ; Beedrill
nybble ICON_MON ; Konya
nybble ICON_MON ; Meowth
nybble ICON_MON ; Persian
nybble ICON_MON ; Persian-A
nybble ICON_MON ; Perrserker
; nybble ICON_BUG ; Kokana
; nybble ICON_BUG ; Kasanagi
; nybble ICON_BUG ; Carapthor
nybble ICON_BIRD ; Spearow
nybble ICON_BIRD ; Fearow
nybble ICON_SNAKE ; Ekans
@ -61,7 +64,6 @@ MonPartyData:
nybble ICON_MON ; Graveler
nybble ICON_MON ; Golem
nybble ICON_MON ; Golem-A
nybble ICON_BUG ; Para
nybble ICON_BUG ; Paras
nybble ICON_BUG ; Parasect
nybble ICON_FAIRY ; Clefairy
@ -103,15 +105,13 @@ MonPartyData:
nybble ICON_MON ; Poliwhirl
nybble ICON_MON ; Poliwrath
nybble ICON_MON ; Politoed
nybble ICON_MON ; Ribbito
nybble ICON_MON ; Croakozuna
nybble ICON_MON ; Drowzee
nybble ICON_MON ; Hypno
nybble ICON_MON ; Lickitung
nybble ICON_MON ; Lickilicky
nybble ICON_MON ; Abra
nybble ICON_MON ; Kadabra
nybble ICON_MON ; Alakazam
nybble ICON_MON ; Lickitung
nybble ICON_MON ; Lickilicky
nybble ICON_MON ; Drowzee
nybble ICON_MON ; Hypno
nybble ICON_MON ; Diglett
nybble ICON_MON ; Dugtrio
nybble ICON_MON ; Dugtrio-A
@ -129,6 +129,8 @@ MonPartyData:
nybble ICON_WATER ; Tentacruel
nybble ICON_GRASS ; Toedscool
nybble ICON_GRASS ; Toedscruel
nybble ICON_MON ; Ribbito
nybble ICON_MON ; Croakozuna
nybble ICON_BALL ; Magnemite
nybble ICON_BALL ; Magnetite
nybble ICON_BALL ; Magneton
@ -137,9 +139,6 @@ MonPartyData:
nybble ICON_MON ; Machoke
nybble ICON_MON ; Machamp
nybble ICON_MON ; Crocky
nybble ICON_BIRD ; Farfetch'd
nybble ICON_BIRD ; Madaamu
nybble ICON_BIRD ; Sirfetch'd
nybble ICON_WATER ; Krabby
nybble ICON_WATER ; Kingler
nybble ICON_QUADRUPED ; Slowpoke
@ -151,12 +150,10 @@ MonPartyData:
nybble ICON_QUADRUPED ; Ponyta
nybble ICON_QUADRUPED ; Rapidash
nybble ICON_QUADRUPED ; Rapidash-G
nybble ICON_QUADRUPED ; Deer
nybble ICON_GRASS ; Monja
nybble ICON_GRASS ; Tangela
nybble ICON_GRASS ; Tangrowth
nybble ICON_BIRD ; Hinaazu
nybble ICON_BIRD ; Doduo
nybble ICON_BIRD ; Dodrio
nybble ICON_BALL ; Barunda
nybble ICON_MON ; Gastly
nybble ICON_MON ; Haunter
@ -165,6 +162,12 @@ MonPartyData:
nybble ICON_MON ; Marowak
nybble ICON_MON ; Marowak-A
nybble ICON_MON ; Guardia
nybble ICON_BIRD ; Farfetch'd
nybble ICON_BIRD ; Madaamu
nybble ICON_BIRD ; Sirfetch'd
nybble ICON_BIRD ; Hinaazu
nybble ICON_BIRD ; Doduo
nybble ICON_BIRD ; Dodrio
nybble ICON_MON ; Betobebii
nybble ICON_MON ; Grimer
nybble ICON_MON ; Muk
@ -172,23 +175,25 @@ MonPartyData:
nybble ICON_MON ; Koffing
nybble ICON_MON ; Weezing
nybble ICON_MON ; Weezing-G
nybble ICON_WATER ; Blastyke
nybble ICON_WATER ; Blastoise
nybble ICON_MON ; Ditto
nybble ICON_MON ; Animon
nybble ICON_QUADRUPED ; Deer
nybble ICON_MON ; Mr.Mime
nybble ICON_MON ; Mr.Rime
nybble ICON_GRASS ; Cactus
nybble ICON_MON ; Hitmonlee
nybble ICON_MON ; Hitmonchan
nybble ICON_MON ; Hitmontop
nybble ICON_GRASS ; Cactus
nybble ICON_HELIX ; Shellder
nybble ICON_HELIX ; Cloyster
nybble ICON_WATER ; Blottle
nybble ICON_WATER ; Pendraken
nybble ICON_HELIX ; Shellder
nybble ICON_HELIX ; Cloyster
nybble ICON_HELIX ; Taaban
nybble ICON_HELIX ; Staryu
nybble ICON_HELIX ; Starmie
nybble ICON_WATER ; Seel
nybble ICON_WATER ; Dewgong
nybble ICON_WATER ; Blastyke
nybble ICON_WATER ; Blastoise
nybble ICON_WATER ; Horsea
nybble ICON_WATER ; Seadra
nybble ICON_WATER ; Kingdra
@ -215,8 +220,6 @@ MonPartyData:
nybble ICON_MON ; Skimper
nybble ICON_MON ; Bawligua
nybble ICON_MON ; Cryithan
nybble ICON_MON ; Mr.Mime
nybble ICON_MON ; Mr.Rime
nybble ICON_MON ; Jynx
nybble ICON_MON ; Buu
nybble ICON_MON ; Electabuzz

2
data/pokemon/names.asm
View file

@ -215,7 +215,7 @@ MonsterNames::
db "SLOWKING@@"
db "ELECTIVIRE"
db "MAGMORTAR@"
db "PARA@@@@@@"
db "TAABAN@@@@"
db "HINAAZU@@@"
db "BETOBEBII@"
db "MAGNEZONE@"

22
data/pokemon/new_dex_text.asm
View file

@ -388,14 +388,14 @@ _MonjaDexEntry::
next "trip and fall"
dex
_ParaDexEntry::
text "It's always born"
next "planted inside"
next "of a mushroom."
_TaabanDexEntry::
text "It evolved after"
next "biting a SLOWPOKE."
next "If it falls off"
page "The mushroom will"
next "stay with it for"
next "its whole life"
page "its host, it will"
next "seek out a new"
next "SLOWPOKE to bite"
dex
_HinaazuDexEntry::
@ -530,7 +530,7 @@ _PolitoedDexEntry::
_SlowkingDexEntry::
text "Every time it"
next "yawns, SHELLDER"
next "yawns, TAABAN"
next "injects more"
page "poison into it,"
@ -909,17 +909,17 @@ _RapidashGDexEntry::
dex
_SlowbroGDexEntry::
text "The SHELLDER that"
text "The TAABAN that"
next "bit SLOWBRO has"
next "made it poisonous."
page "SHELLDER's tongue"
page "TAABAN's tongue"
next "can be squeezed"
next "to spit poison"
dex
_SlowkingGDexEntry::
text "The SHELLDER that"
text "The TAABAN that"
next "bit SLOWKING has"
next "assumed control."

55
data/pokemon/palettes.asm
View file

@ -29,17 +29,20 @@ MonsterPalettes:
db PAL_BROWNMON ; PIDGEY
db PAL_BROWNMON ; PIDGEOTTO
db PAL_BROWNMON ; PIDGEOT
db PAL_YELLOWMON ; KONYA
db PAL_YELLOWMON ; MEOWTH
db PAL_YELLOWMON ; PERSIAN
db PAL_CYANMON ; PERSIAN_A
db PAL_GREYMON ; PERRSEKRER
db PAL_GREENMON ; CATERPIE
db PAL_GREENMON ; METAPOD
db PAL_CYANMON ; BUTTERFREE
db PAL_YELLOWMON ; WEEDLE
db PAL_YELLOWMON ; KAKUNA
db PAL_YELLOWMON ; BEEDRILL
db PAL_YELLOWMON ; KONYA
db PAL_YELLOWMON ; MEOWTH
db PAL_YELLOWMON ; PERSIAN
db PAL_CYANMON ; PERSIAN_A
db PAL_GREYMON ; PERRSEKRER
; db PAL_YELLOWMON ; KOKANA
; db PAL_YELLOWMON ; KASANAGI
; db PAL_YELLOWMON ; CARAPTHOR
db PAL_BROWNMON ; SPEAROW
db PAL_BROWNMON ; FEAROW
db PAL_PURPLEMON ; EKANS
@ -62,7 +65,6 @@ MonsterPalettes:
db PAL_GREYMON ; GRAVELER
db PAL_GREYMON ; GOLEM
db PAL_GREYMON ; GOLEM_A
db PAL_REDMON ; PARA
db PAL_REDMON ; PARAS
db PAL_REDMON ; PARASECT
db PAL_PINKMON ; CLEFAIRY
@ -104,15 +106,13 @@ MonsterPalettes:
db PAL_BLUEMON ; POLIWHIRL
db PAL_BLUEMON ; POLIWRATH
db PAL_GREENMON ; POLITOED
db PAL_GREENMON ; RIBBITO
db PAL_GREENMON ; CROAKOZUNA
db PAL_YELLOWMON ; DROWZEE
db PAL_YELLOWMON ; HYPNO
db PAL_PINKMON ; LICKITUNG
db PAL_PINKMON ; LICKILICKY
db PAL_YELLOWMON ; ABRA
db PAL_YELLOWMON ; KADABRA
db PAL_YELLOWMON ; ALAKAZAM
db PAL_PINKMON ; LICKITUNG
db PAL_PINKMON ; LICKILICKY
db PAL_YELLOWMON ; DROWZEE
db PAL_YELLOWMON ; HYPNO
db PAL_BROWNMON ; DIGLETT
db PAL_BROWNMON ; DUGTRIO
db PAL_BROWNMON ; DUGTRIO_A
@ -130,6 +130,8 @@ MonsterPalettes:
db PAL_CYANMON ; TENTACRUEL
db PAL_BROWNMON ; TOEDSCOOL
db PAL_YELLOWMON ; TOEDSCRUEL
db PAL_GREENMON ; RIBBITO
db PAL_GREENMON ; CROAKOZUNA
db PAL_GREYMON ; MAGNEMITE
db PAL_GREYMON ; MAGNETITE
db PAL_GREYMON ; MAGNETON
@ -138,9 +140,6 @@ MonsterPalettes:
db PAL_GREYMON ; MACHOKE
db PAL_GREYMON ; MACHAMP
db PAL_GREENMON ; CROCKY
db PAL_BROWNMON ; FARFETCHD
db PAL_BROWNMON ; MADAAMU
db PAL_BROWNMON ; SIRFETCHD
db PAL_REDMON ; KRABBY
db PAL_REDMON ; KINGLER
db PAL_PINKMON ; SLOWPOKE
@ -152,12 +151,10 @@ MonsterPalettes:
db PAL_REDMON ; PONYTA
db PAL_REDMON ; RAPIDASH
db PAL_PURPLEMON ; RAPIDASH_G
db PAL_BROWNMON ; DEER
db PAL_BLUEMON ; MONJA
db PAL_BLUEMON ; TANGELA
db PAL_CYANMON ; TANGROWTH
db PAL_BROWNMON ; HINAAZU
db PAL_BROWNMON ; DODUO
db PAL_BROWNMON ; DODRIO
db PAL_PINKMON ; BARUNDA
db PAL_PURPLEMON ; GASTLY
db PAL_PURPLEMON ; HAUNTER
@ -166,6 +163,12 @@ MonsterPalettes:
db PAL_BROWNMON ; MAROWAK
db PAL_PURPLEMON ; MAROWAK_A
db PAL_BROWNMON ; GUARDIA
db PAL_BROWNMON ; FARFETCHD
db PAL_BROWNMON ; MADAAMU
db PAL_BROWNMON ; SIRFETCHD
db PAL_BROWNMON ; HINAAZU
db PAL_BROWNMON ; DODUO
db PAL_BROWNMON ; DODRIO
db PAL_PURPLEMON ; BETOBEBII
db PAL_PURPLEMON ; GRIMER
db PAL_PURPLEMON ; MUK
@ -173,23 +176,25 @@ MonsterPalettes:
db PAL_PURPLEMON ; KOFFING
db PAL_PURPLEMON ; WEEZING
db PAL_GREYMON ; WEEZING_G
db PAL_CYANMON ; BLASTYKE
db PAL_CYANMON ; BLASTOISE
db PAL_PURPLEMON ; DITTO
db PAL_PURPLEMON ; ANIMON
db PAL_BROWNMON ; DEER
db PAL_PINKMON ; MR_MIME
db PAL_CYANMON ; MR_RIME
db PAL_GREENMON ; CACTUS
db PAL_BROWNMON ; HITMONLEE
db PAL_BROWNMON ; HITMONCHAN
db PAL_BROWNMON ; HITMONTOP
db PAL_GREENMON ; CACTUS
db PAL_PURPLEMON ; SHELLDER
db PAL_PURPLEMON ; CLOYSTER
db PAL_MEWMON ; BLOTTLE
db PAL_MEWMON ; PENDRAKEN
db PAL_PURPLEMON ; SHELLDER
db PAL_PURPLEMON ; CLOYSTER
db PAL_GREYMON ; TAABAN
db PAL_REDMON ; STARYU
db PAL_PURPLEMON ; STARMIE
db PAL_BLUEMON ; SEEL
db PAL_BLUEMON ; DEWGONG
db PAL_CYANMON ; BLASTYKE
db PAL_CYANMON ; BLASTOISE
db PAL_CYANMON ; HORSEA
db PAL_CYANMON ; SEADRA
db PAL_CYANMON ; KINGDRA
@ -216,8 +221,6 @@ MonsterPalettes:
db PAL_CYANMON ; SKIMPER
db PAL_CYANMON ; BAWLIGUA
db PAL_CYANMON ; CRYITHAN
db PAL_PINKMON ; MR_MIME
db PAL_CYANMON ; MR_RIME
db PAL_REDBAR ; JYNX
db PAL_BLUEMON ; BUU
db PAL_YELLOWMON ; ELECTABUZZ

16
data/trainers/parties.asm
View file

@ -85,15 +85,15 @@ YoungsterData:
BugCatcherData:
; Viridian Forest
db 6, WEEDLE, CATERPIE, 0
db 7, CATERPIE, KAKUNA, PARA, 0
db 7, CATERPIE, KAKUNA, WEEDLE, 0
db 9, VENONAT, 0
; Route 3
db 10, CATERPIE, WEEDLE, PARA, 0
db 9, WEEDLE, KAKUNA, CATERPIE, METAPOD, 0
db 10, CATERPIE, WEEDLE, WEEDLE, 0
db 9, WEEDLE, KAKUNA, CATERPIE, METAPOD, 0
db 11, CATERPIE, METAPOD, 0
; Mt. Moon 1F
db 12, PARA, PARAS, 0
db 10, CATERPIE, METAPOD, PARA, 0
db 12, BEEDRILL, 0
db 10, METAPOD, PARAS, 0
; Route 24
db 14, CATERPIE, WEEDLE, 0
; Route 6
@ -338,7 +338,7 @@ FisherData:
db 21, POLIWAG, SHELLDER, GOLDEEN, HORSEA, 0
; Route 21
db 28, SEAKING, GOLDEEN, SEAKING, SEAKING, 0
db 31, SHELLDER, CLOYSTER, 0
db 31, SHELLDER, TAABAN, 0
db 27, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, 0
db 33, SEAKING, GOLDEEN, 0
; Route 12
@ -348,7 +348,7 @@ SwimmerData:
; Cerulean Gym
db 16, HORSEA, SHELLDER, 0
; Route 19
db 30, TENTACOOL, SHELLDER, 0
db 30, TENTACOOL, TAABAN, 0
db 29, GOLDEEN, HORSEA, STARYU, 0
db 30, POLIWAG, POLIWHIRL, 0
db 27, HORSEA, TENTACOOL, TENTACOOL, GOLDEEN, 0
@ -402,7 +402,7 @@ BeautyData:
db 29, CLEFAIRY, MEOWTH, 0
; Route 20
db 35, SEAKING, 0
db 30, SHELLDER, SHELLDER, CLOYSTER, 0
db 30, SHELLDER, TAABAN, CLOYSTER, 0
db 31, POLIWAG, SEAKING, 0
; Route 15
db 29, PIDGEOTTO, WIGGLYTUFF, 0

2
data/wild/maps/MtMoon1F.asm
View file

@ -7,7 +7,7 @@ MtMoon1FWildMons:
db 6, BITTYBAT
db 10, SANDSHREW
db 10, GEODUDE
db 8, PARA
db 8, PARAS
db 11, BITTYBAT
db 8, CLEFAIRY
end_grass_wildmons

2
data/wild/maps/MtMoonB1F.asm
View file

@ -5,7 +5,7 @@ MtMoonB1FWildMons:
db 7, GEODUDE
db 8, GEODUDE
db 9, GEODUDE
db 10, PARA
db 10, PARAS
db 10, BITTYBAT
db 11, SANDSHREW
db 9, CLEFAIRY

6
data/wild/maps/Route2.asm
View file

@ -4,11 +4,11 @@ Route2WildMons:
db 5, PIDGEY
db 4, CATERPIE
db 4, WEEDLE
db 5, PARA
db 5, KONYA
db 4, NIDORAN_F
db 3, PARA
db 3, KONYA
db 5, NIDORAN_M
db 5, MONJA
db 5, MONJA ; replace Monja with Kokana when added
db 6, MONJA
end_grass_wildmons

6
data/wild/maps/ViridianForest.asm
View file

@ -4,12 +4,12 @@ ViridianForestWildMons:
db 6, WEEDLE
db 6, CATERPIE
db 5, PIDGEY
db 6, MONJA
db 6, PARA
db 6, MONJA ; KOKANA
db 6, WEEDLE
db 8, KAKUNA
db 8, METAPOD
db 5, PIKACHU
db 9, PIDGEOTTO
db 9, PIDGEOTTO
end_grass_wildmons
def_water_wildmons 0 ; encounter rate