6 files changed, 1013 insertions, 195 deletions
diff --git a/Data/Sys/GameSettings/RUUE01r0.ini b/Data/Sys/GameSettings/RUUE01r0.ini
index b5bbc61784..a016e9c569 100644
--- a/Data/Sys/GameSettings/RUUE01r0.ini
+++ b/Data/Sys/GameSettings/RUUE01r0.ini
@@ -12,39 +12,168 @@
 [Gecko]
 # Add gecko cheats here.
 
-$!!! - README
+$!!! - CONTROL SCHEME README
 *It is required you configure your Wii Remote with a mapped Classic Controller extension!
-*Left Stick variant toggles between movement and IR input (recommended!).
-*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
-*Pointer mode is activated intelligently, but can be forced on/off with the L button.
-*3C75C28F (float 0.015) sets cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
-*To use the in-game keyboard, it is recommended to connect a real keyboard over using the pointer.
-*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+*Two schemes are provided: GBAtemp and ACCF: Deluxe. The latter is likely recommended for most users!
+*Cursor mode is activated intelligently, but can be forced on/off with the L button.
+*Home Menu works as normal, but remember to enable the Cursor with L.
+*3C75C28F (float 0.015) sets Cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
+*For extensive typing, it is recommended to connect a real keyboard over using the pointer.
+
+$!!! - CONTROL SCHEME ACCF: DELUXE
+*Remote & Nunchuk     Classic Cont.   Game Function
+*--------------------------------------------------------------------
+*Remote Home          Home            Open/Close Home Menu
+*Remote D-Pad Up      D-Pad Up        Change Camera
+*Remote D-Pad L/R     D-Pad L/R       Change Tool
+*Remote D-Pad Down    D-Pad Down      Put Away Tool
+*Remote A             A               Confirm, Action
+*Remote B             B               Cancel, Run, Pick Up Item
+*Remote Plus          X               Open/Close Map/Next Tab
+*Remote Minus         Y               Open/Close Inventory/Prev Tab
+*Remote 1             Minus           Take Photo
+*Remote 2             Plus            Open/Close Photos
+*Remote Pointer       L               Toggle Cursor
+*Remote Pointer       Right Stick     Move Cursor
+*Nunchuk Stick        Left Stick      Movement
+*Nunchuk C            R               Confirm, Action
+*Nunchuk Z            ZL/ZR           Cancel, Run, Pick Up Item    	
+*          
+*Toggle Cursor with L, use Right Stick to control it.
+*More information: https://aurumsmods.com/accfdeluxe/classic_controller
 
-$!!! - CONTROL SCHEME
-*Remote & Nunchuk     Classic Controller   Game Function
+$!!! - CONTROL SCHEME GBATEMP
+*Remote & Nunchuk     Classic Cont.   Game Function
 *--------------------------------------------------------------------
-*Remote Home          Home                 Open/Close Home Menu
-*Remote D-Pad         D-Pad                Up: Change Camera
-* ---                  ---                 Left/Right: Change Tool
-* ---                  ---                 Down: Put Away Tool
-*Remote A             A                    Confirm, Action
-*Remote B             B                    Cancel, Run, Pick Up Item
-*Remote +             Plus                 Open/Close Map
-* ---                 ZR                   Next Tab
-*Remote -             X                    Open/Close Inventory
-* ---                 ZL                   Previous Tab
-*Remote 1             Minus                Take Photo
-*Remote 2             Y                    Open/Close Photos
-*Nunchuk Stick        Left Stick           Movement
-*Nunchuk C            N/A (Use A)          Confirm, Action
-*Nunchuk Z            R                    Cancel, Run, Pick Up Item
-*Remote Pointer       L (Toggle)           Move Cursor
+*Remote Home          Home            Open/Close Home Menu
+*Remote D-Pad Up      D-Pad Up        Change Camera
+*Remote D-Pad L/R     D-Pad L/R       Change Tool
+*Remote D-Pad Down    D-Pad Down      Put Away Tool
+*Remote A             A               Confirm, Action
+*Remote B             B               Cancel, Run, Pick Up Item
+*Remote Plus          Plus            Open/Close Map
+*Remote Plus          ZR              Next Tab
+*Remote Minus         X               Open/Close Inventory
+*Remote Minus         ZL              Previous Tab
+*Remote 1             Minus           Take Photo
+*Remote 2             Y               Open/Close Photos
+*Remote Pointer       L               Toggle Cursor
+*Remote Pointer       R/L Stick*      Move Cursor
+*Nunchuk Stick        Left Stick      Movement
+*Nunchuk C            N/A (Use A)     Confirm, Action
+*Nunchuk Z            R               Cancel, Run, Pick Up Item
 *          
-*For the Pointer, use Left or Right Stick, depending on code used.
-*Home Menu works as normal, but remember to enable the pointer with L.
+*Toggle Cursor with L. R/L Stick to control, depending on code used.
+*Right Stick variant allows Cursor movement while walking, but this is not a real advantage and may feel less convenient.
+*Left Stick variant uses toggle, likely recommended for most users.
+*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+
+$QOL - Classic Controller Support (ACCF: Deluxe) v1.2 [Vague Rant, crediar, TechieSaru]
+C20FA624 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA68C 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CE160 48000010
+C2443CE4 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C2443D00 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23BE750 0000001A
+88A40028 2C050002
+408200C0 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803A 60C6D338
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450078 40820008
+EC4200B2 C065007C
+C0030020 C0230074
+FC211024 4800002D
+D0030020 C0030024
+C0230078 FC200850
+48000019 D0030024
+8001000C 7C0803A6
+38210010 4E800020
+FC0100FA C0250080
+FC000800 4180000C
+FC000890 48000014
+FC200850 FC000800
+41810008 FC000890
+4E800020 3FAAAAAB
+3C75C28F 3F800000
+9421FFC0 00000000
+C23BF784 00000039
+901F0068 811F0060
+48000071 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800004D
+80DF0004 7D083378
+911F0004 80DF0074
+48000105 80DF0078
+480000FD 71060040
+41820010 38C00002
+98DF005E 48000164
+71060080 4182015C
+88DF005E 68C60002
+98DF005E 4800014C
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E70010 71060020
+41820008 60E71000
+71062000 41820014
+3C608000 38C00000
+90C32684 60E70080
+71060200 41820008
+60E70800 71060080
+41820008 60E72000
+71060004 41820008
+60E72000 71061000
+41820008 60E70200
+71060400 41820008
+60E70100 7CE83B78
+4E800020 3C608000
+2C060000 4082003C
+3CC0806E 88C6241E
+2C060002 40820060
+80C32684 38C60001
+90C32684 38E00180
+7C063800 40820048
+38C00000 90C32684
+61080080 48000038
+3CE03F40 7C063800
+41800014 38E00000
+90E32684 61080040
+4800001C 7CC600D0
+7C063800 41800010
+38E00000 90E32684
+61080040 4E800020
+60000000 00000000
+*See README and CONTROL SCHEME for further instructions.
 
