alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

OHKO in Armos Knights room

Browse Source
This commit is contained in:
karafruit
2023-03-18 22:50:04 -05:00
parent 0d58bb2568
commit 083a93766c
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
timer.asm
View File

@@ -110,7 +110,9 @@ dw #$003C, #$0000
dw #$FFFF, #$7FFF dw #$FFFF, #$7FFF
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
DrawChallengeTimer: DrawChallengeTimer:
LDA.l RoomIndex : AND.w #$00FF : CMP.w #$00C8 : BEQ .is_ohko
LDA.l OHKOFlag : AND.w #$00FF : BEQ + LDA.l OHKOFlag : AND.w #$00FF : BEQ +
.is_ohko
LDA.w #$2807 : STA.l HUDTileMapBuffer+$90 LDA.w #$2807 : STA.l HUDTileMapBuffer+$90
LDA.w #$280A : STA.l HUDTileMapBuffer+$92 LDA.w #$280A : STA.l HUDTileMapBuffer+$92
LDA.w #$280B : STA.l HUDTileMapBuffer+$94 LDA.w #$280B : STA.l HUDTileMapBuffer+$94
@@ -162,6 +164,7 @@ DrawChallengeTimer:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OHKOTimer: OHKOTimer:
LDA.l RoomIndex : CMP.b #$C8 : BEQ .kill
LDA.l OHKOFlag : BNE .kill LDA.l OHKOFlag : BNE .kill
LDA.l TimeoutBehavior : CMP.b #$02 : BNE + LDA.l TimeoutBehavior : CMP.b #$02 : BNE +
LDA.l ClockStatus : AND.b #$02 : BEQ + LDA.l ClockStatus : AND.b #$02 : BEQ +