From d818246c51ad8bd7c2646cc494d12beb558ec20e Mon Sep 17 00:00:00 2001 From: kub Date: Mon, 23 Oct 2023 23:16:43 +0200 Subject: [PATCH] handle "Mega Drive" naming consistently --- README.md | 2 +- platform/common/emu.c | 2 +- platform/common/menu_pico.c | 8 ++++---- platform/libretro/libretro_core_options.h | 2 +- platform/opendingux/data/default.gcw0.desktop | 2 +- platform/opendingux/data/default.retrofw.desktop | 2 +- platform/opendingux/data/default.rg99.desktop | 2 +- platform/pandora/PicoDrive.pxml.template | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 1b8030aa..68806637 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ This is yet another SEGA 8 bit and 16 bit console emulator for emulating most of the hardware SEGA has published up to and including the 32X. -Emulated 16 bit systems: Megadrive/Genesis, Sega/Mega CD, 32X, Pico. +Emulated 16 bit systems: Mega Drive/Genesis, Sega/Mega CD, 32X, Pico. Emulated 8 bit systems: SG-1000, SC-3000, Master System/Mark III, Game Gear. PicoDrive was originally written having ARM-based handheld devices diff --git a/platform/common/emu.c b/platform/common/emu.c index 4e24c00b..43c7d0af 100644 --- a/platform/common/emu.c +++ b/platform/common/emu.c @@ -371,7 +371,7 @@ static void system_announce(void) } else if (PicoIn.AHW & PAHW_32X) { sys_name = "32X"; } else { - sys_name = "MegaDrive"; + sys_name = "Mega Drive"; if ((Pico.m.hardware & 0xc0) == 0x80) sys_name = "Genesis"; } diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c index 14ddf067..a8e5e3b6 100644 --- a/platform/common/menu_pico.c +++ b/platform/common/menu_pico.c @@ -414,7 +414,7 @@ static const char *mgn_dev_name(int id, int *offs) const char *indev0_names[] = { "none", "3 button pad", "6 button pad", "Team player", "4 way play", NULL }; const char *indev1_names[] = { "none", "3 button pad", "6 button pad", NULL }; -static char h_play34[] = "Works only for Megadrive/CD/32X games having\n" +static char h_play34[] = "Works only for Mega Drive/CD/32X games having\n" "support for Team player or 4 way play"; static menu_entry e_menu_keyconfig[] = @@ -462,7 +462,7 @@ static int menu_loop_keyconfig(int id, int keys) static const char h_renderer[] = "16bit is more accurate, 8bit is faster"; static const char h_fmsound[] = "Disabling improves performance, but breaks sound"; -static const char h_dacnoise[] = "FM chips in the 1st Megadrive model have DAC noise,\n" +static const char h_dacnoise[] = "FM chips in the 1st Mega Drive model have DAC noise,\n" "newer models used different chips without this"; static const char h_fmfilter[] = "Improves sound accuracy but is noticeably slower,\n" "best´quality if native rate isn't working"; @@ -699,7 +699,7 @@ static const char *mgn_opt_alpha(int id, int *offs) static const char h_ensound[] = "Disabling turns off sound output, however all\n" "enabled sound components are still emulated"; -static const char h_quality[] = "native: Megadrive FM hardware rate (~53000Hz),\n" +static const char h_quality[] = "native: Mega Drive FM hardware rate (~53000Hz),\n" "best quality, but may not work on some devices"; static const char h_lowpass[] = "Low pass filter for sound closer to real hardware"; static const char h_lpalpha[] = "Higher values have more impact"; @@ -949,7 +949,7 @@ static menu_entry e_menu_options[] = mee_handler ("Interface options", menu_loop_ui_options), mee_handler ("Display options", menu_loop_gfx_options), mee_handler ("Sound options", menu_loop_snd_options), - mee_handler ("MD/Genesis options", menu_loop_md_options), + mee_handler ("MD/Genesis/Pico options", menu_loop_md_options), mee_handler (" Sega/Mega CD add-on", menu_loop_cd_options), #ifndef NO_32X mee_handler (" 32X add-on", menu_loop_32x_options), diff --git a/platform/libretro/libretro_core_options.h b/platform/libretro/libretro_core_options.h index 4498b469..1e1d4c4b 100644 --- a/platform/libretro/libretro_core_options.h +++ b/platform/libretro/libretro_core_options.h @@ -208,7 +208,7 @@ struct retro_core_option_v2_definition option_defs_us[] = { "picodrive_sound_rate", "Audio Sample Rate (Hz)", "Sample Rate (Hz)", - "Higher values increase sound quality. Lower values may increase performance. Native is the Megadrive sound chip rate (~53000). Select this if you want the most accurate audio.", + "Higher values increase sound quality. Lower values may increase performance. Native is the Mega Drive sound chip rate (~53000). Select this if you want the most accurate audio.", NULL, "audio", { diff --git a/platform/opendingux/data/default.gcw0.desktop b/platform/opendingux/data/default.gcw0.desktop index 17ff8cb4..857f932f 100644 --- a/platform/opendingux/data/default.gcw0.desktop +++ b/platform/opendingux/data/default.gcw0.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Picodrive -Comment=A megadrive/genesis emulator +Comment=A mega drive/genesis emulator Exec=PicoDrive %f Icon=megadrive Terminal=false diff --git a/platform/opendingux/data/default.retrofw.desktop b/platform/opendingux/data/default.retrofw.desktop index 36a01e5f..d702b339 100644 --- a/platform/opendingux/data/default.retrofw.desktop +++ b/platform/opendingux/data/default.retrofw.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=Picodrive -Comment=A megadrive/genesis emulator +Comment=A mega drive/genesis emulator Exec=PicoDrive %f Icon=megadrive Categories=emulators; diff --git a/platform/opendingux/data/default.rg99.desktop b/platform/opendingux/data/default.rg99.desktop index 17ff8cb4..857f932f 100644 --- a/platform/opendingux/data/default.rg99.desktop +++ b/platform/opendingux/data/default.rg99.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Picodrive -Comment=A megadrive/genesis emulator +Comment=A mega drive/genesis emulator Exec=PicoDrive %f Icon=megadrive Terminal=false diff --git a/platform/pandora/PicoDrive.pxml.template b/platform/pandora/PicoDrive.pxml.template index 96d7b1ec..d7203a1e 100644 --- a/platform/pandora/PicoDrive.pxml.template +++ b/platform/pandora/PicoDrive.pxml.template @@ -14,8 +14,8 @@ PicoDrive @major@.@minor@@build_post@ - Genesis/MegaDrive/SegaCD/32x Emulator. - Ein MegaDrive/SegaCD/32x Emulator + Genesis/Mega Drive/Sega CD/32x Emulator. + Ein Mega Drive/Sega CD/32x Emulator -- 2.39.5