-$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1 [Vague Rant, crediar]
+$QOL - Classic Controller Support (GBAtemp - Left Stick Cursor) v1.1 [Vague Rant, crediar]
 C20FA624 00000003
 2C030002 40820008
 3863FFFF 3803FF04
@@ -130,10 +259,10 @@ C23BF784 00000026
 71061000 41820008
 60E70200 7CE83B78
 4E800020 00000000
-*Left Stick variant toggles between movement and IR input (recommended!).
+*Left Stick variant toggles between movement and cursor.
 *See README and CONTROL SCHEME for further instructions.
 
-$QOL - Classic Controller Support (Pointer on Right Stick) v1.1 [Vague Rant, crediar]
+$QOL - Classic Controller Support (GBAtemp - Right Stick Cursor) v1.1 [Vague Rant, crediar]
 C20FA624 00000003
 2C030002 40820008
 3863FFFF 3803FF04
@@ -227,6 +356,10 @@ $QOL - Disable Grass Deterioration [Seth@WiiPlaza, Fox_McCloud45]
 *Does not modify pre-existing save file data; grass will still be deteriorated when disabled.
 *While active, save file data remains static; grass will neither heal nor deteriorate in save data.
 
+$QOL - Enable Fast Text
+0419D06C 38000001
+0419D700 38000001
+
 $QOL - Set Grass Type to Green Darkest (Rain) [Seth@WiiPlaza, hetoan2]
 04162974 38600000
 $QOL - Set Grass Type to Green Lightest (Rain) [Seth@WiiPlaza, hetoan2]
@@ -249,6 +382,8 @@ $QOL - Set Grass Type to Snowy w/ Green Trees (Snow) [Seth@WiiPlaza, hetoan2]
 04162974 38600015s
 
 [Gecko_RetroAchievements_Verified]
-$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1
-$QOL - Classic Controller Support (Pointer on Right Stick) v1.1
-$QOL - Disable Grass Deterioration
-\ No newline at end of file
+$QOL - Classic Controller Support (ACCF: Deluxe) v1.2
+$QOL - Classic Controller Support (GBAtemp - Left Stick Cursor) v1.1
+$QOL - Classic Controller Support (GBAtemp - Right Stick Cursor) v1.1
+$QOL - Disable Grass Deterioration
+$QOL - Enable Fast Text
+\ No newline at end of file
diff --git a/Data/Sys/GameSettings/RUUE01r1.ini b/Data/Sys/GameSettings/RUUE01r1.ini
index 279c9bc96c..62ae160058 100644
--- a/Data/Sys/GameSettings/RUUE01r1.ini
+++ b/Data/Sys/GameSettings/RUUE01r1.ini
@@ -12,39 +12,168 @@
 [Gecko]
 # Add gecko cheats here.
 
-$!!! - README
+$!!! - CONTROL SCHEME README
 *It is required you configure your Wii Remote with a mapped Classic Controller extension!
-*Left Stick variant toggles between movement and IR input (recommended!).
-*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
-*Pointer mode is activated intelligently, but can be forced on/off with the L button.
-*3C75C28F (float 0.015) sets cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
-*To use the in-game keyboard, it is recommended to connect a real keyboard over using the pointer.
-*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+*Two schemes are provided: GBAtemp and ACCF: Deluxe. The latter is likely recommended for most users!
+*Cursor mode is activated intelligently, but can be forced on/off with the L button.
+*Home Menu works as normal, but remember to enable the Cursor with L.
+*3C75C28F (float 0.015) sets Cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
+*For extensive typing, it is recommended to connect a real keyboard over using the pointer.
+
+$!!! - CONTROL SCHEME ACCF: DELUXE
+*Remote & Nunchuk     Classic Cont.   Game Function
+*--------------------------------------------------------------------
+*Remote Home          Home            Open/Close Home Menu
+*Remote D-Pad Up      D-Pad Up        Change Camera
+*Remote D-Pad L/R     D-Pad L/R       Change Tool
+*Remote D-Pad Down    D-Pad Down      Put Away Tool
+*Remote A             A               Confirm, Action
+*Remote B             B               Cancel, Run, Pick Up Item
+*Remote Plus          X               Open/Close Map/Next Tab
+*Remote Minus         Y               Open/Close Inventory/Prev Tab
+*Remote 1             Minus           Take Photo
+*Remote 2             Plus            Open/Close Photos
+*Remote Pointer       L               Toggle Cursor
+*Remote Pointer       Right Stick     Move Cursor
+*Nunchuk Stick        Left Stick      Movement
+*Nunchuk C            R               Confirm, Action
+*Nunchuk Z            ZL/ZR           Cancel, Run, Pick Up Item    	
+*          
+*Toggle Cursor with L, use Right Stick to control it.
+*More information: https://aurumsmods.com/accfdeluxe/classic_controller
 
-$!!! - CONTROL SCHEME
-*Remote & Nunchuk     Classic Controller   Game Function
+$!!! - CONTROL SCHEME GBATEMP
+*Remote & Nunchuk     Classic Cont.   Game Function
 *--------------------------------------------------------------------
-*Remote Home          Home                 Open/Close Home Menu
-*Remote D-Pad         D-Pad                Up: Change Camera
-* ---                  ---                 Left/Right: Change Tool
-* ---                  ---                 Down: Put Away Tool
-*Remote A             A                    Confirm, Action
-*Remote B             B                    Cancel, Run, Pick Up Item
-*Remote +             Plus                 Open/Close Map
-* ---                 ZR                   Next Tab
-*Remote -             X                    Open/Close Inventory
-* ---                 ZL                   Previous Tab
-*Remote 1             Minus                Take Photo
-*Remote 2             Y                    Open/Close Photos
-*Nunchuk Stick        Left Stick           Movement
-*Nunchuk C            N/A (Use A)          Confirm, Action
-*Nunchuk Z            R                    Cancel, Run, Pick Up Item
-*Remote Pointer       L (Toggle)           Move Cursor
+*Remote Home          Home            Open/Close Home Menu
+*Remote D-Pad Up      D-Pad Up        Change Camera
+*Remote D-Pad L/R     D-Pad L/R       Change Tool
+*Remote D-Pad Down    D-Pad Down      Put Away Tool
+*Remote A             A               Confirm, Action
+*Remote B             B               Cancel, Run, Pick Up Item
+*Remote Plus          Plus            Open/Close Map
+*Remote Plus          ZR              Next Tab
+*Remote Minus         X               Open/Close Inventory
+*Remote Minus         ZL              Previous Tab
+*Remote 1             Minus           Take Photo
+*Remote 2             Y               Open/Close Photos
+*Remote Pointer       L               Toggle Cursor
+*Remote Pointer       R/L Stick*      Move Cursor
+*Nunchuk Stick        Left Stick      Movement
+*Nunchuk C            N/A (Use A)     Confirm, Action
+*Nunchuk Z            R               Cancel, Run, Pick Up Item
 *          
