From f9cb1dd086ce602e063396ca81598705e4d482af Mon Sep 17 00:00:00 2001 From: postscriptthree Date: Fri, 10 Jan 2025 06:06:36 -0500 Subject: [PATCH] FF7: Use equipped Attack behavior when using auto-attack shortcut (#773) --- src/ff7/menu.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ff7/menu.cpp b/src/ff7/menu.cpp index 340bd7d7..405b513b 100644 --- a/src/ff7/menu.cpp +++ b/src/ff7/menu.cpp @@ -136,7 +136,9 @@ uint32_t ff7_menu_decrease_item_quantity(uint32_t item_used) } void dispatchAttackCommand(){ - *ff7_externals.issued_command_id = 0x01; + char* character = (char*)ff7_externals.menu_objects + 0x2CBC; //Character attacking + char* attack = (char*)ff7_externals.gamepad_status + 0xCA8 + (*character * 6); //Their equipped attack + *ff7_externals.issued_command_id = *attack; *ff7_externals.issued_action_target_type = 0; *ff7_externals.issued_action_target_index = 4; ((void(*)())ff7_externals.dispatch_chosen_battle_action)();