diff --git a/memmap.cpp b/memmap.cpp index d3684d94..132de475 100644 --- a/memmap.cpp +++ b/memmap.cpp @@ -2988,14 +2988,14 @@ void CMemory::map_WRAM (void) void CMemory::map_LoROMSRAM (void) { - map_index(0x70, 0x7f, 0x0000, 0x7fff, MAP_LOROM_SRAM, MAP_TYPE_RAM); map_index(0xf0, 0xff, 0x0000, 0x7fff, MAP_LOROM_SRAM, MAP_TYPE_RAM); + map_index(0x70, 0x7f, 0x0000, 0x7fff, MAP_LOROM_SRAM, MAP_TYPE_RAM); } void CMemory::map_HiROMSRAM (void) { - map_index(0x20, 0x3f, 0x6000, 0x7fff, MAP_HIROM_SRAM, MAP_TYPE_RAM); map_index(0xa0, 0xbf, 0x6000, 0x7fff, MAP_HIROM_SRAM, MAP_TYPE_RAM); + map_index(0x20, 0x3f, 0x6000, 0x7fff, MAP_HIROM_SRAM, MAP_TYPE_RAM); } void CMemory::map_DSP (void) @@ -3126,8 +3126,8 @@ void CMemory::Map_NoMAD1LoROMMap (void) map_lorom(0x80, 0xbf, 0x8000, 0xffff, CalculatedSize); map_lorom(0xc0, 0xff, 0x0000, 0xffff, CalculatedSize); - map_index(0x70, 0x7f, 0x0000, 0xffff, MAP_LOROM_SRAM, MAP_TYPE_RAM); map_index(0xf0, 0xff, 0x0000, 0xffff, MAP_LOROM_SRAM, MAP_TYPE_RAM); + map_index(0x70, 0x7f, 0x0000, 0xffff, MAP_LOROM_SRAM, MAP_TYPE_RAM); map_WRAM(); @@ -3178,10 +3178,10 @@ void CMemory::Map_SRAM512KLoROMMap (void) map_lorom(0x80, 0xbf, 0x8000, 0xffff, CalculatedSize); map_lorom(0xc0, 0xff, 0x0000, 0xffff, CalculatedSize); - map_space(0x70, 0x70, 0x0000, 0xffff, SRAM); - map_space(0x71, 0x71, 0x0000, 0xffff, SRAM + 0x8000); - map_space(0x72, 0x72, 0x0000, 0xffff, SRAM + 0x10000); map_space(0x73, 0x73, 0x0000, 0xffff, SRAM + 0x18000); + map_space(0x72, 0x72, 0x0000, 0xffff, SRAM + 0x10000); + map_space(0x71, 0x71, 0x0000, 0xffff, SRAM + 0x8000); + map_space(0x70, 0x70, 0x0000, 0xffff, SRAM); map_WRAM(); @@ -3202,14 +3202,14 @@ void CMemory::Map_SufamiTurboLoROMMap (void) if (Multi.sramSizeA) { - map_index(0x60, 0x63, 0x8000, 0xffff, MAP_LOROM_SRAM, MAP_TYPE_RAM); map_index(0xe0, 0xe3, 0x8000, 0xffff, MAP_LOROM_SRAM, MAP_TYPE_RAM); + map_index(0x60, 0x63, 0x8000, 0xffff, MAP_LOROM_SRAM, MAP_TYPE_RAM); } if (Multi.sramSizeB) { - map_index(0x70, 0x73, 0x8000, 0xffff, MAP_LOROM_SRAM_B, MAP_TYPE_RAM); map_index(0xf0, 0xf3, 0x8000, 0xffff, MAP_LOROM_SRAM_B, MAP_TYPE_RAM); + map_index(0x70, 0x73, 0x8000, 0xffff, MAP_LOROM_SRAM_B, MAP_TYPE_RAM); } map_WRAM(); @@ -3233,8 +3233,8 @@ void CMemory::Map_SufamiTurboPseudoLoROMMap (void) // I don't care :P map_space(0x60, 0x63, 0x8000, 0xffff, SRAM - 0x8000); map_space(0xe0, 0xe3, 0x8000, 0xffff, SRAM - 0x8000); - map_space(0x70, 0x73, 0x8000, 0xffff, SRAM + 0x4000 - 0x8000); - map_space(0xf0, 0xf3, 0x8000, 0xffff, SRAM + 0x4000 - 0x8000); + map_space(0x70, 0x73, 0x8000, 0xffff, SRAM + 0x4000 - 0x8000, false); + map_space(0xf0, 0xf3, 0x8000, 0xffff, SRAM + 0x4000 - 0x8000, false); map_WRAM(); @@ -3262,8 +3262,8 @@ void CMemory::Map_SuperFXLoROMMap (void) map_space(0x00, 0x3f, 0x6000, 0x7fff, SRAM - 0x6000); map_space(0x80, 0xbf, 0x6000, 0x7fff, SRAM - 0x6000); - map_space(0x70, 0x70, 0x0000, 0xffff, SRAM); map_space(0x71, 0x71, 0x0000, 0xffff, SRAM + 0x10000); + map_space(0x70, 0x70, 0x0000, 0xffff, SRAM); map_WRAM(); @@ -3316,10 +3316,10 @@ void CMemory::Map_SA1LoROMMap (void) map_hirom_offset(0xc0, 0xff, 0x0000, 0xffff, CalculatedSize, 0); - map_space(0x00, 0x3f, 0x3000, 0x3fff, FillRAM); map_space(0x80, 0xbf, 0x3000, 0x3fff, FillRAM); - map_index(0x00, 0x3f, 0x6000, 0x7fff, MAP_BWRAM, MAP_TYPE_I_O); + map_space(0x00, 0x3f, 0x3000, 0x3fff, FillRAM); map_index(0x80, 0xbf, 0x6000, 0x7fff, MAP_BWRAM, MAP_TYPE_I_O); + map_index(0x00, 0x3f, 0x6000, 0x7fff, MAP_BWRAM, MAP_TYPE_I_O); for (int c = 0x40; c < 0x80; c++) map_space(c, c, 0x0000, 0xffff, SRAM + (c & 1) * 0x10000, false);