improved fast isabelle with blocking of all inputs except A

Author: kwadukathole

Includes/Address/Addresses.hpp

@@ -3,6 +3,7 @@
 #include "types.h"
 
 static const u32 ADDRESSES[][8] = {
+    { 0x541FF8, 0x541534, 0x541040, 0x541040, 0x54092C, 0x54092C, 0x540650, 0x540650 }, //Block key inputs except A
     { 0x316F40, 0x317148, 0x316E84, 0x316E84, 0x316ECC, 0x316ECC, 0x316EDC, 0x316EDC }, //GET_HOUSE_CHECK_DATA
     { 0x30F770, 0x30FBB4, 0x30F820, 0x30F820, 0x30F88C, 0x30F88C, 0x30F744, 0x30F744 }, //GET_HOUSE_SAVE_FROM_PLAYER_OFFSET
     { 0x6FB9E8, 0x6FAE98, 0x6FAA08, 0x6FA9E0, 0x6FA1B4, 0x6FA18C, 0x6F9D5C, 0x6F9D34 }, //GET_ROOM_SIZE

Sources/Folders/MiscCodes.cpp

@@ -470,10 +470,12 @@ namespace CTRPluginFramework {
 	}
 //Fast Isabelle (Fast Text + Game Speed when in the Isabelle greeting room)
 	void fastisabelle(MenuEntry *entry) {
+		static Address blockKeys(0x541FF8);
 		static Address speed(0x54DDB4);
 		static Address fastt(0x5FC6AC);
 		static Address fastt2 = fastt.MoveOffset(8);
 
+		static bool blockKeysPatchedByIsabelle = false;
 		static bool speedPatchedByIsabelle = false;
 		static bool fastTalkPatchedByIsabelle = false;
 
@@ -496,6 +498,13 @@ namespace CTRPluginFramework {
 				fastt2.Patch(0xE3500001);
 				fastTalkPatchedByIsabelle = true;
 			}
+
+
+			if (!blockKeysPatchedByIsabelle) {
+				blockKeys.Patch(0xEA000068); //Block all keys except A
+				blockKeysPatchedByIsabelle = true;
+			}
+
 			Controller::InjectKey(Key::A);
 		}
 		else {
@@ -509,6 +518,11 @@ namespace CTRPluginFramework {
 				fastt2.Unpatch();
 				fastTalkPatchedByIsabelle = false;
 			}
+
+			if (blockKeysPatchedByIsabelle) {
+				blockKeys.Unpatch();
+				blockKeysPatchedByIsabelle = false;
+			}
 		}
 	}
 }