From 3b62a383f66eeb93e880948abaff094b042cca5c Mon Sep 17 00:00:00 2001
From: adas20 <dasar-24@rhodes.edu>
Date: Wed, 6 Aug 2025 15:51:56 -0400
Subject: [PATCH] Edited Layout integers of combo button. Made Combo Button
 display properly in normal portrait mode.

---
 .../main/java/org/citra/citra_emu/overlay/InputOverlay.kt | 4 ++--
 src/android/app/src/main/res/values/integers.xml          | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt
index 4f5fddf96..0d3505b80 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt
@@ -933,11 +933,11 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex
             )
             .putFloat(
                 NativeLibrary.ButtonType.BUTTON_COMBO.toString() + portrait + "-X",
-                resources.getInteger(R.integer.N3DS_BUTTON_COMBO_X).toFloat() / 1000 * maxX
+                resources.getInteger(R.integer.N3DS_BUTTON_COMBO_PORTRAIT_X).toFloat() / 1000 * maxX
             )
             .putFloat(
                 NativeLibrary.ButtonType.BUTTON_COMBO.toString() + portrait + "-Y",
-                resources.getInteger(R.integer.N3DS_BUTTON_COMBO_Y).toFloat() / 1000 * maxY
+                resources.getInteger(R.integer.N3DS_BUTTON_COMBO_PORTRAIT_Y).toFloat() / 1000 * maxY
             )
             .apply()
     }
diff --git a/src/android/app/src/main/res/values/integers.xml b/src/android/app/src/main/res/values/integers.xml
index 133b4d16f..0c091a48b 100644
--- a/src/android/app/src/main/res/values/integers.xml
+++ b/src/android/app/src/main/res/values/integers.xml
@@ -35,8 +35,8 @@
     <integer name="N3DS_BUTTON_SWAP_Y">850</integer>
     <integer name="N3DS_BUTTON_TURBO_X">630</integer>
     <integer name="N3DS_BUTTON_TURBO_Y">850</integer>
-    <integer name="N3DS_BUTTON_COMBO_X">750</integer>
-    <integer name="N3DS_BUTTON_COMBO_Y">800</integer>
+    <integer name="N3DS_BUTTON_COMBO_X">740</integer>
+    <integer name="N3DS_BUTTON_COMBO_Y">480</integer>
 
     <!-- Default N3DS portrait layout -->
     <integer name="N3DS_BUTTON_A_PORTRAIT_X">810</integer>
@@ -71,7 +71,7 @@
     <integer name="N3DS_BUTTON_SWAP_PORTRAIT_Y">675</integer>
     <integer name="N3DS_BUTTON_TURBO_PORTRAIT_X">453</integer>
     <integer name="N3DS_BUTTON_TURBO_PORTRAIT_Y">720</integer>
-    <integer name="N3DS_BUTTON_COMBO_PORTRAIT_X">460</integer>
-    <integer name="N3DS_BUTTON_COMBO_PORTRAIT_Y">550</integer>
+    <integer name="N3DS_BUTTON_COMBO_PORTRAIT_X">445</integer>
+    <integer name="N3DS_BUTTON_COMBO_PORTRAIT_Y">925</integer>
 
 </resources>