|
@@ -501,7 +501,7 @@ static void draw_savestate_bg(int slot)
|
|
|
}
|
|
|
|
|
|
if (file) {
|
|
|
- if (PicoAHW & 1) {
|
|
|
+ if (PicoIn.AHW & 1) {
|
|
|
PicoCdLoadStateGfx(file);
|
|
|
} else {
|
|
|
areaSeek(file, 0x10020, SEEK_SET); // skip header and RAM in state file
|
|
@@ -703,7 +703,7 @@ menu_entry ctrlopt_entries[] =
|
|
|
{ "Player 1", MB_NONE, MA_CTRL_PLAYER1, NULL, 0, 0, 0, 1, 0 },
|
|
|
{ "Player 2", MB_NONE, MA_CTRL_PLAYER2, NULL, 0, 0, 0, 1, 0 },
|
|
|
{ "Emulator controls", MB_NONE, MA_CTRL_EMU, NULL, 0, 0, 0, 1, 0 },
|
|
|
- { "6 button pad", MB_ONOFF, MA_OPT_6BUTTON_PAD, &PicoOpt, 0x020, 0, 0, 1, 1 },
|
|
|
+ { "6 button pad", MB_ONOFF, MA_OPT_6BUTTON_PAD, &PicoIn.opt, 0x020, 0, 0, 1, 1 },
|
|
|
{ "Turbo rate", MB_RANGE, MA_CTRL_TURBO_RATE, ¤tConfig.turbo_rate, 0, 1, 30, 1, 1 },
|
|
|
{ "Done", MB_NONE, MA_CTRL_DONE, NULL, 0, 0, 0, 1, 0 },
|
|
|
};
|
|
@@ -756,7 +756,7 @@ static void kc_sel_loop(void)
|
|
|
if (inp & PBTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }
|
|
|
if (inp & PBTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
|
|
|
if (inp & PBTN_PLAY) {
|
|
|
- int is_6button = PicoOpt & 0x020;
|
|
|
+ int is_6button = PicoIn.opt & 0x020;
|
|
|
switch (selected_id) {
|
|
|
case MA_CTRL_PLAYER1: key_config_loop(me_ctrl_actions, is_6button ? 15 : 11, 0); return;
|
|
|
case MA_CTRL_PLAYER2: key_config_loop(me_ctrl_actions, is_6button ? 15 : 11, 1); return;
|
|
@@ -779,12 +779,12 @@ menu_entry cdopt_entries[] =
|
|
|
{ NULL, MB_NONE, MA_CDOPT_TESTBIOS_EUR, NULL, 0, 0, 0, 1, 0 },
|
|
|
{ NULL, MB_NONE, MA_CDOPT_TESTBIOS_JAP, NULL, 0, 0, 0, 1, 0 },
|
|
|
{ "CD LEDs", MB_ONOFF, MA_CDOPT_LEDS, ¤tConfig.EmuOpt, 0x0400, 0, 0, 1, 1 },
|
|
|
- { "CDDA audio", MB_ONOFF, MA_CDOPT_CDDA, &PicoOpt, 0x0800, 0, 0, 1, 1 },
|
|
|
- { "PCM audio", MB_ONOFF, MA_CDOPT_PCM, &PicoOpt, 0x0400, 0, 0, 1, 1 },
|
|
|
+ { "CDDA audio", MB_ONOFF, MA_CDOPT_CDDA, &PicoIn.opt, 0x0800, 0, 0, 1, 1 },
|
|
|
+ { "PCM audio", MB_ONOFF, MA_CDOPT_PCM, &PicoIn.opt, 0x0400, 0, 0, 1, 1 },
|
|
|
{ NULL, MB_NONE, MA_CDOPT_READAHEAD, NULL, 0, 0, 0, 1, 1 },
|
|
|
- { "SaveRAM cart", MB_ONOFF, MA_CDOPT_SAVERAM, &PicoOpt, 0x8000, 0, 0, 1, 1 },
|
|
|
- { "Scale/Rot. fx (slow)", MB_ONOFF, MA_CDOPT_SCALEROT_CHIP,&PicoOpt, 0x1000, 0, 0, 1, 1 },
|
|
|
- { "Better sync (slow)", MB_ONOFF, MA_CDOPT_BETTER_SYNC, &PicoOpt, 0x2000, 0, 0, 1, 1 },
|
|
|
+ { "SaveRAM cart", MB_ONOFF, MA_CDOPT_SAVERAM, &PicoIn.opt, 0x8000, 0, 0, 1, 1 },
|
|
|
+ { "Scale/Rot. fx (slow)", MB_ONOFF, MA_CDOPT_SCALEROT_CHIP,&PicoIn.opt, 0x1000, 0, 0, 1, 1 },
|
|
|
+ { "Better sync (slow)", MB_ONOFF, MA_CDOPT_BETTER_SYNC, &PicoIn.opt, 0x2000, 0, 0, 1, 1 },
|
|
|
{ "done", MB_NONE, MA_CDOPT_DONE, NULL, 0, 0, 0, 1, 0 },
|
|
|
};
|
|
|
|
|
@@ -927,16 +927,16 @@ static void cd_menu_loop_options(void)
|
|
|
|
|
|
menu_entry opt2_entries[] =
|
|
|
{
|
|
|
- { "Disable sprite limit", MB_ONOFF, MA_OPT2_NO_SPRITE_LIM, &PicoOpt, 0x40000, 0, 0, 1, 1 },
|
|
|
- { "Emulate Z80", MB_ONOFF, MA_OPT2_ENABLE_Z80, &PicoOpt, 0x00004, 0, 0, 1, 1 },
|
|
|
- { "Emulate YM2612 (FM)", MB_ONOFF, MA_OPT2_ENABLE_YM2612, &PicoOpt, 0x00001, 0, 0, 1, 1 },
|
|
|
- { "Emulate SN76496 (PSG)", MB_ONOFF, MA_OPT2_ENABLE_SN76496,&PicoOpt, 0x00002, 0, 0, 1, 1 },
|
|
|
+ { "Disable sprite limit", MB_ONOFF, MA_OPT2_NO_SPRITE_LIM, &PicoIn.opt, 0x40000, 0, 0, 1, 1 },
|
|
|
+ { "Emulate Z80", MB_ONOFF, MA_OPT2_ENABLE_Z80, &PicoIn.opt, 0x00004, 0, 0, 1, 1 },
|
|
|
+ { "Emulate YM2612 (FM)", MB_ONOFF, MA_OPT2_ENABLE_YM2612, &PicoIn.opt, 0x00001, 0, 0, 1, 1 },
|
|
|
+ { "Emulate SN76496 (PSG)", MB_ONOFF, MA_OPT2_ENABLE_SN76496,&PicoIn.opt, 0x00002, 0, 0, 1, 1 },
|
|
|
{ "Double buffering", MB_ONOFF, MA_OPT2_DBLBUFF, ¤tConfig.EmuOpt, 0x8000, 0, 0, 1, 1 },
|
|
|
{ "Wait for V-sync (slow)", MB_ONOFF, MA_OPT2_VSYNC, ¤tConfig.EmuOpt, 0x2000, 0, 0, 1, 1 },
|
|
|
{ "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, ¤tConfig.EmuOpt, 0x0008, 0, 0, 1, 1 },
|
|
|
{ "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, ¤tConfig.EmuOpt, 0x0020, 0, 0, 1, 1 },
|
|
|
- { "SVP dynarec", MB_ONOFF, MA_OPT2_SVP_DYNAREC, &PicoOpt, 0x20000, 0, 0, 1, 1 },
|
|
|
- { "Disable idle loop patching",MB_ONOFF, MA_OPT2_NO_IDLE_LOOPS, &PicoOpt, 0x80000, 0, 0, 1, 1 },
|
|
|
+ { "SVP dynarec", MB_ONOFF, MA_OPT2_SVP_DYNAREC, &PicoIn.opt, 0x20000, 0, 0, 1, 1 },
|
|
|
+ { "Disable idle loop patching",MB_ONOFF, MA_OPT2_NO_IDLE_LOOPS, &PicoIn.opt, 0x80000, 0, 0, 1, 1 },
|
|
|
{ "done", MB_NONE, MA_OPT2_DONE, NULL, 0, 0, 0, 1, 0 },
|
|
|
};
|
|
|
|
|
@@ -1001,7 +1001,7 @@ static void amenu_loop_options(void)
|
|
|
menu_entry opt_entries[] =
|
|
|
{
|
|
|
{ NULL, MB_NONE, MA_OPT_RENDERER, NULL, 0, 0, 0, 1, 1 },
|
|
|
- { "Accurate sprites", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x080, 0, 0, 0, 1 },
|
|
|
+ { "Accurate sprites", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoIn.opt, 0x080, 0, 0, 0, 1 },
|
|
|
{ "Scanline mode (faster)", MB_ONOFF, MA_OPT_INTERLACED, ¤tConfig.EmuOpt, 0x4000, 0, 0, 1, 1 },
|
|
|
{ "Scale low res mode", MB_ONOFF, MA_OPT_SCALING, ¤tConfig.scaling, 0x0001, 0, 3, 1, 1 },
|
|
|
{ "Show FPS", MB_ONOFF, MA_OPT_SHOW_FPS, ¤tConfig.EmuOpt, 0x0002, 0, 0, 1, 1 },
|
|
@@ -1030,7 +1030,7 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
|
|
|
switch (entry->id)
|
|
|
{
|
|
|
case MA_OPT_RENDERER:
|
|
|
- if (PicoOpt&0x10)
|
|
|
+ if (PicoIn.opt&0x10)
|
|
|
str = " 8bit fast";
|
|
|
else if (currentConfig.EmuOpt&0x80)
|
|
|
str = "16bit accurate";
|
|
@@ -1045,11 +1045,11 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
|
|
|
text_out16(x, y, "Frameskip %s", str24);
|
|
|
break;
|
|
|
case MA_OPT_SOUND_QUALITY:
|
|
|
- str = (PicoOpt&0x08)?"stereo":"mono";
|
|
|
+ str = (PicoIn.opt&0x08)?"stereo":"mono";
|
|
|
text_out16(x, y, "Sound Quality: %5iHz %s", PsndRate, str);
|
|
|
break;
|
|
|
case MA_OPT_REGION:
|
|
|
- text_out16(x, y, "Region: %s", me_region_name(PicoRegionOverride, PicoAutoRgnOrder));
|
|
|
+ text_out16(x, y, "Region: %s", me_region_name(PicoIn.regionOverride, PicoIn.autoRgnOrder));
|
|
|
break;
|
|
|
case MA_OPT_CONFIRM_STATES:
|
|
|
switch ((currentConfig.EmuOpt >> 9) & 5) {
|
|
@@ -1108,31 +1108,31 @@ static void region_prevnext(int right)
|
|
|
static int rgn_orders[] = { 0x148, 0x184, 0x814, 0x418, 0x841, 0x481 };
|
|
|
int i;
|
|
|
if (right) {
|
|
|
- if (!PicoRegionOverride) {
|
|
|
+ if (!PicoIn.regionOverride) {
|
|
|
for (i = 0; i < 6; i++)
|
|
|
- if (rgn_orders[i] == PicoAutoRgnOrder) break;
|
|
|
- if (i < 5) PicoAutoRgnOrder = rgn_orders[i+1];
|
|
|
- else PicoRegionOverride=1;
|
|
|
+ if (rgn_orders[i] == PicoIn.autoRgnOrder) break;
|
|
|
+ if (i < 5) PicoIn.autoRgnOrder = rgn_orders[i+1];
|
|
|
+ else PicoIn.regionOverride=1;
|
|
|
}
|
|
|
- else PicoRegionOverride<<=1;
|
|
|
- if (PicoRegionOverride > 8) PicoRegionOverride = 8;
|
|
|
+ else PicoIn.regionOverride<<=1;
|
|
|
+ if (PicoIn.regionOverride > 8) PicoIn.regionOverride = 8;
|
|
|
} else {
|
|
|
- if (!PicoRegionOverride) {
|
|
|
+ if (!PicoIn.regionOverride) {
|
|
|
for (i = 0; i < 6; i++)
|
|
|
- if (rgn_orders[i] == PicoAutoRgnOrder) break;
|
|
|
- if (i > 0) PicoAutoRgnOrder = rgn_orders[i-1];
|
|
|
+ if (rgn_orders[i] == PicoIn.autoRgnOrder) break;
|
|
|
+ if (i > 0) PicoIn.autoRgnOrder = rgn_orders[i-1];
|
|
|
}
|
|
|
- else PicoRegionOverride>>=1;
|
|
|
+ else PicoIn.regionOverride>>=1;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
static void menu_options_save(void)
|
|
|
{
|
|
|
- if (PicoRegionOverride) {
|
|
|
+ if (PicoIn.regionOverride) {
|
|
|
// force setting possibly changed..
|
|
|
- Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;
|
|
|
+ Pico.m.pal = (PicoIn.regionOverride == 2 || PicoIn.regionOverride == 8) ? 1 : 0;
|
|
|
}
|
|
|
- if (!(PicoOpt & 0x20)) {
|
|
|
+ if (!(PicoIn.opt & 0x20)) {
|
|
|
// unbind XYZ MODE, just in case
|
|
|
unbind_action(0xf00);
|
|
|
}
|
|
@@ -1162,28 +1162,28 @@ static int menu_loop_options(void)
|
|
|
switch (selected_id) {
|
|
|
case MA_OPT_RENDERER:
|
|
|
if (inp & PBTN_LEFT) {
|
|
|
- if ((PicoOpt&0x10) || !(currentConfig.EmuOpt &0x80)) {
|
|
|
- PicoOpt&= ~0x10;
|
|
|
+ if ((PicoIn.opt&0x10) || !(currentConfig.EmuOpt &0x80)) {
|
|
|
+ PicoIn.opt&= ~0x10;
|
|
|
currentConfig.EmuOpt |= 0x80;
|
|
|
}
|
|
|
} else {
|
|
|
- if (!(PicoOpt&0x10) || (currentConfig.EmuOpt &0x80)) {
|
|
|
- PicoOpt|= 0x10;
|
|
|
+ if (!(PicoIn.opt&0x10) || (currentConfig.EmuOpt &0x80)) {
|
|
|
+ PicoIn.opt|= 0x10;
|
|
|
currentConfig.EmuOpt &= ~0x80;
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
case MA_OPT_SOUND_QUALITY:
|
|
|
if ((inp & PBTN_RIGHT) && PsndRate == 44100 &&
|
|
|
- !(PicoOpt&0x08))
|
|
|
+ !(PicoIn.opt&0x08))
|
|
|
{
|
|
|
PsndRate = 11025;
|
|
|
- PicoOpt |= 8;
|
|
|
+ PicoIn.opt |= 8;
|
|
|
} else if ((inp & PBTN_LEFT) && PsndRate == 11025 &&
|
|
|
- (PicoOpt&0x08) && !(PicoAHW&1))
|
|
|
+ (PicoIn.opt&0x08) && !(PicoIn.AHW&1))
|
|
|
{
|
|
|
PsndRate = 44100;
|
|
|
- PicoOpt &= ~8;
|
|
|
+ PicoIn.opt &= ~8;
|
|
|
} else
|
|
|
PsndRate = sndrate_prevnext(PsndRate, inp & PBTN_RIGHT);
|
|
|
break;
|