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

remove RingBox and SongMenu DeleteCursor

Browse Source
This commit is contained in:
scawful
2024-07-08 16:55:26 -04:00
parent f1ca9136dc
commit b48324805b
1 changed files with 13 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Menu/menu.asm
View File

@@ -543,7 +543,9 @@ Menu_SongMenu:
.move_right .move_right
.move_up .move_up
JSR SongMenu_DeleteCursor REP #$30
LDX.w Menu_SongIconCursorPositions-2, Y
JSR Menu_DeleteCursor_AltEntry
LDA.w $030F : CMP.b #$04 : BEQ .reset LDA.w $030F : CMP.b #$04 : BEQ .reset
INC.w $030F INC.w $030F
@@ -570,7 +572,10 @@ Menu_SongMenu:
.move_left .move_left
.move_down .move_down
JSR SongMenu_DeleteCursor REP #$30
LDX.w Menu_SongIconCursorPositions-2, Y
JSR Menu_DeleteCursor_AltEntry
LDA.w $030F : CMP.b #$01 : BEQ .reset LDA.w $030F : CMP.b #$01 : BEQ .reset
DEC.w $030F DEC.w $030F
LDA $030F LDA $030F
@@ -599,21 +604,6 @@ Menu_SongMenu:
RTS RTS
} }
SongMenu_DeleteCursor:
{
REP #$30
LDX.w Menu_SongIconCursorPositions-2, Y
LDA.w #$20F5
STA.w $1108, X : STA.w $1148, X
STA.w $114E, X : STA.w $110E, X
STA.w $11C8, X : STA.w $1188, X
STA.w $118E, X : STA.w $11CE, X
SEP #$30
STZ $0207
RTS
}
Menu_SongIconCursorPositions: Menu_SongIconCursorPositions:
dw menu_offset(8,4) dw menu_offset(8,4)
dw menu_offset(8,8) dw menu_offset(8,8)
@@ -638,13 +628,17 @@ Menu_RingBox:
.move_up .move_up
.move_right .move_right
JSR RingMenu_DeleteCursor REP #$30
LDX.w Menu_RingIconCursorPositions-2, Y
JSR Menu_DeleteCursor_AltEntry
INC.w $020B INC.w $020B
LDA.w $020B : CMP.b #$06 : BCS .zero LDA.w $020B : CMP.b #$06 : BCS .zero
BRA .continue BRA .continue
.move_left .move_left
.move_down .move_down
JSR RingMenu_DeleteCursor REP #$30
LDX.w Menu_RingIconCursorPositions-2, Y
JSR Menu_DeleteCursor_AltEntry
LDA.w $020B : CMP.b #$00 : BEQ .continue LDA.w $020B : CMP.b #$00 : BEQ .continue
DEC.w $020B DEC.w $020B
BRA .continue BRA .continue
@@ -667,21 +661,6 @@ Menu_RingBox:
RTS RTS
} }
RingMenu_DeleteCursor:
{
REP #$30
LDX.w Menu_RingIconCursorPositions-2, Y
LDA.w #$20F5
STA.w $1108, X : STA.w $1148, X
STA.w $114E, X : STA.w $110E, X
STA.w $11C8, X : STA.w $1188, X
STA.w $118E, X : STA.w $11CE, X
SEP #$30
STZ $0207
RTS
}
Menu_RingIconCursorPositions: Menu_RingIconCursorPositions:
dw menu_offset(8,6) dw menu_offset(8,6)
dw menu_offset(8,10) dw menu_offset(8,10)