The Big One.

Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you.

- Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them

- Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy.

- Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later.

- Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8.

- Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively

- Restructured the Pokedex a little. Don't worry, Lickitung's still number 108!

- All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones

- Removed Blastyke as a Game Corner prize, replacing it with Squeamata.

- Garnet Cavern is now properly listed as a dungeon map

- Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden

- Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent

- Finished Gauntlet 6F except for the trainer text (PvK please help)

- Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage.

- Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit

- Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke.

- New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone!

- Fixed a bug preventing the trade for Haunter from being accessed.
This commit is contained in:
Martha Schilling 2023-09-19 23:34:25 +01:00
parent 57186bb2a0
commit 508a4e790e
246 changed files with 2446 additions and 2384 deletions

View file

@ -29,7 +29,7 @@ MonsterPalettes:
db PAL_BROWNMON ; PIDGEY
db PAL_BROWNMON ; PIDGEOTTO
db PAL_BROWNMON ; PIDGEOT
db PAL_YELLOWMON ; KONYA
db PAL_YELLOWMON ; COINPUR
db PAL_YELLOWMON ; MEOWTH
db PAL_YELLOWMON ; PERSIAN
db PAL_CYANMON ; PERSIAN_A
@ -41,15 +41,13 @@ MonsterPalettes:
db PAL_YELLOWMON ; KAKUNA
db PAL_YELLOWMON ; BEEDRILL
db PAL_YELLOWMON ; KOKANA
db PAL_YELLOWMON ; KASANAGI
db PAL_YELLOWMON ; PUPAL
db PAL_YELLOWMON ; CARAPTHOR
db PAL_YELLOWMON ; KOTORA
db PAL_YELLOWMON ; GAOTORA
db PAL_YELLOWMON ; GOROTORA
db PAL_BROWNMON ; SPEAROW
db PAL_BROWNMON ; FEAROW
db PAL_PURPLEMON ; EKANS
db PAL_PURPLEMON ; ARBOK
db PAL_BROWNMON ; SANDSHREW
db PAL_BROWNMON ; SANDSLASH
db PAL_CYANMON ; SANDSLASH_A
db PAL_BLUEMON ; NIDORAN_F
db PAL_BLUEMON ; NIDORINA
db PAL_BLUEMON ; NIDOQUEEN
@ -57,7 +55,6 @@ 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
@ -71,13 +68,15 @@ MonsterPalettes:
db PAL_PINKMON ; CLEFABLE
db PAL_PINKMON ; JIGGLYPUFF
db PAL_PINKMON ; WIGGLYTUFF
db PAL_REDMON ; MIKON
db PAL_BROWNMON ; SANDSHREW
db PAL_BROWNMON ; SANDSLASH
db PAL_CYANMON ; SANDSLASH_A
db PAL_PURPLEMON ; EKANS
db PAL_PURPLEMON ; ARBOK
db PAL_REDMON ; VULPIII
db PAL_REDMON ; VULPIX
db PAL_YELLOWMON ; NINETALES
db PAL_CYANMON ; NINETALES_A
db PAL_REDMON ; GROWLITHE
db PAL_REDMON ; ARCANINE
db PAL_REDMON ; ARCANINE_A
db PAL_BROWNMON ; MANKEY
db PAL_BROWNMON ; PRIMEAPE
db PAL_GREYMON ; ANNIHILAPE
@ -88,16 +87,14 @@ MonsterPalettes:
db PAL_GREENMON ; BELLSPROUT
db PAL_GREENMON ; WEEPINBELL
db PAL_GREENMON ; VICTREEBEL
db PAL_GREENMON ; TSUBOMITTO
db PAL_GREENMON ; BELLIGNAN
db PAL_REDMON ; MAGIKARP
db PAL_BLUEMON ; GYARADOS
db PAL_REDMON ; GYOPIN
db PAL_REDMON ; ORFRY
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
db PAL_GREENMON ; WEIRDUCK
db PAL_CYANMON ; GOLDUCK
@ -108,8 +105,14 @@ MonsterPalettes:
db PAL_YELLOWMON ; ABRA
db PAL_YELLOWMON ; KADABRA
db PAL_YELLOWMON ; ALAKAZAM
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_BROWNMON ; DIGLETT
@ -119,9 +122,6 @@ MonsterPalettes:
db PAL_PINKMON ; WUGTRIO
db PAL_GREYMON ; ONIX
db PAL_GREYMON ; STEELIX
db PAL_YELLOWMON ; KOTORA
db PAL_YELLOWMON ; GAOTORA
db PAL_YELLOWMON ; GOROTORA
db PAL_REDMON ; VOLTORB
db PAL_REDMON ; ELECTRODE
db PAL_REDMON ; ELECTRODE_H
@ -131,16 +131,16 @@ MonsterPalettes:
db PAL_YELLOWMON ; TOEDSCRUEL
db PAL_MEWMON ; BLOTTLE
db PAL_MEWMON ; PENDRAKEN
db PAL_GREENMON ; RIBBITO
db PAL_GREENMON ; CROAKOZUNA
db PAL_GREYMON ; MAGNEMITE
db PAL_GREYMON ; MAGNETITE
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
db PAL_GREYMON ; MACHOKE
db PAL_GREYMON ; MACHAMP
db PAL_GREENMON ; CROCKY
db PAL_REDMON ; KRABBY
db PAL_REDMON ; KINGLER
db PAL_PINKMON ; SLOWPOKE
@ -148,15 +148,12 @@ MonsterPalettes:
db PAL_PURPLEMON ; SLOWBRO_G
db PAL_PINKMON ; SLOWKING
db PAL_PURPLEMON ; SLOWKING_G
db PAL_REDMON ; PUCHIKOON
db PAL_GREENMON ; GAVILLAIN
db PAL_REDMON ; KOLTA
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_PINKMON ; BARUNDA
db PAL_PINKMON ; BALUMBA
db PAL_PURPLEMON ; GASTLY
db PAL_PURPLEMON ; HAUNTER
db PAL_PURPLEMON ; GENGAR
@ -164,9 +161,6 @@ 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 ; DODUO
db PAL_BROWNMON ; DODRIO
db PAL_PURPLEMON ; GRIMER
@ -175,27 +169,25 @@ MonsterPalettes:
db PAL_PURPLEMON ; KOFFING
db PAL_PURPLEMON ; WEEZING
db PAL_GREYMON ; WEEZING_G
db PAL_PURPLEMON ; DITTO
db PAL_PURPLEMON ; ANIMON
db PAL_PINKMON ; MR_MIME
db PAL_CYANMON ; MR_RIME
db PAL_GREENMON ; CACTUS
db PAL_BLUEMON ; TANGELA
db PAL_CYANMON ; TANGROWTH
db PAL_BROWNMON ; RAMOOSE
db PAL_BROWNMON ; HITMONLEE
db PAL_BROWNMON ; HITMONCHAN
db PAL_BROWNMON ; HITMONTOP
db PAL_PURPLEMON ; SHELLDER
db PAL_PURPLEMON ; CLOYSTER
db PAL_GREYMON ; TAABAN
db PAL_GREYMON ; DISTURBAN
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
db PAL_BLUEMON ; JAGG
db PAL_CYANMON ; BLASTYKE
db PAL_CYANMON ; BLASTOISE
db PAL_BLUEMON ; SHARPOON
db PAL_PINKMON ; EXEGGCUTE
db PAL_GREENMON ; EXEGGUTOR
db PAL_GREENMON ; EXEGGUTOR_A
@ -206,18 +198,18 @@ MonsterPalettes:
db PAL_REDMON ; SCIZOR
db PAL_BROWNMON ; KLEAVOR
db PAL_BROWNMON ; PINSIR
db PAL_BROWNMON ; PURAKKUSU
db PAL_BROWNMON ; TRICULES
db PAL_BROWNMON ; KANGASKHAN
db PAL_GREYMON ; TRAMPEL
db PAL_BROWNMON ; TAUROS
db PAL_GREYMON ; TAUROS_P
db PAL_CYANMON ; TAUROS_PA
db PAL_REDMON ; TAUROS_PB
db PAL_CYANMON ; TAUROS_PA
db PAL_PINKMON ; CHANSEY
db PAL_PINKMON ; BLISSEY
db PAL_GREENMON ; SKIMPER
db PAL_GREENMON ; BAWLIGUA
db PAL_GREENMON ; CRYITHAN
db PAL_GREENMON ; CACTORMUS
db PAL_PINKMON ; MR_MIME
db PAL_CYANMON ; MR_RIME
db PAL_REDBAR ; JYNX
db PAL_BLUEMON ; BUU
db PAL_YELLOWMON ; ELECTABUZZ
@ -225,6 +217,8 @@ MonsterPalettes:
db PAL_REDMON ; MAGMAR
db PAL_REDMON ; MAGMORTAR
db PAL_CYANMON ; LAPRAS
db PAL_PURPLEMON ; DITTO
db PAL_PURPLEMON ; MIMMEO
db PAL_MEWMON ; PORYGON
db PAL_MEWMON ; PORYGON2
db PAL_MEWMON ; PORYGONZ
@ -234,11 +228,14 @@ MonsterPalettes:
db PAL_BROWNMON ; KABUTOPS
db PAL_GREYMON ; AERODACTYL
db PAL_GREENMON ; DECILLA
db PAL_GREENMON ; GYAOON
db PAL_GREYMON ; OMEGA
db PAL_GREENMON ; GAWARHED
db PAL_GREYMON ; OMEGADGE
db PAL_MEWMON ; SNORLAX
db PAL_PINKMON ; SCREAM_TAIL
db PAL_GREYMON ; SANDY_SHOCKS
db PAL_GREENMON ; SQUEAMATA
db PAL_GREENMON ; MINISTARE
db PAL_GREENMON ; IGUANARCH
db PAL_BLUEMON ; DRATINI
db PAL_BLUEMON ; DRAGONAIR
db PAL_BROWNMON ; DRAGONITE