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

Add Menu_CheckBottle routine for changing bottles

Browse Source
This commit is contained in:
scawful
2023-01-14 15:33:02 -06:00
parent 75c3f6e659
commit 7ec95afac7
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Menu/menu.asm
View File

@@ -59,7 +59,8 @@ Menu_Entry:
dw Menu_StatsScreen ; 06 dw Menu_StatsScreen ; 06
dw Menu_ScrollFrom ; 07 dw Menu_ScrollFrom ; 07
dw Menu_ScrollUp ; 08 dw Menu_ScrollUp ; 08
dw Menu_Exit ; 09 dw Menu_CheckBottle ; 09
dw Menu_Exit ; 0A
; ============================================================================= ; =============================================================================
; 00 MENU INIT GRAPHICS ; 00 MENU INIT GRAPHICS
@@ -117,6 +118,7 @@ Menu_UploadLeft:
JSR Menu_DrawItemName JSR Menu_DrawItemName
; INSERT PALETTE ------- ; INSERT PALETTE -------
LDX.w #$3E LDX.w #$3E
.loop .loop
LDA.w Menu_Palette, X LDA.w Menu_Palette, X
@@ -125,7 +127,9 @@ Menu_UploadLeft:
BPL .loop BPL .loop
SEP #$30 SEP #$30
;----------------------- ;-----------------------
LDA.b #$22 : STA.w $0116 LDA.b #$22 : STA.w $0116
LDA.b #$01 : STA.b $17 : STA.b $15 ; added for palette LDA.b #$01 : STA.b $17 : STA.b $15 ; added for palette
INC.w $0200 INC.w $0200
@@ -314,35 +318,35 @@ Menu_ScrollUp:
} }
; ============================================================================= ; =============================================================================
; Custome Bottle Code ; 09 CHECK BOTTLE
Menu_CheckBottle: Menu_CheckBottle:
{ {
;; 7F5021 7ED101 LDA.w $0202 : CMP.b #$06 : BNE .not_first
STZ.w $7F5021 LDA.b #$01 : BRA .prepare_bottle
LDA.w $0202 : CMP.b #$15 : BNE .not_shovel
LDA.b #$0001 : STA.w $7F5021
.not_shovel .not_first
LDA.w $0202 : CMP.b #$19 : BNE .not_flute LDA.w $0202 : CMP.b #$0C : BNE .not_second
LDA.w $7EF34C : JML $70A31D LDA.b #$02 : BRA .prepare_bottle
.not_flute .not_second
LDA.w $0202 : CMP.b #$12 : BNE .not_third
LDA.b #$03 : BRA .prepare_bottle
.not_third
LDA.w $0202 : CMP.b #$18 : BNE .not_any
LDA.b #$04 : BRA .prepare_bottle
.prepare_bottle
STA.l $7EF34F
.not_any
INC.w $0200
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 ; 0A MENU EXIT
Menu_Exit: Menu_Exit:
{ {

6
Menu/menu_select_item.asm
View File

@@ -7,11 +7,11 @@ Menu_ItemIndex:
; Bow, Boomerang, Hookshot, Bombs, Powder, Bottle 1 ; Bow, Boomerang, Hookshot, Bombs, Powder, Bottle 1
db $03, $02, $0E, $01, $0A, $0B db $03, $02, $0E, $01, $0A, $0B
; Hammer, Lamp, Fire Rod, Ice Rod, Mirror, Bottle 2 ; Hammer, Lamp, Fire Rod, Ice Rod, Mirror, Bottle 2
db $04, $09, $05, $06, $14, $4B db $04, $09, $05, $06, $14, $0B
; Ocarina, Book, Somaria, Byrna, Feather, Bottle3 ; Ocarina, Book, Somaria, Byrna, Feather, Bottle3
db $08, $0C, $12, $0D, $07, $8B db $08, $0C, $12, $0D, $07, $0B
; Deku, Zora, Wolf, Bunny Hood, Stone Mask, Bottle4 ; Deku, Zora, Wolf, Bunny Hood, Stone Mask, Bottle4
db $11, $0F, $08, $10, $13, $CB db $11, $0F, $08, $10, $13, $0B
; ----------------------------------------------------------------------------- ; -----------------------------------------------------------------------------
; Decides which graphics is drawn ; Decides which graphics is drawn