diff --git a/allmakes.sh b/allmakes.sh index 50cd456..16b5d7f 100644 --- a/allmakes.sh +++ b/allmakes.sh @@ -1,4 +1,3 @@ -#!/bin/bash make all TARGET=capcom; cp EBOOT.PBP CAPCOM.PBP; make all TARGET=Cave; cp EBOOT.PBP CAVE.PBP; make all TARGET=cps1; cp EBOOT.PBP CPS1.PBP; @@ -6,6 +5,7 @@ make all TARGET=deco; cp EBOOT.PBP DECO.PBP; make all TARGET=dynax; cp EBOOT.PBP DYNAX.PBP make all TARGET=irem; cp EBOOT.PBP IREM.PBP; make all TARGET=Jaleco; cp EBOOT.PBP JALECO.PBP; +make all TARGET=Kaneko; cp EBOOT.PBP KANEKO.PBP; make all TARGET=konami; cp EBOOT.PBP KONAMI.PBP; make all TARGET=konami2; cp EBOOT.PBP KONAMI2.PBP; make all TARGET=namco; cp EBOOT.PBP NAMCO.PBP; @@ -15,11 +15,10 @@ make all TARGET=nintendo; cp EBOOT.PBP NINTENDO.PBP; make all TARGET=sega; cp EBOOT.PBP SEGA.PBP; make all TARGET=sega2; cp EBOOT.PBP SEGA2.PBP; make all TARGET=sega3; cp EBOOT.PBP SEGA3.PBP; +make all TARGET=Seta; cp EBOOT.PBP SETA.PBP; make all TARGET=snk; cp EBOOT.PBP SNK.PBP; make all TARGET=taito; cp EBOOT.PBP TAITO.PBP; make all TARGET=taito2; cp EBOOT.PBP TAITO2.PBP; make all TARGET=technos; cp EBOOT.PBP TECHNOS.PBP; make all TARGET=Universal; cp EBOOT.PBP UNIVERSAL.PBP; make all TARGET=upl; cp EBOOT.PBP UPL.PBP; - - diff --git a/src/psp/config.c b/src/psp/config.c index 5b4c262..6a4bfa5 100644 --- a/src/psp/config.c +++ b/src/psp/config.c @@ -549,7 +549,7 @@ static void parse_cmdline( int argc, char **argv, int game_index ) setBlitMode(setting.screensize); - wait_vsync = setting.vsync_ON_OFF; + // wait_vsync = setting.vsync_ON_OFF; ui_show_fps_set(setting.show_fps_ON_OFF); throttle = setting.limit_ON_OFF; @@ -710,7 +710,7 @@ int cli_frontend_init( int argc, char **argv ) /* no sound is indicated by a 0 samplerate */ if (SND_OFF==setting.sound_rate) options.samplerate = 0; - if (game_index_int) { + if (game_index_int > -1) { game_index = game_index_int; } diff --git a/src/psp/menu.c b/src/psp/menu.c index 53d1e38..c627752 100644 --- a/src/psp/menu.c +++ b/src/psp/menu.c @@ -410,7 +410,7 @@ void save_config(void) #define SET_DEFAULT_FSKIPS SET_FSKIP_00 #endif // SET_DEFAULT_FSKIPS /* set default to off the video syncronization for draw. */ -#define SET_DEFAULT_VSYNC_ON_OFF SET_ON +// #define SET_DEFAULT_VSYNC_ON_OFF SET_ON /* set default speed max limitage. */ #define SET_DEFAULT_LIMIT_ON_OFF SET_OFF @@ -457,7 +457,7 @@ void load_config(void) strcpy(setting.vercnf, CONFIG_VER); setting.screensize = SET_DEFAULT_SCREEN; setting.frameskip = SET_DEFAULT_FSKIPS; - setting.vsync_ON_OFF = SET_DEFAULT_VSYNC_ON_OFF; + // setting.vsync_ON_OFF = SET_DEFAULT_VSYNC_ON_OFF; setting.limit_ON_OFF = SET_DEFAULT_LIMIT_ON_OFF; setting.show_fps_ON_OFF = SET_OFF; setting.sound_rate = SET_DEFAULT_SOUND_FREQ;/*default sound rate 44100 */ @@ -797,7 +797,7 @@ void psp_menu(void) //---space--- ITEM_SCREEN_SIZE, //1 ITEM_FRAME_SKIP, - ITEM_VSYNC, + // ITEM_VSYNC, ITEM_LIMIT_SPEED, ITEM_SHOW_FPS, ITEM_ROM_FILTER, @@ -829,7 +829,7 @@ void psp_menu(void) case ITEM_FRAME_SKIP: if (setting.frameskip > 0) setting.frameskip--; break; case ITEM_SCREEN_SIZE: if (setting.screensize > 0) setting.screensize--; break; - case ITEM_VSYNC: setting.vsync_ON_OFF = SET_OFF; break; + // case ITEM_VSYNC: setting.vsync_ON_OFF = SET_OFF; break; case ITEM_LIMIT_SPEED: setting.limit_ON_OFF = SET_OFF; break; case ITEM_SHOW_FPS: setting.show_fps_ON_OFF = SET_OFF; break; case ITEM_ROM_FILTER: setting.rom_filter = SET_OFF; Get_DriverList(setting.rom_filter); break; @@ -843,7 +843,7 @@ void psp_menu(void) case ITEM_SOUND_RATE: if (setting.sound_rate > 0) setting.sound_rate--; break; case ITEM_FRAME_SKIP: if (setting.frameskip < (60+1)) setting.frameskip++; break; case ITEM_SCREEN_SIZE: if (setting.screensize < (SCR_MAX-1)) setting.screensize++; break; - case ITEM_VSYNC: setting.vsync_ON_OFF = SET_ON; break; + // case ITEM_VSYNC: setting.vsync_ON_OFF = SET_ON; break; case ITEM_LIMIT_SPEED: setting.limit_ON_OFF = SET_ON; break; case ITEM_SHOW_FPS: setting.show_fps_ON_OFF = SET_ON; break; case ITEM_ROM_FILTER: setting.rom_filter = SET_ON; Get_DriverList(setting.rom_filter); break; @@ -936,16 +936,16 @@ static const char *scr_names[] = { psp_print(MENU2_X_OFFS, ((MENU1_Y_OFFS+ITEM_FRAME_SKIP+(1))*(MENU1_Y_SPACER)), setting.color[3],tmp); - psp_print(MENU2_X_OFFS, ((MENU1_Y_OFFS+ITEM_VSYNC+(1))*(MENU1_Y_SPACER)), setting.color[3], setting.vsync_ON_OFF - ? "VSYNC: " "ON" - #if (SET_ON==SET_DEFAULT_VSYNC_ON_OFF) - STR_DEFAULT - #endif - : "VSYNC: " "OFF" - #if (SET_OFF==SET_DEFAULT_VSYNC_ON_OFF) - STR_DEFAULT - #endif - ); + // psp_print(MENU2_X_OFFS, ((MENU1_Y_OFFS+ITEM_VSYNC+(1))*(MENU1_Y_SPACER)), setting.color[3], setting.vsync_ON_OFF + // ? "VSYNC: " "ON" + // #if (SET_ON==SET_DEFAULT_VSYNC_ON_OFF) + // STR_DEFAULT + // #endif + // : "VSYNC: " "OFF" + // #if (SET_OFF==SET_DEFAULT_VSYNC_ON_OFF) + // STR_DEFAULT + // #endif + // ); psp_print(MENU2_X_OFFS, ((MENU1_Y_OFFS+ITEM_LIMIT_SPEED +(1) )*(MENU1_Y_SPACER)), setting.color[3], setting.limit_ON_OFF ? "LIMIT SPEED: " "ON" : "LIMIT SPEED: " "OFF" STR_DEFAULT ); psp_print(MENU2_X_OFFS, ((MENU1_Y_OFFS+ITEM_SHOW_FPS +(1) )*(MENU1_Y_SPACER)), setting.color[3], setting.show_fps_ON_OFF ? "SHOW FPS: " "ON" : "SHOW FPS: " "OFF" STR_DEFAULT); diff --git a/src/psp/menu.h b/src/psp/menu.h index 565f5b4..024500b 100644 --- a/src/psp/menu.h +++ b/src/psp/menu.h @@ -9,7 +9,7 @@ typedef struct char vercnf[16]; u8/*u8*//*int*/ frameskip; u8/*u8*//*int*/ screensize; - u8/*u8*//*int*/ vsync_ON_OFF; + // u8/*u8*//*int*/ vsync_ON_OFF; u8/*u8*//*int*/ show_fps_ON_OFF;// int showfps; u8/*u8*//*int*/ sound_skip; @@ -54,7 +54,7 @@ enum{ SCR_MAX, //SCR_END, }; -#define CONFIG_VER "0.0.3" +#define CONFIG_VER "0.0.4" #define DRVIDX_MAX 1000 short drv_idx[DRVIDX_MAX]; diff --git a/src/psp/pspmain.c b/src/psp/pspmain.c index bfd4dec..e98bb2e 100644 --- a/src/psp/pspmain.c +++ b/src/psp/pspmain.c @@ -249,6 +249,7 @@ int main(int argc, char *argv[]) for(h=0;h