Auto detect sos mons

Author: zaksabeast

reader_core/src/gen7/draw.rs

@@ -5,7 +5,7 @@ use crate::{
     utils::{format_egg_parent, is_daycare_masuda_method},
 };
 
-pub use crate::draw::{GREEN, PkxType, RED, WHITE, draw_header, draw_pkx, draw_pkx_brief, get_pp, print_pp};
+pub use crate::draw::{draw_header, draw_pkx, draw_pkx_brief, get_pp, print_pp, PkxType, GREEN, RED, WHITE};
 
 pub fn draw_rng(reader: &Gen7Reader, rng: &RngWrapper<Sfmt>) {
     let sfmt_state = rng.current_state();
@@ -30,19 +30,21 @@ pub fn draw_citra_info(reader: &Gen7Reader) {
     pnp::println!("Time offset: {}", main_rng_seed_context.time_offset_ms);
 }
 
-pub fn draw_sos(reader: &Gen7Reader, slot: u32, correction: u32) {
+pub fn draw_sos(reader: &Gen7Reader, slot: u32) {
     pnp::println!("SOS Seed: {:08X}", reader.sos_seed());
     pnp::println!("SOS Chain Length: {}", reader.sos_chain());
     if reader.orb_active() {
         pnp::println!(color = GREEN, "Orb Active")
     } else {
         pnp::println!(color = RED, "Orb Not Active");
     }
-    pnp::println!("Caller Slot: {}", slot);
-    print_pp(get_pp(&reader.sos_caller_pkm(slot)));
-    pnp::println!("");
-    pnp::println!("Ally Data (Slot {}):", reader.ally_slot(slot, correction) + 1);
-    draw_pkx_brief(&reader.sos_ally_pkm(slot, correction));
+    match reader.sos_mon(slot) {
+        Some(pkx) => {
+            draw_pkx_brief(&pkx);
+            print_pp(get_pp(&pkx));
+        }
+        None => pnp::println!(color = RED, "Invalid slot"),
+    }
 }
 
 pub fn draw_daycare(reader: &Gen7Reader) {

reader_core/src/gen7/frame.rs

@@ -1,16 +1,15 @@
 use super::{
-    draw::{PkxType, draw_citra_info, draw_daycare, draw_header, draw_pkx, draw_rng, draw_sos},
+    draw::{draw_citra_info, draw_daycare, draw_header, draw_pkx, draw_rng, draw_sos, PkxType},
     reader::Gen7Reader,
 };
 use crate::{
     pnp,
     rng::{RngWrapper, Sfmt},
     utils::{
-        ShowView,
         help_menu::HelpMenu,
         menu::{Menu, MenuOption, MenuOptionValue},
         sub_menu::SubMenu,
-        sub_menu_capture::SubMenuCapture,
+        ShowView,
     },
 };
 use once_cell::unsync::Lazy;
@@ -54,7 +53,7 @@ struct PersistedState {
     help_menu: HelpMenu,
     wild_menu: SubMenu<1, 4>,
     party_menu: SubMenu<1, 6>,
-    sos_menu: SubMenuCapture<1, 4>,
+    sos_menu: SubMenu<1, 2>,
     pelago_menu: SubMenu<1, 3>,
 }
 
@@ -66,21 +65,8 @@ unsafe fn get_state() -> &'static mut PersistedState {
         party_menu: SubMenu::default(),
         pelago_menu: SubMenu::default(),
         wild_menu: SubMenu::default(),
-        sos_menu: SubMenuCapture::default(),
-        help_menu: HelpMenu::new(|| {
-            pnp::println!("SOS Controls:");
-            pnp::println!("[X] + [Right]:");
-            pnp::println!("   Set Caller slot to");
-            pnp::println!("   the current ally.");
-            pnp::println!("   Use this when you");
-            pnp::println!("   faint the caller.");
-            pnp::println!("");
-            pnp::println!("[X] + [Up]/[Down]:");
-            pnp::println!("   Manually change");
-            pnp::println!("   the caller slot.");
-            pnp::println!("   (Not recommended)");
-            pnp::println!("");
-        }),
+        sos_menu: SubMenu::default(),
+        help_menu: HelpMenu::default(),
         main_menu: Menu::new([
             MenuOption::new(Gen7View::Rng),
             MenuOption::new(Gen7View::Daycare),
@@ -125,15 +111,8 @@ fn run_frame(reader: Gen7Reader) {
             draw_pkx(&reader.wild_pkm((slot - 1) as u32), PkxType::Wild);
         }
         Gen7View::Sos => {
-            let prev_caller_slot = state.sos_menu.counter_value();
-            let prev_correction_value = state.sos_menu.captured_value();
-            let caller_slot = state.sos_menu.update_headless(
-                is_locked,
-                reader.sos_chain() as u32,
-                reader.ally_slot(prev_caller_slot as u32, prev_correction_value) as usize + 1,
-            );
-            let correction_value = state.sos_menu.captured_value();
-            draw_sos(&reader, caller_slot as u32, correction_value);
+            let slot = state.sos_menu.update_and_draw(is_locked);
+            draw_sos(&reader, (slot - 1) as u32);
         }
         Gen7View::Box => draw_pkx(&reader.box_pkm(), PkxType::Tame),
         Gen7View::Citra => draw_citra_info(&reader),

reader_core/src/gen7/reader.rs

@@ -1,6 +1,6 @@
 use super::{game_lib, hook};
 use crate::pnp;
-use core::num::{NonZeroU8, NonZeroU32};
+use core::num::{NonZeroU32, NonZeroU8};
 use pkm_rs::{Pk7, PokeCrypto};
 
 struct Gen7Addresses {
@@ -9,9 +9,9 @@ struct Gen7Addresses {
     sfmt_state: u32,
     party: u32,
     wild: u32,
-    sos: u32,
     orb_active: u32,
     sos_chain_length: u32,
+    sos_battle_table: Option<u32>,
     // To be used in the future vvv
     _sos_index: u32,
     _ally_id: u32,
@@ -37,7 +37,7 @@ const SM_ADDRESSES: Gen7Addresses = Gen7Addresses {
     sfmt_state: 0x33195b88,
     party: 0x34195e10,
     wild: 0x3002f7b8,
-    sos: 0x3002f7b8,
+    sos_battle_table: None,
     _sos_index: 0x30039614,
     orb_active: 0x3003961c,
     sos_chain_length: 0x3003960d,
@@ -63,7 +63,7 @@ const USUM_ADDRESSES: Gen7Addresses = Gen7Addresses {
     sfmt_state: 0x330d35d8,
     party: 0x33f7fa44,
     wild: 0x3002f9a0,
-    sos: 0x3002f9a0,
+    sos_battle_table: Some(0x30000420),
     _sos_index: 0x300397F0,
     orb_active: 0x300397f8,
     sos_chain_length: 0x300397f9,
@@ -154,15 +154,21 @@ impl Gen7Reader {
     pub fn sos_chain(&self) -> u8 {
         pnp::read(self.addrs.sos_chain_length)
     }
+
     pub fn orb_active(&self) -> bool {
         ((pnp::read::<u8>(self.addrs.orb_active) & 0x1) > 0) as bool
     }
-    pub fn ally_slot(&self, caller_slot: u32, correction: u32) -> u32 {
-        if self.sos_chain() == 0 {
-            0
-        } else {
-            ((caller_slot - 1) + ((self.sos_chain() as i32 - (correction as i32 + 1)) % 3) as u32 + 1) % 4
-        }
+
+    pub fn sos_mon(&self, slot: u32) -> Option<Pk7> {
+        let table_offset = match slot {
+            0x0 => 0x4, // Left
+            0x1 => 0x0, // Right
+            _ => return None,
+        };
+        let battle_table = self.addrs.sos_battle_table?;
+        let pkx_container_ptr = pnp::read::<u32>(battle_table + table_offset);
+        let pkx_container = pnp::read::<u32>(pkx_container_ptr);
+        Some(self.read_pk7(pkx_container + 0x40))
     }
 
     fn read_pk7(&self, offset: u32) -> Pk7 {
@@ -207,13 +213,6 @@ impl Gen7Reader {
         self.read_pk7((slot * 236) + self.addrs.pelago)
     }
 
-    pub fn sos_caller_pkm(&self, caller_slot: u32) -> Pk7 {
-        self.read_pk7(((caller_slot - 1) * 484) + self.addrs.sos)
-    }
-    pub fn sos_ally_pkm(&self, caller_slot: u32, correction: u32) -> Pk7 {
-        self.read_pk7((self.ally_slot(caller_slot, correction) * 484) + self.addrs.sos)
-    }
-
     pub fn is_egg_ready(&self) -> bool {
         pnp::read::<u8>(self.addrs.egg_ready) != 0
     }

reader_core/src/utils/circular_counter.rs

@@ -27,10 +27,6 @@ impl<const MIN: usize, const MAX: usize> CircularCounter<MIN, MAX> {
 
         self.value
     }
-    pub fn set(&mut self, value: usize) -> usize {
-        self.value = value.clamp(MIN, MAX);
-        self.value
-    }
 }
 
 impl<const MIN: usize, const MAX: usize> Default for CircularCounter<MIN, MAX> {

reader_core/src/utils/help_menu.rs

@@ -40,13 +40,6 @@ fn print_view(help_view: &HelpView) {
 }
 
 impl HelpMenu {
-    pub fn new(specific_help: fn() -> ()) -> Self {
-        Self {
-            specific_help: specific_help,
-            sub_menu: SubMenu::default(),
-        }
-    }
-
     pub fn update_and_draw(&mut self, is_locked: bool) {
         let help_view = view(self.sub_menu.update_headless(is_locked));
         print_view(&help_view);

reader_core/src/utils/mod.rs

@@ -9,7 +9,6 @@ mod hook_gen6_seed;
 pub mod menu;
 mod show_view;
 pub mod sub_menu;
-pub mod sub_menu_capture;
 
 pub use circular_counter::*;
 pub use daycare::*;