Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-20 00:46:34 +00:00
Code Issues Activity

Revert "Improve recording playback"

Browse source
This commit is contained in:
jugeeya 2023-09-22 07:50:04 -07:00 committed by GitHub
parent f34f2b0cbb
commit 548759d892
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/training/input_record.rs
View file

@ -172,17 +172,7 @@ fn into_transition_term(starting_status: StartingStatus) -> i32 {
} }
} }
#[allow(clippy::unnecessary_unwrap)] pub unsafe fn get_command_flag_cat(module_accessor: &mut BattleObjectModuleAccessor) {
pub unsafe fn handle_recording() {
let player_module_accessor = try_get_module_accessor(FighterId::Player);
let cpu_module_accessor = try_get_module_accessor(FighterId::CPU);
if player_module_accessor.is_some() && cpu_module_accessor.is_some() {
handle_recording_for_fighter(&mut *player_module_accessor.unwrap());
handle_recording_for_fighter(&mut *cpu_module_accessor.unwrap());
}
}
unsafe fn handle_recording_for_fighter(module_accessor: &mut BattleObjectModuleAccessor) {
// Allow this because sometimes we want to make sure our NNSDK doesn't have // Allow this because sometimes we want to make sure our NNSDK doesn't have
// an erroneous definition // an erroneous definition
#[allow(clippy::unnecessary_cast)] #[allow(clippy::unnecessary_cast)]

7
src/training/mod.rs
View file

@ -138,6 +138,7 @@ fn once_per_frame_per_fighter(
); );
} }
input_record::get_command_flag_cat(module_accessor);
combo::get_command_flag_cat(module_accessor); combo::get_command_flag_cat(module_accessor);
hitbox_visualizer::get_command_flag_cat(module_accessor); hitbox_visualizer::get_command_flag_cat(module_accessor);
save_states::save_states(module_accessor); save_states::save_states(module_accessor);
@ -796,7 +797,6 @@ static OPCF_OFFSET: usize = 0x06b7fdc;
// One instruction after the CPU Control function completes // One instruction after the CPU Control function completes
#[skyline::hook(offset = OPCF_OFFSET, inline)] #[skyline::hook(offset = OPCF_OFFSET, inline)]
unsafe fn handle_once_per_cpu_frame(_ctx: &mut InlineCtx) { unsafe fn handle_once_per_cpu_frame(_ctx: &mut InlineCtx) {
input_record::handle_recording();
frame_counter::tick_ingame(); frame_counter::tick_ingame();
tech::hide_tech(); tech::hide_tech();
// Tick notifications // Tick notifications
@ -881,10 +881,7 @@ pub fn training_mods() {
// Enable Custom Stages for Training Mode // Enable Custom Stages for Training Mode
// Specifically, we prevent a field in StageSelectInfo of the Scene that controls if the Custom Stage tab is loaded // Specifically, we prevent a field in StageSelectInfo of the Scene that controls if the Custom Stage tab is loaded
// from being set to false when we load the SSS in Training Mode // from being set to false when we load the SSS in Training Mode
static SSS_TRAINING_OFFSET: usize = 0x184d1d8; skyline::patching::Patch::in_text(0x184d1d8).nop().unwrap();
skyline::patching::Patch::in_text(SSS_TRAINING_OFFSET)
.nop()
.unwrap();
skyline::install_hooks!( skyline::install_hooks!(
// Mash airdodge/jump // Mash airdodge/jump