piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-21 05:09:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

more anti-crash.

Browse Source 
don't unmap VRAM in cases of overlaps. fixes NSMB minigames, for now.
This commit is contained in:
StapleButter
2017-02-01 17:05:12 +01:00
parent 6d2092a106
commit 03c1a9cbc8
3 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
GPU.cpp
View File

@ -177,7 +177,7 @@ void MapVRAM_AB(u32 bank, u8 cnt)
break;
}
if (vrammap)
if (vrammap && *vrammap == vram)
{
*vrammap++ = NULL;
*vrammap++ = NULL;
@ -273,7 +273,7 @@ void MapVRAM_CD(u32 bank, u8 cnt)
break;
}
if (vrammap)
if (vrammap && *vrammap == vram)
{
*vrammap++ = NULL;
*vrammap++ = NULL;
@ -378,12 +378,16 @@ void MapVRAM_E(u32 bank, u8 cnt)
break;
}
if (vrammap)
if (vrammap && *vrammap == vram)
{
*vrammap++ = NULL;
*vrammap++ = NULL;
*vrammap++ = NULL;
*vrammap++ = NULL;
}
else if (vrammap) vrammap += 4;
if (vrammap && *vrammap == vram)
{
*vrammap++ = NULL;
*vrammap++ = NULL;
*vrammap++ = NULL;
@ -485,14 +489,14 @@ void MapVRAM_FG(u32 bank, u8 cnt)
if (vrammap)
{
*vrammap++ = NULL;
*vrammap++ = NULL;
*vrammap++ = NULL;
*vrammap++ = NULL;
*vrammap++ = NULL;
*vrammap++ = NULL;
*vrammap++ = NULL;
*vrammap = NULL;
if (*vrammap == vram) *vrammap++ = NULL; else vrammap++;
if (*vrammap == vram) *vrammap++ = NULL; else vrammap++;
if (*vrammap == vram) *vrammap++ = NULL; else vrammap++;
if (*vrammap == vram) *vrammap++ = NULL; else vrammap++;
if (*vrammap == vram) *vrammap++ = NULL; else vrammap++;
if (*vrammap == vram) *vrammap++ = NULL; else vrammap++;
if (*vrammap == vram) *vrammap++ = NULL; else vrammap++;
if (*vrammap == vram) *vrammap = NULL;
}
}
@ -573,14 +577,23 @@ void MapVRAM_H(u32 bank, u8 cnt)
break;
}
if (vrammap)
if (vrammap && *vrammap == vram)
{
*vrammap++ = NULL;
*vrammap++ = NULL;
} else if (vrammap) vrammap += 2;
if (vrammap && *vrammap == vram)
{
*vrammap++ = NULL;
*vrammap++ = NULL;
} else if (vrammap) vrammap += 2;
if (vrammap && *vrammap == vram)
{
*vrammap++ = NULL;
*vrammap++ = NULL;
} else if (vrammap) vrammap += 2;
if (vrammap && *vrammap == vram)
{
*vrammap++ = NULL;
*vrammap = NULL;
}
@ -658,14 +671,14 @@ void MapVRAM_I(u32 bank, u8 cnt)
if (vrammap)
{
*vrammap++ = NULL;
*vrammap++ = NULL;
*vrammap++ = NULL;
*vrammap++ = NULL;
*vrammap++ = NULL;
*vrammap++ = NULL;
*vrammap++ = NULL;
*vrammap = NULL;
if (*vrammap == vram) *vrammap++ = NULL; else vrammap++;
if (*vrammap == vram) *vrammap++ = NULL; else vrammap++;
if (*vrammap == vram) *vrammap++ = NULL; else vrammap++;
if (*vrammap == vram) *vrammap++ = NULL; else vrammap++;
if (*vrammap == vram) *vrammap++ = NULL; else vrammap++;
if (*vrammap == vram) *vrammap++ = NULL; else vrammap++;
if (*vrammap == vram) *vrammap++ = NULL; else vrammap++;
if (*vrammap == vram) *vrammap = NULL;
}
}