Merge branch 'HDR-Development:dev' into PMRoyProject

Author: LunchablesTX

fighters/common/src/function_hooks/controls.rs

@@ -1153,10 +1153,10 @@ pub fn install() {
     skyline::patching::Patch::in_text(0x3666AF0).data(0xAA0803EAu32);
 
     // Removes 10f C-stick lockout for tilt stick and special stick
-    skyline::patching::Patch::in_text(0x17527dc).data(0x2A1F03FA);
-    skyline::patching::Patch::in_text(0x17527b0).nop();
-    skyline::patching::Patch::in_text(0x17527b4).nop();
-    skyline::patching::Patch::in_text(0x17527b8).nop();
+    skyline::patching::Patch::in_text(0x17532ac).data(0x2A1F03FA);
+    skyline::patching::Patch::in_text(0x17532b0).nop();
+    skyline::patching::Patch::in_text(0x17532b4).nop();
+    skyline::patching::Patch::in_text(0x17532b8).nop();
 
     // Prevents buffered C-stick aerials from triggering nair
     skyline::patching::Patch::in_text(0x6be664).data(0x52800040);

src/lua.rs

@@ -418,7 +418,7 @@ unsafe fn set_parry_button_shield_text(ctx: &skyline::hooks::InlineCtx) {
     }
 }
 
-#[skyline::hook(offset = 0x1d33b80, inline)]
+#[skyline::hook(offset = 0x1d33c80, inline)]
 unsafe fn set_parry_button_taunt_text(ctx: &skyline::hooks::InlineCtx) {
     let sp = (ctx as *const _ as *const u8).add(0x100);
     let ptr = *(sp.add(0xa8) as *const u64);

src/online.rs

@@ -1,7 +1,7 @@
 use skyline::hooks::InlineCtx;
 use std::fmt::Display;
 
-#[skyline::from_offset(0x37a1270)]
+#[skyline::from_offset(0x37a1ef0)]
 pub unsafe fn set_text_string(pane: u64, string: *const u8);
 
 pub unsafe fn get_pane_by_name(arg: u64, arg2: *const u8) -> [u64; 4] {