Memory map fix

diff --git a/GBMemory.cc b/GBMemory.cc
index d9dd16046210d31232d3c9cd006ff79182e71692..6c5b770113c1f6a31df6d053f2a2ea23eb8c0453 100644 (file)
--- 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 5a30559732eec4cbd64176c629251c1750ad07ca..9c55749b92655b0134c2a86044a5c2a453f73f99 100644 (file)
--- 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