Updates for 02-2026 STD

Author: Raytwo

Cargo.toml

@@ -22,7 +22,7 @@ walkdir = "2.3.3"
 thiserror = "1.0.43"
 camino = "1"
 # Switch utilities
-skyline = { git = "https://github.com/ultimate-research/skyline-rs" }
+skyline = "0.6"
 skyline-config = { git = "https://github.com/skyline-rs/skyline-config" }
 # For the updater
 zip = { version = "0.6", default-features = false, features = ["deflate"], optional = true }
@@ -42,7 +42,7 @@ orbits = { git = "https://github.com/blu-dev/orbits" }
 smash-arc = { git = "https://github.com/jam1garner/smash-arc", features = ["smash-runtime", "rust-zstd", "serialize"] }
 hash40 = "1.3"
 arcropolis-api = { git = "https://github.com/Raytwo/arcropolis_api" }
-arc-config = { git = "https://github.com/blu-dev/arc-config", features = ["runtime"] }
+arc-config = { git = "https://github.com/Raytwo/arc-config", features = ["runtime"] }
 # For arc:/ and mods:/
 nn-fuse = { git = "https://github.com/Raytwo/nn-fuse" }
 prcx = { git = "https://github.com/zrksyd/prcx", branch = "xml-style-zrksyd" }

crates/config/Cargo.toml

@@ -11,7 +11,7 @@ serde_json = "1.0"
 toml = "0.5.11"
 log = "0.4.19"
 smash-arc = { git = "https://github.com/jam1garner/smash-arc", default-features = false}
-skyline = { git = "https://github.com/Raytwo/skyline-rs", branch="preview" }
+skyline = "0.6"
 skyline-config = { git = "https://github.com/skyline-rs/skyline-config" }
 thiserror = "1.0.43"
 semver = { version = "1", features = ["serde"] }

crates/menus/Cargo.toml

@@ -13,7 +13,7 @@ skyline-web = { git = "https://github.com/skyline-rs/skyline-web" }
 skyline-config = { git = "https://github.com/skyline-rs/skyline-config" }
 log = "0.4.19"
 smash-arc = { git = "https://github.com/jam1garner/smash-arc" }
-skyline = { git = "https://github.com/Raytwo/skyline-rs", branch="preview" }
+skyline = "0.6"
 config = { path = "../config" }
 semver = { version = "1", features = ["serde"] }
 camino = "1"

src/api/lua.rs

@@ -2,7 +2,7 @@ use crate::lua::lua::{lua_state, luaL_Reg_container, luaL_Reg_from_api};
 use std::ffi::CString;
 
 #[no_mangle]
