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

@ -1595,7 +1595,7 @@ TryRunningFromBattle:
jp z, .canEscape ; jump if it's a safari battle
ld a, [wLinkState]
ld a, [wCurOpponent]
cp OMEGA
cp OMEGADGE
jp z, .omegaCantEscape
cp LINK_STATE_BATTLING
jp z, .canEscape
@ -6417,28 +6417,31 @@ LoadEnemyMonData:
ld de, wEnemyMonNick
ld bc, NAME_LENGTH
call CopyData
cp BATTLE_TENT
jr z, .skipSeenFlagAdding ; one of Battle Tower's rules
;ld a, [wCurMap]
;cp BATTLE_TENT
;jr z, .skipSeenFlagAdding ; one of Battle Tower's rules
ld a, [wEnemyMonSpecies2]
ld [wd11e], a
predef IndexToPokedex
call IsGhostBattle ; this prevents it from being identified early
jr nz, .noMarkSeen ; part of the ghost fix
;call IsGhostBattle ; this prevents it from being identified early
;jr nz, .noMarkSeen ; part of the ghost fix
ld a, [wd11e]
dec a
ld c, a
ld b, FLAG_SET
ld hl, wPokedexSeen
predef FlagActionPredef ; mark this mon as seen in the pokedex
.noMarkSeen ; part of the ghost fix
ld hl, wEnemyMonLevel
ld de, wEnemyMonUnmodifiedLevel
ld bc, 1 + NUM_STATS * 2
call CopyData
ld a, $7 ; default stat mod
ld b, NUM_STAT_MODS ; number of stat mods
ld hl, wEnemyMonStatMods
.skipSeenFlagAdding
;.noMarkSeen ; this is supposed to be a ghost fix but it causes the pokedex to just...never update so I'm commenting it out
; ld hl, wEnemyMonLevel
; ld de, wEnemyMonUnmodifiedLevel
; ld bc, 1 + NUM_STATS * 2
; call CopyData
; ld a, $7 ; default stat mod
; ld b, NUM_STAT_MODS ; number of stat mods
; ld hl, wEnemyMonStatMods
;.skipSeenFlagAdding
ld hl, wEnemyMonLevel
ld de, wEnemyMonUnmodifiedLevel
ld bc, $b