diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 21cdbc4b1..0d9c1f169 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -326,7 +326,7 @@ const char* Settings::GetLogLevelDisplayName(LOGLEVEL level) static std::array s_console_region_names = {{"Auto", "NTSC-J", "NTSC-U", "PAL"}}; static std::array s_console_region_display_names = { {TRANSLATABLE("ConsoleRegion", "Auto-Detect"), TRANSLATABLE("ConsoleRegion", "NTSC-J (Japan)"), - TRANSLATABLE("ConsoleRegion", "NTSC-U (US)"), TRANSLATABLE("ConsoleRegion", "PAL (Europe, Australia)")}}; + TRANSLATABLE("ConsoleRegion", "NTSC-U/C (US, Canada)"), TRANSLATABLE("ConsoleRegion", "PAL (Europe, Australia)")}}; std::optional Settings::ParseConsoleRegionName(const char* str) { @@ -354,7 +354,7 @@ const char* Settings::GetConsoleRegionDisplayName(ConsoleRegion region) static std::array s_disc_region_names = {{"NTSC-J", "NTSC-U", "PAL", "Other"}}; static std::array s_disc_region_display_names = { - {TRANSLATABLE("DiscRegion", "NTSC-J (Japan)"), TRANSLATABLE("DiscRegion", "NTSC-U (US)"), + {TRANSLATABLE("DiscRegion", "NTSC-J (Japan)"), TRANSLATABLE("DiscRegion", "NTSC-U/C (US, Canada)"), TRANSLATABLE("DiscRegion", "PAL (Europe, Australia)"), TRANSLATABLE("DiscRegion", "Other")}}; std::optional Settings::ParseDiscRegionName(const char* str) diff --git a/src/core/system.cpp b/src/core/system.cpp index 50ab3d24d..27ded5cec 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -305,7 +305,7 @@ bool Boot(const SystemBootParameters& params) // TODO: Pull region from PSF if (s_region == ConsoleRegion::Auto) { - Log_InfoPrintf("Defaulting to NTSC-U region for executable."); + Log_InfoPrintf("Defaulting to NTSC-U/C region for executable."); s_region = ConsoleRegion::NTSC_U; } } diff --git a/src/duckstation-libretro/libretro_host_interface.cpp b/src/duckstation-libretro/libretro_host_interface.cpp index 8388ae868..bc68d5a99 100644 --- a/src/duckstation-libretro/libretro_host_interface.cpp +++ b/src/duckstation-libretro/libretro_host_interface.cpp @@ -376,7 +376,7 @@ static std::array s_option_definitions = {{ "Determines which region/hardware to emulate. Auto-Detect will use the region of the disc inserted.", {{"Auto", "Auto-Detect"}, {"NTSC-J", "NTSC-J (Japan)"}, - {"NTSC-U", "NTSC-U (US)"}, + {"NTSC-U", "NTSC-U/C (US, Canada)"}, {"PAL", "PAL (Europe, Australia)"}}, "Auto"}, {"duckstation_BIOS.PatchFastBoot", diff --git a/src/duckstation-qt/gamelistmodel.cpp b/src/duckstation-qt/gamelistmodel.cpp index c3e422bb8..1a01a5567 100644 --- a/src/duckstation-qt/gamelistmodel.cpp +++ b/src/duckstation-qt/gamelistmodel.cpp @@ -280,7 +280,7 @@ void GameListModel::loadCommonImages() m_type_playlist_pixmap.load(QStringLiteral(":/icons/address-book-new-22.png")); m_region_eu_pixmap.load(QStringLiteral(":/icons/flag-eu.png")); m_region_jp_pixmap.load(QStringLiteral(":/icons/flag-jp.png")); - m_region_us_pixmap.load(QStringLiteral(":/icons/flag-us.png")); + m_region_us_pixmap.load(QStringLiteral(":/icons/flag-uc.png")); m_region_eu_pixmap.load(QStringLiteral(":/icons/flag-eu.png")); for (int i = 0; i < static_cast(GameListCompatibilityRating::Count); i++) diff --git a/src/duckstation-qt/resources/icons/flag-eu.png b/src/duckstation-qt/resources/icons/flag-eu.png index 318ff09bd..640f1375e 100644 Binary files a/src/duckstation-qt/resources/icons/flag-eu.png and b/src/duckstation-qt/resources/icons/flag-eu.png differ diff --git a/src/duckstation-qt/resources/icons/flag-eu.svg b/src/duckstation-qt/resources/icons/flag-eu.svg index 0fa4e2414..a605f684e 100644 --- a/src/duckstation-qt/resources/icons/flag-eu.svg +++ b/src/duckstation-qt/resources/icons/flag-eu.svg @@ -1,29 +1,31 @@ - -European flag + + + +European Union flag - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/flag-eu@2x.png b/src/duckstation-qt/resources/icons/flag-eu@2x.png new file mode 100644 index 000000000..cfbdd67c8 Binary files /dev/null and b/src/duckstation-qt/resources/icons/flag-eu@2x.png differ diff --git a/src/duckstation-qt/resources/icons/flag-jp.png b/src/duckstation-qt/resources/icons/flag-jp.png index 46b15cb30..a91b84048 100644 Binary files a/src/duckstation-qt/resources/icons/flag-jp.png and b/src/duckstation-qt/resources/icons/flag-jp.png differ diff --git a/src/duckstation-qt/resources/icons/flag-jp.svg b/src/duckstation-qt/resources/icons/flag-jp.svg index 05ca6995a..5b83bd738 100644 --- a/src/duckstation-qt/resources/icons/flag-jp.svg +++ b/src/duckstation-qt/resources/icons/flag-jp.svg @@ -1,5 +1,6 @@ +Japanese flag \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/flag-jp@2x.png b/src/duckstation-qt/resources/icons/flag-jp@2x.png new file mode 100644 index 000000000..80c82bff1 Binary files /dev/null and b/src/duckstation-qt/resources/icons/flag-jp@2x.png differ diff --git a/src/duckstation-qt/resources/icons/flag-uc.png b/src/duckstation-qt/resources/icons/flag-uc.png new file mode 100644 index 000000000..447161692 Binary files /dev/null and b/src/duckstation-qt/resources/icons/flag-uc.png differ diff --git a/src/duckstation-qt/resources/icons/flag-uc.svg b/src/duckstation-qt/resources/icons/flag-uc.svg new file mode 100644 index 000000000..0bf506b35 --- /dev/null +++ b/src/duckstation-qt/resources/icons/flag-uc.svg @@ -0,0 +1,118 @@ + + + Vertically split United States and Canada flag, made for identification of the NTSU-U/C region. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/flag-uc@2x.png b/src/duckstation-qt/resources/icons/flag-uc@2x.png new file mode 100644 index 000000000..f143e2099 Binary files /dev/null and b/src/duckstation-qt/resources/icons/flag-uc@2x.png differ diff --git a/src/duckstation-qt/resources/icons/flag-us.png b/src/duckstation-qt/resources/icons/flag-us.png index c54624c8d..bd1703acb 100644 Binary files a/src/duckstation-qt/resources/icons/flag-us.png and b/src/duckstation-qt/resources/icons/flag-us.png differ diff --git a/src/duckstation-qt/resources/icons/flag-us.svg b/src/duckstation-qt/resources/icons/flag-us.svg index 3f1081ccf..93a01e5c6 100644 --- a/src/duckstation-qt/resources/icons/flag-us.svg +++ b/src/duckstation-qt/resources/icons/flag-us.svg @@ -1,12 +1,28 @@ - - - - - - - - - - - \ No newline at end of file + +United States flag, reworked as 2:3. This involved shrinking the stripes from the right until the flag was the right aspect, then shrinking the canton horizontally so that it only occupied 1/2 of the flag's width, then transposing the stars so that they were centered within the canton. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/duckstation-qt/resources/icons/flag-us@2x.png b/src/duckstation-qt/resources/icons/flag-us@2x.png new file mode 100644 index 000000000..235d085e3 Binary files /dev/null and b/src/duckstation-qt/resources/icons/flag-us@2x.png differ diff --git a/src/duckstation-qt/resources/resources.qrc b/src/duckstation-qt/resources/resources.qrc index 8252e3ff8..669f65fbe 100644 --- a/src/duckstation-qt/resources/resources.qrc +++ b/src/duckstation-qt/resources/resources.qrc @@ -1,11 +1,19 @@ - icons/flag-eu.png icons/flag-eu.svg - icons/flag-jp.png + icons/flag-eu.png + icons/flag-eu@2x.png icons/flag-jp.svg - icons/flag-us.png + icons/flag-jp.png + icons/flag-jp@2x.png + icons/flag-uc.svg + icons/flag-uc.png + icons/flag-uc@2x.png + icons/star-0.png icons/star-1.png icons/star-2.png