From 2c3aa275a16f9b58ee4b20d32e1470d58e0a5345 Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Wed, 29 Jul 2020 12:15:22 -0400
Subject: [PATCH] do not rage against the machine

---
 src/constants.a      |  1 +
 src/ui.browse.mode.a | 10 +++++-----
 src/ui.reboot.a      | 16 ++++++++--------
 src/ui.search.mode.a | 10 +++++-----
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/constants.a b/src/constants.a
index 81199f6f0..f42e9e095 100644
--- a/src/constants.a
+++ b/src/constants.a
@@ -53,6 +53,7 @@ DHIRESOFF =    $C05F      ; double hi-res off switch
 ; (prefixed because so much of the program runs from LC RAM, so don't call
 ; these without thinking about memory banks first)
 ROM_TEXT2COPY =$F962      ; turn on alternate display mode on IIgs
+ROM_REBOOT =   $FAA6
 ROM_TEXT =     $FB2F
 ROM_MACHINEID =$FBB3
 ROM_HOME =     $FC58
diff --git a/src/ui.browse.mode.a b/src/ui.browse.mode.a
index 6d76e2e59..2a2075876 100644
--- a/src/ui.browse.mode.a
+++ b/src/ui.browse.mode.a
@@ -35,7 +35,7 @@ kBrowseCredits  = 7
 kBrowseCheat    = 8
 kSoftBell       = 9 ; must match kInputError
 kBrowseJoystick = 10
-kBrowseRageQuit = 11
+kBrowseQuit     = 11
 
          ldy   #kNumBrowseKeys
 -        dey
@@ -131,7 +131,7 @@ BrowseDispatchTableLo
          !byte <OnBrowseCheat
          !byte <SoftBell
          !byte <Joystick
-         !byte <OnRageQuit
+         !byte <OnQuit
 BrowseDispatchTableHi
          !byte >OnBrowseSearch
          !byte >OnBrowsePrevious
@@ -144,7 +144,7 @@ BrowseDispatchTableHi
          !byte >OnBrowseCheat
          !byte >SoftBell
          !byte >Joystick
-         !byte >OnRageQuit
+         !byte >OnQuit
 
 kNumBrowseKeys = 14
                                      ; number of entries in next 2 tables (each)
@@ -162,7 +162,7 @@ BrowseKeys
          !byte $8B                   ; up arrow = previous
          !byte $88                   ; left arrow = previous
          !byte $90                   ; Ctrl-P = launch joystick calibration program
-         !byte $92                   ; Ctrl-R = reboot
+         !byte $91                   ; Ctrl-Q = quit
 BrowseKeyDispatch
          !byte kBrowseCheat
          !byte kBrowseCredits
@@ -177,7 +177,7 @@ BrowseKeyDispatch
          !byte kBrowsePrevious
          !byte kBrowsePrevious
          !byte kBrowseJoystick
-         !byte kBrowseRageQuit
+         !byte kBrowseQuit
 
 GameCount
          !word 0
diff --git a/src/ui.reboot.a b/src/ui.reboot.a
index 71a8c6b0b..49c78bfd1 100644
--- a/src/ui.reboot.a
+++ b/src/ui.reboot.a
@@ -1,23 +1,23 @@
 ;license:MIT
-;(c) 2020 by qkumba
+;(c) 2020 by qkumba/4am
 ;
 ; reboot system
 ;
 ; Public functions
-; - OnRageQuit
+; - OnQuit
 ;
 
 ;------------------------------------------------------------------------------
-; OnRageQuit
+; OnQuit
 ; reboot system
 ;
 ; in:    none
 ; out:   nothing
 ;------------------------------------------------------------------------------
-OnRageQuit
+OnQuit
+         jsr   SwitchToBank2
+         jsr   EnableAcceleratorAndSwitchToBank1
          inc   $101       ; bank in ROM
-         lda   #$A6
-         sta   $104
-         lda   #$FA
-         sta   $105       ; JMP $FAA6
+         +LDADDR ROM_REBOOT
+         +ST16 $104
          jmp   $100
diff --git a/src/ui.search.mode.a b/src/ui.search.mode.a
index 38d927900..cf69fde8e 100644
--- a/src/ui.search.mode.a
+++ b/src/ui.search.mode.a
@@ -20,7 +20,7 @@ kInputCredits  = 7
 kInputCheat    = 8
 kInputError    = 9
 kInputJoystick = 10
-kInputRageQuit = 11
+kInputQuit     = 11
 
 InputDispatchTableLo
          !byte <OnSearch
@@ -34,7 +34,7 @@ InputDispatchTableLo
          !byte <OnCheat
          !byte <OnError
          !byte <Joystick
-         !byte <OnRageQuit
+         !byte <OnQuit
 InputDispatchTableHi
          !byte >OnSearch
          !byte >OnClear
@@ -47,7 +47,7 @@ InputDispatchTableHi
          !byte >OnCheat
          !byte >OnError
          !byte >Joystick
-         !byte >OnRageQuit
+         !byte >OnQuit
 
 kNumInputKeys = 12
                                      ; number of entries in next 2 tables (each)
@@ -65,7 +65,7 @@ InputKeys
          !byte $9B                   ; Esc = clear input buffer (if any)
                                      ;   or switch to mega attract mode
          !byte $90                   ; Ctrl-P = launch joystick calibration program
-         !byte $92                   ; Ctrl-R = reboot
+         !byte $91                   ; Ctrl-Q = quit
 InputKeyDispatch
          !byte kInputCheat
          !byte kInputCredits
@@ -78,7 +78,7 @@ InputKeyDispatch
          !byte kInputLaunch
          !byte kInputClear
          !byte kInputJoystick
-         !byte kInputRageQuit
+         !byte kInputQuit
 
 .noKeyMatch
          jsr   IsSearchKey