revert 2 bug fixes due to issues, add to celadon U

the ghost without silph scope fix doesn't work due to a codebase change, and the night shade wiggly animation causes a bank overflow

celadon university has 3 more books detailing lore from one of the old pokedex books
This commit is contained in:
May Evans 2022-09-28 14:50:54 +01:00
parent 23106d3417
commit 5bb215ec23
5 changed files with 86 additions and 10 deletions

View file

@ -1878,8 +1878,8 @@ AnimationWavyScreen:
ld c, $ff
ld hl, WavyScreenLineOffsets
.loop
ld a, [hl] ; this fixes the wavy screen - PvK
ldh [hSCX], a
; ld a, [hl] ; this fixes the wavy screen, but causes a bank overflow
; ldh [hSCX], a
push hl
.innerLoop
call WavyScreen_SetSCX
@ -1896,7 +1896,7 @@ AnimationWavyScreen:
dec c
jr nz, .loop
xor a
ldh [hSCX], a ; also fixing the wavy screen - PvK
; ldh [hSCX], a ; also fixing the wavy screen
ldh [hWY], a
call SaveScreenTilesToBuffer2
call ClearScreen

View file

@ -2405,11 +2405,7 @@ PartyMenuOrRockOrRun:
ld [wd0b5], a
call GetMonHeader
ld de, vFrontPic
call IsGhostBattle ; this prevents ghosts from being identified without the silph scope - PvK
push af
call nz, LoadMonFrontSprite
pop af
call z, LoadGhostPic ; fix ends here, just make it "call LoadMonFrontSprite on line 2408 to revert.
call LoadMonFrontSprite ; want to implement https://github.com/pret/pokered/wiki/Bugs-and-Glitches#the-pok%C3%A9mon-behind-the-ghost-is-identified-as-seen-in-the-pok%C3%A9dex-even-if-you-didnt-use-the-silph-scope-on-it but the codebase was changed since the time of writing
jr .enemyMonPicReloaded
.doEnemyMonAnimation
ld b, BANK(AnimationSubstitute) ; BANK(AnimationMinimizeMon)