scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a bug that caused the feather to draw the ocarina as well in the menu

Browse Source
This commit is contained in:
Jared_Brian_
2024-03-16 22:13:17 -06:00
parent df5c50ef1b
commit b4da07142a
2 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Menu/menu_draw.asm
View File

@@ -40,22 +40,19 @@ DrawMenuItem:
STA.b $08 STA.b $08
STY.b $00 STY.b $00
LDA.b [$08] LDA.b [$08] : AND.w #$00FF : BNE .not_zero
AND.w #$00FF LDY.w #NothingGFX
BRA .draw
BNE .not_zero .not_zero
LDY.w #NothingGFX
BRA .draw
.not_zero
DEC DEC
ASL : ASL : ASL ASL : ASL : ASL
ADC.b $00 ADC.b $00
TAY TAY
.draw .draw
LDA.w $0000,Y : STA.w $1108,X LDA.w $0000,Y : STA.w $1108,X
LDA.w $0002,Y : STA.w $110A,X LDA.w $0002,Y : STA.w $110A,X
LDA.w $0004,Y : STA.w $1148,X LDA.w $0004,Y : STA.w $1148,X
@@ -303,7 +300,8 @@ DrawYItems:
; Row 3 ------------------------------------------------- ; Row 3 -------------------------------------------------
LDA.l $7EF34C : CMP.w #$0000 : BEQ .no_ocarina print pc
LDA.l $7EF34C : AND.w #$00FF : CMP.w #$0000 : BEQ .no_ocarina
LDA.w $030F : BNE .spoof_ocarina LDA.w $030F : BNE .spoof_ocarina
LDA #$0001 ; Multi-songs not unlocked yet LDA #$0001 ; Multi-songs not unlocked yet
.spoof_ocarina .spoof_ocarina

38
Menu/menu_select_item.asm
View File

@@ -33,7 +33,7 @@ Menu_AddressIndex:
db $7EF34C ; shovel 7EF34F db $7EF34C ; shovel 7EF34F
db $7EF34E ; Book db $7EF34E ; Book
db $7EF350 ; Cane of Somaria db $7EF350 ; Cane of Somaria
db $7EF351 ; Cane of Byrna db $7EF351 ; Cane of Byrna / Fishing rod
db $7EF34D ; Roc's Feather db $7EF34D ; Roc's Feather
db $7EF35E ; Bottle 3 db $7EF35E ; Bottle 3
@@ -64,7 +64,7 @@ Menu_ItemCursorPositions:
dw menu_offset(12,2) ; shovel dw menu_offset(12,2) ; shovel
dw menu_offset(12,5) ; feather dw menu_offset(12,5) ; feather
dw menu_offset(12,8) ; somaria dw menu_offset(12,8) ; somaria
dw menu_offset(12,12) ; byrna dw menu_offset(12,12) ; byrna / fishing rod
dw menu_offset(12,15) ; bunny hood dw menu_offset(12,15) ; bunny hood
dw menu_offset(12,18) ; bottle3 dw menu_offset(12,18) ; bottle3
@@ -254,39 +254,36 @@ DoWeHaveThisItem_Override:
{ {
LDY $0202 : LDX.w Menu_AddressLong, Y LDY $0202 : LDX.w Menu_AddressLong, Y
LDA.l $7EF33F, X : BNE .have_this_item LDA.l $7EF33F, X : BNE .have_this_item
CLC CLC
RTL RTL
.have_this_item .have_this_item
SEC SEC
RTL RTL
} }
TryEquipNextItem_Override: TryEquipNextItem_Override:
{ {
.keep_looking .keep_looking
JSR GotoNextItem_Local JSR GotoNextItem_Local
JSL DoWeHaveThisItem_Override : BCC .keep_looking JSL DoWeHaveThisItem_Override : BCC .keep_looking
RTS RTS
} }
SearchForEquippedItem_Override: SearchForEquippedItem_Override:
{ {
SEP #$30 SEP #$30
LDY $0202 : LDX.w Menu_AddressLong-1, Y LDY $0202 : LDX.w Menu_AddressLong-1, Y
LDA.l $7EF33F, X : CMP.b #$00 : BNE .item_available LDA.l $7EF33F, X : CMP.b #$00 : BNE .item_available
; In this case we have no equippable items ; In this case we have no equippable items
STZ $0202 : STZ $0203 : STZ $0204 STZ $0202 : STZ $0203 : STZ $0204
.we_have_that_item .we_have_that_item
RTL RTL
.item_available .item_available
; Is there an item currently equipped (in the HUD slot)? ; Is there an item currently equipped (in the HUD slot)?
LDA $0202 LDA $0202 : BNE .alreadyEquipped
BNE .alreadyEquipped
; If not, set the equipped item to the Bow and Arrow ; If not, set the equipped item to the Bow and Arrow
; (even if we don't actually have it) ; (even if we don't actually have it)
LDA.b #$01 : STA $0202 LDA.b #$01 : STA $0202
@@ -297,11 +294,12 @@ SearchForEquippedItem_Override:
; We're done if we have that item ; We're done if we have that item
.keep_looking .keep_looking
JSR GotoNextItem_Local JSR GotoNextItem_Local
JSL DoWeHaveThisItem_Override : BCC .keep_looking JSL DoWeHaveThisItem_Override : BCC .keep_looking
BCS .we_have_that_item BCS .we_have_that_item
JMP TryEquipNextItem_Override JMP TryEquipNextItem_Override
} }
pushpc pushpc
org $0DDEB0 org $0DDEB0
@@ -321,4 +319,6 @@ SearchForEquippedItem:
} }
warnpc $0DE3C7 warnpc $0DE3C7
; =========================================================
pullpc pullpc