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

move from ACMD toggles to pure code edits

Browse source
This commit is contained in:
jugeeya 2019-06-28 15:15:45 -07:00
parent 956e45e8c6
commit aa971bc27a
3 changed files with 89 additions and 184 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/main.cpp
View file

@ -18,7 +18,6 @@
#include "saltysd/saltysd_helper.hpp"
#include "hitbox_visualizer.hpp"
#include "script_replacement.hpp"
#include "training_mods.hpp"
extern "C" {
@ -86,10 +85,6 @@ int main(int argc, char* argv[]) {
SaltySD_Memcpy(version_string, (u64) "Salty v%d%d%d", 13);
}
// Necessary for script replacement
SaltySD_function_replace_sym("_ZN3lib8L2CAgent15clear_lua_stackEv",
(u64)&clear_lua_stack_replace);
// Add function replacements here
hitbox_vis_main();
training_mods_main();

179
source/script_replacement.hpp
View file

@ -1,179 +0,0 @@
#include <switch.h>
#include <stdint.h>
#include "useful/crc32.h"
#include "useful/useful.h"
#include "useful/const_value_table.h"
#include "useful/raygun_printer.hpp"
#include "acmd_wrapper.hpp"
#include "imports/lib/l2c.hpp"
#include "taunt_toggles.h"
using namespace lib;
using namespace app::lua_bind;
void sv_replace_status_func(u64 l2c_agentbase, int status_kind, u64 key,
void* func);
u64 appeal_lw_replace(L2CAgent* l2c_agent, void* variadic);
u64 appeal_hi_replace(L2CAgent* l2c_agent, void* variadic);
u64 appeal_s_replace(L2CAgent* l2c_agent, void* variadic);
u64 pre_GuardDamage_replace(L2CAgent* l2c_fighter, L2CAgent* l2c_agent);
void replace_scripts(L2CAgent* l2c_agent, u8 category, int kind) {
// fighter
if (category == BATTLE_OBJECT_CATEGORY_FIGHTER) {
// taunt toggles
l2c_agent->sv_set_function_hash(&appeal_lw_replace,
hash40("effect_appeallwl"));
l2c_agent->sv_set_function_hash(&appeal_lw_replace,
hash40("effect_appeallwr"));
l2c_agent->sv_set_function_hash(&appeal_hi_replace,
hash40("effect_appealhil"));
l2c_agent->sv_set_function_hash(&appeal_hi_replace,
hash40("effect_appealhir"));
l2c_agent->sv_set_function_hash(&appeal_s_replace,
hash40("effect_appealsl"));
l2c_agent->sv_set_function_hash(&appeal_s_replace,
hash40("effect_appealsr"));
}
}
u64 appeal_lw_replace(L2CAgent* l2c_agent, void* variadic) {
ACMD acmd = ACMD(l2c_agent);
acmd.frame(1);
if (acmd.is_excute()) {
if (is_training_mode()) {
if (TOGGLE_STATE == MASH_TOGGLES) {
MASH_STATE = (MASH_STATE + 1) % NUM_MASH_STATES;
const char* toggle_strings[NUM_MASH_STATES] = {
"NONE", "AIRDODGE", "JUMP", "RANDOM"};
print_string(acmd.module_accessor, toggle_strings[MASH_STATE]);
}
if (TOGGLE_STATE == ESCAPE_TOGGLES) {
ESCAPE_STATE = (ESCAPE_STATE + 1) % NUM_ESCAPE_STATES;
const char* toggle_strings[NUM_ESCAPE_STATES] = {"NONE",
"LEDGE"};
print_string(acmd.module_accessor, toggle_strings[ESCAPE_STATE]);
}
if (TOGGLE_STATE == SHIELD_TOGGLES) {
SHIELD_STATE = (SHIELD_STATE + 1) % NUM_SHIELD_STATES;
const char* toggle_strings[NUM_SHIELD_STATES] = {
"NONE", "INFINITE", "HOLD"};
print_string(acmd.module_accessor, toggle_strings[SHIELD_STATE]);
}
}
}
return 0;
}
u64 appeal_hi_replace(L2CAgent* l2c_agent, void* variadic) {
ACMD acmd = ACMD(l2c_agent);
acmd.frame(1);
if (acmd.is_excute()) {
if (is_training_mode()) {
HITBOX_VIS = !HITBOX_VIS;
if (HITBOX_VIS)
print_string(acmd.module_accessor, "HITBOX\nVIS");
else
print_string(acmd.module_accessor, "NO\nHITBOX");
}
}
return 0;
}
u64 appeal_s_replace(L2CAgent* l2c_agent, void* variadic) {
ACMD acmd = ACMD(l2c_agent);
acmd.frame(1);
if (acmd.is_excute()) {
if (is_training_mode()) {
if (TOGGLE_STATE == ESCAPE_TOGGLES &&
ESCAPE_STATE == ESCAPE_LEDGE) {
LEDGE_STATE = (LEDGE_STATE + 1) % NUM_LEDGE_STATES;
const char* LEDGE_strings[NUM_LEDGE_STATES] = {
"RANDOM", "NORMAL", "ROLL", "JUMP", "ATTACK"};
print_string(acmd.module_accessor, LEDGE_strings[LEDGE_STATE]);
} else if (MASH_STATE == MASH_ATTACK) {
ATTACK_STATE = (ATTACK_STATE + 1) % NUM_ATTACK_STATES;
const char* ATTACK_strings[NUM_ATTACK_STATES] = {
"NAIR", "FAIR", "BAIR", "UPAIR", "DAIR",
"NEUTRAL B", "SIDE B", "UP B", "DOWN B"};
print_string(acmd.module_accessor,
ATTACK_strings[ATTACK_STATE]);
} else {
if (ControlModule::check_button_on(acmd.module_accessor, CONTROL_PAD_BUTTON_APPEAL_S_L)) {
DI_STATE = DI_STATE == NONE ? DI_RANDOM_IN_AWAY : NONE;
} else {
DI_STATE = DI_STATE == NONE ? SET_DI : NONE;
}
const char* DI_strings[NUM_DI_STATES] = {"NONE", "SET_DI",
"RANDOM\nIN AWAY"};
print_string(acmd.module_accessor, DI_strings[DI_STATE]);
if (DI_STATE == SET_DI) {
DI_stick_x = ControlModule::get_stick_x(acmd.module_accessor);
DI_stick_y = ControlModule::get_stick_y(acmd.module_accessor);
}
}
}
}
return 0;
}
void* sv_get_status_func(u64 l2c_agentbase, int status_kind, u64 key) {
u64 unk48 = LOAD64(l2c_agentbase + 0x48);
u64 unk50 = LOAD64(l2c_agentbase + 0x50);
if (0x2E8BA2E8BA2E8BA3LL * ((unk50 - unk48) >> 4) > (u64)status_kind)
return *(void**)(unk48 + 0xB0LL * status_kind + (key << 32 >> 29));
return 0;
}
void sv_replace_status_func(u64 l2c_agentbase, int status_kind, u64 key,
void* func) {
u64 unk48 = LOAD64(l2c_agentbase + 0x48);
u64 unk50 = LOAD64(l2c_agentbase + 0x50);
if (0x2E8BA2E8BA2E8BA3LL * ((unk50 - unk48) >> 4) > (u64)status_kind) {
*(void**)(unk48 + 0xB0LL * status_kind + (key << 32 >> 29)) = func;
}
}
u64 clear_lua_stack_replace(u64 l2c_agent) {
u64 lua_state = LOAD64(l2c_agent + 8);
if ((lua_state - 8) && LOAD64(lua_state - 8) &&
(LOAD64(LOAD64(lua_state - 8) + 416LL))) {
u8 battle_object_category = *(u8*)(LOAD64(lua_state - 8) + 404LL);
int battle_object_kind = *(int*)(LOAD64(lua_state - 8) + 408LL);
replace_scripts((L2CAgent*)l2c_agent, battle_object_category,
battle_object_kind);
}
// Original clear_lua_stack:
u64 v1 = LOAD64(l2c_agent + 8);
u64 v2 = LOAD64(v1 + 16);
u64 i = LOAD64(LOAD64(v1 + 32)) + 16LL;
for (; v2 < i; v2 = LOAD64(v1 + 16)) {
LOAD64(v1 + 16) = v2 + 16;
*(u32*)(v2 + 8) = 0;
}
LOAD64(v1 + 16) = i;
return l2c_agent;
}

89
source/training_mods.hpp
View file

@ -488,9 +488,98 @@ int vsnprintf_intercept(char* s, size_t maxlen, const char* format, va_list arg)
return ret;
}
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) {
if (motion_kind == hash40("appeal_lw_l") || motion_kind == hash40("appeal_lw_r")) {
if (is_training_mode()) {
if (TOGGLE_STATE == MASH_TOGGLES) {
MASH_STATE = (MASH_STATE + 1) % NUM_MASH_STATES;
const char* toggle_strings[NUM_MASH_STATES] = {
"NONE", "AIRDODGE", "JUMP", "RANDOM"};
print_string(module_accessor, toggle_strings[MASH_STATE]);
}
if (TOGGLE_STATE == ESCAPE_TOGGLES) {
ESCAPE_STATE = (ESCAPE_STATE + 1) % NUM_ESCAPE_STATES;
const char* toggle_strings[NUM_ESCAPE_STATES] = {"NONE",
"LEDGE"};
print_string(module_accessor, toggle_strings[ESCAPE_STATE]);
}
if (TOGGLE_STATE == SHIELD_TOGGLES) {
SHIELD_STATE = (SHIELD_STATE + 1) % NUM_SHIELD_STATES;
const char* toggle_strings[NUM_SHIELD_STATES] = {
"NONE", "INFINITE", "HOLD"};
print_string(module_accessor, toggle_strings[SHIELD_STATE]);
}
}
} else if (motion_kind == hash40("appeal_s_l") || motion_kind == hash40("appeal_s_r")) {
if (is_training_mode()) {
if (TOGGLE_STATE == ESCAPE_TOGGLES &&
ESCAPE_STATE == ESCAPE_LEDGE) {
LEDGE_STATE = (LEDGE_STATE + 1) % NUM_LEDGE_STATES;
const char* LEDGE_strings[NUM_LEDGE_STATES] = {
"RANDOM", "NORMAL", "ROLL", "JUMP", "ATTACK"};
print_string(module_accessor, LEDGE_strings[LEDGE_STATE]);
} else if (MASH_STATE == MASH_ATTACK) {
ATTACK_STATE = (ATTACK_STATE + 1) % NUM_ATTACK_STATES;
const char* ATTACK_strings[NUM_ATTACK_STATES] = {
"NAIR", "FAIR", "BAIR", "UPAIR", "DAIR",
"NEUTRAL B", "SIDE B", "UP B", "DOWN B"};
print_string(module_accessor,
ATTACK_strings[ATTACK_STATE]);
} else {
if (ControlModule::check_button_on(module_accessor, CONTROL_PAD_BUTTON_APPEAL_S_L)) {
DI_STATE = DI_STATE == NONE ? DI_RANDOM_IN_AWAY : NONE;
} else {
DI_STATE = DI_STATE == NONE ? SET_DI : NONE;
}
const char* DI_strings[NUM_DI_STATES] = {"NONE", "SET_DI",
"RANDOM\nIN AWAY"};
print_string(module_accessor, DI_strings[DI_STATE]);
if (DI_STATE == SET_DI) {
DI_stick_x = ControlModule::get_stick_x(module_accessor);
DI_stick_y = ControlModule::get_stick_y(module_accessor);
}
}
}
} else if (motion_kind == hash40("appeal_hi_l") || motion_kind == hash40("appeal_hi_r")) {
if (is_training_mode()) {
HITBOX_VIS = !HITBOX_VIS;
if (HITBOX_VIS)
print_string(module_accessor, "HITBOX\nVIS");
else
print_string(module_accessor, "NO\nHITBOX");
}
}
// call original
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(
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);
// Mash airdodge/jump
SaltySD_function_replace_sym(
"_ZN3app8lua_bind40ControlModule__get_command_flag_cat_implEPNS_26BattleObjectModuleAccessorEi",