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

small fixes

Browse Source 
* transition from HC to sewers counts don’t reset to 00/00
* count the proper keys in menu for HC/sewers
This commit is contained in:
sporchia
2018-01-22 17:49:37 -05:00
parent c894b5e0b2
commit 85b5a97a53
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
compasses.asm
View File

@@ -15,7 +15,9 @@ DrawDungeonCompassCounts:
++ ++
LDA $040C LDA $040C
CMP.w #$0000 : BNE + ; Sewer Passage CMP.w #$0000 : BNE + ; Sewer Passage, use Hyrule Castle counts
LDA $7EF434 : AND.w #$00F0 : LSR #4
BRL ++
+ : CMP.w #$0002 : BNE + ; Hyrule Castle + : CMP.w #$0002 : BNE + ; Hyrule Castle
LDA $7EF434 : AND.w #$00F0 : LSR #4 LDA $7EF434 : AND.w #$00F0 : LSR #4
BRL ++ BRL ++
@@ -65,7 +67,9 @@ DrawDungeonCompassCounts:
LDA.w #$2830 : STA $7EC798 LDA.w #$2830 : STA $7EC798
LDA $040C LDA $040C
CMP.w #$0000 : BNE + ; Sewer Passage CMP.w #$0000 : BNE + ; Sewer Passage, use Hyrule Castle counts
LDA.w #$0008
BRL ++
+ : CMP.w #$0002 : BNE + ; Hyrule Castle + : CMP.w #$0002 : BNE + ; Hyrule Castle
LDA.w #$0008 LDA.w #$0008
BRL ++ BRL ++
@@ -121,7 +125,7 @@ RTL
} }
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; $7EF434 - hhhhdddd - item locations checked ; $7EF434 - hhhhdddd - item locations checked
; h - hyrule castle ; h - hyrule castle/sewers
; d - palace of darkness ; d - palace of darkness
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; $7EF435 - dddhhhaa - item locations checked ; $7EF435 - dddhhhaa - item locations checked

8
pendantcrystalhud.asm
View File

@@ -284,7 +284,7 @@ DrawHUDDungeonItems:
LDA.w #$2810 : STA $1684 ; small keys icon LDA.w #$2810 : STA $1684 ; small keys icon
SEP #$20 ; set 8-bit accumulator SEP #$20 ; set 8-bit accumulator
; Small Keys ; Small Keys
LDA.b #$16 : !ADD $7EF37C : STA $1686 : LDA.b #$28 : ADC #$00 : sta $1686+1 ; sewers LDA.b #$16 : !ADD $7EF37D : STA $1686 : LDA.b #$28 : ADC #$00 : sta $1686+1 ; Hyrule Castle
LDA.b #$16 : !ADD $7EF380 : STA $1688 : LDA.b #$28 : ADC #$00 : sta $1688+1 ; Agahnims Tower LDA.b #$16 : !ADD $7EF380 : STA $1688 : LDA.b #$28 : ADC #$00 : sta $1688+1 ; Agahnims Tower
LDA.b #$16 : !ADD $7EF37E : STA $168C : LDA.b #$28 : ADC #$00 : sta $168C+1 ; Eastern LDA.b #$16 : !ADD $7EF37E : STA $168C : LDA.b #$28 : ADC #$00 : sta $168C+1 ; Eastern
@@ -307,7 +307,7 @@ DrawHUDDungeonItems:
; Big Keys ; Big Keys
LDA HUDDungeonItems : AND.w #$0002 : BNE + : BRL ++ : + LDA HUDDungeonItems : AND.w #$0002 : BNE + : BRL ++ : +
LDA.w #$2811 : STA $16C4 ; big key icon LDA.w #$2811 : STA $16C4 ; big key icon
LDA $7EF367 : AND.w #$0080 : BEQ + ; sewers LDA $7EF367 : AND.w #$0040 : BEQ + ; Hyrule Castle
LDA.w #$2826 : STA $16C6 LDA.w #$2826 : STA $16C6
+ +
LDA $7EF367 : AND.w #$0008 : BEQ + ; Agahnims Tower LDA $7EF367 : AND.w #$0008 : BEQ + ; Agahnims Tower
@@ -354,7 +354,7 @@ DrawHUDDungeonItems:
; Maps ; Maps
LDA HUDDungeonItems : AND.w #$0004 : BNE + : BRL ++ : + LDA HUDDungeonItems : AND.w #$0004 : BNE + : BRL ++ : +
LDA.w #$2821 : STA $1684 ; map icon LDA.w #$2821 : STA $1684 ; map icon
LDA $7EF369 : AND.w #$0080 : BEQ + ; sewers LDA $7EF369 : AND.w #$0040 : BEQ + ; Hyrule Castle
LDA.w #$2826 : STA $1686 LDA.w #$2826 : STA $1686
+ +
LDA $7EF369 : AND.w #$0008 : BEQ + ; Agahnims Tower LDA $7EF369 : AND.w #$0008 : BEQ + ; Agahnims Tower
@@ -398,7 +398,7 @@ DrawHUDDungeonItems:
; Compasses ; Compasses
LDA HUDDungeonItems : AND.w #$0008 : BNE + : BRL ++ : + LDA HUDDungeonItems : AND.w #$0008 : BNE + : BRL ++ : +
LDA.w #$2C20 : STA $16C4 ; compass icon LDA.w #$2C20 : STA $16C4 ; compass icon
LDA $7EF365 : AND.w #$0080 : BEQ + ; sewers LDA $7EF365 : AND.w #$0040 : BEQ + ; Hyrule Castle
LDA.w #$2C26 : STA $16C6 LDA.w #$2C26 : STA $16C6
+ +
LDA $7EF365 : AND.w #$0008 : BEQ + ; Agahnims Tower LDA $7EF365 : AND.w #$0008 : BEQ + ; Agahnims Tower