-*For the Pointer, use Left or Right Stick, depending on code used.
-*Home Menu works as normal, but remember to enable the pointer with L.
+*Toggle Cursor with L. R/L Stick to control, depending on code used.
+*Right Stick variant allows Cursor movement while walking, but this is not a real advantage and may feel less convenient.
+*Left Stick variant uses toggle, likely recommended for most users.
+*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
 
-$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1 [Vague Rant, crediar]
+$QOL - Classic Controller Support (ACCF: Deluxe) v1.2 [Vague Rant, crediar, TechieSaru]
+C20FA624 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA68C 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CE284 48000010
+C2443F4C 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C2443F68 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23BE9B8 0000001A
+88A40028 2C050002
+408200C0 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803A 60C6D5A0
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450078 40820008
+EC4200B2 C065007C
+C0030020 C0230074
+FC211024 4800002D
+D0030020 C0030024
+C0230078 FC200850
+48000019 D0030024
+8001000C 7C0803A6
+38210010 4E800020
+FC0100FA C0250080
+FC000800 4180000C
+FC000890 48000014
+FC200850 FC000800
+41810008 FC000890
+4E800020 3FAAAAAB
+3C75C28F 3F800000
+9421FFC0 00000000
+C23BF9EC 00000039
+901F0068 811F0060
+48000071 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800004D
+80DF0004 7D083378
+911F0004 80DF0074
+48000105 80DF0078
+480000FD 71060040
+41820010 38C00002
+98DF005E 48000164
+71060080 4182015C
+88DF005E 68C60002
+98DF005E 4800014C
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E70010 71060020
+41820008 60E71000
+71062000 41820014
+3C608000 38C00000
+90C32684 60E70080
+71060200 41820008
+60E70800 71060080
+41820008 60E72000
+71060004 41820008
+60E72000 71061000
+41820008 60E70200
+71060400 41820008
+60E70100 7CE83B78
+4E800020 3C608000
+2C060000 4082003C
+3CC0806E 88C6269E
+2C060002 40820060
+80C32684 38C60001
+90C32684 38E00180
+7C063800 40820048
+38C00000 90C32684
+61080080 48000038
+3CE03F40 7C063800
+41800014 38E00000
+90E32684 61080040
+4800001C 7CC600D0
+7C063800 41800010
+38E00000 90E32684
+61080040 4E800020
+60000000 00000000
+*See README and CONTROL SCHEME for further instructions.
+
+$QOL - Classic Controller Support (GBAtemp - Left Stick Cursor) v1.1 [Vague Rant, crediar]
 C20FA624 00000003
 2C030002 40820008
 3863FFFF 3803FF04
@@ -130,10 +259,10 @@ C23BF9EC 00000026
 71061000 41820008
 60E70200 7CE83B78
 4E800020 00000000
-*Left Stick variant toggles between movement and IR input (recommended!).
+*Left Stick variant toggles between movement and cursor.
 *See README and CONTROL SCHEME for further instructions.
 
-$QOL - Classic Controller Support (Pointer on Right Stick) v1.1 [Vague Rant, crediar]
+$QOL - Classic Controller Support (GBAtemp - Right Stick Cursor) v1.1 [Vague Rant, crediar]
 C20FA624 00000003
 2C030002 40820008
 3863FFFF 3803FF04
@@ -220,6 +349,20 @@ C23BF9EC 00000026
 *Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
 *See README and CONTROL SCHEME for further instructions.
 
+$QOL - Disable Grass Deterioration [Seth@WiiPlaza, Fox_McCloud45, TechieSaru]
+042B6410 60000000
+*Prevents grass from deteriorating when walked on.
+*Hides deteriorating grass patches, e.g., around houses.
+*Does not modify pre-existing save file data; grass will still be deteriorated when disabled.
+*While active, save file data remains static; grass will neither heal nor deteriorate in save data.
+
+$QOL - Enable Fast Text
+0419D190 38000001
+0419D824 38000001
+
 [Gecko_RetroAchievements_Verified]
-$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1
-$QOL - Classic Controller Support (Pointer on Right Stick) v1.1
-\ No newline at end of file
+$QOL - Classic Controller Support (ACCF: Deluxe) v1.2
+$QOL - Classic Controller Support (GBAtemp - Left Stick Cursor) v1.1
+$QOL - Classic Controller Support (GBAtemp - Right Stick Cursor) v1.1
+$QOL - Disable Grass Deterioration
+$QOL - Enable Fast Text
+\ No newline at end of file
diff --git a/Data/Sys/GameSettings/RUUJ01r1.ini b/Data/Sys/GameSettings/RUUJ01r1.ini
index 7bea0ebcab..e56ddee6f9 100644
--- a/Data/Sys/GameSettings/RUUJ01r1.ini
+++ b/Data/Sys/GameSettings/RUUJ01r1.ini
@@ -12,39 +12,168 @@
 [Gecko]
 # Add gecko cheats here.
 
-$!!! - README
+$!!! - CONTROL SCHEME README
 *It is required you configure your Wii Remote with a mapped Classic Controller extension!
-*Left Stick variant toggles between movement and IR input (recommended!).
-*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
-*Pointer mode is activated intelligently, but can be forced on/off with the L button.
-*3C75C28F (float 0.015) sets cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
-*To use the in-game keyboard, it is recommended to connect a real keyboard over using the pointer.
-*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+*Two schemes are provided: GBAtemp and ACCF: Deluxe. The latter is likely recommended for most users!
+*Cursor mode is activated intelligently, but can be forced on/off with the L button.
+*Home Menu works as normal, but remember to enable the Cursor with L.
+*3C75C28F (float 0.015) sets Cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
+*For extensive typing, it is recommended to connect a real keyboard over using the pointer.
+
+$!!! - CONTROL SCHEME ACCF: DELUXE
+*Remote & Nunchuk     Classic Cont.   Game Function
+*--------------------------------------------------------------------
+*Remote Home          Home            Open/Close Home Menu
+*Remote D-Pad Up      D-Pad Up        Change Camera
+*Remote D-Pad L/R     D-Pad L/R       Change Tool
+*Remote D-Pad Down    D-Pad Down      Put Away Tool
+*Remote A             A               Confirm, Action
+*Remote B             B               Cancel, Run, Pick Up Item
+*Remote Plus          X               Open/Close Map/Next Tab
+*Remote Minus         Y               Open/Close Inventory/Prev Tab
+*Remote 1             Minus           Take Photo
+*Remote 2             Plus            Open/Close Photos
+*Remote Pointer       L               Toggle Cursor
+*Remote Pointer       Right Stick     Move Cursor
+*Nunchuk Stick        Left Stick      Movement
+*Nunchuk C            R               Confirm, Action
+*Nunchuk Z            ZL/ZR           Cancel, Run, Pick Up Item    	
+*          
+*Toggle Cursor with L, use Right Stick to control it.
+*More information: https://aurumsmods.com/accfdeluxe/classic_controller
 
