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

Pokemon data, Gym Leader teams, palette updates and a couple of other fixes

Browse source
This commit is contained in:
MementoMartha 2022-08-31 11:47:05 +01:00
parent ac45c8b5bc
commit f5a7cc9ffc
14 changed files with 221 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

81
data/pokemon/cries.asm
View file

@ -36,8 +36,8 @@ 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_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_0F, $00, $80 ; Gyaoon
mon_cry SFX_CRY_0A, $2C, $80 ; Nidoreign
mon_cry SFX_CRY_1F, $20, $40 ; Growlithe
mon_cry SFX_CRY_17, $FF, $C0 ; Onix
mon_cry SFX_CRY_18, $40, $A0 ; Fearow
@ -55,26 +55,26 @@ 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_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_0E, $00, $80 ; Barunda
mon_cry SFX_CRY_04, $FF, $30 ; Magmar
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
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_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_15, $40, $A5 ; Deer
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_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_03, $90, $B0 ; Trampel
mon_cry SFX_CRY_1C, $C6, $F0 ; Crocky
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 ; MissingNo.
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_1D, $E0, $80 ; MissingNo.
mon_cry SFX_CRY_00, $80, $10 ; Cactus
mon_cry SFX_CRY_17, $C8, $C0 ; Jagg
mon_cry SFX_CRY_1D, $B4, $4E ; Bittybat
mon_cry SFX_CRY_0B, $BB, $01 ; Doduo
mon_cry SFX_CRY_0E, $FF, $FF ; Poliwag
mon_cry SFX_CRY_0D, $FF, $FF ; Jynx
@ -84,23 +84,23 @@ CryData::
mon_cry SFX_CRY_0E, $FF, $FF ; Ditto
mon_cry SFX_CRY_19, $77, $10 ; Meowth
mon_cry SFX_CRY_20, $20, $E0 ; Krabby
mon_cry SFX_CRY_22, $FF, $40 ; MissingNo.
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_0E, $E0, $60 ; MissingNo.
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_24, $4F, $10 ; Vulpix
mon_cry SFX_CRY_24, $88, $60 ; Ninetales
mon_cry SFX_CRY_0F, $EE, $01 ; Pikachu
mon_cry SFX_CRY_09, $EE, $08 ; Raichu
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_12, $93, $60 ; Ribbito
mon_cry SFX_CRY_12, $25, $FF ; Croakozuna
mon_cry SFX_CRY_0F, $60, $40 ; Dratini
mon_cry SFX_CRY_0F, $40, $80 ; Dragonair
mon_cry SFX_CRY_16, $BB, $40 ; Kabuto
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 ; MissingNo.
mon_cry SFX_CRY_0F, $20, $C0 ; MissingNo.
mon_cry SFX_CRY_0F, $40, $C0 ; Bawligua
mon_cry SFX_CRY_0F, $20, $C0 ; Cryithan
mon_cry SFX_CRY_00, $20, $40 ; Sandshrew
mon_cry SFX_CRY_00, $FF, $FF ; Sandslash
mon_cry SFX_CRY_1F, $F0, $01 ; Omanyte
@ -120,38 +120,38 @@ CryData::
mon_cry SFX_CRY_15, $EE, $01 ; Weedle
mon_cry SFX_CRY_13, $FF, $01 ; Kakuna
mon_cry SFX_CRY_13, $60, $80 ; Beedrill
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_18, $19, $FF ; Luxwan
mon_cry SFX_CRY_0B, $99, $20 ; Dodrio
mon_cry SFX_CRY_0A, $AF, $40 ; Primeape
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_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_09, $FF, $20 ; Purakkusu
mon_cry SFX_CRY_13, $3C, $00 ; Pendraken
mon_cry SFX_CRY_16, $80, $20 ; Caterpie
mon_cry SFX_CRY_1C, $CC, $01 ; Metapod
mon_cry SFX_CRY_16, $77, $40 ; Butterfree
mon_cry SFX_CRY_1F, $08, $C0 ; Machamp
mon_cry SFX_CRY_11, $20, $10 ; MissingNo.
mon_cry SFX_CRY_21, $93, $50 ; Weirduck
mon_cry SFX_CRY_21, $FF, $40 ; Golduck
mon_cry SFX_CRY_0D, $EE, $40 ; Hypno
mon_cry SFX_CRY_1D, $FA, $80 ; Golbat
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_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_19, $C1, $1C ; Konya
mon_cry SFX_CRY_13, $00, $00 ; Omega
mon_cry SFX_CRY_07, $EF, $FF ; Muk
mon_cry SFX_CRY_0F, $40, $80 ; MissingNo.
mon_cry SFX_CRY_0F, $40, $80 ; Decilla
mon_cry SFX_CRY_20, $EE, $E0 ; Kingler
mon_cry SFX_CRY_18, $6F, $E0 ; Cloyster
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_1C, $B1, $90 ; Magnetite
mon_cry SFX_CRY_06, $A8, $90 ; Electrode
mon_cry SFX_CRY_19, $AA, $20 ; Clefable
mon_cry SFX_CRY_12, $FF, $FF ; Weezing
mon_cry SFX_CRY_19, $99, $FF ; Persian
mon_cry SFX_CRY_08, $4F, $60 ; Marowak
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_08, $00, $FF ; Guardia
mon_cry SFX_CRY_1C, $30, $40 ; Haunter
mon_cry SFX_CRY_1C, $C0, $01 ; Abra
mon_cry SFX_CRY_1C, $98, $FF ; Alakazam
@ -161,13 +161,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_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_16, $89, $0E ; Gyopin
mon_cry SFX_CRY_16, $80, $40 ; Goldeen
mon_cry SFX_CRY_16, $10, $FF ; Seaking
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
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, $00, $80 ; Ponyta
mon_cry SFX_CRY_25, $20, $C0 ; Rapidash
mon_cry SFX_CRY_22, $00, $80 ; Rattata
@ -177,16 +177,16 @@ CryData::
mon_cry SFX_CRY_24, $F0, $10 ; Geodude
mon_cry SFX_CRY_25, $AA, $FF ; Porygon
mon_cry SFX_CRY_23, $20, $F0 ; Aerodactyl
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_13, $F7, $00 ; Blastyke
mon_cry SFX_CRY_1C, $80, $60 ; Magnemite
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_0F, $63, $40 ; Skimper
mon_cry SFX_CRY_17, $C1, $E4 ; Gorochu
mon_cry SFX_CRY_04, $60, $40 ; Charmander
mon_cry SFX_CRY_1D, $60, $40 ; Squirtle
mon_cry SFX_CRY_04, $20, $40 ; Charmeleon
mon_cry SFX_CRY_1D, $20, $40 ; Wartortle
mon_cry SFX_CRY_04, $00, $80 ; Charizard
mon_cry SFX_CRY_1D, $00, $80 ; MissingNo.
mon_cry SFX_CRY_1D, $00, $80 ; Totartle
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
@ -196,4 +196,13 @@ 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_21, $DD, $80 ; Tsubomitto
mon_cry SFX_CRY_0E, $50, $FF ; Animon
mon_cry SFX_CRY_12, $93, $00 ; Monja
mon_cry SFX_CRY_1E, $79, $40 ; Para
mon_cry SFX_CRY_00, $00, $00 ; Hinaazu (unfinished)
mon_cry SFX_CRY_1F, $40, $01 ; Pudi
mon_cry SFX_CRY_05, $FF, $40 ; Betobebii
mon_cry SFX_CRY_00, $00, $00 ; Bellossom (unfinished)
mon_cry SFX_CRY_00, $00, $00 ; Scizor (unfinished)
assert_table_length NUM_POKEMON_INDEXES

