diff --git a/source/ngc/fileop.cpp b/source/ngc/fileop.cpp index 418edcd..d6a4665 100644 --- a/source/ngc/fileop.cpp +++ b/source/ngc/fileop.cpp @@ -78,6 +78,10 @@ void UnmountAllFAT() ***************************************************************************/ bool ChangeFATInterface(int method, bool silent) { + #ifdef USE_VM + return true; // we don't want to unmount/remount since a file is loaded! + #endif + bool mounted = false; // unmount all FAT devices diff --git a/source/ngc/pal60.h b/source/ngc/pal60.h deleted file mode 100644 index 160873c..0000000 --- a/source/ngc/pal60.h +++ /dev/null @@ -1,85 +0,0 @@ -u32 vpal60[] = - { - 0x0e160001, - 0x476901ad, - 0x02ea5140, - 0x00110028, - 0x00100029, - 0x410c410c, - 0x40ed40ed, - 0x002f8ee0, - 0x00000000, - 0x002f93e0, - 0x00000000, - 0x00e20262, - 0x910701ae, - 0x90010001, - 0x00010001, - 0x00010001, - 0x00000000, - 0x00000000, - 0x28500100, - 0x1ae771f0, - 0x0db4a574, - 0x00c1188e, - 0xc4c0cbe2, - 0xfcecdecf, - 0x13130f08, - 0x00080c0f, - 0x00ff0000, - 0x00000000, - 0x02800000, - 0x000000ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff, - 0x00ff00ff - }; - -/**************************************************************************** -* VIDEO60 -* -* Differences between Wii/GC and libOGC 60Hz I modes -* -* CC002000 0f06 0e16 -* CC00200C 0003 0011 -* CC00200E 0018 0028 -* CC002010 0002 0010 -* CC002012 0019 0029 -* CC00201C 0034 61A0 002F 8EE0 -* CC002024 0034 66A0 002F 93E0 -* CC00202C 00E4 001E 00E2 0262 -* CC002030 1107 01AE 9107 01AE -* CC002034 1001 0001 9001 0001 -****************************************************************************/ - diff --git a/source/ngc/video.cpp b/source/ngc/video.cpp index 91a985b..d00710b 100644 --- a/source/ngc/video.cpp +++ b/source/ngc/video.cpp @@ -20,7 +20,6 @@ #include "images/bg.h" #include "vba.h" #include "menudraw.h" -//#include "pal60.h" extern unsigned int SMBTimer; // timer to reset SMB connection u32 FrameTimer = 0; @@ -333,11 +332,6 @@ void InitialiseVideo () VIDEO_SetBlack(FALSE); - // set timings in VI to PAL60 - /*u32 *vreg = (u32 *)0xCC002000; - for (int i = 0; i < 64; i++ ) - vreg[i] = vpal60[i];*/ - VIDEO_Flush(); VIDEO_WaitVSync(); diff --git a/source/ngc/vmmem.cpp b/source/ngc/vmmem.cpp index 6cfd003..d48cb56 100644 --- a/source/ngc/vmmem.cpp +++ b/source/ngc/vmmem.cpp @@ -122,7 +122,10 @@ void VMClose() #ifdef USE_VM if (rombase != NULL) + { free(rombase); + rombase = NULL; + } if (romfile != NULL) { fclose(romfile);