-$!!! - CONTROL SCHEME
-*Remote & Nunchuk     Classic Controller   Game Function
+$!!! - CONTROL SCHEME GBATEMP
+*Remote & Nunchuk     Classic Cont.   Game Function
 *--------------------------------------------------------------------
-*Remote Home          Home                 Open/Close Home Menu
-*Remote D-Pad         D-Pad                Up: Change Camera
-* ---                  ---                 Left/Right: Change Tool
-* ---                  ---                 Down: Put Away Tool
-*Remote A             A                    Confirm, Action
-*Remote B             B                    Cancel, Run, Pick Up Item
-*Remote +             Plus                 Open/Close Map
-* ---                 ZR                   Next Tab
-*Remote -             X                    Open/Close Inventory
-* ---                 ZL                   Previous Tab
-*Remote 1             Minus                Take Photo
-*Remote 2             Y                    Open/Close Photos
-*Nunchuk Stick        Left Stick           Movement
-*Nunchuk C            N/A (Use A)          Confirm, Action
-*Nunchuk Z            R                    Cancel, Run, Pick Up Item
-*Remote Pointer       L (Toggle)           Move Cursor
+*Remote Home          Home            Open/Close Home Menu
+*Remote D-Pad Up      D-Pad Up        Change Camera
+*Remote D-Pad L/R     D-Pad L/R       Change Tool
+*Remote D-Pad Down    D-Pad Down      Put Away Tool
+*Remote A             A               Confirm, Action
+*Remote B             B               Cancel, Run, Pick Up Item
+*Remote Plus          Plus            Open/Close Map
+*Remote Plus          ZR              Next Tab
+*Remote Minus         X               Open/Close Inventory
+*Remote Minus         ZL              Previous Tab
+*Remote 1             Minus           Take Photo
+*Remote 2             Y               Open/Close Photos
+*Remote Pointer       L               Toggle Cursor
+*Remote Pointer       R/L Stick*      Move Cursor
+*Nunchuk Stick        Left Stick      Movement
+*Nunchuk C            N/A (Use A)     Confirm, Action
+*Nunchuk Z            R               Cancel, Run, Pick Up Item
 *          
-*For the Pointer, use Left or Right Stick, depending on code used.
-*Home Menu works as normal, but remember to enable the pointer with L.
+*Toggle Cursor with L. R/L Stick to control, depending on code used.
+*Right Stick variant allows Cursor movement while walking, but this is not a real advantage and may feel less convenient.
+*Left Stick variant uses toggle, likely recommended for most users.
+*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+
+$QOL - Classic Controller Support (ACCF: Deluxe) v1.2 [Vague Rant, crediar, TechieSaru]
+C20FA8DC 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA944 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CE300 48000010
+C2443E80 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C2443E9C 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23BE8F4 0000001A
+88A40028 2C050002
+408200C0 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803A 60C6D4DC
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450078 40820008
+EC4200B2 C065007C
+C0030020 C0230074
+FC211024 4800002D
+D0030020 C0030024
+C0230078 FC200850
+48000019 D0030024
+8001000C 7C0803A6
+38210010 4E800020
+FC0100FA C0250080
+FC000800 4180000C
+FC000890 48000014
+FC200850 FC000800
+41810008 FC000890
+4E800020 3FAAAAAB
+3C75C28F 3F800000
+9421FFC0 00000000
+C23BF928 00000039
+901F0068 811F0060
+48000071 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800004D
+80DF0004 7D083378
+911F0004 80DF0074
+48000105 80DF0078
+480000FD 71060040
+41820010 38C00002
+98DF005E 48000164
+71060080 4182015C
+88DF005E 68C60002
+98DF005E 4800014C
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E70010 71060020
+41820008 60E71000
+71062000 41820014
+3C608000 38C00000
+90C32684 60E70080
+71060200 41820008
+60E70800 71060080
+41820008 60E72000
+71060004 41820008
+60E72000 71061000
+41820008 60E70200
+71060400 41820008
+60E70100 7CE83B78
+4E800020 3C608000
+2C060000 4082003C
+3CC0806E 88C6699E
+2C060002 40820060
+80C32684 38C60001
+90C32684 38E00180
+7C063800 40820048
+38C00000 90C32684
+61080080 48000038
+3CE03F40 7C063800
+41800014 38E00000
+90E32684 61080040
+4800001C 7CC600D0
+7C063800 41800010
+38E00000 90E32684
+61080040 4E800020
+60000000 00000000
+*See README and CONTROL SCHEME for further instructions.
 
-$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1 [Vague Rant, crediar]
+$QOL - Classic Controller Support (GBAtemp - Left Stick Cursor) v1.1 [Vague Rant, crediar]
 C20FA8DC 00000003
 2C030002 40820008
 3863FFFF 3803FF04
@@ -130,10 +259,10 @@ C23BF928 00000026
 71061000 41820008
 60E70200 7CE83B78
 4E800020 00000000
-*Left Stick variant toggles between movement and IR input (recommended!).
+*Left Stick variant toggles between movement and cursor.
 *See README and CONTROL SCHEME for further instructions.
 
-$QOL - Classic Controller Support (Pointer on Right Stick) v1.1 [Vague Rant, crediar]
+$QOL - Classic Controller Support (GBAtemp - Right Stick Cursor) v1.1 [Vague Rant, crediar]
 C20FA8DC 00000003
 2C030002 40820008
 3863FFFF 3803FF04
@@ -220,6 +349,12 @@ C23BF928 00000026
 *Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
 *See README and CONTROL SCHEME for further instructions.
 
+$QOL - Enable Fast Text
+0419CD60 38000001
+0419D3F4 38000001
+
 [Gecko_RetroAchievements_Verified]
