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

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

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