Skip to content

Commit e73f90f

Browse files
Add Trainer ID (#66)
1 parent 6486f38 commit e73f90f

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

reader_core/src/crystal/draw.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ pub fn draw_rng(reader: &Gen2Reader) {
3535
pnp::println!("DIV {:04X}", measured_div());
3636
pnp::println!("State {:04X}", reader.rng_state());
3737
pnp::println!("Advances {}", rng_advance());
38+
pnp::println!("");
39+
pnp::println!("TID {}", reader.trainer_id());
3840
}
3941

4042
pub fn draw_pkx(pkx: &Pk2) {

reader_core/src/crystal/reader.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ struct Gen2Addresses {
1010
time_ptr: u32,
1111
time_day_ptr: u32,
1212
play_time_ptr: u32,
13+
trainer_id_ptr: u32,
1314
}
1415

1516
const CRYSTAL_ADDRESSES: Gen2Addresses = Gen2Addresses {
@@ -20,6 +21,7 @@ const CRYSTAL_ADDRESSES: Gen2Addresses = Gen2Addresses {
2021
time_ptr: 0xff94,
2122
time_day_ptr: 0xd4cb,
2223
play_time_ptr: 0xd4c5,
24+
trainer_id_ptr: 0xd47b,
2325
};
2426

2527
pub struct Gen2Reader {
@@ -92,4 +94,8 @@ impl Gen2Reader {
9294
pub fn dst(&self) -> bool {
9395
(gb_mem::read_u8(self.addrs.dst_ptr) & 0x80) != 0
9496
}
97+
98+
pub fn trainer_id(&self) -> u16 {
99+
gb_mem::read_u16(self.addrs.trainer_id_ptr)
100+
}
95101
}

0 commit comments

Comments
 (0)