-$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1
-$QOL - Classic Controller Support (Pointer on Right Stick) v1.1
-\ No newline at end of file
+$QOL - Classic Controller Support (ACCF: Deluxe) v1.2
+$QOL - Classic Controller Support (GBAtemp - Left Stick Cursor) v1.1
+$QOL - Classic Controller Support (GBAtemp - Right Stick Cursor) v1.1
+$QOL - Enable Fast Text
+\ No newline at end of file
diff --git a/Data/Sys/GameSettings/RUUK01r1.ini b/Data/Sys/GameSettings/RUUK01r1.ini
index ad429263e4..29ded01ebc 100644
--- a/Data/Sys/GameSettings/RUUK01r1.ini
+++ b/Data/Sys/GameSettings/RUUK01r1.ini
@@ -12,39 +12,168 @@
 [Gecko]
 # Add gecko cheats here.
 
-$!!! - README
+$!!! - CONTROL SCHEME README
 *It is required you configure your Wii Remote with a mapped Classic Controller extension!
-*Left Stick variant toggles between movement and IR input (recommended!).
-*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
-*Pointer mode is activated intelligently, but can be forced on/off with the L button.
-*3C75C28F (float 0.015) sets cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
-*To use the in-game keyboard, it is recommended to connect a real keyboard over using the pointer.
-*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+*Two schemes are provided: GBAtemp and ACCF: Deluxe. The latter is likely recommended for most users!
+*Cursor mode is activated intelligently, but can be forced on/off with the L button.
+*Home Menu works as normal, but remember to enable the Cursor with L.
+*3C75C28F (float 0.015) sets Cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
+*For extensive typing, it is recommended to connect a real keyboard over using the pointer.
+
+$!!! - CONTROL SCHEME ACCF: DELUXE
+*Remote & Nunchuk     Classic Cont.   Game Function
+*--------------------------------------------------------------------
+*Remote Home          Home            Open/Close Home Menu
+*Remote D-Pad Up      D-Pad Up        Change Camera
+*Remote D-Pad L/R     D-Pad L/R       Change Tool
+*Remote D-Pad Down    D-Pad Down      Put Away Tool
+*Remote A             A               Confirm, Action
+*Remote B             B               Cancel, Run, Pick Up Item
+*Remote Plus          X               Open/Close Map/Next Tab
+*Remote Minus         Y               Open/Close Inventory/Prev Tab
+*Remote 1             Minus           Take Photo
+*Remote 2             Plus            Open/Close Photos
+*Remote Pointer       L               Toggle Cursor
+*Remote Pointer       Right Stick     Move Cursor
+*Nunchuk Stick        Left Stick      Movement
+*Nunchuk C            R               Confirm, Action
+*Nunchuk Z            ZL/ZR           Cancel, Run, Pick Up Item    	
+*          
+*Toggle Cursor with L, use Right Stick to control it.
+*More information: https://aurumsmods.com/accfdeluxe/classic_controller
 
-$!!! - CONTROL SCHEME
-*Remote & Nunchuk     Classic Controller   Game Function
+$!!! - CONTROL SCHEME GBATEMP
+*Remote & Nunchuk     Classic Cont.   Game Function
 *--------------------------------------------------------------------
-*Remote Home          Home                 Open/Close Home Menu
-*Remote D-Pad         D-Pad                Up: Change Camera
-* ---                  ---                 Left/Right: Change Tool
-* ---                  ---                 Down: Put Away Tool
-*Remote A             A                    Confirm, Action
-*Remote B             B                    Cancel, Run, Pick Up Item
-*Remote +             Plus                 Open/Close Map
-* ---                 ZR                   Next Tab
-*Remote -             X                    Open/Close Inventory
-* ---                 ZL                   Previous Tab
-*Remote 1             Minus                Take Photo
-*Remote 2             Y                    Open/Close Photos
-*Nunchuk Stick        Left Stick           Movement
-*Nunchuk C            N/A (Use A)          Confirm, Action
-*Nunchuk Z            R                    Cancel, Run, Pick Up Item
-*Remote Pointer       L (Toggle)           Move Cursor
+*Remote Home          Home            Open/Close Home Menu
+*Remote D-Pad Up      D-Pad Up        Change Camera
+*Remote D-Pad L/R     D-Pad L/R       Change Tool
+*Remote D-Pad Down    D-Pad Down      Put Away Tool
+*Remote A             A               Confirm, Action
+*Remote B             B               Cancel, Run, Pick Up Item
+*Remote Plus          Plus            Open/Close Map
+*Remote Plus          ZR              Next Tab
+*Remote Minus         X               Open/Close Inventory
+*Remote Minus         ZL              Previous Tab
+*Remote 1             Minus           Take Photo
+*Remote 2             Y               Open/Close Photos
+*Remote Pointer       L               Toggle Cursor
+*Remote Pointer       R/L Stick*      Move Cursor
+*Nunchuk Stick        Left Stick      Movement
+*Nunchuk C            N/A (Use A)     Confirm, Action
+*Nunchuk Z            R               Cancel, Run, Pick Up Item
 *          
-*For the Pointer, use Left or Right Stick, depending on code used.
-*Home Menu works as normal, but remember to enable the pointer with L.
+*Toggle Cursor with L. R/L Stick to control, depending on code used.
+*Right Stick variant allows Cursor movement while walking, but this is not a real advantage and may feel less convenient.
+*Left Stick variant uses toggle, likely recommended for most users.
+*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+
+$QOL - Classic Controller Support (ACCF: Deluxe) v1.2 [Vague Rant, crediar, TechieSaru]
+C20FA6A4 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA70C 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CF840 48000010
+C244D8C4 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C244D8E0 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23C72FC 0000001A
+88A40028 2C050002
+408200C0 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803B 60C65EE4
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450078 40820008
+EC4200B2 C065007C
+C0030020 C0230074
+FC211024 4800002D
+D0030020 C0030024
+C0230078 FC200850
+48000019 D0030024
+8001000C 7C0803A6
+38210010 4E800020
+FC0100FA C0250080
+FC000800 4180000C
+FC000890 48000014
+FC200850 FC000800
+41810008 FC000890
+4E800020 3FAAAAAB
+3C75C28F 3F800000
+9421FFC0 00000000
+C23C8330 00000039
+901F0068 811F0060
+48000071 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800004D
+80DF0004 7D083378
+911F0004 80DF0074
+48000105 80DF0078
+480000FD 71060040
+41820010 38C00002
+98DF005E 48000164
+71060080 4182015C
+88DF005E 68C60002
+98DF005E 4800014C
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E70010 71060020
+41820008 60E71000
+71062000 41820014
+3C608000 38C00000
+90C32684 60E70080
+71060200 41820008
+60E70800 71060080
+41820008 60E72000
+71060004 41820008
+60E72000 71061000
+41820008 60E70200
+71060400 41820008
+60E70100 7CE83B78
+4E800020 3C608000
+2C060000 4082003C
+3CC08070 88C6D61E
+2C060002 40820060
+80C32684 38C60001
+90C32684 38E00180
+7C063800 40820048
+38C00000 90C32684
+61080080 48000038
+3CE03F40 7C063800
+41800014 38E00000
+90E32684 61080040
+4800001C 7CC600D0
+7C063800 41800010
+38E00000 90E32684
+61080040 4E800020
+60000000 00000000
+*See README and CONTROL SCHEME for further instructions.
 
