Fix reading shinies and validating pkms

zaksabeast · zaksabeast · commit 1f59a3fa1c13 · 2024-04-09T21:48:20.000-05:00
diff --git a/reader_core/Cargo.lock b/reader_core/Cargo.lock
diff --git a/reader_core/Cargo.toml b/reader_core/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 no_std_io = { git = "https://github.com/zaksabeast/no_std_io.git", rev = "4bc5adf" }
 num_enum = { version = "0.5", default-features = false }
 once_cell = { version = "1.16", default-features = false }
-pkm-rs = { git = "https://github.com/zaksabeast/pkm-rs.git", rev = "a993592" }
+pkm-rs = { git = "https://github.com/zaksabeast/pkm-rs.git", rev = "9d1c647" }
 libc_alloc = "1.0.6"
 chrono = { version = "0.4.34", default-features = false, features = ["alloc"] }
 
diff --git a/reader_core/src/gen6/reader.rs b/reader_core/src/gen6/reader.rs
@@ -166,7 +166,7 @@ impl Gen6Reader {
 
     fn read_pk6(&self, offset: u32) -> Pk6 {
         let bytes = pnp::read_array::<{ Pk6::STORED_SIZE }>(offset);
-        Pk6::new(bytes)
+        Pk6::new_valid(bytes)
     }
 
     pub fn party_pkm(&self, slot: u32) -> Pk6 {
diff --git a/reader_core/src/gen7/reader.rs b/reader_core/src/gen7/reader.rs
@@ -130,7 +130,7 @@ impl Gen7Reader {
 
     fn read_pk7(&self, offset: u32) -> Pk7 {
         let bytes = pnp::read_array::<{ Pk7::STORED_SIZE }>(offset);
-        Pk7::new(bytes)
+        Pk7::new_valid(bytes)
     }
 
     pub fn party_pkm(&self, slot: u32) -> Pk7 {
diff --git a/reader_core/src/transporter/reader.rs b/reader_core/src/transporter/reader.rs
@@ -43,7 +43,7 @@ impl TransporterReader {
 
     fn read_pk7(&self, offset: u32) -> Pk7 {
         let bytes = pnp::read_array::<{ Pk7::STORED_SIZE }>(offset);
-        Pk7::new(bytes)
+        Pk7::new_valid(bytes)
     }
 
     pub fn transported_pkm(&self, slot: u32) -> Pk7 {

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ impl Gen6Reader {`
`166`	`166`
`167`	`167`	`fn read_pk6(&self, offset: u32) -> Pk6 {`
`168`	`168`	`let bytes = pnp::read_array::<{ Pk6::STORED_SIZE }>(offset);`
`169`		`- Pk6::new(bytes)`
	`169`	`+ Pk6::new_valid(bytes)`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`pub fn party_pkm(&self, slot: u32) -> Pk6 {`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ impl Gen7Reader {`
`130`	`130`
`131`	`131`	`fn read_pk7(&self, offset: u32) -> Pk7 {`
`132`	`132`	`let bytes = pnp::read_array::<{ Pk7::STORED_SIZE }>(offset);`
`133`		`- Pk7::new(bytes)`
	`133`	`+ Pk7::new_valid(bytes)`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`pub fn party_pkm(&self, slot: u32) -> Pk7 {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ impl TransporterReader {`
`43`	`43`
`44`	`44`	`fn read_pk7(&self, offset: u32) -> Pk7 {`
`45`	`45`	`let bytes = pnp::read_array::<{ Pk7::STORED_SIZE }>(offset);`
`46`		`- Pk7::new(bytes)`
	`46`	`+ Pk7::new_valid(bytes)`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`pub fn transported_pkm(&self, slot: u32) -> Pk7 {`