mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-20 22:28:41 +13:00
Rejoice! Bittybat is back!
(oh and also Magnetite too i guess) - Finally updated Oak's Pokedex rating checks to accommodate the higher number of Pokemon. - Albatross strikes again, bringing updated sprites for Alolan Ninetales and Exeggutor, plus Aqua and Blaze Breed Paldean Tauros! Combat Breed is still the same. Please note that the game is still unfinished, I'm hoping I can have the proper time and motivation to knock out the last few bugs and unimplemented features. Doing my best, okay? :3 ~ MM
This commit is contained in:
Martha Schilling
parent
9c35a2c12c
commit
5bb500d044
38 changed files with 536 additions and 591 deletions
|
|
@ -54,6 +54,7 @@ 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/bittybat.asm"
|
||||
INCLUDE "data/pokemon/base_stats/zubat.asm"
|
||||
INCLUDE "data/pokemon/base_stats/golbat.asm"
|
||||
INCLUDE "data/pokemon/base_stats/crobat.asm"
|
||||
|
|
@ -104,16 +105,22 @@ INCLUDE "data/pokemon/base_stats/politoed.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/cheep.asm"
|
||||
INCLUDE "data/pokemon/base_stats/jabetta.asm"
|
||||
INCLUDE "data/pokemon/base_stats/lickitung.asm"
|
||||
INCLUDE "data/pokemon/base_stats/lickilicky.asm"
|
||||
INCLUDE "data/pokemon/base_stats/growlithe.asm"
|
||||
INCLUDE "data/pokemon/base_stats/arcanine.asm"
|
||||
INCLUDE "data/pokemon/base_stats/arcanineh.asm"
|
||||
INCLUDE "data/pokemon/base_stats/lickitung.asm"
|
||||
INCLUDE "data/pokemon/base_stats/lickilicky.asm"
|
||||
INCLUDE "data/pokemon/base_stats/farfetchd.asm"
|
||||
INCLUDE "data/pokemon/base_stats/luxwan.asm"
|
||||
INCLUDE "data/pokemon/base_stats/sirfetchd.asm"
|
||||
INCLUDE "data/pokemon/base_stats/drowzee.asm"
|
||||
INCLUDE "data/pokemon/base_stats/hypno.asm"
|
||||
INCLUDE "data/pokemon/base_stats/magnemite.asm"
|
||||
INCLUDE "data/pokemon/base_stats/magnetite.asm"
|
||||
INCLUDE "data/pokemon/base_stats/magneton.asm"
|
||||
INCLUDE "data/pokemon/base_stats/magnezone.asm"
|
||||
INCLUDE "data/pokemon/base_stats/diglett.asm"
|
||||
INCLUDE "data/pokemon/base_stats/dugtrio.asm"
|
||||
INCLUDE "data/pokemon/base_stats/dugtrioa.asm"
|
||||
|
|
@ -130,11 +137,6 @@ INCLUDE "data/pokemon/base_stats/toedscool.asm"
|
|||
INCLUDE "data/pokemon/base_stats/toedscruel.asm"
|
||||
INCLUDE "data/pokemon/base_stats/blottle.asm"
|
||||
INCLUDE "data/pokemon/base_stats/pendraken.asm"
|
||||
INCLUDE "data/pokemon/base_stats/magnemite.asm"
|
||||
INCLUDE "data/pokemon/base_stats/magneton.asm"
|
||||
INCLUDE "data/pokemon/base_stats/magnezone.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/machop.asm"
|
||||
|
|
@ -152,7 +154,6 @@ INCLUDE "data/pokemon/base_stats/kolta.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/balumba.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gastly.asm"
|
||||
INCLUDE "data/pokemon/base_stats/haunter.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gengar.asm"
|
||||
|
|
@ -160,6 +161,7 @@ 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/balumba.asm"
|
||||
INCLUDE "data/pokemon/base_stats/doduo.asm"
|
||||
INCLUDE "data/pokemon/base_stats/dodrio.asm"
|
||||
INCLUDE "data/pokemon/base_stats/grimer.asm"
|
||||
|
|
@ -174,16 +176,16 @@ INCLUDE "data/pokemon/base_stats/ramoose.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/horsea.asm"
|
||||
INCLUDE "data/pokemon/base_stats/seadra.asm"
|
||||
INCLUDE "data/pokemon/base_stats/kingdra.asm"
|
||||
INCLUDE "data/pokemon/base_stats/seel.asm"
|
||||
INCLUDE "data/pokemon/base_stats/dewgong.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/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"
|
||||
INCLUDE "data/pokemon/base_stats/seadra.asm"
|
||||
INCLUDE "data/pokemon/base_stats/kingdra.asm"
|
||||
INCLUDE "data/pokemon/base_stats/blastyke.asm"
|
||||
INCLUDE "data/pokemon/base_stats/blastoise.asm"
|
||||
INCLUDE "data/pokemon/base_stats/sharpoon.asm"
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
db GROWTH_SLOW ; growth rate
|
||||
|
||||
; tm/hm learnset
|
||||
tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, MEGA_KICK, TOXIC, \
|
||||
TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \
|
||||
tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, MEGA_KICK, TOXIC, \
|
||||
TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \
|
||||
BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, SEISMIC_TOSS, \
|
||||
RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \
|
||||
PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ CryData::
|
|||
mon_cry SFX_CRY_13, $00, $80 ; Blastoise
|
||||
mon_cry SFX_CRY_14, $00, $80 ; Pinsir
|
||||
mon_cry SFX_CRY_12, $00, $80 ; Tangela
|
||||
mon_cry SFX_CRY_0F, $00, $80 ; Gyaoon
|
||||
mon_cry SFX_CRY_0F, $00, $80 ; Gawarhed
|
||||
mon_cry SFX_CRY_0A, $2C, $80 ; Nidoreign
|
||||
mon_cry SFX_CRY_1F, $20, $40 ; Growlithe
|
||||
mon_cry SFX_CRY_17, $FF, $C0 ; Onix
|
||||
|
|
@ -58,25 +58,25 @@ CryData::
|
|||
mon_cry SFX_CRY_21, $20, $60 ; Psyduck
|
||||
mon_cry SFX_CRY_0D, $88, $20 ; Drowzee
|
||||
mon_cry SFX_CRY_12, $E0, $40 ; Golem
|
||||
mon_cry SFX_CRY_0E, $00, $80 ; Barunda
|
||||
mon_cry SFX_CRY_0E, $00, $80 ; Balumba
|
||||
mon_cry SFX_CRY_04, $FF, $30 ; Magmar
|
||||
mon_cry SFX_CRY_0D, $2E, $E0 ; Buu
|
||||
mon_cry SFX_CRY_06, $8F, $FF ; Electabuzz
|
||||
mon_cry SFX_CRY_1C, $20, $C0 ; Magneton
|
||||
mon_cry SFX_CRY_12, $E6, $DD ; Koffing
|
||||
mon_cry SFX_CRY_15, $40, $A5 ; Deer
|
||||
mon_cry SFX_CRY_15, $40, $A5 ; Ramoose
|
||||
mon_cry SFX_CRY_0A, $DD, $60 ; Mankey
|
||||
mon_cry SFX_CRY_0C, $88, $C0 ; Seel
|
||||
mon_cry SFX_CRY_0B, $AA, $01 ; Diglett
|
||||
mon_cry SFX_CRY_1D, $11, $40 ; Tauros
|
||||
mon_cry SFX_CRY_03, $90, $B0 ; Trampel
|
||||
mon_cry SFX_CRY_1C, $C6, $F0 ; Crocky
|
||||
mon_cry SFX_CRY_1C, $C6, $F0 ; Gavillain
|
||||
mon_cry SFX_CRY_13, $93, $00 ; Blottle
|
||||
mon_cry SFX_CRY_10, $DD, $01 ; Farfetch'd
|
||||
mon_cry SFX_CRY_1A, $44, $40 ; Venonat
|
||||
mon_cry SFX_CRY_0F, $3C, $C0 ; Dragonite
|
||||
mon_cry SFX_CRY_00, $80, $10 ; Cactus
|
||||
mon_cry SFX_CRY_17, $C8, $C0 ; Jagg
|
||||
mon_cry SFX_CRY_00, $80, $10 ; Cactormus
|
||||
mon_cry SFX_CRY_17, $C8, $C0 ; Sharpoon
|
||||
mon_cry SFX_CRY_1D, $B4, $4E ; Bittybat
|
||||
mon_cry SFX_CRY_0B, $BB, $01 ; Doduo
|
||||
mon_cry SFX_CRY_0E, $FF, $FF ; Poliwag
|
||||
|
|
@ -89,7 +89,7 @@ CryData::
|
|||
mon_cry SFX_CRY_20, $20, $E0 ; Krabby
|
||||
mon_cry SFX_CRY_22, $FF, $40 ; Cheep
|
||||
mon_cry SFX_CRY_22, $32, $FF ; Jabetta
|
||||
mon_cry SFX_CRY_0E, $E0, $60 ; Mikon
|
||||
mon_cry SFX_CRY_0E, $E0, $60 ; Vulpiii
|
||||
mon_cry SFX_CRY_24, $4F, $10 ; Vulpix
|
||||
mon_cry SFX_CRY_24, $88, $60 ; Ninetales
|
||||
mon_cry SFX_CRY_0F, $EE, $01 ; Pikachu
|
||||
|
|
@ -102,8 +102,8 @@ CryData::
|
|||
mon_cry SFX_CRY_18, $EE, $01 ; Kabutops
|
||||
mon_cry SFX_CRY_19, $99, $10 ; Horsea
|
||||
mon_cry SFX_CRY_19, $3C, $01 ; Seadra
|
||||
mon_cry SFX_CRY_0F, $40, $C0 ; Bawligua
|
||||
mon_cry SFX_CRY_0F, $20, $C0 ; Cryithan
|
||||
mon_cry SFX_CRY_0F, $40, $C0 ; Ministare
|
||||
mon_cry SFX_CRY_0F, $20, $C0 ; Iguanarch
|
||||
mon_cry SFX_CRY_00, $20, $40 ; Sandshrew
|
||||
mon_cry SFX_CRY_00, $FF, $FF ; Sandslash
|
||||
mon_cry SFX_CRY_1F, $F0, $01 ; Omanyte
|
||||
|
|
@ -129,7 +129,7 @@ CryData::
|
|||
mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio
|
||||
mon_cry SFX_CRY_1A, $29, $80 ; Venomoth
|
||||
mon_cry SFX_CRY_0C, $23, $FF ; Dewgong
|
||||
mon_cry SFX_CRY_09, $FF, $20 ; Purakkusu
|
||||
mon_cry SFX_CRY_09, $FF, $20 ; Tricules
|
||||
mon_cry SFX_CRY_13, $3C, $00 ; Pendraken
|
||||
mon_cry SFX_CRY_16, $80, $20 ; Caterpie
|
||||
mon_cry SFX_CRY_1C, $CC, $01 ; Metapod
|
||||
|
|
@ -142,8 +142,8 @@ CryData::
|
|||
mon_cry SFX_CRY_1E, $99, $FF ; Mewtwo
|
||||
mon_cry SFX_CRY_05, $55, $01 ; Snorlax
|
||||
mon_cry SFX_CRY_17, $80, $00 ; Magikarp
|
||||
mon_cry SFX_CRY_19, $C1, $1C ; Konya
|
||||
mon_cry SFX_CRY_13, $00, $00 ; Omega
|
||||
mon_cry SFX_CRY_19, $C1, $1C ; Coinpur
|
||||
mon_cry SFX_CRY_13, $00, $00 ; Omegadge
|
||||
mon_cry SFX_CRY_07, $EF, $FF ; Muk
|
||||
mon_cry SFX_CRY_0F, $40, $80 ; Decilla
|
||||
mon_cry SFX_CRY_20, $EE, $E0 ; Kingler
|
||||
|
|
@ -164,13 +164,13 @@ CryData::
|
|||
mon_cry SFX_CRY_0F, $80, $01 ; Bulbasaur
|
||||
mon_cry SFX_CRY_0F, $00, $C0 ; Venusaur
|
||||
mon_cry SFX_CRY_1A, $EE, $FF ; Tentacruel
|
||||
mon_cry SFX_CRY_16, $89, $0E ; Gyopin
|
||||
mon_cry SFX_CRY_16, $89, $0E ; Orfry
|
||||
mon_cry SFX_CRY_16, $80, $40 ; Goldeen
|
||||
mon_cry SFX_CRY_16, $10, $FF ; Seaking
|
||||
mon_cry SFX_CRY_03, $A3, $01 ; Kotora
|
||||
mon_cry SFX_CRY_03, $2D, $01 ; Gaotora
|
||||
mon_cry SFX_CRY_03, $05, $01 ; Gorotora
|
||||
mon_cry SFX_CRY_25, $37, $10 ; Puchikoon
|
||||
mon_cry SFX_CRY_25, $37, $10 ; Kolta
|
||||
mon_cry SFX_CRY_25, $00, $80 ; Ponyta
|
||||
mon_cry SFX_CRY_25, $20, $C0 ; Rapidash
|
||||
mon_cry SFX_CRY_22, $00, $80 ; Rattata
|
||||
|
|
@ -182,7 +182,7 @@ CryData::
|
|||
mon_cry SFX_CRY_23, $20, $F0 ; Aerodactyl
|
||||
mon_cry SFX_CRY_13, $F7, $00 ; Blastyke
|
||||
mon_cry SFX_CRY_1C, $80, $60 ; Magnemite
|
||||
mon_cry SFX_CRY_0F, $63, $40 ; Skimper
|
||||
mon_cry SFX_CRY_0F, $63, $40 ; Squeamata
|
||||
mon_cry SFX_CRY_17, $C1, $E4 ; Gorochu
|
||||
mon_cry SFX_CRY_04, $60, $40 ; Charmander
|
||||
mon_cry SFX_CRY_1D, $60, $40 ; Squirtle
|
||||
|
|
@ -199,8 +199,8 @@ CryData::
|
|||
mon_cry SFX_CRY_21, $55, $01 ; Bellsprout
|
||||
mon_cry SFX_CRY_25, $44, $20 ; Weepinbell
|
||||
mon_cry SFX_CRY_25, $66, $CC ; Victreebel
|
||||
; mon_cry SFX_CRY_12, $93, $00 ; Monja
|
||||
mon_cry SFX_CRY_1F, $40, $01 ; Pudi
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Wiglett
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Wugtrio
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Scizor
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Rhyperior
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Espeon
|
||||
|
|
@ -211,12 +211,12 @@ CryData::
|
|||
mon_cry SFX_CRY_00, $00, $00 ; Lickilicky
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Tangrowth
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Kleavor
|
||||
mon_cry SFX_CRY_21, $DD, $80 ; Tsubomitto
|
||||
mon_cry SFX_CRY_21, $DD, $80 ; Bellignan
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Steelix
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Blissey
|
||||
mon_cry SFX_CRY_1D, $E3, $1A ; Hitmontop
|
||||
mon_cry SFX_CRY_1D, $01, $B1 ; Crobat
|
||||
mon_cry SFX_CRY_0E, $50, $FF ; Animon
|
||||
mon_cry SFX_CRY_0E, $50, $FF ; Mimmeo
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Bellossom
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Porygon2
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Kingdra
|
||||
|
|
@ -224,10 +224,10 @@ 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_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_07, $20, $FF ; Disturban
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Gentlarva
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Pupal
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Carapthor
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Magnezone
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Porygon-Z
|
||||
mon_cry SFX_CRY_20, $00, $1C ; Annihilape
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ PokedexEntryPointers:
|
|||
dw DragoniteDexEntry
|
||||
dw CactormusDexEntry
|
||||
dw SharpoonDexEntry
|
||||
dw WiglettDexEntry
|
||||
dw BittybatDexEntry
|
||||
dw DoduoDexEntry
|
||||
dw PoliwagDexEntry
|
||||
dw JynxDexEntry
|
||||
|
|
@ -139,7 +139,7 @@ PokedexEntryPointers:
|
|||
dw DecillaDexEntry
|
||||
dw KinglerDexEntry
|
||||
dw CloysterDexEntry
|
||||
dw WugtrioDexEntry
|
||||
dw MagnetiteDexEntry
|
||||
dw ElectrodeDexEntry
|
||||
dw ClefableDexEntry
|
||||
dw WeezingDexEntry
|
||||
|
|
@ -190,6 +190,8 @@ PokedexEntryPointers:
|
|||
dw BellsproutDexEntry
|
||||
dw WeepinbellDexEntry
|
||||
dw VictreebelDexEntry
|
||||
dw WiglettDexEntry
|
||||
dw WugtrioDexEntry
|
||||
dw ScizorDexEntry
|
||||
dw RhyperiorDexEntry
|
||||
dw EspeonDexEntry
|
||||
|
|
@ -1406,12 +1408,12 @@ CoinpurDexEntry:
|
|||
text_far _CoinpurDexEntry
|
||||
text_end
|
||||
|
||||
;BittybatDexEntry:
|
||||
; db "TINY BAT@"
|
||||
; db 1,0
|
||||
; dw 80
|
||||
; text_far _BittybatDexEntry
|
||||
; text_end
|
||||
BittybatDexEntry:
|
||||
db "TINY BAT@"
|
||||
db 1,0
|
||||
dw 80
|
||||
text_far _BittybatDexEntry
|
||||
text_end
|
||||
|
||||
RibbitoDexEntry:
|
||||
db "SUMO@"
|
||||
|
|
@ -1553,12 +1555,12 @@ PendrakenDexEntry:
|
|||
text_far _PendrakenDexEntry
|
||||
text_end
|
||||
|
||||
;MagnetiteDexEntry:
|
||||
; db "MAGNET@"
|
||||
; db 2,4
|
||||
; dw 400
|
||||
; text_far _MagnetiteDexEntry
|
||||
; text_end
|
||||
MagnetiteDexEntry:
|
||||
db "MAGNET@"
|
||||
db 2,4
|
||||
dw 400
|
||||
text_far _MagnetiteDexEntry
|
||||
text_end
|
||||
|
||||
TriculesDexEntry:
|
||||
db "BIG HORN@"
|
||||
|
|
@ -1664,13 +1666,6 @@ KleavorDexEntry:
|
|||
dw 1960
|
||||
text_far _KleavorDexEntry
|
||||
text_end
|
||||
|
||||
;MonjaDexEntry:
|
||||
; db "VINE@"
|
||||
; db 1,4
|
||||
; dw 330
|
||||
; text_far _MonjaDexEntry
|
||||
; text_end
|
||||
|
||||
SteelixDexEntry:
|
||||
db "IRON SNAKE@"
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ PokedexOrder:
|
|||
db DEX_DRAGONITE
|
||||
db DEX_CACTORMUS
|
||||
db DEX_SHARPOON
|
||||
db DEX_WIGLETT
|
||||
db DEX_BITTYBAT
|
||||
db DEX_DODUO
|
||||
db DEX_POLIWAG
|
||||
db DEX_JYNX
|
||||
|
|
@ -139,7 +139,7 @@ PokedexOrder:
|
|||
db DEX_DECILLA
|
||||
db DEX_KINGLER
|
||||
db DEX_CLOYSTER
|
||||
db DEX_WUGTRIO
|
||||
db DEX_MAGNETITE
|
||||
db DEX_ELECTRODE
|
||||
db DEX_CLEFABLE
|
||||
db DEX_WEEZING
|
||||
|
|
@ -190,6 +190,8 @@ PokedexOrder:
|
|||
db DEX_BELLSPROUT
|
||||
db DEX_WEEPINBELL
|
||||
db DEX_VICTREEBEL
|
||||
db DEX_WIGLETT
|
||||
db DEX_WUGTRIO
|
||||
db DEX_SCIZOR
|
||||
db DEX_RHYPERIOR
|
||||
db DEX_ESPEON
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ EvosMovesPointerTable:
|
|||
dw DragoniteEvosMoves
|
||||
dw CactormusEvosMoves
|
||||
dw SharpoonEvosMoves
|
||||
dw WiglettEvosMoves
|
||||
dw BittybatEvosMoves
|
||||
dw DoduoEvosMoves
|
||||
dw PoliwagEvosMoves
|
||||
dw JynxEvosMoves
|
||||
|
|
@ -151,7 +151,7 @@ EvosMovesPointerTable:
|
|||
dw DecillaEvosMoves
|
||||
dw KinglerEvosMoves
|
||||
dw CloysterEvosMoves
|
||||
dw WugtrioEvosMoves
|
||||
dw MagnetiteEvosMoves
|
||||
dw ElectrodeEvosMoves
|
||||
dw ClefableEvosMoves
|
||||
dw WeezingEvosMoves
|
||||
|
|
@ -202,6 +202,8 @@ EvosMovesPointerTable:
|
|||
dw BellsproutEvosMoves
|
||||
dw WeepinbellEvosMoves
|
||||
dw VictreebelEvosMoves
|
||||
dw WiglettEvosMoves
|
||||
dw WugtrioEvosMoves
|
||||
dw ScizorEvosMoves
|
||||
dw RhyperiorEvosMoves
|
||||
dw EspeonEvosMoves
|
||||
|
|
@ -1094,19 +1096,19 @@ SharpoonEvosMoves:
|
|||
db 55, HORN_DRILL
|
||||
db 0
|
||||
|
||||
;BittybatEvosMoves:
|
||||
BittybatEvosMoves:
|
||||
; Evolutions
|
||||
; db EV_LEVEL, 15, ZUBAT
|
||||
; db 0
|
||||
db EV_LEVEL, 14, ZUBAT
|
||||
db 0
|
||||
; Learnset
|
||||
; db 7, WING_ATTACK
|
||||
; db 14, GUST
|
||||
; db 18, CONFUSE_RAY
|
||||
; db 22, BITE
|
||||
; db 26, TACKLE
|
||||
; db 30, DISABLE
|
||||
; db 34, HAZE
|
||||
; db 0
|
||||
db 7, WING_ATTACK
|
||||
db 14, GUST
|
||||
db 18, CONFUSE_RAY
|
||||
db 22, BITE
|
||||
db 26, TACKLE
|
||||
db 30, DISABLE
|
||||
db 34, HAZE
|
||||
db 0
|
||||
|
||||
DoduoEvosMoves:
|
||||
; Evolutions
|
||||
|
|
@ -1550,7 +1552,7 @@ MachopEvosMoves:
|
|||
|
||||
ZubatEvosMoves:
|
||||
; Evolutions
|
||||
db EV_LEVEL, 24, GOLBAT
|
||||
db EV_LEVEL, 23, GOLBAT
|
||||
db 0
|
||||
; Learnset
|
||||
db 10, SUPERSONIC
|
||||
|
|
@ -1914,18 +1916,18 @@ CloysterEvosMoves:
|
|||
db 50, SPIKE_CANNON
|
||||
db 0
|
||||
|
||||
;MagnetiteEvosMoves:
|
||||
MagnetiteEvosMoves:
|
||||
; Evolutions
|
||||
; db EV_LEVEL, 30, MAGNETON
|
||||
; db 0
|
||||
db EV_LEVEL, 30, MAGNETON
|
||||
db 0
|
||||
; Learnset
|
||||
; db 21, SONICBOOM
|
||||
; db 25, THUNDERSHOCK
|
||||
; db 29, SUPERSONIC
|
||||
; db 35, THUNDER_WAVE
|
||||
; db 41, SWIFT
|
||||
; db 47, SCREECH
|
||||
; db 0
|
||||
db 21, SONICBOOM
|
||||
db 25, THUNDERSHOCK
|
||||
db 29, SUPERSONIC
|
||||
db 35, THUNDER_WAVE
|
||||
db 41, SWIFT
|
||||
db 47, SCREECH
|
||||
db 0
|
||||
|
||||
ElectrodeEvosMoves:
|
||||
; Evolutions
|
||||
|
|
@ -2306,7 +2308,7 @@ BlastykeEvosMoves:
|
|||
|
||||
MagnemiteEvosMoves:
|
||||
; Evolutions
|
||||
db EV_LEVEL, 30, MAGNETON
|
||||
db EV_LEVEL, 20, MAGNETITE
|
||||
db 0
|
||||
; Learnset
|
||||
db 21, SONICBOOM
|
||||
|
|
@ -2532,34 +2534,6 @@ VictreebelEvosMoves:
|
|||
db 18, SLEEP_POWDER
|
||||
db 0
|
||||
|
||||
;MonjaEvosMoves:
|
||||
; Evolutions
|
||||
; db EV_LEVEL, 22, TANGELA
|
||||
; db 0
|
||||
; Learnset
|
||||
; db 5, BIND
|
||||
; db 9, ABSORB
|
||||
; db 13, VINE_WHIP
|
||||
; db 19, POISONPOWDER
|
||||
; db 22, STUN_SPORE
|
||||
; db 25, SLEEP_POWDER
|
||||
; db 29, SLAM
|
||||
; db 35, GROWTH
|
||||
; db 40, NIGHT_SHADE
|
||||
; db 0
|
||||
|
||||
;PudiEvosMoves:
|
||||
; Evolutions
|
||||
; db EV_LEVEL, 16, GROWLITHE
|
||||
; db 0
|
||||
; Learnset
|
||||
; db 9, EMBER
|
||||
; db 12, LEER
|
||||
; db 15, TAKE_DOWN
|
||||
; db 21, AGILITY
|
||||
; db 30, FLAMETHROWER
|
||||
; db 0
|
||||
|
||||
ScizorEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
|
|
@ -2868,33 +2842,6 @@ CarapthorEvosMoves:
|
|||
db 35, SUBSTITUTE
|
||||
db 0
|
||||
|
||||
;HinaazuEvosMoves:
|
||||
; Evolutions
|
||||
; db EV_LEVEL, 18, DODUO
|
||||
; db 0
|
||||
; Learnset
|
||||
; db 5, QUICK_ATTACK
|
||||
; db 11, FURY_ATTACK
|
||||
; db 20, DRILL_PECK
|
||||
; db 23, RAGE
|
||||
; db 27, TRI_ATTACK
|
||||
; db 32, AGILITY
|
||||
; db 0
|
||||
|
||||
;BetobebiiEvosMoves:
|
||||
; Evolutions
|
||||
; db EV_LEVEL, 20, GRIMER
|
||||
; db 0
|
||||
; Learnset
|
||||
; db 13, POISON_GAS
|
||||
; db 16, ACID
|
||||
; db 19, MINIMIZE
|
||||
; db 22, SLUDGE
|
||||
; db 28, HARDEN
|
||||
; db 33, SCREECH
|
||||
; db 37, ACID_ARMOR
|
||||
; db 0
|
||||
|
||||
MagnezoneEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ MonPartyData:
|
|||
nybble ICON_MON ; Nidorino
|
||||
nybble ICON_MON ; Nidoking
|
||||
nybble ICON_MON ; Nidoreign
|
||||
nybble ICON_MON ; Bittybat
|
||||
nybble ICON_MON ; Zubat
|
||||
nybble ICON_MON ; Golbat
|
||||
nybble ICON_MON ; Crobat
|
||||
|
|
@ -104,16 +105,22 @@ MonPartyData:
|
|||
nybble ICON_MON ; Abra
|
||||
nybble ICON_MON ; Kadabra
|
||||
nybble ICON_MON ; Alakazam
|
||||
nybble ICON_WATER ; Cheep
|
||||
nybble ICON_WATER ; Jabetta
|
||||
nybble ICON_MON ; Lickitung
|
||||
nybble ICON_MON ; Lickilicky
|
||||
nybble ICON_QUADRUPED ; Growlithe
|
||||
nybble ICON_QUADRUPED ; Arcanine
|
||||
nybble ICON_QUADRUPED ; Arcanine-H
|
||||
nybble ICON_MON ; Lickitung
|
||||
nybble ICON_MON ; Lickilicky
|
||||
nybble ICON_SMALL_BIRD ; Farfetch'd
|
||||
nybble ICON_SMALL_BIRD ; Luxwan
|
||||
nybble ICON_SMALL_BIRD ; Luxwan
|
||||
nybble ICON_SMALL_BIRD ; Sirfetch'd
|
||||
nybble ICON_MON ; Drowzee
|
||||
nybble ICON_MON ; Hypno
|
||||
nybble ICON_BALL ; Magnemite
|
||||
nybble ICON_BALL ; Magnetite
|
||||
nybble ICON_BALL ; Magneton
|
||||
nybble ICON_BALL ; Magnezone
|
||||
nybble ICON_MON ; Diglett
|
||||
nybble ICON_MON ; Dugtrio
|
||||
nybble ICON_MON ; Dugtrio-A
|
||||
|
|
@ -130,11 +137,6 @@ MonPartyData:
|
|||
nybble ICON_GRASS ; Toedscruel
|
||||
nybble ICON_WATER ; Blottle
|
||||
nybble ICON_WATER ; Pendraken
|
||||
nybble ICON_BALL ; Magnemite
|
||||
nybble ICON_BALL ; Magneton
|
||||
nybble ICON_BALL ; Magnezone
|
||||
nybble ICON_WATER ; Cheep
|
||||
nybble ICON_WATER ; Jabetta
|
||||
nybble ICON_MON ; Ribbito
|
||||
nybble ICON_MON ; Croakozuna
|
||||
nybble ICON_MON ; Machop
|
||||
|
|
@ -152,7 +154,6 @@ MonPartyData:
|
|||
nybble ICON_QUADRUPED ; Ponyta
|
||||
nybble ICON_QUADRUPED ; Rapidash
|
||||
nybble ICON_QUADRUPED ; Rapidash-G
|
||||
nybble ICON_BALL ; Balumba
|
||||
nybble ICON_MON ; Gastly
|
||||
nybble ICON_MON ; Haunter
|
||||
nybble ICON_MON ; Gengar
|
||||
|
|
@ -160,8 +161,9 @@ MonPartyData:
|
|||
nybble ICON_MON ; Marowak
|
||||
nybble ICON_MON ; Marowak-A
|
||||
nybble ICON_MON ; Guardia
|
||||
nybble ICON_BALL ; Balumba
|
||||
nybble ICON_SMALL_BIRD ; Doduo
|
||||
nybble ICON_BIRD ; Dodrio
|
||||
nybble ICON_SMALL_BIRD ; Dodrio
|
||||
nybble ICON_MON ; Grimer
|
||||
nybble ICON_MON ; Muk
|
||||
nybble ICON_MON ; Muk-A
|
||||
|
|
@ -174,16 +176,16 @@ MonPartyData:
|
|||
nybble ICON_MON ; Hitmonlee
|
||||
nybble ICON_MON ; Hitmonchan
|
||||
nybble ICON_MON ; Hitmontop
|
||||
nybble ICON_WATER ; Horsea
|
||||
nybble ICON_WATER ; Seadra
|
||||
nybble ICON_WATER ; Kingdra
|
||||
nybble ICON_WATER ; Seel
|
||||
nybble ICON_WATER ; Dewgong
|
||||
nybble ICON_HELIX ; Shellder
|
||||
nybble ICON_HELIX ; Cloyster
|
||||
nybble ICON_HELIX ; Disturban
|
||||
nybble ICON_HELIX ; Staryu
|
||||
nybble ICON_HELIX ; Starmie
|
||||
nybble ICON_WATER ; Seel
|
||||
nybble ICON_WATER ; Dewgong
|
||||
nybble ICON_WATER ; Horsea
|
||||
nybble ICON_WATER ; Seadra
|
||||
nybble ICON_WATER ; Kingdra
|
||||
nybble ICON_WATER ; Blastyke
|
||||
nybble ICON_WATER ; Blastoise
|
||||
nybble ICON_WATER ; Sharpoon
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ MonsterNames::
|
|||
db "DRAGONITE@"
|
||||
db "CACTORMUS@" ; Cactus
|
||||
db "SHARPOON@@" ; Jagg
|
||||
db "WIGLETT@@@"
|
||||
db "BITTYBAT@@"
|
||||
db "DODUO@@@@@"
|
||||
db "POLIWAG@@@"
|
||||
db "JYNX@@@@@@"
|
||||
|
|
@ -139,7 +139,7 @@ MonsterNames::
|
|||
db "DECILLA@@@"
|
||||
db "KINGLER@@@"
|
||||
db "CLOYSTER@@"
|
||||
db "WUGTRIO@@@"
|
||||
db "MAGNETITE@"
|
||||
db "ELECTRODE@"
|
||||
db "CLEFABLE@@"
|
||||
db "WEEZING@@@"
|
||||
|
|
@ -190,6 +190,8 @@ MonsterNames::
|
|||
db "BELLSPROUT"
|
||||
db "WEEPINBELL"
|
||||
db "VICTREEBEL"
|
||||
db "WIGLETT@@@"
|
||||
db "WUGTRIO@@@"
|
||||
db "SCIZOR@@@@"
|
||||
db "RHYPERIOR@"
|
||||
db "ESPEON@@@@"
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ _CoinpurDexEntry::
|
|||
next "hoard small coins"
|
||||
dex
|
||||
|
||||
_BittybatDexEntry:: ; unused
|
||||
_BittybatDexEntry::
|
||||
text "Flits about in"
|
||||
next "dark caves. A"
|
||||
next "swarm of BITTYBAT"
|
||||
|
|
@ -328,7 +328,7 @@ _PendrakenDexEntry::
|
|||
next "before attacking"
|
||||
dex
|
||||
|
||||
_MagnetiteDexEntry:: ; unused
|
||||
_MagnetiteDexEntry::
|
||||
text "Occasionally, it"
|
||||
next "attracts so much"
|
||||
next "metal to itself"
|
||||
|
|
@ -378,16 +378,6 @@ _MimmeoDexEntry::
|
|||
next "in an instant"
|
||||
dex
|
||||
|
||||
_MonjaDexEntry:: ; unused
|
||||
text "As it runs about,"
|
||||
next "the vines on its"
|
||||
next "head may obscure"
|
||||
|
||||
page "its singular eye,"
|
||||
next "causing it to"
|
||||
next "trip and fall"
|
||||
dex
|
||||
|
||||
_DisturbanDexEntry::
|
||||
text "It evolved after"
|
||||
next "biting a SLOWPOKE."
|
||||
|
|
@ -998,7 +988,7 @@ _TaurosPADexEntry::
|
|||
next "tips of its horns"
|
||||
dex
|
||||
|
||||
_MissingNoDexEntry::
|
||||
_MissingNoDexEntry:: ; unused
|
||||
text "This is a newly"
|
||||
next "discovered"
|
||||
next "#MON. It is"
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ MonsterPalettes:
|
|||
db PAL_PURPLEMON ; NIDORINO
|
||||
db PAL_PURPLEMON ; NIDOKING
|
||||
db PAL_GREYMON ; NIDOREIGN
|
||||
db PAL_BLUEMON ; BITTYBAT
|
||||
db PAL_BLUEMON ; ZUBAT
|
||||
db PAL_BLUEMON ; GOLBAT
|
||||
db PAL_PURPLEMON ; CROBAT
|
||||
|
|
@ -105,16 +106,22 @@ MonsterPalettes:
|
|||
db PAL_YELLOWMON ; ABRA
|
||||
db PAL_YELLOWMON ; KADABRA
|
||||
db PAL_YELLOWMON ; ALAKAZAM
|
||||
db PAL_PURPLEMON ; CHEEP
|
||||
db PAL_PURPLEMON ; JABETTA
|
||||
db PAL_PINKMON ; LICKITUNG
|
||||
db PAL_PINKMON ; LICKILICKY
|
||||
db PAL_REDMON ; GROWLITHE
|
||||
db PAL_REDMON ; ARCANINE
|
||||
db PAL_REDMON ; ARCANINE_H
|
||||
db PAL_PINKMON ; LICKITUNG
|
||||
db PAL_PINKMON ; LICKILICKY
|
||||
db PAL_BROWNMON ; FARFETCHD
|
||||
db PAL_BROWNMON ; LUXWAN
|
||||
db PAL_BROWNMON ; SIRFETCHD
|
||||
db PAL_YELLOWMON ; DROWZEE
|
||||
db PAL_YELLOWMON ; HYPNO
|
||||
db PAL_GREYMON ; MAGNEMITE
|
||||
db PAL_GREYMON ; MAGNETITE
|
||||
db PAL_GREYMON ; MAGNETON
|
||||
db PAL_GREYMON ; MAGNEZONE
|
||||
db PAL_BROWNMON ; DIGLETT
|
||||
db PAL_BROWNMON ; DUGTRIO
|
||||
db PAL_BROWNMON ; DUGTRIO_A
|
||||
|
|
@ -131,11 +138,6 @@ MonsterPalettes:
|
|||
db PAL_YELLOWMON ; TOEDSCRUEL
|
||||
db PAL_MEWMON ; BLOTTLE
|
||||
db PAL_MEWMON ; PENDRAKEN
|
||||
db PAL_GREYMON ; MAGNEMITE
|
||||
db PAL_GREYMON ; MAGNETON
|
||||
db PAL_GREYMON ; MAGNEZONE
|
||||
db PAL_PURPLEMON ; CHEEP
|
||||
db PAL_PURPLEMON ; JABETTA
|
||||
db PAL_GREENMON ; RIBBITO
|
||||
db PAL_GREENMON ; CROAKOZUNA
|
||||
db PAL_GREYMON ; MACHOP
|
||||
|
|
@ -153,7 +155,6 @@ MonsterPalettes:
|
|||
db PAL_REDMON ; PONYTA
|
||||
db PAL_REDMON ; RAPIDASH
|
||||
db PAL_PURPLEMON ; RAPIDASH_G
|
||||
db PAL_PINKMON ; BALUMBA
|
||||
db PAL_PURPLEMON ; GASTLY
|
||||
db PAL_PURPLEMON ; HAUNTER
|
||||
db PAL_PURPLEMON ; GENGAR
|
||||
|
|
@ -161,6 +162,7 @@ MonsterPalettes:
|
|||
db PAL_BROWNMON ; MAROWAK
|
||||
db PAL_PURPLEMON ; MAROWAK_A
|
||||
db PAL_BROWNMON ; GUARDIA
|
||||
db PAL_PINKMON ; BALUMBA
|
||||
db PAL_BROWNMON ; DODUO
|
||||
db PAL_BROWNMON ; DODRIO
|
||||
db PAL_PURPLEMON ; GRIMER
|
||||
|
|
@ -175,16 +177,16 @@ MonsterPalettes:
|
|||
db PAL_BROWNMON ; HITMONLEE
|
||||
db PAL_BROWNMON ; HITMONCHAN
|
||||
db PAL_BROWNMON ; HITMONTOP
|
||||
db PAL_CYANMON ; HORSEA
|
||||
db PAL_CYANMON ; SEADRA
|
||||
db PAL_CYANMON ; KINGDRA
|
||||
db PAL_BLUEMON ; SEEL
|
||||
db PAL_BLUEMON ; DEWGONG
|
||||
db PAL_PURPLEMON ; SHELLDER
|
||||
db PAL_PURPLEMON ; CLOYSTER
|
||||
db PAL_GREYMON ; DISTURBAN
|
||||
db PAL_REDMON ; STARYU
|
||||
db PAL_PURPLEMON ; STARMIE
|
||||
db PAL_BLUEMON ; SEEL
|
||||
db PAL_BLUEMON ; DEWGONG
|
||||
db PAL_CYANMON ; HORSEA
|
||||
db PAL_CYANMON ; SEADRA
|
||||
db PAL_CYANMON ; KINGDRA
|
||||
db PAL_CYANMON ; BLASTYKE
|
||||
db PAL_CYANMON ; BLASTOISE
|
||||
db PAL_BLUEMON ; SHARPOON
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ TradebackMovesPointerTable:
|
|||
dw DragoniteTradebackMoves
|
||||
dw CactormusTradebackMoves
|
||||
dw SharpoonTradebackMoves
|
||||
dw WiglettTradebackMoves
|
||||
dw BittybatTradebackMoves
|
||||
dw DoduoTradebackMoves
|
||||
dw PoliwagTradebackMoves
|
||||
dw JynxTradebackMoves
|
||||
|
|
@ -144,7 +144,7 @@ TradebackMovesPointerTable:
|
|||
dw DecillaTradebackMoves
|
||||
dw KinglerTradebackMoves
|
||||
dw CloysterTradebackMoves
|
||||
dw WugtrioTradebackMoves
|
||||
dw MagnetiteTradebackMoves
|
||||
dw ElectrodeTradebackMoves
|
||||
dw ClefableTradebackMoves
|
||||
dw WeezingTradebackMoves
|
||||
|
|
@ -195,6 +195,8 @@ TradebackMovesPointerTable:
|
|||
dw BellsproutTradebackMoves
|
||||
dw WeepinbellTradebackMoves
|
||||
dw VictreebelTradebackMoves
|
||||
dw WiglettTradebackMoves
|
||||
dw WugtrioTradebackMoves
|
||||
dw ScizorTradebackMoves
|
||||
dw RhyperiorTradebackMoves
|
||||
dw EspeonTradebackMoves
|
||||
|
|
@ -831,9 +833,9 @@ SharpoonTradebackMoves:
|
|||
db 1, AGILITY ; Egg Move
|
||||
db 0
|
||||
|
||||
;BittybatTradebackMoves:
|
||||
; db 1, QUICK_ATTACK
|
||||
; db 0
|
||||
BittybatTradebackMoves:
|
||||
db 1, QUICK_ATTACK
|
||||
db 0
|
||||
|
||||
DoduoTradebackMoves:
|
||||
db 1, SWIFT
|
||||
|
|
@ -1395,9 +1397,9 @@ CloysterTradebackMoves:
|
|||
db 1, SCREECH
|
||||
db 0
|
||||
|
||||
;MagnetiteTradebackMoves:
|
||||
; db 1, AGILITY
|
||||
; db 0
|
||||
MagnetiteTradebackMoves:
|
||||
db 1, AGILITY
|
||||
db 0
|
||||
|
||||
ElectrodeTradebackMoves:
|
||||
db 1, HEADBUTT
|
||||
|
|
@ -1799,14 +1801,6 @@ VictreebelTradebackMoves:
|
|||
db 1, LEECH_LIFE
|
||||
db 0
|
||||
|
||||
;MonjaTradebackMoves:
|
||||
; db 1, FLASH
|
||||
; db 1, HEADBUTT
|
||||
; db 1, AMNESIA
|
||||
; db 1, CONFUSION
|
||||
; db 1, REFLECT
|
||||
; db 0
|
||||
|
||||
ScizorTradebackMoves:
|
||||
db 1, HEADBUTT
|
||||
db 1, COUNTER
|
||||
|
|
@ -2225,7 +2219,7 @@ TaurosPBTradebackMoves:
|
|||
db 1, FLAMETHROWER
|
||||
db 1, QUICK_ATTACK
|
||||
db 0
|
||||
|
||||
|
||||
FossilKabutopsTradebackMoves:
|
||||
db 0
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue