From d0dc8b03c6fada57a157121b9c8b3b619bd52bcc Mon Sep 17 00:00:00 2001
From: Rupert Carmichael <5050061-carmiker@users.noreply.gitlab.com>
Date: Sun, 4 Aug 2024 12:30:08 -0400
Subject: [PATCH] libretro: Reorder overscan settings to be intuitive

---
 bsnes/target-libretro/libretro.cpp            | 12 ++++++------
 bsnes/target-libretro/libretro_core_options.h |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bsnes/target-libretro/libretro.cpp b/bsnes/target-libretro/libretro.cpp
index 2bbbeab61..97a56b4fb 100644
--- a/bsnes/target-libretro/libretro.cpp
+++ b/bsnes/target-libretro/libretro.cpp
@@ -164,14 +164,14 @@ static void update_variables(void)
 
 	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var))
 	{
-		if (strcmp(var.value, "16") == 0)
-			program->overscan = 16;
-		else if (strcmp(var.value, "12") == 0)
-			program->overscan = 12;
+		if (strcmp(var.value, "0") == 0)
+			program->overscan = 0;
 		else if (strcmp(var.value, "8") == 0)
 			program->overscan = 8;
-		else if (strcmp(var.value, "0") == 0)
-			program->overscan = 0;
+		else if (strcmp(var.value, "12") == 0)
+			program->overscan = 12;
+		else if (strcmp(var.value, "16") == 0)
+			program->overscan = 16;
 	}
 
 	var.key = "bsnes_blur_emulation";
diff --git a/bsnes/target-libretro/libretro_core_options.h b/bsnes/target-libretro/libretro_core_options.h
index f61b34640..1603e9e27 100644
--- a/bsnes/target-libretro/libretro_core_options.h
+++ b/bsnes/target-libretro/libretro_core_options.h
@@ -116,10 +116,10 @@ struct retro_core_option_v2_definition option_defs_us[] = {
       NULL,
       "video",
       {
-         { "16", "16 Lines" },
-         { "12", "12 Lines" },
-         { "8",  "8 Lines" },
          { "0",  "0 Lines" },
+         { "8",  "8 Lines" },
+         { "12", "12 Lines" },
+         { "16", "16 Lines" },
          { NULL, NULL },
       },
       "8"