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

menu work

Browse Source
This commit is contained in:
Justin Scofield
2022-10-05 23:52:14 -05:00
parent de31f30fd7
commit 5becb44f95
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Menu/menu.asm
View File

@@ -326,6 +326,16 @@ Menu_CheckBottle:
RTS RTS
} }
Menu_HookItems:
{
STZ.w $7F5021
LDA.w $0202 : CMP.b #$13 : BNE .not_wolf_mask
LDA.b #$0001 : STA.w $7F5021
.not_wolf_mask
RTS
}
; ============================================================================= ; =============================================================================
; 09 MENU EXIT ; 09 MENU EXIT
@@ -333,8 +343,8 @@ Menu_Exit:
{ {
; set $0303 by using $0202 to index table on exit ; set $0303 by using $0202 to index table on exit
; JSR Menu_CheckBottle ; JSR Menu_CheckBottle
LDY.w $0202 : BEQ .no_item JSR Menu_HookItems
DEY LDY.w $0202 : BEQ .no_item : DEY
LDA.w Menu_ItemIndex, Y LDA.w Menu_ItemIndex, Y
STA.w $0303 STA.w $0303

7
Menu/menu_select_item.asm
View File

@@ -1,18 +1,19 @@
; ============================================================================= ; =============================================================================
; Item Selection Code ; Item Selection Code
; Decides which function to jump to.
Menu_ItemIndex: Menu_ItemIndex:
; Bow, Boomerang, Hookshot, Bombs, Deku, Bottle 1 ; Bow, Boomerang, Hookshot, Bombs, Deku, Bottle 1
db $03, $02, $0E, $01, $11, $0B db $03, $02, $0E, $01, $11, $0B
; Hammer, Lamp, Fire Rod, Ice Rod, Zora, Bottle 2 ; Hammer, Lamp, Fire Rod, Ice Rod, Zora, Bottle 2
db $04, $09, $05, $06, $0F, $4B db $04, $09, $05, $06, $0F, $4B
; Wolf, Feather, Somaria, Byrna, Bunny Hood, Bottle3 ; Wolf, Feather, Somaria, Byrna, Bunny Hood, Bottle3
db $0B, $07, $12, $0D, $10, $8B db $08, $07, $12, $0D, $10, $8B
; Powder, Book, Ocarina, Mirror, Stone Mask, Bottle4 ; Powder, Book, Ocarina, Mirror, Stone Mask, Bottle4
db $0A, $0C, $08, $14, $13, $CB db $0A, $0C, $08, $14, $13, $CB
; ----------------------------------------------------------------------------- ; -----------------------------------------------------------------------------
; Decides which graphics is drawn
Menu_AddressIndex: Menu_AddressIndex:
db $7EF340 ; bow db $7EF340 ; bow
db $7EF341 ; boom db $7EF341 ; boom
@@ -26,7 +27,7 @@ Menu_AddressIndex:
db $7EF346 ; icerod db $7EF346 ; icerod
db $7EF347 ; Zora Mask db $7EF347 ; Zora Mask
db $7EF35D ; bottle2 db $7EF35D ; bottle2
db $7EF34F ; shovel db $7EF34C ; shovel 7EF34F
db $7EF34D ; feather db $7EF34D ; feather
db $7EF350 ; somaria db $7EF350 ; somaria
db $7EF351 ; byrna db $7EF351 ; byrna