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

win32: memView - fix initial address

This commit is contained in:
gocha 2012-07-28 13:59:56 +00:00
parent 3d33308fe7
commit b3b782f810
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
desmume/src/windows/memView.cpp
View File

@ -45,8 +45,10 @@ struct MemViewRegion
unsigned int size; // number of bytes to the end of this region
};
static const MemViewRegion s_arm9Region = { "ARM9", "ARM9 memory", 0x02000000, 0x1000000 };
static const MemViewRegion s_arm7Region = { "ARM7", "ARM7 memory", 0x02000000, 0x1000000 };
const HWAddressType arm9InitAddress = 0x02000000;
const HWAddressType arm7InitAddress = 0x02000000;
static const MemViewRegion s_arm9Region = { "ARM9", "ARM9 memory", arm9InitAddress, 0x1000000 };
static const MemViewRegion s_arm7Region = { "ARM7", "ARM7 memory", arm7InitAddress, 0x1000000 };
typedef std::vector<MemViewRegion> MemoryList;
static MemoryList s_memoryRegions;
@ -203,7 +205,6 @@ CMemView::CMemView()
s_memoryRegions.push_back(s_arm9Region);
s_memoryRegions.push_back(s_arm7Region);
}
address = s_memoryRegions.front().hardwareAddress;
PostInitialize();
}
@ -237,6 +238,10 @@ INT_PTR CALLBACK MemView_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
wnd->font = CreateFont(16, 0, 0, 0, FW_MEDIUM, FALSE, FALSE, FALSE, DEFAULT_CHARSET,
OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, GetFontQuality(), FIXED_PITCH, "Courier New");
s_memoryRegions[MEMVIEW_ARM9].hardwareAddress = arm9InitAddress;
s_memoryRegions[MEMVIEW_ARM7].hardwareAddress = arm7InitAddress;
wnd->address = s_memoryRegions.front().hardwareAddress;
MemViewRegion& region = s_memoryRegions[wnd->region];
cur = GetDlgItem(hDlg, IDC_REGION);
@ -251,7 +256,6 @@ INT_PTR CALLBACK MemView_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
SendMessage(cur, CB_ADDSTRING, 0, (LPARAM)"Halfwords");
SendMessage(cur, CB_ADDSTRING, 0, (LPARAM)"Words");
SendMessage(cur, CB_SETCURSEL, 0, 0);
cur = GetDlgItem(hDlg, IDC_ADDRESS);
SendMessage(cur, EM_SETLIMITTEXT, 8, 0);
char addressText[9];