mirror of
https://github.com/dborth/vbagx.git
synced 2024-12-26 02:31:50 +01:00
fix issue loading second GBA rom for GC users
This commit is contained in:
parent
4007c852cc
commit
2e96b28e24
@ -78,6 +78,10 @@ void UnmountAllFAT()
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
bool ChangeFATInterface(int method, bool silent)
|
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;
|
bool mounted = false;
|
||||||
|
|
||||||
// unmount all FAT devices
|
// unmount all FAT devices
|
||||||
|
@ -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
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
@ -20,7 +20,6 @@
|
|||||||
#include "images/bg.h"
|
#include "images/bg.h"
|
||||||
#include "vba.h"
|
#include "vba.h"
|
||||||
#include "menudraw.h"
|
#include "menudraw.h"
|
||||||
//#include "pal60.h"
|
|
||||||
|
|
||||||
extern unsigned int SMBTimer; // timer to reset SMB connection
|
extern unsigned int SMBTimer; // timer to reset SMB connection
|
||||||
u32 FrameTimer = 0;
|
u32 FrameTimer = 0;
|
||||||
@ -333,11 +332,6 @@ void InitialiseVideo ()
|
|||||||
|
|
||||||
VIDEO_SetBlack(FALSE);
|
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_Flush();
|
||||||
VIDEO_WaitVSync();
|
VIDEO_WaitVSync();
|
||||||
|
|
||||||
|
@ -122,7 +122,10 @@ void VMClose()
|
|||||||
|
|
||||||
#ifdef USE_VM
|
#ifdef USE_VM
|
||||||
if (rombase != NULL)
|
if (rombase != NULL)
|
||||||
|
{
|
||||||
free(rombase);
|
free(rombase);
|
||||||
|
rombase = NULL;
|
||||||
|
}
|
||||||
if (romfile != NULL)
|
if (romfile != NULL)
|
||||||
{
|
{
|
||||||
fclose(romfile);
|
fclose(romfile);
|
||||||
|
Loading…
Reference in New Issue
Block a user