-$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1 [Vague Rant, crediar]
+$QOL - Classic Controller Support (GBAtemp - Left Stick Cursor) v1.1 [Vague Rant, crediar]
 C20FA6A4 00000003
 2C030002 40820008
 3863FFFF 3803FF04
@@ -130,10 +259,10 @@ C23C8330 00000026
 71061000 41820008
 60E70200 7CE83B78
 4E800020 00000000
-*Left Stick variant toggles between movement and IR input (recommended!).
+*Left Stick variant toggles between movement and cursor.
 *See README and CONTROL SCHEME for further instructions.
 
-$QOL - Classic Controller Support (Pointer on Right Stick) v1.1 [Vague Rant, crediar]
+$QOL - Classic Controller Support (GBAtemp - Right Stick Cursor) v1.1 [Vague Rant, crediar]
 C20FA6A4 00000003
 2C030002 40820008
 3863FFFF 3803FF04
@@ -220,6 +349,12 @@ C23C8330 00000026
 *Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
 *See README and CONTROL SCHEME for further instructions.
 
+$QOL - Enable Fast Text
+0419CD60 38000001
+0419D3F4 38000001
+
 [Gecko_RetroAchievements_Verified]
-$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1
-$QOL - Classic Controller Support (Pointer on Right Stick) v1.1
-\ No newline at end of file
+$QOL - Classic Controller Support (ACCF: Deluxe) v1.2
+$QOL - Classic Controller Support (GBAtemp - Left Stick Cursor) v1.1
+$QOL - Classic Controller Support (GBAtemp - Right Stick Cursor) v1.1
+$QOL - Enable Fast Text
+\ No newline at end of file
diff --git a/Data/Sys/GameSettings/RUUP01r0.ini b/Data/Sys/GameSettings/RUUP01r0.ini
index 44a5df6e3e..72df615e6e 100644
--- a/Data/Sys/GameSettings/RUUP01r0.ini
+++ b/Data/Sys/GameSettings/RUUP01r0.ini
@@ -12,39 +12,168 @@
 [Gecko]
 # Add gecko cheats here.
 
-$!!! - README
+$!!! - CONTROL SCHEME README
 *It is required you configure your Wii Remote with a mapped Classic Controller extension!
-*Left Stick variant toggles between movement and IR input (recommended!).
-*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
-*Pointer mode is activated intelligently, but can be forced on/off with the L button.
-*3C75C28F (float 0.015) sets cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
-*To use the in-game keyboard, it is recommended to connect a real keyboard over using the pointer.
-*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+*Two schemes are provided: GBAtemp and ACCF: Deluxe. The latter is likely recommended for most users!
+*Cursor mode is activated intelligently, but can be forced on/off with the L button.
+*Home Menu works as normal, but remember to enable the Cursor with L.
+*3C75C28F (float 0.015) sets Cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
+*For extensive typing, it is recommended to connect a real keyboard over using the pointer.
+
+$!!! - CONTROL SCHEME ACCF: DELUXE
+*Remote & Nunchuk     Classic Cont.   Game Function
+*--------------------------------------------------------------------
+*Remote Home          Home            Open/Close Home Menu
+*Remote D-Pad Up      D-Pad Up        Change Camera
+*Remote D-Pad L/R     D-Pad L/R       Change Tool
+*Remote D-Pad Down    D-Pad Down      Put Away Tool
+*Remote A             A               Confirm, Action
+*Remote B             B               Cancel, Run, Pick Up Item
+*Remote Plus          X               Open/Close Map/Next Tab
+*Remote Minus         Y               Open/Close Inventory/Prev Tab
+*Remote 1             Minus           Take Photo
+*Remote 2             Plus            Open/Close Photos
+*Remote Pointer       L               Toggle Cursor
+*Remote Pointer       Right Stick     Move Cursor
+*Nunchuk Stick        Left Stick      Movement
+*Nunchuk C            R               Confirm, Action
+*Nunchuk Z            ZL/ZR           Cancel, Run, Pick Up Item    	
+*          
+*Toggle Cursor with L, use Right Stick to control it.
+*More information: https://aurumsmods.com/accfdeluxe/classic_controller
 
-$!!! - CONTROL SCHEME
-*Remote & Nunchuk     Classic Controller   Game Function
+$!!! - CONTROL SCHEME GBATEMP
+*Remote & Nunchuk     Classic Cont.   Game Function
 *--------------------------------------------------------------------
-*Remote Home          Home                 Open/Close Home Menu
-*Remote D-Pad         D-Pad                Up: Change Camera
-* ---                  ---                 Left/Right: Change Tool
-* ---                  ---                 Down: Put Away Tool
-*Remote A             A                    Confirm, Action
-*Remote B             B                    Cancel, Run, Pick Up Item
-*Remote +             Plus                 Open/Close Map
-* ---                 ZR                   Next Tab
-*Remote -             X                    Open/Close Inventory
-* ---                 ZL                   Previous Tab
-*Remote 1             Minus                Take Photo
-*Remote 2             Y                    Open/Close Photos
-*Nunchuk Stick        Left Stick           Movement
-*Nunchuk C            N/A (Use A)          Confirm, Action
-*Nunchuk Z            R                    Cancel, Run, Pick Up Item
-*Remote Pointer       L (Toggle)           Move Cursor
+*Remote Home          Home            Open/Close Home Menu
+*Remote D-Pad Up      D-Pad Up        Change Camera
+*Remote D-Pad L/R     D-Pad L/R       Change Tool
+*Remote D-Pad Down    D-Pad Down      Put Away Tool
+*Remote A             A               Confirm, Action
+*Remote B             B               Cancel, Run, Pick Up Item
+*Remote Plus          Plus            Open/Close Map
+*Remote Plus          ZR              Next Tab
+*Remote Minus         X               Open/Close Inventory
+*Remote Minus         ZL              Previous Tab
+*Remote 1             Minus           Take Photo
+*Remote 2             Y               Open/Close Photos
+*Remote Pointer       L               Toggle Cursor
+*Remote Pointer       R/L Stick*      Move Cursor
+*Nunchuk Stick        Left Stick      Movement
+*Nunchuk C            N/A (Use A)     Confirm, Action
+*Nunchuk Z            R               Cancel, Run, Pick Up Item
 *          
