diff --git a/src/parse.prefs.a b/src/parse.prefs.a index d29a588..3b11b9e 100644 --- a/src/parse.prefs.a +++ b/src/parse.prefs.a @@ -44,6 +44,8 @@ kLastPlayed ;------------------------------------------------------------------------------ ; LoadGlobalPreferences +; load global options and state (including current game) from file and populate +; global prefs store ; ; in: current ProDOS prefix is the same as the PITCH.DARK.CONF file ; out: all registers and flags clobbered @@ -67,6 +69,9 @@ LoadGlobalPreferences ;------------------------------------------------------------------------------ ; SaveGlobalPreferences +; save global options and state to file +; note: this function is inefficient because I want the preferences file to +; look a certain way at all times ; ; in: current ProDOS prefix is the same as the PITCH.DARK.CONF file ; out: all registers and flags clobbered diff --git a/src/ui.common.a b/src/ui.common.a index f3a6e2e..e3bd015 100644 --- a/src/ui.common.a +++ b/src/ui.common.a @@ -139,7 +139,7 @@ PrintAt ;------------------------------------------------------------------------------ ; SimulateClick -; select, focus, activate, and unfocus a WeeGUI view +; focus, activate, and unfocus a WeeGUI view ; ; in: WeeGUI initialized ; A contains WeeGUI view ID @@ -147,8 +147,6 @@ PrintAt ;------------------------------------------------------------------------------ !zone { SimulateClick - ldx #WGSelectView - jsr WeeGUI ldx #WGViewFocus jsr WeeGUI ldx #WGViewFocusAction diff --git a/src/ui.main.keys.a b/src/ui.main.keys.a index e36a974..def0f18 100644 --- a/src/ui.main.keys.a +++ b/src/ui.main.keys.a @@ -89,6 +89,8 @@ HandleKey tax ldy gViewInUse,x beq .notFound + ldx #WGSelectView + jsr WeeGUI .focusAndDoAction jmp SimulateClick @@ -211,4 +213,4 @@ callback_boxart = DisplayArtwork callback_options = OptionsDialog callback_clues = LaunchInterpreterWithHints callback_play = LaunchInterpreterWithGame -callback_resume = LaunchInterpreterWithGame +callback_resume = ResumeDialog diff --git a/src/ui.options.a b/src/ui.options.a index b531240..a9eadc2 100644 --- a/src/ui.options.a +++ b/src/ui.options.a @@ -127,6 +127,8 @@ HandleOptionsKey jmp SoftBell .foundKey lda .keys+1,x + ldx #WGSelectView + jsr WeeGUI jmp SimulateClick callback_options_ok