81
data/pokemon/dex_order.asm
View file

@ -30,8 +30,8 @@ PokedexOrder:
db DEX_BLASTOISE
db DEX_PINSIR
db DEX_TANGELA
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db DEX_GYAOON
db DEX_NIDOREIGN
db DEX_GROWLITHE
db DEX_ONIX
db DEX_FEAROW
@ -49,26 +49,26 @@ PokedexOrder:
db DEX_PSYDUCK
db DEX_DROWZEE
db DEX_GOLEM
db 0 ; MISSINGNO.
db DEX_BARUNDA
db DEX_MAGMAR
db 0 ; MISSINGNO.
db DEX_BUU
db DEX_ELECTABUZZ
db DEX_MAGNETON
db DEX_KOFFING
db 0 ; MISSINGNO.
db DEX_DEER
db DEX_MANKEY
db DEX_SEEL
db DEX_DIGLETT
db DEX_TAUROS
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db DEX_TRAMPEL
db DEX_CROCKY
db DEX_BLOTTLE
db DEX_FARFETCHD
db DEX_VENONAT
db DEX_DRAGONITE
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db DEX_CACTUS
db DEX_JAGG
db DEX_BITTYBAT
db DEX_DODUO
db DEX_POLIWAG
db DEX_JYNX
@ -78,23 +78,23 @@ PokedexOrder:
db DEX_DITTO
db DEX_MEOWTH
db DEX_KRABBY
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db DEX_CHEEP
db DEX_JABETTA
db DEX_MIKON
db DEX_VULPIX
db DEX_NINETALES
db DEX_PIKACHU
db DEX_RAICHU
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db DEX_RIBBITO
db DEX_CROAKOZUNA
db DEX_DRATINI
db DEX_DRAGONAIR
db DEX_KABUTO
db DEX_KABUTOPS
db DEX_HORSEA
db DEX_SEADRA
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db DEX_BAWLIGUA
db DEX_CRYITHAN
db DEX_SANDSHREW
db DEX_SANDSLASH
db DEX_OMANYTE
@ -114,38 +114,38 @@ PokedexOrder:
db DEX_WEEDLE
db DEX_KAKUNA
db DEX_BEEDRILL
db 0 ; MISSINGNO.
db DEX_MADAAMU
db DEX_DODRIO
db DEX_PRIMEAPE
db DEX_DUGTRIO
db DEX_VENOMOTH
db DEX_DEWGONG
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db DEX_PURAKKUSU
db DEX_PENDRAKEN
db DEX_CATERPIE
db DEX_METAPOD
db DEX_BUTTERFREE
db DEX_MACHAMP
db 0 ; MISSINGNO.
db DEX_WEIRDUCK
db DEX_GOLDUCK
db DEX_HYPNO
db DEX_GOLBAT
db DEX_MEWTWO
db DEX_SNORLAX
db DEX_MAGIKARP
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db DEX_KONYA
db DEX_OMEGA
db DEX_MUK
db 0 ; MISSINGNO.
db DEX_DECILLA
db DEX_KINGLER
db DEX_CLOYSTER
db 0 ; MISSINGNO.
db DEX_MAGNETITE
db DEX_ELECTRODE
db DEX_CLEFABLE
db DEX_WEEZING
db DEX_PERSIAN
db DEX_MAROWAK
db 0 ; MISSINGNO.
db DEX_GUARDIA
db DEX_HAUNTER
db DEX_ABRA
db DEX_ALAKAZAM
@ -155,13 +155,13 @@ PokedexOrder:
db DEX_BULBASAUR
db DEX_VENUSAUR
db DEX_TENTACRUEL
db 0 ; MISSINGNO.
db DEX_GYOPIN
db DEX_GOLDEEN
db DEX_SEAKING
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db DEX_KOTORA
db DEX_GAOTORA
db DEX_GOROTORA
db DEX_PUCHIKOON
db DEX_PONYTA
db DEX_RAPIDASH
db DEX_RATTATA
@ -171,16 +171,16 @@ PokedexOrder:
db DEX_GEODUDE
db DEX_PORYGON
db DEX_AERODACTYL
db 0 ; MISSINGNO.
db DEX_BLASTYKE
db DEX_MAGNEMITE
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db DEX_SKIMPER
db DEX_GOROCHU
db DEX_CHARMANDER
db DEX_SQUIRTLE
db DEX_CHARMELEON
db DEX_WARTORTLE
db DEX_CHARIZARD
db 0 ; MISSINGNO.
db DEX_TOTARTLE
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
@ -190,4 +190,13 @@ PokedexOrder:
db DEX_BELLSPROUT
db DEX_WEEPINBELL
db DEX_VICTREEBEL
db DEX_TSUBOMITTO
db DEX_ANIMON
db DEX_MONJA
db DEX_PARA
db DEX_HINAAZU
db DEX_PUDI
db DEX_BETOBEBII
db DEX_BELLOSSOM
db DEX_SCIZOR
assert_table_length NUM_POKEMON_INDEXES

