The-Homebrew-Cloud/fceugx
2
0
Fork 0
mirror of https://github.com/dborth/fceugx.git synced 2025-01-07 14:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

VS game support, 480p on GameCube support

Browse Source
This commit is contained in:
dborth 2008-10-01 05:16:59 +00:00
parent b448fab942
commit 1d6352b136
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/ngc/gcvideo.c
View File

@ -21,8 +21,6 @@
extern unsigned int SMBTimer; extern unsigned int SMBTimer;
//#define FORCE_PAL50 1
#define TEX_WIDTH 256 #define TEX_WIDTH 256
#define TEX_HEIGHT 512 #define TEX_HEIGHT 512
#define WIDTH 640 #define WIDTH 640
@ -216,6 +214,15 @@ void initDisplay() {
VIDEO_Init(); VIDEO_Init();
vmode = VIDEO_GetPreferredMode(NULL); vmode = VIDEO_GetPreferredMode(NULL);
#ifdef HW_DOL
/* we have component cables, but the preferred mode is interlaced
* why don't we switch into progressive?
* on the Wii, the user can do this themselves on their Wii Settings */
if(VIDEO_HaveComponentCable() && vmode == &TVNtsc480IntDf)
vmode = &TVNtsc480Prog;
#endif
VIDEO_Configure(vmode); VIDEO_Configure(vmode);
screenheight = vmode->xfbHeight; screenheight = vmode->xfbHeight;

23
source/ngc/pad.c
View File

@ -29,7 +29,8 @@ unsigned int nespadmap[] = {
JOY_B, JOY_A, JOY_B, JOY_A,
JOY_SELECT, JOY_START, JOY_SELECT, JOY_START,
JOY_UP, JOY_DOWN, JOY_UP, JOY_DOWN,
JOY_LEFT, JOY_RIGHT JOY_LEFT, JOY_RIGHT,
0 // insert coin for VS games
}; };
/*** Gamecube controller Padmap ***/ /*** Gamecube controller Padmap ***/
@ -37,28 +38,32 @@ unsigned int gcpadmap[] = {
PAD_BUTTON_B, PAD_BUTTON_A, PAD_BUTTON_B, PAD_BUTTON_A,
PAD_TRIGGER_L, PAD_TRIGGER_R, PAD_TRIGGER_L, PAD_TRIGGER_R,
PAD_BUTTON_UP, PAD_BUTTON_DOWN, PAD_BUTTON_UP, PAD_BUTTON_DOWN,
PAD_BUTTON_LEFT, PAD_BUTTON_RIGHT PAD_BUTTON_LEFT, PAD_BUTTON_RIGHT,
PAD_TRIGGER_Z // insert coin for VS games
}; };
/*** Wiimote Padmap ***/ /*** Wiimote Padmap ***/
unsigned int wmpadmap[] = { unsigned int wmpadmap[] = {
WPAD_BUTTON_1, WPAD_BUTTON_2, WPAD_BUTTON_1, WPAD_BUTTON_2,
WPAD_BUTTON_MINUS, WPAD_BUTTON_PLUS, WPAD_BUTTON_MINUS, WPAD_BUTTON_PLUS,
WPAD_BUTTON_RIGHT, WPAD_BUTTON_LEFT, WPAD_BUTTON_RIGHT, WPAD_BUTTON_LEFT,
WPAD_BUTTON_UP, WPAD_BUTTON_DOWN WPAD_BUTTON_UP, WPAD_BUTTON_DOWN,
WPAD_BUTTON_A // insert coin for VS games
}; };
/*** Classic Controller Padmap ***/ /*** Classic Controller Padmap ***/
unsigned int ccpadmap[] = { unsigned int ccpadmap[] = {
WPAD_CLASSIC_BUTTON_Y, WPAD_CLASSIC_BUTTON_B, WPAD_CLASSIC_BUTTON_Y, WPAD_CLASSIC_BUTTON_B,
WPAD_CLASSIC_BUTTON_MINUS, WPAD_CLASSIC_BUTTON_PLUS, WPAD_CLASSIC_BUTTON_MINUS, WPAD_CLASSIC_BUTTON_PLUS,
WPAD_CLASSIC_BUTTON_UP, WPAD_CLASSIC_BUTTON_DOWN, WPAD_CLASSIC_BUTTON_UP, WPAD_CLASSIC_BUTTON_DOWN,
WPAD_CLASSIC_BUTTON_LEFT, WPAD_CLASSIC_BUTTON_RIGHT WPAD_CLASSIC_BUTTON_LEFT, WPAD_CLASSIC_BUTTON_RIGHT,
WPAD_CLASSIC_BUTTON_FULL_R // insert coin for VS games
}; };
/*** Nunchuk + wiimote Padmap ***/ /*** Nunchuk + wiimote Padmap ***/
unsigned int ncpadmap[] = { unsigned int ncpadmap[] = {
WPAD_NUNCHUK_BUTTON_C, WPAD_NUNCHUK_BUTTON_Z, WPAD_NUNCHUK_BUTTON_C, WPAD_NUNCHUK_BUTTON_Z,
WPAD_BUTTON_MINUS, WPAD_BUTTON_PLUS, WPAD_BUTTON_MINUS, WPAD_BUTTON_PLUS,
WPAD_BUTTON_UP, WPAD_BUTTON_DOWN, WPAD_BUTTON_UP, WPAD_BUTTON_DOWN,
WPAD_BUTTON_LEFT, WPAD_BUTTON_RIGHT WPAD_BUTTON_LEFT, WPAD_BUTTON_RIGHT,
WPAD_BUTTON_A // insert coin for VS games
}; };
static uint32 JSReturn = 0; static uint32 JSReturn = 0;
@ -367,7 +372,12 @@ unsigned char DecodeJoy( unsigned short pad )
|| ( (exp_type == WPAD_EXP_NUNCHUK) && (wp & ncpadmap[i]) ) // nunchuk + wiimote || ( (exp_type == WPAD_EXP_NUNCHUK) && (wp & ncpadmap[i]) ) // nunchuk + wiimote
#endif #endif
) )
J |= nespadmap[i]; {
if(nespadmap[i] > 0)
J |= nespadmap[i];
else
FCEU_DoSimpleCommand(0x07); // insert coin for VS Games
}
} }
// zapper enabled // zapper enabled
@ -382,6 +392,7 @@ unsigned char DecodeJoy( unsigned short pad )
#ifdef HW_RVL #ifdef HW_RVL
|| (wp & WPAD_BUTTON_A) // wiimote || (wp & WPAD_BUTTON_A) // wiimote
|| (wp & WPAD_BUTTON_B) || (wp & WPAD_BUTTON_B)
|| (wp & WPAD_CLASSIC_BUTTON_A) // classic controller
#endif #endif
) )
{ {