From 39a90a6bcce5c277381fa92886d77984584c645c Mon Sep 17 00:00:00 2001 From: Jorge Gorbe Moya Date: Mon, 16 Jun 2008 14:26:19 +0200 Subject: [PATCH] Memory map fix --- GBMemory.cc | 2 +- GBMemory.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/GBMemory.cc b/GBMemory.cc index d9dd160..6c5b770 100644 --- a/GBMemory.cc +++ b/GBMemory.cc @@ -13,7 +13,7 @@ void GBMemory::write(int addr, u8 value) else if (addr < 0xC000) mbc->write(addr, value); else if (addr < 0xD000) WRAM0[addr - WRAM0_BASE] = value; else if (addr < 0xE000) WRAM1[addr - WRAM1_BASE] = value; - else if (addr < 0xFDFF) write(addr-0x2000, value); + else if (addr < 0xFE00) write(addr-0x2000, value); else if (addr < 0xFEA0) core->video.write_OAM (addr, value); else if (addr >= 0xFF00 && addr <= 0xFF7F) { IO.write(addr,value); diff --git a/GBMemory.h b/GBMemory.h index 5a30559..9c55749 100644 --- a/GBMemory.h +++ b/GBMemory.h @@ -41,7 +41,8 @@ class GBMemory u8 WRAM0[4096]; // C000-CFFF: Work RAM Bank 0 u8 WRAM1[4096]; // D000-DFFF: Work RAM Bank 1 (TODO: In GBC mode switchable bank 1-7) // E000-FDFF: ECHO: Same as C000-DDFF - // FE00-FE9F: Sprite Attribute Table + // FE00-FE9F: Sprite Attribute Table (OAM) + // FEA0-FEFF: Not usable GBIO IO; // FF00-FF7F: IO ports u8 HRAM[126]; // FF80-FFFE: High RAM -- 2.34.1