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

temporary ohko

Browse Source
This commit is contained in:
Karkat
2018-03-16 22:38:33 -04:00
parent 0e46888920
commit 69c60f6c78
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LTTP_RND_GeneralBugfixes.asm
View File

@@ -26,7 +26,7 @@ org $3FFFFF ; <- 1FFFFF
db #$00 ; expand file to 2mb db #$00 ; expand file to 2mb
org $1FFFF8 ; <- FFFF8 timestamp rom org $1FFFF8 ; <- FFFF8 timestamp rom
db #$20, #$18, #$03, #$12 ; year/month/day db #$20, #$18, #$03, #$16 ; year/month/day
;================================================================================ ;================================================================================

5
timer.asm
View File

@@ -4,6 +4,7 @@
!Temp = "$7F5020" !Temp = "$7F5020"
!BaseTimer = "$7EF43E" !BaseTimer = "$7EF43E"
!ChallengeTimer = "$7EF454" !ChallengeTimer = "$7EF454"
!TemporaryOHKO = "$7F50CC"
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!CLOCK_HOURS = "$7F5080" ; $7F5080 - $7F5083 - Clock Hours !CLOCK_HOURS = "$7F5080" ; $7F5080 - $7F5083 - Clock Hours
!CLOCK_MINUTES = "$7F5084" ; $7F5084 - $7F5087 - Clock Minutes !CLOCK_MINUTES = "$7F5084" ; $7F5084 - $7F5087 - Clock Minutes
@@ -158,8 +159,10 @@ DrawChallengeTimer:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OHKOTimer: OHKOTimer:
LDA !TemporaryOHKO : BNE .kill
LDA.l TimeoutBehavior : CMP #$02 : BNE + LDA.l TimeoutBehavior : CMP #$02 : BNE +
LDA.l !Status : AND.b #$02 : BEQ + LDA !Status : AND.b #$02 : BEQ +
.kill
LDA.b #$00 : STA $7EF36D ; kill link LDA.b #$00 : STA $7EF36D ; kill link
+ +
LDA $7EF36D LDA $7EF36D