-*For the Pointer, use Left or Right Stick, depending on code used.
-*Home Menu works as normal, but remember to enable the pointer with L.
+*Toggle Cursor with L. R/L Stick to control, depending on code used.
+*Right Stick variant allows Cursor movement while walking, but this is not a real advantage and may feel less convenient.
+*Left Stick variant uses toggle, likely recommended for most users.
+*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+
+$QOL - Classic Controller Support (ACCF: Deluxe) v1.2 [Vague Rant, crediar, TechieSaru]
+C20FA784 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA7EC 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CDFB0 48000010
+C2443CC8 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C2443CE4 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23BE5A0 0000001A
+88A40028 2C050002
+408200C0 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803A 60C6D188
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450078 40820008
+EC4200B2 C065007C
+C0030020 C0230074
+FC211024 4800002D
+D0030020 C0030024
+C0230078 FC200850
+48000019 D0030024
+8001000C 7C0803A6
+38210010 4E800020
+FC0100FA C0250080
+FC000800 4180000C
+FC000890 48000014
+FC200850 FC000800
+41810008 FC000890
+4E800020 3FAAAAAB
+3C75C28F 3F800000
+9421FFC0 00000000
+C23BF5D4 00000039
+901F0068 811F0060
+48000071 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800004D
+80DF0004 7D083378
+911F0004 80DF0074
+48000105 80DF0078
+480000FD 71060040
+41820010 38C00002
+98DF005E 48000164
+71060080 4182015C
+88DF005E 68C60002
+98DF005E 4800014C
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E70010 71060020
+41820008 60E71000
+71062000 41820014
+3C608000 38C00000
+90C32684 60E70080
+71060200 41820008
+60E70800 71060080
+41820008 60E72000
+71060004 41820008
+60E72000 71061000
+41820008 60E70200
+71060400 41820008
+60E70100 7CE83B78
+4E800020 3C608000
+2C060000 4082003C
+3CC0806E 88C64F1E
+2C060002 40820060
+80C32684 38C60001
+90C32684 38E00180
+7C063800 40820048
+38C00000 90C32684
+61080080 48000038
+3CE03F40 7C063800
+41800014 38E00000
+90E32684 61080040
+4800001C 7CC600D0
+7C063800 41800010
+38E00000 90E32684
+61080040 4E800020
+60000000 00000000
+*See README and CONTROL SCHEME for further instructions.
 
-$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1 [Vague Rant, crediar]
+$QOL - Classic Controller Support (GBAtemp - Left Stick Cursor) v1.1 [Vague Rant, crediar]
 C20FA784 00000003
 2C030002 40820008
 3863FFFF 3803FF04
@@ -130,10 +259,10 @@ C23BF5D4 00000026
 71061000 41820008
 60E70200 7CE83B78
 4E800020 00000000
-*Left Stick variant toggles between movement and IR input (recommended!).
+*Left Stick variant toggles between movement and cursor.
 *See README and CONTROL SCHEME for further instructions.
 
-$QOL - Classic Controller Support (Pointer on Right Stick) v1.1 [Vague Rant, crediar]
+$QOL - Classic Controller Support (GBAtemp - Right Stick Cursor) v1.1 [Vague Rant, crediar]
 C20FA784 00000003
 2C030002 40820008
 3863FFFF 3803FF04
@@ -227,7 +356,13 @@ $QOL - Disable Grass Deterioration [Seth@WiiPlaza, Fox_McCloud45]
 *Does not modify pre-existing save file data; grass will still be deteriorated when disabled.
 *While active, save file data remains static; grass will neither heal nor deteriorate in save data.
 
+$QOL - Enable Fast Text
+0419CD60 38000001
+0419D3F4 38000001
+
 [Gecko_RetroAchievements_Verified]
-$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1
-$QOL - Classic Controller Support (Pointer on Right Stick) v1.1
-$QOL - Disable Grass Deterioration
-\ No newline at end of file
+$QOL - Classic Controller Support (ACCF: Deluxe) v1.2
+$QOL - Classic Controller Support (GBAtemp - Left Stick Cursor) v1.1
+$QOL - Classic Controller Support (GBAtemp - Right Stick Cursor) v1.1
+$QOL - Disable Grass Deterioration
+$QOL - Enable Fast Text
+\ No newline at end of file
diff --git a/Data/Sys/GameSettings/RUUP01r1.ini b/Data/Sys/GameSettings/RUUP01r1.ini
index a39e65f953..e5e2ae8c7c 100644
--- a/Data/Sys/GameSettings/RUUP01r1.ini
+++ b/Data/Sys/GameSettings/RUUP01r1.ini
@@ -12,39 +12,168 @@
 [Gecko]
 # Add gecko cheats here.
 
-$!!! - README
+$!!! - CONTROL SCHEME README
 *It is required you configure your Wii Remote with a mapped Classic Controller extension!
-*Left Stick variant toggles between movement and IR input (recommended!).
-*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
-*Pointer mode is activated intelligently, but can be forced on/off with the L button.
-*3C75C28F (float 0.015) sets cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
-*To use the in-game keyboard, it is recommended to connect a real keyboard over using the pointer.
-*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+*Two schemes are provided: GBAtemp and ACCF: Deluxe. The latter is likely recommended for most users!
+*Cursor mode is activated intelligently, but can be forced on/off with the L button.
+*Home Menu works as normal, but remember to enable the Cursor with L.
+*3C75C28F (float 0.015) sets Cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
+*For extensive typing, it is recommended to connect a real keyboard over using the pointer.
+
+$!!! - CONTROL SCHEME ACCF: DELUXE
+*Remote & Nunchuk     Classic Cont.   Game Function
+*--------------------------------------------------------------------
+*Remote Home          Home            Open/Close Home Menu
+*Remote D-Pad Up      D-Pad Up        Change Camera
+*Remote D-Pad L/R     D-Pad L/R       Change Tool
+*Remote D-Pad Down    D-Pad Down      Put Away Tool
+*Remote A             A               Confirm, Action
+*Remote B             B               Cancel, Run, Pick Up Item
+*Remote Plus          X               Open/Close Map/Next Tab
+*Remote Minus         Y               Open/Close Inventory/Prev Tab
+*Remote 1             Minus           Take Photo
+*Remote 2             Plus            Open/Close Photos
+*Remote Pointer       L               Toggle Cursor
+*Remote Pointer       Right Stick     Move Cursor
+*Nunchuk Stick        Left Stick      Movement
+*Nunchuk C            R               Confirm, Action
+*Nunchuk Z            ZL/ZR           Cancel, Run, Pick Up Item    	
+*          
+*Toggle Cursor with L, use Right Stick to control it.
+*More information: https://aurumsmods.com/accfdeluxe/classic_controller
 
