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

@ -16,7 +16,7 @@
const NIDOKING ; $07
const SLOWBRO ; $08
const IVYSAUR ; $09
const EXEGGUTOR ; $0A - Moon Stone (Evo Stone Glitch)
const EXEGGUTOR ; $0A
const LICKITUNG ; $0B
const EXEGGCUTE ; $0C
const GRIMER ; $0D
@ -37,10 +37,10 @@
const BLASTOISE ; $1C
const PINSIR ; $1D
const TANGELA ; $1E
const GYAOON ; $1F (new)
const NIDOREIGN ; $20 (new) Fire Stone (Evo Stone Glitch)
const GROWLITHE ; $21 - Thunderstone (Evo Stone Glitch)
const ONIX ; $22 - Water Stone (Evo Stone Glitch)
const GAWARHED ; $1F (new)
const NIDOREIGN ; $20 (new)
const GROWLITHE ; $21
const ONIX ; $22
const FEAROW ; $23
const PIDGEY ; $24
const SLOWPOKE ; $25
@ -50,58 +50,58 @@
const MACHOKE ; $29
const MR_MIME ; $2A
const HITMONLEE ; $2B
const HITMONCHAN ; $2C - Heart Stone (Evo Stone Glitch)
const HITMONCHAN ; $2C
const ARBOK ; $2D
const PARASECT ; $2E
const PSYDUCK ; $2F - Leaf Stone (Evo Stone Glitch)
const PSYDUCK ; $2F
const DROWZEE ; $30
const GOLEM ; $31
const BARUNDA ; $32 (new)
const BALUMBA ; $32 (new)
const MAGMAR ; $33
const BUU ; $34 (new)
const ELECTABUZZ ; $35
const MAGNETON ; $36
const KOFFING ; $37
const DEER ; $38 (new)
const RAMOOSE ; $38 (new)
const MANKEY ; $39
const SEEL ; $3A
const DIGLETT ; $3B
const TAUROS ; $3C
const TRAMPEL ; $3D (new)
const CROCKY ; $3E (new)
const GAVILLAIN ; $3E (new)
const BLOTTLE ; $3F (new)
const FARFETCHD ; $40
const VENONAT ; $41
const DRAGONITE ; $42
const CACTUS ; $43 (new)
const JAGG ; $44 (new)
const BITTYBAT ; $45 (new)
const CACTORMUS ; $43 (new)
const SHARPOON ; $44 (new)
const WIGLETT ; $45 (new)
const DODUO ; $46
const POLIWAG ; $47
const JYNX ; $48
const MOLTRES ; $49
const ARTICUNO ; $4A
const ZAPDOS ; $4B
const DITTO ; $4C - Candy Jar (Evo Stone Glitch)
const DITTO ; $4C
const MEOWTH ; $4D
const KRABBY ; $4E
const CHEEP ; $4F (new)
const JABETTA ; $50 (new)
const MIKON ; $51 (new)
const VULPIII ; $51 (new)
const VULPIX ; $52
const NINETALES ; $53
const PIKACHU ; $54 - Ice Stone (Evo Stone Glitch)
const RAICHU ; $55 - Protector (Evo Stone Glitch)
const RIBBITO ; $56 (new) Poison Stone (Evo Stone Glitch)
const CROAKOZUNA ; $57 (new) Black Augurite (Evo Stone Glitch)
const DRATINI ; $58 - Dubious Disc (Evo Stone Glitch)
const PIKACHU ; $54
const RAICHU ; $55
const RIBBITO ; $56 (new)
const CROAKOZUNA ; $57 (new)
const DRATINI ; $58
const DRAGONAIR ; $59
const KABUTO ; $5A
const KABUTOPS ; $5B - Up-Grade (Evo Stone Glitch)
const HORSEA ; $5C - Metal Coat (Evo Stone Glitch)
const KABUTOPS ; $5B
const HORSEA ; $5C
const SEADRA ; $5D
const BAWLIGUA ; $5E (new)
const CRYITHAN ; $5F (new)
const MINISTARE ; $5E (new)
const IGUANARCH ; $5F (new)
const SANDSHREW ; $60
const SANDSLASH ; $61
const OMANYTE ; $62
@ -121,13 +121,13 @@
const WEEDLE ; $70
const KAKUNA ; $71
const BEEDRILL ; $72
const MADAAMU ; $73 (new)
const LUXWAN ; $73 (new)
const DODRIO ; $74
const PRIMEAPE ; $75
const DUGTRIO ; $76
const VENOMOTH ; $77
const DEWGONG ; $78
const PURAKKUSU ; $79 (new)
const TRICULES ; $79 (new)
const PENDRAKEN ; $7A (new)
const CATERPIE ; $7B
const METAPOD ; $7C
@ -140,13 +140,13 @@
const MEWTWO ; $83
const SNORLAX ; $84
const MAGIKARP ; $85
const KONYA ; $86 (new)
const OMEGA ; $87 (new)
const COINPUR ; $86 (new)
const OMEGADGE ; $87 (new)
const MUK ; $88
const DECILLA ; $89 (new)
const KINGLER ; $8A
const CLOYSTER ; $8B
const MAGNETITE ; $8C (new)
const WUGTRIO ; $8C (new)
const ELECTRODE ; $8D
const CLEFABLE ; $8E
const WEEZING ; $8F
@ -162,13 +162,13 @@
const BULBASAUR ; $99
const VENUSAUR ; $9A
const TENTACRUEL ; $9B
const GYOPIN ; $9C (new)
const ORFRY ; $9C (new)
const GOLDEEN ; $9D
const SEAKING ; $9E
const KOTORA ; $9F (new)
const GAOTORA ; $A0 (new)
const GOROTORA ; $A1 (new)
const PUCHIKOON ; $A2 (new)
const KOLTA ; $A2 (new)
const PONYTA ; $A3
const RAPIDASH ; $A4
const RATTATA ; $A5
@ -180,7 +180,7 @@
const AERODACTYL ; $AB
const BLASTYKE ; $AC (new)
const MAGNEMITE ; $AD
const SKIMPER ; $AE (new)
const SQUEAMATA ; $AE (new)
const GOROCHU ; $AF (new)
const CHARMANDER ; $B0
const SQUIRTLE ; $B1
@ -197,70 +197,67 @@
const BELLSPROUT ; $BC
const WEEPINBELL ; $BD
const VICTREEBEL ; $BE
const MONJA ; $BF (new pokemon start here)
const SCIZOR ; $C0
const RHYPERIOR ; $C1
const ESPEON ; $C2
const UMBREON ; $C3
const LEAFEON ; $C4
const GLACEON ; $C5
const SYLVEON ; $C6
const LICKILICKY ; $C7
const TANGROWTH ; $C8
const KLEAVOR ; $C9
const TSUBOMITTO ; $CA
const STEELIX ; $CB
const BLISSEY ; $CC
const HITMONTOP ; $CD
const CROBAT ; $CE
const ANIMON ; $CF
const BELLOSSOM ; $D0
const PORYGON2 ; $D1
const KINGDRA ; $D2
const POLITOED ; $D3
const SLOWKING ; $D4
const ELECTIVIRE ; $D5
const MAGMORTAR ; $D6
const TAABAN ; $D7
const KOKANA ; $D8
const KASANAGI ; $D9
const CARAPTHOR ; $DA
const MAGNEZONE ; $DB
const PORYGONZ ; $DC
const ANNIHILAPE ; $DD
const SCREAM_TAIL ; $DE
const SANDY_SHOCKS ; $DF
const WIGLETT ; $E0
const WUGTRIO ; $E1
const TOEDSCOOL ; $E2
const TOEDSCRUEL ; $E3
const PERRSERKER ; $E4
const SIRFETCHD ; $E5
const MR_RIME ; $E6
const MELTAN ; $E7
const MELMETAL ; $E8
const ARCANINE_H ; $E9
const ELECTRODE_H ; $EA
const RATICATE_A ; $EB
const RAICHU_A ; $EC
const SANDSLASH_A ; $ED
const NINETALES_A ; $EE
const DUGTRIO_A ; $EF
const PERSIAN_A ; $F0
const GOLEM_A ; $F1
const RAPIDASH_G ; $F2
const SLOWBRO_G ; $F3
const SLOWKING_G ; $F4
const MUK_A ; $F5
const EXEGGUTOR_A ; $F6
const MAROWAK_A ; $F7
const WEEZING_G ; $F8
const TAUROS_P ; $F9
const TAUROS_PA ; $FA
const TAUROS_PB ; $FB
const FOSSIL_KABUTOPS ; $FC (was B6)
const FOSSIL_AERODACTYL ; $FD (was B7)
const MON_GHOST ; $FE (was B8)
const SCIZOR ; $BF (new pokemon start here)
const RHYPERIOR ; $C0
const ESPEON ; $C1
const UMBREON ; $C2
const LEAFEON ; $C3
const GLACEON ; $C4
const SYLVEON ; $C5
const LICKILICKY ; $C6
const TANGROWTH ; $C7
const KLEAVOR ; $C8
const BELLIGNAN ; $C9
const STEELIX ; $CA
const BLISSEY ; $CB
const HITMONTOP ; $CC
const CROBAT ; $CD
const MIMMEO ; $CE
const BELLOSSOM ; $CF
const PORYGON2 ; $D0
const KINGDRA ; $D1
const POLITOED ; $D2
const SLOWKING ; $D3
const ELECTIVIRE ; $D4
const MAGMORTAR ; $D5
const DISTURBAN ; $D6
const KOKANA ; $D7
const PUPAL ; $D8
const CARAPTHOR ; $D9
const MAGNEZONE ; $DA
const PORYGONZ ; $DB
const ANNIHILAPE ; $DC
const SCREAM_TAIL ; $DD
const SANDY_SHOCKS ; $DE
const TOEDSCOOL ; $DF
const TOEDSCRUEL ; $E0
const PERRSERKER ; $E1
const SIRFETCHD ; $E2
const MR_RIME ; $E3
const MELTAN ; $E4
const MELMETAL ; $E5
const ARCANINE_H ; $E6
const ELECTRODE_H ; $E7
const RATICATE_A ; $E8
const RAICHU_A ; $E9
const SANDSLASH_A ; $EA
const NINETALES_A ; $EB
const DUGTRIO_A ; $EC
const PERSIAN_A ; $ED
const GOLEM_A ; $EE
const RAPIDASH_G ; $EF
const SLOWBRO_G ; $F0
const SLOWKING_G ; $F1
const MUK_A ; $F2
const EXEGGUTOR_A ; $F3
const MAROWAK_A ; $F4
const WEEZING_G ; $F5
const TAUROS_P ; $F6
const TAUROS_PA ; $F7
const TAUROS_PB ; $F8
const FOSSIL_KABUTOPS ; $F9 (was B6)
const FOSSIL_AERODACTYL ; $FA (was B7)
const MON_GHOST ; $FB (was B8)
DEF NUM_POKEMON_INDEXES EQU const_value - 1