thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-20 22:28:41 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'mistress' into renewables

Browse source
This commit is contained in:
Thorn Avery 2024-01-14 09:41:22 +11:00
commit 65e94896d1
19 changed files with 90 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engine/battle/animations.asm
View file

@ -1861,8 +1861,8 @@ AnimationWavyScreen:
ld c, $ff
ld hl, WavyScreenLineOffsets
.loop
; ld a, [hl] ; this fixes the wavy screen, but causes a bank overflow
; 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
@ -1879,7 +1879,7 @@ AnimationWavyScreen:
dec c
jr nz, .loop
xor a
; ldh [hSCX], a ; also fixing the wavy screen
ldh [hSCX], a ; also fixing the wavy screen
ldh [hWY], a
call SaveScreenTilesToBuffer2
call ClearScreen

13
engine/overworld/missable_objects.asm
View file

@ -142,8 +142,21 @@ HideObject:
ld c, a
ld b, FLAG_SET
call MissableObjectFlagAction ; set "removed" flag
call VerifyObjectState
jr z, HideObject
jp UpdateSprites
;returns z flag set if shown and z flag cleared if hidden
VerifyObjectState:
ld hl, wMissableObjectFlags
ld a, [wMissableObjectIndex]
ld c, a
ld b, FLAG_TEST
call MissableObjectFlagAction
ld a, c
and a
ret
MissableObjectFlagAction:
; identical to FlagAction