RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sms, revisit FM settings

Browse source 
setting moved to SMS section, default off since it crashes some games
This commit is contained in:
kub 2021-10-21 20:40:13 +02:00
parent d0cb6cfa57
commit 1ffc8b84f1
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pico/sms.c
View file

@ -137,8 +137,7 @@ static unsigned char z80_sms_in(unsigned short a)
break; break;
case 0xf2: case 0xf2:
// bit 0 = 1 active FM Pac // bit 0 = 1 active FM Pac
d = ymflag; d = 0xf8 | ymflag;
//printf("read FM Check = %02x\n", d);
break; break;
} }
} }
@ -202,7 +201,7 @@ static void z80_sms_out(unsigned short a, unsigned char d)
break; break;
case 0xf2: case 0xf2:
// bit 0 = 1 active FM Pac // bit 0 = 1 active FM Pac
ymflag = d; ymflag = d & 0x1;
break; break;
} }
} }

2
platform/common/emu.c
View file

@ -589,7 +589,7 @@ void emu_prep_defconfig(void)
memset(&defaultConfig, 0, sizeof(defaultConfig)); memset(&defaultConfig, 0, sizeof(defaultConfig));
defaultConfig.EmuOpt = EOPT_EN_SRAM | EOPT_EN_SOUND | EOPT_16BPP | defaultConfig.EmuOpt = EOPT_EN_SRAM | EOPT_EN_SOUND | EOPT_16BPP |
EOPT_EN_CD_LEDS | EOPT_GZIP_SAVES | 0x10/*?*/; EOPT_EN_CD_LEDS | EOPT_GZIP_SAVES | 0x10/*?*/;
defaultConfig.s_PicoOpt = POPT_EN_SNDFILTER|POPT_EN_YM2413|POPT_EN_GG_LCD | defaultConfig.s_PicoOpt = POPT_EN_SNDFILTER|POPT_EN_GG_LCD |
POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80 | POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80 |
POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX |
POPT_EN_DRC|POPT_ACC_SPRITES | POPT_EN_DRC|POPT_ACC_SPRITES |

6
platform/common/menu_pico.c
View file

@ -528,10 +528,13 @@ static int menu_loop_32x_options(int id, int keys)
#ifndef NO_SMS #ifndef NO_SMS
static const char *sms_hardwares[] = { "auto", "Game Gear", "Master System", NULL }; static const char *sms_hardwares[] = { "auto", "Game Gear", "Master System", NULL };
static const char h_smsfm[] = "FM sound is only supported by few games\nOther games may crash with FM enabled";
static menu_entry e_menu_sms_options[] = static menu_entry e_menu_sms_options[] =
{ {
mee_enum ("System", MA_SMSOPT_HARDWARE, PicoIn.hwSelect, sms_hardwares ), mee_enum ("System", MA_SMSOPT_HARDWARE, PicoIn.hwSelect, sms_hardwares ),
mee_onoff_h ("FM Sound Unit", MA_OPT2_ENABLE_YM2413, PicoIn.opt, POPT_EN_YM2413, h_smsfm),
mee_end,
}; };
static int menu_loop_sms_options(int id, int keys) static int menu_loop_sms_options(int id, int keys)
@ -557,7 +560,6 @@ static menu_entry e_menu_adv_options[] =
mee_onoff ("Emulate YM2612 (FM)", MA_OPT2_ENABLE_YM2612, PicoIn.opt, POPT_EN_FM), mee_onoff ("Emulate YM2612 (FM)", MA_OPT2_ENABLE_YM2612, PicoIn.opt, POPT_EN_FM),
mee_onoff ("Disable YM2612 SSG-EG", MA_OPT2_DISABLE_YM_SSG,PicoIn.opt, POPT_DIS_FM_SSGEG), mee_onoff ("Disable YM2612 SSG-EG", MA_OPT2_DISABLE_YM_SSG,PicoIn.opt, POPT_DIS_FM_SSGEG),
mee_onoff ("Emulate SN76496 (PSG)", MA_OPT2_ENABLE_SN76496,PicoIn.opt, POPT_EN_PSG), mee_onoff ("Emulate SN76496 (PSG)", MA_OPT2_ENABLE_SN76496,PicoIn.opt, POPT_EN_PSG),
mee_onoff ("Emulate YM2413 (FM)", MA_OPT2_ENABLE_YM2413 ,PicoIn.opt, POPT_EN_YM2413),
mee_onoff ("Emulate Game Gear LCD", MA_OPT2_ENABLE_GGLCD ,PicoIn.opt, POPT_EN_GG_LCD), mee_onoff ("Emulate Game Gear LCD", MA_OPT2_ENABLE_GGLCD ,PicoIn.opt, POPT_EN_GG_LCD),
mee_onoff ("Disable idle loop patching",MA_OPT2_NO_IDLE_LOOPS,PicoIn.opt, POPT_DIS_IDLE_DET), mee_onoff ("Disable idle loop patching",MA_OPT2_NO_IDLE_LOOPS,PicoIn.opt, POPT_DIS_IDLE_DET),
mee_onoff ("Disable frame limiter", MA_OPT2_NO_FRAME_LIMIT,currentConfig.EmuOpt, EOPT_NO_FRMLIMIT), mee_onoff ("Disable frame limiter", MA_OPT2_NO_FRAME_LIMIT,currentConfig.EmuOpt, EOPT_NO_FRMLIMIT),