Compare commits

..

No commits in common. "64230973f15151a585e77a4f01f9e7c52de7db45" and "1440cd1fc7010f586a9a9226b1601bab39cfb0c2" have entirely different histories.

5 changed files with 3 additions and 8 deletions

View File

@ -15,11 +15,11 @@
* [ ] MBC1M * [ ] MBC1M
* [x] MBC2 * [x] MBC2
* [x] MBC5 * [x] MBC5
* Implements a cycle-accurate PPU FIFO
* Doesn't \*exactly\* work right just yet
Supports: ROM-only, MBC1, MBC2, MBC3 and MBC5 games. Supports: ROM-only, MBC1, MBC2, MBC3 and MBC5 games.
* Implements a cycle-accurate PPU FIFO
* Doesn't \*exactly\* work right just yet
### Controls ### Controls
@ -33,6 +33,3 @@ Key | Button
<kbd>Shift</kbd> | SELECT <kbd>Shift</kbd> | SELECT
Then use the Arrow keys for the D-Pad Then use the Arrow keys for the D-Pad
### Credits
The Boot ROM found in the `bin/` directory was made by [Optix](https://github.com/Hacktix) over [here](https://github.com/Hacktix/Bootix)

Binary file not shown.

View File

@ -15,7 +15,6 @@ pub struct Cpu {
} }
impl Cpu { impl Cpu {
#[allow(dead_code)]
pub(crate) fn without_boot() -> Self { pub(crate) fn without_boot() -> Self {
Self { Self {
reg: Registers { reg: Registers {

View File

@ -160,7 +160,7 @@ pub mod build {
pub fn finish(mut self) -> Emulator { pub fn finish(mut self) -> Emulator {
let mut emu = Emulator::new(match self.boot { let mut emu = Emulator::new(match self.boot {
Some(rom) => Cpu::with_boot(rom), Some(rom) => Cpu::with_boot(rom),
None => Cpu::with_boot(*include_bytes!("../bin/bootix_dmg.bin")), None => Cpu::without_boot(),
}); });
if let Some(rom) = self.cart.take() { if let Some(rom) = self.cart.take() {

View File

@ -418,7 +418,6 @@ impl Ppu {
self.frame_buf.swap_with_slice(&mut blank); self.frame_buf.swap_with_slice(&mut blank);
} }
#[inline]
pub(crate) fn frame_buf(&self) -> &[u8; GB_HEIGHT * GB_WIDTH * 4] { pub(crate) fn frame_buf(&self) -> &[u8; GB_HEIGHT * GB_WIDTH * 4] {
&self.frame_buf &self.frame_buf
} }