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

Address should actually of been stored into a DWORD

This commit is contained in:
Emmet Young 2015-05-18 14:19:31 +10:00
parent a89f1d29f5
commit 007cbc1695
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Project64/N64 System/Mips/Mempak.cpp
View File

@ -129,7 +129,7 @@ BYTE Mempak::CalculateCrc(BYTE * DataToCrc)
void Mempak::ReadFrom(int Control, BYTE * command) void Mempak::ReadFrom(int Control, BYTE * command)
{ {
int address = (command[3] << 8) | (command[4] & 0xE0); DWORD address = (command[3] << 8) | (command[4] & 0xE0);
if (address < 0x8000) if (address < 0x8000)
{ {
@ -149,7 +149,7 @@ void Mempak::ReadFrom(int Control, BYTE * command)
void Mempak::WriteTo(int Control, BYTE * command) void Mempak::WriteTo(int Control, BYTE * command)
{ {
DWORD dwWritten; DWORD dwWritten;
int address = (command[3] << 8) | (command[4] & 0xE0); DWORD address = (command[3] << 8) | (command[4] & 0xE0);
if (address < 0x8000) if (address < 0x8000)
{ {

11
Source/Project64/N64 System/Mips/Rumblepak.cpp
View File

@ -12,24 +12,21 @@
void Rumblepak::ReadFrom(BYTE * command) void Rumblepak::ReadFrom(BYTE * command)
{ {
unsigned char data; DWORD address = (command[3] << 8) | (command[4] & 0xE0);
int address = (command[3] << 8) | (command[4] & 0xE0);
if ((address >= 0x8000) && (address < 0x9000)) if ((address >= 0x8000) && (address < 0x9000))
{ {
data = 0x80; memset(&command[5], 0x80, 0x20);
} }
else else
{ {
data = 0x00; memset(&command[5], 0x00, 0x20);
} }
memset(&command[5], data, 0x20);
} }
void Rumblepak::WriteTo(int Control, BYTE * command) void Rumblepak::WriteTo(int Control, BYTE * command)
{ {
int address = (command[3] << 8) | (command[4] & 0xE0); DWORD address = (command[3] << 8) | (command[4] & 0xE0);
if ((address) == 0xC000) if ((address) == 0xC000)
{ {