Fix Zora mask draw in hud, various housekeeping
This commit is contained in:
@@ -224,15 +224,12 @@ Menu_ItemScreen:
|
|||||||
|
|
||||||
BEQ .no_delete
|
BEQ .no_delete
|
||||||
|
|
||||||
|
; Delete cursor
|
||||||
LDA.w #$20F5
|
LDA.w #$20F5
|
||||||
STA.w $1108, X
|
STA.w $1108, X : STA.w $1148, X
|
||||||
STA.w $1148, X
|
STA.w $114E, X : STA.w $110E, X
|
||||||
STA.w $114E, X
|
STA.w $11C8, X : STA.w $1188, X
|
||||||
STA.w $110E, X
|
STA.w $118E, X : STA.w $11CE, X
|
||||||
STA.w $11C8, X
|
|
||||||
STA.w $1188, X
|
|
||||||
STA.w $118E, X
|
|
||||||
STA.w $11CE, X
|
|
||||||
BRA .done
|
BRA .done
|
||||||
|
|
||||||
.no_delete
|
.no_delete
|
||||||
@@ -310,12 +307,9 @@ Menu_ScrollUp:
|
|||||||
|
|
||||||
LDX.w MenuScrollLevelV
|
LDX.w MenuScrollLevelV
|
||||||
LDA.w Menu_Scroll, X
|
LDA.w Menu_Scroll, X
|
||||||
STA.b $EA
|
STA.b $EA : BNE .loop
|
||||||
BNE .loop
|
|
||||||
STZ.b $E4
|
STZ.b $E4
|
||||||
|
|
||||||
INC.w $0200
|
INC.w $0200
|
||||||
|
|
||||||
RTS
|
RTS
|
||||||
|
|
||||||
.loop
|
.loop
|
||||||
|
|||||||
@@ -312,7 +312,7 @@ DrawYItems:
|
|||||||
JSR DrawMenuItem
|
JSR DrawMenuItem
|
||||||
.no_ocarina
|
.no_ocarina
|
||||||
|
|
||||||
LDA.l $7EF34E : CMP.w #$00 : BEQ .no_book
|
LDA.l $7EF34E : AND.w #$00FF : CMP.w #$00 : BEQ .no_book
|
||||||
LDA.w #$01 : STA.w ShortSpoof : LDA.w #ShortSpoof
|
LDA.w #$01 : STA.w ShortSpoof : LDA.w #ShortSpoof
|
||||||
LDX.w #menu_offset(13,6)
|
LDX.w #menu_offset(13,6)
|
||||||
LDY.w #BookGFX
|
LDY.w #BookGFX
|
||||||
|
|||||||
@@ -505,10 +505,6 @@ org $0DF811
|
|||||||
dw $20F5, $20F5, $20F5, $20F5
|
dw $20F5, $20F5, $20F5, $20F5
|
||||||
dw $30B4, $30B5, $30C4, $30C5
|
dw $30B4, $30B5, $30C4, $30C5
|
||||||
|
|
||||||
; Fishing Rod GFX (Unused slot)
|
|
||||||
org $0DF831
|
|
||||||
dw $2C82, $2C83, $2C8B, $2C8C
|
|
||||||
|
|
||||||
; =========================================================
|
; =========================================================
|
||||||
; $6FE77-$6FFC0
|
; $6FE77-$6FFC0
|
||||||
|
|
||||||
|
|||||||
@@ -260,7 +260,7 @@ SearchForEquippedItem_Override:
|
|||||||
{
|
{
|
||||||
SEP #$30
|
SEP #$30
|
||||||
|
|
||||||
LDY $0202
|
LDY $0202
|
||||||
LDX.w Menu_AddressLong-1, Y
|
LDX.w Menu_AddressLong-1, Y
|
||||||
LDA.l $7EF300, X
|
LDA.l $7EF300, X
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user