alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rupee counter displays item collection count in ganon's room

Browse Source
This commit is contained in:
Karkat
2018-05-27 17:45:35 -04:00
parent 34328496ce
commit dd029fd0b0
2 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
rupeelimit.asm
View File

@@ -2,39 +2,21 @@
; Four Digit Rupees ; Four Digit Rupees
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
Draw4DigitRupees: Draw4DigitRupees:
LDA $7EF362 LDA $1B : AND.w #$00FF : BEQ .outdoors ; skip if outdoors
JSL.l HexToDec .indoors
LDA $A0 : BNE .normal ; skip except for ganon's room
;REP #$30 ;LDA #$246E : STA $7EC712
LDA $7F5004 : AND.w #$00FF : ORA.w #$2400 : STA $7EC750 ;LDA #$246F : STA $7EC714
LDA $7F5005 : AND.w #$00FF : ORA.w #$2400 : STA $7EC752 LDA $7EF423
LDA $7F5006 : AND.w #$00FF : ORA.w #$2400 : STA $7EC754 BRA .print
LDA $7F5007 : AND.w #$00FF : ORA.w #$2400 : STA $7EC756 .outdoors
.normal
;LDA.w #$247F ; clear other hud cells LDA $7EF362
;STA $7EC758 .print
;STA $7EC75E JSL.l HexToDec
;STA $7EC764 LDA $7F5004 : AND.w #$00FF : ORA.w #$2400 : STA $7EC750
LDA $7F5005 : AND.w #$00FF : ORA.w #$2400 : STA $7EC752
;STA $7EC718 ; bombs LDA $7F5006 : AND.w #$00FF : ORA.w #$2400 : STA $7EC754
;STA $7EC71E ; arrows LDA $7F5007 : AND.w #$00FF : ORA.w #$2400 : STA $7EC756
;STA $7EC724 ; keys
;LDA.w #$2C88 : STA $7EC71A ; bomb icon
;LDA.w #$2C89 : STA $7EC71C
;LDA $7EF340 : AND.w #$00FF : CMP.w #$0003 : !BGE .silverArrows
;.woodArrows
;LDA.w #$20A7 : STA $7EC720 ; wood arrow icon
;LDA.w #$20A9 : STA $7EC722
;BRA +
;.silverArrows
;LDA.w #$2486 : STA $7EC720 ; silver arrow icon
;LDA.w #$2487 : STA $7EC722
;+
;LDA.w #$2871 : STA $7EC726 ; key icon
RTL RTL
;================================================================================ ;================================================================================

2
timer.asm
View File

@@ -125,7 +125,7 @@ dw #$FFFF, #$7FFF
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!TEMPORARY_OHKO = "$7F50CC" !TEMPORARY_OHKO = "$7F50CC"
DrawChallengeTimer: DrawChallengeTimer:
LDA !TEMPORARY_OHKO : AND.w #00FF : BEQ + LDA !TEMPORARY_OHKO : AND.w #$00FF : BEQ +
LDA.w #$2807 : STA $7EC790 LDA.w #$2807 : STA $7EC790
LDA.w #$280A : STA $7EC792 LDA.w #$280A : STA $7EC792
LDA.w #$280B : STA $7EC794 LDA.w #$280B : STA $7EC794