From 66aa745e53f288837dd0c79b76012eb6877c9eaf Mon Sep 17 00:00:00 2001 From: jugeeya Date: Mon, 19 Feb 2024 17:40:45 -0800 Subject: [PATCH] initial --- Cargo.toml | 6 +++--- src/training/ui/mod.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1edcf27..32324d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "training_modpack" -version = "6.0.1" +version = "6.1.0" authors = ["jugeeya "] edition = "2018" @@ -9,7 +9,7 @@ crate-type = ["cdylib"] [dependencies] skyline = { git = "https://github.com/ultimate-research/skyline-rs.git" } -skyline_smash = { git = "https://github.com/GradualSyrup/skyline-smash.git", branch = "training-modpack-updates" } +skyline_smash = { git = "https://github.com/jugeeya/skyline-smash.git", branch = "patch-2" } skyline-web = { git = "https://github.com/skyline-rs/skyline-web.git" } bitflags = "1.2.1" parking_lot = { version = "0.12.0", features = ["nightly"] } @@ -64,4 +64,4 @@ plugin-dependencies = [ [features] outside_training_mode = [] -layout_arc_from_file = [] \ No newline at end of file +layout_arc_from_file = [] diff --git a/src/training/ui/mod.rs b/src/training/ui/mod.rs index 25fe544..9db7d34 100644 --- a/src/training/ui/mod.rs +++ b/src/training/ui/mod.rs @@ -7,7 +7,7 @@ use training_mod_consts::{OnOff, MENU}; use crate::common::menu::QUICK_MENU_ACTIVE; //use crate::common::offsets::{OFFSET_DRAW, OFFSET_LAYOUT_ARC_MALLOC}; -use crate::common::offsets::{OFFSET_DRAW}; +use crate::common::offsets::OFFSET_DRAW; use crate::common::{is_ready_go, is_training_mode}; #[cfg(feature = "layout_arc_from_file")] use crate::consts::LAYOUT_ARC_PATH; @@ -91,7 +91,7 @@ pub unsafe fn handle_draw(layout: *mut Layout, draw_info: u64, cmd_buffer: u64) // in order for us to be able to swap the 'layout.arc' with the current // version of the file in between loads of training mode. #[cfg(feature = "layout_arc_from_file")] -const LAYOUT_ARC_SIZE: usize = (4 * MEBIBYTE) as usize; +const LAYOUT_ARC_SIZE: usize = (5 * MEBIBYTE) as usize; #[cfg(feature = "layout_arc_from_file")] static mut LAYOUT_ARC: &mut [u8; LAYOUT_ARC_SIZE] = &mut [0u8; LAYOUT_ARC_SIZE]; @@ -129,7 +129,7 @@ static mut LAYOUT_ARC: &mut [u8; LAYOUT_ARC_SIZE] = &mut [0u8; LAYOUT_ARC_SIZE]; /// label_material.set_white_res_color(LABEL_WHITE_SELECTED_COLOR); /// label_material.set_black_res_color(LABEL_BLACK_SELECTED_COLOR); /// ``` -#[skyline::hook(offset = 0x37730d4, inline)] // TODO: Fix for 13.0.2 +#[skyline::hook(offset = 0x3773d54, inline)] // TODO: Fix for 13.0.2 unsafe fn handle_layout_arc_malloc(ctx: &mut skyline::hooks::InlineCtx) { if !is_training_mode() { return;