thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-30 06:03:17 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Safari Zone check labels

Browse source
This commit is contained in:
dannye 2015-07-16 23:41:44 -05:00
parent 40ea6a5f75
commit 77ba61cb17
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
engine/hidden_object_functions7.asm
View file

@ -37,12 +37,12 @@ StrengthsAndWeaknessesText: ; 1e983 (7:6983)
SafariZoneCheck: ; 1e988 (7:6988) SafariZoneCheck: ; 1e988 (7:6988)
ld hl, wd790 ld hl, wd790
bit 7, [hl] bit 7, [hl]; if we are not in the Safari Zone,
jr z, SafariZoneGameOver jr z, SafariZoneGameStillGoing ; don't bother printing game over text
ld a, [W_NUMSAFARIBALLS] ld a, [W_NUMSAFARIBALLS]
and a and a
jr z, SafariZoneGameStillGoing jr z, SafariZoneGameOver
jr SafariZoneGameOver jr SafariZoneGameStillGoing
SafariZoneCheckSteps: ; 1e997 (7:6997) SafariZoneCheckSteps: ; 1e997 (7:6997)
ld a, [wSafariSteps] ld a, [wSafariSteps]
@ -50,17 +50,18 @@ SafariZoneCheckSteps: ; 1e997 (7:6997)
ld a, [wSafariSteps + 1] ld a, [wSafariSteps + 1]
ld c, a ld c, a
or b or b
jr z, SafariZoneGameStillGoing jr z, SafariZoneGameOver
dec bc dec bc
ld a, b ld a, b
ld [wSafariSteps], a ld [wSafariSteps], a
ld a, c ld a, c
ld [wSafariSteps + 1], a ld [wSafariSteps + 1], a
SafariZoneGameOver: ; 1e9ab (7:69ab) SafariZoneGameStillGoing: ; 1e9ab (7:69ab)
xor a xor a
ld [wSafariZoneGameOver], a ld [wSafariZoneGameOver], a
ret ret
SafariZoneGameStillGoing: ; 1e9b0 (7:69b0)
SafariZoneGameOver: ; 1e9b0 (7:69b0)
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
xor a xor a
ld [wMusicHeaderPointer], a ld [wMusicHeaderPointer], a