From e156bf92adc061ed6777af21d6ffdbbd6321467f Mon Sep 17 00:00:00 2001 From: Peter Ferrie Date: Mon, 23 Mar 2020 09:38:27 -0700 Subject: [PATCH] move games list, suppress CR, rebuild store after anim, don't show text page 2 --- src/4cade.a | 2 +- src/4cade.init.a | 4 ++-- src/parse.common.a | 2 ++ src/ui.animation.a | 1 + src/ui.search.mode.a | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/4cade.a b/src/4cade.a index fa6cdb457..e48a7eba1 100644 --- a/src/4cade.a +++ b/src/4cade.a @@ -122,7 +122,7 @@ gFXStore gDFXStore !word $6000 gSearchStore - !word $8000 + !word $8200 gSlideshowStore !word $0800 gGlobalPrefsStore diff --git a/src/4cade.init.a b/src/4cade.init.a index 7f808cc03..76f319237 100644 --- a/src/4cade.init.a +++ b/src/4cade.init.a @@ -360,10 +360,10 @@ CopyDevs +LDAY SRC ; (SRC) points to free space after the OKVS data structure we just created +STAY gGamesListStore ; save pointer to free space for next store - jsr LoadFile ; load games list file into $8000 + jsr LoadFile ; load games list file into $8200 !word kRootDirectory !word @kGameListConfFile -- !word $8000 +- !word $8200 jsr ParseGamesList ; parse games list into OKVS data structure in LC RAM bank !word gGamesListStore !word - diff --git a/src/parse.common.a b/src/parse.common.a index 7945f3028..a60b5af6f 100644 --- a/src/parse.common.a +++ b/src/parse.common.a @@ -131,5 +131,7 @@ IncAndGetChar bne + inc $FF + lda ($FE),y + cmp #$0D ; CR - hide it + beq IncAndGetChar .parseKeyValueDone rts diff --git a/src/ui.animation.a b/src/ui.animation.a index 2cebe854a..27d1eff29 100644 --- a/src/ui.animation.a +++ b/src/ui.animation.a @@ -60,6 +60,7 @@ MaybeAnimateTitle jsr Launch ; execute the animation + jsr BuildSearchStore jsr ResyncPage ; we don't know which HGR page is showing ; when the animation returns, so resync ; the current one with our OffscreenPage diff --git a/src/ui.search.mode.a b/src/ui.search.mode.a index 4010499b9..1b2f3337c 100644 --- a/src/ui.search.mode.a +++ b/src/ui.search.mode.a @@ -102,6 +102,7 @@ SearchMode stx gGameToLaunch ; $FF = no game selected jsr BuildSearchStore jsr Home ; clear screen (switches to text mode) + stx OffscreenPage ; don't show text page 2 by accident jsr OnInputChanged ; draw UI offscreen jsr HGRMode ; show HGR screen jsr ResyncPage