Add TRV to gen 6 and 7

Author: zaksabeast

reader_core/src/gen6/draw.rs

@@ -48,7 +48,7 @@ pub fn draw_rng(reader: &Gen6Reader, rng: &Gen6Rng) {
     draw_tinymt(reader, rng);
     pnp::println!("");
     pnp::println!("Save var: {:08X}", reader.seed_save_variable());
-    pnp::println!("TSV: {}", reader.tsv());
+    pnp::println!("TSV: {}, TRV: {:X}", reader.tsv(), reader.trv());
 }
 
 pub fn draw_daycare(daycare: &Daycare) {

reader_core/src/gen6/reader.rs

@@ -126,6 +126,10 @@ impl Gen6Reader {
         (self.tid() ^ self.sid()) >> 4
     }
 
+    pub fn trv(&self) -> u16 {
+        (self.tid() ^ self.sid()) & 0xf
+    }
+
     pub fn daycare1(&self) -> Daycare {
         Daycare {
             egg_seed: [

reader_core/src/gen7/draw.rs

@@ -15,8 +15,8 @@ pub fn draw_rng(reader: &Gen7Reader, rng: &RngWrapper<Sfmt>) {
     pnp::println!("State[0]: {:08X}", (sfmt_state >> 32) as u32);
     pnp::println!("Advances: {}", rng.advances());
     pnp::println!("");
-    pnp::println!("Gen7TID: {}", reader.tid());
-    pnp::println!("TSV: {}", reader.tsv());
+    pnp::println!("Gen7TID: {}", reader.g7tid());
+    pnp::println!("TSV: {}, TRV: {:X}", reader.tsv(), reader.trv());
     pnp::println!("");
     pnp::println!("NPC count: {}", reader.npc_count());
 }

reader_core/src/gen7/reader.rs

@@ -89,17 +89,26 @@ impl Gen7Reader {
         }
     }
 
-    pub fn tid(&self) -> u32 {
+    pub fn g7tid(&self) -> u32 {
         let sidtid = pnp::read::<u32>(self.addrs.id);
 
         sidtid % 1000000
     }
 
+    fn tid(&self) -> u16 {
+        pnp::read::<u16>(self.addrs.id)
+    }
+
+    fn sid(&self) -> u16 {
+        pnp::read::<u16>(self.addrs.id + 2)
+    }
+
     pub fn tsv(&self) -> u16 {
-        let tid = pnp::read::<u16>(self.addrs.id);
-        let sid = pnp::read::<u16>(self.addrs.id + 2);
+        (self.tid() ^ self.sid()) >> 4
+    }
 
-        (tid ^ sid) >> 4
+    pub fn trv(&self) -> u16 {
+        (self.tid() ^ self.sid()) & 0xf
     }
 
     pub fn init_seed(&self) -> u32 {