rename okvs_get_current to okvs_next_field

This commit is contained in:
4am
2021-11-09 12:41:15 -05:00
parent 819a17476c
commit 3d5241d09a
5 changed files with 11 additions and 11 deletions

View File

@@ -71,17 +71,17 @@ _gameToLaunchExit
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
FindGameInActionSlideshow FindGameInActionSlideshow
+ST16 gLastMegaAttractGame +ST16 gLastMegaAttractGame
jsr okvs_get_current ; (PTR) -> OKVS value (filename or empty string) jsr okvs_next_field ; (PTR) -> OKVS value (filename or empty string)
; Y=0 ; Y=0
lda (PTR), y lda (PTR), y
beq + beq +
+LD16 PTR +LD16 PTR
+ST16 gLastMegaAttractGame +ST16 gLastMegaAttractGame
+ jsr okvs_get_current_PTR_is_already_set ; (PTR) -> game display name + jsr okvs_next_field_PTR_is_already_set ; (PTR) -> game display name
+LD16 PTR ; A/Y -> game display name +LD16 PTR ; A/Y -> game display name
+ST16 SAVE ; (SAVE) -> game display name +ST16 SAVE ; (SAVE) -> game display name
FindGame FindGame
jsr okvs_get_current ; (PTR) -> game requirements bitfield jsr okvs_next_field ; (PTR) -> game requirements bitfield
; Y=0 ; Y=0
; check if game requires joystick ; check if game requires joystick

View File

@@ -168,7 +168,7 @@ KEYLEN = *+1
clc clc
@maybeGetValue @maybeGetValue
brk ; SMC brk ; SMC
jsr okvs_get_current jsr okvs_next_field
+LD16 PTR +LD16 PTR
clc clc
rts rts
@@ -384,10 +384,10 @@ okvs_iter_values
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; internal functions ; internal functions
okvs_get_current okvs_next_field
; out: Y = 0 ; out: Y = 0
+ST16 PTR +ST16 PTR
okvs_get_current_PTR_is_already_set okvs_next_field_PTR_is_already_set
jsr stepptr jsr stepptr
bne incptr bne incptr

View File

@@ -77,7 +77,7 @@ MiniAttractMode
jsr okvs_find jsr okvs_find
!word - !word -
+ !word $FDFD ; SMC + !word $FDFD ; SMC
jsr okvs_get_current jsr okvs_next_field
jsr SwitchToBank2 jsr SwitchToBank2
sty OKVS_CACHE sty OKVS_CACHE
ldy #4 ldy #4
@@ -113,7 +113,7 @@ MiniAttractMode
+LDADDR - +LDADDR -
jsr okvs_nth ; get the next module on the list jsr okvs_nth ; get the next module on the list
+ST16 SAVE +ST16 SAVE
jsr okvs_get_current ; get module type jsr okvs_next_field ; get module type
; Y = 0 ; Y = 0
iny iny
lda (PTR),y lda (PTR),y

View File

@@ -88,8 +88,8 @@ LoadGameTitleOffscreen
+ST16 @fname +ST16 @fname
bit MachineStatus ; if < 128K, don't bother checking for DHGR title bit MachineStatus ; if < 128K, don't bother checking for DHGR title
bvc @hgr bvc @hgr
jsr okvs_get_current jsr okvs_next_field
jsr okvs_get_current_PTR_is_already_set jsr okvs_next_field_PTR_is_already_set
; (PTR) -> length-prefixed game info bitfield ; (PTR) -> length-prefixed game info bitfield
; Y = 0 ; Y = 0
iny ; Y = 1 iny ; Y = 1

View File

@@ -125,7 +125,7 @@ DrawUI
jsr GetGameToLaunch ; get current game, if any jsr GetGameToLaunch ; get current game, if any
bcs @doneWithLine2 ; if no game, nothing more to do on UI line 2 bcs @doneWithLine2 ; if no game, nothing more to do on UI line 2
; A/Y -> key of current game (in gSearchStore) ; A/Y -> key of current game (in gSearchStore)
jsr okvs_get_current ; (PTR) -> display name of current game jsr okvs_next_field ; (PTR) -> display name of current game
; Y = 0 ; Y = 0
lda (PTR), y lda (PTR), y
tay tay