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

@ -78,54 +78,6 @@
const EVENT_BEAT_MISTY
const EVENT_GOT_BICYCLE
; Silph Gauntlet events ; Why is there so much free space here, my god
; 1F Trainers
const_next $d1
const EVENT_BEAT_GAUNTLET_YOUNGSTER
const EVENT_BEAT_GAUNTLET_BUG_CATCHER
const EVENT_BEAT_GAUNTLET_STUDENT
const EVENT_BEAT_GAUNTLET_JR_TRAINER_M
const EVENT_BEAT_GAUNTLET_JR_TRAINER_F
const EVENT_BEAT_GAUNTLET_BIRD_KEEPER
; 2F Trainers
const EVENT_BEAT_GAUNTLET_LASS
const EVENT_BEAT_GAUNTLET_JUNIOR
const EVENT_BEAT_GAUNTLET_HIKER
const EVENT_BEAT_GAUNTLET_SUPER_NERD
const EVENT_BEAT_GAUNTLET_POKEMANIAC
const EVENT_BEAT_GAUNTLET_BLACK_BELT
; 3F Trainers
const EVENT_BEAT_GAUNTLET_SAILOR
const EVENT_BEAT_GAUNTLET_FIREFIGHTER
const EVENT_BEAT_GAUNTLET_GENTLEMAN
const EVENT_BEAT_GAUNTLET_ENGINEER
const EVENT_BEAT_GAUNTLET_ROCKER
const EVENT_BEAT_GAUNTLET_FISHER
const EVENT_BEAT_GAUNTLET_BEAUTY
; 4F Trainers
const EVENT_BEAT_GAUNTLET_SCIENTIST
const EVENT_BEAT_GAUNTLET_GAMBLER
const EVENT_BEAT_GAUNTLET_ROCKET
const EVENT_BEAT_GAUNTLET_BIKER
const EVENT_BEAT_GAUNTLET_BURGLAR
const EVENT_BEAT_GAUNTLET_CHANNELER
; 5F Trainers
const EVENT_BEAT_GAUNTLET_JUGGLER
const EVENT_BEAT_GAUNTLET_PSYCHIC
const EVENT_BEAT_GAUNTLET_CUE_BALL
const EVENT_BEAT_GAUNTLET_SWIMMER
const EVENT_BEAT_GAUNTLET_TAMER
const EVENT_BEAT_GAUNTLET_COOLTRAINER_F
const EVENT_BEAT_GAUNTLET_COOLTRAINER_M
; 6F Trainers
const EVENT_BEAT_GAUNTLET_BROCK
const EVENT_BEAT_GAUNTLET_MISTY
const EVENT_BEAT_GAUNTLET_SURGE
const EVENT_BEAT_GAUNTLET_ERIKA
const EVENT_BEAT_GAUNTLET_KOGA
const EVENT_BEAT_GAUNTLET_SABRINA
const EVENT_BEAT_GAUNTLET_BLAINE
; Lavender Town events
const_next $100 - 2
const EVENT_POKEMON_TOWER_RIVAL_ON_LEFT
@ -554,7 +506,7 @@
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
const EVENT_BEAT_GYAOON
const_skip
const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2
; Route 24 events
@ -649,8 +601,6 @@
; New static encounter events
const_next $620
const_skip
const EVENT_BEAT_WUGTRIO
const_skip 7
const EVENT_BEAT_MEW
const_skip 7
const EVENT_BEAT_MOLTRES
@ -793,7 +743,7 @@
const EVENT_BEAT_OMEGA ; must be here
const EVENT_SILPH_CO_11_UNLOCKED_DOOR
const EVENT_GOT_CANDY_JAR
const EVENT_BEAT_CHIEF
const_skip
const EVENT_GOT_MASTER_BALL
const_skip
const EVENT_BEAT_SILPH_CO_GIOVANNI
@ -862,6 +812,65 @@ DEF INDIGO_PLATEAU_EVENTS_END EQU const_value - 1
const_skip 4
const EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH
; Silph Gauntlet events
const_next $930
DEF SILPH_GAUNTLET_EVENTS_START EQU const_value
; 1F Trainers
const_skip
const EVENT_BEAT_GAUNTLET_YOUNGSTER
const EVENT_BEAT_GAUNTLET_BUG_CATCHER
const EVENT_BEAT_GAUNTLET_STUDENT
const EVENT_BEAT_GAUNTLET_JR_TRAINER_M
const EVENT_BEAT_GAUNTLET_JR_TRAINER_F
const EVENT_BEAT_GAUNTLET_BIRD_KEEPER
; 2F Trainers
const_skip 2
const EVENT_BEAT_GAUNTLET_LASS
const EVENT_BEAT_GAUNTLET_HIKER
const EVENT_BEAT_GAUNTLET_SUPER_NERD
const EVENT_BEAT_GAUNTLET_POKEMANIAC
const EVENT_BEAT_GAUNTLET_BEAUTY
const EVENT_BEAT_GAUNTLET_BLACK_BELT
; 3F Trainers
const_skip 2
const EVENT_BEAT_GAUNTLET_SAILOR
const EVENT_BEAT_GAUNTLET_FIREFIGHTER
const EVENT_BEAT_GAUNTLET_GENTLEMAN
const EVENT_BEAT_GAUNTLET_ENGINEER
const EVENT_BEAT_GAUNTLET_ROCKER
const EVENT_BEAT_GAUNTLET_FISHER
; 4F Trainers
const_skip 2
const EVENT_BEAT_GAUNTLET_SCIENTIST
const EVENT_BEAT_GAUNTLET_GAMBLER
const EVENT_BEAT_GAUNTLET_ROCKET
const EVENT_BEAT_GAUNTLET_BIKER
const EVENT_BEAT_GAUNTLET_BURGLAR
const EVENT_BEAT_GAUNTLET_CHANNELER
; 5F Trainers
const_skip 2
const EVENT_BEAT_GAUNTLET_JUGGLER
const EVENT_BEAT_GAUNTLET_PSYCHIC
const EVENT_BEAT_GAUNTLET_CUE_BALL
const EVENT_BEAT_GAUNTLET_SWIMMER
const EVENT_BEAT_GAUNTLET_TAMER
const EVENT_BEAT_GAUNTLET_COOLTRAINER_F
const EVENT_BEAT_GAUNTLET_COOLTRAINER_M
; 6F Trainers
const_skip
const EVENT_BEAT_GAUNTLET_BROCK
const EVENT_BEAT_GAUNTLET_MISTY
const EVENT_BEAT_GAUNTLET_SURGE
const EVENT_BEAT_GAUNTLET_ERIKA
const EVENT_BEAT_GAUNTLET_KOGA
const EVENT_BEAT_GAUNTLET_SABRINA
const EVENT_BEAT_GAUNTLET_BLAINE
const_skip
const EVENT_BEAT_CHIEF
const_skip 5
const_skip
DEF SILPH_GAUNTLET_EVENTS_END EQU const_value - 1
; Rock Tunnel events
const_next $9B0
const_skip