Skip to content

Commit 61d7882

Browse files
authored
(Crystal) Adds an option to view the next egg as soon as the DVs are generated (#75)
1 parent 0e9e6a4 commit 61d7882

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

reader_core/src/crystal/frame.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ enum CrystalView {
2020
Rng,
2121
Party,
2222
Wild,
23+
Egg,
2324
Research,
2425
HelpMenu,
2526
}
@@ -37,6 +38,7 @@ const MENU: &'static [MenuOption<CrystalView>] = &[
3738
MenuOption::new(CrystalView::Rng, "RNG"),
3839
MenuOption::new(CrystalView::Party, "Party"),
3940
MenuOption::new(CrystalView::Wild, "Wild"),
41+
MenuOption::new(CrystalView::Egg, "Egg"),
4042
MenuOption::new(CrystalView::Research, "Research"),
4143
MenuOption::new(CrystalView::HelpMenu, "Help"),
4244
];
@@ -85,6 +87,7 @@ pub fn run_frame() {
8587
let slot = state.party_menu.update_and_draw(is_locked);
8688
draw_pkx(&reader.party((slot - 1) as u8));
8789
}
90+
CrystalView::Egg => draw_pkx(&reader.egg()),
8891
CrystalView::Research => draw_research(&reader, state.frame),
8992
CrystalView::HelpMenu => state.help_menu.update_and_draw(is_locked),
9093
CrystalView::MainMenu => {

reader_core/src/crystal/reader.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ impl Gen2Reader {
5959
Pk2::new(spec_index, atkdef, spespc, 0)
6060
}
6161

62+
pub fn egg(&self) -> Pk2 {
63+
let spec_index = gb_mem::read_u8(0xDF7B);
64+
let atkdef = gb_mem::read_u8(0xDF90);
65+
let spespc = gb_mem::read_u8(0xDF91);
66+
Pk2::new(spec_index, atkdef, spespc, 0)
67+
}
68+
6269
pub fn rng_state(&self) -> u16 {
6370
gb_mem::read_u16(self.addrs.gb_rng_ptr)
6471
}

0 commit comments

Comments
 (0)