4
data/pokemon/palettes.asm
View file

@ -104,8 +104,8 @@ MonsterPalettes:
db PAL_PINKMON ; BARUNDA
db PAL_BROWNMON ; FARFETCHD
db PAL_BROWNMON ; MADAAMU
db PAL_BLUEMON ; BLASTYKE
db PAL_BLUEMON ; BLASTOISE
db PAL_CYANMON ; BLASTYKE
db PAL_CYANMON ; BLASTOISE
db PAL_BROWNMON ; HINAAZU
db PAL_BROWNMON ; DODUO
db PAL_BROWNMON ; DODRIO

64
data/pokemon/title_mons.asm
View file

@ -1,38 +1,38 @@
TitleMons:
; mons on the title screen are randomly chosen from here
IF DEF(_RED)
db STARTER1
db STARTER2
db STARTER3
db WEEDLE
db NIDORAN_M
db SCYTHER
db PIKACHU
db CLEFAIRY
db RHYDON
db ABRA
db GASTLY
db DITTO
db PIDGEOTTO
db ONIX
db PONYTA
db MAGIKARP
db CHARIZARD
db TOTARTLE
db VENUSAUR
db GOROCHU
db CACTUS
db DEER
db BARUNDA
db RIBBITO
db GYAOON
db PUDI
db MAGNETITE
db MONJA
db ANIMON
db SCIZOR
db BELLOSSOM
db BUU
ENDC
IF DEF(_BLUE)
db STARTER2
db STARTER1
db STARTER3
db MANKEY
db HITMONLEE
db VULPIX
db CHANSEY
db AERODACTYL
db JOLTEON
db SNORLAX
db GLOOM
db POLIWAG
db DODUO
db PORYGON
db GENGAR
db RAICHU
db TOTARTLE
db CHARIZARD
db VENUSAUR
db GOROCHU
db CROCKY
db TRAMPEL
db JAGG
db CHEEP
db OMEGA
db MIKON
db WEIRDUCK
db BLOTTLE
db MADAAMU
db PURAKKUSU
db TSUBOMITTO
db GUARDIA
ENDC