Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-03-14 02:16:10 +00:00
Code Issues Activity

fix for v4.0.0

Browse source
This commit is contained in:
jugeeya 2019-07-31 23:35:18 -07:00
parent 8c0200fe9e
commit def081ea98
4 changed files with 36 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
romfs/msg_melee+us_en.msbt Normal file
View file

Binary file not shown.

BIN
romfs/msg_melee_edited.msbt
View file

Binary file not shown.

30
source/training/input_recorder.hpp
View file

@ -12,7 +12,7 @@ typedef struct FrameInput {
int attack_air_kind;
} FrameInput;
#define NUM_FRAME_INPUTS 60
#define NUM_FRAME_INPUTS 120
FrameInput frame_inputs[NUM_FRAME_INPUTS];
int curr_frame = 0;
@ -28,7 +28,7 @@ namespace InputRecorder {
bool should_replace_input(u64 module_accessor) {
return is_training_mode() && is_operation_cpu(module_accessor) &&
(INPUT_RECORD_STATE == INPUT_RECORDING ||
INPUT_RECORD_STATE == INPUT_PLAYBACK)
INPUT_RECORD_STATE == INPUT_PLAYBACK);
}
int get_command_flag_cat(u64 module_accessor, int category, int flag, bool& replace) {
@ -41,19 +41,19 @@ int get_command_flag_cat(u64 module_accessor, int category, int flag, bool& repl
INPUT_RECORD_STATE == INPUT_PLAYBACK) {
if (INPUT_RECORD_STATE == INPUT_RECORDING)
; // Set color overlay to blue
else {
else
; // Reset color overlay
replace = true;
int frame = curr_frame > 0 ? curr_frame - 1 : NUM_FRAME_INPUTS - 1;
if (category == 0)
return frame_inputs[curr_frame].cat1_flag;
return frame_inputs[frame].cat1_flag & ~FIGHTER_PAD_CMD_CAT1_FLAG_TURN_DASH;
else if (category == 1)
return frame_inputs[curr_frame].cat2_flag;
return frame_inputs[frame].cat2_flag;
else if (category == 2)
return frame_inputs[curr_frame].cat3_flag;
return frame_inputs[frame].cat3_flag;
else if (category == 3)
return frame_inputs[curr_frame].cat4_flag;
}
return frame_inputs[frame].cat4_flag;
}
} else {
if (INPUT_RECORD_STATE == NONE) {
@ -73,7 +73,6 @@ int get_command_flag_cat(u64 module_accessor, int category, int flag, bool& repl
}
} else if (INPUT_RECORD_STATE == INPUT_RECORDING) {
if (category == FIGHTER_PAD_COMMAND_CATEGORY1) {
curr_frame++;
frame_inputs[curr_frame] = FrameInput{
flag,
ControlModule::get_command_flag_cat(module_accessor, 1),
@ -84,6 +83,7 @@ int get_command_flag_cat(u64 module_accessor, int category, int flag, bool& repl
ControlModule::get_stick_y(module_accessor),
ControlModule::get_attack_air_kind(module_accessor)
};
curr_frame++;
if (curr_frame == NUM_FRAME_INPUTS - 1) {
print_string(module_accessor, "PLAYBACK");
@ -115,7 +115,8 @@ int get_command_flag_cat(u64 module_accessor, int category, int flag, bool& repl
int get_pad_flag(u64 module_accessor, bool& replace) {
if (should_replace_input(module_accessor)) {
replace = true;
return frame_inputs[curr_frame].pad_flag;
int frame = curr_frame > 0 ? curr_frame - 1 : NUM_FRAME_INPUTS - 1;
return frame_inputs[frame].pad_flag;
}
replace = false;
@ -125,7 +126,8 @@ int get_pad_flag(u64 module_accessor, bool& replace) {
float get_stick_x(u64 module_accessor, bool& replace) {
if (should_replace_input(module_accessor)) {
replace = true;
return frame_inputs[curr_frame].stick_x;
int frame = curr_frame > 0 ? curr_frame - 1 : NUM_FRAME_INPUTS - 1;
return frame_inputs[frame].stick_x;
}
replace = false;
@ -135,7 +137,8 @@ float get_stick_x(u64 module_accessor, bool& replace) {
float get_stick_y(u64 module_accessor, bool& replace) {
if (should_replace_input(module_accessor)) {
replace = true;
return frame_inputs[curr_frame].stick_y;
int frame = curr_frame > 0 ? curr_frame - 1 : NUM_FRAME_INPUTS - 1;
return frame_inputs[frame].stick_y;
}
replace = false;
@ -145,7 +148,8 @@ float get_stick_y(u64 module_accessor, bool& replace) {
int get_attack_air_kind(u64 module_accessor, bool& replace) {
if (should_replace_input(module_accessor)) {
replace = true;
return frame_inputs[curr_frame].stick_y;
int frame = curr_frame > 0 ? curr_frame - 1 : NUM_FRAME_INPUTS - 1;
return frame_inputs[frame].attack_air_kind;
}
replace = false;

37
source/training_mods.hpp
View file

@ -79,9 +79,9 @@ int get_command_flag_cat_replace(u64 module_accessor, int category) {
int (*get_command_flag_cat)(u64, int) = (int (*)(u64, int)) load_module_impl(control_module, 0x350);
int flag = get_command_flag_cat(control_module, category);
bool replace;
/*bool replace;
int ret = InputRecorder::get_command_flag_cat(module_accessor, category, flag, replace);
if (replace) return ret;
if (replace) return ret;*/
Mash::get_command_flag_cat(module_accessor, category, flag);
Ledge::get_command_flag_cat(module_accessor, category, flag);
@ -91,7 +91,7 @@ int get_command_flag_cat_replace(u64 module_accessor, int category) {
int get_pad_flag(u64 module_accessor) {
u64 control_module = load_module(module_accessor, 0x48);
int (*get_pad_flag)(u64) = (int (*)(u64)) load_module_impl(control_module, GET_PAD_FLAG_FUNC_OFFSET);
int (*get_pad_flag)(u64) = (int (*)(u64)) load_module_impl(control_module, 0x348);
int pad_flag = get_pad_flag(control_module);
bool replace;
@ -103,7 +103,7 @@ int get_pad_flag(u64 module_accessor) {
float get_stick_x_replace(u64 module_accessor) {
u64 control_module = load_module(module_accessor, 0x48);
float (*get_stick_x)(u64) = (float (*)(u64)) load_module_impl(control_module, GET_STICK_X_FUNC_OFFSET);
float (*get_stick_x)(u64) = (float (*)(u64)) load_module_impl(control_module, 0x178);
float stick_x = get_stick_x(control_module);
bool replace;
@ -115,7 +115,7 @@ float get_stick_x_replace(u64 module_accessor) {
float get_stick_y_replace(u64 module_accessor) {
u64 control_module = load_module(module_accessor, 0x48);
float (*get_stick_y)(u64) = (float (*)(u64)) load_module_impl(control_module, GET_STICK_Y_FUNC_OFFSET);
float (*get_stick_y)(u64) = (float (*)(u64)) load_module_impl(control_module, 0x188);
float stick_y = get_stick_y(control_module);
bool replace;
@ -146,27 +146,28 @@ bool check_button_off_replace(u64 module_accessor, int button) {
bool (*check_button_off)(u64, int) = (bool (*)(u64, int)) load_module_impl(control_module, 0x268);
return check_button_off(control_module, button);
}
void clear_command_replace(u64 module_accessor, bool unk1) {
Selection::change_motion(module_accessor, MotionModule::motion_kind(module_accessor));
u64 control_module = load_module(module_accessor, 0x48);
void (*clear_command)(u64, bool) =
(void (*)(u64, bool)) load_module_impl(control_module, 0x358);
clear_command(control_module, unk1);
}
} // namespace ControlModule
} // namespace app::lua_bind
namespace app::lua_bind::MotionModule {
void change_motion_replace(u64 module_accessor, u64 motion_kind, float start_frame, float frame_speed_mult, bool unk1, float unk2, bool unk3, bool unk4) {
Selection::change_motion(module_accessor, motion_kind);
u64 motion_module = load_module(module_accessor, 0x88);
void (*change_motion)(u64, u64, float, float, bool, float, bool, bool) =
(void (*)(u64, u64, float, float, bool, float, bool, bool)) load_module_impl(motion_module, 0xD8);
change_motion(motion_module, motion_kind, start_frame, frame_speed_mult, unk1, unk2, unk3, unk4);
}
} // namespace app::lua_bind::MotionModule
void training_mods_main() {
fighter_manager_addr = SaltySDCore_FindSymbol(
"_ZN3lib9SingletonIN3app14FighterManagerEE9instance_E");
SaltySD_function_replace_sym(
"_ZN3app8lua_bind32MotionModule__change_motion_implEPNS_26BattleObjectModuleAccessorEN3phx6Hash40Effbfbb",
(u64)&MotionModule::change_motion_replace);
// Taunt toggles
SaltySD_function_replace_sym(
"_ZN3app8lua_bind33ControlModule__clear_command_implEPNS_26BattleObjectModuleAccessorEb",
(u64)&ControlModule::clear_command_replace);
// Mash airdodge/jump
SaltySD_function_replace_sym(