1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-28 12:50:16 +00:00

merge with master

This commit is contained in:
jugeeya 2020-09-27 23:24:52 +00:00
commit 67dec0402d

View file

@ -35,7 +35,7 @@ pub unsafe fn get_command_flag_cat(module_accessor: &mut BattleObjectModuleAcces
playback(); playback();
} }
// Attack + Dpad Left: Record // Attack + Dpad Left: Record
else if ControlModule::check_button_on(module_accessor, *CONTROL_PAD_BUTTON_CATCH) else if ControlModule::check_button_on(module_accessor, *CONTROL_PAD_BUTTON_ATTACK)
&& ControlModule::check_button_trigger(module_accessor, *CONTROL_PAD_BUTTON_APPEAL_S_L) && ControlModule::check_button_trigger(module_accessor, *CONTROL_PAD_BUTTON_APPEAL_S_L)
{ {
record(); record();
@ -82,4 +82,4 @@ pub unsafe fn handle_get_npad_state(
*state = P1_NPAD_STATES.lock()[INPUT_RECORD_FRAME]; *state = P1_NPAD_STATES.lock()[INPUT_RECORD_FRAME];
(*state).updateCount = update_count; (*state).updateCount = update_count;
} }
} }