diff --git a/hkrpg/src/addr.rs b/hkrpg/src/addr.rs index f9fa7cd..9953839 100644 --- a/hkrpg/src/addr.rs +++ b/hkrpg/src/addr.rs @@ -6,10 +6,7 @@ use crate::util::scan_il2cpp_section; const IL2CPP_STRING_NEW_LEN: &str = "E8 ? ? ? ? EB ? 31 C0 48 89 06 48 8B 47 ? 48 89 46 ? F2 0F 10 47"; const MAKE_INITIAL_URL: &str = "E8 ? ? ? ? 48 89 D9 48 89 C2 E8 ? ? ? ? 48 89 D9 4C 89 FA E8 ? ? ? ? 49 89 5D"; // TODO -const SET_ELEVATION_DITHER: &str = "56 48 83 EC ? 0F 29 74 24 ? 0F 28 F1 48 89 CE 80 3D ? ? ? ? ? 75 ? 80 7E ? ? 74 ? 0F 57 C0 F3 0F 5F C6 F3 0F 10 0D ? ? ? ? F3 0F 5D C8 F3 0F 11 4E ? F3 0F 59 4E ? 48 89 F1 41 B8 ? ? ? ? E8 ? ? ? ? 84 C0 75 ? C7 46 ? ? ? ? ? 0F 28 74 24 ? 48 83 C4 ? 5E C3 B9 ? ? ? ? E8 ? ? ? ? 48 85 C0 74 ? 48 89 C1 48 89 F2 0F 28 D6 0F 28 74 24 ? 48 83 C4 ? 5E E9 ? ? ? ? E8 ? ? ? ? CC 0F 1F 00 56 57 53"; // TODO -const SET_DISTANCE_DITHER: &str = "E8 ? ? ? ? 49 8B 46 ? 48 85 C0 0F 84 ? ? ? ? 48 8B 4D"; // TODO -const SET_DITHER_ALPHA: &str = "E8 ? ? ? ? 0F 28 74 24 ? 48 83 C4 ? 5B 5F 5E C3 B9 ? ? ? ? E8 ? ? ? ? 48 85 C0 0F 84 ? ? ? ? 48 89 C1 48 89 F2 E8"; // TODO -const SET_DITHER_ALPHA_ANIM: &str = "E8 ? ? ? ? 8B 46 ? 0F 57 C0 0F 2E C6 0F 82"; // TODO +const SET_DITHER: &str = "E8 ? ? ? ? F3 0F 10 96 ? ? ? ? C7 44 24"; const SDK_PUBLIC_KEY_LITERAL: &str = "48 8B 0D ? ? ? ? 4C 89 E2 E8 ? ? ? ? 48 89 C6 48 8B 0D ? ? ? ? E8 ? ? ? ? 48 89 C7 48 8B 0D"; // const HK_CHECK1: &str = "55 41 56 56 57 53 48 81 EC 00 01 00 00 48 8D AC 24 80 00 00 00 C7 45 7C 00 00 00 00"; // const HK_CHECK2: &str = "55 41 57 41 56 41 55 41 54 56 57 53 48 81 EC B8 02 00 00"; @@ -18,13 +15,10 @@ const SDK_PUBLIC_KEY_LITERAL: &str = "48 8B 0D ? ? ? ? 4C 89 E2 E8 ? ? ? ? 48 89 pub struct RVAConfig { pub il2cpp_string_new_len: usize, pub make_initial_url: usize, - pub set_elevation_dither: usize, - pub set_distance_dither: usize, - pub set_dither_alpha: usize, - pub set_dither_alpha_anim: usize, + pub set_dither: usize, + pub sdk_public_key: usize, pub hk_check1: usize, pub hk_check2: usize, - pub sdk_public_key: usize, } #[allow(static_mut_refs)] @@ -85,40 +79,13 @@ pub unsafe fn init_rvas() { 0x0 ); - // set_elevation_dither + // set_dither set_rva!( GAME_ASSEMBLY_BASE, config, - set_elevation_dither, + set_dither, scan_il2cpp_section, - SET_ELEVATION_DITHER, - 0x0 - ); - // set_distance_dither - set_rva!( - GAME_ASSEMBLY_BASE, - config, - set_distance_dither, - scan_il2cpp_section, - SET_DISTANCE_DITHER, - 0x0 - ); - // set_dither_alpha - set_rva!( - GAME_ASSEMBLY_BASE, - config, - set_dither_alpha, - scan_il2cpp_section, - SET_DITHER_ALPHA, - 0x0 - ); - // set_dither_alpha_anim - set_rva!( - GAME_ASSEMBLY_BASE, - config, - set_dither_alpha_anim, - scan_il2cpp_section, - SET_DITHER_ALPHA_ANIM, + SET_DITHER, 0x0 ); diff --git a/hkrpg/src/modules/censorship_patch.rs b/hkrpg/src/modules/censorship_patch.rs index f8a6725..57219a5 100644 --- a/hkrpg/src/modules/censorship_patch.rs +++ b/hkrpg/src/modules/censorship_patch.rs @@ -27,10 +27,7 @@ impl HkrpgModule for HkrpgModuleContext { replace!( self, config, - set_distance_dither, - set_elevation_dither, - set_dither_alpha, - set_dither_alpha_anim + set_dither ); Ok(()) }