-pub extern "C" fn arcorp_add_lua_menu_manager(name: *mut i8, reg_vec_ptr: *mut luaL_Reg_from_api, reg_vec_size: usize, reg_vec_cap: usize) -> bool {
+pub extern "C" fn arcorp_add_lua_menu_manager(name: *mut u8, reg_vec_ptr: *mut luaL_Reg_from_api, reg_vec_size: usize, reg_vec_cap: usize) -> bool {
     debug!("arcorp_add_lua_menu_manager -> Function called");
     unsafe {
         match CString::from_raw(name).to_str() {
@@ -28,7 +28,7 @@ pub extern "C" fn arcorp_add_lua_menu_manager(name: *mut i8, reg_vec_ptr: *mut l
 }
 
 #[no_mangle]
-pub extern "C" fn arcorp_add_lua_ingame_manager(name: *mut i8, reg_vec_ptr: *mut luaL_Reg_from_api, reg_vec_size: usize, reg_vec_cap: usize) -> bool {
+pub extern "C" fn arcorp_add_lua_ingame_manager(name: *mut u8, reg_vec_ptr: *mut luaL_Reg_from_api, reg_vec_size: usize, reg_vec_cap: usize) -> bool {
     debug!("arcorp_add_lua_ingame_manager -> Function called");
     unsafe {
         match CString::from_raw(name).to_str() {
@@ -95,7 +95,7 @@ pub extern "C" fn arcrop_lua_state_push_nil(lua_state: &mut lua_state) {
 }
 
 #[no_mangle]
-pub extern "C" fn arcrop_lua_state_push_string(lua_state: &mut lua_state, str: *mut i8) {
+pub extern "C" fn arcrop_lua_state_push_string(lua_state: &mut lua_state, str: *mut u8) {
     debug!("arcrop_lua_state_push_string -> Function called");
     unsafe { lua_state.push_string(CString::from_raw(str).to_str().expect("Failed to get string from str pointer!")); }
 }

src/fixes.rs

@@ -5,8 +5,8 @@ use skyline::{from_offset, hook, hooks::InlineCtx, install_hooks, patching::{Pat
 fn install_inkling_patches() {
     #[skyline::hook(offset = offsets::clear_ink_patch(), inline)]
     unsafe fn clear_ink_patch(ctx: &mut InlineCtx) {
-        let res = (*ctx.registers[24].w.as_ref() as u32) % 8;
-        *ctx.registers[24].w.as_mut() = res;
+        let res = ctx.registers[24].w() % 8;
+        ctx.registers[24].set_w(res);
     }
 
     // Inkling Patches here nop some branches so it can work with more than c08+
@@ -39,7 +39,7 @@ fn install_added_color_patches() {
 
     #[hook(offset = offsets::set_global_color_for_classic_mode(), inline)]
     pub unsafe fn set_global_color_for_classic_mode(ctx: &mut InlineCtx) {
-        *(ctx.registers[9].w.as_mut()) = *(ctx.registers[9].w.as_ref()) % 8;
+        ctx.registers[9].set_w(ctx.registers[9].w() % 8);
     }
 
     skyline::install_hook!(set_global_color_for_classic_mode);
@@ -126,8 +126,8 @@ fn install_lazy_loading_patches() {
     #[hook(offset = offsets::load_chara_1_for_all_costumes(), inline)]
     pub unsafe fn original_load_chara_1_ui_for_all_colors(ctx: &mut InlineCtx) {
         // Save the first and fourth parameter for reference when we load the file ourselves
-        PARAM_1 = *ctx.registers[0].x.as_ref();
-        PARAM_4 = *ctx.registers[3].x.as_ref();
+        PARAM_1 = ctx.registers[0].x();
+        PARAM_4 = ctx.registers[3].x();
     }
 
     #[hook(offset = offsets::load_stock_icon_for_portrait_menu(), inline)]
@@ -137,8 +137,8 @@ fn install_lazy_loading_patches() {
           CharaSelectMenu, which means we should be pretty safe loading the CSPs
         */
         if PARAM_1 != 0 && PARAM_4 != 0 {
-            let ui_chara_hash = *ctx.registers[1].x.as_ref();
-            let color = *ctx.registers[2].w.as_ref();
+            let ui_chara_hash = ctx.registers[1].x();
+            let color = ctx.registers[2].w();
             let path = get_ui_chara_path_from_hash_color_and_type(ui_chara_hash, color, 1);
             load_ui_file(PARAM_1 as *const u64, &path, 0, PARAM_4);
         }

src/lib.rs

@@ -50,14 +50,14 @@ static mut NEWS_DATA: LazyLock<RwLock<HashMap<String, String>>> = LazyLock::new(
 #[macro_export]
 macro_rules! reg_x {
     ($ctx:ident, $no:expr) => {
-        unsafe { *$ctx.registers[$no].x.as_ref() }
+        $ctx.registers[$no].x()
     };
 }
 
 #[macro_export]
 macro_rules! reg_w {
     ($ctx:ident, $no:expr) => {
-        unsafe { *$ctx.registers[$no].w.as_ref() }
+        $ctx.registers[$no].w()
     };
 }
 
@@ -342,13 +342,13 @@ unsafe fn msbt_text(ctx: &mut InlineCtx) {
         text.push('\0');
 
         let text_vec: Vec<u16> = text.encode_utf16().collect();
-        *ctx.registers[0].x.as_mut() = text_vec.as_ptr() as u64;
+        ctx.registers[0].set_x(text_vec.as_ptr() as u64);
     }
 }
 
 #[skyline::hook(offset = offsets::packet_send(), inline)]
 unsafe fn online_slot_spoof(ctx: &InlineCtx) {
-    let data = *ctx.registers[3].x.as_ref() as *mut u8;
+    let data = ctx.registers[3].x() as *mut u8;
 
     if data.is_null() {
         return;
@@ -371,9 +371,9 @@ pub fn is_online() -> bool {
 unsafe fn change_fighter_color_r(ctx: &mut skyline::hooks::InlineCtx) {
     if is_online() {
         unsafe {
-            if *ctx.registers[8].w.as_ref() >= 8 {
-                *ctx.registers[8].w.as_mut() = 0; // Actual color
-                *ctx.registers[3].w.as_mut() = 0; // UI
+            if ctx.registers[8].w() >= 8 {
+                ctx.registers[8].set_w(0); // Actual color
+                ctx.registers[3].set_w(0); // UI
             }
         }
     }
@@ -383,33 +383,30 @@ unsafe fn change_fighter_color_r(ctx: &mut skyline::hooks::InlineCtx) {
 unsafe fn change_fighter_color_l(ctx: &mut skyline::hooks::InlineCtx) {
     if is_online() {
         unsafe {
-            if *ctx.registers[8].w.as_ref() >= 8 {
+            if ctx.registers[8].w() >= 8 {
                 // Assuming that if they can change a character's color then that means a character has at least a set of 8 colors
-                *ctx.registers[8].w.as_mut() = 7; // Actual color
-                *ctx.registers[3].w.as_mut() = 7; // UI
+                ctx.registers[8].set_w(7); // Actual color
+                ctx.registers[3].set_w(7); // UI
             }
         }
     }
 }
 
 #[skyline::hook(offset = offsets::skip_opening(), inline)]
 unsafe fn skip_opening_cutscene(ctx: &mut InlineCtx) {
-    let data = ctx.registers[8].x.as_mut();
-    *data = 0;
+    ctx.registers[8].set_x(0);
 }
 
 // Change the next callback for the TitleSceneInfo::callbacks::Enter from "DisplayOpeningCutscene" to "HowToPlay"
 #[skyline::hook(offset = offsets::title_scene_play_opening(), inline)]
 unsafe fn title_scene_play_opening(ctx: &mut InlineCtx) {
-    let data = ctx.registers[9].x.as_mut();
-    *data = 1;
+    ctx.registers[9].set_x(1);
 }
 
 // Pretend the state for another state handler (OpeningCutsceneLayout?) is set to 5
 #[skyline::hook(offset = offsets::title_scene_how_to_play(), inline)]
 unsafe fn title_scene_show_how_to_play_fake_state_index(ctx: &mut InlineCtx) {
-    let data = ctx.registers[8].x.as_mut();
-    *data = 5;
+    ctx.registers[8].set_x(5);
 }
 
 #[skyline::main(name = "arcropolis")]

src/lua/lua.rs

@@ -72,7 +72,7 @@ pub struct luaL_Reg_container {
 #[repr(C)]
 #[derive(Debug)]
 pub struct luaL_Reg_from_api {
-    pub name: *mut i8,
+    pub name: *mut u8,
     pub func: LuaCfunction,
 }