ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ARM7 VRAM

This commit is contained in:
StapleButter 2017-02-01 19:30:57 +01:00
parent e028973caa
commit 64f9822db6
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
NDS.cpp
View File

@ -142,7 +142,7 @@ void LoadROM()
//f = fopen("rom/armwrestler.nds", "rb"); //f = fopen("rom/armwrestler.nds", "rb");
//f = fopen("rom/zorp.nds", "rb"); //f = fopen("rom/zorp.nds", "rb");
//f = fopen("rom/hello_world.nds", "rb"); //f = fopen("rom/hello_world.nds", "rb");
f = fopen("rom/nsmb.nds", "rb"); f = fopen("rom/mkds.nds", "rb");
u32 bootparams[8]; u32 bootparams[8];
fseek(f, 0x20, SEEK_SET); fseek(f, 0x20, SEEK_SET);
@ -209,7 +209,7 @@ void Reset()
fseek(f, 0, SEEK_SET); fseek(f, 0, SEEK_SET);
fread(ARM9BIOS, 0x1000, 1, f); fread(ARM9BIOS, 0x1000, 1, f);
printf("ARM9 BIOS loaded: %08X\n", ARM9Read32(0xFFFF0000)); printf("ARM9 BIOS loaded\n");
fclose(f); fclose(f);
} }
@ -221,7 +221,7 @@ void Reset()
fseek(f, 0, SEEK_SET); fseek(f, 0, SEEK_SET);
fread(ARM7BIOS, 0x4000, 1, f); fread(ARM7BIOS, 0x4000, 1, f);
printf("ARM7 BIOS loaded: %08X\n", ARM7Read32(0x00000000)); printf("ARM7 BIOS loaded\n");
fclose(f); fclose(f);
} }
@ -1022,7 +1022,7 @@ u8 ARM7Read8(u32 addr)
u32 chunk = (addr >> 17) & 0x1; u32 chunk = (addr >> 17) & 0x1;
u8* vram = GPU::VRAM_ARM7[chunk]; u8* vram = GPU::VRAM_ARM7[chunk];
if (vram) if (vram)
return *(u8*)&vram[addr & 0x3FFF]; return *(u8*)&vram[addr & 0x1FFFF];
} }
return 0; return 0;
} }
@ -1063,7 +1063,7 @@ u16 ARM7Read16(u32 addr)
u32 chunk = (addr >> 17) & 0x1; u32 chunk = (addr >> 17) & 0x1;
u8* vram = GPU::VRAM_ARM7[chunk]; u8* vram = GPU::VRAM_ARM7[chunk];
if (vram) if (vram)
return *(u16*)&vram[addr & 0x3FFF]; return *(u16*)&vram[addr & 0x1FFFF];
} }
return 0; return 0;
} }
@ -1106,7 +1106,7 @@ u32 ARM7Read32(u32 addr)
u32 chunk = (addr >> 17) & 0x1; u32 chunk = (addr >> 17) & 0x1;
u8* vram = GPU::VRAM_ARM7[chunk]; u8* vram = GPU::VRAM_ARM7[chunk];
if (vram) if (vram)
return *(u32*)&vram[addr & 0x3FFF]; return *(u32*)&vram[addr & 0x1FFFF];
} }
return 0; return 0;
} }
@ -1142,7 +1142,7 @@ void ARM7Write8(u32 addr, u8 val)
u32 chunk = (addr >> 17) & 0x1; u32 chunk = (addr >> 17) & 0x1;
u8* vram = GPU::VRAM_ARM7[chunk]; u8* vram = GPU::VRAM_ARM7[chunk];
if (vram) if (vram)
*(u8*)&vram[addr & 0x3FFF] = val; *(u8*)&vram[addr & 0x1FFFF] = val;
} }
return; return;
} }
@ -1181,7 +1181,7 @@ void ARM7Write16(u32 addr, u16 val)
u32 chunk = (addr >> 17) & 0x1; u32 chunk = (addr >> 17) & 0x1;
u8* vram = GPU::VRAM_ARM7[chunk]; u8* vram = GPU::VRAM_ARM7[chunk];
if (vram) if (vram)
*(u16*)&vram[addr & 0x3FFF] = val; *(u16*)&vram[addr & 0x1FFFF] = val;
} }
return; return;
} }
@ -1216,7 +1216,7 @@ void ARM7Write32(u32 addr, u32 val)
u32 chunk = (addr >> 17) & 0x1; u32 chunk = (addr >> 17) & 0x1;
u8* vram = GPU::VRAM_ARM7[chunk]; u8* vram = GPU::VRAM_ARM7[chunk];
if (vram) if (vram)
*(u32*)&vram[addr & 0x3FFF] = val; *(u32*)&vram[addr & 0x1FFFF] = val;
} }
return; return;
} }

6
melonDS.depend
View File

@ -10,7 +10,7 @@
1481161027 c:\documents\sources\melonds\types.h 1481161027 c:\documents\sources\melonds\types.h
1485905010 source:c:\documents\sources\melonds\nds.cpp 1485973806 source:c:\documents\sources\melonds\nds.cpp
<stdio.h> <stdio.h>
<string.h> <string.h>
"NDS.h" "NDS.h"
@ -24,7 +24,7 @@
"RTC.h" "RTC.h"
"Wifi.h" "Wifi.h"
1485873712 source:c:\documents\sources\melonds\arm.cpp 1485973712 source:c:\documents\sources\melonds\arm.cpp
<stdio.h> <stdio.h>
"NDS.h" "NDS.h"
"ARM.h" "ARM.h"
@ -86,7 +86,7 @@
"NDS.h" "NDS.h"
"SPI.h" "SPI.h"
1485906742 source:c:\documents\sources\melonds\gpu2d.cpp 1485971044 source:c:\documents\sources\melonds\gpu2d.cpp
<stdio.h> <stdio.h>
<string.h> <string.h>
"NDS.h" "NDS.h"