-$!!! - CONTROL SCHEME
-*Remote & Nunchuk     Classic Controller   Game Function
+$!!! - CONTROL SCHEME GBATEMP
+*Remote & Nunchuk     Classic Cont.   Game Function
 *--------------------------------------------------------------------
-*Remote Home          Home                 Open/Close Home Menu
-*Remote D-Pad         D-Pad                Up: Change Camera
-* ---                  ---                 Left/Right: Change Tool
-* ---                  ---                 Down: Put Away Tool
-*Remote A             A                    Confirm, Action
-*Remote B             B                    Cancel, Run, Pick Up Item
-*Remote +             Plus                 Open/Close Map
-* ---                 ZR                   Next Tab
-*Remote -             X                    Open/Close Inventory
-* ---                 ZL                   Previous Tab
-*Remote 1             Minus                Take Photo
-*Remote 2             Y                    Open/Close Photos
-*Nunchuk Stick        Left Stick           Movement
-*Nunchuk C            N/A (Use A)          Confirm, Action
-*Nunchuk Z            R                    Cancel, Run, Pick Up Item
-*Remote Pointer       L (Toggle)           Move Cursor
+*Remote Home          Home            Open/Close Home Menu
+*Remote D-Pad Up      D-Pad Up        Change Camera
+*Remote D-Pad L/R     D-Pad L/R       Change Tool
+*Remote D-Pad Down    D-Pad Down      Put Away Tool
+*Remote A             A               Confirm, Action
+*Remote B             B               Cancel, Run, Pick Up Item
+*Remote Plus          Plus            Open/Close Map
+*Remote Plus          ZR              Next Tab
+*Remote Minus         X               Open/Close Inventory
+*Remote Minus         ZL              Previous Tab
+*Remote 1             Minus           Take Photo
+*Remote 2             Y               Open/Close Photos
+*Remote Pointer       L               Toggle Cursor
+*Remote Pointer       R/L Stick*      Move Cursor
+*Nunchuk Stick        Left Stick      Movement
+*Nunchuk C            N/A (Use A)     Confirm, Action
+*Nunchuk Z            R               Cancel, Run, Pick Up Item
 *          
-*For the Pointer, use Left or Right Stick, depending on code used.
-*Home Menu works as normal, but remember to enable the pointer with L.
+*Toggle Cursor with L. R/L Stick to control, depending on code used.
+*Right Stick variant allows Cursor movement while walking, but this is not a real advantage and may feel less convenient.
+*Left Stick variant uses toggle, likely recommended for most users.
+*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+
+$QOL - Classic Controller Support (ACCF: Deluxe) v1.2 [Vague Rant, crediar, TechieSaru]
+C20FA784 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA7EC 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CE0D4 48000010
+C2443F30 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C2443F4C 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23BE808 0000001A
+88A40028 2C050002
+408200C0 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803A 60C6D3F0
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450078 40820008
+EC4200B2 C065007C
+C0030020 C0230074
+FC211024 4800002D
+D0030020 C0030024
+C0230078 FC200850
+48000019 D0030024
+8001000C 7C0803A6
+38210010 4E800020
+FC0100FA C0250080
+FC000800 4180000C
+FC000890 48000014
+FC200850 FC000800
+41810008 FC000890
+4E800020 3FAAAAAB
+3C75C28F 3F800000
+9421FFC0 00000000
+C23BF83C 00000039
+901F0068 811F0060
+48000071 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800004D
+80DF0004 7D083378
+911F0004 80DF0074
+48000105 80DF0078
+480000FD 71060040
+41820010 38C00002
+98DF005E 48000164
+71060080 4182015C
+88DF005E 68C60002
+98DF005E 4800014C
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E70010 71060020
+41820008 60E71000
+71062000 41820014
+3C608000 38C00000
+90C32684 60E70080
+71060200 41820008
+60E70800 71060080
+41820008 60E72000
+71060004 41820008
+60E72000 71061000
+41820008 60E70200
+71060400 41820008
+60E70100 7CE83B78
+4E800020 3C608000
+2C060000 4082003C
+3CC0806E 88C6519E
+2C060002 40820060
+80C32684 38C60001
+90C32684 38E00180
+7C063800 40820048
+38C00000 90C32684
+61080080 48000038
+3CE03F40 7C063800
+41800014 38E00000
+90E32684 61080040
+4800001C 7CC600D0
+7C063800 41800010
+38E00000 90E32684
+61080040 4E800020
+60000000 00000000
+*See README and CONTROL SCHEME for further instructions.
 
-$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1 [Vague Rant, crediar]
+$QOL - Classic Controller Support (GBAtemp - Left Stick Cursor) v1.1 [Vague Rant, crediar]
 C20FA784 00000003
 2C030002 40820008
 3863FFFF 3803FF04
@@ -130,10 +259,10 @@ C23BF83C 00000026
 71061000 41820008
 60E70200 7CE83B78
 4E800020 00000000
-*Left Stick variant toggles between movement and IR input (recommended!).
+*Left Stick variant toggles between movement and cursor.
 *See README and CONTROL SCHEME for further instructions.
 
-$QOL - Classic Controller Support (Pointer on Right Stick) v1.1 [Vague Rant, crediar]
+$QOL - Classic Controller Support (GBAtemp - Right Stick Cursor) v1.1 [Vague Rant, crediar]
 C20FA784 00000003
 2C030002 40820008
 3863FFFF 3803FF04
@@ -227,7 +356,13 @@ $QOL - Disable Grass Deterioration [Seth@WiiPlaza, Fox_McCloud45]
 *Does not modify pre-existing save file data; grass will still be deteriorated when disabled.
 *While active, save file data remains static; grass will neither heal nor deteriorate in save data.
 
+$QOL - Enable Fast Text
+0419CE84 38000001
+0419D518 38000001
+
 [Gecko_RetroAchievements_Verified]
-$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1
-$QOL - Classic Controller Support (Pointer on Right Stick) v1.1
-$QOL - Disable Grass Deterioration
-\ No newline at end of file
+$QOL - Classic Controller Support (ACCF: Deluxe) v1.2
+$QOL - Classic Controller Support (GBAtemp - Left Stick Cursor) v1.1
+$QOL - Classic Controller Support (GBAtemp - Right Stick Cursor) v1.1
+$QOL - Disable Grass Deterioration
+$QOL - Enable Fast Text
+\ No newline at end of file