FF7: Fix naming screen when Steam Input is enabled (#627)

julianxhokaxhiu · Nov 21, 2023 · a8d102e · a8d102e
1 parent a304000
commit a8d102e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -31,6 +31,7 @@
 ## FF7 Steam
 
 - Common: Fix a softlock when trying to change in-game Controller setting to "Normal" (by disabling this option)
+- Input: Fix character naming screen not working correctly when Steam Input is enabled
 
 ## FF8
 

diff --git a/src/ff7_opengl.cpp b/src/ff7_opengl.cpp
@@ -385,7 +385,13 @@ void ff7_init_hooks(struct game_obj *_game_object)
 		}
 
 		// Disable "Normal" setting in Controller section of the Config menu (it softlocks on Steam)
-		memset_code(ff7_externals.config_menu_sub + 0x8AC, 0x90, 0xE6);    
+		memset_code(ff7_externals.config_menu_sub + 0x8AC, 0x90, 0xE6);
+
+		// Restore Steam release behavior on character name screen when using gamepads in Steam Input mode
+		// Aali driver used to patch out these three functions to fix this issue
+		replace_function(ff7_externals.set_default_input_settings_save, noop);
+		replace_function(ff7_externals.keyboard_name_input, noop);
+		replace_function(ff7_externals.restore_input_settings, noop);
 	}
 
 	//###############################