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

Hexeditor: fixed ROM coloring when using CDLogger data

This commit is contained in:
ansstuff 2013-03-02 13:00:38 +00:00
parent ba8fb91eaa
commit 5acc146be8
1 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/drivers/win/memview.cpp
View File

@ -43,6 +43,9 @@ extern Name* lastBankNames;
extern Name* loadedBankNames; extern Name* loadedBankNames;
extern Name* ramBankNames; extern Name* ramBankNames;
extern unsigned char *cdloggervdata;
extern unsigned int cdloggerVideoDataSize;
using namespace std; using namespace std;
#define MODE_NES_MEMORY 0 #define MODE_NES_MEMORY 0
@ -373,7 +376,8 @@ int LoadTable(const char* nameo)
} }
//should return -1, otherwise returns the line number it had the error on //should return -1, otherwise returns the line number it had the error on
int LoadTableFile(){ int LoadTableFile()
{
const char filter[]="Table Files (*.TBL)\0*.tbl\0All Files (*.*)\0*.*\0\0"; const char filter[]="Table Files (*.TBL)\0*.tbl\0All Files (*.*)\0*.*\0\0";
char nameo[2048]; char nameo[2048];
OPENFILENAME ofn; OPENFILENAME ofn;
@ -386,7 +390,7 @@ int LoadTableFile(){
ofn.lpstrFile=nameo; ofn.lpstrFile=nameo;
ofn.nMaxFile=256; ofn.nMaxFile=256;
ofn.Flags=OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY; ofn.Flags=OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY;
ofn.hwndOwner = hCDLogger; ofn.hwndOwner = hMemView;
if(!GetOpenFileName(&ofn))return -1; if(!GetOpenFileName(&ofn))return -1;
int result = LoadTable(nameo); int result = LoadTable(nameo);
@ -550,13 +554,24 @@ char EditString[3][20] = {"RAM","PPU","ROM"};
void UpdateCaption() void UpdateCaption()
{ {
static char str[1000]; static char str[1000];
static char addrName[1000]; static char addrName[500];
static char addrNameCopy[1000]; static char addrNameCopy[500];
if (CursorEndAddy == -1) if (CursorEndAddy == -1)
{ {
sprintf(str, "Hex Editor - %s Offset 0x%06x", if (EditingMode == 2)
EditString[EditingMode], CursorStartAddy); {
if (CursorStartAddy < 16)
sprintf(str, "Hex Editor - ROM Header Offset 0x%06x", CursorStartAddy);
else if (CursorStartAddy - 16 < (int)PRGsize[0])
sprintf(str, "Hex Editor - (PRG) ROM Offset 0x%06x", CursorStartAddy);
else if (CursorStartAddy - 16 - PRGsize[0] < (int)CHRsize[0])
sprintf(str, "Hex Editor - (CHR) ROM Offset 0x%06x", CursorStartAddy);
} else
{
sprintf(str, "Hex Editor - %s Offset 0x%06x", EditString[EditingMode], CursorStartAddy);
}
if (EditingMode == 0 && symbDebugEnabled) if (EditingMode == 0 && symbDebugEnabled)
{ {
// when watching RAM we may as well see symbolic names // when watching RAM we may as well see symbolic names
@ -645,22 +660,24 @@ void UpdateColorTable(){
// ################################## End of SP CODE ########################### // ################################## End of SP CODE ###########################
//mbg merge 6/29/06 - added argument //mbg merge 6/29/06 - added argument
if(EditingMode == 0)FCEUI_ListCheats(UpdateCheatColorCallB,0); if (EditingMode == 0)
FCEUI_ListCheats(UpdateCheatColorCallB, 0);
if(EditingMode == 2){ if(EditingMode == 2)
if(cdloggerdata)
{ {
for(i = 0;i < DataAmount;i++) if (cdloggerdataSize)
{
for (i = 0; i < DataAmount; i++)
{ {
temp_offset = CurOffset + i - 16; // (minus iNES header) temp_offset = CurOffset + i - 16; // (minus iNES header)
if (temp_offset >= 0) if (temp_offset >= 0)
{ {
if (temp_offset < PRGsize[0]) if (temp_offset < cdloggerdataSize)
{ {
// PRG // PRG
if ((cdloggerdata[temp_offset] & 3) == 3) if ((cdloggerdata[temp_offset] & 3) == 3)
{ {
// the byte is both Code and Data // the byte is both Code and Data - green
TextColorList[i]=RGB(0,190,0); TextColorList[i]=RGB(0,190,0);
} else if((cdloggerdata[temp_offset] & 3) == 1) } else if((cdloggerdata[temp_offset] & 3) == 1)
{ {
@ -674,33 +691,36 @@ void UpdateColorTable(){
TextColorList[i]=RGB(0,130,160); TextColorList[i]=RGB(0,130,160);
else else
// non-PCM data - blue // non-PCM data - blue
TextColorList[i]=RGB(0,0,195); TextColorList[i]=RGB(0,0,210);
} }
} else } else
{ {
temp_offset -= PRGsize[0]; temp_offset -= cdloggerdataSize;
if ((temp_offset < CHRsize[0])) if ((temp_offset < cdloggerVideoDataSize))
{
// CHR // CHR
if ((cdloggerdata[temp_offset] & 3) == 3) if ((cdloggervdata[temp_offset] & 3) == 3)
{ {
// the byte was both rendered and read programmatically - light-green // the byte was both rendered and read programmatically - light-green
TextColorList[i]=RGB(5,255,5); TextColorList[i]=RGB(5,255,5);
} else if((cdloggerdata[temp_offset] & 3) == 1) } else if ((cdloggervdata[temp_offset] & 3) == 1)
{ {
// the byte was rendered - yellow // the byte was rendered - yellow
TextColorList[i]=RGB(210,190,0); TextColorList[i]=RGB(210,190,0);
} else if((cdloggerdata[temp_offset] & 3) == 2) } else if ((cdloggervdata[temp_offset] & 3) == 2)
{ {
// the byte was read programmatically - light-blue // the byte was read programmatically - light-blue
TextColorList[i]=RGB(10,10,255); TextColorList[i]=RGB(15,15,255);
}
} }
} }
} }
} }
} }
tmp=undo_list; tmp = undo_list;
while(tmp!= 0){ while(tmp!= 0)
{
//if((tmp->addr < CurOffset+DataAmount) && (tmp->addr+tmp->size > CurOffset)) //if((tmp->addr < CurOffset+DataAmount) && (tmp->addr+tmp->size > CurOffset))
for(i = tmp->addr;i < tmp->addr+tmp->size;i++){ for(i = tmp->addr;i < tmp->addr+tmp->size;i++){
if((i > CurOffset) && (i < CurOffset+DataAmount)) if((i > CurOffset) && (i < CurOffset+DataAmount))
@ -1609,7 +1629,7 @@ LRESULT CALLBACK MemViewCallB(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
case MENU_MV_FILE_LOAD_TBL: case MENU_MV_FILE_LOAD_TBL:
if((i = LoadTableFile()) != -1){ if((i = LoadTableFile()) != -1){
sprintf(str,"Error Loading Table File At Line %d",i); sprintf(str,"Error Loading Table File At Line %d",i);
MessageBox(hMemView,str,"error", MB_OK); MessageBox(hMemView, str, "error", MB_OK);
} }
UpdateColorTable(); UpdateColorTable();
return 0; return 0;