Merge pull request #2303 from HDR-Development/smashline-2-fixes

Fix Custom Gamemodes

Author: WuBoytH

fighters/common/src/function_hooks/attack.rs

@@ -53,10 +53,13 @@ unsafe fn attack_module_set_attack(module: u64, id: i32, group: i32, data: &mut
 unsafe fn get_damage_frame_mul(ctx: &mut skyline::hooks::InlineCtx) {
     match utils::game_modes::get_custom_mode() {
         Some(modes) => {
-            if modes.contains(&CustomMode::Smash64Mode) {
-                let damage_frame_mul_n64: f32 = 0.533;
-                asm!("fmov s0, w8", in("w8") damage_frame_mul_n64)
+            let damage_frame_mul: f32 = if modes.contains(&CustomMode::Smash64Mode) {
+                0.533
             }
+            else {
+                0.42
+            };
+            asm!("fmov s0, w8", in("w8") damage_frame_mul)
         },
         _ => {}
     }
@@ -66,10 +69,13 @@ unsafe fn get_damage_frame_mul(ctx: &mut skyline::hooks::InlineCtx) {
 unsafe fn get_hitstop_frame_add(ctx: &mut skyline::hooks::InlineCtx) {
     match utils::game_modes::get_custom_mode() {
         Some(modes) => {
-            if modes.contains(&CustomMode::Smash64Mode) {
-                let hitstop_frame_add_n64: f32 = 5.0;
-                asm!("fmov s0, w8", in("w8") hitstop_frame_add_n64)
+            let hitstop_frame_add: f32 = if modes.contains(&CustomMode::Smash64Mode) {
+                5.0
             }
+            else {
+                4.0
+            };
+            asm!("fmov s0, w8", in("w8") hitstop_frame_add)
         },
         _ => {}
     }

utils/src/game_modes.rs

@@ -161,7 +161,7 @@ unsafe fn once_per_game_frame(game_state_ptr: u64) {
 
 pub fn install() {
     skyline::install_hooks!(
-        // on_rule_select_hook,
-        // once_per_game_frame
+        on_rule_select_hook,
+        once_per_game_frame
     );
 }

utils/src/offsets.rs

@@ -419,7 +419,7 @@ mod offsets_impl {
             offsets.map_controls = byte_search(MAP_CONTROLS_SEARCH_CODE).expect("Unable to find control mapping function!");
             offsets.once_per_game_frame = byte_search(ONCE_PER_GAME_FRAME_SEARCH_CODE).expect("Unable to find once-per-game-frame function!");
             offsets.on_rule_select = byte_search(ON_RULE_SELECT_SEARCH_CODE).expect("Unable to find on-rule-select instructions!");
-            offsets.global_frame_counter = 0x52e6b44;
+            offsets.global_frame_counter = 0x52e8b44;
             offsets.get_match_mode = {
                 let offset = byte_search(GET_MATCH_MODE_SEARCH_CODE).expect("Unable to find get_match_mode!") - GET_MATCH_MODE_OFFSET_TO_START;
                 let bl_offset = offset_from_bl(offset);