@@ -3,12 +3,12 @@ use rand::prelude::SliceRandom;
3
3
use rand:: Rng ;
4
4
use utils:: ext:: * ;
5
5
6
- #[ skyline:: hook( offset = 0x16d948c , inline) ]
6
+ #[ skyline:: hook( offset = 0x16d85dc , inline) ]
7
7
unsafe fn packed_packet_creation ( ctx : & mut skyline:: hooks:: InlineCtx ) {
8
8
* ctx. registers [ 22 ] . x . as_mut ( ) = 0x2 ;
9
9
}
10
10
11
- #[ skyline:: hook( offset = 0x16d94c0 , inline) ]
11
+ #[ skyline:: hook( offset = 0x16d8610 , inline) ]
12
12
unsafe fn write_packet ( ctx : & mut skyline:: hooks:: InlineCtx ) {
13
13
let raw = * ctx. registers [ 19 ] . x . as_ref ( ) ;
14
14
@@ -927,7 +927,7 @@ struct ControlModuleInternal {
927
927
static mut LAST_ALT_STICK : [ f32 ; 2 ] = [ 0.0 , 0.0 ] ;
928
928
static mut LAST_ANALOG : f32 = 0.0 ;
929
929
930
- #[ skyline:: hook( offset = 0x3f7220 ) ]
930
+ #[ skyline:: hook( offset = 0x3f7240 ) ]
931
931
unsafe fn parse_inputs ( this : & mut ControlModuleInternal ) {
932
932
const NEUTRAL : f32 = 0.2 ;
933
933
const CLAMP_MAX : f32 = 120.0 ;
@@ -970,7 +970,7 @@ unsafe fn parse_inputs(this: &mut ControlModuleInternal) {
970
970
call_original ! ( this)
971
971
}
972
972
973
- #[ skyline:: hook( offset = 0x6b9c5c , inline) ]
973
+ #[ skyline:: hook( offset = 0x6b9c7c , inline) ]
974
974
unsafe fn after_exec ( ctx : & skyline:: hooks:: InlineCtx ) {
975
975
let module = * ctx. registers [ 19 ] . x . as_ref ( ) ;
976
976
let internal_class = * ( module as * const u64 ) . add ( 0x110 / 0x8 ) ;
@@ -979,7 +979,7 @@ unsafe fn after_exec(ctx: &skyline::hooks::InlineCtx) {
979
979
* ( internal_class as * mut f32 ) . add ( 0x48 / 0x4 ) = LAST_ANALOG ;
980
980
}
981
981
982
- #[ skyline:: hook( offset = 0x16d7ee4 , inline) ]
982
+ #[ skyline:: hook( offset = 0x16d7034 , inline) ]
983
983
unsafe fn handle_incoming_packet ( ctx : & mut skyline:: hooks:: InlineCtx ) {
984
984
let packet = * ctx. registers [ 15 ] . x . as_ref ( ) ;
985
985
@@ -1028,7 +1028,7 @@ unsafe extern "C" fn is_throw_stick(fighter: &mut L2CFighterCommon) -> L2CValue
1028
1028
static mut SHOULD_END_RESULT_SCREEN : bool = false ;
1029
1029
1030
1030
// Skip results screen with start button
1031
- #[ skyline:: hook( offset = 0x3664040 ) ]
1031
+ #[ skyline:: hook( offset = 0x3664CC0 ) ]
1032
1032
unsafe fn process_inputs_handheld ( controller : & mut Controller ) {
1033
1033
let entry_count = lua_bind:: FighterManager :: entry_count ( utils:: singletons:: FighterManager ( ) ) ;
1034
1034
if lua_bind:: FighterManager :: is_result_mode ( utils:: singletons:: FighterManager ( ) )
@@ -1058,7 +1058,7 @@ unsafe fn process_inputs_handheld(controller: &mut Controller) {
1058
1058
1059
1059
static mut GC_TRIGGERS : [ f32 ; 2 ] = [ 0.0 , 0.0 ] ;
1060
1060
1061
- #[ skyline:: hook( offset = 0x3665e2c , inline) ]
1061
+ #[ skyline:: hook( offset = 0x3666AAC , inline) ]
1062
1062
unsafe fn post_gamecube_process ( ctx : & skyline:: hooks:: InlineCtx ) {
1063
1063
let state: * mut skyline:: nn:: hid:: NpadGcState =
1064
1064
( ctx as * const _ as * mut u8 ) . add ( 0x100 ) as * mut _ ;
@@ -1068,7 +1068,7 @@ unsafe fn post_gamecube_process(ctx: &skyline::hooks::InlineCtx) {
1068
1068
GC_TRIGGERS [ 1 ] = ( * state) . RTrigger as f32 / i16:: MAX as f32 ;
1069
1069
}
1070
1070
1071
- #[ skyline:: hook( offset = 0x3665c8c , inline) ]
1071
+ #[ skyline:: hook( offset = 0x366690C , inline) ]
1072
1072
unsafe fn apply_triggers ( ctx : & skyline:: hooks:: InlineCtx ) {
1073
1073
let controller: * mut Controller = * ctx. registers [ 19 ] . x . as_ref ( ) as _ ;
1074
1074
( * controller) . left_trigger = GC_TRIGGERS [ 0 ] ;
@@ -1099,7 +1099,7 @@ unsafe fn analog_trigger_r(ctx: &mut skyline::hooks::InlineCtx) {
1099
1099
1100
1100
// These 2 hooks prevent buffered nair after inputting C-stick on first few frames of jumpsquat
1101
1101
// Both found in ControlModule::exec_command
1102
- #[ skyline:: hook( offset = 0x6be610 ) ]
1102
+ #[ skyline:: hook( offset = 0x6be630 ) ]
1103
1103
unsafe fn set_attack_air_stick_hook ( control_module : u64 , arg : u32 ) {
1104
1104
// This check passes on the frame FighterControlModuleImpl::reserve_on_attack_button is called
1105
1105
// Only happens during jumpsquat currently
@@ -1111,7 +1111,7 @@ unsafe fn set_attack_air_stick_hook(control_module: u64, arg: u32) {
1111
1111
}
1112
1112
call_original ! ( control_module, arg) ;
1113
1113
}
1114
- #[ skyline:: hook( offset = 0x6bd6a4 , inline) ]
1114
+ #[ skyline:: hook( offset = 0x6bd6c4 , inline) ]
1115
1115
unsafe fn exec_command_reset_attack_air_kind_hook ( ctx : & mut skyline:: hooks:: InlineCtx ) {
1116
1116
let control_module = * ctx. registers [ 21 ] . x . as_ref ( ) ;
1117
1117
let boma = * ( control_module as * mut * mut BattleObjectModuleAccessor ) . add ( 1 ) ;
@@ -1145,25 +1145,25 @@ fn nro_hook(info: &skyline::nro::NroInfo) {
1145
1145
pub fn install ( ) {
1146
1146
// Custom buffer-state handling
1147
1147
// Always uses the hitlag handling that cat4 uses
1148
- skyline:: patching:: Patch :: in_text ( 0x6bd428 ) . nop ( ) ;
1149
- skyline:: patching:: Patch :: in_text ( 0x6bd484 ) . nop ( ) ;
1148
+ skyline:: patching:: Patch :: in_text ( 0x6bd448 ) . nop ( ) ;
1149
+ skyline:: patching:: Patch :: in_text ( 0x6bd4a4 ) . nop ( ) ;
1150
1150
1151
1151
// Stuff for parry input
1152
- skyline:: patching:: Patch :: in_text ( 0x3665e5c ) . data ( 0xAA0903EAu32 ) ;
1153
- skyline:: patching:: Patch :: in_text ( 0x3665e70 ) . data ( 0xAA0803EAu32 ) ;
1152
+ skyline:: patching:: Patch :: in_text ( 0x3666ADC ) . data ( 0xAA0903EAu32 ) ;
1153
+ skyline:: patching:: Patch :: in_text ( 0x3666AF0 ) . data ( 0xAA0803EAu32 ) ;
1154
1154
1155
1155
// Removes 10f C-stick lockout for tilt stick and special stick
1156
1156
skyline:: patching:: Patch :: in_text ( 0x17527dc ) . data ( 0x2A1F03FA ) ;
1157
- skyline:: patching:: Patch :: in_text ( 0x17527e0 ) . nop ( ) ;
1158
- skyline:: patching:: Patch :: in_text ( 0x17527e4 ) . nop ( ) ;
1159
- skyline:: patching:: Patch :: in_text ( 0x17527e8 ) . nop ( ) ;
1157
+ skyline:: patching:: Patch :: in_text ( 0x17527b0 ) . nop ( ) ;
1158
+ skyline:: patching:: Patch :: in_text ( 0x17527b4 ) . nop ( ) ;
1159
+ skyline:: patching:: Patch :: in_text ( 0x17527b8 ) . nop ( ) ;
1160
1160
1161
1161
// Prevents buffered C-stick aerials from triggering nair
1162
- skyline:: patching:: Patch :: in_text ( 0x6be644 ) . data ( 0x52800040 ) ;
1162
+ skyline:: patching:: Patch :: in_text ( 0x6be664 ) . data ( 0x52800040 ) ;
1163
1163
1164
1164
// Prevents attack_air_kind from resetting every frame
1165
1165
// Found in ControlModule::exec_command
1166
- skyline:: patching:: Patch :: in_text ( 0x6bd6a4 ) . nop ( ) ;
1166
+ skyline:: patching:: Patch :: in_text ( 0x6bd6c4 ) . nop ( ) ;
1167
1167
1168
1168
skyline:: install_hooks!(
1169
1169
map_controls_hook,
0 commit comments