diff options
| author | nakeee <nakeee@gmail.com> | 2009-02-09 19:26:14 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-02-09 19:26:14 +0000 |
| commit | 59a8fd4848a97cbad5abb7008d4e6fead5892287 (patch) | |
| tree | fc6ea77555a1d9920b05315a1448016c8ab3a7d4 /Source/Core | |
| parent | 2ff2852771d7b38576832f73201b531e2f23212a (diff) | |
Chaoscode fix for last commit.
If anyone understands why it made any difference do tell me... it seems both should just return null..
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2181 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/HW/Memmap.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp index ddf895b175..5c37c1803e 100644 --- a/Source/Core/Core/Src/HW/Memmap.cpp +++ b/Source/Core/Core/Src/HW/Memmap.cpp @@ -780,19 +780,18 @@ u8 *GetPointer(const u32 _Address) case 0xC1: return (u8*)(((char*)m_pRAM) + (_Address & RAM_MASK)); - case 0x10: - case 0x11: - case 0x12: - case 0x13: - case 0x7B: - case 0x90: - case 0x91: - case 0x92: - case 0x93: - case 0xD0: - case 0xD1: - case 0xD2: - case 0xD3: + case 0x10: + case 0x11: + case 0x12: + case 0x13: + case 0x90: + case 0x91: + case 0x92: + case 0x93: + case 0xD0: + case 0xD1: + case 0xD2: + case 0xD3: if (Core::GetStartupParameter().bWii) return (u8*)(((char*)m_pEXRAM) + (_Address & EXRAM_MASK)); else @@ -810,7 +809,9 @@ u8 *GetPointer(const u32 _Address) case 0xCD: _dbg_assert_msg_(MEMMAP, 0, "Memory", "GetPointer from IO Bridge doesnt work"); return NULL; - case 0xFF: break; + case 0x7B: + case 0xFF: + break; default: if (!PanicYesNo("unknown pointer address report this to the devs %08x\n Continue?", (_Address >> 24))) Crash(); |