Use dynamic offsets

src/common/offsets.rs

@@ -344,4 +344,17 @@ static NEEDLE_LAYOUT_ARC_MALLOC: &[u8] = &[
     0xc1, 0xb6, 0x40, 0xf9,
     0xc2, 0x57, 0x00, 0xb0,
 ];
-impl_offset!(LAYOUT_ARC_MALLOC);
+impl_offset!(LAYOUT_ARC_MALLOC);
+
+// OFFSET_TRAINING_RESET_CHECK = 0x1378e30
+static NEEDLE_TRAINING_RESET_CHECK: &[u8] = &[
+    0x1f, 0x09, 0x00, 0x71,
+    0x41, 0x1c, 0x00, 0x54,
+    0xe8, 0xf9, 0x01, 0xf0,
+    0x08, 0x7d, 0x42, 0xf9,
+    0x08, 0x01, 0x40, 0xf9,
+    0x09, 0xa1, 0x40, 0xb9,
+    0x3f, 0x05, 0x00, 0x71,
+    0x2b, 0x0a, 0x00, 0x54,
+];
+impl_offset!(TRAINING_RESET_CHECK);

src/training/mod.rs

@@ -419,11 +419,8 @@ pub unsafe fn handle_add_damage(
 }
 
 // Control L+R+A Resets
-// Toggling in menu for now, probably best for this to become a customizable button combo
-static LRA_OFFSET: usize = 0x1378e30;
-
 // This function already has a training mode check in it so we don't need to toggle in training mode for this
-#[skyline::hook(offset = LRA_OFFSET, inline)]
+#[skyline::hook(offset = *OFFSET_TRAINING_RESET_CHECK, inline)]
 unsafe fn lra_handle(ctx: &mut InlineCtx) {
     let x8 = ctx.registers[8].x.as_mut();
     if !(MENU.lra_reset.as_bool()) {