diff --git a/examples/sdl/src/main.rs b/examples/sdl/src/main.rs index a3411a55f56d0b03b32e0b1b60dda559be420533..ee5ffe2a9e3deb01012e9f9bf610a14c837c64d2 100644 --- a/examples/sdl/src/main.rs +++ b/examples/sdl/src/main.rs @@ -157,13 +157,15 @@ fn main() { game_boy.load_boot_default(); //let rom = game_boy.load_rom_file("../../res/roms.prop/tetris.gb"); - //let rom = game_boy.load_rom_file("../../res/roms.prop/dr_mario.gb"); + let rom = game_boy.load_rom_file("../../res/roms.prop/dr_mario.gb"); //let rom = game_boy.load_rom_file("../../res/roms.prop/alleyway.gb"); //let rom = game_boy.load_rom_file("../../res/roms.prop/super_mario.gb"); //let rom = game_boy.load_rom_file("../../res/roms.prop/super_mario_2.gb"); //let rom = game_boy.load_rom_file("../../res/roms.prop/pokemon_red.gb"); - let rom = game_boy.load_rom_file("../../res/roms.prop/pokemon_yellow.gb"); + //let rom = game_boy.load_rom_file("../../res/roms.prop/pokemon_yellow.gb"); //let rom = game_boy.load_rom_file("../../res/roms.prop/zelda.gb"); + //let rom = game_boy.load_rom_file("../../res/roms.prop/django.gb"); + //let rom = game_boy.load_rom_file("../../res/roms.prop/2048.gb"); //let rom = game_boy.load_rom_file("../../res/roms/firstwhite.gb"); //let rom = game_boy.load_rom_file("../../res/roms/opus5.gb"); diff --git a/src/rom.rs b/src/rom.rs index d83821ec28075dc8f523c6da3c81536090dd4569..b791a353a2fa3446284313d4873141f74d6512b1 100644 --- a/src/rom.rs +++ b/src/rom.rs @@ -548,11 +548,7 @@ pub static MBC5: Mbc = Mbc { } // ROM bank selection 0x2000 => { - let mut rom_bank = value & 0xff; - rom_bank = rom_bank & (rom.rom_bank_count * 2 - 1) as u8; - if rom_bank == 0 { - rom_bank = 1; - } + let rom_bank = value & 0xff; rom.set_rom_bank(rom_bank); } // RAM bank selection