mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-06 15:45:24 +13:00
A Christmas miracle! Martha got something done!
(and by that, she added Perrserker, Sirfetch'd, Mr. Rime and the Galar Birds, plus some team scaling and updated sprites for Politoed and Annihilape.)
This commit is contained in:
MementoMartha
parent
02fe134613
commit
2fc1f2250b
27 changed files with 576 additions and 325 deletions
|
|
@ -23,6 +23,7 @@ INCLUDE "data/pokemon/base_stats/beedrill.asm"
|
|||
INCLUDE "data/pokemon/base_stats/konya.asm"
|
||||
INCLUDE "data/pokemon/base_stats/meowth.asm"
|
||||
INCLUDE "data/pokemon/base_stats/persian.asm"
|
||||
INCLUDE "data/pokemon/base_stats/perrserker.asm"
|
||||
INCLUDE "data/pokemon/base_stats/pikachu.asm"
|
||||
INCLUDE "data/pokemon/base_stats/raichu.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gorochu.asm"
|
||||
|
|
@ -39,8 +40,6 @@ INCLUDE "data/pokemon/base_stats/nidoranm.asm"
|
|||
INCLUDE "data/pokemon/base_stats/nidorino.asm"
|
||||
INCLUDE "data/pokemon/base_stats/nidoking.asm"
|
||||
INCLUDE "data/pokemon/base_stats/nidoreign.asm"
|
||||
INCLUDE "data/pokemon/base_stats/magikarp.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gyarados.asm"
|
||||
INCLUDE "data/pokemon/base_stats/bittybat.asm"
|
||||
INCLUDE "data/pokemon/base_stats/zubat.asm"
|
||||
INCLUDE "data/pokemon/base_stats/golbat.asm"
|
||||
|
|
@ -72,11 +71,13 @@ INCLUDE "data/pokemon/base_stats/bellsprout.asm"
|
|||
INCLUDE "data/pokemon/base_stats/weepinbell.asm"
|
||||
INCLUDE "data/pokemon/base_stats/victreebel.asm"
|
||||
INCLUDE "data/pokemon/base_stats/tsubomitto.asm"
|
||||
INCLUDE "data/pokemon/base_stats/venonat.asm"
|
||||
INCLUDE "data/pokemon/base_stats/venomoth.asm"
|
||||
INCLUDE "data/pokemon/base_stats/magikarp.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gyarados.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gyopin.asm"
|
||||
INCLUDE "data/pokemon/base_stats/goldeen.asm"
|
||||
INCLUDE "data/pokemon/base_stats/seaking.asm"
|
||||
INCLUDE "data/pokemon/base_stats/venonat.asm"
|
||||
INCLUDE "data/pokemon/base_stats/venomoth.asm"
|
||||
INCLUDE "data/pokemon/base_stats/cheep.asm"
|
||||
INCLUDE "data/pokemon/base_stats/jabetta.asm"
|
||||
INCLUDE "data/pokemon/base_stats/psyduck.asm"
|
||||
|
|
@ -89,13 +90,12 @@ 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/farfetchd.asm"
|
||||
INCLUDE "data/pokemon/base_stats/madaamu.asm"
|
||||
INCLUDE "data/pokemon/base_stats/diglett.asm"
|
||||
INCLUDE "data/pokemon/base_stats/dugtrio.asm"
|
||||
INCLUDE "data/pokemon/base_stats/wiglett.asm"
|
||||
INCLUDE "data/pokemon/base_stats/wugtrio.asm"
|
||||
INCLUDE "data/pokemon/base_stats/crocky.asm"
|
||||
INCLUDE "data/pokemon/base_stats/drowzee.asm"
|
||||
INCLUDE "data/pokemon/base_stats/hypno.asm"
|
||||
INCLUDE "data/pokemon/base_stats/kotora.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gaotora.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gorotora.asm"
|
||||
|
|
@ -105,8 +105,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/drowzee.asm"
|
||||
INCLUDE "data/pokemon/base_stats/hypno.asm"
|
||||
INCLUDE "data/pokemon/base_stats/ribbito.asm"
|
||||
INCLUDE "data/pokemon/base_stats/croakozuna.asm"
|
||||
INCLUDE "data/pokemon/base_stats/lickitung.asm"
|
||||
INCLUDE "data/pokemon/base_stats/lickilicky.asm"
|
||||
INCLUDE "data/pokemon/base_stats/onix.asm"
|
||||
|
|
@ -118,8 +118,10 @@ INCLUDE "data/pokemon/base_stats/magnezone.asm"
|
|||
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/ribbito.asm"
|
||||
INCLUDE "data/pokemon/base_stats/croakozuna.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"
|
||||
|
|
@ -131,8 +133,6 @@ INCLUDE "data/pokemon/base_stats/rapidash.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/staryu.asm"
|
||||
INCLUDE "data/pokemon/base_stats/starmie.asm"
|
||||
INCLUDE "data/pokemon/base_stats/hinaazu.asm"
|
||||
INCLUDE "data/pokemon/base_stats/doduo.asm"
|
||||
INCLUDE "data/pokemon/base_stats/dodrio.asm"
|
||||
|
|
@ -161,6 +161,8 @@ 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/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/horsea.asm"
|
||||
|
|
@ -186,6 +188,7 @@ 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"
|
||||
|
|
@ -220,8 +223,11 @@ INCLUDE "data/pokemon/base_stats/dratini.asm"
|
|||
INCLUDE "data/pokemon/base_stats/dragonair.asm"
|
||||
INCLUDE "data/pokemon/base_stats/dragonite.asm"
|
||||
INCLUDE "data/pokemon/base_stats/articuno.asm"
|
||||
INCLUDE "data/pokemon/base_stats/articunog.asm"
|
||||
INCLUDE "data/pokemon/base_stats/zapdos.asm"
|
||||
INCLUDE "data/pokemon/base_stats/zapdosg.asm"
|
||||
INCLUDE "data/pokemon/base_stats/moltres.asm"
|
||||
INCLUDE "data/pokemon/base_stats/moltresg.asm"
|
||||
INCLUDE "data/pokemon/base_stats/mewtwo.asm"
|
||||
INCLUDE "data/pokemon/base_stats/mew.asm"
|
||||
; INCLUDE "data/pokemon/base_stats/meltan.asm"
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@
|
|||
|
||||
; tm/hm learnset
|
||||
tmhm RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, TOXIC, HORN_DRILL, \
|
||||
BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, THUNDERBOLT, \
|
||||
THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \
|
||||
SWIFT, SKULL_BASH, REST, SUBSTITUTE, CUT, \
|
||||
FLY
|
||||
BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \
|
||||
THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \
|
||||
BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \
|
||||
CUT, FLY
|
||||
; end
|
||||
|
||||
db BANK(MadaamuPicFront)
|
||||
|
|
|
|||
26
data/pokemon/base_stats/mrrime.asm
Normal file
26
data/pokemon/base_stats/mrrime.asm
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
db DEX_MR_RIME ; pokedex id
|
||||
|
||||
db 80, 85, 75, 70, 100
|
||||
; hp atk def spd spc
|
||||
|
||||
db ICE, PSYCHIC_TYPE ; type
|
||||
db 45 ; catch rate
|
||||
db 207 ; base exp
|
||||
|
||||
INCBIN "gfx/pokemon/front/mr.rime.pic", 0, 1 ; sprite dimensions
|
||||
dw MrRimePicFront, MrRimePicBack
|
||||
|
||||
db CONFUSION, REFLECT, NO_MOVE, NO_MOVE ; level 1 learnset
|
||||
db GROWTH_MEDIUM_FAST ; growth rate
|
||||
|
||||
; tm/hm learnset
|
||||
tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \
|
||||
DOUBLE_EDGE, ICE_BEAM, BLIZZARD, HYPER_BEAM, SUBMISSION, \
|
||||
COUNTER, SEISMIC_TOSS, RAGE, SOLARBEAM, THUNDERBOLT, \
|
||||
THUNDER, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \
|
||||
REFLECT, BIDE, METRONOME, SKULL_BASH, REST, \
|
||||
THUNDER_WAVE, PSYWAVE, SUBSTITUTE, FLASH
|
||||
; end
|
||||
|
||||
db BANK(MrRimePicFront)
|
||||
assert BANK(MrRimePicFront) == BANK(MrRimePicBack)
|
||||
24
data/pokemon/base_stats/perrserker.asm
Normal file
24
data/pokemon/base_stats/perrserker.asm
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
db DEX_PERRSERKER ; pokedex id
|
||||
|
||||
db 60, 110, 100, 50, 60
|
||||
; hp atk def spd spc
|
||||
|
||||
db STEEL, STEEL ; type
|
||||
db 90 ; catch rate
|
||||
db 148 ; base exp
|
||||
|
||||
INCBIN "gfx/pokemon/front/perrserker.pic", 0, 1 ; sprite dimensions
|
||||
dw PerrserkerPicFront, PerrserkerPicBack
|
||||
|
||||
db GROWL, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
|
||||
db GROWTH_MEDIUM_FAST ; growth rate
|
||||
|
||||
; tm/hm learnset
|
||||
tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \
|
||||
BUBBLEBEAM, WATER_GUN, HYPER_BEAM, PAY_DAY, RAGE, \
|
||||
THUNDERBOLT, THUNDER, DIG, MIMIC, BIDE, \
|
||||
SWIFT, SKULL_BASH, REST, SUBSTITUTE, CUT
|
||||
; end
|
||||
|
||||
db BANK(PerrserkerPicFront)
|
||||
assert BANK(PerrserkerPicFront) == BANK(PerrserkerPicBack)
|
||||
25
data/pokemon/base_stats/sirfetchd.asm
Normal file
25
data/pokemon/base_stats/sirfetchd.asm
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
db DEX_SIRFETCHD ; pokedex id
|
||||
|
||||
db 62, 135, 95, 65, 68
|
||||
; hp atk def spd spc
|
||||
|
||||
db FIGHTING, FIGHTING ; type
|
||||
db 25 ; catch rate
|
||||
db 196 ; base exp
|
||||
|
||||
INCBIN "gfx/pokemon/front/sirfetchd.pic", 0, 1 ; sprite dimensions
|
||||
dw SirfetchdPicFront, SirfetchdPicBack
|
||||
|
||||
db PECK, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset
|
||||
db GROWTH_MEDIUM_FAST ; growth rate
|
||||
|
||||
; tm/hm learnset
|
||||
tmhm RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, TOXIC, BODY_SLAM, \
|
||||
TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, \
|
||||
SEISMIC_TOSS, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \
|
||||
BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \
|
||||
CUT, FLY
|
||||
; end
|
||||
|
||||
db BANK(SirfetchdPicFront)
|
||||
assert BANK(SirfetchdPicFront) == BANK(SirfetchdPicBack)
|
||||
|
|
@ -233,10 +233,13 @@ CryData::
|
|||
mon_cry SFX_CRY_00, $00, $00 ; Wugtrio
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Toedscool
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Toedscruel
|
||||
; mon_cry SFX_CRY_19, $1A, $40 ; Perrserker
|
||||
; mon_cry SFX_CRY_10, $64, $40 ; Sirfetch'd
|
||||
; mon_cry SFX_CRY_20, $00, $70 ; Mr. Rime
|
||||
mon_cry SFX_CRY_19, $1A, $40 ; Perrserker
|
||||
mon_cry SFX_CRY_10, $64, $40 ; Sirfetch'd
|
||||
mon_cry SFX_CRY_20, $00, $90 ; Mr. Rime
|
||||
; mon_cry SFX_CRY_00, $00, $00 ; Meltan
|
||||
; mon_cry SFX_CRY_00, $00, $00 ; Melmetal
|
||||
mon_cry SFX_CRY_09, $80, $40 ; Articuno-G
|
||||
mon_cry SFX_CRY_18, $FF, $80 ; Zapdos-G
|
||||
mon_cry SFX_CRY_09, $F8, $40 ; Moltres-G
|
||||
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
|
||||
assert_table_length NUM_POKEMON_INDEXES
|
||||
|
|
|
|||
|
|
@ -227,6 +227,12 @@ PokedexEntryPointers:
|
|||
dw WugtrioDexEntry
|
||||
dw ToedscoolDexEntry
|
||||
dw ToedscruelDexEntry
|
||||
dw PerrserkerDexEntry
|
||||
dw SirfetchdDexEntry
|
||||
dw MrRimeDexEntry
|
||||
dw ArticunoGDexEntry
|
||||
dw ZapdosGDexEntry
|
||||
dw MoltresGDexEntry
|
||||
dw MissingNoDexEntry
|
||||
assert_table_length NUM_POKEMON_INDEXES
|
||||
|
||||
|
|
@ -1809,4 +1815,46 @@ ToedscruelDexEntry:
|
|||
dw 1280
|
||||
text_far _ToedscruelDexEntry
|
||||
text_end
|
||||
|
||||
PerrserkerDexEntry:
|
||||
db "VIKING@"
|
||||
db 2,7
|
||||
dw 620
|
||||
text_far _PerrserkerDexEntry
|
||||
text_end
|
||||
|
||||
SirfetchdDexEntry:
|
||||
db "WILD DUCK@"
|
||||
db 2,7
|
||||
dw 2580
|
||||
text_far _SirfetchdDexEntry
|
||||
text_end
|
||||
|
||||
MrRimeDexEntry:
|
||||
db "COMEDIAN@"
|
||||
db 4,11
|
||||
dw 1280
|
||||
text_far _MrRimeDexEntry
|
||||
text_end
|
||||
|
||||
ArticunoGDexEntry:
|
||||
db "CRUEL@"
|
||||
db 5,7
|
||||
dw 1120
|
||||
text_far _ArticunoGDexEntry
|
||||
text_end
|
||||
|
||||
ZapdosGDexEntry:
|
||||
db "STRONGLEGS@"
|
||||
db 5,3
|
||||
dw 1280
|
||||
text_far _ZapdosGDexEntry
|
||||
text_end
|
||||
|
||||
MoltresGDexEntry:
|
||||
db "MALEVOLENT@"
|
||||
db 6,7
|
||||
dw 1460
|
||||
text_far _MoltresGDexEntry
|
||||
text_end
|
||||
|
||||
|
|
@ -227,10 +227,13 @@ PokedexOrder:
|
|||
db DEX_WUGTRIO
|
||||
db DEX_TOEDSCOOL
|
||||
db DEX_TOEDSCRUEL
|
||||
; db DEX_PERRSERKER
|
||||
; db DEX_SIRFETCHD
|
||||
; db DEX_MR_RIME
|
||||
db DEX_PERRSERKER
|
||||
db DEX_SIRFETCHD
|
||||
db DEX_MR_RIME
|
||||
; db DEX_MELTAN
|
||||
; db DEX_MELMETAL
|
||||
db DEX_ARTICUNO_G
|
||||
db DEX_ZAPDOS_G
|
||||
db DEX_MOLTRES_G
|
||||
db DEX_MISSINGNO
|
||||
assert_table_length NUM_POKEMON_INDEXES
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ _NidoranFDexEntry:: ; new entry
|
|||
|
||||
page "lay two eggs. Baby"
|
||||
next "NIDORAN are just"
|
||||
next "10cm long"
|
||||
next "4 inches long"
|
||||
dex
|
||||
|
||||
_NidoqueenDexEntry:: ; does not need a n.ew entry
|
||||
|
|
@ -249,7 +249,7 @@ _GastlyDexEntry:: ; Dex entry from Green, swapping the Indian Elephant for Tram
|
|||
dex
|
||||
|
||||
_ScytherDexEntry:: ; new entry
|
||||
page "Few specimens"
|
||||
text "Few specimens"
|
||||
next "have ever been"
|
||||
next "caught. While"
|
||||
|
||||
|
|
@ -473,7 +473,7 @@ _MagmarDexEntry:: ; new entry, modified from the original
|
|||
next "areas, MAGMAR's"
|
||||
next "body burns at"
|
||||
|
||||
page "2200 degrees F." ; changed to imperial
|
||||
page "2,200 degrees F." ; changed to imperial
|
||||
next "Hides perfectly"
|
||||
next "among flames"
|
||||
dex
|
||||
|
|
@ -604,9 +604,9 @@ _JynxDexEntry:: ; new entry
|
|||
next "in a human-"
|
||||
next "like manner,"
|
||||
|
||||
page "the language is"
|
||||
next "impossible"
|
||||
next "to translate."
|
||||
page "the language"
|
||||
next "seems impossible"
|
||||
next "to translate"
|
||||
|
||||
dex
|
||||
|
||||
|
|
@ -687,7 +687,7 @@ _NinetalesDexEntry:: ; new entry
|
|||
|
||||
page "'NINETALES, 1,000"
|
||||
next "years, TOTARTLE,"
|
||||
next "10,000 years."
|
||||
next "10,000 years.'"
|
||||
dex
|
||||
|
||||
_PikachuDexEntry:: ; new entry
|
||||
|
|
@ -743,11 +743,11 @@ _KabutoDexEntry:: ; new entry
|
|||
_KabutopsDexEntry:: ; new entry
|
||||
text "The oldest of"
|
||||
next "all #MON. The"
|
||||
next "only KABUTOPS"
|
||||
next "only complete"
|
||||
|
||||
page "fossil was"
|
||||
next "discovered 6"
|
||||
next "years ago"
|
||||
page "KABUTOPS fossil"
|
||||
next "was discovered"
|
||||
next "6 years ago"
|
||||
dex
|
||||
|
||||
_HorseaDexEntry:: ; new entry
|
||||
|
|
@ -1041,13 +1041,13 @@ _ButterfreeDexEntry:: ; new entry
|
|||
dex
|
||||
|
||||
_MachampDexEntry:: ; new entry
|
||||
text "It can throw 1000"
|
||||
text "Can throw 1,000"
|
||||
next "punches in 2"
|
||||
next "seconds. While"
|
||||
|
||||
page "thought to evolve"
|
||||
next "from MACHOKE, the"
|
||||
next "method is unknown"
|
||||
next "method is unclear"
|
||||
dex
|
||||
|
||||
_GolduckDexEntry:: ; new entry
|
||||
|
|
@ -1122,7 +1122,7 @@ _MukDexEntry:: ; new entry
|
|||
|
||||
_KinglerDexEntry:: ; does not need a n.ew entry
|
||||
text "The large pincer"
|
||||
next "has 10000 hp of"
|
||||
next "has 10,000 hp of"
|
||||
next "crushing power."
|
||||
|
||||
page "However, its huge"
|
||||
|
|
|
|||
|
|
@ -230,6 +230,12 @@ EvosMovesPointerTable:
|
|||
dw WugtrioEvosMoves
|
||||
dw ToedscoolEvosMoves
|
||||
dw ToedscruelEvosMoves
|
||||
dw PerrserkerEvosMoves
|
||||
dw SirfetchdEvosMoves
|
||||
dw MrRimeEvosMoves
|
||||
dw ArticunoGEvosMoves
|
||||
dw ZapdosGEvosMoves
|
||||
dw MoltresGEvosMoves
|
||||
dw MissingNoEvosMoves
|
||||
assert_table_length NUM_POKEMON_INDEXES
|
||||
|
||||
|
|
@ -724,6 +730,7 @@ MachokeEvosMoves:
|
|||
|
||||
MrMimeEvosMoves:
|
||||
; Evolutions
|
||||
db EV_ITEM, ICE_STONE, 1, MR_RIME
|
||||
db 0
|
||||
; Learnset
|
||||
db 15, CONFUSION
|
||||
|
|
@ -994,7 +1001,7 @@ BlottleEvosMoves:
|
|||
FarfetchdEvosMoves:
|
||||
; Evolutions
|
||||
db EV_LEVEL, 24, MADAAMU
|
||||
; db EV_ITEM, HEART_STONE, 1, SIRFETCHD
|
||||
db EV_ITEM, HEART_STONE, 1, SIRFETCHD
|
||||
db 0
|
||||
; Learnset
|
||||
db 7, LEER
|
||||
|
|
@ -1249,15 +1256,6 @@ RaichuEvosMoves:
|
|||
db EV_TRADE, 1, GOROCHU ; It matches the old rumour and everyone will try it, don't bother doing Thunder Stone 2...
|
||||
db 0
|
||||
; Learnset
|
||||
db 6, TAIL_WHIP
|
||||
db 8, THUNDER_WAVE
|
||||
db 11, QUICK_ATTACK
|
||||
db 15, DOUBLE_TEAM
|
||||
db 20, SLAM
|
||||
db 26, AGILITY
|
||||
db 33, THUNDERBOLT
|
||||
db 41, LIGHT_SCREEN
|
||||
db 50, THUNDER
|
||||
db 0
|
||||
|
||||
RibbitoEvosMoves:
|
||||
|
|
@ -2415,8 +2413,8 @@ OddishEvosMoves:
|
|||
|
||||
GloomEvosMoves:
|
||||
; Evolutions
|
||||
db EV_ITEM, LEAF_STONE, 1, VILEPLUME
|
||||
db EV_ITEM, POISON_STONE, 1, BELLOSSOM
|
||||
db EV_ITEM, POISON_STONE, 1, VILEPLUME
|
||||
db EV_ITEM, LEAF_STONE, 1, BELLOSSOM
|
||||
db 0
|
||||
; Learnset
|
||||
db 15, POISONPOWDER
|
||||
|
|
@ -2869,7 +2867,7 @@ SandyShocksEvosMoves:
|
|||
|
||||
WiglettEvosMoves:
|
||||
; Evolutions
|
||||
db EV_LEVEL, 28, WUGTRIO
|
||||
db EV_LEVEL, 26, WUGTRIO
|
||||
db 0
|
||||
; Learnset
|
||||
db 15, SAND_ATTACK
|
||||
|
|
@ -2918,50 +2916,91 @@ ToedscruelEvosMoves:
|
|||
db 43, SCREECH
|
||||
db 50, SPORE
|
||||
db 0
|
||||
|
||||
PerrserkerEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 8, SCRATCH
|
||||
db 12, PAY_DAY
|
||||
db 17, BITE
|
||||
db 25, MAGNET_BOMB ; Smart Strike
|
||||
db 29, FURY_SWIPES
|
||||
db 32, SCREECH
|
||||
db 36, SLASH
|
||||
db 40, METAL_SOUND
|
||||
db 45, IRON_HEAD
|
||||
db 0
|
||||
|
||||
SirfetchdEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 7, LEER
|
||||
db 15, DOUBLE_KICK
|
||||
db 23, BRUTAL_SWING
|
||||
db 31, LOW_KICK
|
||||
db 39, SWORDS_DANCE
|
||||
db 44, JUMP_KICK
|
||||
db 49, ROLLING_KICK
|
||||
db 55, HI_JUMP_KICK
|
||||
db 0
|
||||
|
||||
MrRimeEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 23, LIGHT_SCREEN
|
||||
db 28, PSYBEAM
|
||||
db 31, AURORA_BEAM
|
||||
db 39, ICE_BEAM
|
||||
db 44, PSYCHIC_M
|
||||
db 50, FEINT_ATTACK
|
||||
db 0
|
||||
|
||||
ArticunoGEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 40, REFLECT
|
||||
db 45, HYPNOSIS
|
||||
db 51, PSYBEAM
|
||||
db 55, AGILITY
|
||||
db 60, LIGHT_SCREEN
|
||||
db 65, RECOVER
|
||||
db 70, DREAM_EATER
|
||||
db 0
|
||||
|
||||
ZapdosGEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 40, DOUBLE_KICK
|
||||
db 45, LIGHT_SCREEN
|
||||
db 51, LOW_KICK
|
||||
db 55, AGILITY
|
||||
db 58, JUMP_KICK
|
||||
db 62, DRILL_PECK
|
||||
db 66, ROLLING_KICK
|
||||
db 70, HI_JUMP_KICK
|
||||
db 0
|
||||
|
||||
MoltresGEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 40, BITE ; Fake Tears
|
||||
db 45, WING_ATTACK
|
||||
db 51, BRUTAL_SWING
|
||||
db 55, AGILITY
|
||||
db 58, FEINT_ATTACK
|
||||
db 62, AMNESIA ; Nasty Plot
|
||||
db 66, NIGHT_SLASH ; False Surrender
|
||||
db 70, SKY_ATTACK
|
||||
db 0
|
||||
|
||||
MissingNoEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 0
|
||||
|
||||
;ArticunoGEvosMoves:
|
||||
; Evolutions
|
||||
; db 0
|
||||
; Learnset
|
||||
; db 40, REFLECT
|
||||
; db 45, HYPNOSIS
|
||||
; db 51, PSYBEAM
|
||||
; db 55, AGILITY
|
||||
; db 60, LIGHT_SCREEN
|
||||
; db 65, RECOVER
|
||||
; db 70, DREAM_EATER
|
||||
; db 0
|
||||
|
||||
;ZapdosGEvosMoves:
|
||||
; Evolutions
|
||||
; db 0
|
||||
; Learnset
|
||||
; db 40, DOUBLE_KICK
|
||||
; db 45, LIGHT_SCREEN
|
||||
; db 51, LOW_KICK
|
||||
; db 55, AGILITY
|
||||
; db 58, JUMP_KICK
|
||||
; db 62, DRILL_PECK
|
||||
; db 66, ROLLING_KICK
|
||||
; db 70, HI_JUMP_KICK
|
||||
; db 0
|
||||
|
||||
;MoltresGEvosMoves:
|
||||
; Evolutions
|
||||
; db 0
|
||||
; Learnset
|
||||
; db 40, BITE ; Fake Tears
|
||||
; db 45, WING_ATTACK
|
||||
; db 51, BRUTAL_SWING
|
||||
; db 55, AGILITY
|
||||
; db 58, FEINT_ATTACK
|
||||
; db 62, AMNESIA ; Nasty Plot
|
||||
; db 66, NIGHT_SLASH ; False Surrender
|
||||
; db 70, SKY_ATTACK
|
||||
; db 0
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ MonPartyData:
|
|||
nybble ICON_MON ; Konya
|
||||
nybble ICON_MON ; Meowth
|
||||
nybble ICON_MON ; Persian
|
||||
nybble ICON_MON ; Perrserker
|
||||
nybble ICON_FAIRY ; Pikachu
|
||||
nybble ICON_FAIRY ; Raichu
|
||||
nybble ICON_FAIRY ; Gorochu
|
||||
|
|
@ -39,8 +40,6 @@ MonPartyData:
|
|||
nybble ICON_MON ; Nidorino
|
||||
nybble ICON_MON ; Nidoking
|
||||
nybble ICON_MON ; Nidoreign
|
||||
nybble ICON_WATER ; Magikarp
|
||||
nybble ICON_SNAKE ; Gyarados
|
||||
nybble ICON_MON ; Bittybat
|
||||
nybble ICON_MON ; Zubat
|
||||
nybble ICON_MON ; Golbat
|
||||
|
|
@ -72,11 +71,13 @@ MonPartyData:
|
|||
nybble ICON_GRASS ; Weepinbell
|
||||
nybble ICON_GRASS ; Victreebel
|
||||
nybble ICON_GRASS ; Tsubomitto
|
||||
nybble ICON_BUG ; Venonat
|
||||
nybble ICON_BUG ; Venomoth
|
||||
nybble ICON_WATER ; Magikarp
|
||||
nybble ICON_SNAKE ; Gyarados
|
||||
nybble ICON_WATER ; Gyopin
|
||||
nybble ICON_WATER ; Goldeen
|
||||
nybble ICON_WATER ; Seaking
|
||||
nybble ICON_BUG ; Venonat
|
||||
nybble ICON_BUG ; Venomoth
|
||||
nybble ICON_WATER ; Cheep
|
||||
nybble ICON_WATER ; Jabetta
|
||||
nybble ICON_MON ; Psyduck
|
||||
|
|
@ -89,13 +90,12 @@ MonPartyData:
|
|||
nybble ICON_MON ; Poliwhirl
|
||||
nybble ICON_MON ; Poliwrath
|
||||
nybble ICON_MON ; Politoed
|
||||
nybble ICON_BIRD ; Farfetch'd
|
||||
nybble ICON_BIRD ; Madaamu
|
||||
nybble ICON_MON ; Diglett
|
||||
nybble ICON_MON ; Dugtrio
|
||||
nybble ICON_WATER ; Wiglett
|
||||
nybble ICON_WATER ; Wugtrio
|
||||
nybble ICON_MON ; Crocky
|
||||
nybble ICON_MON ; Drowzee
|
||||
nybble ICON_MON ; Hypno
|
||||
nybble ICON_QUADRUPED ; Kotora
|
||||
nybble ICON_QUADRUPED ; Gaotora
|
||||
nybble ICON_QUADRUPED ; Gorotora
|
||||
|
|
@ -105,8 +105,8 @@ MonPartyData:
|
|||
nybble ICON_WATER ; Tentacruel
|
||||
nybble ICON_GRASS ; Toedscool
|
||||
nybble ICON_GRASS ; Toedscruel
|
||||
nybble ICON_MON ; Drowzee
|
||||
nybble ICON_MON ; Hypno
|
||||
nybble ICON_MON ; Ribbito
|
||||
nybble ICON_MON ; Croakozuna
|
||||
nybble ICON_MON ; Lickitung
|
||||
nybble ICON_MON ; Lickilicky
|
||||
nybble ICON_SNAKE ; Onix
|
||||
|
|
@ -118,8 +118,10 @@ MonPartyData:
|
|||
nybble ICON_MON ; Machop
|
||||
nybble ICON_MON ; Machoke
|
||||
nybble ICON_MON ; Machamp
|
||||
nybble ICON_MON ; Ribbito
|
||||
nybble ICON_MON ; Croakozuna
|
||||
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
|
||||
|
|
@ -131,8 +133,6 @@ MonPartyData:
|
|||
nybble ICON_GRASS ; Monja
|
||||
nybble ICON_GRASS ; Tangela
|
||||
nybble ICON_GRASS ; Tangrowth
|
||||
nybble ICON_HELIX ; Staryu
|
||||
nybble ICON_HELIX ; Starmie
|
||||
nybble ICON_BIRD ; Hinaazu
|
||||
nybble ICON_BIRD ; Doduo
|
||||
nybble ICON_BIRD ; Dodrio
|
||||
|
|
@ -161,6 +161,8 @@ MonPartyData:
|
|||
nybble ICON_HELIX ; Cloyster
|
||||
nybble ICON_WATER ; Blottle
|
||||
nybble ICON_WATER ; Pendraken
|
||||
nybble ICON_HELIX ; Staryu
|
||||
nybble ICON_HELIX ; Starmie
|
||||
nybble ICON_WATER ; Seel
|
||||
nybble ICON_WATER ; Dewgong
|
||||
nybble ICON_WATER ; Horsea
|
||||
|
|
@ -186,6 +188,7 @@ MonPartyData:
|
|||
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
|
||||
|
|
@ -220,8 +223,11 @@ MonPartyData:
|
|||
nybble ICON_FAIRY ; Scream Tail
|
||||
nybble ICON_BALL ; Sandy Shocks
|
||||
nybble ICON_BIRD ; Articuno
|
||||
nybble ICON_BIRD ; Articuno-G
|
||||
nybble ICON_BIRD ; Zapdos
|
||||
nybble ICON_BIRD ; Zapdos-G
|
||||
nybble ICON_BIRD ; Moltres
|
||||
nybble ICON_BIRD ; Moltres-G
|
||||
nybble ICON_MON ; Mewtwo
|
||||
nybble ICON_MON ; Mew
|
||||
; nybble ICON_BALL ; Meltan
|
||||
|
|
|
|||
|
|
@ -227,11 +227,14 @@ MonsterNames::
|
|||
db "WUGTRIO@@@"
|
||||
db "TOEDSCOOL@"
|
||||
db "TOEDSCRUEL"
|
||||
; db "PERRSERKER"
|
||||
; db "SIRFETCH'D"
|
||||
; db "MR.RIME@@@"
|
||||
db "PERRSERKER"
|
||||
db "SIRFETCH'D"
|
||||
db "MR.RIME@@@"
|
||||
; db "MELTAN@@@@"
|
||||
; db "MELMETAL@@"
|
||||
db "ARTICUNO-G"
|
||||
db "ZAPDOS-G@@"
|
||||
db "MOLTRES-G@"
|
||||
db "MISSINGNO."
|
||||
|
||||
assert_table_length NUM_POKEMON_INDEXES
|
||||
|
|
|
|||
|
|
@ -714,8 +714,8 @@ _ScreamTailDexEntry::
|
|||
next "an ancient"
|
||||
|
||||
page "JIGGLYPUFF that"
|
||||
next "was in a"
|
||||
next "strange book."
|
||||
next "was found in a"
|
||||
next "strange book"
|
||||
dex
|
||||
|
||||
_SandyShocksDexEntry::
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ MonsterPalettes:
|
|||
db PAL_YELLOWMON ; KONYA
|
||||
db PAL_YELLOWMON ; MEOWTH
|
||||
db PAL_YELLOWMON ; PERSIAN
|
||||
db PAL_GREYMON ; PERRSEKRER
|
||||
db PAL_YELLOWMON ; PIKACHU
|
||||
db PAL_YELLOWMON ; RAICHU
|
||||
db PAL_YELLOWMON ; GOROCHU
|
||||
|
|
@ -40,8 +41,6 @@ MonsterPalettes:
|
|||
db PAL_PURPLEMON ; NIDORINO
|
||||
db PAL_PURPLEMON ; NIDOKING
|
||||
db PAL_GREYMON ; NIDOREIGN
|
||||
db PAL_REDMON ; MAGIKARP
|
||||
db PAL_BLUEMON ; GYARADOS
|
||||
db PAL_BLUEMON ; BITTYBAT
|
||||
db PAL_BLUEMON ; ZUBAT
|
||||
db PAL_BLUEMON ; GOLBAT
|
||||
|
|
@ -73,11 +72,13 @@ MonsterPalettes:
|
|||
db PAL_GREENMON ; WEEPINBELL
|
||||
db PAL_GREENMON ; VICTREEBEL
|
||||
db PAL_GREENMON ; TSUBOMITTO
|
||||
db PAL_PURPLEMON ; VENONAT
|
||||
db PAL_PURPLEMON ; VENOMOTH
|
||||
db PAL_REDMON ; MAGIKARP
|
||||
db PAL_BLUEMON ; GYARADOS
|
||||
db PAL_REDMON ; GYOPIN
|
||||
db PAL_REDMON ; GOLDEEN
|
||||
db PAL_REDMON ; SEAKING
|
||||
db PAL_PURPLEMON ; VENONAT
|
||||
db PAL_PURPLEMON ; VENOMOTH
|
||||
db PAL_PURPLEMON ; CHEEP
|
||||
db PAL_PURPLEMON ; JABETTA
|
||||
db PAL_YELLOWMON ; PSYDUCK
|
||||
|
|
@ -90,13 +91,12 @@ MonsterPalettes:
|
|||
db PAL_BLUEMON ; POLIWHIRL
|
||||
db PAL_BLUEMON ; POLIWRATH
|
||||
db PAL_GREENMON ; POLITOED
|
||||
db PAL_BROWNMON ; FARFETCHD
|
||||
db PAL_BROWNMON ; MADAAMU
|
||||
db PAL_BROWNMON ; DIGLETT
|
||||
db PAL_BROWNMON ; DUGTRIO
|
||||
db PAL_PINKMON ; WIGLETT
|
||||
db PAL_PINKMON ; WUGTRIO
|
||||
db PAL_GREENMON ; CROCKY
|
||||
db PAL_YELLOWMON ; DROWZEE
|
||||
db PAL_YELLOWMON ; HYPNO
|
||||
db PAL_YELLOWMON ; KOTORA
|
||||
db PAL_YELLOWMON ; GAOTORA
|
||||
db PAL_YELLOWMON ; GOROTORA
|
||||
|
|
@ -106,8 +106,8 @@ MonsterPalettes:
|
|||
db PAL_CYANMON ; TENTACRUEL
|
||||
db PAL_BROWNMON ; TOEDSCOOL
|
||||
db PAL_YELLOWMON ; TOEDSCRUEL - Yellow doesn't really look right...
|
||||
db PAL_YELLOWMON ; DROWZEE
|
||||
db PAL_YELLOWMON ; HYPNO
|
||||
db PAL_GREENMON ; RIBBITO
|
||||
db PAL_GREENMON ; CROAKOZUNA
|
||||
db PAL_PINKMON ; LICKITUNG
|
||||
db PAL_PINKMON ; LICKILICKY
|
||||
db PAL_GREYMON ; ONIX
|
||||
|
|
@ -119,8 +119,10 @@ MonsterPalettes:
|
|||
db PAL_GREYMON ; MACHOP
|
||||
db PAL_GREYMON ; MACHOKE
|
||||
db PAL_GREYMON ; MACHAMP
|
||||
db PAL_GREENMON ; RIBBITO
|
||||
db PAL_GREENMON ; CROAKOZUNA
|
||||
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
|
||||
|
|
@ -132,8 +134,6 @@ MonsterPalettes:
|
|||
db PAL_BLUEMON ; MONJA
|
||||
db PAL_BLUEMON ; TANGELA
|
||||
db PAL_CYANMON ; TANGROWTH
|
||||
db PAL_REDMON ; STARYU
|
||||
db PAL_PURPLEMON ; STARMIE
|
||||
db PAL_BROWNMON ; HINAAZU
|
||||
db PAL_BROWNMON ; DODUO
|
||||
db PAL_BROWNMON ; DODRIO
|
||||
|
|
@ -162,6 +162,8 @@ MonsterPalettes:
|
|||
db PAL_PURPLEMON ; CLOYSTER
|
||||
db PAL_MEWMON ; BLOTTLE
|
||||
db PAL_MEWMON ; PENDRAKEN
|
||||
db PAL_REDMON ; STARYU
|
||||
db PAL_PURPLEMON ; STARMIE
|
||||
db PAL_BLUEMON ; SEEL
|
||||
db PAL_BLUEMON ; DEWGONG
|
||||
db PAL_CYANMON ; HORSEA
|
||||
|
|
@ -187,6 +189,7 @@ MonsterPalettes:
|
|||
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
|
||||
|
|
@ -221,8 +224,11 @@ MonsterPalettes:
|
|||
db PAL_BLUEMON ; DRAGONAIR
|
||||
db PAL_BROWNMON ; DRAGONITE
|
||||
db PAL_BLUEMON ; ARTICUNO
|
||||
db PAL_PURPLEMON ; ARTICUNO_G
|
||||
db PAL_YELLOWMON ; ZAPDOS
|
||||
db PAL_REDMON ; ZAPDOS_G
|
||||
db PAL_REDMON ; MOLTRES
|
||||
db PAL_PINKMON ; MOLTRES_G
|
||||
db PAL_MEWMON ; MEWTWO
|
||||
db PAL_MEWMON ; MEW
|
||||
; db PAL_YELLOWMON ; MELTAN
|
||||
|
|
|
|||
|
|
@ -608,7 +608,7 @@ _ScarletBook2::
|
|||
cont "were attacked by"
|
||||
cont "a MAGNETON that"
|
||||
cont "looked like a"
|
||||
cont "a tyrannosaur."
|
||||
cont "tyrannosaur."
|
||||
|
||||
para "We called it"
|
||||
line "SANDY SHOCKS."
|
||||
|
|
|
|||
|
|
@ -487,14 +487,16 @@ BirdKeeperData:
|
|||
|
||||
BlackbeltData:
|
||||
; Koichi parties
|
||||
db 7, MACHOP, MANKEY, 0
|
||||
db 18, MACHOP, MANKEY, POLIWHIRL, 0
|
||||
db 22, MACHOKE, MANKEY, POLIWHIRL, HITMONLEE, HITMONCHAN, 0
|
||||
db 28, MACHOKE, PRIMEAPE, POLIWHIRL, HITMONLEE, HITMONCHAN, HITMONTOP, 0
|
||||
db 34, MACHOKE, PRIMEAPE, POLIWHIRL, HITMONLEE, HITMONCHAN, HITMONTOP, 0
|
||||
db 39, MACHAMP, PRIMEAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0
|
||||
db 46, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0
|
||||
db 55, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0
|
||||
db 12, MACHOP, HITMONLEE, HITMONCHAN, 0 ; 0 badges
|
||||
db 20, MACHOP, MANKEY, HITMONLEE, HITMONCHAN, 0 ; 1
|
||||
db 24, MACHOKE, MANKEY, POLIWHIRL, HITMONLEE, HITMONCHAN, 0 ; 2
|
||||
db 30, MACHOKE, PRIMEAPE, POLIWHIRL, HITMONLEE, HITMONCHAN, 0 ; 3
|
||||
db 40, MACHOKE, PRIMEAPE, POLIWHIRL, HITMONLEE, HITMONCHAN, 0 ; 4
|
||||
db 42, MACHAMP, PRIMEAPE, POLIWRATH, HITMONLEE, HITMONCHAN, 0 ; 5
|
||||
db 46, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, 0 ; 6
|
||||
db 49, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 7
|
||||
db 53, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 8
|
||||
db 67, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; Silph Gauntlet
|
||||
; Fighting Dojo Trainers
|
||||
db 31, CHEEP, CHEEP, JABETTA, 0
|
||||
db 32, MACHOKE, MACHAMP, 0
|
||||
|
|
@ -666,48 +668,84 @@ BrunoData:
|
|||
db $FF, 54, HITMONTOP, 55, STEELIX, 55, POLIWRATH, 56, JABETTA, 56, PURAKKUSU, 58, MACHAMP, 0
|
||||
; post-game rematch team (currently unused)
|
||||
; db $FF, 74, STEELIX, 75, POLIWRATH, 75, SIRFETCHD, 76, PURAKKUSU, 76, MACHAMP, 78, ZAPDOS_G, 0
|
||||
|
||||
; gyms except giovanni begin here
|
||||
BrockData: ; part of an experiment
|
||||
db $FF, 7, GEODUDE, 7, RHYHORN, 10, DECILLA, 12, ONIX, 0
|
||||
db $FF, 17, GEODUDE, 17, RHYHORN, 18, OMANYTE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0
|
||||
db $FF, 22, GRAVELER, 22, RHYHORN, 23, OMANYTE, 23, KABUTO, 24, DECILLA, 26, ONIX, 0
|
||||
db $FF, 28, GRAVELER, 28, RHYHORN, 30, OMANYTE, 30, KABUTO, 31, DECILLA, 33, ONIX, 0
|
||||
db $FF, 34, GRAVELER, 28, RHYHORN, 36, OMANYTE, 36, KABUTO, 38, DECILLA, 40, STEELIX, 0
|
||||
db $FF, 39, GOLEM, 39, RHYDON, 40, OMASTAR, 40, KABUTOPS, 42, GYAOON, 43, STEELIX, 0
|
||||
db $FF, 45, GOLEM, 45, RHYDON, 47, OMASTAR, 46, KABUTOPS, 46, GYAOON, 47, STEELIX, 0
|
||||
db $FF, 47, GOLEM, 47, RHYPERIOR, 46, OMASTAR, 46, KABUTOPS, 48, GYAOON, 50, STEELIX, 0
|
||||
; post-game rematch team (currently unused)
|
||||
db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, NIDOREIGN, 67, KLEAVOR, 70, GYAOON, 0
|
||||
BrockData:
|
||||
db $FF, 10, GEODUDE, 10, RHYHORN, 11, DECILLA, 13, ONIX, 0 ; 0 badges
|
||||
db $FF, 19, GEODUDE, 18, OMANYTE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0 ; 1
|
||||
db $FF, 22, GRAVELER, 22, OMANYTE, 22, KABUTO, 23, DECILLA, 25, ONIX, 0 ; 2
|
||||
db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0 ; 3
|
||||
db $FF, 39, GOLEM, 38, OMANYTE, 38, KABUTO, 39, NIDOREIGN, 41, GYAOON, 0 ; 4
|
||||
db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, NIDOREIGN, 43, GYAOON, 0 ; 5
|
||||
db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, NIDOREIGN, 47, GYAOON, 0 ; 6
|
||||
db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, NIDOREIGN, 48, KLEAVOR, 50, GYAOON, 0 ; 7 (unused)
|
||||
db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, NIDOREIGN, 67, KLEAVOR, 70, GYAOON, 0 ; 8 (postgame)
|
||||
|
||||
MistyData:
|
||||
db $FF, 19, HORSEA, 18, CHEEP, 18, BLOTTLE, 19, BLASTYKE, 21, STARMIE, 0
|
||||
; post-game rematch team (currently unused)
|
||||
; db $FF, 66, STARMIE, 67, PENDRAKEN, 67, JABETTA, 66, TOTARTLE, 67, JAGG, 70, GYARADOS, 0
|
||||
db $FF, 10, HORSEA, 10, CHEEP, 11, GYOPIN, 13, WEIRDUCK, 0 ; 0 badges
|
||||
db $FF, 19, HORSEA, 18, CHEEP, 18, GOLDEEN, 19, WEIRDUCK, 21, STARMIE, 0 ; 1
|
||||
db $FF, 22, HORSEA, 22, CHEEP, 22, GOLDEEN, 23, WEIRDUCK, 25, STARMIE, 0 ; 2
|
||||
db $FF, 29, HORSEA, 28, JABETTA, 28, GOLDEEN, 29, WEIRDUCK, 31, STARMIE, 0 ; 3
|
||||
db $FF, 39, SEADRA, 38, JABETTA, 38, SEAKING, 39, GOLDUCK, 41, STARMIE, 0 ; 4
|
||||
db $FF, 41, SEADRA, 40, JABETTA, 40, SEAKING, 41, GOLDUCK, 43, STARMIE, 0 ; 5
|
||||
db $FF, 45, KINGDRA, 44, JABETTA, 44, SEAKING, 45, GOLDUCK, 47, STARMIE, 0 ; 6
|
||||
db $FF, 47, KINGDRA, 46, JABETTA, 46, SEAKING, 48, GOLDUCK, 48, JAGG, 50, STARMIE, 0 ; 7 (unused)
|
||||
db $FF, 66, STARMIE, 67, VAPOREON, 67, GOLDUCK, 66, TOTARTLE, 67, JAGG, 70, GYARADOS, 0 ; 8 (postgame)
|
||||
|
||||
LtSurgeData:
|
||||
db $FF, 22, VOLTORB, 21, GAOTORA, 22, MAGNETITE, 23, ELECTABUZZ, 25, GOROCHU, 0
|
||||
; post-game rematch team (currently unused)
|
||||
; db $FF, 66, GOROTORA, 67, ELECTIVIRE, 67, JOLTEON, 66, SANDY_SHOCKS, 67, GOROCHU, 70, ZAPDOS, 0
|
||||
db $FF, 10, VOLTORB, 10, KOTORA, 11, PIKACHU, 13, MAGNETITE, 0 ; 0 badges
|
||||
db $FF, 19, VOLTORB, 18, KOTORA, 18, PIKACHU, 19, MAGNETITE, 21, ELECTABUZZ, 0 ; 1
|
||||
db $FF, 22, VOLTORB, 22, GAOTORA, 22, MAGNETITE, 23, ELECTABUZZ, 25, GOROCHU, 0 ; 2
|
||||
db $FF, 28, ELECTRODE, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, GOROCHU, 0 ; 3
|
||||
db $FF, 39, ELECTRODE, 38, GOROTORA, 38, MAGNETON, 39, ELECTABUZZ, 41, GOROCHU, 0 ; 4
|
||||
db $FF, 41, ELECTRODE, 40, GOROTORA, 40, MAGNETON, 41, ELECTABUZZ, 43, GOROCHU, 0 ; 5
|
||||
db $FF, 45, ELECTRODE, 44, GOROTORA, 44, MAGNEZONE, 45, ELECTIVIRE, 47, GOROCHU, 0 ; 6
|
||||
db $FF, 47, ELECTRODE, 46, GOROTORA, 46, MAGNEZONE, 48, ELECTIVIRE, 48, JOLTEON, 50, GOROCHU, 0 ; 7 (unused)
|
||||
db $FF, 66, GOROTORA, 67, ELECTIVIRE, 67, JOLTEON, 66, SANDY_SHOCKS, 67, GOROCHU, 70, ZAPDOS, 0 ; 8 (postgame)
|
||||
|
||||
ErikaData:
|
||||
db $FF, 28, WEEPINBELL, 28, GLOOM, 29, CACTUS, 28, PARASECT, 31, TANGROWTH, 0
|
||||
; post-game rematch team (currently unused)
|
||||
; db $FF, 66, TOEDSCRUEL, 67, BELLOSSOM, 67, EXEGGUTOR, 66, VENUSAUR, 67, LEAFEON, 70, TANGROWTH, 0
|
||||
db $FF, 10, BELLSPROUT, 10, PARAS, 11, MONJA, 13, GLOOM, 0 ; 0 badges
|
||||
db $FF, 19, BELLSPROUT, 18, PARAS, 18, TOEDSCOOL, 19, TANGELA, 21, GLOOM, 0 ; 1
|
||||
db $FF, 22, BELLSPROUT, 22, PARASECT, 22, TOEDSCOOL, 23, TANGELA, 25, GLOOM, 0 ; 2
|
||||
db $FF, 28, WEEPINBELL, 28, PARASECT, 28, CACTUS, 29, TANGELA, 31, BELLOSSOM, 0 ; 3
|
||||
db $FF, 38, VICTREEBEL, 38, BELLOSSOM, 39, TOEDSCRUEL, 39, CACTUS, 41, TANGROWTH, 0 ; 4
|
||||
db $FF, 40, VICTREEBEL, 40, BELLOSSOM, 41, TOEDSCRUEL, 41, CACTUS, 43, TANGROWTH, 0 ; 5
|
||||
db $FF, 44, VICTREEBEL, 44, BELLOSSOM, 45, TOEDSCRUEL, 45, CACTUS, 47, TANGROWTH, 0 ; 6
|
||||
db $FF, 46, VICTREEBEL, 46, BELLOSSOM, 47, TOEDSCRUEL, 48, CACTUS, 48, EXEGGUTOR, 50, TANGROWTH, 0 ; 7 (unused)
|
||||
db $FF, 66, TOEDSCRUEL, 67, BELLOSSOM, 67, EXEGGUTOR, 66, VENUSAUR, 67, LEAFEON, 70, TANGROWTH, 0 ; 8 (postgame)
|
||||
|
||||
KogaData:
|
||||
db $FF, 39, VENOMOTH, 38, NIDOREIGN, 39, MUK, 39, WEEZING, 41, CROBAT, 0
|
||||
; post-game rematch team (currently unused)
|
||||
; db $FF, 66, TENTACRUEL, 67, MUK, 67, VENOMOTH, 66, TSUBOMITTO, 67, WEEZING, 70, CROBAT, 0
|
||||
db $FF, 10, VENONAT, 10, GRIMER, 11, KOFFING, 13, NIDORINO, 0 ; 0 badges
|
||||
db $FF, 19, ZUBAT, 18, VENONAT, 18, GRIMER, 19, KOFFING, 21, NIDORINO, 0 ; 1
|
||||
db $FF, 22, ZUBAT, 22, NIDORINO, 22, GRIMER, 23, KOFFING, 25, VENOMOTH, 0 ; 2
|
||||
db $FF, 28, GOLBAT, 28, NIDORINO, 28, GRIMER, 29, KOFFING, 31, VENOMOTH, 0 ; 3
|
||||
db $FF, 38, TENTACRUEL, 39, VENOMOTH, 38, MUK, 39, WEEZING, 41, CROBAT, 0 ; 4
|
||||
db $FF, 40, TENTACRUEL, 41, VENOMOTH, 40, MUK, 41, WEEZING, 43, CROBAT, 0 ; 5
|
||||
db $FF, 44, TENTACRUEL, 45, VENOMOTH, 44, MUK, 45, WEEZING, 47, CROBAT, 0 ; 6
|
||||
db $FF, 46, TENTACRUEL, 46, NIDOKING, 47, VENOMOTH, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7
|
||||
db $FF, 66, TENTACRUEL, 67, NIDOKING, 66, TSUBOMITTO, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame)
|
||||
|
||||
BlaineData:
|
||||
db $FF, 45, RAPIDASH, 44, NINETALES, 44, FLAREON, 45, ARCANINE, 47, MAGMORTAR, 0
|
||||
; post-game rematch team (currently unused)
|
||||
; db $FF, 66, NINETALES, 67, RAPIDASH, 67, ARCANINE, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES, 0
|
||||
db $FF, 10, GROWLITHE, 10, VULPIX, 11, CHARMANDER, 13, PONYTA, 0 ; 0 badges (unused?)
|
||||
db $FF, 19, PONYTA, 18, VULPIX, 18, GROWLITHE, 19, CHARMELEON, 21, MAGMAR, 0 ; 1
|
||||
db $FF, 22, PONYTA, 22, VULPIX, 22, GROWLITHE, 23, CHARMELEON, 25, MAGMAR, 0 ; 2
|
||||
db $FF, 28, PONYTA, 28, VULPIX, 28, GROWLITHE, 29, FLAREON, 31, MAGMAR, 0 ; 3
|
||||
db $FF, 38, PONYTA, 39, NINETALES, 38, FLAREON, 39, ARCANINE, 41, MAGMORTAR, 0 ; 4
|
||||
db $FF, 41, RAPIDASH, 40, NINETALES, 40, FLAREON, 41, ARCANINE, 43, MAGMORTAR, 0 ; 5
|
||||
db $FF, 45, RAPIDASH, 44, NINETALES, 44, FLAREON, 45, ARCANINE, 47, MAGMORTAR, 0 ; 6
|
||||
db $FF, 47, RAPIDASH, 46, NINETALES, 46, FLAREON, 48, CHARIZARD, 48, ARCANINE, 50, MAGMORTAR, 0 ; 7 (unused)
|
||||
db $FF, 66, NINETALES, 67, RAPIDASH, 67, ARCANINE, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES, 0 ; 8 (postgame)
|
||||
|
||||
SabrinaData:
|
||||
db $FF, 39, ESPEON, 40, MR_MIME, 39, SLOWKING, 40, HYPNO, 43, ALAKAZAM, 0
|
||||
; post-game rematch team (currently unused)
|
||||
; db $FF, 66, ESPEON, 67, SLOWKING, 67, HYPNO, 66, SCREAM_TAIL, 67, ALAKAZAM, 70, ARTICUNO_G, 0
|
||||
db $FF, 10, DROWZEE, 10, SLOWPOKE, 11, EXEGGCUTE, 13, KADABRA, 0 ; 0 badges
|
||||
db $FF, 19, DROWZEE, 18, SLOWPOKE, 18, EXEGGCUTE, 19, KADABRA, 21, MR_MIME, 0 ; 1
|
||||
db $FF, 22, DROWZEE, 22, SLOWPOKE, 22, EXEGGCUTE, 23, KADABRA, 25, MR_MIME, 0 ; 2
|
||||
db $FF, 28, MR_MIME, 28, SLOWPOKE, 28, EXEGGCUTE, 29, HYPNO, 31, ALAKAZAM, 0 ; 3
|
||||
db $FF, 38, ESPEON, 39, MR_MIME, 38, SLOWKING, 39, HYPNO, 41, ALAKAZAM, 0 ; 4
|
||||
db $FF, 40, ESPEON, 41, MR_MIME, 40, SLOWKING, 41, HYPNO, 43, ALAKAZAM, 0 ; 5
|
||||
db $FF, 44, ESPEON, 45, MR_RIME, 44, SLOWKING, 45, HYPNO, 47, ALAKAZAM, 0 ; 6
|
||||
db $FF, 46, ESPEON, 47, MR_RIME, 46, SLOWKING, 48, EXEGGUTOR, 48, HYPNO, 50, ALAKAZAM, 0 ; 7 (unused)
|
||||
; db $FF, 66, ESPEON, 67, SLOWKING, 67, HYPNO, 66, SCREAM_TAIL, 67, ALAKAZAM, 70, ARTICUNO_G, 0 ; 8 (postgame)
|
||||
|
||||
GentlemanData:
|
||||
; SS Anne 1F Rooms
|
||||
|
|
@ -762,7 +800,7 @@ ChannelerData:
|
|||
db 23, MIKON, GASTLY, 0
|
||||
db 24, VULPIX, 0
|
||||
; Unused - this will be used in the Silph Gauntlet
|
||||
db 65, GUARDIA, NINETALES, PRIMEAPE, HYPNO, MUK, GENGAR, 0
|
||||
db 65, GUARDIA, NINETALES, ANNIHILAPE, HYPNO, MUK, GENGAR, 0
|
||||
; Pokémon Tower 3F
|
||||
db 25, GASTLY, HAUNTER, 0
|
||||
; Pokémon Tower 4F, now unused
|
||||
|
|
@ -792,7 +830,7 @@ ChannelerData:
|
|||
db 33, GASTLY, GASTLY, HAUNTER, 0
|
||||
|
||||
AgathaData:
|
||||
db $FF, 57, CROAKOZUNA, 56, CROBAT, 56, PRIMEAPE, 58, UMBREON, 58, ARBOK, 60, GENGAR, 0
|
||||
db $FF, 57, CROAKOZUNA, 56, CROBAT, 56, ANNIHILAPE, 58, UMBREON, 58, ARBOK, 60, GENGAR, 0
|
||||
; post-game rematch team (currently unused)
|
||||
; db $FF, 77, ANNIHILAPE, 76, MAROWAK_A, 76, UMBREON, 78, CROBAT, 78, GENGAR, 80, MOLTRES_G, 0
|
||||
|
||||
|
|
@ -800,3 +838,4 @@ LanceData:
|
|||
db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, CHARIZARD, 59, CRYITHAN, 62, DRAGONITE, 0
|
||||
; post-game rematch team (currently unused)
|
||||
; db $FF, 78, CROCKY, 77, KINGDRA, 77, AERODACTYL, 79, EXEGGUTOR_A, 79, CRYITHAN, 82, DRAGONITE, 0
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue