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

Cleanup menu_draw and menu_text components

Browse Source
This commit is contained in:
scawful
2024-10-03 19:07:07 -04:00
parent 5170c4908f
commit 6fd5e047df
2 changed files with 51 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Menu/menu_draw.asm
View File

@@ -470,7 +470,6 @@ Menu_DrawBigKey:
{ {
LDA $040C : AND.w #$00FF : CMP.w #$00FF : BEQ .notInPalace LDA $040C : AND.w #$00FF : CMP.w #$00FF : BEQ .notInPalace
LSR A : TAX LSR A : TAX
; Check if we have the big key in this palace ; Check if we have the big key in this palace
LDA $7EF366 LDA $7EF366
@@ -508,7 +507,6 @@ Menu_DrawBigKey:
LDA $040C : AND.w #$00FF : CMP.w #$00FF : BEQ .notInPalaceAgain LDA $040C : AND.w #$00FF : CMP.w #$00FF : BEQ .notInPalaceAgain
LSR A : TAX LSR A : TAX
; Check if we have the map in this dungeon ; Check if we have the map in this dungeon
LDA $7EF368 LDA $7EF368
@@ -525,7 +523,6 @@ Menu_DrawBigKey:
.dontHaveMap .dontHaveMap
.notInPalaceAgain .notInPalaceAgain
RTS RTS
} }
@@ -535,11 +532,8 @@ Menu_DrawBigKey:
CheckPalaceItemPossession: CheckPalaceItemPossession:
{ {
SEP #$30 SEP #$30
LDA $040C : LSR A LDA $040C : LSR A
JSL UseImplicitRegIndexedLocalJumpTable JSL UseImplicitRegIndexedLocalJumpTable
dw .no_item dw .no_item
dw .no_item dw .no_item
dw .bow dw .bow
@@ -565,7 +559,6 @@ CheckPalaceItemPossession:
STZ $02 STZ $02
STZ $03 STZ $03
RTS RTS
.bow .bow
@@ -581,7 +574,6 @@ CheckPalaceItemPossession:
LDA.b #$01 : STA $02 LDA.b #$01 : STA $02
STZ $03 STZ $03
RTS RTS
.power_glove .power_glove
@@ -943,4 +935,3 @@ Menu_DrawCursor:
RTS RTS
} }
; =========================================================