From e6a61cbe6798d30f796c76a1a91ed370baba9b16 Mon Sep 17 00:00:00 2001 From: WuBoytH Date: Wed, 2 Sep 2026 10:02:14 -0400 Subject: [PATCH 1/2] 13.0.5 Offsets --- src/fixes.rs | 20 ++++++++++---------- src/lib.rs | 6 +++--- src/lua/lua.rs | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/fixes.rs b/src/fixes.rs index d17dcad59..bc128438d 100644 --- a/src/fixes.rs +++ b/src/fixes.rs @@ -13,11 +13,11 @@ fn install_inkling_patches() { Patch::in_text(offsets::inkling_patch()) .nop() .expect("Failed to patch inkling 1 cmp"); - + Patch::in_text(offsets::inkling_patch() + 4) .nop() .expect("Failed to patch inkling 1 b.cs"); - + BranchBuilder::branch() .branch_offset(offsets::inkling_c10plus()) .branch_to_offset(offsets::inkling_c10plus() + 0x38) @@ -51,13 +51,13 @@ fn install_added_color_patches() { */ // OFFSETS ARE CURRENTLY HARDCODED TO VERSION 13.0.2 static ADDED_COLOR_PATCHES: &[(usize, u32)] = &[ - (0x18355fc, 0xF104027F), // cmp x19, #256 (Issue related to Aegis) - (0x18352bc, 0xF104027F), // cmp x19, #256 (Issue related to Aegis) - (0x1835618, 0xF104011F), // cmp x8, #256 (Issue related to Aegis) - (0x18359e8, 0xF10402FF), // cmp x23, #256 (Issue related to Aegis) - (0x1835e7c, 0xF104011F), // cmp x8, #256 (Issue related to Aegis) - (0x18365d4, 0xF104027F), // cmp x19, #256 (Issue related to Aegis) - (0x18368f0, 0xF104013F), // cmp x9, #256 (Issue related to Aegis) + (0x18355fc - 0x40, 0xF104027F), // cmp x19, #256 (Issue related to Aegis) + (0x18352bc - 0x40, 0xF104027F), // cmp x19, #256 (Issue related to Aegis) + (0x1835618 - 0x40, 0xF104011F), // cmp x8, #256 (Issue related to Aegis) + (0x18359e8 - 0x40, 0xF10402FF), // cmp x23, #256 (Issue related to Aegis) + (0x1835e7c - 0x40, 0xF104011F), // cmp x8, #256 (Issue related to Aegis) + (0x18365d4 - 0x40, 0xF104027F), // cmp x19, #256 (Issue related to Aegis) + (0x18368f0 - 0x40, 0xF104013F), // cmp x9, #256 (Issue related to Aegis) (0x1a1cdf0, 0xF104011F), // cmp x8, #256 (Issue related to Aegis) (0x1a1ce34, 0xF104011F), // cmp x8, #256 (Issue related to Aegis) (0x14de31c, 0x7104013F), // cmp w9, #256 (Issue related to Terry) @@ -116,7 +116,7 @@ fn install_lazy_loading_patches() { pub fn get_ui_chara_path_from_hash_color_and_type(ui_chara_hash: u64, color_slot: u32, ui_type: u32) -> u64; // This takes the character_database and the ui_chara_hash to get the color_num - #[from_offset(0x32384c0)] + #[from_offset(0x3238A70)] pub fn get_color_num_from_hash(character_database: u64, ui_chara_hash: u64) -> u8; // This takes the character_database and the ui_chara_hash to get the chara's respective echo (for loading it at the same time) diff --git a/src/lib.rs b/src/lib.rs index 9e19ba7d0..9f3324a83 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -257,9 +257,9 @@ fn initial_loading(_ctx: &InlineCtx) { fuse::arc::install_arc_fs(); api::event::send_event(Event::ArcFilesystemMounted); replacement::lookup::initialize(Some(arc)); - + let mut filesystem = unsafe { GLOBAL_FILESYSTEM.write().unwrap() }; - + *filesystem = filesystem.take().finish(arc).unwrap(); filesystem.process_mods(); @@ -430,7 +430,7 @@ pub fn main() { ); })); - if utils::env::get_game_version() != semver::Version::new(13, 0, 4) { + if utils::env::get_game_version() != semver::Version::new(13, 0, 5) { skyline::error::show_error(69, "Smash Ultimate requires an update.\0", "ARCropolis cannot currently run on a Smash version other than 13.0.4\n\nConsider updating your game or uninstalling ARCropolis.\0"); // Do not perform any of the hook installation and let the game proceed as normal. return; diff --git a/src/lua/lua.rs b/src/lua/lua.rs index e62011ca9..de6d0cdbc 100644 --- a/src/lua/lua.rs +++ b/src/lua/lua.rs @@ -27,13 +27,13 @@ fn lua_getfield(lua_state: &mut lua_state, lua_registry: *const TValue, name: *c #[from_offset(offsets::lua_setmetatable())] fn lua_setmetatable(lua_state: &mut lua_state, obj_idx: i32); -#[from_offset(0x38f6cb0)] +#[from_offset(0x38f4440)] fn lua_tonumberx(lua_state: &mut lua_state, idx: i32, unk: *const u64) -> f32; -#[from_offset(0x38f4000)] +#[from_offset(0x38f45B0)] fn lua_tointegerx(lua_state: &mut lua_state, idx: i32, unk: *const u64) -> u64; -#[from_offset(0x38f4180)] +#[from_offset(0x38f4730)] fn lua_tolstring(lua_state: &mut lua_state, idx: i32, unk: *const u64) -> *const u8; #[from_offset(offsets::declare_namespace())] From e1f8fd7cf829cc57f72a765553ff79086c89c519 Mon Sep 17 00:00:00 2001 From: WuBoytH Date: Wed, 2 Sep 2026 10:03:56 -0400 Subject: [PATCH 2/2] remove math --- src/fixes.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/fixes.rs b/src/fixes.rs index bc128438d..9c8392b0b 100644 --- a/src/fixes.rs +++ b/src/fixes.rs @@ -51,13 +51,13 @@ fn install_added_color_patches() { */ // OFFSETS ARE CURRENTLY HARDCODED TO VERSION 13.0.2 static ADDED_COLOR_PATCHES: &[(usize, u32)] = &[ - (0x18355fc - 0x40, 0xF104027F), // cmp x19, #256 (Issue related to Aegis) - (0x18352bc - 0x40, 0xF104027F), // cmp x19, #256 (Issue related to Aegis) - (0x1835618 - 0x40, 0xF104011F), // cmp x8, #256 (Issue related to Aegis) - (0x18359e8 - 0x40, 0xF10402FF), // cmp x23, #256 (Issue related to Aegis) - (0x1835e7c - 0x40, 0xF104011F), // cmp x8, #256 (Issue related to Aegis) - (0x18365d4 - 0x40, 0xF104027F), // cmp x19, #256 (Issue related to Aegis) - (0x18368f0 - 0x40, 0xF104013F), // cmp x9, #256 (Issue related to Aegis) + (0x18355bc, 0xF104027F), // cmp x19, #256 (Issue related to Aegis) + (0x183527c, 0xF104027F), // cmp x19, #256 (Issue related to Aegis) + (0x18355d8, 0xF104011F), // cmp x8, #256 (Issue related to Aegis) + (0x18359a8, 0xF10402FF), // cmp x23, #256 (Issue related to Aegis) + (0x1835e3c, 0xF104011F), // cmp x8, #256 (Issue related to Aegis) + (0x1836594, 0xF104027F), // cmp x19, #256 (Issue related to Aegis) + (0x18368b0, 0xF104013F), // cmp x9, #256 (Issue related to Aegis) (0x1a1cdf0, 0xF104011F), // cmp x8, #256 (Issue related to Aegis) (0x1a1ce34, 0xF104011F), // cmp x8, #256 (Issue related to Aegis) (0x14de31c, 0x7104013F), // cmp w9, #256 (Issue related to Terry)