Push code for 1.25.0

Author: Raytwo

Cargo.toml

@@ -12,7 +12,7 @@ package-resources = [
 ]
 
 [dependencies]
-skyline = { git = "https://github.com/ultimate-research/skyline-rs" }
+skyline = "0.5.1"
 ozone_macro = { path = "./ozone_macro" }
 cobalt = { path = "crates/cobalt" }
 updater = { path = "crates/updater" }

crates/cobalt/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "cobalt"
-version = "1.23.0"
+version = "1.25.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-skyline = { git = "https://github.com/ultimate-research/skyline-rs" }
+skyline = "0.5.1"
 unity = { version = "0.3.0", git = "https://github.com/DivineDragonFanClub/unity" }
 engage = { version = "0.10.0", git = "https://github.com/DivineDragonFanClub/engage" }
 mods = { path = "../mods" }
@@ -23,4 +23,5 @@ gamedata = { path = "../gamedata" }
 easer = "0.3.0"
 phf = { version = "0.11", features = ["macros"] }
 lazysimd = { git = "https://github.com/Raytwo/lazysimd" }
-image = { version = "0.24.9", default-features = false, features = ["png"] }
+image = { version = "0.24.9", default-features = false, features = ["png"] }
+

crates/cobalt/src/api/events/mod.rs

@@ -1,7 +1,8 @@
+use std::cell::RefCell;
 use std::sync::{
     LazyLock, RwLock
 };
-
+use engage::proc::desc::ProcDesc;
 use engage::proc::ProcInst;
 
 mod event;
@@ -20,7 +21,11 @@ pub enum SystemEvent {
     MsbtLoaded,
     LanguageChanged,
     SaveLoaded { ty: i32, slot_id: i32 },
-    ProcInstJump { proc: &'static ProcInst, label: i32 }
+    ProcInstJump { proc: &'static ProcInst, label: i32 },
+    ProcInstBind {
+        proc: RefCell<&'static mut ProcInst>,
+        parent: RefCell<Option<&'static mut ProcInst>>,
+    },
 }
 
 #[repr(C)]

crates/cobalt/src/audio.rs

@@ -153,7 +153,7 @@ pub struct FileCommon {}
 #[repr(C)]
 pub struct FileCommonStaticFields<'a> {
     lock_object: &'a (),
-    dictionary: &'a Dictionary<&'a Il2CppString, &'a mut FileData>,
+    dictionary: &'a Dictionary<'a, &'a Il2CppString, &'a mut FileData>,
     // Meh
 }
 

crates/cobalt/src/catalog.rs

@@ -167,11 +167,11 @@ pub fn from_json_hook(json: &Il2CppString, method_info: OptionalMethod) -> *cons
                         Asset::Sprite(_) => 2,
                         Asset::Text(_) => 12,
                         Asset::Terrain(_) => 13,
+                        Asset::AnimationClip(_) => 36,
+                        Asset::AnimatorOverrideController(_) => 47,
                         Asset::Unparsed(_) => {
                             // We handle any type that isn't parsed by Astra-formats here
                             match found_asset.type_hash() {
-                                // AnimationClip
-                                -80937412517696055409803870673809846754 => 36,
                                 _ => 4
                             }
                         },
@@ -203,6 +203,7 @@ pub fn from_json_hook(json: &Il2CppString, method_info: OptionalMethod) -> *cons
                     ".asset",
                     ".unity",
                     ".fbx",
+                    ".overrideController"
                 ];
 
                 let internal_path = suffixes.iter().fold(internal_path, |path, suffix| {

crates/cobalt/src/lib.rs

@@ -2,11 +2,13 @@
 #![feature(stmt_expr_attributes)]
 #![feature(unsafe_cell_from_mut)]
 
+use std::cell::RefCell;
 use engage::{
     gamedata::{Gamedata, GodData},
     godpool::god_pool_try_get_gid,
     proc::{ProcInst, ProcInstFields},
 };
+use engage::proc::desc::ProcDesc;
 use unity::prelude::*;
 
 pub mod api;
@@ -56,6 +58,33 @@ pub fn procinst_jump(this: &'static ProcInst, label: &i32, method_info: Optional
 
     call_original!(this, label, method_info)
 }
+#[skyline::from_offset(0x0281e4d0)]
+pub fn proc_inst_create_internal(
+    this: &ProcInst,
+    parent: Option<&ProcInst>,
+    desc: &Il2CppArray<&ProcDesc>,
+    name: Option<&Il2CppString>,
+    is_bind: bool,
+    method_info: OptionalMethod) -> &'static ProcInst;
+
+#[skyline::hook(offset=0x280a6b0)]
+pub fn proc_inst_create_bind(
+    this: &'static mut ProcInst,
+    parent: Option<&'static mut ProcInst>,
+    desc: &'static Il2CppArray<&'static ProcDesc>,
+    name: Option<&Il2CppString>,
+    method_info: OptionalMethod) -> &'static ProcInst
+{
+    let proc =
+    unsafe {
+        proc_inst_create_internal(this, parent.as_deref(), desc, name, true, method_info)
+    };
+    crate::api::events::publish_system_event(api::events::SystemEvent::ProcInstBind {
+        proc: RefCell::new(this),
+        parent: RefCell::new(parent)
+    });
+    proc
+}
 
 #[skyline::from_offset(0x429cc8)]
 pub fn value_to_int(value: &i32) -> &i32;

crates/cobalt/src/sequences/titleloop.rs

@@ -7,7 +7,7 @@ use engage::{
 
 use crate::api::events::{Event, SystemEvent};
 
-const TITLELOOPSEQUENCE_HASHCODE: i32 = -988690862;
+pub const TITLELOOPSEQUENCE_HASHCODE: i32 = -988690862;
 
 pub extern "C" fn grand_opening_skip(evt: &Event<SystemEvent>) {
     if let Event::Args(ev) = evt {