From 5e37b7f08309b34343540570e8eebc26330c3f23 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 25 Oct 2023 13:17:43 +0300
Subject: [PATCH 001/162] Test Vulkan CI fix (#329)

* Hopefully find a fix to the Vulkan CI issue

* Update HTTP_Build.yml

* Update Hydra_Build.yml

* Update Linux_Build.yml

* Update MacOS_Build.yml

* Update Qt_Build.yml

* Update HTTP_Build.yml

* Update Hydra_Build.yml

* Update HTTP_Build.yml

* Update Hydra_Build.yml

* Update Linux_Build.yml
---
 .github/workflows/HTTP_Build.yml    |  8 +++++++-
 .github/workflows/Hydra_Build.yml   | 14 ++++++++++----
 .github/workflows/Linux_Build.yml   |  8 +++++++-
 .github/workflows/MacOS_Build.yml   |  2 +-
 .github/workflows/Qt_Build.yml      |  4 ++--
 .github/workflows/Windows_Build.yml |  2 +-
 6 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/HTTP_Build.yml b/.github/workflows/HTTP_Build.yml
index 24cd19bc..f80d16db 100644
--- a/.github/workflows/HTTP_Build.yml
+++ b/.github/workflows/HTTP_Build.yml
@@ -22,13 +22,19 @@ jobs:
     - uses: actions/checkout@v2
     - name: Fetch submodules
       run: git submodule update --init --recursive
+      
+    - name: Install newer Clang
+      run: |
+       wget https://apt.llvm.org/llvm.sh
+       chmod +x ./llvm.sh
+       sudo ./llvm.sh 16
 
     - name: Setup Vulkan SDK
       uses: humbletim/setup-vulkan-sdk@v1.2.0
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
diff --git a/.github/workflows/Hydra_Build.yml b/.github/workflows/Hydra_Build.yml
index 18194059..25c4f458 100644
--- a/.github/workflows/Hydra_Build.yml
+++ b/.github/workflows/Hydra_Build.yml
@@ -24,7 +24,7 @@ jobs:
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_USER_BUILD=ON -DBUILD_HYDRA_CORE=ON
@@ -52,7 +52,7 @@ jobs:
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_USER_BUILD=ON -DBUILD_HYDRA_CORE=ON
@@ -77,13 +77,19 @@ jobs:
     - name: Install misc packages
       run: |
        sudo apt-get update && sudo apt install libx11-dev libgl1-mesa-glx mesa-common-dev libfuse2 libwayland-dev
+      
+    - name: Install newer Clang
+      run: |
+       wget https://apt.llvm.org/llvm.sh
+       chmod +x ./llvm.sh
+       sudo ./llvm.sh 16
        
     - name: Setup Vulkan SDK
       uses: humbletim/setup-vulkan-sdk@v1.2.0
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DENABLE_USER_BUILD=ON -DBUILD_HYDRA_CORE=ON
@@ -114,7 +120,7 @@ jobs:
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=x86_64 -DBUILD_HYDRA_CORE=1 -DENABLE_VULKAN=0
diff --git a/.github/workflows/Linux_Build.yml b/.github/workflows/Linux_Build.yml
index bbc79d81..0dc42673 100644
--- a/.github/workflows/Linux_Build.yml
+++ b/.github/workflows/Linux_Build.yml
@@ -26,12 +26,18 @@ jobs:
     - name: Install misc packages
       run: sudo apt-get update && sudo apt install libx11-dev libgl1-mesa-glx mesa-common-dev
 
+    - name: Install newer Clang
+      run: |
+       wget https://apt.llvm.org/llvm.sh
+       chmod +x ./llvm.sh
+       sudo ./llvm.sh 16
+
     - name: Setup Vulkan SDK
       uses: humbletim/setup-vulkan-sdk@v1.2.0
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
diff --git a/.github/workflows/MacOS_Build.yml b/.github/workflows/MacOS_Build.yml
index 7e54c5a5..b659e3fa 100644
--- a/.github/workflows/MacOS_Build.yml
+++ b/.github/workflows/MacOS_Build.yml
@@ -28,7 +28,7 @@ jobs:
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
diff --git a/.github/workflows/Qt_Build.yml b/.github/workflows/Qt_Build.yml
index 0cb007f4..f824d0aa 100644
--- a/.github/workflows/Qt_Build.yml
+++ b/.github/workflows/Qt_Build.yml
@@ -30,7 +30,7 @@ jobs:
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_USER_BUILD=ON -DENABLE_QT_GUI=ON
@@ -63,7 +63,7 @@ jobs:
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Install bundle dependencies
       run: |
diff --git a/.github/workflows/Windows_Build.yml b/.github/workflows/Windows_Build.yml
index 653692f3..ae9fd587 100644
--- a/.github/workflows/Windows_Build.yml
+++ b/.github/workflows/Windows_Build.yml
@@ -28,7 +28,7 @@ jobs:
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.

From e35251ac748974db1760d29161306d36d830dc92 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Tue, 24 Oct 2023 15:50:10 +0300
Subject: [PATCH 002/162] Minor hydra gl interface fixup

---
 src/hydra_core.cpp     | 12 +++++++-----
 third_party/hydra_core |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/hydra_core.cpp b/src/hydra_core.cpp
index 3c809dc3..25da6753 100644
--- a/src/hydra_core.cpp
+++ b/src/hydra_core.cpp
@@ -18,8 +18,8 @@ class HC_GLOBAL HydraCore final : public hydra::IBase, public hydra::IOpenGlRend
 	void setOutputSize(hydra::Size size) override;
 
 	// IOpenGlRendered
+	void resetContext() override;
 	void setFbo(unsigned handle) override;
-	void setContext(void* context) override;
 	void setGetProcAddress(void* function) override;
 
 	// IFrontendDriven
@@ -34,6 +34,7 @@ class HC_GLOBAL HydraCore final : public hydra::IBase, public hydra::IOpenGlRend
 	RendererGL* renderer;
 	void (*pollInputCallback)() = nullptr;
 	int32_t (*checkButtonCallback)(uint32_t player, hydra::ButtonType button) = nullptr;
+	void* getProcAddress = nullptr;
 };
 
 HydraCore::HydraCore() : emulator(new Emulator) {
@@ -100,13 +101,13 @@ hydra::Size HydraCore::getNativeSize() { return {400, 480}; }
 // Size doesn't matter as the glBlitFramebuffer call is commented out for the core
 void HydraCore::setOutputSize(hydra::Size size) {}
 
-void HydraCore::setGetProcAddress(void* function) {
+void HydraCore::resetContext() {
 #ifdef __ANDROID__
-	if (!gladLoadGLES2Loader(reinterpret_cast<GLADloadproc>(function))) {
+	if (!gladLoadGLES2Loader(reinterpret_cast<GLADloadproc>(getProcAddress))) {
 		Helpers::panic("OpenGL ES init failed");
 	}
 #else
-	if (!gladLoadGLLoader(reinterpret_cast<GLADloadproc>(function))) {
+	if (!gladLoadGLLoader(reinterpret_cast<GLADloadproc>(getProcAddress))) {
 		Helpers::panic("OpenGL init failed");
 	}
 #endif
@@ -114,9 +115,10 @@ void HydraCore::setGetProcAddress(void* function) {
 	emulator->initGraphicsContext(nullptr);
 }
 
-void HydraCore::setContext(void*) {}
 void HydraCore::setFbo(unsigned handle) { renderer->setFBO(handle); }
 
+void HydraCore::setGetProcAddress(void* function) { getProcAddress = function; }
+
 void HydraCore::setPollInputCallback(void (*callback)()) { pollInputCallback = callback; }
 void HydraCore::setCheckButtonCallback(int32_t (*callback)(uint32_t player, hydra::ButtonType button)) { checkButtonCallback = callback; }
 
diff --git a/third_party/hydra_core b/third_party/hydra_core
index e4cc6b0f..28311efe 160000
--- a/third_party/hydra_core
+++ b/third_party/hydra_core
@@ -1 +1 @@
-Subproject commit e4cc6b0fc224583e509bc3472a4c11eafb69c041
+Subproject commit 28311efe6e96af0b192f07179fe87dadab479041

From 9e30e6a14c6625a2c2f88ffba54d131e9d119fef Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Tue, 24 Oct 2023 18:34:27 +0300
Subject: [PATCH 003/162] destroyContext function stub

---
 src/hydra_core.cpp     | 3 +++
 third_party/hydra_core | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/hydra_core.cpp b/src/hydra_core.cpp
index 25da6753..793e3abf 100644
--- a/src/hydra_core.cpp
+++ b/src/hydra_core.cpp
@@ -19,6 +19,7 @@ class HC_GLOBAL HydraCore final : public hydra::IBase, public hydra::IOpenGlRend
 
 	// IOpenGlRendered
 	void resetContext() override;
+	void destroyContext() override;
 	void setFbo(unsigned handle) override;
 	void setGetProcAddress(void* function) override;
 
@@ -115,6 +116,8 @@ void HydraCore::resetContext() {
 	emulator->initGraphicsContext(nullptr);
 }
 
+void HydraCore::destroyContext() {}
+
 void HydraCore::setFbo(unsigned handle) { renderer->setFBO(handle); }
 
 void HydraCore::setGetProcAddress(void* function) { getProcAddress = function; }
diff --git a/third_party/hydra_core b/third_party/hydra_core
index 28311efe..1cdb1eda 160000
--- a/third_party/hydra_core
+++ b/third_party/hydra_core
@@ -1 +1 @@
-Subproject commit 28311efe6e96af0b192f07179fe87dadab479041
+Subproject commit 1cdb1eda5f368481e216416a119c85664e8c72ab

From 057436edc059513024a9d80f1f2ce9e64dba78e3 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 25 Oct 2023 15:41:56 +0300
Subject: [PATCH 004/162] Update to Clang 17 on CI (#330)

* Update HTTP_Build.yml

* Update Hydra_Build.yml

* Update Linux_AppImage_Build.yml

* Update Linux_Build.yml

* Update Qt_Build.yml

* Update Qt_Build.yml

* Update Linux_AppImage_Build.yml
---
 .github/workflows/HTTP_Build.yml           | 2 +-
 .github/workflows/Hydra_Build.yml          | 2 +-
 .github/workflows/Linux_AppImage_Build.yml | 4 ++--
 .github/workflows/Linux_Build.yml          | 2 +-
 .github/workflows/Qt_Build.yml             | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/HTTP_Build.yml b/.github/workflows/HTTP_Build.yml
index f80d16db..1b7775aa 100644
--- a/.github/workflows/HTTP_Build.yml
+++ b/.github/workflows/HTTP_Build.yml
@@ -27,7 +27,7 @@ jobs:
       run: |
        wget https://apt.llvm.org/llvm.sh
        chmod +x ./llvm.sh
-       sudo ./llvm.sh 16
+       sudo ./llvm.sh 17
 
     - name: Setup Vulkan SDK
       uses: humbletim/setup-vulkan-sdk@v1.2.0
diff --git a/.github/workflows/Hydra_Build.yml b/.github/workflows/Hydra_Build.yml
index 25c4f458..0d5778d3 100644
--- a/.github/workflows/Hydra_Build.yml
+++ b/.github/workflows/Hydra_Build.yml
@@ -82,7 +82,7 @@ jobs:
       run: |
        wget https://apt.llvm.org/llvm.sh
        chmod +x ./llvm.sh
-       sudo ./llvm.sh 16
+       sudo ./llvm.sh 17
        
     - name: Setup Vulkan SDK
       uses: humbletim/setup-vulkan-sdk@v1.2.0
diff --git a/.github/workflows/Linux_AppImage_Build.yml b/.github/workflows/Linux_AppImage_Build.yml
index 0a304109..23aae405 100644
--- a/.github/workflows/Linux_AppImage_Build.yml
+++ b/.github/workflows/Linux_AppImage_Build.yml
@@ -30,7 +30,7 @@ jobs:
       run: |
        wget https://apt.llvm.org/llvm.sh
        chmod +x ./llvm.sh
-       sudo ./llvm.sh 16
+       sudo ./llvm.sh 17
 
     - name: Install newer CMake
       run: |
@@ -50,7 +50,7 @@ jobs:
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang-16 -DCMAKE_CXX_COMPILER=clang++-16 -DENABLE_USER_BUILD=ON
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17 -DENABLE_USER_BUILD=ON
 
     - name: Build
       # Build your program with the given configuration
diff --git a/.github/workflows/Linux_Build.yml b/.github/workflows/Linux_Build.yml
index 0dc42673..e43413ef 100644
--- a/.github/workflows/Linux_Build.yml
+++ b/.github/workflows/Linux_Build.yml
@@ -30,7 +30,7 @@ jobs:
       run: |
        wget https://apt.llvm.org/llvm.sh
        chmod +x ./llvm.sh
-       sudo ./llvm.sh 16
+       sudo ./llvm.sh 17
 
     - name: Setup Vulkan SDK
       uses: humbletim/setup-vulkan-sdk@v1.2.0
diff --git a/.github/workflows/Qt_Build.yml b/.github/workflows/Qt_Build.yml
index f824d0aa..a112e529 100644
--- a/.github/workflows/Qt_Build.yml
+++ b/.github/workflows/Qt_Build.yml
@@ -114,7 +114,7 @@ jobs:
       run: |
        wget https://apt.llvm.org/llvm.sh
        chmod +x ./llvm.sh
-       sudo ./llvm.sh 16
+       sudo ./llvm.sh 17
 
     - name: Install newer CMake
       run: |
@@ -132,7 +132,7 @@ jobs:
        sudo apt install vulkan-sdk
 
     - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang-16 -DCMAKE_CXX_COMPILER=clang++-16 -DENABLE_USER_BUILD=ON -DENABLE_QT_GUI=ON
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17 -DENABLE_USER_BUILD=ON -DENABLE_QT_GUI=ON
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

From dddb784469e7837cd5a8981686a8809ae32ea80d Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 25 Oct 2023 20:29:59 +0300
Subject: [PATCH 005/162] Actually upgrade to clang 17 on CI (#331)

* Update HTTP_Build.yml

* Update Hydra_Build.yml

* Update Linux_Build.yml
---
 .github/workflows/HTTP_Build.yml  | 2 +-
 .github/workflows/Hydra_Build.yml | 2 +-
 .github/workflows/Linux_Build.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/HTTP_Build.yml b/.github/workflows/HTTP_Build.yml
index 1b7775aa..7bfe9c7f 100644
--- a/.github/workflows/HTTP_Build.yml
+++ b/.github/workflows/HTTP_Build.yml
@@ -39,7 +39,7 @@ jobs:
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DENABLE_USER_BUILD=ON -DENABLE_HTTP_SERVER=ON
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17 -DENABLE_USER_BUILD=ON -DENABLE_HTTP_SERVER=ON
 
     - name: Build
       # Build your program with the given configuration
diff --git a/.github/workflows/Hydra_Build.yml b/.github/workflows/Hydra_Build.yml
index 0d5778d3..3387d46d 100644
--- a/.github/workflows/Hydra_Build.yml
+++ b/.github/workflows/Hydra_Build.yml
@@ -92,7 +92,7 @@ jobs:
         vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DENABLE_USER_BUILD=ON -DBUILD_HYDRA_CORE=ON
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17 -DENABLE_USER_BUILD=ON -DBUILD_HYDRA_CORE=ON
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
diff --git a/.github/workflows/Linux_Build.yml b/.github/workflows/Linux_Build.yml
index e43413ef..78e5cc5a 100644
--- a/.github/workflows/Linux_Build.yml
+++ b/.github/workflows/Linux_Build.yml
@@ -42,7 +42,7 @@ jobs:
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DENABLE_USER_BUILD=ON
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17 -DENABLE_USER_BUILD=ON
 
     - name: Build
       # Build your program with the given configuration

From 7345e2e2553c96055a0527f11abc9386cf1b7de4 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 25 Oct 2023 23:09:14 +0300
Subject: [PATCH 006/162] Update hydra_core.cpp

---
 src/hydra_core.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/hydra_core.cpp b/src/hydra_core.cpp
index 793e3abf..6d1a9a1d 100644
--- a/src/hydra_core.cpp
+++ b/src/hydra_core.cpp
@@ -90,7 +90,6 @@ void HydraCore::runFrame() {
 	}
 
 	hid.updateInputs(emulator->getTicks());
-
 	emulator->runFrame();
 }
 
@@ -116,16 +115,14 @@ void HydraCore::resetContext() {
 	emulator->initGraphicsContext(nullptr);
 }
 
-void HydraCore::destroyContext() {}
-
+void HydraCore::destroyContext() { emulator.deinitGraphicsContext(); }
 void HydraCore::setFbo(unsigned handle) { renderer->setFBO(handle); }
-
 void HydraCore::setGetProcAddress(void* function) { getProcAddress = function; }
 
 void HydraCore::setPollInputCallback(void (*callback)()) { pollInputCallback = callback; }
 void HydraCore::setCheckButtonCallback(int32_t (*callback)(uint32_t player, hydra::ButtonType button)) { checkButtonCallback = callback; }
 
-HC_API hydra::IBase* createEmulator() { return new HydraCore; }
+HC_API hydra::IBase* createEmulator() { return new HydraCore(); }
 HC_API void destroyEmulator(hydra::IBase* emulator) { delete emulator; }
 
 HC_API const char* getInfo(hydra::InfoType type) {
@@ -145,4 +142,4 @@ HC_API const char* getInfo(hydra::InfoType type) {
 
 		default: return nullptr;
 	}
-}
\ No newline at end of file
+}

From f48359f6304aec1264ae3019b7e11d010f79a374 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 25 Oct 2023 23:23:31 +0300
Subject: [PATCH 007/162] Fix derp

---
 src/hydra_core.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hydra_core.cpp b/src/hydra_core.cpp
index 6d1a9a1d..3ecf7019 100644
--- a/src/hydra_core.cpp
+++ b/src/hydra_core.cpp
@@ -115,7 +115,7 @@ void HydraCore::resetContext() {
 	emulator->initGraphicsContext(nullptr);
 }
 
-void HydraCore::destroyContext() { emulator.deinitGraphicsContext(); }
+void HydraCore::destroyContext() { emulator->deinitGraphicsContext(); }
 void HydraCore::setFbo(unsigned handle) { renderer->setFBO(handle); }
 void HydraCore::setGetProcAddress(void* function) { getProcAddress = function; }
 

From d4a84c337e8afd4f49d3b125c78c3918cc537560 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:09:01 +0300
Subject: [PATCH 008/162] Fix forward declaration of SDL_Window

---
 include/emulator.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/emulator.hpp b/include/emulator.hpp
index 2b96b0cf..121c6b8d 100644
--- a/include/emulator.hpp
+++ b/include/emulator.hpp
@@ -23,7 +23,7 @@
 #include "gl/context.h"
 #endif
 
-class SDL_Window;
+struct SDL_Window;
 
 enum class ROMType {
 	None,

From 7e7d4f7f1611cbd3bbcef2ddf07a425142785308 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Tue, 24 Oct 2023 16:52:08 +0300
Subject: [PATCH 009/162] Make cheats struct more versatile

---
 include/cheats.hpp   |  7 ++++++-
 include/emulator.hpp |  1 +
 src/core/cheats.cpp  | 42 ++++++++++++++++++++++++++++++++++++++++--
 src/hydra_core.cpp   | 37 +++++++++++++++++++++++++++++++++++--
 4 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/include/cheats.hpp b/include/cheats.hpp
index c8d7c763..d995a883 100644
--- a/include/cheats.hpp
+++ b/include/cheats.hpp
@@ -12,17 +12,22 @@ class Memory;
 class Cheats {
   public:
 	enum class CheatType {
+		None,
 		ActionReplay,  // CTRPF cheats
 		// TODO: Other cheat devices and standards?
 	};
 
 	struct Cheat {
+		bool enabled;
 		CheatType type;
 		std::vector<u32> instructions;
 	};
 
 	Cheats(Memory& mem, HIDService& hid);
-	void addCheat(const Cheat& cheat);
+	uint32_t addCheat(const Cheat& cheat);
+	void removeCheat(uint32_t id);
+	void enableCheat(uint32_t id);
+	void disableCheat(uint32_t id);
 	void reset();
 	void run();
 
diff --git a/include/emulator.hpp b/include/emulator.hpp
index 121c6b8d..df930373 100644
--- a/include/emulator.hpp
+++ b/include/emulator.hpp
@@ -115,6 +115,7 @@ class Emulator {
 	void deinitGraphicsContext() { gpu.deinitGraphicsContext(); }
 
 	EmulatorConfig& getConfig() { return config; }
+	Cheats& getCheats() { return cheats; }
 	ServiceManager& getServiceManager() { return kernel.getServiceManager(); }
 	RendererType getRendererType() const { return config.rendererType; }
 	Renderer* getRenderer() { return gpu.getRenderer(); }
diff --git a/src/core/cheats.cpp b/src/core/cheats.cpp
index 618460c5..6841cdce 100644
--- a/src/core/cheats.cpp
+++ b/src/core/cheats.cpp
@@ -7,9 +7,45 @@ void Cheats::reset() {
 	ar.reset();  // Reset ActionReplay
 }
 
-void Cheats::addCheat(const Cheat& cheat) {
-	cheats.push_back(cheat);
+uint32_t Cheats::addCheat(const Cheat& cheat) {
 	cheatsLoaded = true;
+
+	// Find an empty slot if a cheat was previously removed
+	for (size_t i = 0; i < cheats.size(); i++) {
+		if (cheats[i].type == CheatType::None) {
+			cheats[i] = cheat;
+			return i;
+		}
+	}
+
+	// Otherwise, just add a new slot
+	cheats.push_back(cheat);
+	return cheats.size() - 1;
+}
+
+void Cheats::removeCheat(uint32_t id) {
+	if (id >= cheats.size()) return;
+
+	// Not using std::erase because we don't want to invalidate cheat IDs
+	cheats[id].type = CheatType::None;
+	cheats[id].instructions.clear();
+
+	// Check if no cheats are loaded
+	for (const auto& cheat : cheats) {
+		if (cheat.type != CheatType::None) return;
+	}
+
+	cheatsLoaded = false;
+}
+
+void Cheats::enableCheat(uint32_t id) {
+	if (id >= cheats.size()) return;
+	cheats[id].enabled = true;
+}
+
+void Cheats::disableCheat(uint32_t id) {
+	if (id >= cheats.size()) return;
+	cheats[id].enabled = false;
 }
 
 void Cheats::clear() {
@@ -19,6 +55,8 @@ void Cheats::clear() {
 
 void Cheats::run() {
 	for (const Cheat& cheat : cheats) {
+		if (!cheat.enabled) continue;
+
 		switch (cheat.type) {
 			case CheatType::ActionReplay: {
 				ar.runCheat(cheat.instructions);
diff --git a/src/hydra_core.cpp b/src/hydra_core.cpp
index 3ecf7019..1c711a02 100644
--- a/src/hydra_core.cpp
+++ b/src/hydra_core.cpp
@@ -4,8 +4,13 @@
 #include <stdexcept>
 
 #include "hydra_icon.hpp"
+#include "swap.hpp"
 
-class HC_GLOBAL HydraCore final : public hydra::IBase, public hydra::IOpenGlRendered, public hydra::IFrontendDriven, public hydra::IInput {
+class HC_GLOBAL HydraCore final : public hydra::IBase,
+								  public hydra::IOpenGlRendered,
+								  public hydra::IFrontendDriven,
+								  public hydra::IInput,
+								  public hydra::ICheat {
 	HYDRA_CLASS
   public:
 	HydraCore();
@@ -31,6 +36,12 @@ class HC_GLOBAL HydraCore final : public hydra::IBase, public hydra::IOpenGlRend
 	void setPollInputCallback(void (*callback)()) override;
 	void setCheckButtonCallback(int32_t (*callback)(uint32_t player, hydra::ButtonType button)) override;
 
+	// ICheat
+	uint32_t addCheat(const uint8_t* data, uint32_t size) override;
+	void removeCheat(uint32_t id) override;
+	void enableCheat(uint32_t id) override;
+	void disableCheat(uint32_t id) override;
+
 	std::unique_ptr<Emulator> emulator;
 	RendererGL* renderer;
 	void (*pollInputCallback)() = nullptr;
@@ -122,7 +133,29 @@ void HydraCore::setGetProcAddress(void* function) { getProcAddress = function; }
 void HydraCore::setPollInputCallback(void (*callback)()) { pollInputCallback = callback; }
 void HydraCore::setCheckButtonCallback(int32_t (*callback)(uint32_t player, hydra::ButtonType button)) { checkButtonCallback = callback; }
 
-HC_API hydra::IBase* createEmulator() { return new HydraCore(); }
+uint32_t HydraCore::addCheat(const uint8_t* data, uint32_t size) {
+	if ((size % 8) != 0) return hydra::BAD_CHEAT;
+
+	Cheats::Cheat cheat;
+	cheat.enabled = true;
+	cheat.type = Cheats::CheatType::ActionReplay;
+
+	for (uint32_t i = 0; i < size; i += 8) {
+		uint32_t first_word = Common::swap32(*reinterpret_cast<const uint32_t*>(data + i));
+		uint32_t second_word = Common::swap32(*reinterpret_cast<const uint32_t*>(data + i + 4));
+		cheat.instructions.insert(cheat.instructions.end(), {first_word, second_word});
+	}
+
+	return emulator->getCheats().addCheat(cheat);
+};
+
+void HydraCore::removeCheat(uint32_t id) { emulator->getCheats().removeCheat(id); }
+
+void HydraCore::enableCheat(uint32_t id) { emulator->getCheats().enableCheat(id); }
+
+void HydraCore::disableCheat(uint32_t id) { emulator->getCheats().disableCheat(id); }
+
+HC_API hydra::IBase* createEmulator() { return new HydraCore; }
 HC_API void destroyEmulator(hydra::IBase* emulator) { delete emulator; }
 
 HC_API const char* getInfo(hydra::InfoType type) {

From 8502cd92854985b3c52f6ff520153a5bdf8fbfd9 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 24 Oct 2023 22:07:45 +0300
Subject: [PATCH 010/162] Moar cheats

---
 include/cheats.hpp  |  8 ++++----
 src/core/cheats.cpp | 23 ++++++++++++++---------
 src/hydra_core.cpp  | 44 +++++++++++++++++++++++++-------------------
 3 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/include/cheats.hpp b/include/cheats.hpp
index d995a883..1ffa83b7 100644
--- a/include/cheats.hpp
+++ b/include/cheats.hpp
@@ -24,10 +24,10 @@ class Cheats {
 	};
 
 	Cheats(Memory& mem, HIDService& hid);
-	uint32_t addCheat(const Cheat& cheat);
-	void removeCheat(uint32_t id);
-	void enableCheat(uint32_t id);
-	void disableCheat(uint32_t id);
+	u32 addCheat(const Cheat& cheat);
+	void removeCheat(u32 id);
+	void enableCheat(u32 id);
+	void disableCheat(u32 id);
 	void reset();
 	void run();
 
diff --git a/src/core/cheats.cpp b/src/core/cheats.cpp
index 6841cdce..c359d432 100644
--- a/src/core/cheats.cpp
+++ b/src/core/cheats.cpp
@@ -7,7 +7,7 @@ void Cheats::reset() {
 	ar.reset();  // Reset ActionReplay
 }
 
-uint32_t Cheats::addCheat(const Cheat& cheat) {
+u32 Cheats::addCheat(const Cheat& cheat) {
 	cheatsLoaded = true;
 
 	// Find an empty slot if a cheat was previously removed
@@ -23,8 +23,10 @@ uint32_t Cheats::addCheat(const Cheat& cheat) {
 	return cheats.size() - 1;
 }
 
-void Cheats::removeCheat(uint32_t id) {
-	if (id >= cheats.size()) return;
+void Cheats::removeCheat(u32 id) {
+	if (id >= cheats.size()) {
+        return;
+    }
 
 	// Not using std::erase because we don't want to invalidate cheat IDs
 	cheats[id].type = CheatType::None;
@@ -38,14 +40,16 @@ void Cheats::removeCheat(uint32_t id) {
 	cheatsLoaded = false;
 }
 
-void Cheats::enableCheat(uint32_t id) {
-	if (id >= cheats.size()) return;
-	cheats[id].enabled = true;
+void Cheats::enableCheat(u32 id) {
+	if (id < cheats.size()) {
+	    cheats[id].enabled = true;
+    }
 }
 
-void Cheats::disableCheat(uint32_t id) {
-	if (id >= cheats.size()) return;
-	cheats[id].enabled = false;
+void Cheats::disableCheat(u32 id) {
+	if (id < cheats.size()) {
+	    cheats[id].enabled = false;
+    }
 }
 
 void Cheats::clear() {
@@ -63,6 +67,7 @@ void Cheats::run() {
 				break;
 			}
 
+            case CheatType::None: break;
 			default: Helpers::panic("Unknown cheat device!");
 		}
 	}
diff --git a/src/hydra_core.cpp b/src/hydra_core.cpp
index 1c711a02..25cecafc 100644
--- a/src/hydra_core.cpp
+++ b/src/hydra_core.cpp
@@ -30,17 +30,17 @@ class HC_GLOBAL HydraCore final : public hydra::IBase,
 
 	// IFrontendDriven
 	void runFrame() override;
-	uint16_t getFps() override;
+	u16 getFps() override;
 
 	// IInput
 	void setPollInputCallback(void (*callback)()) override;
-	void setCheckButtonCallback(int32_t (*callback)(uint32_t player, hydra::ButtonType button)) override;
+	void setCheckButtonCallback(s32 (*callback)(u32 player, hydra::ButtonType button)) override;
 
 	// ICheat
-	uint32_t addCheat(const uint8_t* data, uint32_t size) override;
-	void removeCheat(uint32_t id) override;
-	void enableCheat(uint32_t id) override;
-	void disableCheat(uint32_t id) override;
+	u32 addCheat(const u8* data, u32 size) override;
+	void removeCheat(u32 id) override;
+	void enableCheat(u32 id) override;
+	void disableCheat(u32 id) override;
 
 	std::unique_ptr<Emulator> emulator;
 	RendererGL* renderer;
@@ -104,7 +104,7 @@ void HydraCore::runFrame() {
 	emulator->runFrame();
 }
 
-uint16_t HydraCore::getFps() { return 60; }
+u16 HydraCore::getFps() { return 60; }
 
 void HydraCore::reset() { emulator->reset(Emulator::ReloadOption::Reload); }
 hydra::Size HydraCore::getNativeSize() { return {400, 480}; }
@@ -131,29 +131,35 @@ void HydraCore::setFbo(unsigned handle) { renderer->setFBO(handle); }
 void HydraCore::setGetProcAddress(void* function) { getProcAddress = function; }
 
 void HydraCore::setPollInputCallback(void (*callback)()) { pollInputCallback = callback; }
-void HydraCore::setCheckButtonCallback(int32_t (*callback)(uint32_t player, hydra::ButtonType button)) { checkButtonCallback = callback; }
+void HydraCore::setCheckButtonCallback(s32 (*callback)(u32 player, hydra::ButtonType button)) { checkButtonCallback = callback; }
 
-uint32_t HydraCore::addCheat(const uint8_t* data, uint32_t size) {
-	if ((size % 8) != 0) return hydra::BAD_CHEAT;
+u32 HydraCore::addCheat(const u8* data, u32 size) {
+	// Every 3DS cheat is a multiple of 64 bits == 8 bytes
+    if ((size % 8) != 0) {
+        return hydra::BAD_CHEAT;
+    }
 
 	Cheats::Cheat cheat;
 	cheat.enabled = true;
 	cheat.type = Cheats::CheatType::ActionReplay;
 
-	for (uint32_t i = 0; i < size; i += 8) {
-		uint32_t first_word = Common::swap32(*reinterpret_cast<const uint32_t*>(data + i));
-		uint32_t second_word = Common::swap32(*reinterpret_cast<const uint32_t*>(data + i + 4));
-		cheat.instructions.insert(cheat.instructions.end(), {first_word, second_word});
+	for (u32 i = 0; i < size; i += 8) {
+        auto read32 = [](const u8* ptr) {
+            return (u32(ptr[3]) << 24) | (u32(ptr[2]) << 16) | (u32(ptr[1]) << 8) | u32(ptr[0]);
+        };
+
+        // Data is passed to us in big endian so we bswap
+		u32 firstWord = Common::swap32(read32(data + i));
+		u32 secondWord = Common::swap32(read32(data + i + 4));
+		cheat.instructions.insert(cheat.instructions.end(), {firstWord, secondWord});
 	}
 
 	return emulator->getCheats().addCheat(cheat);
 };
 
-void HydraCore::removeCheat(uint32_t id) { emulator->getCheats().removeCheat(id); }
-
-void HydraCore::enableCheat(uint32_t id) { emulator->getCheats().enableCheat(id); }
-
-void HydraCore::disableCheat(uint32_t id) { emulator->getCheats().disableCheat(id); }
+void HydraCore::removeCheat(u32 id) { emulator->getCheats().removeCheat(id); }
+void HydraCore::enableCheat(u32 id) { emulator->getCheats().enableCheat(id); }
+void HydraCore::disableCheat(u32 id) { emulator->getCheats().disableCheat(id); }
 
 HC_API hydra::IBase* createEmulator() { return new HydraCore; }
 HC_API void destroyEmulator(hydra::IBase* emulator) { delete emulator; }

From f9228707854b71958d6804de63a7960757d18304 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 24 Oct 2023 22:10:40 +0300
Subject: [PATCH 011/162] format

---
 include/cheats.hpp  |  3 +--
 src/core/cheats.cpp | 14 +++++++-------
 src/hydra_core.cpp  | 12 +++++-------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/include/cheats.hpp b/include/cheats.hpp
index 1ffa83b7..59e88e7a 100644
--- a/include/cheats.hpp
+++ b/include/cheats.hpp
@@ -12,9 +12,8 @@ class Memory;
 class Cheats {
   public:
 	enum class CheatType {
-		None,
+		None,          // Cheat has been removed by the frontend or is invalid
 		ActionReplay,  // CTRPF cheats
-		// TODO: Other cheat devices and standards?
 	};
 
 	struct Cheat {
diff --git a/src/core/cheats.cpp b/src/core/cheats.cpp
index c359d432..83e7cdc4 100644
--- a/src/core/cheats.cpp
+++ b/src/core/cheats.cpp
@@ -25,8 +25,8 @@ u32 Cheats::addCheat(const Cheat& cheat) {
 
 void Cheats::removeCheat(u32 id) {
 	if (id >= cheats.size()) {
-        return;
-    }
+		return;
+	}
 
 	// Not using std::erase because we don't want to invalidate cheat IDs
 	cheats[id].type = CheatType::None;
@@ -42,14 +42,14 @@ void Cheats::removeCheat(u32 id) {
 
 void Cheats::enableCheat(u32 id) {
 	if (id < cheats.size()) {
-	    cheats[id].enabled = true;
-    }
+		cheats[id].enabled = true;
+	}
 }
 
 void Cheats::disableCheat(u32 id) {
 	if (id < cheats.size()) {
-	    cheats[id].enabled = false;
-    }
+		cheats[id].enabled = false;
+	}
 }
 
 void Cheats::clear() {
@@ -67,7 +67,7 @@ void Cheats::run() {
 				break;
 			}
 
-            case CheatType::None: break;
+			case CheatType::None: break;
 			default: Helpers::panic("Unknown cheat device!");
 		}
 	}
diff --git a/src/hydra_core.cpp b/src/hydra_core.cpp
index 25cecafc..b7c084e2 100644
--- a/src/hydra_core.cpp
+++ b/src/hydra_core.cpp
@@ -135,20 +135,18 @@ void HydraCore::setCheckButtonCallback(s32 (*callback)(u32 player, hydra::Button
 
 u32 HydraCore::addCheat(const u8* data, u32 size) {
 	// Every 3DS cheat is a multiple of 64 bits == 8 bytes
-    if ((size % 8) != 0) {
-        return hydra::BAD_CHEAT;
-    }
+	if ((size % 8) != 0) {
+		return hydra::BAD_CHEAT;
+	}
 
 	Cheats::Cheat cheat;
 	cheat.enabled = true;
 	cheat.type = Cheats::CheatType::ActionReplay;
 
 	for (u32 i = 0; i < size; i += 8) {
-        auto read32 = [](const u8* ptr) {
-            return (u32(ptr[3]) << 24) | (u32(ptr[2]) << 16) | (u32(ptr[1]) << 8) | u32(ptr[0]);
-        };
+		auto read32 = [](const u8* ptr) { return (u32(ptr[3]) << 24) | (u32(ptr[2]) << 16) | (u32(ptr[1]) << 8) | u32(ptr[0]); };
 
-        // Data is passed to us in big endian so we bswap
+		// Data is passed to us in big endian so we bswap
 		u32 firstWord = Common::swap32(read32(data + i));
 		u32 secondWord = Common::swap32(read32(data + i + 4));
 		cheat.instructions.insert(cheat.instructions.end(), {firstWord, secondWord});

From 1c501aceef28e306ca11f40a2513785e561f5bba Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Thu, 26 Oct 2023 12:12:05 +0300
Subject: [PATCH 012/162] Cheats: Default to enabled + CTRPF

---
 include/cheats.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/cheats.hpp b/include/cheats.hpp
index 59e88e7a..2be25827 100644
--- a/include/cheats.hpp
+++ b/include/cheats.hpp
@@ -17,8 +17,8 @@ class Cheats {
 	};
 
 	struct Cheat {
-		bool enabled;
-		CheatType type;
+		bool enabled = true;
+		CheatType type = CheatType::ActionReplay;
 		std::vector<u32> instructions;
 	};
 
@@ -37,4 +37,4 @@ class Cheats {
 	ActionReplay ar;  // An ActionReplay cheat machine for executing CTRPF codes
 	std::vector<Cheat> cheats;
 	bool cheatsLoaded = false;
-};
\ No newline at end of file
+};

From 8b6008e1964db5cf65221308be8667b525c217c4 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 30 Oct 2023 00:15:13 +0200
Subject: [PATCH 013/162] Fix new syntax

---
 src/hydra_core.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hydra_core.cpp b/src/hydra_core.cpp
index b7c084e2..d67ffe2f 100644
--- a/src/hydra_core.cpp
+++ b/src/hydra_core.cpp
@@ -159,7 +159,7 @@ void HydraCore::removeCheat(u32 id) { emulator->getCheats().removeCheat(id); }
 void HydraCore::enableCheat(u32 id) { emulator->getCheats().enableCheat(id); }
 void HydraCore::disableCheat(u32 id) { emulator->getCheats().disableCheat(id); }
 
-HC_API hydra::IBase* createEmulator() { return new HydraCore; }
+HC_API hydra::IBase* createEmulator() { return new HydraCore(); }
 HC_API void destroyEmulator(hydra::IBase* emulator) { delete emulator; }
 
 HC_API const char* getInfo(hydra::InfoType type) {

From 8d5485fbeb60023e9c0c8823d3603ee032cd3103 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 30 Oct 2023 20:20:47 +0200
Subject: [PATCH 014/162] [Qt] Add proper message queue for thread
 communication

---
 include/panda_qt/main_window.hpp | 31 ++++++++++++++++---
 src/panda_qt/main_window.cpp     | 51 +++++++++++++++++++++-----------
 2 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp
index b5b93d56..0187b424 100644
--- a/include/panda_qt/main_window.hpp
+++ b/include/panda_qt/main_window.hpp
@@ -9,9 +9,11 @@
 #include <filesystem>
 #include <mutex>
 #include <thread>
+#include <vector>
 
 #include "emulator.hpp"
 #include "panda_qt/screen.hpp"
+#include "services/hid.hpp"
 
 class MainWindow : public QMainWindow {
 	Q_OBJECT
@@ -23,15 +25,34 @@ class MainWindow : public QMainWindow {
 		Dark = 2,
 	};
 
+	// Types of messages we might send from the GUI thread to the emulator thread
+	enum class MessageType {
+		LoadROM, Reset, Pause, Resume, TogglePause, DumpRomFS, PressKey, ReleaseKey
+	};
+
+	// Tagged union representing our message queue messages
+	struct EmulatorMessage {
+		MessageType type;
+
+		union {
+			struct {
+				std::filesystem::path* p;
+			} path;
+
+			struct {
+				u32 key;
+			} key;
+		};
+	};
+
 	// This would normally be an std::unique_ptr but it's shared between threads so definitely not
 	Emulator* emu = nullptr;
 	std::thread emuThread;
 
 	std::atomic<bool> appRunning = true; // Is the application itself running?
-	std::mutex messageQueueMutex; // Used for synchronizing messages between the emulator and UI
-	std::filesystem::path romToLoad = "";
-
-	bool needToLoadROM = false;
+	// Used for synchronizing messages between the emulator and UI
+	std::mutex messageQueueMutex;
+	std::vector<EmulatorMessage> messageQueue;
 
 	ScreenWidget screen;
 	QComboBox* themeSelect = nullptr;
@@ -43,6 +64,8 @@ class MainWindow : public QMainWindow {
 	void emuThreadMainLoop();
 	void selectROM();
 	void dumpRomFS();
+	void sendMessage(const EmulatorMessage& message);
+	void dispatchMessage(const EmulatorMessage& message);
 
 	// Tracks whether we are using an OpenGL-backed renderer or a Vulkan-backed renderer
 	bool usingGL = false;
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index 2c2cc64f..8ffaf7b6 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -73,13 +73,13 @@ void MainWindow::emuThreadMainLoop() {
 		{
 			std::unique_lock lock(messageQueueMutex);
 
-			if (needToLoadROM) {
-				needToLoadROM = false;
-
-				bool success = emu->loadROM(romToLoad);
-				if (!success) {
-					printf("Failed to load ROM");
+			// Dispatch all messages in the message queue
+			if (!messageQueue.empty()) {
+				for (const auto& msg : messageQueue) {
+					dispatchMessage(msg);
 				}
+
+				messageQueue.clear();
 			}
 		}
 
@@ -102,23 +102,15 @@ void MainWindow::swapEmuBuffer() {
 }
 
 void MainWindow::selectROM() {
-	// Are we already waiting for a ROM to be loaded? Then complain about it!
-	{
-		std::unique_lock lock(messageQueueMutex);
-		if (needToLoadROM) {
-			QMessageBox::warning(this, tr("Already loading ROM"), tr("Panda3DS is already busy loading a ROM, please wait"));
-			return;
-		}
-	}
-
 	auto path =
 		QFileDialog::getOpenFileName(this, tr("Select 3DS ROM to load"), "", tr("Nintendo 3DS ROMs (*.3ds *.cci *.cxi *.app *.3dsx *.elf *.axf)"));
 
 	if (!path.isEmpty()) {
-		std::unique_lock lock(messageQueueMutex);
+		std::filesystem::path* p = new std::filesystem::path(path.toStdU16String());
 
-		romToLoad = path.toStdU16String();
-		needToLoadROM = true;
+		EmulatorMessage message{.type = MessageType::LoadROM};
+		message.path.p = p;
+		sendMessage(message);
 	}
 }
 
@@ -135,6 +127,12 @@ MainWindow::~MainWindow() {
 	delete themeSelect;
 }
 
+// Send a message to the emulator thread. Lock the mutex and just push back to the vector.
+void MainWindow::sendMessage(const EmulatorMessage& message) {
+	std::unique_lock lock(messageQueueMutex);
+	messageQueue.push_back(message);
+}
+
 void MainWindow::setTheme(Theme theme) {
 	currentTheme = theme;
 
@@ -225,4 +223,21 @@ void MainWindow::dumpRomFS() {
 			QMessageBox::warning(this, tr("No RomFS found"), tr("No RomFS partition was found in the loaded app"));
 			break;
 	}
+}
+
+void MainWindow::dispatchMessage(const EmulatorMessage& message) {
+	switch (message.type) {
+		case MessageType::LoadROM:
+			emu->loadROM(*message.path.p);
+			// Clean up the allocated path
+			delete message.path.p;
+			break;
+
+		case MessageType::Pause: emu->pause(); break;
+		case MessageType::Resume: emu->resume(); break;
+		case MessageType::TogglePause: emu->togglePause(); break;
+		case MessageType::Reset: emu->reset(Emulator::ReloadOption::Reload); break;
+		case MessageType::PressKey: emu->getServiceManager().getHID().pressKey(message.key.key); break;
+		case MessageType::ReleaseKey: emu->getServiceManager().getHID().releaseKey(message.key.key); break;
+	}
 }
\ No newline at end of file

From a36fd6dd57bc45778290027af7a9eff0d9c1cb8f Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 30 Oct 2023 20:41:09 +0200
Subject: [PATCH 015/162] [Qt] Add basic input

---
 include/panda_qt/main_window.hpp |  3 ++
 src/panda_qt/main_window.cpp     | 56 ++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp
index 0187b424..f9eb4f63 100644
--- a/include/panda_qt/main_window.hpp
+++ b/include/panda_qt/main_window.hpp
@@ -74,4 +74,7 @@ class MainWindow : public QMainWindow {
   public:
 	MainWindow(QApplication* app, QWidget* parent = nullptr);
 	~MainWindow();
+
+	void keyPressEvent(QKeyEvent* event) override;
+	void keyReleaseEvent(QKeyEvent* event) override;
 };
\ No newline at end of file
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index 8ffaf7b6..8b70c04c 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -240,4 +240,60 @@ void MainWindow::dispatchMessage(const EmulatorMessage& message) {
 		case MessageType::PressKey: emu->getServiceManager().getHID().pressKey(message.key.key); break;
 		case MessageType::ReleaseKey: emu->getServiceManager().getHID().releaseKey(message.key.key); break;
 	}
+}
+
+void MainWindow::keyPressEvent(QKeyEvent* event) {
+	auto pressKey = [this](u32 key) {
+		EmulatorMessage message{.type = MessageType::PressKey};
+		message.key.key = key;
+
+		sendMessage(message);
+	};
+
+	switch (event->key()) {
+		case Qt::Key_L: pressKey(HID::Keys::A); break;
+		case Qt::Key_K: pressKey(HID::Keys::B); break;
+		case Qt::Key_O: pressKey(HID::Keys::X); break;
+		case Qt::Key_I: pressKey(HID::Keys::Y); break;
+
+		case Qt::Key_Q: pressKey(HID::Keys::L); break;
+		case Qt::Key_P: pressKey(HID::Keys::R); break;
+
+		case Qt::Key_Right: pressKey(HID::Keys::Right); break;
+		case Qt::Key_Left: pressKey(HID::Keys::Left); break;
+		case Qt::Key_Up: pressKey(HID::Keys::Up); break;
+		case Qt::Key_Down: pressKey(HID::Keys::Down); break;
+
+		case Qt::Key_Return: pressKey(HID::Keys::Start); break;
+		case Qt::Key_Backspace: pressKey(HID::Keys::Select); break;
+		case Qt::Key_F4: sendMessage(EmulatorMessage{.type = MessageType::TogglePause}); break;
+		case Qt::Key_F5: sendMessage(EmulatorMessage{.type = MessageType::Reset}); break;
+	}
+}
+
+void MainWindow::keyReleaseEvent(QKeyEvent* event) {
+	auto releaseKey = [this](u32 key) {
+		EmulatorMessage message{.type = MessageType::ReleaseKey};
+		message.key.key = key;
+
+		sendMessage(message);
+	};
+
+	switch (event->key()) {
+		case Qt::Key_L: releaseKey(HID::Keys::A); break;
+		case Qt::Key_K: releaseKey(HID::Keys::B); break;
+		case Qt::Key_O: releaseKey(HID::Keys::X); break;
+		case Qt::Key_I: releaseKey(HID::Keys::Y); break;
+
+		case Qt::Key_Q: releaseKey(HID::Keys::L); break;
+		case Qt::Key_P: releaseKey(HID::Keys::R); break;
+
+		case Qt::Key_Right: releaseKey(HID::Keys::Right); break;
+		case Qt::Key_Left: releaseKey(HID::Keys::Left); break;
+		case Qt::Key_Up: releaseKey(HID::Keys::Up); break;
+		case Qt::Key_Down: releaseKey(HID::Keys::Down); break;
+
+		case Qt::Key_Return: releaseKey(HID::Keys::Start); break;
+		case Qt::Key_Backspace: releaseKey(HID::Keys::Select); break;
+	}
 }
\ No newline at end of file

From 9bbaab78712feceb161ae2319aad448b89aad72b Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 30 Oct 2023 20:46:11 +0200
Subject: [PATCH 016/162] [Qt] Add Pause/Resume/Reset

---
 src/panda_qt/main_window.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index 8b70c04c..ab717087 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -27,6 +27,13 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 	auto pandaAction = fileMenu->addAction(tr("panda..."));
 	connect(pandaAction, &QAction::triggered, this, &MainWindow::selectROM);
 
+	auto pauseAction = emulationMenu->addAction(tr("Pause"));
+	auto resumeAction = emulationMenu->addAction(tr("Resume"));
+	auto resetAction = emulationMenu->addAction(tr("Reset"));
+	connect(pauseAction, &QAction::triggered, this, [this]() { sendMessage(EmulatorMessage{.type = MessageType::Pause}); });
+	connect(resumeAction, &QAction::triggered, this, [this]() { sendMessage(EmulatorMessage{.type = MessageType::Resume}); });
+	connect(resetAction, &QAction::triggered, this, [this]() { sendMessage(EmulatorMessage{.type = MessageType::Reset}); });
+
 	auto dumpRomFSAction = toolsMenu->addAction(tr("Dump RomFS"));
 	connect(dumpRomFSAction, &QAction::triggered, this, &MainWindow::dumpRomFS);
 

From b0261234a6a541fed677b2a8a995ce39bd2d5567 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 30 Oct 2023 20:53:41 +0200
Subject: [PATCH 017/162] [Qt] Properly update HID service

---
 include/emulator.hpp         | 2 ++
 src/panda_qt/main_window.cpp | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/include/emulator.hpp b/include/emulator.hpp
index df930373..2da76847 100644
--- a/include/emulator.hpp
+++ b/include/emulator.hpp
@@ -52,12 +52,14 @@ class Emulator {
 	// We bind gyro to right click + mouse movement
 	bool holdingRightClick = false;
 
+  public:
 	static constexpr u32 width = 400;
 	static constexpr u32 height = 240 * 2;  // * 2 because 2 screens
 	ROMType romType = ROMType::None;
 	bool running = false;         // Is the emulator running a game?
 	bool programRunning = false;  // Is the emulator program itself running?
 
+  private:
 #ifdef PANDA3DS_ENABLE_HTTP_SERVER
 	HttpServer httpServer;
 	friend struct HttpServer;
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index ab717087..adfd3470 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -91,6 +91,10 @@ void MainWindow::emuThreadMainLoop() {
 		}
 
 		emu->runFrame();
+		if (emu->romType != ROMType::None) {
+			emu->getServiceManager().getHID().updateInputs(emu->getTicks());
+		}
+
 		swapEmuBuffer();
 	}
 

From 7571e58ce5aa7043de0e1a5ee4a2baa30f935301 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 30 Oct 2023 21:14:03 +0200
Subject: [PATCH 018/162] [Qt] Add pink theme

---
 include/panda_qt/main_window.hpp |  1 +
 src/panda_qt/main_window.cpp     | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp
index f9eb4f63..31fb1e0d 100644
--- a/include/panda_qt/main_window.hpp
+++ b/include/panda_qt/main_window.hpp
@@ -23,6 +23,7 @@ class MainWindow : public QMainWindow {
 		System = 0,
 		Light = 1,
 		Dark = 2,
+		GreetingsCat = 3,
 	};
 
 	// Types of messages we might send from the GUI thread to the emulator thread
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index adfd3470..33e27a0d 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -43,6 +43,7 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 	themeSelect->addItem(tr("System"));
 	themeSelect->addItem(tr("Light"));
 	themeSelect->addItem(tr("Dark"));
+	themeSelect->addItem(tr("Greetings Cat"));
 	themeSelect->setCurrentIndex(static_cast<int>(currentTheme));
 
 	themeSelect->setGeometry(40, 40, 100, 50);
@@ -192,6 +193,29 @@ void MainWindow::setTheme(Theme theme) {
 			break;
 		}
 
+		case Theme::GreetingsCat: {
+			QApplication::setStyle(QStyleFactory::create("Fusion"));
+
+			QPalette p;
+			p.setColor(QPalette::Window, QColor(250, 207, 228));
+			p.setColor(QPalette::WindowText, QColor(225, 22, 137));
+			p.setColor(QPalette::Base, QColor(250, 207, 228));
+			p.setColor(QPalette::AlternateBase, QColor(250, 207, 228));
+			p.setColor(QPalette::ToolTipBase, QColor(225, 22, 137));
+			p.setColor(QPalette::ToolTipText, QColor(225, 22, 137));
+			p.setColor(QPalette::Text, QColor(225, 22, 137));
+			p.setColor(QPalette::Button, QColor(250, 207, 228));
+			p.setColor(QPalette::ButtonText, QColor(225, 22, 137));
+			p.setColor(QPalette::BrightText, Qt::black);
+			p.setColor(QPalette::Link, QColor(42, 130, 218));
+
+			p.setColor(QPalette::Highlight, QColor(42, 130, 218));
+			p.setColor(QPalette::HighlightedText, Qt::black);
+			qApp->setPalette(p);
+			break;
+		}
+
+
 		case Theme::System: {
 			qApp->setPalette(this->style()->standardPalette());
 			qApp->setStyle(QStyleFactory::create("WindowsVista"));

From 1769783dc7e10358c5c34650f34375c9295a674f Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 30 Oct 2023 22:49:32 +0200
Subject: [PATCH 019/162] Add about menu

---
 CMakeLists.txt                    |   6 +--
 docs/img/rstarstruck_icon.png     | Bin 0 -> 9132 bytes
 include/panda_qt/about_window.hpp |  12 ++++++
 include/panda_qt/main_window.hpp  |   3 ++
 src/panda_qt/about_window.cpp     |  62 ++++++++++++++++++++++++++++++
 src/panda_qt/main_window.cpp      |  14 ++++++-
 6 files changed, 92 insertions(+), 5 deletions(-)
 create mode 100644 docs/img/rstarstruck_icon.png
 create mode 100644 include/panda_qt/about_window.hpp
 create mode 100644 src/panda_qt/about_window.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a718fbb..c202f80c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,8 +185,8 @@ set(RENDERER_SW_SOURCE_FILES src/core/renderer_sw/renderer_sw.cpp)
 
 # Frontend source files
 if(ENABLE_QT_GUI)
-    set(FRONTEND_SOURCE_FILES src/panda_qt/main.cpp src/panda_qt/screen.cpp src/panda_qt/main_window.cpp)
-    set(FRONTEND_HEADER_FILES include/panda_qt/screen.hpp include/panda_qt/main_window.hpp)
+    set(FRONTEND_SOURCE_FILES src/panda_qt/main.cpp src/panda_qt/screen.cpp src/panda_qt/main_window.cpp src/panda_qt/about_window.cpp)
+    set(FRONTEND_HEADER_FILES include/panda_qt/screen.hpp include/panda_qt/main_window.hpp include/panda_qt/about_window.hpp)
 
     source_group("Source Files\\Qt" FILES ${FRONTEND_SOURCE_FILES})
     source_group("Header Files\\Qt" FILES ${FRONTEND_HEADER_FILES})
@@ -429,7 +429,7 @@ if(ENABLE_QT_GUI)
     qt_add_resources(Alber "app_images"
         PREFIX "/"
         FILES
-            docs/img/rsob_icon.png
+            docs/img/rsob_icon.png docs/img/rstarstruck_icon.png
     )
 else()
     target_compile_definitions(Alber PUBLIC "PANDA3DS_FRONTEND_SDL=1")
diff --git a/docs/img/rstarstruck_icon.png b/docs/img/rstarstruck_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b4aab062193120af369718fe3810c690e14ad83
GIT binary patch
literal 9132
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

literal 0
HcmV?d00001

diff --git a/include/panda_qt/about_window.hpp b/include/panda_qt/about_window.hpp
new file mode 100644
index 00000000..78812d14
--- /dev/null
+++ b/include/panda_qt/about_window.hpp
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <QApplication>
+#include <QDialog>
+#include <QWidget>
+
+class AboutWindow : public QDialog {
+	Q_OBJECT
+
+  public:
+	AboutWindow(QWidget* parent = nullptr);
+};
\ No newline at end of file
diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp
index 31fb1e0d..a50ee9a1 100644
--- a/include/panda_qt/main_window.hpp
+++ b/include/panda_qt/main_window.hpp
@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "emulator.hpp"
+#include "panda_qt/about_window.hpp"
 #include "panda_qt/screen.hpp"
 #include "services/hid.hpp"
 
@@ -56,6 +57,7 @@ class MainWindow : public QMainWindow {
 	std::vector<EmulatorMessage> messageQueue;
 
 	ScreenWidget screen;
+	AboutWindow* aboutWindow;
 	QComboBox* themeSelect = nullptr;
 	QMenuBar* menuBar = nullptr;
 
@@ -65,6 +67,7 @@ class MainWindow : public QMainWindow {
 	void emuThreadMainLoop();
 	void selectROM();
 	void dumpRomFS();
+	void showAboutMenu();
 	void sendMessage(const EmulatorMessage& message);
 	void dispatchMessage(const EmulatorMessage& message);
 
diff --git a/src/panda_qt/about_window.cpp b/src/panda_qt/about_window.cpp
new file mode 100644
index 00000000..6f799c23
--- /dev/null
+++ b/src/panda_qt/about_window.cpp
@@ -0,0 +1,62 @@
+#include "panda_qt/about_window.hpp"
+
+#include <QLabel>
+#include <QTextEdit>
+#include <QVBoxLayout>
+#include <QtGlobal>
+
+// Based on https://github.com/dolphin-emu/dolphin/blob/master/Source/Core/DolphinQt/AboutDialog.cpp
+
+AboutWindow::AboutWindow(QWidget* parent) : QDialog(parent) {
+	resize(200, 200);
+
+	setWindowTitle(tr("About Panda3DS"));
+	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
+	const QString text =
+		QStringLiteral(R"(
+<p style='font-size:38pt; font-weight:400;'>Panda3DS</p>
+
+<p>
+%ABOUT_PANDA3DS%<br>
+<a href='https://panda3ds.com/'>%SUPPORT%</a><br>
+</p>
+
+<p>
+<a>%AUTHORS%</a>
+</p>
+)")
+			.replace(QStringLiteral("%ABOUT_PANDA3DS%"), tr("Panda3DS is a free and open source Nintendo 3DS emulator, for Windows, MacOS and Linux"))
+			.replace(QStringLiteral("%SUPPORT%"), tr("Visit panda3ds.com for help with Panda3DS and links to our official support sites."))
+			.replace(
+				QStringLiteral("%AUTHORS%"), tr("Panda3DS is developed by volunteers in their spare time. Below is a list of some of these"
+												" volunteers who've agreed to be listed here, in no particular order.<br>If you think you should be "
+												"listed here too, please inform us<br><br>"
+												"- Peach (wheremyfoodat)<br>"
+												"- noumidev<br>"
+												"- liuk707<br>"
+												"- Wunk<br>"
+												"- marysaka<br>"
+												"- Sky<br>"
+												"- merryhime<br>"
+												"- TGP17<br>")
+			);
+
+	QLabel* textLabel = new QLabel(text);
+	textLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
+	textLabel->setOpenExternalLinks(true);
+
+	QLabel* logo = new QLabel();
+	logo->setPixmap(QPixmap(":/docs/img/rstarstruck_icon.png"));
+	logo->setContentsMargins(30, 0, 30, 0);
+
+	QVBoxLayout* mainLayout = new QVBoxLayout;
+	QHBoxLayout* hLayout = new QHBoxLayout;
+
+	setLayout(mainLayout);
+	mainLayout->addLayout(hLayout);
+
+	hLayout->setAlignment(Qt::AlignLeft);
+	hLayout->addWidget(logo);
+	hLayout->addWidget(textLabel);
+}
\ No newline at end of file
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index 33e27a0d..804dc63a 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -20,7 +20,6 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 	auto fileMenu = menuBar->addMenu(tr("File"));
 	auto emulationMenu = menuBar->addMenu(tr("Emulation"));
 	auto toolsMenu = menuBar->addMenu(tr("Tools"));
-	auto helpMenu = menuBar->addMenu(tr("Help"));
 	auto aboutMenu = menuBar->addMenu(tr("About"));
 
 	// Create and bind actions for them
@@ -37,6 +36,9 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 	auto dumpRomFSAction = toolsMenu->addAction(tr("Dump RomFS"));
 	connect(dumpRomFSAction, &QAction::triggered, this, &MainWindow::dumpRomFS);
 
+	auto aboutAction = aboutMenu->addAction(tr("About Panda3DS"));
+	connect(aboutAction, &QAction::triggered, this, &MainWindow::showAboutMenu);
+
 	// Set up theme selection
 	setTheme(Theme::Dark);
 	themeSelect = new QComboBox(this);
@@ -50,6 +52,9 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 	themeSelect->show();
 	connect(themeSelect, &QComboBox::currentIndexChanged, this, [&](int index) { setTheme(static_cast<Theme>(index)); });
 
+	// Set up misc objects
+	aboutWindow = new AboutWindow(nullptr);
+
 	emu = new Emulator();
 	emu->setOutputSize(screen.surfaceWidth, screen.surfaceHeight);
 
@@ -136,6 +141,7 @@ MainWindow::~MainWindow() {
 
 	delete emu;
 	delete menuBar;
+	delete aboutWindow;
 	delete themeSelect;
 }
 
@@ -215,7 +221,6 @@ void MainWindow::setTheme(Theme theme) {
 			break;
 		}
 
-
 		case Theme::System: {
 			qApp->setPalette(this->style()->standardPalette());
 			qApp->setStyle(QStyleFactory::create("WindowsVista"));
@@ -260,6 +265,11 @@ void MainWindow::dumpRomFS() {
 	}
 }
 
+void MainWindow::showAboutMenu() {
+	AboutWindow about(this);
+	about.exec();
+}
+
 void MainWindow::dispatchMessage(const EmulatorMessage& message) {
 	switch (message.type) {
 		case MessageType::LoadROM:

From f2b7f14dcd604ec6dbe1092e02c70cca4c9ad4ac Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 31 Oct 2023 19:33:14 +0200
Subject: [PATCH 020/162] [Qt] Fix up about window

---
 src/panda_qt/about_window.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/panda_qt/about_window.cpp b/src/panda_qt/about_window.cpp
index 6f799c23..67767198 100644
--- a/src/panda_qt/about_window.cpp
+++ b/src/panda_qt/about_window.cpp
@@ -39,7 +39,8 @@ AboutWindow::AboutWindow(QWidget* parent) : QDialog(parent) {
 												"- marysaka<br>"
 												"- Sky<br>"
 												"- merryhime<br>"
-												"- TGP17<br>")
+												"- TGP17<br>"
+												"- Shadow<br>")
 			);
 
 	QLabel* textLabel = new QLabel(text);

From 5a2e554a6ca5c1de95ff57150509813fb2e8c237 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 31 Oct 2023 23:51:34 +0200
Subject: [PATCH 021/162] Make incomplete framebuffers warn instead of panic

---
 include/renderer_gl/surfaces.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/renderer_gl/surfaces.hpp b/include/renderer_gl/surfaces.hpp
index 1c2976d6..15304a7a 100644
--- a/include/renderer_gl/surfaces.hpp
+++ b/include/renderer_gl/surfaces.hpp
@@ -48,7 +48,7 @@ struct ColourBuffer {
 		fbo.bind(OpenGL::DrawAndReadFramebuffer);
 
 		if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
-			Helpers::panic("Incomplete framebuffer");
+			Helpers::warn("ColourBuffer: Incomplete framebuffer");
 		}
 
 		// TODO: This should not clear the framebuffer contents. It should load them from VRAM.

From 171733870d6884d279ba7070b5b303a89d10bfcd Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 1 Nov 2023 22:49:50 +0200
Subject: [PATCH 022/162] Add Y2R::GetStandardCoefficientParams

---
 include/services/y2r.hpp  | 11 +++++++++++
 src/core/services/y2r.cpp | 23 ++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/include/services/y2r.hpp b/include/services/y2r.hpp
index 17ceaafa..3fe56f36 100644
--- a/include/services/y2r.hpp
+++ b/include/services/y2r.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <array>
 #include <optional>
 #include "helpers.hpp"
 #include "kernel_types.hpp"
@@ -50,6 +51,15 @@ class Y2RService {
 		Block8x8 = 1, // Output buffer's pixels are morton swizzled. Used when outputting to a GPU texture.
 	};
 
+	// https://github.com/citra-emu/citra/blob/ac9d72a95ca9a60de8d39484a14aecf489d6d016/src/core/hle/service/cam/y2r_u.cpp#L33
+	using CoefficientSet = std::array<s16, 8>;
+	static constexpr std::array<CoefficientSet, 4> standardCoefficients{{
+		{{0x100, 0x166, 0xB6, 0x58, 0x1C5, -0x166F, 0x10EE, -0x1C5B}},  // ITU_Rec601
+		{{0x100, 0x193, 0x77, 0x2F, 0x1DB, -0x1933, 0xA7C, -0x1D51}},   // ITU_Rec709
+		{{0x12A, 0x198, 0xD0, 0x64, 0x204, -0x1BDE, 0x10F2, -0x229B}},  // ITU_Rec601_Scaling
+		{{0x12A, 0x1CA, 0x88, 0x36, 0x21C, -0x1F04, 0x99C, -0x2421}},   // ITU_Rec709_Scaling
+	}};
+
 	InputFormat inputFmt;
 	OutputFormat outputFmt;
 	Rotation rotation;
@@ -88,6 +98,7 @@ class Y2RService {
 	void setSpacialDithering(u32 messagePointer);
 	void setStandardCoeff(u32 messagePointer);
 	void setTemporalDithering(u32 messagePointer);
+	void getStandardCoefficientParams(u32 messagePointer);
 
 	void startConversion(u32 messagePointer);
 	void stopConversion(u32 messagePointer);
diff --git a/src/core/services/y2r.cpp b/src/core/services/y2r.cpp
index 40a6a04d..9539f02a 100644
--- a/src/core/services/y2r.cpp
+++ b/src/core/services/y2r.cpp
@@ -24,6 +24,7 @@ namespace Y2RCommands {
 		SetInputLines = 0x001C0040,
 		GetInputLines = 0x001D0000,
 		SetStandardCoeff = 0x00200040,
+		GetStandardCoefficientParams = 0x00210040,
 		SetAlpha = 0x00220040,
 		StartConversion = 0x00260000,
 		StopConversion = 0x00270000,
@@ -62,6 +63,7 @@ void Y2RService::handleSyncRequest(u32 messagePointer) {
 		case Y2RCommands::GetInputLineWidth: getInputLineWidth(messagePointer); break;
 		case Y2RCommands::GetOutputFormat: getOutputFormat(messagePointer); break;
 		case Y2RCommands::GetTransferEndEvent: getTransferEndEvent(messagePointer); break;
+		case Y2RCommands::GetStandardCoefficientParams: getStandardCoefficientParams(messagePointer); break;
 		case Y2RCommands::IsBusyConversion: isBusyConversion(messagePointer); break;
 		case Y2RCommands::PingProcess: pingProcess(messagePointer); break;
 		case Y2RCommands::SetAlpha: setAlpha(messagePointer); break;
@@ -306,7 +308,7 @@ void Y2RService::setStandardCoeff(u32 messagePointer) {
 	log("Y2R::SetStandardCoeff (coefficient = %d)\n", coeff);
 	mem.write32(messagePointer, IPC::responseHeader(0x20, 1, 0));
 
-	if (coeff > 3) {
+	if (coeff > 3) { // Invalid coefficient, should have an error code
 		Helpers::panic("Y2R: Invalid standard coefficient (coefficient = %d)\n", coeff);
 	}
 
@@ -316,6 +318,25 @@ void Y2RService::setStandardCoeff(u32 messagePointer) {
 	}
 }
 
+void Y2RService::getStandardCoefficientParams(u32 messagePointer) {
+	const u32 coefficientIndex = mem.read32(messagePointer + 4);
+	log("Y2R::GetStandardCoefficientParams (coefficient = %d)\n", coefficientIndex);
+
+	if (coefficientIndex > 3) {  // Invalid coefficient, should have an error code
+		Helpers::panic("Y2R: Invalid standard coefficient (coefficient = %d)\n", coefficientIndex);
+	} else {
+		mem.write32(messagePointer, IPC::responseHeader(0x21, 5, 0));
+		mem.write32(messagePointer + 4, Result::Success);
+		const auto& coeff = standardCoefficients[coefficientIndex];
+
+		// Write standard coefficient parameters to output buffer
+		for (int i = 0; i < 8; i++) {
+			const u32 pointer = messagePointer + 8 + i * sizeof(u16); // Pointer to write parameter to
+			mem.write16(pointer, coeff[i]);
+		}
+	}
+}
+
 void Y2RService::setSendingY(u32 messagePointer) {
 	log("Y2R::SetSendingY\n");
 	Helpers::warn("Unimplemented Y2R::SetSendingY");

From cc130d52e92bba095fafd726f99d3b46e2c2123b Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 1 Nov 2023 23:01:38 +0200
Subject: [PATCH 023/162] Add Y2R::GetCoefficientParams

---
 include/services/y2r.hpp  |  3 +++
 src/core/services/y2r.cpp | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/include/services/y2r.hpp b/include/services/y2r.hpp
index 3fe56f36..8b30525c 100644
--- a/include/services/y2r.hpp
+++ b/include/services/y2r.hpp
@@ -60,6 +60,8 @@ class Y2RService {
 		{{0x12A, 0x1CA, 0x88, 0x36, 0x21C, -0x1F04, 0x99C, -0x2421}},   // ITU_Rec709_Scaling
 	}};
 
+	CoefficientSet conversionCoefficients; // Current conversion coefficients
+
 	InputFormat inputFmt;
 	OutputFormat outputFmt;
 	Rotation rotation;
@@ -98,6 +100,7 @@ class Y2RService {
 	void setSpacialDithering(u32 messagePointer);
 	void setStandardCoeff(u32 messagePointer);
 	void setTemporalDithering(u32 messagePointer);
+	void getCoefficientParams(u32 messagePointer);
 	void getStandardCoefficientParams(u32 messagePointer);
 
 	void startConversion(u32 messagePointer);
diff --git a/src/core/services/y2r.cpp b/src/core/services/y2r.cpp
index 9539f02a..44a04958 100644
--- a/src/core/services/y2r.cpp
+++ b/src/core/services/y2r.cpp
@@ -23,6 +23,7 @@ namespace Y2RCommands {
 		GetInputLineWidth = 0x001B0000,
 		SetInputLines = 0x001C0040,
 		GetInputLines = 0x001D0000,
+		GetCoefficientParams = 0x001F0000,
 		SetStandardCoeff = 0x00200040,
 		GetStandardCoefficientParams = 0x00210040,
 		SetAlpha = 0x00220040,
@@ -51,6 +52,8 @@ void Y2RService::reset() {
 	alpha = 0xFFFF;
 	inputLines = 69;
 	inputLineWidth = 420;
+
+	conversionCoefficients.fill(0);
 }
 
 void Y2RService::handleSyncRequest(u32 messagePointer) {
@@ -84,6 +87,9 @@ void Y2RService::handleSyncRequest(u32 messagePointer) {
 		case Y2RCommands::SetTransferEndInterrupt: setTransferEndInterrupt(messagePointer); break;
 		case Y2RCommands::StartConversion: [[likely]] startConversion(messagePointer); break;
 		case Y2RCommands::StopConversion: stopConversion(messagePointer); break;
+
+		// Intentionally break ordering a bit for less-used Y2R functions
+		case Y2RCommands::GetCoefficientParams: getCoefficientParams(messagePointer); break;
 		default: Helpers::panic("Y2R service requested. Command: %08X\n", command);
 	}
 }
@@ -99,6 +105,8 @@ void Y2RService::driverInitialize(u32 messagePointer) {
 	log("Y2R::DriverInitialize\n");
 	mem.write32(messagePointer, IPC::responseHeader(0x2B, 1, 0));
 	mem.write32(messagePointer + 4, Result::Success);
+
+	conversionCoefficients.fill(0);
 }
 
 void Y2RService::driverFinalize(u32 messagePointer) {
@@ -337,6 +345,20 @@ void Y2RService::getStandardCoefficientParams(u32 messagePointer) {
 	}
 }
 
+void Y2RService::getCoefficientParams(u32 messagePointer) {
+	log("Y2R::GetCoefficientParams\n");
+	mem.write32(messagePointer, IPC::responseHeader(0x1F, 5, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+	const auto& coeff = conversionCoefficients;
+
+	// Write coefficient parameters to output buffer
+	for (int i = 0; i < 8; i++) {
+		const u32 pointer = messagePointer + 8 + i * sizeof(u16);  // Pointer to write parameter to
+		mem.write16(pointer, coeff[i]);
+	}
+}
+
+
 void Y2RService::setSendingY(u32 messagePointer) {
 	log("Y2R::SetSendingY\n");
 	Helpers::warn("Unimplemented Y2R::SetSendingY");

From 0b56427019e82ca7705680f4e7b1da46cccdc28d Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 1 Nov 2023 23:09:07 +0200
Subject: [PATCH 024/162] Add Y2R::SetCoefficientParams

---
 include/services/y2r.hpp  |  1 +
 src/core/services/y2r.cpp | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/include/services/y2r.hpp b/include/services/y2r.hpp
index 8b30525c..0a1cae2f 100644
--- a/include/services/y2r.hpp
+++ b/include/services/y2r.hpp
@@ -87,6 +87,7 @@ class Y2RService {
 
 	void setAlpha(u32 messagePointer);
 	void setBlockAlignment(u32 messagePointer);
+	void setCoefficientParams(u32 messagePointer);
 	void setInputFormat(u32 messagePointer);
 	void setInputLineWidth(u32 messagePointer);
 	void setInputLines(u32 messagePointer);
diff --git a/src/core/services/y2r.cpp b/src/core/services/y2r.cpp
index 44a04958..62f933f6 100644
--- a/src/core/services/y2r.cpp
+++ b/src/core/services/y2r.cpp
@@ -23,6 +23,7 @@ namespace Y2RCommands {
 		GetInputLineWidth = 0x001B0000,
 		SetInputLines = 0x001C0040,
 		GetInputLines = 0x001D0000,
+		SetCoefficientParams = 0x001E0100,
 		GetCoefficientParams = 0x001F0000,
 		SetStandardCoeff = 0x00200040,
 		GetStandardCoefficientParams = 0x00210040,
@@ -89,6 +90,7 @@ void Y2RService::handleSyncRequest(u32 messagePointer) {
 		case Y2RCommands::StopConversion: stopConversion(messagePointer); break;
 
 		// Intentionally break ordering a bit for less-used Y2R functions
+		case Y2RCommands::SetCoefficientParams: setCoefficientParams(messagePointer); break;
 		case Y2RCommands::GetCoefficientParams: getCoefficientParams(messagePointer); break;
 		default: Helpers::panic("Y2R service requested. Command: %08X\n", command);
 	}
@@ -345,6 +347,19 @@ void Y2RService::getStandardCoefficientParams(u32 messagePointer) {
 	}
 }
 
+void Y2RService::setCoefficientParams(u32 messagePointer) {
+	log("Y2R::SetCoefficientParams\n");
+	mem.write32(messagePointer, IPC::responseHeader(0x1E, 1, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+	auto& coeff = conversionCoefficients;
+
+	// Write coefficient parameters to output buffer
+	for (int i = 0; i < 8; i++) {
+		const u32 pointer = messagePointer + 8 + i * sizeof(u16);  // Pointer to write parameter to
+		coeff[i] = mem.read16(pointer);
+	}
+}
+
 void Y2RService::getCoefficientParams(u32 messagePointer) {
 	log("Y2R::GetCoefficientParams\n");
 	mem.write32(messagePointer, IPC::responseHeader(0x1F, 5, 0));
@@ -358,7 +373,6 @@ void Y2RService::getCoefficientParams(u32 messagePointer) {
 	}
 }
 
-
 void Y2RService::setSendingY(u32 messagePointer) {
 	log("Y2R::SetSendingY\n");
 	Helpers::warn("Unimplemented Y2R::SetSendingY");

From 42252e6442a791b8ebf4a50b9681308e4a30fa1b Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 1 Nov 2023 23:29:09 +0200
Subject: [PATCH 025/162] Fix Y2R::SetCoefficientParams

---
 src/core/services/y2r.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/core/services/y2r.cpp b/src/core/services/y2r.cpp
index 62f933f6..b5daf6bb 100644
--- a/src/core/services/y2r.cpp
+++ b/src/core/services/y2r.cpp
@@ -288,6 +288,7 @@ void Y2RService::getInputLineWidth(u32 messagePointer) {
 	mem.write32(messagePointer + 4, Result::Success);
 	mem.write32(messagePointer + 8, inputLineWidth);
 }
+
 void Y2RService::setInputLines(u32 messagePointer) {
 	const u16 lines = mem.read16(messagePointer + 4);
 	log("Y2R::SetInputLines (lines = %d)\n", lines);
@@ -349,15 +350,16 @@ void Y2RService::getStandardCoefficientParams(u32 messagePointer) {
 
 void Y2RService::setCoefficientParams(u32 messagePointer) {
 	log("Y2R::SetCoefficientParams\n");
-	mem.write32(messagePointer, IPC::responseHeader(0x1E, 1, 0));
-	mem.write32(messagePointer + 4, Result::Success);
 	auto& coeff = conversionCoefficients;
 
 	// Write coefficient parameters to output buffer
 	for (int i = 0; i < 8; i++) {
-		const u32 pointer = messagePointer + 8 + i * sizeof(u16);  // Pointer to write parameter to
+		const u32 pointer = messagePointer + 4 + i * sizeof(u16);  // Pointer to write parameter to
 		coeff[i] = mem.read16(pointer);
 	}
+
+	mem.write32(messagePointer, IPC::responseHeader(0x1E, 1, 0));
+	mem.write32(messagePointer + 4, Result::Success);
 }
 
 void Y2RService::getCoefficientParams(u32 messagePointer) {

From 798b10ec690306e876224746ca52d678d2be078a Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 4 Nov 2023 18:07:13 +0200
Subject: [PATCH 026/162] Fix KTimer not properly triggering

---
 src/core/kernel/timers.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/core/kernel/timers.cpp b/src/core/kernel/timers.cpp
index 1c18d9de..4c2bf358 100644
--- a/src/core/kernel/timers.cpp
+++ b/src/core/kernel/timers.cpp
@@ -51,6 +51,10 @@ void Kernel::signalTimer(Handle timerHandle, Timer* timer) {
 			case ResetType::Pulse: Helpers::panic("Signalled pulsing timer"); break;
 		}
 	}
+
+	if (timer->interval == 0) {
+		cancelTimer(timer);
+	}
 }
 
 void Kernel::svcCreateTimer() {
@@ -70,8 +74,8 @@ void Kernel::svcCreateTimer() {
 void Kernel::svcSetTimer() {
 	Handle handle = regs[0];
 	// TODO: Is this actually s64 or u64? 3DBrew says s64, but u64 makes more sense
-	const s64 initial = s64(u64(regs[1]) | (u64(regs[2]) << 32));
-	const s64 interval = s64(u64(regs[3]) | (u64(regs[4]) << 32));
+	const s64 initial = s64(u64(regs[1]) | (u64(regs[3]) << 32));
+	const s64 interval = s64(u64(regs[2]) | (u64(regs[4]) << 32));
 	logSVC("SetTimer (handle = %X, initial delay = %llX, interval delay = %llX)\n", handle, initial, interval);
 
 	KernelObject* object = getObject(handle, KernelObjectType::Timer);

From 708b10c194e1056e7c342d61974faddf567f833a Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 4 Nov 2023 18:26:20 +0200
Subject: [PATCH 027/162] Fix svcSetTimer ABI maybe...?

---
 src/core/kernel/timers.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/kernel/timers.cpp b/src/core/kernel/timers.cpp
index 4c2bf358..c6097ed7 100644
--- a/src/core/kernel/timers.cpp
+++ b/src/core/kernel/timers.cpp
@@ -74,8 +74,8 @@ void Kernel::svcCreateTimer() {
 void Kernel::svcSetTimer() {
 	Handle handle = regs[0];
 	// TODO: Is this actually s64 or u64? 3DBrew says s64, but u64 makes more sense
-	const s64 initial = s64(u64(regs[1]) | (u64(regs[3]) << 32));
-	const s64 interval = s64(u64(regs[2]) | (u64(regs[4]) << 32));
+	const s64 initial = s64(u64(regs[2]) | (u64(regs[3]) << 32));
+	const s64 interval = s64(u64(regs[1]) | (u64(regs[4]) << 32));
 	logSVC("SetTimer (handle = %X, initial delay = %llX, interval delay = %llX)\n", handle, initial, interval);
 
 	KernelObject* object = getObject(handle, KernelObjectType::Timer);

From 1f7fc2274ac5b3a985f1bf7f59ca21f27d67a53a Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 4 Nov 2023 18:28:28 +0200
Subject: [PATCH 028/162] Add vector of timer handles

---
 include/kernel/kernel.hpp  | 1 +
 src/core/kernel/kernel.cpp | 1 +
 src/core/kernel/timers.cpp | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/kernel/kernel.hpp b/include/kernel/kernel.hpp
index dc821a68..30f1310e 100644
--- a/include/kernel/kernel.hpp
+++ b/include/kernel/kernel.hpp
@@ -36,6 +36,7 @@ class Kernel {
 	std::vector<KernelObject> objects;
 	std::vector<Handle> portHandles;
 	std::vector<Handle> mutexHandles;
+	std::vector<Handle> timerHandles;
 
 	// Thread indices, sorted by priority
 	std::vector<int> threadIndices;
diff --git a/src/core/kernel/kernel.cpp b/src/core/kernel/kernel.cpp
index b21c4c58..cd691b48 100644
--- a/src/core/kernel/kernel.cpp
+++ b/src/core/kernel/kernel.cpp
@@ -148,6 +148,7 @@ void Kernel::reset() {
 	}
 	objects.clear();
 	mutexHandles.clear();
+	timerHandles.clear();
 	portHandles.clear();
 	threadIndices.clear();
 	serviceManager.reset();
diff --git a/src/core/kernel/timers.cpp b/src/core/kernel/timers.cpp
index c6097ed7..a9c95292 100644
--- a/src/core/kernel/timers.cpp
+++ b/src/core/kernel/timers.cpp
@@ -9,7 +9,7 @@ Handle Kernel::makeTimer(ResetType type) {
 		Helpers::panic("Created pulse timer");
 	}
 
-	// timerHandles.push_back(ret);
+	timerHandles.push_back(ret);
 	return ret;
 }
 

From 135c8cb508fda0ec454833c39616d12d58b3ce5d Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 11 Nov 2023 20:11:40 +0200
Subject: [PATCH 029/162] [Applets] Proper glance/receiveParameter sorta

---
 include/applets/applet_manager.hpp  |  7 +++++
 include/services/apt.hpp            | 25 ++++++++++++++++
 src/core/applets/applet_manager.cpp | 29 ++++++++++++++++++
 src/core/services/apt.cpp           | 46 +++++++++--------------------
 4 files changed, 75 insertions(+), 32 deletions(-)

diff --git a/include/applets/applet_manager.hpp b/include/applets/applet_manager.hpp
index 95b54009..e75e1268 100644
--- a/include/applets/applet_manager.hpp
+++ b/include/applets/applet_manager.hpp
@@ -1,3 +1,6 @@
+#pragma once
+#include <optional>
+
 #include "applets/mii_selector.hpp"
 #include "applets/software_keyboard.hpp"
 #include "helpers.hpp"
@@ -8,10 +11,14 @@ namespace Applets {
 	class AppletManager {
 		MiiSelectorApplet miiSelector;
 		SoftwareKeyboardApplet swkbd;
+		std::optional<Applets::Parameter> nextParameter = std::nullopt;
 
 	  public:
 		AppletManager(Memory& mem);
 		void reset();
 		AppletBase* getApplet(u32 id);
+
+		Applets::Parameter glanceParameter();
+		Applets::Parameter receiveParameter();
 	};
 }  // namespace Applets
\ No newline at end of file
diff --git a/include/services/apt.hpp b/include/services/apt.hpp
index a7df056f..48a59c2d 100644
--- a/include/services/apt.hpp
+++ b/include/services/apt.hpp
@@ -15,6 +15,31 @@ enum class ConsoleModel : u32 {
 	Old3DS, New3DS
 };
 
+// https://www.3dbrew.org/wiki/NS_and_APT_Services#Command
+namespace APT::Transitions {
+	enum : u32 {
+		None = 0,
+		Wakeup = 1,
+		Request = 2,
+		Response = 3,
+		Exit = 4,
+		Message = 5,
+		HomeButtonSingle = 6,
+		HomeButtonDouble = 7,
+		DSPSleep = 8,
+		DSPWakeup = 9,
+		WakeupByExit = 10,
+		WakuepByPause = 11,
+		WakeupByCancel = 12,
+		WakeupByCancelAll = 13,
+		WakeupByPowerButton = 14,
+		WakeupToJumpHome = 15,
+		RequestForApplet = 16,
+		WakeupToLaunchApp = 17,
+		ProcessDed = 0x41
+	};
+}
+
 class APTService {
 	Handle handle = KernelHandles::APT;
 	Memory& mem;
diff --git a/src/core/applets/applet_manager.cpp b/src/core/applets/applet_manager.cpp
index c94eee28..192a76c0 100644
--- a/src/core/applets/applet_manager.cpp
+++ b/src/core/applets/applet_manager.cpp
@@ -1,4 +1,7 @@
 #include "applets/applet_manager.hpp"
+
+#include "services/apt.hpp"
+
 using namespace Applets;
 
 AppletManager::AppletManager(Memory& mem) : miiSelector(mem), swkbd(mem) {}
@@ -18,4 +21,30 @@ AppletBase* AppletManager::getApplet(u32 id) {
 
 		default: return nullptr;
 	}
+}
+
+Applets::Parameter AppletManager::glanceParameter() {
+	if (nextParameter) {
+		// Copy parameter
+		Applets::Parameter param = nextParameter.value();
+		// APT module clears next parameter even for GlanceParameter for these 2 signals
+		if (param.signal == APTSignal::DspWakeup || param.signal == APTSignal::DspSleep) {
+			nextParameter = std::nullopt;
+		}
+
+		return param;
+	}
+
+	// Default return value. This is legacy code from before applets were implemented. TODO: Update it
+	else {
+		return Applets::Parameter{.senderID = 0, .destID = Applets::AppletIDs::Application, .signal = APTSignal::Wakeup, .data = {}};
+	}
+}
+
+Applets::Parameter AppletManager::receiveParameter() {
+	Applets::Parameter param = glanceParameter();
+	// ReceiveParameter always clears nextParameter whereas glanceParameter does not
+	nextParameter = std::nullopt;
+
+	return param;
 }
\ No newline at end of file
diff --git a/src/core/services/apt.cpp b/src/core/services/apt.cpp
index d969f2a4..64ff5cef 100644
--- a/src/core/services/apt.cpp
+++ b/src/core/services/apt.cpp
@@ -32,31 +32,6 @@ namespace APTCommands {
 	};
 }
 
-// https://www.3dbrew.org/wiki/NS_and_APT_Services#Command
-namespace APTTransitions {
-	enum : u32 {
-		None = 0,
-		Wakeup = 1,
-		Request = 2,
-		Response = 3,
-		Exit = 4,
-		Message = 5,
-		HomeButtonSingle = 6,
-		HomeButtonDouble = 7,
-		DSPSleep = 8,
-		DSPWakeup = 9,
-		WakeupByExit = 10,
-		WakuepByPause = 11,
-		WakeupByCancel = 12,
-		WakeupByCancelAll = 13,
-		WakeupByPowerButton = 14,
-		WakeupToJumpHome = 15,
-		RequestForApplet = 16,
-		WakeupToLaunchApp = 17,
-		ProcessDed = 0x41
-	};
-}
-
 void APTService::reset() {
 	// Set the default CPU time limit to 30%. Seems safe, as this is what Metroid 2 uses by default
 	cpuTimeLimit = 30;
@@ -273,13 +248,16 @@ void APTService::receiveParameter(u32 messagePointer) {
 	log("APT::ReceiveParameter(app ID = %X, size = %04X) (STUBBED)\n", app, size);
 
 	if (size > 0x1000) Helpers::panic("APT::ReceiveParameter with size > 0x1000");
+	auto parameter = appletManager.receiveParameter();
 
-	// TODO: Properly implement this. We currently stub somewhat like 3dmoo
 	mem.write32(messagePointer, IPC::responseHeader(0xD, 4, 4));
 	mem.write32(messagePointer + 4, Result::Success);
-	mem.write32(messagePointer + 8, 0); // Sender App ID
-	mem.write32(messagePointer + 12, APTTransitions::Wakeup); // Command
-	mem.write32(messagePointer + 16, 0);
+	// Sender App ID
+	mem.write32(messagePointer + 8, parameter.senderID);
+	// Command
+	mem.write32(messagePointer + 12, static_cast<u32>(parameter.signal));
+	// Size of parameter data
+	mem.write32(messagePointer + 16, parameter.data.size());
 	mem.write32(messagePointer + 20, 0x10);
 	mem.write32(messagePointer + 24, 0);
 	mem.write32(messagePointer + 28, 0);
@@ -291,13 +269,17 @@ void APTService::glanceParameter(u32 messagePointer) {
 	log("APT::GlanceParameter(app ID = %X, size = %04X) (STUBBED)\n", app, size);
 
 	if (size > 0x1000) Helpers::panic("APT::GlanceParameter with size > 0x1000");
+	auto parameter = appletManager.glanceParameter();
 
 	// TODO: Properly implement this. We currently stub it similar
 	mem.write32(messagePointer, IPC::responseHeader(0xE, 4, 4));
 	mem.write32(messagePointer + 4, Result::Success);
-	mem.write32(messagePointer + 8, 0); // Sender App ID
-	mem.write32(messagePointer + 12, APTTransitions::Wakeup); // Command
-	mem.write32(messagePointer + 16, 0);
+	// Sender App ID
+	mem.write32(messagePointer + 8, parameter.senderID);
+	// Command
+	mem.write32(messagePointer + 12, static_cast<u32>(parameter.signal));
+	// Size of parameter data
+	mem.write32(messagePointer + 16, parameter.data.size());
 	mem.write32(messagePointer + 20, 0);
 	mem.write32(messagePointer + 24, 0);
 	mem.write32(messagePointer + 28, 0);

From 60b565273e881d8bf579c00cecbed8ef907cf43c Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 11 Nov 2023 20:35:10 +0200
Subject: [PATCH 030/162] [Applets] Properly expose nextParameter

---
 include/applets/applet.hpp             | 4 +++-
 include/applets/mii_selector.hpp       | 2 +-
 include/applets/software_keyboard.hpp  | 2 +-
 src/core/applets/applet_manager.cpp    | 2 +-
 src/core/applets/software_keyboard.cpp | 9 +++++++++
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/include/applets/applet.hpp b/include/applets/applet.hpp
index 0c3ab519..f1a91afd 100644
--- a/include/applets/applet.hpp
+++ b/include/applets/applet.hpp
@@ -72,7 +72,9 @@ namespace Applets {
 	};
 
 	class AppletBase {
+	  protected:
 		Memory& mem;
+		std::optional<Parameter>& nextParameter;
 
 	  public:
 		virtual const char* name() = 0;
@@ -83,6 +85,6 @@ namespace Applets {
 		virtual Result::HorizonResult receiveParameter() = 0;
 		virtual void reset() = 0;
 
-		AppletBase(Memory& mem) : mem(mem) {}
+		AppletBase(Memory& mem, std::optional<Parameter>& nextParam) : mem(mem), nextParameter(nextParam) {}
 	};
 }  // namespace Applets
\ No newline at end of file
diff --git a/include/applets/mii_selector.hpp b/include/applets/mii_selector.hpp
index e40547fb..7a882615 100644
--- a/include/applets/mii_selector.hpp
+++ b/include/applets/mii_selector.hpp
@@ -8,6 +8,6 @@ namespace Applets {
 		virtual Result::HorizonResult receiveParameter() override;
 		virtual void reset() override;
 
-		MiiSelectorApplet(Memory& memory) : AppletBase(memory) {}
+		MiiSelectorApplet(Memory& memory, std::optional<Parameter>& nextParam) : AppletBase(memory, nextParam) {}
 	};
 }  // namespace Applets
\ No newline at end of file
diff --git a/include/applets/software_keyboard.hpp b/include/applets/software_keyboard.hpp
index 1fb721a1..89b87953 100644
--- a/include/applets/software_keyboard.hpp
+++ b/include/applets/software_keyboard.hpp
@@ -8,6 +8,6 @@ namespace Applets {
 		virtual Result::HorizonResult receiveParameter() override;
 		virtual void reset() override;
 
-		SoftwareKeyboardApplet(Memory& memory) : AppletBase(memory) {}
+		SoftwareKeyboardApplet(Memory& memory, std::optional<Parameter>& nextParam) : AppletBase(memory, nextParam) {}
 	};
 }  // namespace Applets
\ No newline at end of file
diff --git a/src/core/applets/applet_manager.cpp b/src/core/applets/applet_manager.cpp
index 192a76c0..196b1f60 100644
--- a/src/core/applets/applet_manager.cpp
+++ b/src/core/applets/applet_manager.cpp
@@ -4,7 +4,7 @@
 
 using namespace Applets;
 
-AppletManager::AppletManager(Memory& mem) : miiSelector(mem), swkbd(mem) {}
+AppletManager::AppletManager(Memory& mem) : miiSelector(mem, nextParameter), swkbd(mem, nextParameter) {}
 
 void AppletManager::reset() {
 	miiSelector.reset();
diff --git a/src/core/applets/software_keyboard.cpp b/src/core/applets/software_keyboard.cpp
index 2ff22792..3c203133 100644
--- a/src/core/applets/software_keyboard.cpp
+++ b/src/core/applets/software_keyboard.cpp
@@ -7,5 +7,14 @@ Result::HorizonResult SoftwareKeyboardApplet::start() { return Result::Success;
 
 Result::HorizonResult SoftwareKeyboardApplet::receiveParameter() {
 	Helpers::warn("Software keyboard: Unimplemented ReceiveParameter");
+
+	Applets::Parameter param = Applets::Parameter{
+		.senderID = AppletIDs::SoftwareKeyboard,
+		.destID = AppletIDs::Application,
+		.signal = APTSignal::Response,
+		.data = {},
+	};
+
+	nextParameter = param;
 	return Result::Success;
 }
\ No newline at end of file

From 5df44e0c4f91d5d6ee3a2c6fe5f85c52e3ca1675 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 11 Nov 2023 20:51:53 +0200
Subject: [PATCH 031/162] [GSP] Add GSP::GPU::ReleaseRight

---
 include/services/gsp_gpu.hpp  |  1 +
 src/core/services/gsp_gpu.cpp | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/include/services/gsp_gpu.hpp b/include/services/gsp_gpu.hpp
index 92ca36e2..68e24580 100644
--- a/include/services/gsp_gpu.hpp
+++ b/include/services/gsp_gpu.hpp
@@ -65,6 +65,7 @@ class GPUService {
 	void flushDataCache(u32 messagePointer);
 	void importDisplayCaptureInfo(u32 messagePointer);
 	void registerInterruptRelayQueue(u32 messagePointer);
+	void releaseRight(u32 messagePointer);
 	void saveVramSysArea(u32 messagePointer);
 	void setAxiConfigQoSMode(u32 messagePointer);
 	void setBufferSwap(u32 messagePointer);
diff --git a/src/core/services/gsp_gpu.cpp b/src/core/services/gsp_gpu.cpp
index 0e27c0ec..861dfb0a 100644
--- a/src/core/services/gsp_gpu.cpp
+++ b/src/core/services/gsp_gpu.cpp
@@ -15,6 +15,7 @@ namespace ServiceCommands {
 		FlushDataCache = 0x00080082,
 		SetLCDForceBlack = 0x000B0040,
 		TriggerCmdReqQueue = 0x000C0000,
+		ReleaseRight = 0x00170000,
 		ImportDisplayCaptureInfo = 0x00180000,
 		SaveVramSysArea = 0x00190000,
 		SetInternalPriorities = 0x001E0080,
@@ -49,6 +50,7 @@ void GPUService::handleSyncRequest(u32 messagePointer) {
 		case ServiceCommands::FlushDataCache: flushDataCache(messagePointer); break;
 		case ServiceCommands::ImportDisplayCaptureInfo: importDisplayCaptureInfo(messagePointer); break;
 		case ServiceCommands::RegisterInterruptRelayQueue: registerInterruptRelayQueue(messagePointer); break;
+		case ServiceCommands::ReleaseRight: releaseRight(messagePointer); break;
 		case ServiceCommands::SaveVramSysArea: saveVramSysArea(messagePointer); break;
 		case ServiceCommands::SetAxiConfigQoSMode: setAxiConfigQoSMode(messagePointer); break;
 		case ServiceCommands::SetBufferSwap: setBufferSwap(messagePointer); break;
@@ -80,6 +82,16 @@ void GPUService::acquireRight(u32 messagePointer) {
 	mem.write32(messagePointer + 4, Result::Success);
 }
 
+void GPUService::releaseRight(u32 messagePointer) {
+	log("GSP::GPU::ReleaseRight\n");
+	if (privilegedProcess == currentPID) {
+		privilegedProcess = 0xFFFFFFFF;
+	}
+
+	mem.write32(messagePointer, IPC::responseHeader(0x17, 1, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+}
+
 // TODO: What is the flags field meant to be?
 // What is the "GSP module thread index" meant to be?
 // How does the shared memory handle thing work?

From bd1d7b7a810422c81257ac5b573f7f3b115f8049 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sun, 12 Nov 2023 21:07:44 +0200
Subject: [PATCH 032/162] [APT] Properly forward parameters in SendParameter

---
 include/applets/applet.hpp             |  4 ++--
 include/applets/mii_selector.hpp       |  2 +-
 include/applets/software_keyboard.hpp  |  2 +-
 src/core/applets/applet_manager.cpp    |  9 +++++++--
 src/core/applets/mii_selector.cpp      |  2 +-
 src/core/applets/software_keyboard.cpp |  6 +++---
 src/core/services/apt.cpp              | 16 +++++++++++++++-
 7 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/include/applets/applet.hpp b/include/applets/applet.hpp
index f1a91afd..79fba1cb 100644
--- a/include/applets/applet.hpp
+++ b/include/applets/applet.hpp
@@ -67,7 +67,7 @@ namespace Applets {
 	struct Parameter {
 		u32 senderID;
 		u32 destID;
-		APTSignal signal;
+		u32 signal;
 		std::vector<u8> data;
 	};
 
@@ -82,7 +82,7 @@ namespace Applets {
 		// Called by APT::StartLibraryApplet and similar
 		virtual Result::HorizonResult start() = 0;
 		// Transfer parameters from application -> applet
-		virtual Result::HorizonResult receiveParameter() = 0;
+		virtual Result::HorizonResult receiveParameter(const Parameter& parameter) = 0;
 		virtual void reset() = 0;
 
 		AppletBase(Memory& mem, std::optional<Parameter>& nextParam) : mem(mem), nextParameter(nextParam) {}
diff --git a/include/applets/mii_selector.hpp b/include/applets/mii_selector.hpp
index 7a882615..c90d4b59 100644
--- a/include/applets/mii_selector.hpp
+++ b/include/applets/mii_selector.hpp
@@ -5,7 +5,7 @@ namespace Applets {
 	  public:
 		virtual const char* name() override { return "Mii Selector"; }
 		virtual Result::HorizonResult start() override;
-		virtual Result::HorizonResult receiveParameter() override;
+		virtual Result::HorizonResult receiveParameter(const Applets::Parameter& parameter) override;
 		virtual void reset() override;
 
 		MiiSelectorApplet(Memory& memory, std::optional<Parameter>& nextParam) : AppletBase(memory, nextParam) {}
diff --git a/include/applets/software_keyboard.hpp b/include/applets/software_keyboard.hpp
index 89b87953..f4179012 100644
--- a/include/applets/software_keyboard.hpp
+++ b/include/applets/software_keyboard.hpp
@@ -5,7 +5,7 @@ namespace Applets {
 	  public:
 		virtual const char* name() override { return "Software Keyboard"; }
 		virtual Result::HorizonResult start() override;
-		virtual Result::HorizonResult receiveParameter() override;
+		virtual Result::HorizonResult receiveParameter(const Applets::Parameter& parameter) override;
 		virtual void reset() override;
 
 		SoftwareKeyboardApplet(Memory& memory, std::optional<Parameter>& nextParam) : AppletBase(memory, nextParam) {}
diff --git a/src/core/applets/applet_manager.cpp b/src/core/applets/applet_manager.cpp
index 196b1f60..4c241027 100644
--- a/src/core/applets/applet_manager.cpp
+++ b/src/core/applets/applet_manager.cpp
@@ -28,7 +28,7 @@ Applets::Parameter AppletManager::glanceParameter() {
 		// Copy parameter
 		Applets::Parameter param = nextParameter.value();
 		// APT module clears next parameter even for GlanceParameter for these 2 signals
-		if (param.signal == APTSignal::DspWakeup || param.signal == APTSignal::DspSleep) {
+		if (param.signal == static_cast<u32>(APTSignal::DspWakeup) || param.signal == static_cast<u32>(APTSignal::DspSleep)) {
 			nextParameter = std::nullopt;
 		}
 
@@ -37,7 +37,12 @@ Applets::Parameter AppletManager::glanceParameter() {
 
 	// Default return value. This is legacy code from before applets were implemented. TODO: Update it
 	else {
-		return Applets::Parameter{.senderID = 0, .destID = Applets::AppletIDs::Application, .signal = APTSignal::Wakeup, .data = {}};
+		return Applets::Parameter{
+			.senderID = 0,
+			.destID = Applets::AppletIDs::Application,
+			.signal = static_cast<u32>(APTSignal::Wakeup),
+			.data = {},
+		};
 	}
 }
 
diff --git a/src/core/applets/mii_selector.cpp b/src/core/applets/mii_selector.cpp
index 211e6f07..f392d846 100644
--- a/src/core/applets/mii_selector.cpp
+++ b/src/core/applets/mii_selector.cpp
@@ -5,7 +5,7 @@ using namespace Applets;
 void MiiSelectorApplet::reset() {}
 Result::HorizonResult MiiSelectorApplet::start() { return Result::Success; }
 
-Result::HorizonResult MiiSelectorApplet::receiveParameter() {
+Result::HorizonResult MiiSelectorApplet::receiveParameter(const Applets::Parameter& parameter) {
 	Helpers::warn("Mii Selector: Unimplemented ReceiveParameter");
 	return Result::Success;
 }
\ No newline at end of file
diff --git a/src/core/applets/software_keyboard.cpp b/src/core/applets/software_keyboard.cpp
index 3c203133..be5a9e21 100644
--- a/src/core/applets/software_keyboard.cpp
+++ b/src/core/applets/software_keyboard.cpp
@@ -5,13 +5,13 @@ using namespace Applets;
 void SoftwareKeyboardApplet::reset() {}
 Result::HorizonResult SoftwareKeyboardApplet::start() { return Result::Success; }
 
-Result::HorizonResult SoftwareKeyboardApplet::receiveParameter() {
+Result::HorizonResult SoftwareKeyboardApplet::receiveParameter(const Applets::Parameter& parameter) {
 	Helpers::warn("Software keyboard: Unimplemented ReceiveParameter");
 
 	Applets::Parameter param = Applets::Parameter{
-		.senderID = AppletIDs::SoftwareKeyboard,
+		.senderID = parameter.destID,
 		.destID = AppletIDs::Application,
-		.signal = APTSignal::Response,
+		.signal = static_cast<u32>(APTSignal::Response),
 		.data = {},
 	};
 
diff --git a/src/core/services/apt.cpp b/src/core/services/apt.cpp
index 64ff5cef..f1c43b26 100644
--- a/src/core/services/apt.cpp
+++ b/src/core/services/apt.cpp
@@ -234,7 +234,21 @@ void APTService::sendParameter(u32 messagePointer) {
 	if (destApplet == nullptr) {
 		Helpers::warn("APT::SendParameter: Unimplemented dest applet ID");
 	} else {
-		auto result = destApplet->receiveParameter();
+		// Construct parameter, send it to applet
+		Applets::Parameter param;
+		param.senderID = sourceAppID;
+		param.destID = destAppID;
+		param.signal = cmd;
+
+		// Fetch parameter data buffer
+		param.data.reserve(paramSize);
+		u32 pointer = parameterPointer;
+
+		for (u32 i = 0; i < paramSize; i++) {
+			param.data.push_back(mem.read8(pointer++));
+		}
+
+		auto result = destApplet->receiveParameter(param);
 	}
 
 	if (resumeEvent.has_value()) {

From aa40eaf4cc9d1094fa5d9f83e8090a4de6a0d07a Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sun, 12 Nov 2023 21:16:38 +0200
Subject: [PATCH 033/162] [APT] Remove redundant cast

---
 src/core/services/apt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/services/apt.cpp b/src/core/services/apt.cpp
index f1c43b26..0fc2bb8a 100644
--- a/src/core/services/apt.cpp
+++ b/src/core/services/apt.cpp
@@ -269,7 +269,7 @@ void APTService::receiveParameter(u32 messagePointer) {
 	// Sender App ID
 	mem.write32(messagePointer + 8, parameter.senderID);
 	// Command
-	mem.write32(messagePointer + 12, static_cast<u32>(parameter.signal));
+	mem.write32(messagePointer + 12, parameter.signal);
 	// Size of parameter data
 	mem.write32(messagePointer + 16, parameter.data.size());
 	mem.write32(messagePointer + 20, 0x10);

From 62af35c42b8a13e00b356d1a30904f295e24b768 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sun, 12 Nov 2023 21:24:12 +0200
Subject: [PATCH 034/162] [Applet Manager] Fix resetting

---
 src/core/applets/applet_manager.cpp | 2 ++
 src/core/services/apt.cpp           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/applets/applet_manager.cpp b/src/core/applets/applet_manager.cpp
index 4c241027..c2791777 100644
--- a/src/core/applets/applet_manager.cpp
+++ b/src/core/applets/applet_manager.cpp
@@ -7,6 +7,8 @@ using namespace Applets;
 AppletManager::AppletManager(Memory& mem) : miiSelector(mem, nextParameter), swkbd(mem, nextParameter) {}
 
 void AppletManager::reset() {
+	nextParameter = std::nullopt;
+
 	miiSelector.reset();
 	swkbd.reset();
 }
diff --git a/src/core/services/apt.cpp b/src/core/services/apt.cpp
index 0fc2bb8a..754baa13 100644
--- a/src/core/services/apt.cpp
+++ b/src/core/services/apt.cpp
@@ -291,7 +291,7 @@ void APTService::glanceParameter(u32 messagePointer) {
 	// Sender App ID
 	mem.write32(messagePointer + 8, parameter.senderID);
 	// Command
-	mem.write32(messagePointer + 12, static_cast<u32>(parameter.signal));
+	mem.write32(messagePointer + 12, parameter.signal);
 	// Size of parameter data
 	mem.write32(messagePointer + 16, parameter.data.size());
 	mem.write32(messagePointer + 20, 0);

From 469ae2805cc452ce72673eca87d5f042b130ecc8 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Tue, 14 Nov 2023 15:30:53 +0200
Subject: [PATCH 035/162] Add initial pandroid files

---
 CMakeLists.txt                                |  34 +++-
 src/emulator.cpp                              |   2 +
 src/jni_driver.cpp                            |  11 ++
 src/pandroid/.gitignore                       |  15 ++
 src/pandroid/app/.gitignore                   |   1 +
 src/pandroid/app/build.gradle.kts             |  46 +++++
 src/pandroid/app/proguard-rules.pro           |  21 ++
 src/pandroid/app/src/main/AndroidManifest.xml |  26 +++
 .../com/panda3ds/pandroid/AlberDriver.java    |  10 +
 .../com/panda3ds/pandroid/MainActivity.java   |  16 ++
 src/pandroid/app/src/main/jniLibs/.gitignore  |   2 +
 .../app/src/main/jniLibs/arm64-v8a/.gitkeep   |   0
 .../app/src/main/jniLibs/x86_64/.gitkeep      |   0
 .../res/drawable/ic_launcher_background.xml   | 170 ++++++++++++++++
 .../res/drawable/ic_launcher_foreground.xml   |  30 +++
 .../app/src/main/res/layout/activity_main.xml |  18 ++
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   6 +
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   6 +
 .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes
 .../res/mipmap-hdpi/ic_launcher_round.webp    | Bin 0 -> 2898 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes
 .../res/mipmap-mdpi/ic_launcher_round.webp    | Bin 0 -> 1772 bytes
 .../main/res/mipmap-xhdpi/ic_launcher.webp    | Bin 0 -> 1900 bytes
 .../res/mipmap-xhdpi/ic_launcher_round.webp   | Bin 0 -> 3918 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.webp   | Bin 0 -> 2884 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.webp  | Bin 0 -> 5914 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.webp  | Bin 0 -> 3844 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes
 .../app/src/main/res/values-night/themes.xml  |   7 +
 .../app/src/main/res/values/colors.xml        |   5 +
 .../app/src/main/res/values/strings.xml       |   3 +
 .../app/src/main/res/values/themes.xml        |   9 +
 .../app/src/main/res/xml/backup_rules.xml     |  13 ++
 .../main/res/xml/data_extraction_rules.xml    |  19 ++
 src/pandroid/build.gradle.kts                 |   4 +
 src/pandroid/gradle.properties                |  21 ++
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 0 -> 59203 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   6 +
 src/pandroid/gradlew                          | 185 ++++++++++++++++++
 src/pandroid/gradlew.bat                      |  89 +++++++++
 src/pandroid/settings.gradle.kts              |  17 ++
 41 files changed, 782 insertions(+), 10 deletions(-)
 create mode 100644 src/jni_driver.cpp
 create mode 100644 src/pandroid/.gitignore
 create mode 100644 src/pandroid/app/.gitignore
 create mode 100644 src/pandroid/app/build.gradle.kts
 create mode 100644 src/pandroid/app/proguard-rules.pro
 create mode 100644 src/pandroid/app/src/main/AndroidManifest.xml
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/MainActivity.java
 create mode 100644 src/pandroid/app/src/main/jniLibs/.gitignore
 create mode 100644 src/pandroid/app/src/main/jniLibs/arm64-v8a/.gitkeep
 create mode 100644 src/pandroid/app/src/main/jniLibs/x86_64/.gitkeep
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_launcher_background.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_launcher_foreground.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/activity_main.xml
 create mode 100644 src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 create mode 100644 src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
 create mode 100644 src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher.webp
 create mode 100644 src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
 create mode 100644 src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher.webp
 create mode 100644 src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
 create mode 100644 src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
 create mode 100644 src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
 create mode 100644 src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
 create mode 100644 src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
 create mode 100644 src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
 create mode 100644 src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
 create mode 100644 src/pandroid/app/src/main/res/values-night/themes.xml
 create mode 100644 src/pandroid/app/src/main/res/values/colors.xml
 create mode 100644 src/pandroid/app/src/main/res/values/strings.xml
 create mode 100644 src/pandroid/app/src/main/res/values/themes.xml
 create mode 100644 src/pandroid/app/src/main/res/xml/backup_rules.xml
 create mode 100644 src/pandroid/app/src/main/res/xml/data_extraction_rules.xml
 create mode 100644 src/pandroid/build.gradle.kts
 create mode 100644 src/pandroid/gradle.properties
 create mode 100644 src/pandroid/gradle/wrapper/gradle-wrapper.jar
 create mode 100644 src/pandroid/gradle/wrapper/gradle-wrapper.properties
 create mode 100755 src/pandroid/gradlew
 create mode 100644 src/pandroid/gradlew.bat
 create mode 100644 src/pandroid/settings.gradle.kts

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c202f80c..2a80b06a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,16 +184,18 @@ set(APPLET_SOURCE_FILES src/core/applets/applet.cpp src/core/applets/mii_selecto
 set(RENDERER_SW_SOURCE_FILES src/core/renderer_sw/renderer_sw.cpp)
 
 # Frontend source files
-if(ENABLE_QT_GUI)
-    set(FRONTEND_SOURCE_FILES src/panda_qt/main.cpp src/panda_qt/screen.cpp src/panda_qt/main_window.cpp src/panda_qt/about_window.cpp)
-    set(FRONTEND_HEADER_FILES include/panda_qt/screen.hpp include/panda_qt/main_window.hpp include/panda_qt/about_window.hpp)
+if(NOT ANDROID)
+    if(ENABLE_QT_GUI)
+        set(FRONTEND_SOURCE_FILES src/panda_qt/main.cpp src/panda_qt/screen.cpp src/panda_qt/main_window.cpp src/panda_qt/about_window.cpp)
+        set(FRONTEND_HEADER_FILES include/panda_qt/screen.hpp include/panda_qt/main_window.hpp include/panda_qt/about_window.hpp)
 
-    source_group("Source Files\\Qt" FILES ${FRONTEND_SOURCE_FILES})
-    source_group("Header Files\\Qt" FILES ${FRONTEND_HEADER_FILES})
-    include_directories(${Qt6Gui_PRIVATE_INCLUDE_DIRS})
-else()
-    set(FRONTEND_SOURCE_FILES src/panda_sdl/main.cpp src/panda_sdl/frontend_sdl.cpp)
-    set(FRONTEND_HEADER_FILES "")
+        source_group("Source Files\\Qt" FILES ${FRONTEND_SOURCE_FILES})
+        source_group("Header Files\\Qt" FILES ${FRONTEND_HEADER_FILES})
+        include_directories(${Qt6Gui_PRIVATE_INCLUDE_DIRS})
+    else()
+        set(FRONTEND_SOURCE_FILES src/panda_sdl/main.cpp src/panda_sdl/frontend_sdl.cpp)
+        set(FRONTEND_HEADER_FILES "")
+    endif()
 endif()
 
 set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.hpp
@@ -378,6 +380,10 @@ if(ENABLE_VULKAN)
     set(ALL_SOURCES ${ALL_SOURCES} ${RENDERER_VK_SOURCE_FILES})
 endif()
 
+if(ANDROID)
+    set(ALL_SOURCES ${ALL_SOURCES} src/jni_driver.cpp)
+endif()
+
 if(BUILD_HYDRA_CORE)
     include_directories(third_party/hydra_core/include)
     add_library(Alber SHARED ${ALL_SOURCES} src/hydra_core.cpp)
@@ -386,11 +392,19 @@ else()
     add_executable(Alber ${ALL_SOURCES})
 endif()
 
+if(ANDROID)
+    target_link_libraries(Alber PRIVATE log)
+endif()
+
 if(ENABLE_LTO OR ENABLE_USER_BUILD)
     set_target_properties(Alber PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
 endif()
 
-target_link_libraries(Alber PRIVATE dynarmic SDL2-static cryptopp glad resources_console_fonts)
+target_link_libraries(Alber PRIVATE dynarmic cryptopp glad resources_console_fonts)
+
+if(NOT ANDROID)
+    target_link_libraries(Alber PRIVATE SDL2-static)
+endif()
 
 if(ENABLE_DISCORD_RPC AND NOT ANDROID)
     target_compile_definitions(Alber PUBLIC "PANDA3DS_ENABLE_DISCORD_RPC=1")
diff --git a/src/emulator.cpp b/src/emulator.cpp
index 81d3ac5c..cd6bbdcb 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -1,6 +1,8 @@
 #include "emulator.hpp"
 
+#ifndef __ANDROID__
 #include <SDL_filesystem.h>
+#endif
 
 #include <fstream>
 
diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
new file mode 100644
index 00000000..c2a00d7b
--- /dev/null
+++ b/src/jni_driver.cpp
@@ -0,0 +1,11 @@
+#include <jni.h>
+#include <android/log.h>
+#include "emulator.hpp"
+
+std::unique_ptr<Emulator> emulator;
+
+extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_Initialize(JNIEnv* env, jobject obj) {
+    __android_log_print(ANDROID_LOG_INFO, "Panda3DS", "Initializing Alber Driver");
+    emulator = std::make_unique<Emulator>();
+    __android_log_print(ANDROID_LOG_INFO, "Panda3DS", "Done");
+}
\ No newline at end of file
diff --git a/src/pandroid/.gitignore b/src/pandroid/.gitignore
new file mode 100644
index 00000000..aa724b77
--- /dev/null
+++ b/src/pandroid/.gitignore
@@ -0,0 +1,15 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
diff --git a/src/pandroid/app/.gitignore b/src/pandroid/app/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/src/pandroid/app/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/src/pandroid/app/build.gradle.kts b/src/pandroid/app/build.gradle.kts
new file mode 100644
index 00000000..ff8debcb
--- /dev/null
+++ b/src/pandroid/app/build.gradle.kts
@@ -0,0 +1,46 @@
+plugins {
+    id("com.android.application")
+}
+
+android {
+    namespace = "com.panda3ds.pandroid"
+    compileSdk = 33
+
+    defaultConfig {
+        applicationId = "com.panda3ds.pandroid"
+        minSdk = 24
+        targetSdk = 33
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+        ndk {
+            abiFilters += listOf("x86_64", "arm64-v8a")
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("com.google.android.material:material:1.8.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+}
\ No newline at end of file
diff --git a/src/pandroid/app/proguard-rules.pro b/src/pandroid/app/proguard-rules.pro
new file mode 100644
index 00000000..481bb434
--- /dev/null
+++ b/src/pandroid/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/AndroidManifest.xml b/src/pandroid/app/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..8047484a
--- /dev/null
+++ b/src/pandroid/app/src/main/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Pandroid"
+        tools:targetApi="31">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
new file mode 100644
index 00000000..55bcd47e
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
@@ -0,0 +1,10 @@
+package com.panda3ds.pandroid;
+
+public class AlberDriver {
+
+    public static native void Initialize();
+
+    static {
+        System.loadLibrary("Alber");
+    }
+}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/MainActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/MainActivity.java
new file mode 100644
index 00000000..e2ab412b
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/MainActivity.java
@@ -0,0 +1,16 @@
+package com.panda3ds.pandroid;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        AlberDriver.Initialize();
+    }
+}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/jniLibs/.gitignore b/src/pandroid/app/src/main/jniLibs/.gitignore
new file mode 100644
index 00000000..0b469178
--- /dev/null
+++ b/src/pandroid/app/src/main/jniLibs/.gitignore
@@ -0,0 +1,2 @@
+# Prebuilt Alber libraries will be placed in this directory, but we don't want to push them to the repo
+libAlber.so
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/jniLibs/arm64-v8a/.gitkeep b/src/pandroid/app/src/main/jniLibs/arm64-v8a/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/pandroid/app/src/main/jniLibs/x86_64/.gitkeep b/src/pandroid/app/src/main/jniLibs/x86_64/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/pandroid/app/src/main/res/drawable/ic_launcher_background.xml b/src/pandroid/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 00000000..07d5da9c
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_launcher_foreground.xml b/src/pandroid/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 00000000..2b068d11
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/activity_main.xml b/src/pandroid/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 00000000..17eab17b
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 00000000..6f3b755b
--- /dev/null
+++ b/src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000..6f3b755b
--- /dev/null
+++ b/src/pandroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3
GIT binary patch
literal 1404
zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r
zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN
zXl<@<#Cm<R)d19?=)E<{+g@mp0C)CAX%7ksNnpX=jPlJEkqD9%o*fC(U7iySOYHHS
zCLH@bXPyI|^Z)Mc^PG7Oc+NfBJO`d7p5;U`M53Wbd!w|M(MUoNRc2m{@^!wFKzL?&
zx_RAc-^9Azxo%DmXW^9GV0~;n_G9&dym)|QrMEx!y_F=oDunn;1y)cvAc6z{0MHiz
zodGIH07w8nF%*bGq9Gv`YHnm80|d1T$uW=u4vGV%tX#>e5f5yr2h%@8TWh?)bSK`O
z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF!
z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!<r*4*+?g*sysFgiN}}d!-T(>jH(_Z*nzTK4
zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG
z?Fe{#<RA5Hg_mG&BZS>9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~
zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd
zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK
zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG<W<SKpuS2eaDGkL-J-
z!+&UV_N0e<DV*|igwqdC*l{lj0T&&`uq=ycU@f9x0i8jzLa(y*X(YV?PCtUw;ks}p
z4zFn7N(-OG^(9ot1ZhYISOWe9?+l%f6v41n+j<OM$_uJgNP?ZJy}hEMMH=;WiG4I`
zs(bIWwSD<LJnAN(E(Xjr4k(^UYF37F_3f{;E%%FEa&I3I0GbdH@{pD5$m+1PN5CW)
zyZ&*9o#8wstdx@^rci;0B4BP2+H4Y<KbJI5L(bXG(k@`Kp=d>8I5h*uf{rn48Z!_@
z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqro<oln8GL@_6LPC)kg1!M)Y!|NCn7b*0sG
zEN=&c2xMM<>a($ne7EUK;#3V<N-jQ7j($tREa0F&-HzYCQtR#fTCZMRN*ZSm;T7a+
zuxa$}zDL8R9wGYkHb$+gJoiM@z+u{u7a_VUBwtd)bPzHxH}C`W=^2PsBr`s7taBMG
zm#Ss=-o`)W8%%x%>YkXaew%Kh^3OrMht<?zOY6P}#rBhn_hrWY$_P`{#CBR9w?+E6
zt7r#NN-tjxFY{9q75P<|L<ZJBHwn4FhG(&i>jYN?XEoY`tRPQsAkH-DSL^QqyN0>^
zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y
z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu
z4)<UE%?IC0Du41FrE~F_qc8nOq>P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6
z>%NbT+5*@L5(I9<vs%8>j@06@(!<!eaZcF<_le1MVaYMg=gRy*f2#IaBH-mJIpy+L
z=Gsbhd6=3>{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W
Kmw_-CKmY()leWbG

literal 0
HcmV?d00001

diff --git a/src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/src/pandroid/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9
GIT binary patch
literal 2898
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

literal 0
HcmV?d00001

diff --git a/src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca
GIT binary patch
literal 982
zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^
z^1csucXz7-Qrhzl9HuH<!ckn_w-(t15itRHmqN0O$B3XH(E|jyV^QXq8=yM`Q**vy
zpEpgQd+no=J<Tlv&+_>B%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N
zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}<p
z;bEy|mw1;}P&gp|0ssKe4*;D3Dlh;r06r}ehC-pC4mGy`3;|+W04+#B4r_x~@mHHy
z)H}bD|I2-n_L$pW;*I)~?=#N<)`92&<$3IR`#<SH6@I&FRQa6xBmQ5wPwJ2PAI(ne
z$L2Yb@JHxb`+bLk*AjR$^`b?pr|?!6=+AboIQ2D-p)UI7x(J0|5(5~ur$_+)`>C%4
zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{
ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT
zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh
zOBLA>$~P3r4b*NcqR;y6pwyhZ<hjKiZs6mOSFB&+cIl`GV$93-<ciUjF#*1^<p~gh
ziQ_{)r0dA7$It&Fe=obxu8n!+elxmgqxPbUL!FxW0;AOfqz@8JOz9Qbm)m-9!^7D)
z480@BoIIb<oT``+rVla8L)8fXO&6}3P9n4v$`6WG<DUNWuKb9J9rUsAn7d-_YWT^U
z{NXl@OAPIJ!>3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu
z(U^&XLW^Q<WhKYr9rXr6*~Tmpuq6NjnD6;;NNBGIg-1ZvfACQ4{ocrwM0)?`oL2ts
zCXY5KT@`(ir63J0?%+_(-dDgf<6R$u{lCdy6Zi5d+Bf;1OXyD;xe3#Gug*&T|0o41
zD8;$|JvUv&@vsLIH&C5+S{!k&{~Z54^y@9r>X7F9Z*SRPpQl{B%x)_AMp^}_v~?j7
zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0
z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@
E0Of=7!T<mO

literal 0
HcmV?d00001

diff --git a/src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/src/pandroid/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..62b611da081676d42f6c3f78a2c91e7bcedddedb
GIT binary patch
literal 1772
zcmV<I1{3*GNk&HG1^@t8MM6+kP&il$0000G0000l001ul06|PpNL&H{00E$D+qP-j
z>Qj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP*
z(X?&brZw<itFzD+K&M3~p69>({`)WU&rdAs1i<RDIiSY82S2mupC8Pt4!H6t1GTb(
zWRM~Q$%>T<R+Yg3{a%pbg++@O@<l(ulw^R7DJ5kYQ(?LhFeMn^80iDc8a#OdFhyzL
zDn(d!5nfX;MJV7nMVO%oPb#QF78@wSOhvdEwtz$5l){XK=|H&u(ZCCOX72e)L;uHO
z1tnw`glk~|XjH3U$_P_d)`A8s=1~}>a0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE
z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TR<yeHWl(T-||IU&i!Rd!TMUruU72
z<l~rLRD-qWW4hw3Q)?MQ93gOvat1wqq{JcosXwejji>Z+cz#eD3f8V;2r-1fE!F}W
zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_<vjH0E1*B
zfk*0C6jY|!Rf=RG!W+$uDg^D?-XzoVrR42)&Y)P6w7*9BP@dq)8yymh;%(CA$R7+o
zloov8A4l6H7NzQ3vsrJ*;3X6j#0T=toMt(L(p9c**S(b_DMgZG<-Trpa|&g3Ns}I1
zKlp(~|M0=q9!(O5aw}K0apy5RZoJ5U{>?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7
zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n
zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u
zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR
zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u*
z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN
zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT
zDL1m&|DVpI<IwA;|3z1u>y=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=*
zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8
z52e1W<DmYW|KhLyAh*AQ$=bd-79$cFL1=dC7E!?lJ(DK_A2rbd*I!fTiWjU@hO@LO
z{34r?8R+y6;5?)6c=hv86*TVD<6h<-YN#p%M+B*z{-U|t?d%$+^@~OhgQ=;&eE7WW
zQMm4(i7@Afmhf}Dnwx!Q1lKgexn~licBP}_&7QY=>U%^L1}15Ex0fF$e@eCT(()_P
zvV?CA<sp1RgQ~qYDHIC(K$HgNSDgI7aFI{AcoU=(>%#Sy08_U6VPt4EtmVQraWJX`
zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4
zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN
z8U5{-<bq**{p6!H-(%Tic#_E`wcN6#HU8-OK@OS$MA~<4ln|3Duf90UXNW1nMhk@X
z!<X~il$GI)0FveT${!;q6+#ptj}^6#CM6bt!8aB|<oIwiQzNU~!^v#E0ATVF@f>yY
zvV{`&WKU2$mZeoBmiJrEd<YP=_2@e1bJ|tRh6}2@09)72_kFh|s|{=Q%;lrD1V0sq
z5(|fB{Q};57E-A$Y;tLp9MPkkDs1?cxgaM#DX)SROj{lUu_=U;L%&QSd(1lwW9=M~
zPXv~y>zUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA
z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)<p
z|22C&(o0<{zD=}o7hFmrnHiNsKS+q5do@k^v7dAg(j37~!7%msUYhV9SAD*hicVK@
zd=IyocF&y5dH^sh4`7M2vQg8OP##~+Eu~vo(S~k<e%FqF9ffGv{w_F?KH5TRvvnu}
O>FJ$wK}0tWNB{uH;AM~i

literal 0
HcmV?d00001

diff --git a/src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0
GIT binary patch
literal 1900
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

literal 0
HcmV?d00001

diff --git a/src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/src/pandroid/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f
GIT binary patch
literal 3918
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

literal 0
HcmV?d00001

diff --git a/src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..28d4b77f9f036a47549d47db79c16788749dca10
GIT binary patch
literal 2884
zcmV-K3%m4ENk&FI3jhFDMM6+kP&il$0000G0001w0055w06|PpNY()W00EFA*|uso
z=UmW3;Ri7@GcyiBW{ey$jes55b5S`|ZVZ{(x$xch{z?D+^{yErVgleVwa9qvGt40r
z42;MG=7<0QySlzE=Ig6%01!FBK^$Fsxe@Hfe6aCy?Wh2r0~}@_lQAF90oTUi0FhEr
z#(<GhM2CTE5->*;kTC<I6%bkw<P!?WpaDI10CfmFPKu1G=p;%VjNdWOy5JfR^IubB
zmWbY`5VOa4^Co4?lA*0$&a)>(r!tQk6;gxj4h%FdHAt(^M3YvYj(!tOeN)+Hvj6+<
zzyJRG?^lZfWuR#t!tUKP&(?%3v&Zd<cNCc=qEAh>$R2YN>lB(Lq`OInY48%4%yTv2
zYe1{G`3)(PDEio5Y@-I5tUf`c%%O<RR41hl;a9a>CJMtSW56g3iEg%3`$7XSJJHyA
z<|7&N)5Xrlgv~%BO24eFd;Hd;uiK%D`EdK|quUeRZDqbh9l)%j%J#0lfrZumvA<_w
zu&=AVvdChf6}eqh(bUz`(`Ue*p01{fBAcTgKyDYLs_I+YyJEk+rM@avU~>fB$n)HS
zM7pfJydu`i%gfS<LN|{i=ttzza$L{zW8L#y$C4ZoauSg-Za~HmA&1d`@TXE%P&gn!
z2><{PF94kZDv$t>06sAkheDzu40NJ$5CMW%n^Lls?8^p^QGWURbKu3ZduZQZ((s2?
zzE`}<{<HFD`<Klx_&=&1@jStQ!GBWei{=~oAN3#D|91cP9<hA@KTtaAf1`iE_5l7p
z{_oR6_8;Nf_OJGn;4k(%=}+Tjk)AMkcQv~rTZfv5m>;Zt7<$C|9R8A~DJ~@%x>TfP
zF>TX8)@v|t)q4GjRt<}5s6hLHwRel7>V@&r-O|Av(yh;Q1A{E>Ir>p+%dHD|=l+lT
zpr(Dg&>#Nu=!)6bCLr-ZS%|;h)Ij$+e@r8_{qO19QvDe=&1tmpY*0lcA^Cc-#{9fQ
z<~$*<&P$Q<_jy#<$40PMofM7aQ}C=jphI`4kLg}Z7CIN#<BNcF_3BC#1Or(Pa6X(x
zm*>26D{-4v-_CA-LiE@(%{y!BzsU%gG`Q?sjLUf%qFSl0y)2#ae*+EI><i9^|McQ6
z&u-wt#o7y!{eZ1mUVdD*Za<g;gIMqY0RI1A80-K3n!MCY=3j$fj0a3c7yP%@*`6F<
zo`Ip>s|i`d^V$Dn)qmzqRq6VJRY|{4ujsIU%#bnqU6MR&-1I_43=|5(6Jr;Jvert)
zE?S|Tmn}Tv<-??sxV5@9t}3D=>YZ0JrQe$CO~|EY=Lj9RM&4svQHPQL6%pV5fPFiH
zfXDx;l@~et{*{U*#c#Dvzu)<y{p<iKevLm%@24Es{u1>|znDO7$#CRx)Z&yp-}<F^
z`~J$vWM;oQpQO>SrD{&|(MQtfUz~n35@RLfUy=aqrhCX0M}J_r5QsK~NmRCR|Nm&L
z41UdsLjWxSUlL41r^0K&nCCK>fdR-!MYjFg(z9_mF^C|#ZQw?`)f6uVzF^`bRnVY&
zo}@M06J&_+>w9@jpaO4snmU;0t-(zYW1qVBHtuD!d?%?AtN7Plp><-1Y8Rqb20ZaP
zTCgn*-Sri4Q8Xn>=gNaWQ57%!D35UkA@ksOlPB*Dvw}t02ENAqw|kFhn%ZyyW%+t{
zNdM!uqEM^;2}f+tECHbwLmH*!nZVrb$-az%t50Y2pg(HqhvY-^-lb}>^6l{$jOI6}
zo_kBzj%8aX|6H5M0Y<)7pzz_wLkIpRm!;PzY)9+24wk2&TT{w--phDGDCOz{cN_ca
zpnm7`$oDy=HX%0i-`769*0M6(e5j-?(?24%)<)&46y0e&6@HCDZAm9W6Ib#Y#BF6-
z=30crHGg+RRTe%VBC>T00OV6F+gQDAK38<n*vA8r%O6>Ne3N9bm|62tPccBJi)5{B
z4zc^Db72XiBd}v$CF|yU{Z=M|DZ%-(XarYNclODlb1Kz1_EKLy(NSLCN`eUl(rBCL
zT*jx@wNvze0|TSqgE(QArOZU)_?qH(sj#TwzElLs9q)(0u!_P|R%Cy_0JFQxgGV>1
zz4?_uq<8_gM0`c*Hh|;UMz~vrg1gQXp{ufg`hM_qU;U>+zmvc5blCLSq@PrEBSGR#
z&8=2Z4uXN`F3p73ueD1l{s{k$WipAvSh5W7ABe?4)t;r@V?y`bNB5FvBuE|0VRTb<
zM1Hn^?DSsJY+sX@T5xW=#>T9VEV|?<(=6|ge$X6Sb05!LFdjDcoq*gM(Zq<f*af)i
zNrX<tMgmsmg+`)u<gVRy&HOky#ont<pVW|J_-$wrA`xxK6{hhd+PXR8vNn*oM*H0|
z1qYtJ28e684_5Ps?yhMANn+G%uO1h`$vWv3s;1>=t;_)Le&jyt(&9jzR73noru`a#
zN*<`KwGa^gZU3-)MSLF0aFag#f0<>E(bYTeHmtdbns#|I)-$)mJ`q9ctQ8g0=ET?|
zdO}eZ*b_p>ygRTtR^5Ggdam=Zb5wmd{}np+Jn1d_=M`~P=M67jj})fH4ztb5yQqQW
z^C|C&^LHAK-u+ooIK)yM)QM?t;|<{P;;{`p=BclzAN#JzL4jCwXkQB1Dy{=^KR`=~
zTrr)y7eiYBzSNs_DvO=4A6#EgGS-zY%Vi)N*Yb`U;6o}KR}dq{r9pT5wqZ@3NOE8-
z9-(}D|Nc5732CSYQbL)!gPQ#RbD8BhK3dl{sUuPvei0tkvnJBxDE<YT0)IF6ZR)Bk
z@)a0nBbA1w8SkQ(D#i5&8jGNWcVh3%MMH8Vt0#Cqs{7rj9lAfnOxdi%ON~J_Lk4Vr
zr{*Y)igLGP+Xld7jyNiw*|X1cmPqh_jE+%>AYTesU8H$)g(Plra{VH(v3u^CO1~(+
zU0O7#)jaS4{NcwA+LuSm&VBcX2#Im3xg)W}ySNw%->orn1taZ&+d)}8gJTqA!u|5P
z{yv?zol_3|(1(%M(EVU=cp?L`{Pi|ixk<Zz{d_OJ{%(afPiA`kGm0)dQ`ag~77r|Y
z&C+7i1_BU!*UJRd(^@b?4zBGXgdZlcPU8~&SFU-ec*eK#s8l5P4x$+w-ol8WnhVHs
z<8AXv+lumqmDSsBEq_1%nCKJHKDdY<XS%xm_eRL@MHf03BP@ZPs+4efWYQybye<P;
z!YgDeDt`-=e#48=xgFFnb3ip6+;21bca6@PSyeFDq6U)Bi{elQF$F^{M8$^wE9+h9
zp|0OT-Yl*F^H*Gl@RJ6Ygk#_Hwne|c{O*=S8hR2WOY7QEb^oD<fAVQQx1i_#15%F~
zSB12atfnDt>{U)*guFML3P!OSlz;zGA#T+E@8@cgQ_mv1o7RSU=Zo_82F?&&2r;WE
z@wk}JHYEZ9nYUc(Vv~iTCa3u8e4q(yq<29VoNbKk<beKrau_(DO?g1SPxl?tXR8kl
zm@B7yS{4nzYa-BC)B<s3ZV|tCLVRY=S6W|%ltS7#@=YN0E{Q~^h`zp6^Ds5_kY-c@
znjlqvzdNqVg-)ddJh>|`mq%I6u)My=gPIDuUb&lzf4`M<g#L>EA9^g8u<af%@W-r>
z)vp8|$$HE9m_BTV?lOosIGa4jud=jIbw)O2eCMfyw2*S8?hjWw^nqws$O*M$3I1)x
zR0PWFb3$ySOcGTe1dz%N0l;RPc`x%05FtT^f^j{Y<u?Msf@VVK=mBY*;G{h}T6alh
i;_JuyfJ;~Um+rnc{a6{0b-ci|^HsjhJK1mm0001WTfUJ1

literal 0
HcmV?d00001

diff --git a/src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/src/pandroid/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..9287f5083623b375139afb391af71cc533a7dd37
GIT binary patch
literal 5914
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

literal 0
HcmV?d00001

diff --git a/src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..aa7d6427e6fa1074b79ccd52ef67ac15c5637e85
GIT binary patch
literal 3844
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
G0001O&w8c+

literal 0
HcmV?d00001

diff --git a/src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/src/pandroid/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000000000000000000000000000000000000..9126ae37cbc3587421d6889eadd1d91fbf1994d4
GIT binary patch
literal 7778
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

literal 0
HcmV?d00001

diff --git a/src/pandroid/app/src/main/res/values-night/themes.xml b/src/pandroid/app/src/main/res/values-night/themes.xml
new file mode 100644
index 00000000..98dd320a
--- /dev/null
+++ b/src/pandroid/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,7 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Base.Theme.Pandroid" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Customize your dark theme here. -->
+        <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
+    </style>
+</resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/colors.xml b/src/pandroid/app/src/main/res/values/colors.xml
new file mode 100644
index 00000000..c8524cd9
--- /dev/null
+++ b/src/pandroid/app/src/main/res/values/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/strings.xml b/src/pandroid/app/src/main/res/values/strings.xml
new file mode 100644
index 00000000..40c0990f
--- /dev/null
+++ b/src/pandroid/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">pandroid</string>
+</resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/themes.xml b/src/pandroid/app/src/main/res/values/themes.xml
new file mode 100644
index 00000000..812da8ea
--- /dev/null
+++ b/src/pandroid/app/src/main/res/values/themes.xml
@@ -0,0 +1,9 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Base.Theme.Pandroid" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Customize your light theme here. -->
+        <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
+    </style>
+
+    <style name="Theme.Pandroid" parent="Base.Theme.Pandroid" />
+</resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/xml/backup_rules.xml b/src/pandroid/app/src/main/res/xml/backup_rules.xml
new file mode 100644
index 00000000..fa0f996d
--- /dev/null
+++ b/src/pandroid/app/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older that API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+    <!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+</full-backup-content>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/xml/data_extraction_rules.xml b/src/pandroid/app/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 00000000..9ee9997b
--- /dev/null
+++ b/src/pandroid/app/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+    <cloud-backup>
+        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <include .../>
+        <exclude .../>
+        -->
+    </cloud-backup>
+    <!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>
\ No newline at end of file
diff --git a/src/pandroid/build.gradle.kts b/src/pandroid/build.gradle.kts
new file mode 100644
index 00000000..c21801c7
--- /dev/null
+++ b/src/pandroid/build.gradle.kts
@@ -0,0 +1,4 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    id("com.android.application") version "8.1.2" apply false
+}
\ No newline at end of file
diff --git a/src/pandroid/gradle.properties b/src/pandroid/gradle.properties
new file mode 100644
index 00000000..3e927b11
--- /dev/null
+++ b/src/pandroid/gradle.properties
@@ -0,0 +1,21 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
\ No newline at end of file
diff --git a/src/pandroid/gradle/wrapper/gradle-wrapper.jar b/src/pandroid/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f
GIT binary patch
literal 59203
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
E2O(~oYXATM

literal 0
HcmV?d00001

diff --git a/src/pandroid/gradle/wrapper/gradle-wrapper.properties b/src/pandroid/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..22c9e5ab
--- /dev/null
+++ b/src/pandroid/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Nov 14 14:40:27 EET 2023
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/src/pandroid/gradlew b/src/pandroid/gradlew
new file mode 100755
index 00000000..4f906e0c
--- /dev/null
+++ b/src/pandroid/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/src/pandroid/gradlew.bat b/src/pandroid/gradlew.bat
new file mode 100644
index 00000000..ac1b06f9
--- /dev/null
+++ b/src/pandroid/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/pandroid/settings.gradle.kts b/src/pandroid/settings.gradle.kts
new file mode 100644
index 00000000..84d1ce30
--- /dev/null
+++ b/src/pandroid/settings.gradle.kts
@@ -0,0 +1,17 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "pandroid"
+include(":app")

From 7a78b2cf20fd6c6fc3ff0b3a844aa5317c1c8b97 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 20 Nov 2023 21:46:20 +0200
Subject: [PATCH 036/162] Fix FS::GetThisSaveDataSecureValue stub

Based on https://github.com/citra-emu/citra/pull/7191
---
 src/core/services/fs.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/services/fs.cpp b/src/core/services/fs.cpp
index 0bcbab37..1f3317fb 100644
--- a/src/core/services/fs.cpp
+++ b/src/core/services/fs.cpp
@@ -670,6 +670,9 @@ void FSService::getThisSaveDataSecureValue(u32 messagePointer) {
 
 	mem.write32(messagePointer, IPC::responseHeader(0x86F, 1, 0));
 	mem.write32(messagePointer + 4, Result::Success);
+	mem.write8(messagePointer + 8, 0); // Secure value does not exist
+	mem.write8(messagePointer + 12, 1); // TODO: What is this?
+	mem.write64(messagePointer + 16, 0); // Secure value
 }
 
 void FSService::setThisSaveDataSecureValue(u32 messagePointer) {
@@ -760,4 +763,4 @@ void FSService::renameFile(u32 messagePointer) {
 	// Everything is OK, let's do the rename. Both archives should match so we don't need the dest anymore
 	const HorizonResult res = sourceArchive->archive->renameFile(sourcePath, destPath);
 	mem.write32(messagePointer + 4, static_cast<u32>(res));
-}
\ No newline at end of file
+}

From a87397a2145cceafe9b1a4f224ca9822eaf0f061 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Tue, 21 Nov 2023 00:57:05 +0200
Subject: [PATCH 037/162] Add renderer/surface view files

---
 CMakeLists.txt                                |  2 +-
 src/jni_driver.cpp                            | 31 +++++++-
 .../com/panda3ds/pandroid/AlberDriver.java    |  6 ++
 .../com/panda3ds/pandroid/MainActivity.java   |  9 ++-
 .../panda3ds/pandroid/PandaGlRenderer.java    | 79 +++++++++++++++++++
 .../panda3ds/pandroid/PandaGlSurfaceView.java | 19 +++++
 6 files changed, 140 insertions(+), 6 deletions(-)
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlRenderer.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlSurfaceView.java

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a80b06a..4aa4456a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -393,7 +393,7 @@ else()
 endif()
 
 if(ANDROID)
-    target_link_libraries(Alber PRIVATE log)
+    target_link_libraries(Alber PRIVATE EGL log)
 endif()
 
 if(ENABLE_LTO OR ENABLE_USER_BUILD)
diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index c2a00d7b..11d19963 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -1,11 +1,36 @@
 #include <jni.h>
+#include <stdexcept>
 #include <android/log.h>
+#include <EGL/egl.h>
+#include "renderer_gl/renderer_gl.hpp"
 #include "emulator.hpp"
 
-std::unique_ptr<Emulator> emulator;
+std::unique_ptr<Emulator> emulator = nullptr;
+RendererGL* renderer = nullptr;
 
 extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_Initialize(JNIEnv* env, jobject obj) {
-    __android_log_print(ANDROID_LOG_INFO, "Panda3DS", "Initializing Alber Driver");
     emulator = std::make_unique<Emulator>();
-    __android_log_print(ANDROID_LOG_INFO, "Panda3DS", "Done");
+    if (emulator->getRendererType() != RendererType::OpenGL) {
+        throw std::runtime_error("Renderer is not OpenGL");
+    }
+    renderer = static_cast<RendererGL*>(emulator->getRenderer());
+    __android_log_print(ANDROID_LOG_INFO, "AlberDriver", "OpenGL ES Before %d.%d", GLVersion.major, GLVersion.minor);
+    if (!gladLoadGLES2Loader(reinterpret_cast<GLADloadproc>(eglGetProcAddress))) {
+		throw std::runtime_error("OpenGL ES init failed");
+	}
+    __android_log_print(ANDROID_LOG_INFO, "AlberDriver", "OpenGL ES %d.%d", GLVersion.major, GLVersion.minor);
+	emulator->initGraphicsContext(nullptr);
+    // girlboss it for now :3
+    emulator->loadROM("/data/data/com.panda3ds.pandroid/files/rom.3ds");
+}
+
+extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_RunFrame(JNIEnv* env, jobject obj, jint fbo) {
+    renderer->setFBO(fbo);
+    renderer->resetStateManager();
+    emulator->runFrame();
+}
+
+extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_Finalize(JNIEnv* env, jobject obj) {
+    emulator = nullptr;
+    renderer = nullptr;
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
index 55bcd47e..da3b2020 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
@@ -2,7 +2,13 @@ package com.panda3ds.pandroid;
 
 public class AlberDriver {
 
+    AlberDriver() {
+        super();
+    }
+
     public static native void Initialize();
+    public static native void RunFrame(int fbo);
+    public static native void Finalize();
 
     static {
         System.loadLibrary("Alber");
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/MainActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/MainActivity.java
index e2ab412b..8cb6b6d1 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/MainActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/MainActivity.java
@@ -2,15 +2,20 @@ package com.panda3ds.pandroid;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.os.Build;
 import android.os.Bundle;
+import android.view.WindowInsets;
+import android.view.View;
 
 public class MainActivity extends AppCompatActivity {
 
+    PandaGlSurfaceView glView;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
 
-        AlberDriver.Initialize();
+        glView = new PandaGlSurfaceView(this);
+        setContentView(glView);
     }
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlRenderer.java
new file mode 100644
index 00000000..cc6499e6
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlRenderer.java
@@ -0,0 +1,79 @@
+package com.panda3ds.pandroid;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+import static android.opengl.GLES32.*;
+
+import android.content.res.Resources;
+import android.opengl.GLSurfaceView;
+import android.util.DisplayMetrics;
+import android.util.Log;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+
+public class PandaGlRenderer implements GLSurfaceView.Renderer {
+    int screenWidth, screenHeight;
+    int screenTexture;
+    public int screenFbo;
+
+    PandaGlRenderer() {
+        super();
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+        if (screenTexture != 0) {
+            glDeleteTextures(1, new int[]{screenTexture}, 0);
+        }
+        if (screenFbo != 0) {
+            glDeleteFramebuffers(1, new int[]{screenFbo}, 0);
+        }
+        super.finalize();
+    }
+    
+    public void onSurfaceCreated(GL10 unused, EGLConfig config) {
+        Log.i("pandroid", glGetString(GL_EXTENSIONS));
+        Log.w("pandroid", glGetString(GL_VERSION));
+        screenWidth = Resources.getSystem().getDisplayMetrics().widthPixels;
+        screenHeight = Resources.getSystem().getDisplayMetrics().heightPixels;
+
+        glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+        glClear(GL_COLOR_BUFFER_BIT);
+
+        int[] generateBuffer = new int[1];
+        glGenTextures(1, generateBuffer, 0);
+        screenTexture = generateBuffer[0];
+        glBindTexture(GL_TEXTURE_2D, screenTexture);
+        glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, screenWidth, screenHeight);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+        glBindTexture(GL_TEXTURE_2D, 0);
+
+        glGenFramebuffers(1, generateBuffer, 0);
+        screenFbo = generateBuffer[0];
+        glBindFramebuffer(GL_FRAMEBUFFER, screenFbo);
+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, screenTexture, 0);
+        glBindFramebuffer(GL_FRAMEBUFFER, 0);
+
+        AlberDriver.Initialize();
+    }
+
+    public void onDrawFrame(GL10 unused) {
+        AlberDriver.RunFrame(screenFbo);
+        // is this needed? prob not
+        glBindTexture(GL_TEXTURE_2D, 0);
+        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+        glBindFramebuffer(GL_READ_FRAMEBUFFER, screenFbo);
+        glBlitFramebuffer(0, 0, 400, 480, 0, 0, screenWidth, screenHeight, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+    }
+
+    public void onSurfaceChanged(GL10 unused, int width, int height) {
+        glViewport(0, 0, width, height);
+        screenWidth = width;
+        screenHeight = height;
+        glDisable(GL_SCISSOR_TEST);
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlSurfaceView.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlSurfaceView.java
new file mode 100644
index 00000000..657b327c
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlSurfaceView.java
@@ -0,0 +1,19 @@
+package com.panda3ds.pandroid;
+
+import android.app.Activity;
+import android.content.Context;
+import android.opengl.GLSurfaceView;
+import android.util.DisplayMetrics;
+
+import com.panda3ds.pandroid.PandaGlRenderer;
+
+public class PandaGlSurfaceView extends GLSurfaceView {
+    final PandaGlRenderer renderer;
+
+    public PandaGlSurfaceView(Context context) {
+        super(context);
+        setEGLContextClientVersion(3);
+        renderer = new PandaGlRenderer();
+        setRenderer(renderer);
+    }
+}
\ No newline at end of file

From 3f9c8d85355099cd1817fc557912120557d74059 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Tue, 21 Nov 2023 02:55:37 +0200
Subject: [PATCH 038/162] Silly filepicker

---
 src/jni_driver.cpp                            |  14 +-
 src/pandroid/app/src/main/AndroidManifest.xml |   2 +-
 .../com/panda3ds/pandroid/AlberDriver.java    |   2 +
 .../com/panda3ds/pandroid/MainActivity.java   |  48 ++++++-
 .../panda3ds/pandroid/PandaGlRenderer.java    |  12 +-
 .../java/com/panda3ds/pandroid/PathUtils.java | 125 ++++++++++++++++++
 6 files changed, 193 insertions(+), 10 deletions(-)
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/PathUtils.java

diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index 11d19963..74ac0732 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -7,6 +7,7 @@
 
 std::unique_ptr<Emulator> emulator = nullptr;
 RendererGL* renderer = nullptr;
+bool romLoaded = false;
 
 extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_Initialize(JNIEnv* env, jobject obj) {
     emulator = std::make_unique<Emulator>();
@@ -20,8 +21,6 @@ extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_Initial
 	}
     __android_log_print(ANDROID_LOG_INFO, "AlberDriver", "OpenGL ES %d.%d", GLVersion.major, GLVersion.minor);
 	emulator->initGraphicsContext(nullptr);
-    // girlboss it for now :3
-    emulator->loadROM("/data/data/com.panda3ds.pandroid/files/rom.3ds");
 }
 
 extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_RunFrame(JNIEnv* env, jobject obj, jint fbo) {
@@ -33,4 +32,15 @@ extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_RunFram
 extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_Finalize(JNIEnv* env, jobject obj) {
     emulator = nullptr;
     renderer = nullptr;
+}
+
+extern "C" JNIEXPORT jboolean JNICALL Java_com_panda3ds_pandroid_AlberDriver_HasRomLoaded(JNIEnv* env, jobject obj) {
+    return romLoaded;
+}
+
+extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_LoadRom(JNIEnv* env, jobject obj, jstring path) {
+    const char* pathStr = env->GetStringUTFChars(path, nullptr);
+    __android_log_print(ANDROID_LOG_INFO, "AlberDriver", "Loading ROM %s", pathStr);
+    romLoaded = emulator->loadROM(pathStr);
+    env->ReleaseStringUTFChars(path, pathStr);
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/AndroidManifest.xml b/src/pandroid/app/src/main/AndroidManifest.xml
index 8047484a..0effd35f 100644
--- a/src/pandroid/app/src/main/AndroidManifest.xml
+++ b/src/pandroid/app/src/main/AndroidManifest.xml
@@ -22,5 +22,5 @@
             </intent-filter>
         </activity>
     </application>
-
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage"/>
 </manifest>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
index da3b2020..1021e1d2 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
@@ -8,6 +8,8 @@ public class AlberDriver {
 
     public static native void Initialize();
     public static native void RunFrame(int fbo);
+    public static native boolean HasRomLoaded();
+    public static native void LoadRom(String path);
     public static native void Finalize();
 
     static {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/MainActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/MainActivity.java
index 8cb6b6d1..b7b3726d 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/MainActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/MainActivity.java
@@ -1,21 +1,67 @@
 package com.panda3ds.pandroid;
 
 import androidx.appcompat.app.AppCompatActivity;
+import static android.provider.Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION;
 
+import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.WindowInsets;
 import android.view.View;
+import android.os.Environment;
+import android.widget.Toast;
+import android.widget.FrameLayout;
+import com.panda3ds.pandroid.PathUtils;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 public class MainActivity extends AppCompatActivity {
 
     PandaGlSurfaceView glView;
 
+    private static final int PICK_3DS_ROM = 2;
+
+    private void openFile() {
+        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("*/*");
+        startActivityForResult(intent, PICK_3DS_ROM);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        if (!Environment.isExternalStorageManager()) {
+            Intent intent = new Intent(ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
+            startActivity(intent);
+        }
+        
         glView = new PandaGlSurfaceView(this);
         setContentView(glView);
+        FloatingActionButton fab = new FloatingActionButton(this);
+        fab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                openFile();
+            }
+        });
+        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(200, 200);
+        addContentView(fab, params);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == PICK_3DS_ROM) {
+            if (resultCode == RESULT_OK) {
+                String path = PathUtils.getPath(getApplicationContext(), data.getData());
+                Toast.makeText(getApplicationContext(), "pandroid opening " + path, Toast.LENGTH_LONG).show();
+                glView.queueEvent(new Runnable() {
+                    @Override
+                    public void run() {
+                        AlberDriver.LoadRom(path);
+                    }
+                });
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlRenderer.java
index cc6499e6..cb6f90da 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlRenderer.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlRenderer.java
@@ -62,12 +62,12 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer {
     }
 
     public void onDrawFrame(GL10 unused) {
-        AlberDriver.RunFrame(screenFbo);
-        // is this needed? prob not
-        glBindTexture(GL_TEXTURE_2D, 0);
-        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
-        glBindFramebuffer(GL_READ_FRAMEBUFFER, screenFbo);
-        glBlitFramebuffer(0, 0, 400, 480, 0, 0, screenWidth, screenHeight, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+        if (AlberDriver.HasRomLoaded()) {
+            AlberDriver.RunFrame(screenFbo);
+            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+            glBindFramebuffer(GL_READ_FRAMEBUFFER, screenFbo);
+            glBlitFramebuffer(0, 0, 400, 480, 0, 0, screenWidth, screenHeight, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+        }
     }
 
     public void onSurfaceChanged(GL10 unused, int width, int height) {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PathUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PathUtils.java
new file mode 100644
index 00000000..740223eb
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PathUtils.java
@@ -0,0 +1,125 @@
+package com.panda3ds.pandroid;
+
+import android.content.ContentUris;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.provider.DocumentsContract;
+import android.provider.MediaStore;
+
+public class PathUtils {
+
+    public static String getPath(final Context context, final Uri uri) {
+
+        // DocumentProvider
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && DocumentsContract.isDocumentUri(context, uri)) {
+
+            if (isExternalStorageDocument(uri)) {// ExternalStorageProvider
+                final String docId = DocumentsContract.getDocumentId(uri);
+                final String[] split = docId.split(":");
+                final String type = split[0];
+                String storageDefinition;
+
+
+                if("primary".equalsIgnoreCase(type)){
+
+                    return Environment.getExternalStorageDirectory() + "/" + split[1];
+
+                } else {
+
+                    if(Environment.isExternalStorageRemovable()){
+                        storageDefinition = "EXTERNAL_STORAGE";
+
+                    } else{
+                        storageDefinition = "SECONDARY_STORAGE";
+                    }
+
+                    return System.getenv(storageDefinition) + "/" + split[1];
+                }
+            
+            } else if (isDownloadsDocument(uri)) {// DownloadsProvider
+
+                final String id = DocumentsContract.getDocumentId(uri);
+                final Uri contentUri = ContentUris.withAppendedId(
+                        Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
+
+                return getDataColumn(context, contentUri, null, null);
+
+            } else if (isMediaDocument(uri)) {// MediaProvider
+                final String docId = DocumentsContract.getDocumentId(uri);
+                final String[] split = docId.split(":");
+                final String type = split[0];
+
+                Uri contentUri = null;
+                if ("image".equals(type)) {
+                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+                } else if ("video".equals(type)) {
+                contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+                } else if ("audio".equals(type)) {
+                    contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+                }
+
+                final String selection = "_id=?";
+                final String[] selectionArgs = new String[]{
+                        split[1]
+                };
+
+                return getDataColumn(context, contentUri, selection, selectionArgs);
+            }
+
+        } else if ("content".equalsIgnoreCase(uri.getScheme())) {// MediaStore (and general)
+
+            // Return the remote address
+            if (isGooglePhotosUri(uri))
+                return uri.getLastPathSegment();
+
+            return getDataColumn(context, uri, null, null);
+
+        } else if ("file".equalsIgnoreCase(uri.getScheme())) {// File
+            return uri.getPath();
+        }
+
+        return null;
+    }
+
+    public static String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
+
+        Cursor cursor = null;
+        final String column = "_data";
+        final String[] projection = {
+                column
+        };
+
+        try {
+            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
+            if (cursor != null && cursor.moveToFirst()) {
+                final int column_index = cursor.getColumnIndexOrThrow(column);
+                return cursor.getString(column_index);
+            }
+        } finally {
+            if (cursor != null)
+                cursor.close();
+        }
+        return null;
+    }
+
+
+    public static boolean isExternalStorageDocument(Uri uri) {
+        return "com.android.externalstorage.documents".equals(uri.getAuthority());
+    }
+
+
+    public static boolean isDownloadsDocument(Uri uri) {
+        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
+    }
+
+    public static boolean isMediaDocument(Uri uri) {
+        return "com.android.providers.media.documents".equals(uri.getAuthority());
+    }
+
+    public static boolean isGooglePhotosUri(Uri uri) {
+        return "com.google.android.apps.photos.content".equals(uri.getAuthority());
+    }
+}
\ No newline at end of file

From 070d5b1c6dad1878dd95fbc4c33e24425e6e73d5 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 28 Nov 2023 12:08:25 +0200
Subject: [PATCH 039/162] Fix configuration file path on Android

---
 include/config.hpp   |  6 ++++--
 include/emulator.hpp |  3 +++
 include/helpers.hpp  |  7 +++++++
 src/config.cpp       | 11 +++++++----
 src/emulator.cpp     | 27 ++++++++++++++++++++-------
 5 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/include/config.hpp b/include/config.hpp
index 326ab203..424d0741 100644
--- a/include/config.hpp
+++ b/include/config.hpp
@@ -17,7 +17,9 @@ struct EmulatorConfig {
 	// Default to 3% battery to make users suffer
 	int batteryPercentage = 3;
 
+	std::filesystem::path filePath;
+
 	EmulatorConfig(const std::filesystem::path& path);
-	void load(const std::filesystem::path& path);
-	void save(const std::filesystem::path& path);
+	void load();
+	void save();
 };
\ No newline at end of file
diff --git a/include/emulator.hpp b/include/emulator.hpp
index 2da76847..d992b331 100644
--- a/include/emulator.hpp
+++ b/include/emulator.hpp
@@ -122,4 +122,7 @@ class Emulator {
 	RendererType getRendererType() const { return config.rendererType; }
 	Renderer* getRenderer() { return gpu.getRenderer(); }
 	u64 getTicks() { return cpu.getTicks(); }
+
+	std::filesystem::path getConfigPath();
+	std::filesystem::path getAndroidAppPath();
 };
diff --git a/include/helpers.hpp b/include/helpers.hpp
index 9082cc54..037c8976 100644
--- a/include/helpers.hpp
+++ b/include/helpers.hpp
@@ -90,6 +90,13 @@ namespace Helpers {
 		return false;
 	}
 
+	static constexpr bool isAndroid() {
+#ifdef __ANDROID__
+		return true;
+#endif
+		return false;
+	}
+
 	static void debug_printf(const char* fmt, ...) {
 		if constexpr (buildingInDebugMode()) {
 			std::va_list args;
diff --git a/src/config.cpp b/src/config.cpp
index 59ee78f6..28946d52 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -11,13 +11,15 @@
 // We are legally allowed, as per the author's wish, to use the above code without any licensing restrictions
 // However we still want to follow the license as closely as possible and offer the proper attributions.
 
-EmulatorConfig::EmulatorConfig(const std::filesystem::path& path) { load(path); }
+EmulatorConfig::EmulatorConfig(const std::filesystem::path& path) : filePath(path) { load(); }
+
+void EmulatorConfig::load() {
+	const std::filesystem::path& path = filePath;
 
-void EmulatorConfig::load(const std::filesystem::path& path) {
 	// If the configuration file does not exist, create it and return
 	std::error_code error;
 	if (!std::filesystem::exists(path, error)) {
-		save(path);
+		save();
 		return;
 	}
 
@@ -84,8 +86,9 @@ void EmulatorConfig::load(const std::filesystem::path& path) {
 	}
 }
 
-void EmulatorConfig::save(const std::filesystem::path& path) {
+void EmulatorConfig::save() {
 	toml::basic_value<toml::preserve_comments> data;
+	const std::filesystem::path& path = filePath;
 
 	std::error_code error;
 	if (std::filesystem::exists(path, error)) {
diff --git a/src/emulator.cpp b/src/emulator.cpp
index 81d3ac5c..bcd74966 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -15,7 +15,7 @@ __declspec(dllexport) DWORD AmdPowerXpressRequestHighPerformance = 1;
 #endif
 
 Emulator::Emulator()
-	: config(std::filesystem::current_path() / "config.toml"), kernel(cpu, memory, gpu, config), cpu(memory, kernel), gpu(memory, config),
+	: config(getConfigPath()), kernel(cpu, memory, gpu, config), cpu(memory, kernel), gpu(memory, config),
 	  memory(cpu.getTicksRef(), config), cheats(memory, kernel.getServiceManager().getHID()), lua(memory), running(false), programRunning(false)
 #ifdef PANDA3DS_ENABLE_HTTP_SERVER
 	  , httpServer(this)
@@ -31,7 +31,7 @@ Emulator::Emulator()
 }
 
 Emulator::~Emulator() {
-	config.save(std::filesystem::current_path() / "config.toml");
+	config.save();
 	lua.close();
 
 #ifdef PANDA3DS_ENABLE_DISCORD_RPC
@@ -68,6 +68,23 @@ void Emulator::reset(ReloadOption reload) {
 	}
 }
 
+std::filesystem::path Emulator::getAndroidAppPath() {
+	// SDL_GetPrefPath fails to get the path due to no JNI environment
+	std::ifstream cmdline("/proc/self/cmdline");
+	std::string applicationName;
+	std::getline(cmdline, applicationName, '\0');
+
+	return std::filesystem::path("/data") / "data" / applicationName / "files";
+}
+
+std::filesystem::path Emulator::getConfigPath() {
+	if constexpr (Helpers::isAndroid()) {
+		return getAndroidAppPath() / "config.toml";
+	} else {
+		return std::filesystem::current_path() / "config.toml";
+	}
+}
+
 void Emulator::step() {}
 void Emulator::render() {}
 
@@ -115,11 +132,7 @@ bool Emulator::loadROM(const std::filesystem::path& path) {
 	std::filesystem::path appDataPath;
 
 	#ifdef __ANDROID__
-	// SDL_GetPrefPath fails to get the path due to no JNI environment
-	std::ifstream cmdline("/proc/self/cmdline");
-	std::string applicationName;
-	std::getline(cmdline, applicationName, '\0');
-	appDataPath = std::filesystem::path("/data") / "data" / applicationName / "files";
+	appDataPath = getAndroidAppPath();
 	#else
 	char* appData;
 	if (!config.usePortableBuild) {

From 62880f0fd6f8d7a68b8deb09a63a41927fe0229c Mon Sep 17 00:00:00 2001
From: gabriel <gabrielcacoal400@gmail.com>
Date: Sat, 25 Nov 2023 17:51:17 -0400
Subject: [PATCH 040/162] [Android]Add input

---
 .github/workflows/Android_Build.yml           |  89 +++++++++++
 patch.patch                                   | 118 ++++++++++++++
 src/jni_driver.cpp                            |  30 +++-
 src/pandroid/app/src/main/AndroidManifest.xml |  16 +-
 .../com/panda3ds/pandroid/AlberDriver.java    |   6 +
 .../panda3ds/pandroid/PandaGlSurfaceView.java |  19 ---
 .../panda3ds/pandroid/app/BaseActivity.java   |   6 +
 .../panda3ds/pandroid/app/GameActivity.java   |  56 +++++++
 .../pandroid/{ => app}/MainActivity.java      |  49 +++---
 .../com/panda3ds/pandroid/math/Vector2.java   |  23 +++
 .../panda3ds/pandroid/utils/Constants.java    |  23 +++
 .../pandroid/{ => utils}/PathUtils.java       |   2 +-
 .../pandroid/{ => view}/PandaGlRenderer.java  |  54 +++++--
 .../pandroid/view/PandaGlSurfaceView.java     |  20 +++
 .../pandroid/view/PandaLayoutController.java  |  62 ++++++++
 .../view/controller/ControllerLayout.java     | 146 ++++++++++++++++++
 .../view/controller/ControllerNode.java       |  24 +++
 .../pandroid/view/controller/TouchEvent.java  |  28 ++++
 .../listeners/ButtonStateListener.java        |   7 +
 .../listeners/JoystickListener.java           |   7 +
 .../controller/nodes/BasicControllerNode.java |  24 +++
 .../view/controller/nodes/Button.java         |  73 +++++++++
 .../view/controller/nodes/Joystick.java       | 132 ++++++++++++++++
 .../res/drawable/screen_gamepad_checkbox.xml  |   5 +
 .../main/res/drawable/screen_gamepad_hide.xml |   9 ++
 .../main/res/drawable/screen_gamepad_show.xml |   5 +
 .../res/drawable/simple_analog_background.xml |  19 +++
 .../main/res/drawable/simple_card_button.xml  |  12 ++
 .../res/drawable/simple_card_button_left.xml  |  12 ++
 .../res/drawable/simple_card_button_right.xml |  12 ++
 .../res/drawable/simple_circle_button.xml     |  10 ++
 .../app/src/main/res/layout/activity_main.xml |  26 ++--
 .../src/main/res/layout/controller_dpad.xml   |  28 ++++
 .../main/res/layout/controller_gamepad.xml    |  32 ++++
 .../app/src/main/res/layout/game_activity.xml | 127 +++++++++++++++
 .../app/src/main/res/values/strings.xml       |   1 +
 .../app/src/main/res/values/styleable.xml     |  10 ++
 37 files changed, 1245 insertions(+), 77 deletions(-)
 create mode 100644 .github/workflows/Android_Build.yml
 create mode 100644 patch.patch
 delete mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlSurfaceView.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
 rename src/pandroid/app/src/main/java/com/panda3ds/pandroid/{ => app}/MainActivity.java (50%)
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
 rename src/pandroid/app/src/main/java/com/panda3ds/pandroid/{ => utils}/PathUtils.java (99%)
 rename src/pandroid/app/src/main/java/com/panda3ds/pandroid/{ => view}/PandaGlRenderer.java (57%)
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/ButtonStateListener.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/JoystickListener.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/BasicControllerNode.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Button.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java
 create mode 100644 src/pandroid/app/src/main/res/drawable/screen_gamepad_checkbox.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/screen_gamepad_hide.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/screen_gamepad_show.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/simple_analog_background.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/simple_card_button.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/simple_card_button_left.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/simple_card_button_right.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/simple_circle_button.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/controller_dpad.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/controller_gamepad.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/game_activity.xml
 create mode 100644 src/pandroid/app/src/main/res/values/styleable.xml

diff --git a/.github/workflows/Android_Build.yml b/.github/workflows/Android_Build.yml
new file mode 100644
index 00000000..c94140d7
--- /dev/null
+++ b/.github/workflows/Android_Build.yml
@@ -0,0 +1,89 @@
+name: Android Build
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  x64:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Fetch submodules
+      run: git submodule update --init --recursive
+
+    - name: Setup Vulkan SDK
+      uses: humbletim/setup-vulkan-sdk@v1.2.0
+      with:
+        vulkan-query-version: latest
+        vulkan-use-cache: true
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
+
+    - name: Setup Java
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'zulu' # See 'Supported distributions' for available options
+        java-version: '17'
+
+    - name: Configure CMake
+      run: cmake -B ${{github.workspace}}/build -DBUILD_HYDRA_CORE=1 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=x86_64 -DENABLE_VULKAN=0
+
+    - name: Build
+      run: |
+        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        mv ./build/libAlber.so ./src/pandroid/app/src/main/jniLibs/x86_64/
+        cd src/pandroid
+        ./gradlew assembleDebug
+        cd ../..
+
+    - name: Upload executable
+      uses: actions/upload-artifact@v2
+      with:
+        name: Android APK (x86-64)
+        path: './src/pandroid/app/build/outputs/apk/debug/app-debug.apk'
+
+  arm64:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Fetch submodules
+      run: git submodule update --init --recursive
+
+    - name: Setup Vulkan SDK
+      uses: humbletim/setup-vulkan-sdk@v1.2.0
+      with:
+        vulkan-query-version: latest
+        vulkan-use-cache: true
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
+
+    - name: Setup Java
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'zulu' # See 'Supported distributions' for available options
+        java-version: '17'
+
+    - name: Configure CMake
+      run: cmake -B ${{github.workspace}}/build -DBUILD_HYDRA_CORE=1 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DENABLE_VULKAN=0 -DCMAKE_CXX_FLAGS="-march=armv8.1-a+crypto"
+
+    - name: Build
+      run: |
+        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        mv ./build/libAlber.so ./src/pandroid/app/src/main/jniLibs/arm64-v8a/
+        cd src/pandroid
+        ./gradlew assembleDebug
+        cd ../..
+
+    - name: Upload executable
+      uses: actions/upload-artifact@v2
+      with:
+        name: Android APK (arm64)
+        path: './src/pandroid/app/build/outputs/apk/debug/app-debug.apk'
+
diff --git a/patch.patch b/patch.patch
new file mode 100644
index 00000000..98cad32b
--- /dev/null
+++ b/patch.patch
@@ -0,0 +1,118 @@
+diff --git a/src/host_shaders/opengl_display.frag b/src/host_shaders/opengl_display.frag
+index 612671c8..1937f711 100644
+--- a/src/host_shaders/opengl_display.frag
++++ b/src/host_shaders/opengl_display.frag
+@@ -1,4 +1,5 @@
+-#version 410 core
++#version 300 es
++precision mediump float;
+ in vec2 UV;
+ out vec4 FragColor;
+ 
+diff --git a/src/host_shaders/opengl_display.vert b/src/host_shaders/opengl_display.vert
+index 990e2f80..6917c23c 100644
+--- a/src/host_shaders/opengl_display.vert
++++ b/src/host_shaders/opengl_display.vert
+@@ -1,4 +1,4 @@
+-#version 410 core
++#version 300 es
+ out vec2 UV;
+ 
+ void main() {
+diff --git a/src/host_shaders/opengl_fragment_shader.frag b/src/host_shaders/opengl_fragment_shader.frag
+index f6fa6c55..b0850438 100644
+--- a/src/host_shaders/opengl_fragment_shader.frag
++++ b/src/host_shaders/opengl_fragment_shader.frag
+@@ -1,4 +1,5 @@
+-#version 410 core
++#version 300 es
++precision mediump float;
+ 
+ in vec3 v_tangent;
+ in vec3 v_normal;
+@@ -27,7 +28,7 @@ uniform bool u_depthmapEnable;
+ uniform sampler2D u_tex0;
+ uniform sampler2D u_tex1;
+ uniform sampler2D u_tex2;
+-uniform sampler1DArray u_tex_lighting_lut;
++// uniform sampler1DArray u_tex_lighting_lut;
+ 
+ uniform uint u_picaRegs[0x200 - 0x48];
+ 
+@@ -145,9 +146,15 @@ vec4 tevCalculateCombiner(int tev_id) {
+ #define RR_LUT 6u
+ 
+ float lutLookup(uint lut, uint light, float value) {
+-	if (lut >= FR_LUT && lut <= RR_LUT) lut -= 1;
+-	if (lut == SP_LUT) lut = light + 8;
+-	return texture(u_tex_lighting_lut, vec2(value, lut)).r;
++	// if (lut >= FR_LUT && lut <= RR_LUT) lut -= 1;
++	// if (lut == SP_LUT) lut = light + 8;
++	// return texture(u_tex_lighting_lut, vec2(value, lut)).r;
++	return 0.0;
++}
++
++uint bitfieldExtract(uint val, int off, int size) {
++    uint mask = uint((1 << size) - 1);
++    return uint(val >> off) & mask;
+ }
+ 
+ vec3 regToColor(uint reg) {
+diff --git a/src/host_shaders/opengl_vertex_shader.vert b/src/host_shaders/opengl_vertex_shader.vert
+index a25d7a6d..5967ccd6 100644
+--- a/src/host_shaders/opengl_vertex_shader.vert
++++ b/src/host_shaders/opengl_vertex_shader.vert
+@@ -1,4 +1,4 @@
+-#version 410 core
++#version 300 es
+ 
+ layout(location = 0) in vec4 a_coords;
+ layout(location = 1) in vec4 a_quaternion;
+@@ -20,7 +20,7 @@ out vec2 v_texcoord2;
+ flat out vec4 v_textureEnvColor[6];
+ flat out vec4 v_textureEnvBufferColor;
+ 
+-out float gl_ClipDistance[2];
++// out float gl_ClipDistance[2];
+ 
+ // TEV uniforms
+ uniform uint u_textureEnvColor[6];
+@@ -93,6 +93,6 @@ void main() {
+ 	);
+ 
+ 	// There's also another, always-on clipping plane based on vertex z
+-	gl_ClipDistance[0] = -a_coords.z;
+-	gl_ClipDistance[1] = dot(clipData, a_coords);
++	// gl_ClipDistance[0] = -a_coords.z;
++	// gl_ClipDistance[1] = dot(clipData, a_coords);
+ }
+diff --git a/third_party/opengl/opengl.hpp b/third_party/opengl/opengl.hpp
+index f368f573..5ead7f63 100644
+--- a/third_party/opengl/opengl.hpp
++++ b/third_party/opengl/opengl.hpp
+@@ -520,21 +520,21 @@ namespace OpenGL {
+ 	static void enableBlend() { glEnable(GL_BLEND); }
+ 	static void disableBlend() { glDisable(GL_BLEND); }
+ 	static void enableLogicOp() { glEnable(GL_COLOR_LOGIC_OP); }
+-	static void disableLogicOp() { glDisable(GL_COLOR_LOGIC_OP); }
++	static void disableLogicOp() { /* glDisable(GL_COLOR_LOGIC_OP); */ }
+ 	static void enableDepth() { glEnable(GL_DEPTH_TEST); }
+ 	static void disableDepth() { glDisable(GL_DEPTH_TEST); }
+ 	static void enableStencil() { glEnable(GL_STENCIL_TEST); }
+ 	static void disableStencil() { glDisable(GL_STENCIL_TEST); }
+ 
+-	static void enableClipPlane(GLuint index) { glEnable(GL_CLIP_DISTANCE0 + index); }
+-	static void disableClipPlane(GLuint index) { glDisable(GL_CLIP_DISTANCE0 + index); }
++	static void enableClipPlane(GLuint index) { /* glEnable(GL_CLIP_DISTANCE0 + index); */ }
++	static void disableClipPlane(GLuint index) { /* glDisable(GL_CLIP_DISTANCE0 + index); */ }
+ 
+ 	static void setDepthFunc(DepthFunc func) { glDepthFunc(static_cast<GLenum>(func)); }
+ 	static void setColourMask(GLboolean r, GLboolean g, GLboolean b, GLboolean a) { glColorMask(r, g, b, a); }
+ 	static void setDepthMask(GLboolean mask) { glDepthMask(mask); }
+ 
+ 	// TODO: Add a proper enum for this
+-	static void setLogicOp(GLenum op) { glLogicOp(op); }
++	static void setLogicOp(GLenum op) { /* glLogicOp(op); */ }
+ 
+     enum Primitives {
+         Triangle = GL_TRIANGLES,
diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index 74ac0732..5cd519e6 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -27,6 +27,8 @@ extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_RunFram
     renderer->setFBO(fbo);
     renderer->resetStateManager();
     emulator->runFrame();
+    
+    emulator->getServiceManager().getHID().updateInputs(emulator->getTicks());
 }
 
 extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_Finalize(JNIEnv* env, jobject obj) {
@@ -43,4 +45,30 @@ extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_LoadRom
     __android_log_print(ANDROID_LOG_INFO, "AlberDriver", "Loading ROM %s", pathStr);
     romLoaded = emulator->loadROM(pathStr);
     env->ReleaseStringUTFChars(path, pathStr);
-}
\ No newline at end of file
+}
+
+
+
+extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_TouchScreenDown(JNIEnv* env, jobject obj, jint x, jint y) {
+    emulator->getServiceManager().getHID().setTouchScreenPress((u16)x, (u16)y);
+}
+
+extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_TouchScreenUp(JNIEnv* env, jobject obj) {
+    emulator->getServiceManager().getHID().releaseTouchScreen();
+}
+
+
+extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_KeyUp(JNIEnv* env, jobject obj, jint keyCode) {
+    emulator->getServiceManager().getHID().releaseKey((u32)keyCode);
+}
+
+extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_KeyDown(JNIEnv* env, jobject obj, jint keyCode) {
+    emulator->getServiceManager().getHID().pressKey((u32)keyCode);
+}
+
+extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_SetCirclepadAxis(JNIEnv* env, jobject obj, jint x, jint y) {
+    emulator->getServiceManager().getHID().setCirclepadX((s16)x);
+    emulator->getServiceManager().getHID().setCirclepadY((s16)y);
+}
+
+
diff --git a/src/pandroid/app/src/main/AndroidManifest.xml b/src/pandroid/app/src/main/AndroidManifest.xml
index 0effd35f..01931edc 100644
--- a/src/pandroid/app/src/main/AndroidManifest.xml
+++ b/src/pandroid/app/src/main/AndroidManifest.xml
@@ -2,6 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage"/>
+
+    <uses-feature
+        android:required="true"
+        android:glEsVersion="0x0030002"/>
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -13,14 +19,16 @@
         android:theme="@style/Theme.Pandroid"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name=".app.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".app.GameActivity"
+            android:configChanges="screenSize|screenLayout|orientation|density|uiMode">
+        </activity>
     </application>
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage"/>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
index 1021e1d2..92d276a2 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
@@ -12,6 +12,12 @@ public class AlberDriver {
     public static native void LoadRom(String path);
     public static native void Finalize();
 
+    public static native void KeyDown(int code);
+    public static native void KeyUp(int code);
+    public static native void SetCirclepadAxis(int x, int y);
+    public static native void TouchScreenUp();
+    public static native void TouchScreenDown(int x, int y);
+
     static {
         System.loadLibrary("Alber");
     }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlSurfaceView.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlSurfaceView.java
deleted file mode 100644
index 657b327c..00000000
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlSurfaceView.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.panda3ds.pandroid;
-
-import android.app.Activity;
-import android.content.Context;
-import android.opengl.GLSurfaceView;
-import android.util.DisplayMetrics;
-
-import com.panda3ds.pandroid.PandaGlRenderer;
-
-public class PandaGlSurfaceView extends GLSurfaceView {
-    final PandaGlRenderer renderer;
-
-    public PandaGlSurfaceView(Context context) {
-        super(context);
-        setEGLContextClientVersion(3);
-        renderer = new PandaGlRenderer();
-        setRenderer(renderer);
-    }
-}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
new file mode 100644
index 00000000..597d664b
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
@@ -0,0 +1,6 @@
+package com.panda3ds.pandroid.app;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class BaseActivity extends AppCompatActivity {
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
new file mode 100644
index 00000000..275797fb
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -0,0 +1,56 @@
+package com.panda3ds.pandroid.app;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.FrameLayout;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+import com.panda3ds.pandroid.AlberDriver;
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.utils.Constants;
+import com.panda3ds.pandroid.view.PandaGlSurfaceView;
+import com.panda3ds.pandroid.view.PandaLayoutController;
+import com.panda3ds.pandroid.view.controller.ControllerLayout;
+
+public class GameActivity extends BaseActivity {
+    private PandaGlSurfaceView pandaSurface;
+    private PandaLayoutController controllerLayout;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        if(!intent.hasExtra(Constants.EXTRA_PATH)){
+
+            setContentView(new FrameLayout(this));
+            Toast.makeText(this, "INVALID ROM PATH", Toast.LENGTH_LONG).show();
+            finish();
+            return;
+        }
+
+        pandaSurface = new PandaGlSurfaceView(this, intent.getStringExtra(Constants.EXTRA_PATH));;
+
+        setContentView(R.layout.game_activity);
+
+        ((FrameLayout)findViewById(R.id.panda_gl_frame))
+                .addView(pandaSurface, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+
+        controllerLayout = findViewById(R.id.controller_layout);
+        controllerLayout.initialize();
+
+        ((CheckBox)findViewById(R.id.hide_screen_controller))
+                .setOnCheckedChangeListener((buttonView, isChecked) -> {
+                    controllerLayout.setVisibility(isChecked ? View.VISIBLE : View.INVISIBLE);
+                });
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/MainActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
similarity index 50%
rename from src/pandroid/app/src/main/java/com/panda3ds/pandroid/MainActivity.java
rename to src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
index b7b3726d..b98bf723 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/MainActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
@@ -1,24 +1,20 @@
-package com.panda3ds.pandroid;
+package com.panda3ds.pandroid.app;
 
-import androidx.appcompat.app.AppCompatActivity;
 import static android.provider.Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION;
 
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.view.WindowInsets;
-import android.view.View;
 import android.os.Environment;
 import android.widget.Toast;
-import android.widget.FrameLayout;
-import com.panda3ds.pandroid.PathUtils;
 
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.appcompat.app.AppCompatActivity;
 
-public class MainActivity extends AppCompatActivity {
-
-    PandaGlSurfaceView glView;
+import com.panda3ds.pandroid.utils.Constants;
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.utils.PathUtils;
 
+public class MainActivity extends BaseActivity {
     private static final int PICK_3DS_ROM = 2;
 
     private void openFile() {
@@ -31,22 +27,18 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (!Environment.isExternalStorageManager()) {
-            Intent intent = new Intent(ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
-            startActivity(intent);
-        }
-        
-        glView = new PandaGlSurfaceView(this);
-        setContentView(glView);
-        FloatingActionButton fab = new FloatingActionButton(this);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                openFile();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            if (!Environment.isExternalStorageManager()) {
+                Intent intent = new Intent(ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
+                startActivity(intent);
             }
+        }
+
+        setContentView(R.layout.activity_main);
+
+        findViewById(R.id.load_rom).setOnClickListener(v->{
+            openFile();
         });
-        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(200, 200);
-        addContentView(fab, params);
     }
 
     @Override
@@ -55,13 +47,10 @@ public class MainActivity extends AppCompatActivity {
             if (resultCode == RESULT_OK) {
                 String path = PathUtils.getPath(getApplicationContext(), data.getData());
                 Toast.makeText(getApplicationContext(), "pandroid opening " + path, Toast.LENGTH_LONG).show();
-                glView.queueEvent(new Runnable() {
-                    @Override
-                    public void run() {
-                        AlberDriver.LoadRom(path);
-                    }
-                });
+                startActivity(new Intent(this, GameActivity.class)
+                        .putExtra(Constants.EXTRA_PATH, path));
             }
+            super.onActivityResult(requestCode, resultCode, data);
         }
     }
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java
new file mode 100644
index 00000000..8d413203
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java
@@ -0,0 +1,23 @@
+package com.panda3ds.pandroid.math;
+
+public class Vector2 {
+    public float x,y;
+    public Vector2(){
+        this(0.0f);
+    }
+    public Vector2(float value){
+        this(value,value);
+    }
+
+    public Vector2(float x, float y){
+        this.x = x;
+        this.y = y;
+    }
+
+    public float distanceTo(Vector2 vec){
+        return distance(x,y,vec.x, vec.y);
+    }
+    public static float distance(float x, float y, float x2, float y2){
+        return (float) Math.sqrt((x - x2) * (x - x2) + (y - y2) * (y - y2));
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
new file mode 100644
index 00000000..c8ba68cd
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
@@ -0,0 +1,23 @@
+package com.panda3ds.pandroid.utils;
+
+public class Constants {
+
+    public static final int INPUT_KEY_UP = 1 << 6;
+    public static final int INPUT_KEY_DOWN = 1 << 7;
+    public static final int INPUT_KEY_LEFT = 1 << 5;
+    public static final int INPUT_KEY_RIGHT = 1 << 4;
+
+    public static final int INPUT_KEY_A = 1 << 0;
+    public static final int INPUT_KEY_B = 1 << 1;
+    public static final int INPUT_KEY_X = 1 << 10;
+    public static final int INPUT_KEY_Y = 1 << 11;
+
+    public static final int INPUT_KEY_R = 1 << 8;
+    public static final int INPUT_KEY_L = 1 << 9;
+
+    public static final int INPUT_KEY_START = 1 << 3;
+    public static final int INPUT_KEY_SELECT = 1 << 2;
+
+    public static final String EXTRA_PATH = "path";
+    public static final String LOG_TAG = "Alber";
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PathUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
similarity index 99%
rename from src/pandroid/app/src/main/java/com/panda3ds/pandroid/PathUtils.java
rename to src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
index 740223eb..0a24603c 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PathUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
@@ -1,4 +1,4 @@
-package com.panda3ds.pandroid;
+package com.panda3ds.pandroid.utils;
 
 import android.content.ContentUris;
 import android.content.Context;
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
similarity index 57%
rename from src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlRenderer.java
rename to src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
index cb6f90da..4adce575 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/PandaGlRenderer.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
@@ -1,4 +1,4 @@
-package com.panda3ds.pandroid;
+package com.panda3ds.pandroid.view;
 
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.opengles.GL10;
@@ -7,20 +7,22 @@ import static android.opengl.GLES32.*;
 
 import android.content.res.Resources;
 import android.opengl.GLSurfaceView;
-import android.util.DisplayMetrics;
 import android.util.Log;
 
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
+import com.panda3ds.pandroid.AlberDriver;
+
+import java.util.ArrayList;
 
 public class PandaGlRenderer implements GLSurfaceView.Renderer {
-    int screenWidth, screenHeight;
-    int screenTexture;
+
+    private final String romPath;
+    private int screenWidth, screenHeight;
+    private int screenTexture;
     public int screenFbo;
 
-    PandaGlRenderer() {
+    PandaGlRenderer(String romPath) {
         super();
+        this.romPath = romPath;
     }
 
     @Override
@@ -33,7 +35,7 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer {
         }
         super.finalize();
     }
-    
+
     public void onSurfaceCreated(GL10 unused, EGLConfig config) {
         Log.i("pandroid", glGetString(GL_EXTENSIONS));
         Log.w("pandroid", glGetString(GL_VERSION));
@@ -59,6 +61,7 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer {
         glBindFramebuffer(GL_FRAMEBUFFER, 0);
 
         AlberDriver.Initialize();
+        AlberDriver.LoadRom(romPath);
     }
 
     public void onDrawFrame(GL10 unused) {
@@ -66,7 +69,36 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer {
             AlberDriver.RunFrame(screenFbo);
             glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
             glBindFramebuffer(GL_READ_FRAMEBUFFER, screenFbo);
-            glBlitFramebuffer(0, 0, 400, 480, 0, 0, screenWidth, screenHeight, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+            if (screenWidth > screenHeight) {
+                int topDisplayWidth = (int) ((screenHeight / 240.0) * 400);
+                int topDisplayHeight = screenHeight;
+
+                if (topDisplayWidth > (screenWidth*0.7)){
+                    topDisplayWidth = (int) (screenWidth * 0.7);
+                    topDisplayHeight = (int) ((topDisplayWidth/400.0)*240);
+                }
+
+                int bottomDisplayHeight = (int) (((screenWidth-topDisplayWidth)/320)*240);
+
+                int topDisplayY = screenHeight-topDisplayHeight;
+                int bottomDisplayY = screenHeight-bottomDisplayHeight;
+
+                glBlitFramebuffer(0, 240,
+                        400, 480,
+                        0, topDisplayY,
+                        topDisplayWidth,topDisplayY+topDisplayHeight,
+                        GL_COLOR_BUFFER_BIT, GL_LINEAR);
+
+                glBlitFramebuffer(
+                        40, 0,
+                        360, 240,
+                        topDisplayWidth, bottomDisplayY,
+                        screenWidth,bottomDisplayY+bottomDisplayHeight,
+                        GL_COLOR_BUFFER_BIT, GL_LINEAR);
+            } else {
+                int h = (int) ((screenWidth / 400.0) * 480);
+                glBlitFramebuffer(0, 0, 400, 480, 0, screenHeight - h, screenWidth, screenHeight, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+            }
         }
     }
 
@@ -76,4 +108,4 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer {
         screenHeight = height;
         glDisable(GL_SCISSOR_TEST);
     }
-}
+}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
new file mode 100644
index 00000000..35805657
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
@@ -0,0 +1,20 @@
+package com.panda3ds.pandroid.view;
+
+import android.content.Context;
+import android.opengl.GLSurfaceView;
+
+public class PandaGlSurfaceView extends GLSurfaceView {
+    final PandaGlRenderer renderer;
+
+    public PandaGlSurfaceView(Context context, String romPath) {
+        super(context);
+        setEGLContextClientVersion(3);
+        setDebugFlags(DEBUG_LOG_GL_CALLS);
+        renderer = new PandaGlRenderer(romPath);
+        setRenderer(renderer);
+    }
+
+    public PandaGlRenderer getRenderer() {
+        return renderer;
+    }
+}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java
new file mode 100644
index 00000000..63f328da
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java
@@ -0,0 +1,62 @@
+package com.panda3ds.pandroid.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import com.panda3ds.pandroid.AlberDriver;
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.utils.Constants;
+import com.panda3ds.pandroid.view.controller.ControllerLayout;
+import com.panda3ds.pandroid.view.controller.nodes.Button;
+import com.panda3ds.pandroid.view.controller.nodes.Joystick;
+
+public class PandaLayoutController extends ControllerLayout {
+    public PandaLayoutController(Context context) {
+        super(context);
+    }
+
+    public PandaLayoutController(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public PandaLayoutController(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public PandaLayoutController(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public void initialize(){
+        int[] keyButtonList = {
+                R.id.button_a, Constants.INPUT_KEY_A,
+                R.id.button_b, Constants.INPUT_KEY_B,
+                R.id.button_y, Constants.INPUT_KEY_Y,
+                R.id.button_x, Constants.INPUT_KEY_X,
+
+                R.id.button_left,   Constants.INPUT_KEY_LEFT,
+                R.id.button_right,  Constants.INPUT_KEY_RIGHT,
+                R.id.button_up,     Constants.INPUT_KEY_UP,
+                R.id.button_down,   Constants.INPUT_KEY_DOWN,
+
+                R.id.button_start,  Constants.INPUT_KEY_START,
+                R.id.button_select, Constants.INPUT_KEY_SELECT,
+
+                R.id.button_l,      Constants.INPUT_KEY_L,
+                R.id.button_r,      Constants.INPUT_KEY_R
+        };
+
+        for (int i = 0; i < keyButtonList.length; i+=2){
+            final int keyCode = keyButtonList[i+1];
+            ((Button)findViewById(keyButtonList[i])).setStateListener((btn, pressed)->{
+                if (pressed) AlberDriver.KeyDown(keyCode);
+                else AlberDriver.KeyUp(keyCode);
+            });
+        }
+
+        ((Joystick)findViewById(R.id.left_analog))
+                .setJoystickListener((joystick, axisX, axisY) -> {
+                    AlberDriver.SetCirclepadAxis((int)(axisX*0x9C), (int)(axisY*0x9C)*-1);
+                });
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java
new file mode 100644
index 00000000..97c8eb12
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java
@@ -0,0 +1,146 @@
+package com.panda3ds.pandroid.view.controller;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
+
+import com.panda3ds.pandroid.math.Vector2;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class ControllerLayout extends RelativeLayout {
+
+    private final HashMap<Integer, ControllerNode> activeTouchEvents = new HashMap<>();
+    private final ArrayList<ControllerNode> controllerNodes = new ArrayList<>();
+
+    public ControllerLayout(Context context) {
+        this(context,null);
+    }
+
+    public ControllerLayout(Context context, AttributeSet attrs) {
+        this(context, attrs,0);
+    }
+
+    public ControllerLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr,0 );
+    }
+
+    public ControllerLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public void refreshChildren(){
+        controllerNodes.clear();
+        populateNodesArray(this, controllerNodes);
+    }
+
+    private void populateNodesArray(ViewGroup group, ArrayList<ControllerNode> list){
+        for (int i = 0; i < group.getChildCount(); i++){
+            View view = group.getChildAt(i);
+            if(view instanceof ControllerNode){
+                list.add((ControllerNode) view);
+            } else if (view instanceof ViewGroup) {
+                populateNodesArray((ViewGroup) view, list);
+            }
+        }
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        int index = event.getActionIndex();
+
+        switch (event.getActionMasked()){
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_POINTER_UP: {
+                int id = event.getPointerId(index);
+                processTouch(true, event.getX(index), event.getY(index), id);
+            }break;
+            case MotionEvent.ACTION_DOWN:
+            case MotionEvent.ACTION_POINTER_DOWN: {
+                int id = event.getPointerId(index);
+                processTouch(false, event.getX(index), event.getY(index), id);
+            }break;
+            case MotionEvent.ACTION_MOVE:
+                for (int id = 0; id < event.getPointerCount(); id++){
+                    processTouch(false, event.getX(id), event.getY(id), id);
+                }
+                break;
+        }
+        return true;
+    }
+
+    private void processTouch(boolean up, float x, float y, int index){
+        int[] globalPosition = new int[2];
+        getLocationInWindow(globalPosition);
+
+        int action = TouchEvent.ACTION_MOVE;
+
+        if ((!activeTouchEvents.containsKey(index))){
+            if (up)return;
+            ControllerNode node = null;
+            for (ControllerNode item: controllerNodes){
+                Vector2 pos = item.getPosition();
+                Vector2 size= item.getSize();
+
+                float cx = (pos.x - globalPosition[0]);
+                float cy = (pos.y - globalPosition[1]);
+                if( x > cx && x < cx+size.x && y > cy && y < cy+size.y){
+                    node = item;
+                    break;
+                }
+            }
+            if (node != null){
+                activeTouchEvents.put(index, node);
+                action = TouchEvent.ACTION_DOWN;
+            } else {
+                return;
+            }
+        }
+
+        if (up) action = TouchEvent.ACTION_UP;
+
+        ControllerNode node = activeTouchEvents.get(index);
+        Vector2 pos = node.getPosition();
+        pos.x -= globalPosition[0];
+        pos.y -= globalPosition[1];
+
+        x -= pos.x;
+        y -= pos.y;
+
+        node.onTouch(new TouchEvent(x,y,action));
+
+        if(up){
+            activeTouchEvents.remove(index);
+        }
+    }
+
+    @Override
+    public void onViewAdded(View child) {
+        super.onViewAdded(child);
+        refreshChildren();
+    }
+
+    @Override
+    public void onViewRemoved(View child) {
+        super.onViewRemoved(child);
+        refreshChildren();
+    }
+
+    /*@TODO: Need replace that methods for prevent Android send events directly to children*/
+
+    @Override
+    public ArrayList<View> getTouchables() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        return true;
+    }
+
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java
new file mode 100644
index 00000000..8b01fa97
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java
@@ -0,0 +1,24 @@
+package com.panda3ds.pandroid.view.controller;
+
+
+import android.view.View;
+
+import androidx.annotation.NonNull;
+
+import com.panda3ds.pandroid.math.Vector2;
+
+public interface ControllerNode {
+
+    @NonNull
+    default Vector2 getPosition(){
+        View me = (View) this;
+
+        int[] position = new int[2];
+        me.getLocationInWindow(position);
+        return new Vector2(position[0], position[1]);
+    }
+
+    @NonNull Vector2 getSize();
+
+    void onTouch(TouchEvent event);
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java
new file mode 100644
index 00000000..a804cda1
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java
@@ -0,0 +1,28 @@
+package com.panda3ds.pandroid.view.controller;
+
+public class TouchEvent {
+    public static final int ACTION_DOWN = 0;
+    public static final int ACTION_MOVE = 1;
+    public static final int ACTION_UP   = 2;
+
+    private final int action;
+    private final float x,y;
+
+    public float getX() {
+        return x;
+    }
+
+    public float getY() {
+        return y;
+    }
+
+    public int getAction() {
+        return action;
+    }
+
+    public TouchEvent(float x, float y, int action){
+        this.x = x;
+        this.y = y;
+        this.action = action;
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/ButtonStateListener.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/ButtonStateListener.java
new file mode 100644
index 00000000..a658cdc0
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/ButtonStateListener.java
@@ -0,0 +1,7 @@
+package com.panda3ds.pandroid.view.controller.listeners;
+
+import com.panda3ds.pandroid.view.controller.nodes.Button;
+
+public interface ButtonStateListener {
+    void onButtonPressedChange(Button button, boolean pressed);
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/JoystickListener.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/JoystickListener.java
new file mode 100644
index 00000000..538e2cd8
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/JoystickListener.java
@@ -0,0 +1,7 @@
+package com.panda3ds.pandroid.view.controller.listeners;
+
+import com.panda3ds.pandroid.view.controller.nodes.Joystick;
+
+public interface JoystickListener {
+    void onJoystickAxisChange(Joystick joystick, float axisX, float axisY);
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/BasicControllerNode.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/BasicControllerNode.java
new file mode 100644
index 00000000..90d5f5f7
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/BasicControllerNode.java
@@ -0,0 +1,24 @@
+package com.panda3ds.pandroid.view.controller.nodes;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import com.panda3ds.pandroid.view.controller.ControllerNode;
+
+public abstract class BasicControllerNode extends AppCompatTextView implements ControllerNode {
+    public BasicControllerNode(@NonNull Context context) {
+        super(context);
+    }
+
+    public BasicControllerNode(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public BasicControllerNode(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Button.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Button.java
new file mode 100644
index 00000000..7e8d4e86
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Button.java
@@ -0,0 +1,73 @@
+package com.panda3ds.pandroid.view.controller.nodes;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.view.Gravity;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import com.panda3ds.pandroid.math.Vector2;
+import com.panda3ds.pandroid.view.controller.ControllerNode;
+import com.panda3ds.pandroid.view.controller.TouchEvent;
+import com.panda3ds.pandroid.view.controller.listeners.ButtonStateListener;
+
+public class Button extends BasicControllerNode {
+    private boolean pressed = false;
+    private int width,height;
+
+    private ButtonStateListener stateListener;
+
+    public Button(@NonNull Context context) {
+        super(context);
+        init();
+    }
+
+    public Button(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public Button(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        width = getWidth();
+        height = getHeight();
+    }
+
+    private void init(){
+        setTextAlignment(TEXT_ALIGNMENT_CENTER);
+        setGravity(Gravity.CENTER);
+    }
+
+    public void setStateListener(ButtonStateListener stateListener) {
+        this.stateListener = stateListener;
+    }
+
+    public boolean isPressed() {
+        return pressed;
+    }
+
+    @NonNull
+    @Override
+    public Vector2 getSize() {
+        return new Vector2(width,height);
+    }
+
+    @Override
+    public void onTouch(TouchEvent event) {
+        pressed = event.getAction() != TouchEvent.ACTION_UP;
+        setAlpha(pressed ? 0.2F : 1.0F);
+        if (stateListener != null){
+            stateListener.onButtonPressedChange(this, pressed);
+        }
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java
new file mode 100644
index 00000000..757ec3cb
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java
@@ -0,0 +1,132 @@
+package com.panda3ds.pandroid.view.controller.nodes;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import com.panda3ds.pandroid.math.Vector2;
+import com.panda3ds.pandroid.view.controller.ControllerNode;
+import com.panda3ds.pandroid.view.controller.TouchEvent;
+import com.panda3ds.pandroid.view.controller.listeners.JoystickListener;
+
+
+public class Joystick extends BasicControllerNode implements ControllerNode {
+    private float stick_x = 0;
+    private float stick_y = 0;
+
+    private int size_width = 0;
+    private int size_height= 0;
+
+    private JoystickListener joystickListener;
+
+    public Joystick(Context context) {
+        this(context,null);
+    }
+
+    public Joystick(Context context, AttributeSet attrs) {
+        this(context, attrs,0);
+    }
+
+    public Joystick(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        paint.setColor(Color.RED);
+        invalidate();
+    }
+
+    private final Paint paint = new Paint();
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+    }
+
+    @Override
+    public void onDrawForeground(Canvas canvas) {
+        size_width = getWidth();
+        size_height = getHeight();
+
+        int analogIconSize = size_width-getPaddingLeft();
+
+        float middleIconSize = analogIconSize / 2.0F;
+        float middle = size_width / 2.0F;
+
+        float maxDistance = (middle - middleIconSize) * 0.9F;
+
+        float tx = maxDistance * stick_x;
+        float ty = maxDistance * stick_y;
+
+        float radius = Vector2.distance(0.0F, 0.0F, Math.abs(tx), Math.abs(ty));
+        radius = Math.min(maxDistance, radius);
+
+        double deg = Math.atan2(ty,tx) * (180.0/Math.PI);
+        float rx = (float) (radius*Math.cos(Math.PI * 2 * deg/360.0));
+        float ry = (float) (radius*Math.sin(Math.PI * 2 * deg/360.0));
+
+        stick_x = Math.max(-1.0f, Math.min(1.0f, stick_x));
+        stick_y = Math.max(-1.0f, Math.min(1.0f, stick_y));
+
+
+        float x = middle-middleIconSize+rx;
+        float y = middle-middleIconSize+ry;
+
+
+        Drawable foreground = getForeground();
+        if (foreground != null){
+            foreground.setBounds((int) x, (int) y, (int) (x+analogIconSize), (int) (y+analogIconSize));
+            foreground.draw(canvas);
+        } else {
+            canvas.drawOval(x, y, x+analogIconSize,y+analogIconSize,paint);
+        }
+    }
+
+    public Vector2 getAxis() {
+        return new Vector2(
+                Math.max(-1.0F, Math.min(1.0F, stick_x)),
+                Math.max(-1.0F, Math.min(1.0F, stick_y))
+        );
+    }
+
+    public void setJoystickListener(JoystickListener joystickListener) {
+        this.joystickListener = joystickListener;
+    }
+
+    @NonNull
+    @Override
+    public Vector2 getSize() {
+        return new Vector2(size_width,size_height);
+    }
+
+    @Override
+    public void onTouch(TouchEvent event) {
+
+        float middle = size_width/2.0F;
+
+        float x = event.getX();
+        float y = event.getY();
+
+        x = Math.max(0, Math.min(middle*2, x));
+        y = Math.max(0, Math.min(middle*2, y));
+
+        stick_x = ((x-middle)/middle);
+
+        stick_y = ((y-middle)/middle);
+
+        if (event.getAction() == TouchEvent.ACTION_UP){
+            stick_x = 0;
+            stick_y = 0;
+        }
+
+        if (joystickListener != null){
+            joystickListener.onJoystickAxisChange(this, stick_x, stick_y);
+        }
+
+        invalidate();
+    }
+}
diff --git a/src/pandroid/app/src/main/res/drawable/screen_gamepad_checkbox.xml b/src/pandroid/app/src/main/res/drawable/screen_gamepad_checkbox.xml
new file mode 100644
index 00000000..8c61f4c8
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/screen_gamepad_checkbox.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/screen_gamepad_show" android:state_checked="false"/>
+    <item android:drawable="@drawable/screen_gamepad_hide" android:state_checked="true"/>
+</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/screen_gamepad_hide.xml b/src/pandroid/app/src/main/res/drawable/screen_gamepad_hide.xml
new file mode 100644
index 00000000..f22e8c9d
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/screen_gamepad_hide.xml
@@ -0,0 +1,9 @@
+<vector
+    android:height="24dp"
+    android:tint="#FFF"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFF" android:pathData="M21.19,21.19L2.81,2.81L1.39,4.22L3.3,6.13C2.54,6.41 2,7.15 2,8v8c0,1.1 0.9,2 2,2h11.17l4.61,4.61L21.19,21.19zM9,13v2H7v-2H5v-2h2V9.83L10.17,13H9zM20.7,17.87C21.46,17.59 22,16.85 22,16V8c0,-1.1 -0.9,-2 -2,-2H8.83L20.7,17.87zM17.5,9c0.83,0 1.5,0.67 1.5,1.5S18.33,12 17.5,12S16,11.33 16,10.5S16.67,9 17.5,9z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/screen_gamepad_show.xml b/src/pandroid/app/src/main/res/drawable/screen_gamepad_show.xml
new file mode 100644
index 00000000..133f2e70
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/screen_gamepad_show.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFF" android:pathData="M21,6L3,6c-1.1,0 -2,0.9 -2,2v8c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.1 -0.9,-2 -2,-2zM11,13L8,13v3L6,16v-3L3,13v-2h3L6,8h2v3h3v2zM15.5,15c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S18.67,9 19.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/simple_analog_background.xml b/src/pandroid/app/src/main/res/drawable/simple_analog_background.xml
new file mode 100644
index 00000000..81855e14
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/simple_analog_background.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp"/>
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="#0000"/>
+            <stroke android:color="#6FFF" android:width="1dp"/>
+            <corners android:radius="999dp"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/simple_card_button.xml b/src/pandroid/app/src/main/res/drawable/simple_card_button.xml
new file mode 100644
index 00000000..d58e9c4f
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/simple_card_button.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#5FFF"/>
+            <stroke android:color="#6FFF" android:width="1dp"/>
+            <corners android:topLeftRadius="8dp" android:topRightRadius="8dp"
+                android:bottomLeftRadius="8dp"
+                android:bottomRightRadius="8dp"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/simple_card_button_left.xml b/src/pandroid/app/src/main/res/drawable/simple_card_button_left.xml
new file mode 100644
index 00000000..baf1f293
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/simple_card_button_left.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#5FFF"/>
+            <stroke android:color="#6FFF" android:width="1dp"/>
+            <corners android:topLeftRadius="8dp" android:topRightRadius="8dp"
+                android:bottomLeftRadius="8dp"
+                android:bottomRightRadius="16dp"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/simple_card_button_right.xml b/src/pandroid/app/src/main/res/drawable/simple_card_button_right.xml
new file mode 100644
index 00000000..2f69341c
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/simple_card_button_right.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#5FFF"/>
+            <stroke android:color="#6FFF" android:width="1dp"/>
+            <corners android:topLeftRadius="8dp" android:topRightRadius="8dp"
+                android:bottomLeftRadius="16dp"
+                android:bottomRightRadius="8dp"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/simple_circle_button.xml b/src/pandroid/app/src/main/res/drawable/simple_circle_button.xml
new file mode 100644
index 00000000..15879540
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/simple_circle_button.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#5FFF"/>
+            <stroke android:color="#6FFF" android:width="1dp"/>
+            <corners android:radius="999dp"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/activity_main.xml b/src/pandroid/app/src/main/res/layout/activity_main.xml
index 17eab17b..89a17ce9 100644
--- a/src/pandroid/app/src/main/res/layout/activity_main.xml
+++ b/src/pandroid/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".app.MainActivity">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="bottom|end"
+        android:padding="17dp">
+        <Button
+            android:id="@+id/load_rom"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:text="@string/load_rom"/>
+    </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/controller_dpad.xml b/src/pandroid/app/src/main/res/layout/controller_dpad.xml
new file mode 100644
index 00000000..0eea66ac
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/controller_dpad.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="96dp"
+    android:layout_height="96dp">
+
+    <com.panda3ds.pandroid.view.controller.nodes.Button
+        android:id="@+id/button_up"
+        style="@style/ControllerSimpleButton"
+        android:layout_marginLeft="30dp"/>
+
+    <com.panda3ds.pandroid.view.controller.nodes.Button
+        android:id="@+id/button_left"
+        style="@style/ControllerSimpleButton"
+        android:layout_marginTop="30dp"/>
+
+    <com.panda3ds.pandroid.view.controller.nodes.Button
+        android:id="@+id/button_down"
+        style="@style/ControllerSimpleButton"
+        android:layout_marginTop="60dp"
+        android:layout_marginLeft="30dp"/>
+
+    <com.panda3ds.pandroid.view.controller.nodes.Button
+        android:id="@+id/button_right"
+        style="@style/ControllerSimpleButton"
+        android:layout_marginTop="30dp"
+        android:layout_marginLeft="60dp"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/controller_gamepad.xml b/src/pandroid/app/src/main/res/layout/controller_gamepad.xml
new file mode 100644
index 00000000..16b5ba72
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/controller_gamepad.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="96dp"
+    android:layout_height="96dp">
+
+    <com.panda3ds.pandroid.view.controller.nodes.Button
+        android:id="@+id/button_x"
+        style="@style/ControllerSimpleButton"
+        android:layout_marginLeft="30dp"
+        android:text="X"/>
+
+    <com.panda3ds.pandroid.view.controller.nodes.Button
+        android:id="@+id/button_y"
+        style="@style/ControllerSimpleButton"
+        android:layout_marginTop="30dp"
+        android:text="Y"/>
+
+    <com.panda3ds.pandroid.view.controller.nodes.Button
+        android:id="@+id/button_b"
+        style="@style/ControllerSimpleButton"
+        android:layout_marginTop="60dp"
+        android:layout_marginLeft="30dp"
+        android:text="B"/>
+
+    <com.panda3ds.pandroid.view.controller.nodes.Button
+        android:id="@+id/button_a"
+        style="@style/ControllerSimpleButton"
+        android:layout_marginTop="30dp"
+        android:layout_marginLeft="60dp"
+        android:text="A"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/game_activity.xml b/src/pandroid/app/src/main/res/layout/game_activity.xml
new file mode 100644
index 00000000..64f067b2
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/game_activity.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#000">
+
+    <FrameLayout
+        android:id="@+id/panda_gl_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <com.panda3ds.pandroid.view.PandaLayoutController
+        android:id="@+id/controller_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="bottom"
+            android:padding="20dp">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+
+                <com.panda3ds.pandroid.view.controller.nodes.Button
+                    android:id="@+id/button_l"
+                    android:layout_width="100dp"
+                    android:layout_height="25dp"
+                    android:layout_gravity="left"
+                    style="@style/ControllerSimpleButton"
+                    android:background="@drawable/simple_card_button_left"
+                    android:text="L"/>
+
+                <com.panda3ds.pandroid.view.controller.nodes.Button
+                    android:id="@+id/button_r"
+                    android:layout_width="100dp"
+                    android:layout_height="25dp"
+                    android:layout_gravity="right"
+                    style="@style/ControllerSimpleButton"
+                    android:background="@drawable/simple_card_button_right"
+                    android:text="R"/>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingTop="60dp">
+
+                    <include layout="@layout/controller_dpad"/>
+
+                    <com.panda3ds.pandroid.view.controller.nodes.Joystick
+                        android:id="@+id/left_analog"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:layout_marginTop="20dp"
+                        android:background="@drawable/simple_analog_background"
+                        android:foreground="@drawable/simple_circle_button"
+                        android:padding="40dp"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="end|bottom"
+                    android:orientation="vertical"
+                    android:layout_gravity="center">
+
+                    <include layout="@layout/controller_gamepad"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom|center">
+
+                    <com.panda3ds.pandroid.view.controller.nodes.Button
+                        android:id="@+id/button_start"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/simple_card_button"
+                        style="@style/ControllerSimpleButton"
+                        android:paddingHorizontal="10dp"
+                        android:text="START"/>
+
+                    <com.panda3ds.pandroid.view.controller.nodes.Button
+                        android:id="@+id/button_select"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/simple_card_button"
+                        style="@style/ControllerSimpleButton"
+                        android:paddingHorizontal="10dp"
+                        android:layout_marginLeft="10dp"
+                        android:text="SELECT"/>
+
+                </LinearLayout>
+
+            </FrameLayout>
+
+        </LinearLayout>
+
+    </com.panda3ds.pandroid.view.PandaLayoutController>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="25dp">
+
+        <CheckBox
+            android:id="@+id/hide_screen_controller"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:checked="true"
+            android:button="@drawable/screen_gamepad_checkbox"
+            android:layout_gravity="bottom|right"
+            android:buttonTint="#FFF"
+            android:alpha="0.4"
+            android:theme="@style/Theme.AppCompat.Light"/>
+
+    </FrameLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/strings.xml b/src/pandroid/app/src/main/res/values/strings.xml
index 40c0990f..f937ad5f 100644
--- a/src/pandroid/app/src/main/res/values/strings.xml
+++ b/src/pandroid/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">pandroid</string>
+    <string name="load_rom">Load ROM</string>
 </resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/styleable.xml b/src/pandroid/app/src/main/res/values/styleable.xml
new file mode 100644
index 00000000..c5fc4329
--- /dev/null
+++ b/src/pandroid/app/src/main/res/values/styleable.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="ControllerSimpleButton">
+        <item name="android:layout_height">32dp</item>
+        <item name="android:layout_width">32dp</item>
+        <item name="android:textColor">#FFF</item>
+        <item name="textAllCaps">true</item>
+        <item name="android:background">@drawable/simple_circle_button</item>
+    </style>
+</resources>
\ No newline at end of file

From c1162678bb5783d4b10b919de86726141019a918 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Tue, 28 Nov 2023 13:26:07 +0200
Subject: [PATCH 041/162] Cleanup jni_driver

---
 patch.patch                                   | 118 ------------------
 src/jni_driver.cpp                            |  78 ++++++------
 .../panda3ds/pandroid/app/GameActivity.java   |   2 +-
 3 files changed, 40 insertions(+), 158 deletions(-)
 delete mode 100644 patch.patch

diff --git a/patch.patch b/patch.patch
deleted file mode 100644
index 98cad32b..00000000
--- a/patch.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/src/host_shaders/opengl_display.frag b/src/host_shaders/opengl_display.frag
-index 612671c8..1937f711 100644
---- a/src/host_shaders/opengl_display.frag
-+++ b/src/host_shaders/opengl_display.frag
-@@ -1,4 +1,5 @@
--#version 410 core
-+#version 300 es
-+precision mediump float;
- in vec2 UV;
- out vec4 FragColor;
- 
-diff --git a/src/host_shaders/opengl_display.vert b/src/host_shaders/opengl_display.vert
-index 990e2f80..6917c23c 100644
---- a/src/host_shaders/opengl_display.vert
-+++ b/src/host_shaders/opengl_display.vert
-@@ -1,4 +1,4 @@
--#version 410 core
-+#version 300 es
- out vec2 UV;
- 
- void main() {
-diff --git a/src/host_shaders/opengl_fragment_shader.frag b/src/host_shaders/opengl_fragment_shader.frag
-index f6fa6c55..b0850438 100644
---- a/src/host_shaders/opengl_fragment_shader.frag
-+++ b/src/host_shaders/opengl_fragment_shader.frag
-@@ -1,4 +1,5 @@
--#version 410 core
-+#version 300 es
-+precision mediump float;
- 
- in vec3 v_tangent;
- in vec3 v_normal;
-@@ -27,7 +28,7 @@ uniform bool u_depthmapEnable;
- uniform sampler2D u_tex0;
- uniform sampler2D u_tex1;
- uniform sampler2D u_tex2;
--uniform sampler1DArray u_tex_lighting_lut;
-+// uniform sampler1DArray u_tex_lighting_lut;
- 
- uniform uint u_picaRegs[0x200 - 0x48];
- 
-@@ -145,9 +146,15 @@ vec4 tevCalculateCombiner(int tev_id) {
- #define RR_LUT 6u
- 
- float lutLookup(uint lut, uint light, float value) {
--	if (lut >= FR_LUT && lut <= RR_LUT) lut -= 1;
--	if (lut == SP_LUT) lut = light + 8;
--	return texture(u_tex_lighting_lut, vec2(value, lut)).r;
-+	// if (lut >= FR_LUT && lut <= RR_LUT) lut -= 1;
-+	// if (lut == SP_LUT) lut = light + 8;
-+	// return texture(u_tex_lighting_lut, vec2(value, lut)).r;
-+	return 0.0;
-+}
-+
-+uint bitfieldExtract(uint val, int off, int size) {
-+    uint mask = uint((1 << size) - 1);
-+    return uint(val >> off) & mask;
- }
- 
- vec3 regToColor(uint reg) {
-diff --git a/src/host_shaders/opengl_vertex_shader.vert b/src/host_shaders/opengl_vertex_shader.vert
-index a25d7a6d..5967ccd6 100644
---- a/src/host_shaders/opengl_vertex_shader.vert
-+++ b/src/host_shaders/opengl_vertex_shader.vert
-@@ -1,4 +1,4 @@
--#version 410 core
-+#version 300 es
- 
- layout(location = 0) in vec4 a_coords;
- layout(location = 1) in vec4 a_quaternion;
-@@ -20,7 +20,7 @@ out vec2 v_texcoord2;
- flat out vec4 v_textureEnvColor[6];
- flat out vec4 v_textureEnvBufferColor;
- 
--out float gl_ClipDistance[2];
-+// out float gl_ClipDistance[2];
- 
- // TEV uniforms
- uniform uint u_textureEnvColor[6];
-@@ -93,6 +93,6 @@ void main() {
- 	);
- 
- 	// There's also another, always-on clipping plane based on vertex z
--	gl_ClipDistance[0] = -a_coords.z;
--	gl_ClipDistance[1] = dot(clipData, a_coords);
-+	// gl_ClipDistance[0] = -a_coords.z;
-+	// gl_ClipDistance[1] = dot(clipData, a_coords);
- }
-diff --git a/third_party/opengl/opengl.hpp b/third_party/opengl/opengl.hpp
-index f368f573..5ead7f63 100644
---- a/third_party/opengl/opengl.hpp
-+++ b/third_party/opengl/opengl.hpp
-@@ -520,21 +520,21 @@ namespace OpenGL {
- 	static void enableBlend() { glEnable(GL_BLEND); }
- 	static void disableBlend() { glDisable(GL_BLEND); }
- 	static void enableLogicOp() { glEnable(GL_COLOR_LOGIC_OP); }
--	static void disableLogicOp() { glDisable(GL_COLOR_LOGIC_OP); }
-+	static void disableLogicOp() { /* glDisable(GL_COLOR_LOGIC_OP); */ }
- 	static void enableDepth() { glEnable(GL_DEPTH_TEST); }
- 	static void disableDepth() { glDisable(GL_DEPTH_TEST); }
- 	static void enableStencil() { glEnable(GL_STENCIL_TEST); }
- 	static void disableStencil() { glDisable(GL_STENCIL_TEST); }
- 
--	static void enableClipPlane(GLuint index) { glEnable(GL_CLIP_DISTANCE0 + index); }
--	static void disableClipPlane(GLuint index) { glDisable(GL_CLIP_DISTANCE0 + index); }
-+	static void enableClipPlane(GLuint index) { /* glEnable(GL_CLIP_DISTANCE0 + index); */ }
-+	static void disableClipPlane(GLuint index) { /* glDisable(GL_CLIP_DISTANCE0 + index); */ }
- 
- 	static void setDepthFunc(DepthFunc func) { glDepthFunc(static_cast<GLenum>(func)); }
- 	static void setColourMask(GLboolean r, GLboolean g, GLboolean b, GLboolean a) { glColorMask(r, g, b, a); }
- 	static void setDepthMask(GLboolean mask) { glDepthMask(mask); }
- 
- 	// TODO: Add a proper enum for this
--	static void setLogicOp(GLenum op) { glLogicOp(op); }
-+	static void setLogicOp(GLenum op) { /* glLogicOp(op); */ }
- 
-     enum Primitives {
-         Triangle = GL_TRIANGLES,
diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index 5cd519e6..422096d8 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -1,74 +1,74 @@
-#include <jni.h>
-#include <stdexcept>
-#include <android/log.h>
 #include <EGL/egl.h>
-#include "renderer_gl/renderer_gl.hpp"
+#include <android/log.h>
+#include <jni.h>
+
+#include <stdexcept>
+
 #include "emulator.hpp"
+#include "renderer_gl/renderer_gl.hpp"
+#include "services/hid.hpp"
 
 std::unique_ptr<Emulator> emulator = nullptr;
+HIDService* hidService = nullptr;
 RendererGL* renderer = nullptr;
 bool romLoaded = false;
 
 extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_Initialize(JNIEnv* env, jobject obj) {
-    emulator = std::make_unique<Emulator>();
-    if (emulator->getRendererType() != RendererType::OpenGL) {
-        throw std::runtime_error("Renderer is not OpenGL");
-    }
-    renderer = static_cast<RendererGL*>(emulator->getRenderer());
-    __android_log_print(ANDROID_LOG_INFO, "AlberDriver", "OpenGL ES Before %d.%d", GLVersion.major, GLVersion.minor);
-    if (!gladLoadGLES2Loader(reinterpret_cast<GLADloadproc>(eglGetProcAddress))) {
+	emulator = std::make_unique<Emulator>();
+
+	if (emulator->getRendererType() != RendererType::OpenGL) {
+		throw std::runtime_error("Renderer is not OpenGL");
+	}
+
+	renderer = static_cast<RendererGL*>(emulator->getRenderer());
+	hidService = &emulator->getServiceManager().getHID();
+
+	if (!gladLoadGLES2Loader(reinterpret_cast<GLADloadproc>(eglGetProcAddress))) {
 		throw std::runtime_error("OpenGL ES init failed");
 	}
-    __android_log_print(ANDROID_LOG_INFO, "AlberDriver", "OpenGL ES %d.%d", GLVersion.major, GLVersion.minor);
+
+	__android_log_print(ANDROID_LOG_INFO, "AlberDriver", "OpenGL ES %d.%d", GLVersion.major, GLVersion.minor);
 	emulator->initGraphicsContext(nullptr);
 }
 
 extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_RunFrame(JNIEnv* env, jobject obj, jint fbo) {
-    renderer->setFBO(fbo);
-    renderer->resetStateManager();
-    emulator->runFrame();
-    
-    emulator->getServiceManager().getHID().updateInputs(emulator->getTicks());
+	renderer->setFBO(fbo);
+	renderer->resetStateManager();
+	emulator->runFrame();
+
+	hidService->updateInputs(emulator->getTicks());
 }
 
 extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_Finalize(JNIEnv* env, jobject obj) {
-    emulator = nullptr;
-    renderer = nullptr;
+	emulator = nullptr;
+	hidService = nullptr;
+	renderer = nullptr;
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_com_panda3ds_pandroid_AlberDriver_HasRomLoaded(JNIEnv* env, jobject obj) {
-    return romLoaded;
-}
+extern "C" JNIEXPORT jboolean JNICALL Java_com_panda3ds_pandroid_AlberDriver_HasRomLoaded(JNIEnv* env, jobject obj) { return romLoaded; }
 
 extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_LoadRom(JNIEnv* env, jobject obj, jstring path) {
-    const char* pathStr = env->GetStringUTFChars(path, nullptr);
-    __android_log_print(ANDROID_LOG_INFO, "AlberDriver", "Loading ROM %s", pathStr);
-    romLoaded = emulator->loadROM(pathStr);
-    env->ReleaseStringUTFChars(path, pathStr);
+	const char* pathStr = env->GetStringUTFChars(path, nullptr);
+	__android_log_print(ANDROID_LOG_INFO, "AlberDriver", "Loading ROM %s", pathStr);
+	romLoaded = emulator->loadROM(pathStr);
+	env->ReleaseStringUTFChars(path, pathStr);
 }
 
-
-
 extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_TouchScreenDown(JNIEnv* env, jobject obj, jint x, jint y) {
-    emulator->getServiceManager().getHID().setTouchScreenPress((u16)x, (u16)y);
-}
-
-extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_TouchScreenUp(JNIEnv* env, jobject obj) {
-    emulator->getServiceManager().getHID().releaseTouchScreen();
+	hidService->setTouchScreenPress((u16)x, (u16)y);
 }
 
+extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_TouchScreenUp(JNIEnv* env, jobject obj) { hidService->releaseTouchScreen(); }
 
 extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_KeyUp(JNIEnv* env, jobject obj, jint keyCode) {
-    emulator->getServiceManager().getHID().releaseKey((u32)keyCode);
+	hidService->releaseKey((u32)keyCode);
 }
 
 extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_KeyDown(JNIEnv* env, jobject obj, jint keyCode) {
-    emulator->getServiceManager().getHID().pressKey((u32)keyCode);
+	hidService->pressKey((u32)keyCode);
 }
 
 extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_SetCirclepadAxis(JNIEnv* env, jobject obj, jint x, jint y) {
-    emulator->getServiceManager().getHID().setCirclepadX((s16)x);
-    emulator->getServiceManager().getHID().setCirclepadY((s16)y);
+	hidService->setCirclepadX((s16)x);
+	hidService->setCirclepadY((s16)y);
 }
-
-
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
index 275797fb..60fe8724 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -38,7 +38,7 @@ public class GameActivity extends BaseActivity {
             return;
         }
 
-        pandaSurface = new PandaGlSurfaceView(this, intent.getStringExtra(Constants.EXTRA_PATH));;
+        pandaSurface = new PandaGlSurfaceView(this, intent.getStringExtra(Constants.EXTRA_PATH));
 
         setContentView(R.layout.game_activity);
 

From 200a884589238d240c63bb3bdea0632a65300cf2 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Tue, 28 Nov 2023 14:05:51 +0200
Subject: [PATCH 042/162] Various cleanups

---
 .../panda3ds/pandroid/app/GameActivity.java   |  2 +-
 .../com/panda3ds/pandroid/math/Vector2.java   |  3 ++
 .../panda3ds/pandroid/utils/Constants.java    |  3 ++
 .../pandroid/view/PandaGlRenderer.java        | 29 +++++++++----------
 .../pandroid/view/PandaGlSurfaceView.java     |  4 ---
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
index 60fe8724..5c234423 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -33,7 +33,7 @@ public class GameActivity extends BaseActivity {
         if(!intent.hasExtra(Constants.EXTRA_PATH)){
 
             setContentView(new FrameLayout(this));
-            Toast.makeText(this, "INVALID ROM PATH", Toast.LENGTH_LONG).show();
+            Toast.makeText(this, "Invalid rom path!", Toast.LENGTH_LONG).show();
             finish();
             return;
         }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java
index 8d413203..9c5b45b7 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java
@@ -2,9 +2,11 @@ package com.panda3ds.pandroid.math;
 
 public class Vector2 {
     public float x,y;
+
     public Vector2(){
         this(0.0f);
     }
+
     public Vector2(float value){
         this(value,value);
     }
@@ -17,6 +19,7 @@ public class Vector2 {
     public float distanceTo(Vector2 vec){
         return distance(x,y,vec.x, vec.y);
     }
+
     public static float distance(float x, float y, float x2, float y2){
         return (float) Math.sqrt((x - x2) * (x - x2) + (y - y2) * (y - y2));
     }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
index c8ba68cd..2e706530 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
@@ -18,6 +18,9 @@ public class Constants {
     public static final int INPUT_KEY_START = 1 << 3;
     public static final int INPUT_KEY_SELECT = 1 << 2;
 
+    public static final int N3DS_WIDTH = 400;
+    public static final int N3DS_HEIGHT = 240;
+
     public static final String EXTRA_PATH = "path";
     public static final String LOG_TAG = "Alber";
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
index 4adce575..b6be4df2 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
@@ -10,6 +10,7 @@ import android.opengl.GLSurfaceView;
 import android.util.Log;
 
 import com.panda3ds.pandroid.AlberDriver;
+import com.panda3ds.pandroid.utils.Constants;
 
 import java.util.ArrayList;
 
@@ -69,43 +70,41 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer {
             AlberDriver.RunFrame(screenFbo);
             glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
             glBindFramebuffer(GL_READ_FRAMEBUFFER, screenFbo);
+
             if (screenWidth > screenHeight) {
-                int topDisplayWidth = (int) ((screenHeight / 240.0) * 400);
+                int topDisplayWidth = (int)((screenHeight / (float)Constants.N3DS_HEIGHT) * Constants.N3DS_WIDTH);
                 int topDisplayHeight = screenHeight;
 
-                if (topDisplayWidth > (screenWidth*0.7)){
-                    topDisplayWidth = (int) (screenWidth * 0.7);
-                    topDisplayHeight = (int) ((topDisplayWidth/400.0)*240);
+                if (topDisplayWidth > screenWidth * 0.7){
+                    topDisplayWidth = (int)(screenWidth * 0.7);
+                    topDisplayHeight = (int)((topDisplayWidth / (float)Constants.N3DS_WIDTH) * Constants.N3DS_HEIGHT);
                 }
 
-                int bottomDisplayHeight = (int) (((screenWidth-topDisplayWidth)/320)*240);
+                int bottomDisplayHeight = (int)(((screenWidth - topDisplayWidth) / 320) * Constants.N3DS_HEIGHT);
+                int topDisplayY = screenHeight - topDisplayHeight;
+                int bottomDisplayY = screenHeight - bottomDisplayHeight;
 
-                int topDisplayY = screenHeight-topDisplayHeight;
-                int bottomDisplayY = screenHeight-bottomDisplayHeight;
-
-                glBlitFramebuffer(0, 240,
-                        400, 480,
+                glBlitFramebuffer(0, Constants.N3DS_HEIGHT,
+                        Constants.N3DS_WIDTH, Constants.N3DS_HEIGHT * 2,
                         0, topDisplayY,
                         topDisplayWidth,topDisplayY+topDisplayHeight,
                         GL_COLOR_BUFFER_BIT, GL_LINEAR);
 
                 glBlitFramebuffer(
                         40, 0,
-                        360, 240,
+                        360, Constants.N3DS_HEIGHT,
                         topDisplayWidth, bottomDisplayY,
                         screenWidth,bottomDisplayY+bottomDisplayHeight,
                         GL_COLOR_BUFFER_BIT, GL_LINEAR);
             } else {
-                int h = (int) ((screenWidth / 400.0) * 480);
-                glBlitFramebuffer(0, 0, 400, 480, 0, screenHeight - h, screenWidth, screenHeight, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+                int h = (int)((screenWidth / (float)Constants.N3DS_WIDTH) * Constants.N3DS_HEIGHT * 2);
+                glBlitFramebuffer(0, 0, Constants.N3DS_WIDTH, Constants.N3DS_HEIGHT * 2, 0, screenHeight - h, screenWidth, screenHeight, GL_COLOR_BUFFER_BIT, GL_LINEAR);
             }
         }
     }
 
     public void onSurfaceChanged(GL10 unused, int width, int height) {
-        glViewport(0, 0, width, height);
         screenWidth = width;
         screenHeight = height;
-        glDisable(GL_SCISSOR_TEST);
     }
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
index 35805657..3b5694ed 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
@@ -13,8 +13,4 @@ public class PandaGlSurfaceView extends GLSurfaceView {
         renderer = new PandaGlRenderer(romPath);
         setRenderer(renderer);
     }
-
-    public PandaGlRenderer getRenderer() {
-        return renderer;
-    }
 }
\ No newline at end of file

From 9aded6e55611cc1d950156c7c4262726465a28ec Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Tue, 28 Nov 2023 18:45:00 +0200
Subject: [PATCH 043/162] Permissions for older phones

---
 src/jni_driver.cpp                                        | 2 +-
 src/pandroid/app/src/main/AndroidManifest.xml             | 3 +++
 .../main/java/com/panda3ds/pandroid/app/MainActivity.java | 8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index 422096d8..6d3bd104 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -49,8 +49,8 @@ extern "C" JNIEXPORT jboolean JNICALL Java_com_panda3ds_pandroid_AlberDriver_Has
 
 extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_LoadRom(JNIEnv* env, jobject obj, jstring path) {
 	const char* pathStr = env->GetStringUTFChars(path, nullptr);
-	__android_log_print(ANDROID_LOG_INFO, "AlberDriver", "Loading ROM %s", pathStr);
 	romLoaded = emulator->loadROM(pathStr);
+	__android_log_print(ANDROID_LOG_INFO, "AlberDriver", "Loading ROM %s, result: %d", pathStr, (int)romLoaded);
 	env->ReleaseStringUTFChars(path, pathStr);
 }
 
diff --git a/src/pandroid/app/src/main/AndroidManifest.xml b/src/pandroid/app/src/main/AndroidManifest.xml
index 01931edc..978edcc5 100644
--- a/src/pandroid/app/src/main/AndroidManifest.xml
+++ b/src/pandroid/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage"/>
 
     <uses-feature
@@ -9,6 +11,7 @@
         android:glEsVersion="0x0030002"/>
 
     <application
+        android:requestLegacyExternalStorage="true"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
index b98bf723..ef0ac63f 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
@@ -10,12 +10,17 @@ import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
+import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
+import androidx.core.app.ActivityCompat;
+
 import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.utils.PathUtils;
 
 public class MainActivity extends BaseActivity {
     private static final int PICK_3DS_ROM = 2;
+    private static final int PERMISSION_REQUEST_CODE = 3;
 
     private void openFile() {
         Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
@@ -32,6 +37,9 @@ public class MainActivity extends BaseActivity {
                 Intent intent = new Intent(ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
                 startActivity(intent);
             }
+        } else {
+            ActivityCompat.requestPermissions(this, new String[]{READ_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
+            ActivityCompat.requestPermissions(this, new String[]{WRITE_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
         }
 
         setContentView(R.layout.activity_main);

From 7c9d17f5ca9c49c6d62df6d35d50de37b2a26cef Mon Sep 17 00:00:00 2001
From: Gabriel Machado <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Tue, 28 Nov 2023 14:54:10 -0400
Subject: [PATCH 044/162] TouchScreen input (#6)

---
 .../panda3ds/pandroid/app/GameActivity.java   |  20 ++-
 .../com/panda3ds/pandroid/math/Vector2.java   |  14 +-
 .../pandroid/view/PandaGlRenderer.java        |  78 +++++----
 .../pandroid/view/PandaGlSurfaceView.java     |  36 +++-
 .../pandroid/view/PandaLayoutController.java  |   2 +
 .../view/controller/ControllerLayout.java     |  14 +-
 .../view/controller/ControllerNode.java       |   4 +
 .../controller/nodes/TouchScreenNodeImpl.java |  39 +++++
 .../view/renderer/ConsoleRenderer.java        |   9 +
 .../view/renderer/layout/ConsoleLayout.java   |  15 ++
 .../renderer/layout/DefaultScreenLayout.java  |  81 +++++++++
 .../app/src/main/res/layout/game_activity.xml | 161 +++++++++---------
 .../app/src/main/res/values/values.xml        |   4 +
 13 files changed, 349 insertions(+), 128 deletions(-)
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/ConsoleRenderer.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/ConsoleLayout.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java
 create mode 100644 src/pandroid/app/src/main/res/values/values.xml

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
index 5c234423..53fb1805 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -2,24 +2,20 @@ package com.panda3ds.pandroid.app;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
+import android.os.Handler;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
-import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.view.PandaGlSurfaceView;
 import com.panda3ds.pandroid.view.PandaLayoutController;
-import com.panda3ds.pandroid.view.controller.ControllerLayout;
 
 public class GameActivity extends BaseActivity {
     private PandaGlSurfaceView pandaSurface;
@@ -46,11 +42,21 @@ public class GameActivity extends BaseActivity {
                 .addView(pandaSurface, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 
         controllerLayout = findViewById(R.id.controller_layout);
+
         controllerLayout.initialize();
 
         ((CheckBox)findViewById(R.id.hide_screen_controller))
                 .setOnCheckedChangeListener((buttonView, isChecked) -> {
-                    controllerLayout.setVisibility(isChecked ? View.VISIBLE : View.INVISIBLE);
+                    findViewById(R.id.overlay_controller)
+                            .setVisibility(isChecked ? View.VISIBLE : View.INVISIBLE);
                 });
+
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
     }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java
index 9c5b45b7..541d45e1 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java
@@ -2,13 +2,8 @@ package com.panda3ds.pandroid.math;
 
 public class Vector2 {
     public float x,y;
-
-    public Vector2(){
-        this(0.0f);
-    }
-
-    public Vector2(float value){
-        this(value,value);
+    public Vector2(Vector2 value){
+        this(value.x,value.y);
     }
 
     public Vector2(float x, float y){
@@ -23,4 +18,9 @@ public class Vector2 {
     public static float distance(float x, float y, float x2, float y2){
         return (float) Math.sqrt((x - x2) * (x - x2) + (y - y2) * (y - y2));
     }
+
+    public void set(float x, float y) {
+        this.x  = x;
+        this.y  = y;
+    }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
index b6be4df2..e6adbd9f 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
@@ -6,17 +6,19 @@ import javax.microedition.khronos.opengles.GL10;
 import static android.opengl.GLES32.*;
 
 import android.content.res.Resources;
+import android.graphics.Rect;
 import android.opengl.GLSurfaceView;
 import android.util.Log;
 
 import com.panda3ds.pandroid.AlberDriver;
-import com.panda3ds.pandroid.utils.Constants;
+import com.panda3ds.pandroid.view.renderer.layout.ConsoleLayout;
+import com.panda3ds.pandroid.view.renderer.ConsoleRenderer;
+import com.panda3ds.pandroid.view.renderer.layout.DefaultScreenLayout;
 
-import java.util.ArrayList;
-
-public class PandaGlRenderer implements GLSurfaceView.Renderer {
+public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer {
 
     private final String romPath;
+    private ConsoleLayout displayLayout;
     private int screenWidth, screenHeight;
     private int screenTexture;
     public int screenFbo;
@@ -24,6 +26,10 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer {
     PandaGlRenderer(String romPath) {
         super();
         this.romPath = romPath;
+
+        screenWidth = Resources.getSystem().getDisplayMetrics().widthPixels;
+        screenHeight = Resources.getSystem().getDisplayMetrics().heightPixels;
+        setLayout(new DefaultScreenLayout());
     }
 
     @Override
@@ -40,8 +46,6 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer {
     public void onSurfaceCreated(GL10 unused, EGLConfig config) {
         Log.i("pandroid", glGetString(GL_EXTENSIONS));
         Log.w("pandroid", glGetString(GL_VERSION));
-        screenWidth = Resources.getSystem().getDisplayMetrics().widthPixels;
-        screenHeight = Resources.getSystem().getDisplayMetrics().heightPixels;
 
         glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
         glClear(GL_COLOR_BUFFER_BIT);
@@ -71,40 +75,48 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer {
             glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
             glBindFramebuffer(GL_READ_FRAMEBUFFER, screenFbo);
 
-            if (screenWidth > screenHeight) {
-                int topDisplayWidth = (int)((screenHeight / (float)Constants.N3DS_HEIGHT) * Constants.N3DS_WIDTH);
-                int topDisplayHeight = screenHeight;
+            Rect topScreen = displayLayout.getTopDisplayBounds();
+            Rect bottomScreen = displayLayout.getBottomDisplayBounds();
 
-                if (topDisplayWidth > screenWidth * 0.7){
-                    topDisplayWidth = (int)(screenWidth * 0.7);
-                    topDisplayHeight = (int)((topDisplayWidth / (float)Constants.N3DS_WIDTH) * Constants.N3DS_HEIGHT);
-                }
+            glBlitFramebuffer(
+                    0, 480,
+                    400, 240,
+                    topScreen.left, screenHeight - topScreen.top,
+                    topScreen.right, screenHeight - topScreen.bottom,
+                    GL_COLOR_BUFFER_BIT, GL_LINEAR);
 
-                int bottomDisplayHeight = (int)(((screenWidth - topDisplayWidth) / 320) * Constants.N3DS_HEIGHT);
-                int topDisplayY = screenHeight - topDisplayHeight;
-                int bottomDisplayY = screenHeight - bottomDisplayHeight;
-
-                glBlitFramebuffer(0, Constants.N3DS_HEIGHT,
-                        Constants.N3DS_WIDTH, Constants.N3DS_HEIGHT * 2,
-                        0, topDisplayY,
-                        topDisplayWidth,topDisplayY+topDisplayHeight,
-                        GL_COLOR_BUFFER_BIT, GL_LINEAR);
-
-                glBlitFramebuffer(
-                        40, 0,
-                        360, Constants.N3DS_HEIGHT,
-                        topDisplayWidth, bottomDisplayY,
-                        screenWidth,bottomDisplayY+bottomDisplayHeight,
-                        GL_COLOR_BUFFER_BIT, GL_LINEAR);
-            } else {
-                int h = (int)((screenWidth / (float)Constants.N3DS_WIDTH) * Constants.N3DS_HEIGHT * 2);
-                glBlitFramebuffer(0, 0, Constants.N3DS_WIDTH, Constants.N3DS_HEIGHT * 2, 0, screenHeight - h, screenWidth, screenHeight, GL_COLOR_BUFFER_BIT, GL_LINEAR);
-            }
+            glBlitFramebuffer(
+                    40, 240,
+                    360, 0,
+                    bottomScreen.left, screenHeight - bottomScreen.top,
+                    bottomScreen.right, screenHeight - bottomScreen.bottom,
+                    GL_COLOR_BUFFER_BIT, GL_LINEAR);
         }
     }
 
     public void onSurfaceChanged(GL10 unused, int width, int height) {
         screenWidth = width;
         screenHeight = height;
+        glDisable(GL_SCISSOR_TEST);
+
+        displayLayout.update(screenWidth, screenHeight);
+    }
+
+    @Override
+    public void setLayout(ConsoleLayout layout) {
+        displayLayout = layout;
+        displayLayout.setTopDisplaySourceSize(400, 240);
+        displayLayout.setBottomDisplaySourceSize(320, 240);
+        displayLayout.update(screenWidth, screenHeight);
+    }
+
+    @Override
+    public ConsoleLayout getLayout() {
+        return displayLayout;
+    }
+
+    @Override
+    public String getBackendName() {
+        return "OpenGL";
     }
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
index 3b5694ed..9f280393 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
@@ -1,10 +1,22 @@
 package com.panda3ds.pandroid.view;
 
 import android.content.Context;
+import android.graphics.Canvas;
 import android.opengl.GLSurfaceView;
+import android.util.Log;
 
-public class PandaGlSurfaceView extends GLSurfaceView {
+import androidx.annotation.NonNull;
+
+import com.panda3ds.pandroid.math.Vector2;
+import com.panda3ds.pandroid.utils.Constants;
+import com.panda3ds.pandroid.view.controller.TouchEvent;
+import com.panda3ds.pandroid.view.controller.nodes.TouchScreenNodeImpl;
+import com.panda3ds.pandroid.view.renderer.ConsoleRenderer;
+
+public class PandaGlSurfaceView extends GLSurfaceView implements TouchScreenNodeImpl {
     final PandaGlRenderer renderer;
+    private int size_width;
+    private int size_height;
 
     public PandaGlSurfaceView(Context context, String romPath) {
         super(context);
@@ -13,4 +25,26 @@ public class PandaGlSurfaceView extends GLSurfaceView {
         renderer = new PandaGlRenderer(romPath);
         setRenderer(renderer);
     }
+
+    public ConsoleRenderer getRenderer() {
+        return renderer;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        size_width = getMeasuredWidth();
+        size_height = getMeasuredHeight();
+    }
+
+    @NonNull
+    @Override
+    public Vector2 getSize() {
+        return new Vector2(size_width, size_height);
+    }
+
+    @Override
+    public void onTouch(TouchEvent event) {
+        onTouchScreenPress(renderer, event);
+    }
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java
index 63f328da..e7d9438f 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java
@@ -58,5 +58,7 @@ public class PandaLayoutController extends ControllerLayout {
                 .setJoystickListener((joystick, axisX, axisY) -> {
                     AlberDriver.SetCirclepadAxis((int)(axisX*0x9C), (int)(axisY*0x9C)*-1);
                 });
+
+        refreshChildren();
     }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java
index 97c8eb12..1ef93c89 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java
@@ -2,14 +2,18 @@ package com.panda3ds.pandroid.view.controller;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 
 import com.panda3ds.pandroid.math.Vector2;
+import com.panda3ds.pandroid.utils.Constants;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 
 public class ControllerLayout extends RelativeLayout {
@@ -34,8 +38,14 @@ public class ControllerLayout extends RelativeLayout {
     }
 
     public void refreshChildren(){
+        ArrayList<ControllerNode> nodes = new ArrayList<>();
+        populateNodesArray(this, nodes);
+
+        //Need Reverse: First view is in back and last view is in front for respect android View hierarchy
+        Collections.reverse(nodes);
+
         controllerNodes.clear();
-        populateNodesArray(this, controllerNodes);
+        controllerNodes.addAll(nodes);
     }
 
     private void populateNodesArray(ViewGroup group, ArrayList<ControllerNode> list){
@@ -89,7 +99,7 @@ public class ControllerLayout extends RelativeLayout {
 
                 float cx = (pos.x - globalPosition[0]);
                 float cy = (pos.y - globalPosition[1]);
-                if( x > cx && x < cx+size.x && y > cy && y < cy+size.y){
+                if(item.isVisible() && x > cx && x < cx+size.x && y > cy && y < cy+size.y){
                     node = item;
                     break;
                 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java
index 8b01fa97..a29d08a4 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java
@@ -18,6 +18,10 @@ public interface ControllerNode {
         return new Vector2(position[0], position[1]);
     }
 
+    default boolean isVisible(){
+        return ((View)this).isShown();
+    }
+
     @NonNull Vector2 getSize();
 
     void onTouch(TouchEvent event);
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java
new file mode 100644
index 00000000..85d1ddd6
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java
@@ -0,0 +1,39 @@
+package com.panda3ds.pandroid.view.controller.nodes;
+
+import android.graphics.Rect;
+import android.util.Log;
+import android.view.View;
+
+import com.panda3ds.pandroid.AlberDriver;
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.utils.Constants;
+import com.panda3ds.pandroid.view.controller.ControllerNode;
+import com.panda3ds.pandroid.view.controller.TouchEvent;
+import com.panda3ds.pandroid.view.renderer.ConsoleRenderer;
+
+public interface TouchScreenNodeImpl extends ControllerNode {
+    default void onTouchScreenPress(ConsoleRenderer renderer, TouchEvent event){
+
+        View me = (View) this;
+        boolean hasDownEvent = me.getTag(R.id.TagEventHasDown) != null && (boolean) me.getTag(R.id.TagEventHasDown);
+
+        Rect bounds = renderer.getLayout().getBottomDisplayBounds();;
+
+        if (event.getX() >= bounds.left && event.getY() >= bounds.top && event.getX() <= bounds.right && event.getY() <= bounds.bottom){
+            int x = (int) (event.getX() - bounds.left);
+            int y = (int) (event.getY() - bounds.top);
+
+            x = Math.round((x/(float)bounds.width())*320);
+            y = Math.round((y/(float)bounds.height())*240);
+
+            AlberDriver.TouchScreenDown(x,y);
+
+            me.setTag(R.id.TagEventHasDown, true);
+        }
+
+        if (hasDownEvent && event.getAction() == TouchEvent.ACTION_UP){
+            AlberDriver.TouchScreenUp();
+            me.setTag(R.id.TagEventHasDown, false);
+        }
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/ConsoleRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/ConsoleRenderer.java
new file mode 100644
index 00000000..13ad4d39
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/ConsoleRenderer.java
@@ -0,0 +1,9 @@
+package com.panda3ds.pandroid.view.renderer;
+
+import com.panda3ds.pandroid.view.renderer.layout.ConsoleLayout;
+
+public interface ConsoleRenderer {
+    void setLayout(ConsoleLayout layout);
+    ConsoleLayout getLayout();
+    String getBackendName();
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/ConsoleLayout.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/ConsoleLayout.java
new file mode 100644
index 00000000..781f0abd
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/ConsoleLayout.java
@@ -0,0 +1,15 @@
+package com.panda3ds.pandroid.view.renderer.layout;
+
+import android.graphics.Rect;
+
+import com.panda3ds.pandroid.math.Vector2;
+
+public interface ConsoleLayout {
+    void update(int screenWidth, int screenHeight);
+
+    void setBottomDisplaySourceSize(int width, int height);
+    void setTopDisplaySourceSize(int width, int height);
+
+    Rect getBottomDisplayBounds();
+    Rect getTopDisplayBounds();
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java
new file mode 100644
index 00000000..a54db8f7
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java
@@ -0,0 +1,81 @@
+package com.panda3ds.pandroid.view.renderer.layout;
+
+import android.graphics.Rect;
+import android.util.Size;
+
+import com.panda3ds.pandroid.math.Vector2;
+
+public class DefaultScreenLayout implements ConsoleLayout {
+    private final Rect topDisplay = new Rect();
+    private final Rect bottomDisplay = new Rect();
+
+    private final Vector2 screenSize = new Vector2(1.0F, 1.0F);
+    private final Vector2 topSourceSize = new Vector2(1.0F, 1.0F);
+    private final Vector2 bottomSourceSize = new Vector2(1.0F, 1.0F);
+
+    @Override
+    public void update(int screenWidth, int screenHeight) {
+        screenSize.set(screenWidth, screenHeight);
+        updateBounds();
+    }
+
+    @Override
+    public void setBottomDisplaySourceSize(int width, int height) {
+        bottomSourceSize.set(width,height);
+        updateBounds();
+    }
+    @Override
+    public void setTopDisplaySourceSize(int width, int height) {
+        topSourceSize.set(width,height);
+        updateBounds();
+    }
+
+    private void updateBounds(){
+        int screenWidth = (int) screenSize.x;
+        int screenHeight = (int) screenSize.y;
+
+        if (screenWidth > screenHeight){
+
+            int topDisplayWidth = (int) ((screenHeight / topSourceSize.y) * topSourceSize.x);
+            int topDisplayHeight = screenHeight;
+
+            if (topDisplayWidth > (screenWidth*0.7)){
+                topDisplayWidth = (int) (screenWidth * 0.7);
+                topDisplayHeight = (int) ((topDisplayWidth/topSourceSize.x)* topSourceSize.y);
+            }
+
+            int bottomDisplayHeight = (int) (((screenWidth-topDisplayWidth)/ bottomSourceSize.x)* bottomSourceSize.y);
+
+
+            topDisplay.set(0, 0, topDisplayWidth, topDisplayHeight);
+            bottomDisplay.set(topDisplayWidth, 0, topDisplayWidth+(screenWidth-topDisplayWidth), bottomDisplayHeight);
+        } else {
+            int topScreenHeight = (int) ((screenWidth/ topSourceSize.x) * topSourceSize.y);
+            topDisplay.set(0,0,screenWidth,topScreenHeight);
+
+            int bottomDisplayHeight = (int)((screenWidth/ bottomSourceSize.x) * bottomSourceSize.y);
+            int bottomDisplayWidth = screenWidth;
+            int bottomDisplayX = 0;
+
+            if (topScreenHeight + bottomDisplayHeight > screenHeight){
+                bottomDisplayHeight = (screenHeight-topScreenHeight);
+                bottomDisplayWidth = (int) ((bottomDisplayHeight/ bottomSourceSize.y)*bottomSourceSize.x);
+                bottomDisplayX = (screenWidth-bottomDisplayX)/2;
+            }
+
+            topDisplay.set(0,0, screenWidth,topScreenHeight);
+            bottomDisplay.set(bottomDisplayX, topScreenHeight, bottomDisplayX+bottomDisplayWidth,topScreenHeight+bottomDisplayHeight);
+        }
+    }
+
+
+    @Override
+    public Rect getBottomDisplayBounds() {
+        return bottomDisplay;
+    }
+
+    @Override
+    public Rect getTopDisplayBounds() {
+        return topDisplay;
+    }
+}
diff --git a/src/pandroid/app/src/main/res/layout/game_activity.xml b/src/pandroid/app/src/main/res/layout/game_activity.xml
index 64f067b2..6f6f65d7 100644
--- a/src/pandroid/app/src/main/res/layout/game_activity.xml
+++ b/src/pandroid/app/src/main/res/layout/game_activity.xml
@@ -4,105 +4,110 @@
     android:layout_height="match_parent"
     android:background="#000">
 
-    <FrameLayout
-        android:id="@+id/panda_gl_frame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
 
     <com.panda3ds.pandroid.view.PandaLayoutController
         android:id="@+id/controller_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-
-        <LinearLayout
+        <FrameLayout
+            android:id="@+id/panda_gl_frame"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="bottom"
-            android:padding="20dp">
+            android:layout_height="match_parent"/>
 
-            <FrameLayout
+        <FrameLayout
+            android:id="@+id/overlay_controller"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent"
+                android:gravity="bottom"
+                android:padding="20dp">
 
-
-                <com.panda3ds.pandroid.view.controller.nodes.Button
-                    android:id="@+id/button_l"
-                    android:layout_width="100dp"
-                    android:layout_height="25dp"
-                    android:layout_gravity="left"
-                    style="@style/ControllerSimpleButton"
-                    android:background="@drawable/simple_card_button_left"
-                    android:text="L"/>
-
-                <com.panda3ds.pandroid.view.controller.nodes.Button
-                    android:id="@+id/button_r"
-                    android:layout_width="100dp"
-                    android:layout_height="25dp"
-                    android:layout_gravity="right"
-                    style="@style/ControllerSimpleButton"
-                    android:background="@drawable/simple_card_button_right"
-                    android:text="R"/>
-
-                <LinearLayout
+                <FrameLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingTop="60dp">
+                    android:layout_height="wrap_content">
 
-                    <include layout="@layout/controller_dpad"/>
-
-                    <com.panda3ds.pandroid.view.controller.nodes.Joystick
-                        android:id="@+id/left_analog"
+                    <com.panda3ds.pandroid.view.controller.nodes.Button
+                        android:id="@+id/button_l"
                         android:layout_width="100dp"
-                        android:layout_height="100dp"
-                        android:layout_marginTop="20dp"
-                        android:background="@drawable/simple_analog_background"
-                        android:foreground="@drawable/simple_circle_button"
-                        android:padding="40dp"/>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="end|bottom"
-                    android:orientation="vertical"
-                    android:layout_gravity="center">
-
-                    <include layout="@layout/controller_gamepad"/>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|center">
+                        android:layout_height="25dp"
+                        android:layout_gravity="left"
+                        style="@style/ControllerSimpleButton"
+                        android:background="@drawable/simple_card_button_left"
+                        android:text="L"/>
 
                     <com.panda3ds.pandroid.view.controller.nodes.Button
-                        android:id="@+id/button_start"
+                        android:id="@+id/button_r"
+                        android:layout_width="100dp"
+                        android:layout_height="25dp"
+                        android:layout_gravity="right"
+                        style="@style/ControllerSimpleButton"
+                        android:background="@drawable/simple_card_button_right"
+                        android:text="R"/>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:paddingTop="60dp">
+
+                        <include layout="@layout/controller_dpad"/>
+
+                        <com.panda3ds.pandroid.view.controller.nodes.Joystick
+                            android:id="@+id/left_analog"
+                            android:layout_width="100dp"
+                            android:layout_height="100dp"
+                            android:layout_marginTop="20dp"
+                            android:background="@drawable/simple_analog_background"
+                            android:foreground="@drawable/simple_circle_button"
+                            android:padding="40dp"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="end|bottom"
+                        android:orientation="vertical"
+                        android:layout_gravity="center">
+
+                        <include layout="@layout/controller_gamepad"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:background="@drawable/simple_card_button"
-                        style="@style/ControllerSimpleButton"
-                        android:paddingHorizontal="10dp"
-                        android:text="START"/>
+                        android:layout_gravity="bottom|center">
 
-                    <com.panda3ds.pandroid.view.controller.nodes.Button
-                        android:id="@+id/button_select"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/simple_card_button"
-                        style="@style/ControllerSimpleButton"
-                        android:paddingHorizontal="10dp"
-                        android:layout_marginLeft="10dp"
-                        android:text="SELECT"/>
+                        <com.panda3ds.pandroid.view.controller.nodes.Button
+                            android:id="@+id/button_start"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/simple_card_button"
+                            style="@style/ControllerSimpleButton"
+                            android:paddingHorizontal="10dp"
+                            android:text="START"/>
 
-                </LinearLayout>
+                        <com.panda3ds.pandroid.view.controller.nodes.Button
+                            android:id="@+id/button_select"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/simple_card_button"
+                            style="@style/ControllerSimpleButton"
+                            android:paddingHorizontal="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:text="SELECT"/>
 
-            </FrameLayout>
+                    </LinearLayout>
 
-        </LinearLayout>
+                </FrameLayout>
+
+            </LinearLayout>
+        </FrameLayout>
 
     </com.panda3ds.pandroid.view.PandaLayoutController>
 
diff --git a/src/pandroid/app/src/main/res/values/values.xml b/src/pandroid/app/src/main/res/values/values.xml
new file mode 100644
index 00000000..9a4071c7
--- /dev/null
+++ b/src/pandroid/app/src/main/res/values/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="TagEventHasDown" type="id"/>
+</resources>
\ No newline at end of file

From a40e74a15d08798ae045bae2b64324949b8e1ac3 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Tue, 28 Nov 2023 21:11:58 +0200
Subject: [PATCH 045/162] Remove magic numbers

---
 .../com/panda3ds/pandroid/utils/Constants.java     |  3 ++-
 .../panda3ds/pandroid/view/PandaGlRenderer.java    | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
index 2e706530..14d5c398 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
@@ -19,7 +19,8 @@ public class Constants {
     public static final int INPUT_KEY_SELECT = 1 << 2;
 
     public static final int N3DS_WIDTH = 400;
-    public static final int N3DS_HEIGHT = 240;
+    public static final int N3DS_HALF_HEIGHT = 240;
+    public static final int N3DS_FULL_HEIGHT = 480;
 
     public static final String EXTRA_PATH = "path";
     public static final String LOG_TAG = "Alber";
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
index e6adbd9f..0e1826d1 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
@@ -79,15 +79,16 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
             Rect bottomScreen = displayLayout.getBottomDisplayBounds();
 
             glBlitFramebuffer(
-                    0, 480,
-                    400, 240,
+                    0, Constants.N3DS_FULL_HEIGHT,
+                    Constants.N3DS_WIDTH, Constants.N3DS_HALF_HEIGHT,
                     topScreen.left, screenHeight - topScreen.top,
                     topScreen.right, screenHeight - topScreen.bottom,
                     GL_COLOR_BUFFER_BIT, GL_LINEAR);
 
+            // Remove the black bars on the bottom screen
             glBlitFramebuffer(
-                    40, 240,
-                    360, 0,
+                    40, Constants.N3DS_HALF_HEIGHT,
+                    Constants.N3DS_WIDTH - 40, 0,
                     bottomScreen.left, screenHeight - bottomScreen.top,
                     bottomScreen.right, screenHeight - bottomScreen.bottom,
                     GL_COLOR_BUFFER_BIT, GL_LINEAR);
@@ -97,7 +98,6 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
     public void onSurfaceChanged(GL10 unused, int width, int height) {
         screenWidth = width;
         screenHeight = height;
-        glDisable(GL_SCISSOR_TEST);
 
         displayLayout.update(screenWidth, screenHeight);
     }
@@ -105,8 +105,8 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
     @Override
     public void setLayout(ConsoleLayout layout) {
         displayLayout = layout;
-        displayLayout.setTopDisplaySourceSize(400, 240);
-        displayLayout.setBottomDisplaySourceSize(320, 240);
+        displayLayout.setTopDisplaySourceSize(Constants.N3DS_WIDTH, Constants.N3DS_HALF_HEIGHT);
+        displayLayout.setBottomDisplaySourceSize(Constants.N3DS_WIDTH - 40 - 40, Constants.N3DS_HALF_HEIGHT);
         displayLayout.update(screenWidth, screenHeight);
     }
 

From ed0864d24f2f4675275f72beb30a768a1d58c3fb Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Tue, 28 Nov 2023 21:41:57 +0200
Subject: [PATCH 046/162] Run clang-format on .java files

---
 src/pandroid/app/.gitignore                   |   1 -
 src/pandroid/app/build.gradle.kts             |   4 -
 .../com/panda3ds/pandroid/AlberDriver.java    |  29 +--
 .../panda3ds/pandroid/app/BaseActivity.java   |   3 +-
 .../panda3ds/pandroid/app/GameActivity.java   |  62 +++--
 .../panda3ds/pandroid/app/MainActivity.java   |  80 +++----
 .../com/panda3ds/pandroid/math/Vector2.java   |  30 +--
 .../panda3ds/pandroid/utils/Constants.java    |  35 ++-
 .../panda3ds/pandroid/utils/PathUtils.java    | 156 ++++++-------
 .../pandroid/view/PandaGlRenderer.java        | 176 +++++++-------
 .../pandroid/view/PandaGlSurfaceView.java     |  56 +++--
 .../pandroid/view/PandaLayoutController.java  |  68 +++---
 .../view/controller/ControllerLayout.java     | 218 +++++++++---------
 .../view/controller/ControllerNode.java       |  26 +--
 .../pandroid/view/controller/TouchEvent.java  |  32 ++-
 .../listeners/ButtonStateListener.java        |   2 +-
 .../listeners/JoystickListener.java           |   2 +-
 .../controller/nodes/BasicControllerNode.java |  14 +-
 .../view/controller/nodes/Button.java         |  86 ++++---
 .../view/controller/nodes/Joystick.java       | 155 ++++++-------
 .../controller/nodes/TouchScreenNodeImpl.java |  37 ++-
 .../view/renderer/ConsoleRenderer.java        |   6 +-
 .../view/renderer/layout/ConsoleLayout.java   |  11 +-
 .../renderer/layout/DefaultScreenLayout.java  | 116 +++++-----
 24 files changed, 634 insertions(+), 771 deletions(-)
 delete mode 100644 src/pandroid/app/.gitignore

diff --git a/src/pandroid/app/.gitignore b/src/pandroid/app/.gitignore
deleted file mode 100644
index 42afabfd..00000000
--- a/src/pandroid/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/src/pandroid/app/build.gradle.kts b/src/pandroid/app/build.gradle.kts
index ff8debcb..276eb552 100644
--- a/src/pandroid/app/build.gradle.kts
+++ b/src/pandroid/app/build.gradle.kts
@@ -36,11 +36,7 @@ android {
 }
 
 dependencies {
-
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("com.google.android.material:material:1.8.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
index 92d276a2..81bf29a5 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
@@ -1,24 +1,19 @@
 package com.panda3ds.pandroid;
 
 public class AlberDriver {
+	AlberDriver() { super(); }
 
-    AlberDriver() {
-        super();
-    }
+	public static native void Initialize();
+	public static native void RunFrame(int fbo);
+	public static native boolean HasRomLoaded();
+	public static native void LoadRom(String path);
+	public static native void Finalize();
 
-    public static native void Initialize();
-    public static native void RunFrame(int fbo);
-    public static native boolean HasRomLoaded();
-    public static native void LoadRom(String path);
-    public static native void Finalize();
+	public static native void KeyDown(int code);
+	public static native void KeyUp(int code);
+	public static native void SetCirclepadAxis(int x, int y);
+	public static native void TouchScreenUp();
+	public static native void TouchScreenDown(int x, int y);
 
-    public static native void KeyDown(int code);
-    public static native void KeyUp(int code);
-    public static native void SetCirclepadAxis(int x, int y);
-    public static native void TouchScreenUp();
-    public static native void TouchScreenDown(int x, int y);
-
-    static {
-        System.loadLibrary("Alber");
-    }
+	static { System.loadLibrary("Alber"); }
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
index 597d664b..72926b07 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
@@ -2,5 +2,4 @@ package com.panda3ds.pandroid.app;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-public class BaseActivity extends AppCompatActivity {
-}
+public class BaseActivity extends AppCompatActivity {}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
index 53fb1805..e196d0d1 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -9,54 +9,48 @@ import android.view.WindowManager;
 import android.widget.CheckBox;
 import android.widget.FrameLayout;
 import android.widget.Toast;
-
 import androidx.annotation.Nullable;
-
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.view.PandaGlSurfaceView;
 import com.panda3ds.pandroid.view.PandaLayoutController;
 
 public class GameActivity extends BaseActivity {
-    private PandaGlSurfaceView pandaSurface;
-    private PandaLayoutController controllerLayout;
+	private PandaGlSurfaceView pandaSurface;
+	private PandaLayoutController controllerLayout;
 
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+	@Override
+	protected void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
 
-        Intent intent = getIntent();
-        if(!intent.hasExtra(Constants.EXTRA_PATH)){
+		Intent intent = getIntent();
+		if (!intent.hasExtra(Constants.EXTRA_PATH)) {
+			setContentView(new FrameLayout(this));
+			Toast.makeText(this, "Invalid rom path!", Toast.LENGTH_LONG).show();
+			finish();
+			return;
+		}
 
-            setContentView(new FrameLayout(this));
-            Toast.makeText(this, "Invalid rom path!", Toast.LENGTH_LONG).show();
-            finish();
-            return;
-        }
+		pandaSurface = new PandaGlSurfaceView(this, intent.getStringExtra(Constants.EXTRA_PATH));
 
-        pandaSurface = new PandaGlSurfaceView(this, intent.getStringExtra(Constants.EXTRA_PATH));
+		setContentView(R.layout.game_activity);
 
-        setContentView(R.layout.game_activity);
+		((FrameLayout) findViewById(R.id.panda_gl_frame))
+			.addView(pandaSurface, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 
-        ((FrameLayout)findViewById(R.id.panda_gl_frame))
-                .addView(pandaSurface, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+		controllerLayout = findViewById(R.id.controller_layout);
 
-        controllerLayout = findViewById(R.id.controller_layout);
+		controllerLayout.initialize();
 
-        controllerLayout.initialize();
+		((CheckBox) findViewById(R.id.hide_screen_controller)).setOnCheckedChangeListener((buttonView, isChecked) -> {
+			findViewById(R.id.overlay_controller).setVisibility(isChecked ? View.VISIBLE : View.INVISIBLE);
+		});
+	}
 
-        ((CheckBox)findViewById(R.id.hide_screen_controller))
-                .setOnCheckedChangeListener((buttonView, isChecked) -> {
-                    findViewById(R.id.overlay_controller)
-                            .setVisibility(isChecked ? View.VISIBLE : View.INVISIBLE);
-                });
-
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-    }
+	@Override
+	protected void onResume() {
+		super.onResume();
+		getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
+		getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
index ef0ac63f..181cfb4e 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
@@ -1,5 +1,7 @@
 package com.panda3ds.pandroid.app;
 
+import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
+import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
 import static android.provider.Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION;
 
 import android.content.Intent;
@@ -7,58 +9,50 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.widget.Toast;
-
 import androidx.appcompat.app.AppCompatActivity;
-
-import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
-import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
 import androidx.core.app.ActivityCompat;
-
-import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.utils.PathUtils;
 
 public class MainActivity extends BaseActivity {
-    private static final int PICK_3DS_ROM = 2;
-    private static final int PERMISSION_REQUEST_CODE = 3;
+	private static final int PICK_3DS_ROM = 2;
+	private static final int PERMISSION_REQUEST_CODE = 3;
 
-    private void openFile() {
-        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
-        intent.addCategory(Intent.CATEGORY_OPENABLE);
-        intent.setType("*/*");
-        startActivityForResult(intent, PICK_3DS_ROM);
-    }
+	private void openFile() {
+		Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+		intent.addCategory(Intent.CATEGORY_OPENABLE);
+		intent.setType("*/*");
+		startActivityForResult(intent, PICK_3DS_ROM);
+	}
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            if (!Environment.isExternalStorageManager()) {
-                Intent intent = new Intent(ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
-                startActivity(intent);
-            }
-        } else {
-            ActivityCompat.requestPermissions(this, new String[]{READ_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
-            ActivityCompat.requestPermissions(this, new String[]{WRITE_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
-        }
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+			if (!Environment.isExternalStorageManager()) {
+				Intent intent = new Intent(ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
+				startActivity(intent);
+			}
+		} else {
+			ActivityCompat.requestPermissions(this, new String[] {READ_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
+			ActivityCompat.requestPermissions(this, new String[] {WRITE_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
+		}
 
-        setContentView(R.layout.activity_main);
+		setContentView(R.layout.activity_main);
 
-        findViewById(R.id.load_rom).setOnClickListener(v->{
-            openFile();
-        });
-    }
+		findViewById(R.id.load_rom).setOnClickListener(v -> { openFile(); });
+	}
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == PICK_3DS_ROM) {
-            if (resultCode == RESULT_OK) {
-                String path = PathUtils.getPath(getApplicationContext(), data.getData());
-                Toast.makeText(getApplicationContext(), "pandroid opening " + path, Toast.LENGTH_LONG).show();
-                startActivity(new Intent(this, GameActivity.class)
-                        .putExtra(Constants.EXTRA_PATH, path));
-            }
-            super.onActivityResult(requestCode, resultCode, data);
-        }
-    }
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		if (requestCode == PICK_3DS_ROM) {
+			if (resultCode == RESULT_OK) {
+				String path = PathUtils.getPath(getApplicationContext(), data.getData());
+				Toast.makeText(getApplicationContext(), "pandroid opening " + path, Toast.LENGTH_LONG).show();
+				startActivity(new Intent(this, GameActivity.class).putExtra(Constants.EXTRA_PATH, path));
+			}
+			super.onActivityResult(requestCode, resultCode, data);
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java
index 541d45e1..4208b610 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java
@@ -1,26 +1,20 @@
 package com.panda3ds.pandroid.math;
 
 public class Vector2 {
-    public float x,y;
-    public Vector2(Vector2 value){
-        this(value.x,value.y);
-    }
+	public float x, y;
+	public Vector2(Vector2 value) { this(value.x, value.y); }
 
-    public Vector2(float x, float y){
-        this.x = x;
-        this.y = y;
-    }
+	public Vector2(float x, float y) {
+		this.x = x;
+		this.y = y;
+	}
 
-    public float distanceTo(Vector2 vec){
-        return distance(x,y,vec.x, vec.y);
-    }
+	public float distanceTo(Vector2 vec) { return distance(x, y, vec.x, vec.y); }
 
-    public static float distance(float x, float y, float x2, float y2){
-        return (float) Math.sqrt((x - x2) * (x - x2) + (y - y2) * (y - y2));
-    }
+	public static float distance(float x, float y, float x2, float y2) { return (float) Math.sqrt((x - x2) * (x - x2) + (y - y2) * (y - y2)); }
 
-    public void set(float x, float y) {
-        this.x  = x;
-        this.y  = y;
-    }
+	public void set(float x, float y) {
+		this.x = x;
+		this.y = y;
+	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
index 14d5c398..bc389987 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
@@ -1,27 +1,26 @@
 package com.panda3ds.pandroid.utils;
 
 public class Constants {
+	public static final int INPUT_KEY_UP = 1 << 6;
+	public static final int INPUT_KEY_DOWN = 1 << 7;
+	public static final int INPUT_KEY_LEFT = 1 << 5;
+	public static final int INPUT_KEY_RIGHT = 1 << 4;
 
-    public static final int INPUT_KEY_UP = 1 << 6;
-    public static final int INPUT_KEY_DOWN = 1 << 7;
-    public static final int INPUT_KEY_LEFT = 1 << 5;
-    public static final int INPUT_KEY_RIGHT = 1 << 4;
+	public static final int INPUT_KEY_A = 1 << 0;
+	public static final int INPUT_KEY_B = 1 << 1;
+	public static final int INPUT_KEY_X = 1 << 10;
+	public static final int INPUT_KEY_Y = 1 << 11;
 
-    public static final int INPUT_KEY_A = 1 << 0;
-    public static final int INPUT_KEY_B = 1 << 1;
-    public static final int INPUT_KEY_X = 1 << 10;
-    public static final int INPUT_KEY_Y = 1 << 11;
+	public static final int INPUT_KEY_R = 1 << 8;
+	public static final int INPUT_KEY_L = 1 << 9;
 
-    public static final int INPUT_KEY_R = 1 << 8;
-    public static final int INPUT_KEY_L = 1 << 9;
+	public static final int INPUT_KEY_START = 1 << 3;
+	public static final int INPUT_KEY_SELECT = 1 << 2;
 
-    public static final int INPUT_KEY_START = 1 << 3;
-    public static final int INPUT_KEY_SELECT = 1 << 2;
+	public static final int N3DS_WIDTH = 400;
+	public static final int N3DS_HALF_HEIGHT = 240;
+	public static final int N3DS_FULL_HEIGHT = 480;
 
-    public static final int N3DS_WIDTH = 400;
-    public static final int N3DS_HALF_HEIGHT = 240;
-    public static final int N3DS_FULL_HEIGHT = 480;
-
-    public static final String EXTRA_PATH = "path";
-    public static final String LOG_TAG = "Alber";
+	public static final String EXTRA_PATH = "path";
+	public static final String LOG_TAG = "Alber";
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
index 0a24603c..ccf655bf 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
@@ -10,116 +10,92 @@ import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 
 public class PathUtils {
+	public static String getPath(final Context context, final Uri uri) {
+		// DocumentProvider
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && DocumentsContract.isDocumentUri(context, uri)) {
+			if (isExternalStorageDocument(uri)) { // ExternalStorageProvider
+				final String docId = DocumentsContract.getDocumentId(uri);
+				final String[] split = docId.split(":");
+				final String type = split[0];
+				String storageDefinition;
 
-    public static String getPath(final Context context, final Uri uri) {
+				if ("primary".equalsIgnoreCase(type)) {
+					return Environment.getExternalStorageDirectory() + "/" + split[1];
 
-        // DocumentProvider
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && DocumentsContract.isDocumentUri(context, uri)) {
+				} else {
+					if (Environment.isExternalStorageRemovable()) {
+						storageDefinition = "EXTERNAL_STORAGE";
 
-            if (isExternalStorageDocument(uri)) {// ExternalStorageProvider
-                final String docId = DocumentsContract.getDocumentId(uri);
-                final String[] split = docId.split(":");
-                final String type = split[0];
-                String storageDefinition;
+					} else {
+						storageDefinition = "SECONDARY_STORAGE";
+					}
 
+					return System.getenv(storageDefinition) + "/" + split[1];
+				}
 
-                if("primary".equalsIgnoreCase(type)){
+			} else if (isDownloadsDocument(uri)) { // DownloadsProvider
 
-                    return Environment.getExternalStorageDirectory() + "/" + split[1];
+				final String id = DocumentsContract.getDocumentId(uri);
+				final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
 
-                } else {
+				return getDataColumn(context, contentUri, null, null);
 
-                    if(Environment.isExternalStorageRemovable()){
-                        storageDefinition = "EXTERNAL_STORAGE";
+			} else if (isMediaDocument(uri)) { // MediaProvider
+				final String docId = DocumentsContract.getDocumentId(uri);
+				final String[] split = docId.split(":");
+				final String type = split[0];
 
-                    } else{
-                        storageDefinition = "SECONDARY_STORAGE";
-                    }
+				Uri contentUri = null;
+				if ("image".equals(type)) {
+					contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+				} else if ("video".equals(type)) {
+					contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+				} else if ("audio".equals(type)) {
+					contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+				}
 
-                    return System.getenv(storageDefinition) + "/" + split[1];
-                }
-            
-            } else if (isDownloadsDocument(uri)) {// DownloadsProvider
+				final String selection = "_id=?";
+				final String[] selectionArgs = new String[] {split[1]};
 
-                final String id = DocumentsContract.getDocumentId(uri);
-                final Uri contentUri = ContentUris.withAppendedId(
-                        Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
+				return getDataColumn(context, contentUri, selection, selectionArgs);
+			}
 
-                return getDataColumn(context, contentUri, null, null);
+		} else if ("content".equalsIgnoreCase(uri.getScheme())) { // MediaStore (and general)
 
-            } else if (isMediaDocument(uri)) {// MediaProvider
-                final String docId = DocumentsContract.getDocumentId(uri);
-                final String[] split = docId.split(":");
-                final String type = split[0];
+			// Return the remote address
+			if (isGooglePhotosUri(uri)) return uri.getLastPathSegment();
 
-                Uri contentUri = null;
-                if ("image".equals(type)) {
-                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
-                } else if ("video".equals(type)) {
-                contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
-                } else if ("audio".equals(type)) {
-                    contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
-                }
+			return getDataColumn(context, uri, null, null);
 
-                final String selection = "_id=?";
-                final String[] selectionArgs = new String[]{
-                        split[1]
-                };
+		} else if ("file".equalsIgnoreCase(uri.getScheme())) { // File
+			return uri.getPath();
+		}
 
-                return getDataColumn(context, contentUri, selection, selectionArgs);
-            }
+		return null;
+	}
 
-        } else if ("content".equalsIgnoreCase(uri.getScheme())) {// MediaStore (and general)
+	public static String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
+		Cursor cursor = null;
+		final String column = "_data";
+		final String[] projection = {column};
 
-            // Return the remote address
-            if (isGooglePhotosUri(uri))
-                return uri.getLastPathSegment();
+		try {
+			cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
+			if (cursor != null && cursor.moveToFirst()) {
+				final int column_index = cursor.getColumnIndexOrThrow(column);
+				return cursor.getString(column_index);
+			}
+		} finally {
+			if (cursor != null) cursor.close();
+		}
+		return null;
+	}
 
-            return getDataColumn(context, uri, null, null);
+	public static boolean isExternalStorageDocument(Uri uri) { return "com.android.externalstorage.documents".equals(uri.getAuthority()); }
 
-        } else if ("file".equalsIgnoreCase(uri.getScheme())) {// File
-            return uri.getPath();
-        }
+	public static boolean isDownloadsDocument(Uri uri) { return "com.android.providers.downloads.documents".equals(uri.getAuthority()); }
 
-        return null;
-    }
+	public static boolean isMediaDocument(Uri uri) { return "com.android.providers.media.documents".equals(uri.getAuthority()); }
 
-    public static String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
-
-        Cursor cursor = null;
-        final String column = "_data";
-        final String[] projection = {
-                column
-        };
-
-        try {
-            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
-            if (cursor != null && cursor.moveToFirst()) {
-                final int column_index = cursor.getColumnIndexOrThrow(column);
-                return cursor.getString(column_index);
-            }
-        } finally {
-            if (cursor != null)
-                cursor.close();
-        }
-        return null;
-    }
-
-
-    public static boolean isExternalStorageDocument(Uri uri) {
-        return "com.android.externalstorage.documents".equals(uri.getAuthority());
-    }
-
-
-    public static boolean isDownloadsDocument(Uri uri) {
-        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
-    }
-
-    public static boolean isMediaDocument(Uri uri) {
-        return "com.android.providers.media.documents".equals(uri.getAuthority());
-    }
-
-    public static boolean isGooglePhotosUri(Uri uri) {
-        return "com.google.android.apps.photos.content".equals(uri.getAuthority());
-    }
+	public static boolean isGooglePhotosUri(Uri uri) { return "com.google.android.apps.photos.content".equals(uri.getAuthority()); }
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
index 0e1826d1..b21e3353 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
@@ -1,122 +1,116 @@
 package com.panda3ds.pandroid.view;
 
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-
 import static android.opengl.GLES32.*;
 
 import android.content.res.Resources;
 import android.graphics.Rect;
 import android.opengl.GLSurfaceView;
 import android.util.Log;
-
 import com.panda3ds.pandroid.AlberDriver;
-import com.panda3ds.pandroid.view.renderer.layout.ConsoleLayout;
+import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.view.renderer.ConsoleRenderer;
+import com.panda3ds.pandroid.view.renderer.layout.ConsoleLayout;
 import com.panda3ds.pandroid.view.renderer.layout.DefaultScreenLayout;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
 
 public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer {
+	private final String romPath;
+	private ConsoleLayout displayLayout;
+	private int screenWidth, screenHeight;
+	private int screenTexture;
+	public int screenFbo;
 
-    private final String romPath;
-    private ConsoleLayout displayLayout;
-    private int screenWidth, screenHeight;
-    private int screenTexture;
-    public int screenFbo;
+	PandaGlRenderer(String romPath) {
+		super();
+		this.romPath = romPath;
 
-    PandaGlRenderer(String romPath) {
-        super();
-        this.romPath = romPath;
+		screenWidth = Resources.getSystem().getDisplayMetrics().widthPixels;
+		screenHeight = Resources.getSystem().getDisplayMetrics().heightPixels;
+		setLayout(new DefaultScreenLayout());
+	}
 
-        screenWidth = Resources.getSystem().getDisplayMetrics().widthPixels;
-        screenHeight = Resources.getSystem().getDisplayMetrics().heightPixels;
-        setLayout(new DefaultScreenLayout());
-    }
+	@Override
+	protected void finalize() throws Throwable {
+		if (screenTexture != 0) {
+			glDeleteTextures(1, new int[] {screenTexture}, 0);
+		}
+		if (screenFbo != 0) {
+			glDeleteFramebuffers(1, new int[] {screenFbo}, 0);
+		}
+		super.finalize();
+	}
 
-    @Override
-    protected void finalize() throws Throwable {
-        if (screenTexture != 0) {
-            glDeleteTextures(1, new int[]{screenTexture}, 0);
-        }
-        if (screenFbo != 0) {
-            glDeleteFramebuffers(1, new int[]{screenFbo}, 0);
-        }
-        super.finalize();
-    }
+	public void onSurfaceCreated(GL10 unused, EGLConfig config) {
+		Log.i("pandroid", glGetString(GL_EXTENSIONS));
+		Log.w("pandroid", glGetString(GL_VERSION));
 
-    public void onSurfaceCreated(GL10 unused, EGLConfig config) {
-        Log.i("pandroid", glGetString(GL_EXTENSIONS));
-        Log.w("pandroid", glGetString(GL_VERSION));
+		glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+		glClear(GL_COLOR_BUFFER_BIT);
 
-        glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-        glClear(GL_COLOR_BUFFER_BIT);
+		int[] generateBuffer = new int[1];
+		glGenTextures(1, generateBuffer, 0);
+		screenTexture = generateBuffer[0];
+		glBindTexture(GL_TEXTURE_2D, screenTexture);
+		glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, screenWidth, screenHeight);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		glBindTexture(GL_TEXTURE_2D, 0);
 
-        int[] generateBuffer = new int[1];
-        glGenTextures(1, generateBuffer, 0);
-        screenTexture = generateBuffer[0];
-        glBindTexture(GL_TEXTURE_2D, screenTexture);
-        glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, screenWidth, screenHeight);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        glBindTexture(GL_TEXTURE_2D, 0);
+		glGenFramebuffers(1, generateBuffer, 0);
+		screenFbo = generateBuffer[0];
+		glBindFramebuffer(GL_FRAMEBUFFER, screenFbo);
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, screenTexture, 0);
+		glBindFramebuffer(GL_FRAMEBUFFER, 0);
 
-        glGenFramebuffers(1, generateBuffer, 0);
-        screenFbo = generateBuffer[0];
-        glBindFramebuffer(GL_FRAMEBUFFER, screenFbo);
-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, screenTexture, 0);
-        glBindFramebuffer(GL_FRAMEBUFFER, 0);
+		AlberDriver.Initialize();
+		AlberDriver.LoadRom(romPath);
+	}
 
-        AlberDriver.Initialize();
-        AlberDriver.LoadRom(romPath);
-    }
+	public void onDrawFrame(GL10 unused) {
+		if (AlberDriver.HasRomLoaded()) {
+			AlberDriver.RunFrame(screenFbo);
+			glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+			glBindFramebuffer(GL_READ_FRAMEBUFFER, screenFbo);
 
-    public void onDrawFrame(GL10 unused) {
-        if (AlberDriver.HasRomLoaded()) {
-            AlberDriver.RunFrame(screenFbo);
-            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
-            glBindFramebuffer(GL_READ_FRAMEBUFFER, screenFbo);
+			Rect topScreen = displayLayout.getTopDisplayBounds();
+			Rect bottomScreen = displayLayout.getBottomDisplayBounds();
 
-            Rect topScreen = displayLayout.getTopDisplayBounds();
-            Rect bottomScreen = displayLayout.getBottomDisplayBounds();
+			glBlitFramebuffer(
+				0, Constants.N3DS_FULL_HEIGHT, Constants.N3DS_WIDTH, Constants.N3DS_HALF_HEIGHT, topScreen.left, screenHeight - topScreen.top,
+				topScreen.right, screenHeight - topScreen.bottom, GL_COLOR_BUFFER_BIT, GL_LINEAR
+			);
 
-            glBlitFramebuffer(
-                    0, Constants.N3DS_FULL_HEIGHT,
-                    Constants.N3DS_WIDTH, Constants.N3DS_HALF_HEIGHT,
-                    topScreen.left, screenHeight - topScreen.top,
-                    topScreen.right, screenHeight - topScreen.bottom,
-                    GL_COLOR_BUFFER_BIT, GL_LINEAR);
+			// Remove the black bars on the bottom screen
+			glBlitFramebuffer(
+				40, Constants.N3DS_HALF_HEIGHT, Constants.N3DS_WIDTH - 40, 0, bottomScreen.left, screenHeight - bottomScreen.top, bottomScreen.right,
+				screenHeight - bottomScreen.bottom, GL_COLOR_BUFFER_BIT, GL_LINEAR
+			);
+		}
+	}
 
-            // Remove the black bars on the bottom screen
-            glBlitFramebuffer(
-                    40, Constants.N3DS_HALF_HEIGHT,
-                    Constants.N3DS_WIDTH - 40, 0,
-                    bottomScreen.left, screenHeight - bottomScreen.top,
-                    bottomScreen.right, screenHeight - bottomScreen.bottom,
-                    GL_COLOR_BUFFER_BIT, GL_LINEAR);
-        }
-    }
+	public void onSurfaceChanged(GL10 unused, int width, int height) {
+		screenWidth = width;
+		screenHeight = height;
 
-    public void onSurfaceChanged(GL10 unused, int width, int height) {
-        screenWidth = width;
-        screenHeight = height;
+		displayLayout.update(screenWidth, screenHeight);
+	}
 
-        displayLayout.update(screenWidth, screenHeight);
-    }
+	@Override
+	public void setLayout(ConsoleLayout layout) {
+		displayLayout = layout;
+		displayLayout.setTopDisplaySourceSize(Constants.N3DS_WIDTH, Constants.N3DS_HALF_HEIGHT);
+		displayLayout.setBottomDisplaySourceSize(Constants.N3DS_WIDTH - 40 - 40, Constants.N3DS_HALF_HEIGHT);
+		displayLayout.update(screenWidth, screenHeight);
+	}
 
-    @Override
-    public void setLayout(ConsoleLayout layout) {
-        displayLayout = layout;
-        displayLayout.setTopDisplaySourceSize(Constants.N3DS_WIDTH, Constants.N3DS_HALF_HEIGHT);
-        displayLayout.setBottomDisplaySourceSize(Constants.N3DS_WIDTH - 40 - 40, Constants.N3DS_HALF_HEIGHT);
-        displayLayout.update(screenWidth, screenHeight);
-    }
+	@Override
+	public ConsoleLayout getLayout() {
+		return displayLayout;
+	}
 
-    @Override
-    public ConsoleLayout getLayout() {
-        return displayLayout;
-    }
-
-    @Override
-    public String getBackendName() {
-        return "OpenGL";
-    }
+	@Override
+	public String getBackendName() {
+		return "OpenGL";
+	}
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
index 9f280393..f5a19efe 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
@@ -4,9 +4,7 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.opengl.GLSurfaceView;
 import android.util.Log;
-
 import androidx.annotation.NonNull;
-
 import com.panda3ds.pandroid.math.Vector2;
 import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.view.controller.TouchEvent;
@@ -14,37 +12,35 @@ import com.panda3ds.pandroid.view.controller.nodes.TouchScreenNodeImpl;
 import com.panda3ds.pandroid.view.renderer.ConsoleRenderer;
 
 public class PandaGlSurfaceView extends GLSurfaceView implements TouchScreenNodeImpl {
-    final PandaGlRenderer renderer;
-    private int size_width;
-    private int size_height;
+	final PandaGlRenderer renderer;
+	private int size_width;
+	private int size_height;
 
-    public PandaGlSurfaceView(Context context, String romPath) {
-        super(context);
-        setEGLContextClientVersion(3);
-        setDebugFlags(DEBUG_LOG_GL_CALLS);
-        renderer = new PandaGlRenderer(romPath);
-        setRenderer(renderer);
-    }
+	public PandaGlSurfaceView(Context context, String romPath) {
+		super(context);
+		setEGLContextClientVersion(3);
+		setDebugFlags(DEBUG_LOG_GL_CALLS);
+		renderer = new PandaGlRenderer(romPath);
+		setRenderer(renderer);
+	}
 
-    public ConsoleRenderer getRenderer() {
-        return renderer;
-    }
+	public ConsoleRenderer getRenderer() { return renderer; }
 
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        size_width = getMeasuredWidth();
-        size_height = getMeasuredHeight();
-    }
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+		size_width = getMeasuredWidth();
+		size_height = getMeasuredHeight();
+	}
 
-    @NonNull
-    @Override
-    public Vector2 getSize() {
-        return new Vector2(size_width, size_height);
-    }
+	@NonNull
+	@Override
+	public Vector2 getSize() {
+		return new Vector2(size_width, size_height);
+	}
 
-    @Override
-    public void onTouch(TouchEvent event) {
-        onTouchScreenPress(renderer, event);
-    }
+	@Override
+	public void onTouch(TouchEvent event) {
+		onTouchScreenPress(renderer, event);
+	}
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java
index e7d9438f..543ab840 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java
@@ -2,7 +2,6 @@ package com.panda3ds.pandroid.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
-
 import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.utils.Constants;
@@ -11,54 +10,41 @@ import com.panda3ds.pandroid.view.controller.nodes.Button;
 import com.panda3ds.pandroid.view.controller.nodes.Joystick;
 
 public class PandaLayoutController extends ControllerLayout {
-    public PandaLayoutController(Context context) {
-        super(context);
-    }
+	public PandaLayoutController(Context context) { super(context); }
 
-    public PandaLayoutController(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
+	public PandaLayoutController(Context context, AttributeSet attrs) { super(context, attrs); }
 
-    public PandaLayoutController(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
+	public PandaLayoutController(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); }
 
-    public PandaLayoutController(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
+	public PandaLayoutController(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+		super(context, attrs, defStyleAttr, defStyleRes);
+	}
 
-    public void initialize(){
-        int[] keyButtonList = {
-                R.id.button_a, Constants.INPUT_KEY_A,
-                R.id.button_b, Constants.INPUT_KEY_B,
-                R.id.button_y, Constants.INPUT_KEY_Y,
-                R.id.button_x, Constants.INPUT_KEY_X,
+	public void initialize() {
+		int[] keyButtonList = {R.id.button_a,     Constants.INPUT_KEY_A,     R.id.button_b,      Constants.INPUT_KEY_B,
+							   R.id.button_y,     Constants.INPUT_KEY_Y,     R.id.button_x,      Constants.INPUT_KEY_X,
 
-                R.id.button_left,   Constants.INPUT_KEY_LEFT,
-                R.id.button_right,  Constants.INPUT_KEY_RIGHT,
-                R.id.button_up,     Constants.INPUT_KEY_UP,
-                R.id.button_down,   Constants.INPUT_KEY_DOWN,
+							   R.id.button_left,  Constants.INPUT_KEY_LEFT,  R.id.button_right,  Constants.INPUT_KEY_RIGHT,
+							   R.id.button_up,    Constants.INPUT_KEY_UP,    R.id.button_down,   Constants.INPUT_KEY_DOWN,
 
-                R.id.button_start,  Constants.INPUT_KEY_START,
-                R.id.button_select, Constants.INPUT_KEY_SELECT,
+							   R.id.button_start, Constants.INPUT_KEY_START, R.id.button_select, Constants.INPUT_KEY_SELECT,
 
-                R.id.button_l,      Constants.INPUT_KEY_L,
-                R.id.button_r,      Constants.INPUT_KEY_R
-        };
+							   R.id.button_l,     Constants.INPUT_KEY_L,     R.id.button_r,      Constants.INPUT_KEY_R};
 
-        for (int i = 0; i < keyButtonList.length; i+=2){
-            final int keyCode = keyButtonList[i+1];
-            ((Button)findViewById(keyButtonList[i])).setStateListener((btn, pressed)->{
-                if (pressed) AlberDriver.KeyDown(keyCode);
-                else AlberDriver.KeyUp(keyCode);
-            });
-        }
+		for (int i = 0; i < keyButtonList.length; i += 2) {
+			final int keyCode = keyButtonList[i + 1];
+			((Button) findViewById(keyButtonList[i])).setStateListener((btn, pressed) -> {
+				if (pressed)
+					AlberDriver.KeyDown(keyCode);
+				else
+					AlberDriver.KeyUp(keyCode);
+			});
+		}
 
-        ((Joystick)findViewById(R.id.left_analog))
-                .setJoystickListener((joystick, axisX, axisY) -> {
-                    AlberDriver.SetCirclepadAxis((int)(axisX*0x9C), (int)(axisY*0x9C)*-1);
-                });
+		((Joystick) findViewById(R.id.left_analog)).setJoystickListener((joystick, axisX, axisY) -> {
+			AlberDriver.SetCirclepadAxis((int) (axisX * 0x9C), (int) (axisY * 0x9C) * -1);
+		});
 
-        refreshChildren();
-    }
+		refreshChildren();
+	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java
index 1ef93c89..137bd312 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java
@@ -7,150 +7,140 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
-
 import com.panda3ds.pandroid.math.Vector2;
 import com.panda3ds.pandroid.utils.Constants;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 
 public class ControllerLayout extends RelativeLayout {
+	private final HashMap<Integer, ControllerNode> activeTouchEvents = new HashMap<>();
+	private final ArrayList<ControllerNode> controllerNodes = new ArrayList<>();
 
-    private final HashMap<Integer, ControllerNode> activeTouchEvents = new HashMap<>();
-    private final ArrayList<ControllerNode> controllerNodes = new ArrayList<>();
+	public ControllerLayout(Context context) { this(context, null); }
 
-    public ControllerLayout(Context context) {
-        this(context,null);
-    }
+	public ControllerLayout(Context context, AttributeSet attrs) { this(context, attrs, 0); }
 
-    public ControllerLayout(Context context, AttributeSet attrs) {
-        this(context, attrs,0);
-    }
+	public ControllerLayout(Context context, AttributeSet attrs, int defStyleAttr) { this(context, attrs, defStyleAttr, 0); }
 
-    public ControllerLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-        this(context, attrs, defStyleAttr,0 );
-    }
+	public ControllerLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+		super(context, attrs, defStyleAttr, defStyleRes);
+	}
 
-    public ControllerLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
+	public void refreshChildren() {
+		ArrayList<ControllerNode> nodes = new ArrayList<>();
+		populateNodesArray(this, nodes);
 
-    public void refreshChildren(){
-        ArrayList<ControllerNode> nodes = new ArrayList<>();
-        populateNodesArray(this, nodes);
+		// Need Reverse: First view is in back and last view is in front for respect android View hierarchy
+		Collections.reverse(nodes);
 
-        //Need Reverse: First view is in back and last view is in front for respect android View hierarchy
-        Collections.reverse(nodes);
+		controllerNodes.clear();
+		controllerNodes.addAll(nodes);
+	}
 
-        controllerNodes.clear();
-        controllerNodes.addAll(nodes);
-    }
+	private void populateNodesArray(ViewGroup group, ArrayList<ControllerNode> list) {
+		for (int i = 0; i < group.getChildCount(); i++) {
+			View view = group.getChildAt(i);
+			if (view instanceof ControllerNode) {
+				list.add((ControllerNode) view);
+			} else if (view instanceof ViewGroup) {
+				populateNodesArray((ViewGroup) view, list);
+			}
+		}
+	}
 
-    private void populateNodesArray(ViewGroup group, ArrayList<ControllerNode> list){
-        for (int i = 0; i < group.getChildCount(); i++){
-            View view = group.getChildAt(i);
-            if(view instanceof ControllerNode){
-                list.add((ControllerNode) view);
-            } else if (view instanceof ViewGroup) {
-                populateNodesArray((ViewGroup) view, list);
-            }
-        }
-    }
+	@Override
+	public boolean onTouchEvent(MotionEvent event) {
+		int index = event.getActionIndex();
 
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        int index = event.getActionIndex();
+		switch (event.getActionMasked()) {
+			case MotionEvent.ACTION_UP:
+			case MotionEvent.ACTION_CANCEL:
+			case MotionEvent.ACTION_POINTER_UP: {
+				int id = event.getPointerId(index);
+				processTouch(true, event.getX(index), event.getY(index), id);
+			} break;
+			case MotionEvent.ACTION_DOWN:
+			case MotionEvent.ACTION_POINTER_DOWN: {
+				int id = event.getPointerId(index);
+				processTouch(false, event.getX(index), event.getY(index), id);
+			} break;
+			case MotionEvent.ACTION_MOVE:
+				for (int id = 0; id < event.getPointerCount(); id++) {
+					processTouch(false, event.getX(id), event.getY(id), id);
+				}
+				break;
+		}
+		return true;
+	}
 
-        switch (event.getActionMasked()){
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_CANCEL:
-            case MotionEvent.ACTION_POINTER_UP: {
-                int id = event.getPointerId(index);
-                processTouch(true, event.getX(index), event.getY(index), id);
-            }break;
-            case MotionEvent.ACTION_DOWN:
-            case MotionEvent.ACTION_POINTER_DOWN: {
-                int id = event.getPointerId(index);
-                processTouch(false, event.getX(index), event.getY(index), id);
-            }break;
-            case MotionEvent.ACTION_MOVE:
-                for (int id = 0; id < event.getPointerCount(); id++){
-                    processTouch(false, event.getX(id), event.getY(id), id);
-                }
-                break;
-        }
-        return true;
-    }
+	private void processTouch(boolean up, float x, float y, int index) {
+		int[] globalPosition = new int[2];
+		getLocationInWindow(globalPosition);
 
-    private void processTouch(boolean up, float x, float y, int index){
-        int[] globalPosition = new int[2];
-        getLocationInWindow(globalPosition);
+		int action = TouchEvent.ACTION_MOVE;
 
-        int action = TouchEvent.ACTION_MOVE;
+		if ((!activeTouchEvents.containsKey(index))) {
+			if (up) return;
+			ControllerNode node = null;
+			for (ControllerNode item : controllerNodes) {
+				Vector2 pos = item.getPosition();
+				Vector2 size = item.getSize();
 
-        if ((!activeTouchEvents.containsKey(index))){
-            if (up)return;
-            ControllerNode node = null;
-            for (ControllerNode item: controllerNodes){
-                Vector2 pos = item.getPosition();
-                Vector2 size= item.getSize();
+				float cx = (pos.x - globalPosition[0]);
+				float cy = (pos.y - globalPosition[1]);
+				if (item.isVisible() && x > cx && x < cx + size.x && y > cy && y < cy + size.y) {
+					node = item;
+					break;
+				}
+			}
+			if (node != null) {
+				activeTouchEvents.put(index, node);
+				action = TouchEvent.ACTION_DOWN;
+			} else {
+				return;
+			}
+		}
 
-                float cx = (pos.x - globalPosition[0]);
-                float cy = (pos.y - globalPosition[1]);
-                if(item.isVisible() && x > cx && x < cx+size.x && y > cy && y < cy+size.y){
-                    node = item;
-                    break;
-                }
-            }
-            if (node != null){
-                activeTouchEvents.put(index, node);
-                action = TouchEvent.ACTION_DOWN;
-            } else {
-                return;
-            }
-        }
+		if (up) action = TouchEvent.ACTION_UP;
 
-        if (up) action = TouchEvent.ACTION_UP;
+		ControllerNode node = activeTouchEvents.get(index);
+		Vector2 pos = node.getPosition();
+		pos.x -= globalPosition[0];
+		pos.y -= globalPosition[1];
 
-        ControllerNode node = activeTouchEvents.get(index);
-        Vector2 pos = node.getPosition();
-        pos.x -= globalPosition[0];
-        pos.y -= globalPosition[1];
+		x -= pos.x;
+		y -= pos.y;
 
-        x -= pos.x;
-        y -= pos.y;
+		node.onTouch(new TouchEvent(x, y, action));
 
-        node.onTouch(new TouchEvent(x,y,action));
+		if (up) {
+			activeTouchEvents.remove(index);
+		}
+	}
 
-        if(up){
-            activeTouchEvents.remove(index);
-        }
-    }
+	@Override
+	public void onViewAdded(View child) {
+		super.onViewAdded(child);
+		refreshChildren();
+	}
 
-    @Override
-    public void onViewAdded(View child) {
-        super.onViewAdded(child);
-        refreshChildren();
-    }
+	@Override
+	public void onViewRemoved(View child) {
+		super.onViewRemoved(child);
+		refreshChildren();
+	}
 
-    @Override
-    public void onViewRemoved(View child) {
-        super.onViewRemoved(child);
-        refreshChildren();
-    }
+	/*@TODO: Need replace that methods for prevent Android send events directly to children*/
 
-    /*@TODO: Need replace that methods for prevent Android send events directly to children*/
-
-    @Override
-    public ArrayList<View> getTouchables() {
-        return new ArrayList<>();
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
-        return true;
-    }
+	@Override
+	public ArrayList<View> getTouchables() {
+		return new ArrayList<>();
+	}
 
+	@Override
+	public boolean onInterceptTouchEvent(MotionEvent ev) {
+		return true;
+	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java
index a29d08a4..e5b8795e 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java
@@ -1,28 +1,22 @@
 package com.panda3ds.pandroid.view.controller;
 
-
 import android.view.View;
-
 import androidx.annotation.NonNull;
-
 import com.panda3ds.pandroid.math.Vector2;
 
 public interface ControllerNode {
+	@NonNull
+	default Vector2 getPosition() {
+		View me = (View) this;
 
-    @NonNull
-    default Vector2 getPosition(){
-        View me = (View) this;
+		int[] position = new int[2];
+		me.getLocationInWindow(position);
+		return new Vector2(position[0], position[1]);
+	}
 
-        int[] position = new int[2];
-        me.getLocationInWindow(position);
-        return new Vector2(position[0], position[1]);
-    }
+	default boolean isVisible() { return ((View) this).isShown(); }
 
-    default boolean isVisible(){
-        return ((View)this).isShown();
-    }
+	@NonNull Vector2 getSize();
 
-    @NonNull Vector2 getSize();
-
-    void onTouch(TouchEvent event);
+	void onTouch(TouchEvent event);
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java
index a804cda1..d3b40db9 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java
@@ -1,28 +1,22 @@
 package com.panda3ds.pandroid.view.controller;
 
 public class TouchEvent {
-    public static final int ACTION_DOWN = 0;
-    public static final int ACTION_MOVE = 1;
-    public static final int ACTION_UP   = 2;
+	public static final int ACTION_DOWN = 0;
+	public static final int ACTION_MOVE = 1;
+	public static final int ACTION_UP = 2;
 
-    private final int action;
-    private final float x,y;
+	private final int action;
+	private final float x, y;
 
-    public float getX() {
-        return x;
-    }
+	public float getX() { return x; }
 
-    public float getY() {
-        return y;
-    }
+	public float getY() { return y; }
 
-    public int getAction() {
-        return action;
-    }
+	public int getAction() { return action; }
 
-    public TouchEvent(float x, float y, int action){
-        this.x = x;
-        this.y = y;
-        this.action = action;
-    }
+	public TouchEvent(float x, float y, int action) {
+		this.x = x;
+		this.y = y;
+		this.action = action;
+	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/ButtonStateListener.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/ButtonStateListener.java
index a658cdc0..eb5a693a 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/ButtonStateListener.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/ButtonStateListener.java
@@ -3,5 +3,5 @@ package com.panda3ds.pandroid.view.controller.listeners;
 import com.panda3ds.pandroid.view.controller.nodes.Button;
 
 public interface ButtonStateListener {
-    void onButtonPressedChange(Button button, boolean pressed);
+	void onButtonPressedChange(Button button, boolean pressed);
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/JoystickListener.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/JoystickListener.java
index 538e2cd8..77225223 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/JoystickListener.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/listeners/JoystickListener.java
@@ -3,5 +3,5 @@ package com.panda3ds.pandroid.view.controller.listeners;
 import com.panda3ds.pandroid.view.controller.nodes.Joystick;
 
 public interface JoystickListener {
-    void onJoystickAxisChange(Joystick joystick, float axisX, float axisY);
+	void onJoystickAxisChange(Joystick joystick, float axisX, float axisY);
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/BasicControllerNode.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/BasicControllerNode.java
index 90d5f5f7..224be9a4 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/BasicControllerNode.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/BasicControllerNode.java
@@ -2,23 +2,15 @@ package com.panda3ds.pandroid.view.controller.nodes;
 
 import android.content.Context;
 import android.util.AttributeSet;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatTextView;
-
 import com.panda3ds.pandroid.view.controller.ControllerNode;
 
 public abstract class BasicControllerNode extends AppCompatTextView implements ControllerNode {
-    public BasicControllerNode(@NonNull Context context) {
-        super(context);
-    }
+	public BasicControllerNode(@NonNull Context context) { super(context); }
 
-    public BasicControllerNode(@NonNull Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-    }
+	public BasicControllerNode(@NonNull Context context, @Nullable AttributeSet attrs) { super(context, attrs); }
 
-    public BasicControllerNode(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
+	public BasicControllerNode(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Button.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Button.java
index 7e8d4e86..4dadc22b 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Button.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Button.java
@@ -5,69 +5,63 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.util.AttributeSet;
 import android.view.Gravity;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatTextView;
-
 import com.panda3ds.pandroid.math.Vector2;
 import com.panda3ds.pandroid.view.controller.ControllerNode;
 import com.panda3ds.pandroid.view.controller.TouchEvent;
 import com.panda3ds.pandroid.view.controller.listeners.ButtonStateListener;
 
 public class Button extends BasicControllerNode {
-    private boolean pressed = false;
-    private int width,height;
+	private boolean pressed = false;
+	private int width, height;
 
-    private ButtonStateListener stateListener;
+	private ButtonStateListener stateListener;
 
-    public Button(@NonNull Context context) {
-        super(context);
-        init();
-    }
+	public Button(@NonNull Context context) {
+		super(context);
+		init();
+	}
 
-    public Button(@NonNull Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
+	public Button(@NonNull Context context, @Nullable AttributeSet attrs) {
+		super(context, attrs);
+		init();
+	}
 
-    public Button(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init();
-    }
+	public Button(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+		init();
+	}
 
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-        width = getWidth();
-        height = getHeight();
-    }
+	@Override
+	protected void onDraw(Canvas canvas) {
+		super.onDraw(canvas);
+		width = getWidth();
+		height = getHeight();
+	}
 
-    private void init(){
-        setTextAlignment(TEXT_ALIGNMENT_CENTER);
-        setGravity(Gravity.CENTER);
-    }
+	private void init() {
+		setTextAlignment(TEXT_ALIGNMENT_CENTER);
+		setGravity(Gravity.CENTER);
+	}
 
-    public void setStateListener(ButtonStateListener stateListener) {
-        this.stateListener = stateListener;
-    }
+	public void setStateListener(ButtonStateListener stateListener) { this.stateListener = stateListener; }
 
-    public boolean isPressed() {
-        return pressed;
-    }
+	public boolean isPressed() { return pressed; }
 
-    @NonNull
-    @Override
-    public Vector2 getSize() {
-        return new Vector2(width,height);
-    }
+	@NonNull
+	@Override
+	public Vector2 getSize() {
+		return new Vector2(width, height);
+	}
 
-    @Override
-    public void onTouch(TouchEvent event) {
-        pressed = event.getAction() != TouchEvent.ACTION_UP;
-        setAlpha(pressed ? 0.2F : 1.0F);
-        if (stateListener != null){
-            stateListener.onButtonPressedChange(this, pressed);
-        }
-    }
+	@Override
+	public void onTouch(TouchEvent event) {
+		pressed = event.getAction() != TouchEvent.ACTION_UP;
+		setAlpha(pressed ? 0.2F : 1.0F);
+		if (stateListener != null) {
+			stateListener.onButtonPressedChange(this, pressed);
+		}
+	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java
index 757ec3cb..df487bd8 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java
@@ -6,127 +6,110 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
-
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatTextView;
-
 import com.panda3ds.pandroid.math.Vector2;
 import com.panda3ds.pandroid.view.controller.ControllerNode;
 import com.panda3ds.pandroid.view.controller.TouchEvent;
 import com.panda3ds.pandroid.view.controller.listeners.JoystickListener;
 
-
 public class Joystick extends BasicControllerNode implements ControllerNode {
-    private float stick_x = 0;
-    private float stick_y = 0;
+	private float stick_x = 0;
+	private float stick_y = 0;
 
-    private int size_width = 0;
-    private int size_height= 0;
+	private int size_width = 0;
+	private int size_height = 0;
 
-    private JoystickListener joystickListener;
+	private JoystickListener joystickListener;
 
-    public Joystick(Context context) {
-        this(context,null);
-    }
+	public Joystick(Context context) { this(context, null); }
 
-    public Joystick(Context context, AttributeSet attrs) {
-        this(context, attrs,0);
-    }
+	public Joystick(Context context, AttributeSet attrs) { this(context, attrs, 0); }
 
-    public Joystick(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
+	public Joystick(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
 
-        paint.setColor(Color.RED);
-        invalidate();
-    }
+		paint.setColor(Color.RED);
+		invalidate();
+	}
 
-    private final Paint paint = new Paint();
+	private final Paint paint = new Paint();
 
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-    }
+	@Override
+	protected void onDraw(Canvas canvas) {
+		super.onDraw(canvas);
+	}
 
-    @Override
-    public void onDrawForeground(Canvas canvas) {
-        size_width = getWidth();
-        size_height = getHeight();
+	@Override
+	public void onDrawForeground(Canvas canvas) {
+		size_width = getWidth();
+		size_height = getHeight();
 
-        int analogIconSize = size_width-getPaddingLeft();
+		int analogIconSize = size_width - getPaddingLeft();
 
-        float middleIconSize = analogIconSize / 2.0F;
-        float middle = size_width / 2.0F;
+		float middleIconSize = analogIconSize / 2.0F;
+		float middle = size_width / 2.0F;
 
-        float maxDistance = (middle - middleIconSize) * 0.9F;
+		float maxDistance = (middle - middleIconSize) * 0.9F;
 
-        float tx = maxDistance * stick_x;
-        float ty = maxDistance * stick_y;
+		float tx = maxDistance * stick_x;
+		float ty = maxDistance * stick_y;
 
-        float radius = Vector2.distance(0.0F, 0.0F, Math.abs(tx), Math.abs(ty));
-        radius = Math.min(maxDistance, radius);
+		float radius = Vector2.distance(0.0F, 0.0F, Math.abs(tx), Math.abs(ty));
+		radius = Math.min(maxDistance, radius);
 
-        double deg = Math.atan2(ty,tx) * (180.0/Math.PI);
-        float rx = (float) (radius*Math.cos(Math.PI * 2 * deg/360.0));
-        float ry = (float) (radius*Math.sin(Math.PI * 2 * deg/360.0));
+		double deg = Math.atan2(ty, tx) * (180.0 / Math.PI);
+		float rx = (float) (radius * Math.cos(Math.PI * 2 * deg / 360.0));
+		float ry = (float) (radius * Math.sin(Math.PI * 2 * deg / 360.0));
 
-        stick_x = Math.max(-1.0f, Math.min(1.0f, stick_x));
-        stick_y = Math.max(-1.0f, Math.min(1.0f, stick_y));
+		stick_x = Math.max(-1.0f, Math.min(1.0f, stick_x));
+		stick_y = Math.max(-1.0f, Math.min(1.0f, stick_y));
 
+		float x = middle - middleIconSize + rx;
+		float y = middle - middleIconSize + ry;
 
-        float x = middle-middleIconSize+rx;
-        float y = middle-middleIconSize+ry;
+		Drawable foreground = getForeground();
+		if (foreground != null) {
+			foreground.setBounds((int) x, (int) y, (int) (x + analogIconSize), (int) (y + analogIconSize));
+			foreground.draw(canvas);
+		} else {
+			canvas.drawOval(x, y, x + analogIconSize, y + analogIconSize, paint);
+		}
+	}
 
+	public Vector2 getAxis() { return new Vector2(Math.max(-1.0F, Math.min(1.0F, stick_x)), Math.max(-1.0F, Math.min(1.0F, stick_y))); }
 
-        Drawable foreground = getForeground();
-        if (foreground != null){
-            foreground.setBounds((int) x, (int) y, (int) (x+analogIconSize), (int) (y+analogIconSize));
-            foreground.draw(canvas);
-        } else {
-            canvas.drawOval(x, y, x+analogIconSize,y+analogIconSize,paint);
-        }
-    }
+	public void setJoystickListener(JoystickListener joystickListener) { this.joystickListener = joystickListener; }
 
-    public Vector2 getAxis() {
-        return new Vector2(
-                Math.max(-1.0F, Math.min(1.0F, stick_x)),
-                Math.max(-1.0F, Math.min(1.0F, stick_y))
-        );
-    }
+	@NonNull
+	@Override
+	public Vector2 getSize() {
+		return new Vector2(size_width, size_height);
+	}
 
-    public void setJoystickListener(JoystickListener joystickListener) {
-        this.joystickListener = joystickListener;
-    }
+	@Override
+	public void onTouch(TouchEvent event) {
+		float middle = size_width / 2.0F;
 
-    @NonNull
-    @Override
-    public Vector2 getSize() {
-        return new Vector2(size_width,size_height);
-    }
+		float x = event.getX();
+		float y = event.getY();
 
-    @Override
-    public void onTouch(TouchEvent event) {
+		x = Math.max(0, Math.min(middle * 2, x));
+		y = Math.max(0, Math.min(middle * 2, y));
 
-        float middle = size_width/2.0F;
+		stick_x = ((x - middle) / middle);
 
-        float x = event.getX();
-        float y = event.getY();
+		stick_y = ((y - middle) / middle);
 
-        x = Math.max(0, Math.min(middle*2, x));
-        y = Math.max(0, Math.min(middle*2, y));
+		if (event.getAction() == TouchEvent.ACTION_UP) {
+			stick_x = 0;
+			stick_y = 0;
+		}
 
-        stick_x = ((x-middle)/middle);
+		if (joystickListener != null) {
+			joystickListener.onJoystickAxisChange(this, stick_x, stick_y);
+		}
 
-        stick_y = ((y-middle)/middle);
-
-        if (event.getAction() == TouchEvent.ACTION_UP){
-            stick_x = 0;
-            stick_y = 0;
-        }
-
-        if (joystickListener != null){
-            joystickListener.onJoystickAxisChange(this, stick_x, stick_y);
-        }
-
-        invalidate();
-    }
+		invalidate();
+	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java
index 85d1ddd6..1009d29c 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java
@@ -3,7 +3,6 @@ package com.panda3ds.pandroid.view.controller.nodes;
 import android.graphics.Rect;
 import android.util.Log;
 import android.view.View;
-
 import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.utils.Constants;
@@ -12,28 +11,28 @@ import com.panda3ds.pandroid.view.controller.TouchEvent;
 import com.panda3ds.pandroid.view.renderer.ConsoleRenderer;
 
 public interface TouchScreenNodeImpl extends ControllerNode {
-    default void onTouchScreenPress(ConsoleRenderer renderer, TouchEvent event){
+	default void onTouchScreenPress(ConsoleRenderer renderer, TouchEvent event) {
+		View me = (View) this;
+		boolean hasDownEvent = me.getTag(R.id.TagEventHasDown) != null && (boolean) me.getTag(R.id.TagEventHasDown);
 
-        View me = (View) this;
-        boolean hasDownEvent = me.getTag(R.id.TagEventHasDown) != null && (boolean) me.getTag(R.id.TagEventHasDown);
+		Rect bounds = renderer.getLayout().getBottomDisplayBounds();
+		;
 
-        Rect bounds = renderer.getLayout().getBottomDisplayBounds();;
+		if (event.getX() >= bounds.left && event.getY() >= bounds.top && event.getX() <= bounds.right && event.getY() <= bounds.bottom) {
+			int x = (int) (event.getX() - bounds.left);
+			int y = (int) (event.getY() - bounds.top);
 
-        if (event.getX() >= bounds.left && event.getY() >= bounds.top && event.getX() <= bounds.right && event.getY() <= bounds.bottom){
-            int x = (int) (event.getX() - bounds.left);
-            int y = (int) (event.getY() - bounds.top);
+			x = Math.round((x / (float) bounds.width()) * 320);
+			y = Math.round((y / (float) bounds.height()) * 240);
 
-            x = Math.round((x/(float)bounds.width())*320);
-            y = Math.round((y/(float)bounds.height())*240);
+			AlberDriver.TouchScreenDown(x, y);
 
-            AlberDriver.TouchScreenDown(x,y);
+			me.setTag(R.id.TagEventHasDown, true);
+		}
 
-            me.setTag(R.id.TagEventHasDown, true);
-        }
-
-        if (hasDownEvent && event.getAction() == TouchEvent.ACTION_UP){
-            AlberDriver.TouchScreenUp();
-            me.setTag(R.id.TagEventHasDown, false);
-        }
-    }
+		if (hasDownEvent && event.getAction() == TouchEvent.ACTION_UP) {
+			AlberDriver.TouchScreenUp();
+			me.setTag(R.id.TagEventHasDown, false);
+		}
+	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/ConsoleRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/ConsoleRenderer.java
index 13ad4d39..d5c99e8d 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/ConsoleRenderer.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/ConsoleRenderer.java
@@ -3,7 +3,7 @@ package com.panda3ds.pandroid.view.renderer;
 import com.panda3ds.pandroid.view.renderer.layout.ConsoleLayout;
 
 public interface ConsoleRenderer {
-    void setLayout(ConsoleLayout layout);
-    ConsoleLayout getLayout();
-    String getBackendName();
+	void setLayout(ConsoleLayout layout);
+	ConsoleLayout getLayout();
+	String getBackendName();
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/ConsoleLayout.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/ConsoleLayout.java
index 781f0abd..dc83c59f 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/ConsoleLayout.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/ConsoleLayout.java
@@ -1,15 +1,14 @@
 package com.panda3ds.pandroid.view.renderer.layout;
 
 import android.graphics.Rect;
-
 import com.panda3ds.pandroid.math.Vector2;
 
 public interface ConsoleLayout {
-    void update(int screenWidth, int screenHeight);
+	void update(int screenWidth, int screenHeight);
 
-    void setBottomDisplaySourceSize(int width, int height);
-    void setTopDisplaySourceSize(int width, int height);
+	void setBottomDisplaySourceSize(int width, int height);
+	void setTopDisplaySourceSize(int width, int height);
 
-    Rect getBottomDisplayBounds();
-    Rect getTopDisplayBounds();
+	Rect getBottomDisplayBounds();
+	Rect getTopDisplayBounds();
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java
index a54db8f7..d8616167 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java
@@ -2,80 +2,76 @@ package com.panda3ds.pandroid.view.renderer.layout;
 
 import android.graphics.Rect;
 import android.util.Size;
-
 import com.panda3ds.pandroid.math.Vector2;
 
 public class DefaultScreenLayout implements ConsoleLayout {
-    private final Rect topDisplay = new Rect();
-    private final Rect bottomDisplay = new Rect();
+	private final Rect topDisplay = new Rect();
+	private final Rect bottomDisplay = new Rect();
 
-    private final Vector2 screenSize = new Vector2(1.0F, 1.0F);
-    private final Vector2 topSourceSize = new Vector2(1.0F, 1.0F);
-    private final Vector2 bottomSourceSize = new Vector2(1.0F, 1.0F);
+	private final Vector2 screenSize = new Vector2(1.0F, 1.0F);
+	private final Vector2 topSourceSize = new Vector2(1.0F, 1.0F);
+	private final Vector2 bottomSourceSize = new Vector2(1.0F, 1.0F);
 
-    @Override
-    public void update(int screenWidth, int screenHeight) {
-        screenSize.set(screenWidth, screenHeight);
-        updateBounds();
-    }
+	@Override
+	public void update(int screenWidth, int screenHeight) {
+		screenSize.set(screenWidth, screenHeight);
+		updateBounds();
+	}
 
-    @Override
-    public void setBottomDisplaySourceSize(int width, int height) {
-        bottomSourceSize.set(width,height);
-        updateBounds();
-    }
-    @Override
-    public void setTopDisplaySourceSize(int width, int height) {
-        topSourceSize.set(width,height);
-        updateBounds();
-    }
+	@Override
+	public void setBottomDisplaySourceSize(int width, int height) {
+		bottomSourceSize.set(width, height);
+		updateBounds();
+	}
+	@Override
+	public void setTopDisplaySourceSize(int width, int height) {
+		topSourceSize.set(width, height);
+		updateBounds();
+	}
 
-    private void updateBounds(){
-        int screenWidth = (int) screenSize.x;
-        int screenHeight = (int) screenSize.y;
+	private void updateBounds() {
+		int screenWidth = (int) screenSize.x;
+		int screenHeight = (int) screenSize.y;
 
-        if (screenWidth > screenHeight){
+		if (screenWidth > screenHeight) {
+			int topDisplayWidth = (int) ((screenHeight / topSourceSize.y) * topSourceSize.x);
+			int topDisplayHeight = screenHeight;
 
-            int topDisplayWidth = (int) ((screenHeight / topSourceSize.y) * topSourceSize.x);
-            int topDisplayHeight = screenHeight;
+			if (topDisplayWidth > (screenWidth * 0.7)) {
+				topDisplayWidth = (int) (screenWidth * 0.7);
+				topDisplayHeight = (int) ((topDisplayWidth / topSourceSize.x) * topSourceSize.y);
+			}
 
-            if (topDisplayWidth > (screenWidth*0.7)){
-                topDisplayWidth = (int) (screenWidth * 0.7);
-                topDisplayHeight = (int) ((topDisplayWidth/topSourceSize.x)* topSourceSize.y);
-            }
+			int bottomDisplayHeight = (int) (((screenWidth - topDisplayWidth) / bottomSourceSize.x) * bottomSourceSize.y);
 
-            int bottomDisplayHeight = (int) (((screenWidth-topDisplayWidth)/ bottomSourceSize.x)* bottomSourceSize.y);
+			topDisplay.set(0, 0, topDisplayWidth, topDisplayHeight);
+			bottomDisplay.set(topDisplayWidth, 0, topDisplayWidth + (screenWidth - topDisplayWidth), bottomDisplayHeight);
+		} else {
+			int topScreenHeight = (int) ((screenWidth / topSourceSize.x) * topSourceSize.y);
+			topDisplay.set(0, 0, screenWidth, topScreenHeight);
 
+			int bottomDisplayHeight = (int) ((screenWidth / bottomSourceSize.x) * bottomSourceSize.y);
+			int bottomDisplayWidth = screenWidth;
+			int bottomDisplayX = 0;
 
-            topDisplay.set(0, 0, topDisplayWidth, topDisplayHeight);
-            bottomDisplay.set(topDisplayWidth, 0, topDisplayWidth+(screenWidth-topDisplayWidth), bottomDisplayHeight);
-        } else {
-            int topScreenHeight = (int) ((screenWidth/ topSourceSize.x) * topSourceSize.y);
-            topDisplay.set(0,0,screenWidth,topScreenHeight);
+			if (topScreenHeight + bottomDisplayHeight > screenHeight) {
+				bottomDisplayHeight = (screenHeight - topScreenHeight);
+				bottomDisplayWidth = (int) ((bottomDisplayHeight / bottomSourceSize.y) * bottomSourceSize.x);
+				bottomDisplayX = (screenWidth - bottomDisplayX) / 2;
+			}
 
-            int bottomDisplayHeight = (int)((screenWidth/ bottomSourceSize.x) * bottomSourceSize.y);
-            int bottomDisplayWidth = screenWidth;
-            int bottomDisplayX = 0;
+			topDisplay.set(0, 0, screenWidth, topScreenHeight);
+			bottomDisplay.set(bottomDisplayX, topScreenHeight, bottomDisplayX + bottomDisplayWidth, topScreenHeight + bottomDisplayHeight);
+		}
+	}
 
-            if (topScreenHeight + bottomDisplayHeight > screenHeight){
-                bottomDisplayHeight = (screenHeight-topScreenHeight);
-                bottomDisplayWidth = (int) ((bottomDisplayHeight/ bottomSourceSize.y)*bottomSourceSize.x);
-                bottomDisplayX = (screenWidth-bottomDisplayX)/2;
-            }
+	@Override
+	public Rect getBottomDisplayBounds() {
+		return bottomDisplay;
+	}
 
-            topDisplay.set(0,0, screenWidth,topScreenHeight);
-            bottomDisplay.set(bottomDisplayX, topScreenHeight, bottomDisplayX+bottomDisplayWidth,topScreenHeight+bottomDisplayHeight);
-        }
-    }
-
-
-    @Override
-    public Rect getBottomDisplayBounds() {
-        return bottomDisplay;
-    }
-
-    @Override
-    public Rect getTopDisplayBounds() {
-        return topDisplay;
-    }
+	@Override
+	public Rect getTopDisplayBounds() {
+		return topDisplay;
+	}
 }

From ba3db24f3024349ba5d088703fb6da7be8a25609 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 6 Dec 2023 02:39:55 +0200
Subject: [PATCH 047/162] [Kernel] Fix WaitSynchronization1 ABI

---
 src/core/kernel/events.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/kernel/events.cpp b/src/core/kernel/events.cpp
index 06841720..7da4788e 100644
--- a/src/core/kernel/events.cpp
+++ b/src/core/kernel/events.cpp
@@ -96,7 +96,7 @@ void Kernel::svcSignalEvent() {
 // Result WaitSynchronization1(Handle handle, s64 timeout_nanoseconds)
 void Kernel::waitSynchronization1() {
 	const Handle handle = regs[0];
-	const s64 ns = s64(u64(regs[1]) | (u64(regs[2]) << 32));
+	const s64 ns = s64(u64(regs[2]) | (u64(regs[3]) << 32));
 	logSVC("WaitSynchronization1(handle = %X, ns = %lld)\n", handle, ns);
 
 	const auto object = getObject(handle);

From 13d680e8b6e818224d0913e9a68a793c368d5281 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 6 Dec 2023 02:40:09 +0200
Subject: [PATCH 048/162] [IR] Report CPP as not plugged

---
 src/core/services/ir_user.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/core/services/ir_user.cpp b/src/core/services/ir_user.cpp
index 47a2299a..ce4f94c4 100644
--- a/src/core/services/ir_user.cpp
+++ b/src/core/services/ir_user.cpp
@@ -120,9 +120,14 @@ void IRUserService::requireConnection(u32 messagePointer) {
 		u32 sharedMemAddress = sharedMemory.value().addr;
 
 		if (deviceID == u8(DeviceID::CirclePadPro)) {
-			mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionStatus), 2); // Citra uses 2 here but only 1 works??
-			mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionRole), 2);
-			mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, isConnected), 1);
+			// Note: We temporarily pretend we don't have a CirclePad Pro. This code must change when we emulate it or N3DS C-stick
+			constexpr u8 status = 1; // Not connected. Any value other than 2 is considered not connected.
+			constexpr u8 role = 0;
+			constexpr u8 connected = 0;
+
+			mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionStatus), status);
+			mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, connectionRole), role);
+			mem.write8(sharedMemAddress + offsetof(SharedMemoryStatus, isConnected), connected);
 
 			connectedDevice = true;
 			if (connectionStatusEvent.has_value()) {

From 95c1923c3778d7bd029abc657a4867ee024675f3 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 6 Dec 2023 17:11:30 +0200
Subject: [PATCH 049/162] Update .gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ee5f1331..7214ef50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,9 +58,10 @@ fb.bat
 *.3ds
 *.3dsx
 *.app
+*.cia
 *.cci
 *.cxi
 *.elf
 *.smdh
 
-config.toml
\ No newline at end of file
+config.toml

From 609d3fc196984c7f071ca6efa9b7ea1c16906907 Mon Sep 17 00:00:00 2001
From: gabriel <gabrielcacoal400@gmail.com>
Date: Thu, 7 Dec 2023 17:49:22 -0400
Subject: [PATCH 050/162] Fix words

---
 src/pandroid/app/src/main/AndroidManifest.xml |  2 +-
 .../panda3ds/pandroid/app/GameActivity.java   | 13 +++---
 .../com/panda3ds/pandroid/math/Vector2.java   |  4 --
 .../panda3ds/pandroid/utils/Constants.java    |  4 +-
 .../pandroid/view/PandaGlRenderer.java        |  4 +-
 .../pandroid/view/PandaGlSurfaceView.java     | 14 +++----
 .../view/controller/ControllerNode.java       |  4 +-
 .../view/controller/nodes/Joystick.java       | 42 +++++++++----------
 .../controller/nodes/TouchScreenNodeImpl.java | 12 +++---
 .../view/renderer/layout/ConsoleLayout.java   |  1 -
 .../renderer/layout/DefaultScreenLayout.java  |  2 +-
 11 files changed, 45 insertions(+), 57 deletions(-)

diff --git a/src/pandroid/app/src/main/AndroidManifest.xml b/src/pandroid/app/src/main/AndroidManifest.xml
index 978edcc5..291496f4 100644
--- a/src/pandroid/app/src/main/AndroidManifest.xml
+++ b/src/pandroid/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
 
     <uses-feature
         android:required="true"
-        android:glEsVersion="0x0030002"/>
+        android:glEsVersion="0x0030001"/>
 
     <application
         android:requestLegacyExternalStorage="true"
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
index e196d0d1..d086e85f 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -2,22 +2,21 @@ package com.panda3ds.pandroid.app;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.CheckBox;
 import android.widget.FrameLayout;
 import android.widget.Toast;
+
 import androidx.annotation.Nullable;
+
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.view.PandaGlSurfaceView;
 import com.panda3ds.pandroid.view.PandaLayoutController;
 
 public class GameActivity extends BaseActivity {
-	private PandaGlSurfaceView pandaSurface;
-	private PandaLayoutController controllerLayout;
 
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -31,20 +30,18 @@ public class GameActivity extends BaseActivity {
 			return;
 		}
 
-		pandaSurface = new PandaGlSurfaceView(this, intent.getStringExtra(Constants.EXTRA_PATH));
+		PandaGlSurfaceView pandaSurface = new PandaGlSurfaceView(this, intent.getStringExtra(Constants.EXTRA_PATH));
 
 		setContentView(R.layout.game_activity);
 
 		((FrameLayout) findViewById(R.id.panda_gl_frame))
 			.addView(pandaSurface, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 
-		controllerLayout = findViewById(R.id.controller_layout);
+		PandaLayoutController controllerLayout = findViewById(R.id.controller_layout);
 
 		controllerLayout.initialize();
 
-		((CheckBox) findViewById(R.id.hide_screen_controller)).setOnCheckedChangeListener((buttonView, isChecked) -> {
-			findViewById(R.id.overlay_controller).setVisibility(isChecked ? View.VISIBLE : View.INVISIBLE);
-		});
+		((CheckBox) findViewById(R.id.hide_screen_controller)).setOnCheckedChangeListener((buttonView, isChecked) -> findViewById(R.id.overlay_controller).setVisibility(isChecked ? View.VISIBLE : View.INVISIBLE));
 	}
 
 	@Override
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java
index 4208b610..becec9e1 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/math/Vector2.java
@@ -2,15 +2,11 @@ package com.panda3ds.pandroid.math;
 
 public class Vector2 {
 	public float x, y;
-	public Vector2(Vector2 value) { this(value.x, value.y); }
-
 	public Vector2(float x, float y) {
 		this.x = x;
 		this.y = y;
 	}
 
-	public float distanceTo(Vector2 vec) { return distance(x, y, vec.x, vec.y); }
-
 	public static float distance(float x, float y, float x2, float y2) { return (float) Math.sqrt((x - x2) * (x - x2) + (y - y2) * (y - y2)); }
 
 	public void set(float x, float y) {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
index bc389987..3485180e 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
@@ -6,7 +6,7 @@ public class Constants {
 	public static final int INPUT_KEY_LEFT = 1 << 5;
 	public static final int INPUT_KEY_RIGHT = 1 << 4;
 
-	public static final int INPUT_KEY_A = 1 << 0;
+	public static final int INPUT_KEY_A = 1;
 	public static final int INPUT_KEY_B = 1 << 1;
 	public static final int INPUT_KEY_X = 1 << 10;
 	public static final int INPUT_KEY_Y = 1 << 11;
@@ -22,5 +22,5 @@ public class Constants {
 	public static final int N3DS_FULL_HEIGHT = 480;
 
 	public static final String EXTRA_PATH = "path";
-	public static final String LOG_TAG = "Alber";
+	public static final String LOG_TAG = "pandroid";
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
index b21e3353..0df05e9f 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
@@ -42,8 +42,8 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
 	}
 
 	public void onSurfaceCreated(GL10 unused, EGLConfig config) {
-		Log.i("pandroid", glGetString(GL_EXTENSIONS));
-		Log.w("pandroid", glGetString(GL_VERSION));
+		Log.i(Constants.LOG_TAG, glGetString(GL_EXTENSIONS));
+		Log.w(Constants.LOG_TAG, glGetString(GL_VERSION));
 
 		glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
 		glClear(GL_COLOR_BUFFER_BIT);
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
index f5a19efe..eb65762d 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
@@ -1,20 +1,18 @@
 package com.panda3ds.pandroid.view;
 
 import android.content.Context;
-import android.graphics.Canvas;
 import android.opengl.GLSurfaceView;
-import android.util.Log;
+
 import androidx.annotation.NonNull;
 import com.panda3ds.pandroid.math.Vector2;
-import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.view.controller.TouchEvent;
 import com.panda3ds.pandroid.view.controller.nodes.TouchScreenNodeImpl;
 import com.panda3ds.pandroid.view.renderer.ConsoleRenderer;
 
 public class PandaGlSurfaceView extends GLSurfaceView implements TouchScreenNodeImpl {
 	final PandaGlRenderer renderer;
-	private int size_width;
-	private int size_height;
+	private int width;
+	private int height;
 
 	public PandaGlSurfaceView(Context context, String romPath) {
 		super(context);
@@ -29,14 +27,14 @@ public class PandaGlSurfaceView extends GLSurfaceView implements TouchScreenNode
 	@Override
 	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-		size_width = getMeasuredWidth();
-		size_height = getMeasuredHeight();
+		width = getMeasuredWidth();
+		height = getMeasuredHeight();
 	}
 
 	@NonNull
 	@Override
 	public Vector2 getSize() {
-		return new Vector2(size_width, size_height);
+		return new Vector2(width, height);
 	}
 
 	@Override
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java
index e5b8795e..e6c1dc92 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java
@@ -7,10 +7,10 @@ import com.panda3ds.pandroid.math.Vector2;
 public interface ControllerNode {
 	@NonNull
 	default Vector2 getPosition() {
-		View me = (View) this;
+		View view = (View) this;
 
 		int[] position = new int[2];
-		me.getLocationInWindow(position);
+		view.getLocationInWindow(position);
 		return new Vector2(position[0], position[1]);
 	}
 
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java
index df487bd8..ad3df6b1 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java
@@ -7,18 +7,18 @@ import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.AppCompatTextView;
+
 import com.panda3ds.pandroid.math.Vector2;
 import com.panda3ds.pandroid.view.controller.ControllerNode;
 import com.panda3ds.pandroid.view.controller.TouchEvent;
 import com.panda3ds.pandroid.view.controller.listeners.JoystickListener;
 
 public class Joystick extends BasicControllerNode implements ControllerNode {
-	private float stick_x = 0;
-	private float stick_y = 0;
+	private float axisX = 0;
+	private float axisY = 0;
 
-	private int size_width = 0;
-	private int size_height = 0;
+	private int width = 0;
+	private int height = 0;
 
 	private JoystickListener joystickListener;
 
@@ -42,18 +42,18 @@ public class Joystick extends BasicControllerNode implements ControllerNode {
 
 	@Override
 	public void onDrawForeground(Canvas canvas) {
-		size_width = getWidth();
-		size_height = getHeight();
+		width = getWidth();
+		height = getHeight();
 
-		int analogIconSize = size_width - getPaddingLeft();
+		int analogIconSize = width - getPaddingLeft();
 
 		float middleIconSize = analogIconSize / 2.0F;
-		float middle = size_width / 2.0F;
+		float middle = width / 2.0F;
 
 		float maxDistance = (middle - middleIconSize) * 0.9F;
 
-		float tx = maxDistance * stick_x;
-		float ty = maxDistance * stick_y;
+		float tx = maxDistance * axisX;
+		float ty = maxDistance * axisY;
 
 		float radius = Vector2.distance(0.0F, 0.0F, Math.abs(tx), Math.abs(ty));
 		radius = Math.min(maxDistance, radius);
@@ -62,8 +62,8 @@ public class Joystick extends BasicControllerNode implements ControllerNode {
 		float rx = (float) (radius * Math.cos(Math.PI * 2 * deg / 360.0));
 		float ry = (float) (radius * Math.sin(Math.PI * 2 * deg / 360.0));
 
-		stick_x = Math.max(-1.0f, Math.min(1.0f, stick_x));
-		stick_y = Math.max(-1.0f, Math.min(1.0f, stick_y));
+		axisX = Math.max(-1.0f, Math.min(1.0f, axisX));
+		axisY = Math.max(-1.0f, Math.min(1.0f, axisY));
 
 		float x = middle - middleIconSize + rx;
 		float y = middle - middleIconSize + ry;
@@ -77,19 +77,19 @@ public class Joystick extends BasicControllerNode implements ControllerNode {
 		}
 	}
 
-	public Vector2 getAxis() { return new Vector2(Math.max(-1.0F, Math.min(1.0F, stick_x)), Math.max(-1.0F, Math.min(1.0F, stick_y))); }
+	public Vector2 getAxis() { return new Vector2(Math.max(-1.0F, Math.min(1.0F, axisX)), Math.max(-1.0F, Math.min(1.0F, axisY))); }
 
 	public void setJoystickListener(JoystickListener joystickListener) { this.joystickListener = joystickListener; }
 
 	@NonNull
 	@Override
 	public Vector2 getSize() {
-		return new Vector2(size_width, size_height);
+		return new Vector2(width, height);
 	}
 
 	@Override
 	public void onTouch(TouchEvent event) {
-		float middle = size_width / 2.0F;
+		float middle = width / 2.0F;
 
 		float x = event.getX();
 		float y = event.getY();
@@ -97,17 +97,17 @@ public class Joystick extends BasicControllerNode implements ControllerNode {
 		x = Math.max(0, Math.min(middle * 2, x));
 		y = Math.max(0, Math.min(middle * 2, y));
 
-		stick_x = ((x - middle) / middle);
+		axisX = ((x - middle) / middle);
 
-		stick_y = ((y - middle) / middle);
+		axisY = ((y - middle) / middle);
 
 		if (event.getAction() == TouchEvent.ACTION_UP) {
-			stick_x = 0;
-			stick_y = 0;
+			axisX = 0;
+			axisY = 0;
 		}
 
 		if (joystickListener != null) {
-			joystickListener.onJoystickAxisChange(this, stick_x, stick_y);
+			joystickListener.onJoystickAxisChange(this, axisX, axisY);
 		}
 
 		invalidate();
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java
index 1009d29c..39e6aae9 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java
@@ -1,22 +1,20 @@
 package com.panda3ds.pandroid.view.controller.nodes;
 
 import android.graphics.Rect;
-import android.util.Log;
 import android.view.View;
+
 import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.R;
-import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.view.controller.ControllerNode;
 import com.panda3ds.pandroid.view.controller.TouchEvent;
 import com.panda3ds.pandroid.view.renderer.ConsoleRenderer;
 
 public interface TouchScreenNodeImpl extends ControllerNode {
 	default void onTouchScreenPress(ConsoleRenderer renderer, TouchEvent event) {
-		View me = (View) this;
-		boolean hasDownEvent = me.getTag(R.id.TagEventHasDown) != null && (boolean) me.getTag(R.id.TagEventHasDown);
+		View view = (View) this;
+		boolean hasDownEvent = view.getTag(R.id.TagEventHasDown) != null && (boolean) view.getTag(R.id.TagEventHasDown);
 
 		Rect bounds = renderer.getLayout().getBottomDisplayBounds();
-		;
 
 		if (event.getX() >= bounds.left && event.getY() >= bounds.top && event.getX() <= bounds.right && event.getY() <= bounds.bottom) {
 			int x = (int) (event.getX() - bounds.left);
@@ -27,12 +25,12 @@ public interface TouchScreenNodeImpl extends ControllerNode {
 
 			AlberDriver.TouchScreenDown(x, y);
 
-			me.setTag(R.id.TagEventHasDown, true);
+			view.setTag(R.id.TagEventHasDown, true);
 		}
 
 		if (hasDownEvent && event.getAction() == TouchEvent.ACTION_UP) {
 			AlberDriver.TouchScreenUp();
-			me.setTag(R.id.TagEventHasDown, false);
+			view.setTag(R.id.TagEventHasDown, false);
 		}
 	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/ConsoleLayout.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/ConsoleLayout.java
index dc83c59f..7ec00974 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/ConsoleLayout.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/ConsoleLayout.java
@@ -1,7 +1,6 @@
 package com.panda3ds.pandroid.view.renderer.layout;
 
 import android.graphics.Rect;
-import com.panda3ds.pandroid.math.Vector2;
 
 public interface ConsoleLayout {
 	void update(int screenWidth, int screenHeight);
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java
index d8616167..adfe5443 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java
@@ -1,7 +1,7 @@
 package com.panda3ds.pandroid.view.renderer.layout;
 
 import android.graphics.Rect;
-import android.util.Size;
+
 import com.panda3ds.pandroid.math.Vector2;
 
 public class DefaultScreenLayout implements ConsoleLayout {

From 00bf1bc6b870c46c4e8c66e47a4aebec613f3429 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Fri, 8 Dec 2023 02:24:02 +0200
Subject: [PATCH 051/162] Reduce jni boilerplate

---
 src/jni_driver.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index 6d3bd104..82720e2a 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -13,7 +13,10 @@ HIDService* hidService = nullptr;
 RendererGL* renderer = nullptr;
 bool romLoaded = false;
 
-extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_Initialize(JNIEnv* env, jobject obj) {
+#define AlberFunction(type, name) JNIEXPORT type JNICALL Java_com_panda3ds_pandroid_AlberDriver_##name
+
+extern "C" {
+AlberFunction(void, Initialize)(JNIEnv* env, jobject obj) {
 	emulator = std::make_unique<Emulator>();
 
 	if (emulator->getRendererType() != RendererType::OpenGL) {
@@ -31,7 +34,7 @@ extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_Initial
 	emulator->initGraphicsContext(nullptr);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_RunFrame(JNIEnv* env, jobject obj, jint fbo) {
+AlberFunction(void, RunFrame)(JNIEnv* env, jobject obj, jint fbo) {
 	renderer->setFBO(fbo);
 	renderer->resetStateManager();
 	emulator->runFrame();
@@ -39,36 +42,33 @@ extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_RunFram
 	hidService->updateInputs(emulator->getTicks());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_Finalize(JNIEnv* env, jobject obj) {
+AlberFunction(void, Finalize)(JNIEnv* env, jobject obj) {
 	emulator = nullptr;
 	hidService = nullptr;
 	renderer = nullptr;
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_com_panda3ds_pandroid_AlberDriver_HasRomLoaded(JNIEnv* env, jobject obj) { return romLoaded; }
+AlberFunction(jboolean, HasRomLoaded)(JNIEnv* env, jobject obj) { return romLoaded; }
 
-extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_LoadRom(JNIEnv* env, jobject obj, jstring path) {
+AlberFunction(void, LoadRom)(JNIEnv* env, jobject obj, jstring path) {
 	const char* pathStr = env->GetStringUTFChars(path, nullptr);
 	romLoaded = emulator->loadROM(pathStr);
 	__android_log_print(ANDROID_LOG_INFO, "AlberDriver", "Loading ROM %s, result: %d", pathStr, (int)romLoaded);
 	env->ReleaseStringUTFChars(path, pathStr);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_TouchScreenDown(JNIEnv* env, jobject obj, jint x, jint y) {
-	hidService->setTouchScreenPress((u16)x, (u16)y);
-}
+AlberFunction(void, TouchScreenDown)(JNIEnv* env, jobject obj, jint x, jint y) { hidService->setTouchScreenPress((u16)x, (u16)y); }
 
-extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_TouchScreenUp(JNIEnv* env, jobject obj) { hidService->releaseTouchScreen(); }
+AlberFunction(void, TouchScreenUp)(JNIEnv* env, jobject obj) { hidService->releaseTouchScreen(); }
 
-extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_KeyUp(JNIEnv* env, jobject obj, jint keyCode) {
-	hidService->releaseKey((u32)keyCode);
-}
+AlberFunction(void, KeyUp)(JNIEnv* env, jobject obj, jint keyCode) { hidService->releaseKey((u32)keyCode); }
 
-extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_KeyDown(JNIEnv* env, jobject obj, jint keyCode) {
-	hidService->pressKey((u32)keyCode);
-}
+AlberFunction(void, KeyDown)(JNIEnv* env, jobject obj, jint keyCode) { hidService->pressKey((u32)keyCode); }
 
-extern "C" JNIEXPORT void JNICALL Java_com_panda3ds_pandroid_AlberDriver_SetCirclepadAxis(JNIEnv* env, jobject obj, jint x, jint y) {
+AlberFunction(void, SetCirclepadAxis)(JNIEnv* env, jobject obj, jint x, jint y) {
 	hidService->setCirclepadX((s16)x);
 	hidService->setCirclepadY((s16)y);
 }
+}
+
+#undef AlberFunction
\ No newline at end of file

From a78a1a099f562ad100d0d80f30c09a02ce1e49c0 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Fri, 8 Dec 2023 03:12:21 +0200
Subject: [PATCH 052/162] More peach fixups

---
 .../panda3ds/pandroid/app/GameActivity.java   |  4 ++--
 .../panda3ds/pandroid/app/MainActivity.java   |  8 +++----
 .../panda3ds/pandroid/utils/Constants.java    | 23 ++++++++-----------
 .../panda3ds/pandroid/utils/PathUtils.java    | 19 ++++-----------
 .../pandroid/view/PandaGlRenderer.java        |  8 +++++++
 .../view/controller/ControllerLayout.java     |  7 +++---
 .../pandroid/view/controller/TouchEvent.java  | 10 +++-----
 .../pandroid/view/controller/TouchType.java   |  7 ++++++
 .../view/controller/nodes/Button.java         |  5 ++--
 .../view/controller/nodes/Joystick.java       | 19 +++++++--------
 .../controller/nodes/TouchScreenNodeImpl.java |  3 ++-
 .../renderer/layout/DefaultScreenLayout.java  |  6 ++---
 12 files changed, 60 insertions(+), 59 deletions(-)
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchType.java

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
index d086e85f..dfba96e5 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -23,14 +23,14 @@ public class GameActivity extends BaseActivity {
 		super.onCreate(savedInstanceState);
 
 		Intent intent = getIntent();
-		if (!intent.hasExtra(Constants.EXTRA_PATH)) {
+		if (!intent.hasExtra(Constants.ACTIVITY_PARAMETER_PATH)) {
 			setContentView(new FrameLayout(this));
 			Toast.makeText(this, "Invalid rom path!", Toast.LENGTH_LONG).show();
 			finish();
 			return;
 		}
 
-		PandaGlSurfaceView pandaSurface = new PandaGlSurfaceView(this, intent.getStringExtra(Constants.EXTRA_PATH));
+		PandaGlSurfaceView pandaSurface = new PandaGlSurfaceView(this, intent.getStringExtra(Constants.ACTIVITY_PARAMETER_PATH));
 
 		setContentView(R.layout.game_activity);
 
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
index 181cfb4e..368efe0e 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
@@ -16,14 +16,14 @@ import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.utils.PathUtils;
 
 public class MainActivity extends BaseActivity {
-	private static final int PICK_3DS_ROM = 2;
+	private static final int PICK_ROM = 2;
 	private static final int PERMISSION_REQUEST_CODE = 3;
 
 	private void openFile() {
 		Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
 		intent.addCategory(Intent.CATEGORY_OPENABLE);
 		intent.setType("*/*");
-		startActivityForResult(intent, PICK_3DS_ROM);
+		startActivityForResult(intent, PICK_ROM);
 	}
 
 	@Override
@@ -46,11 +46,11 @@ public class MainActivity extends BaseActivity {
 
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		if (requestCode == PICK_3DS_ROM) {
+		if (requestCode == PICK_ROM) {
 			if (resultCode == RESULT_OK) {
 				String path = PathUtils.getPath(getApplicationContext(), data.getData());
 				Toast.makeText(getApplicationContext(), "pandroid opening " + path, Toast.LENGTH_LONG).show();
-				startActivity(new Intent(this, GameActivity.class).putExtra(Constants.EXTRA_PATH, path));
+				startActivity(new Intent(this, GameActivity.class).putExtra(Constants.ACTIVITY_PARAMETER_PATH, path));
 			}
 			super.onActivityResult(requestCode, resultCode, data);
 		}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
index 3485180e..6b480c23 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
@@ -1,26 +1,23 @@
 package com.panda3ds.pandroid.utils;
 
 public class Constants {
+	public static final int INPUT_KEY_A = 1 << 0;
+	public static final int INPUT_KEY_B = 1 << 1;
+	public static final int INPUT_KEY_SELECT = 1 << 2;
+	public static final int INPUT_KEY_START = 1 << 3;
+	public static final int INPUT_KEY_RIGHT = 1 << 4;
+	public static final int INPUT_KEY_LEFT = 1 << 5;
 	public static final int INPUT_KEY_UP = 1 << 6;
 	public static final int INPUT_KEY_DOWN = 1 << 7;
-	public static final int INPUT_KEY_LEFT = 1 << 5;
-	public static final int INPUT_KEY_RIGHT = 1 << 4;
-
-	public static final int INPUT_KEY_A = 1;
-	public static final int INPUT_KEY_B = 1 << 1;
+	public static final int INPUT_KEY_R = 1 << 8;
+	public static final int INPUT_KEY_L = 1 << 9;
 	public static final int INPUT_KEY_X = 1 << 10;
 	public static final int INPUT_KEY_Y = 1 << 11;
 
-	public static final int INPUT_KEY_R = 1 << 8;
-	public static final int INPUT_KEY_L = 1 << 9;
-
-	public static final int INPUT_KEY_START = 1 << 3;
-	public static final int INPUT_KEY_SELECT = 1 << 2;
-
 	public static final int N3DS_WIDTH = 400;
 	public static final int N3DS_HALF_HEIGHT = 240;
-	public static final int N3DS_FULL_HEIGHT = 480;
+	public static final int N3DS_FULL_HEIGHT = N3DS_HALF_HEIGHT * 2;
 
-	public static final String EXTRA_PATH = "path";
+	public static final String ACTIVITY_PARAMETER_PATH = "path";
 	public static final String LOG_TAG = "pandroid";
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
index ccf655bf..0434e53f 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
@@ -11,9 +11,8 @@ import android.provider.MediaStore;
 
 public class PathUtils {
 	public static String getPath(final Context context, final Uri uri) {
-		// DocumentProvider
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && DocumentsContract.isDocumentUri(context, uri)) {
-			if (isExternalStorageDocument(uri)) { // ExternalStorageProvider
+			if (isExternalStorageDocument(uri)) {
 				final String docId = DocumentsContract.getDocumentId(uri);
 				final String[] split = docId.split(":");
 				final String type = split[0];
@@ -33,14 +32,12 @@ public class PathUtils {
 					return System.getenv(storageDefinition) + "/" + split[1];
 				}
 
-			} else if (isDownloadsDocument(uri)) { // DownloadsProvider
-
+			} else if (isDownloadsDocument(uri)) {
 				final String id = DocumentsContract.getDocumentId(uri);
 				final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
 
 				return getDataColumn(context, contentUri, null, null);
-
-			} else if (isMediaDocument(uri)) { // MediaProvider
+			} else if (isMediaDocument(uri)) {
 				final String docId = DocumentsContract.getDocumentId(uri);
 				final String[] split = docId.split(":");
 				final String type = split[0];
@@ -56,18 +53,13 @@ public class PathUtils {
 
 				final String selection = "_id=?";
 				final String[] selectionArgs = new String[] {split[1]};
-
 				return getDataColumn(context, contentUri, selection, selectionArgs);
 			}
 
-		} else if ("content".equalsIgnoreCase(uri.getScheme())) { // MediaStore (and general)
-
-			// Return the remote address
+		} else if ("content".equalsIgnoreCase(uri.getScheme())) {
 			if (isGooglePhotosUri(uri)) return uri.getLastPathSegment();
-
 			return getDataColumn(context, uri, null, null);
-
-		} else if ("file".equalsIgnoreCase(uri.getScheme())) { // File
+		} else if ("file".equalsIgnoreCase(uri.getScheme())) {
 			return uri.getPath();
 		}
 
@@ -78,7 +70,6 @@ public class PathUtils {
 		Cursor cursor = null;
 		final String column = "_data";
 		final String[] projection = {column};
-
 		try {
 			cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
 			if (cursor != null && cursor.moveToFirst()) {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
index 0df05e9f..128e9b4f 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
@@ -45,6 +45,14 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
 		Log.i(Constants.LOG_TAG, glGetString(GL_EXTENSIONS));
 		Log.w(Constants.LOG_TAG, glGetString(GL_VERSION));
 
+		int[] version = new int[2];
+		glGetIntegerv(GL_MAJOR_VERSION, version, 0);
+		glGetIntegerv(GL_MINOR_VERSION, version, 1);
+
+		if (version[0] < 3 || (version[0] == 3 && version[1] < 1)) {
+			Log.e(Constants.LOG_TAG, "OpenGL 3.1 or higher is required");
+		}
+
 		glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
 		glClear(GL_COLOR_BUFFER_BIT);
 
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java
index 137bd312..4af28497 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java
@@ -79,8 +79,7 @@ public class ControllerLayout extends RelativeLayout {
 		int[] globalPosition = new int[2];
 		getLocationInWindow(globalPosition);
 
-		int action = TouchEvent.ACTION_MOVE;
-
+		TouchType action = TouchType.ACTION_MOVE;
 		if ((!activeTouchEvents.containsKey(index))) {
 			if (up) return;
 			ControllerNode node = null;
@@ -97,13 +96,13 @@ public class ControllerLayout extends RelativeLayout {
 			}
 			if (node != null) {
 				activeTouchEvents.put(index, node);
-				action = TouchEvent.ACTION_DOWN;
+				action = TouchType.ACTION_DOWN;
 			} else {
 				return;
 			}
 		}
 
-		if (up) action = TouchEvent.ACTION_UP;
+		if (up) action = TouchType.ACTION_UP;
 
 		ControllerNode node = activeTouchEvents.get(index);
 		Vector2 pos = node.getPosition();
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java
index d3b40db9..8c940414 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java
@@ -1,20 +1,16 @@
 package com.panda3ds.pandroid.view.controller;
 
 public class TouchEvent {
-	public static final int ACTION_DOWN = 0;
-	public static final int ACTION_MOVE = 1;
-	public static final int ACTION_UP = 2;
-
-	private final int action;
+	private final TouchType action;
 	private final float x, y;
 
 	public float getX() { return x; }
 
 	public float getY() { return y; }
 
-	public int getAction() { return action; }
+	public TouchType getAction() { return action; }
 
-	public TouchEvent(float x, float y, int action) {
+	public TouchEvent(float x, float y, TouchType action) {
 		this.x = x;
 		this.y = y;
 		this.action = action;
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchType.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchType.java
new file mode 100644
index 00000000..69772915
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchType.java
@@ -0,0 +1,7 @@
+package com.panda3ds.pandroid.view.controller;
+
+public enum TouchType {
+	ACTION_DOWN,
+	ACTION_MOVE,
+	ACTION_UP
+};
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Button.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Button.java
index 4dadc22b..83c38d48 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Button.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Button.java
@@ -11,6 +11,7 @@ import androidx.appcompat.widget.AppCompatTextView;
 import com.panda3ds.pandroid.math.Vector2;
 import com.panda3ds.pandroid.view.controller.ControllerNode;
 import com.panda3ds.pandroid.view.controller.TouchEvent;
+import com.panda3ds.pandroid.view.controller.TouchType;
 import com.panda3ds.pandroid.view.controller.listeners.ButtonStateListener;
 
 public class Button extends BasicControllerNode {
@@ -58,8 +59,8 @@ public class Button extends BasicControllerNode {
 
 	@Override
 	public void onTouch(TouchEvent event) {
-		pressed = event.getAction() != TouchEvent.ACTION_UP;
-		setAlpha(pressed ? 0.2F : 1.0F);
+		pressed = event.getAction() != TouchType.ACTION_UP;
+		setAlpha(pressed ? 0.2f : 1.0f);
 		if (stateListener != null) {
 			stateListener.onButtonPressedChange(this, pressed);
 		}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java
index ad3df6b1..b63e9d66 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java
@@ -11,6 +11,7 @@ import androidx.annotation.NonNull;
 import com.panda3ds.pandroid.math.Vector2;
 import com.panda3ds.pandroid.view.controller.ControllerNode;
 import com.panda3ds.pandroid.view.controller.TouchEvent;
+import com.panda3ds.pandroid.view.controller.TouchType;
 import com.panda3ds.pandroid.view.controller.listeners.JoystickListener;
 
 public class Joystick extends BasicControllerNode implements ControllerNode {
@@ -47,20 +48,20 @@ public class Joystick extends BasicControllerNode implements ControllerNode {
 
 		int analogIconSize = width - getPaddingLeft();
 
-		float middleIconSize = analogIconSize / 2.0F;
-		float middle = width / 2.0F;
+		float middleIconSize = analogIconSize / 2.0f;
+		float middle = width / 2.0f;
 
-		float maxDistance = (middle - middleIconSize) * 0.9F;
+		float maxDistance = (middle - middleIconSize) * 0.9f;
 
 		float tx = maxDistance * axisX;
 		float ty = maxDistance * axisY;
 
-		float radius = Vector2.distance(0.0F, 0.0F, Math.abs(tx), Math.abs(ty));
+		float radius = Vector2.distance(0.0f, 0.0f, Math.abs(tx), Math.abs(ty));
 		radius = Math.min(maxDistance, radius);
 
 		double deg = Math.atan2(ty, tx) * (180.0 / Math.PI);
-		float rx = (float) (radius * Math.cos(Math.PI * 2 * deg / 360.0));
-		float ry = (float) (radius * Math.sin(Math.PI * 2 * deg / 360.0));
+		float rx = (float) (radius * Math.cos(2 * Math.PI * deg / 360.0));
+		float ry = (float) (radius * Math.sin(2 * Math.PI * deg / 360.0));
 
 		axisX = Math.max(-1.0f, Math.min(1.0f, axisX));
 		axisY = Math.max(-1.0f, Math.min(1.0f, axisY));
@@ -77,7 +78,7 @@ public class Joystick extends BasicControllerNode implements ControllerNode {
 		}
 	}
 
-	public Vector2 getAxis() { return new Vector2(Math.max(-1.0F, Math.min(1.0F, axisX)), Math.max(-1.0F, Math.min(1.0F, axisY))); }
+	public Vector2 getAxis() { return new Vector2(Math.max(-1.0f, Math.min(1.0f, axisX)), Math.max(-1.0f, Math.min(1.0f, axisY))); }
 
 	public void setJoystickListener(JoystickListener joystickListener) { this.joystickListener = joystickListener; }
 
@@ -89,7 +90,7 @@ public class Joystick extends BasicControllerNode implements ControllerNode {
 
 	@Override
 	public void onTouch(TouchEvent event) {
-		float middle = width / 2.0F;
+		float middle = width / 2.0f;
 
 		float x = event.getX();
 		float y = event.getY();
@@ -101,7 +102,7 @@ public class Joystick extends BasicControllerNode implements ControllerNode {
 
 		axisY = ((y - middle) / middle);
 
-		if (event.getAction() == TouchEvent.ACTION_UP) {
+		if (event.getAction() == TouchType.ACTION_UP) {
 			axisX = 0;
 			axisY = 0;
 		}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java
index 39e6aae9..bf51d4fe 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/TouchScreenNodeImpl.java
@@ -7,6 +7,7 @@ import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.view.controller.ControllerNode;
 import com.panda3ds.pandroid.view.controller.TouchEvent;
+import com.panda3ds.pandroid.view.controller.TouchType;
 import com.panda3ds.pandroid.view.renderer.ConsoleRenderer;
 
 public interface TouchScreenNodeImpl extends ControllerNode {
@@ -28,7 +29,7 @@ public interface TouchScreenNodeImpl extends ControllerNode {
 			view.setTag(R.id.TagEventHasDown, true);
 		}
 
-		if (hasDownEvent && event.getAction() == TouchEvent.ACTION_UP) {
+		if (hasDownEvent && event.getAction() == TouchType.ACTION_UP) {
 			AlberDriver.TouchScreenUp();
 			view.setTag(R.id.TagEventHasDown, false);
 		}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java
index adfe5443..a726b2e6 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/renderer/layout/DefaultScreenLayout.java
@@ -8,9 +8,9 @@ public class DefaultScreenLayout implements ConsoleLayout {
 	private final Rect topDisplay = new Rect();
 	private final Rect bottomDisplay = new Rect();
 
-	private final Vector2 screenSize = new Vector2(1.0F, 1.0F);
-	private final Vector2 topSourceSize = new Vector2(1.0F, 1.0F);
-	private final Vector2 bottomSourceSize = new Vector2(1.0F, 1.0F);
+	private final Vector2 screenSize = new Vector2(1.0f, 1.0f);
+	private final Vector2 topSourceSize = new Vector2(1.0f, 1.0f);
+	private final Vector2 bottomSourceSize = new Vector2(1.0f, 1.0f);
 
 	@Override
 	public void update(int screenWidth, int screenHeight) {

From e6880b15641f4fae33880e407ac77289fb041f58 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Fri, 8 Dec 2023 03:28:43 +0200
Subject: [PATCH 053/162] Even more peach stuff

---
 src/jni_driver.cpp                                    | 11 ++++++++---
 .../java/com/panda3ds/pandroid/utils/Constants.java   |  4 ++--
 .../com/panda3ds/pandroid/view/PandaGlRenderer.java   |  3 +++
 .../panda3ds/pandroid/view/PandaGlSurfaceView.java    |  5 ++++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index 82720e2a..770e16da 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -15,19 +15,24 @@ bool romLoaded = false;
 
 #define AlberFunction(type, name) JNIEXPORT type JNICALL Java_com_panda3ds_pandroid_AlberDriver_##name
 
+void throwException(JNIEnv* env, const char* message) {
+	jclass exceptionClass = env->FindClass("java/lang/RuntimeException");
+	env->ThrowNew(exceptionClass, message);
+}
+
 extern "C" {
 AlberFunction(void, Initialize)(JNIEnv* env, jobject obj) {
 	emulator = std::make_unique<Emulator>();
 
 	if (emulator->getRendererType() != RendererType::OpenGL) {
-		throw std::runtime_error("Renderer is not OpenGL");
+		return throwException(env, "Renderer type is not OpenGL");
 	}
 
 	renderer = static_cast<RendererGL*>(emulator->getRenderer());
 	hidService = &emulator->getServiceManager().getHID();
 
 	if (!gladLoadGLES2Loader(reinterpret_cast<GLADloadproc>(eglGetProcAddress))) {
-		throw std::runtime_error("OpenGL ES init failed");
+		return throwException(env, "Failed to load OpenGL ES 2.0");
 	}
 
 	__android_log_print(ANDROID_LOG_INFO, "AlberDriver", "OpenGL ES %d.%d", GLVersion.major, GLVersion.minor);
@@ -36,6 +41,7 @@ AlberFunction(void, Initialize)(JNIEnv* env, jobject obj) {
 
 AlberFunction(void, RunFrame)(JNIEnv* env, jobject obj, jint fbo) {
 	renderer->setFBO(fbo);
+	// TODO: don't reset entire state manager
 	renderer->resetStateManager();
 	emulator->runFrame();
 
@@ -53,7 +59,6 @@ AlberFunction(jboolean, HasRomLoaded)(JNIEnv* env, jobject obj) { return romLoad
 AlberFunction(void, LoadRom)(JNIEnv* env, jobject obj, jstring path) {
 	const char* pathStr = env->GetStringUTFChars(path, nullptr);
 	romLoaded = emulator->loadROM(pathStr);
-	__android_log_print(ANDROID_LOG_INFO, "AlberDriver", "Loading ROM %s, result: %d", pathStr, (int)romLoaded);
 	env->ReleaseStringUTFChars(path, pathStr);
 }
 
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
index 6b480c23..d94164c7 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
@@ -15,8 +15,8 @@ public class Constants {
 	public static final int INPUT_KEY_Y = 1 << 11;
 
 	public static final int N3DS_WIDTH = 400;
-	public static final int N3DS_HALF_HEIGHT = 240;
-	public static final int N3DS_FULL_HEIGHT = N3DS_HALF_HEIGHT * 2;
+	public static final int N3DS_FULL_HEIGHT = 480;
+	public static final int N3DS_HALF_HEIGHT = N3DS_FULL_HEIGHT / 2;
 
 	public static final String ACTIVITY_PARAMETER_PATH = "path";
 	public static final String LOG_TAG = "pandroid";
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
index 128e9b4f..8dd350ce 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
@@ -69,6 +69,9 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
 		screenFbo = generateBuffer[0];
 		glBindFramebuffer(GL_FRAMEBUFFER, screenFbo);
 		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, screenTexture, 0);
+		if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
+			Log.e(Constants.LOG_TAG, "Framebuffer is not complete");
+		}
 		glBindFramebuffer(GL_FRAMEBUFFER, 0);
 
 		AlberDriver.Initialize();
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
index eb65762d..c813294c 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlSurfaceView.java
@@ -2,6 +2,7 @@ package com.panda3ds.pandroid.view;
 
 import android.content.Context;
 import android.opengl.GLSurfaceView;
+import android.os.Debug;
 
 import androidx.annotation.NonNull;
 import com.panda3ds.pandroid.math.Vector2;
@@ -17,7 +18,9 @@ public class PandaGlSurfaceView extends GLSurfaceView implements TouchScreenNode
 	public PandaGlSurfaceView(Context context, String romPath) {
 		super(context);
 		setEGLContextClientVersion(3);
-		setDebugFlags(DEBUG_LOG_GL_CALLS);
+		if (Debug.isDebuggerConnected()) {
+			setDebugFlags(DEBUG_LOG_GL_CALLS);
+		}
 		renderer = new PandaGlRenderer(romPath);
 		setRenderer(renderer);
 	}

From 63a09dd51fb88013ef71612e7e01e78b415495f6 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 13 Dec 2023 22:47:32 +0200
Subject: [PATCH 054/162] Android bonk

---
 src/jni_driver.cpp                                            | 3 ---
 .../src/main/java/com/panda3ds/pandroid/app/GameActivity.java | 3 ---
 .../src/main/java/com/panda3ds/pandroid/app/MainActivity.java | 1 -
 .../src/main/java/com/panda3ds/pandroid/utils/PathUtils.java  | 3 ---
 .../com/panda3ds/pandroid/view/PandaLayoutController.java     | 2 --
 .../panda3ds/pandroid/view/controller/ControllerLayout.java   | 4 +---
 .../com/panda3ds/pandroid/view/controller/ControllerNode.java | 1 -
 .../com/panda3ds/pandroid/view/controller/TouchEvent.java     | 2 --
 .../pandroid/view/controller/nodes/BasicControllerNode.java   | 2 --
 .../com/panda3ds/pandroid/view/controller/nodes/Joystick.java | 3 ---
 10 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index 770e16da..8f5c352e 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -63,11 +63,8 @@ AlberFunction(void, LoadRom)(JNIEnv* env, jobject obj, jstring path) {
 }
 
 AlberFunction(void, TouchScreenDown)(JNIEnv* env, jobject obj, jint x, jint y) { hidService->setTouchScreenPress((u16)x, (u16)y); }
-
 AlberFunction(void, TouchScreenUp)(JNIEnv* env, jobject obj) { hidService->releaseTouchScreen(); }
-
 AlberFunction(void, KeyUp)(JNIEnv* env, jobject obj, jint keyCode) { hidService->releaseKey((u32)keyCode); }
-
 AlberFunction(void, KeyDown)(JNIEnv* env, jobject obj, jint keyCode) { hidService->pressKey((u32)keyCode); }
 
 AlberFunction(void, SetCirclepadAxis)(JNIEnv* env, jobject obj, jint x, jint y) {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
index dfba96e5..2da73b97 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -17,7 +17,6 @@ import com.panda3ds.pandroid.view.PandaGlSurfaceView;
 import com.panda3ds.pandroid.view.PandaLayoutController;
 
 public class GameActivity extends BaseActivity {
-
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -31,14 +30,12 @@ public class GameActivity extends BaseActivity {
 		}
 
 		PandaGlSurfaceView pandaSurface = new PandaGlSurfaceView(this, intent.getStringExtra(Constants.ACTIVITY_PARAMETER_PATH));
-
 		setContentView(R.layout.game_activity);
 
 		((FrameLayout) findViewById(R.id.panda_gl_frame))
 			.addView(pandaSurface, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 
 		PandaLayoutController controllerLayout = findViewById(R.id.controller_layout);
-
 		controllerLayout.initialize();
 
 		((CheckBox) findViewById(R.id.hide_screen_controller)).setOnCheckedChangeListener((buttonView, isChecked) -> findViewById(R.id.overlay_controller).setVisibility(isChecked ? View.VISIBLE : View.INVISIBLE));
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
index 368efe0e..f4fc27bf 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
@@ -40,7 +40,6 @@ public class MainActivity extends BaseActivity {
 		}
 
 		setContentView(R.layout.activity_main);
-
 		findViewById(R.id.load_rom).setOnClickListener(v -> { openFile(); });
 	}
 
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
index 0434e53f..9bfaa0e4 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
@@ -83,10 +83,7 @@ public class PathUtils {
 	}
 
 	public static boolean isExternalStorageDocument(Uri uri) { return "com.android.externalstorage.documents".equals(uri.getAuthority()); }
-
 	public static boolean isDownloadsDocument(Uri uri) { return "com.android.providers.downloads.documents".equals(uri.getAuthority()); }
-
 	public static boolean isMediaDocument(Uri uri) { return "com.android.providers.media.documents".equals(uri.getAuthority()); }
-
 	public static boolean isGooglePhotosUri(Uri uri) { return "com.google.android.apps.photos.content".equals(uri.getAuthority()); }
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java
index 543ab840..617b407e 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java
@@ -11,9 +11,7 @@ import com.panda3ds.pandroid.view.controller.nodes.Joystick;
 
 public class PandaLayoutController extends ControllerLayout {
 	public PandaLayoutController(Context context) { super(context); }
-
 	public PandaLayoutController(Context context, AttributeSet attrs) { super(context, attrs); }
-
 	public PandaLayoutController(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); }
 
 	public PandaLayoutController(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java
index 4af28497..32451bc7 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerLayout.java
@@ -19,9 +19,7 @@ public class ControllerLayout extends RelativeLayout {
 	private final ArrayList<ControllerNode> controllerNodes = new ArrayList<>();
 
 	public ControllerLayout(Context context) { this(context, null); }
-
 	public ControllerLayout(Context context, AttributeSet attrs) { this(context, attrs, 0); }
-
 	public ControllerLayout(Context context, AttributeSet attrs, int defStyleAttr) { this(context, attrs, defStyleAttr, 0); }
 
 	public ControllerLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
@@ -131,7 +129,7 @@ public class ControllerLayout extends RelativeLayout {
 		refreshChildren();
 	}
 
-	/*@TODO: Need replace that methods for prevent Android send events directly to children*/
+	// TODO: Need to replace these methods to prevent Android sending events directly to children
 
 	@Override
 	public ArrayList<View> getTouchables() {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java
index e6c1dc92..7d45550a 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/ControllerNode.java
@@ -17,6 +17,5 @@ public interface ControllerNode {
 	default boolean isVisible() { return ((View) this).isShown(); }
 
 	@NonNull Vector2 getSize();
-
 	void onTouch(TouchEvent event);
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java
index 8c940414..6b82d201 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/TouchEvent.java
@@ -5,9 +5,7 @@ public class TouchEvent {
 	private final float x, y;
 
 	public float getX() { return x; }
-
 	public float getY() { return y; }
-
 	public TouchType getAction() { return action; }
 
 	public TouchEvent(float x, float y, TouchType action) {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/BasicControllerNode.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/BasicControllerNode.java
index 224be9a4..d196c7ec 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/BasicControllerNode.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/BasicControllerNode.java
@@ -9,8 +9,6 @@ import com.panda3ds.pandroid.view.controller.ControllerNode;
 
 public abstract class BasicControllerNode extends AppCompatTextView implements ControllerNode {
 	public BasicControllerNode(@NonNull Context context) { super(context); }
-
 	public BasicControllerNode(@NonNull Context context, @Nullable AttributeSet attrs) { super(context, attrs); }
-
 	public BasicControllerNode(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java
index b63e9d66..cf33afb6 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/nodes/Joystick.java
@@ -20,11 +20,9 @@ public class Joystick extends BasicControllerNode implements ControllerNode {
 
 	private int width = 0;
 	private int height = 0;
-
 	private JoystickListener joystickListener;
 
 	public Joystick(Context context) { this(context, null); }
-
 	public Joystick(Context context, AttributeSet attrs) { this(context, attrs, 0); }
 
 	public Joystick(Context context, AttributeSet attrs, int defStyleAttr) {
@@ -99,7 +97,6 @@ public class Joystick extends BasicControllerNode implements ControllerNode {
 		y = Math.max(0, Math.min(middle * 2, y));
 
 		axisX = ((x - middle) / middle);
-
 		axisY = ((y - middle) / middle);
 
 		if (event.getAction() == TouchType.ACTION_UP) {

From 79079f35e2d99986aa9585b42dc55bd72e444729 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 13 Dec 2023 23:24:43 +0200
Subject: [PATCH 055/162] [Qt] Preparations before making the Qt builds public

---
 src/panda_qt/main_window.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index 804dc63a..2e4963d3 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -23,7 +23,7 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 	auto aboutMenu = menuBar->addMenu(tr("About"));
 
 	// Create and bind actions for them
-	auto pandaAction = fileMenu->addAction(tr("panda..."));
+	auto pandaAction = fileMenu->addAction(tr("Load game"));
 	connect(pandaAction, &QAction::triggered, this, &MainWindow::selectROM);
 
 	auto pauseAction = emulationMenu->addAction(tr("Pause"));
@@ -341,4 +341,4 @@ void MainWindow::keyReleaseEvent(QKeyEvent* event) {
 		case Qt::Key_Return: releaseKey(HID::Keys::Start); break;
 		case Qt::Key_Backspace: releaseKey(HID::Keys::Select); break;
 	}
-}
\ No newline at end of file
+}

From 6527df72111234db91574ff547d1892f134791e1 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 13 Dec 2023 23:33:13 +0200
Subject: [PATCH 056/162] Add panda-qt links

---
 readme.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 8667862d..0d9e7f7b 100644
--- a/readme.md
+++ b/readme.md
@@ -13,14 +13,23 @@ Join our Discord server by pressing on the banner below, or find us on other pla
 ![screenshot1](docs/img/KirbyRobobot.png) ![screenshot2](docs/img/OoT_Title.png) ![screenshot3](docs/img/pokegang.png)
 
 # Download
-You can download stable builds from the Releases tab, or you can download the latest build from the table below
+You can download stable builds from the Releases tab, or you can download the latest build from the tables below. Panda3DS comes in two flavours: A minimal SDL frontend, which does not have a GUI, and an experimental Qt frontend
 
+SDL builds (No GUI):
 |Platform|Status|Download|
 |--------|------------|--------|
 |Windows build|[![Windows Build](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Windows_Build.yml/badge.svg?branch=master)](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Windows_Build.yml)|[Windows Executable](https://nightly.link/wheremyfoodat/Panda3DS/workflows/Windows_Build/master/Windows%20executable.zip)|
 |MacOS build|[![MacOS Build](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/MacOS_Build.yml/badge.svg?branch=master)](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/MacOS_Build.yml)|[MacOS App Bundle](https://nightly.link/wheremyfoodat/Panda3DS/workflows/MacOS_Build/master/MacOS%20Alber%20App%20Bundle.zip)|
 |Linux build|[![Linux Build](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Linux_Build.yml/badge.svg?branch=master)](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Linux_Build.yml)|[Linux AppImage](https://nightly.link/wheremyfoodat/Panda3DS/workflows/Linux_AppImage_Build/master/Linux%20executable.zip)|
 
+Qt builds:
+|Platform|Status|Download|
+|--------|------------|--------|
+|Windows build|[![Windows Build](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Windows_Build.yml/badge.svg?branch=master)](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Windows_Build.yml)|[Windows Executable](https://nightly.link/wheremyfoodat/Panda3DS/workflows/Qt_Build/master/Windows%20executable.zip)|
+|MacOS build|[![MacOS Build](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/MacOS_Build.yml/badge.svg?branch=master)](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/MacOS_Build.yml)|[MacOS App Bundle](https://nightly.link/wheremyfoodat/Panda3DS/workflows/Qt_Build/master/MacOS%20Alber%20App%20Bundle.zip)|
+|Linux build|[![Linux Build](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Linux_Build.yml/badge.svg?branch=master)](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Linux_Build.yml)|[Linux AppImage](https://nightly.link/wheremyfoodat/Panda3DS/workflows/Qt_Build/master/Linux%20executable.zip)|
+
+
 # Compatibility
 Panda3DS is still in the early stages of development. Many games boot, many don't. Lots of games have at least some hilariously broken graphics, audio is not supported, and some QoL features (including a GUI) are missing. However, even more things are implemented, such as most of the 3DS core required to play games, and various neat features, such as Lua scripting, discord bot support, support for some system apps, cheats, controller support, WIP amiibo support and many more! The emulator is constantly evolving, so make sure to take a peek every now and then!
 

From 09f6d46aaa186e43dfc19c1a672e0f02aaf7e8c6 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 13 Dec 2023 23:33:43 +0200
Subject: [PATCH 057/162] Update readme.md

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 0d9e7f7b..152e3550 100644
--- a/readme.md
+++ b/readme.md
@@ -13,7 +13,7 @@ Join our Discord server by pressing on the banner below, or find us on other pla
 ![screenshot1](docs/img/KirbyRobobot.png) ![screenshot2](docs/img/OoT_Title.png) ![screenshot3](docs/img/pokegang.png)
 
 # Download
-You can download stable builds from the Releases tab, or you can download the latest build from the tables below. Panda3DS comes in two flavours: A minimal SDL frontend, which does not have a GUI, and an experimental Qt frontend
+You can download stable builds from the Releases tab, or you can download the latest build from the tables below. Panda3DS comes in two flavours: A minimal SDL frontend, which does not have a GUI, and an experimental Qt frontend.
 
 SDL builds (No GUI):
 |Platform|Status|Download|

From 29c946af99fb0a24be0840e240ded145f26486be Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 13 Dec 2023 23:34:20 +0200
Subject: [PATCH 058/162] Update readme.md

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 152e3550..63be3921 100644
--- a/readme.md
+++ b/readme.md
@@ -13,7 +13,7 @@ Join our Discord server by pressing on the banner below, or find us on other pla
 ![screenshot1](docs/img/KirbyRobobot.png) ![screenshot2](docs/img/OoT_Title.png) ![screenshot3](docs/img/pokegang.png)
 
 # Download
-You can download stable builds from the Releases tab, or you can download the latest build from the tables below. Panda3DS comes in two flavours: A minimal SDL frontend, which does not have a GUI, and an experimental Qt frontend.
+You can download stable builds from the Releases tab, or you can download the latest build from the tables below. Panda3DS comes in two flavours: A minimal SDL frontend, which does not have a GUI, and an experimental Qt 6 frontend with a proper user interface.
 
 SDL builds (No GUI):
 |Platform|Status|Download|

From 8afda8da5b056e1658bcbb7862181f6d4dd7f73c Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 13 Dec 2023 23:37:17 +0200
Subject: [PATCH 059/162] Update readme.md

---
 readme.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/readme.md b/readme.md
index 63be3921..6e4d5ac0 100644
--- a/readme.md
+++ b/readme.md
@@ -25,9 +25,9 @@ SDL builds (No GUI):
 Qt builds:
 |Platform|Status|Download|
 |--------|------------|--------|
-|Windows build|[![Windows Build](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Windows_Build.yml/badge.svg?branch=master)](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Windows_Build.yml)|[Windows Executable](https://nightly.link/wheremyfoodat/Panda3DS/workflows/Qt_Build/master/Windows%20executable.zip)|
-|MacOS build|[![MacOS Build](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/MacOS_Build.yml/badge.svg?branch=master)](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/MacOS_Build.yml)|[MacOS App Bundle](https://nightly.link/wheremyfoodat/Panda3DS/workflows/Qt_Build/master/MacOS%20Alber%20App%20Bundle.zip)|
-|Linux build|[![Linux Build](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Linux_Build.yml/badge.svg?branch=master)](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Linux_Build.yml)|[Linux AppImage](https://nightly.link/wheremyfoodat/Panda3DS/workflows/Qt_Build/master/Linux%20executable.zip)|
+|Windows build|[![Qt Build](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Qt_Build.yml/badge.svg)](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Qt_Build.yml)|[Windows Executable](https://nightly.link/wheremyfoodat/Panda3DS/workflows/Qt_Build/master/Windows%20executable.zip)|
+|MacOS build|[![Qt Build](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Qt_Build.yml/badge.svg)](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Qt_Build.yml)|[MacOS App Bundle](https://nightly.link/wheremyfoodat/Panda3DS/workflows/Qt_Build/master/MacOS%20Alber%20App%20Bundle.zip)|
+|Linux build|[![Qt Build](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Qt_Build.yml/badge.svg)](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Qt_Build.yml)|[Linux AppImage](https://nightly.link/wheremyfoodat/Panda3DS/workflows/Qt_Build/master/Linux%20executable.zip)|
 
 
 # Compatibility

From 0cccde79f4f5fb4eb06b5c8f315be5c998e392fa Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 13 Dec 2023 23:45:53 +0200
Subject: [PATCH 060/162] Specify the SDL/Qt frontend split only happens on PC

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 6e4d5ac0..9e27194c 100644
--- a/readme.md
+++ b/readme.md
@@ -13,7 +13,7 @@ Join our Discord server by pressing on the banner below, or find us on other pla
 ![screenshot1](docs/img/KirbyRobobot.png) ![screenshot2](docs/img/OoT_Title.png) ![screenshot3](docs/img/pokegang.png)
 
 # Download
-You can download stable builds from the Releases tab, or you can download the latest build from the tables below. Panda3DS comes in two flavours: A minimal SDL frontend, which does not have a GUI, and an experimental Qt 6 frontend with a proper user interface.
+You can download stable builds from the Releases tab, or you can download the latest build from the tables below. Additionally, Panda3DS comes in 2 flavours on PC: A minimal SDL frontend, which does not have a GUI, and an experimental Qt 6 frontend with a proper user interface.
 
 SDL builds (No GUI):
 |Platform|Status|Download|

From 101cc4d0aca532ce9ce96e19aa54e1ebf49d6ea0 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Thu, 14 Dec 2023 00:43:12 +0200
Subject: [PATCH 061/162] [Qt] Add separate configuration window for theme

---
 CMakeLists.txt                     |  4 +-
 include/panda_qt/config_window.hpp | 29 +++++++++
 include/panda_qt/main_window.hpp   | 14 +----
 src/panda_qt/config_window.cpp     | 99 ++++++++++++++++++++++++++++++
 src/panda_qt/main_window.cpp       | 97 ++---------------------------
 5 files changed, 136 insertions(+), 107 deletions(-)
 create mode 100644 include/panda_qt/config_window.hpp
 create mode 100644 src/panda_qt/config_window.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c202f80c..cea72785 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,8 +185,8 @@ set(RENDERER_SW_SOURCE_FILES src/core/renderer_sw/renderer_sw.cpp)
 
 # Frontend source files
 if(ENABLE_QT_GUI)
-    set(FRONTEND_SOURCE_FILES src/panda_qt/main.cpp src/panda_qt/screen.cpp src/panda_qt/main_window.cpp src/panda_qt/about_window.cpp)
-    set(FRONTEND_HEADER_FILES include/panda_qt/screen.hpp include/panda_qt/main_window.hpp include/panda_qt/about_window.hpp)
+    set(FRONTEND_SOURCE_FILES src/panda_qt/main.cpp src/panda_qt/screen.cpp src/panda_qt/main_window.cpp src/panda_qt/about_window.cpp src/panda_qt/config_window.cpp)
+    set(FRONTEND_HEADER_FILES include/panda_qt/screen.hpp include/panda_qt/main_window.hpp include/panda_qt/about_window.hpp include/panda_qt/config_window.hpp)
 
     source_group("Source Files\\Qt" FILES ${FRONTEND_SOURCE_FILES})
     source_group("Header Files\\Qt" FILES ${FRONTEND_HEADER_FILES})
diff --git a/include/panda_qt/config_window.hpp b/include/panda_qt/config_window.hpp
new file mode 100644
index 00000000..e91936c4
--- /dev/null
+++ b/include/panda_qt/config_window.hpp
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <QApplication>
+#include <QComboBox>
+#include <QDialog>
+#include <QPalette>
+#include <QWidget>
+#include <QtWidgets>
+
+class ConfigWindow : public QDialog {
+	Q_OBJECT
+
+  private:
+	enum class Theme : int {
+		System = 0,
+		Light = 1,
+		Dark = 2,
+		GreetingsCat = 3,
+	};
+
+	Theme currentTheme;
+	QComboBox* themeSelect = nullptr;
+
+	void setTheme(Theme theme);
+
+  public:
+	ConfigWindow(QWidget* parent = nullptr);
+	~ConfigWindow();
+};
\ No newline at end of file
diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp
index a50ee9a1..e2fd8596 100644
--- a/include/panda_qt/main_window.hpp
+++ b/include/panda_qt/main_window.hpp
@@ -1,9 +1,7 @@
 #pragma once
 
 #include <QApplication>
-#include <QComboBox>
 #include <QMenuBar>
-#include <QPalette>
 #include <QtWidgets>
 #include <atomic>
 #include <filesystem>
@@ -13,6 +11,7 @@
 
 #include "emulator.hpp"
 #include "panda_qt/about_window.hpp"
+#include "panda_qt/config_window.hpp"
 #include "panda_qt/screen.hpp"
 #include "services/hid.hpp"
 
@@ -20,13 +19,6 @@ class MainWindow : public QMainWindow {
 	Q_OBJECT
 
   private:
-	enum class Theme : int {
-		System = 0,
-		Light = 1,
-		Dark = 2,
-		GreetingsCat = 3,
-	};
-
 	// Types of messages we might send from the GUI thread to the emulator thread
 	enum class MessageType {
 		LoadROM, Reset, Pause, Resume, TogglePause, DumpRomFS, PressKey, ReleaseKey
@@ -58,11 +50,9 @@ class MainWindow : public QMainWindow {
 
 	ScreenWidget screen;
 	AboutWindow* aboutWindow;
-	QComboBox* themeSelect = nullptr;
+	ConfigWindow* configWindow;
 	QMenuBar* menuBar = nullptr;
 
-	Theme currentTheme;
-	void setTheme(Theme theme);
 	void swapEmuBuffer();
 	void emuThreadMainLoop();
 	void selectROM();
diff --git a/src/panda_qt/config_window.cpp b/src/panda_qt/config_window.cpp
new file mode 100644
index 00000000..44debc32
--- /dev/null
+++ b/src/panda_qt/config_window.cpp
@@ -0,0 +1,99 @@
+#include "panda_qt/config_window.hpp"
+
+ConfigWindow::ConfigWindow(QWidget* parent) : QDialog(parent) {
+	setWindowTitle(tr("Configuration"));
+
+	// Set up theme selection
+	setTheme(Theme::Dark);
+	themeSelect = new QComboBox(this);
+	themeSelect->addItem(tr("System"));
+	themeSelect->addItem(tr("Light"));
+	themeSelect->addItem(tr("Dark"));
+	themeSelect->addItem(tr("Greetings Cat"));
+	themeSelect->setCurrentIndex(static_cast<int>(currentTheme));
+
+	themeSelect->setGeometry(40, 40, 100, 50);
+	themeSelect->show();
+	connect(themeSelect, &QComboBox::currentIndexChanged, this, [&](int index) { setTheme(static_cast<Theme>(index)); });
+}
+
+void ConfigWindow::setTheme(Theme theme) {
+	currentTheme = theme;
+
+	switch (theme) {
+		case Theme::Dark: {
+			QApplication::setStyle(QStyleFactory::create("Fusion"));
+
+			QPalette p;
+			p.setColor(QPalette::Window, QColor(53, 53, 53));
+			p.setColor(QPalette::WindowText, Qt::white);
+			p.setColor(QPalette::Base, QColor(25, 25, 25));
+			p.setColor(QPalette::AlternateBase, QColor(53, 53, 53));
+			p.setColor(QPalette::ToolTipBase, Qt::white);
+			p.setColor(QPalette::ToolTipText, Qt::white);
+			p.setColor(QPalette::Text, Qt::white);
+			p.setColor(QPalette::Button, QColor(53, 53, 53));
+			p.setColor(QPalette::ButtonText, Qt::white);
+			p.setColor(QPalette::BrightText, Qt::red);
+			p.setColor(QPalette::Link, QColor(42, 130, 218));
+
+			p.setColor(QPalette::Highlight, QColor(42, 130, 218));
+			p.setColor(QPalette::HighlightedText, Qt::black);
+			qApp->setPalette(p);
+			break;
+		}
+
+		case Theme::Light: {
+			QApplication::setStyle(QStyleFactory::create("Fusion"));
+
+			QPalette p;
+			p.setColor(QPalette::Window, Qt::white);
+			p.setColor(QPalette::WindowText, Qt::black);
+			p.setColor(QPalette::Base, QColor(243, 243, 243));
+			p.setColor(QPalette::AlternateBase, Qt::white);
+			p.setColor(QPalette::ToolTipBase, Qt::black);
+			p.setColor(QPalette::ToolTipText, Qt::black);
+			p.setColor(QPalette::Text, Qt::black);
+			p.setColor(QPalette::Button, Qt::white);
+			p.setColor(QPalette::ButtonText, Qt::black);
+			p.setColor(QPalette::BrightText, Qt::red);
+			p.setColor(QPalette::Link, QColor(42, 130, 218));
+
+			p.setColor(QPalette::Highlight, QColor(42, 130, 218));
+			p.setColor(QPalette::HighlightedText, Qt::white);
+			qApp->setPalette(p);
+			break;
+		}
+
+		case Theme::GreetingsCat: {
+			QApplication::setStyle(QStyleFactory::create("Fusion"));
+
+			QPalette p;
+			p.setColor(QPalette::Window, QColor(250, 207, 228));
+			p.setColor(QPalette::WindowText, QColor(225, 22, 137));
+			p.setColor(QPalette::Base, QColor(250, 207, 228));
+			p.setColor(QPalette::AlternateBase, QColor(250, 207, 228));
+			p.setColor(QPalette::ToolTipBase, QColor(225, 22, 137));
+			p.setColor(QPalette::ToolTipText, QColor(225, 22, 137));
+			p.setColor(QPalette::Text, QColor(225, 22, 137));
+			p.setColor(QPalette::Button, QColor(250, 207, 228));
+			p.setColor(QPalette::ButtonText, QColor(225, 22, 137));
+			p.setColor(QPalette::BrightText, Qt::black);
+			p.setColor(QPalette::Link, QColor(42, 130, 218));
+
+			p.setColor(QPalette::Highlight, QColor(42, 130, 218));
+			p.setColor(QPalette::HighlightedText, Qt::black);
+			qApp->setPalette(p);
+			break;
+		}
+
+		case Theme::System: {
+			qApp->setPalette(this->style()->standardPalette());
+			qApp->setStyle(QStyleFactory::create("WindowsVista"));
+			qApp->setStyleSheet("");
+			break;
+		}
+	}
+}
+
+ConfigWindow::~ConfigWindow() { delete themeSelect; }
\ No newline at end of file
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index 804dc63a..3dcb246f 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -29,9 +29,11 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 	auto pauseAction = emulationMenu->addAction(tr("Pause"));
 	auto resumeAction = emulationMenu->addAction(tr("Resume"));
 	auto resetAction = emulationMenu->addAction(tr("Reset"));
+	auto configureAction = emulationMenu->addAction(tr("Configure"));
 	connect(pauseAction, &QAction::triggered, this, [this]() { sendMessage(EmulatorMessage{.type = MessageType::Pause}); });
 	connect(resumeAction, &QAction::triggered, this, [this]() { sendMessage(EmulatorMessage{.type = MessageType::Resume}); });
 	connect(resetAction, &QAction::triggered, this, [this]() { sendMessage(EmulatorMessage{.type = MessageType::Reset}); });
+	connect(configureAction, &QAction::triggered, this, [this]() { configWindow->show(); });
 
 	auto dumpRomFSAction = toolsMenu->addAction(tr("Dump RomFS"));
 	connect(dumpRomFSAction, &QAction::triggered, this, &MainWindow::dumpRomFS);
@@ -39,21 +41,9 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 	auto aboutAction = aboutMenu->addAction(tr("About Panda3DS"));
 	connect(aboutAction, &QAction::triggered, this, &MainWindow::showAboutMenu);
 
-	// Set up theme selection
-	setTheme(Theme::Dark);
-	themeSelect = new QComboBox(this);
-	themeSelect->addItem(tr("System"));
-	themeSelect->addItem(tr("Light"));
-	themeSelect->addItem(tr("Dark"));
-	themeSelect->addItem(tr("Greetings Cat"));
-	themeSelect->setCurrentIndex(static_cast<int>(currentTheme));
-
-	themeSelect->setGeometry(40, 40, 100, 50);
-	themeSelect->show();
-	connect(themeSelect, &QComboBox::currentIndexChanged, this, [&](int index) { setTheme(static_cast<Theme>(index)); });
-
 	// Set up misc objects
 	aboutWindow = new AboutWindow(nullptr);
+	configWindow = new ConfigWindow(this);
 
 	emu = new Emulator();
 	emu->setOutputSize(screen.surfaceWidth, screen.surfaceHeight);
@@ -142,7 +132,7 @@ MainWindow::~MainWindow() {
 	delete emu;
 	delete menuBar;
 	delete aboutWindow;
-	delete themeSelect;
+	delete configWindow;
 }
 
 // Send a message to the emulator thread. Lock the mutex and just push back to the vector.
@@ -151,85 +141,6 @@ void MainWindow::sendMessage(const EmulatorMessage& message) {
 	messageQueue.push_back(message);
 }
 
-void MainWindow::setTheme(Theme theme) {
-	currentTheme = theme;
-
-	switch (theme) {
-		case Theme::Dark: {
-			QApplication::setStyle(QStyleFactory::create("Fusion"));
-
-			QPalette p;
-			p.setColor(QPalette::Window, QColor(53, 53, 53));
-			p.setColor(QPalette::WindowText, Qt::white);
-			p.setColor(QPalette::Base, QColor(25, 25, 25));
-			p.setColor(QPalette::AlternateBase, QColor(53, 53, 53));
-			p.setColor(QPalette::ToolTipBase, Qt::white);
-			p.setColor(QPalette::ToolTipText, Qt::white);
-			p.setColor(QPalette::Text, Qt::white);
-			p.setColor(QPalette::Button, QColor(53, 53, 53));
-			p.setColor(QPalette::ButtonText, Qt::white);
-			p.setColor(QPalette::BrightText, Qt::red);
-			p.setColor(QPalette::Link, QColor(42, 130, 218));
-
-			p.setColor(QPalette::Highlight, QColor(42, 130, 218));
-			p.setColor(QPalette::HighlightedText, Qt::black);
-			qApp->setPalette(p);
-			break;
-		}
-
-		case Theme::Light: {
-			QApplication::setStyle(QStyleFactory::create("Fusion"));
-
-			QPalette p;
-			p.setColor(QPalette::Window, Qt::white);
-			p.setColor(QPalette::WindowText, Qt::black);
-			p.setColor(QPalette::Base, QColor(243, 243, 243));
-			p.setColor(QPalette::AlternateBase, Qt::white);
-			p.setColor(QPalette::ToolTipBase, Qt::black);
-			p.setColor(QPalette::ToolTipText, Qt::black);
-			p.setColor(QPalette::Text, Qt::black);
-			p.setColor(QPalette::Button, Qt::white);
-			p.setColor(QPalette::ButtonText, Qt::black);
-			p.setColor(QPalette::BrightText, Qt::red);
-			p.setColor(QPalette::Link, QColor(42, 130, 218));
-
-			p.setColor(QPalette::Highlight, QColor(42, 130, 218));
-			p.setColor(QPalette::HighlightedText, Qt::white);
-			qApp->setPalette(p);
-			break;
-		}
-
-		case Theme::GreetingsCat: {
-			QApplication::setStyle(QStyleFactory::create("Fusion"));
-
-			QPalette p;
-			p.setColor(QPalette::Window, QColor(250, 207, 228));
-			p.setColor(QPalette::WindowText, QColor(225, 22, 137));
-			p.setColor(QPalette::Base, QColor(250, 207, 228));
-			p.setColor(QPalette::AlternateBase, QColor(250, 207, 228));
-			p.setColor(QPalette::ToolTipBase, QColor(225, 22, 137));
-			p.setColor(QPalette::ToolTipText, QColor(225, 22, 137));
-			p.setColor(QPalette::Text, QColor(225, 22, 137));
-			p.setColor(QPalette::Button, QColor(250, 207, 228));
-			p.setColor(QPalette::ButtonText, QColor(225, 22, 137));
-			p.setColor(QPalette::BrightText, Qt::black);
-			p.setColor(QPalette::Link, QColor(42, 130, 218));
-
-			p.setColor(QPalette::Highlight, QColor(42, 130, 218));
-			p.setColor(QPalette::HighlightedText, Qt::black);
-			qApp->setPalette(p);
-			break;
-		}
-
-		case Theme::System: {
-			qApp->setPalette(this->style()->standardPalette());
-			qApp->setStyle(QStyleFactory::create("WindowsVista"));
-			qApp->setStyleSheet("");
-			break;
-		}
-	}
-}
-
 void MainWindow::dumpRomFS() {
 	auto folder = QFileDialog::getExistingDirectory(
 		this, tr("Select folder to dump RomFS files to"), "", QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks

From 53c3b5096ca9e6118d5c0dfb24d722ed8d05fa10 Mon Sep 17 00:00:00 2001
From: Gabriel Machado <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Thu, 14 Dec 2023 00:56:35 -0400
Subject: [PATCH 062/162] Best Screen Gamepad accessibility

---
 .../main/res/drawable/analog_background.xml   | 26 +++++
 .../main/res/drawable/analog_foreground.xml   | 41 ++++++++
 .../app/src/main/res/drawable/button_a.xml    | 39 ++++++++
 .../app/src/main/res/drawable/button_b.xml    | 39 ++++++++
 .../app/src/main/res/drawable/button_l.xml    | 24 +++++
 .../app/src/main/res/drawable/button_r.xml    | 24 +++++
 .../src/main/res/drawable/button_select.xml   | 38 +++++++
 .../src/main/res/drawable/button_start.xml    | 38 +++++++
 .../app/src/main/res/drawable/button_x.xml    | 39 ++++++++
 .../app/src/main/res/drawable/button_y.xml    | 39 ++++++++
 .../app/src/main/res/drawable/dpad_down.xml   | 39 ++++++++
 .../app/src/main/res/drawable/dpad_left.xml   | 39 ++++++++
 .../app/src/main/res/drawable/dpad_right.xml  | 39 ++++++++
 .../app/src/main/res/drawable/dpad_up.xml     | 39 ++++++++
 .../app/src/main/res/drawable/ic_add.xml      |  5 +
 .../res/drawable/simple_analog_background.xml | 19 ----
 .../res/drawable/simple_circle_button.xml     | 10 --
 .../src/main/res/layout/controller_dpad.xml   | 30 +++---
 .../main/res/layout/controller_gamepad.xml    | 34 ++++---
 .../main/res/layout/controller_joystick.xml   | 11 +++
 .../app/src/main/res/layout/controller_l.xml  | 10 ++
 .../app/src/main/res/layout/controller_r.xml  | 10 ++
 .../src/main/res/layout/controller_select.xml | 10 ++
 .../src/main/res/layout/controller_start.xml  | 10 ++
 .../app/src/main/res/layout/game_activity.xml | 98 +++----------------
 .../app/src/main/res/values/styleable.xml     | 10 +-
 26 files changed, 612 insertions(+), 148 deletions(-)
 create mode 100644 src/pandroid/app/src/main/res/drawable/analog_background.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/analog_foreground.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_a.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_b.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_l.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_r.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_select.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_start.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_x.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_y.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/dpad_down.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/dpad_left.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/dpad_right.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/dpad_up.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_add.xml
 delete mode 100644 src/pandroid/app/src/main/res/drawable/simple_analog_background.xml
 delete mode 100644 src/pandroid/app/src/main/res/drawable/simple_circle_button.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/controller_joystick.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/controller_l.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/controller_r.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/controller_select.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/controller_start.xml

diff --git a/src/pandroid/app/src/main/res/drawable/analog_background.xml b/src/pandroid/app/src/main/res/drawable/analog_background.xml
new file mode 100644
index 00000000..3f3747cd
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/analog_background.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,7C26.27,7 7,26.27 7,50 7,73.73 26.27,93 50,93 73.73,93 93,73.73 93,50 93,26.27 73.73,7 50,7ZM50,10.06C72.08,10.06 89.94,27.92 89.94,50 89.94,72.08 72.08,89.94 50,89.94 27.92,89.94 10.06,72.08 10.06,50 10.06,27.92 27.92,10.06 50,10.06Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.285353"/>
+  <path
+      android:pathData="M50,7.55C26.57,7.55 7.55,26.57 7.55,50 7.55,73.43 26.57,92.45 50,92.45 73.43,92.45 92.45,73.43 92.45,50 92.45,26.57 73.43,7.55 50,7.55ZM50,9.51C72.38,9.51 90.49,27.62 90.49,50 90.49,72.38 72.38,90.49 50,90.49 27.62,90.49 9.51,72.38 9.51,50 9.51,27.62 27.62,9.51 50,9.51Z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:centerX="0.32"
+          android:centerY="14.57"
+          android:gradientRadius="112.13"
+          android:type="radial">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FF525252"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/analog_foreground.xml b/src/pandroid/app/src/main/res/drawable/analog_foreground.xml
new file mode 100644
index 00000000..c339e69f
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/analog_foreground.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.321096"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:centerX="50"
+          android:centerY="50"
+          android:gradientRadius="45"
+          android:type="radial">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FF888888"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M50,3.34C24.25,3.34 3.34,24.25 3.34,50 3.34,75.75 24.25,96.66 50,96.66 75.75,96.66 96.66,75.75 96.66,50 96.66,24.25 75.75,3.34 50,3.34ZM50,6.66C73.96,6.66 93.34,26.04 93.34,50 93.34,73.96 73.96,93.34 50,93.34 26.04,93.34 6.66,73.96 6.66,50 6.66,26.04 26.04,6.66 50,6.66Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.285353"/>
+  <path
+      android:pathData="M50,3.94C24.57,3.94 3.94,24.57 3.94,50 3.94,75.43 24.57,96.06 50,96.06 75.43,96.06 96.06,75.43 96.06,50 96.06,24.57 75.43,3.94 50,3.94ZM50,6.06C74.28,6.06 93.94,25.72 93.94,50 93.94,74.28 74.28,93.94 50,93.94 25.72,93.94 6.06,74.28 6.06,50 6.06,25.72 25.72,6.06 50,6.06Z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:centerX="-3.9"
+          android:centerY="11.55"
+          android:gradientRadius="121.67"
+          android:type="radial">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FF525252"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_a.xml b/src/pandroid/app/src/main/res/drawable/button_a.xml
new file mode 100644
index 00000000..d04306b9
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_a.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m60.36,69.56q-0.62,-2.03 -1.41,-4.18 -0.73,-2.14 -1.47,-4.29l-15.24,0q-0.73,2.14 -1.52,4.29 -0.73,2.14 -1.35,4.18l-9.14,0q2.2,-6.32 4.18,-11.68 1.98,-5.36 3.84,-10.1 1.92,-4.74 3.73,-8.97 1.86,-4.29 3.84,-8.35l8.41,0q1.92,4.06 3.78,8.35 1.86,4.23 3.73,8.97 1.92,4.74 3.89,10.1 1.98,5.36 4.18,11.68zM49.8,39.3q-0.28,0.85 -0.85,2.31 -0.56,1.47 -1.3,3.39 -0.73,1.92 -1.64,4.23 -0.85,2.31 -1.75,4.85l11.12,0q-0.9,-2.54 -1.75,-4.85 -0.85,-2.31 -1.64,-4.23 -0.73,-1.92 -1.3,-3.39 -0.56,-1.47 -0.9,-2.31z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.45"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_b.xml b/src/pandroid/app/src/main/res/drawable/button_b.xml
new file mode 100644
index 00000000..1611f28d
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_b.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m48.59,70.07q-3.22,0 -6.43,-0.23 -3.16,-0.17 -6.6,-0.9l0,-37.93q2.71,-0.51 5.93,-0.73 3.22,-0.28 5.98,-0.28 3.73,0 6.83,0.56 3.16,0.51 5.42,1.81 2.26,1.3 3.5,3.44 1.3,2.09 1.3,5.19 0,4.68 -4.52,7.39 3.73,1.41 5.08,3.84 1.35,2.43 1.35,5.48 0,6.15 -4.52,9.26 -4.46,3.1 -13.32,3.1zM44.13,52.51l0,10.1q0.96,0.11 2.09,0.17 1.13,0.06 2.48,0.06 3.95,0 6.38,-1.13 2.43,-1.13 2.43,-4.18 0,-2.71 -2.03,-3.84 -2.03,-1.19 -5.81,-1.19zM44.13,45.79l4.29,0q4.06,0 5.81,-1.02 1.75,-1.07 1.75,-3.39 0,-2.37 -1.81,-3.33 -1.81,-0.96 -5.31,-0.96 -1.13,0 -2.43,0.06 -1.3,0 -2.31,0.11z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.45"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_l.xml b/src/pandroid/app/src/main/res/drawable/button_l.xml
new file mode 100644
index 00000000..a2b2f5ad
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_l.xml
@@ -0,0 +1,24 @@
+<vector android:height="24dp" android:viewportHeight="64"
+    android:viewportWidth="264" android:width="99dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillType="evenOdd"
+        android:pathData="m12.36,1c-5.54,0 -10.12,3.92 -11.14,9.15 -0.14,0.71 -0.21,1.45 -0.21,2.2v39.29c0,6.29 5.06,11.36 11.36,11.36h144.42c0.81,0 1.6,-0.08 2.36,-0.24 58.82,-1.71 103.87,-12.44 103.87,-25.52L263,31.87 263,26.76 263,11 263,10.14c0,-0.17 -0.04,-0.34 -0.09,-0.49 -0.66,-4.89 -4.83,-8.64 -9.91,-8.64h-96.23z"
+        android:strokeColor="#00000000" android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" android:strokeWidth="0.556">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="0" android:centerY="0"
+                android:gradientRadius="132.57" android:type="radial">
+                <item android:color="#FFFCFCFC" android:offset="0"/>
+                <item android:color="#FF484848" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillColor="#afafaf" android:fillType="evenOdd"
+        android:pathData="m14.35,4.15c-5.51,0 -9.95,4.44 -9.95,9.95v34.41c0,5.51 4.44,9.95 9.95,9.95h151.37c0.71,0 1.4,-0.07 2.07,-0.21 51.52,-1.5 90.98,-10.9 90.98,-22.35L258.76,31.19 258.76,26.72 258.76,12.91 258.76,12.15c0,-0.15 -0.03,-0.3 -0.08,-0.43 -0.58,-4.29 -4.23,-7.57 -8.68,-7.57h-84.29z"
+        android:strokeColor="#00000000" android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" android:strokeWidth="0.487007"/>
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="m12.36,0.72c-5.67,0 -10.37,4.02 -11.42,9.38 -0.14,0.73 -0.22,1.48 -0.22,2.26L0.72,51.64c0,6.44 5.19,11.63 11.63,11.63L156.77,63.28c0.81,0 1.6,-0.09 2.37,-0.24 29.42,-0.86 55.4,-3.97 74.05,-8.51 9.32,-2.27 16.81,-4.89 21.99,-7.79 2.59,-1.45 4.6,-2.96 5.98,-4.54 1.38,-1.58 2.12,-3.25 2.12,-4.96L263.28,31.87 263.28,26.76 263.28,11 263.28,10.14c0,-0.2 -0.04,-0.39 -0.11,-0.56C262.48,4.56 258.2,0.72 253,0.72L156.77,0.72ZM12.36,1.28h144.42,96.23c4.94,0 8.99,3.64 9.63,8.4l0,0.03 0.01,0.03c0.05,0.13 0.08,0.26 0.08,0.4v0.87,15.76 5.11,5.37c0,1.55 -0.67,3.08 -1.98,4.6 -1.32,1.51 -3.28,3 -5.83,4.42 -5.11,2.85 -12.56,5.47 -21.85,7.73 -18.59,4.52 -44.54,7.63 -73.93,8.49l-0.03,0 -0.02,0c-0.74,0.16 -1.51,0.24 -2.3,0.24L12.36,62.72c-6.14,0 -11.08,-4.94 -11.08,-11.08L1.28,12.36c0,-0.74 0.07,-1.46 0.21,-2.15 1,-5.1 5.47,-8.93 10.87,-8.93z"/>
+    <path android:fillColor="#424242"
+        android:pathData="m53.32,42.88l0,7.37L27.85,50.25l0,-38.12l8.58,0l0,30.75z"
+        android:strokeAlpha="0.396361" android:strokeWidth="0.38"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_r.xml b/src/pandroid/app/src/main/res/drawable/button_r.xml
new file mode 100644
index 00000000..24cf739b
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_r.xml
@@ -0,0 +1,24 @@
+<vector android:height="24dp" android:viewportHeight="64"
+    android:viewportWidth="264" android:width="99dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillType="evenOdd"
+        android:pathData="m251.64,1c5.54,0 10.12,3.92 11.14,9.15 0.14,0.71 0.21,1.45 0.21,2.2v39.29c0,6.29 -5.06,11.36 -11.36,11.36h-144.42c-0.81,0 -1.6,-0.08 -2.36,-0.24C46.05,61.04 1,50.31 1,37.24L1,31.87 1,26.76 1,11 1,10.14c0,-0.17 0.04,-0.34 0.09,-0.49 0.66,-4.89 4.83,-8.64 9.91,-8.64h96.23z"
+        android:strokeColor="#00000000" android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" android:strokeWidth="0.556">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="37.3" android:centerY="23.14"
+                android:gradientRadius="132.57" android:type="radial">
+                <item android:color="#FFFCFCFC" android:offset="0"/>
+                <item android:color="#FF484848" android:offset="0.61"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillColor="#afafaf" android:fillType="evenOdd"
+        android:pathData="m248.82,4.15c5.51,0 9.95,4.44 9.95,9.95v34.41c0,5.51 -4.44,9.95 -9.95,9.95L97.45,58.46c-0.71,0 -1.4,-0.07 -2.07,-0.21C43.87,56.74 4.4,47.34 4.4,35.89L4.4,31.19 4.4,26.72 4.4,12.91 4.4,12.15c0,-0.15 0.03,-0.3 0.08,-0.43 0.58,-4.29 4.23,-7.57 8.68,-7.57h84.29z"
+        android:strokeColor="#00000000" android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" android:strokeWidth="0.487007"/>
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="m251.64,0.72c5.67,0 10.37,4.02 11.42,9.38 0.14,0.73 0.22,1.48 0.22,2.26L263.28,51.64c0,6.44 -5.19,11.63 -11.63,11.63L107.23,63.28c-0.81,0 -1.6,-0.09 -2.37,-0.24 -29.42,-0.86 -55.4,-3.97 -74.05,-8.51 -9.32,-2.27 -16.81,-4.89 -21.99,-7.79 -2.59,-1.45 -4.6,-2.96 -5.98,-4.54 -1.38,-1.58 -2.12,-3.25 -2.12,-4.96L0.72,31.87 0.72,26.76 0.72,11 0.72,10.14c0,-0.2 0.04,-0.39 0.11,-0.56 0.69,-5.01 4.97,-8.85 10.17,-8.85h96.23zM251.64,1.28L107.23,1.28 11,1.28c-4.94,0 -8.99,3.64 -9.63,8.4l-0,0.03 -0.01,0.03c-0.05,0.13 -0.08,0.26 -0.08,0.4v0.87,15.76 5.11,5.37c0,1.55 0.67,3.08 1.98,4.6 1.32,1.51 3.28,3 5.83,4.42 5.11,2.85 12.56,5.47 21.85,7.73 18.59,4.52 44.54,7.63 73.93,8.49l0.03,0 0.02,0c0.74,0.16 1.51,0.24 2.3,0.24h31.1,113.32c6.14,0 11.08,-4.94 11.08,-11.08L262.72,12.36c0,-0.74 -0.07,-1.46 -0.21,-2.15 -1,-5.1 -5.47,-8.93 -10.87,-8.93z"/>
+    <path android:fillColor="#424242"
+        android:pathData="m221.58,11.81q8.58,0 13.15,3.08 4.57,3.03 4.57,9.46 0,4.02 -1.87,6.55 -1.82,2.48 -5.28,3.91 1.16,1.43 2.42,3.3 1.27,1.82 2.48,3.85 1.27,1.98 2.42,4.18 1.16,2.15 2.15,4.24l-9.63,0q-1.05,-1.87 -2.15,-3.8 -1.05,-1.93 -2.2,-3.74 -1.1,-1.82 -2.2,-3.41 -1.1,-1.65 -2.2,-2.97l-4.24,0l0,13.92l-8.58,0l0,-37.57q2.81,-0.55 5.78,-0.77 3.03,-0.22 5.39,-0.22zM222.08,19.12q-0.94,0 -1.71,0.06 -0.72,0.06 -1.38,0.11l0,10.34l2.42,0q4.84,0 6.93,-1.21 2.09,-1.21 2.09,-4.13 0,-2.81 -2.15,-3.96 -2.09,-1.21 -6.22,-1.21z"
+        android:strokeAlpha="0.396361" android:strokeWidth="0.38"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_select.xml b/src/pandroid/app/src/main/res/drawable/button_select.xml
new file mode 100644
index 00000000..c71a3bff
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_select.xml
@@ -0,0 +1,38 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="175dp"
+    android:height="50dp"
+    android:viewportWidth="175"
+    android:viewportHeight="50">
+  <path
+      android:pathData="M7.62,1L167.38,1A6.62,6.62 0,0 1,174 7.62L174,42.38A6.62,6.62 0,0 1,167.38 49L7.62,49A6.62,6.62 0,0 1,1 42.38L1,7.62A6.62,6.62 0,0 1,7.62 1z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="1.04136"
+      android:fillType="evenOdd"
+      android:strokeLineCap="butt">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:centerX="4.7"
+          android:centerY="0"
+          android:gradientRadius="208.29"
+          android:type="radial">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="0.56" android:color="#FF4D4D4D"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M166.91,4.17C122.64,4.21 78.37,4.16 34.09,4.19 25.08,4.2 16.05,4.18 7.04,4.23 5.09,4.52 3.82,6.66 4.19,8.54c0.01,11.53 -0.08,23.08 0.07,34.6 0.39,1.91 2.53,3.03 4.37,2.67 53.05,0.01 106.1,0.01 159.14,-0.01 2.03,-0.2 3.42,-2.4 3.03,-4.34 -0,-11.53 0.08,-23.07 -0.07,-34.6 -0.35,-1.69 -2.14,-2.89 -3.83,-2.7z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="1.04136"
+      android:fillColor="#afafaf"
+      android:fillType="evenOdd"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="M33.72,12.26C32.33,12.26 31.09,12.44 29.98,12.79C28.87,13.12 27.93,13.6 27.16,14.24C26.38,14.87 25.78,15.65 25.36,16.56C24.94,17.46 24.72,18.47 24.72,19.6C24.72,20.73 24.92,21.69 25.32,22.49C25.72,23.27 26.24,23.94 26.88,24.5C27.51,25.04 28.23,25.5 29.03,25.88C29.83,26.23 30.63,26.55 31.43,26.83C33.26,27.44 34.55,28.02 35.31,28.56C36.06,29.08 36.44,29.73 36.44,30.53C36.44,30.91 36.38,31.25 36.26,31.56C36.14,31.86 35.93,32.13 35.62,32.37C35.32,32.58 34.91,32.76 34.39,32.9C33.9,33.01 33.26,33.07 32.48,33.07C30.93,33.07 29.62,32.92 28.53,32.61C27.48,32.29 26.58,31.92 25.85,31.52L24.3,35.9C24.63,36.08 25.03,36.28 25.5,36.5C25.99,36.71 26.57,36.91 27.23,37.09C27.91,37.28 28.69,37.44 29.56,37.55C30.43,37.69 31.4,37.77 32.48,37.77C35.71,37.77 38.12,37.14 39.72,35.9C41.32,34.63 42.12,32.85 42.12,30.57C42.12,29.39 41.96,28.39 41.66,27.57C41.35,26.75 40.88,26.03 40.25,25.42C39.63,24.81 38.86,24.28 37.92,23.83C36.98,23.36 35.87,22.89 34.6,22.42C33.99,22.21 33.43,22.01 32.91,21.82C32.41,21.61 31.97,21.38 31.57,21.15C31.19,20.89 30.9,20.61 30.69,20.3C30.47,20 30.37,19.62 30.37,19.17C30.37,18.42 30.65,17.87 31.22,17.52C31.8,17.14 32.76,16.95 34.07,16.95C35.25,16.95 36.25,17.09 37.07,17.37C37.92,17.63 38.68,17.94 39.36,18.29L40.95,13.95C40.18,13.53 39.19,13.14 37.99,12.79C36.79,12.44 35.37,12.26 33.72,12.26zM120.4,12.26C118.61,12.26 116.95,12.54 115.42,13.11C113.89,13.67 112.58,14.51 111.47,15.61C110.37,16.69 109.5,18.03 108.86,19.63C108.23,21.21 107.91,23.01 107.91,25.03C107.91,29.1 108.94,32.24 111.01,34.45C113.11,36.66 116.14,37.77 120.11,37.77C121.97,37.77 123.61,37.58 125.02,37.2C126.43,36.82 127.52,36.4 128.3,35.93L126.78,31.52C126.48,31.66 126.14,31.82 125.76,31.98C125.38,32.14 124.95,32.3 124.45,32.44C123.96,32.56 123.4,32.66 122.76,32.76C122.13,32.85 121.41,32.9 120.61,32.9C119.34,32.9 118.26,32.7 117.36,32.3C116.47,31.87 115.74,31.31 115.18,30.6C114.63,29.9 114.24,29.06 113.98,28.1C113.74,27.11 113.62,26.05 113.62,24.92C113.62,23.51 113.81,22.31 114.19,21.33C114.56,20.34 115.06,19.54 115.67,18.93C116.3,18.29 117.02,17.83 117.82,17.55C118.64,17.27 119.48,17.13 120.33,17.13C121.6,17.13 122.73,17.27 123.71,17.55C124.72,17.83 125.61,18.17 126.36,18.57L127.95,14.13C127.76,14.01 127.45,13.85 127.03,13.64C126.61,13.42 126.08,13.22 125.44,13.04C124.81,12.82 124.07,12.65 123.22,12.51C122.37,12.34 121.43,12.26 120.4,12.26zM46.35,12.82L46.35,37.27L63.67,37.27L63.67,32.65L51.85,32.65L51.85,26.76L61.62,26.76L61.62,22.24L51.85,22.24L51.85,17.45L62.86,17.45L62.86,12.82L46.35,12.82zM67.73,12.82L67.73,37.27L84.06,37.27L84.06,32.54L73.23,32.54L73.23,12.82L67.73,12.82zM87.59,12.82L87.59,37.27L104.91,37.27L104.91,32.65L93.09,32.65L93.09,26.76L102.86,26.76L102.86,22.24L93.09,22.24L93.09,17.45L104.1,17.45L104.1,12.82L87.59,12.82zM130.45,12.82L130.45,17.52L137.82,17.52L137.82,37.27L143.33,37.27L143.33,17.52L150.7,17.52L150.7,12.82L130.45,12.82z"
+      android:fillColor="#424242"/>
+  <path
+      android:pathData="m7.62,0.68c-3.84,0 -6.94,3.1 -6.94,6.94L0.68,42.38c0,3.84 3.1,6.94 6.94,6.94L167.38,49.32c3.84,0 6.94,-3.1 6.94,-6.94L174.32,7.62c0,-3.84 -3.1,-6.94 -6.94,-6.94L27.61,0.68ZM7.62,1.32L167.38,1.32c3.49,0 6.3,2.8 6.3,6.3L173.68,42.38c0,3.49 -2.8,6.3 -6.3,6.3L7.62,48.68c-3.49,0 -6.3,-2.8 -6.3,-6.3L1.32,7.62c0,-3.49 2.8,-6.3 6.3,-6.3z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_start.xml b/src/pandroid/app/src/main/res/drawable/button_start.xml
new file mode 100644
index 00000000..33e0a58b
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_start.xml
@@ -0,0 +1,38 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="175dp"
+    android:height="50dp"
+    android:viewportWidth="175"
+    android:viewportHeight="50">
+  <path
+      android:pathData="M7.62,1L167.38,1A6.62,6.62 0,0 1,174 7.62L174,42.38A6.62,6.62 0,0 1,167.38 49L7.62,49A6.62,6.62 0,0 1,1 42.38L1,7.62A6.62,6.62 0,0 1,7.62 1z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="1.04136"
+      android:fillType="evenOdd"
+      android:strokeLineCap="butt">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:centerX="4.7"
+          android:centerY="0"
+          android:gradientRadius="208.29"
+          android:type="radial">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="0.56" android:color="#FF4D4D4D"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M166.91,4.17C122.64,4.21 78.37,4.16 34.09,4.19 25.08,4.2 16.05,4.18 7.04,4.23 5.09,4.52 3.82,6.66 4.19,8.54c0.01,11.53 -0.08,23.08 0.07,34.6 0.39,1.91 2.53,3.03 4.37,2.67 53.05,0.01 106.1,0.01 159.14,-0.01 2.03,-0.2 3.42,-2.4 3.03,-4.34 -0,-11.53 0.08,-23.07 -0.07,-34.6 -0.35,-1.69 -2.14,-2.89 -3.83,-2.7z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="1.04136"
+      android:fillColor="#afafaf"
+      android:fillType="evenOdd"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="M43.49,12.26C42.1,12.26 40.86,12.44 39.75,12.79C38.65,13.12 37.71,13.6 36.93,14.24C36.15,14.87 35.55,15.65 35.13,16.56C34.71,17.46 34.5,18.47 34.5,19.6C34.5,20.73 34.7,21.69 35.1,22.49C35.5,23.27 36.01,23.94 36.65,24.5C37.28,25.04 38,25.5 38.8,25.88C39.6,26.23 40.4,26.55 41.2,26.83C43.03,27.44 44.33,28.02 45.08,28.56C45.83,29.08 46.21,29.73 46.21,30.53C46.21,30.91 46.15,31.25 46.03,31.56C45.91,31.86 45.7,32.13 45.4,32.37C45.09,32.58 44.68,32.76 44.16,32.9C43.67,33.01 43.03,33.07 42.26,33.07C40.7,33.07 39.39,32.92 38.31,32.61C37.25,32.29 36.35,31.92 35.62,31.52L34.07,35.9C34.4,36.08 34.8,36.28 35.27,36.5C35.77,36.71 36.34,36.91 37,37.09C37.68,37.28 38.46,37.44 39.33,37.55C40.2,37.69 41.17,37.77 42.26,37.77C45.48,37.77 47.89,37.14 49.49,35.9C51.09,34.63 51.89,32.85 51.89,30.57C51.89,29.39 51.74,28.39 51.43,27.57C51.12,26.75 50.65,26.03 50.02,25.42C49.41,24.81 48.63,24.28 47.69,23.83C46.75,23.36 45.64,22.89 44.37,22.42C43.76,22.21 43.2,22.01 42.68,21.82C42.19,21.61 41.74,21.38 41.34,21.15C40.96,20.89 40.67,20.61 40.46,20.3C40.25,20 40.14,19.62 40.14,19.17C40.14,18.42 40.42,17.87 40.99,17.52C41.58,17.14 42.53,16.95 43.84,16.95C45.02,16.95 46.02,17.09 46.84,17.37C47.69,17.63 48.45,17.94 49.14,18.29L50.72,13.95C49.95,13.53 48.96,13.14 47.76,12.79C46.56,12.44 45.14,12.26 43.49,12.26zM106.78,12.54C105.77,12.54 104.62,12.59 103.32,12.68C102.05,12.78 100.82,12.94 99.62,13.18L99.62,37.27L105.12,37.27L105.12,28.35L107.84,28.35C108.31,28.91 108.78,29.55 109.25,30.25C109.72,30.93 110.19,31.66 110.66,32.44C111.15,33.21 111.62,34.01 112.07,34.84C112.54,35.66 113,36.47 113.45,37.27L119.62,37.27C119.2,36.38 118.74,35.47 118.24,34.55C117.75,33.61 117.23,32.72 116.69,31.87C116.18,31 115.65,30.18 115.11,29.4C114.56,28.6 114.05,27.9 113.55,27.29C115.03,26.68 116.16,25.84 116.94,24.78C117.74,23.7 118.14,22.3 118.14,20.59C118.14,17.83 117.16,15.81 115.21,14.52C113.26,13.2 110.45,12.54 106.78,12.54zM53.3,12.82L53.3,17.52L60.67,17.52L60.67,37.27L66.18,37.27L66.18,17.52L73.55,17.52L73.55,12.82L53.3,12.82zM81.45,12.82C80.63,14.52 79.83,16.26 79.05,18.04C78.3,19.81 77.52,21.68 76.72,23.65C75.95,25.63 75.15,27.73 74.32,29.97C73.5,32.2 72.63,34.64 71.71,37.27L77.43,37.27C77.69,36.42 77.97,35.55 78.28,34.66C78.6,33.77 78.92,32.87 79.23,31.98L88.75,31.98C89.06,32.87 89.36,33.77 89.67,34.66C90,35.55 90.29,36.42 90.55,37.27L96.44,37.27C95.53,34.64 94.66,32.2 93.83,29.97C93.01,27.73 92.2,25.63 91.4,23.65C90.62,21.68 89.85,19.81 89.07,18.04C88.29,16.26 87.51,14.52 86.71,12.82L81.45,12.82zM120.68,12.82L120.68,17.52L128.05,17.52L128.05,37.27L133.56,37.27L133.56,17.52L140.93,17.52L140.93,12.82L120.68,12.82zM107.1,17.23C108.86,17.23 110.19,17.49 111.08,18.01C112,18.5 112.46,19.35 112.46,20.55C112.46,21.8 112.01,22.68 111.12,23.2C110.23,23.71 108.74,23.97 106.67,23.97L105.12,23.97L105.12,17.34C105.4,17.32 105.7,17.29 106,17.27C106.33,17.25 106.7,17.23 107.1,17.23zM83.96,18.36C84.1,18.72 84.28,19.2 84.52,19.81C84.75,20.42 85.03,21.13 85.33,21.93C85.66,22.73 86,23.61 86.35,24.57C86.71,25.54 87.07,26.55 87.45,27.61L80.5,27.61C80.87,26.55 81.24,25.54 81.59,24.57C81.97,23.61 82.31,22.73 82.61,21.93C82.92,21.13 83.19,20.42 83.43,19.81C83.66,19.2 83.84,18.72 83.96,18.36z"
+      android:fillColor="#424242"/>
+  <path
+      android:pathData="m7.62,0.68c-3.84,0 -6.94,3.1 -6.94,6.94L0.68,42.38c0,3.84 3.1,6.94 6.94,6.94L167.38,49.32c3.84,0 6.94,-3.1 6.94,-6.94L174.32,7.62c0,-3.84 -3.1,-6.94 -6.94,-6.94L27.61,0.68ZM7.62,1.32L167.38,1.32c3.49,0 6.3,2.8 6.3,6.3L173.68,42.38c0,3.49 -2.8,6.3 -6.3,6.3L7.62,48.68c-3.49,0 -6.3,-2.8 -6.3,-6.3L1.32,7.62c0,-3.49 2.8,-6.3 6.3,-6.3z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_x.xml b/src/pandroid/app/src/main/res/drawable/button_x.xml
new file mode 100644
index 00000000..4050c539
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_x.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m57.93,69.56q-1.64,-3.27 -3.61,-6.6 -1.92,-3.39 -4.46,-6.89 -0.79,1.02 -2.03,2.82 -1.19,1.81 -2.43,3.84 -1.19,2.03 -2.26,3.89 -1.07,1.86 -1.58,2.94l-10.05,0q2.48,-4.57 5.76,-9.6 3.33,-5.02 7.39,-10.67l-12.59,-18.85l10.67,0l7.62,12.19 7.45,-12.19l10.05,0l-12.42,18.97q4.74,6.15 7.96,11.4 3.22,5.19 5.08,8.75z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.45"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_y.xml b/src/pandroid/app/src/main/res/drawable/button_y.xml
new file mode 100644
index 00000000..87799691
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_y.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m50.2,46.53q2.37,-4.01 4.52,-8.02 2.14,-4.01 3.95,-8.07l9.71,0q-3.22,6.32 -6.66,12.25 -3.44,5.93 -7.28,11.91l0,14.96l-8.81,0l0,-14.84q-3.84,-5.98 -7.34,-11.97 -3.44,-5.98 -6.66,-12.3l10.22,0q1.81,4.06 3.89,8.07 2.09,4.01 4.46,8.02z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.45"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/dpad_down.xml b/src/pandroid/app/src/main/res/drawable/dpad_down.xml
new file mode 100644
index 00000000..3a904b2d
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/dpad_down.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m67.31,39.29l-34.72,0.58a3.16,2.28 89.04,0 0,-1.52 5.42L46.49,65.95a7.63,5.51 89.04,0 0,7.79 -0.13l14.73,-21.15a3.16,2.28 89.04,0 0,-1.7 -5.37z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.611288"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/dpad_left.xml b/src/pandroid/app/src/main/res/drawable/dpad_left.xml
new file mode 100644
index 00000000..8dad75be
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/dpad_left.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m60.04,32.64l0,34.73a2.28,3.16 90,0 1,-5.4 1.61L33.73,53.89a5.51,7.63 90,0 1,0 -7.79l20.91,-15.08a2.28,3.16 90,0 1,5.4 1.61z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.88"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/dpad_right.xml b/src/pandroid/app/src/main/res/drawable/dpad_right.xml
new file mode 100644
index 00000000..e0bea7ec
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/dpad_right.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m38.09,67.12l0.58,-34.72a2.28,3.16 90.96,0 1,5.42 -1.52L64.74,46.31a5.51,7.63 90.96,0 1,-0.13 7.79l-21.15,14.73a2.28,3.16 90.96,0 1,-5.37 -1.7z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.611288"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/dpad_up.xml b/src/pandroid/app/src/main/res/drawable/dpad_up.xml
new file mode 100644
index 00000000..4bc0a96b
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/dpad_up.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m67.31,61.77l-34.72,-0.58a3.16,2.28 90.96,0 1,-1.52 -5.42L46.49,35.11a7.63,5.51 90.96,0 1,7.79 0.13l14.73,21.15a3.16,2.28 90.96,0 1,-1.7 5.37z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.611288"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_add.xml b/src/pandroid/app/src/main/res/drawable/ic_add.xml
new file mode 100644
index 00000000..89633bb1
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_add.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/simple_analog_background.xml b/src/pandroid/app/src/main/res/drawable/simple_analog_background.xml
deleted file mode 100644
index 81855e14..00000000
--- a/src/pandroid/app/src/main/res/drawable/simple_analog_background.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <padding
-                android:left="10dp"
-                android:top="10dp"
-                android:right="10dp"
-                android:bottom="10dp"/>
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <solid android:color="#0000"/>
-            <stroke android:color="#6FFF" android:width="1dp"/>
-            <corners android:radius="999dp"/>
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/simple_circle_button.xml b/src/pandroid/app/src/main/res/drawable/simple_circle_button.xml
deleted file mode 100644
index 15879540..00000000
--- a/src/pandroid/app/src/main/res/drawable/simple_circle_button.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <solid android:color="#5FFF"/>
-            <stroke android:color="#6FFF" android:width="1dp"/>
-            <corners android:radius="999dp"/>
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/controller_dpad.xml b/src/pandroid/app/src/main/res/layout/controller_dpad.xml
index 0eea66ac..e3320daf 100644
--- a/src/pandroid/app/src/main/res/layout/controller_dpad.xml
+++ b/src/pandroid/app/src/main/res/layout/controller_dpad.xml
@@ -1,28 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="96dp"
-    android:layout_height="96dp">
+    android:layout_width="57pt"
+    android:layout_height="57pt"
+    android:layout_gravity="bottom"
+    android:layout_marginBottom="40pt">
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_up"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginLeft="30dp"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:background="@drawable/dpad_up"
+        android:layout_marginLeft="19pt"/>
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_left"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginTop="30dp"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:background="@drawable/dpad_left"
+        android:layout_marginTop="19pt"/>
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_down"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginTop="60dp"
-        android:layout_marginLeft="30dp"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:background="@drawable/dpad_down"
+        android:layout_marginTop="38pt"
+        android:layout_marginLeft="19pt"/>
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_right"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginTop="30dp"
-        android:layout_marginLeft="60dp"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:background="@drawable/dpad_right"
+        android:layout_marginTop="19pt"
+        android:layout_marginLeft="38pt"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/controller_gamepad.xml b/src/pandroid/app/src/main/res/layout/controller_gamepad.xml
index 16b5ba72..dce6a60e 100644
--- a/src/pandroid/app/src/main/res/layout/controller_gamepad.xml
+++ b/src/pandroid/app/src/main/res/layout/controller_gamepad.xml
@@ -1,32 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="96dp"
-    android:layout_height="96dp">
+    android:layout_width="57pt"
+    android:layout_height="57pt"
+    android:layout_gravity="end|bottom"
+    android:layout_marginBottom="30pt">
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_x"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginLeft="30dp"
-        android:text="X"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:layout_marginStart="19pt"
+        android:background="@drawable/button_x"/>
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_y"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginTop="30dp"
-        android:text="Y"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:layout_marginTop="19pt"
+        android:background="@drawable/button_y"/>
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_b"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginTop="60dp"
-        android:layout_marginLeft="30dp"
-        android:text="B"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:layout_marginTop="38pt"
+        android:layout_marginStart="19pt"
+        android:background="@drawable/button_b"/>
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_a"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginTop="30dp"
-        android:layout_marginLeft="60dp"
-        android:text="A"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:layout_marginTop="19pt"
+        android:layout_marginStart="38pt"
+        android:background="@drawable/button_a"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/controller_joystick.xml b/src/pandroid/app/src/main/res/layout/controller_joystick.xml
new file mode 100644
index 00000000..d758822f
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/controller_joystick.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.panda3ds.pandroid.view.controller.nodes.Joystick
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/left_analog"
+    android:layout_width="50pt"
+    android:layout_height="50pt"
+    android:background="@drawable/analog_background"
+    android:foreground="@drawable/analog_foreground"
+    android:padding="16pt"
+    android:layout_gravity="bottom"
+    android:layout_marginStart="35pt"/>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/controller_l.xml b/src/pandroid/app/src/main/res/layout/controller_l.xml
new file mode 100644
index 00000000..96ec7582
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/controller_l.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.panda3ds.pandroid.view.controller.nodes.Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/button_l"
+    android:layout_width="50pt"
+    android:layout_height="12pt"
+    style="@style/ControllerStyle.SimpleButton"
+    android:background="@drawable/button_l"
+    android:layout_gravity="bottom"
+    android:layout_marginBottom="125pt"/>
diff --git a/src/pandroid/app/src/main/res/layout/controller_r.xml b/src/pandroid/app/src/main/res/layout/controller_r.xml
new file mode 100644
index 00000000..8aa2fba1
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/controller_r.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.panda3ds.pandroid.view.controller.nodes.Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/button_r"
+    android:layout_width="50pt"
+    android:layout_height="12pt"
+    style="@style/ControllerStyle.SimpleButton"
+    android:background="@drawable/button_r"
+    android:layout_gravity="end|bottom"
+    android:layout_marginBottom="125pt"/>
diff --git a/src/pandroid/app/src/main/res/layout/controller_select.xml b/src/pandroid/app/src/main/res/layout/controller_select.xml
new file mode 100644
index 00000000..a77855be
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/controller_select.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.panda3ds.pandroid.view.controller.nodes.Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/button_select"
+    android:layout_width="35pt"
+    android:layout_height="10pt"
+    android:background="@drawable/button_select"
+    style="@style/ControllerStyle.SimpleButton"
+    android:layout_marginBottom="112pt"
+    android:layout_gravity="start|bottom"/>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/controller_start.xml b/src/pandroid/app/src/main/res/layout/controller_start.xml
new file mode 100644
index 00000000..94f12eb7
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/controller_start.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.panda3ds.pandroid.view.controller.nodes.Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/button_start"
+    android:layout_width="35pt"
+    android:layout_height="10pt"
+    android:background="@drawable/button_start"
+    style="@style/ControllerStyle.SimpleButton"
+    android:layout_gravity="end|bottom"
+    android:layout_marginBottom="112pt"/>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/game_activity.xml b/src/pandroid/app/src/main/res/layout/game_activity.xml
index 6f6f65d7..9536a847 100644
--- a/src/pandroid/app/src/main/res/layout/game_activity.xml
+++ b/src/pandroid/app/src/main/res/layout/game_activity.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#000">
@@ -18,95 +19,18 @@
         <FrameLayout
             android:id="@+id/overlay_controller"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:alpha="0.6"
+            android:padding="14pt">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="bottom"
-                android:padding="20dp">
+            <include layout="@layout/controller_l"/>
+            <include layout="@layout/controller_r"/>
+            <include layout="@layout/controller_joystick"/>
+            <include layout="@layout/controller_dpad"/>
+            <include layout="@layout/controller_gamepad"/>
+            <include layout="@layout/controller_select"/>
+            <include layout="@layout/controller_start"/>
 
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <com.panda3ds.pandroid.view.controller.nodes.Button
-                        android:id="@+id/button_l"
-                        android:layout_width="100dp"
-                        android:layout_height="25dp"
-                        android:layout_gravity="left"
-                        style="@style/ControllerSimpleButton"
-                        android:background="@drawable/simple_card_button_left"
-                        android:text="L"/>
-
-                    <com.panda3ds.pandroid.view.controller.nodes.Button
-                        android:id="@+id/button_r"
-                        android:layout_width="100dp"
-                        android:layout_height="25dp"
-                        android:layout_gravity="right"
-                        style="@style/ControllerSimpleButton"
-                        android:background="@drawable/simple_card_button_right"
-                        android:text="R"/>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:paddingTop="60dp">
-
-                        <include layout="@layout/controller_dpad"/>
-
-                        <com.panda3ds.pandroid.view.controller.nodes.Joystick
-                            android:id="@+id/left_analog"
-                            android:layout_width="100dp"
-                            android:layout_height="100dp"
-                            android:layout_marginTop="20dp"
-                            android:background="@drawable/simple_analog_background"
-                            android:foreground="@drawable/simple_circle_button"
-                            android:padding="40dp"/>
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="end|bottom"
-                        android:orientation="vertical"
-                        android:layout_gravity="center">
-
-                        <include layout="@layout/controller_gamepad"/>
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom|center">
-
-                        <com.panda3ds.pandroid.view.controller.nodes.Button
-                            android:id="@+id/button_start"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/simple_card_button"
-                            style="@style/ControllerSimpleButton"
-                            android:paddingHorizontal="10dp"
-                            android:text="START"/>
-
-                        <com.panda3ds.pandroid.view.controller.nodes.Button
-                            android:id="@+id/button_select"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/simple_card_button"
-                            style="@style/ControllerSimpleButton"
-                            android:paddingHorizontal="10dp"
-                            android:layout_marginLeft="10dp"
-                            android:text="SELECT"/>
-
-                    </LinearLayout>
-
-                </FrameLayout>
-
-            </LinearLayout>
         </FrameLayout>
 
     </com.panda3ds.pandroid.view.PandaLayoutController>
diff --git a/src/pandroid/app/src/main/res/values/styleable.xml b/src/pandroid/app/src/main/res/values/styleable.xml
index c5fc4329..69219724 100644
--- a/src/pandroid/app/src/main/res/values/styleable.xml
+++ b/src/pandroid/app/src/main/res/values/styleable.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="ControllerSimpleButton">
-        <item name="android:layout_height">32dp</item>
-        <item name="android:layout_width">32dp</item>
+    <style name="ControllerStyle"/>
+    <style name="ControllerStyle.SimpleButton">
+        <item name="android:layout_height">19pt</item>
+        <item name="android:layout_width">19pt</item>
         <item name="android:textColor">#FFF</item>
         <item name="textAllCaps">true</item>
-        <item name="android:background">@drawable/simple_circle_button</item>
+        <item name="android:backgroundTintMode">multiply</item>
+        <item name="android:backgroundTint">#FFF</item>
     </style>
 </resources>
\ No newline at end of file

From f553e800801bcb93d28c3155a3ad4cf54776a9af Mon Sep 17 00:00:00 2001
From: GabrielBRDeveloper <gabriecacoal400@gmail.com>
Date: Thu, 14 Dec 2023 12:55:28 -0400
Subject: [PATCH 063/162] GlobalConfig and create node data storage

---
 src/pandroid/app/src/main/AndroidManifest.xml |   1 +
 .../pandroid/app/PandaApplication.java        |  21 +++
 .../pandroid/data/config/GlobalConfig.java    |  61 +++++++
 .../panda3ds/pandroid/data/node/Caster.java   |  40 +++++
 .../pandroid/data/node/NodeArray.java         | 133 ++++++++++++++
 .../panda3ds/pandroid/data/node/NodeBase.java |  34 ++++
 .../pandroid/data/node/NodeObject.java        | 164 ++++++++++++++++++
 .../com/panda3ds/pandroid/lang/Function.java  |   5 +
 .../panda3ds/pandroid/utils/Constants.java    |   2 +
 9 files changed, 461 insertions(+)
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandaApplication.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/Caster.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeArray.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeBase.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeObject.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Function.java

diff --git a/src/pandroid/app/src/main/AndroidManifest.xml b/src/pandroid/app/src/main/AndroidManifest.xml
index 291496f4..a4379fb2 100644
--- a/src/pandroid/app/src/main/AndroidManifest.xml
+++ b/src/pandroid/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
         android:glEsVersion="0x0030001"/>
 
     <application
+        android:name=".app.PandaApplication"
         android:requestLegacyExternalStorage="true"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandaApplication.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandaApplication.java
new file mode 100644
index 00000000..16a4469c
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandaApplication.java
@@ -0,0 +1,21 @@
+package com.panda3ds.pandroid.app;
+
+import android.app.Application;
+import android.content.Context;
+
+import com.panda3ds.pandroid.data.config.GlobalConfig;
+
+public class PandaApplication extends Application {
+    private static Context appContext;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        appContext = this;
+        GlobalConfig.initialize();
+    }
+
+    public static Context getAppContext() {
+        return appContext;
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
new file mode 100644
index 00000000..65f5a6c4
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
@@ -0,0 +1,61 @@
+package com.panda3ds.pandroid.data.config;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import com.panda3ds.pandroid.app.PandaApplication;
+import com.panda3ds.pandroid.utils.Constants;
+
+import java.io.Serializable;
+
+public class GlobalConfig {
+    private static SharedPreferences data;
+
+    public static void initialize() {
+        data = PandaApplication.getAppContext()
+                .getSharedPreferences(Constants.PREF_GLOBAL_CONFIG, Context.MODE_PRIVATE);
+    }
+
+    private static <T extends Serializable> T get(Key<T> key) {
+        Serializable value;
+        if (key.defValue instanceof String) {
+            value = data.getString(key.name, (String) key.defValue);
+        } else if (key.defValue instanceof Integer) {
+            value = data.getInt(key.name, (int) key.defValue);
+        } else if (key.defValue instanceof Boolean) {
+            value = data.getBoolean(key.name, (Boolean) key.defValue);
+        } else if (key.defValue instanceof Long) {
+            value = data.getLong(key.name, (Long) key.defValue);
+        } else {
+            value = data.getFloat(key.name, ((Number) key.defValue).floatValue());
+        }
+        return (T) value;
+    }
+
+    //Need synchronized why SharedPreferences don't support aysnc write
+    private static synchronized <T extends Serializable> void set(Key<T> key, T value) {
+        if (value instanceof String) {
+            data.edit().putString(key.name, (String) value).apply();
+        } else if (value instanceof Integer) {
+            data.edit().putInt(key.name, (Integer) value).apply();
+        } else if (value instanceof Boolean) {
+            data.edit().putBoolean(key.name, (Boolean) value).apply();
+        } else if (value instanceof Long) {
+            data.edit().putLong(key.name, (Long) value).apply();
+        } else if (value instanceof Float) {
+            data.edit().putFloat(key.name, (Float) value).apply();
+        } else {
+            throw new IllegalArgumentException("Invalid global config value instance");
+        }
+    }
+
+    private static class Key<T extends Serializable> {
+        private final String name;
+        private final T defValue;
+
+        private Key(String name, T defValue) {
+            this.name = name;
+            this.defValue = defValue;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/Caster.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/Caster.java
new file mode 100644
index 00000000..68f45302
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/Caster.java
@@ -0,0 +1,40 @@
+package com.panda3ds.pandroid.data.node;
+
+/**
+ * JAVA THINGS:
+ * Java allow cast primary (int, double, float and long)
+ * but crash on cast object number why!!
+ **/
+class Caster {
+    public static int intValue(Object value){
+        if (value instanceof Number){
+            return ((Number)value).intValue();
+        } else {
+            return Integer.parseInt((String) value);
+        }
+    }
+
+    public static float floatValue(Object value){
+        if (value instanceof Number){
+            return ((Number)value).floatValue();
+        } else {
+            return Float.parseFloat((String) value);
+        }
+    }
+
+    public static long longValue(Object value){
+        if (value instanceof Number){
+            return ((Number)value).longValue();
+        } else {
+            return Long.parseLong((String) value);
+        }
+    }
+
+    public static double doubleValue(Object value){
+        if (value instanceof Number){
+            return ((Number)value).doubleValue();
+        } else {
+            return Double.parseDouble((String) value);
+        }
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeArray.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeArray.java
new file mode 100644
index 00000000..7f8a318b
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeArray.java
@@ -0,0 +1,133 @@
+package com.panda3ds.pandroid.data.node;
+
+import androidx.annotation.NonNull;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+public class NodeArray extends NodeBase {
+    public static final String EMPTY_SOURCE = "[]";
+
+    private final ArrayList<Object> list = new ArrayList<>();
+
+    NodeArray(JSONArray array) {
+        init(array);
+    }
+
+    public NodeArray() {
+        this(EMPTY_SOURCE);
+    }
+
+    public NodeArray(String source) {
+        try {
+            init(new JSONArray(source));
+        } catch (JSONException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    private void init(JSONArray array) {
+        try {
+            for (int i = 0; i < array.length(); i++) {
+                Object item = array.get(i);
+                if (item instanceof JSONArray) {
+                    item = new NodeArray((JSONArray) item);
+                    ((NodeArray) item).setParent(this);
+                } else if (item instanceof JSONObject) {
+                    item = new NodeObject((JSONObject) item);
+                    ((NodeObject) item).setParent(this);
+                }
+                list.add(item);
+            }
+        } catch (Exception e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    private void add(Object obj) {
+        list.add(obj);
+        changed();
+    }
+
+    public String getString(int index) {
+        return (String) list.get(index);
+    }
+
+    public int getInteger(int index) {
+        return Caster.intValue(list.get(index));
+    }
+
+    public long getLong(int index) {
+        return Caster.longValue(list.get(index));
+    }
+
+    public boolean getBoolean(int index) {
+        return (boolean) list.get(index);
+    }
+
+    public double getDouble(int index) {
+        return Caster.doubleValue(list.get(index));
+    }
+
+    public NodeArray getArray(int index) {
+        return (NodeArray) list.get(index);
+    }
+
+    public NodeObject getObject(int index) {
+        return (NodeObject) list.get(index);
+    }
+
+    public void add(String val) {
+        list.add(val);
+    }
+
+    public void add(int val) {
+        add((Object) val);
+    }
+
+    public void add(long val) {
+        add((Object) val);
+    }
+
+    public void add(double val) {
+        add((Object) val);
+    }
+
+    public void add(boolean val) {
+        add((Object) val);
+    }
+
+    public void add(NodeBase val) {
+        add((Object) val);
+    }
+
+    public int getSize() {
+        return list.size();
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        try {
+            return ((JSONArray) buildValue()).toString(4);
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    protected Object buildValue() {
+        JSONArray array = new JSONArray();
+        for (Object obj : list) {
+            if (obj instanceof NodeBase) {
+                array.put(((NodeBase) obj).buildValue());
+            } else {
+                array.put(obj);
+            }
+        }
+        return array;
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeBase.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeBase.java
new file mode 100644
index 00000000..12961a4f
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeBase.java
@@ -0,0 +1,34 @@
+package com.panda3ds.pandroid.data.node;
+
+import androidx.annotation.NonNull;
+
+import com.panda3ds.pandroid.lang.Function;
+
+abstract class NodeBase {
+    private NodeBase parent = null;
+    private Function<NodeBase> changeListener;
+
+    protected void setParent(NodeBase parent) {
+        this.parent = parent;
+    }
+
+    protected void changed() {
+        if (parent != null)
+            parent.changed();
+        if (changeListener != null)
+            changeListener.run(this);
+    }
+
+    public <T extends NodeBase> void setChangeListener(Function<T> listener) {
+        changeListener = val -> listener.run((T) val);
+    }
+
+    protected NodeBase getParent() {
+        return parent;
+    }
+
+    protected abstract Object buildValue();
+
+    @NonNull
+    public abstract String toString();
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeObject.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeObject.java
new file mode 100644
index 00000000..40cb1682
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeObject.java
@@ -0,0 +1,164 @@
+package com.panda3ds.pandroid.data.node;
+
+import androidx.annotation.NonNull;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Iterator;
+
+public class NodeObject extends NodeBase {
+
+    public static final String EMPTY_SOURCE = "{}";
+    private final HashMap<String, Object> map = new HashMap<>();
+
+    NodeObject(JSONObject obj) {
+        init(obj);
+    }
+
+    public NodeObject() {
+        this(EMPTY_SOURCE);
+    }
+
+    public NodeObject(String source) {
+        try {
+            init(new JSONObject(source));
+        } catch (JSONException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    private void init(JSONObject base) {
+        try {
+            Iterator<String> keys = base.keys();
+            while (keys.hasNext()) {
+                String key = keys.next();
+                Object item = base.get(key);
+                if (item instanceof JSONObject) {
+                    item = new NodeObject((JSONObject) item);
+                    ((NodeObject) item).setParent(this);
+                } else if (item instanceof JSONArray) {
+                    item = new NodeArray((JSONArray) item);
+                    ((NodeArray) item).setParent(this);
+                }
+                map.put(key, item);
+            }
+        } catch (Exception e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    private Object get(String key, Object def) {
+        if (!has(key))
+            return def;
+
+        return map.get(key);
+    }
+
+    private void put(String key, Object value) {
+        map.put(key, value);
+        changed();
+    }
+
+    public String getString(String key, String def) {
+        return (String) get(key, def);
+    }
+
+    public int getInteger(String key, int def) {
+        return Caster.intValue(get(key, def));
+    }
+
+    public long getLong(String key, long def) {
+        return Caster.longValue(get(key, def));
+    }
+
+    public boolean getBoolean(String key, boolean def) {
+        return (boolean) get(key, def);
+    }
+
+    public double getDouble(String key, double def) {
+        return Caster.doubleValue(get(key, def));
+    }
+
+    public NodeArray getArray(String key, NodeArray def) {
+        return (NodeArray) get(key, def);
+    }
+
+    public NodeObject getObject(String key, NodeObject def) {
+        return (NodeObject) get(key, def);
+    }
+
+    public void put(String key, String val) {
+        put(key, (Object) val);
+    }
+
+    public void put(String key, int val) {
+        put(key, (Object) val);
+    }
+
+    public void put(String key, double val) {
+        put(key, (Object) val);
+    }
+
+    public void put(String key, boolean val) {
+        put(key, (Object) val);
+    }
+
+    public void put(String key, NodeBase val) {
+        put(key, (Object) val);
+    }
+
+    public boolean has(String key) {
+        return map.containsKey(key);
+    }
+
+    public void remove(String key) {
+        map.remove(key);
+        changed();
+    }
+
+
+    public void clear() {
+        map.clear();
+        changed();
+    }
+
+    public String[] getKeys() {
+        return map.keySet().toArray(new String[0]);
+    }
+
+
+    public int getSize() {
+        return map.size();
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        try {
+            return ((JSONObject) buildValue()).toString(4);
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    protected Object buildValue() {
+        try {
+            JSONObject dest = new JSONObject();
+            for (String key : getKeys()) {
+                Object obj = map.get(key);
+                if (obj instanceof NodeBase) {
+                    obj = ((NodeBase) obj).buildValue();
+                }
+                dest.put(key, obj);
+            }
+
+            return dest;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Function.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Function.java
new file mode 100644
index 00000000..c5e6a4f4
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Function.java
@@ -0,0 +1,5 @@
+package com.panda3ds.pandroid.lang;
+
+public interface Function<T> {
+    void run(T val);
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
index d94164c7..1aac0a4d 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
@@ -20,4 +20,6 @@ public class Constants {
 
 	public static final String ACTIVITY_PARAMETER_PATH = "path";
 	public static final String LOG_TAG = "pandroid";
+
+	public static final String PREF_GLOBAL_CONFIG = "app.GlobalConfig";
 }

From 71109d701d37fd7117768fb1c41c0718dc0b5db4 Mon Sep 17 00:00:00 2001
From: GabrielBRDeveloper <gabriecacoal400@gmail.com>
Date: Thu, 14 Dec 2023 14:22:55 -0400
Subject: [PATCH 064/162] Remove Node storage for replace by Gson

---
 src/pandroid/app/build.gradle.kts             |   1 +
 src/pandroid/app/src/main/AndroidManifest.xml |   2 +-
 ...lication.java => PandroidApplication.java} |   2 +-
 .../pandroid/data/config/GlobalConfig.java    |   4 +-
 .../panda3ds/pandroid/data/node/Caster.java   |  40 -----
 .../pandroid/data/node/NodeArray.java         | 133 --------------
 .../panda3ds/pandroid/data/node/NodeBase.java |  34 ----
 .../pandroid/data/node/NodeObject.java        | 164 ------------------
 8 files changed, 5 insertions(+), 375 deletions(-)
 rename src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/{PandaApplication.java => PandroidApplication.java} (88%)
 delete mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/Caster.java
 delete mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeArray.java
 delete mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeBase.java
 delete mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeObject.java

diff --git a/src/pandroid/app/build.gradle.kts b/src/pandroid/app/build.gradle.kts
index 276eb552..91a36c6e 100644
--- a/src/pandroid/app/build.gradle.kts
+++ b/src/pandroid/app/build.gradle.kts
@@ -39,4 +39,5 @@ dependencies {
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("com.google.android.material:material:1.8.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("com.google.code.gson:gson:2.10.1")
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/AndroidManifest.xml b/src/pandroid/app/src/main/AndroidManifest.xml
index a4379fb2..15bf6270 100644
--- a/src/pandroid/app/src/main/AndroidManifest.xml
+++ b/src/pandroid/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
         android:glEsVersion="0x0030001"/>
 
     <application
-        android:name=".app.PandaApplication"
+        android:name=".app.PandroidApplication"
         android:requestLegacyExternalStorage="true"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandaApplication.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
similarity index 88%
rename from src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandaApplication.java
rename to src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
index 16a4469c..0e284db6 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandaApplication.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
@@ -5,7 +5,7 @@ import android.content.Context;
 
 import com.panda3ds.pandroid.data.config.GlobalConfig;
 
-public class PandaApplication extends Application {
+public class PandroidApplication extends Application {
     private static Context appContext;
 
     @Override
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
index 65f5a6c4..40a1ebec 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
@@ -3,7 +3,7 @@ package com.panda3ds.pandroid.data.config;
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.panda3ds.pandroid.app.PandaApplication;
+import com.panda3ds.pandroid.app.PandroidApplication;
 import com.panda3ds.pandroid.utils.Constants;
 
 import java.io.Serializable;
@@ -12,7 +12,7 @@ public class GlobalConfig {
     private static SharedPreferences data;
 
     public static void initialize() {
-        data = PandaApplication.getAppContext()
+        data = PandroidApplication.getAppContext()
                 .getSharedPreferences(Constants.PREF_GLOBAL_CONFIG, Context.MODE_PRIVATE);
     }
 
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/Caster.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/Caster.java
deleted file mode 100644
index 68f45302..00000000
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/Caster.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.panda3ds.pandroid.data.node;
-
-/**
- * JAVA THINGS:
- * Java allow cast primary (int, double, float and long)
- * but crash on cast object number why!!
- **/
-class Caster {
-    public static int intValue(Object value){
-        if (value instanceof Number){
-            return ((Number)value).intValue();
-        } else {
-            return Integer.parseInt((String) value);
-        }
-    }
-
-    public static float floatValue(Object value){
-        if (value instanceof Number){
-            return ((Number)value).floatValue();
-        } else {
-            return Float.parseFloat((String) value);
-        }
-    }
-
-    public static long longValue(Object value){
-        if (value instanceof Number){
-            return ((Number)value).longValue();
-        } else {
-            return Long.parseLong((String) value);
-        }
-    }
-
-    public static double doubleValue(Object value){
-        if (value instanceof Number){
-            return ((Number)value).doubleValue();
-        } else {
-            return Double.parseDouble((String) value);
-        }
-    }
-}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeArray.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeArray.java
deleted file mode 100644
index 7f8a318b..00000000
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeArray.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.panda3ds.pandroid.data.node;
-
-import androidx.annotation.NonNull;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-
-public class NodeArray extends NodeBase {
-    public static final String EMPTY_SOURCE = "[]";
-
-    private final ArrayList<Object> list = new ArrayList<>();
-
-    NodeArray(JSONArray array) {
-        init(array);
-    }
-
-    public NodeArray() {
-        this(EMPTY_SOURCE);
-    }
-
-    public NodeArray(String source) {
-        try {
-            init(new JSONArray(source));
-        } catch (JSONException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    private void init(JSONArray array) {
-        try {
-            for (int i = 0; i < array.length(); i++) {
-                Object item = array.get(i);
-                if (item instanceof JSONArray) {
-                    item = new NodeArray((JSONArray) item);
-                    ((NodeArray) item).setParent(this);
-                } else if (item instanceof JSONObject) {
-                    item = new NodeObject((JSONObject) item);
-                    ((NodeObject) item).setParent(this);
-                }
-                list.add(item);
-            }
-        } catch (Exception e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    private void add(Object obj) {
-        list.add(obj);
-        changed();
-    }
-
-    public String getString(int index) {
-        return (String) list.get(index);
-    }
-
-    public int getInteger(int index) {
-        return Caster.intValue(list.get(index));
-    }
-
-    public long getLong(int index) {
-        return Caster.longValue(list.get(index));
-    }
-
-    public boolean getBoolean(int index) {
-        return (boolean) list.get(index);
-    }
-
-    public double getDouble(int index) {
-        return Caster.doubleValue(list.get(index));
-    }
-
-    public NodeArray getArray(int index) {
-        return (NodeArray) list.get(index);
-    }
-
-    public NodeObject getObject(int index) {
-        return (NodeObject) list.get(index);
-    }
-
-    public void add(String val) {
-        list.add(val);
-    }
-
-    public void add(int val) {
-        add((Object) val);
-    }
-
-    public void add(long val) {
-        add((Object) val);
-    }
-
-    public void add(double val) {
-        add((Object) val);
-    }
-
-    public void add(boolean val) {
-        add((Object) val);
-    }
-
-    public void add(NodeBase val) {
-        add((Object) val);
-    }
-
-    public int getSize() {
-        return list.size();
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        try {
-            return ((JSONArray) buildValue()).toString(4);
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    protected Object buildValue() {
-        JSONArray array = new JSONArray();
-        for (Object obj : list) {
-            if (obj instanceof NodeBase) {
-                array.put(((NodeBase) obj).buildValue());
-            } else {
-                array.put(obj);
-            }
-        }
-        return array;
-    }
-}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeBase.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeBase.java
deleted file mode 100644
index 12961a4f..00000000
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeBase.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.panda3ds.pandroid.data.node;
-
-import androidx.annotation.NonNull;
-
-import com.panda3ds.pandroid.lang.Function;
-
-abstract class NodeBase {
-    private NodeBase parent = null;
-    private Function<NodeBase> changeListener;
-
-    protected void setParent(NodeBase parent) {
-        this.parent = parent;
-    }
-
-    protected void changed() {
-        if (parent != null)
-            parent.changed();
-        if (changeListener != null)
-            changeListener.run(this);
-    }
-
-    public <T extends NodeBase> void setChangeListener(Function<T> listener) {
-        changeListener = val -> listener.run((T) val);
-    }
-
-    protected NodeBase getParent() {
-        return parent;
-    }
-
-    protected abstract Object buildValue();
-
-    @NonNull
-    public abstract String toString();
-}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeObject.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeObject.java
deleted file mode 100644
index 40cb1682..00000000
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/node/NodeObject.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.panda3ds.pandroid.data.node;
-
-import androidx.annotation.NonNull;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-public class NodeObject extends NodeBase {
-
-    public static final String EMPTY_SOURCE = "{}";
-    private final HashMap<String, Object> map = new HashMap<>();
-
-    NodeObject(JSONObject obj) {
-        init(obj);
-    }
-
-    public NodeObject() {
-        this(EMPTY_SOURCE);
-    }
-
-    public NodeObject(String source) {
-        try {
-            init(new JSONObject(source));
-        } catch (JSONException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    private void init(JSONObject base) {
-        try {
-            Iterator<String> keys = base.keys();
-            while (keys.hasNext()) {
-                String key = keys.next();
-                Object item = base.get(key);
-                if (item instanceof JSONObject) {
-                    item = new NodeObject((JSONObject) item);
-                    ((NodeObject) item).setParent(this);
-                } else if (item instanceof JSONArray) {
-                    item = new NodeArray((JSONArray) item);
-                    ((NodeArray) item).setParent(this);
-                }
-                map.put(key, item);
-            }
-        } catch (Exception e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    private Object get(String key, Object def) {
-        if (!has(key))
-            return def;
-
-        return map.get(key);
-    }
-
-    private void put(String key, Object value) {
-        map.put(key, value);
-        changed();
-    }
-
-    public String getString(String key, String def) {
-        return (String) get(key, def);
-    }
-
-    public int getInteger(String key, int def) {
-        return Caster.intValue(get(key, def));
-    }
-
-    public long getLong(String key, long def) {
-        return Caster.longValue(get(key, def));
-    }
-
-    public boolean getBoolean(String key, boolean def) {
-        return (boolean) get(key, def);
-    }
-
-    public double getDouble(String key, double def) {
-        return Caster.doubleValue(get(key, def));
-    }
-
-    public NodeArray getArray(String key, NodeArray def) {
-        return (NodeArray) get(key, def);
-    }
-
-    public NodeObject getObject(String key, NodeObject def) {
-        return (NodeObject) get(key, def);
-    }
-
-    public void put(String key, String val) {
-        put(key, (Object) val);
-    }
-
-    public void put(String key, int val) {
-        put(key, (Object) val);
-    }
-
-    public void put(String key, double val) {
-        put(key, (Object) val);
-    }
-
-    public void put(String key, boolean val) {
-        put(key, (Object) val);
-    }
-
-    public void put(String key, NodeBase val) {
-        put(key, (Object) val);
-    }
-
-    public boolean has(String key) {
-        return map.containsKey(key);
-    }
-
-    public void remove(String key) {
-        map.remove(key);
-        changed();
-    }
-
-
-    public void clear() {
-        map.clear();
-        changed();
-    }
-
-    public String[] getKeys() {
-        return map.keySet().toArray(new String[0]);
-    }
-
-
-    public int getSize() {
-        return map.size();
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        try {
-            return ((JSONObject) buildValue()).toString(4);
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    protected Object buildValue() {
-        try {
-            JSONObject dest = new JSONObject();
-            for (String key : getKeys()) {
-                Object obj = map.get(key);
-                if (obj instanceof NodeBase) {
-                    obj = ((NodeBase) obj).buildValue();
-                }
-                dest.put(key, obj);
-            }
-
-            return dest;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-}

From cc44801acdb59887ca88c069e85b85e11912a548 Mon Sep 17 00:00:00 2001
From: GabrielBRDeveloper <gabriecacoal400@gmail.com>
Date: Fri, 15 Dec 2023 11:08:42 -0400
Subject: [PATCH 065/162] paris changes

---
 src/pandroid/app/build.gradle.kts             |  1 -
 .../pandroid/data/config/GlobalConfig.java    | 28 +++++++++----------
 .../com/panda3ds/pandroid/lang/Function.java  |  5 ----
 3 files changed, 14 insertions(+), 20 deletions(-)
 delete mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Function.java

diff --git a/src/pandroid/app/build.gradle.kts b/src/pandroid/app/build.gradle.kts
index 91a36c6e..276eb552 100644
--- a/src/pandroid/app/build.gradle.kts
+++ b/src/pandroid/app/build.gradle.kts
@@ -39,5 +39,4 @@ dependencies {
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("com.google.android.material:material:1.8.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("com.google.code.gson:gson:2.10.1")
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
index 40a1ebec..d1427dba 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
@@ -16,24 +16,24 @@ public class GlobalConfig {
                 .getSharedPreferences(Constants.PREF_GLOBAL_CONFIG, Context.MODE_PRIVATE);
     }
 
-    private static <T extends Serializable> T get(Key<T> key) {
+    public static <T extends Serializable> T get(Key<T> key) {
         Serializable value;
-        if (key.defValue instanceof String) {
-            value = data.getString(key.name, (String) key.defValue);
-        } else if (key.defValue instanceof Integer) {
-            value = data.getInt(key.name, (int) key.defValue);
-        } else if (key.defValue instanceof Boolean) {
-            value = data.getBoolean(key.name, (Boolean) key.defValue);
-        } else if (key.defValue instanceof Long) {
-            value = data.getLong(key.name, (Long) key.defValue);
+        if (key.defaultValue instanceof String) {
+            value = data.getString(key.name, (String) key.defaultValue);
+        } else if (key.defaultValue instanceof Integer) {
+            value = data.getInt(key.name, (int) key.defaultValue);
+        } else if (key.defaultValue instanceof Boolean) {
+            value = data.getBoolean(key.name, (boolean) key.defaultValue);
+        } else if (key.defaultValue instanceof Long) {
+            value = data.getLong(key.name, (long) key.defaultValue);
         } else {
-            value = data.getFloat(key.name, ((Number) key.defValue).floatValue());
+            value = data.getFloat(key.name, (float) key.defaultValue);
         }
         return (T) value;
     }
 
     //Need synchronized why SharedPreferences don't support aysnc write
-    private static synchronized <T extends Serializable> void set(Key<T> key, T value) {
+    public static synchronized <T extends Serializable> void set(Key<T> key, T value) {
         if (value instanceof String) {
             data.edit().putString(key.name, (String) value).apply();
         } else if (value instanceof Integer) {
@@ -51,11 +51,11 @@ public class GlobalConfig {
 
     private static class Key<T extends Serializable> {
         private final String name;
-        private final T defValue;
+        private final T defaultValue;
 
-        private Key(String name, T defValue) {
+        private Key(String name, T defaultValue) {
             this.name = name;
-            this.defValue = defValue;
+            this.defaultValue = defaultValue;
         }
     }
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Function.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Function.java
deleted file mode 100644
index c5e6a4f4..00000000
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Function.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.panda3ds.pandroid.lang;
-
-public interface Function<T> {
-    void run(T val);
-}

From 102361174a1abcaa4ab5535a0bc7478c560586c1 Mon Sep 17 00:00:00 2001
From: GabrielBRDeveloper <gabriecacoal400@gmail.com>
Date: Fri, 15 Dec 2023 11:11:53 -0400
Subject: [PATCH 066/162] paris changes

---
 .../com/panda3ds/pandroid/data/config/GlobalConfig.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
index d1427dba..185eb9d1 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
@@ -37,13 +37,13 @@ public class GlobalConfig {
         if (value instanceof String) {
             data.edit().putString(key.name, (String) value).apply();
         } else if (value instanceof Integer) {
-            data.edit().putInt(key.name, (Integer) value).apply();
+            data.edit().putInt(key.name, (int) value).apply();
         } else if (value instanceof Boolean) {
-            data.edit().putBoolean(key.name, (Boolean) value).apply();
+            data.edit().putBoolean(key.name, (boolean) value).apply();
         } else if (value instanceof Long) {
-            data.edit().putLong(key.name, (Long) value).apply();
+            data.edit().putLong(key.name, (long) value).apply();
         } else if (value instanceof Float) {
-            data.edit().putFloat(key.name, (Float) value).apply();
+            data.edit().putFloat(key.name, (float) value).apply();
         } else {
             throw new IllegalArgumentException("Invalid global config value instance");
         }

From ab37cb571d7574db0dba94ede7af1ac4730a1763 Mon Sep 17 00:00:00 2001
From: GabrielBRDeveloper <gabriecacoal400@gmail.com>
Date: Fri, 15 Dec 2023 11:12:48 -0400
Subject: [PATCH 067/162] paris changes

---
 .../java/com/panda3ds/pandroid/data/config/GlobalConfig.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
index 185eb9d1..ddfee09e 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
@@ -32,7 +32,6 @@ public class GlobalConfig {
         return (T) value;
     }
 
-    //Need synchronized why SharedPreferences don't support aysnc write
     public static synchronized <T extends Serializable> void set(Key<T> key, T value) {
         if (value instanceof String) {
             data.edit().putString(key.name, (String) value).apply();

From 9fd94f0b1712b8d5b72e9b753e55527d2ac8a9c6 Mon Sep 17 00:00:00 2001
From: Gabriel Machado <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Fri, 15 Dec 2023 11:17:27 -0400
Subject: [PATCH 068/162] Update GlobalConfig.java

---
 .../panda3ds/pandroid/data/config/GlobalConfig.java   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
index d1427dba..d25e34c7 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
@@ -32,18 +32,17 @@ public class GlobalConfig {
         return (T) value;
     }
 
-    //Need synchronized why SharedPreferences don't support aysnc write
     public static synchronized <T extends Serializable> void set(Key<T> key, T value) {
         if (value instanceof String) {
             data.edit().putString(key.name, (String) value).apply();
         } else if (value instanceof Integer) {
-            data.edit().putInt(key.name, (Integer) value).apply();
+            data.edit().putInt(key.name, (int) value).apply();
         } else if (value instanceof Boolean) {
-            data.edit().putBoolean(key.name, (Boolean) value).apply();
+            data.edit().putBoolean(key.name, (boolean) value).apply();
         } else if (value instanceof Long) {
-            data.edit().putLong(key.name, (Long) value).apply();
+            data.edit().putLong(key.name, (long) value).apply();
         } else if (value instanceof Float) {
-            data.edit().putFloat(key.name, (Float) value).apply();
+            data.edit().putFloat(key.name, (float) value).apply();
         } else {
             throw new IllegalArgumentException("Invalid global config value instance");
         }
@@ -58,4 +57,4 @@ public class GlobalConfig {
             this.defaultValue = defaultValue;
         }
     }
-}
\ No newline at end of file
+}

From c57f2db6c0de7b155d5cf527eed9681ede5ab676 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 16 Dec 2023 15:51:45 +0200
Subject: [PATCH 069/162] [Qt] Add text editor

---
 .gitmodules                      |  3 +++
 CMakeLists.txt                   | 15 +++++++++++++--
 include/panda_qt/main_window.hpp |  9 +++++----
 include/panda_qt/text_editor.hpp | 22 ++++++++++++++++++++++
 src/panda_qt/main_window.cpp     |  6 ++++++
 src/panda_qt/text_editor.cpp     | 20 ++++++++++++++++++++
 src/panda_qt/zep.cpp             |  2 ++
 third_party/zep                  |  1 +
 8 files changed, 72 insertions(+), 6 deletions(-)
 create mode 100644 include/panda_qt/text_editor.hpp
 create mode 100644 src/panda_qt/text_editor.cpp
 create mode 100644 src/panda_qt/zep.cpp
 create mode 160000 third_party/zep

diff --git a/.gitmodules b/.gitmodules
index 8a6cac49..428ca1d1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,3 +43,6 @@
 [submodule "third_party/hydra_core"]
 	path = third_party/hydra_core
 	url = https://github.com/hydra-emu/core
+[submodule "third_party/zep"]
+	path = third_party/zep
+	url = https://github.com/Panda3DS-emu/zep
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e49c27c..732ec793 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,12 +186,20 @@ set(RENDERER_SW_SOURCE_FILES src/core/renderer_sw/renderer_sw.cpp)
 # Frontend source files
 if(NOT ANDROID)
     if(ENABLE_QT_GUI)
-        set(FRONTEND_SOURCE_FILES src/panda_qt/main.cpp src/panda_qt/screen.cpp src/panda_qt/main_window.cpp src/panda_qt/about_window.cpp src/panda_qt/config_window.cpp)
-        set(FRONTEND_HEADER_FILES include/panda_qt/screen.hpp include/panda_qt/main_window.hpp include/panda_qt/about_window.hpp include/panda_qt/config_window.hpp)
+        set(FRONTEND_SOURCE_FILES src/panda_qt/main.cpp src/panda_qt/screen.cpp src/panda_qt/main_window.cpp src/panda_qt/about_window.cpp
+            src/panda_qt/config_window.cpp src/panda_qt/zep.cpp src/panda_qt/text_editor.cpp
+        )   
+        set(FRONTEND_HEADER_FILES include/panda_qt/screen.hpp include/panda_qt/main_window.hpp include/panda_qt/about_window.hpp
+            include/panda_qt/config_window.hpp include/panda_qt/text_editor.hpp
+        )
 
         source_group("Source Files\\Qt" FILES ${FRONTEND_SOURCE_FILES})
         source_group("Header Files\\Qt" FILES ${FRONTEND_HEADER_FILES})
         include_directories(${Qt6Gui_PRIVATE_INCLUDE_DIRS})
+
+        include_directories(third_party/zep/include) # Include zep for text editor usage
+        configure_file(third_party/zep/cmake/config_app.h.cmake ${CMAKE_BINARY_DIR}/zep_config/config_app.h)
+        include_directories(${CMAKE_BINARY_DIR}/zep_config)
     else()
         set(FRONTEND_SOURCE_FILES src/panda_sdl/main.cpp src/panda_sdl/frontend_sdl.cpp)
         set(FRONTEND_HEADER_FILES "")
@@ -428,6 +436,9 @@ endif()
 
 if(ENABLE_QT_GUI)
     target_compile_definitions(Alber PUBLIC "PANDA3DS_FRONTEND_QT=1")
+    target_compile_definitions(Alber PUBLIC "ZEP_QT=1")
+    target_compile_definitions(Alber PUBLIC "ZEP_FEATURE_CPP_FILE_SYSTEM=1")
+
     target_link_libraries(Alber PRIVATE Qt6::Widgets)
 
     if(LINUX OR FREEBSD)
diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp
index e2fd8596..ee24efdd 100644
--- a/include/panda_qt/main_window.hpp
+++ b/include/panda_qt/main_window.hpp
@@ -13,6 +13,7 @@
 #include "panda_qt/about_window.hpp"
 #include "panda_qt/config_window.hpp"
 #include "panda_qt/screen.hpp"
+#include "panda_qt/text_editor.hpp"
 #include "services/hid.hpp"
 
 class MainWindow : public QMainWindow {
@@ -20,9 +21,7 @@ class MainWindow : public QMainWindow {
 
   private:
 	// Types of messages we might send from the GUI thread to the emulator thread
-	enum class MessageType {
-		LoadROM, Reset, Pause, Resume, TogglePause, DumpRomFS, PressKey, ReleaseKey
-	};
+	enum class MessageType { LoadROM, Reset, Pause, Resume, TogglePause, DumpRomFS, PressKey, ReleaseKey };
 
 	// Tagged union representing our message queue messages
 	struct EmulatorMessage {
@@ -43,7 +42,7 @@ class MainWindow : public QMainWindow {
 	Emulator* emu = nullptr;
 	std::thread emuThread;
 
-	std::atomic<bool> appRunning = true; // Is the application itself running?
+	std::atomic<bool> appRunning = true;  // Is the application itself running?
 	// Used for synchronizing messages between the emulator and UI
 	std::mutex messageQueueMutex;
 	std::vector<EmulatorMessage> messageQueue;
@@ -51,12 +50,14 @@ class MainWindow : public QMainWindow {
 	ScreenWidget screen;
 	AboutWindow* aboutWindow;
 	ConfigWindow* configWindow;
+	TextEditorWindow* luaEditor;
 	QMenuBar* menuBar = nullptr;
 
 	void swapEmuBuffer();
 	void emuThreadMainLoop();
 	void selectROM();
 	void dumpRomFS();
+	void openLuaEditor();
 	void showAboutMenu();
 	void sendMessage(const EmulatorMessage& message);
 	void dispatchMessage(const EmulatorMessage& message);
diff --git a/include/panda_qt/text_editor.hpp b/include/panda_qt/text_editor.hpp
new file mode 100644
index 00000000..fd0f7884
--- /dev/null
+++ b/include/panda_qt/text_editor.hpp
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <QApplication>
+#include <QDialog>
+#include <QWidget>
+#include <string>
+
+#include "zep.h"
+#include "zep/mode_repl.h"
+#include "zep/regress.h"
+
+class TextEditorWindow : public QDialog {
+	Q_OBJECT
+
+  private:
+	Zep::ZepWidget_Qt zepWidget;
+	Zep::IZepReplProvider replProvider;
+	static constexpr float fontSize = 14.0f;
+
+  public:
+	TextEditorWindow(QWidget* parent, const std::string& filename, const std::string& initialText);
+};
\ No newline at end of file
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index 8dbfc7aa..95b36661 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -36,7 +36,9 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 	connect(configureAction, &QAction::triggered, this, [this]() { configWindow->show(); });
 
 	auto dumpRomFSAction = toolsMenu->addAction(tr("Dump RomFS"));
+	auto luaEditorAction = toolsMenu->addAction(tr("Open Lua Editor"));
 	connect(dumpRomFSAction, &QAction::triggered, this, &MainWindow::dumpRomFS);
+	connect(luaEditorAction, &QAction::triggered, this, &MainWindow::openLuaEditor);
 
 	auto aboutAction = aboutMenu->addAction(tr("About Panda3DS"));
 	connect(aboutAction, &QAction::triggered, this, &MainWindow::showAboutMenu);
@@ -44,6 +46,7 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 	// Set up misc objects
 	aboutWindow = new AboutWindow(nullptr);
 	configWindow = new ConfigWindow(this);
+	luaEditor = new TextEditorWindow(this, "script.lua", "");
 
 	emu = new Emulator();
 	emu->setOutputSize(screen.surfaceWidth, screen.surfaceHeight);
@@ -133,6 +136,7 @@ MainWindow::~MainWindow() {
 	delete menuBar;
 	delete aboutWindow;
 	delete configWindow;
+	delete luaEditor;
 }
 
 // Send a message to the emulator thread. Lock the mutex and just push back to the vector.
@@ -181,6 +185,8 @@ void MainWindow::showAboutMenu() {
 	about.exec();
 }
 
+void MainWindow::openLuaEditor() { luaEditor->show(); }
+
 void MainWindow::dispatchMessage(const EmulatorMessage& message) {
 	switch (message.type) {
 		case MessageType::LoadROM:
diff --git a/src/panda_qt/text_editor.cpp b/src/panda_qt/text_editor.cpp
new file mode 100644
index 00000000..646db7d0
--- /dev/null
+++ b/src/panda_qt/text_editor.cpp
@@ -0,0 +1,20 @@
+#include "panda_qt/text_editor.hpp"
+#include <QVBoxLayout>
+
+using namespace Zep;
+
+TextEditorWindow::TextEditorWindow(QWidget* parent, const std::string& filename, const std::string& initialText)
+	: QDialog(parent), zepWidget(this, qApp->applicationDirPath().toStdString(), fontSize) {
+	resize(600, 600);
+
+	// Register our extensions
+	ZepRegressExCommand::Register(zepWidget.GetEditor());
+	ZepReplExCommand::Register(zepWidget.GetEditor(), &replProvider);
+
+	zepWidget.GetEditor().SetGlobalMode(Zep::ZepMode_Standard::StaticName());
+	zepWidget.GetEditor().InitWithText(filename, initialText);
+	
+	QVBoxLayout* mainLayout = new QVBoxLayout();
+	setLayout(mainLayout);
+	mainLayout->addWidget(&zepWidget);
+}
\ No newline at end of file
diff --git a/src/panda_qt/zep.cpp b/src/panda_qt/zep.cpp
new file mode 100644
index 00000000..570f0e64
--- /dev/null
+++ b/src/panda_qt/zep.cpp
@@ -0,0 +1,2 @@
+#define ZEP_SINGLE_HEADER_BUILD
+#include "zep.h"
\ No newline at end of file
diff --git a/third_party/zep b/third_party/zep
new file mode 160000
index 00000000..c125fcc3
--- /dev/null
+++ b/third_party/zep
@@ -0,0 +1 @@
+Subproject commit c125fcc3961dcb7c4ac073f7259edb4675209676

From 6386605b9758bcc9bd11f7ec3295f91a681a44a6 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 16 Dec 2023 16:36:03 +0200
Subject: [PATCH 070/162] We can now load lua scripts properly

---
 include/emulator.hpp             |  2 ++
 include/lua_manager.hpp          |  5 +++++
 include/panda_qt/main_window.hpp |  7 ++++++-
 src/lua.cpp                      | 25 +++++++++++++++++++++++++
 src/panda_qt/main_window.cpp     | 13 +++++++++++++
 src/panda_qt/text_editor.cpp     | 23 ++++++++++++++++++++++-
 6 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/include/emulator.hpp b/include/emulator.hpp
index d992b331..fcf93329 100644
--- a/include/emulator.hpp
+++ b/include/emulator.hpp
@@ -119,6 +119,8 @@ class Emulator {
 	EmulatorConfig& getConfig() { return config; }
 	Cheats& getCheats() { return cheats; }
 	ServiceManager& getServiceManager() { return kernel.getServiceManager(); }
+	LuaManager& getLua() { return lua; }
+
 	RendererType getRendererType() const { return config.rendererType; }
 	Renderer* getRenderer() { return gpu.getRenderer(); }
 	u64 getTicks() { return cpu.getTicks(); }
diff --git a/include/lua_manager.hpp b/include/lua_manager.hpp
index 7ef96f18..50b8dd61 100644
--- a/include/lua_manager.hpp
+++ b/include/lua_manager.hpp
@@ -1,4 +1,6 @@
 #pragma once
+#include <string>
+
 #include "helpers.hpp"
 #include "memory.hpp"
 
@@ -36,6 +38,8 @@ class LuaManager {
 	void initialize();
 	void initializeThunks();
 	void loadFile(const char* path);
+	void loadString(const std::string& code);
+
 	void reset();
 	void signalEvent(LuaEvent e) {
 		if (haveScript) [[unlikely]] {
@@ -52,6 +56,7 @@ class LuaManager {
 	void close() {}
 	void initialize() {}
 	void loadFile(const char* path) {}
+	void loadString(const std::string& code) {}
 	void reset() {}
 	void signalEvent(LuaEvent e) {}
 };
diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp
index ee24efdd..070ceb29 100644
--- a/include/panda_qt/main_window.hpp
+++ b/include/panda_qt/main_window.hpp
@@ -21,7 +21,7 @@ class MainWindow : public QMainWindow {
 
   private:
 	// Types of messages we might send from the GUI thread to the emulator thread
-	enum class MessageType { LoadROM, Reset, Pause, Resume, TogglePause, DumpRomFS, PressKey, ReleaseKey };
+	enum class MessageType { LoadROM, Reset, Pause, Resume, TogglePause, DumpRomFS, PressKey, ReleaseKey, LoadLuaScript };
 
 	// Tagged union representing our message queue messages
 	struct EmulatorMessage {
@@ -35,6 +35,10 @@ class MainWindow : public QMainWindow {
 			struct {
 				u32 key;
 			} key;
+
+			struct {
+				std::string* str;
+			} string;
 		};
 	};
 
@@ -72,4 +76,5 @@ class MainWindow : public QMainWindow {
 
 	void keyPressEvent(QKeyEvent* event) override;
 	void keyReleaseEvent(QKeyEvent* event) override;
+	void loadLuaScript(const std::string& code);
 };
\ No newline at end of file
diff --git a/src/lua.cpp b/src/lua.cpp
index 729b6581..ec1287bd 100644
--- a/src/lua.cpp
+++ b/src/lua.cpp
@@ -51,6 +51,31 @@ void LuaManager::loadFile(const char* path) {
 	}
 }
 
+void LuaManager::loadString(const std::string& code) {
+	// Initialize Lua if it has not been initialized
+	if (!initialized) {
+		initialize();
+	}
+
+	// If init failed, don't execute
+	if (!initialized) {
+		printf("Lua initialization failed, file won't run\n");
+		haveScript = false;
+
+		return;
+	}
+
+	int status = luaL_loadstring(L, code.c_str());  // load Lua script
+	int ret = lua_pcall(L, 0, 0, 0);                // tell Lua to run the script
+
+	if (ret != 0) {
+		haveScript = false;
+		fprintf(stderr, "%s\n", lua_tostring(L, -1));  // tell us what mistake we made
+	} else {
+		haveScript = true;
+	}
+}
+
 void LuaManager::signalEventInternal(LuaEvent e) {
 	lua_getglobal(L, "eventHandler"); // We want to call the event handler
 	lua_pushnumber(L, static_cast<int>(e)); // Push event type
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index 95b36661..be3509da 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -195,6 +195,11 @@ void MainWindow::dispatchMessage(const EmulatorMessage& message) {
 			delete message.path.p;
 			break;
 
+		case MessageType::LoadLuaScript:
+			emu->getLua().loadString(*message.string.str);
+			delete message.string.str;
+			break;
+
 		case MessageType::Pause: emu->pause(); break;
 		case MessageType::Resume: emu->resume(); break;
 		case MessageType::TogglePause: emu->togglePause(); break;
@@ -259,3 +264,11 @@ void MainWindow::keyReleaseEvent(QKeyEvent* event) {
 		case Qt::Key_Backspace: releaseKey(HID::Keys::Select); break;
 	}
 }
+
+void MainWindow::loadLuaScript(const std::string& code) {
+	EmulatorMessage message{.type = MessageType::LoadLuaScript};
+
+	// Make a copy of the code on the heap to send via the message queue
+	message.string.str = new std::string(code);
+	sendMessage(message);
+}
\ No newline at end of file
diff --git a/src/panda_qt/text_editor.cpp b/src/panda_qt/text_editor.cpp
index 646db7d0..bef4ec9f 100644
--- a/src/panda_qt/text_editor.cpp
+++ b/src/panda_qt/text_editor.cpp
@@ -1,6 +1,10 @@
 #include "panda_qt/text_editor.hpp"
+
+#include <QPushButton>
 #include <QVBoxLayout>
 
+#include "panda_qt/main_window.hpp"
+
 using namespace Zep;
 
 TextEditorWindow::TextEditorWindow(QWidget* parent, const std::string& filename, const std::string& initialText)
@@ -13,8 +17,25 @@ TextEditorWindow::TextEditorWindow(QWidget* parent, const std::string& filename,
 
 	zepWidget.GetEditor().SetGlobalMode(Zep::ZepMode_Standard::StaticName());
 	zepWidget.GetEditor().InitWithText(filename, initialText);
-	
+
 	QVBoxLayout* mainLayout = new QVBoxLayout();
 	setLayout(mainLayout);
+
+	QPushButton* button = new QPushButton(tr("Load script"), this);
+	button->setFixedSize(100, 20);
+
+	connect(button, &QPushButton::pressed, this, [this]() {
+		if (parentWidget()) {
+			auto buffer = zepWidget.GetEditor().GetMRUBuffer();
+			const std::string text = buffer->GetBufferText(buffer->Begin(), buffer->End());
+
+			static_cast<MainWindow*>(parentWidget())->loadLuaScript(text);
+		} else {
+			// This should be unreachable, only here for safety purposes
+			printf("Text editor does not have any parent widget, click doesn't work :(\n");
+		}
+	});
+
+	mainLayout->addWidget(button);
 	mainLayout->addWidget(&zepWidget);
 }
\ No newline at end of file

From c30fbd3801315ddf743a41307301c7bbb612df31 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 16 Dec 2023 16:54:31 +0200
Subject: [PATCH 071/162] Fix syntax highlighting

---
 third_party/zep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/zep b/third_party/zep
index c125fcc3..0a47740d 160000
--- a/third_party/zep
+++ b/third_party/zep
@@ -1 +1 @@
-Subproject commit c125fcc3961dcb7c4ac073f7259edb4675209676
+Subproject commit 0a47740db9962b3d022a3c098d57784d223d203f

From 7c6b4989185c5103dc77d9e9318d80ffddb6a2ed Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 16 Dec 2023 17:18:52 +0200
Subject: [PATCH 072/162] [Qt] Add capability to load scripts from files

---
 include/panda_qt/main_window.hpp |  1 +
 include/panda_qt/text_editor.hpp |  1 +
 src/panda_qt/main_window.cpp     | 35 ++++++++++++++++++++++++++++++--
 src/panda_qt/text_editor.cpp     |  3 +++
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp
index 070ceb29..7dfb91b7 100644
--- a/include/panda_qt/main_window.hpp
+++ b/include/panda_qt/main_window.hpp
@@ -59,6 +59,7 @@ class MainWindow : public QMainWindow {
 
 	void swapEmuBuffer();
 	void emuThreadMainLoop();
+	void selectLuaFile();
 	void selectROM();
 	void dumpRomFS();
 	void openLuaEditor();
diff --git a/include/panda_qt/text_editor.hpp b/include/panda_qt/text_editor.hpp
index fd0f7884..0da98294 100644
--- a/include/panda_qt/text_editor.hpp
+++ b/include/panda_qt/text_editor.hpp
@@ -19,4 +19,5 @@ class TextEditorWindow : public QDialog {
 
   public:
 	TextEditorWindow(QWidget* parent, const std::string& filename, const std::string& initialText);
+	void setText(const std::string& text) { zepWidget.GetEditor().GetMRUBuffer()->SetText(text); }
 };
\ No newline at end of file
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index be3509da..672fc2a1 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -2,6 +2,7 @@
 
 #include <QFileDialog>
 #include <cstdio>
+#include <fstream>
 
 MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent), screen(this) {
 	setWindowTitle("Alber");
@@ -23,8 +24,10 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 	auto aboutMenu = menuBar->addMenu(tr("About"));
 
 	// Create and bind actions for them
-	auto pandaAction = fileMenu->addAction(tr("Load game"));
-	connect(pandaAction, &QAction::triggered, this, &MainWindow::selectROM);
+	auto loadGameAction = fileMenu->addAction(tr("Load game"));
+	auto loadLuaAction = fileMenu->addAction(tr("Load Lua script"));
+	connect(loadGameAction, &QAction::triggered, this, &MainWindow::selectROM);
+	connect(loadLuaAction, &QAction::triggered, this, &MainWindow::selectLuaFile);
 
 	auto pauseAction = emulationMenu->addAction(tr("Pause"));
 	auto resumeAction = emulationMenu->addAction(tr("Resume"));
@@ -124,6 +127,34 @@ void MainWindow::selectROM() {
 	}
 }
 
+void MainWindow::selectLuaFile() {
+	auto path = QFileDialog::getOpenFileName(this, tr("Select Lua script to load"), "", tr("Lua scripts (*.lua *.txt)"));
+
+	if (!path.isEmpty()) {
+		std::ifstream file(std::filesystem::path(path.toStdU16String()), std::ios::in);
+
+		if (file.fail()) {
+			printf("Failed to load selected lua file\n");
+			return;
+		}
+
+		// Read whole file into an std::string string
+		// Get file size, preallocate std::string to avoid furthermemory allocations
+		std::string code;
+		file.seekg(0, std::ios::end);
+		code.resize(file.tellg());
+
+		// Rewind and read the whole file
+		file.seekg(0, std::ios::beg);
+		file.read(&code[0], code.size());
+		file.close();
+
+		loadLuaScript(code);
+		// Copy the Lua script to the Lua editor
+		luaEditor->setText(code);
+	}
+}
+
 // Cleanup when the main window closes
 MainWindow::~MainWindow() {
 	appRunning = false; // Set our running atomic to false in order to make the emulator thread stop, and join it
diff --git a/src/panda_qt/text_editor.cpp b/src/panda_qt/text_editor.cpp
index bef4ec9f..c189c2ce 100644
--- a/src/panda_qt/text_editor.cpp
+++ b/src/panda_qt/text_editor.cpp
@@ -15,15 +15,18 @@ TextEditorWindow::TextEditorWindow(QWidget* parent, const std::string& filename,
 	ZepRegressExCommand::Register(zepWidget.GetEditor());
 	ZepReplExCommand::Register(zepWidget.GetEditor(), &replProvider);
 
+	// Default to standard mode instead of vim mode, initialize text box
 	zepWidget.GetEditor().SetGlobalMode(Zep::ZepMode_Standard::StaticName());
 	zepWidget.GetEditor().InitWithText(filename, initialText);
 
+	// Layout for widgets
 	QVBoxLayout* mainLayout = new QVBoxLayout();
 	setLayout(mainLayout);
 
 	QPushButton* button = new QPushButton(tr("Load script"), this);
 	button->setFixedSize(100, 20);
 
+	// When the Load Script button is pressed, send the current text to the MainWindow, which will upload it to the emulator's lua object
 	connect(button, &QPushButton::pressed, this, [this]() {
 		if (parentWidget()) {
 			auto buffer = zepWidget.GetEditor().GetMRUBuffer();

From fa0ee8a080d49aa08de1c33ba5c8526f1b8da73f Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 16 Dec 2023 17:43:45 +0200
Subject: [PATCH 073/162] Update zep

---
 third_party/zep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/zep b/third_party/zep
index 0a47740d..75406e1c 160000
--- a/third_party/zep
+++ b/third_party/zep
@@ -1 +1 @@
-Subproject commit 0a47740db9962b3d022a3c098d57784d223d203f
+Subproject commit 75406e1c854b9fa6ede697d6165664e0e11b09ff

From 18f1ea54532581205a752827d31528dbb6c27386 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 16 Dec 2023 22:11:14 +0200
Subject: [PATCH 074/162] [APT] Gracefully handle SetApplicationCpuTimeLimit
 with invalid inputs

---
 src/core/services/apt.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/core/services/apt.cpp b/src/core/services/apt.cpp
index 754baa13..9d02bf94 100644
--- a/src/core/services/apt.cpp
+++ b/src/core/services/apt.cpp
@@ -2,6 +2,7 @@
 #include "ipc.hpp"
 #include "kernel.hpp"
 
+#include <algorithm>
 #include <vector>
 
 namespace APTCommands {
@@ -311,12 +312,14 @@ void APTService::setApplicationCpuTimeLimit(u32 messagePointer) {
 	log("APT::SetApplicationCpuTimeLimit (percentage = %d%%)\n", percentage);
 
 	if (percentage < 5 || percentage > 89 || fixed != 1) {
-		Helpers::panic("Invalid parameters passed to APT::SetApplicationCpuTimeLimit");
-	} else {
-		mem.write32(messagePointer, IPC::responseHeader(0x4F, 1, 0));
-		mem.write32(messagePointer + 4, Result::Success);
-		cpuTimeLimit = percentage;
+		Helpers::warn("Invalid parameter passed to APT::SetApplicationCpuTimeLimit: (percentage, fixed) = (%d, %d)\n", percentage, fixed);
+		// TODO: Does the clamp operation happen? Verify with getApplicationCpuTimeLimit on hardware
+		percentage = std::clamp<u32>(percentage, 5, 89);
 	}
+
+	mem.write32(messagePointer, IPC::responseHeader(0x4F, 1, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+	cpuTimeLimit = percentage;
 }
 
 void APTService::getApplicationCpuTimeLimit(u32 messagePointer) {

From 3298bd14dbc78055afef2157c65ce4bd8ee5b7bc Mon Sep 17 00:00:00 2001
From: GabrielBRDeveloper <gabriecacoal400@gmail.com>
Date: Sat, 16 Dec 2023 23:22:11 -0400
Subject: [PATCH 075/162] Pandroid UI

---
 src/pandroid/app/build.gradle.kts             |   2 +
 src/pandroid/app/src/main/AndroidManifest.xml |   9 +-
 .../panda3ds/pandroid/app/GameActivity.java   |  35 ++++-
 .../panda3ds/pandroid/app/MainActivity.java   |  58 +++++---
 .../pandroid/app/PandroidApplication.java     |   4 +
 .../pandroid/app/PreferenceActivity.java      |  54 ++++++++
 .../app/base/BasePreferenceFragment.java      |  19 +++
 .../pandroid/app/game/AlberInputListener.java |  54 ++++++++
 .../pandroid/app/main/GamesFragment.java      |  75 +++++++++++
 .../pandroid/app/main/SearchFragment.java     |  67 ++++++++++
 .../pandroid/app/main/SettingsFragment.java   |  18 +++
 .../app/preferences/InputMapActivity.java     |  76 +++++++++++
 .../app/preferences/InputMapPreferences.java  |  72 ++++++++++
 .../pandroid/data/game/GameMetadata.java      |  44 ++++++
 .../pandroid/data/game/GameRegion.java        |  12 ++
 .../panda3ds/pandroid/input/InputEvent.java   |  23 ++++
 .../panda3ds/pandroid/input/InputHandler.java | 116 ++++++++++++++++
 .../com/panda3ds/pandroid/input/InputMap.java |  42 ++++++
 .../com/panda3ds/pandroid/input/KeyName.java  |  38 ++++++
 .../com/panda3ds/pandroid/lang/Function.java  |   5 +
 .../panda3ds/pandroid/utils/Constants.java    |   3 +
 .../panda3ds/pandroid/utils/FileUtils.java    |  63 +++++++++
 .../panda3ds/pandroid/utils/GameUtils.java    |  64 +++++++++
 .../panda3ds/pandroid/utils/PathUtils.java    |   5 +-
 .../panda3ds/pandroid/utils/SearchAgent.java  |  91 +++++++++++++
 .../pandroid/view/SimpleTextWatcher.java      |  19 +++
 .../pandroid/view/gamesgrid/GameAdapter.java  |  42 ++++++
 .../pandroid/view/gamesgrid/GameIconView.java |  42 ++++++
 .../view/gamesgrid/GamesGridView.java         |  58 ++++++++
 .../pandroid/view/gamesgrid/ItemHolder.java   |  28 ++++
 .../app/src/main/res/drawable/ic_key_a.xml    |   5 +
 .../app/src/main/res/drawable/ic_search.xml   |   5 +
 .../app/src/main/res/drawable/ic_settings.xml |   5 +
 .../src/main/res/drawable/ic_videogame.xml    |   5 +
 .../res/drawable/search_bar_background.xml    |   9 ++
 .../res/drawable/simple_card_background.xml   |   9 ++
 .../main/res/drawable/simple_card_button.xml  |  12 --
 .../res/drawable/simple_card_button_left.xml  |  12 --
 .../res/drawable/simple_card_button_right.xml |  12 --
 .../app/src/main/res/drawable/temp_thumb.jpg  | Bin 0 -> 51816 bytes
 .../main/res/layout-land/activity_main.xml    |  29 ++++
 .../main/res/layout/activity_input_map.xml    |  23 ++++
 .../app/src/main/res/layout/activity_main.xml |  32 +++--
 .../main/res/layout/activity_preference.xml   |  19 +++
 .../src/main/res/layout/fragment_games.xml    |  25 ++++
 .../src/main/res/layout/fragment_search.xml   |  49 +++++++
 .../app/src/main/res/layout/holder_game.xml   |  41 ++++++
 .../res/layout/preference_simple_about.xml    |  29 ++++
 .../main/res/layout/preference_start_item.xml |  54 ++++++++
 .../res/menu/main_activity_navigation.xml     |  24 ++++
 .../app/src/main/res/values-night/themes.xml  |   7 -
 .../src/main/res/values-pt-rBR/strings.xml    |  16 +++
 .../app/src/main/res/values/strings.xml       |  13 ++
 .../app/src/main/res/values/styleable.xml     |   3 +
 .../main/res/xml/input_map_preferences.xml    | 125 ++++++++++++++++++
 .../src/main/res/xml/start_preferences.xml    |  17 +++
 56 files changed, 1741 insertions(+), 77 deletions(-)
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PreferenceActivity.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SearchFragment.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapActivity.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameRegion.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputEvent.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputHandler.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputMap.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/KeyName.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Function.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/SearchAgent.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/SimpleTextWatcher.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GameAdapter.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GameIconView.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GamesGridView.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/ItemHolder.java
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_key_a.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_search.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_settings.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_videogame.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/search_bar_background.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/simple_card_background.xml
 delete mode 100644 src/pandroid/app/src/main/res/drawable/simple_card_button.xml
 delete mode 100644 src/pandroid/app/src/main/res/drawable/simple_card_button_left.xml
 delete mode 100644 src/pandroid/app/src/main/res/drawable/simple_card_button_right.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/temp_thumb.jpg
 create mode 100644 src/pandroid/app/src/main/res/layout-land/activity_main.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/activity_input_map.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/activity_preference.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/fragment_games.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/fragment_search.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/holder_game.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/preference_simple_about.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/preference_start_item.xml
 create mode 100644 src/pandroid/app/src/main/res/menu/main_activity_navigation.xml
 delete mode 100644 src/pandroid/app/src/main/res/values-night/themes.xml
 create mode 100644 src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
 create mode 100644 src/pandroid/app/src/main/res/xml/input_map_preferences.xml
 create mode 100644 src/pandroid/app/src/main/res/xml/start_preferences.xml

diff --git a/src/pandroid/app/build.gradle.kts b/src/pandroid/app/build.gradle.kts
index 276eb552..f1feaf0d 100644
--- a/src/pandroid/app/build.gradle.kts
+++ b/src/pandroid/app/build.gradle.kts
@@ -38,5 +38,7 @@ android {
 dependencies {
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("com.google.android.material:material:1.8.0")
+    implementation("androidx.preference:preference:1.2.1")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("com.google.code.gson:gson:2.10.1")
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/AndroidManifest.xml b/src/pandroid/app/src/main/AndroidManifest.xml
index 15bf6270..8caf9bb0 100644
--- a/src/pandroid/app/src/main/AndroidManifest.xml
+++ b/src/pandroid/app/src/main/AndroidManifest.xml
@@ -24,7 +24,8 @@
         tools:targetApi="31">
         <activity
             android:name=".app.MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:configChanges="orientation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -34,5 +35,11 @@
             android:name=".app.GameActivity"
             android:configChanges="screenSize|screenLayout|orientation|density|uiMode">
         </activity>
+        <activity android:name=".app.PreferenceActivity"
+            android:launchMode="standard"
+            android:configChanges="screenSize|screenLayout|orientation|density"/>
+
+        <activity android:name=".app.preferences.InputMapActivity"
+            android:configChanges="density|orientation|screenSize"/>
     </application>
 </manifest>
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
index 2da73b97..286a7ed3 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -2,6 +2,8 @@ package com.panda3ds.pandroid.app;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -12,11 +14,17 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 
 import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.app.game.AlberInputListener;
+import com.panda3ds.pandroid.input.InputHandler;
+import com.panda3ds.pandroid.input.InputMap;
 import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.view.PandaGlSurfaceView;
 import com.panda3ds.pandroid.view.PandaLayoutController;
 
 public class GameActivity extends BaseActivity {
+
+	private final AlberInputListener inputListener = new AlberInputListener();
+
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -33,7 +41,7 @@ public class GameActivity extends BaseActivity {
 		setContentView(R.layout.game_activity);
 
 		((FrameLayout) findViewById(R.id.panda_gl_frame))
-			.addView(pandaSurface, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+				.addView(pandaSurface, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 
 		PandaLayoutController controllerLayout = findViewById(R.id.controller_layout);
 		controllerLayout.initialize();
@@ -46,5 +54,30 @@ public class GameActivity extends BaseActivity {
 		super.onResume();
 		getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
 		getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		InputHandler.reset();
+		InputHandler.setMotionDeadZone(InputMap.getDeadZone());
+		InputHandler.setEventListener(inputListener);
+	}
+
+	@Override
+	protected void onPause() {
+		super.onPause();
+		InputHandler.reset();
+	}
+
+	@Override
+	public boolean dispatchKeyEvent(KeyEvent event) {
+		if (InputHandler.processKeyEvent(event))
+			return true;
+
+		return super.dispatchKeyEvent(event);
+	}
+
+	@Override
+	public boolean dispatchGenericMotionEvent(MotionEvent ev) {
+		if (InputHandler.processMotionEvent(ev))
+			return true;
+
+		return super.dispatchGenericMotionEvent(ev);
 	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
index f4fc27bf..29070a88 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
@@ -8,17 +8,27 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.widget.Toast;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import com.panda3ds.pandroid.R;
-import com.panda3ds.pandroid.utils.Constants;
-import com.panda3ds.pandroid.utils.PathUtils;
+import android.view.MenuItem;
 
-public class MainActivity extends BaseActivity {
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
+import com.google.android.material.navigation.NavigationBarView;
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.app.main.GamesFragment;
+import com.panda3ds.pandroid.app.main.SearchFragment;
+import com.panda3ds.pandroid.app.main.SettingsFragment;
+
+public class MainActivity extends BaseActivity implements NavigationBarView.OnItemSelectedListener {
 	private static final int PICK_ROM = 2;
 	private static final int PERMISSION_REQUEST_CODE = 3;
 
+	private final GamesFragment gamesFragment = new GamesFragment();
+	private final SearchFragment searchFragment = new SearchFragment();
+	private final SettingsFragment settingsFragment = new SettingsFragment();
+
 	private void openFile() {
 		Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
 		intent.addCategory(Intent.CATEGORY_OPENABLE);
@@ -35,23 +45,35 @@ public class MainActivity extends BaseActivity {
 				startActivity(intent);
 			}
 		} else {
-			ActivityCompat.requestPermissions(this, new String[] {READ_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
-			ActivityCompat.requestPermissions(this, new String[] {WRITE_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
+			ActivityCompat.requestPermissions(this, new String[]{READ_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
+			ActivityCompat.requestPermissions(this, new String[]{WRITE_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
 		}
 
 		setContentView(R.layout.activity_main);
-		findViewById(R.id.load_rom).setOnClickListener(v -> { openFile(); });
+
+		NavigationBarView bar = findViewById(R.id.navigation);
+		bar.setOnItemSelectedListener(this);
+		bar.postDelayed(() -> bar.setSelectedItemId(bar.getSelectedItemId()), 5);
 	}
 
 	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		if (requestCode == PICK_ROM) {
-			if (resultCode == RESULT_OK) {
-				String path = PathUtils.getPath(getApplicationContext(), data.getData());
-				Toast.makeText(getApplicationContext(), "pandroid opening " + path, Toast.LENGTH_LONG).show();
-				startActivity(new Intent(this, GameActivity.class).putExtra(Constants.ACTIVITY_PARAMETER_PATH, path));
-			}
-			super.onActivityResult(requestCode, resultCode, data);
+	public boolean onNavigationItemSelected(@NonNull MenuItem item) {
+		int id = item.getItemId();
+		FragmentManager manager = getSupportFragmentManager();
+		Fragment fragment;
+		if (id == R.id.games) {
+			fragment = gamesFragment;
+		} else if (id == R.id.search) {
+			fragment = searchFragment;
+		} else if (id == R.id.settings) {
+			fragment = settingsFragment;
+		} else {
+			return false;
 		}
+
+		manager.beginTransaction()
+				.replace(R.id.fragment_container, fragment)
+				.commitNow();
+		return true;
 	}
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
index 0e284db6..246decec 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
@@ -4,6 +4,8 @@ import android.app.Application;
 import android.content.Context;
 
 import com.panda3ds.pandroid.data.config.GlobalConfig;
+import com.panda3ds.pandroid.input.InputMap;
+import com.panda3ds.pandroid.utils.GameUtils;
 
 public class PandroidApplication extends Application {
     private static Context appContext;
@@ -13,6 +15,8 @@ public class PandroidApplication extends Application {
         super.onCreate();
         appContext = this;
         GlobalConfig.initialize();
+        GameUtils.initialize();
+        InputMap.initialize();
     }
 
     public static Context getAppContext() {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PreferenceActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PreferenceActivity.java
new file mode 100644
index 00000000..3b8ebb2e
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PreferenceActivity.java
@@ -0,0 +1,54 @@
+package com.panda3ds.pandroid.app;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.utils.Constants;
+
+public class PreferenceActivity extends BaseActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent intent = getIntent();
+
+        setContentView(R.layout.activity_preference);
+        setSupportActionBar(findViewById(R.id.toolbar));
+
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        if (!intent.hasExtra(Constants.ACTIVITY_PARAMETER_FRAGMENT)) {
+            finish();
+            return;
+        }
+
+        try {
+            Class<?> clazz = getClassLoader().loadClass(intent.getStringExtra(Constants.ACTIVITY_PARAMETER_FRAGMENT));
+            getSupportFragmentManager()
+                    .beginTransaction()
+                    .replace(R.id.fragment_container, (Fragment) clazz.newInstance())
+                    .commitNow();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void launch(Context context, Class<? extends Fragment> clazz) {
+        context.startActivity(new Intent(context, PreferenceActivity.class)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .putExtra(Constants.ACTIVITY_PARAMETER_FRAGMENT, clazz.getName()));
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        if (item.getItemId() == android.R.id.home)
+            finish();
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java
new file mode 100644
index 00000000..f459aa6d
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java
@@ -0,0 +1,19 @@
+package com.panda3ds.pandroid.app.base;
+
+import android.annotation.SuppressLint;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+
+import com.panda3ds.pandroid.lang.Function;
+
+public abstract class BasePreferenceFragment extends PreferenceFragmentCompat {
+    @SuppressLint("RestrictedApi")
+    protected void setItemClick(String key, Function<Preference> listener){
+        findPreference(key).setOnPreferenceClickListener(preference -> {
+            listener.run(preference);
+            getPreferenceScreen().performClick();
+            return false;
+        });
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java
new file mode 100644
index 00000000..c500d970
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java
@@ -0,0 +1,54 @@
+package com.panda3ds.pandroid.app.game;
+
+import com.panda3ds.pandroid.AlberDriver;
+import com.panda3ds.pandroid.input.InputEvent;
+import com.panda3ds.pandroid.input.InputMap;
+import com.panda3ds.pandroid.input.KeyName;
+import com.panda3ds.pandroid.lang.Function;
+import com.panda3ds.pandroid.math.Vector2;
+
+public class AlberInputListener implements Function<InputEvent> {
+
+    private final Vector2 axis = new Vector2(0.0f, 0.0f);
+
+    @Override
+    public void run(InputEvent event) {
+        KeyName key = InputMap.relative(event.getName());
+
+        if (key == KeyName.NULL)
+            return;
+
+        boolean axisChanged = false;
+
+        switch (key) {
+            case AXIS_UP:
+                axis.y = event.getValue();
+                axisChanged = true;
+                break;
+            case AXIS_DOWN:
+                axis.y = -event.getValue();
+                axisChanged = true;
+                break;
+            case AXIS_LEFT:
+                axis.x = -event.getValue();
+                axisChanged = true;
+                break;
+            case AXIS_RIGHT:
+                axis.x = event.getValue();
+                axisChanged = true;
+                break;
+            default:
+                if (event.isDown()) {
+                    AlberDriver.KeyDown(key.getKeyId());
+                } else {
+                    AlberDriver.KeyUp(key.getKeyId());
+                }
+                break;
+        }
+
+        if (axisChanged) {
+            AlberDriver.SetCirclepadAxis(Math.round(axis.x * 0x9C), Math.round(axis.y * 0x9C));
+        }
+    }
+
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java
new file mode 100644
index 00000000..ef49f6f1
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java
@@ -0,0 +1,75 @@
+package com.panda3ds.pandroid.app.main;
+
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.data.game.GameMetadata;
+import com.panda3ds.pandroid.utils.FileUtils;
+import com.panda3ds.pandroid.utils.GameUtils;
+import com.panda3ds.pandroid.view.gamesgrid.GamesGridView;
+
+public class GamesFragment extends Fragment implements ActivityResultCallback<Uri> {
+
+    private final ActivityResultContracts.OpenDocument openRomContract = new ActivityResultContracts.OpenDocument();
+    private ActivityResultLauncher<String[]> pickFileRequest;
+    private GamesGridView gameListView;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_games, container, false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        gameListView = view.findViewById(R.id.games);
+
+        view.findViewById(R.id.add_rom).setOnClickListener((v) -> pickFileRequest.launch(new String[]{"*/*"}));
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        gameListView.setGameList(GameUtils.getGames());
+    }
+
+    @Override
+    public void onActivityResult(Uri result) {
+        if (result != null) {
+            String uri = result.toString();
+            if (GameUtils.findByRomPath(uri) == null) {
+                FileUtils.makeUriPermanent(uri, FileUtils.MODE_READ);
+                GameMetadata game = new GameMetadata(FileUtils.getName(uri).split("\\.")[0], uri, "Unknown");
+                GameUtils.addGame(game);
+                GameUtils.launch(requireActivity(), game);
+            }
+        }
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        pickFileRequest = registerForActivityResult(openRomContract, this);
+    }
+
+    @Override
+    public void onDestroy() {
+        if (pickFileRequest != null) {
+            pickFileRequest.unregister();
+            pickFileRequest = null;
+        }
+        super.onDestroy();
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SearchFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SearchFragment.java
new file mode 100644
index 00000000..213d55fc
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SearchFragment.java
@@ -0,0 +1,67 @@
+package com.panda3ds.pandroid.app.main;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatEditText;
+import androidx.fragment.app.Fragment;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.data.game.GameMetadata;
+import com.panda3ds.pandroid.utils.GameUtils;
+import com.panda3ds.pandroid.utils.SearchAgent;
+import com.panda3ds.pandroid.view.SimpleTextWatcher;
+import com.panda3ds.pandroid.view.gamesgrid.GamesGridView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SearchFragment extends Fragment {
+
+    private final SearchAgent searchAgent = new SearchAgent();
+    private GamesGridView gamesListView;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_search, container, false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        gamesListView = view.findViewById(R.id.games);
+
+        ((AppCompatEditText) view.findViewById(R.id.search_bar))
+                .addTextChangedListener((SimpleTextWatcher) this::search);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        searchAgent.clearBuffer();
+        for (GameMetadata game : GameUtils.getGames()) {
+            searchAgent.addToBuffer(game.getId(), game.getTitle(), game.getPublisher());
+        }
+        search("");
+    }
+
+    private void search(String query) {
+        List<String> resultIds = searchAgent.search(query);
+        ArrayList<GameMetadata> games = new ArrayList<>(GameUtils.getGames());
+        Object[] resultObj = games.stream()
+                .filter(gameMetadata -> resultIds.contains(gameMetadata.getId()))
+                .toArray();
+
+        games.clear();
+        for (Object res : resultObj)
+            games.add((GameMetadata) res);
+
+        gamesListView.setGameList(games);
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java
new file mode 100644
index 00000000..22f888fe
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java
@@ -0,0 +1,18 @@
+package com.panda3ds.pandroid.app.main;
+
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.app.PreferenceActivity;
+import com.panda3ds.pandroid.app.base.BasePreferenceFragment;
+import com.panda3ds.pandroid.app.preferences.InputMapPreferences;
+
+public class SettingsFragment extends BasePreferenceFragment {
+    @Override
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+        setPreferencesFromResource(R.xml.start_preferences, rootKey);
+        setItemClick("inputMap", (item) -> PreferenceActivity.launch(requireContext(), InputMapPreferences.class));
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapActivity.java
new file mode 100644
index 00000000..b7a2cbb4
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapActivity.java
@@ -0,0 +1,76 @@
+package com.panda3ds.pandroid.app.preferences;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.widget.Toast;
+
+import androidx.activity.result.contract.ActivityResultContract;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.app.BaseActivity;
+import com.panda3ds.pandroid.input.InputEvent;
+import com.panda3ds.pandroid.input.InputHandler;
+
+import java.util.Objects;
+
+public class InputMapActivity extends BaseActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_input_map);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        InputHandler.reset();
+        InputHandler.setMotionDeadZone(0.8F);
+        InputHandler.setEventListener(this::onInputEvent);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        InputHandler.reset();
+    }
+
+    @Override
+    public boolean dispatchGenericMotionEvent(MotionEvent ev) {
+        return InputHandler.processMotionEvent(ev);
+    }
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        return InputHandler.processKeyEvent(event);
+    }
+
+    private void onInputEvent(InputEvent event) {
+        if (Objects.equals(event.getName(), "KEYCODE_BACK")) {
+            onBackPressed();
+            return;
+        }
+        setResult(RESULT_OK, new Intent(event.getName()));
+        Toast.makeText(this, event.getName(), Toast.LENGTH_SHORT).show();
+        finish();
+    }
+
+
+    public static final class Contract extends ActivityResultContract<String, String> {
+
+        @NonNull
+        @Override
+        public Intent createIntent(@NonNull Context context, String s) {
+            return new Intent(context, InputMapActivity.class);
+        }
+
+        @Override
+        public String parseResult(int i, @Nullable Intent intent) {
+            return i == RESULT_OK ? intent.getAction() : null;
+        }
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java
new file mode 100644
index 00000000..007920bd
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java
@@ -0,0 +1,72 @@
+package com.panda3ds.pandroid.app.preferences;
+
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.app.base.BasePreferenceFragment;
+import com.panda3ds.pandroid.input.InputMap;
+import com.panda3ds.pandroid.input.KeyName;
+
+public class InputMapPreferences extends BasePreferenceFragment implements ActivityResultCallback<String> {
+
+    private ActivityResultLauncher<String> requestKey;
+    private String currentKey;
+
+    @Override
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+        setPreferencesFromResource(R.xml.input_map_preferences, rootKey);
+        for (KeyName key : KeyName.values()) {
+            if (key == KeyName.NULL) return;
+            setItemClick(key.name(), this::onItemPressed);
+        }
+        refreshList();
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        requestKey = registerForActivityResult(new InputMapActivity.Contract(), this);
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        if (requestKey != null) {
+            requestKey.unregister();
+            requestKey = null;
+        }
+    }
+
+    private void onItemPressed(Preference pref) {
+        currentKey = pref.getKey();
+        requestKey.launch(null);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        refreshList();
+    }
+
+    private void refreshList() {
+        for (KeyName key : KeyName.values()) {
+            if (key == KeyName.NULL) continue;
+            findPreference(key.name()).setSummary(InputMap.relative(key));
+        }
+    }
+
+    @Override
+    public void onActivityResult(String result) {
+        if (result != null) {
+            InputMap.set(KeyName.valueOf(currentKey), result);
+            refreshList();
+        }
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java
new file mode 100644
index 00000000..46407302
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java
@@ -0,0 +1,44 @@
+package com.panda3ds.pandroid.data.game;
+
+import java.util.UUID;
+
+public class GameMetadata {
+
+    private final String id;
+    private final String romPath;
+    private final String title;
+    private final int[] icon = new int[48 * 48];
+    private final String publisher;
+    private final GameRegion[] regions = new GameRegion[]{GameRegion.None};
+
+    public GameMetadata(String title, String romPath, String publisher) {
+        this.id = UUID.randomUUID().toString();
+        this.title = title;
+        this.publisher = publisher;
+        this.romPath = romPath;
+    }
+
+    public String getRomPath() {
+        return romPath;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getPublisher() {
+        return publisher;
+    }
+
+    public int[] getIcon() {
+        return icon;
+    }
+
+    public GameRegion[] getRegions() {
+        return regions;
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameRegion.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameRegion.java
new file mode 100644
index 00000000..9b99b095
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameRegion.java
@@ -0,0 +1,12 @@
+package com.panda3ds.pandroid.data.game;
+
+public enum GameRegion {
+    NorthAmerican,
+    Japan,
+    Europe,
+    Australia,
+    China,
+    Korean,
+    Taiwan,
+    None
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputEvent.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputEvent.java
new file mode 100644
index 00000000..7869e00a
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputEvent.java
@@ -0,0 +1,23 @@
+package com.panda3ds.pandroid.input;
+
+public class InputEvent {
+    private final String name;
+    private final float value;
+
+    public InputEvent(String name, float value) {
+        this.name = name;
+        this.value = Math.max(0.0f, Math.min(1.0f, value));
+    }
+
+    public boolean isDown() {
+        return value > 0.0f;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public float getValue() {
+        return value;
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputHandler.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputHandler.java
new file mode 100644
index 00000000..08142d06
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputHandler.java
@@ -0,0 +1,116 @@
+package com.panda3ds.pandroid.input;
+
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+
+import com.panda3ds.pandroid.lang.Function;
+
+import java.util.HashMap;
+
+public class InputHandler {
+    private static Function<InputEvent> eventListener;
+    private static float motionDeadZone = 0.0f;
+
+    private static final int[] gamepadSources = {
+            InputDevice.SOURCE_GAMEPAD,
+            InputDevice.SOURCE_JOYSTICK
+    };
+
+    private static final int[] validSources = {
+            InputDevice.SOURCE_GAMEPAD,
+            InputDevice.SOURCE_JOYSTICK,
+            InputDevice.SOURCE_DPAD,
+            InputDevice.SOURCE_KEYBOARD
+    };
+
+    private static final HashMap<String, Float> motionDownEvents = new HashMap<>();
+
+    private static boolean containsSource(int[] sources, int sourceMasked) {
+        for (int source : sources) {
+            if ((sourceMasked & source) == source)
+                return true;
+        }
+        return false;
+    }
+
+    private static boolean isGamepadSource(int sourceMask) {
+        return containsSource(gamepadSources, sourceMask);
+    }
+
+    private static boolean isSourceValid(int sourceMasked) {
+        return containsSource(validSources, sourceMasked);
+    }
+
+    public static void setEventListener(Function<InputEvent> eventListener) {
+        InputHandler.eventListener = eventListener;
+    }
+
+    private static void handleEvent(InputEvent event) {
+        if (eventListener != null) {
+            eventListener.run(event);
+        }
+    }
+
+    public static void setMotionDeadZone(float motionDeadZone) {
+        InputHandler.motionDeadZone = motionDeadZone;
+    }
+
+    public static boolean processMotionEvent(MotionEvent event) {
+        if (!isSourceValid(event.getSource()))
+            return false;
+
+        if (isGamepadSource(event.getSource())) {
+            for (InputDevice.MotionRange range : event.getDevice().getMotionRanges()) {
+                float axisValue = event.getAxisValue(range.getAxis());
+                float value = Math.abs(axisValue);
+                String name = (MotionEvent.axisToString(range.getAxis()) + (axisValue >= 0 ? "+" : "-")).toUpperCase();
+                String reverseName = (MotionEvent.axisToString(range.getAxis()) + (axisValue >= 0 ? "-" : "+")).toUpperCase();
+
+                if (motionDownEvents.containsKey(reverseName)) {
+                    motionDownEvents.remove(reverseName);
+                    handleEvent(new InputEvent(reverseName.toUpperCase(), 0.0f));
+                }
+
+                if (value > motionDeadZone) {
+                    motionDownEvents.put(name, value);
+                    handleEvent(new InputEvent(name.toUpperCase(), (value - motionDeadZone) / (1.0f - motionDeadZone)));
+                } else if (motionDownEvents.containsKey(name)) {
+                    motionDownEvents.remove(name);
+                    handleEvent(new InputEvent(name.toUpperCase(), 0.0f));
+                }
+
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean processKeyEvent(KeyEvent event) {
+        if (!isSourceValid(event.getSource()))
+            return false;
+
+        if (isGamepadSource(event.getSource())) {
+            // Dpad return motion event + key event, this remove the key event
+            switch (event.getKeyCode()) {
+                case KeyEvent.KEYCODE_DPAD_UP:
+                case KeyEvent.KEYCODE_DPAD_UP_LEFT:
+                case KeyEvent.KEYCODE_DPAD_UP_RIGHT:
+                case KeyEvent.KEYCODE_DPAD_DOWN:
+                case KeyEvent.KEYCODE_DPAD_DOWN_LEFT:
+                case KeyEvent.KEYCODE_DPAD_DOWN_RIGHT:
+                case KeyEvent.KEYCODE_DPAD_RIGHT:
+                case KeyEvent.KEYCODE_DPAD_LEFT:
+                    return true;
+            }
+        }
+        handleEvent(new InputEvent(KeyEvent.keyCodeToString(event.getKeyCode()), event.getAction() == KeyEvent.ACTION_UP ? 0.0f : 1.0f));
+        return true;
+    }
+
+    public static void reset() {
+        eventListener = null;
+        motionDeadZone = 0.0f;
+        motionDownEvents.clear();
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputMap.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputMap.java
new file mode 100644
index 00000000..6e61345c
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputMap.java
@@ -0,0 +1,42 @@
+package com.panda3ds.pandroid.input;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import com.panda3ds.pandroid.app.PandroidApplication;
+import com.panda3ds.pandroid.utils.Constants;
+
+public class InputMap {
+
+    private static SharedPreferences data;
+    private static final String KEY_DEAD_ZONE = "deadZone";
+
+    public static void initialize() {
+        data = PandroidApplication.getAppContext().getSharedPreferences(Constants.PREF_INPUT_MAP, Context.MODE_PRIVATE);
+    }
+
+    public static float getDeadZone() {
+        return data.getFloat(KEY_DEAD_ZONE, 0.2f);
+    }
+
+    public static void set(KeyName key, String name) {
+        data.edit().putString(key.name(), name).apply();
+    }
+
+    public static String relative(KeyName key) {
+        return data.getString(key.name(), "-");
+    }
+
+    public static KeyName relative(String name) {
+        for (KeyName key : KeyName.values()) {
+            if (relative(key).equalsIgnoreCase(name))
+                return key;
+        }
+        return KeyName.NULL;
+    }
+
+    public static void setDeadZone(float value) {
+        data.edit().putFloat(KEY_DEAD_ZONE, Math.max(0, Math.min(1.0F, value))).apply();
+    }
+
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/KeyName.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/KeyName.java
new file mode 100644
index 00000000..1253529f
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/KeyName.java
@@ -0,0 +1,38 @@
+package com.panda3ds.pandroid.input;
+
+import com.panda3ds.pandroid.utils.Constants;
+
+public enum KeyName {
+    A(Constants.INPUT_KEY_A),
+    B(Constants.INPUT_KEY_B),
+    X(Constants.INPUT_KEY_X),
+    Y(Constants.INPUT_KEY_Y),
+    UP(Constants.INPUT_KEY_UP),
+    DOWN(Constants.INPUT_KEY_DOWN),
+    LEFT(Constants.INPUT_KEY_LEFT),
+    RIGHT(Constants.INPUT_KEY_RIGHT),
+    AXIS_LEFT,
+    AXIS_RIGHT,
+    AXIS_UP,
+    AXIS_DOWN,
+    START(Constants.INPUT_KEY_START),
+    SELECT(Constants.INPUT_KEY_SELECT),
+    L(Constants.INPUT_KEY_L),
+    R(Constants.INPUT_KEY_R),
+    NULL;
+
+    private final int keyId;
+
+    KeyName() {
+        this(-1);
+    }
+
+    KeyName(int keyId) {
+        this.keyId = keyId;
+    }
+
+    public int getKeyId() {
+        return keyId;
+    }
+
+}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Function.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Function.java
new file mode 100644
index 00000000..25a15875
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Function.java
@@ -0,0 +1,5 @@
+package com.panda3ds.pandroid.lang;
+
+public interface Function<T> {
+    void run(T arg);
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
index 1aac0a4d..7adf2e47 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
@@ -19,7 +19,10 @@ public class Constants {
 	public static final int N3DS_HALF_HEIGHT = N3DS_FULL_HEIGHT / 2;
 
 	public static final String ACTIVITY_PARAMETER_PATH = "path";
+	public static final String ACTIVITY_PARAMETER_FRAGMENT = "fragment";
 	public static final String LOG_TAG = "pandroid";
 
 	public static final String PREF_GLOBAL_CONFIG = "app.GlobalConfig";
+    public static final String PREF_GAME_UTILS = "app.GameUtils";
+    public static final String PREF_INPUT_MAP = "app.InputMap";
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
new file mode 100644
index 00000000..4ebd7241
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
@@ -0,0 +1,63 @@
+package com.panda3ds.pandroid.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+import androidx.documentfile.provider.DocumentFile;
+
+import com.panda3ds.pandroid.app.PandroidApplication;
+
+public class FileUtils {
+
+    public static final String MODE_READ = "r";
+
+    private static Uri parseUri(String value) {
+        return Uri.parse(value);
+    }
+
+    private static Context getContext() {
+        return PandroidApplication.getAppContext();
+    }
+
+    public static String getName(String path) {
+        DocumentFile file = DocumentFile.fromSingleUri(getContext(), parseUri(path));
+        return file.getName();
+    }
+
+    public static long getSize(String path) {
+        return DocumentFile.fromSingleUri(getContext(), parseUri(path)).length();
+    }
+
+
+    public static String getCacheDir() {
+        return getContext().getCacheDir().getAbsolutePath();
+    }
+
+    public static void makeUriPermanent(String uri, String mode) {
+
+        int flags = Intent.FLAG_GRANT_READ_URI_PERMISSION;
+        if (mode.toLowerCase().contains("w"))
+            flags &= Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
+
+        getContext().getContentResolver().takePersistableUriPermission(parseUri(uri), flags);
+    }
+
+    public static int openContentUri(String path, String mode) {
+        try {
+            Uri uri = parseUri(path);
+            ParcelFileDescriptor descriptor = getContext().getContentResolver().openFileDescriptor(uri, mode);
+            int fd = descriptor.getFd();
+            descriptor.detachFd();
+            descriptor.close();
+            return fd;
+        } catch (Exception e) {
+            Log.e(Constants.LOG_TAG, "Error on openContentUri: " + e);
+        }
+
+        return -1;
+    }
+    
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
new file mode 100644
index 00000000..e4c2f53e
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
@@ -0,0 +1,64 @@
+package com.panda3ds.pandroid.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+
+import com.google.gson.Gson;
+import com.panda3ds.pandroid.app.GameActivity;
+import com.panda3ds.pandroid.app.PandroidApplication;
+import com.panda3ds.pandroid.data.game.GameMetadata;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Objects;
+
+public class GameUtils {
+    private static final String KEY_GAME_LIST = "gameList";
+    private static final ArrayList<GameMetadata> games = new ArrayList<>();
+    private static SharedPreferences data;
+    private static final Gson gson = new Gson();
+
+    public static void initialize() {
+        data = PandroidApplication.getAppContext().getSharedPreferences(Constants.PREF_GAME_UTILS, Context.MODE_PRIVATE);
+
+        GameMetadata[] list = gson.fromJson(data.getString(KEY_GAME_LIST, "[]"), GameMetadata[].class);
+        games.clear();
+        games.addAll(Arrays.asList(list));
+    }
+
+    public static GameMetadata findByRomPath(String romPath) {
+        for (GameMetadata game : games) {
+            if (Objects.equals(romPath, game.getRomPath())) {
+                return game;
+            }
+        }
+        return null;
+    }
+
+    public static void launch(Context context, GameMetadata game) {
+        String path = PathUtils.getPath(Uri.parse(game.getRomPath()));
+        context.startActivity(new Intent(context, GameActivity.class).putExtra(Constants.ACTIVITY_PARAMETER_PATH, path));
+    }
+
+    public static void removeGame(GameMetadata game) {
+        games.remove(game);
+        saveAll();
+    }
+
+    public static void addGame(GameMetadata game) {
+        games.add(game);
+        saveAll();
+    }
+
+    public static ArrayList<GameMetadata> getGames() {
+        return new ArrayList<>(games);
+    }
+
+    private static synchronized void saveAll() {
+        data.edit()
+                .putString(KEY_GAME_LIST, gson.toJson(games.toArray(new GameMetadata[0])))
+                .apply();
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
index 9bfaa0e4..c4682de2 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
@@ -9,8 +9,11 @@ import android.os.Environment;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 
+import com.panda3ds.pandroid.app.PandroidApplication;
+
 public class PathUtils {
-	public static String getPath(final Context context, final Uri uri) {
+	public static String getPath(final Uri uri) {
+		final Context context = PandroidApplication.getAppContext();
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && DocumentsContract.isDocumentUri(context, uri)) {
 			if (isExternalStorageDocument(uri)) {
 				final String docId = DocumentsContract.getDocumentId(uri);
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/SearchAgent.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/SearchAgent.java
new file mode 100644
index 00000000..212c1a1d
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/SearchAgent.java
@@ -0,0 +1,91 @@
+package com.panda3ds.pandroid.utils;
+
+import java.text.Normalizer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+public class SearchAgent {
+
+    /**
+     * Store all possibles results in map
+     * id->words
+     */
+    private final HashMap<String, String> searchBuffer = new HashMap<>();
+
+    // Add search item to list
+    public void addToBuffer(String id, String... words) {
+        StringBuilder string = new StringBuilder();
+        for (String word : words) {
+            string.append(normalize(word)).append(" ");
+        }
+        searchBuffer.put(id, string.toString());
+    }
+
+    /**
+     * Convert string to simple string with only a-z 0-9 for do this first it get the input string
+     * and apply lower case, after convert all chars to ASCII
+     * Ex: ç => c, á => a
+     * after replace all double space for single space
+     */
+    private String normalize(String string) {
+        string = Normalizer.normalize(string, Normalizer.Form.NFD).replaceAll("[^\\p{ASCII}]", "");
+
+        return string.toLowerCase()
+                .replaceAll("(?!([a-z0-9 ])).*", "")
+                .replaceAll("\\s\\s", " ");
+    }
+
+    // Execute search and return array with item id.
+    public List<String> search(String query) {
+        String[] words = normalize(query).split("\\s");
+
+        if (words.length == 0)
+            return Collections.emptyList();
+
+        // Map for add all search result: id -> probability
+        HashMap<String, Integer> results = new HashMap<>();
+        for (String key : searchBuffer.keySet()) {
+            int probability = 0;
+            String value = searchBuffer.get(key);
+            for (String word : words) {
+                if (value.contains(word))
+                    probability++;
+            }
+            if (probability > 0)
+                results.put(key, probability);
+        }
+
+
+        // Filter by probability average
+        // Ex: A = 10% B = 30% C = 70% (calc is (10+30+70)/3=36)
+        // After remove all result with probability < 36
+        int average = 0;
+        for (String key : results.keySet()) {
+            average += results.get(key);
+        }
+        average = average / Math.max(1, results.size());
+
+        int i = 0;
+        ArrayList<String> resultKeys = new ArrayList<>(Arrays.asList(results.keySet().toArray(new String[0])));
+        while ((i < resultKeys.size() && resultKeys.size() > 1)) {
+            if (results.get(resultKeys.get(i)) < average) {
+                String key = resultKeys.get(i);
+                resultKeys.remove(i);
+                results.remove(key);
+                i = 0;
+                continue;
+            }
+            i++;
+        }
+
+        return Arrays.asList(results.keySet().toArray(new String[0]));
+    }
+
+    // Clear search buffer
+    public void clearBuffer() {
+        searchBuffer.clear();
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/SimpleTextWatcher.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/SimpleTextWatcher.java
new file mode 100644
index 00000000..46a43ddb
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/SimpleTextWatcher.java
@@ -0,0 +1,19 @@
+package com.panda3ds.pandroid.view;
+
+import android.text.Editable;
+import android.text.TextWatcher;
+
+public interface SimpleTextWatcher extends TextWatcher {
+    void onChange(String value);
+
+    @Override
+    default void onTextChanged(CharSequence s, int start, int before, int count) {}
+
+    @Override
+    default void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+    @Override
+    default void afterTextChanged(Editable s){
+        onChange(s.toString());
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GameAdapter.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GameAdapter.java
new file mode 100644
index 00000000..1a3febd4
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GameAdapter.java
@@ -0,0 +1,42 @@
+package com.panda3ds.pandroid.view.gamesgrid;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.data.game.GameMetadata;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class GameAdapter extends RecyclerView.Adapter<ItemHolder> {
+    private final ArrayList<GameMetadata> games = new ArrayList<>();
+
+    @NonNull
+    @Override
+    public ItemHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new ItemHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.holder_game, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ItemHolder holder, int position) {
+        holder.apply(games.get(position));
+    }
+
+    public void replace(List<GameMetadata> games) {
+        int oldCount = getItemCount();
+        this.games.clear();
+        notifyItemRangeRemoved(0, oldCount);
+        this.games.addAll(games);
+        notifyItemRangeInserted(0, getItemCount());
+    }
+
+    @Override
+    public int getItemCount() {
+        return games.size();
+    }
+
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GameIconView.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GameIconView.java
new file mode 100644
index 00000000..df4d2a5c
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GameIconView.java
@@ -0,0 +1,42 @@
+package com.panda3ds.pandroid.view.gamesgrid;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
+
+public class GameIconView extends AppCompatImageView {
+
+    public GameIconView(@NonNull Context context) {
+        super(context);
+    }
+
+    public GameIconView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public GameIconView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int size = getMeasuredWidth();
+        setMeasuredDimension(size, size);
+    }
+
+    @Override
+    public void setImageBitmap(Bitmap bm) {
+        super.setImageBitmap(bm);
+        Drawable bitmapDrawable = getDrawable();
+        if (bitmapDrawable instanceof BitmapDrawable) {
+            bitmapDrawable.setFilterBitmap(false);
+        }
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GamesGridView.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GamesGridView.java
new file mode 100644
index 00000000..d218d467
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GamesGridView.java
@@ -0,0 +1,58 @@
+package com.panda3ds.pandroid.view.gamesgrid;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.panda3ds.pandroid.data.game.GameMetadata;
+
+import java.util.List;
+
+public class GamesGridView extends RecyclerView {
+    private int iconSize = 170;
+    private final GameAdapter adapter;
+
+    public GamesGridView(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public GamesGridView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public GamesGridView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        setLayoutManager(new AutoFitLayout());
+        setAdapter(adapter = new GameAdapter());
+    }
+
+    public void setGameList(List<GameMetadata> games) {
+        adapter.replace(games);
+    }
+
+    public void setIconSize(int iconSize) {
+        this.iconSize = iconSize;
+        requestLayout();
+        measure(MeasureSpec.EXACTLY, MeasureSpec.EXACTLY);
+    }
+
+    private final class AutoFitLayout extends GridLayoutManager {
+        public AutoFitLayout() {
+            super(GamesGridView.this.getContext(), 1);
+        }
+
+        @Override
+        public void onMeasure(@NonNull Recycler recycler, @NonNull State state, int widthSpec, int heightSpec) {
+            super.onMeasure(recycler, state, widthSpec, heightSpec);
+            int width = getMeasuredWidth();
+            int iconSize = (int) (GamesGridView.this.iconSize * getResources().getDisplayMetrics().density);
+            int iconCount = Math.max(1, width / iconSize);
+            if (getSpanCount() != iconCount)
+                setSpanCount(iconCount);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/ItemHolder.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/ItemHolder.java
new file mode 100644
index 00000000..d2ccba1f
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/ItemHolder.java
@@ -0,0 +1,28 @@
+package com.panda3ds.pandroid.view.gamesgrid;
+
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.data.game.GameMetadata;
+import com.panda3ds.pandroid.utils.GameUtils;
+
+class ItemHolder extends RecyclerView.ViewHolder {
+    public ItemHolder(@NonNull View itemView) {
+        super(itemView);
+    }
+
+    public void apply(GameMetadata game) {
+        ((AppCompatTextView) itemView.findViewById(R.id.title))
+                .setText(game.getTitle());
+        ((AppCompatTextView) itemView.findViewById(R.id.description))
+                .setText(game.getPublisher());
+
+        itemView.setOnClickListener((v) -> {
+            GameUtils.launch(v.getContext(), game);
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/ic_key_a.xml b/src/pandroid/app/src/main/res/drawable/ic_key_a.xml
new file mode 100644
index 00000000..3081c462
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_key_a.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M9.93,13.5h4.14L12,7.98zM20,2L4,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM15.95,18.5l-1.14,-3L9.17,15.5l-1.12,3L5.96,18.5l5.11,-13h1.86l5.11,13h-2.09z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_search.xml b/src/pandroid/app/src/main/res/drawable/ic_search.xml
new file mode 100644
index 00000000..a5687c63
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_search.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_settings.xml b/src/pandroid/app/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 00000000..298a5a1f
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_videogame.xml b/src/pandroid/app/src/main/res/drawable/ic_videogame.xml
new file mode 100644
index 00000000..8693be5f
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_videogame.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21,6L3,6c-1.1,0 -2,0.9 -2,2v8c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.1 -0.9,-2 -2,-2zM11,13L8,13v3L6,16v-3L3,13v-2h3L6,8h2v3h3v2zM15.5,15c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S18.67,9 19.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/search_bar_background.xml b/src/pandroid/app/src/main/res/drawable/search_bar_background.xml
new file mode 100644
index 00000000..44a1c5b4
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/search_bar_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#FFF"/>
+            <corners android:radius="9999dp"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/simple_card_background.xml b/src/pandroid/app/src/main/res/drawable/simple_card_background.xml
new file mode 100644
index 00000000..88845ce4
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/simple_card_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="8dp"/>
+            <solid android:color="#FFF"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/simple_card_button.xml b/src/pandroid/app/src/main/res/drawable/simple_card_button.xml
deleted file mode 100644
index d58e9c4f..00000000
--- a/src/pandroid/app/src/main/res/drawable/simple_card_button.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <solid android:color="#5FFF"/>
-            <stroke android:color="#6FFF" android:width="1dp"/>
-            <corners android:topLeftRadius="8dp" android:topRightRadius="8dp"
-                android:bottomLeftRadius="8dp"
-                android:bottomRightRadius="8dp"/>
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/simple_card_button_left.xml b/src/pandroid/app/src/main/res/drawable/simple_card_button_left.xml
deleted file mode 100644
index baf1f293..00000000
--- a/src/pandroid/app/src/main/res/drawable/simple_card_button_left.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <solid android:color="#5FFF"/>
-            <stroke android:color="#6FFF" android:width="1dp"/>
-            <corners android:topLeftRadius="8dp" android:topRightRadius="8dp"
-                android:bottomLeftRadius="8dp"
-                android:bottomRightRadius="16dp"/>
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/simple_card_button_right.xml b/src/pandroid/app/src/main/res/drawable/simple_card_button_right.xml
deleted file mode 100644
index 2f69341c..00000000
--- a/src/pandroid/app/src/main/res/drawable/simple_card_button_right.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <solid android:color="#5FFF"/>
-            <stroke android:color="#6FFF" android:width="1dp"/>
-            <corners android:topLeftRadius="8dp" android:topRightRadius="8dp"
-                android:bottomLeftRadius="16dp"
-                android:bottomRightRadius="8dp"/>
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/temp_thumb.jpg b/src/pandroid/app/src/main/res/drawable/temp_thumb.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e66782be3443db4a00c8ea22027718fb270ae2bf
GIT binary patch
literal 51816
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
J6lk=6|Jf$twEX}8

literal 0
HcmV?d00001

diff --git a/src/pandroid/app/src/main/res/layout-land/activity_main.xml b/src/pandroid/app/src/main/res/layout-land/activity_main.xml
new file mode 100644
index 00000000..ba552154
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout-land/activity_main.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".app.MainActivity">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragment_container"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/navigation"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+    <com.google.android.material.navigationrail.NavigationRailView
+        android:id="@+id/navigation"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:menu="@menu/main_activity_navigation"
+        app:labelVisibilityMode="selected"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/activity_input_map.xml b/src/pandroid/app/src/main/res/layout/activity_input_map.xml
new file mode 100644
index 00000000..cbacc64e
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/activity_input_map.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center">
+
+    <View
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:background="@drawable/ic_key_a"
+        android:backgroundTint="?colorOnSurfaceVariant"/>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        android:text="@string/press_any_key"/>
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/activity_main.xml b/src/pandroid/app/src/main/res/layout/activity_main.xml
index 89a17ce9..1facabd3 100644
--- a/src/pandroid/app/src/main/res/layout/activity_main.xml
+++ b/src/pandroid/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -7,16 +7,22 @@
     android:layout_height="match_parent"
     tools:context=".app.MainActivity">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="bottom|end"
-        android:padding="17dp">
-        <Button
-            android:id="@+id/load_rom"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:text="@string/load_rom"/>
-    </LinearLayout>
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragment_container"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/navigation"/>
 
-</FrameLayout>
\ No newline at end of file
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/navigation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/fragment_container"
+        app:labelVisibilityMode="selected"
+        app:menu="@menu/main_activity_navigation"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/activity_preference.xml b/src/pandroid/app/src/main/res/layout/activity_preference.xml
new file mode 100644
index 00000000..54b3d364
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/activity_preference.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        app:title="@string/settings" />
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/fragment_games.xml b/src/pandroid/app/src/main/res/layout/fragment_games.xml
new file mode 100644
index 00000000..ee69fdc8
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/fragment_games.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.panda3ds.pandroid.view.gamesgrid.GamesGridView
+        android:id="@+id/games"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="15dp"
+        android:paddingEnd="15dp"/>
+
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/add_rom"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="20dp"
+        android:layout_gravity="end|bottom"
+        android:src="@drawable/ic_add"
+        android:tint="?colorOnPrimary"
+        android:background="@drawable/simple_card_background"
+        android:backgroundTint="?colorPrimary"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/fragment_search.xml b/src/pandroid/app/src/main/res/layout/fragment_search.xml
new file mode 100644
index 00000000..5872a404
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/fragment_search.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:paddingHorizontal="20dp">
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/search_bar"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:hint="@string/search"
+            android:paddingEnd="10dp"
+            android:paddingStart="50dp"
+            android:textSize="16sp"
+            android:background="@drawable/search_bar_background"
+            android:backgroundTint="?colorSurfaceVariant" />
+
+        <View
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:background="@drawable/ic_search"
+            android:backgroundTint="?colorOnSurfaceVariant"
+            android:layout_gravity="start|center"
+            android:layout_marginStart="15dp"/>
+
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp">
+
+        <com.panda3ds.pandroid.view.gamesgrid.GamesGridView
+            android:id="@+id/games"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/holder_game.xml b/src/pandroid/app/src/main/res/layout/holder_game.xml
new file mode 100644
index 00000000..169896e6
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/holder_game.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="15dp">
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:cardCornerRadius="16dp">
+
+        <com.panda3ds.pandroid.view.gamesgrid.GameIconView
+            android:id="@+id/cover"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="centerCrop"
+            android:src="@drawable/temp_thumb"/>
+
+    </androidx.cardview.widget.CardView>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/app_name"
+        android:layout_marginTop="8dp"
+        android:textStyle="bold"
+        android:gravity="center"/>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/app_name"
+        android:textSize="10sp"
+        android:gravity="center"/>
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/preference_simple_about.xml b/src/pandroid/app/src/main/res/layout/preference_simple_about.xml
new file mode 100644
index 00000000..9364de36
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/preference_simple_about.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="320dp"
+    android:orientation="vertical"
+    android:gravity="center">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:layout_width="128dp"
+        android:layout_height="128dp"
+        android:src="@mipmap/ic_launcher"/>
+
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:textSize="24sp"
+        android:textColor="?colorOnSurface"/>
+
+    <TextView
+        android:id="@android:id/summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:alpha="0.5"
+        android:textColor="?colorOnSurface"/>
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/preference_start_item.xml b/src/pandroid/app/src/main/res/layout/preference_start_item.xml
new file mode 100644
index 00000000..35aa5554
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/preference_start_item.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="70dp"
+    android:layout_marginVertical="10dp"
+    android:layout_marginHorizontal="10dp"
+    android:background="@drawable/simple_card_background"
+    android:backgroundTint="?colorSurfaceVariant">
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:orientation="horizontal">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@android:id/icon"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:src="@drawable/ic_add"
+            android:tint="?colorOnSurfaceVariant"
+            android:padding="20dp"/>
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:layout_marginStart="5dp"
+            android:gravity="start|center">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?colorOnSurfaceVariant"
+                android:textSize="18sp"
+                android:textStyle="bold"
+                tools:text="@string/app_name"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@android:id/summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?colorOnSurfaceVariant"
+                tools:text="@string/app_name"
+                android:alpha="0.7"/>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/menu/main_activity_navigation.xml b/src/pandroid/app/src/main/res/menu/main_activity_navigation.xml
new file mode 100644
index 00000000..f457d8cf
--- /dev/null
+++ b/src/pandroid/app/src/main/res/menu/main_activity_navigation.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <group>
+        <item
+            android:id="@+id/games"
+            android:icon="@drawable/ic_videogame"
+            android:title="@string/games"
+            android:checkable="true"/>
+        <item
+            android:id="@+id/search"
+            android:icon="@drawable/ic_search"
+            android:title="@string/search"
+            android:checkable="true"/>
+
+        <item
+            android:id="@+id/settings"
+            android:icon="@drawable/ic_settings"
+            android:title="@string/settings"
+            android:checkable="true"/>
+    </group>
+
+</menu>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values-night/themes.xml b/src/pandroid/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 98dd320a..00000000
--- a/src/pandroid/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Base.Theme.Pandroid" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your dark theme here. -->
-        <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
-    </style>
-</resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 00000000..90e533a7
--- /dev/null
+++ b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">pandroid</string>
+    <string name="load_rom">Carregar ROM</string>
+    <string name="games">Jogos</string>
+    <string name="settings">Configurações</string>
+    <string name="search">Pesquisar</string>
+    <string name="unknown">Desconhecido</string>
+    <string name="left">Esquerda</string>
+    <string name="right">Direita</string>
+    <string name="up">Cima</string>
+    <string name="down">Baixo</string>
+    <string name="others">Outros</string>
+    <string name="press_any_key">Pressione qualquer tecla</string>
+    <string name="axis">Eixos</string>
+</resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/strings.xml b/src/pandroid/app/src/main/res/values/strings.xml
index f937ad5f..b7855eca 100644
--- a/src/pandroid/app/src/main/res/values/strings.xml
+++ b/src/pandroid/app/src/main/res/values/strings.xml
@@ -1,4 +1,17 @@
 <resources>
     <string name="app_name">pandroid</string>
     <string name="load_rom">Load ROM</string>
+    <string name="games">Games</string>
+    <string name="settings">Settings</string>
+    <string name="search">Search</string>
+    <string name="unknown">Unknown</string>
+
+    <string name="left">Left</string>
+    <string name="right">Right</string>
+    <string name="up">Up</string>
+    <string name="down">Down</string>
+
+    <string name="others">Others</string>
+    <string name="press_any_key">Press any key</string>
+    <string name="axis">Axis</string>
 </resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/styleable.xml b/src/pandroid/app/src/main/res/values/styleable.xml
index 69219724..32e51685 100644
--- a/src/pandroid/app/src/main/res/values/styleable.xml
+++ b/src/pandroid/app/src/main/res/values/styleable.xml
@@ -9,4 +9,7 @@
         <item name="android:backgroundTintMode">multiply</item>
         <item name="android:backgroundTint">#FFF</item>
     </style>
+    <style name="HiddenTextAppearance">
+        <item name="android:textSize">0.1px</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/xml/input_map_preferences.xml b/src/pandroid/app/src/main/res/xml/input_map_preferences.xml
new file mode 100644
index 00000000..25b224d1
--- /dev/null
+++ b/src/pandroid/app/src/main/res/xml/input_map_preferences.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        android:title="@string/axis"
+        app:iconSpaceReserved="false">
+
+        <Preference
+            app:title="@string/up"
+            app:key="AXIS_UP"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+        <Preference
+            app:title="@string/down"
+            app:key="AXIS_DOWN"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+        <Preference
+            app:title="@string/left"
+            app:key="AXIS_LEFT"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+        <Preference
+            app:title="@string/right"
+            app:key="AXIS_RIGHT"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="Dpad"
+        app:iconSpaceReserved="false">
+
+        <Preference
+            app:title="@string/up"
+            app:key="UP"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+        <Preference
+            app:title="@string/down"
+            app:key="DOWN"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+        <Preference
+            app:title="@string/left"
+            app:key="LEFT"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+        <Preference
+            app:title="@string/right"
+            app:key="RIGHT"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="Buttons"
+        app:iconSpaceReserved="false">
+
+        <Preference
+            app:title="A"
+            app:key="A"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+        <Preference
+            app:title="B"
+            app:key="B"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+        <Preference
+            app:title="X"
+            app:key="X"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+        <Preference
+            app:title="Y"
+            app:key="Y"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/others"
+        app:iconSpaceReserved="false">
+
+        <Preference
+            app:title="L"
+            app:key="L"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+        <Preference
+            app:title="R"
+            app:key="R"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+        <Preference
+            app:title="Start"
+            app:key="START"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+        <Preference
+            app:title="Select"
+            app:key="SELECT"
+            app:summary="none"
+            app:iconSpaceReserved="false"/>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/xml/start_preferences.xml b/src/pandroid/app/src/main/res/xml/start_preferences.xml
new file mode 100644
index 00000000..48c8d7a9
--- /dev/null
+++ b/src/pandroid/app/src/main/res/xml/start_preferences.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <Preference
+        android:title="@string/app_name"
+        android:enabled="false"
+        android:summary="1.0"
+        android:layout="@layout/preference_simple_about"/>
+
+    <Preference
+        android:key="inputMap"
+        android:icon="@drawable/ic_key_a"
+        android:title="Controller Mapping"
+        android:summary="Map physics controller or keyboard"
+        android:layout="@layout/preference_start_item"/>
+
+</PreferenceScreen>
\ No newline at end of file

From ae24bd0701863977f099cbbc2324b869dc6862ed Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sun, 17 Dec 2023 20:35:07 +0200
Subject: [PATCH 076/162] Optionally flush file in File::Write

---
 src/core/kernel/file_operations.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/core/kernel/file_operations.cpp b/src/core/kernel/file_operations.cpp
index c7837100..972190fa 100644
--- a/src/core/kernel/file_operations.cpp
+++ b/src/core/kernel/file_operations.cpp
@@ -148,6 +148,11 @@ void Kernel::writeFile(u32 messagePointer, Handle fileHandle) {
 	IOFile f(file->fd);
 	auto [success, bytesWritten] = f.writeBytes(data.get(), size);
 
+	// TODO: Should this check only the byte?
+	if (writeOption) {
+		f.flush();
+	}
+
 	mem.write32(messagePointer, IPC::responseHeader(0x0803, 2, 2));
 	if (!success) {
 		Helpers::panic("Kernel::WriteFile failed");

From a82c03312ad040f912d30835f580bb85b6f3e38d Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sun, 17 Dec 2023 20:47:50 +0200
Subject: [PATCH 077/162] Handle svcClose for file objects

---
 src/core/kernel/kernel.cpp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/core/kernel/kernel.cpp b/src/core/kernel/kernel.cpp
index cd691b48..04af5096 100644
--- a/src/core/kernel/kernel.cpp
+++ b/src/core/kernel/kernel.cpp
@@ -179,6 +179,30 @@ u32 Kernel::getTLSPointer() {
 // Result CloseHandle(Handle handle)
 void Kernel::svcCloseHandle() {
 	logSVC("CloseHandle(handle = %d) (Unimplemented)\n", regs[0]);
+	const Handle handle = regs[0];
+
+	KernelObject* object = getObject(handle);
+	if (object != nullptr) {
+		switch (object->type) {
+			// Close file descriptor when closing a file to prevent leaks and properly flush file contents
+			case KernelObjectType::File: {
+				FileSession* file = object->getData<FileSession>();
+				if (file->isOpen) {
+					file->isOpen = false;
+
+					if (file->fd != nullptr) {
+						fclose(file->fd);
+						file->fd = nullptr;
+					}
+				}
+				break;
+			}
+
+			default: break;
+		}
+	}
+
+	// Stub to always succeed for now
 	regs[0] = Result::Success;
 }
 

From 6c73fb13c536f58213e14ffc34ce8ee91cc2ae76 Mon Sep 17 00:00:00 2001
From: noumidev <139501014+noumidev@users.noreply.github.com>
Date: Mon, 18 Dec 2023 19:45:57 +0100
Subject: [PATCH 078/162] Proper handling of `SetApplicationCpuTimeLimit` with
 invalid parameters (#353)

* Add NotImplemented error code

* Add proper handling of SetAppCpuTimeLimit with invalid params

Set default time limit to 0

* Add AppCpuTimeLimit tests

* Replace spaces with tab
---
 include/result/result_os.hpp        |   3 +-
 src/core/services/apt.cpp           |  17 +-
 tests/AppCpuTimeLimit/Makefile      | 258 ++++++++++++++++++++++++++++
 tests/AppCpuTimeLimit/o3ds.png      | Bin 0 -> 11121 bytes
 tests/AppCpuTimeLimit/source/main.c |  55 ++++++
 5 files changed, 324 insertions(+), 9 deletions(-)
 create mode 100644 tests/AppCpuTimeLimit/Makefile
 create mode 100644 tests/AppCpuTimeLimit/o3ds.png
 create mode 100644 tests/AppCpuTimeLimit/source/main.c

diff --git a/include/result/result_os.hpp b/include/result/result_os.hpp
index 35d1f378..92025366 100644
--- a/include/result/result_os.hpp
+++ b/include/result/result_os.hpp
@@ -5,10 +5,11 @@ DEFINE_HORIZON_RESULT_MODULE(Result::OS, OS);
 
 namespace Result::OS {
 	DEFINE_HORIZON_RESULT(PortNameTooLong, 30, InvalidArgument, Usage);
-	DEFINE_HORIZON_RESULT(InvalidHandle, 1015, WrongArgument, Permanent);
 	DEFINE_HORIZON_RESULT(InvalidCombination, 1006, InvalidArgument, Usage);
 	DEFINE_HORIZON_RESULT(MisalignedAddress, 1009, InvalidArgument, Usage);
 	DEFINE_HORIZON_RESULT(MisalignedSize, 1010, InvalidArgument, Usage);
+	DEFINE_HORIZON_RESULT(NotImplemented, 1012, InvalidArgument, Usage);
+	DEFINE_HORIZON_RESULT(InvalidHandle, 1015, WrongArgument, Permanent);
 	DEFINE_HORIZON_RESULT(OutOfRange, 1021, InvalidArgument, Usage);
 	DEFINE_HORIZON_RESULT(Timeout, 1022, StatusChanged, Info);
 };  // namespace Result::OS
diff --git a/src/core/services/apt.cpp b/src/core/services/apt.cpp
index 9d02bf94..830b8377 100644
--- a/src/core/services/apt.cpp
+++ b/src/core/services/apt.cpp
@@ -34,8 +34,8 @@ namespace APTCommands {
 }
 
 void APTService::reset() {
-	// Set the default CPU time limit to 30%. Seems safe, as this is what Metroid 2 uses by default
-	cpuTimeLimit = 30;
+	// Set the default CPU time limit to 0%. Appears to be the default value on hardware
+	cpuTimeLimit = 0;
 
 	// Reset the handles for the various service objects
 	lockHandle = std::nullopt;
@@ -311,15 +311,16 @@ void APTService::setApplicationCpuTimeLimit(u32 messagePointer) {
 	u32 percentage = mem.read32(messagePointer + 8); // CPU time percentage between 5% and 89%
 	log("APT::SetApplicationCpuTimeLimit (percentage = %d%%)\n", percentage);
 
+	mem.write32(messagePointer, IPC::responseHeader(0x4F, 1, 0));
+
+	// If called with invalid parameters, the current time limit is left unchanged, and OS::NotImplemented is returned
 	if (percentage < 5 || percentage > 89 || fixed != 1) {
 		Helpers::warn("Invalid parameter passed to APT::SetApplicationCpuTimeLimit: (percentage, fixed) = (%d, %d)\n", percentage, fixed);
-		// TODO: Does the clamp operation happen? Verify with getApplicationCpuTimeLimit on hardware
-		percentage = std::clamp<u32>(percentage, 5, 89);
+		mem.write32(messagePointer + 4, Result::OS::NotImplemented);
+	} else {
+		mem.write32(messagePointer + 4, Result::Success);
+		cpuTimeLimit = percentage;
 	}
-
-	mem.write32(messagePointer, IPC::responseHeader(0x4F, 1, 0));
-	mem.write32(messagePointer + 4, Result::Success);
-	cpuTimeLimit = percentage;
 }
 
 void APTService::getApplicationCpuTimeLimit(u32 messagePointer) {
diff --git a/tests/AppCpuTimeLimit/Makefile b/tests/AppCpuTimeLimit/Makefile
new file mode 100644
index 00000000..9fc3a849
--- /dev/null
+++ b/tests/AppCpuTimeLimit/Makefile
@@ -0,0 +1,258 @@
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
+
+ifeq ($(strip $(DEVKITARM)),)
+$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
+endif
+
+TOPDIR ?= $(CURDIR)
+include $(DEVKITARM)/3ds_rules
+
+#---------------------------------------------------------------------------------
+# TARGET is the name of the output
+# BUILD is the directory where object files & intermediate files will be placed
+# SOURCES is a list of directories containing source code
+# DATA is a list of directories containing data files
+# INCLUDES is a list of directories containing header files
+# GRAPHICS is a list of directories containing graphics files
+# GFXBUILD is the directory where converted graphics files will be placed
+#   If set to $(BUILD), it will statically link in the converted
+#   files as if they were data files.
+#
+# NO_SMDH: if set to anything, no SMDH file is generated.
+# ROMFS is the directory which contains the RomFS, relative to the Makefile (Optional)
+# APP_TITLE is the name of the app stored in the SMDH file (Optional)
+# APP_DESCRIPTION is the description of the app stored in the SMDH file (Optional)
+# APP_AUTHOR is the author of the app stored in the SMDH file (Optional)
+# ICON is the filename of the icon (.png), relative to the project folder.
+#   If not set, it attempts to use one of the following (in this order):
+#     - <Project name>.png
+#     - icon.png
+#     - <libctru folder>/default_icon.png
+#---------------------------------------------------------------------------------
+TARGET		:=	AppCpuTimeLimit
+BUILD		:=	build
+SOURCES		:=	source
+DATA		:=	data
+INCLUDES	:=	include
+GRAPHICS	:=	gfx
+GFXBUILD	:=	$(BUILD)
+#ROMFS		:=	romfs
+#GFXBUILD	:=	$(ROMFS)/gfx
+APP_TITLE   := AppCpuTimeLimit
+APP_DESCRIPTION := Tests Set/GetAppCpuTimeLimit
+APP_AUTHOR  := noumidev
+
+#---------------------------------------------------------------------------------
+# options for code generation
+#---------------------------------------------------------------------------------
+ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft
+
+CFLAGS	:=	-g -Wall -O2 -mword-relocations \
+			-ffunction-sections \
+			$(ARCH)
+
+CFLAGS	+=	$(INCLUDE) -D__3DS__
+
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
+
+ASFLAGS	:=	-g $(ARCH)
+LDFLAGS	=	-specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
+
+LIBS	:= -lctru -lm
+
+#---------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level containing
+# include and lib
+#---------------------------------------------------------------------------------
+LIBDIRS	:= $(CTRULIB)
+
+
+#---------------------------------------------------------------------------------
+# no real need to edit anything past this point unless you need to add additional
+# rules for different file extensions
+#---------------------------------------------------------------------------------
+ifneq ($(BUILD),$(notdir $(CURDIR)))
+#---------------------------------------------------------------------------------
+
+export OUTPUT	:=	$(CURDIR)/$(TARGET)
+export TOPDIR	:=	$(CURDIR)
+
+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+			$(foreach dir,$(GRAPHICS),$(CURDIR)/$(dir)) \
+			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
+
+export DEPSDIR	:=	$(CURDIR)/$(BUILD)
+
+CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
+PICAFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.v.pica)))
+SHLISTFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.shlist)))
+GFXFILES	:=	$(foreach dir,$(GRAPHICS),$(notdir $(wildcard $(dir)/*.t3s)))
+BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
+
+#---------------------------------------------------------------------------------
+# use CXX for linking C++ projects, CC for standard C
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(CPPFILES)),)
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CC)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CXX)
+#---------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------
+
+#---------------------------------------------------------------------------------
+ifeq ($(GFXBUILD),$(BUILD))
+#---------------------------------------------------------------------------------
+export T3XFILES :=  $(GFXFILES:.t3s=.t3x)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+export ROMFS_T3XFILES	:=	$(patsubst %.t3s, $(GFXBUILD)/%.t3x, $(GFXFILES))
+export T3XHFILES		:=	$(patsubst %.t3s, $(BUILD)/%.h, $(GFXFILES))
+#---------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------
+
+export OFILES_SOURCES 	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+
+export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES)) \
+			$(PICAFILES:.v.pica=.shbin.o) $(SHLISTFILES:.shlist=.shbin.o) \
+			$(addsuffix .o,$(T3XFILES))
+
+export OFILES := $(OFILES_BIN) $(OFILES_SOURCES)
+
+export HFILES	:=	$(PICAFILES:.v.pica=_shbin.h) $(SHLISTFILES:.shlist=_shbin.h) \
+			$(addsuffix .h,$(subst .,_,$(BINFILES))) \
+			$(GFXFILES:.t3s=.h)
+
+export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
+			-I$(CURDIR)/$(BUILD)
+
+export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+
+export _3DSXDEPS	:=	$(if $(NO_SMDH),,$(OUTPUT).smdh)
+
+ifeq ($(strip $(ICON)),)
+	icons := $(wildcard *.png)
+	ifneq (,$(findstring $(TARGET).png,$(icons)))
+		export APP_ICON := $(TOPDIR)/$(TARGET).png
+	else
+		ifneq (,$(findstring icon.png,$(icons)))
+			export APP_ICON := $(TOPDIR)/icon.png
+		endif
+	endif
+else
+	export APP_ICON := $(TOPDIR)/$(ICON)
+endif
+
+ifeq ($(strip $(NO_SMDH)),)
+	export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh
+endif
+
+ifneq ($(ROMFS),)
+	export _3DSXFLAGS += --romfs=$(CURDIR)/$(ROMFS)
+endif
+
+.PHONY: all clean
+
+#---------------------------------------------------------------------------------
+all: $(BUILD) $(GFXBUILD) $(DEPSDIR) $(ROMFS_T3XFILES) $(T3XHFILES)
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+
+$(BUILD):
+	@mkdir -p $@
+
+ifneq ($(GFXBUILD),$(BUILD))
+$(GFXBUILD):
+	@mkdir -p $@
+endif
+
+ifneq ($(DEPSDIR),$(BUILD))
+$(DEPSDIR):
+	@mkdir -p $@
+endif
+
+#---------------------------------------------------------------------------------
+clean:
+	@echo clean ...
+	@rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf $(GFXBUILD)
+
+#---------------------------------------------------------------------------------
+$(GFXBUILD)/%.t3x	$(BUILD)/%.h	:	%.t3s
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@tex3ds -i $< -H $(BUILD)/$*.h -d $(DEPSDIR)/$*.d -o $(GFXBUILD)/$*.t3x
+
+#---------------------------------------------------------------------------------
+else
+
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+$(OUTPUT).3dsx	:	$(OUTPUT).elf $(_3DSXDEPS)
+
+$(OFILES_SOURCES) : $(HFILES)
+
+$(OUTPUT).elf	:	$(OFILES)
+
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data
+#---------------------------------------------------------------------------------
+%.bin.o	%_bin.h :	%.bin
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@$(bin2o)
+
+#---------------------------------------------------------------------------------
+.PRECIOUS	:	%.t3x
+#---------------------------------------------------------------------------------
+%.t3x.o	%_t3x.h :	%.t3x
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@$(bin2o)
+
+#---------------------------------------------------------------------------------
+# rules for assembling GPU shaders
+#---------------------------------------------------------------------------------
+define shader-as
+	$(eval CURBIN := $*.shbin)
+	$(eval DEPSFILE := $(DEPSDIR)/$*.shbin.d)
+	echo "$(CURBIN).o: $< $1" > $(DEPSFILE)
+	echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(CURBIN) | tr . _)`.h
+	echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h
+	echo "extern const u32" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(CURBIN) | tr . _)`.h
+	picasso -o $(CURBIN) $1
+	bin2s $(CURBIN) | $(AS) -o $*.shbin.o
+endef
+
+%.shbin.o %_shbin.h : %.v.pica %.g.pica
+	@echo $(notdir $^)
+	@$(call shader-as,$^)
+
+%.shbin.o %_shbin.h : %.v.pica
+	@echo $(notdir $<)
+	@$(call shader-as,$<)
+
+%.shbin.o %_shbin.h : %.shlist
+	@echo $(notdir $<)
+	@$(call shader-as,$(foreach file,$(shell cat $<),$(dir $<)$(file)))
+
+#---------------------------------------------------------------------------------
+%.t3x	%.h	:	%.t3s
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@tex3ds -i $< -H $*.h -d $*.d -o $*.t3x
+
+-include $(DEPSDIR)/*.d
+
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------
diff --git a/tests/AppCpuTimeLimit/o3ds.png b/tests/AppCpuTimeLimit/o3ds.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3da7ce7b18d022d4036af813cfa339c437cb897
GIT binary patch
literal 11121
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

literal 0
HcmV?d00001

diff --git a/tests/AppCpuTimeLimit/source/main.c b/tests/AppCpuTimeLimit/source/main.c
new file mode 100644
index 00000000..e61dc498
--- /dev/null
+++ b/tests/AppCpuTimeLimit/source/main.c
@@ -0,0 +1,55 @@
+#include <3ds.h>
+
+#include <stdio.h>
+
+int main(int argc, char **argv) {
+    gfxInitDefault();
+
+    consoleInit(GFX_TOP, NULL);
+
+    printf("--- APT::SetAppCpuTimeLimit ---\n\n");
+
+    // Get initial percentage
+    u32 percentage;
+    APT_GetAppCpuTimeLimit(&percentage);
+
+    printf("Initial percentage: %lu\n\n", percentage);
+
+    // Try all percentages from 0-100%, print failed calls
+    for (int i = 0; i <= 100; i++) {
+        const Result res = APT_SetAppCpuTimeLimit(i);
+
+        if (R_FAILED(res)) {
+            APT_GetAppCpuTimeLimit(&percentage);
+
+            printf("[%d:%lu:%lX]\n", i, percentage, res);
+        }
+    }
+
+    // Send command with invalid fixed value
+    u32 aptcmdbuf[16];
+    aptcmdbuf[0] = 0x004F0080;
+    aptcmdbuf[1] = 0;
+    aptcmdbuf[2] = 20;
+
+    aptSendCommand(aptcmdbuf);
+
+    printf("\nWith fixed = 0: [%08lX:%08lX]\n", aptcmdbuf[0], aptcmdbuf[1]);
+
+    while (aptMainLoop()) {
+        hidScanInput();
+
+        if ((hidKeysDown() & KEY_START) != 0) {
+            break;
+        }
+
+        gfxFlushBuffers();
+        gfxSwapBuffers();
+
+        gspWaitForVBlank();
+    }
+
+    gfxExit();
+
+    return 0;
+}

From c17c2307c744af954e3e3e053059405613f81955 Mon Sep 17 00:00:00 2001
From: GabrielBRDeveloper <gabriecacoal400@gmail.com>
Date: Mon, 18 Dec 2023 16:10:11 -0400
Subject: [PATCH 079/162] Final ui update

---
 .../panda3ds/pandroid/app/BaseActivity.java   |  41 ++++++++-
 .../pandroid/app/main/SettingsFragment.java   |   2 +
 .../preferences/AppearancePreferences.java    |  28 ++++++
 .../app/preferences/InputMapPreferences.java  |  25 +++++-
 .../pandroid/data/config/GlobalConfig.java    |   7 ++
 .../pandroid/data/game/GameMetadata.java      |   6 +-
 .../com/panda3ds/pandroid/input/InputMap.java |   2 +-
 .../panda3ds/pandroid/utils/FileUtils.java    |  27 ------
 .../pandroid/view/gamesgrid/ItemHolder.java   |   2 +
 .../SingleSelectionPreferences.java           |  84 ++++++++++++++++++
 .../bottom_navigation_indicator_tint.xml      |   5 ++
 .../main/res/color/text_secondary_dark.xml    |   9 ++
 .../main/res/color/text_secondary_light.xml   |   8 ++
 .../app/src/main/res/drawable/ic_done.xml     |   5 ++
 .../app/src/main/res/drawable/ic_theme.xml    |   5 ++
 .../app/src/main/res/drawable/temp_thumb.jpg  | Bin 51816 -> 0 bytes
 .../main/res/layout-land/activity_main.xml    |   3 +-
 .../app/src/main/res/layout/activity_main.xml |   3 +-
 .../app/src/main/res/layout/holder_game.xml   |   4 +-
 .../main/res/layout/preference_start_item.xml |   2 +-
 .../src/main/res/values-pt-rBR/strings.xml    |  11 +++
 .../app/src/main/res/values/strings.xml       |  11 +++
 .../app/src/main/res/values/styleable.xml     |  19 +++-
 .../app/src/main/res/values/themes.xml        |  69 +++++++++++++-
 .../main/res/xml/appearance_preference.xml    |  14 +++
 .../main/res/xml/input_map_preferences.xml    |  13 +++
 .../src/main/res/xml/start_preferences.xml    |  29 +++---
 27 files changed, 384 insertions(+), 50 deletions(-)
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java
 create mode 100644 src/pandroid/app/src/main/res/color/bottom_navigation_indicator_tint.xml
 create mode 100644 src/pandroid/app/src/main/res/color/text_secondary_dark.xml
 create mode 100644 src/pandroid/app/src/main/res/color/text_secondary_light.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_done.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_theme.xml
 delete mode 100644 src/pandroid/app/src/main/res/drawable/temp_thumb.jpg
 create mode 100644 src/pandroid/app/src/main/res/xml/appearance_preference.xml

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
index 72926b07..2462b595 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
@@ -1,5 +1,44 @@
 package com.panda3ds.pandroid.app;
 
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-public class BaseActivity extends AppCompatActivity {}
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.data.config.GlobalConfig;
+
+public class BaseActivity extends AppCompatActivity {
+    private int currentTheme = GlobalConfig.get(GlobalConfig.KEY_APP_THEME);
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        applyTheme();
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (GlobalConfig.get(GlobalConfig.KEY_APP_THEME) != currentTheme){
+            recreate();
+        }
+    }
+
+    private void applyTheme(){
+        switch (GlobalConfig.get(GlobalConfig.KEY_APP_THEME)){
+            case GlobalConfig.VALUE_THEME_ANDROID:
+                setTheme(R.style.Theme_Pandroid);
+                break;
+            case GlobalConfig.VALUE_THEME_LIGHT:
+                setTheme(R.style.Theme_Pandroid_Light);
+                break;
+            case GlobalConfig.VALUE_THEME_DARK:
+                setTheme(R.style.Theme_Pandroid_Dark);
+                break;
+            case GlobalConfig.VALUE_THEME_BLACK:
+                setTheme(R.style.Theme_Pandroid_Black);
+                break;
+        }
+        currentTheme = GlobalConfig.get(GlobalConfig.KEY_APP_THEME);
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java
index 22f888fe..08f2d70f 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java
@@ -8,11 +8,13 @@ import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.app.PreferenceActivity;
 import com.panda3ds.pandroid.app.base.BasePreferenceFragment;
 import com.panda3ds.pandroid.app.preferences.InputMapPreferences;
+import com.panda3ds.pandroid.app.preferences.AppearancePreferences;
 
 public class SettingsFragment extends BasePreferenceFragment {
     @Override
     public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
         setPreferencesFromResource(R.xml.start_preferences, rootKey);
         setItemClick("inputMap", (item) -> PreferenceActivity.launch(requireContext(), InputMapPreferences.class));
+        setItemClick("appearance", (item)-> PreferenceActivity.launch(requireContext(), AppearancePreferences.class));
     }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java
new file mode 100644
index 00000000..63f79ddb
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java
@@ -0,0 +1,28 @@
+package com.panda3ds.pandroid.app.preferences;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.app.BaseActivity;
+import com.panda3ds.pandroid.app.base.BasePreferenceFragment;
+import com.panda3ds.pandroid.data.config.GlobalConfig;
+import com.panda3ds.pandroid.view.preferences.SingleSelectionPreferences;
+
+public class AppearancePreferences extends BasePreferenceFragment {
+    @Override
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+        setPreferencesFromResource(R.xml.appearance_preference, rootKey);
+
+        ((BaseActivity) requireActivity()).getSupportActionBar().setTitle(R.string.appearance);
+
+        SingleSelectionPreferences themePreference = findPreference("theme");
+        themePreference.setSelectedItem(GlobalConfig.get(GlobalConfig.KEY_APP_THEME));
+        themePreference.setOnPreferenceChangeListener((preference, value) -> {
+            GlobalConfig.set(GlobalConfig.KEY_APP_THEME, (int) value);
+            return false;
+        });
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java
index 007920bd..00f031ac 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java
@@ -8,8 +8,10 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.Preference;
+import androidx.preference.SeekBarPreference;
 
 import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.app.BaseActivity;
 import com.panda3ds.pandroid.app.base.BasePreferenceFragment;
 import com.panda3ds.pandroid.input.InputMap;
 import com.panda3ds.pandroid.input.KeyName;
@@ -19,16 +21,35 @@ public class InputMapPreferences extends BasePreferenceFragment implements Activ
     private ActivityResultLauncher<String> requestKey;
     private String currentKey;
 
+    private SeekBarPreference deadZonePreference;
+
     @Override
     public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
         setPreferencesFromResource(R.xml.input_map_preferences, rootKey);
+
+        ((BaseActivity) requireActivity()).getSupportActionBar().setTitle(R.string.controller_mapping);
+
         for (KeyName key : KeyName.values()) {
-            if (key == KeyName.NULL) return;
+            if (key == KeyName.NULL) continue;
             setItemClick(key.name(), this::onItemPressed);
         }
+
+        deadZonePreference = getPreferenceScreen().findPreference("dead_zone");
+
+        deadZonePreference.setOnPreferenceChangeListener((preference, value) -> {
+            InputMap.setDeadZone(((int)value/100.0f));
+            refreshList();
+            return false;
+        });
+
         refreshList();
     }
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
@@ -56,6 +77,8 @@ public class InputMapPreferences extends BasePreferenceFragment implements Activ
     }
 
     private void refreshList() {
+        deadZonePreference.setValue((int)(InputMap.getDeadZone()*100));
+        deadZonePreference.setSummary(deadZonePreference.getValue()+"%");
         for (KeyName key : KeyName.values()) {
             if (key == KeyName.NULL) continue;
             findPreference(key.name()).setSummary(InputMap.relative(key));
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
index ddfee09e..95af3801 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
@@ -11,6 +11,13 @@ import java.io.Serializable;
 public class GlobalConfig {
     private static SharedPreferences data;
 
+    public static final int VALUE_THEME_ANDROID = 0;
+    public static final int VALUE_THEME_LIGHT = 1;
+    public static final int VALUE_THEME_DARK = 2;
+    public static final int VALUE_THEME_BLACK = 3;
+
+    public static final Key<Integer> KEY_APP_THEME = new Key<>("app.theme", VALUE_THEME_ANDROID);
+
     public static void initialize() {
         data = PandroidApplication.getAppContext()
                 .getSharedPreferences(Constants.PREF_GLOBAL_CONFIG, Context.MODE_PRIVATE);
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java
index 46407302..325ce1e7 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java
@@ -1,5 +1,7 @@
 package com.panda3ds.pandroid.data.game;
 
+import android.graphics.Bitmap;
+
 import java.util.UUID;
 
 public class GameMetadata {
@@ -7,7 +9,7 @@ public class GameMetadata {
     private final String id;
     private final String romPath;
     private final String title;
-    private final int[] icon = new int[48 * 48];
+    private transient final Bitmap icon = Bitmap.createBitmap(48,48, Bitmap.Config.RGB_565);
     private final String publisher;
     private final GameRegion[] regions = new GameRegion[]{GameRegion.None};
 
@@ -34,7 +36,7 @@ public class GameMetadata {
         return publisher;
     }
 
-    public int[] getIcon() {
+    public Bitmap getIcon() {
         return icon;
     }
 
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputMap.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputMap.java
index 6e61345c..b94ceaac 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputMap.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputMap.java
@@ -36,7 +36,7 @@ public class InputMap {
     }
 
     public static void setDeadZone(float value) {
-        data.edit().putFloat(KEY_DEAD_ZONE, Math.max(0, Math.min(1.0F, value))).apply();
+        data.edit().putFloat(KEY_DEAD_ZONE, Math.max(0.0f, Math.min(1.0f, value))).apply();
     }
 
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
index 4ebd7241..a22c4842 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
@@ -3,8 +3,6 @@ package com.panda3ds.pandroid.utils;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.ParcelFileDescriptor;
-import android.util.Log;
 
 import androidx.documentfile.provider.DocumentFile;
 
@@ -27,15 +25,6 @@ public class FileUtils {
         return file.getName();
     }
 
-    public static long getSize(String path) {
-        return DocumentFile.fromSingleUri(getContext(), parseUri(path)).length();
-    }
-
-
-    public static String getCacheDir() {
-        return getContext().getCacheDir().getAbsolutePath();
-    }
-
     public static void makeUriPermanent(String uri, String mode) {
 
         int flags = Intent.FLAG_GRANT_READ_URI_PERMISSION;
@@ -44,20 +33,4 @@ public class FileUtils {
 
         getContext().getContentResolver().takePersistableUriPermission(parseUri(uri), flags);
     }
-
-    public static int openContentUri(String path, String mode) {
-        try {
-            Uri uri = parseUri(path);
-            ParcelFileDescriptor descriptor = getContext().getContentResolver().openFileDescriptor(uri, mode);
-            int fd = descriptor.getFd();
-            descriptor.detachFd();
-            descriptor.close();
-            return fd;
-        } catch (Exception e) {
-            Log.e(Constants.LOG_TAG, "Error on openContentUri: " + e);
-        }
-
-        return -1;
-    }
-    
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/ItemHolder.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/ItemHolder.java
index d2ccba1f..54f86dae 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/ItemHolder.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/ItemHolder.java
@@ -18,6 +18,8 @@ class ItemHolder extends RecyclerView.ViewHolder {
     public void apply(GameMetadata game) {
         ((AppCompatTextView) itemView.findViewById(R.id.title))
                 .setText(game.getTitle());
+        ((GameIconView) itemView.findViewById(R.id.icon))
+                .setImageBitmap(game.getIcon());
         ((AppCompatTextView) itemView.findViewById(R.id.description))
                 .setText(game.getPublisher());
 
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java
new file mode 100644
index 00000000..f4ddfd12
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java
@@ -0,0 +1,84 @@
+package com.panda3ds.pandroid.view.preferences;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.utils.Constants;
+
+public class SingleSelectionPreferences extends PreferenceCategory implements Preference.OnPreferenceClickListener {
+    private final Drawable transparent = new ColorDrawable(Color.TRANSPARENT);
+    private final Drawable doneDrawable = ContextCompat.getDrawable(getContext(), R.drawable.ic_done);
+
+    public SingleSelectionPreferences(@NonNull Context context) {
+        super(context);
+    }
+
+    public SingleSelectionPreferences(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SingleSelectionPreferences(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public SingleSelectionPreferences(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    {
+        try {
+            TypedArray color = getContext().obtainStyledAttributes(new int[]{
+                    android.R.attr.textColorSecondary
+            });
+            doneDrawable.setTint(color.getColor(0, Color.RED));
+            color.recycle();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                color.close();
+            }
+        } catch (Exception e) {
+            Log.e(Constants.LOG_TAG, "Error on obtain text color secondary: ", e);
+        }
+    }
+
+    @Override
+    public void onAttached() {
+        super.onAttached();
+        for (int i = 0; i < getPreferenceCount();i++) {
+            getPreference(i).setOnPreferenceClickListener(this);
+        }
+    }
+
+    public void setSelectedItem(int index){
+        onPreferenceClick(getPreference(index));
+    }
+
+    @Override
+    public boolean onPreferenceClick(@NonNull Preference preference) {
+        int index = 0;
+        for (int i = 0; i < getPreferenceCount(); i++){
+            Preference item = getPreference(i);
+            if (item == preference){
+                index = i;
+                item.setIcon(R.drawable.ic_done);
+            } else {
+                item.setIcon(transparent);
+            }
+        }
+
+        callChangeListener(index);
+        return false;
+    }
+}
diff --git a/src/pandroid/app/src/main/res/color/bottom_navigation_indicator_tint.xml b/src/pandroid/app/src/main/res/color/bottom_navigation_indicator_tint.xml
new file mode 100644
index 00000000..e0fc9112
--- /dev/null
+++ b/src/pandroid/app/src/main/res/color/bottom_navigation_indicator_tint.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?colorOnSecondary" android:state_checked="true"/>
+    <item android:color="?colorOnSurface"/>
+</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/color/text_secondary_dark.xml b/src/pandroid/app/src/main/res/color/text_secondary_dark.xml
new file mode 100644
index 00000000..53a9cd15
--- /dev/null
+++ b/src/pandroid/app/src/main/res/color/text_secondary_dark.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:state_enabled="true" android:color="#000"/>
+
+    <item android:state_activated="false" android:color="#8000"/>
+    <item android:state_enabled="false" android:color="#8000"/>
+
+    <item android:color="#000"/>
+</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/color/text_secondary_light.xml b/src/pandroid/app/src/main/res/color/text_secondary_light.xml
new file mode 100644
index 00000000..35136058
--- /dev/null
+++ b/src/pandroid/app/src/main/res/color/text_secondary_light.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:state_enabled="true" android:color="#FFF"/>
+
+    <item android:state_activated="false" android:color="#AFFF"/>
+    <item android:state_enabled="false" android:color="#AFFF"/>
+    <item android:color="#FFF"/>
+</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/ic_done.xml b/src/pandroid/app/src/main/res/drawable/ic_done.xml
new file mode 100644
index 00000000..25e52514
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_done.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_theme.xml b/src/pandroid/app/src/main/res/drawable/ic_theme.xml
new file mode 100644
index 00000000..c3d2c7b3
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_theme.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/temp_thumb.jpg b/src/pandroid/app/src/main/res/drawable/temp_thumb.jpg
deleted file mode 100644
index e66782be3443db4a00c8ea22027718fb270ae2bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 51816
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
J6lk=6|Jf$twEX}8

diff --git a/src/pandroid/app/src/main/res/layout-land/activity_main.xml b/src/pandroid/app/src/main/res/layout-land/activity_main.xml
index ba552154..fa4cfbca 100644
--- a/src/pandroid/app/src/main/res/layout-land/activity_main.xml
+++ b/src/pandroid/app/src/main/res/layout-land/activity_main.xml
@@ -24,6 +24,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:menu="@menu/main_activity_navigation"
-        app:labelVisibilityMode="selected"/>
+        app:labelVisibilityMode="selected"
+        style="@style/ThemedNavigationBottom"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/activity_main.xml b/src/pandroid/app/src/main/res/layout/activity_main.xml
index 1facabd3..6de64020 100644
--- a/src/pandroid/app/src/main/res/layout/activity_main.xml
+++ b/src/pandroid/app/src/main/res/layout/activity_main.xml
@@ -23,6 +23,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/fragment_container"
         app:labelVisibilityMode="selected"
-        app:menu="@menu/main_activity_navigation"/>
+        app:menu="@menu/main_activity_navigation"
+        style="@style/ThemedNavigationBottom"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/holder_game.xml b/src/pandroid/app/src/main/res/layout/holder_game.xml
index 169896e6..b2d46d1b 100644
--- a/src/pandroid/app/src/main/res/layout/holder_game.xml
+++ b/src/pandroid/app/src/main/res/layout/holder_game.xml
@@ -13,11 +13,11 @@
         app:cardCornerRadius="16dp">
 
         <com.panda3ds.pandroid.view.gamesgrid.GameIconView
-            android:id="@+id/cover"
+            android:id="@+id/icon"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="centerCrop"
-            android:src="@drawable/temp_thumb"/>
+            android:background="?colorSurfaceVariant"/>
 
     </androidx.cardview.widget.CardView>
 
diff --git a/src/pandroid/app/src/main/res/layout/preference_start_item.xml b/src/pandroid/app/src/main/res/layout/preference_start_item.xml
index 35aa5554..ecb10436 100644
--- a/src/pandroid/app/src/main/res/layout/preference_start_item.xml
+++ b/src/pandroid/app/src/main/res/layout/preference_start_item.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="70dp"
-    android:layout_marginVertical="10dp"
+    android:layout_marginVertical="4dp"
     android:layout_marginHorizontal="10dp"
     android:background="@drawable/simple_card_background"
     android:backgroundTint="?colorSurfaceVariant">
diff --git a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
index 90e533a7..e57feab5 100644
--- a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
+++ b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
@@ -13,4 +13,15 @@
     <string name="others">Outros</string>
     <string name="press_any_key">Pressione qualquer tecla</string>
     <string name="axis">Eixos</string>
+    <string name="dead_zone">Zona Morta</string>
+    <string name="options">Opções</string>
+    <string name="pref_input_map_summary">Mapeie um controle ou teclado</string>
+    <string name="controller_mapping">Mapeamento de controle</string>
+    <string name="theme">Tema</string>
+    <string name="pref_appearance_summary">Defina a aparência do aplicativo</string>
+    <string name="appearance">Aparência</string>
+    <string name="theme_device">Mesmo do dispositivo</string>
+    <string name="light">Claro</string>
+    <string name="dark">Escuro</string>
+    <string name="black">Preto</string>
 </resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/strings.xml b/src/pandroid/app/src/main/res/values/strings.xml
index b7855eca..973e7acb 100644
--- a/src/pandroid/app/src/main/res/values/strings.xml
+++ b/src/pandroid/app/src/main/res/values/strings.xml
@@ -14,4 +14,15 @@
     <string name="others">Others</string>
     <string name="press_any_key">Press any key</string>
     <string name="axis">Axis</string>
+    <string name="dead_zone">Dead zone</string>
+    <string name="options">Options</string>
+    <string name="pref_input_map_summary">Map physics controller or keyboard</string>
+    <string name="controller_mapping">Controller Mapping</string>
+    <string name="theme">Theme</string>
+    <string name="pref_appearance_summary">Set application theme</string>
+    <string name="appearance">Appearance</string>
+    <string name="theme_device">Device</string>
+    <string name="light">Light</string>
+    <string name="dark">Dark</string>
+    <string name="black">Black</string>
 </resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/styleable.xml b/src/pandroid/app/src/main/res/values/styleable.xml
index 32e51685..c4bce805 100644
--- a/src/pandroid/app/src/main/res/values/styleable.xml
+++ b/src/pandroid/app/src/main/res/values/styleable.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+    <style name="Pandroid"/>
+
     <style name="ControllerStyle"/>
     <style name="ControllerStyle.SimpleButton">
         <item name="android:layout_height">19pt</item>
@@ -9,7 +12,19 @@
         <item name="android:backgroundTintMode">multiply</item>
         <item name="android:backgroundTint">#FFF</item>
     </style>
-    <style name="HiddenTextAppearance">
-        <item name="android:textSize">0.1px</item>
+    <style name="ThemedNavigationBottom">
+        <item name="itemActiveIndicatorStyle">@style/ThemedNavigationBottom.Indicator</item>
+        <item name="labelVisibilityMode">selected</item>
+        <item name="android:background">#0000</item>
+        <item name="itemIconTint">@color/bottom_navigation_indicator_tint</item>
     </style>
+    <style name="ThemedNavigationBottom.Indicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">
+        <item name="color">?colorSecondary</item>
+        <item name="android:color">?colorSecondary</item>
+    </style>
+
+    <style name="Pandroid.SeekbarPreference" parent="Preference.SeekBarPreference">
+        <item name="android:textColorSecondary">#C00</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/themes.xml b/src/pandroid/app/src/main/res/values/themes.xml
index 812da8ea..c7d79080 100644
--- a/src/pandroid/app/src/main/res/values/themes.xml
+++ b/src/pandroid/app/src/main/res/values/themes.xml
@@ -1,9 +1,76 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Base.Theme.Pandroid" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your light theme here. -->
         <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
+        <item name="alertDialogTheme">@style/Theme.AppCompat.DayNight.Dialog</item>
     </style>
 
     <style name="Theme.Pandroid" parent="Base.Theme.Pandroid" />
+
+    <style name="Theme.Pandroid.Custom" parent="Theme.Pandroid">
+        <item name="android:textColor">?colorOnSurface</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColorHint">?colorOnSurfaceVariant</item>
+        <item name="android:statusBarColor">?colorSurfaceVariant</item>
+        <item name="android:windowBackground">?colorSurface</item>
+        <item name="titleTextColor">?colorOnSurface</item>
+        <item name="hintTextColor">?colorOnSurfaceVariant</item>
+        <item name="colorOnBackground">?colorOnSurface</item>
+    </style>
+
+    <style name="Theme.Pandroid.Dark" parent="Theme.Pandroid.Custom">
+        <item name="colorSurface">#222</item>
+        <item name="colorOnSurface">#FFF</item>
+
+        <item name="colorSurfaceVariant">#333</item>
+        <item name="colorOnSurfaceVariant">#BBB</item>
+
+        <item name="colorPrimary">#FF6D00</item>
+        <item name="colorOnPrimary">#FFF</item>
+        
+        <item name="colorSecondary">#B37749</item>
+        <item name="colorOnSecondary">#FFF</item>
+
+        <item name="android:textColorPrimary">@color/text_secondary_light</item>
+        <item name="android:textColorSecondary">@color/text_secondary_light</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.Pandroid.Black" parent="Theme.Pandroid.Custom">
+        <item name="colorSurface">#000000</item>
+        <item name="colorOnSurface">#FFF</item>
+
+        <item name="colorSurfaceVariant">#202020</item>
+        <item name="colorOnSurfaceVariant">#BBB</item>
+
+        <item name="colorPrimary">#FF6D00</item>
+        <item name="colorOnPrimary">#000000</item>
+
+        <item name="colorSecondary">#B37749</item>
+        <item name="colorOnSecondary">#000000</item>
+
+        <item name="android:textColorPrimary">@color/text_secondary_light</item>
+        <item name="android:textColorSecondary">@color/text_secondary_light</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.Pandroid.Light" parent="Theme.Pandroid.Custom">
+        <item name="colorSurface">#FFF</item>
+        <item name="colorOnSurface">#111</item>
+
+        <item name="colorSurfaceVariant">#EEE</item>
+        <item name="colorOnSurfaceVariant">#222</item>
+
+        <item name="colorPrimary">#FF6D00</item>
+        <item name="colorOnPrimary">#FFF</item>
+
+        <item name="colorSecondary">#B37749</item>
+        <item name="colorOnSecondary">#FFF</item>
+
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:textColorPrimary">@color/text_secondary_dark</item>
+        <item name="android:textColorSecondary">@color/text_secondary_dark</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/xml/appearance_preference.xml b/src/pandroid/app/src/main/res/xml/appearance_preference.xml
new file mode 100644
index 00000000..dd1ed483
--- /dev/null
+++ b/src/pandroid/app/src/main/res/xml/appearance_preference.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.panda3ds.pandroid.view.preferences.SingleSelectionPreferences
+        app:key="theme"
+        app:title="@string/theme"
+        app:iconSpaceReserved="false">
+
+        <Preference app:title="@string/theme_device"/>
+        <Preference app:title="@string/light"/>
+        <Preference app:title="@string/dark"/>
+        <Preference app:title="@string/black"/>
+
+    </com.panda3ds.pandroid.view.preferences.SingleSelectionPreferences>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/xml/input_map_preferences.xml b/src/pandroid/app/src/main/res/xml/input_map_preferences.xml
index 25b224d1..fbb6221f 100644
--- a/src/pandroid/app/src/main/res/xml/input_map_preferences.xml
+++ b/src/pandroid/app/src/main/res/xml/input_map_preferences.xml
@@ -2,6 +2,19 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <PreferenceCategory
+        app:title="@string/options"
+        app:iconSpaceReserved="false">
+
+        <SeekBarPreference
+            android:key="dead_zone"
+            android:title="@string/dead_zone"
+            app:iconSpaceReserved="false"
+            android:summary="0%"
+            android:max="100"/>
+
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:title="@string/axis"
         app:iconSpaceReserved="false">
diff --git a/src/pandroid/app/src/main/res/xml/start_preferences.xml b/src/pandroid/app/src/main/res/xml/start_preferences.xml
index 48c8d7a9..57a6d32c 100644
--- a/src/pandroid/app/src/main/res/xml/start_preferences.xml
+++ b/src/pandroid/app/src/main/res/xml/start_preferences.xml
@@ -1,17 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:divider="#F00">
 
     <Preference
-        android:title="@string/app_name"
-        android:enabled="false"
-        android:summary="1.0"
-        android:layout="@layout/preference_simple_about"/>
+        app:title="@string/app_name"
+        app:enabled="false"
+        app:summary="1.0"
+        app:layout="@layout/preference_simple_about"/>
 
     <Preference
-        android:key="inputMap"
-        android:icon="@drawable/ic_key_a"
-        android:title="Controller Mapping"
-        android:summary="Map physics controller or keyboard"
-        android:layout="@layout/preference_start_item"/>
+        app:key="inputMap"
+        app:icon="@drawable/ic_key_a"
+        app:title="@string/controller_mapping"
+        app:summary="@string/pref_input_map_summary"
+        app:layout="@layout/preference_start_item"/>
+
+    <Preference
+        app:key="appearance"
+        app:icon="@drawable/ic_theme"
+        app:title="@string/appearance"
+        app:summary="@string/pref_appearance_summary"
+        app:layout="@layout/preference_start_item"/>
 
 </PreferenceScreen>
\ No newline at end of file

From d31e79ebc8cd2d12946f1d09707cbb84d0ab51c5 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 20 Dec 2023 19:32:07 +0200
Subject: [PATCH 080/162] [SelfNCCH] Fix reading from end of RomFS

---
 src/core/fs/archive_self_ncch.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/fs/archive_self_ncch.cpp b/src/core/fs/archive_self_ncch.cpp
index 9c911769..9369152d 100644
--- a/src/core/fs/archive_self_ncch.cpp
+++ b/src/core/fs/archive_self_ncch.cpp
@@ -83,7 +83,7 @@ std::optional<u32> SelfNCCHArchive::readFile(FileSession* file, u64 offset, u32
 			case PathType::RomFS: {
 				const u64 romFSSize = cxi->romFS.size;
 				const u64 romFSOffset = cxi->romFS.offset;
-				if ((offset >> 32) || (offset >= romFSSize) || (offset + size >= romFSSize)) {
+				if ((offset >> 32) || (offset >= romFSSize) || (offset + size > romFSSize)) {
 					Helpers::panic("Tried to read from SelfNCCH with too big of an offset");
 				}
 
@@ -95,7 +95,7 @@ std::optional<u32> SelfNCCHArchive::readFile(FileSession* file, u64 offset, u32
 			case PathType::ExeFS: {
 				const u64 exeFSSize = cxi->exeFS.size;
 				const u64 exeFSOffset = cxi->exeFS.offset;
-				if ((offset >> 32) || (offset >= exeFSSize) || (offset + size >= exeFSSize)) {
+				if ((offset >> 32) || (offset >= exeFSSize) || (offset + size > exeFSSize)) {
 					Helpers::panic("Tried to read from SelfNCCH with too big of an offset");
 				}
 
@@ -110,7 +110,7 @@ std::optional<u32> SelfNCCHArchive::readFile(FileSession* file, u64 offset, u32
 
 				const u64 romFSSize = cxi->romFS.size;
 				const u64 romFSOffset = cxi->romFS.offset;
-				if ((offset >> 32) || (offset >= romFSSize) || (offset + size >= romFSSize)) {
+				if ((offset >> 32) || (offset >= romFSSize) || (offset + size > romFSSize)) {
 					Helpers::panic("Tried to read from SelfNCCH with too big of an offset");
 				}
 
@@ -129,7 +129,7 @@ std::optional<u32> SelfNCCHArchive::readFile(FileSession* file, u64 offset, u32
 		switch (type) {
 			case PathType::RomFS: {
 				const u64 romFSSize = hb3dsx->romFSSize;
-				if ((offset >> 32) || (offset >= romFSSize) || (offset + size >= romFSSize)) {
+				if ((offset >> 32) || (offset >= romFSSize) || (offset + size > romFSSize)) {
 					Helpers::panic("Tried to read from SelfNCCH with too big of an offset");
 				}
 				break;
@@ -150,4 +150,4 @@ std::optional<u32> SelfNCCHArchive::readFile(FileSession* file, u64 offset, u32
 	}
 
 	return u32(bytesRead);
-}
\ No newline at end of file
+}

From 0f2fa4e738d9fab618b6f83cf10cb6bc09d27900 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 20 Dec 2023 19:33:38 +0200
Subject: [PATCH 081/162] Same for NCCH archive

---
 src/core/fs/archive_ncch.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/fs/archive_ncch.cpp b/src/core/fs/archive_ncch.cpp
index 5935a0c5..d5a4bab5 100644
--- a/src/core/fs/archive_ncch.cpp
+++ b/src/core/fs/archive_ncch.cpp
@@ -142,7 +142,7 @@ std::optional<u32> NCCHArchive::readFile(FileSession* file, u64 offset, u32 size
 		case PathType::RomFS: {
 			const u64 romFSSize = cxi->romFS.size;
 			const u64 romFSOffset = cxi->romFS.offset;
-			if ((offset >> 32) || (offset >= romFSSize) || (offset + size >= romFSSize)) {
+			if ((offset >> 32) || (offset >= romFSSize) || (offset + size > romFSSize)) {
 				Helpers::panic("Tried to read from NCCH with too big of an offset");
 			}
 
@@ -166,4 +166,4 @@ std::optional<u32> NCCHArchive::readFile(FileSession* file, u64 offset, u32 size
 	}
 
 	return u32(bytesRead);
-}
\ No newline at end of file
+}

From c0960dcccdc0026d1c86cc598bce6305ce3ada60 Mon Sep 17 00:00:00 2001
From: Gabriel <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Thu, 21 Dec 2023 02:31:22 -0400
Subject: [PATCH 082/162] Game metadata extractor and some fixes

- App not closing on back pressed (AlberInputListener.java)
- Extract SMDH from rom.
- Extract metadata from SMDH
---
 CMakeLists.txt                                |   1 +
 include/jni_driver.hpp                        |   7 +
 src/core/loader/ncch.cpp                      |   9 +
 src/jni_driver.cpp                            |  46 ++++-
 .../com/panda3ds/pandroid/AlberDriver.java    |  16 ++
 .../panda3ds/pandroid/app/GameActivity.java   |   2 +-
 .../pandroid/app/PandroidApplication.java     |   2 +
 .../pandroid/app/game/AlberInputListener.java |  14 ++
 .../pandroid/app/main/GamesFragment.java      |   2 +-
 .../java/com/panda3ds/pandroid/data/SMDH.java | 167 ++++++++++++++++++
 .../pandroid/data/game/GameMetadata.java      |  47 ++++-
 .../panda3ds/pandroid/utils/FileUtils.java    |  31 +++-
 .../panda3ds/pandroid/utils/GameUtils.java    |  42 ++++-
 13 files changed, 370 insertions(+), 16 deletions(-)
 create mode 100644 include/jni_driver.hpp
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/SMDH.java

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 732ec793..4b0410fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -389,6 +389,7 @@ if(ENABLE_VULKAN)
 endif()
 
 if(ANDROID)
+    set(HEADER_FILES ${HEADER_FILES} include/jni_driver.hpp)
     set(ALL_SOURCES ${ALL_SOURCES} src/jni_driver.cpp)
 endif()
 
diff --git a/include/jni_driver.hpp b/include/jni_driver.hpp
new file mode 100644
index 00000000..ff6230f1
--- /dev/null
+++ b/include/jni_driver.hpp
@@ -0,0 +1,7 @@
+#include <vector>
+#include "helpers.hpp"
+
+class Pandroid {
+public:
+    static void onSmdhLoaded(const std::vector<u8> &smdh);
+};
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 2546aa01..3e17790c 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -6,6 +6,10 @@
 #include "loader/ncch.hpp"
 #include "memory.hpp"
 
+#ifdef __ANDROID__
+#include "jni_driver.hpp"    
+#endif
+
 #include <iostream>
 
 bool NCCH::loadFromHeader(Crypto::AESEngine &aesEngine, IOFile& file, const FSInfo &info) {
@@ -255,6 +259,11 @@ bool NCCH::parseSMDH(const std::vector<u8>& smdh) {
 		return false;
 	}
 
+
+    #ifdef __ANDROID__
+    Pandroid::onSmdhLoaded(smdh);
+    #endif
+
 	// Bitmask showing which regions are allowed.
 	// https://www.3dbrew.org/wiki/SMDH#Region_Lockout
 	const u32 regionMasks = *(u32*)&smdh[0x2018];
diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index 8f5c352e..37d15787 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -8,10 +8,14 @@
 #include "renderer_gl/renderer_gl.hpp"
 #include "services/hid.hpp"
 
+#include "jni_driver.hpp"
+
 std::unique_ptr<Emulator> emulator = nullptr;
 HIDService* hidService = nullptr;
 RendererGL* renderer = nullptr;
 bool romLoaded = false;
+JavaVM* jvm = nullptr;
+const char* alberClass = "com/panda3ds/pandroid/AlberDriver";
 
 #define AlberFunction(type, name) JNIEXPORT type JNICALL Java_com_panda3ds_pandroid_AlberDriver_##name
 
@@ -20,7 +24,47 @@ void throwException(JNIEnv* env, const char* message) {
 	env->ThrowNew(exceptionClass, message);
 }
 
+JNIEnv* jniEnv(){
+    JNIEnv* env;
+    auto status = jvm->GetEnv((void **)&env, JNI_VERSION_1_6);
+    if(status == JNI_EDETACHED){
+        jvm->AttachCurrentThread(&env, nullptr);
+    } else if(status != JNI_OK){
+        throw std::runtime_error("Failed to obtain JNIEnv from JVM!!");
+    }
+    return env;
+}
+
+
+void Pandroid::onSmdhLoaded(const std::vector<u8> &smdh){
+    JNIEnv* env = jniEnv();
+    int size = smdh.size();
+    
+    jbyteArray result = env->NewByteArray(size);
+    
+    jbyte buffer[size];
+    
+    for(int i = 0; i < size; i++){
+        buffer[i] = (jbyte) smdh[i];
+    }
+    env->SetByteArrayRegion(result, 0, size, buffer);
+
+    
+    auto clazz = env->FindClass(alberClass);
+    auto method = env->GetStaticMethodID(clazz, "OnSmdhLoaded", "([B)V");
+
+    env->CallStaticVoidMethod(clazz, method, result);
+
+    env->DeleteLocalRef(result);
+}
+
+
 extern "C" {
+
+AlberFunction(void, Setup)(JNIEnv* env, jobject obj) {
+    env->GetJavaVM(&jvm);
+}
+
 AlberFunction(void, Initialize)(JNIEnv* env, jobject obj) {
 	emulator = std::make_unique<Emulator>();
 
@@ -73,4 +117,4 @@ AlberFunction(void, SetCirclepadAxis)(JNIEnv* env, jobject obj, jint x, jint y)
 }
 }
 
-#undef AlberFunction
\ No newline at end of file
+#undef AlberFunction
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
index 81bf29a5..fe808548 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
@@ -1,8 +1,16 @@
 package com.panda3ds.pandroid;
 
+import android.util.Log;
+
+import com.panda3ds.pandroid.data.SMDH;
+import com.panda3ds.pandroid.data.game.GameMetadata;
+import com.panda3ds.pandroid.utils.Constants;
+import com.panda3ds.pandroid.utils.GameUtils;
+
 public class AlberDriver {
 	AlberDriver() { super(); }
 
+	public static native void Setup();
 	public static native void Initialize();
 	public static native void RunFrame(int fbo);
 	public static native boolean HasRomLoaded();
@@ -15,5 +23,13 @@ public class AlberDriver {
 	public static native void TouchScreenUp();
 	public static native void TouchScreenDown(int x, int y);
 
+	public static void OnSmdhLoaded(byte[] buffer) {
+		Log.i(Constants.LOG_TAG, "Loaded rom smdh");
+		SMDH smdh = new SMDH(buffer);
+		GameMetadata game = GameUtils.getCurrentGame();
+		GameUtils.removeGame(game);
+		GameUtils.addGame(GameMetadata.applySMDH(game, smdh));
+	}
+
 	static { System.loadLibrary("Alber"); }
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
index 286a7ed3..fc622cd6 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -23,7 +23,7 @@ import com.panda3ds.pandroid.view.PandaLayoutController;
 
 public class GameActivity extends BaseActivity {
 
-	private final AlberInputListener inputListener = new AlberInputListener();
+	private final AlberInputListener inputListener = new AlberInputListener(this);
 
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
index 246decec..770e5e81 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
@@ -3,6 +3,7 @@ package com.panda3ds.pandroid.app;
 import android.app.Application;
 import android.content.Context;
 
+import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.data.config.GlobalConfig;
 import com.panda3ds.pandroid.input.InputMap;
 import com.panda3ds.pandroid.utils.GameUtils;
@@ -17,6 +18,7 @@ public class PandroidApplication extends Application {
         GlobalConfig.initialize();
         GameUtils.initialize();
         InputMap.initialize();
+        AlberDriver.Setup();
     }
 
     public static Context getAppContext() {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java
index c500d970..10167664 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java
@@ -1,5 +1,8 @@
 package com.panda3ds.pandroid.app.game;
 
+import android.app.Activity;
+import android.view.KeyEvent;
+
 import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.input.InputEvent;
 import com.panda3ds.pandroid.input.InputMap;
@@ -7,7 +10,13 @@ import com.panda3ds.pandroid.input.KeyName;
 import com.panda3ds.pandroid.lang.Function;
 import com.panda3ds.pandroid.math.Vector2;
 
+import java.util.Objects;
+
 public class AlberInputListener implements Function<InputEvent> {
+    private final Activity activity;
+    public AlberInputListener(Activity activity){
+        this.activity = activity;
+    }
 
     private final Vector2 axis = new Vector2(0.0f, 0.0f);
 
@@ -15,6 +24,11 @@ public class AlberInputListener implements Function<InputEvent> {
     public void run(InputEvent event) {
         KeyName key = InputMap.relative(event.getName());
 
+        if (Objects.equals(event.getName(), "KEYCODE_BACK")){
+            activity.onBackPressed();
+            return;
+        }
+
         if (key == KeyName.NULL)
             return;
 
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java
index ef49f6f1..c5f1acee 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java
@@ -51,7 +51,7 @@ public class GamesFragment extends Fragment implements ActivityResultCallback<Ur
             String uri = result.toString();
             if (GameUtils.findByRomPath(uri) == null) {
                 FileUtils.makeUriPermanent(uri, FileUtils.MODE_READ);
-                GameMetadata game = new GameMetadata(FileUtils.getName(uri).split("\\.")[0], uri, "Unknown");
+                GameMetadata game = new GameMetadata(uri, FileUtils.getName(uri).split("\\.")[0],"Unknown");
                 GameUtils.addGame(game);
                 GameUtils.launch(requireActivity(), game);
             }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/SMDH.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/SMDH.java
new file mode 100644
index 00000000..ae61cf4b
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/SMDH.java
@@ -0,0 +1,167 @@
+package com.panda3ds.pandroid.data;
+
+import android.graphics.Bitmap;
+
+import com.panda3ds.pandroid.data.game.GameRegion;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+
+public class SMDH {
+    private static final int ICON_SIZE = 48;
+    private static final int META_OFFSET = 0x8 ;
+    private static final int META_REGION_OFFSET = 0x2018;
+    private static final int IMAGE_OFFSET = 0x24C0;
+
+    private int metaIndex = 1;
+    private final ByteBuffer smdh;
+    private final String[] title = new String[12];
+    private final String[] publisher = new String[12];
+    private final int[] icon;
+
+    private final GameRegion region;
+
+    public SMDH(byte[] source){
+        smdh = ByteBuffer.allocate(source.length);
+        smdh.position(0);
+        smdh.put(source);
+        smdh.position(0);
+
+        region = parseRegion();
+        icon = parseIcon();
+        parseMeta();
+    }
+
+    private GameRegion parseRegion(){
+        GameRegion region;
+        smdh.position(META_REGION_OFFSET);
+
+        int regionMasks = smdh.get() & 0xFF;
+
+        final boolean japan = (regionMasks & 0x1) != 0;
+        final boolean northAmerica = (regionMasks & 0x2) != 0;
+        final boolean europe = (regionMasks & 0x4) != 0;
+        final boolean australia = (regionMasks & 0x8) != 0;
+        final boolean china = (regionMasks & 0x10) != 0;
+        final boolean korea = (regionMasks & 0x20) != 0;
+
+        final boolean taiwan = (regionMasks & 0x40) != 0;
+        if (northAmerica) {
+            region = GameRegion.NorthAmerican;
+        } else if (europe) {
+            region = GameRegion.Europe;
+        } else if (australia) {
+            region = GameRegion.Australia;
+        } else if (japan) {
+            region = GameRegion.Japan;
+            metaIndex = 0;
+        } else if (korea) {
+            metaIndex = 7;
+            region = GameRegion.Korean;
+        } else if (china) {
+            metaIndex = 6;
+            region = GameRegion.China;
+        } else if (taiwan) {
+            metaIndex = 6;
+            region = GameRegion.Taiwan;
+        } else {
+            region = GameRegion.None;
+        }
+
+        return region;
+    }
+
+    private void parseMeta(){
+
+        for (int i = 0; i < 12; i++){
+            smdh.position(META_OFFSET + (512*i) + 0x80);
+            byte[] data = new byte[0x100];
+            smdh.get(data);
+            title[i] = convertString(data).replaceAll("\n", " ");
+        }
+
+        for (int i = 0; i < 12; i++){
+            smdh.position(META_OFFSET + (512 * i) + 0x180);
+            byte[] data = new byte[0x80];
+            smdh.get(data);
+            publisher[i] = convertString(data);
+        }
+    }
+
+    private int[] parseIcon() {
+        int[] icon = new int[ICON_SIZE*ICON_SIZE];
+        smdh.position(0);
+
+        for (int x = 0; x < ICON_SIZE; x++) {
+            for (int y = 0; y < ICON_SIZE; y++) {
+                int curseY = y & ~7;
+                int curseX = x & ~7;
+
+                int i = mortonInterleave(x, y);
+                int offset = (i + (curseX * 8)) * 2;
+
+                offset = offset + curseY * 48 * 2;
+
+                smdh.position(offset + IMAGE_OFFSET);
+
+                int bit1 = smdh.get() & 0xFF;
+                int bit2 = smdh.get() & 0xFF;
+
+                int pixel = bit1 + (bit2 << 8);
+
+                int r = (((pixel & 0xF800) >> 11) << 3);
+                int g = (((pixel & 0x7E0) >> 5) << 2);
+                int b = (((pixel & 0x1F)) << 3);
+
+                //Convert to ARGB8888
+                icon[x + 48 * y] = 255 << 24 | (r & 255) << 16 | (g & 255) << 8 | (b & 255);
+            }
+        }
+        return icon;
+    }
+
+
+    public GameRegion getRegion() {
+        return region;
+    }
+
+    public Bitmap getBitmapIcon(){
+        Bitmap bitmap = Bitmap.createBitmap(ICON_SIZE, ICON_SIZE, Bitmap.Config.RGB_565);
+        bitmap.setPixels(icon,0,ICON_SIZE,0,0,ICON_SIZE,ICON_SIZE);
+        return bitmap;
+    }
+
+    public int[] getIcon() {
+        return icon;
+    }
+
+    public String getTitle(){
+        return title[metaIndex];
+    }
+
+    public String getPublisher(){
+        return publisher[metaIndex];
+    }
+
+    // SMDH stores string in UTF-16LE format
+    private static String convertString(byte[] buffer){
+        try {
+            return new String(buffer,0, buffer.length, StandardCharsets.UTF_16LE)
+                    .replaceAll("\0","");
+        } catch (Exception e){
+            return "";
+        }
+    }
+
+    // u and v are the UVs of the relevant texel
+    // Texture data is stored interleaved in Morton order, ie in a Z - order curve as shown here
+    // https://en.wikipedia.org/wiki/Z-order_curve
+    // Textures are split into 8x8 tiles.This function returns the in - tile offset depending on the u & v of the texel
+    // The in - tile offset is the sum of 2 offsets, one depending on the value of u % 8 and the other on the value of y % 8
+    // As documented in this picture https ://en.wikipedia.org/wiki/File:Moser%E2%80%93de_Bruijn_addition.svg
+    private static int mortonInterleave(int u, int v) {
+        int[] xlut = {0, 1, 4, 5, 16, 17, 20, 21};
+        int[] ylut = {0, 2, 8, 10, 32, 34, 40, 42};
+        return xlut[u % 8] + ylut[v % 8];
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java
index 325ce1e7..7e73872d 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java
@@ -1,23 +1,42 @@
 package com.panda3ds.pandroid.data.game;
 
 import android.graphics.Bitmap;
+import android.util.Log;
 
+import androidx.annotation.Nullable;
+
+import com.panda3ds.pandroid.data.SMDH;
+import com.panda3ds.pandroid.utils.Constants;
+import com.panda3ds.pandroid.utils.GameUtils;
+
+import java.util.Objects;
 import java.util.UUID;
 
 public class GameMetadata {
-
     private final String id;
     private final String romPath;
     private final String title;
-    private transient final Bitmap icon = Bitmap.createBitmap(48,48, Bitmap.Config.RGB_565);
     private final String publisher;
-    private final GameRegion[] regions = new GameRegion[]{GameRegion.None};
+    private final GameRegion[] regions;
+    private transient Bitmap icon;
 
-    public GameMetadata(String title, String romPath, String publisher) {
-        this.id = UUID.randomUUID().toString();
+    private GameMetadata(String id, String romPath, String title, String publisher, Bitmap icon, GameRegion[] regions){
+        this.id = id;
         this.title = title;
         this.publisher = publisher;
         this.romPath = romPath;
+        this.regions = regions;
+        if (icon != null) {
+            GameUtils.setGameIcon(id, icon);
+        }
+    }
+
+    public GameMetadata(String romPath,String title, String publisher, GameRegion[] regions) {
+        this(UUID.randomUUID().toString(), romPath, title, publisher, null, regions);
+    }
+
+    public GameMetadata(String romPath,String title, String publisher){
+        this(romPath,title, publisher, new GameRegion[]{GameRegion.None});
     }
 
     public String getRomPath() {
@@ -37,10 +56,28 @@ public class GameMetadata {
     }
 
     public Bitmap getIcon() {
+        if (icon == null){
+            icon = GameUtils.loadGameIcon(id);
+        }
         return icon;
     }
 
     public GameRegion[] getRegions() {
         return regions;
     }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj instanceof GameMetadata){
+            return Objects.equals(((GameMetadata) obj).id, id);
+        }
+        return false;
+    }
+
+    public static GameMetadata applySMDH(GameMetadata meta, SMDH smdh){
+        Bitmap icon = smdh.getBitmapIcon();
+        GameMetadata newMeta = new GameMetadata(meta.getId(), meta.getRomPath(), smdh.getTitle(), smdh.getPublisher(), icon, new GameRegion[]{smdh.getRegion()});
+        icon.recycle();
+        return newMeta;
+    }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
index a22c4842..652eb6fd 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
@@ -8,12 +8,16 @@ import androidx.documentfile.provider.DocumentFile;
 
 import com.panda3ds.pandroid.app.PandroidApplication;
 
+import java.io.File;
+
 public class FileUtils {
-
     public static final String MODE_READ = "r";
-
-    private static Uri parseUri(String value) {
-        return Uri.parse(value);
+    private static DocumentFile parseFile(String path){
+        if (path.startsWith("/")){
+            return DocumentFile.fromFile(new File(path));
+        }
+        Uri uri = Uri.parse(path);
+        return DocumentFile.fromSingleUri(getContext(), uri);
     }
 
     private static Context getContext() {
@@ -21,8 +25,21 @@ public class FileUtils {
     }
 
     public static String getName(String path) {
-        DocumentFile file = DocumentFile.fromSingleUri(getContext(), parseUri(path));
-        return file.getName();
+        return parseFile(path).getName();
+    }
+
+    public static boolean createFolder(String path, String name){
+        DocumentFile folder = parseFile(path);
+
+        if (folder.findFile(name) != null){
+            return true;
+        }
+
+        return folder.createDirectory(name) != null;
+    }
+
+    public static String getPrivatePath(){
+        return getContext().getFilesDir().getAbsolutePath();
     }
 
     public static void makeUriPermanent(String uri, String mode) {
@@ -31,6 +48,6 @@ public class FileUtils {
         if (mode.toLowerCase().contains("w"))
             flags &= Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
 
-        getContext().getContentResolver().takePersistableUriPermission(parseUri(uri), flags);
+        getContext().getContentResolver().takePersistableUriPermission(Uri.parse(uri), flags);
     }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
index e4c2f53e..49d4f6f2 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
@@ -3,27 +3,39 @@ package com.panda3ds.pandroid.utils;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.net.Uri;
+import android.util.Log;
 
 import com.google.gson.Gson;
 import com.panda3ds.pandroid.app.GameActivity;
 import com.panda3ds.pandroid.app.PandroidApplication;
 import com.panda3ds.pandroid.data.game.GameMetadata;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Objects;
 
 public class GameUtils {
+    private static final Bitmap DEFAULT_ICON = Bitmap.createBitmap(48,48, Bitmap.Config.ARGB_8888);
     private static final String KEY_GAME_LIST = "gameList";
     private static final ArrayList<GameMetadata> games = new ArrayList<>();
     private static SharedPreferences data;
     private static final Gson gson = new Gson();
 
+    private static GameMetadata currentGame;
+
     public static void initialize() {
         data = PandroidApplication.getAppContext().getSharedPreferences(Constants.PREF_GAME_UTILS, Context.MODE_PRIVATE);
 
         GameMetadata[] list = gson.fromJson(data.getString(KEY_GAME_LIST, "[]"), GameMetadata[].class);
+
+        for (GameMetadata game: list)
+            game.getIcon();
+
         games.clear();
         games.addAll(Arrays.asList(list));
     }
@@ -38,17 +50,22 @@ public class GameUtils {
     }
 
     public static void launch(Context context, GameMetadata game) {
+        currentGame = game;
         String path = PathUtils.getPath(Uri.parse(game.getRomPath()));
         context.startActivity(new Intent(context, GameActivity.class).putExtra(Constants.ACTIVITY_PARAMETER_PATH, path));
     }
 
+    public static GameMetadata getCurrentGame() {
+        return currentGame;
+    }
+
     public static void removeGame(GameMetadata game) {
         games.remove(game);
         saveAll();
     }
 
     public static void addGame(GameMetadata game) {
-        games.add(game);
+        games.add(0,game);
         saveAll();
     }
 
@@ -61,4 +78,27 @@ public class GameUtils {
                 .putString(KEY_GAME_LIST, gson.toJson(games.toArray(new GameMetadata[0])))
                 .apply();
     }
+
+    public static void setGameIcon(String id, Bitmap icon) {
+        try {
+            File file = new File(FileUtils.getPrivatePath()+"/cache_icons/", id+".png");
+            file.getParentFile().mkdirs();
+            FileOutputStream o = new FileOutputStream(file);
+            icon.compress(Bitmap.CompressFormat.PNG, 100, o);
+            o.close();
+        } catch (Exception e){
+            Log.e(Constants.LOG_TAG, "Error on save game icon: ", e);
+        }
+    }
+
+    public static Bitmap loadGameIcon(String id) {
+        try {
+            File file = new File(FileUtils.getPrivatePath()+"/cache_icons/"+id+".png");
+            if (file.exists())
+                return BitmapFactory.decodeFile(file.getAbsolutePath());
+        } catch (Exception e){
+            Log.e(Constants.LOG_TAG, "Error on load game icon: ", e);
+        }
+        return DEFAULT_ICON;
+    }
 }

From 8b93ef76ac6e33e80270157113584c1cc55b1bd6 Mon Sep 17 00:00:00 2001
From: Gabriel <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Thu, 21 Dec 2023 14:48:35 -0400
Subject: [PATCH 083/162] Use vector directly on jni_driver.cpp

---
 src/jni_driver.cpp                                       | 7 +------
 .../src/main/java/com/panda3ds/pandroid/AlberDriver.java | 3 ++-
 .../java/com/panda3ds/pandroid/app/GameActivity.java     | 9 +++++++++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index 37d15787..806a0074 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -42,12 +42,7 @@ void Pandroid::onSmdhLoaded(const std::vector<u8> &smdh){
     
     jbyteArray result = env->NewByteArray(size);
     
-    jbyte buffer[size];
-    
-    for(int i = 0; i < size; i++){
-        buffer[i] = (jbyte) smdh[i];
-    }
-    env->SetByteArrayRegion(result, 0, size, buffer);
+    env->SetByteArrayRegion(result, 0, size, (jbyte*)smdh.data());
 
     
     auto clazz = env->FindClass(alberClass);
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
index fe808548..2a496693 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
@@ -24,8 +24,9 @@ public class AlberDriver {
 	public static native void TouchScreenDown(int x, int y);
 
 	public static void OnSmdhLoaded(byte[] buffer) {
-		Log.i(Constants.LOG_TAG, "Loaded rom smdh");
 		SMDH smdh = new SMDH(buffer);
+		Log.i(Constants.LOG_TAG, "Loaded rom SDMH");
+		Log.i(Constants.LOG_TAG, String.format("Are you playing '%s' published by '%s'", smdh.getTitle(), smdh.getPublisher()));
 		GameMetadata game = GameUtils.getCurrentGame();
 		GameUtils.removeGame(game);
 		GameUtils.addGame(GameMetadata.applySMDH(game, smdh));
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
index fc622cd6..9c241eba 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -13,6 +13,7 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
+import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.app.game.AlberInputListener;
 import com.panda3ds.pandroid.input.InputHandler;
@@ -80,4 +81,12 @@ public class GameActivity extends BaseActivity {
 
 		return super.dispatchGenericMotionEvent(ev);
 	}
+
+	@Override
+	protected void onDestroy() {
+		if(AlberDriver.HasRomLoaded()){
+			AlberDriver.Finalize();
+		}
+		super.onDestroy();
+	}
 }

From cad4174845c8cbecd37cb1c288d170c84b7ab557 Mon Sep 17 00:00:00 2001
From: Gabriel <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Thu, 21 Dec 2023 15:35:59 -0400
Subject: [PATCH 084/162] Apply SAF for write icon file

replace fs/io by SAF implementation
---
 .../panda3ds/pandroid/utils/FileUtils.java    | 37 +++++++++++++++----
 .../panda3ds/pandroid/utils/GameUtils.java    | 26 ++++++++-----
 2 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
index 652eb6fd..e1fe098a 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
@@ -9,6 +9,9 @@ import androidx.documentfile.provider.DocumentFile;
 import com.panda3ds.pandroid.app.PandroidApplication;
 
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.OutputStream;
 
 public class FileUtils {
     public static final String MODE_READ = "r";
@@ -28,18 +31,38 @@ public class FileUtils {
         return parseFile(path).getName();
     }
 
-    public static boolean createFolder(String path, String name){
-        DocumentFile folder = parseFile(path);
-
-        if (folder.findFile(name) != null){
-            return true;
+    public static String getPrivatePath(){
+        File file = getContext().getFilesDir();
+        if (!file.exists()){
+            file.mkdirs();
         }
+        return file.getAbsolutePath();
+    }
 
+    public static boolean exists(String path){
+        return parseFile(path).exists();
+    }
+
+    public static boolean createDir(String path, String name){
+        DocumentFile folder = parseFile(path);
+        if (folder.findFile(name) != null)
+            return true;
         return folder.createDirectory(name) != null;
     }
 
-    public static String getPrivatePath(){
-        return getContext().getFilesDir().getAbsolutePath();
+    public static boolean createFile(String path, String name){
+        DocumentFile folder = parseFile(path);
+        if (folder.findFile(name) != null)
+            return true;
+        return folder.createFile("application/octet-stream", name) != null;
+    }
+
+    public static InputStream getInputStream(String path) throws FileNotFoundException {
+        return getContext().getContentResolver().openInputStream(parseFile(path).getUri());
+    }
+
+    public static OutputStream getOutputStream(String path) throws FileNotFoundException {
+        return getContext().getContentResolver().openOutputStream(parseFile(path).getUri());
     }
 
     public static void makeUriPermanent(String uri, String mode) {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
index 49d4f6f2..32f7c2a5 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
@@ -13,8 +13,8 @@ import com.panda3ds.pandroid.app.GameActivity;
 import com.panda3ds.pandroid.app.PandroidApplication;
 import com.panda3ds.pandroid.data.game.GameMetadata;
 
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Objects;
@@ -81,11 +81,13 @@ public class GameUtils {
 
     public static void setGameIcon(String id, Bitmap icon) {
         try {
-            File file = new File(FileUtils.getPrivatePath()+"/cache_icons/", id+".png");
-            file.getParentFile().mkdirs();
-            FileOutputStream o = new FileOutputStream(file);
-            icon.compress(Bitmap.CompressFormat.PNG, 100, o);
-            o.close();
+            String appPath = FileUtils.getPrivatePath();
+            FileUtils.createDir(appPath, "cache_icons");
+            FileUtils.createFile(appPath+"/cache_icons/", id+".png");
+
+            OutputStream output = FileUtils.getOutputStream(appPath+"/cache_icons/"+id+".png");
+            icon.compress(Bitmap.CompressFormat.PNG, 100, output);
+            output.close();
         } catch (Exception e){
             Log.e(Constants.LOG_TAG, "Error on save game icon: ", e);
         }
@@ -93,9 +95,13 @@ public class GameUtils {
 
     public static Bitmap loadGameIcon(String id) {
         try {
-            File file = new File(FileUtils.getPrivatePath()+"/cache_icons/"+id+".png");
-            if (file.exists())
-                return BitmapFactory.decodeFile(file.getAbsolutePath());
+            String path = FileUtils.getPrivatePath()+"/cache_icons/"+id+".png";
+            if (FileUtils.exists(path)) {
+                InputStream stream = FileUtils.getInputStream(path);
+                Bitmap image = BitmapFactory.decodeStream(stream);
+                stream.close();
+                return image;
+            }
         } catch (Exception e){
             Log.e(Constants.LOG_TAG, "Error on load game icon: ", e);
         }

From b2c653ed1bc3741c578bd3d3ed5e0b7cc56eb0af Mon Sep 17 00:00:00 2001
From: Gabriel <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Thu, 21 Dec 2023 23:02:06 -0400
Subject: [PATCH 085/162] Fix SAF mime-type

---
 .../src/main/java/com/panda3ds/pandroid/utils/FileUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
index e1fe098a..7e926eb3 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
@@ -54,7 +54,7 @@ public class FileUtils {
         DocumentFile folder = parseFile(path);
         if (folder.findFile(name) != null)
             return true;
-        return folder.createFile("application/octet-stream", name) != null;
+        return folder.createFile("", name) != null;
     }
 
     public static InputStream getInputStream(String path) throws FileNotFoundException {

From 56398acdc9cbfb9e44c149140c0a4bf7d0c401a8 Mon Sep 17 00:00:00 2001
From: Gabriel <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Fri, 22 Dec 2023 01:05:08 -0400
Subject: [PATCH 086/162] Replace SharedPreferences by Gson

Replace all SharedPreferences use by gson
---
 .../pandroid/data/GsonConfigParser.java       | 37 ++++++++++
 .../pandroid/data/config/GlobalConfig.java    | 56 ++++++++-------
 .../com/panda3ds/pandroid/input/InputMap.java | 30 ++++----
 .../java/com/panda3ds/pandroid/lang/Task.java | 20 ++++++
 .../panda3ds/pandroid/utils/FileUtils.java    | 68 ++++++++++++++++---
 .../panda3ds/pandroid/utils/GameUtils.java    | 56 +++++++--------
 6 files changed, 189 insertions(+), 78 deletions(-)
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java
new file mode 100644
index 00000000..76ffdbac
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java
@@ -0,0 +1,37 @@
+package com.panda3ds.pandroid.data;
+
+import com.google.gson.Gson;
+import com.panda3ds.pandroid.lang.Task;
+import com.panda3ds.pandroid.utils.FileUtils;
+
+public class GsonConfigParser {
+    private final Gson gson = new Gson();
+    private final String name;
+
+    public GsonConfigParser(String name){
+        this.name = name;
+    }
+
+    private String getPath(){
+        return FileUtils.getConfigPath()+"/"+name+".json";
+    }
+
+    public void save(Object data){
+        synchronized (this) {
+            new Task(() -> {
+                String json = gson.toJson(data);
+                FileUtils.writeTextFile(FileUtils.getConfigPath(), name + ".json", json);
+            }).runSync();
+        }
+    }
+
+    public <T> T load(Class<T> clazz){
+        String[] content = new String[]{"{}"};
+        new Task(()->{
+            if (FileUtils.exists(getPath())){
+                content[0] = FileUtils.readTextFile(getPath());
+            }
+        }).runSync();
+        return gson.fromJson(content[0], clazz);
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
index 127f2ffa..0ee41dde 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
@@ -1,58 +1,56 @@
 package com.panda3ds.pandroid.data.config;
 
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import com.panda3ds.pandroid.app.PandroidApplication;
+import com.panda3ds.pandroid.data.GsonConfigParser;
 import com.panda3ds.pandroid.utils.Constants;
 
 import java.io.Serializable;
+import java.util.HashMap;
 
 public class GlobalConfig {
-    private static SharedPreferences data;
+
+    private static final GsonConfigParser parser = new GsonConfigParser(Constants.PREF_GLOBAL_CONFIG);
 
     public static final int VALUE_THEME_ANDROID = 0;
     public static final int VALUE_THEME_LIGHT = 1;
     public static final int VALUE_THEME_DARK = 2;
     public static final int VALUE_THEME_BLACK = 3;
 
+    public static DataModel data;
+
     public static final Key<Integer> KEY_APP_THEME = new Key<>("app.theme", VALUE_THEME_ANDROID);
 
     public static void initialize() {
-        data = PandroidApplication.getAppContext()
-                .getSharedPreferences(Constants.PREF_GLOBAL_CONFIG, Context.MODE_PRIVATE);
+        data = parser.load(DataModel.class);
     }
 
     public static <T extends Serializable> T get(Key<T> key) {
         Serializable value;
+
+        if (!data.configs.containsKey(key.name)){
+            return key.defaultValue;
+        }
+
         if (key.defaultValue instanceof String) {
-            value = data.getString(key.name, (String) key.defaultValue);
+            value = (String) data.configs.get(key.name);
         } else if (key.defaultValue instanceof Integer) {
-            value = data.getInt(key.name, (int) key.defaultValue);
+            value = ((Number) data.get(key.name)).intValue();
         } else if (key.defaultValue instanceof Boolean) {
-            value = data.getBoolean(key.name, (boolean) key.defaultValue);
+            value = (boolean) data.get(key.name);
         } else if (key.defaultValue instanceof Long) {
-            value = data.getLong(key.name, (long) key.defaultValue);
+            value = ((Number) data.get(key.name)).longValue();
         } else {
-            value = data.getFloat(key.name, (float) key.defaultValue);
+            value = ((Number) data.get(key.name)).floatValue();
         }
         return (T) value;
     }
 
     public static synchronized <T extends Serializable> void set(Key<T> key, T value) {
-        if (value instanceof String) {
-            data.edit().putString(key.name, (String) value).apply();
-        } else if (value instanceof Integer) {
-            data.edit().putInt(key.name, (int) value).apply();
-        } else if (value instanceof Boolean) {
-            data.edit().putBoolean(key.name, (boolean) value).apply();
-        } else if (value instanceof Long) {
-            data.edit().putLong(key.name, (long) value).apply();
-        } else if (value instanceof Float) {
-            data.edit().putFloat(key.name, (float) value).apply();
-        } else {
-            throw new IllegalArgumentException("Invalid global config value instance");
-        }
+        data.configs.put(key.name, value);
+        writeChanges();
+    }
+
+    private static void writeChanges(){
+        parser.save(data);
     }
 
     private static class Key<T extends Serializable> {
@@ -64,4 +62,12 @@ public class GlobalConfig {
             this.defaultValue = defaultValue;
         }
     }
+
+    private static class DataModel {
+        private final HashMap<String, Object> configs = new HashMap<>();
+
+        public Object get(String key){
+            return configs.get(key);
+        }
+    }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputMap.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputMap.java
index b94ceaac..ab2cdd04 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputMap.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputMap.java
@@ -1,30 +1,27 @@
 package com.panda3ds.pandroid.input;
 
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import com.panda3ds.pandroid.app.PandroidApplication;
+import com.panda3ds.pandroid.data.GsonConfigParser;
 import com.panda3ds.pandroid.utils.Constants;
 
 public class InputMap {
-
-    private static SharedPreferences data;
-    private static final String KEY_DEAD_ZONE = "deadZone";
+    public static final GsonConfigParser parser = new GsonConfigParser(Constants.PREF_INPUT_MAP);
+    private static DataModel data;
 
     public static void initialize() {
-        data = PandroidApplication.getAppContext().getSharedPreferences(Constants.PREF_INPUT_MAP, Context.MODE_PRIVATE);
+        data = parser.load(DataModel.class);
     }
 
     public static float getDeadZone() {
-        return data.getFloat(KEY_DEAD_ZONE, 0.2f);
+        return data.deadZone;
     }
 
     public static void set(KeyName key, String name) {
-        data.edit().putString(key.name(), name).apply();
+        data.keys[key.ordinal()] = name;
+        writeConfig();
     }
 
     public static String relative(KeyName key) {
-        return data.getString(key.name(), "-");
+        return data.keys[key.ordinal()] == null ? "-" : data.keys[key.ordinal()];
     }
 
     public static KeyName relative(String name) {
@@ -36,7 +33,16 @@ public class InputMap {
     }
 
     public static void setDeadZone(float value) {
-        data.edit().putFloat(KEY_DEAD_ZONE, Math.max(0.0f, Math.min(1.0f, value))).apply();
+        data.deadZone = Math.max(0.0f, Math.min(1.0f, value));
+        writeConfig();
     }
 
+    private static void writeConfig() {
+        parser.save(data);
+    }
+
+    private static class DataModel {
+        public float deadZone = 0.2f;
+        public final String[] keys = new String[32];
+    }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java
new file mode 100644
index 00000000..1b76c757
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java
@@ -0,0 +1,20 @@
+package com.panda3ds.pandroid.lang;
+
+public class Task extends Thread {
+    public Task(Runnable runnable){
+        super(runnable);
+    }
+
+
+    public void runSync(){
+        start();
+        waitFinish();
+    }
+    public void waitFinish(){
+        try {
+            join();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
index 7e926eb3..1f0cff07 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
@@ -3,20 +3,24 @@ package com.panda3ds.pandroid.utils;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.util.Log;
 
 import androidx.documentfile.provider.DocumentFile;
 
 import com.panda3ds.pandroid.app.PandroidApplication;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 
 public class FileUtils {
     public static final String MODE_READ = "r";
-    private static DocumentFile parseFile(String path){
-        if (path.startsWith("/")){
+
+    private static DocumentFile parseFile(String path) {
+        if (path.startsWith("/")) {
             return DocumentFile.fromFile(new File(path));
         }
         Uri uri = Uri.parse(path);
@@ -31,32 +35,81 @@ public class FileUtils {
         return parseFile(path).getName();
     }
 
-    public static String getPrivatePath(){
+    public static String getPrivatePath() {
         File file = getContext().getFilesDir();
-        if (!file.exists()){
+        if (!file.exists()) {
             file.mkdirs();
         }
         return file.getAbsolutePath();
     }
 
-    public static boolean exists(String path){
+    public static String getConfigPath() {
+        File file = new File(getPrivatePath(), "config");
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+        return file.getAbsolutePath();
+    }
+
+    public static boolean exists(String path) {
         return parseFile(path).exists();
     }
 
-    public static boolean createDir(String path, String name){
+    public static boolean createDir(String path, String name) {
         DocumentFile folder = parseFile(path);
         if (folder.findFile(name) != null)
             return true;
         return folder.createDirectory(name) != null;
     }
 
-    public static boolean createFile(String path, String name){
+    public static boolean createFile(String path, String name) {
         DocumentFile folder = parseFile(path);
         if (folder.findFile(name) != null)
             return true;
         return folder.createFile("", name) != null;
     }
 
+    public static boolean writeTextFile(String path, String name, String content) {
+        try {
+            if (!exists(path + "/" + name)) {
+                createFile(path, name);
+            }
+            OutputStream stream = getOutputStream(path + "/" + name);
+            stream.write(content.getBytes(StandardCharsets.UTF_8));
+            stream.flush();
+            stream.close();
+        } catch (Exception e) {
+            Log.e(Constants.LOG_TAG, "Error on write text file: ", e);
+            return false;
+        }
+        return true;
+    }
+
+    public static String readTextFile(String path) {
+        if (!exists(path))
+            return null;
+
+        try {
+            InputStream stream = getInputStream(path);
+            ByteArrayOutputStream output = new ByteArrayOutputStream();
+
+            int len;
+            byte[] buffer = new byte[1024 * 8];
+            while ((len = stream.read(buffer)) != -1)
+                output.write(buffer, 0, len);
+
+            stream.close();
+            output.flush();
+            output.close();
+
+            byte[] data = output.toByteArray();
+
+            return new String(data, 0, data.length);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
     public static InputStream getInputStream(String path) throws FileNotFoundException {
         return getContext().getContentResolver().openInputStream(parseFile(path).getUri());
     }
@@ -66,7 +119,6 @@ public class FileUtils {
     }
 
     public static void makeUriPermanent(String uri, String mode) {
-
         int flags = Intent.FLAG_GRANT_READ_URI_PERMISSION;
         if (mode.toLowerCase().contains("w"))
             flags &= Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
index 32f7c2a5..7fe111d7 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
@@ -2,46 +2,34 @@ package com.panda3ds.pandroid.utils;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.util.Log;
 
-import com.google.gson.Gson;
 import com.panda3ds.pandroid.app.GameActivity;
-import com.panda3ds.pandroid.app.PandroidApplication;
+import com.panda3ds.pandroid.data.GsonConfigParser;
 import com.panda3ds.pandroid.data.game.GameMetadata;
 
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Objects;
 
 public class GameUtils {
-    private static final Bitmap DEFAULT_ICON = Bitmap.createBitmap(48,48, Bitmap.Config.ARGB_8888);
-    private static final String KEY_GAME_LIST = "gameList";
-    private static final ArrayList<GameMetadata> games = new ArrayList<>();
-    private static SharedPreferences data;
-    private static final Gson gson = new Gson();
+    private static final Bitmap DEFAULT_ICON = Bitmap.createBitmap(48, 48, Bitmap.Config.ARGB_8888);
+    public static GsonConfigParser parser = new GsonConfigParser(Constants.PREF_GAME_UTILS);
+
+    private static DataModel data;
 
     private static GameMetadata currentGame;
 
     public static void initialize() {
-        data = PandroidApplication.getAppContext().getSharedPreferences(Constants.PREF_GAME_UTILS, Context.MODE_PRIVATE);
-
-        GameMetadata[] list = gson.fromJson(data.getString(KEY_GAME_LIST, "[]"), GameMetadata[].class);
-
-        for (GameMetadata game: list)
-            game.getIcon();
-
-        games.clear();
-        games.addAll(Arrays.asList(list));
+        data = parser.load(DataModel.class);
     }
 
     public static GameMetadata findByRomPath(String romPath) {
-        for (GameMetadata game : games) {
+        for (GameMetadata game : data.games) {
             if (Objects.equals(romPath, game.getRomPath())) {
                 return game;
             }
@@ -60,51 +48,53 @@ public class GameUtils {
     }
 
     public static void removeGame(GameMetadata game) {
-        games.remove(game);
-        saveAll();
+        data.games.remove(game);
+        writeChanges();
     }
 
     public static void addGame(GameMetadata game) {
-        games.add(0,game);
-        saveAll();
+        data.games.add(0, game);
+        writeChanges();
     }
 
     public static ArrayList<GameMetadata> getGames() {
-        return new ArrayList<>(games);
+        return new ArrayList<>(data.games);
     }
 
-    private static synchronized void saveAll() {
-        data.edit()
-                .putString(KEY_GAME_LIST, gson.toJson(games.toArray(new GameMetadata[0])))
-                .apply();
+    private static void writeChanges() {
+        parser.save(data);
     }
 
     public static void setGameIcon(String id, Bitmap icon) {
         try {
             String appPath = FileUtils.getPrivatePath();
             FileUtils.createDir(appPath, "cache_icons");
-            FileUtils.createFile(appPath+"/cache_icons/", id+".png");
+            FileUtils.createFile(appPath + "/cache_icons/", id + ".png");
 
-            OutputStream output = FileUtils.getOutputStream(appPath+"/cache_icons/"+id+".png");
+            OutputStream output = FileUtils.getOutputStream(appPath + "/cache_icons/" + id + ".png");
             icon.compress(Bitmap.CompressFormat.PNG, 100, output);
             output.close();
-        } catch (Exception e){
+        } catch (Exception e) {
             Log.e(Constants.LOG_TAG, "Error on save game icon: ", e);
         }
     }
 
     public static Bitmap loadGameIcon(String id) {
         try {
-            String path = FileUtils.getPrivatePath()+"/cache_icons/"+id+".png";
+            String path = FileUtils.getPrivatePath() + "/cache_icons/" + id + ".png";
             if (FileUtils.exists(path)) {
                 InputStream stream = FileUtils.getInputStream(path);
                 Bitmap image = BitmapFactory.decodeStream(stream);
                 stream.close();
                 return image;
             }
-        } catch (Exception e){
+        } catch (Exception e) {
             Log.e(Constants.LOG_TAG, "Error on load game icon: ", e);
         }
         return DEFAULT_ICON;
     }
+
+    private static class DataModel {
+        public final ArrayList<GameMetadata> games = new ArrayList<>();
+    }
 }

From d0c4b8ff3ba35a34a1a7978b58d6bdb9528c2d8c Mon Sep 17 00:00:00 2001
From: Gabriel <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Fri, 22 Dec 2023 12:32:42 -0400
Subject: [PATCH 087/162] Peach changes

---
 .../panda3ds/pandroid/app/BaseActivity.java   |   8 +-
 .../java/com/panda3ds/pandroid/data/SMDH.java | 116 ++++++++++--------
 .../pandroid/data/config/GlobalConfig.java    |  10 +-
 .../panda3ds/pandroid/utils/SearchAgent.java  |   6 +-
 4 files changed, 75 insertions(+), 65 deletions(-)

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
index 2462b595..ed6ec32c 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
@@ -26,16 +26,16 @@ public class BaseActivity extends AppCompatActivity {
 
     private void applyTheme(){
         switch (GlobalConfig.get(GlobalConfig.KEY_APP_THEME)){
-            case GlobalConfig.VALUE_THEME_ANDROID:
+            case GlobalConfig.THEME_ANDROID:
                 setTheme(R.style.Theme_Pandroid);
                 break;
-            case GlobalConfig.VALUE_THEME_LIGHT:
+            case GlobalConfig.THEME_LIGHT:
                 setTheme(R.style.Theme_Pandroid_Light);
                 break;
-            case GlobalConfig.VALUE_THEME_DARK:
+            case GlobalConfig.THEME_DARK:
                 setTheme(R.style.Theme_Pandroid_Dark);
                 break;
-            case GlobalConfig.VALUE_THEME_BLACK:
+            case GlobalConfig.THEME_BLACK:
                 setTheme(R.style.Theme_Pandroid_Black);
                 break;
         }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/SMDH.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/SMDH.java
index ae61cf4b..2401a403 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/SMDH.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/SMDH.java
@@ -1,6 +1,7 @@
 package com.panda3ds.pandroid.data;
 
 import android.graphics.Bitmap;
+import android.graphics.Color;
 
 import com.panda3ds.pandroid.data.game.GameRegion;
 
@@ -8,12 +9,26 @@ import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 
 public class SMDH {
+
+    public static final int LANGUAGE_ENGLISH = 1;
+    public static final int LANGUAGE_JAPANESE = 0;
+    public static final int LANGUAGE_CHINESE = 6;
+    public static final int LANGUAGE_KOREAN = 7;
+
+    public static final int REGION_JAPAN_MASK = 0x1;
+    public static final int REGION_NORTH_AMERICAN_MASK = 0x2;
+    public static final int REGION_EUROPE_MASK = 0x4;
+    public static final int REGION_AUSTRALIA_MASK = 0x8;
+    public static final int REGION_CHINA_MASK = 0x10;
+    public static final int REGION_KOREAN_MASK = 0x20;
+    public static final int REGION_TAIWAN_MASK = 0x40;
+
     private static final int ICON_SIZE = 48;
-    private static final int META_OFFSET = 0x8 ;
+    private static final int META_OFFSET = 0x8;
     private static final int META_REGION_OFFSET = 0x2018;
     private static final int IMAGE_OFFSET = 0x24C0;
 
-    private int metaIndex = 1;
+    private int metaLanguage = LANGUAGE_ENGLISH;
     private final ByteBuffer smdh;
     private final String[] title = new String[12];
     private final String[] publisher = new String[12];
@@ -21,7 +36,7 @@ public class SMDH {
 
     private final GameRegion region;
 
-    public SMDH(byte[] source){
+    public SMDH(byte[] source) {
         smdh = ByteBuffer.allocate(source.length);
         smdh.position(0);
         smdh.put(source);
@@ -32,20 +47,20 @@ public class SMDH {
         parseMeta();
     }
 
-    private GameRegion parseRegion(){
+    private GameRegion parseRegion() {
         GameRegion region;
         smdh.position(META_REGION_OFFSET);
 
         int regionMasks = smdh.get() & 0xFF;
 
-        final boolean japan = (regionMasks & 0x1) != 0;
-        final boolean northAmerica = (regionMasks & 0x2) != 0;
-        final boolean europe = (regionMasks & 0x4) != 0;
-        final boolean australia = (regionMasks & 0x8) != 0;
-        final boolean china = (regionMasks & 0x10) != 0;
-        final boolean korea = (regionMasks & 0x20) != 0;
+        final boolean japan = (regionMasks & REGION_JAPAN_MASK) != 0;
+        final boolean northAmerica = (regionMasks & REGION_NORTH_AMERICAN_MASK) != 0;
+        final boolean europe = (regionMasks & REGION_EUROPE_MASK) != 0;
+        final boolean australia = (regionMasks & REGION_AUSTRALIA_MASK) != 0;
+        final boolean china = (regionMasks & REGION_CHINA_MASK) != 0;
+        final boolean korea = (regionMasks & REGION_KOREAN_MASK) != 0;
+        final boolean taiwan = (regionMasks & REGION_TAIWAN_MASK) != 0;
 
-        final boolean taiwan = (regionMasks & 0x40) != 0;
         if (northAmerica) {
             region = GameRegion.NorthAmerican;
         } else if (europe) {
@@ -54,15 +69,15 @@ public class SMDH {
             region = GameRegion.Australia;
         } else if (japan) {
             region = GameRegion.Japan;
-            metaIndex = 0;
+            metaLanguage = LANGUAGE_JAPANESE;
         } else if (korea) {
-            metaIndex = 7;
+            metaLanguage = LANGUAGE_KOREAN;
             region = GameRegion.Korean;
         } else if (china) {
-            metaIndex = 6;
+            metaLanguage = LANGUAGE_CHINESE;
             region = GameRegion.China;
         } else if (taiwan) {
-            metaIndex = 6;
+            metaLanguage = LANGUAGE_CHINESE;
             region = GameRegion.Taiwan;
         } else {
             region = GameRegion.None;
@@ -71,50 +86,52 @@ public class SMDH {
         return region;
     }
 
-    private void parseMeta(){
-
-        for (int i = 0; i < 12; i++){
-            smdh.position(META_OFFSET + (512*i) + 0x80);
-            byte[] data = new byte[0x100];
+    private void parseMeta() {
+        byte[] data;
+        for (int i = 0; i < 12; i++) {
+            smdh.position(META_OFFSET + (512 * i) + 0x80);
+            data = new byte[0x100];
             smdh.get(data);
             title[i] = convertString(data).replaceAll("\n", " ");
-        }
 
-        for (int i = 0; i < 12; i++){
             smdh.position(META_OFFSET + (512 * i) + 0x180);
-            byte[] data = new byte[0x80];
+            data = new byte[0x80];
             smdh.get(data);
             publisher[i] = convertString(data);
         }
     }
 
+    // The icons are stored in RGB562 but android need RGB888
     private int[] parseIcon() {
-        int[] icon = new int[ICON_SIZE*ICON_SIZE];
+        int[] icon = new int[ICON_SIZE * ICON_SIZE];
         smdh.position(0);
 
         for (int x = 0; x < ICON_SIZE; x++) {
             for (int y = 0; y < ICON_SIZE; y++) {
-                int curseY = y & ~7;
-                int curseX = x & ~7;
+                int indexY = y & ~7;
+                int indexX = x & ~7;
 
                 int i = mortonInterleave(x, y);
-                int offset = (i + (curseX * 8)) * 2;
+                int offset = (i + (indexX * 8)) * 2;
 
-                offset = offset + curseY * 48 * 2;
+                offset = offset + indexY * ICON_SIZE * 2;
 
                 smdh.position(offset + IMAGE_OFFSET);
 
-                int bit1 = smdh.get() & 0xFF;
-                int bit2 = smdh.get() & 0xFF;
+                int byte1 = smdh.get() & 0xFF;
+                int byte2 = smdh.get() & 0xFF;
 
-                int pixel = bit1 + (bit2 << 8);
+                int texel = byte1 | (byte2 << 8);
 
-                int r = (((pixel & 0xF800) >> 11) << 3);
-                int g = (((pixel & 0x7E0) >> 5) << 2);
-                int b = (((pixel & 0x1F)) << 3);
+                int r = (texel >> 11) & 0x1f;
+                int g = (texel >> 5) & 0x3f;
+                int b = texel & 0x1f;
 
-                //Convert to ARGB8888
-                icon[x + 48 * y] = 255 << 24 | (r & 255) << 16 | (g & 255) << 8 | (b & 255);
+                b = (b << 3) | (b >> 2);
+                g = (g << 2) | (g >> 4);
+                r = (r << 3) | (r >> 2);
+
+                icon[x + ICON_SIZE * y] = Color.rgb(r, g, b);
             }
         }
         return icon;
@@ -125,9 +142,9 @@ public class SMDH {
         return region;
     }
 
-    public Bitmap getBitmapIcon(){
+    public Bitmap getBitmapIcon() {
         Bitmap bitmap = Bitmap.createBitmap(ICON_SIZE, ICON_SIZE, Bitmap.Config.RGB_565);
-        bitmap.setPixels(icon,0,ICON_SIZE,0,0,ICON_SIZE,ICON_SIZE);
+        bitmap.setPixels(icon, 0, ICON_SIZE, 0, 0, ICON_SIZE, ICON_SIZE);
         return bitmap;
     }
 
@@ -135,30 +152,25 @@ public class SMDH {
         return icon;
     }
 
-    public String getTitle(){
-        return title[metaIndex];
+    public String getTitle() {
+        return title[metaLanguage];
     }
 
-    public String getPublisher(){
-        return publisher[metaIndex];
+    public String getPublisher() {
+        return publisher[metaLanguage];
     }
 
     // SMDH stores string in UTF-16LE format
-    private static String convertString(byte[] buffer){
+    private static String convertString(byte[] buffer) {
         try {
-            return new String(buffer,0, buffer.length, StandardCharsets.UTF_16LE)
-                    .replaceAll("\0","");
-        } catch (Exception e){
+            return new String(buffer, 0, buffer.length, StandardCharsets.UTF_16LE)
+                    .replaceAll("\0", "");
+        } catch (Exception e) {
             return "";
         }
     }
 
-    // u and v are the UVs of the relevant texel
-    // Texture data is stored interleaved in Morton order, ie in a Z - order curve as shown here
-    // https://en.wikipedia.org/wiki/Z-order_curve
-    // Textures are split into 8x8 tiles.This function returns the in - tile offset depending on the u & v of the texel
-    // The in - tile offset is the sum of 2 offsets, one depending on the value of u % 8 and the other on the value of y % 8
-    // As documented in this picture https ://en.wikipedia.org/wiki/File:Moser%E2%80%93de_Bruijn_addition.svg
+    // Reference: https://github.com/wheremyfoodat/Panda3DS/blob/master/src/core/renderer_gl/textures.cpp#L88
     private static int mortonInterleave(int u, int v) {
         int[] xlut = {0, 1, 4, 5, 16, 17, 20, 21};
         int[] ylut = {0, 2, 8, 10, 32, 34, 40, 42};
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
index 0ee41dde..038c27ce 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
@@ -10,14 +10,14 @@ public class GlobalConfig {
 
     private static final GsonConfigParser parser = new GsonConfigParser(Constants.PREF_GLOBAL_CONFIG);
 
-    public static final int VALUE_THEME_ANDROID = 0;
-    public static final int VALUE_THEME_LIGHT = 1;
-    public static final int VALUE_THEME_DARK = 2;
-    public static final int VALUE_THEME_BLACK = 3;
+    public static final int THEME_ANDROID = 0;
+    public static final int THEME_LIGHT = 1;
+    public static final int THEME_DARK = 2;
+    public static final int THEME_BLACK = 3;
 
     public static DataModel data;
 
-    public static final Key<Integer> KEY_APP_THEME = new Key<>("app.theme", VALUE_THEME_ANDROID);
+    public static final Key<Integer> KEY_APP_THEME = new Key<>("app.theme", THEME_ANDROID);
 
     public static void initialize() {
         data = parser.load(DataModel.class);
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/SearchAgent.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/SearchAgent.java
index 212c1a1d..b4ea2152 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/SearchAgent.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/SearchAgent.java
@@ -9,10 +9,8 @@ import java.util.List;
 
 public class SearchAgent {
 
-    /**
-     * Store all possibles results in map
-     * id->words
-     */
+    // Store all possibles results in map
+    // id->words
     private final HashMap<String, String> searchBuffer = new HashMap<>();
 
     // Add search item to list

From 13136c66868c9bd665d03d57e6e34ee5d00f3c28 Mon Sep 17 00:00:00 2001
From: Gabriel <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Fri, 22 Dec 2023 14:41:41 -0400
Subject: [PATCH 088/162] Save screen gamepad visibility and some fixes

Fix Gson serialization error on GlobalConfig
Now screen gamepad visibility saves last visibility state
---
 .../java/com/panda3ds/pandroid/app/GameActivity.java     | 9 ++++++++-
 .../com/panda3ds/pandroid/data/GsonConfigParser.java     | 2 +-
 .../com/panda3ds/pandroid/data/config/GlobalConfig.java  | 5 ++++-
 .../main/java/com/panda3ds/pandroid/utils/GameUtils.java | 3 ++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
index 9c241eba..61b9cb1d 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -16,6 +16,7 @@ import androidx.annotation.Nullable;
 import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.app.game.AlberInputListener;
+import com.panda3ds.pandroid.data.config.GlobalConfig;
 import com.panda3ds.pandroid.input.InputHandler;
 import com.panda3ds.pandroid.input.InputMap;
 import com.panda3ds.pandroid.utils.Constants;
@@ -47,7 +48,13 @@ public class GameActivity extends BaseActivity {
 		PandaLayoutController controllerLayout = findViewById(R.id.controller_layout);
 		controllerLayout.initialize();
 
-		((CheckBox) findViewById(R.id.hide_screen_controller)).setOnCheckedChangeListener((buttonView, isChecked) -> findViewById(R.id.overlay_controller).setVisibility(isChecked ? View.VISIBLE : View.INVISIBLE));
+		((CheckBox) findViewById(R.id.hide_screen_controller)).setOnCheckedChangeListener((buttonView, checked) -> {
+			findViewById(R.id.overlay_controller).setVisibility(checked ? View.VISIBLE : View.GONE);
+			findViewById(R.id.overlay_controller).invalidate();
+			findViewById(R.id.overlay_controller).requestLayout();
+			GlobalConfig.set(GlobalConfig.KEY_SCREEN_GAMEPAD_VISIBLE, checked);
+		});
+		((CheckBox) findViewById(R.id.hide_screen_controller)).setChecked(GlobalConfig.get(GlobalConfig.KEY_SCREEN_GAMEPAD_VISIBLE));
 	}
 
 	@Override
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java
index 76ffdbac..f88687f2 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java
@@ -19,7 +19,7 @@ public class GsonConfigParser {
     public void save(Object data){
         synchronized (this) {
             new Task(() -> {
-                String json = gson.toJson(data);
+                String json = gson.toJson(data, data.getClass());
                 FileUtils.writeTextFile(FileUtils.getConfigPath(), name + ".json", json);
             }).runSync();
         }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
index 038c27ce..d05d9f22 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
@@ -1,10 +1,12 @@
 package com.panda3ds.pandroid.data.config;
 
+import com.google.gson.internal.LinkedTreeMap;
 import com.panda3ds.pandroid.data.GsonConfigParser;
 import com.panda3ds.pandroid.utils.Constants;
 
 import java.io.Serializable;
 import java.util.HashMap;
+import java.util.Map;
 
 public class GlobalConfig {
 
@@ -18,6 +20,7 @@ public class GlobalConfig {
     public static DataModel data;
 
     public static final Key<Integer> KEY_APP_THEME = new Key<>("app.theme", THEME_ANDROID);
+    public static final Key<Boolean> KEY_SCREEN_GAMEPAD_VISIBLE = new Key<>("app.screen_gamepad.visible", true);
 
     public static void initialize() {
         data = parser.load(DataModel.class);
@@ -64,7 +67,7 @@ public class GlobalConfig {
     }
 
     private static class DataModel {
-        private final HashMap<String, Object> configs = new HashMap<>();
+        private final Map<String, Object> configs = new LinkedTreeMap<>();
 
         public Object get(String key){
             return configs.get(key);
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
index 7fe111d7..cb3ebb39 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
@@ -14,6 +14,7 @@ import com.panda3ds.pandroid.data.game.GameMetadata;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 public class GameUtils {
@@ -95,6 +96,6 @@ public class GameUtils {
     }
 
     private static class DataModel {
-        public final ArrayList<GameMetadata> games = new ArrayList<>();
+        public final List<GameMetadata> games = new ArrayList<>();
     }
 }

From 6757117e0d89d7a468cfaf0d130f04ea9648a91d Mon Sep 17 00:00:00 2001
From: Gabriel <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Fri, 22 Dec 2023 15:40:10 -0400
Subject: [PATCH 089/162] Fix buffer errors

---
 .../java/com/panda3ds/pandroid/utils/FileUtils.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
index 1f0cff07..c6902c94 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
@@ -64,16 +64,16 @@ public class FileUtils {
 
     public static boolean createFile(String path, String name) {
         DocumentFile folder = parseFile(path);
-        if (folder.findFile(name) != null)
-            return true;
+        if (folder.findFile(name) != null) {
+            folder.findFile(name).delete();
+        }
+
         return folder.createFile("", name) != null;
     }
 
     public static boolean writeTextFile(String path, String name, String content) {
         try {
-            if (!exists(path + "/" + name)) {
-                createFile(path, name);
-            }
+            createFile(path, name);
             OutputStream stream = getOutputStream(path + "/" + name);
             stream.write(content.getBytes(StandardCharsets.UTF_8));
             stream.flush();

From 058530bd905fba39f3ead09fdb98cd730267d31e Mon Sep 17 00:00:00 2001
From: Gabriel <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Sun, 24 Dec 2023 13:19:05 -0400
Subject: [PATCH 090/162] Resolve PathUtils.java

---
 .../pandroid/app/main/GamesFragment.java      |  5 +++
 .../panda3ds/pandroid/utils/FileUtils.java    | 41 +++++++++++++++++++
 .../panda3ds/pandroid/utils/GameUtils.java    |  2 +-
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java
index c5f1acee..e2c97a17 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
 import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
@@ -50,6 +51,10 @@ public class GamesFragment extends Fragment implements ActivityResultCallback<Ur
         if (result != null) {
             String uri = result.toString();
             if (GameUtils.findByRomPath(uri) == null) {
+                if (FileUtils.obtainRealPath(uri) == null){
+                    Toast.makeText(getContext(), "Invalid file path", Toast.LENGTH_LONG).show();
+                    return;
+                }
                 FileUtils.makeUriPermanent(uri, FileUtils.MODE_READ);
                 GameMetadata game = new GameMetadata(uri, FileUtils.getName(uri).split("\\.")[0],"Unknown");
                 GameUtils.addGame(game);
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
index c6902c94..edab01d8 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
@@ -3,6 +3,8 @@ package com.panda3ds.pandroid.utils;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+import android.system.Os;
 import android.util.Log;
 
 import androidx.documentfile.provider.DocumentFile;
@@ -15,9 +17,11 @@ import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.Objects;
 
 public class FileUtils {
     public static final String MODE_READ = "r";
+    public static final int CANONICAL_SEARCH_DEEP = 8;
 
     private static DocumentFile parseFile(String path) {
         if (path.startsWith("/")) {
@@ -125,4 +129,41 @@ public class FileUtils {
 
         getContext().getContentResolver().takePersistableUriPermission(Uri.parse(uri), flags);
     }
+
+    /**
+     * When call ContentProvider.openFileDescriptor() android open a file descriptor
+     * on app process in /proc/self/fd/[file descriptor id] this is a link to real file path
+     * can use File.getCanonicalPath() for get a link origin, but in some android version
+     * need use Os.readlink(path) to get a real path.
+     */
+    public static String obtainRealPath(String uri) {
+        try {
+            ParcelFileDescriptor parcelDescriptor = getContext().getContentResolver().openFileDescriptor(Uri.parse(uri), "r");
+            int fd = parcelDescriptor.getFd();
+            File file = new File("/proc/self/fd/" + fd).getAbsoluteFile();
+            for (int i = 0; i < CANONICAL_SEARCH_DEEP; i++) {
+                try {
+                    String canonical = file.getCanonicalPath();
+                    if (!Objects.equals(canonical, file.getAbsolutePath())) {
+                        file = new File(canonical).getAbsoluteFile();
+                    }
+                } catch (Exception x) {
+                    break;
+                }
+            }
+
+            if (!file.getAbsolutePath().startsWith("/proc/self/")) {
+                parcelDescriptor.close();
+                return file.getAbsolutePath();
+            }
+            String path = Os.readlink(file.getAbsolutePath());
+            parcelDescriptor.close();
+
+            if (new File(path).exists())
+                return path;
+            return null;
+        } catch (Exception e) {
+            return null;
+        }
+    }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
index cb3ebb39..b763f7b2 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/GameUtils.java
@@ -40,7 +40,7 @@ public class GameUtils {
 
     public static void launch(Context context, GameMetadata game) {
         currentGame = game;
-        String path = PathUtils.getPath(Uri.parse(game.getRomPath()));
+        String path = FileUtils.obtainRealPath(game.getRomPath());
         context.startActivity(new Intent(context, GameActivity.class).putExtra(Constants.ACTIVITY_PARAMETER_PATH, path));
     }
 

From d7036fc4e7f88254575810b86f5b9797740b7a71 Mon Sep 17 00:00:00 2001
From: Gabriel <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Sun, 24 Dec 2023 13:19:49 -0400
Subject: [PATCH 091/162] Delete PathUtils.java

---
 .../panda3ds/pandroid/utils/PathUtils.java    | 92 -------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
deleted file mode 100644
index c4682de2..00000000
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PathUtils.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.panda3ds.pandroid.utils;
-
-import android.content.ContentUris;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.provider.DocumentsContract;
-import android.provider.MediaStore;
-
-import com.panda3ds.pandroid.app.PandroidApplication;
-
-public class PathUtils {
-	public static String getPath(final Uri uri) {
-		final Context context = PandroidApplication.getAppContext();
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && DocumentsContract.isDocumentUri(context, uri)) {
-			if (isExternalStorageDocument(uri)) {
-				final String docId = DocumentsContract.getDocumentId(uri);
-				final String[] split = docId.split(":");
-				final String type = split[0];
-				String storageDefinition;
-
-				if ("primary".equalsIgnoreCase(type)) {
-					return Environment.getExternalStorageDirectory() + "/" + split[1];
-
-				} else {
-					if (Environment.isExternalStorageRemovable()) {
-						storageDefinition = "EXTERNAL_STORAGE";
-
-					} else {
-						storageDefinition = "SECONDARY_STORAGE";
-					}
-
-					return System.getenv(storageDefinition) + "/" + split[1];
-				}
-
-			} else if (isDownloadsDocument(uri)) {
-				final String id = DocumentsContract.getDocumentId(uri);
-				final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
-
-				return getDataColumn(context, contentUri, null, null);
-			} else if (isMediaDocument(uri)) {
-				final String docId = DocumentsContract.getDocumentId(uri);
-				final String[] split = docId.split(":");
-				final String type = split[0];
-
-				Uri contentUri = null;
-				if ("image".equals(type)) {
-					contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
-				} else if ("video".equals(type)) {
-					contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
-				} else if ("audio".equals(type)) {
-					contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
-				}
-
-				final String selection = "_id=?";
-				final String[] selectionArgs = new String[] {split[1]};
-				return getDataColumn(context, contentUri, selection, selectionArgs);
-			}
-
-		} else if ("content".equalsIgnoreCase(uri.getScheme())) {
-			if (isGooglePhotosUri(uri)) return uri.getLastPathSegment();
-			return getDataColumn(context, uri, null, null);
-		} else if ("file".equalsIgnoreCase(uri.getScheme())) {
-			return uri.getPath();
-		}
-
-		return null;
-	}
-
-	public static String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
-		Cursor cursor = null;
-		final String column = "_data";
-		final String[] projection = {column};
-		try {
-			cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
-			if (cursor != null && cursor.moveToFirst()) {
-				final int column_index = cursor.getColumnIndexOrThrow(column);
-				return cursor.getString(column_index);
-			}
-		} finally {
-			if (cursor != null) cursor.close();
-		}
-		return null;
-	}
-
-	public static boolean isExternalStorageDocument(Uri uri) { return "com.android.externalstorage.documents".equals(uri.getAuthority()); }
-	public static boolean isDownloadsDocument(Uri uri) { return "com.android.providers.downloads.documents".equals(uri.getAuthority()); }
-	public static boolean isMediaDocument(Uri uri) { return "com.android.providers.media.documents".equals(uri.getAuthority()); }
-	public static boolean isGooglePhotosUri(Uri uri) { return "com.google.android.apps.photos.content".equals(uri.getAuthority()); }
-}
\ No newline at end of file

From 0ab7bf3b17702d8dda8563d825ae9623c5d7daf3 Mon Sep 17 00:00:00 2001
From: Gabriel <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Sun, 24 Dec 2023 13:25:52 -0400
Subject: [PATCH 092/162] FileUtils.java: english error on comment

---
 .../src/main/java/com/panda3ds/pandroid/utils/FileUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
index edab01d8..2b7ce281 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
@@ -131,7 +131,7 @@ public class FileUtils {
     }
 
     /**
-     * When call ContentProvider.openFileDescriptor() android open a file descriptor
+     * When call ContentProvider.openFileDescriptor() android opens a file descriptor
      * on app process in /proc/self/fd/[file descriptor id] this is a link to real file path
      * can use File.getCanonicalPath() for get a link origin, but in some android version
      * need use Os.readlink(path) to get a real path.

From f2fac171a098deccab95a2ccaa8cd0f8c9e13866 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 26 Dec 2023 02:20:55 +0200
Subject: [PATCH 093/162] Bonk

---
 include/jni_driver.hpp                        |  7 +-
 src/core/loader/ncch.cpp                      |  7 +-
 src/jni_driver.cpp                            | 50 +++++-----
 .../panda3ds/pandroid/app/BaseActivity.java   | 58 +++++------
 .../panda3ds/pandroid/app/GameActivity.java   | 14 +--
 .../panda3ds/pandroid/app/MainActivity.java   | 11 +--
 .../pandroid/app/PandroidApplication.java     | 27 +++--
 .../pandroid/app/PreferenceActivity.java      | 64 ++++++------
 .../app/base/BasePreferenceFragment.java      | 19 ++--
 .../pandroid/app/game/AlberInputListener.java | 91 +++++++++--------
 .../pandroid/app/main/GamesFragment.java      | 99 +++++++++----------
 .../pandroid/app/main/SearchFragment.java     | 69 ++++++-------
 .../app/preferences/InputMapActivity.java     |  4 +-
 .../app/preferences/InputMapPreferences.java  | 16 ++-
 .../pandroid/data/GsonConfigParser.java       |  4 +-
 .../java/com/panda3ds/pandroid/data/SMDH.java | 37 +++----
 .../panda3ds/pandroid/input/InputHandler.java | 13 ++-
 .../java/com/panda3ds/pandroid/lang/Task.java |  2 +-
 .../panda3ds/pandroid/utils/FileUtils.java    | 23 +++--
 .../panda3ds/pandroid/utils/SearchAgent.java  | 29 +++---
 .../pandroid/view/gamesgrid/GameIconView.java |  1 -
 .../SingleSelectionPreferences.java           |  2 +
 22 files changed, 324 insertions(+), 323 deletions(-)

diff --git a/include/jni_driver.hpp b/include/jni_driver.hpp
index ff6230f1..a4d6895e 100644
--- a/include/jni_driver.hpp
+++ b/include/jni_driver.hpp
@@ -1,7 +1,8 @@
 #include <vector>
+
 #include "helpers.hpp"
 
-class Pandroid {
-public:
-    static void onSmdhLoaded(const std::vector<u8> &smdh);
+
+namespace Pandroid {
+	static void onSmdhLoaded(const std::vector<u8>& smdh);
 };
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 3e17790c..a294f0e6 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -259,10 +259,9 @@ bool NCCH::parseSMDH(const std::vector<u8>& smdh) {
 		return false;
 	}
 
-
-    #ifdef __ANDROID__
-    Pandroid::onSmdhLoaded(smdh);
-    #endif
+#ifdef __ANDROID__
+	Pandroid::onSmdhLoaded(smdh);
+#endif
 
 	// Bitmask showing which regions are allowed.
 	// https://www.3dbrew.org/wiki/SMDH#Region_Lockout
diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index 806a0074..c38359b4 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -1,3 +1,5 @@
+#include "jni_driver.hpp"
+
 #include <EGL/egl.h>
 #include <android/log.h>
 #include <jni.h>
@@ -8,8 +10,6 @@
 #include "renderer_gl/renderer_gl.hpp"
 #include "services/hid.hpp"
 
-#include "jni_driver.hpp"
-
 std::unique_ptr<Emulator> emulator = nullptr;
 HIDService* hidService = nullptr;
 RendererGL* renderer = nullptr;
@@ -24,41 +24,35 @@ void throwException(JNIEnv* env, const char* message) {
 	env->ThrowNew(exceptionClass, message);
 }
 
-JNIEnv* jniEnv(){
-    JNIEnv* env;
-    auto status = jvm->GetEnv((void **)&env, JNI_VERSION_1_6);
-    if(status == JNI_EDETACHED){
-        jvm->AttachCurrentThread(&env, nullptr);
-    } else if(status != JNI_OK){
-        throw std::runtime_error("Failed to obtain JNIEnv from JVM!!");
-    }
-    return env;
+JNIEnv* jniEnv() {
+	JNIEnv* env;
+	auto status = jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
+	if (status == JNI_EDETACHED) {
+		jvm->AttachCurrentThread(&env, nullptr);
+	} else if (status != JNI_OK) {
+		throw std::runtime_error("Failed to obtain JNIEnv from JVM!!");
+	}
+
+	return env;
 }
 
+void Pandroid::onSmdhLoaded(const std::vector<u8>& smdh) {
+	JNIEnv* env = jniEnv();
+	int size = smdh.size();
 
-void Pandroid::onSmdhLoaded(const std::vector<u8> &smdh){
-    JNIEnv* env = jniEnv();
-    int size = smdh.size();
-    
-    jbyteArray result = env->NewByteArray(size);
-    
-    env->SetByteArrayRegion(result, 0, size, (jbyte*)smdh.data());
+	jbyteArray result = env->NewByteArray(size);
+	env->SetByteArrayRegion(result, 0, size, (jbyte*)smdh.data());
 
-    
-    auto clazz = env->FindClass(alberClass);
-    auto method = env->GetStaticMethodID(clazz, "OnSmdhLoaded", "([B)V");
+	auto classLoader = env->FindClass(alberClass);
+	auto method = env->GetStaticMethodID(classLoader, "OnSmdhLoaded", "([B)V");
 
-    env->CallStaticVoidMethod(clazz, method, result);
-
-    env->DeleteLocalRef(result);
+	env->CallStaticVoidMethod(classLoader, method, result);
+	env->DeleteLocalRef(result);
 }
 
-
 extern "C" {
 
-AlberFunction(void, Setup)(JNIEnv* env, jobject obj) {
-    env->GetJavaVM(&jvm);
-}
+AlberFunction(void, Setup)(JNIEnv* env, jobject obj) { env->GetJavaVM(&jvm); }
 
 AlberFunction(void, Initialize)(JNIEnv* env, jobject obj) {
 	emulator = std::make_unique<Emulator>();
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
index ed6ec32c..527d4966 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
@@ -1,44 +1,38 @@
 package com.panda3ds.pandroid.app;
 
 import android.os.Bundle;
-
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.data.config.GlobalConfig;
 
+
 public class BaseActivity extends AppCompatActivity {
-    private int currentTheme = GlobalConfig.get(GlobalConfig.KEY_APP_THEME);
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        applyTheme();
-        super.onCreate(savedInstanceState);
-    }
+	private int currentTheme = GlobalConfig.get(GlobalConfig.KEY_APP_THEME);
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (GlobalConfig.get(GlobalConfig.KEY_APP_THEME) != currentTheme){
-            recreate();
-        }
-    }
+	@Override
+	protected void onCreate(@Nullable Bundle savedInstanceState) {
+		applyTheme();
+		super.onCreate(savedInstanceState);
+	}
 
-    private void applyTheme(){
-        switch (GlobalConfig.get(GlobalConfig.KEY_APP_THEME)){
-            case GlobalConfig.THEME_ANDROID:
-                setTheme(R.style.Theme_Pandroid);
-                break;
-            case GlobalConfig.THEME_LIGHT:
-                setTheme(R.style.Theme_Pandroid_Light);
-                break;
-            case GlobalConfig.THEME_DARK:
-                setTheme(R.style.Theme_Pandroid_Dark);
-                break;
-            case GlobalConfig.THEME_BLACK:
-                setTheme(R.style.Theme_Pandroid_Black);
-                break;
-        }
-        currentTheme = GlobalConfig.get(GlobalConfig.KEY_APP_THEME);
-    }
+	@Override
+	protected void onResume() {
+		super.onResume();
+
+		if (GlobalConfig.get(GlobalConfig.KEY_APP_THEME) != currentTheme) {
+			recreate();
+		}
+	}
+
+	private void applyTheme() {
+		switch (GlobalConfig.get(GlobalConfig.KEY_APP_THEME)) {
+			case GlobalConfig.THEME_ANDROID: setTheme(R.style.Theme_Pandroid); break;
+			case GlobalConfig.THEME_LIGHT: setTheme(R.style.Theme_Pandroid_Light); break;
+			case GlobalConfig.THEME_DARK: setTheme(R.style.Theme_Pandroid_Dark); break;
+			case GlobalConfig.THEME_BLACK: setTheme(R.style.Theme_Pandroid_Black); break;
+		}
+
+		currentTheme = GlobalConfig.get(GlobalConfig.KEY_APP_THEME);
+	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
index 61b9cb1d..03593b44 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -10,9 +10,7 @@ import android.view.WindowManager;
 import android.widget.CheckBox;
 import android.widget.FrameLayout;
 import android.widget.Toast;
-
 import androidx.annotation.Nullable;
-
 import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.app.game.AlberInputListener;
@@ -24,7 +22,6 @@ import com.panda3ds.pandroid.view.PandaGlSurfaceView;
 import com.panda3ds.pandroid.view.PandaLayoutController;
 
 public class GameActivity extends BaseActivity {
-
 	private final AlberInputListener inputListener = new AlberInputListener(this);
 
 	@Override
@@ -43,7 +40,7 @@ public class GameActivity extends BaseActivity {
 		setContentView(R.layout.game_activity);
 
 		((FrameLayout) findViewById(R.id.panda_gl_frame))
-				.addView(pandaSurface, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+			.addView(pandaSurface, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 
 		PandaLayoutController controllerLayout = findViewById(R.id.controller_layout);
 		controllerLayout.initialize();
@@ -75,25 +72,28 @@ public class GameActivity extends BaseActivity {
 
 	@Override
 	public boolean dispatchKeyEvent(KeyEvent event) {
-		if (InputHandler.processKeyEvent(event))
+		if (InputHandler.processKeyEvent(event)) {
 			return true;
+		}
 
 		return super.dispatchKeyEvent(event);
 	}
 
 	@Override
 	public boolean dispatchGenericMotionEvent(MotionEvent ev) {
-		if (InputHandler.processMotionEvent(ev))
+		if (InputHandler.processMotionEvent(ev)) {
 			return true;
+		}
 
 		return super.dispatchGenericMotionEvent(ev);
 	}
 
 	@Override
 	protected void onDestroy() {
-		if(AlberDriver.HasRomLoaded()){
+		if (AlberDriver.HasRomLoaded()) {
 			AlberDriver.Finalize();
 		}
+
 		super.onDestroy();
 	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
index 29070a88..ee7acf88 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
@@ -9,18 +9,17 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.view.MenuItem;
-
 import androidx.annotation.NonNull;
 import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-
 import com.google.android.material.navigation.NavigationBarView;
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.app.main.GamesFragment;
 import com.panda3ds.pandroid.app.main.SearchFragment;
 import com.panda3ds.pandroid.app.main.SettingsFragment;
 
+
 public class MainActivity extends BaseActivity implements NavigationBarView.OnItemSelectedListener {
 	private static final int PICK_ROM = 2;
 	private static final int PERMISSION_REQUEST_CODE = 3;
@@ -45,8 +44,8 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
 				startActivity(intent);
 			}
 		} else {
-			ActivityCompat.requestPermissions(this, new String[]{READ_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
-			ActivityCompat.requestPermissions(this, new String[]{WRITE_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
+			ActivityCompat.requestPermissions(this, new String[] {READ_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
+			ActivityCompat.requestPermissions(this, new String[] {WRITE_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
 		}
 
 		setContentView(R.layout.activity_main);
@@ -71,9 +70,7 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
 			return false;
 		}
 
-		manager.beginTransaction()
-				.replace(R.id.fragment_container, fragment)
-				.commitNow();
+		manager.beginTransaction().replace(R.id.fragment_container, fragment).commitNow();
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
index 770e5e81..0ae779dd 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
@@ -2,26 +2,25 @@ package com.panda3ds.pandroid.app;
 
 import android.app.Application;
 import android.content.Context;
-
 import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.data.config.GlobalConfig;
 import com.panda3ds.pandroid.input.InputMap;
 import com.panda3ds.pandroid.utils.GameUtils;
 
+
 public class PandroidApplication extends Application {
-    private static Context appContext;
+	private static Context appContext;
 
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        appContext = this;
-        GlobalConfig.initialize();
-        GameUtils.initialize();
-        InputMap.initialize();
-        AlberDriver.Setup();
-    }
+	@Override
+	public void onCreate() {
+		super.onCreate();
+		appContext = this;
 
-    public static Context getAppContext() {
-        return appContext;
-    }
+		GlobalConfig.initialize();
+		GameUtils.initialize();
+		InputMap.initialize();
+		AlberDriver.Setup();
+	}
+
+	public static Context getAppContext() { return appContext; }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PreferenceActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PreferenceActivity.java
index 3b8ebb2e..64249c5b 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PreferenceActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PreferenceActivity.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
@@ -13,42 +12,41 @@ import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.utils.Constants;
 
 public class PreferenceActivity extends BaseActivity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Intent intent = getIntent();
+	@Override
+	protected void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		Intent intent = getIntent();
 
-        setContentView(R.layout.activity_preference);
-        setSupportActionBar(findViewById(R.id.toolbar));
+		setContentView(R.layout.activity_preference);
+		setSupportActionBar(findViewById(R.id.toolbar));
 
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        if (!intent.hasExtra(Constants.ACTIVITY_PARAMETER_FRAGMENT)) {
-            finish();
-            return;
-        }
+		if (!intent.hasExtra(Constants.ACTIVITY_PARAMETER_FRAGMENT)) {
+			finish();
+			return;
+		}
 
-        try {
-            Class<?> clazz = getClassLoader().loadClass(intent.getStringExtra(Constants.ACTIVITY_PARAMETER_FRAGMENT));
-            getSupportFragmentManager()
-                    .beginTransaction()
-                    .replace(R.id.fragment_container, (Fragment) clazz.newInstance())
-                    .commitNow();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
+		try {
+			Class<?> clazz = getClassLoader().loadClass(intent.getStringExtra(Constants.ACTIVITY_PARAMETER_FRAGMENT));
+			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, (Fragment) clazz.newInstance()).commitNow();
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
 
-    public static void launch(Context context, Class<? extends Fragment> clazz) {
-        context.startActivity(new Intent(context, PreferenceActivity.class)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .putExtra(Constants.ACTIVITY_PARAMETER_FRAGMENT, clazz.getName()));
-    }
+	public static void launch(Context context, Class<? extends Fragment> clazz) {
+		context.startActivity(new Intent(context, PreferenceActivity.class)
+								  .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+								  .putExtra(Constants.ACTIVITY_PARAMETER_FRAGMENT, clazz.getName()));
+	}
 
-    @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        if (item.getItemId() == android.R.id.home)
-            finish();
-        return super.onOptionsItemSelected(item);
-    }
+	@Override
+	public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+		if (item.getItemId() == android.R.id.home) {
+			finish();
+		}
+
+		return super.onOptionsItemSelected(item);
+	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java
index f459aa6d..3cd28f4b 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java
@@ -1,19 +1,18 @@
 package com.panda3ds.pandroid.app.base;
 
 import android.annotation.SuppressLint;
-
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
-
 import com.panda3ds.pandroid.lang.Function;
 
+
 public abstract class BasePreferenceFragment extends PreferenceFragmentCompat {
-    @SuppressLint("RestrictedApi")
-    protected void setItemClick(String key, Function<Preference> listener){
-        findPreference(key).setOnPreferenceClickListener(preference -> {
-            listener.run(preference);
-            getPreferenceScreen().performClick();
-            return false;
-        });
-    }
+	@SuppressLint("RestrictedApi")
+	protected void setItemClick(String key, Function<Preference> listener) {
+		findPreference(key).setOnPreferenceClickListener(preference -> {
+			listener.run(preference);
+			getPreferenceScreen().performClick();
+			return false;
+		});
+	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java
index 10167664..6daca9a6 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java
@@ -2,67 +2,64 @@ package com.panda3ds.pandroid.app.game;
 
 import android.app.Activity;
 import android.view.KeyEvent;
-
 import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.input.InputEvent;
 import com.panda3ds.pandroid.input.InputMap;
 import com.panda3ds.pandroid.input.KeyName;
 import com.panda3ds.pandroid.lang.Function;
 import com.panda3ds.pandroid.math.Vector2;
-
 import java.util.Objects;
 
+
 public class AlberInputListener implements Function<InputEvent> {
-    private final Activity activity;
-    public AlberInputListener(Activity activity){
-        this.activity = activity;
-    }
+	private final Activity activity;
+	public AlberInputListener(Activity activity) { this.activity = activity; }
 
-    private final Vector2 axis = new Vector2(0.0f, 0.0f);
+	private final Vector2 axis = new Vector2(0.0f, 0.0f);
 
-    @Override
-    public void run(InputEvent event) {
-        KeyName key = InputMap.relative(event.getName());
+	@Override
+	public void run(InputEvent event) {
+		KeyName key = InputMap.relative(event.getName());
 
-        if (Objects.equals(event.getName(), "KEYCODE_BACK")){
-            activity.onBackPressed();
-            return;
-        }
+		if (Objects.equals(event.getName(), "KEYCODE_BACK")) {
+			activity.onBackPressed();
+			return;
+		}
 
-        if (key == KeyName.NULL)
-            return;
+		if (key == KeyName.NULL) {
+			return;
+		}
 
-        boolean axisChanged = false;
+		boolean axisChanged = false;
 
-        switch (key) {
-            case AXIS_UP:
-                axis.y = event.getValue();
-                axisChanged = true;
-                break;
-            case AXIS_DOWN:
-                axis.y = -event.getValue();
-                axisChanged = true;
-                break;
-            case AXIS_LEFT:
-                axis.x = -event.getValue();
-                axisChanged = true;
-                break;
-            case AXIS_RIGHT:
-                axis.x = event.getValue();
-                axisChanged = true;
-                break;
-            default:
-                if (event.isDown()) {
-                    AlberDriver.KeyDown(key.getKeyId());
-                } else {
-                    AlberDriver.KeyUp(key.getKeyId());
-                }
-                break;
-        }
-
-        if (axisChanged) {
-            AlberDriver.SetCirclepadAxis(Math.round(axis.x * 0x9C), Math.round(axis.y * 0x9C));
-        }
-    }
+		switch (key) {
+			case AXIS_UP:
+				axis.y = event.getValue();
+				axisChanged = true;
+				break;
+			case AXIS_DOWN:
+				axis.y = -event.getValue();
+				axisChanged = true;
+				break;
+			case AXIS_LEFT:
+				axis.x = -event.getValue();
+				axisChanged = true;
+				break;
+			case AXIS_RIGHT:
+				axis.x = event.getValue();
+				axisChanged = true;
+				break;
+			default:
+				if (event.isDown()) {
+					AlberDriver.KeyDown(key.getKeyId());
+				} else {
+					AlberDriver.KeyUp(key.getKeyId());
+				}
+				break;
+		}
 
+		if (axisChanged) {
+			AlberDriver.SetCirclepadAxis(Math.round(axis.x * 0x9C), Math.round(axis.y * 0x9C));
+		}
+	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java
index e2c97a17..ff6e4dca 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/GamesFragment.java
@@ -6,75 +6,74 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
-
 import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.data.game.GameMetadata;
 import com.panda3ds.pandroid.utils.FileUtils;
 import com.panda3ds.pandroid.utils.GameUtils;
 import com.panda3ds.pandroid.view.gamesgrid.GamesGridView;
 
+
 public class GamesFragment extends Fragment implements ActivityResultCallback<Uri> {
+	private final ActivityResultContracts.OpenDocument openRomContract = new ActivityResultContracts.OpenDocument();
+	private ActivityResultLauncher<String[]> pickFileRequest;
+	private GamesGridView gameListView;
 
-    private final ActivityResultContracts.OpenDocument openRomContract = new ActivityResultContracts.OpenDocument();
-    private ActivityResultLauncher<String[]> pickFileRequest;
-    private GamesGridView gameListView;
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+		return inflater.inflate(R.layout.fragment_games, container, false);
+	}
 
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_games, container, false);
-    }
+	@Override
+	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+		super.onViewCreated(view, savedInstanceState);
+		gameListView = view.findViewById(R.id.games);
 
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        gameListView = view.findViewById(R.id.games);
+		view.findViewById(R.id.add_rom).setOnClickListener((v) -> pickFileRequest.launch(new String[] {"*/*"}));
+	}
 
-        view.findViewById(R.id.add_rom).setOnClickListener((v) -> pickFileRequest.launch(new String[]{"*/*"}));
-    }
+	@Override
+	public void onResume() {
+		super.onResume();
+		gameListView.setGameList(GameUtils.getGames());
+	}
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        gameListView.setGameList(GameUtils.getGames());
-    }
+	@Override
+	public void onActivityResult(Uri result) {
+		if (result != null) {
+			String uri = result.toString();
+			if (GameUtils.findByRomPath(uri) == null) {
+				if (FileUtils.obtainRealPath(uri) == null) {
+					Toast.makeText(getContext(), "Invalid file path", Toast.LENGTH_LONG).show();
+					return;
+				}
+				FileUtils.makeUriPermanent(uri, FileUtils.MODE_READ);
+				GameMetadata game = new GameMetadata(uri, FileUtils.getName(uri).split("\\.")[0], "Unknown");
+				GameUtils.addGame(game);
+				GameUtils.launch(requireActivity(), game);
+			}
+		}
+	}
 
-    @Override
-    public void onActivityResult(Uri result) {
-        if (result != null) {
-            String uri = result.toString();
-            if (GameUtils.findByRomPath(uri) == null) {
-                if (FileUtils.obtainRealPath(uri) == null){
-                    Toast.makeText(getContext(), "Invalid file path", Toast.LENGTH_LONG).show();
-                    return;
-                }
-                FileUtils.makeUriPermanent(uri, FileUtils.MODE_READ);
-                GameMetadata game = new GameMetadata(uri, FileUtils.getName(uri).split("\\.")[0],"Unknown");
-                GameUtils.addGame(game);
-                GameUtils.launch(requireActivity(), game);
-            }
-        }
-    }
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		pickFileRequest = registerForActivityResult(openRomContract, this);
+	}
 
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        pickFileRequest = registerForActivityResult(openRomContract, this);
-    }
+	@Override
+	public void onDestroy() {
+		if (pickFileRequest != null) {
+			pickFileRequest.unregister();
+			pickFileRequest = null;
+		}
 
-    @Override
-    public void onDestroy() {
-        if (pickFileRequest != null) {
-            pickFileRequest.unregister();
-            pickFileRequest = null;
-        }
-        super.onDestroy();
-    }
+		super.onDestroy();
+	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SearchFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SearchFragment.java
index 213d55fc..e9db7f80 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SearchFragment.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SearchFragment.java
@@ -4,64 +4,59 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatEditText;
 import androidx.fragment.app.Fragment;
-
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.data.game.GameMetadata;
 import com.panda3ds.pandroid.utils.GameUtils;
 import com.panda3ds.pandroid.utils.SearchAgent;
 import com.panda3ds.pandroid.view.SimpleTextWatcher;
 import com.panda3ds.pandroid.view.gamesgrid.GamesGridView;
-
 import java.util.ArrayList;
 import java.util.List;
 
+
 public class SearchFragment extends Fragment {
+	private final SearchAgent searchAgent = new SearchAgent();
+	private GamesGridView gamesListView;
 
-    private final SearchAgent searchAgent = new SearchAgent();
-    private GamesGridView gamesListView;
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+		return inflater.inflate(R.layout.fragment_search, container, false);
+	}
 
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_search, container, false);
-    }
+	@Override
+	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+		super.onViewCreated(view, savedInstanceState);
 
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
+		gamesListView = view.findViewById(R.id.games);
+		((AppCompatEditText) view.findViewById(R.id.search_bar)).addTextChangedListener((SimpleTextWatcher) this::search);
+	}
 
-        gamesListView = view.findViewById(R.id.games);
+	@Override
+	public void onResume() {
+		super.onResume();
+		searchAgent.clearBuffer();
+		for (GameMetadata game : GameUtils.getGames()) {
+			searchAgent.addToBuffer(game.getId(), game.getTitle(), game.getPublisher());
+		}
 
-        ((AppCompatEditText) view.findViewById(R.id.search_bar))
-                .addTextChangedListener((SimpleTextWatcher) this::search);
-    }
+		search("");
+	}
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        searchAgent.clearBuffer();
-        for (GameMetadata game : GameUtils.getGames()) {
-            searchAgent.addToBuffer(game.getId(), game.getTitle(), game.getPublisher());
-        }
-        search("");
-    }
+	private void search(String query) {
+		List<String> resultIds = searchAgent.search(query);
+		ArrayList<GameMetadata> games = new ArrayList<>(GameUtils.getGames());
+		Object[] resultObj = games.stream().filter(gameMetadata -> resultIds.contains(gameMetadata.getId())).toArray();
 
-    private void search(String query) {
-        List<String> resultIds = searchAgent.search(query);
-        ArrayList<GameMetadata> games = new ArrayList<>(GameUtils.getGames());
-        Object[] resultObj = games.stream()
-                .filter(gameMetadata -> resultIds.contains(gameMetadata.getId()))
-                .toArray();
-
-        games.clear();
-        for (Object res : resultObj)
+		games.clear();
+		for (Object res : resultObj) {
             games.add((GameMetadata) res);
+        }
 
-        gamesListView.setGameList(games);
-    }
+		gamesListView.setGameList(games);
+	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapActivity.java
index b7a2cbb4..dce56a5f 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapActivity.java
@@ -28,8 +28,9 @@ public class InputMapActivity extends BaseActivity {
     @Override
     protected void onResume() {
         super.onResume();
+
         InputHandler.reset();
-        InputHandler.setMotionDeadZone(0.8F);
+        InputHandler.setMotionDeadZone(0.8f);
         InputHandler.setEventListener(this::onInputEvent);
     }
 
@@ -61,7 +62,6 @@ public class InputMapActivity extends BaseActivity {
 
 
     public static final class Contract extends ActivityResultContract<String, String> {
-
         @NonNull
         @Override
         public Intent createIntent(@NonNull Context context, String s) {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java
index 00f031ac..83024490 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java
@@ -30,7 +30,10 @@ public class InputMapPreferences extends BasePreferenceFragment implements Activ
         ((BaseActivity) requireActivity()).getSupportActionBar().setTitle(R.string.controller_mapping);
 
         for (KeyName key : KeyName.values()) {
-            if (key == KeyName.NULL) continue;
+            if (key == KeyName.NULL) {
+                continue;
+            }
+
             setItemClick(key.name(), this::onItemPressed);
         }
 
@@ -59,6 +62,7 @@ public class InputMapPreferences extends BasePreferenceFragment implements Activ
     @Override
     public void onDetach() {
         super.onDetach();
+        
         if (requestKey != null) {
             requestKey.unregister();
             requestKey = null;
@@ -77,10 +81,14 @@ public class InputMapPreferences extends BasePreferenceFragment implements Activ
     }
 
     private void refreshList() {
-        deadZonePreference.setValue((int)(InputMap.getDeadZone()*100));
-        deadZonePreference.setSummary(deadZonePreference.getValue()+"%");
+        deadZonePreference.setValue((int)(InputMap.getDeadZone() * 100));
+        deadZonePreference.setSummary(deadZonePreference.getValue() + "%");
+        
         for (KeyName key : KeyName.values()) {
-            if (key == KeyName.NULL) continue;
+            if (key == KeyName.NULL) {
+                continue;
+            }
+            
             findPreference(key.name()).setSummary(InputMap.relative(key));
         }
     }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java
index f88687f2..f5025c32 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java
@@ -13,7 +13,7 @@ public class GsonConfigParser {
     }
 
     private String getPath(){
-        return FileUtils.getConfigPath()+"/"+name+".json";
+        return FileUtils.getConfigPath()+ "/" + name + ".json";
     }
 
     public void save(Object data){
@@ -26,7 +26,7 @@ public class GsonConfigParser {
     }
 
     public <T> T load(Class<T> clazz){
-        String[] content = new String[]{"{}"};
+        String[] content = new String[] {"{}"};
         new Task(()->{
             if (FileUtils.exists(getPath())){
                 content[0] = FileUtils.readTextFile(getPath());
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/SMDH.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/SMDH.java
index 2401a403..e1230f24 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/SMDH.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/SMDH.java
@@ -9,9 +9,8 @@ import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 
 public class SMDH {
-
-    public static final int LANGUAGE_ENGLISH = 1;
     public static final int LANGUAGE_JAPANESE = 0;
+    public static final int LANGUAGE_ENGLISH = 1;
     public static final int LANGUAGE_CHINESE = 6;
     public static final int LANGUAGE_KOREAN = 7;
 
@@ -61,6 +60,8 @@ public class SMDH {
         final boolean korea = (regionMasks & REGION_KOREAN_MASK) != 0;
         final boolean taiwan = (regionMasks & REGION_TAIWAN_MASK) != 0;
 
+        // Depending on the regions allowed in the region mask, pick one of the regions to use
+        // We prioritize English-speaking regions both here and in the emulator core, since users are most likely to speak English at least
         if (northAmerica) {
             region = GameRegion.NorthAmerican;
         } else if (europe) {
@@ -71,14 +72,14 @@ public class SMDH {
             region = GameRegion.Japan;
             metaLanguage = LANGUAGE_JAPANESE;
         } else if (korea) {
-            metaLanguage = LANGUAGE_KOREAN;
             region = GameRegion.Korean;
+            metaLanguage = LANGUAGE_KOREAN;
         } else if (china) {
-            metaLanguage = LANGUAGE_CHINESE;
             region = GameRegion.China;
-        } else if (taiwan) {
             metaLanguage = LANGUAGE_CHINESE;
+        } else if (taiwan) {
             region = GameRegion.Taiwan;
+            metaLanguage = LANGUAGE_CHINESE;
         } else {
             region = GameRegion.None;
         }
@@ -111,29 +112,30 @@ public class SMDH {
                 int indexY = y & ~7;
                 int indexX = x & ~7;
 
-                int i = mortonInterleave(x, y);
-                int offset = (i + (indexX * 8)) * 2;
+                int interleave = mortonInterleave(x, y);
+                int offset = (interleave + (indexX * 8)) * 2;
 
                 offset = offset + indexY * ICON_SIZE * 2;
 
                 smdh.position(offset + IMAGE_OFFSET);
 
-                int byte1 = smdh.get() & 0xFF;
-                int byte2 = smdh.get() & 0xFF;
+                int lowByte = smdh.get() & 0xFF;
+                int highByte = smdh.get() & 0xFF;
+                int texel = (highByte << 8) | lowByte;
 
-                int texel = byte1 | (byte2 << 8);
+                // Convert texel from RGB565 to RGB888
+                int r = (texel >> 11) & 0x1F;
+                int g = (texel >> 5) & 0x3F;
+                int b = texel & 0x1F;
 
-                int r = (texel >> 11) & 0x1f;
-                int g = (texel >> 5) & 0x3f;
-                int b = texel & 0x1f;
-
-                b = (b << 3) | (b >> 2);
-                g = (g << 2) | (g >> 4);
                 r = (r << 3) | (r >> 2);
+                g = (g << 2) | (g >> 4);
+                b = (b << 3) | (b >> 2);
 
                 icon[x + ICON_SIZE * y] = Color.rgb(r, g, b);
             }
         }
+    
         return icon;
     }
 
@@ -160,7 +162,7 @@ public class SMDH {
         return publisher[metaLanguage];
     }
 
-    // SMDH stores string in UTF-16LE format
+    // Strings in SMDH files are stored as UTF-16LE
     private static String convertString(byte[] buffer) {
         try {
             return new String(buffer, 0, buffer.length, StandardCharsets.UTF_16LE)
@@ -174,6 +176,7 @@ public class SMDH {
     private static int mortonInterleave(int u, int v) {
         int[] xlut = {0, 1, 4, 5, 16, 17, 20, 21};
         int[] ylut = {0, 2, 8, 10, 32, 34, 40, 42};
+
         return xlut[u % 8] + ylut[v % 8];
     }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputHandler.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputHandler.java
index 08142d06..390708b9 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputHandler.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputHandler.java
@@ -26,11 +26,13 @@ public class InputHandler {
 
     private static final HashMap<String, Float> motionDownEvents = new HashMap<>();
 
-    private static boolean containsSource(int[] sources, int sourceMasked) {
+    private static boolean containsSource(int[] sources, int sourceMask) {
         for (int source : sources) {
-            if ((sourceMasked & source) == source)
+            if ((source & sourceMask) == source) {
                 return true;
+            }
         }
+
         return false;
     }
 
@@ -57,8 +59,9 @@ public class InputHandler {
     }
 
     public static boolean processMotionEvent(MotionEvent event) {
-        if (!isSourceValid(event.getSource()))
+        if (!isSourceValid(event.getSource())) {
             return false;
+        }
 
         if (isGamepadSource(event.getSource())) {
             for (InputDevice.MotionRange range : event.getDevice().getMotionRanges()) {
@@ -87,8 +90,9 @@ public class InputHandler {
     }
 
     public static boolean processKeyEvent(KeyEvent event) {
-        if (!isSourceValid(event.getSource()))
+        if (!isSourceValid(event.getSource())) {
             return false;
+        }
 
         if (isGamepadSource(event.getSource())) {
             // Dpad return motion event + key event, this remove the key event
@@ -104,6 +108,7 @@ public class InputHandler {
                     return true;
             }
         }
+        
         handleEvent(new InputEvent(KeyEvent.keyCodeToString(event.getKeyCode()), event.getAction() == KeyEvent.ACTION_UP ? 0.0f : 1.0f));
         return true;
     }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java
index 1b76c757..b41a9e33 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java
@@ -5,11 +5,11 @@ public class Task extends Thread {
         super(runnable);
     }
 
-
     public void runSync(){
         start();
         waitFinish();
     }
+
     public void waitFinish(){
         try {
             join();
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
index 2b7ce281..a065cd0c 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
@@ -44,6 +44,7 @@ public class FileUtils {
         if (!file.exists()) {
             file.mkdirs();
         }
+
         return file.getAbsolutePath();
     }
 
@@ -52,6 +53,7 @@ public class FileUtils {
         if (!file.exists()) {
             file.mkdirs();
         }
+
         return file.getAbsolutePath();
     }
 
@@ -61,8 +63,10 @@ public class FileUtils {
 
     public static boolean createDir(String path, String name) {
         DocumentFile folder = parseFile(path);
-        if (folder.findFile(name) != null)
+        if (folder.findFile(name) != null) {
             return true;
+        }
+    
         return folder.createDirectory(name) != null;
     }
 
@@ -86,12 +90,14 @@ public class FileUtils {
             Log.e(Constants.LOG_TAG, "Error on write text file: ", e);
             return false;
         }
+
         return true;
     }
 
     public static String readTextFile(String path) {
-        if (!exists(path))
+        if (!exists(path)) {
             return null;
+        }
 
         try {
             InputStream stream = getInputStream(path);
@@ -99,15 +105,15 @@ public class FileUtils {
 
             int len;
             byte[] buffer = new byte[1024 * 8];
-            while ((len = stream.read(buffer)) != -1)
+            while ((len = stream.read(buffer)) != -1) {
                 output.write(buffer, 0, len);
+            }
 
             stream.close();
             output.flush();
             output.close();
 
             byte[] data = output.toByteArray();
-
             return new String(data, 0, data.length);
         } catch (Exception e) {
             return null;
@@ -124,8 +130,9 @@ public class FileUtils {
 
     public static void makeUriPermanent(String uri, String mode) {
         int flags = Intent.FLAG_GRANT_READ_URI_PERMISSION;
-        if (mode.toLowerCase().contains("w"))
+        if (mode.toLowerCase().contains("w")) {
             flags &= Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
+        }
 
         getContext().getContentResolver().takePersistableUriPermission(Uri.parse(uri), flags);
     }
@@ -141,6 +148,7 @@ public class FileUtils {
             ParcelFileDescriptor parcelDescriptor = getContext().getContentResolver().openFileDescriptor(Uri.parse(uri), "r");
             int fd = parcelDescriptor.getFd();
             File file = new File("/proc/self/fd/" + fd).getAbsoluteFile();
+        
             for (int i = 0; i < CANONICAL_SEARCH_DEEP; i++) {
                 try {
                     String canonical = file.getCanonicalPath();
@@ -156,11 +164,14 @@ public class FileUtils {
                 parcelDescriptor.close();
                 return file.getAbsolutePath();
             }
+
             String path = Os.readlink(file.getAbsolutePath());
             parcelDescriptor.close();
 
-            if (new File(path).exists())
+            if (new File(path).exists()) {
                 return path;
+            }
+    
             return null;
         } catch (Exception e) {
             return null;
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/SearchAgent.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/SearchAgent.java
index b4ea2152..749e1bd6 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/SearchAgent.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/SearchAgent.java
@@ -8,9 +8,8 @@ import java.util.HashMap;
 import java.util.List;
 
 public class SearchAgent {
-
-    // Store all possibles results in map
-    // id->words
+    // Store all results in a hashmap
+    // Matches IDs -> Result string
     private final HashMap<String, String> searchBuffer = new HashMap<>();
 
     // Add search item to list
@@ -19,15 +18,12 @@ public class SearchAgent {
         for (String word : words) {
             string.append(normalize(word)).append(" ");
         }
+
         searchBuffer.put(id, string.toString());
     }
 
-    /**
-     * Convert string to simple string with only a-z 0-9 for do this first it get the input string
-     * and apply lower case, after convert all chars to ASCII
-     * Ex: ç => c, á => a
-     * after replace all double space for single space
-     */
+    // Convert string to lowercase alphanumeric string, converting all characters to ASCII and turning double spaces into single ones
+    // For example, é will be converted to e
     private String normalize(String string) {
         string = Normalizer.normalize(string, Normalizer.Form.NFD).replaceAll("[^\\p{ASCII}]", "");
 
@@ -40,26 +36,30 @@ public class SearchAgent {
     public List<String> search(String query) {
         String[] words = normalize(query).split("\\s");
 
-        if (words.length == 0)
+        if (words.length == 0) {
             return Collections.emptyList();
+        }
 
         // Map for add all search result: id -> probability
         HashMap<String, Integer> results = new HashMap<>();
         for (String key : searchBuffer.keySet()) {
             int probability = 0;
             String value = searchBuffer.get(key);
+
             for (String word : words) {
                 if (value.contains(word))
                     probability++;
             }
-            if (probability > 0)
+
+            if (probability > 0) {
                 results.put(key, probability);
+            }
         }
 
 
-        // Filter by probability average
-        // Ex: A = 10% B = 30% C = 70% (calc is (10+30+70)/3=36)
-        // After remove all result with probability < 36
+        // Filter by probability average, ie by how closely they match to our query
+        // Ex: A = 10% B = 30% C = 70% (formula is (10+30+70)/3=36)
+        // Afterwards remove all results with probability < 36
         int average = 0;
         for (String key : results.keySet()) {
             average += results.get(key);
@@ -76,6 +76,7 @@ public class SearchAgent {
                 i = 0;
                 continue;
             }
+            
             i++;
         }
 
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GameIconView.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GameIconView.java
index df4d2a5c..e73d8d08 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GameIconView.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GameIconView.java
@@ -11,7 +11,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
 
 public class GameIconView extends AppCompatImageView {
-
     public GameIconView(@NonNull Context context) {
         super(context);
     }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java
index f4ddfd12..4f451c8f 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java
@@ -56,6 +56,7 @@ public class SingleSelectionPreferences extends PreferenceCategory implements Pr
     @Override
     public void onAttached() {
         super.onAttached();
+
         for (int i = 0; i < getPreferenceCount();i++) {
             getPreference(i).setOnPreferenceClickListener(this);
         }
@@ -68,6 +69,7 @@ public class SingleSelectionPreferences extends PreferenceCategory implements Pr
     @Override
     public boolean onPreferenceClick(@NonNull Preference preference) {
         int index = 0;
+
         for (int i = 0; i < getPreferenceCount(); i++){
             Preference item = getPreference(i);
             if (item == preference){

From 1c691e169095043da211369a8f42089c9c4317dd Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 26 Dec 2023 02:24:53 +0200
Subject: [PATCH 094/162] Rebonk

---
 .../app/preferences/InputMapPreferences.java        |  5 +++--
 .../panda3ds/pandroid/data/GsonConfigParser.java    | 13 +++++++------
 .../panda3ds/pandroid/data/config/GlobalConfig.java |  6 +++---
 .../panda3ds/pandroid/data/game/GameMetadata.java   | 10 +++++-----
 .../main/java/com/panda3ds/pandroid/lang/Task.java  |  6 +++---
 .../panda3ds/pandroid/view/SimpleTextWatcher.java   |  2 +-
 .../preferences/SingleSelectionPreferences.java     |  6 +++---
 7 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java
index 83024490..b4d148b9 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java
@@ -40,8 +40,9 @@ public class InputMapPreferences extends BasePreferenceFragment implements Activ
         deadZonePreference = getPreferenceScreen().findPreference("dead_zone");
 
         deadZonePreference.setOnPreferenceChangeListener((preference, value) -> {
-            InputMap.setDeadZone(((int)value/100.0f));
+            InputMap.setDeadZone(((int)value / 100.0f));
             refreshList();
+
             return false;
         });
 
@@ -62,7 +63,7 @@ public class InputMapPreferences extends BasePreferenceFragment implements Activ
     @Override
     public void onDetach() {
         super.onDetach();
-        
+
         if (requestKey != null) {
             requestKey.unregister();
             requestKey = null;
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java
index f5025c32..99c1419b 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java
@@ -8,15 +8,15 @@ public class GsonConfigParser {
     private final Gson gson = new Gson();
     private final String name;
 
-    public GsonConfigParser(String name){
+    public GsonConfigParser(String name) {
         this.name = name;
     }
 
-    private String getPath(){
+    private String getPath() {
         return FileUtils.getConfigPath()+ "/" + name + ".json";
     }
 
-    public void save(Object data){
+    public void save(Object data) {
         synchronized (this) {
             new Task(() -> {
                 String json = gson.toJson(data, data.getClass());
@@ -25,13 +25,14 @@ public class GsonConfigParser {
         }
     }
 
-    public <T> T load(Class<T> clazz){
+    public <T> T load(Class<T> myClass) {
         String[] content = new String[] {"{}"};
         new Task(()->{
-            if (FileUtils.exists(getPath())){
+            if (FileUtils.exists(getPath())) {
                 content[0] = FileUtils.readTextFile(getPath());
             }
         }).runSync();
-        return gson.fromJson(content[0], clazz);
+
+        return gson.fromJson(content[0], myClass);
     }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
index d05d9f22..d6dbe3b8 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
@@ -29,7 +29,7 @@ public class GlobalConfig {
     public static <T extends Serializable> T get(Key<T> key) {
         Serializable value;
 
-        if (!data.configs.containsKey(key.name)){
+        if (!data.configs.containsKey(key.name)) {
             return key.defaultValue;
         }
 
@@ -52,7 +52,7 @@ public class GlobalConfig {
         writeChanges();
     }
 
-    private static void writeChanges(){
+    private static void writeChanges() {
         parser.save(data);
     }
 
@@ -69,7 +69,7 @@ public class GlobalConfig {
     private static class DataModel {
         private final Map<String, Object> configs = new LinkedTreeMap<>();
 
-        public Object get(String key){
+        public Object get(String key) {
             return configs.get(key);
         }
     }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java
index 7e73872d..512a3725 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/game/GameMetadata.java
@@ -20,7 +20,7 @@ public class GameMetadata {
     private final GameRegion[] regions;
     private transient Bitmap icon;
 
-    private GameMetadata(String id, String romPath, String title, String publisher, Bitmap icon, GameRegion[] regions){
+    private GameMetadata(String id, String romPath, String title, String publisher, Bitmap icon, GameRegion[] regions) {
         this.id = id;
         this.title = title;
         this.publisher = publisher;
@@ -35,7 +35,7 @@ public class GameMetadata {
         this(UUID.randomUUID().toString(), romPath, title, publisher, null, regions);
     }
 
-    public GameMetadata(String romPath,String title, String publisher){
+    public GameMetadata(String romPath,String title, String publisher) {
         this(romPath,title, publisher, new GameRegion[]{GameRegion.None});
     }
 
@@ -56,7 +56,7 @@ public class GameMetadata {
     }
 
     public Bitmap getIcon() {
-        if (icon == null){
+        if (icon == null) {
             icon = GameUtils.loadGameIcon(id);
         }
         return icon;
@@ -68,13 +68,13 @@ public class GameMetadata {
 
     @Override
     public boolean equals(@Nullable Object obj) {
-        if (obj instanceof GameMetadata){
+        if (obj instanceof GameMetadata) {
             return Objects.equals(((GameMetadata) obj).id, id);
         }
         return false;
     }
 
-    public static GameMetadata applySMDH(GameMetadata meta, SMDH smdh){
+    public static GameMetadata applySMDH(GameMetadata meta, SMDH smdh) {
         Bitmap icon = smdh.getBitmapIcon();
         GameMetadata newMeta = new GameMetadata(meta.getId(), meta.getRomPath(), smdh.getTitle(), smdh.getPublisher(), icon, new GameRegion[]{smdh.getRegion()});
         icon.recycle();
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java
index b41a9e33..7745883d 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java
@@ -1,16 +1,16 @@
 package com.panda3ds.pandroid.lang;
 
 public class Task extends Thread {
-    public Task(Runnable runnable){
+    public Task(Runnable runnable) {
         super(runnable);
     }
 
-    public void runSync(){
+    public void runSync() {
         start();
         waitFinish();
     }
 
-    public void waitFinish(){
+    public void waitFinish() {
         try {
             join();
         } catch (InterruptedException e) {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/SimpleTextWatcher.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/SimpleTextWatcher.java
index 46a43ddb..baacd743 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/SimpleTextWatcher.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/SimpleTextWatcher.java
@@ -13,7 +13,7 @@ public interface SimpleTextWatcher extends TextWatcher {
     default void beforeTextChanged(CharSequence s, int start, int count, int after) {}
 
     @Override
-    default void afterTextChanged(Editable s){
+    default void afterTextChanged(Editable s) {
         onChange(s.toString());
     }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java
index 4f451c8f..49fabd6a 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/preferences/SingleSelectionPreferences.java
@@ -62,7 +62,7 @@ public class SingleSelectionPreferences extends PreferenceCategory implements Pr
         }
     }
 
-    public void setSelectedItem(int index){
+    public void setSelectedItem(int index) {
         onPreferenceClick(getPreference(index));
     }
 
@@ -70,9 +70,9 @@ public class SingleSelectionPreferences extends PreferenceCategory implements Pr
     public boolean onPreferenceClick(@NonNull Preference preference) {
         int index = 0;
 
-        for (int i = 0; i < getPreferenceCount(); i++){
+        for (int i = 0; i < getPreferenceCount(); i++) {
             Preference item = getPreference(i);
-            if (item == preference){
+            if (item == preference) {
                 index = i;
                 item.setIcon(R.drawable.ic_done);
             } else {

From 5341ee8f1e464618a4eb9fe12b368e4be2a21239 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 26 Dec 2023 02:29:47 +0200
Subject: [PATCH 095/162] Fix Pandroid class

---
 include/jni_driver.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/jni_driver.hpp b/include/jni_driver.hpp
index a4d6895e..a11a4df0 100644
--- a/include/jni_driver.hpp
+++ b/include/jni_driver.hpp
@@ -3,6 +3,7 @@
 #include "helpers.hpp"
 
 
-namespace Pandroid {
+class Pandroid {
+  public:
 	static void onSmdhLoaded(const std::vector<u8>& smdh);
 };

From 83f4fcc65ad045db5f960d36b6df7d8331f9b100 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 26 Dec 2023 02:45:33 +0200
Subject: [PATCH 096/162] Remove redundant whitelines

---
 include/jni_driver.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/jni_driver.hpp b/include/jni_driver.hpp
index a11a4df0..94408db4 100644
--- a/include/jni_driver.hpp
+++ b/include/jni_driver.hpp
@@ -2,7 +2,6 @@
 
 #include "helpers.hpp"
 
-
 class Pandroid {
   public:
 	static void onSmdhLoaded(const std::vector<u8>& smdh);

From d28ead1438941026f9ed94d8110e82a2a8442196 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 26 Dec 2023 20:29:07 +0200
Subject: [PATCH 097/162] Ignore JNI driver files for Android Hydra core

---
 CMakeLists.txt           | 3 ++-
 src/core/loader/ncch.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b0410fd..ef26e401 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -388,9 +388,10 @@ if(ENABLE_VULKAN)
     set(ALL_SOURCES ${ALL_SOURCES} ${RENDERER_VK_SOURCE_FILES})
 endif()
 
-if(ANDROID)
+if(ANDROID AND NOT BUILD_HYDRA_CORE)
     set(HEADER_FILES ${HEADER_FILES} include/jni_driver.hpp)
     set(ALL_SOURCES ${ALL_SOURCES} src/jni_driver.cpp)
+    target_compile_definitions(Alber PRIVATE PANDA3DS_FRONTEND_PANDROID=1)
 endif()
 
 if(BUILD_HYDRA_CORE)
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index a294f0e6..ac1eb629 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -259,7 +259,8 @@ bool NCCH::parseSMDH(const std::vector<u8>& smdh) {
 		return false;
 	}
 
-#ifdef __ANDROID__
+	// In the Android version, notify the application that we're loading an SMDH file, to extract data for the title list
+#ifdef PANDA3DS_FRONTEND_PANDROID
 	Pandroid::onSmdhLoaded(smdh);
 #endif
 

From adb8cccf8caebd9072c927c3678f5ce3995848e9 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 26 Dec 2023 20:30:01 +0200
Subject: [PATCH 098/162] Fix Android hydra core (again)

---
 src/core/loader/ncch.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index ac1eb629..8881812d 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -6,7 +6,7 @@
 #include "loader/ncch.hpp"
 #include "memory.hpp"
 
-#ifdef __ANDROID__
+#ifdef PANDA3DS_FRONTEND_PANDROID
 #include "jni_driver.hpp"    
 #endif
 

From 0525d96aec9a5233bbc721edc6364cfba0e4868b Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 27 Dec 2023 00:46:37 +0200
Subject: [PATCH 099/162] Roll back Pandroid/Hydra split

---
 CMakeLists.txt           | 3 +--
 src/core/loader/ncch.cpp | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef26e401..4b0410fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -388,10 +388,9 @@ if(ENABLE_VULKAN)
     set(ALL_SOURCES ${ALL_SOURCES} ${RENDERER_VK_SOURCE_FILES})
 endif()
 
-if(ANDROID AND NOT BUILD_HYDRA_CORE)
+if(ANDROID)
     set(HEADER_FILES ${HEADER_FILES} include/jni_driver.hpp)
     set(ALL_SOURCES ${ALL_SOURCES} src/jni_driver.cpp)
-    target_compile_definitions(Alber PRIVATE PANDA3DS_FRONTEND_PANDROID=1)
 endif()
 
 if(BUILD_HYDRA_CORE)
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 8881812d..a4dd6e54 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -6,7 +6,7 @@
 #include "loader/ncch.hpp"
 #include "memory.hpp"
 
-#ifdef PANDA3DS_FRONTEND_PANDROID
+#ifdef __ANDROID__
 #include "jni_driver.hpp"    
 #endif
 
@@ -260,7 +260,7 @@ bool NCCH::parseSMDH(const std::vector<u8>& smdh) {
 	}
 
 	// In the Android version, notify the application that we're loading an SMDH file, to extract data for the title list
-#ifdef PANDA3DS_FRONTEND_PANDROID
+#ifdef __ANDROID__
 	Pandroid::onSmdhLoaded(smdh);
 #endif
 

From 3aa977c6c59cbed4ce4c0cb44b1c4855d5e1e763 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Wed, 27 Dec 2023 23:05:21 +0200
Subject: [PATCH 100/162] Clean up smdh getting

---
 CMakeLists.txt                                |  1 -
 include/emulator.hpp                          |  3 +++
 include/jni_driver.hpp                        |  8 ------
 include/loader/ncch.hpp                       |  1 +
 src/core/loader/ncch.cpp                      | 17 +++---------
 src/emulator.cpp                              | 11 ++++++++
 src/jni_driver.cpp                            | 26 +++++++------------
 .../com/panda3ds/pandroid/AlberDriver.java    | 14 +---------
 .../pandroid/view/PandaGlRenderer.java        | 16 ++++++++++++
 9 files changed, 45 insertions(+), 52 deletions(-)
 delete mode 100644 include/jni_driver.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b0410fd..732ec793 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -389,7 +389,6 @@ if(ENABLE_VULKAN)
 endif()
 
 if(ANDROID)
-    set(HEADER_FILES ${HEADER_FILES} include/jni_driver.hpp)
     set(ALL_SOURCES ${ALL_SOURCES} src/jni_driver.cpp)
 endif()
 
diff --git a/include/emulator.hpp b/include/emulator.hpp
index fcf93329..f4537425 100644
--- a/include/emulator.hpp
+++ b/include/emulator.hpp
@@ -3,6 +3,7 @@
 #include <filesystem>
 #include <fstream>
 #include <optional>
+#include <span>
 
 #include "PICA/gpu.hpp"
 #include "cheats.hpp"
@@ -127,4 +128,6 @@ class Emulator {
 
 	std::filesystem::path getConfigPath();
 	std::filesystem::path getAndroidAppPath();
+
+	std::span<u8> getSMDH();
 };
diff --git a/include/jni_driver.hpp b/include/jni_driver.hpp
deleted file mode 100644
index 94408db4..00000000
--- a/include/jni_driver.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <vector>
-
-#include "helpers.hpp"
-
-class Pandroid {
-  public:
-	static void onSmdhLoaded(const std::vector<u8>& smdh);
-};
diff --git a/include/loader/ncch.hpp b/include/loader/ncch.hpp
index 5e2ad1d8..c5ef2465 100644
--- a/include/loader/ncch.hpp
+++ b/include/loader/ncch.hpp
@@ -65,6 +65,7 @@ struct NCCH {
 	std::vector<u8> saveData;
 	// The cart region. Only the CXI's region matters to us. Necessary to get past region locking
 	std::optional<Regions> region = std::nullopt;
+	std::vector<u8> smdh;
 
 	// Returns true on success, false on failure
 	// Partition index/offset/size must have been set before this
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index a4dd6e54..1f534fa0 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -6,10 +6,6 @@
 #include "loader/ncch.hpp"
 #include "memory.hpp"
 
-#ifdef __ANDROID__
-#include "jni_driver.hpp"    
-#endif
-
 #include <iostream>
 
 bool NCCH::loadFromHeader(Crypto::AESEngine &aesEngine, IOFile& file, const FSInfo &info) {
@@ -30,6 +26,7 @@ bool NCCH::loadFromHeader(Crypto::AESEngine &aesEngine, IOFile& file, const FSIn
 
 	codeFile.clear();
 	saveData.clear();
+	smdh.clear();
 	partitionInfo = info;
 
 	size = u64(*(u32*)&header[0x104]) * mediaUnit; // TODO: Maybe don't type pun because big endian will break
@@ -223,11 +220,10 @@ bool NCCH::loadFromHeader(Crypto::AESEngine &aesEngine, IOFile& file, const FSIn
 				}
 			} else if (std::strcmp(name, "icon") == 0) {
 				// Parse icon file to extract region info and more in the future (logo, etc)
-				std::vector<u8> tmp;
-				tmp.resize(fileSize);
-				readFromFile(file, exeFS, tmp.data(), fileOffset + exeFSHeaderSize, fileSize);
+				smdh.resize(fileSize);
+				readFromFile(file, exeFS, smdh.data(), fileOffset + exeFSHeaderSize, fileSize);
 
-				if (!parseSMDH(tmp)) {
+				if (!parseSMDH(smdh)) {
 					printf("Failed to parse SMDH!\n");
 				}
 			}
@@ -259,11 +255,6 @@ bool NCCH::parseSMDH(const std::vector<u8>& smdh) {
 		return false;
 	}
 
-	// In the Android version, notify the application that we're loading an SMDH file, to extract data for the title list
-#ifdef __ANDROID__
-	Pandroid::onSmdhLoaded(smdh);
-#endif
-
 	// Bitmask showing which regions are allowed.
 	// https://www.3dbrew.org/wiki/SMDH#Region_Lockout
 	const u32 regionMasks = *(u32*)&smdh[0x2018];
diff --git a/src/emulator.cpp b/src/emulator.cpp
index 656aaebd..e94170a2 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -252,6 +252,17 @@ bool Emulator::loadELF(std::ifstream& file) {
 	return true;
 }
 
+std::span<u8> Emulator::getSMDH() {
+	switch (romType) {
+		case ROMType::NCSD:
+		case ROMType::CXI:
+			return memory.getCXI()->smdh;
+		default: {
+			return std::span<u8>();
+		}
+	}
+}
+
 #ifdef PANDA3DS_ENABLE_DISCORD_RPC
 void Emulator::updateDiscord() {
 	if (config.discordRpcEnabled) {
diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index c38359b4..cbc5a16e 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -1,5 +1,3 @@
-#include "jni_driver.hpp"
-
 #include <EGL/egl.h>
 #include <android/log.h>
 #include <jni.h>
@@ -15,7 +13,6 @@ HIDService* hidService = nullptr;
 RendererGL* renderer = nullptr;
 bool romLoaded = false;
 JavaVM* jvm = nullptr;
-const char* alberClass = "com/panda3ds/pandroid/AlberDriver";
 
 #define AlberFunction(type, name) JNIEXPORT type JNICALL Java_com_panda3ds_pandroid_AlberDriver_##name
 
@@ -36,20 +33,6 @@ JNIEnv* jniEnv() {
 	return env;
 }
 
-void Pandroid::onSmdhLoaded(const std::vector<u8>& smdh) {
-	JNIEnv* env = jniEnv();
-	int size = smdh.size();
-
-	jbyteArray result = env->NewByteArray(size);
-	env->SetByteArrayRegion(result, 0, size, (jbyte*)smdh.data());
-
-	auto classLoader = env->FindClass(alberClass);
-	auto method = env->GetStaticMethodID(classLoader, "OnSmdhLoaded", "([B)V");
-
-	env->CallStaticVoidMethod(classLoader, method, result);
-	env->DeleteLocalRef(result);
-}
-
 extern "C" {
 
 AlberFunction(void, Setup)(JNIEnv* env, jobject obj) { env->GetJavaVM(&jvm); }
@@ -104,6 +87,15 @@ AlberFunction(void, SetCirclepadAxis)(JNIEnv* env, jobject obj, jint x, jint y)
 	hidService->setCirclepadX((s16)x);
 	hidService->setCirclepadY((s16)y);
 }
+
+AlberFunction(jbyteArray, GetSmdh)(JNIEnv* env, jobject obj) {
+	std::span<u8> smdh = emulator->getSMDH();
+
+	jbyteArray result = env->NewByteArray(smdh.size());
+	env->SetByteArrayRegion(result, 0, smdh.size(), (jbyte*)smdh.data());
+
+	return result;
+}
 }
 
 #undef AlberFunction
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
index 2a496693..33438bb0 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
@@ -2,11 +2,6 @@ package com.panda3ds.pandroid;
 
 import android.util.Log;
 
-import com.panda3ds.pandroid.data.SMDH;
-import com.panda3ds.pandroid.data.game.GameMetadata;
-import com.panda3ds.pandroid.utils.Constants;
-import com.panda3ds.pandroid.utils.GameUtils;
-
 public class AlberDriver {
 	AlberDriver() { super(); }
 
@@ -23,14 +18,7 @@ public class AlberDriver {
 	public static native void TouchScreenUp();
 	public static native void TouchScreenDown(int x, int y);
 
-	public static void OnSmdhLoaded(byte[] buffer) {
-		SMDH smdh = new SMDH(buffer);
-		Log.i(Constants.LOG_TAG, "Loaded rom SDMH");
-		Log.i(Constants.LOG_TAG, String.format("Are you playing '%s' published by '%s'", smdh.getTitle(), smdh.getPublisher()));
-		GameMetadata game = GameUtils.getCurrentGame();
-		GameUtils.removeGame(game);
-		GameUtils.addGame(GameMetadata.applySMDH(game, smdh));
-	}
+	public static native byte[] GetSmdh();
 
 	static { System.loadLibrary("Alber"); }
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
index 8dd350ce..52e609a3 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
@@ -8,9 +8,12 @@ import android.opengl.GLSurfaceView;
 import android.util.Log;
 import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.utils.Constants;
+import com.panda3ds.pandroid.utils.GameUtils;
 import com.panda3ds.pandroid.view.renderer.ConsoleRenderer;
 import com.panda3ds.pandroid.view.renderer.layout.ConsoleLayout;
 import com.panda3ds.pandroid.view.renderer.layout.DefaultScreenLayout;
+import com.panda3ds.pandroid.data.SMDH;
+import com.panda3ds.pandroid.data.game.GameMetadata;
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.opengles.GL10;
 
@@ -76,6 +79,19 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
 
 		AlberDriver.Initialize();
 		AlberDriver.LoadRom(romPath);
+
+		// Load the SMDH
+		byte[] smdhData = AlberDriver.GetSmdh();
+		if (smdhData.length == 0) {
+			Log.w(Constants.LOG_TAG, "Failed to load SMDH");
+		} else {
+			SMDH smdh = new SMDH(smdhData);
+			Log.i(Constants.LOG_TAG, "Loaded rom SDMH");
+			Log.i(Constants.LOG_TAG, String.format("Are you playing '%s' published by '%s'", smdh.getTitle(), smdh.getPublisher()));
+			GameMetadata game = GameUtils.getCurrentGame();
+			GameUtils.removeGame(game);
+			GameUtils.addGame(GameMetadata.applySMDH(game, smdh));
+		}
 	}
 
 	public void onDrawFrame(GL10 unused) {

From 02d506f843172940d175919841f46201caf48731 Mon Sep 17 00:00:00 2001
From: Gabriel Machado <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Fri, 29 Dec 2023 13:01:58 -0400
Subject: [PATCH 101/162] Pandroid: Drawer (#356)

* Drawer initial commit

* Translate drawer, and remove redundant code

* bonk

---------

Co-authored-by: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
---
 src/jni_driver.cpp                            |   2 +
 .../com/panda3ds/pandroid/AlberDriver.java    |   2 +
 .../panda3ds/pandroid/app/GameActivity.java   |  14 ++-
 .../pandroid/app/game/AlberInputListener.java |   9 +-
 .../pandroid/app/game/DrawerFragment.java     | 111 ++++++++++++++++++
 .../app/src/main/res/drawable/ic_exit.xml     |   5 +
 .../app/src/main/res/drawable/ic_shortcut.xml |   5 +
 .../main/res/layout/drawer_game_container.xml |  24 ++++
 .../main/res/layout/fragment_game_drawer.xml  |  92 +++++++++++++++
 .../app/src/main/res/layout/game_activity.xml |   2 +
 .../src/main/res/menu/game_drawer_actions.xml |  11 ++
 .../src/main/res/values-pt-rBR/strings.xml    |   3 +
 .../app/src/main/res/values/strings.xml       |   3 +
 .../app/src/main/res/values/styleable.xml     |   9 ++
 14 files changed, 286 insertions(+), 6 deletions(-)
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_exit.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_shortcut.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/drawer_game_container.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml
 create mode 100644 src/pandroid/app/src/main/res/menu/game_drawer_actions.xml

diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index cbc5a16e..0bdaa345 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -36,6 +36,8 @@ JNIEnv* jniEnv() {
 extern "C" {
 
 AlberFunction(void, Setup)(JNIEnv* env, jobject obj) { env->GetJavaVM(&jvm); }
+AlberFunction(void, Pause)(JNIEnv* env, jobject obj) { emulator->pause(); }
+AlberFunction(void, Resume)(JNIEnv* env, jobject obj) { emulator->resume(); }
 
 AlberFunction(void, Initialize)(JNIEnv* env, jobject obj) {
 	emulator = std::make_unique<Emulator>();
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
index 33438bb0..46ab2577 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
@@ -17,6 +17,8 @@ public class AlberDriver {
 	public static native void SetCirclepadAxis(int x, int y);
 	public static native void TouchScreenUp();
 	public static native void TouchScreenDown(int x, int y);
+	public static native void Pause();
+	public static native void Resume();
 
 	public static native byte[] GetSmdh();
 
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
index 03593b44..ade3e2ac 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -14,6 +14,7 @@ import androidx.annotation.Nullable;
 import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.app.game.AlberInputListener;
+import com.panda3ds.pandroid.app.game.DrawerFragment;
 import com.panda3ds.pandroid.data.config.GlobalConfig;
 import com.panda3ds.pandroid.input.InputHandler;
 import com.panda3ds.pandroid.input.InputMap;
@@ -22,7 +23,14 @@ import com.panda3ds.pandroid.view.PandaGlSurfaceView;
 import com.panda3ds.pandroid.view.PandaLayoutController;
 
 public class GameActivity extends BaseActivity {
-	private final AlberInputListener inputListener = new AlberInputListener(this);
+	private final DrawerFragment drawerFragment = new DrawerFragment();
+	private final AlberInputListener inputListener = new AlberInputListener(() -> {
+		if (drawerFragment.isOpened()) {
+			drawerFragment.close();
+		} else {
+			drawerFragment.open();
+		}
+	});
 
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -52,6 +60,8 @@ public class GameActivity extends BaseActivity {
 			GlobalConfig.set(GlobalConfig.KEY_SCREEN_GAMEPAD_VISIBLE, checked);
 		});
 		((CheckBox) findViewById(R.id.hide_screen_controller)).setChecked(GlobalConfig.get(GlobalConfig.KEY_SCREEN_GAMEPAD_VISIBLE));
+
+		getSupportFragmentManager().beginTransaction().replace(R.id.drawer_fragment, drawerFragment).commitNow();
 	}
 
 	@Override
@@ -67,7 +77,9 @@ public class GameActivity extends BaseActivity {
 	@Override
 	protected void onPause() {
 		super.onPause();
+
 		InputHandler.reset();
+		drawerFragment.open();
 	}
 
 	@Override
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java
index 6daca9a6..ec15a9bb 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/AlberInputListener.java
@@ -1,19 +1,18 @@
 package com.panda3ds.pandroid.app.game;
 
-import android.app.Activity;
-import android.view.KeyEvent;
 import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.input.InputEvent;
 import com.panda3ds.pandroid.input.InputMap;
 import com.panda3ds.pandroid.input.KeyName;
 import com.panda3ds.pandroid.lang.Function;
 import com.panda3ds.pandroid.math.Vector2;
+
 import java.util.Objects;
 
 
 public class AlberInputListener implements Function<InputEvent> {
-	private final Activity activity;
-	public AlberInputListener(Activity activity) { this.activity = activity; }
+	private final Runnable backListener;
+	public AlberInputListener(Runnable backListener) { this.backListener = backListener;  }
 
 	private final Vector2 axis = new Vector2(0.0f, 0.0f);
 
@@ -22,7 +21,7 @@ public class AlberInputListener implements Function<InputEvent> {
 		KeyName key = InputMap.relative(event.getName());
 
 		if (Objects.equals(event.getName(), "KEYCODE_BACK")) {
-			activity.onBackPressed();
+			backListener.run();
 			return;
 		}
 
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java
new file mode 100644
index 00000000..d18fac2b
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java
@@ -0,0 +1,111 @@
+package com.panda3ds.pandroid.app.game;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.Fragment;
+
+import com.google.android.material.navigation.NavigationView;
+import com.panda3ds.pandroid.AlberDriver;
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.data.game.GameMetadata;
+import com.panda3ds.pandroid.utils.GameUtils;
+import com.panda3ds.pandroid.view.gamesgrid.GameIconView;
+
+public class DrawerFragment extends Fragment implements DrawerLayout.DrawerListener, NavigationView.OnNavigationItemSelectedListener {
+    private DrawerLayout drawerContainer;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        drawerContainer = requireActivity().findViewById(R.id.drawer_container);
+        drawerContainer.removeDrawerListener(this);
+        drawerContainer.addDrawerListener(this);
+        drawerContainer.setScrimColor(Color.argb(160, 0,0,0));
+        drawerContainer.setVisibility(View.GONE);
+
+        return inflater.inflate(R.layout.fragment_game_drawer, container, false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        drawerContainer.setVisibility(View.GONE);
+
+        GameMetadata game = GameUtils.getCurrentGame();
+
+        ((GameIconView)view.findViewById(R.id.game_icon)).setImageBitmap(game.getIcon());
+        ((AppCompatTextView)view.findViewById(R.id.game_title)).setText(game.getTitle());
+        ((AppCompatTextView)view.findViewById(R.id.game_publisher)).setText(game.getPublisher());
+
+        ((NavigationView)view.findViewById(R.id.action_navigation)).setNavigationItemSelectedListener(this);
+    }
+
+    @Override
+    public void onDetach() {
+        drawerContainer.removeDrawerListener(this);
+        super.onDetach();
+    }
+
+    private void refreshLayout() {
+        drawerContainer.measure(View.MeasureSpec.EXACTLY, View.MeasureSpec.EXACTLY);
+        drawerContainer.requestLayout();
+        drawerContainer.invalidate();
+        drawerContainer.forceLayout();
+    }
+
+    public void open() {
+        if (!drawerContainer.isOpen()) {
+            drawerContainer.setVisibility(View.VISIBLE);
+            drawerContainer.open();
+            drawerContainer.postDelayed(this::refreshLayout, 20);
+        }
+    }
+
+    public void close() {
+        if (drawerContainer.isOpen()) {        
+            drawerContainer.close();
+        }
+    }
+
+    @Override
+    public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {}
+
+    @Override
+    public void onDrawerOpened(@NonNull View drawerView) {
+        AlberDriver.Pause();
+    }
+
+    @Override
+    public void onDrawerClosed(@NonNull View drawerView) {
+        drawerContainer.setVisibility(View.GONE);
+        AlberDriver.Resume();
+    }
+
+    @Override
+    public void onDrawerStateChanged(int newState) {}
+
+    @Override
+    public boolean onNavigationItemSelected(@NonNull MenuItem item) {
+        int id = item.getItemId();
+        if (id == R.id.resume) {
+            close();
+        } else if (id == R.id.exit) {
+            requireActivity().onBackPressed();
+        }
+
+        return false;
+    }
+
+    public boolean isOpened() {
+        return drawerContainer.isOpen();
+    }
+}
diff --git a/src/pandroid/app/src/main/res/drawable/ic_exit.xml b/src/pandroid/app/src/main/res/drawable/ic_exit.xml
new file mode 100644
index 00000000..a17ca78b
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_exit.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_shortcut.xml b/src/pandroid/app/src/main/res/drawable/ic_shortcut.xml
new file mode 100644
index 00000000..13be1ace
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_shortcut.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21,11l-6,-6v5H8c-2.76,0 -5,2.24 -5,5v4h2v-4c0,-1.65 1.35,-3 3,-3h7v5L21,11z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/layout/drawer_game_container.xml b/src/pandroid/app/src/main/res/layout/drawer_game_container.xml
new file mode 100644
index 00000000..4b094e75
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/drawer_game_container.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.drawerlayout.widget.DrawerLayout
+    android:id="@+id/drawer_container"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <com.google.android.material.navigation.NavigationView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start">
+
+        <FrameLayout
+            android:id="@+id/drawer_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+    </com.google.android.material.navigation.NavigationView>
+
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml b/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml
new file mode 100644
index 00000000..2da6b9c8
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:background="?colorSurface">
+
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:minHeight="190dp"
+        android:background="?colorSurfaceVariant">
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="90dp"
+            android:layout_height="90dp"
+            app:cardCornerRadius="10dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp">
+
+            <com.panda3ds.pandroid.view.gamesgrid.GameIconView
+                android:id="@+id/game_icon"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="?colorSurface"/>
+
+        </androidx.cardview.widget.CardView>
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:layout_marginBottom="20dp">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/game_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/app_name"
+                android:textColor="?colorOnSurfaceVariant"
+                android:paddingBottom="4dp"
+                android:gravity="center"
+                android:textStyle="bold"
+                android:textSize="19sp"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/game_publisher"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/app_name"
+                android:textColor="?colorOnSurfaceVariant"
+                android:textSize="14sp"/>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="10dp">
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/actions"
+                style="@style/TextAppearanceGameDrawerSubTitle"/>
+
+            <com.google.android.material.navigation.NavigationView
+                android:id="@+id/action_navigation"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:menu="@menu/game_drawer_actions"
+                android:background="?colorSurface"/>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+    </ScrollView>
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/game_activity.xml b/src/pandroid/app/src/main/res/layout/game_activity.xml
index 9536a847..6cd91f07 100644
--- a/src/pandroid/app/src/main/res/layout/game_activity.xml
+++ b/src/pandroid/app/src/main/res/layout/game_activity.xml
@@ -53,4 +53,6 @@
 
     </FrameLayout>
 
+    <include layout="@layout/drawer_game_container"/>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/menu/game_drawer_actions.xml b/src/pandroid/app/src/main/res/menu/game_drawer_actions.xml
new file mode 100644
index 00000000..9fd3264a
--- /dev/null
+++ b/src/pandroid/app/src/main/res/menu/game_drawer_actions.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/resume"
+        android:icon="@drawable/ic_shortcut"
+        android:title="@string/resume"/>
+    <item
+        android:id="@+id/exit"
+        android:icon="@drawable/ic_exit"
+        android:title="@string/exit"/>
+</menu>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
index e57feab5..d3966e18 100644
--- a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
+++ b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
@@ -24,4 +24,7 @@
     <string name="light">Claro</string>
     <string name="dark">Escuro</string>
     <string name="black">Preto</string>
+    <string name="actions">Ações</string>
+    <string name="exit">Sair</string>
+    <string name="resume">Continuar</string>
 </resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/strings.xml b/src/pandroid/app/src/main/res/values/strings.xml
index 973e7acb..13db9152 100644
--- a/src/pandroid/app/src/main/res/values/strings.xml
+++ b/src/pandroid/app/src/main/res/values/strings.xml
@@ -25,4 +25,7 @@
     <string name="light">Light</string>
     <string name="dark">Dark</string>
     <string name="black">Black</string>
+    <string name="actions">Actions</string>
+    <string name="exit">Exit</string>
+    <string name="resume">Resume</string>
 </resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/styleable.xml b/src/pandroid/app/src/main/res/values/styleable.xml
index c4bce805..cc26e7d9 100644
--- a/src/pandroid/app/src/main/res/values/styleable.xml
+++ b/src/pandroid/app/src/main/res/values/styleable.xml
@@ -23,6 +23,15 @@
         <item name="android:color">?colorSecondary</item>
     </style>
 
+    <style name="TextAppearanceGameDrawerSubTitle">
+        <item name="android:textSize">14sp</item>
+        <item name="textAllCaps">true</item>
+        <item name="android:alpha">0.7</item>
+        <item name="android:paddingStart">24dp</item>
+        <item name="android:paddingEnd">24dp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
     <style name="Pandroid.SeekbarPreference" parent="Preference.SeekBarPreference">
         <item name="android:textColorSecondary">#C00</item>
     </style>

From 46f92f145fcd87d199c45b124fce243415485d2d Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sun, 31 Dec 2023 23:36:07 +0200
Subject: [PATCH 102/162] Implement AC::GetWifiStatus

---
 include/services/ac.hpp  |  1 +
 src/core/services/ac.cpp | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/include/services/ac.hpp b/include/services/ac.hpp
index a6f68698..4ba53033 100644
--- a/include/services/ac.hpp
+++ b/include/services/ac.hpp
@@ -19,6 +19,7 @@ class ACService {
 	void getConnectingInfraPriority(u32 messagePointer);
 	void getStatus(u32 messagePointer);
 	void getLastErrorCode(u32 messagePointer);
+	void getWifiStatus(u32 messagePointer);
 	void isConnected(u32 messagePointer);
 	void registerDisconnectEvent(u32 messagePointer);
 	void setClientVersion(u32 messagePointer);
diff --git a/src/core/services/ac.cpp b/src/core/services/ac.cpp
index 3feddebe..8f5545fe 100644
--- a/src/core/services/ac.cpp
+++ b/src/core/services/ac.cpp
@@ -8,6 +8,7 @@ namespace ACCommands {
 		CloseAsync = 0x00080004,
 		GetLastErrorCode = 0x000A0000,
 		GetStatus = 0x000C0000,
+		GetWifiStatus = 0x000D0000,
 		GetConnectingInfraPriority = 0x000F0000,
 		RegisterDisconnectEvent = 0x00300004,
 		IsConnected = 0x003E0042,
@@ -29,6 +30,7 @@ void ACService::handleSyncRequest(u32 messagePointer) {
 		case ACCommands::GetConnectingInfraPriority: getConnectingInfraPriority(messagePointer); break;
 		case ACCommands::GetLastErrorCode: getLastErrorCode(messagePointer); break;
 		case ACCommands::GetStatus: getStatus(messagePointer); break;
+		case ACCommands::GetWifiStatus: getWifiStatus(messagePointer); break;
 		case ACCommands::IsConnected: isConnected(messagePointer); break;
 		case ACCommands::RegisterDisconnectEvent: registerDisconnectEvent(messagePointer); break;
 		case ACCommands::SetClientVersion: setClientVersion(messagePointer); break;
@@ -91,6 +93,20 @@ void ACService::getStatus(u32 messagePointer) {
 	mem.write32(messagePointer + 8, 0);
 }
 
+void ACService::getWifiStatus(u32 messagePointer) {
+	log("AC::GetWifiStatus (stubbed)\n");
+
+	enum class WifiStatus : u32 {
+		None = 0,
+		Slot1 = 1,
+		Slot2 = 2,
+		Slot3 = 4,
+	};
+
+	mem.write32(messagePointer, IPC::responseHeader(0x0D, 2, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+	mem.write32(messagePointer + 8, static_cast<u32>(WifiStatus::None));
+}
 
 void ACService::isConnected(u32 messagePointer) {
 	log("AC::IsConnected\n");

From 1430f1c4c2839485440ef0494ad2cd72640885a0 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 2 Jan 2024 17:18:47 +0200
Subject: [PATCH 103/162] Implement SVC 0x3B (GetThreadContext)

---
 include/kernel/kernel.hpp   | 1 +
 src/core/kernel/kernel.cpp  | 1 +
 src/core/kernel/threads.cpp | 7 +++++++
 3 files changed, 9 insertions(+)

diff --git a/include/kernel/kernel.hpp b/include/kernel/kernel.hpp
index 30f1310e..3f09bf12 100644
--- a/include/kernel/kernel.hpp
+++ b/include/kernel/kernel.hpp
@@ -146,6 +146,7 @@ public:
 	void getResourceLimitCurrentValues();
 	void getSystemInfo();
 	void getSystemTick();
+	void getThreadContext();
 	void getThreadID();
 	void getThreadIdealProcessor();
 	void getThreadPriority();
diff --git a/src/core/kernel/kernel.cpp b/src/core/kernel/kernel.cpp
index 04af5096..2e4fffff 100644
--- a/src/core/kernel/kernel.cpp
+++ b/src/core/kernel/kernel.cpp
@@ -66,6 +66,7 @@ void Kernel::serviceSVC(u32 svc) {
 		case 0x38: getResourceLimit(); break;
 		case 0x39: getResourceLimitLimitValues(); break;
 		case 0x3A: getResourceLimitCurrentValues(); break;
+		case 0x3B: getThreadContext(); break;
 		case 0x3D: outputDebugString(); break;
 		default: Helpers::panic("Unimplemented svc: %X @ %08X", svc, regs[15]); break;
 	}
diff --git a/src/core/kernel/threads.cpp b/src/core/kernel/threads.cpp
index 5c21d507..239a6617 100644
--- a/src/core/kernel/threads.cpp
+++ b/src/core/kernel/threads.cpp
@@ -462,6 +462,13 @@ void Kernel::getThreadIdealProcessor() {
 	regs[1] = static_cast<u32>(ProcessorID::AppCore);
 }
 
+void Kernel::getThreadContext() {
+	Helpers::warn("Stubbed Kernel::GetThreadContext");
+
+	// TODO: Decompile this from Kernel11. 3DBrew says function is stubbed.
+	regs[0] = Result::Success;
+}
+
 void Kernel::setThreadPriority() {
 	const Handle handle = regs[0];
 	const u32 priority = regs[1];

From 1ce414ef8c9ce114f19cf65c2b3657713578ee4e Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 3 Jan 2024 00:24:46 +0200
Subject: [PATCH 104/162] [Qt] Load ROMs via CLI arguments

---
 src/panda_qt/main_window.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index 672fc2a1..e390aa44 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -54,7 +54,16 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 	emu = new Emulator();
 	emu->setOutputSize(screen.surfaceWidth, screen.surfaceHeight);
 
-	// The emulator graphics context for the thread should be initialized in the emulator thread due to how GL contexts work 
+	auto args = QCoreApplication::arguments();
+	if (args.size() > 1) {
+		auto romPath = std::filesystem::current_path() / args.at(1).toStdU16String();
+		if (!emu->loadROM(romPath)) {
+			// For some reason just .c_str() doesn't show the proper path
+			Helpers::warn("Failed to load ROM file: %s", romPath.string().c_str());
+		}
+	}
+
+	// The emulator graphics context for the thread should be initialized in the emulator thread due to how GL contexts work
 	emuThread = std::thread([this]() {
 		const RendererType rendererType = emu->getConfig().rendererType;
 		usingGL = (rendererType == RendererType::OpenGL || rendererType == RendererType::Software || rendererType == RendererType::Null);
@@ -157,8 +166,8 @@ void MainWindow::selectLuaFile() {
 
 // Cleanup when the main window closes
 MainWindow::~MainWindow() {
-	appRunning = false; // Set our running atomic to false in order to make the emulator thread stop, and join it
-	
+	appRunning = false;  // Set our running atomic to false in order to make the emulator thread stop, and join it
+
 	if (emuThread.joinable()) {
 		emuThread.join();
 	}
@@ -192,7 +201,7 @@ void MainWindow::dumpRomFS() {
 	messageQueueMutex.unlock();
 
 	switch (res) {
-		case RomFS::DumpingResult::Success: break; // Yay!
+		case RomFS::DumpingResult::Success: break;  // Yay!
 		case RomFS::DumpingResult::InvalidFormat: {
 			QMessageBox messageBox(
 				QMessageBox::Icon::Warning, tr("Invalid format for RomFS dumping"),

From c0621d07604863d945d6fd9a597b610f22a97e7e Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 3 Jan 2024 00:39:36 +0200
Subject: [PATCH 105/162] WIP arm64 shader recompiler

---
 .gitmodules                                   |   3 +
 CMakeLists.txt                                |   5 +
 include/PICA/dynapica/shader_rec.hpp          |   4 +-
 .../dynapica/shader_rec_emitter_arm64.hpp     | 129 ++++++++++
 .../dynapica/shader_rec_emitter_arm64.cpp     | 239 ++++++++++++++++++
 .../PICA/dynapica/shader_rec_emitter_x64.cpp  |   6 +-
 third_party/oaknut                            |   1 +
 7 files changed, 383 insertions(+), 4 deletions(-)
 create mode 100644 include/PICA/dynapica/shader_rec_emitter_arm64.hpp
 create mode 100644 src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
 create mode 160000 third_party/oaknut

diff --git a/.gitmodules b/.gitmodules
index 428ca1d1..3735d0cb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,3 +46,6 @@
 [submodule "third_party/zep"]
 	path = third_party/zep
 	url = https://github.com/Panda3DS-emu/zep
+[submodule "third_party/oaknut"]
+	path = third_party/oaknut
+	url = https://github.com/merryhime/oaknut
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 732ec793..b78fe0ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,6 +128,9 @@ endif()
 # Check for arm64
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
     set(HOST_ARM64 TRUE)
+    add_subdirectory(third_party/oaknut) # Add Oaknut submodule for arm64 JITs
+    include_directories(third_party/oaknut/include)
+    add_compile_definitions(PANDA3DS_DYNAPICA_SUPPORTED)
     add_compile_definitions(PANDA3DS_ARM64_HOST)
 else()
     set(HOST_ARM64 FALSE)
@@ -172,6 +175,7 @@ set(SERVICE_SOURCE_FILES src/core/services/service_manager.cpp src/core/services
 set(PICA_SOURCE_FILES src/core/PICA/gpu.cpp src/core/PICA/regs.cpp src/core/PICA/shader_unit.cpp
                       src/core/PICA/shader_interpreter.cpp src/core/PICA/dynapica/shader_rec.cpp
                       src/core/PICA/dynapica/shader_rec_emitter_x64.cpp src/core/PICA/pica_hash.cpp
+                      src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
 )
 
 set(LOADER_SOURCE_FILES src/core/loader/elf.cpp src/core/loader/ncsd.cpp src/core/loader/ncch.cpp src/core/loader/3dsx.cpp src/core/loader/lz77.cpp)
@@ -236,6 +240,7 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.hpp
                  include/services/news_u.hpp include/applets/software_keyboard.hpp include/applets/applet_manager.hpp include/fs/archive_user_save_data.hpp
                  include/services/amiibo_device.hpp include/services/nfc_types.hpp include/swap.hpp include/services/csnd.hpp include/services/nwm_uds.hpp
                  include/fs/archive_system_save_data.hpp include/lua_manager.hpp include/memory_mapped_file.hpp include/hydra_icon.hpp
+                 include/PICA/dynapica/shader_rec_emitter_arm64.hpp
 )
 
 cmrc_add_resource_library(
diff --git a/include/PICA/dynapica/shader_rec.hpp b/include/PICA/dynapica/shader_rec.hpp
index e8b6afed..2dabc128 100644
--- a/include/PICA/dynapica/shader_rec.hpp
+++ b/include/PICA/dynapica/shader_rec.hpp
@@ -1,13 +1,15 @@
 #pragma once
 #include "PICA/shader.hpp"
 
-#if defined(PANDA3DS_DYNAPICA_SUPPORTED) && defined(PANDA3DS_X64_HOST)
+#if defined(PANDA3DS_DYNAPICA_SUPPORTED) && (defined(PANDA3DS_X64_HOST) || defined(PANDA3DS_ARM64_HOST))
 #define PANDA3DS_SHADER_JIT_SUPPORTED
 #include <memory>
 #include <unordered_map>
 
 #ifdef PANDA3DS_X64_HOST
 #include "shader_rec_emitter_x64.hpp"
+#elif defined(PANDA3DS_ARM64_HOST)
+#include "shader_rec_emitter_arm64.hpp"
 #endif
 #endif
 
diff --git a/include/PICA/dynapica/shader_rec_emitter_arm64.hpp b/include/PICA/dynapica/shader_rec_emitter_arm64.hpp
new file mode 100644
index 00000000..4dd21174
--- /dev/null
+++ b/include/PICA/dynapica/shader_rec_emitter_arm64.hpp
@@ -0,0 +1,129 @@
+#pragma once
+
+// Only do anything if we're on an x64 target with JIT support enabled
+#if defined(PANDA3DS_DYNAPICA_SUPPORTED) && defined(PANDA3DS_ARM64_HOST)
+#include <array>
+#include <oaknut/code_block.hpp>
+#include <oaknut/oaknut.hpp>
+
+#include "PICA/shader.hpp"
+#include "helpers.hpp"
+#include "logger.hpp"
+
+class ShaderEmitter : private oaknut::CodeBlock, public oaknut::CodeGenerator {
+	static constexpr size_t executableMemorySize = PICAShader::maxInstructionCount * 96;  // How much executable memory to alloc for each shader
+	// Allocate some extra space as padding for security purposes in the extremely unlikely occasion we manage to overflow the above size
+	static constexpr size_t allocSize = executableMemorySize + 0x1000;
+
+	// If the swizzle field is this value then the swizzle pattern is .xyzw so we don't need a shuffle
+	static constexpr uint noSwizzle = 0x1B;
+
+	using f24 = Floats::f24;
+	using vec4f = std::array<f24, 4>;
+
+	// An array of labels (incl pointers) to each compiled (to x64) PICA instruction
+	std::array<oaknut::Label, PICAShader::maxInstructionCount> instructionLabels;
+	// A vector of PCs that can potentially return based on the state of the PICA callstack.
+	// Filled before compiling a shader by scanning the code for call instructions
+	std::vector<u32> returnPCs;
+
+	// Vector value of (1.0, 1.0, 1.0, 1.0) for SLT(i)/SGE(i)
+	oaknut::Label onesVector;
+
+	u32 recompilerPC = 0;  // PC the recompiler is currently recompiling @
+	u32 loopLevel = 0;     // The current loop nesting level (0 = not in a loop)
+
+	// Shows whether the loaded shader has any log2 and exp2 instructions
+	bool codeHasLog2 = false;
+	bool codeHasExp2 = false;
+
+	oaknut::Label log2Func, exp2Func;
+	oaknut::Label emitLog2Func();
+	oaknut::Label emitExp2Func();
+
+	// Compile all instructions from [current recompiler PC, end)
+	void compileUntil(const PICAShader& shaderUnit, u32 endPC);
+	// Compile instruction "instr"
+	void compileInstruction(const PICAShader& shaderUnit);
+
+	bool isCall(u32 instruction) {
+		const u32 opcode = instruction >> 26;
+		return (opcode == ShaderOpcodes::CALL) || (opcode == ShaderOpcodes::CALLC) || (opcode == ShaderOpcodes::CALLU);
+	}
+
+	// Scan the shader code for call instructions to fill up the returnPCs vector before starting compilation
+	// We also scan for log2/exp2 instructions to see whether to emit the relevant functions
+	void scanCode(const PICAShader& shaderUnit);
+
+	// Load register with number "srcReg" indexed by index "idx" into the arm64 register "reg"
+	template <int sourceIndex>
+	void loadRegister(oaknut::QReg dest, const PICAShader& shader, u32 src, u32 idx, u32 operandDescriptor);
+	void storeRegister(oaknut::QReg source, const PICAShader& shader, u32 dest, u32 operandDescriptor);
+
+	const vec4f& getSourceRef(const PICAShader& shader, u32 src);
+	const vec4f& getDestRef(const PICAShader& shader, u32 dest);
+
+	// Check the value of the cmp register for instructions like ifc and callc
+	// Result is returned in the zero flag. If the comparison is true then zero == 1, else zero == 0
+	void checkCmpRegister(const PICAShader& shader, u32 instruction);
+
+	// Check the value of the bool uniform for instructions like ifu and callu
+	// Result is returned in the zero flag. If the comparison is true then zero == 0, else zero == 1 (Opposite of checkCmpRegister)
+	void checkBoolUniform(const PICAShader& shader, u32 instruction);
+
+	// Instruction recompilation functions
+	void recADD(const PICAShader& shader, u32 instruction);
+	void recCALL(const PICAShader& shader, u32 instruction);
+	void recCALLC(const PICAShader& shader, u32 instruction);
+	void recCALLU(const PICAShader& shader, u32 instruction);
+	void recCMP(const PICAShader& shader, u32 instruction);
+	void recDP3(const PICAShader& shader, u32 instruction);
+	void recDP4(const PICAShader& shader, u32 instruction);
+	void recDPH(const PICAShader& shader, u32 instruction);
+	void recEMIT(const PICAShader& shader, u32 instruction);
+	void recEND(const PICAShader& shader, u32 instruction);
+	void recEX2(const PICAShader& shader, u32 instruction);
+	void recFLR(const PICAShader& shader, u32 instruction);
+	void recIFC(const PICAShader& shader, u32 instruction);
+	void recIFU(const PICAShader& shader, u32 instruction);
+	void recJMPC(const PICAShader& shader, u32 instruction);
+	void recJMPU(const PICAShader& shader, u32 instruction);
+	void recLG2(const PICAShader& shader, u32 instruction);
+	void recLOOP(const PICAShader& shader, u32 instruction);
+	void recMAD(const PICAShader& shader, u32 instruction);
+	void recMAX(const PICAShader& shader, u32 instruction);
+	void recMIN(const PICAShader& shader, u32 instruction);
+	void recMOVA(const PICAShader& shader, u32 instruction);
+	void recMOV(const PICAShader& shader, u32 instruction);
+	void recMUL(const PICAShader& shader, u32 instruction);
+	void recRCP(const PICAShader& shader, u32 instruction);
+	void recRSQ(const PICAShader& shader, u32 instruction);
+	void recSETEMIT(const PICAShader& shader, u32 instruction);
+	void recSGE(const PICAShader& shader, u32 instruction);
+	void recSLT(const PICAShader& shader, u32 instruction);
+
+	MAKE_LOG_FUNCTION(log, shaderJITLogger)
+
+  public:
+	// Callback type used for instructions
+	using InstructionCallback = const void (*)(PICAShader& shaderUnit);
+	// Callback type used for the JIT prologue. This is what the caller will call
+	using PrologueCallback = const void (*)(PICAShader& shaderUnit, InstructionCallback cb);
+
+	PrologueCallback prologueCb = nullptr;
+
+	// Initialize our emitter with "allocSize" bytes of memory allocated for the code buffer
+	ShaderEmitter() : oaknut::CodeBlock(allocSize), oaknut::CodeGenerator(oaknut::CodeBlock::ptr()) {}
+
+	// PC must be a valid entrypoint here. It doesn't have that much overhead in this case, so we use std::array<>::at() to assert it does
+	InstructionCallback getInstructionCallback(u32 pc) {
+		// Cast away the constness because casting to a function pointer is hard otherwise. Legal as long as we don't write to *ptr
+		uint8_t* ptr = instructionLabels.at(pc).ptr<u8*>();
+		return reinterpret_cast<InstructionCallback>(ptr);
+	}
+
+	PrologueCallback getPrologueCallback() { return prologueCb; }
+	void compile(const PICAShader& shaderUnit);
+};
+
+#endif  // arm64 recompiler check
\ No newline at end of file
diff --git a/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp b/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
new file mode 100644
index 00000000..750adc81
--- /dev/null
+++ b/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
@@ -0,0 +1,239 @@
+#if defined(PANDA3DS_DYNAPICA_SUPPORTED) && defined(PANDA3DS_ARM64_HOST)
+#include "PICA/dynapica/shader_rec_emitter_arm64.hpp"
+
+#include <bit>
+
+using namespace Helpers;
+using namespace oaknut;
+using namespace oaknut::util;
+
+// Similar to the x64 recompiler, we use an odd internal ABI, which abuses the fact that we'll very rarely be calling C++ functions
+// So to avoid pushing and popping, we'll be making use of volatile registers as much as possible
+static constexpr QReg scratch1 = Q0;
+static constexpr QReg scratch2 = Q1;
+static constexpr QReg src1_vec = Q2;
+static constexpr QReg src2_vec = Q3;
+static constexpr QReg src3_vec = Q4;
+
+static constexpr XReg statePointer = X9;
+
+void ShaderEmitter::compile(const PICAShader& shaderUnit) {
+	// Scan the code for call, exp2, log2, etc instructions which need some special care
+	// After that, emit exp2 and log2 functions if the corresponding instructions are present
+	scanCode(shaderUnit);
+	if (codeHasExp2) Helpers::panic("arm64 shader JIT: Code has exp2");
+	if (codeHasLog2) Helpers::panic("arm64 shader JIT: Code has log2");
+
+	align(16);
+	// Compile every instruction in the shader
+	// This sounds horrible but the PICA instruction memory is tiny, and most of the time it's padded wtih nops that compile to nothing
+	recompilerPC = 0;
+	loopLevel = 0;
+	compileUntil(shaderUnit, PICAShader::maxInstructionCount);
+}
+
+void ShaderEmitter::scanCode(const PICAShader& shaderUnit) {
+	returnPCs.clear();
+
+	for (u32 i = 0; i < PICAShader::maxInstructionCount; i++) {
+		const u32 instruction = shaderUnit.loadedShader[i];
+		const u32 opcode = instruction >> 26;
+
+		if (isCall(instruction)) {
+			const u32 num = instruction & 0xff;
+			const u32 dest = getBits<10, 12>(instruction);
+			const u32 returnPC = num + dest;  // Add them to get the return PC
+
+			returnPCs.push_back(returnPC);
+		} else if (opcode == ShaderOpcodes::EX2) {
+			codeHasExp2 = true;
+		} else if (opcode == ShaderOpcodes::LG2) {
+			codeHasLog2 = true;
+		}
+	}
+
+	// Sort return PCs so they can be binary searched
+	std::sort(returnPCs.begin(), returnPCs.end());
+}
+
+void ShaderEmitter::compileUntil(const PICAShader& shaderUnit, u32 end) {
+	while (recompilerPC < end) {
+		compileInstruction(shaderUnit);
+	}
+}
+
+void ShaderEmitter::compileInstruction(const PICAShader& shaderUnit) {
+	// Write current location to label for this instruction
+	l(instructionLabels[recompilerPC]);
+
+	// See if PC is a possible return PC and emit the proper code if so
+	if (std::binary_search(returnPCs.begin(), returnPCs.end(), recompilerPC)) {
+		Helpers::panic("Unimplemented return address for call instruction");
+	}
+
+	// Fetch instruction and inc PC
+	const u32 instruction = shaderUnit.loadedShader[recompilerPC++];
+	const u32 opcode = instruction >> 26;
+
+	switch (opcode) {
+		// case ShaderOpcodes::ADD: recADD(shaderUnit, instruction); break;
+		// case ShaderOpcodes::CALL: recCALL(shaderUnit, instruction); break;
+		// case ShaderOpcodes::CALLC: recCALLC(shaderUnit, instruction); break;
+		// case ShaderOpcodes::CALLU: recCALLU(shaderUnit, instruction); break;
+		// case ShaderOpcodes::CMP1:
+		// case ShaderOpcodes::CMP2: recCMP(shaderUnit, instruction); break;
+		// case ShaderOpcodes::DP3: recDP3(shaderUnit, instruction); break;
+		// case ShaderOpcodes::DP4: recDP4(shaderUnit, instruction); break;
+		// case ShaderOpcodes::DPH:
+		// case ShaderOpcodes::DPHI: recDPH(shaderUnit, instruction); break;
+		// case ShaderOpcodes::END: recEND(shaderUnit, instruction); break;
+		// case ShaderOpcodes::EX2: recEX2(shaderUnit, instruction); break;
+		// case ShaderOpcodes::FLR: recFLR(shaderUnit, instruction); break;
+		// case ShaderOpcodes::IFC: recIFC(shaderUnit, instruction); break;
+		// case ShaderOpcodes::IFU: recIFU(shaderUnit, instruction); break;
+		// case ShaderOpcodes::JMPC: recJMPC(shaderUnit, instruction); break;
+		// case ShaderOpcodes::JMPU: recJMPU(shaderUnit, instruction); break;
+		// case ShaderOpcodes::LG2: recLG2(shaderUnit, instruction); break;
+		// case ShaderOpcodes::LOOP: recLOOP(shaderUnit, instruction); break;
+		case ShaderOpcodes::MOV: recMOV(shaderUnit, instruction); break;
+		// case ShaderOpcodes::MOVA: recMOVA(shaderUnit, instruction); break;
+		// case ShaderOpcodes::MAX: recMAX(shaderUnit, instruction); break;
+		// case ShaderOpcodes::MIN: recMIN(shaderUnit, instruction); break;
+		// case ShaderOpcodes::MUL: recMUL(shaderUnit, instruction); break;
+		case ShaderOpcodes::NOP:
+			break;
+			// case ShaderOpcodes::RCP: recRCP(shaderUnit, instruction); break;
+			// case ShaderOpcodes::RSQ: recRSQ(shaderUnit, instruction); break;
+
+			// Unimplemented opcodes that don't seem to actually be used but exist in the binary
+			// EMIT/SETEMIT are used in geometry shaders, however are sometimes found in vertex shaders?
+			// case ShaderOpcodes::EMIT:
+			// case ShaderOpcodes::SETEMIT:
+			//	log("[ShaderJIT] Unknown PICA opcode: %02X\n", opcode);
+			//	emitPrintLog(shaderUnit);
+			//	break;
+
+			// case ShaderOpcodes::BREAK:
+			// case ShaderOpcodes::BREAKC: Helpers::warn("[Shader JIT] Unimplemented BREAK(C) instruction!"); break;
+
+			// We consider both MAD and MADI to be the same instruction and decode which one we actually have in recMAD
+			// case 0x30:
+			// case 0x31:
+			// case 0x32:
+			// case 0x33:
+			// case 0x34:
+			// case 0x35:
+			// case 0x36:
+			// case 0x37:
+			// case 0x38:
+			// case 0x39:
+			// case 0x3A:
+			// case 0x3B:
+			// case 0x3C:
+			// case 0x3D:
+			// case 0x3E:
+			// case 0x3F: recMAD(shaderUnit, instruction); break;
+
+			// case ShaderOpcodes::SLT:
+			// case ShaderOpcodes::SLTI: recSLT(shaderUnit, instruction); break;
+
+			// case ShaderOpcodes::SGE:
+			// case ShaderOpcodes::SGEI: recSGE(shaderUnit, instruction); break;
+
+		default: Helpers::panic("Shader JIT: Unimplemented PICA opcode %X", opcode);
+	}
+}
+
+const ShaderEmitter::vec4f& ShaderEmitter::getSourceRef(const PICAShader& shader, u32 src) {
+	if (src < 0x10)
+		return shader.inputs[src];
+	else if (src < 0x20)
+		return shader.tempRegisters[src - 0x10];
+	else if (src <= 0x7f)
+		return shader.floatUniforms[src - 0x20];
+	else {
+		Helpers::warn("[Shader JIT] Unimplemented source value: %X\n", src);
+		return shader.dummy;
+	}
+}
+
+const ShaderEmitter::vec4f& ShaderEmitter::getDestRef(const PICAShader& shader, u32 dest) {
+	if (dest < 0x10) {
+		return shader.outputs[dest];
+	} else if (dest < 0x20) {
+		return shader.tempRegisters[dest - 0x10];
+	}
+	Helpers::panic("[Shader JIT] Unimplemented dest: %X", dest);
+}
+
+// See shader.hpp header for docs on how the swizzle and negate works
+template <int sourceIndex>
+void ShaderEmitter::loadRegister(QReg dest, const PICAShader& shader, u32 src, u32 index, u32 operandDescriptor) {
+	u32 compSwizzle;  // Component swizzle pattern for the register
+	bool negate;      // If true, negate all lanes of the register
+
+	if constexpr (sourceIndex == 1) {  // SRC1
+		negate = (getBit<4>(operandDescriptor)) != 0;
+		compSwizzle = getBits<5, 8>(operandDescriptor);
+	} else if constexpr (sourceIndex == 2) {  // SRC2
+		negate = (getBit<13>(operandDescriptor)) != 0;
+		compSwizzle = getBits<14, 8>(operandDescriptor);
+	} else if constexpr (sourceIndex == 3) {  // SRC3
+		negate = (getBit<22>(operandDescriptor)) != 0;
+		compSwizzle = getBits<23, 8>(operandDescriptor);
+	}
+
+	switch (index) {
+		case 0:
+			[[likely]] {  // Keep src as is, no need to offset it
+				const vec4f& srcRef = getSourceRef(shader, src);
+				const uintptr_t offset = uintptr_t(&srcRef) - uintptr_t(&shader);  // Calculate offset of register from start of the state struct
+
+				LDR(dest, statePointer, offset);
+				switch (compSwizzle) {
+					case noSwizzle: break;                              // .xyzw
+					case 0x0: DUP(dest.S4(), dest.Selem()[0]); break;   // .xxxx
+					case 0x55: DUP(dest.S4(), dest.Selem()[1]); break;  // .yyyy
+					case 0xAA: DUP(dest.S4(), dest.Selem()[2]); break;  // .zzzz
+					case 0xFF: DUP(dest.S4(), dest.Selem()[3]); break;  // .wwww
+					default: Helpers::panic("Unimplemented swizzle pattern for loading");
+				}
+
+				// Negate the register if necessary
+				if (negate) {
+					FNEG(dest.S4(), dest.S4());
+				}
+				return;  // Return. Rest of the function handles indexing which is not used if index == 0
+			}
+
+		default: Helpers::panic("[ShaderJIT]: Unimplemented source index type %d", index);
+	}
+
+	Helpers::panic("Unimplemented indexed register load");
+}
+
+void ShaderEmitter::storeRegister(QReg source, const PICAShader& shader, u32 dest, u32 operandDescriptor) {
+	const vec4f& destRef = getDestRef(shader, dest);
+	const uintptr_t offset = uintptr_t(&destRef) - uintptr_t(&shader);  // Calculate offset of register from start of the state struct
+
+	// Mask of which lanes to write
+	u32 writeMask = operandDescriptor & 0xf;
+	if (writeMask == 0xf) {  // No lanes are masked, just use STR
+		STR(source, statePointer, offset);
+	} else {
+        LDR(scratch1, statePointer, offset); // Load current source
+        Helpers::panic("Unimplemented: Storing to register with blending");
+    }
+}
+
+void ShaderEmitter::recMOV(const PICAShader& shader, u32 instruction) {
+	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
+	const u32 src = getBits<12, 7>(instruction);
+	const u32 idx = getBits<19, 2>(instruction);
+	const u32 dest = getBits<21, 5>(instruction);
+
+	loadRegister<1>(src1_vec, shader, src, idx, operandDescriptor);  // Load source 1 into scratch1
+	storeRegister(src1_vec, shader, dest, operandDescriptor);
+}
+
+#endif
\ No newline at end of file
diff --git a/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp b/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp
index 046c7813..f3dae7b7 100644
--- a/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp
+++ b/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp
@@ -342,10 +342,10 @@ void ShaderEmitter::storeRegister(Xmm source, const PICAShader& shader, u32 dest
 	} else if (std::popcount(writeMask) == 1) { // Only 1 register needs to be written back. This can be done with a simple shift right + movss
 		int bit = std::countr_zero(writeMask); // Get which PICA register needs to be written to (0 = w, 1 = z, etc)
 		size_t index = 3 - bit;
-		const uintptr_t lane_offset = offset + index * sizeof(float);
+		const uintptr_t laneOffset = offset + index * sizeof(float);
 
 		if (index == 0) { // Bottom lane, no need to shift
-			movss(dword[statePointer + lane_offset], source);
+			movss(dword[statePointer + laneOffset], source);
 		} else { // Shift right by 32 * index, then write bottom lane
 			if (haveAVX) {
 				vpsrldq(scratch1, source, index * sizeof(float));
@@ -353,7 +353,7 @@ void ShaderEmitter::storeRegister(Xmm source, const PICAShader& shader, u32 dest
 				movaps(scratch1, source);
 				psrldq(scratch1, index * sizeof(float));
 			}
-			movss(dword[statePointer + lane_offset], scratch1);
+			movss(dword[statePointer + laneOffset], scratch1);
 		}
 	} else if (haveSSE4_1) {
 		// Bit reverse the write mask because that is what blendps expects
diff --git a/third_party/oaknut b/third_party/oaknut
new file mode 160000
index 00000000..1d51f551
--- /dev/null
+++ b/third_party/oaknut
@@ -0,0 +1 @@
+Subproject commit 1d51f551294897ab4c8001c5259c8c5dee7e2a85

From fe01df588b009886dc9558b3bd81094042bc0486 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 3 Jan 2024 22:00:16 +0200
Subject: [PATCH 106/162] Get some demos running on a64 shader JIT

---
 .../dynapica/shader_rec_emitter_arm64.hpp     |   3 +
 .../dynapica/shader_rec_emitter_arm64.cpp     | 275 +++++++++++++++---
 2 files changed, 236 insertions(+), 42 deletions(-)

diff --git a/include/PICA/dynapica/shader_rec_emitter_arm64.hpp b/include/PICA/dynapica/shader_rec_emitter_arm64.hpp
index 4dd21174..671ae120 100644
--- a/include/PICA/dynapica/shader_rec_emitter_arm64.hpp
+++ b/include/PICA/dynapica/shader_rec_emitter_arm64.hpp
@@ -27,6 +27,9 @@ class ShaderEmitter : private oaknut::CodeBlock, public oaknut::CodeGenerator {
 	// Filled before compiling a shader by scanning the code for call instructions
 	std::vector<u32> returnPCs;
 
+	// An array of 128-bit masks for blending registers together to perform masked writes.
+	// Eg for writing only the x and y components, the mask is 0x00000000'00000000'FFFFFFFF'FFFF
+	oaknut::Label blendMasks;
 	// Vector value of (1.0, 1.0, 1.0, 1.0) for SLT(i)/SGE(i)
 	oaknut::Label onesVector;
 
diff --git a/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp b/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
index 750adc81..43121d86 100644
--- a/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
+++ b/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
@@ -15,9 +15,37 @@ static constexpr QReg src1_vec = Q2;
 static constexpr QReg src2_vec = Q3;
 static constexpr QReg src3_vec = Q4;
 
+static constexpr XReg arg1 = X0;
+static constexpr XReg arg2 = X1;
 static constexpr XReg statePointer = X9;
 
 void ShaderEmitter::compile(const PICAShader& shaderUnit) {
+	oaknut::CodeBlock::unprotect();  // Unprotect the memory before writing to it
+
+	// Constants
+	align(16);
+	// Generate blending masks for doing masked writes to registers
+	l(blendMasks);
+	for (int i = 0; i < 16; i++) {
+		dw((i & 0x8) ? 0xFFFFFFFF : 0);  // Mask for x component
+		dw((i & 0x4) ? 0xFFFFFFFF : 0);  // Mask for y component
+		dw((i & 0x2) ? 0xFFFFFFFF : 0);  // Mask for z component
+		dw((i & 0x1) ? 0xFFFFFFFF : 0);  // Mask for w component
+	}
+
+	// Emit prologue first
+	oaknut::Label prologueLabel;
+	align(16);
+
+	l(prologueLabel);
+	prologueCb = prologueLabel.ptr<PrologueCallback>();
+
+	// Set state pointer to the proper pointer
+	// state pointer is volatile, no need to preserve it
+	MOV(statePointer, arg1);
+	// Jump to code with a tail call
+	BR(arg2);
+
 	// Scan the code for call, exp2, log2, etc instructions which need some special care
 	// After that, emit exp2 and log2 functions if the corresponding instructions are present
 	scanCode(shaderUnit);
@@ -30,6 +58,10 @@ void ShaderEmitter::compile(const PICAShader& shaderUnit) {
 	recompilerPC = 0;
 	loopLevel = 0;
 	compileUntil(shaderUnit, PICAShader::maxInstructionCount);
+
+	// Protect the memory and invalidate icache before executing the code
+	oaknut::CodeBlock::protect();
+	oaknut::CodeBlock::invalidate_all();
 }
 
 void ShaderEmitter::scanCode(const PICAShader& shaderUnit) {
@@ -76,17 +108,17 @@ void ShaderEmitter::compileInstruction(const PICAShader& shaderUnit) {
 	const u32 opcode = instruction >> 26;
 
 	switch (opcode) {
-		// case ShaderOpcodes::ADD: recADD(shaderUnit, instruction); break;
+		case ShaderOpcodes::ADD: recADD(shaderUnit, instruction); break;
 		// case ShaderOpcodes::CALL: recCALL(shaderUnit, instruction); break;
 		// case ShaderOpcodes::CALLC: recCALLC(shaderUnit, instruction); break;
 		// case ShaderOpcodes::CALLU: recCALLU(shaderUnit, instruction); break;
 		// case ShaderOpcodes::CMP1:
 		// case ShaderOpcodes::CMP2: recCMP(shaderUnit, instruction); break;
-		// case ShaderOpcodes::DP3: recDP3(shaderUnit, instruction); break;
-		// case ShaderOpcodes::DP4: recDP4(shaderUnit, instruction); break;
+		case ShaderOpcodes::DP3: recDP3(shaderUnit, instruction); break;
+		case ShaderOpcodes::DP4: recDP4(shaderUnit, instruction); break;
 		// case ShaderOpcodes::DPH:
 		// case ShaderOpcodes::DPHI: recDPH(shaderUnit, instruction); break;
-		// case ShaderOpcodes::END: recEND(shaderUnit, instruction); break;
+		case ShaderOpcodes::END: recEND(shaderUnit, instruction); break;
 		// case ShaderOpcodes::EX2: recEX2(shaderUnit, instruction); break;
 		// case ShaderOpcodes::FLR: recFLR(shaderUnit, instruction); break;
 		// case ShaderOpcodes::IFC: recIFC(shaderUnit, instruction); break;
@@ -97,42 +129,43 @@ void ShaderEmitter::compileInstruction(const PICAShader& shaderUnit) {
 		// case ShaderOpcodes::LOOP: recLOOP(shaderUnit, instruction); break;
 		case ShaderOpcodes::MOV: recMOV(shaderUnit, instruction); break;
 		// case ShaderOpcodes::MOVA: recMOVA(shaderUnit, instruction); break;
-		// case ShaderOpcodes::MAX: recMAX(shaderUnit, instruction); break;
-		// case ShaderOpcodes::MIN: recMIN(shaderUnit, instruction); break;
-		// case ShaderOpcodes::MUL: recMUL(shaderUnit, instruction); break;
-		case ShaderOpcodes::NOP:
+		case ShaderOpcodes::MAX: recMAX(shaderUnit, instruction); break;
+		case ShaderOpcodes::MIN: recMIN(shaderUnit, instruction); break;
+		case ShaderOpcodes::MUL: recMUL(shaderUnit, instruction); break;
+		case ShaderOpcodes::NOP: break;
+		// case ShaderOpcodes::RCP: recRCP(shaderUnit, instruction); break;
+		case ShaderOpcodes::RSQ: recRSQ(shaderUnit, instruction); break;
+
+		// Unimplemented opcodes that don't seem to actually be used but exist in the binary
+		// EMIT/SETEMIT are used in geometry shaders, however are sometimes found in vertex shaders?
+		// case ShaderOpcodes::EMIT:
+		// case ShaderOpcodes::SETEMIT:
+		//	log("[ShaderJIT] Unknown PICA opcode: %02X\n", opcode);
+		//	emitPrintLog(shaderUnit);
+		//	break;
+
+		// case ShaderOpcodes::BREAK:
+		// case ShaderOpcodes::BREAKC: Helpers::warn("[Shader JIT] Unimplemented BREAK(C) instruction!"); break;
+
+		// We consider both MAD and MADI to be the same instruction and decode which one we actually have in recMAD
+		case 0x30:
+		case 0x31:
+		case 0x32:
+		case 0x33:
+		case 0x34:
+		case 0x35:
+		case 0x36:
+		case 0x37:
+		case 0x38:
+		case 0x39:
+		case 0x3A:
+		case 0x3B:
+		case 0x3C:
+		case 0x3D:
+		case 0x3E:
+		case 0x3F:
+			recMAD(shaderUnit, instruction);
 			break;
-			// case ShaderOpcodes::RCP: recRCP(shaderUnit, instruction); break;
-			// case ShaderOpcodes::RSQ: recRSQ(shaderUnit, instruction); break;
-
-			// Unimplemented opcodes that don't seem to actually be used but exist in the binary
-			// EMIT/SETEMIT are used in geometry shaders, however are sometimes found in vertex shaders?
-			// case ShaderOpcodes::EMIT:
-			// case ShaderOpcodes::SETEMIT:
-			//	log("[ShaderJIT] Unknown PICA opcode: %02X\n", opcode);
-			//	emitPrintLog(shaderUnit);
-			//	break;
-
-			// case ShaderOpcodes::BREAK:
-			// case ShaderOpcodes::BREAKC: Helpers::warn("[Shader JIT] Unimplemented BREAK(C) instruction!"); break;
-
-			// We consider both MAD and MADI to be the same instruction and decode which one we actually have in recMAD
-			// case 0x30:
-			// case 0x31:
-			// case 0x32:
-			// case 0x33:
-			// case 0x34:
-			// case 0x35:
-			// case 0x36:
-			// case 0x37:
-			// case 0x38:
-			// case 0x39:
-			// case 0x3A:
-			// case 0x3B:
-			// case 0x3C:
-			// case 0x3D:
-			// case 0x3E:
-			// case 0x3F: recMAD(shaderUnit, instruction); break;
 
 			// case ShaderOpcodes::SLT:
 			// case ShaderOpcodes::SLTI: recSLT(shaderUnit, instruction); break;
@@ -221,9 +254,165 @@ void ShaderEmitter::storeRegister(QReg source, const PICAShader& shader, u32 des
 	if (writeMask == 0xf) {  // No lanes are masked, just use STR
 		STR(source, statePointer, offset);
 	} else {
-        LDR(scratch1, statePointer, offset); // Load current source
-        Helpers::panic("Unimplemented: Storing to register with blending");
-    }
+		LDR(scratch1, statePointer, offset);                    // Load current value
+		LDR(scratch2, blendMasks.ptr<u8*>() + writeMask * 16);  // Load write mask for blending
+
+		BSL(scratch2.B16(), source.B16(), scratch1.B16());  // Scratch2 = (Source & mask) | (original & ~mask)
+		STR(scratch2, statePointer, offset);                // Write it back
+	}
+}
+
+void ShaderEmitter::recDP3(const PICAShader& shader, u32 instruction) {
+	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
+	const u32 src1 = getBits<12, 7>(instruction);
+	const u32 src2 = getBits<7, 5>(instruction);
+	const u32 idx = getBits<19, 2>(instruction);
+	const u32 dest = getBits<21, 5>(instruction);
+	const u32 writeMask = getBits<0, 4>(operandDescriptor);
+
+	// TODO: Safe multiplication equivalent (Multiplication is not IEEE compliant on the PICA)
+	loadRegister<1>(src1_vec, shader, src1, idx, operandDescriptor);
+	loadRegister<2>(src2_vec, shader, src2, 0, operandDescriptor);
+	// Set W component of src1 to 0.0, so that the w factor of the following dp4 will become 0, making it equivalent to a dp3
+	INS(src1_vec.Selem()[3], WZR);
+
+	// Now do a full DP4
+	FMUL(src1_vec.S4(), src1_vec.S4(), src2_vec.S4());   // Do a piecewise multiplication of the vectors first
+	FADDP(src1_vec.S4(), src1_vec.S4(), src1_vec.S4());  // Now add the adjacent components together
+	FADDP(src1_vec.toS(), src1_vec.toD().S2());          // Again for the bottom 2 lanes. Now the bottom lane contains the dot product
+
+	if (writeMask != 0x8) {                       // Copy bottom lane to all lanes if we're not simply writing back x
+		DUP(src1_vec.S4(), src1_vec.Selem()[0]);  // src1_vec = src1_vec.xxxx
+	}
+
+	storeRegister(src1_vec, shader, dest, operandDescriptor);
+}
+
+void ShaderEmitter::recDP4(const PICAShader& shader, u32 instruction) {
+	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
+	const u32 src1 = getBits<12, 7>(instruction);
+	const u32 src2 = getBits<7, 5>(instruction);
+	const u32 idx = getBits<19, 2>(instruction);
+	const u32 dest = getBits<21, 5>(instruction);
+	const u32 writeMask = getBits<0, 4>(operandDescriptor);
+
+	// TODO: Safe multiplication equivalent (Multiplication is not IEEE compliant on the PICA)
+	loadRegister<1>(src1_vec, shader, src1, idx, operandDescriptor);
+	loadRegister<2>(src2_vec, shader, src2, 0, operandDescriptor);
+
+	FMUL(src1_vec.S4(), src1_vec.S4(), src2_vec.S4());   // Do a piecewise multiplication of the vectors first
+	FADDP(src1_vec.S4(), src1_vec.S4(), src1_vec.S4());  // Now add the adjacent components together
+	FADDP(src1_vec.toS(), src1_vec.toD().S2());          // Again for the bottom 2 lanes. Now the bottom lane contains the dot product
+
+	if (writeMask != 0x8) {                       // Copy bottom lane to all lanes if we're not simply writing back x
+		DUP(src1_vec.S4(), src1_vec.Selem()[0]);  // src1_vec = src1_vec.xxxx
+	}
+
+	storeRegister(src1_vec, shader, dest, operandDescriptor);
+}
+
+void ShaderEmitter::recADD(const PICAShader& shader, u32 instruction) {
+	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
+	const u32 src1 = getBits<12, 7>(instruction);
+	const u32 src2 = getBits<7, 5>(instruction);
+	const u32 idx = getBits<19, 2>(instruction);
+	const u32 dest = getBits<21, 5>(instruction);
+
+	loadRegister<1>(src1_vec, shader, src1, idx, operandDescriptor);
+	loadRegister<2>(src2_vec, shader, src2, 0, operandDescriptor);
+	FADD(src1_vec.S4(), src1_vec.S4(), src2_vec.S4());
+	storeRegister(src1_vec, shader, dest, operandDescriptor);
+}
+
+void ShaderEmitter::recMAX(const PICAShader& shader, u32 instruction) {
+	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
+	const u32 src1 = getBits<12, 7>(instruction);
+	const u32 src2 = getBits<7, 5>(instruction);
+	const u32 idx = getBits<19, 2>(instruction);
+	const u32 dest = getBits<21, 5>(instruction);
+
+	loadRegister<1>(src1_vec, shader, src1, idx, operandDescriptor);
+	loadRegister<2>(src2_vec, shader, src2, 0, operandDescriptor);
+	FMAX(src1_vec.S4(), src1_vec.S4(), src2_vec.S4());
+	storeRegister(src1_vec, shader, dest, operandDescriptor);
+}
+
+void ShaderEmitter::recMIN(const PICAShader& shader, u32 instruction) {
+	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
+	const u32 src1 = getBits<12, 7>(instruction);
+	const u32 src2 = getBits<7, 5>(instruction);
+	const u32 idx = getBits<19, 2>(instruction);
+	const u32 dest = getBits<21, 5>(instruction);
+
+	loadRegister<1>(src1_vec, shader, src1, idx, operandDescriptor);
+	loadRegister<2>(src2_vec, shader, src2, 0, operandDescriptor);
+	FMIN(src1_vec.S4(), src1_vec.S4(), src2_vec.S4());
+	storeRegister(src1_vec, shader, dest, operandDescriptor);
+}
+
+void ShaderEmitter::recMUL(const PICAShader& shader, u32 instruction) {
+	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
+	const u32 src1 = getBits<12, 7>(instruction);
+	const u32 src2 = getBits<7, 5>(instruction);  // src2 coming first because PICA moment
+	const u32 idx = getBits<19, 2>(instruction);
+	const u32 dest = getBits<21, 5>(instruction);
+
+	// TODO: Safe multiplication equivalent (Multiplication is not IEEE compliant on the PICA)
+	loadRegister<1>(src1_vec, shader, src1, idx, operandDescriptor);
+	loadRegister<2>(src2_vec, shader, src2, 0, operandDescriptor);
+	FMUL(src1_vec.S4(), src1_vec.S4(), src2_vec.S4());
+	storeRegister(src1_vec, shader, dest, operandDescriptor);
+}
+
+void ShaderEmitter::recRSQ(const PICAShader& shader, u32 instruction) {
+	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
+	const u32 src = getBits<12, 7>(instruction);
+	const u32 idx = getBits<19, 2>(instruction);
+	const u32 dest = getBits<21, 5>(instruction);
+	const u32 writeMask = operandDescriptor & 0xf;
+	constexpr bool useAccurateRSQ = false;
+
+	loadRegister<1>(src1_vec, shader, src, idx, operandDescriptor);  // Load source 1 into scratch1
+
+	// Compute reciprocal square root approximation
+	// TODO: Should this use frsqte or fsqrt+div? The former is faster but less accurate
+	// PICA RSQ uses f24 precision though, so it'll be inherently innacurate, and it's likely using an inaccurate approximation too, seeing as
+	// It doesn't have regular sqrt/div instructions.
+	// For now, we default to inaccurate inverse square root
+	if constexpr (useAccurateRSQ) {
+		FMOV(scratch1.S4(), FImm8(0x70));                      // scratch1 = vec4(1.0f)
+		FSQRT(src1_vec.toS(), src1_vec.toS());                 // src1 = sqrt(src1), scalar
+		FDIV(src1_vec.toS(), scratch1.toS(), src1_vec.toS());  // Now invert src1
+	} else {
+		FRSQRTE(src1_vec.toS(), src1_vec.toS());  // Much nicer
+	}
+
+	// If we only write back the x component to the result, we needn't perform a shuffle to do res = res.xxxx
+	// Otherwise we do
+	if (writeMask != 0x8) {                       // Copy bottom lane to all lanes if we're not simply writing back x
+		DUP(src1_vec.S4(), src1_vec.Selem()[0]);  // src1_vec = src1_vec.xxxx
+	}
+
+	storeRegister(src1_vec, shader, dest, operandDescriptor);
+}
+
+void ShaderEmitter::recMAD(const PICAShader& shader, u32 instruction) {
+	const bool isMADI = getBit<29>(instruction) == 0;
+
+	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x1f];
+	const u32 src1 = getBits<17, 5>(instruction);
+	const u32 src2 = isMADI ? getBits<12, 5>(instruction) : getBits<10, 7>(instruction);
+	const u32 src3 = isMADI ? getBits<5, 7>(instruction) : getBits<5, 5>(instruction);
+	const u32 idx = getBits<22, 2>(instruction);
+	const u32 dest = getBits<24, 5>(instruction);
+
+	loadRegister<1>(src1_vec, shader, src1, 0, operandDescriptor);
+	loadRegister<2>(src2_vec, shader, src2, isMADI ? 0 : idx, operandDescriptor);
+	loadRegister<3>(src3_vec, shader, src3, isMADI ? idx : 0, operandDescriptor);
+
+	// TODO: Safe PICA multiplication
+	FMLA(src3_vec.S4(), src1_vec.S4(), src2_vec.S4());
+	storeRegister(src3_vec, shader, dest, operandDescriptor);
 }
 
 void ShaderEmitter::recMOV(const PICAShader& shader, u32 instruction) {
@@ -236,4 +425,6 @@ void ShaderEmitter::recMOV(const PICAShader& shader, u32 instruction) {
 	storeRegister(src1_vec, shader, dest, operandDescriptor);
 }
 
+void ShaderEmitter::recEND(const PICAShader& shader, u32 instruction) { RET(); }
+
 #endif
\ No newline at end of file

From d94167f89bcf593c335fe0b534cfea91a3dc82e5 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Wed, 3 Jan 2024 19:41:57 +0200
Subject: [PATCH 107/162] Apply GLES patch on CI

---
 .github/gles.patch                  | 280 ++++++++++++++++++++++++++++
 .github/workflows/Android_Build.yml |   4 +-
 CMakeLists.txt                      |   4 +
 3 files changed, 287 insertions(+), 1 deletion(-)
 create mode 100644 .github/gles.patch

diff --git a/.github/gles.patch b/.github/gles.patch
new file mode 100644
index 00000000..f1dc2c73
--- /dev/null
+++ b/.github/gles.patch
@@ -0,0 +1,280 @@
+diff --git a/src/core/renderer_gl/renderer_gl.cpp b/src/core/renderer_gl/renderer_gl.cpp
+index a11a6ffa..77486a09 100644
+--- a/src/core/renderer_gl/renderer_gl.cpp
++++ b/src/core/renderer_gl/renderer_gl.cpp
+@@ -357,27 +357,27 @@ void RendererGL::bindTexturesToSlots() {
+ 	}
+ 
+ 	glActiveTexture(GL_TEXTURE0 + 3);
+-	glBindTexture(GL_TEXTURE_1D_ARRAY, lightLUTTextureArray);
++	// glBindTexture(GL_TEXTURE_1D_ARRAY, lightLUTTextureArray);
+ 	glActiveTexture(GL_TEXTURE0);
+ }
+ 
+ void RendererGL::updateLightingLUT() {
+-	gpu.lightingLUTDirty = false;
+-	std::array<u16, GPU::LightingLutSize> u16_lightinglut;
+-
+-	for (int i = 0; i < gpu.lightingLUT.size(); i++) {
+-		uint64_t value = gpu.lightingLUT[i] & ((1 << 12) - 1);
+-		u16_lightinglut[i] = value * 65535 / 4095;
+-	}
+-
+-	glActiveTexture(GL_TEXTURE0 + 3);
+-	glBindTexture(GL_TEXTURE_1D_ARRAY, lightLUTTextureArray);
+-	glTexImage2D(GL_TEXTURE_1D_ARRAY, 0, GL_R16, 256, Lights::LUT_Count, 0, GL_RED, GL_UNSIGNED_SHORT, u16_lightinglut.data());
+-	glTexParameteri(GL_TEXTURE_1D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+-	glTexParameteri(GL_TEXTURE_1D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+-	glTexParameteri(GL_TEXTURE_1D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+-	glTexParameteri(GL_TEXTURE_1D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+-	glActiveTexture(GL_TEXTURE0);
++	// gpu.lightingLUTDirty = false;
++	// std::array<u16, GPU::LightingLutSize> u16_lightinglut;
++
++	// for (int i = 0; i < gpu.lightingLUT.size(); i++) {
++	// 	uint64_t value = gpu.lightingLUT[i] & ((1 << 12) - 1);
++	// 	u16_lightinglut[i] = value * 65535 / 4095;
++	// }
++
++	// glActiveTexture(GL_TEXTURE0 + 3);
++	// glBindTexture(GL_TEXTURE_1D_ARRAY, lightLUTTextureArray);
++	// glTexImage2D(GL_TEXTURE_1D_ARRAY, 0, GL_R16, 256, Lights::LUT_Count, 0, GL_RED, GL_UNSIGNED_SHORT, u16_lightinglut.data());
++	// glTexParameteri(GL_TEXTURE_1D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
++	// glTexParameteri(GL_TEXTURE_1D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
++	// glTexParameteri(GL_TEXTURE_1D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
++	// glTexParameteri(GL_TEXTURE_1D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
++	// glActiveTexture(GL_TEXTURE0);
+ }
+ 
+ void RendererGL::drawVertices(PICA::PrimType primType, std::span<const Vertex> vertices) {
+diff --git a/src/host_shaders/opengl_display.frag b/src/host_shaders/opengl_display.frag
+index 612671c8..1937f711 100644
+--- a/src/host_shaders/opengl_display.frag
++++ b/src/host_shaders/opengl_display.frag
+@@ -1,4 +1,5 @@
+-#version 410 core
++#version 300 es
++precision mediump float;
+ in vec2 UV;
+ out vec4 FragColor;
+ 
+diff --git a/src/host_shaders/opengl_display.vert b/src/host_shaders/opengl_display.vert
+index 990e2f80..2e7842ac 100644
+--- a/src/host_shaders/opengl_display.vert
++++ b/src/host_shaders/opengl_display.vert
+@@ -1,4 +1,5 @@
+-#version 410 core
++#version 300 es
++precision mediump float;
+ out vec2 UV;
+ 
+ void main() {
+diff --git a/src/host_shaders/opengl_fragment_shader.frag b/src/host_shaders/opengl_fragment_shader.frag
+index f6fa6c55..bb88e278 100644
+--- a/src/host_shaders/opengl_fragment_shader.frag
++++ b/src/host_shaders/opengl_fragment_shader.frag
+@@ -1,4 +1,5 @@
+-#version 410 core
++#version 300 es
++precision mediump float;
+ 
+ in vec3 v_tangent;
+ in vec3 v_normal;
+@@ -27,7 +28,7 @@ uniform bool u_depthmapEnable;
+ uniform sampler2D u_tex0;
+ uniform sampler2D u_tex1;
+ uniform sampler2D u_tex2;
+-uniform sampler1DArray u_tex_lighting_lut;
++// uniform sampler1DArray u_tex_lighting_lut;
+ 
+ uniform uint u_picaRegs[0x200 - 0x48];
+ 
+@@ -145,16 +146,23 @@ vec4 tevCalculateCombiner(int tev_id) {
+ #define RR_LUT 6u
+ 
+ float lutLookup(uint lut, uint light, float value) {
+-	if (lut >= FR_LUT && lut <= RR_LUT) lut -= 1;
+-	if (lut == SP_LUT) lut = light + 8;
+-	return texture(u_tex_lighting_lut, vec2(value, lut)).r;
++	// if (lut >= FR_LUT && lut <= RR_LUT) lut -= 1;
++	// if (lut == SP_LUT) lut = light + 8;
++	// return texture(u_tex_lighting_lut, vec2(value, lut)).r;
++	return 0.0;
++}
++
++// some gles versions have bitfieldExtract and complain if you redefine it, some don't and compile error, using this instead
++uint bitfieldExtractCompat(uint val, int off, int size) {
++    uint mask = uint((1 << size) - 1);
++    return uint(val >> off) & mask;
+ }
+ 
+ vec3 regToColor(uint reg) {
+ 	// Normalization scale to convert from [0...255] to [0.0...1.0]
+ 	const float scale = 1.0 / 255.0;
+ 
+-	return scale * vec3(float(bitfieldExtract(reg, 20, 8)), float(bitfieldExtract(reg, 10, 8)), float(bitfieldExtract(reg, 00, 8)));
++	return scale * vec3(float(bitfieldExtractCompat(reg, 20, 8)), float(bitfieldExtractCompat(reg, 10, 8)), float(bitfieldExtractCompat(reg, 00, 8)));
+ }
+ 
+ // Convert an arbitrary-width floating point literal to an f32
+@@ -189,7 +197,7 @@ void calcLighting(out vec4 primary_color, out vec4 secondary_color) {
+ 	vec3 view = normalize(v_view);
+ 
+ 	uint GPUREG_LIGHTING_ENABLE = readPicaReg(0x008Fu);
+-	if (bitfieldExtract(GPUREG_LIGHTING_ENABLE, 0, 1) == 0u) {
++	if (bitfieldExtractCompat(GPUREG_LIGHTING_ENABLE, 0, 1) == 0u) {
+ 		primary_color = secondary_color = vec4(1.0);
+ 		return;
+ 	}
+@@ -213,7 +221,7 @@ void calcLighting(out vec4 primary_color, out vec4 secondary_color) {
+ 	bool error_unimpl = false;
+ 
+ 	for (uint i = 0u; i < GPUREG_LIGHTING_NUM_LIGHTS; i++) {
+-		uint light_id = bitfieldExtract(GPUREG_LIGHTING_LIGHT_PERMUTATION, int(i * 3u), 3);
++		uint light_id = bitfieldExtractCompat(GPUREG_LIGHTING_LIGHT_PERMUTATION, int(i * 3u), 3);
+ 
+ 		uint GPUREG_LIGHTi_SPECULAR0 = readPicaReg(0x0140u + 0x10u * light_id);
+ 		uint GPUREG_LIGHTi_SPECULAR1 = readPicaReg(0x0141u + 0x10u * light_id);
+@@ -224,14 +232,14 @@ void calcLighting(out vec4 primary_color, out vec4 secondary_color) {
+ 		uint GPUREG_LIGHTi_CONFIG = readPicaReg(0x0149u + 0x10u * light_id);
+ 
+ 		vec3 light_vector = normalize(vec3(
+-			decodeFP(bitfieldExtract(GPUREG_LIGHTi_VECTOR_LOW, 0, 16), 5u, 10u), decodeFP(bitfieldExtract(GPUREG_LIGHTi_VECTOR_LOW, 16, 16), 5u, 10u),
+-			decodeFP(bitfieldExtract(GPUREG_LIGHTi_VECTOR_HIGH, 0, 16), 5u, 10u)
++			decodeFP(bitfieldExtractCompat(GPUREG_LIGHTi_VECTOR_LOW, 0, 16), 5u, 10u), decodeFP(bitfieldExtractCompat(GPUREG_LIGHTi_VECTOR_LOW, 16, 16), 5u, 10u),
++			decodeFP(bitfieldExtractCompat(GPUREG_LIGHTi_VECTOR_HIGH, 0, 16), 5u, 10u)
+ 		));
+ 
+ 		vec3 half_vector;
+ 
+ 		// Positional Light
+-		if (bitfieldExtract(GPUREG_LIGHTi_CONFIG, 0, 1) == 0u) {
++		if (bitfieldExtractCompat(GPUREG_LIGHTi_CONFIG, 0, 1) == 0u) {
+ 			// error_unimpl = true;
+ 			half_vector = normalize(normalize(light_vector + v_view) + view);
+ 		}
+@@ -242,12 +250,12 @@ void calcLighting(out vec4 primary_color, out vec4 secondary_color) {
+ 		}
+ 
+ 		for (int c = 0; c < 7; c++) {
+-			if (bitfieldExtract(GPUREG_LIGHTING_CONFIG1, 16 + c, 1) == 0u) {
+-				uint scale_id = bitfieldExtract(GPUREG_LIGHTING_LUTINPUT_SCALE, c * 4, 3);
++			if (bitfieldExtractCompat(GPUREG_LIGHTING_CONFIG1, 16 + c, 1) == 0u) {
++				uint scale_id = bitfieldExtractCompat(GPUREG_LIGHTING_LUTINPUT_SCALE, c * 4, 3);
+ 				float scale = float(1u << scale_id);
+ 				if (scale_id >= 6u) scale /= 256.0;
+ 
+-				uint input_id = bitfieldExtract(GPUREG_LIGHTING_LUTINPUT_SELECT, c * 4, 3);
++				uint input_id = bitfieldExtractCompat(GPUREG_LIGHTING_LUTINPUT_SELECT, c * 4, 3);
+ 				if (input_id == 0u)
+ 					d[c] = dot(normal, half_vector);
+ 				else if (input_id == 1u)
+@@ -260,9 +268,9 @@ void calcLighting(out vec4 primary_color, out vec4 secondary_color) {
+ 					uint GPUREG_LIGHTi_SPOTDIR_LOW = readPicaReg(0x0146u + 0x10u * light_id);
+ 					uint GPUREG_LIGHTi_SPOTDIR_HIGH = readPicaReg(0x0147u + 0x10u * light_id);
+ 					vec3 spot_light_vector = normalize(vec3(
+-						decodeFP(bitfieldExtract(GPUREG_LIGHTi_SPOTDIR_LOW, 0, 16), 1u, 11u),
+-						decodeFP(bitfieldExtract(GPUREG_LIGHTi_SPOTDIR_LOW, 16, 16), 1u, 11u),
+-						decodeFP(bitfieldExtract(GPUREG_LIGHTi_SPOTDIR_HIGH, 0, 16), 1u, 11u)
++						decodeFP(bitfieldExtractCompat(GPUREG_LIGHTi_SPOTDIR_LOW, 0, 16), 1u, 11u),
++						decodeFP(bitfieldExtractCompat(GPUREG_LIGHTi_SPOTDIR_LOW, 16, 16), 1u, 11u),
++						decodeFP(bitfieldExtractCompat(GPUREG_LIGHTi_SPOTDIR_HIGH, 0, 16), 1u, 11u)
+ 					));
+ 					d[c] = dot(-light_vector, spot_light_vector);  // -L dot P (aka Spotlight aka SP);
+ 				} else if (input_id == 5u) {
+@@ -273,13 +281,13 @@ void calcLighting(out vec4 primary_color, out vec4 secondary_color) {
+ 				}
+ 
+ 				d[c] = lutLookup(uint(c), light_id, d[c] * 0.5 + 0.5) * scale;
+-				if (bitfieldExtract(GPUREG_LIGHTING_LUTINPUT_ABS, 2 * c, 1) != 0u) d[c] = abs(d[c]);
++				if (bitfieldExtractCompat(GPUREG_LIGHTING_LUTINPUT_ABS, 2 * c, 1) != 0u) d[c] = abs(d[c]);
+ 			} else {
+ 				d[c] = 1.0;
+ 			}
+ 		}
+ 
+-		uint lookup_config = bitfieldExtract(GPUREG_LIGHTi_CONFIG, 4, 4);
++		uint lookup_config = bitfieldExtractCompat(GPUREG_LIGHTi_CONFIG, 4, 4);
+ 		if (lookup_config == 0u) {
+ 			d[D1_LUT] = 0.0;
+ 			d[FR_LUT] = 0.0;
+@@ -310,7 +318,7 @@ void calcLighting(out vec4 primary_color, out vec4 secondary_color) {
+ 		float NdotL = dot(normal, light_vector);  // Li dot N
+ 
+ 		// Two sided diffuse
+-		if (bitfieldExtract(GPUREG_LIGHTi_CONFIG, 1, 1) == 0u)
++		if (bitfieldExtractCompat(GPUREG_LIGHTi_CONFIG, 1, 1) == 0u)
+ 			NdotL = max(0.0, NdotL);
+ 		else
+ 			NdotL = abs(NdotL);
+@@ -321,8 +329,8 @@ void calcLighting(out vec4 primary_color, out vec4 secondary_color) {
+ 		secondary_color.rgb += light_factor * (regToColor(GPUREG_LIGHTi_SPECULAR0) * d[D0_LUT] +
+ 											   regToColor(GPUREG_LIGHTi_SPECULAR1) * d[D1_LUT] * vec3(d[RR_LUT], d[RG_LUT], d[RB_LUT]));
+ 	}
+-	uint fresnel_output1 = bitfieldExtract(GPUREG_LIGHTING_CONFIG0, 2, 1);
+-	uint fresnel_output2 = bitfieldExtract(GPUREG_LIGHTING_CONFIG0, 3, 1);
++	uint fresnel_output1 = bitfieldExtractCompat(GPUREG_LIGHTING_CONFIG0, 2, 1);
++	uint fresnel_output2 = bitfieldExtractCompat(GPUREG_LIGHTING_CONFIG0, 3, 1);
+ 
+ 	if (fresnel_output1 == 1u) primary_color.a = d[FR_LUT];
+ 	if (fresnel_output2 == 1u) secondary_color.a = d[FR_LUT];
+diff --git a/src/host_shaders/opengl_vertex_shader.vert b/src/host_shaders/opengl_vertex_shader.vert
+index a25d7a6d..7cf40398 100644
+--- a/src/host_shaders/opengl_vertex_shader.vert
++++ b/src/host_shaders/opengl_vertex_shader.vert
+@@ -1,4 +1,6 @@
+-#version 410 core
++#version 300 es
++precision mediump float;
++precision mediump int;
+ 
+ layout(location = 0) in vec4 a_coords;
+ layout(location = 1) in vec4 a_quaternion;
+@@ -20,7 +22,7 @@ out vec2 v_texcoord2;
+ flat out vec4 v_textureEnvColor[6];
+ flat out vec4 v_textureEnvBufferColor;
+ 
+-out float gl_ClipDistance[2];
++// out float gl_ClipDistance[2];
+ 
+ // TEV uniforms
+ uniform uint u_textureEnvColor[6];
+@@ -93,6 +95,6 @@ void main() {
+ 	);
+ 
+ 	// There's also another, always-on clipping plane based on vertex z
+-	gl_ClipDistance[0] = -a_coords.z;
+-	gl_ClipDistance[1] = dot(clipData, a_coords);
++	// gl_ClipDistance[0] = -a_coords.z;
++	// gl_ClipDistance[1] = dot(clipData, a_coords);
+ }
+diff --git a/third_party/opengl/opengl.hpp b/third_party/opengl/opengl.hpp
+index f368f573..5ead7f63 100644
+--- a/third_party/opengl/opengl.hpp
++++ b/third_party/opengl/opengl.hpp
+@@ -520,21 +520,21 @@ namespace OpenGL {
+ 	static void enableBlend() { glEnable(GL_BLEND); }
+ 	static void disableBlend() { glDisable(GL_BLEND); }
+ 	static void enableLogicOp() { glEnable(GL_COLOR_LOGIC_OP); }
+-	static void disableLogicOp() { glDisable(GL_COLOR_LOGIC_OP); }
++	static void disableLogicOp() { /* glDisable(GL_COLOR_LOGIC_OP); */ }
+ 	static void enableDepth() { glEnable(GL_DEPTH_TEST); }
+ 	static void disableDepth() { glDisable(GL_DEPTH_TEST); }
+ 	static void enableStencil() { glEnable(GL_STENCIL_TEST); }
+ 	static void disableStencil() { glDisable(GL_STENCIL_TEST); }
+ 
+-	static void enableClipPlane(GLuint index) { glEnable(GL_CLIP_DISTANCE0 + index); }
+-	static void disableClipPlane(GLuint index) { glDisable(GL_CLIP_DISTANCE0 + index); }
++	static void enableClipPlane(GLuint index) { /* glEnable(GL_CLIP_DISTANCE0 + index); */ }
++	static void disableClipPlane(GLuint index) { /* glDisable(GL_CLIP_DISTANCE0 + index); */ }
+ 
+ 	static void setDepthFunc(DepthFunc func) { glDepthFunc(static_cast<GLenum>(func)); }
+ 	static void setColourMask(GLboolean r, GLboolean g, GLboolean b, GLboolean a) { glColorMask(r, g, b, a); }
+ 	static void setDepthMask(GLboolean mask) { glDepthMask(mask); }
+ 
+ 	// TODO: Add a proper enum for this
+-	static void setLogicOp(GLenum op) { glLogicOp(op); }
++	static void setLogicOp(GLenum op) { /* glLogicOp(op); */ }
+ 
+     enum Primitives {
+         Triangle = GL_TRIANGLES,
diff --git a/.github/workflows/Android_Build.yml b/.github/workflows/Android_Build.yml
index c94140d7..cc2da2bb 100644
--- a/.github/workflows/Android_Build.yml
+++ b/.github/workflows/Android_Build.yml
@@ -37,6 +37,7 @@ jobs:
 
     - name: Build
       run: |
+        git apply ./.github/gles.patch
         cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
         mv ./build/libAlber.so ./src/pandroid/app/src/main/jniLibs/x86_64/
         cd src/pandroid
@@ -71,10 +72,11 @@ jobs:
         java-version: '17'
 
     - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DBUILD_HYDRA_CORE=1 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DENABLE_VULKAN=0 -DCMAKE_CXX_FLAGS="-march=armv8.1-a+crypto"
+      run: cmake -B ${{github.workspace}}/build -DBUILD_HYDRA_CORE=1 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DENABLE_VULKAN=0 -DCMAKE_CXX_FLAGS="-march=armv8-a+crypto"
 
     - name: Build
       run: |
+        git apply ./.github/gles.patch
         cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
         mv ./build/libAlber.so ./src/pandroid/app/src/main/jniLibs/arm64-v8a/
         cd src/pandroid
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 732ec793..e86c40d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,6 +98,10 @@ add_compile_definitions(BOOST_NO_CXX98_FUNCTION_BASE) # Forbid Boost from using
 add_library(boost INTERFACE)
 target_include_directories(boost SYSTEM INTERFACE ${Boost_INCLUDE_DIR})
 
+if(ANDROID)
+    set(CRYPTOPP_OPT_DISABLE_ASM ON CACHE BOOL "" FORCE)
+endif()
+
 set(CRYPTOPP_BUILD_TESTING OFF)
 add_subdirectory(third_party/cryptopp)
 add_subdirectory(third_party/glad)

From c849af47da450a3ef3bc5304587115eac08f468f Mon Sep 17 00:00:00 2001
From: Gabriel Machado <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Wed, 3 Jan 2024 17:35:30 -0400
Subject: [PATCH 108/162] Pandroid: add option to change screen gamepad,
 buttons position. (#359)

* Add change screen gamepad: initial commit

* Add change gamepad positions: part 2

* Peach fixes

* Bonk

---------

Co-authored-by: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
---
 .../pandroid/app/PreferenceActivity.java      |   9 +-
 .../pandroid/app/base/BottomAlertDialog.java  |  57 +++++
 .../pandroid/app/main/SettingsFragment.java   |   4 +-
 .../preferences/AppearancePreferences.java    |   1 -
 .../ControllerMapperPreferences.java          | 101 +++++++++
 .../app/preferences/InputPreferences.java     | 109 ++++++++++
 .../pandroid/data/GsonConfigParser.java       |   3 +-
 .../panda3ds/pandroid/utils/Constants.java    |   1 +
 .../pandroid/view/PandaLayoutController.java  |  33 +++
 .../controller/mapping/ControllerItem.java    |   9 +
 .../controller/mapping/ControllerMapper.java  | 202 ++++++++++++++++++
 .../mapping/ControllerProfileManager.java     | 103 +++++++++
 .../view/controller/mapping/Layout.java       |  36 ++++
 .../view/controller/mapping/Location.java     |  57 +++++
 .../view/controller/mapping/Profile.java      | 104 +++++++++
 .../app/src/main/res/color/red_color.xml      |   4 +
 .../res/drawable/alert_dialog_background.xml  |   9 +
 .../app/src/main/res/drawable/ic_add.xml      |   2 +-
 .../app/src/main/res/drawable/ic_delete.xml   |   5 +
 .../main/res/drawable/ic_rotate_screen.xml    |   5 +
 .../app/src/main/res/drawable/ic_save.xml     |   5 +
 .../src/main/res/drawable/ic_visibility.xml   |   5 +
 .../src/main/res/layout/controller_dpad.xml   |   1 +
 .../main/res/layout/controller_gamepad.xml    |   4 +-
 .../app/src/main/res/layout/game_activity.xml |   3 +-
 .../layout/preference_controller_mapper.xml   |  90 ++++++++
 .../src/main/res/values-pt-rBR/strings.xml    |   8 +
 .../app/src/main/res/values/dimens.xml        |   4 +
 .../app/src/main/res/values/strings.xml       |  10 +-
 .../app/src/main/res/values/themes.xml        |  21 +-
 .../app/src/main/res/xml/input_preference.xml |  31 +++
 .../src/main/res/xml/start_preferences.xml    |   6 +-
 32 files changed, 1028 insertions(+), 14 deletions(-)
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BottomAlertDialog.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/ControllerMapperPreferences.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputPreferences.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/ControllerItem.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/ControllerMapper.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/ControllerProfileManager.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/Layout.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/Location.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/Profile.java
 create mode 100644 src/pandroid/app/src/main/res/color/red_color.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/alert_dialog_background.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_delete.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_rotate_screen.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_save.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_visibility.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/preference_controller_mapper.xml
 create mode 100644 src/pandroid/app/src/main/res/values/dimens.xml
 create mode 100644 src/pandroid/app/src/main/res/xml/input_preference.xml

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PreferenceActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PreferenceActivity.java
index 64249c5b..9bc9900b 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PreferenceActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PreferenceActivity.java
@@ -29,15 +29,22 @@ public class PreferenceActivity extends BaseActivity {
 
 		try {
 			Class<?> clazz = getClassLoader().loadClass(intent.getStringExtra(Constants.ACTIVITY_PARAMETER_FRAGMENT));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, (Fragment) clazz.newInstance()).commitNow();
+			Fragment fragment = (Fragment) clazz.newInstance();
+			fragment.setArguments(intent.getExtras());
+			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, fragment).commitNow();
 		} catch (Exception e) {
 			throw new RuntimeException(e);
 		}
 	}
 
 	public static void launch(Context context, Class<? extends Fragment> clazz) {
+		launch(context, clazz, new Intent());
+	}
+
+	public static void launch(Context context, Class<? extends Fragment> clazz, Intent extras) {
 		context.startActivity(new Intent(context, PreferenceActivity.class)
 								  .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+								  .putExtras(extras)
 								  .putExtra(Constants.ACTIVITY_PARAMETER_FRAGMENT, clazz.getName()));
 	}
 
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BottomAlertDialog.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BottomAlertDialog.java
new file mode 100644
index 00000000..7c5470f1
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BottomAlertDialog.java
@@ -0,0 +1,57 @@
+package com.panda3ds.pandroid.app.base;
+
+import android.content.Context;
+import android.view.Gravity;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.AppCompatEditText;
+import androidx.appcompat.widget.LinearLayoutCompat;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.lang.Function;
+
+public class BottomAlertDialog extends AlertDialog.Builder {
+    private final LinearLayoutCompat layoutCompat;
+
+    public BottomAlertDialog(@NonNull Context context) {
+        super(context, R.style.AlertDialog);
+        layoutCompat = new LinearLayoutCompat(context);
+        layoutCompat.setOrientation(LinearLayoutCompat.VERTICAL);
+
+        int padding = getContext().getResources().getDimensionPixelSize(androidx.appcompat.R.dimen.abc_dialog_padding_material);
+        layoutCompat.setPadding(padding, 0, padding, 0);
+
+        setView(layoutCompat);
+    }
+
+    @NonNull
+    @Override
+    public AlertDialog create() {
+        AlertDialog dialog = super.create();
+        dialog.getWindow().setGravity(Gravity.BOTTOM | Gravity.CENTER);
+        dialog.getWindow().getAttributes().y = Math.round(getContext().getResources().getDisplayMetrics().density * 15);
+        return dialog;
+    }
+
+    public BottomAlertDialog setTextInput(String hint, Function<String> listener) {
+        AppCompatEditText edit = new AppCompatEditText(getContext());
+        edit.setHint(hint);
+        int margin = layoutCompat.getPaddingLeft() / 2;
+        LinearLayoutCompat.LayoutParams params = new LinearLayoutCompat.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        params.setMargins(0, margin, 0, margin);
+        layoutCompat.addView(edit, params);
+        setPositiveButton(android.R.string.ok, (dialog, which) -> listener.run(String.valueOf(edit.getText())));
+        setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss());
+        return this;
+    }
+
+    @Override
+    public AlertDialog show() {
+        AlertDialog dialog = create();
+        dialog.show();
+
+        return dialog;
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java
index 08f2d70f..b3bebf8f 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java
@@ -7,14 +7,14 @@ import androidx.annotation.Nullable;
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.app.PreferenceActivity;
 import com.panda3ds.pandroid.app.base.BasePreferenceFragment;
-import com.panda3ds.pandroid.app.preferences.InputMapPreferences;
 import com.panda3ds.pandroid.app.preferences.AppearancePreferences;
+import com.panda3ds.pandroid.app.preferences.InputPreferences;
 
 public class SettingsFragment extends BasePreferenceFragment {
     @Override
     public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
         setPreferencesFromResource(R.xml.start_preferences, rootKey);
-        setItemClick("inputMap", (item) -> PreferenceActivity.launch(requireContext(), InputMapPreferences.class));
+        setItemClick("input", (item) -> PreferenceActivity.launch(requireContext(), InputPreferences.class));
         setItemClick("appearance", (item)-> PreferenceActivity.launch(requireContext(), AppearancePreferences.class));
     }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java
index 63f79ddb..dea4e261 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java
@@ -1,6 +1,5 @@
 package com.panda3ds.pandroid.app.preferences;
 
-import android.app.Activity;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/ControllerMapperPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/ControllerMapperPreferences.java
new file mode 100644
index 00000000..e59adfbe
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/ControllerMapperPreferences.java
@@ -0,0 +1,101 @@
+package com.panda3ds.pandroid.app.preferences;
+
+import android.content.pm.ActivityInfo;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.app.BaseActivity;
+import com.panda3ds.pandroid.app.base.BottomAlertDialog;
+import com.panda3ds.pandroid.view.controller.mapping.ControllerMapper;
+import com.panda3ds.pandroid.view.controller.mapping.ControllerProfileManager;
+import com.panda3ds.pandroid.view.controller.mapping.ControllerItem;
+import com.panda3ds.pandroid.view.controller.mapping.Profile;
+
+public class ControllerMapperPreferences extends Fragment {
+    private Profile currentProfile;
+    private ControllerMapper mapper;
+    private View saveButton;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.preference_controller_mapper, container, false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+
+        currentProfile = ControllerProfileManager.get(getArguments().getString("profile")).clone();
+
+        ((BaseActivity) requireActivity()).getSupportActionBar().hide();
+        mapper = view.findViewById(R.id.mapper);
+        mapper.initialize(this::onLocationChanged, currentProfile);
+
+        view.findViewById(R.id.change_visibility).setOnClickListener(v -> {
+            BottomAlertDialog builder = new BottomAlertDialog(v.getContext());
+            builder.setTitle("Visibility");
+            boolean[] visibleList = {
+                    currentProfile.isVisible(ControllerItem.START),
+                    currentProfile.isVisible(ControllerItem.SELECT),
+                    currentProfile.isVisible(ControllerItem.L),
+                    currentProfile.isVisible(ControllerItem.R),
+                    currentProfile.isVisible(ControllerItem.DPAD),
+                    currentProfile.isVisible(ControllerItem.JOYSTICK),
+                    currentProfile.isVisible(ControllerItem.GAMEPAD),
+            };
+            builder.setMultiChoiceItems(new CharSequence[]{
+                    "Start", "Select", "L", "R", "Dpad", getString(R.string.axis), "A/B/X/Y"
+            }, visibleList, (dialog, index, visibility) -> {
+                visibleList[index] = visibility;
+            }).setPositiveButton(android.R.string.ok, (dialog, which) -> {
+
+                saveButton.setVisibility(View.VISIBLE);
+
+                currentProfile.setVisible(ControllerItem.START, visibleList[0]);
+                currentProfile.setVisible(ControllerItem.SELECT, visibleList[1]);
+                currentProfile.setVisible(ControllerItem.L, visibleList[2]);
+                currentProfile.setVisible(ControllerItem.R, visibleList[3]);
+                currentProfile.setVisible(ControllerItem.DPAD, visibleList[4]);
+                currentProfile.setVisible(ControllerItem.JOYSTICK, visibleList[5]);
+                currentProfile.setVisible(ControllerItem.GAMEPAD, visibleList[6]);
+
+                mapper.refreshLayout();
+            }).setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss());
+            builder.show();
+        });
+
+        saveButton = view.findViewById(R.id.save);
+        saveButton.setOnClickListener(v -> {
+            ControllerProfileManager.add(currentProfile);
+            Toast.makeText(v.getContext(), R.string.saved, Toast.LENGTH_SHORT).show();
+            requireActivity().finish();
+        });
+
+        view.findViewById(R.id.delete).setOnClickListener(v -> {
+            ControllerProfileManager.remove(currentProfile.getId());
+            requireActivity().finish();
+        });
+
+        view.findViewById(R.id.rotate).setOnClickListener(v -> {
+            requireActivity().setRequestedOrientation(mapper.getCurrentWidth() > mapper.getCurrentHeight() ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT : ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+        });
+
+        view.findViewById(R.id.delete).setVisibility(ControllerProfileManager.getProfileCount() > 1 ? View.VISIBLE : View.GONE);
+
+        saveButton.setVisibility(View.GONE);
+    }
+
+    public void onLocationChanged(ControllerItem id) {
+        saveButton.setVisibility(View.VISIBLE);
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputPreferences.java
new file mode 100644
index 00000000..aa5d5eff
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputPreferences.java
@@ -0,0 +1,109 @@
+package com.panda3ds.pandroid.app.preferences;
+
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.app.BaseActivity;
+import com.panda3ds.pandroid.app.PreferenceActivity;
+import com.panda3ds.pandroid.app.base.BasePreferenceFragment;
+import com.panda3ds.pandroid.app.base.BottomAlertDialog;
+import com.panda3ds.pandroid.view.controller.mapping.ControllerProfileManager;
+import com.panda3ds.pandroid.view.controller.mapping.Profile;
+
+import java.util.List;
+import java.util.Objects;
+
+public class InputPreferences extends BasePreferenceFragment {
+
+    public static final String ID_DEFAULT_CONTROLLER_PROFILE = "defaultControllerProfile";
+    public static final String ID_INPUT_MAP = "inputMap";
+    public static final String ID_CREATE_PROFILE = "createProfile";
+    private static final CharSequence ID_GAMEPAD_PROFILE_LIST = "gamepadProfileList";
+
+    @Override
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+        setPreferencesFromResource(R.xml.input_preference, rootKey);
+        setItemClick(ID_INPUT_MAP, (item) -> PreferenceActivity.launch(requireContext(), InputMapPreferences.class));
+        setItemClick(ID_CREATE_PROFILE, (item) -> {
+            new BottomAlertDialog(requireContext())
+                    .setTextInput(getString(R.string.name), (name) -> {
+                        name = formatName(name);
+                        if (name.length() > 0) {
+                            Profile profile = ControllerProfileManager.makeDefaultProfile();
+                            profile.setName(name);
+                            ControllerProfileManager.add(profile);
+                            refreshScreenProfileList();
+                        } else {
+                            Toast.makeText(requireContext(), R.string.invalid_name, Toast.LENGTH_SHORT).show();
+                        }
+                    }).setTitle(R.string.create_profile).show();
+        });
+
+        setItemClick(ID_DEFAULT_CONTROLLER_PROFILE, (item) -> {
+            List<Profile> profiles = ControllerProfileManager.listAll();
+            String defaultProfileId = ControllerProfileManager.getDefaultProfile().getId();
+            int defaultProfileIndex = 0;
+            CharSequence[] names = new CharSequence[profiles.size()];
+            for (int i = 0; i < names.length; i++) {
+                names[i] = profiles.get(i).getName();
+                if (Objects.equals(profiles.get(i).getId(), defaultProfileId)) {
+                    defaultProfileIndex = i;
+                }
+            }
+            new BottomAlertDialog(item.getContext())
+                    .setSingleChoiceItems(names, defaultProfileIndex, (dialog, which) -> {
+                        dialog.dismiss();
+                        ControllerProfileManager.setDefaultProfileId(profiles.get(which).getId());
+                        item.setSummary(profiles.get(which).getName());
+                    }).setTitle(R.string.pref_default_controller_title).show();
+        });
+
+        ((BaseActivity) requireActivity()).getSupportActionBar().setTitle(R.string.input);
+    }
+
+    public String formatName(String name) {
+        return name.trim().replaceAll("\\s\\s", " ");
+    }
+
+    private void refresh() {
+        findPreference(ID_DEFAULT_CONTROLLER_PROFILE).setSummary(ControllerProfileManager.getDefaultProfile().getName());
+        refreshScreenProfileList();
+    }
+
+    @SuppressLint("RestrictedApi")
+    private void refreshScreenProfileList() {
+        PreferenceCategory category = findPreference(ID_GAMEPAD_PROFILE_LIST);
+        Preference add = category.getPreference(category.getPreferenceCount() - 1);
+        category.removeAll();
+        category.setOrderingAsAdded(true);
+
+        for (Profile profile : ControllerProfileManager.listAll()) {
+            Preference item = new Preference(category.getContext());
+            item.setOnPreferenceClickListener(preference -> {
+                category.performClick();
+                PreferenceActivity.launch(requireActivity(), ControllerMapperPreferences.class, new Intent().putExtra("profile", profile.getId()));
+                return false;
+            });
+            item.setOrder(category.getPreferenceCount());
+            item.setIconSpaceReserved(false);
+            item.setTitle(profile.getName());
+            category.addPreference(item);
+        }
+
+        add.setOrder(category.getPreferenceCount());
+        category.addPreference(add);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        refresh();
+    }
+}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java
index 99c1419b..0fde3d2f 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/GsonConfigParser.java
@@ -1,11 +1,12 @@
 package com.panda3ds.pandroid.data;
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.panda3ds.pandroid.lang.Task;
 import com.panda3ds.pandroid.utils.FileUtils;
 
 public class GsonConfigParser {
-    private final Gson gson = new Gson();
+    private final Gson gson = new GsonBuilder().setPrettyPrinting().create();
     private final String name;
 
     public GsonConfigParser(String name) {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
index 7adf2e47..c72a516a 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/Constants.java
@@ -25,4 +25,5 @@ public class Constants {
 	public static final String PREF_GLOBAL_CONFIG = "app.GlobalConfig";
     public static final String PREF_GAME_UTILS = "app.GameUtils";
     public static final String PREF_INPUT_MAP = "app.InputMap";
+    public static final String PREF_SCREEN_CONTROLLER_PROFILES = "app.input.ScreenControllerManager";
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java
index 617b407e..2f341c7b 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaLayoutController.java
@@ -6,10 +6,17 @@ import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.view.controller.ControllerLayout;
+import com.panda3ds.pandroid.view.controller.mapping.ControllerProfileManager;
+import com.panda3ds.pandroid.view.controller.mapping.ControllerItem;
+import com.panda3ds.pandroid.view.controller.mapping.Profile;
 import com.panda3ds.pandroid.view.controller.nodes.Button;
 import com.panda3ds.pandroid.view.controller.nodes.Joystick;
 
 public class PandaLayoutController extends ControllerLayout {
+
+	private int width = -1;
+	private int height = -1;
+
 	public PandaLayoutController(Context context) { super(context); }
 	public PandaLayoutController(Context context, AttributeSet attrs) { super(context, attrs); }
 	public PandaLayoutController(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); }
@@ -44,5 +51,31 @@ public class PandaLayoutController extends ControllerLayout {
 		});
 
 		refreshChildren();
+		measure(MeasureSpec.EXACTLY, MeasureSpec.EXACTLY);
+	}
+
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+		int measuredWidth = getMeasuredWidth();
+		int measuredHeight = getMeasuredHeight();
+
+		if (measuredWidth != width || measuredHeight != height) {
+			width = measuredWidth;
+			height = measuredHeight;
+			applyProfileMap();
+		}
+	}
+
+	private void applyProfileMap() {
+		Profile profile = ControllerProfileManager.getDefaultProfile();
+
+		profile.applyToView(ControllerItem.L,findViewById(R.id.button_l), width, height);
+		profile.applyToView(ControllerItem.R, findViewById(R.id.button_r), width, height);
+		profile.applyToView(ControllerItem.START, findViewById(R.id.button_start), width, height);
+		profile.applyToView(ControllerItem.SELECT, findViewById(R.id.button_select), width, height);
+		profile.applyToView(ControllerItem.JOYSTICK, findViewById(R.id.left_analog), width, height);
+		profile.applyToView(ControllerItem.GAMEPAD, findViewById(R.id.gamepad), width, height);
+		profile.applyToView(ControllerItem.DPAD, findViewById(R.id.dpad), width, height);
 	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/ControllerItem.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/ControllerItem.java
new file mode 100644
index 00000000..6be617b5
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/ControllerItem.java
@@ -0,0 +1,9 @@
+package com.panda3ds.pandroid.view.controller.mapping;
+
+public enum ControllerItem {
+    START,
+    SELECT,
+    L,R,
+    GAMEPAD,
+    DPAD, JOYSTICK
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/ControllerMapper.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/ControllerMapper.java
new file mode 100644
index 00000000..04cb75c8
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/ControllerMapper.java
@@ -0,0 +1,202 @@
+package com.panda3ds.pandroid.view.controller.mapping;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.DashPathEffect;
+import android.graphics.Paint;
+import android.graphics.drawable.ColorDrawable;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.lang.Function;
+import com.panda3ds.pandroid.math.Vector2;
+
+public class ControllerMapper extends FrameLayout {
+    public static int COLOR_DARK = Color.rgb(20, 20, 20);
+    public static int COLOR_LIGHT = Color.rgb(60, 60, 60);
+    private final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    private Profile profile;
+    private View selectedView;
+    private final Paint selectionPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    private int width = -1;
+    private int height = -1;
+    private Function<ControllerItem> changeListener;
+
+    public ControllerMapper(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public ControllerMapper(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public ControllerMapper(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0);
+    }
+
+    public ControllerMapper(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        setBackground(new ColorDrawable(Color.YELLOW));
+        float dp = getResources().getDisplayMetrics().density;
+
+        selectionPaint.setColor(Color.RED);
+        selectionPaint.setStrokeWidth(dp * 2);
+        selectionPaint.setStyle(Paint.Style.STROKE);
+        selectionPaint.setPathEffect(new DashPathEffect(new float[]{dp * 10, dp * 10}, 0.0f));
+    }
+
+    public void initialize(Function<ControllerItem> changeListener, Profile profile) {
+        this.profile = profile;
+        this.changeListener = changeListener;
+
+        measure(MeasureSpec.EXACTLY, MeasureSpec.EXACTLY);
+
+        new MoveElementListener(ControllerItem.L, findViewById(R.id.button_l));
+        new MoveElementListener(ControllerItem.R, findViewById(R.id.button_r));
+        new MoveElementListener(ControllerItem.START, findViewById(R.id.button_start));
+        new MoveElementListener(ControllerItem.SELECT, findViewById(R.id.button_select));
+        new MoveElementListener(ControllerItem.DPAD, findViewById(R.id.dpad));
+        new MoveElementListener(ControllerItem.GAMEPAD, findViewById(R.id.gamepad));
+        new MoveElementListener(ControllerItem.JOYSTICK, findViewById(R.id.left_analog));
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        drawBackground(canvas);
+        if (selectedView != null) {
+            paint.setColor(Color.argb(30, 255, 0, 0));
+            drawSelected(canvas, paint);
+        }
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        super.dispatchDraw(canvas);
+        if (selectedView != null) {
+            drawSelected(canvas, selectionPaint);
+        }
+    }
+
+    public void drawSelected(Canvas canvas, Paint paint) {
+        int[] absolutePosition = new int[2];
+        int[] selectedViewPosition = new int[2];
+
+        selectedView.getLocationOnScreen(selectedViewPosition);
+        getLocationOnScreen(absolutePosition);
+
+        int width = selectedView.getLayoutParams().width;
+        int height = selectedView.getLayoutParams().height;
+
+        int x = selectedViewPosition[0] - absolutePosition[0];
+        int y = selectedViewPosition[1] - absolutePosition[1];
+
+        canvas.drawRect(x, y, x + width, y + height, paint);
+    }
+
+
+    private void drawBackground(Canvas canvas) {
+        paint.setStyle(Paint.Style.FILL);
+
+        int shapeSize = Math.round(getResources().getDimension(R.dimen.SizePt) * 7.2f);
+        boolean dark = true;
+        boolean start = true;
+
+        for (int x = 0; x < width + shapeSize; x += shapeSize) {
+            for (int y = 0; y < height + shapeSize; y += shapeSize) {
+                paint.setColor(dark ? COLOR_DARK : COLOR_LIGHT);
+                canvas.drawRect(x, y, x + shapeSize, y + shapeSize, paint);
+                dark = !dark;
+            }
+            start = !start;
+            dark = start;
+        }
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int measuredWidth = getMeasuredWidth();
+        int measuredHeight = getMeasuredHeight();
+        
+        if (measuredWidth != width || measuredHeight != height) {
+            width = measuredWidth;
+            height = measuredHeight;
+            refreshLayout();
+        }
+    }
+
+    public void refreshLayout() {
+        if (profile != null) {
+            profile.applyToView(ControllerItem.L, findViewById(R.id.button_l), width, height);
+            profile.applyToView(ControllerItem.R, findViewById(R.id.button_r), width, height);
+            profile.applyToView(ControllerItem.START, findViewById(R.id.button_start), width, height);
+            profile.applyToView(ControllerItem.SELECT, findViewById(R.id.button_select), width, height);
+            profile.applyToView(ControllerItem.DPAD, findViewById(R.id.dpad), width, height);
+            profile.applyToView(ControllerItem.GAMEPAD, findViewById(R.id.gamepad), width, height);
+            profile.applyToView(ControllerItem.JOYSTICK, findViewById(R.id.left_analog), width, height);
+        }
+    }
+
+    public int getCurrentWidth() {
+        return width;
+    }
+
+    public int getCurrentHeight() {
+        return height;
+    }
+
+    public class MoveElementListener implements OnTouchListener {
+        private final ControllerItem id;
+        private final View view;
+        private final Vector2 downPosition = new Vector2(0.0f, 0.0f);
+        private boolean down = false;
+
+        public MoveElementListener(ControllerItem id, View view) {
+            this.view = view;
+            this.id = id;
+            this.view.setOnTouchListener(this);
+        }
+
+        @SuppressLint("ClickableViewAccessibility")
+        @Override
+        public boolean onTouch(View v, MotionEvent event) {
+            if (!down) {
+                down = true;
+                downPosition.set(event.getX() - (view.getLayoutParams().width / 2.0f), event.getY() - (view.getLayoutParams().height / 2.0f));
+            }
+
+            int[] viewPosition = new int[2];
+            getLocationOnScreen(viewPosition);
+
+            int x = Math.max(0, Math.min(Math.round(event.getRawX() - viewPosition[0] - downPosition.x), width));
+            int y = Math.max(0, Math.min(Math.round(event.getRawY() - viewPosition[1] - downPosition.y), height));
+
+            profile.setLocation(id, x, y, width, height);
+            profile.applyToView(id, view, width, height);
+
+            if (changeListener != null) {
+                changeListener.run(id);
+            }
+
+            selectedView = view;
+
+            if (event.getAction() == MotionEvent.ACTION_UP) {
+                selectedView = null;
+                down = false;
+                invalidate();
+                return false;
+            } else {
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/ControllerProfileManager.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/ControllerProfileManager.java
new file mode 100644
index 00000000..c5b753d2
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/ControllerProfileManager.java
@@ -0,0 +1,103 @@
+package com.panda3ds.pandroid.view.controller.mapping;
+
+import android.annotation.SuppressLint;
+import android.view.Gravity;
+
+import com.panda3ds.pandroid.data.GsonConfigParser;
+import com.panda3ds.pandroid.utils.Constants;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+
+public class ControllerProfileManager {
+
+    public static final GsonConfigParser parser;
+    private static final DataModel data;
+
+    static {
+        parser = new GsonConfigParser(Constants.PREF_SCREEN_CONTROLLER_PROFILES);
+        data = parser.load(DataModel.class);
+        if (data.profiles.size() == 0) {
+            add(makeDefaultProfile());
+        }
+    }
+
+    public static void remove(String id) {
+        data.profiles.remove(id);
+        save();
+    }
+
+    public static void add(Profile profile) {
+        data.profiles.put(profile.getId(), profile);
+        save();
+    }
+
+    public static List<Profile> listAll() {
+        return new ArrayList<>(data.profiles.values());
+    }
+
+    public static int getProfileCount() {
+        return data.profiles.size();
+    }
+
+    public static Profile getDefaultProfile() {
+        if (data.profiles.containsKey(data.profileId)) {
+            return data.profiles.get(data.profileId);
+        } else if (getProfileCount() > 0) {
+            data.profileId = data.profiles.keySet().iterator().next();
+            save();
+            return getDefaultProfile();
+        } else {
+            add(makeDefaultProfile());
+            return getDefaultProfile();
+        }
+    }
+
+    private static void save() {
+        if ((!data.profiles.containsKey(data.profileId)) && getProfileCount() > 0) {
+            data.profileId = data.profiles.keySet().iterator().next();
+        }
+        parser.save(data);
+    }
+
+    public static Profile makeDefaultProfile() {
+        return new Profile(UUID.randomUUID().toString(), "Default", createDefaultLayout(), createDefaultLayout());
+    }
+
+    @SuppressLint("RtlHardcoded")
+    public static Layout createDefaultLayout() {
+        Layout layout = new Layout();
+
+        layout.setLocation(ControllerItem.L, new Location(39, 145, Gravity.LEFT, true));
+        layout.setLocation(ControllerItem.R, new Location(39, 145, Gravity.RIGHT, true));
+
+        layout.setLocation(ControllerItem.SELECT, new Location(32, 131, Gravity.LEFT, true));
+        layout.setLocation(ControllerItem.START, new Location(32, 131, Gravity.RIGHT, true));
+
+        layout.setLocation(ControllerItem.DPAD, new Location(42, 90, Gravity.LEFT, true));
+        layout.setLocation(ControllerItem.JOYSTICK, new Location(74, 45, Gravity.LEFT, true));
+        layout.setLocation(ControllerItem.GAMEPAD, new Location(42, 75, Gravity.RIGHT, true));
+
+        return layout;
+    }
+
+    public static Profile get(String profile) {
+        return data.profiles.getOrDefault(profile, null);
+    }
+
+    public static void setDefaultProfileId(String id) {
+        if (data.profiles.containsKey(id) && !Objects.equals(id, data.profileId)) {
+            data.profileId = id;
+            save();
+        }
+    }
+
+    public static class DataModel {
+        public final Map<String, Profile> profiles = new HashMap<>();
+        public String profileId;
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/Layout.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/Layout.java
new file mode 100644
index 00000000..a2e5f3ce
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/Layout.java
@@ -0,0 +1,36 @@
+package com.panda3ds.pandroid.view.controller.mapping;
+
+
+import androidx.annotation.NonNull;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+public class Layout {
+    private final Map<ControllerItem, Location> mapLocations = new HashMap<>();
+
+    public void setLocation(ControllerItem item, Location location) {
+        mapLocations.put(item, location);
+    }
+
+    @NotNull
+    public Location getLocation(ControllerItem item) {
+        if (!mapLocations.containsKey(item)) {
+            setLocation(item, new Location());
+        }
+        return Objects.requireNonNull(mapLocations.get(item));
+    }
+
+    @NonNull
+    @Override
+    public Layout clone() {
+        Layout cloned = new Layout();
+        for (ControllerItem key : mapLocations.keySet()) {
+            cloned.setLocation(key, getLocation(key).clone());
+        }
+        return cloned;
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/Location.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/Location.java
new file mode 100644
index 00000000..1d28758a
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/Location.java
@@ -0,0 +1,57 @@
+package com.panda3ds.pandroid.view.controller.mapping;
+
+import android.view.Gravity;
+
+import androidx.annotation.NonNull;
+
+public class Location {
+    private float x = 0.0f;
+    private float y = 0.0f;
+    private int gravity = Gravity.LEFT;
+    private boolean visible = false;
+
+    public Location() {}
+
+    public Location(float x, float y, int gravity, boolean visible) {
+        this.x = x;
+        this.y = y;
+        this.gravity = gravity;
+        this.visible = visible;
+    }
+
+    public int getGravity() {
+        return gravity;
+    }
+
+    public float getX() {
+        return x;
+    }
+
+    public float getY() {
+        return y;
+    }
+
+    public void setVisible(boolean visible) {
+        this.visible = visible;
+    }
+
+    public boolean isVisible() {
+        return visible;
+    }
+
+    public void setGravity(int gravity) {
+        this.gravity = gravity;
+    }
+
+    public void setPosition(float x, float y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    @NonNull
+    @Override
+    public Location clone() {
+        return new Location(x, y, gravity, visible);
+    }
+
+}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/Profile.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/Profile.java
new file mode 100644
index 00000000..b537133b
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/controller/mapping/Profile.java
@@ -0,0 +1,104 @@
+package com.panda3ds.pandroid.view.controller.mapping;
+
+import android.view.Gravity;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.app.PandroidApplication;
+
+import java.util.UUID;
+
+public class Profile {
+    private final String id;
+    private final Layout landscapeLayout;
+    private final Layout portraitLayout;
+    private String name;
+
+    public Profile(String id, String name, Layout landscape, Layout portrait) {
+        this.id = id;
+        this.name = name;
+        this.landscapeLayout = landscape;
+        this.portraitLayout = portrait;
+    }
+
+    public void applyToView(ControllerItem id, View view, int viewportWidth, int viewportHeight) {
+        float pt = view.getResources().getDimension(R.dimen.SizePt);
+
+        int width = view.getLayoutParams().width;
+        int height = view.getLayoutParams().height;
+
+        Layout layout = getLayoutBySize(viewportWidth, viewportHeight);
+
+        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(width, height);
+        Location location = layout.getLocation(id);
+
+        int x = Math.round(location.getX() * pt);
+        int y = Math.round(location.getY() * pt);
+
+        params.gravity = location.getGravity() | Gravity.BOTTOM;
+        params.bottomMargin = Math.max(Math.min(y - (height / 2), viewportHeight - height), 0);
+
+        int gravity = location.getGravity() & Gravity.HORIZONTAL_GRAVITY_MASK;
+        if (gravity == Gravity.RIGHT) {
+            params.rightMargin = Math.max(x - (width / 2), 0);
+        } else {
+            params.leftMargin = Math.max(x - (width / 2), 0);
+        }
+
+        view.setVisibility(location.isVisible() ? View.VISIBLE : View.GONE);
+        view.setLayoutParams(params);
+    }
+
+    public void setLocation(ControllerItem item, int x, int y, int viewportWidth, int viewportHeight) {
+        float pt = PandroidApplication.getAppContext().getResources().getDimension(R.dimen.SizePt);
+
+        Layout layout = getLayoutBySize(viewportWidth, viewportHeight);
+        Location location = layout.getLocation(item);
+
+        y = viewportHeight - y;
+
+        if (x < viewportWidth / 2) {
+            location.setGravity(Gravity.LEFT);
+            location.setPosition(x / pt, y / pt);
+        } else {
+            x = (viewportWidth / 2) - (x - (viewportWidth / 2));
+            location.setGravity(Gravity.RIGHT);
+            location.setPosition(x / pt, y / pt);
+        }
+    }
+
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setVisible(ControllerItem id, boolean visible) {
+        landscapeLayout.getLocation(id).setVisible(visible);
+        portraitLayout.getLocation(id).setVisible(visible);
+    }
+
+    private Layout getLayoutBySize(int width, int height) {
+        return width > height ? landscapeLayout : portraitLayout;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    @NonNull
+    @Override
+    public Profile clone() {
+        return new Profile(id, name, landscapeLayout.clone(), portraitLayout.clone());
+    }
+
+    public boolean isVisible(ControllerItem id) {
+        return landscapeLayout.getLocation(id).isVisible();
+    }
+}
diff --git a/src/pandroid/app/src/main/res/color/red_color.xml b/src/pandroid/app/src/main/res/color/red_color.xml
new file mode 100644
index 00000000..c42336f5
--- /dev/null
+++ b/src/pandroid/app/src/main/res/color/red_color.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#F00"/>
+</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/alert_dialog_background.xml b/src/pandroid/app/src/main/res/drawable/alert_dialog_background.xml
new file mode 100644
index 00000000..20a71e46
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/alert_dialog_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="20dp"/>
+            <solid android:color="?colorSurface"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/ic_add.xml b/src/pandroid/app/src/main/res/drawable/ic_add.xml
index 89633bb1..db709d0b 100644
--- a/src/pandroid/app/src/main/res/drawable/ic_add.xml
+++ b/src/pandroid/app/src/main/res/drawable/ic_add.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#000000"
+<vector android:height="24dp" android:tint="?colorOnSurface"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_delete.xml b/src/pandroid/app/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 00000000..1efcc802
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="?colorOnSurface"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_rotate_screen.xml b/src/pandroid/app/src/main/res/drawable/ic_rotate_screen.xml
new file mode 100644
index 00000000..4e95fb72
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_rotate_screen.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="?colorOnSurface"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M16.48,2.52c3.27,1.55 5.61,4.72 5.97,8.48h1.5C23.44,4.84 18.29,0 12,0l-0.66,0.03 3.81,3.81 1.33,-1.32zM10.23,1.75c-0.59,-0.59 -1.54,-0.59 -2.12,0L1.75,8.11c-0.59,0.59 -0.59,1.54 0,2.12l12.02,12.02c0.59,0.59 1.54,0.59 2.12,0l6.36,-6.36c0.59,-0.59 0.59,-1.54 0,-2.12L10.23,1.75zM14.83,21.19L2.81,9.17l6.36,-6.36 12.02,12.02 -6.36,6.36zM7.52,21.48C4.25,19.94 1.91,16.76 1.55,13L0.05,13C0.56,19.16 5.71,24 12,24l0.66,-0.03 -3.81,-3.81 -1.33,1.32z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_save.xml b/src/pandroid/app/src/main/res/drawable/ic_save.xml
new file mode 100644
index 00000000..82070aa2
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_save.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_visibility.xml b/src/pandroid/app/src/main/res/drawable/ic_visibility.xml
new file mode 100644
index 00000000..b923c39d
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_visibility.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/layout/controller_dpad.xml b/src/pandroid/app/src/main/res/layout/controller_dpad.xml
index e3320daf..b6f0f626 100644
--- a/src/pandroid/app/src/main/res/layout/controller_dpad.xml
+++ b/src/pandroid/app/src/main/res/layout/controller_dpad.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dpad"
     android:layout_width="57pt"
     android:layout_height="57pt"
     android:layout_gravity="bottom"
diff --git a/src/pandroid/app/src/main/res/layout/controller_gamepad.xml b/src/pandroid/app/src/main/res/layout/controller_gamepad.xml
index dce6a60e..b2186a9d 100644
--- a/src/pandroid/app/src/main/res/layout/controller_gamepad.xml
+++ b/src/pandroid/app/src/main/res/layout/controller_gamepad.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/gamepad"
     android:layout_width="57pt"
     android:layout_height="57pt"
     android:layout_gravity="end|bottom"
diff --git a/src/pandroid/app/src/main/res/layout/game_activity.xml b/src/pandroid/app/src/main/res/layout/game_activity.xml
index 6cd91f07..9677ac70 100644
--- a/src/pandroid/app/src/main/res/layout/game_activity.xml
+++ b/src/pandroid/app/src/main/res/layout/game_activity.xml
@@ -20,8 +20,7 @@
             android:id="@+id/overlay_controller"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:alpha="0.6"
-            android:padding="14pt">
+            android:alpha="0.6">
 
             <include layout="@layout/controller_l"/>
             <include layout="@layout/controller_r"/>
diff --git a/src/pandroid/app/src/main/res/layout/preference_controller_mapper.xml b/src/pandroid/app/src/main/res/layout/preference_controller_mapper.xml
new file mode 100644
index 00000000..daecd2b2
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/preference_controller_mapper.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <com.panda3ds.pandroid.view.controller.mapping.ControllerMapper
+        android:id="@+id/mapper"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:alpha="0.75"
+            tools:visibility="invisible">
+
+            <include layout="@layout/controller_start"/>
+            <include layout="@layout/controller_select"/>
+            <include layout="@layout/controller_joystick"/>
+            <include layout="@layout/controller_dpad"/>
+            <include layout="@layout/controller_gamepad"/>
+            <include layout="@layout/controller_r"/>
+            <include layout="@layout/controller_l"/>
+
+        </FrameLayout>
+
+    </com.panda3ds.pandroid.view.controller.mapping.ControllerMapper>
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="end|top"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="10dp">
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/save"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:src="@drawable/ic_save"
+            android:scaleType="fitCenter"
+            android:padding="8dp"
+            android:tint="?colorOnPrimary"
+            android:layout_margin="10dp"
+            android:backgroundTint="?colorPrimary"
+            android:background="@drawable/simple_card_background"/>
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/change_visibility"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:src="@drawable/ic_visibility"
+            android:scaleType="fitCenter"
+            android:padding="8dp"
+            android:tint="?colorOnPrimary"
+            android:layout_margin="10dp"
+            android:backgroundTint="?colorPrimary"
+            android:background="@drawable/simple_card_background"/>
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/delete"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:src="@drawable/ic_delete"
+            android:scaleType="fitCenter"
+            android:padding="8dp"
+            android:tint="?colorOnPrimary"
+            android:layout_margin="10dp"
+            android:backgroundTint="?colorPrimary"
+            android:background="@drawable/simple_card_background"/>
+
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/rotate"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:src="@drawable/ic_rotate_screen"
+            android:scaleType="fitCenter"
+            android:padding="8dp"
+            android:tint="?colorOnPrimary"
+            android:layout_margin="10dp"
+            android:backgroundTint="?colorPrimary"
+            android:background="@drawable/simple_card_background"/>
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
index d3966e18..18edc50f 100644
--- a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
+++ b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
@@ -27,4 +27,12 @@
     <string name="actions">Ações</string>
     <string name="exit">Sair</string>
     <string name="resume">Continuar</string>
+    <string name="saved">Salvo</string>
+    <string name="create_profile">Criar perfil</string>
+    <string name="input">Entrada</string>
+    <string name="input_summary">Altere o mapeamento de controles, disposição de controle na tela etc.</string>
+    <string name="name">Nome</string>
+    <string name="pref_screen_controllers_title">Disposições de controle</string>
+    <string name="pref_default_controller_title">Disposição de controle padrão</string>
+    <string name="invalid_name">Nome Invalido</string>
 </resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/dimens.xml b/src/pandroid/app/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..5119ce72
--- /dev/null
+++ b/src/pandroid/app/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="SizePt">1pt</dimen>
+</resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/strings.xml b/src/pandroid/app/src/main/res/values/strings.xml
index 13db9152..2f08ab71 100644
--- a/src/pandroid/app/src/main/res/values/strings.xml
+++ b/src/pandroid/app/src/main/res/values/strings.xml
@@ -17,7 +17,7 @@
     <string name="dead_zone">Dead zone</string>
     <string name="options">Options</string>
     <string name="pref_input_map_summary">Map physics controller or keyboard</string>
-    <string name="controller_mapping">Controller Mapping</string>
+    <string name="controller_mapping">Controller mapping</string>
     <string name="theme">Theme</string>
     <string name="pref_appearance_summary">Set application theme</string>
     <string name="appearance">Appearance</string>
@@ -28,4 +28,12 @@
     <string name="actions">Actions</string>
     <string name="exit">Exit</string>
     <string name="resume">Resume</string>
+    <string name="saved">Saved</string>
+    <string name="create_profile">Create profile</string>
+    <string name="input">Input</string>
+    <string name="input_summary">Change input map, screen gamepad, etc.</string>
+    <string name="name">Name</string>
+    <string name="pref_screen_controllers_title">Screen gamepad layouts</string>
+    <string name="pref_default_controller_title">Default screen gamepad layout</string>
+    <string name="invalid_name">Invalid name</string>
 </resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/themes.xml b/src/pandroid/app/src/main/res/values/themes.xml
index c7d79080..2ade7102 100644
--- a/src/pandroid/app/src/main/res/values/themes.xml
+++ b/src/pandroid/app/src/main/res/values/themes.xml
@@ -3,7 +3,25 @@
     <style name="Base.Theme.Pandroid" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your light theme here. -->
         <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
-        <item name="alertDialogTheme">@style/Theme.AppCompat.DayNight.Dialog</item>
+        <item name="alertDialogTheme">@style/AlertDialog</item>
+        <item name="preferenceTheme">@style/PreferenceTheme</item>
+    </style>
+
+    <style name="PreferenceTheme" parent="PreferenceThemeOverlay">
+        <item name="preferenceFragmentCompatStyle">@style/PreferenceStyle</item>
+    </style>
+
+    <style name="PreferenceStyle" parent="PreferenceFragment.Material">
+        <item name="android:divider">?colorSurfaceVariant</item>
+    </style>
+
+    <style name="AlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="android:windowBackground">@drawable/alert_dialog_background</item>
+        <item name="materialAlertDialogTitleTextStyle">@style/AlertDialog.Title</item>
+    </style>
+
+    <style name="AlertDialog.Title" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
+        <item name="android:textSize">32sp</item>
     </style>
 
     <style name="Theme.Pandroid" parent="Base.Theme.Pandroid" />
@@ -17,6 +35,7 @@
         <item name="titleTextColor">?colorOnSurface</item>
         <item name="hintTextColor">?colorOnSurfaceVariant</item>
         <item name="colorOnBackground">?colorOnSurface</item>
+        <item name="colorControlHighlight">?colorSurfaceVariant</item>
     </style>
 
     <style name="Theme.Pandroid.Dark" parent="Theme.Pandroid.Custom">
diff --git a/src/pandroid/app/src/main/res/xml/input_preference.xml b/src/pandroid/app/src/main/res/xml/input_preference.xml
new file mode 100644
index 00000000..8f91ab40
--- /dev/null
+++ b/src/pandroid/app/src/main/res/xml/input_preference.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <Preference
+        android:key="inputMap"
+        android:title="@string/controller_mapping"
+        android:summary="@string/pref_input_map_summary"
+        app:iconSpaceReserved="false"/>
+
+    <Preference
+        android:key="defaultControllerProfile"
+        app:iconSpaceReserved="false"
+        android:title="@string/pref_default_controller_title"
+        android:summary="-"/>
+
+    <PreferenceCategory
+        android:key="gamepadProfileList"
+        android:title="@string/pref_screen_controllers_title"
+        app:iconSpaceReserved="false">
+
+        <Preference
+            android:key="createProfile"
+            app:icon="@drawable/ic_add"
+            app:title="@string/create_profile"
+            app:allowDividerBelow="true"
+            app:allowDividerAbove="true"/>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/xml/start_preferences.xml b/src/pandroid/app/src/main/res/xml/start_preferences.xml
index 57a6d32c..878aa920 100644
--- a/src/pandroid/app/src/main/res/xml/start_preferences.xml
+++ b/src/pandroid/app/src/main/res/xml/start_preferences.xml
@@ -10,10 +10,10 @@
         app:layout="@layout/preference_simple_about"/>
 
     <Preference
-        app:key="inputMap"
+        app:key="input"
         app:icon="@drawable/ic_key_a"
-        app:title="@string/controller_mapping"
-        app:summary="@string/pref_input_map_summary"
+        app:title="@string/input"
+        app:summary="@string/input_summary"
         app:layout="@layout/preference_start_item"/>
 
     <Preference

From 745da35324e7fcf77ff6f346620527f9a6b388a7 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Thu, 4 Jan 2024 03:19:31 +0200
Subject: [PATCH 109/162] Fix cmp in x64 shader JIT

---
 src/core/PICA/dynapica/shader_rec_emitter_x64.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp b/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp
index 046c7813..65b73e30 100644
--- a/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp
+++ b/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp
@@ -403,11 +403,18 @@ void ShaderEmitter::checkCmpRegister(const PICAShader& shader, u32 instruction)
 	switch (condition) {
 		case 0: // Either cmp register matches 
 			// Z flag is 0 if at least 1 of them is set
-			test(word[statePointer + cmpRegXOffset], refX_refY_merged);
 
-			// Invert z flag
-			setz(al);
-			test(al, al);
+			// Check if X matches
+			cmp(byte[statePointer + cmpRegXOffset], refX);
+			sete(al);
+
+			// Or if Y matches
+			cmp(byte[statePointer + cmpRegYOffset], refY);
+			sete(cl);
+			or_(al, cl);
+
+			// If either of them matches, set Z to 1, else set it to 0
+			xor_(al, 1);
 			break;
 		case 1: // Both cmp registers match
 			cmp(word[statePointer + cmpRegXOffset], refX_refY_merged);

From 5e2930a81b8f8d8dd2f1d4a209ae24155a5b19a5 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Thu, 4 Jan 2024 11:44:50 +0200
Subject: [PATCH 110/162] [Android] Fix English localization

---
 src/pandroid/app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pandroid/app/src/main/res/values/strings.xml b/src/pandroid/app/src/main/res/values/strings.xml
index 2f08ab71..b765bedc 100644
--- a/src/pandroid/app/src/main/res/values/strings.xml
+++ b/src/pandroid/app/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="axis">Axis</string>
     <string name="dead_zone">Dead zone</string>
     <string name="options">Options</string>
-    <string name="pref_input_map_summary">Map physics controller or keyboard</string>
+    <string name="pref_input_map_summary">Map physical ontroller or keyboard</string>
     <string name="controller_mapping">Controller mapping</string>
     <string name="theme">Theme</string>
     <string name="pref_appearance_summary">Set application theme</string>
@@ -36,4 +36,4 @@
     <string name="pref_screen_controllers_title">Screen gamepad layouts</string>
     <string name="pref_default_controller_title">Default screen gamepad layout</string>
     <string name="invalid_name">Invalid name</string>
-</resources>
\ No newline at end of file
+</resources>

From fe7cb3f4af72a6c6a0d00edf9a6b2251f895d00a Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Thu, 4 Jan 2024 12:08:31 +0200
Subject: [PATCH 111/162] Spelling is hard

---
 src/pandroid/app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pandroid/app/src/main/res/values/strings.xml b/src/pandroid/app/src/main/res/values/strings.xml
index b765bedc..f8e2098a 100644
--- a/src/pandroid/app/src/main/res/values/strings.xml
+++ b/src/pandroid/app/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="axis">Axis</string>
     <string name="dead_zone">Dead zone</string>
     <string name="options">Options</string>
-    <string name="pref_input_map_summary">Map physical ontroller or keyboard</string>
+    <string name="pref_input_map_summary">Map physical controller or keyboard</string>
     <string name="controller_mapping">Controller mapping</string>
     <string name="theme">Theme</string>
     <string name="pref_appearance_summary">Set application theme</string>

From 9a5dc71027cb812daa36e4b4d3002c7665339e6e Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Thu, 4 Jan 2024 15:19:28 +0200
Subject: [PATCH 112/162] Set ENABLE_USER_BUILD to ON for Android

---
 .github/workflows/Android_Build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Android_Build.yml b/.github/workflows/Android_Build.yml
index cc2da2bb..7625e18d 100644
--- a/.github/workflows/Android_Build.yml
+++ b/.github/workflows/Android_Build.yml
@@ -33,7 +33,7 @@ jobs:
         java-version: '17'
 
     - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DBUILD_HYDRA_CORE=1 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=x86_64 -DENABLE_VULKAN=0
+      run: cmake -B ${{github.workspace}}/build -DBUILD_HYDRA_CORE=1 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=x86_64 -DENABLE_VULKAN=0 -DENABLE_USER_BUILD=ON
 
     - name: Build
       run: |
@@ -72,7 +72,7 @@ jobs:
         java-version: '17'
 
     - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DBUILD_HYDRA_CORE=1 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DENABLE_VULKAN=0 -DCMAKE_CXX_FLAGS="-march=armv8-a+crypto"
+      run: cmake -B ${{github.workspace}}/build -DBUILD_HYDRA_CORE=1 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DENABLE_VULKAN=0 -DENABLE_USER_BUILD=ON -DCMAKE_CXX_FLAGS="-march=armv8-a+crypto"
 
     - name: Build
       run: |

From 6c2e0be07d6b6f392dc097b2397dbad305762aaa Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Thu, 4 Jan 2024 23:25:46 +0200
Subject: [PATCH 113/162] [arm64 shader JIT] Booting OoT now

---
 .../dynapica/shader_rec_emitter_arm64.hpp     |   2 -
 .../dynapica/shader_rec_emitter_arm64.cpp     | 426 +++++++++++++++++-
 .../PICA/dynapica/shader_rec_emitter_x64.cpp  |   4 +-
 3 files changed, 406 insertions(+), 26 deletions(-)

diff --git a/include/PICA/dynapica/shader_rec_emitter_arm64.hpp b/include/PICA/dynapica/shader_rec_emitter_arm64.hpp
index 671ae120..bb716d91 100644
--- a/include/PICA/dynapica/shader_rec_emitter_arm64.hpp
+++ b/include/PICA/dynapica/shader_rec_emitter_arm64.hpp
@@ -30,8 +30,6 @@ class ShaderEmitter : private oaknut::CodeBlock, public oaknut::CodeGenerator {
 	// An array of 128-bit masks for blending registers together to perform masked writes.
 	// Eg for writing only the x and y components, the mask is 0x00000000'00000000'FFFFFFFF'FFFF
 	oaknut::Label blendMasks;
-	// Vector value of (1.0, 1.0, 1.0, 1.0) for SLT(i)/SGE(i)
-	oaknut::Label onesVector;
 
 	u32 recompilerPC = 0;  // PC the recompiler is currently recompiling @
 	u32 loopLevel = 0;     // The current loop nesting level (0 = not in a loop)
diff --git a/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp b/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
index 43121d86..192deb43 100644
--- a/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
+++ b/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
@@ -14,6 +14,7 @@ static constexpr QReg scratch2 = Q1;
 static constexpr QReg src1_vec = Q2;
 static constexpr QReg src2_vec = Q3;
 static constexpr QReg src3_vec = Q4;
+static constexpr QReg onesVector = Q5;
 
 static constexpr XReg arg1 = X0;
 static constexpr XReg arg2 = X1;
@@ -43,6 +44,15 @@ void ShaderEmitter::compile(const PICAShader& shaderUnit) {
 	// Set state pointer to the proper pointer
 	// state pointer is volatile, no need to preserve it
 	MOV(statePointer, arg1);
+	// Generate a vector of all 1.0s for SLT/SGE/RCP/RSQ
+	FMOV(onesVector.S4(), FImm8(0x70));
+
+	// Push a return guard on the stack. This happens due to the way we handle the PICA callstack, by pushing the return PC to stack
+	// By pushing -1, we make it impossible for a return check to erroneously pass
+	MOV(arg1, 0xffffffffffffffffll);
+	// Backup link register (X30) and push return guard
+	STP(arg1, X30, SP, PRE_INDEXED, -16);
+
 	// Jump to code with a tail call
 	BR(arg2);
 
@@ -100,7 +110,15 @@ void ShaderEmitter::compileInstruction(const PICAShader& shaderUnit) {
 
 	// See if PC is a possible return PC and emit the proper code if so
 	if (std::binary_search(returnPCs.begin(), returnPCs.end(), recompilerPC)) {
-		Helpers::panic("Unimplemented return address for call instruction");
+		Label skipReturn;
+
+		LDP(X0, XZR, SP);       // W0 = Next return address
+		MOV(W1, recompilerPC);  // W1 = Current PC
+		CMP(W0, W1);            // If they're equal, execute a RET, otherwise skip it
+		B(NE, skipReturn);
+		RET();
+
+		l(skipReturn);
 	}
 
 	// Fetch instruction and inc PC
@@ -109,11 +127,11 @@ void ShaderEmitter::compileInstruction(const PICAShader& shaderUnit) {
 
 	switch (opcode) {
 		case ShaderOpcodes::ADD: recADD(shaderUnit, instruction); break;
-		// case ShaderOpcodes::CALL: recCALL(shaderUnit, instruction); break;
+		case ShaderOpcodes::CALL: recCALL(shaderUnit, instruction); break;
 		// case ShaderOpcodes::CALLC: recCALLC(shaderUnit, instruction); break;
 		// case ShaderOpcodes::CALLU: recCALLU(shaderUnit, instruction); break;
-		// case ShaderOpcodes::CMP1:
-		// case ShaderOpcodes::CMP2: recCMP(shaderUnit, instruction); break;
+		case ShaderOpcodes::CMP1:
+		case ShaderOpcodes::CMP2: recCMP(shaderUnit, instruction); break;
 		case ShaderOpcodes::DP3: recDP3(shaderUnit, instruction); break;
 		case ShaderOpcodes::DP4: recDP4(shaderUnit, instruction); break;
 		// case ShaderOpcodes::DPH:
@@ -121,19 +139,19 @@ void ShaderEmitter::compileInstruction(const PICAShader& shaderUnit) {
 		case ShaderOpcodes::END: recEND(shaderUnit, instruction); break;
 		// case ShaderOpcodes::EX2: recEX2(shaderUnit, instruction); break;
 		// case ShaderOpcodes::FLR: recFLR(shaderUnit, instruction); break;
-		// case ShaderOpcodes::IFC: recIFC(shaderUnit, instruction); break;
-		// case ShaderOpcodes::IFU: recIFU(shaderUnit, instruction); break;
-		// case ShaderOpcodes::JMPC: recJMPC(shaderUnit, instruction); break;
+		case ShaderOpcodes::IFC: recIFC(shaderUnit, instruction); break;
+		case ShaderOpcodes::IFU: recIFU(shaderUnit, instruction); break;
+		case ShaderOpcodes::JMPC: recJMPC(shaderUnit, instruction); break;
 		// case ShaderOpcodes::JMPU: recJMPU(shaderUnit, instruction); break;
 		// case ShaderOpcodes::LG2: recLG2(shaderUnit, instruction); break;
 		// case ShaderOpcodes::LOOP: recLOOP(shaderUnit, instruction); break;
 		case ShaderOpcodes::MOV: recMOV(shaderUnit, instruction); break;
-		// case ShaderOpcodes::MOVA: recMOVA(shaderUnit, instruction); break;
+		case ShaderOpcodes::MOVA: recMOVA(shaderUnit, instruction); break;
 		case ShaderOpcodes::MAX: recMAX(shaderUnit, instruction); break;
 		case ShaderOpcodes::MIN: recMIN(shaderUnit, instruction); break;
 		case ShaderOpcodes::MUL: recMUL(shaderUnit, instruction); break;
 		case ShaderOpcodes::NOP: break;
-		// case ShaderOpcodes::RCP: recRCP(shaderUnit, instruction); break;
+		case ShaderOpcodes::RCP: recRCP(shaderUnit, instruction); break;
 		case ShaderOpcodes::RSQ: recRSQ(shaderUnit, instruction); break;
 
 		// Unimplemented opcodes that don't seem to actually be used but exist in the binary
@@ -216,6 +234,8 @@ void ShaderEmitter::loadRegister(QReg dest, const PICAShader& shader, u32 src, u
 		compSwizzle = getBits<23, 8>(operandDescriptor);
 	}
 
+	// TODO: Do indexes get applied if src < 0x20?
+
 	switch (index) {
 		case 0:
 			[[likely]] {  // Keep src as is, no need to offset it
@@ -228,8 +248,39 @@ void ShaderEmitter::loadRegister(QReg dest, const PICAShader& shader, u32 src, u
 					case 0x0: DUP(dest.S4(), dest.Selem()[0]); break;   // .xxxx
 					case 0x55: DUP(dest.S4(), dest.Selem()[1]); break;  // .yyyy
 					case 0xAA: DUP(dest.S4(), dest.Selem()[2]); break;  // .zzzz
-					case 0xFF: DUP(dest.S4(), dest.Selem()[3]); break;  // .wwww
-					default: Helpers::panic("Unimplemented swizzle pattern for loading");
+					case 0xFF:
+						DUP(dest.S4(), dest.Selem()[3]);
+						break;  // .wwww
+
+					// Some of these cases may still be optimizable
+					default: {
+						MOV(scratch1.B16(), dest.B16());  // Make a copy of the register
+
+						const auto newX = getBits<6, 2>(compSwizzle);
+						const auto newY = getBits<4, 2>(compSwizzle);
+						const auto newZ = getBits<2, 2>(compSwizzle);
+						const auto newW = getBits<0, 2>(compSwizzle);
+
+						// If the lane swizzled into the new x component is NOT the current x component, swizzle the correct lane with a mov
+						// Repeat for each component of the vector
+						if (newX != 0) {
+							MOV(dest.Selem()[0], scratch1.Selem()[newX]);
+						}
+
+						if (newY != 1) {
+							MOV(dest.Selem()[1], scratch1.Selem()[newY]);
+						}
+
+						if (newZ != 2) {
+							MOV(dest.Selem()[2], scratch1.Selem()[newZ]);
+						}
+
+						if (newW != 3) {
+							MOV(dest.Selem()[3], scratch1.Selem()[newW]);
+						}
+
+						break;
+					}
 				}
 
 				// Negate the register if necessary
@@ -239,10 +290,117 @@ void ShaderEmitter::loadRegister(QReg dest, const PICAShader& shader, u32 src, u
 				return;  // Return. Rest of the function handles indexing which is not used if index == 0
 			}
 
+		case 1: {
+			const uintptr_t addrXOffset = uintptr_t(&shader.addrRegister[0]) - uintptr_t(&shader);
+			LDRSW(X0, statePointer, addrXOffset);  // X0 = address register X
+			break;
+		}
+
+		case 2: {
+			const uintptr_t addrYOffset = uintptr_t(&shader.addrRegister[1]) - uintptr_t(&shader);
+			LDRSW(X0, statePointer, addrYOffset);  // X0 = address register Y
+			break;
+		}
+
+		case 3: {
+			const uintptr_t loopCounterOffset = uintptr_t(&shader.loopCounter) - uintptr_t(&shader);
+			LDR(W0, statePointer, loopCounterOffset);  // X0 = loop counter
+			break;
+		}
+
 		default: Helpers::panic("[ShaderJIT]: Unimplemented source index type %d", index);
 	}
 
-	Helpers::panic("Unimplemented indexed register load");
+	// Swizzle and load register into dest, from [state pointer + X1 + offset] and apply the relevant swizzle. Thrashes X2
+	auto swizzleAndLoadReg = [this, &dest, &compSwizzle](size_t offset) {
+		MOV(X2, offset);
+		ADD(X1, X1, X2);
+		LDR(dest, statePointer, X1);
+
+		switch (compSwizzle) {
+			case noSwizzle: break;                              // .xyzw
+			case 0x0: DUP(dest.S4(), dest.Selem()[0]); break;   // .xxxx
+			case 0x55: DUP(dest.S4(), dest.Selem()[1]); break;  // .yyyy
+			case 0xAA: DUP(dest.S4(), dest.Selem()[2]); break;  // .zzzz
+			case 0xFF:
+				DUP(dest.S4(), dest.Selem()[3]);
+				break;  // .wwww
+
+			// Some of these cases may still be optimizable
+			default: {
+				MOV(scratch1.B16(), dest.B16());  // Make a copy of the register
+
+				const auto newX = getBits<6, 2>(compSwizzle);
+				const auto newY = getBits<4, 2>(compSwizzle);
+				const auto newZ = getBits<2, 2>(compSwizzle);
+				const auto newW = getBits<0, 2>(compSwizzle);
+
+				// If the lane swizzled into the new x component is NOT the current x component, swizzle the correct lane with a mov
+				// Repeat for each component of the vector
+				if (newX != 0) {
+					MOV(dest.Selem()[0], scratch1.Selem()[newX]);
+				}
+
+				if (newY != 1) {
+					MOV(dest.Selem()[1], scratch1.Selem()[newY]);
+				}
+
+				if (newZ != 2) {
+					MOV(dest.Selem()[2], scratch1.Selem()[newZ]);
+				}
+
+				if (newW != 3) {
+					MOV(dest.Selem()[3], scratch1.Selem()[newW]);
+				}
+
+				break;
+			}
+		}
+	};
+
+	// Here we handle what happens when using indexed addressing & we can't predict what register will be read at compile time
+	// The index of the access is assumed to be in X0
+	// Add source register (src) and index (X0) to form the final register
+	ADD(X0, X0, src);
+
+	Label maybeTemp, maybeUniform, unknownReg, end;
+	const uintptr_t inputOffset = uintptr_t(&shader.inputs[0]) - uintptr_t(&shader);
+	const uintptr_t tempOffset = uintptr_t(&shader.tempRegisters[0]) - uintptr_t(&shader);
+	const uintptr_t uniformOffset = uintptr_t(&shader.floatUniforms[0]) - uintptr_t(&shader);
+
+	// If reg < 0x10, return inputRegisters[reg]
+	CMP(X0, 0x10);
+	B(HS, maybeTemp);
+	LSL(X1, X0, 4);
+	swizzleAndLoadReg(inputOffset);
+	B(end);
+
+	// If (reg < 0x1F) return tempRegisters[reg - 0x10]
+	l(maybeTemp);
+	CMP(X0, 0x20);
+	B(HS, maybeUniform);
+	SUB(X1, X0, 0x10);
+	LSL(X1, X1, 4);
+	swizzleAndLoadReg(tempOffset);
+	B(end);
+
+	// If (reg < 0x80) return floatUniforms[reg - 0x20]
+	l(maybeUniform);
+	CMP(X0, 0x80);
+	B(HS, unknownReg);
+	SUB(X1, X0, 0x20);
+	LSL(X1, X1, 4);
+	swizzleAndLoadReg(uniformOffset);
+	B(end);
+
+	l(unknownReg);
+	MOVI(dest.S4(), 0);  // Set dest to 0 if we're reading from a garbage register
+
+	l(end);
+	// Negate the register if necessary
+	if (negate) {
+		FNEG(dest.S4(), dest.S4());
+	}
 }
 
 void ShaderEmitter::storeRegister(QReg source, const PICAShader& shader, u32 dest, u32 operandDescriptor) {
@@ -262,6 +420,45 @@ void ShaderEmitter::storeRegister(QReg source, const PICAShader& shader, u32 des
 	}
 }
 
+void ShaderEmitter::recMOV(const PICAShader& shader, u32 instruction) {
+	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
+	const u32 src = getBits<12, 7>(instruction);
+	const u32 idx = getBits<19, 2>(instruction);
+	const u32 dest = getBits<21, 5>(instruction);
+
+	loadRegister<1>(src1_vec, shader, src, idx, operandDescriptor);  // Load source 1 into scratch1
+	storeRegister(src1_vec, shader, dest, operandDescriptor);
+}
+
+void ShaderEmitter::recMOVA(const PICAShader& shader, u32 instruction) {
+	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
+	const u32 src = getBits<12, 7>(instruction);
+	const u32 idx = getBits<19, 2>(instruction);
+
+	const bool writeX = getBit<3>(operandDescriptor);  // Should we write the x component of the address register?
+	const bool writeY = getBit<2>(operandDescriptor);
+
+	static_assert(sizeof(shader.addrRegister) == 2 * sizeof(s32));  // Assert that the address register is 2 s32s
+	const uintptr_t addrRegisterOffset = uintptr_t(&shader.addrRegister[0]) - uintptr_t(&shader);
+	const uintptr_t addrRegisterYOffset = addrRegisterOffset + sizeof(shader.addrRegister[0]);
+
+	// If no register is being written to then it is a nop. Probably not common but whatever
+	if (!writeX && !writeY) return;
+
+	loadRegister<1>(src1_vec, shader, src, idx, operandDescriptor);
+	FCVTZS(src1_vec.S4(), src1_vec.S4());  // Convert src1 from floats to s32s with truncation
+
+	// Write both together
+	if (writeX && writeY) {
+		STR(src1_vec.toD(), statePointer, addrRegisterOffset);
+	} else if (writeX) {
+		STR(src1_vec.toS(), statePointer, addrRegisterOffset);
+	} else if (writeY) {
+		MOV(W0, src1_vec.Selem()[1]);  // W0 = Y component
+		STR(W0, statePointer, addrRegisterYOffset);
+	}
+}
+
 void ShaderEmitter::recDP3(const PICAShader& shader, u32 instruction) {
 	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
 	const u32 src1 = getBits<12, 7>(instruction);
@@ -364,13 +561,32 @@ void ShaderEmitter::recMUL(const PICAShader& shader, u32 instruction) {
 	storeRegister(src1_vec, shader, dest, operandDescriptor);
 }
 
+void ShaderEmitter::recRCP(const PICAShader& shader, u32 instruction) {
+	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
+	const u32 src = getBits<12, 7>(instruction);
+	const u32 idx = getBits<19, 2>(instruction);
+	const u32 dest = getBits<21, 5>(instruction);
+	const u32 writeMask = operandDescriptor & 0xf;
+
+	loadRegister<1>(src1_vec, shader, src, idx, operandDescriptor);  // Load source 1 into scratch1
+	FDIV(src1_vec.toS(), onesVector.toS(), src1_vec.toS());          // src1 = 1.0 / src1
+
+	// If we only write back the x component to the result, we needn't perform a shuffle to do res = res.xxxx
+	// Otherwise we do
+	if (writeMask != 0x8) {                       // Copy bottom lane to all lanes if we're not simply writing back x
+		DUP(src1_vec.S4(), src1_vec.Selem()[0]);  // src1_vec = src1_vec.xxxx
+	}
+
+	storeRegister(src1_vec, shader, dest, operandDescriptor);
+}
+
 void ShaderEmitter::recRSQ(const PICAShader& shader, u32 instruction) {
 	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
 	const u32 src = getBits<12, 7>(instruction);
 	const u32 idx = getBits<19, 2>(instruction);
 	const u32 dest = getBits<21, 5>(instruction);
 	const u32 writeMask = operandDescriptor & 0xf;
-	constexpr bool useAccurateRSQ = false;
+	constexpr bool useAccurateRSQ = true;
 
 	loadRegister<1>(src1_vec, shader, src, idx, operandDescriptor);  // Load source 1 into scratch1
 
@@ -378,11 +594,10 @@ void ShaderEmitter::recRSQ(const PICAShader& shader, u32 instruction) {
 	// TODO: Should this use frsqte or fsqrt+div? The former is faster but less accurate
 	// PICA RSQ uses f24 precision though, so it'll be inherently innacurate, and it's likely using an inaccurate approximation too, seeing as
 	// It doesn't have regular sqrt/div instructions.
-	// For now, we default to inaccurate inverse square root
+	// For now, we default to accurate inverse square root
 	if constexpr (useAccurateRSQ) {
-		FMOV(scratch1.S4(), FImm8(0x70));                      // scratch1 = vec4(1.0f)
-		FSQRT(src1_vec.toS(), src1_vec.toS());                 // src1 = sqrt(src1), scalar
-		FDIV(src1_vec.toS(), scratch1.toS(), src1_vec.toS());  // Now invert src1
+		FSQRT(src1_vec.toS(), src1_vec.toS());                   // src1 = sqrt(src1), scalar
+		FDIV(src1_vec.toS(), onesVector.toS(), src1_vec.toS());  // Now invert src1
 	} else {
 		FRSQRTE(src1_vec.toS(), src1_vec.toS());  // Much nicer
 	}
@@ -415,16 +630,181 @@ void ShaderEmitter::recMAD(const PICAShader& shader, u32 instruction) {
 	storeRegister(src3_vec, shader, dest, operandDescriptor);
 }
 
-void ShaderEmitter::recMOV(const PICAShader& shader, u32 instruction) {
+void ShaderEmitter::recCMP(const PICAShader& shader, u32 instruction) {
 	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
-	const u32 src = getBits<12, 7>(instruction);
+	const u32 src1 = getBits<12, 7>(instruction);
+	const u32 src2 = getBits<7, 5>(instruction);  // src2 coming first because PICA moment
 	const u32 idx = getBits<19, 2>(instruction);
-	const u32 dest = getBits<21, 5>(instruction);
+	const u32 cmpY = getBits<21, 3>(instruction);
+	const u32 cmpX = getBits<24, 3>(instruction);
 
-	loadRegister<1>(src1_vec, shader, src, idx, operandDescriptor);  // Load source 1 into scratch1
-	storeRegister(src1_vec, shader, dest, operandDescriptor);
+	loadRegister<1>(src1_vec, shader, src1, idx, operandDescriptor);
+	loadRegister<2>(src2_vec, shader, src2, 0, operandDescriptor);
+
+	// Map from PICA condition codes (used as index) to x86 condition codes
+	// We treat invalid condition codes as "always" as suggested by 3DBrew
+	static constexpr std::array<oaknut::Cond, 8> conditionCodes = {
+		oaknut::util::EQ, oaknut::util::NE, oaknut::util::LT, oaknut::util::LE,
+		oaknut::util::GT, oaknut::util::GE, oaknut::util::AL, oaknut::util::AL,
+	};
+
+	static_assert(sizeof(shader.cmpRegister[0]) == 1 && sizeof(shader.cmpRegister) == 2);  // The code below relies on bool being 1 byte exactly
+	const size_t cmpRegXOffset = uintptr_t(&shader.cmpRegister[0]) - uintptr_t(&shader);
+
+	// NEON doesn't have SIMD comparisons to do fun stuff with like on x64
+	FCMP(src1_vec.toS(), src2_vec.toS());
+	CSET(W0, conditionCodes[cmpX]);
+
+	// Compare Y components, which annoyingly enough can't be done without moving
+	MOV(scratch1.toS(), src1_vec.Selem()[1]);
+	MOV(scratch2.toS(), src2_vec.Selem()[1]);
+	FCMP(scratch1.toS(), scratch2.toS());
+	CSET(W1, conditionCodes[cmpY]);
+
+	// Merge the booleans and write them back in one STRh
+	ORR(W0, W0, W1, LogShift::LSL, 8);
+	STRH(W0, statePointer, cmpRegXOffset);
 }
 
-void ShaderEmitter::recEND(const PICAShader& shader, u32 instruction) { RET(); }
+void ShaderEmitter::checkBoolUniform(const PICAShader& shader, u32 instruction) {
+	const u32 bit = getBits<22, 4>(instruction);  // Bit of the bool uniform to check
+	const uintptr_t boolUniformOffset = uintptr_t(&shader.boolUniform) - uintptr_t(&shader);
+
+	LDRH(W0, statePointer, boolUniformOffset);  // Load bool uniform into w0
+	TST(W0, 1 << bit);                          // Check if bit is set
+}
+
+void ShaderEmitter::checkCmpRegister(const PICAShader& shader, u32 instruction) {
+	static_assert(sizeof(bool) == 1 && sizeof(shader.cmpRegister) == 2);  // The code below relies on bool being 1 byte exactly
+	const size_t cmpRegXOffset = uintptr_t(&shader.cmpRegister[0]) - uintptr_t(&shader);
+	const size_t cmpRegYOffset = cmpRegXOffset + sizeof(bool);
+
+	const u32 condition = getBits<22, 2>(instruction);
+	const uint refY = getBit<24>(instruction);
+	const uint refX = getBit<25>(instruction);
+
+	// refX in the bottom byte, refY in the top byte. This is done for condition codes 0 and 1 which check both x and y, so we can emit a single
+	// instruction that checks both
+	const u16 refX_refY_merged = refX | (refY << 8);
+
+	switch (condition) {
+		case 0:  // Either cmp register matches
+			LDRB(W0, statePointer, cmpRegXOffset);
+			LDRB(W1, statePointer, cmpRegYOffset);
+
+			// Check if x matches refX
+			CMP(W0, refX);
+			CSET(W0, EQ);
+
+			// Check if y matches refY
+			CMP(W1, refY);
+			CSET(W1, EQ);
+
+			// Set Z to 1 if at least one of them matches
+			ORR(W0, W0, W1);
+			CMP(W0, 1);
+			break;
+		case 1:  // Both cmp registers match
+			LDRH(W0, statePointer, cmpRegXOffset);
+
+			// If ref fits in 8 bits, use a single CMP, otherwise move into register and then CMP
+			if (refX_refY_merged <= 0xff) {
+				CMP(W0, refX_refY_merged);
+			} else {
+				MOV(W1, refX_refY_merged);
+				CMP(W0, W1);
+			}
+			break;
+		case 2:  // At least cmp.x matches
+			LDRB(W0, statePointer, cmpRegXOffset);
+			CMP(W0, refX);
+			break;
+		default:  // At least cmp.y matches
+			LDRB(W0, statePointer, cmpRegYOffset);
+			CMP(W0, refY);
+			break;
+	}
+}
+
+void ShaderEmitter::recCALL(const PICAShader& shader, u32 instruction) {
+	const u32 num = instruction & 0xff;
+	const u32 dest = getBits<10, 12>(instruction);
+
+	// Push return PC as stack parameter. This is a decently fast solution and Citra does the same but we should probably switch to a proper PICA-like
+	// Callstack, because it's not great to have an infinitely expanding call stack
+	MOV(X0, dest + num);
+	// Push return PC + current link register so that we'll be able to return later
+	STP(X0, X30, SP, PRE_INDEXED, -16);
+	// Call subroutine, Oaknut will update the label if it hasn't been initialized yet
+	BL(instructionLabels[dest]);
+
+	// Fetch original LR and return. This also restores SP to its original value, discarding the return guard into XZR
+	LDP(XZR, X30, SP, POST_INDEXED, 16);
+}
+
+void ShaderEmitter::recIFC(const PICAShader& shader, u32 instruction) {
+	// z is 1 if true, else 0
+	checkCmpRegister(shader, instruction);
+	const u32 num = instruction & 0xff;
+	const u32 dest = getBits<10, 12>(instruction);
+
+	if (dest < recompilerPC) {
+		Helpers::warn("Shader JIT: IFC instruction with dest < current PC\n");
+	}
+	Label elseBlock, endIf;
+
+	// Jump to else block if z is 0
+	B(NE, elseBlock);
+	compileUntil(shader, dest);
+
+	if (num == 0) {  // Else block is empty,
+		l(elseBlock);
+	} else {       // Else block is NOT empty
+		B(endIf);  // Skip executing the else branch if the if branch was ran
+		l(elseBlock);
+		compileUntil(shader, dest + num);
+		l(endIf);
+	}
+}
+
+void ShaderEmitter::recIFU(const PICAShader& shader, u32 instruction) {
+	// z is 0 if true, else 1
+	checkBoolUniform(shader, instruction);
+	const u32 num = instruction & 0xff;
+	const u32 dest = getBits<10, 12>(instruction);
+
+	if (dest < recompilerPC) {
+		Helpers::warn("Shader JIT: IFC instruction with dest < current PC\n");
+	}
+	Label elseBlock, endIf;
+
+	// Jump to else block if z is 1
+	B(EQ, elseBlock);
+	compileUntil(shader, dest);
+
+	if (num == 0) {  // Else block is empty,
+		l(elseBlock);
+	} else {       // Else block is NOT empty
+		B(endIf);  // Skip executing the else branch if the if branch was ran
+		l(elseBlock);
+		compileUntil(shader, dest + num);
+		l(endIf);
+	}
+}
+
+void ShaderEmitter::recJMPC(const PICAShader& shader, u32 instruction) {
+	const u32 dest = getBits<10, 12>(instruction);
+
+	Label& l = instructionLabels[dest];
+	// Z is 1 if the comparison is true
+	checkCmpRegister(shader, instruction);
+	B(EQ, l);
+}
+
+void ShaderEmitter::recEND(const PICAShader& shader, u32 instruction) {
+	// Fetch original LR and return. This also restores SP to its original value, discarding the return guard into XZR
+	LDP(XZR, X30, SP, POST_INDEXED, 16);
+	RET();
+}
 
 #endif
\ No newline at end of file
diff --git a/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp b/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp
index f3dae7b7..ebe6e7af 100644
--- a/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp
+++ b/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp
@@ -235,6 +235,8 @@ void ShaderEmitter::loadRegister(Xmm dest, const PICAShader& shader, u32 src, u3
 		compSwizzle = getBits<23, 8>(operandDescriptor);
 	}
 
+	// TODO: Do indexes get applied if src < 0x20?
+
 	// PICA has the swizzle descriptor inverted in comparison to x86. For the PICA, the descriptor is (lowest to highest bits) wzyx while it's xyzw for x86
 	u32 convertedSwizzle = ((compSwizzle >> 6) & 0b11) | (((compSwizzle >> 4) & 0b11) << 2) | (((compSwizzle >> 2) & 0b11) << 4) | ((compSwizzle & 0b11) << 6);
 
@@ -838,7 +840,7 @@ void ShaderEmitter::recCALL(const PICAShader& shader, u32 instruction) {
 	const u32 dest = getBits<10, 12>(instruction);
 
 	// Push return PC as stack parameter. This is a decently fast solution and Citra does the same but we should probably switch to a proper PICA-like
-	// Callstack, because it's not great to have an infinitely expanding call stack where popping from empty stack is undefined as hell
+	// Callstack, because it's not great to have an infinitely expanding call stack where popping from empty stack is undefined
 	push(qword, dest + num);
 	// Call subroutine, Xbyak will update the label if it hasn't been initialized yet
 	call(instructionLabels[dest]);

From aaef3b66f94ec889632a3be5fb477dd52a9a9ed1 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 9 Jan 2024 23:50:57 +0200
Subject: [PATCH 114/162] Moar arm64 shader ops

---
 .../dynapica/shader_rec_emitter_arm64.cpp     | 177 ++++++++++++++++--
 1 file changed, 157 insertions(+), 20 deletions(-)

diff --git a/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp b/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
index 192deb43..e2ff59f5 100644
--- a/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
+++ b/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
@@ -128,8 +128,8 @@ void ShaderEmitter::compileInstruction(const PICAShader& shaderUnit) {
 	switch (opcode) {
 		case ShaderOpcodes::ADD: recADD(shaderUnit, instruction); break;
 		case ShaderOpcodes::CALL: recCALL(shaderUnit, instruction); break;
-		// case ShaderOpcodes::CALLC: recCALLC(shaderUnit, instruction); break;
-		// case ShaderOpcodes::CALLU: recCALLU(shaderUnit, instruction); break;
+		case ShaderOpcodes::CALLC: recCALLC(shaderUnit, instruction); break;
+		case ShaderOpcodes::CALLU: recCALLU(shaderUnit, instruction); break;
 		case ShaderOpcodes::CMP1:
 		case ShaderOpcodes::CMP2: recCMP(shaderUnit, instruction); break;
 		case ShaderOpcodes::DP3: recDP3(shaderUnit, instruction); break;
@@ -138,13 +138,13 @@ void ShaderEmitter::compileInstruction(const PICAShader& shaderUnit) {
 		// case ShaderOpcodes::DPHI: recDPH(shaderUnit, instruction); break;
 		case ShaderOpcodes::END: recEND(shaderUnit, instruction); break;
 		// case ShaderOpcodes::EX2: recEX2(shaderUnit, instruction); break;
-		// case ShaderOpcodes::FLR: recFLR(shaderUnit, instruction); break;
+		case ShaderOpcodes::FLR: recFLR(shaderUnit, instruction); break;
 		case ShaderOpcodes::IFC: recIFC(shaderUnit, instruction); break;
 		case ShaderOpcodes::IFU: recIFU(shaderUnit, instruction); break;
 		case ShaderOpcodes::JMPC: recJMPC(shaderUnit, instruction); break;
-		// case ShaderOpcodes::JMPU: recJMPU(shaderUnit, instruction); break;
+		case ShaderOpcodes::JMPU: recJMPU(shaderUnit, instruction); break;
 		// case ShaderOpcodes::LG2: recLG2(shaderUnit, instruction); break;
-		// case ShaderOpcodes::LOOP: recLOOP(shaderUnit, instruction); break;
+		case ShaderOpcodes::LOOP: recLOOP(shaderUnit, instruction); break;
 		case ShaderOpcodes::MOV: recMOV(shaderUnit, instruction); break;
 		case ShaderOpcodes::MOVA: recMOVA(shaderUnit, instruction); break;
 		case ShaderOpcodes::MAX: recMAX(shaderUnit, instruction); break;
@@ -156,14 +156,11 @@ void ShaderEmitter::compileInstruction(const PICAShader& shaderUnit) {
 
 		// Unimplemented opcodes that don't seem to actually be used but exist in the binary
 		// EMIT/SETEMIT are used in geometry shaders, however are sometimes found in vertex shaders?
-		// case ShaderOpcodes::EMIT:
-		// case ShaderOpcodes::SETEMIT:
-		//	log("[ShaderJIT] Unknown PICA opcode: %02X\n", opcode);
-		//	emitPrintLog(shaderUnit);
-		//	break;
+		case ShaderOpcodes::EMIT:
+		case ShaderOpcodes::SETEMIT: log("[ShaderJIT] Unimplemented PICA opcode: %02X\n", opcode); break;
 
-		// case ShaderOpcodes::BREAK:
-		// case ShaderOpcodes::BREAKC: Helpers::warn("[Shader JIT] Unimplemented BREAK(C) instruction!"); break;
+		case ShaderOpcodes::BREAK:
+		case ShaderOpcodes::BREAKC: Helpers::warn("[Shader JIT] Unimplemented BREAK(C) instruction!"); break;
 
 		// We consider both MAD and MADI to be the same instruction and decode which one we actually have in recMAD
 		case 0x30:
@@ -181,15 +178,13 @@ void ShaderEmitter::compileInstruction(const PICAShader& shaderUnit) {
 		case 0x3C:
 		case 0x3D:
 		case 0x3E:
-		case 0x3F:
-			recMAD(shaderUnit, instruction);
-			break;
+		case 0x3F: recMAD(shaderUnit, instruction); break;
 
-			// case ShaderOpcodes::SLT:
-			// case ShaderOpcodes::SLTI: recSLT(shaderUnit, instruction); break;
+		case ShaderOpcodes::SLT:
+		case ShaderOpcodes::SLTI: recSLT(shaderUnit, instruction); break;
 
-			// case ShaderOpcodes::SGE:
-			// case ShaderOpcodes::SGEI: recSGE(shaderUnit, instruction); break;
+		case ShaderOpcodes::SGE:
+		case ShaderOpcodes::SGEI: recSGE(shaderUnit, instruction); break;
 
 		default: Helpers::panic("Shader JIT: Unimplemented PICA opcode %X", opcode);
 	}
@@ -430,6 +425,17 @@ void ShaderEmitter::recMOV(const PICAShader& shader, u32 instruction) {
 	storeRegister(src1_vec, shader, dest, operandDescriptor);
 }
 
+void ShaderEmitter::recFLR(const PICAShader& shader, u32 instruction) {
+	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
+	const u32 src = getBits<12, 7>(instruction);
+	const u32 idx = getBits<19, 2>(instruction);
+	const u32 dest = getBits<21, 5>(instruction);
+
+	loadRegister<1>(src1_vec, shader, src, idx, operandDescriptor);  // Load source 1 into scratch1
+	FRINTM(src1_vec.S4(), src1_vec.S4());                            // Floor it and store into dest
+	storeRegister(src1_vec, shader, dest, operandDescriptor);
+}
+
 void ShaderEmitter::recMOVA(const PICAShader& shader, u32 instruction) {
 	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
 	const u32 src = getBits<12, 7>(instruction);
@@ -630,6 +636,42 @@ void ShaderEmitter::recMAD(const PICAShader& shader, u32 instruction) {
 	storeRegister(src3_vec, shader, dest, operandDescriptor);
 }
 
+void ShaderEmitter::recSLT(const PICAShader& shader, u32 instruction) {
+	const bool isSLTI = (instruction >> 26) == ShaderOpcodes::SLTI;
+	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
+
+	const u32 src1 = isSLTI ? getBits<14, 5>(instruction) : getBits<12, 7>(instruction);
+	const u32 src2 = isSLTI ? getBits<7, 7>(instruction) : getBits<7, 5>(instruction);
+	const u32 idx = getBits<19, 2>(instruction);
+	const u32 dest = getBits<21, 5>(instruction);
+
+	loadRegister<1>(src1_vec, shader, src1, isSLTI ? 0 : idx, operandDescriptor);
+	loadRegister<2>(src2_vec, shader, src2, isSLTI ? idx : 0, operandDescriptor);
+	// Set each lane of SRC1 to FFFFFFFF if src2 > src1, else to 0. NEON does not have FCMLT so we use FCMGT with inverted operands
+	// This is more or less a direct port of the relevant x64 JIT code
+	FCMGT(src1_vec.S4(), src2_vec.S4(), src1_vec.S4());
+	AND(src1_vec.B16(), src1_vec.B16(), onesVector.B16());  // AND with vec4(1.0) to convert the FFFFFFFF lanes into 1.0
+	storeRegister(src1_vec, shader, dest, operandDescriptor);
+}
+
+void ShaderEmitter::recSGE(const PICAShader& shader, u32 instruction) {
+	const bool isSGEI = (instruction >> 26) == ShaderOpcodes::SGEI;
+	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
+
+	const u32 src1 = isSGEI ? getBits<14, 5>(instruction) : getBits<12, 7>(instruction);
+	const u32 src2 = isSGEI ? getBits<7, 7>(instruction) : getBits<7, 5>(instruction);
+	const u32 idx = getBits<19, 2>(instruction);
+	const u32 dest = getBits<21, 5>(instruction);
+
+	loadRegister<1>(src1_vec, shader, src1, isSGEI ? 0 : idx, operandDescriptor);
+	loadRegister<2>(src2_vec, shader, src2, isSGEI ? idx : 0, operandDescriptor);
+	// Set each lane of SRC1 to FFFFFFFF if src1 >= src2, else to 0.
+	// This is more or less a direct port of the relevant x64 JIT code
+	FCMGE(src1_vec.S4(), src1_vec.S4(), src2_vec.S4());
+	AND(src1_vec.B16(), src1_vec.B16(), onesVector.B16());  // AND with vec4(1.0) to convert the FFFFFFFF lanes into 1.0
+	storeRegister(src1_vec, shader, dest, operandDescriptor);
+}
+
 void ShaderEmitter::recCMP(const PICAShader& shader, u32 instruction) {
 	const u32 operandDescriptor = shader.operandDescriptors[instruction & 0x7f];
 	const u32 src1 = getBits<12, 7>(instruction);
@@ -742,6 +784,28 @@ void ShaderEmitter::recCALL(const PICAShader& shader, u32 instruction) {
 	LDP(XZR, X30, SP, POST_INDEXED, 16);
 }
 
+void ShaderEmitter::recCALLC(const PICAShader& shader, u32 instruction) {
+	Label skipCall;
+
+	// z is 1 if the call should be taken, 0 otherwise
+	checkCmpRegister(shader, instruction);
+	B(NE, skipCall);
+	recCALL(shader, instruction);
+
+	l(skipCall);
+}
+
+void ShaderEmitter::recCALLU(const PICAShader& shader, u32 instruction) {
+	Label skipCall;
+
+	// z is 0 if the call should be taken, 1 otherwise
+	checkBoolUniform(shader, instruction);
+	B(EQ, skipCall);
+	recCALL(shader, instruction);
+
+	l(skipCall);
+}
+
 void ShaderEmitter::recIFC(const PICAShader& shader, u32 instruction) {
 	// z is 1 if true, else 0
 	checkCmpRegister(shader, instruction);
@@ -801,10 +865,83 @@ void ShaderEmitter::recJMPC(const PICAShader& shader, u32 instruction) {
 	B(EQ, l);
 }
 
+void ShaderEmitter::recJMPU(const PICAShader& shader, u32 instruction) {
+	bool jumpIfFalse = instruction & 1;  // If the LSB is 0 we want to compare to true, otherwise compare to false
+	const u32 dest = getBits<10, 12>(instruction);
+
+	Label& l = instructionLabels[dest];
+	// Z is 0 if the uniform is true
+	checkBoolUniform(shader, instruction);
+
+	if (jumpIfFalse) {
+		B(EQ, l);
+	} else {
+		B(NE, l);
+	}
+}
+
+void ShaderEmitter::recLOOP(const PICAShader& shader, u32 instruction) {
+	const u32 dest = getBits<10, 12>(instruction);
+	const u32 uniformIndex = getBits<22, 2>(instruction);
+
+	if (loopLevel > 0) {
+		log("[Shader JIT] Detected nested loop. Might be broken?\n");
+	}
+
+	if (dest < recompilerPC) {
+		Helpers::panic("[Shader JIT] Detected backwards loop\n");
+	}
+
+	loopLevel++;
+
+	// Offset of the uniform
+	const auto& uniform = shader.intUniforms[uniformIndex];
+	const uintptr_t uniformOffset = uintptr_t(&uniform[0]) - uintptr_t(&shader);
+	// Offset of the loop register
+	const uintptr_t loopRegOffset = uintptr_t(&shader.loopCounter) - uintptr_t(&shader);
+
+	LDRB(W0, statePointer, uniformOffset);                   // W0 = loop iteration count
+	LDRB(W1, statePointer, uniformOffset + sizeof(u8));      // W1 = initial loop counter value
+	LDRB(W2, statePointer, uniformOffset + 2 * sizeof(u8));  // W2 = Loop increment
+
+	ADD(W0, W0, 1);                        // The iteration count is actually uniform.x + 1
+	STR(W1, statePointer, loopRegOffset);  // Set loop counter
+
+	// Push loop iteration counter & loop increment
+	// TODO: This might break if an instruction in a loop decides to yield...
+	STP(X0, X2, SP, PRE_INDEXED, -16);
+
+	Label loopStart, loopEnd;
+	l(loopStart);
+	compileUntil(shader, dest + 1);
+
+	const size_t stackOffsetOfLoopIncrement = 0;
+	const size_t stackOffsetOfIterationCounter = stackOffsetOfLoopIncrement + 8;
+
+	LDP(X0, X2, SP);                       // W0 = loop iteration, W2 = loop increment
+	LDR(W1, statePointer, loopRegOffset);  // W1 = loop register
+
+	// Increment loop counter
+	ADD(W1, W1, W2);
+	STR(W1, statePointer, loopRegOffset);
+	// Subtract 1 from loop iteration counter,
+	SUBS(W0, W0, 1);
+	B(EQ, loopEnd);
+
+	// Loop hasn't ended: Write back new iteration counter and go back to the start
+	STR(X0, SP);
+	B(loopStart);
+
+	l(loopEnd);
+	// Remove the stuff we pushed on the stack earlier
+	ADD(SP, SP, 16);
+	loopLevel--;
+}
+
 void ShaderEmitter::recEND(const PICAShader& shader, u32 instruction) {
 	// Fetch original LR and return. This also restores SP to its original value, discarding the return guard into XZR
 	LDP(XZR, X30, SP, POST_INDEXED, 16);
 	RET();
 }
 
-#endif
\ No newline at end of file
+#endif

From 99e06d83255c6e5483d7ef65a2ce46b6b07d0eb0 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Fri, 12 Jan 2024 18:40:00 +0200
Subject: [PATCH 115/162] Make shader JIT off-by-default for arm64 temporarily

---
 include/config.hpp | 9 ++++++++-
 src/config.cpp     | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/config.hpp b/include/config.hpp
index 424d0741..155f5961 100644
--- a/include/config.hpp
+++ b/include/config.hpp
@@ -5,7 +5,14 @@
 
 // Remember to initialize every field here to its default value otherwise bad things will happen
 struct EmulatorConfig {
-	bool shaderJitEnabled = true;
+    // Only enable the shader JIT by default on platforms where it's completely tested
+#ifdef PANDA3DS_X64_HOST
+	static constexpr bool shaderJitDefault = true;
+#else
+	static constexpr bool shaderJitDefault = false;
+#endif
+
+	bool shaderJitEnabled = shaderJitDefault;
 	bool discordRpcEnabled = false;
 	RendererType rendererType = RendererType::OpenGL;
 
diff --git a/src/config.cpp b/src/config.cpp
index 28946d52..cd4e1f79 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -58,7 +58,7 @@ void EmulatorConfig::load() {
 				rendererType = RendererType::OpenGL;
 			}
 
-			shaderJitEnabled = toml::find_or<toml::boolean>(gpu, "EnableShaderJIT", true);
+			shaderJitEnabled = toml::find_or<toml::boolean>(gpu, "EnableShaderJIT", shaderJitDefault);
 		}
 	}
 

From 23770e27044b67b1e08e7e7cd1402322e5ef03d7 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Fri, 12 Jan 2024 19:27:22 +0200
Subject: [PATCH 116/162] Attempt to skip CMake upgrade on Linux since it's
 broken (#370)

* Update Linux_AppImage_Build.yml

* Update Qt_Build.yml
---
 .github/workflows/Linux_AppImage_Build.yml | 8 --------
 .github/workflows/Qt_Build.yml             | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/.github/workflows/Linux_AppImage_Build.yml b/.github/workflows/Linux_AppImage_Build.yml
index 23aae405..507187a3 100644
--- a/.github/workflows/Linux_AppImage_Build.yml
+++ b/.github/workflows/Linux_AppImage_Build.yml
@@ -31,14 +31,6 @@ jobs:
        wget https://apt.llvm.org/llvm.sh
        chmod +x ./llvm.sh
        sudo ./llvm.sh 17
-
-    - name: Install newer CMake
-      run: |
-       sudo curl -s https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
-       sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 42D5A192B819C5DA
-       sudo add-apt-repository -y 'deb https://apt.kitware.com/ubuntu/ focal main'
-       sudo apt-get update
-       sudo apt-get install cmake
        
     - name: Setup Vulkan SDK
       run: |
diff --git a/.github/workflows/Qt_Build.yml b/.github/workflows/Qt_Build.yml
index a112e529..0b3910d7 100644
--- a/.github/workflows/Qt_Build.yml
+++ b/.github/workflows/Qt_Build.yml
@@ -115,14 +115,6 @@ jobs:
        wget https://apt.llvm.org/llvm.sh
        chmod +x ./llvm.sh
        sudo ./llvm.sh 17
-
-    - name: Install newer CMake
-      run: |
-       sudo curl -s https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
-       sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 42D5A192B819C5DA
-       sudo add-apt-repository -y 'deb https://apt.kitware.com/ubuntu/ focal main'
-       sudo apt-get update
-       sudo apt-get install cmake
        
     - name: Setup Vulkan SDK
       run: |

From b5718010eec86c04863cc09f5557287c3deff53f Mon Sep 17 00:00:00 2001
From: Gabriel Machado <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Tue, 16 Jan 2024 15:43:30 -0400
Subject: [PATCH 117/162] Add scripting support for Android (#369)

* Lua Patcher and code editor: initial commit

* Code Editor + Lua Patchs + Fixes

* some fixes

* bonk

---------

Co-authored-by: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
---
 src/jni_driver.cpp                            |   6 +
 src/pandroid/app/src/main/AndroidManifest.xml |   5 +
 .../app/src/main/assets/fonts/comic_mono.ttf  | Bin 0 -> 18724 bytes
 .../com/panda3ds/pandroid/AlberDriver.java    |   2 +-
 .../panda3ds/pandroid/app/BaseActivity.java   |  14 +-
 .../panda3ds/pandroid/app/GameActivity.java   |  21 +-
 .../panda3ds/pandroid/app/MainActivity.java   |  10 +-
 .../pandroid/app/PandroidApplication.java     |  31 ++
 .../app/base/BottomDialogFragment.java        |  28 ++
 .../app/editor/CodeEditorActivity.java        | 196 +++++++++++
 .../pandroid/app/game/DrawerFragment.java     |  10 +-
 .../pandroid/app/game/LuaDialogFragment.java  | 185 ++++++++++
 .../panda3ds/pandroid/utils/FileUtils.java    |  47 +++
 .../pandroid/view/code/BaseEditor.java        | 322 ++++++++++++++++++
 .../pandroid/view/code/BasicTextEditor.java   | 154 +++++++++
 .../pandroid/view/code/CodeEditor.java        |  51 +++
 .../pandroid/view/code/EditorColors.java      |  63 ++++
 .../pandroid/view/code/syntax/CodeSyntax.java |  21 ++
 .../pandroid/view/code/syntax/LuaSyntax.java  |  58 ++++
 .../view/code/syntax/PatternUtils.java        |  18 +
 .../view/gamesgrid/GamesGridView.java         |  27 +-
 .../view/recycler/AutoFitGridLayout.java      |  33 ++
 .../view/recycler/SimpleListAdapter.java      |  76 +++++
 .../app/src/main/res/drawable/ic_code.xml     |   5 +
 .../app/src/main/res/drawable/ic_edit.xml     |   5 +
 .../main/res/drawable/ic_keyboard_hide.xml    |   5 +
 .../app/src/main/res/drawable/ic_play.xml     |   5 +
 .../app/src/main/res/drawable/ic_tab.xml      |   5 +
 .../main/res/layout/activity_code_editor.xml  | 133 ++++++++
 .../main/res/layout/dialog_lua_scripts.xml    |  65 ++++
 .../main/res/layout/fragment_game_drawer.xml  |  13 +
 .../src/main/res/layout/holder_lua_script.xml |  52 +++
 .../src/main/res/menu/game_drawer_others.xml  |   7 +
 .../src/main/res/values-pt-rBR/strings.xml    |  10 +
 .../app/src/main/res/values/strings.xml       |  10 +
 35 files changed, 1639 insertions(+), 54 deletions(-)
 create mode 100644 src/pandroid/app/src/main/assets/fonts/comic_mono.ttf
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BottomDialogFragment.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/editor/CodeEditorActivity.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/LuaDialogFragment.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/BaseEditor.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/BasicTextEditor.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/CodeEditor.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/EditorColors.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/syntax/CodeSyntax.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/syntax/LuaSyntax.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/syntax/PatternUtils.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/recycler/AutoFitGridLayout.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/recycler/SimpleListAdapter.java
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_code.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_edit.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_keyboard_hide.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_play.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_tab.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/activity_code_editor.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/dialog_lua_scripts.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/holder_lua_script.xml
 create mode 100644 src/pandroid/app/src/main/res/menu/game_drawer_others.xml

diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index 0bdaa345..6eeb727a 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -80,6 +80,12 @@ AlberFunction(void, LoadRom)(JNIEnv* env, jobject obj, jstring path) {
 	env->ReleaseStringUTFChars(path, pathStr);
 }
 
+AlberFunction(void, LoadLuaScript)(JNIEnv* env, jobject obj, jstring script) {
+	const char* scriptStr = env->GetStringUTFChars(script, nullptr);
+	emulator->getLua().loadString(scriptStr);
+	env->ReleaseStringUTFChars(script, scriptStr);
+}
+
 AlberFunction(void, TouchScreenDown)(JNIEnv* env, jobject obj, jint x, jint y) { hidService->setTouchScreenPress((u16)x, (u16)y); }
 AlberFunction(void, TouchScreenUp)(JNIEnv* env, jobject obj) { hidService->releaseTouchScreen(); }
 AlberFunction(void, KeyUp)(JNIEnv* env, jobject obj, jint keyCode) { hidService->releaseKey((u32)keyCode); }
diff --git a/src/pandroid/app/src/main/AndroidManifest.xml b/src/pandroid/app/src/main/AndroidManifest.xml
index 8caf9bb0..9f767654 100644
--- a/src/pandroid/app/src/main/AndroidManifest.xml
+++ b/src/pandroid/app/src/main/AndroidManifest.xml
@@ -35,6 +35,11 @@
             android:name=".app.GameActivity"
             android:configChanges="screenSize|screenLayout|orientation|density|uiMode">
         </activity>
+        <activity
+            android:name=".app.editor.CodeEditorActivity"
+            android:windowSoftInputMode="adjustResize"
+            android:configChanges="screenSize|screenLayout|orientation|density|uiMode">
+        </activity>
         <activity android:name=".app.PreferenceActivity"
             android:launchMode="standard"
             android:configChanges="screenSize|screenLayout|orientation|density"/>
diff --git a/src/pandroid/app/src/main/assets/fonts/comic_mono.ttf b/src/pandroid/app/src/main/assets/fonts/comic_mono.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..9bc7354e3ad1702a85a08dea067bb2871bce689a
GIT binary patch
literal 18724
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

literal 0
HcmV?d00001

diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
index 46ab2577..5cff703c 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
@@ -19,7 +19,7 @@ public class AlberDriver {
 	public static native void TouchScreenDown(int x, int y);
 	public static native void Pause();
 	public static native void Resume();
-
+	public static native void LoadLuaScript(String script);
 	public static native byte[] GetSmdh();
 
 	static { System.loadLibrary("Alber"); }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
index 527d4966..56c82d96 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/BaseActivity.java
@@ -8,7 +8,7 @@ import com.panda3ds.pandroid.data.config.GlobalConfig;
 
 
 public class BaseActivity extends AppCompatActivity {
-	private int currentTheme = GlobalConfig.get(GlobalConfig.KEY_APP_THEME);
+	private int currentTheme = PandroidApplication.getThemeId();
 
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -20,19 +20,13 @@ public class BaseActivity extends AppCompatActivity {
 	protected void onResume() {
 		super.onResume();
 
-		if (GlobalConfig.get(GlobalConfig.KEY_APP_THEME) != currentTheme) {
+		if (PandroidApplication.getThemeId() != currentTheme) {
 			recreate();
 		}
 	}
 
 	private void applyTheme() {
-		switch (GlobalConfig.get(GlobalConfig.KEY_APP_THEME)) {
-			case GlobalConfig.THEME_ANDROID: setTheme(R.style.Theme_Pandroid); break;
-			case GlobalConfig.THEME_LIGHT: setTheme(R.style.Theme_Pandroid_Light); break;
-			case GlobalConfig.THEME_DARK: setTheme(R.style.Theme_Pandroid_Dark); break;
-			case GlobalConfig.THEME_BLACK: setTheme(R.style.Theme_Pandroid_Black); break;
-		}
-
-		currentTheme = GlobalConfig.get(GlobalConfig.KEY_APP_THEME);
+		currentTheme = PandroidApplication.getThemeId();
+		setTheme(currentTheme);
 	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
index ade3e2ac..aced6faa 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -24,13 +24,7 @@ import com.panda3ds.pandroid.view.PandaLayoutController;
 
 public class GameActivity extends BaseActivity {
 	private final DrawerFragment drawerFragment = new DrawerFragment();
-	private final AlberInputListener inputListener = new AlberInputListener(() -> {
-		if (drawerFragment.isOpened()) {
-			drawerFragment.close();
-		} else {
-			drawerFragment.open();
-		}
-	});
+	private final AlberInputListener inputListener = new AlberInputListener(this::onBackPressed);
 
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -84,16 +78,25 @@ public class GameActivity extends BaseActivity {
 
 	@Override
 	public boolean dispatchKeyEvent(KeyEvent event) {
-		if (InputHandler.processKeyEvent(event)) {
+		if ((!drawerFragment.isOpened()) && InputHandler.processKeyEvent(event)) {
 			return true;
 		}
 
 		return super.dispatchKeyEvent(event);
 	}
 
+	@Override
+	public void onBackPressed() {
+		if (drawerFragment.isOpened()) {
+			drawerFragment.close();
+		} else {
+			drawerFragment.open();
+		}
+	}
+
 	@Override
 	public boolean dispatchGenericMotionEvent(MotionEvent ev) {
-		if (InputHandler.processMotionEvent(ev)) {
+		if ((!drawerFragment.isOpened()) && InputHandler.processMotionEvent(ev)) {
 			return true;
 		}
 
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
index ee7acf88..18914a80 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/MainActivity.java
@@ -15,10 +15,13 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import com.google.android.material.navigation.NavigationBarView;
 import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.app.editor.CodeEditorActivity;
 import com.panda3ds.pandroid.app.main.GamesFragment;
 import com.panda3ds.pandroid.app.main.SearchFragment;
 import com.panda3ds.pandroid.app.main.SettingsFragment;
 
+import java.io.File;
+
 
 public class MainActivity extends BaseActivity implements NavigationBarView.OnItemSelectedListener {
 	private static final int PICK_ROM = 2;
@@ -28,13 +31,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
 	private final SearchFragment searchFragment = new SearchFragment();
 	private final SettingsFragment settingsFragment = new SettingsFragment();
 
-	private void openFile() {
-		Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
-		intent.addCategory(Intent.CATEGORY_OPENABLE);
-		intent.setType("*/*");
-		startActivityForResult(intent, PICK_ROM);
-	}
-
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
index 0ae779dd..02fbbbcc 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
@@ -2,7 +2,11 @@ package com.panda3ds.pandroid.app;
 
 import android.app.Application;
 import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+
 import com.panda3ds.pandroid.AlberDriver;
+import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.data.config.GlobalConfig;
 import com.panda3ds.pandroid.input.InputMap;
 import com.panda3ds.pandroid.utils.GameUtils;
@@ -22,5 +26,32 @@ public class PandroidApplication extends Application {
 		AlberDriver.Setup();
 	}
 
+	public static int getThemeId() {
+		switch (GlobalConfig.get(GlobalConfig.KEY_APP_THEME)) {
+			case GlobalConfig.THEME_LIGHT:
+				return R.style.Theme_Pandroid_Light;
+			case GlobalConfig.THEME_DARK:
+				return R.style.Theme_Pandroid_Dark;
+			case GlobalConfig.THEME_BLACK:
+				return R.style.Theme_Pandroid_Black;
+		}
+
+		return R.style.Theme_Pandroid;
+	}
+
+	public static boolean isDarkMode() {
+		switch (GlobalConfig.get(GlobalConfig.KEY_APP_THEME)) {
+			case GlobalConfig.THEME_DARK:
+			case GlobalConfig.THEME_BLACK:
+				return true;
+			case GlobalConfig.THEME_LIGHT:
+				return false;
+		}
+        
+		Resources res = Resources.getSystem();
+		int nightFlags = res.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+		return nightFlags == Configuration.UI_MODE_NIGHT_YES;
+	}
+
 	public static Context getAppContext() { return appContext; }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BottomDialogFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BottomDialogFragment.java
new file mode 100644
index 00000000..4e54dc61
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BottomDialogFragment.java
@@ -0,0 +1,28 @@
+package com.panda3ds.pandroid.app.base;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.Gravity;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
+import com.panda3ds.pandroid.R;
+
+public class BottomDialogFragment extends DialogFragment {
+    @Override
+    public int getTheme() {
+        return R.style.AlertDialog;
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        Dialog dialog = super.onCreateDialog(savedInstanceState);
+        dialog.getWindow().setGravity(Gravity.CENTER | Gravity.BOTTOM);
+        dialog.getWindow().getAttributes().y = Math.round(getContext().getResources().getDisplayMetrics().density * 15);
+
+        return dialog;
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/editor/CodeEditorActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/editor/CodeEditorActivity.java
new file mode 100644
index 00000000..e5ced4b4
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/editor/CodeEditorActivity.java
@@ -0,0 +1,196 @@
+package com.panda3ds.pandroid.app.editor;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+
+import androidx.activity.result.contract.ActivityResultContract;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.app.BaseActivity;
+import com.panda3ds.pandroid.app.base.BottomAlertDialog;
+import com.panda3ds.pandroid.lang.Task;
+import com.panda3ds.pandroid.utils.FileUtils;
+import com.panda3ds.pandroid.view.code.CodeEditor;
+import com.panda3ds.pandroid.view.code.syntax.CodeSyntax;
+
+import java.io.Serializable;
+
+public class CodeEditorActivity extends BaseActivity {
+    private static final String TAB = "    ";
+    private String path;
+    private String fileName;
+    private CodeEditor editor;
+    private AppCompatTextView title;
+    private View saveButton;
+    private boolean changed = false;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_code_editor);
+        Arguments args = (Arguments) getIntent().getSerializableExtra("args");
+
+        editor = findViewById(R.id.editor);
+        getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(this::onGlobalLayoutChanged);
+
+        path = args.path;
+        fileName = args.fileName;
+        title = findViewById(R.id.title);
+        title.setText(fileName);
+
+        saveButton = findViewById(R.id.save);
+
+        saveButton.setVisibility(View.GONE);
+        saveButton.setOnClickListener(v -> save());
+
+        new Task(() -> {
+            String content = FileUtils.readTextFile(path + "/" + fileName);
+        
+            editor.post(() -> {
+                editor.setText(content);
+                editor.setSyntax(CodeSyntax.getFromFilename(fileName));
+                editor.setOnContentChangedListener(this::onDocumentContentChanged);
+            });
+        }).start();
+
+        switch (args.type) {
+            case LUA_SCRIPT_EDITOR:
+                setupLuaPatchEditor();
+                break;
+            case READ_ONLY_EDITOR:
+                setupReadOnlyEditor();
+                break;
+        }
+
+        onGlobalLayoutChanged();
+
+        findViewById(R.id.key_hide).setOnClickListener(v -> {
+            ((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE)).hideSoftInputFromWindow(v.getWindowToken(), 0);
+        });
+        findViewById(R.id.key_tab).setOnClickListener(v -> {
+            editor.insert(TAB);
+        });
+    }
+
+    // Detect virtual keyboard is visible
+    private void onGlobalLayoutChanged() {
+        View view = getWindow().getDecorView();
+        Rect rect = new Rect();
+        view.getWindowVisibleDisplayFrame(rect);
+        int currentHeight = rect.height();
+        int height = view.getHeight();
+
+        if (currentHeight < height * 0.8) {
+            findViewById(R.id.keybar).setVisibility(View.VISIBLE);
+        } else {
+            findViewById(R.id.keybar).setVisibility(View.GONE);
+        }
+    }
+
+    private void setupReadOnlyEditor() {
+        editor.setEnabled(false);
+        editor.setFocusable(false);
+    }
+
+    private void setupLuaPatchEditor() {
+        findViewById(R.id.lua_toolbar).setVisibility(View.VISIBLE);
+        findViewById(R.id.lua_play).setOnClickListener(v -> {
+            if (changed) {
+                save();
+            }
+            setResult(Activity.RESULT_OK, new Intent(Result.ACTION_PLAY.name()));
+            finish();
+        });
+    }
+
+    @SuppressLint("SetTextI18n")
+    private void onDocumentContentChanged() {
+        changed = true;
+
+        title.setText("*" + fileName);
+        saveButton.setVisibility(View.VISIBLE);
+    }
+
+    public void save() {
+        title.setText(fileName);
+        saveButton.setVisibility(View.GONE);
+
+        changed = false;
+        new Task(() -> FileUtils.writeTextFile(path, fileName, String.valueOf(editor.getText()))).runSync();
+    }
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        if (event.getKeyCode() == KeyEvent.KEYCODE_TAB) {
+            if (event.getAction() == KeyEvent.ACTION_UP) {
+                editor.insert(TAB);
+            }
+        
+            return true;
+        }
+
+        return super.dispatchKeyEvent(event);
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (changed) {
+            new BottomAlertDialog(this)
+                    .setNeutralButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
+                    .setPositiveButton(R.string.save_and_exit, (dialog, which) -> {
+                        save();
+                        finish();
+                    })
+                    .setNegativeButton(R.string.exit_without_saving, (dialog, which) -> finish())
+                    .setTitle(String.format(getString(R.string.exit_without_saving_title_ff), fileName)).show();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+    public static final class Arguments implements Serializable {
+        private final String path;
+        private final String fileName;
+        private final EditorType type;
+
+        public Arguments(String path, String fileName, EditorType type) {
+            this.path = path;
+            this.fileName = fileName;
+            this.type = type;
+        }
+    }
+
+    public enum Result {
+        ACTION_PLAY,
+        NULL
+    }
+
+    public enum EditorType {
+        LUA_SCRIPT_EDITOR,
+        READ_ONLY_EDITOR,
+        TEXT_EDITOR
+    }
+
+    public static final class Contract extends ActivityResultContract<Arguments, Result> {
+        @NonNull
+        @Override
+        public Intent createIntent(@NonNull Context context, Arguments args) {
+            return new Intent(context, CodeEditorActivity.class).putExtra("args", args);
+        }
+
+        @Override
+        public Result parseResult(int i, @Nullable Intent intent) {
+            return i == RESULT_OK && intent != null ? Result.valueOf(intent.getAction()) : Result.NULL;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java
index d18fac2b..bd402b52 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java
@@ -47,11 +47,15 @@ public class DrawerFragment extends Fragment implements DrawerLayout.DrawerListe
         ((AppCompatTextView)view.findViewById(R.id.game_publisher)).setText(game.getPublisher());
 
         ((NavigationView)view.findViewById(R.id.action_navigation)).setNavigationItemSelectedListener(this);
+        ((NavigationView)view.findViewById(R.id.others_navigation)).setNavigationItemSelectedListener(this);
     }
 
     @Override
     public void onDetach() {
-        drawerContainer.removeDrawerListener(this);
+        if (drawerContainer != null) {
+            drawerContainer.removeDrawerListener(this);
+        }
+
         super.onDetach();
     }
 
@@ -99,7 +103,9 @@ public class DrawerFragment extends Fragment implements DrawerLayout.DrawerListe
         if (id == R.id.resume) {
             close();
         } else if (id == R.id.exit) {
-            requireActivity().onBackPressed();
+            requireActivity().finish();
+        } else if (id == R.id.lua_script){
+            new LuaDialogFragment().show(getParentFragmentManager(), null);
         }
 
         return false;
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/LuaDialogFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/LuaDialogFragment.java
new file mode 100644
index 00000000..1db9f9c7
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/LuaDialogFragment.java
@@ -0,0 +1,185 @@
+package com.panda3ds.pandroid.app.game;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.panda3ds.pandroid.AlberDriver;
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.app.base.BottomAlertDialog;
+import com.panda3ds.pandroid.app.base.BottomDialogFragment;
+import com.panda3ds.pandroid.app.editor.CodeEditorActivity;
+import com.panda3ds.pandroid.lang.Task;
+import com.panda3ds.pandroid.utils.FileUtils;
+import com.panda3ds.pandroid.view.recycler.AutoFitGridLayout;
+import com.panda3ds.pandroid.view.recycler.SimpleListAdapter;
+
+import java.util.ArrayList;
+import java.util.UUID;
+
+public class LuaDialogFragment extends BottomDialogFragment {
+    private final SimpleListAdapter<LuaFile> adapter = new SimpleListAdapter<>(R.layout.holder_lua_script, this::onCreateListItem);
+    private ActivityResultLauncher<CodeEditorActivity.Arguments> codeEditorLauncher;
+    private LuaFile currentEditorFile;
+
+    private ActivityResultLauncher<String[]> openDocumentLauncher;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.dialog_lua_scripts, container, false);
+    }
+
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        openDocumentLauncher = registerForActivityResult(new ActivityResultContracts.OpenDocument(), result -> {
+            if (result != null) {
+                String fileName = FileUtils.getName(result.toString());
+
+                if (fileName.toLowerCase().endsWith(".lua")) {
+                    new Task(() -> {
+                        String content = FileUtils.readTextFile(result.toString());
+                        createFile(FileUtils.getName(result.toString()), content);
+                    }).start();
+                } else {
+                    Toast.makeText(getContext(), R.string.file_not_supported, Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+
+        codeEditorLauncher = registerForActivityResult(new CodeEditorActivity.Contract(), result -> {
+            if (result != null) {
+                switch (result) {
+                    case ACTION_PLAY:
+                        loadScript(currentEditorFile);
+                        break;
+                }
+            }
+            
+            orderByModified();
+        });
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        view.findViewById(R.id.open_file).setOnClickListener(v -> {
+            openDocumentLauncher.launch(new String[]{"*/*"});
+        });
+        view.findViewById(R.id.create).setOnClickListener(v -> {
+            new BottomAlertDialog(requireContext())
+                    .setTextInput(getString(R.string.name), arg -> {
+                        String name = arg.trim();
+                        if (name.length() > 1) {
+                            new Task(() -> {
+                                LuaFile file = createFile(name, "");
+                                currentEditorFile = file;
+                                codeEditorLauncher.launch(new CodeEditorActivity.Arguments(file.path, file.name, CodeEditorActivity.EditorType.LUA_SCRIPT_EDITOR));
+                            }).start();
+                        }
+                    }).setTitle(R.string.create_new)
+                    .show();
+        });
+
+        ((RecyclerView) view.findViewById(R.id.recycler)).setAdapter(adapter);
+        ((RecyclerView) view.findViewById(R.id.recycler)).setLayoutManager(new AutoFitGridLayout(getContext(), 140));
+        FileUtils.createDir(FileUtils.getResourcesPath(), "Lua Scripts");
+        ArrayList<LuaFile> files = new ArrayList<>();
+        String path = FileUtils.getResourcesPath() + "/Lua Scripts/";
+        for (String file : FileUtils.listFiles(path)) {
+            files.add(new LuaFile(file));
+        }
+
+        adapter.addAll(files);
+        orderByModified();
+    }
+
+    private LuaFile createFile(String name, String content) {
+        if (name.toLowerCase().endsWith(".lua")) {
+            name = name.substring(0, name.length() - 4);
+        }
+
+        name = name.replaceAll("[^[a-zA-Z0-9-_ ]]", "-");
+
+        String fileName = name + "." + UUID.randomUUID().toString().substring(0, 4) + ".lua";
+        LuaFile file = new LuaFile(fileName);
+        FileUtils.writeTextFile(file.path, fileName, content);
+        getView().post(() -> {
+            adapter.addAll(file);
+            orderByModified();
+        });
+
+        return file;
+    }
+
+    private void orderByModified() {
+        adapter.sort((o1, o2) -> Long.compare(o2.lastModified(), o1.lastModified()));
+    }
+
+    private void onCreateListItem(int position, LuaFile file, View view) {
+        ((TextView) view.findViewById(R.id.title))
+                .setText(file.name.split("\\.")[0]);
+
+        view.setOnClickListener(v -> loadScript(file));
+        view.findViewById(R.id.edit).setOnClickListener(v -> {
+            currentEditorFile = file;
+            codeEditorLauncher.launch(new CodeEditorActivity.Arguments(file.path, file.name, CodeEditorActivity.EditorType.LUA_SCRIPT_EDITOR));
+        });
+    }
+
+    private void loadScript(LuaFile file) {
+        dismiss();
+        
+        Toast.makeText(getContext(), String.format(getString(R.string.running_ff), file.name), Toast.LENGTH_SHORT).show();
+        new Task(() -> {
+            String script = FileUtils.readTextFile(file.absolutePath());
+            file.update();
+            AlberDriver.LoadLuaScript(script);
+        }).start();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        openDocumentLauncher.unregister();
+        codeEditorLauncher.unregister();
+    }
+
+    private static class LuaFile {
+        private final String name;
+        private final String path;
+
+        private LuaFile(String path, String name) {
+            this.name = name;
+            this.path = path;
+        }
+
+        private LuaFile(String name) {
+            this(FileUtils.getResourcesPath() + "/Lua Scripts/", name);
+        }
+
+        private String absolutePath() {
+            return path + "/" + name;
+        }
+
+        private void update() {
+            FileUtils.updateFile(absolutePath());
+        }
+
+        private long lastModified() {
+            return FileUtils.getLastModified(absolutePath());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
index a065cd0c..45faf5a4 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
@@ -39,6 +39,15 @@ public class FileUtils {
         return parseFile(path).getName();
     }
 
+    public static String getResourcesPath(){
+        File file = new File(getPrivatePath(), "config/resources");
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+
+        return file.getAbsolutePath();
+    }
+
     public static String getPrivatePath() {
         File file = getContext().getFilesDir();
         if (!file.exists()) {
@@ -177,4 +186,42 @@ public class FileUtils {
             return null;
         }
     }
+
+    public static void updateFile(String path){
+        DocumentFile file = parseFile(path);
+        Uri uri = file.getUri();
+        
+        switch (uri.getScheme()) {
+            case "file": {
+                new File(uri.getPath()).setLastModified(System.currentTimeMillis());
+                break;
+            }
+
+            case "content": {
+                getContext().getContentResolver().update(uri, null, null, null);
+                break;
+            }
+
+            default: {
+                Log.w(Constants.LOG_TAG, "Cannot update file from scheme: " + uri.getScheme());
+                break;
+            }
+        }
+    }
+
+    public static long getLastModified(String path) {
+        return parseFile(path).lastModified();
+    }
+
+    public static String[] listFiles(String path){
+        DocumentFile folder = parseFile(path);
+        DocumentFile[] files = folder.listFiles();
+
+        String[] result = new String[files.length];
+        for (int i = 0; i < result.length; i++){
+            result[i] = files[i].getName();
+        }
+        
+        return result;
+    }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/BaseEditor.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/BaseEditor.java
new file mode 100644
index 00000000..4dba9f7c
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/BaseEditor.java
@@ -0,0 +1,322 @@
+package com.panda3ds.pandroid.view.code;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.text.Editable;
+import android.text.Layout;
+import android.util.AttributeSet;
+import android.view.ViewTreeObserver;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.Arrays;
+
+public class BaseEditor extends BasicTextEditor {
+    private static final String HELLO_WORLD = "Hello World";
+    private final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.SUBPIXEL_TEXT_FLAG);
+    private final Rect rect = new Rect();
+    private int currentLine;
+    private float spaceWidth;
+    private int lineHeight;
+    private int textOffset;
+    private int beginLine;
+    private int beginIndex;
+    private int endLine;
+    private int endIndex;
+    private int visibleHeight;
+    private int contentWidth;
+    private Layout textLayout;
+    private int currentWidth = -1;
+    private int currentHeight = -1;
+
+    private final char[] textBuffer = new char[1];
+    protected final int[] colors = new int[256];
+
+    // Allocate 512KB for the buffer
+    protected final byte[] syntaxBuffer = new byte[512 * 1024];
+    private boolean requireUpdate = true;
+
+    public BaseEditor(@NonNull Context context) {
+        super(context);
+    }
+
+    public BaseEditor(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public BaseEditor(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    {
+        EditorColors.obtainColorScheme(colors, getContext());
+    }
+
+    @Override
+    protected void initialize() {
+        super.initialize();
+        getViewTreeObserver().addOnGlobalLayoutListener(() -> {
+            adjustScroll();
+            requireUpdate = true;
+        });
+    }
+
+    @SuppressLint("MissingSuperCall")
+    @Override
+    public void draw(Canvas canvas) {
+        //super.draw(canvas);
+        canvas.drawColor(colors[EditorColors.COLOR_BACKGROUND]);
+        textLayout = getLayout();
+        if (textLayout == null) {
+            postDelayed(this::invalidate, 25);
+            return;
+        }
+
+        try {
+            prepareDraw();
+            if (requireUpdate) {
+                onVisibleContentChanged(beginIndex, endIndex - beginIndex);
+            }
+
+            if (getSelectionStart() == getSelectionEnd()) {
+                drawCaret(canvas);
+                drawCurrentLine(canvas);
+            } else {
+                drawSelection(canvas);
+            }
+
+            drawText(canvas);
+            drawLineCount(canvas);
+        } catch (Throwable e) {
+            drawError(canvas, e);
+        }
+    }
+
+    private void drawError(Canvas canvas, Throwable e) {
+        canvas.drawColor(Color.RED);
+        paint.setTextSize(getTextSize());
+        paint.setColor(Color.WHITE);
+        canvas.drawText("Editor draw error:", getPaddingLeft(), getLineHeight(), paint);
+        canvas.drawText(String.valueOf(e), getPaddingLeft(), getLineHeight() * 2, paint);
+
+        int index = 2;
+        for (StackTraceElement trace : e.getStackTrace()) {
+            index++;
+            if (index > 5) break;
+            canvas.drawText(trace.getClassName() + ":" + trace.getMethodName() + ":" + trace.getLineNumber(), getPaddingLeft(), getLineHeight() * index, paint);
+        }
+    }
+
+    private void prepareDraw() {
+        paint.setTypeface(getTypeface());
+        paint.setTextSize(getTextSize());
+
+        Paint.FontMetrics fontMetrics = paint.getFontMetrics();
+        spaceWidth = paint.measureText(" ");
+        lineHeight = getLineHeight();
+
+        //Align text to center of line
+        {
+            int ascent = (int) Math.abs(fontMetrics.ascent);
+            paint.getTextBounds(HELLO_WORLD, 0, HELLO_WORLD.length(), rect);
+            textOffset = Math.max(((lineHeight - rect.height()) / 2), 0) + ascent;
+        }
+
+        int lineCount = textLayout.getLineCount();
+        currentLine = textLayout.getLineForOffset(getSelectionStart());
+
+        int oldBeginLine = beginLine;
+        int oldEndLine = endLine;
+
+        beginLine = Math.max(0, Math.min((getScrollY() / lineHeight) - 1, lineCount));
+        beginIndex = textLayout.getLineStart(beginLine);
+
+        if (oldEndLine != endLine || beginLine != oldBeginLine) {
+            requireUpdate = true;
+        }
+
+        getGlobalVisibleRect(rect);
+        visibleHeight = rect.height();
+
+        endLine = Math.round(((float) visibleHeight / lineHeight) + 2) + beginLine;
+        endIndex = getLayout().getLineStart(Math.min(lineCount, endLine));
+
+        int padding = (int) (paint.measureText(String.valueOf(lineCount)) + (spaceWidth * 4));
+        if (getPaddingLeft() != padding) {
+            setPadding(padding, 0, 0, 0);
+        }
+
+        contentWidth = getWidth() + getScrollX();
+    }
+
+    private void drawLineCount(Canvas canvas) {
+        int colorEnable = colors[EditorColors.COLOR_TEXT];
+        int colorDisable = applyAlphaToColor(colors[EditorColors.COLOR_TEXT], 100);
+
+        paint.setColor(colors[EditorColors.COLOR_BACKGROUND_SECONDARY]);
+        int scrollY = getScrollY();
+        float x = getScrollX();
+
+        canvas.translate(x, 0);
+        canvas.drawRect(0, scrollY, getPaddingLeft() - spaceWidth, visibleHeight + scrollY, paint);
+        paint.setColor(colors[EditorColors.COLOR_CURRENT_LINE]);
+        canvas.drawRect(0, currentLine * lineHeight, getPaddingLeft() - spaceWidth, (currentLine * lineHeight) + lineHeight, paint);
+
+        for (int i = beginLine; i < Math.min(getLineCount(), endLine); i++) {
+            String text = String.valueOf(i + 1);
+            if (i == currentLine) {
+                paint.setColor(colorEnable);
+            } else {
+                paint.setColor(colorDisable);
+            }
+
+            float width = paint.measureText(text);
+            canvas.drawText(text, getPaddingLeft() - width - (spaceWidth * 2.5f), (i * lineHeight) + textOffset, paint);
+        }
+
+        paint.setColor(applyAlphaToColor(colorEnable, 10));
+        canvas.drawRect(getPaddingLeft() - spaceWidth - (spaceWidth / 4), scrollY, getPaddingLeft() - spaceWidth, visibleHeight + scrollY, paint);
+
+        canvas.translate(-x, 0);
+    }
+
+    private void drawCurrentLine(Canvas canvas) {
+        float y = currentLine * lineHeight;
+        paint.setColor(colors[EditorColors.COLOR_CURRENT_LINE]);
+        canvas.drawRect(0, y, contentWidth, y + lineHeight, paint);
+    }
+
+    private void drawText(Canvas canvas) {
+        Editable edit = getText();
+        float x = 0;
+        float y = textOffset;
+        int line = 0;
+
+        canvas.translate(getPaddingLeft(), beginLine * lineHeight);
+
+        paint.setColor(colors[EditorColors.COLOR_TEXT]);
+        for (int i = beginIndex; i < endIndex; i++) {
+            textBuffer[0] = edit.charAt(i);
+            switch (textBuffer[0]) {
+                case '\n':
+                    line++;
+                    x = 0;
+                    y = (line * lineHeight) + textOffset;
+                    break;
+
+                case ' ':
+                    x += spaceWidth;
+                    break;
+
+                default:
+                    paint.setColor(colors[syntaxBuffer[i - beginIndex]]);
+                    canvas.drawText(textBuffer, 0, 1, x, y, paint);
+                    x += paint.measureText(textBuffer, 0, 1);
+                    break;
+            }
+        }
+
+        canvas.translate(-getPaddingLeft(), -(beginLine * lineHeight));
+    }
+
+    private void drawCaret(Canvas canvas) {
+        int start = textLayout.getLineStart(currentLine);
+        int end = textLayout.getLineEnd(currentLine);
+        int position = getSelectionStart();
+        float x = getPaddingLeft();
+        float y = (currentLine * lineHeight);
+        Editable text = getText();
+        for (int i = start; i < end; i++) {
+            if (i == position) {
+                break;
+            }
+
+            textBuffer[0] = text.charAt(i);
+            x += paint.measureText(textBuffer, 0, 1);
+        }
+
+        paint.setColor(colors[EditorColors.COLOR_CARET]);
+        float caretWidth = spaceWidth / 2;
+        canvas.drawRect(x - (caretWidth / 2), y, x + (caretWidth / 2), y + lineHeight, paint);
+    }
+
+    private void drawSelection(Canvas canvas) {
+        int start = getSelectionStart();
+        int end = getSelectionEnd();
+        int endLine = textLayout.getLineForOffset(end);
+        canvas.translate(getPaddingLeft(), 0);
+
+        paint.setColor(colors[EditorColors.COLOR_SELECTION]);
+
+        Editable text = getText();
+
+        for (int line = currentLine; line <= endLine; line++) {
+
+            if (line < beginLine) continue;
+            if (line > this.endLine) break;
+
+            if (line == endLine || line == currentLine) {
+                int lineStart = textLayout.getLineStart(line);
+                float x = 0;
+
+                if (lineStart <= start) {
+                    x = paint.measureText(text, lineStart, start);
+                    lineStart = start;
+                }
+                float width;
+                if (line < endLine) {
+                    width = contentWidth;
+                } else {
+                    width = paint.measureText(text, lineStart, end);
+                }
+
+                canvas.drawRect(x, lineHeight * line, x + width, (lineHeight * line) + lineHeight, paint);
+            } else {
+                canvas.drawRect(0, lineHeight * line, contentWidth, (lineHeight * line) + lineHeight, paint);
+            }
+        }
+        canvas.translate(-getPaddingLeft(), 0);
+    }
+
+    public int applyAlphaToColor(int color, int alpha) {
+        return Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color));
+    }
+
+    protected void onVisibleContentChanged(int index, int length) {
+        requireUpdate = false;
+
+        Arrays.fill(syntaxBuffer, (byte) 0);
+        if (length > 0) {
+            onRefreshColorScheme(syntaxBuffer, index, length);
+        }
+    }
+
+    protected void onRefreshColorScheme(byte[] buffer, int index, int length) {
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        if (currentWidth != getMeasuredWidth() || currentHeight != getMeasuredHeight()) {
+            currentWidth = getMeasuredWidth();
+            currentHeight = getMeasuredHeight();
+            invalidateAll();
+        }
+    }
+
+    protected void invalidateAll() {
+        requireUpdate = true;
+        invalidate();
+    }
+
+    @Override
+    protected void onTextChanged() {
+        requireUpdate = true;
+        super.onTextChanged();
+    }
+}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/BasicTextEditor.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/BasicTextEditor.java
new file mode 100644
index 00000000..1d497656
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/BasicTextEditor.java
@@ -0,0 +1,154 @@
+package com.panda3ds.pandroid.view.code;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.GestureDetector;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.inputmethod.EditorInfo;
+import android.widget.Scroller;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatEditText;
+
+import com.panda3ds.pandroid.view.SimpleTextWatcher;
+
+public class BasicTextEditor extends AppCompatEditText {
+    private GestureDetector gestureDetector;
+    private final Rect visibleRect = new Rect();
+
+    public BasicTextEditor(@NonNull Context context) {
+        super(context);
+        initialize();
+    }
+
+    public BasicTextEditor(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initialize();
+    }
+
+    public BasicTextEditor(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initialize();
+    }
+
+    protected void initialize() {
+        setTypeface(Typeface.MONOSPACE);
+        gestureDetector = new GestureDetector(getContext(), new ScrollGesture());
+
+        setTypeface(Typeface.createFromAsset(getContext().getAssets(), "fonts/comic_mono.ttf"));
+        setGravity(Gravity.START | Gravity.TOP);
+        setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+        setLineSpacing(0, 1.3f);
+        setScroller(new Scroller(getContext()));
+
+        setInputType(InputType.TYPE_CLASS_TEXT |
+                InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS |
+                InputType.TYPE_TEXT_FLAG_IME_MULTI_LINE |
+                InputType.TYPE_TEXT_FLAG_MULTI_LINE |
+                InputType.TYPE_TEXT_FLAG_AUTO_CORRECT);
+
+        setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
+        setBackgroundColor(Color.BLACK);
+        setTextColor(Color.WHITE);
+
+        setFocusableInTouchMode(true);
+        setHorizontallyScrolling(true);
+        setHorizontalScrollBarEnabled(true);
+
+        addTextChangedListener((SimpleTextWatcher) value -> BasicTextEditor.this.onTextChanged());
+    }
+
+    // Disable default Android scroll
+    @Override
+    public void scrollBy(int x, int y) {}
+
+    @Override
+    public void scrollTo(int x, int y) {}
+
+    public void setScroll(int x, int y) {
+        x = Math.max(0, x);
+        y = Math.max(0, y);
+
+        int maxHeight = Math.round(getLineCount() * getLineHeight());
+        getGlobalVisibleRect(visibleRect);
+        maxHeight = Math.max(0, maxHeight - visibleRect.height());
+
+        int maxWidth = (int) getPaint().measureText(getText(), 0, length());
+        maxWidth += getPaddingLeft() + getPaddingRight();
+
+        int scrollX = x - Math.max(Math.min(maxWidth - visibleRect.width(), x), 0);
+        int scrollY = Math.min(maxHeight, y);
+
+        super.scrollTo(scrollX, scrollY);
+    }
+
+    public void adjustScroll(){
+        setScroll(getScrollX(), getScrollY());
+    }
+
+    protected void onTextChanged() {}
+
+    private boolean onSuperTouchListener(MotionEvent event) {
+        return super.onTouchEvent(event);
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        return gestureDetector.onTouchEvent(event);
+    }
+
+    private class ScrollGesture implements GestureDetector.OnGestureListener {
+        @Override
+        public boolean onDown(@NonNull MotionEvent e) {
+            return true;
+        }
+
+        @Override
+        public void onShowPress(@NonNull MotionEvent e) {
+            onSuperTouchListener(e);
+        }
+
+        @Override
+        public boolean onSingleTapUp(@NonNull MotionEvent e) {
+            return onSuperTouchListener(e);
+        }
+
+        @Override
+        public boolean onScroll(@NonNull MotionEvent e1, @NonNull MotionEvent e2, float distanceX, float distanceY) {
+            int scrollX = (int) Math.max(0, getScrollX() + distanceX);
+            int scrollY = (int) Math.max(0, getScrollY() + distanceY);
+            setScroll(scrollX, scrollY);
+            return true;
+        }
+
+        @Override
+        public void onLongPress(@NonNull MotionEvent e) {
+            onSuperTouchListener(e);
+        }
+
+        @Override
+        public boolean onFling(@NonNull MotionEvent e1, @NonNull MotionEvent e2, float velocityX, float velocityY) {
+            return false;
+        }
+    }
+
+    public void insert(CharSequence text) {
+        if (getSelectionStart() == getSelectionEnd()) {
+            getText().insert(getSelectionStart(), text);
+        } else {
+            getText().replace(getSelectionStart(), getSelectionEnd(), text);
+        }
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/CodeEditor.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/CodeEditor.java
new file mode 100644
index 00000000..96a8637b
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/CodeEditor.java
@@ -0,0 +1,51 @@
+package com.panda3ds.pandroid.view.code;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import com.panda3ds.pandroid.view.code.syntax.CodeSyntax;
+
+public class CodeEditor extends BaseEditor {
+    private CodeSyntax syntax;
+    private Runnable contentChangeListener;
+
+    public CodeEditor(Context context) {
+        super(context);
+    }
+
+    public CodeEditor(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public CodeEditor(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public void setSyntax(CodeSyntax syntax) {
+        this.syntax = syntax;
+        invalidateAll();
+    }
+
+    public void setOnContentChangedListener(Runnable contentChangeListener) {
+        this.contentChangeListener = contentChangeListener;
+    }
+
+    @Override
+    protected void onTextChanged() {
+        super.onTextChanged();
+        if (contentChangeListener != null) {
+            contentChangeListener.run();
+        }
+    }
+
+    @Override
+    protected void onRefreshColorScheme(byte[] buffer, int index, int length) {
+        super.onRefreshColorScheme(buffer, index, length);
+
+        if (syntax != null) {
+            final CharSequence text = getText().subSequence(index, index + length);
+            syntax.apply(syntaxBuffer, text);
+            System.gc();
+        }
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/EditorColors.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/EditorColors.java
new file mode 100644
index 00000000..3b12ddf9
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/EditorColors.java
@@ -0,0 +1,63 @@
+package com.panda3ds.pandroid.view.code;
+
+import android.content.Context;
+
+import com.panda3ds.pandroid.app.PandroidApplication;
+
+public class EditorColors {
+    public static final byte COLOR_TEXT = 0x0;
+    public static final byte COLOR_KEYWORDS = 0x1;
+    public static final byte COLOR_NUMBERS = 0x2;
+    public static final byte COLOR_STRING = 0x3;
+    public static final byte COLOR_METADATA = 0x4;
+    public static final byte COLOR_COMMENT = 0x5;
+    public static final byte COLOR_SYMBOLS = 0x6;
+    public static final byte COLOR_FIELDS = 0x7;
+    public static final byte COLOR_BACKGROUND = 0x1D;
+    public static final byte COLOR_BACKGROUND_SECONDARY = 0x2D;
+    public static final byte COLOR_SELECTION = 0x3D;
+    public static final byte COLOR_CARET = 0x4D;
+    public static final byte COLOR_CURRENT_LINE = 0x5D;
+
+    public static void obtainColorScheme(int[] colors, Context context) {
+        if (PandroidApplication.isDarkMode()) {
+            applyDarkTheme(colors);
+        } else {
+            applyLightTheme(colors);
+        }
+    }
+
+    private static void applyLightTheme(int[] colors) {
+        colors[EditorColors.COLOR_TEXT] = 0xFF000000;
+        colors[EditorColors.COLOR_KEYWORDS] = 0xFF3AE666;
+        colors[EditorColors.COLOR_NUMBERS] = 0xFF3A9EE6;
+        colors[EditorColors.COLOR_METADATA] = 0xFF806AE6;
+        colors[EditorColors.COLOR_SYMBOLS] = 0xFF202020;
+        colors[EditorColors.COLOR_STRING] = 0xFF2EB541;
+        colors[EditorColors.COLOR_FIELDS] = 0xFF9876AA;
+        colors[EditorColors.COLOR_COMMENT] = 0xFF808080;
+
+        colors[EditorColors.COLOR_BACKGROUND] = 0xFFFFFFFF;
+        colors[EditorColors.COLOR_BACKGROUND_SECONDARY] = 0xFFF0F0F0;
+        colors[EditorColors.COLOR_SELECTION] = 0x701F9EDE;
+        colors[EditorColors.COLOR_CARET] = 0xFF000000;
+        colors[EditorColors.COLOR_CURRENT_LINE] = 0x05000050;
+    }
+
+    private static void applyDarkTheme(int[] colors) {
+        colors[EditorColors.COLOR_TEXT] = 0xFFFFFFFF;
+        colors[EditorColors.COLOR_KEYWORDS] = 0xFFE37F3E;
+        colors[EditorColors.COLOR_NUMBERS] = 0xFF3A9EE6;
+        colors[EditorColors.COLOR_METADATA] = 0xFFC5CA1D;
+        colors[EditorColors.COLOR_SYMBOLS] = 0xFFC0C0C0;
+        colors[EditorColors.COLOR_STRING] = 0xFF2EB541;
+        colors[EditorColors.COLOR_FIELDS] = 0xFF9876AA;
+        colors[EditorColors.COLOR_COMMENT] = 0xFFBBBBBB;
+
+        colors[EditorColors.COLOR_BACKGROUND] = 0xFF2B2B2B;
+        colors[EditorColors.COLOR_BACKGROUND_SECONDARY] = 0xFF313335;
+        colors[EditorColors.COLOR_SELECTION] = 0x701F9EDE;
+        colors[EditorColors.COLOR_CARET] = 0x60FFFFFF;
+        colors[EditorColors.COLOR_CURRENT_LINE] = 0x10FFFFFF;
+    }
+}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/syntax/CodeSyntax.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/syntax/CodeSyntax.java
new file mode 100644
index 00000000..6c50865f
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/syntax/CodeSyntax.java
@@ -0,0 +1,21 @@
+package com.panda3ds.pandroid.view.code.syntax;
+
+public abstract class CodeSyntax {
+    public abstract void apply(byte[] syntaxBuffer, final CharSequence text);
+
+    // Get syntax highlighting data for a file based on its filename, by looking at the extension
+    public static CodeSyntax getFromFilename(String name) {
+        name = name.trim().toLowerCase();
+        String[] parts = name.split("\\.");
+        if (parts.length == 0)
+            return null;
+
+        // Get syntax based on file extension
+        switch (parts[parts.length - 1]) {
+            case "lua":
+                return new LuaSyntax();
+            default:
+                return null;
+        }
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/syntax/LuaSyntax.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/syntax/LuaSyntax.java
new file mode 100644
index 00000000..d53fb1d7
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/syntax/LuaSyntax.java
@@ -0,0 +1,58 @@
+package com.panda3ds.pandroid.view.code.syntax;
+
+import com.panda3ds.pandroid.view.code.EditorColors;
+
+import java.util.Arrays;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+class LuaSyntax extends CodeSyntax {
+    public static final Pattern comment = Pattern.compile("(\\-\\-.*)");
+
+    public static final Pattern keywords = PatternUtils.buildGenericKeywords(
+            "and", "break", "do", "else", "elseif", "end", "false", "for", "function", "if", "in",
+            "local", "nil", "not", "or", "repeat", "return", "then", "true", "until", "while");
+
+    public static final Pattern identifiers = PatternUtils.buildGenericKeywords(
+            "assert", "collectgarbage", "dofile", "error", "getmetatable", "ipairs", "loadfile", "load", "loadstring", "next", "pairs", "pcall", "print", "rawequal", "rawlen", "rawget", "rawset",
+            "select", "setmetatable", "tonumber", "tostring", "type", "xpcall", "_G", "_VERSION", "arshift", "band", "bnot", "bor", "bxor", "btest", "extract", "lrotate", "lshift", "replace",
+            "rrotate", "rshift", "create", "resume", "running", "status", "wrap", "yield", "isyieldable", "debug", "getuservalue", "gethook", "getinfo", "getlocal", "getregistry", "getmetatable",
+            "getupvalue", "upvaluejoin", "upvalueid", "setuservalue", "sethook", "setlocal", "setmetatable", "setupvalue", "traceback", "close", "flush", "input", "lines", "open", "output", "popen",
+            "read", "tmpfile", "type", "write", "close", "flush", "lines", "read", "seek", "setvbuf", "write", "__gc", "__tostring", "abs", "acos", "asin", "atan", "ceil", "cos", "deg", "exp", "tointeger",
+            "floor", "fmod", "ult", "log", "max", "min", "modf", "rad", "random", "randomseed", "sin", "sqrt", "string", "tan", "type", "atan2", "cosh", "sinh", "tanh",
+            "pow", "frexp", "ldexp", "log10", "pi", "huge", "maxinteger", "mininteger", "loadlib", "searchpath", "seeall", "preload", "cpath", "path", "searchers", "loaded", "module", "require", "clock",
+            "date", "difftime", "execute", "exit", "getenv", "remove", "rename", "setlocale", "time", "tmpname", "byte", "char", "dump", "find", "format", "gmatch", "gsub", "len", "lower", "match", "rep",
+            "reverse", "sub", "upper", "pack", "packsize", "unpack", "concat", "maxn", "insert", "pack", "unpack", "remove", "move", "sort", "offset", "codepoint", "char", "len", "codes", "charpattern",
+            "coroutine", "table", "io", "os", "string", "uint8_t", "bit32", "math", "debug", "package");
+
+    public static final Pattern string = Pattern.compile("((\")(.*?)([^\\\\]\"))|((\")(.+))|((')(.?)('))");
+    public static final Pattern symbols = Pattern.compile("([.!&?:;*+/{}()\\]\\[,=-])");
+    public static final Pattern numbers = Pattern.compile("\\b((\\d*[.]?\\d+([Ee][+-]?[\\d]+)?[LlfFdD]?)|(0[xX][0-9a-zA-Z]+)|(0[bB][0-1]+)|(0[0-7]+))\\b");
+
+    @Override
+    public void apply(byte[] syntaxBuffer, CharSequence text) {
+        for (Matcher matcher = keywords.matcher(text); matcher.find(); ) {
+            Arrays.fill(syntaxBuffer, matcher.start(), matcher.end(), EditorColors.COLOR_KEYWORDS);
+        }
+
+        for (Matcher matcher = identifiers.matcher(text); matcher.find(); ) {
+            Arrays.fill(syntaxBuffer, matcher.start(), matcher.end(), EditorColors.COLOR_FIELDS);
+        }
+
+        for (Matcher matcher = symbols.matcher(text); matcher.find(); ) {
+            Arrays.fill(syntaxBuffer, matcher.start(), matcher.end(), EditorColors.COLOR_SYMBOLS);
+        }
+
+        for (Matcher matcher = numbers.matcher(text); matcher.find(); ) {
+            Arrays.fill(syntaxBuffer, matcher.start(), matcher.end(), EditorColors.COLOR_NUMBERS);
+        }
+
+        for (Matcher matcher = string.matcher(text); matcher.find(); ) {
+            Arrays.fill(syntaxBuffer, matcher.start(), matcher.end(), EditorColors.COLOR_STRING);
+        }
+
+        for (Matcher matcher = comment.matcher(text); matcher.find(); ) {
+            Arrays.fill(syntaxBuffer, matcher.start(), matcher.end(), EditorColors.COLOR_COMMENT);
+        }
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/syntax/PatternUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/syntax/PatternUtils.java
new file mode 100644
index 00000000..e3e5128a
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/code/syntax/PatternUtils.java
@@ -0,0 +1,18 @@
+package com.panda3ds.pandroid.view.code.syntax;
+
+import java.util.regex.Pattern;
+
+class PatternUtils {
+    public static Pattern buildGenericKeywords(String... keywords){
+        StringBuilder builder = new StringBuilder();
+        builder.append("\\b(");
+        for (int i = 0; i < keywords.length; i++){
+            builder.append(keywords[i]);
+            if (i+1 != keywords.length){
+                builder.append("|");
+            }
+        }
+        builder.append(")\\b");
+        return Pattern.compile(builder.toString());
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GamesGridView.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GamesGridView.java
index d218d467..24e65e2f 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GamesGridView.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/gamesgrid/GamesGridView.java
@@ -5,15 +5,14 @@ import android.util.AttributeSet;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.panda3ds.pandroid.data.game.GameMetadata;
+import com.panda3ds.pandroid.view.recycler.AutoFitGridLayout;
 
 import java.util.List;
 
 public class GamesGridView extends RecyclerView {
-    private int iconSize = 170;
     private final GameAdapter adapter;
 
     public GamesGridView(@NonNull Context context) {
@@ -26,33 +25,11 @@ public class GamesGridView extends RecyclerView {
 
     public GamesGridView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        setLayoutManager(new AutoFitLayout());
+        setLayoutManager(new AutoFitGridLayout(getContext(), 170));
         setAdapter(adapter = new GameAdapter());
     }
 
     public void setGameList(List<GameMetadata> games) {
         adapter.replace(games);
     }
-
-    public void setIconSize(int iconSize) {
-        this.iconSize = iconSize;
-        requestLayout();
-        measure(MeasureSpec.EXACTLY, MeasureSpec.EXACTLY);
-    }
-
-    private final class AutoFitLayout extends GridLayoutManager {
-        public AutoFitLayout() {
-            super(GamesGridView.this.getContext(), 1);
-        }
-
-        @Override
-        public void onMeasure(@NonNull Recycler recycler, @NonNull State state, int widthSpec, int heightSpec) {
-            super.onMeasure(recycler, state, widthSpec, heightSpec);
-            int width = getMeasuredWidth();
-            int iconSize = (int) (GamesGridView.this.iconSize * getResources().getDisplayMetrics().density);
-            int iconCount = Math.max(1, width / iconSize);
-            if (getSpanCount() != iconCount)
-                setSpanCount(iconCount);
-        }
-    }
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/recycler/AutoFitGridLayout.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/recycler/AutoFitGridLayout.java
new file mode 100644
index 00000000..26f80adb
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/recycler/AutoFitGridLayout.java
@@ -0,0 +1,33 @@
+package com.panda3ds.pandroid.view.recycler;
+
+import android.content.Context;
+import android.util.TypedValue;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+public final class AutoFitGridLayout extends GridLayoutManager {
+    private final int iconSize;
+    private final Context context;
+
+    public AutoFitGridLayout(Context context, int iconSize) {
+        super(context, 1);
+
+        this.iconSize = iconSize;
+        this.context = context;
+    }
+
+    @Override
+    public void onMeasure(@NonNull RecyclerView.Recycler recycler, @NonNull RecyclerView.State state, int widthSpec, int heightSpec) {
+        super.onMeasure(recycler, state, widthSpec, heightSpec);
+        int width = View.MeasureSpec.getSize(widthSpec);
+        int iconSize = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, this.iconSize, context.getResources().getDisplayMetrics());
+        int iconCount = Math.max(1, width / iconSize);
+        
+        if (getSpanCount() != iconCount) {
+            setSpanCount(iconCount);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/recycler/SimpleListAdapter.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/recycler/SimpleListAdapter.java
new file mode 100644
index 00000000..7d4fa7c3
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/recycler/SimpleListAdapter.java
@@ -0,0 +1,76 @@
+package com.panda3ds.pandroid.view.recycler;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+
+public class SimpleListAdapter<T> extends RecyclerView.Adapter<SimpleListAdapter.Holder> {
+    private final ArrayList<T> list = new ArrayList<>();
+    private final Binder<T> binder;
+    private final int layoutId;
+
+    public SimpleListAdapter(@LayoutRes int layoutId, Binder<T> binder) {
+        this.layoutId = layoutId;
+        this.binder = binder;
+    }
+
+    @NonNull
+    @Override
+    public Holder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new Holder(LayoutInflater.from(parent.getContext()).inflate(layoutId, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull Holder holder, int position) {
+        binder.bind(position, list.get(position), holder.getView());
+    }
+
+    public void addAll(T... items) {
+        addAll(Arrays.asList(items));
+    }
+
+    public void addAll(List<T> items) {
+        int index = list.size();
+        this.list.addAll(items);
+        notifyItemRangeInserted(index, getItemCount() - index);
+    }
+
+    public void clear() {
+        int count = getItemCount();
+        list.clear();
+        notifyItemRangeRemoved(0, count);
+    }
+
+    public void sort(Comparator<T> comparator) {
+        list.sort(comparator);
+        notifyItemRangeChanged(0, getItemCount());
+    }
+
+    @Override
+    public int getItemCount() {
+        return list.size();
+    }
+
+    public interface Binder<I> {
+        void bind(int position, I item, View view);
+    }
+
+    public static class Holder extends RecyclerView.ViewHolder {
+        public Holder(@NonNull View itemView) {
+            super(itemView);
+        }
+
+        public View getView() {
+            return itemView;
+        }
+    }
+}
diff --git a/src/pandroid/app/src/main/res/drawable/ic_code.xml b/src/pandroid/app/src/main/res/drawable/ic_code.xml
new file mode 100644
index 00000000..8ef40bd2
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_code.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_edit.xml b/src/pandroid/app/src/main/res/drawable/ic_edit.xml
new file mode 100644
index 00000000..1c9bd3e6
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_edit.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_keyboard_hide.xml b/src/pandroid/app/src/main/res/drawable/ic_keyboard_hide.xml
new file mode 100644
index 00000000..d4e7929b
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_keyboard_hide.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,3L4,3c-1.1,0 -1.99,0.9 -1.99,2L2,15c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,5c0,-1.1 -0.9,-2 -2,-2zM11,6h2v2h-2L11,6zM11,9h2v2h-2L11,9zM8,6h2v2L8,8L8,6zM8,9h2v2L8,11L8,9zM7,11L5,11L5,9h2v2zM7,8L5,8L5,6h2v2zM16,15L8,15v-2h8v2zM16,11h-2L14,9h2v2zM16,8h-2L14,6h2v2zM19,11h-2L17,9h2v2zM19,8h-2L17,6h2v2zM12,23l4,-4L8,19l4,4z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_play.xml b/src/pandroid/app/src/main/res/drawable/ic_play.xml
new file mode 100644
index 00000000..d75d7da3
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_play.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M8,6.82v10.36c0,0.79 0.87,1.27 1.54,0.84l8.14,-5.18c0.62,-0.39 0.62,-1.29 0,-1.69L9.54,5.98C8.87,5.55 8,6.03 8,6.82z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_tab.xml b/src/pandroid/app/src/main/res/drawable/ic_tab.xml
new file mode 100644
index 00000000..3f7efd95
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_tab.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11.59,7.41L15.17,11H1v2h14.17l-3.59,3.59L13,18l6,-6 -6,-6 -1.41,1.41zM20,6v12h2V6h-2z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/layout/activity_code_editor.xml b/src/pandroid/app/src/main/res/layout/activity_code_editor.xml
new file mode 100644
index 00000000..5cef8609
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/activity_code_editor.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="58dp"
+            android:orientation="horizontal">
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:gravity="start|center"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/app_name"
+                    android:textSize="17sp"/>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:gravity="end|center"
+                android:paddingLeft="14dp"
+                android:paddingRight="14dp">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/save"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:padding="5dp"
+                    android:tint="?colorOnSurface"
+                    app:srcCompat="@drawable/ic_save"
+                    android:scaleType="centerInside"
+                    android:background="#0000"/>
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/lua_toolbar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:visibility="gone">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/lua_play"
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:padding="5dp"
+                        android:layout_marginHorizontal="5dp"
+                        android:tint="?colorOnSurface"
+                        app:srcCompat="@drawable/ic_play"
+                        android:scaleType="centerInside"
+                        android:background="#0000"/>
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?colorOnSurface"
+            android:alpha="0.1"/>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <com.panda3ds.pandroid.view.code.CodeEditor
+                android:id="@+id/editor"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/keybar"/>
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/keybar"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintHeight="38dp"
+                android:visibility="visible"
+                android:orientation="horizontal"
+                android:background="?colorSurfaceVariant">
+
+
+                <androidx.appcompat.widget.AppCompatImageButton
+                    android:id="@+id/key_tab"
+                    android:layout_width="75dp"
+                    android:layout_height="match_parent"
+                    android:padding="0dp"
+                    android:layout_marginEnd="10dp"
+                    android:src="@drawable/ic_tab"
+                    android:tint="?colorOnSurfaceVariant"
+                    android:background="#0000"/>
+
+
+                <androidx.appcompat.widget.AppCompatImageButton
+                    android:id="@+id/key_hide"
+                    android:layout_width="75dp"
+                    android:layout_height="match_parent"
+                    android:padding="0dp"
+                    android:layout_marginEnd="10dp"
+                    android:src="@drawable/ic_keyboard_hide"
+                    android:tint="?colorOnSurfaceVariant"
+                    android:background="#0000"/>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/dialog_lua_scripts.xml b/src/pandroid/app/src/main/res/layout/dialog_lua_scripts.xml
new file mode 100644
index 00000000..69a9d0a4
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/dialog_lua_scripts.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_marginTop="10dp"
+    android:layout_marginBottom="10dp">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingBottom="100dp">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layout_constrainedHeight="true"
+                app:layout_constraintHeight_max="400dp"
+                app:layout_constraintHeight_min="200dp"
+                tools:itemCount="5"
+                tools:listitem="@layout/holder_lua_script"
+                android:layout_marginBottom="10dp" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:orientation="vertical"
+            android:layout_gravity="bottom|center">
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/open_file"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:text="@string/open_file"
+                android:layout_margin="5dp"
+                android:textColor="?colorOnPrimary"
+                android:backgroundTint="?colorPrimary"
+                android:background="@drawable/simple_card_background"/>
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/create"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:text="@string/create_new"
+                android:layout_margin="5dp"
+                android:textColor="?colorOnSurfaceVariant"
+                android:backgroundTint="?colorSurfaceVariant"
+                android:background="@drawable/simple_card_background"
+                android:layout_marginBottom="10dp"/>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+    </FrameLayout>
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml b/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml
index 2da6b9c8..fa81a503 100644
--- a/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml
+++ b/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml
@@ -85,6 +85,19 @@
                 app:menu="@menu/game_drawer_actions"
                 android:background="?colorSurface"/>
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/others"
+                style="@style/TextAppearanceGameDrawerSubTitle"/>
+
+            <com.google.android.material.navigation.NavigationView
+                android:id="@+id/others_navigation"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:menu="@menu/game_drawer_others"
+                android:background="?colorSurface"/>
+
         </androidx.appcompat.widget.LinearLayoutCompat>
 
     </ScrollView>
diff --git a/src/pandroid/app/src/main/res/layout/holder_lua_script.xml b/src/pandroid/app/src/main/res/layout/holder_lua_script.xml
new file mode 100644
index 00000000..a1865c3f
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/holder_lua_script.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="start|center"
+    android:padding="5dp">
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/simple_card_background"
+        android:backgroundTint="?colorSurfaceVariant"
+        android:orientation="vertical"
+        android:gravity="center"
+        android:padding="10dp">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_marginHorizontal="5dp"
+            android:scaleType="fitCenter"
+            android:tint="?colorOnSurfaceVariant"
+            android:alpha="0.5"
+            android:padding="14dp"
+            android:src="@drawable/ic_code"
+            android:layout_marginBottom="14dp"/>
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/app_name"
+            android:textSize="15sp"
+            android:gravity="center"/>
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/edit"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:src="@drawable/ic_edit"
+        android:scaleType="fitCenter"
+        android:padding="10dp"
+        android:tint="?colorOnSurfaceVariant"
+        android:layout_gravity="end|top"
+        android:background="#0000"
+        android:layout_margin="10dp"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/menu/game_drawer_others.xml b/src/pandroid/app/src/main/res/menu/game_drawer_others.xml
new file mode 100644
index 00000000..b6dd4897
--- /dev/null
+++ b/src/pandroid/app/src/main/res/menu/game_drawer_others.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/lua_script"
+        android:icon="@drawable/ic_code"
+        android:title="@string/lua_script"/>
+</menu>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
index 18edc50f..065b9e4f 100644
--- a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
+++ b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
@@ -35,4 +35,14 @@
     <string name="pref_screen_controllers_title">Disposições de controle</string>
     <string name="pref_default_controller_title">Disposição de controle padrão</string>
     <string name="invalid_name">Nome Invalido</string>
+    <string name="hacks">Trapaças</string>
+    <string name="lua_script">Script Lua</string>
+    <string name="scripts">Scripts</string>
+    <string name="file_not_supported">Esse arquivo não é suportado</string>
+    <string name="save_and_exit">Salvar e sair</string>
+    <string name="exit_without_saving">Sair sem salvar</string>
+    <string name="exit_without_saving_title_ff">Salvar \"%s\" antes de sair?</string>
+    <string name="open_file">Abrir arquivo</string>
+    <string name="create_new">Criar novo</string>
+    <string name="running_ff">Executando \"%s\" ...</string>
 </resources>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/values/strings.xml b/src/pandroid/app/src/main/res/values/strings.xml
index f8e2098a..e0de62e1 100644
--- a/src/pandroid/app/src/main/res/values/strings.xml
+++ b/src/pandroid/app/src/main/res/values/strings.xml
@@ -36,4 +36,14 @@
     <string name="pref_screen_controllers_title">Screen gamepad layouts</string>
     <string name="pref_default_controller_title">Default screen gamepad layout</string>
     <string name="invalid_name">Invalid name</string>
+    <string name="hacks">Hacks</string>
+    <string name="lua_script">Lua script</string>
+    <string name="scripts">Scripts</string>
+    <string name="file_not_supported">File type isn\'t supported</string>
+    <string name="save_and_exit">Save and exit</string>
+    <string name="exit_without_saving">Exit without saving</string>
+    <string name="exit_without_saving_title_ff">Exit without saving \"%s\"?</string>
+    <string name="open_file">Open file</string>
+    <string name="create_new">Create new</string>
+    <string name="running_ff">Running \"%s\" ...</string>
 </resources>

From 7343497f36820ac914f57c60fb98fcb19c93fa88 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 20 Jan 2024 23:17:35 +0200
Subject: [PATCH 118/162] Add basic scheduler structure

---
 CMakeLists.txt                |  2 +-
 include/cpu_dynarmic.hpp      | 16 ++++++-----
 include/scheduler.hpp         | 50 +++++++++++++++++++++++++++++++++++
 src/core/CPU/cpu_dynarmic.cpp | 45 +++++++++++++++++--------------
 4 files changed, 85 insertions(+), 28 deletions(-)
 create mode 100644 include/scheduler.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4b1503a..e557c5c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -244,7 +244,7 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.hpp
                  include/services/news_u.hpp include/applets/software_keyboard.hpp include/applets/applet_manager.hpp include/fs/archive_user_save_data.hpp
                  include/services/amiibo_device.hpp include/services/nfc_types.hpp include/swap.hpp include/services/csnd.hpp include/services/nwm_uds.hpp
                  include/fs/archive_system_save_data.hpp include/lua_manager.hpp include/memory_mapped_file.hpp include/hydra_icon.hpp
-                 include/PICA/dynapica/shader_rec_emitter_arm64.hpp
+                 include/PICA/dynapica/shader_rec_emitter_arm64.hpp include/scheduler.hpp
 )
 
 cmrc_add_resource_library(
diff --git a/include/cpu_dynarmic.hpp b/include/cpu_dynarmic.hpp
index 8f1e277b..e45705de 100644
--- a/include/cpu_dynarmic.hpp
+++ b/include/cpu_dynarmic.hpp
@@ -9,6 +9,7 @@
 #include "helpers.hpp"
 #include "kernel.hpp"
 #include "memory.hpp"
+#include "scheduler.hpp"
 
 class CPU;
 
@@ -112,15 +113,16 @@ public:
 };
 
 class CPU {
-    std::unique_ptr<Dynarmic::A32::Jit> jit;
-    std::shared_ptr<CP15> cp15;
+	std::unique_ptr<Dynarmic::A32::Jit> jit;
+	std::shared_ptr<CP15> cp15;
 
-    // Make exclusive monitor with only 1 CPU core
-    Dynarmic::ExclusiveMonitor exclusiveMonitor{1};
-    MyEnvironment env;
-    Memory& mem;
+	// Make exclusive monitor with only 1 CPU core
+	Dynarmic::ExclusiveMonitor exclusiveMonitor{1};
+	MyEnvironment env;
+	Memory& mem;
+	Scheduler scheduler;
 
-public:
+  public:
     static constexpr u64 ticksPerSec = 268111856;
 
     CPU(Memory& mem, Kernel& kernel);
diff --git a/include/scheduler.hpp b/include/scheduler.hpp
new file mode 100644
index 00000000..e941259c
--- /dev/null
+++ b/include/scheduler.hpp
@@ -0,0 +1,50 @@
+#pragma once
+#include <boost/container/flat_map.hpp>
+#include <boost/container/static_vector.hpp>
+#include <limits>
+#include <ranges>
+
+#include "helpers.hpp"
+
+struct Scheduler {
+	enum class EventType {
+		VBlank = 0,          // End of frame event
+		Panic = 1,           // Dummy event that is always pending and should never be triggered (Timestamp = UINT64_MAX)
+		TotalNumberOfEvents  // How many event types do we have in total?
+	};
+	static constexpr usize totalNumberOfEvents = static_cast<usize>(EventType::TotalNumberOfEvents);
+
+	template <typename Key, typename Val, usize size>
+	using EventMap = boost::container::flat_multimap<Key, Val, std::less<Key>, boost::container::static_vector<std::pair<Key, Val>, size>>;
+
+	EventMap<u64, EventType, totalNumberOfEvents> events;
+	u64 currentTimestamp = 0;
+	u64 nextTimestamp = 0;
+
+	// Set nextTimestamp to the timestamp of the next event
+	void updateNextTimestamp() { nextTimestamp = events.cbegin()->first; }
+	void addCycles(u64 cycles) { currentTimestamp += cycles; }
+
+	void addEvent(EventType type, u64 timestamp) {
+		events.emplace(timestamp, type);
+		updateNextTimestamp();
+	}
+
+	void removeEvent(EventType type) {
+		auto it = std::ranges::find_if(events, [type](decltype(events)::const_reference pair) { return pair.second == type; });
+
+		if (it != events.end()) {
+			events.erase(it);
+			updateNextTimestamp();
+		}
+	};
+
+	void reset() {
+		currentTimestamp = 0;
+
+		// Clear any pending events
+		events.clear();
+		// Add a dummy event to always keep the scheduler non-empty
+		addEvent(EventType::Panic, std::numeric_limits<u64>::max());
+	}
+};
\ No newline at end of file
diff --git a/src/core/CPU/cpu_dynarmic.cpp b/src/core/CPU/cpu_dynarmic.cpp
index 29ca49d1..62e484be 100644
--- a/src/core/CPU/cpu_dynarmic.cpp
+++ b/src/core/CPU/cpu_dynarmic.cpp
@@ -1,32 +1,37 @@
 #ifdef CPU_DYNARMIC
 #include "cpu_dynarmic.hpp"
+
 #include "arm_defs.hpp"
 
 CPU::CPU(Memory& mem, Kernel& kernel) : mem(mem), env(mem, kernel) {
-    cp15 = std::make_shared<CP15>();
+	cp15 = std::make_shared<CP15>();
 
-    Dynarmic::A32::UserConfig config;
-    config.arch_version = Dynarmic::A32::ArchVersion::v6K;
-    config.callbacks = &env;
-    config.coprocessors[15] = cp15;
-    config.define_unpredictable_behaviour = true;
-    config.global_monitor = &exclusiveMonitor;
-    config.processor_id = 0;
-    
-    jit = std::make_unique<Dynarmic::A32::Jit>(config);
+	Dynarmic::A32::UserConfig config;
+	config.arch_version = Dynarmic::A32::ArchVersion::v6K;
+	config.callbacks = &env;
+	config.coprocessors[15] = cp15;
+	config.define_unpredictable_behaviour = true;
+	config.global_monitor = &exclusiveMonitor;
+	config.processor_id = 0;
+
+	jit = std::make_unique<Dynarmic::A32::Jit>(config);
 }
 
 void CPU::reset() {
-    setCPSR(CPSR::UserMode);
-    setFPSCR(FPSCR::MainThreadDefault);
-    env.totalTicks = 0;
+	setCPSR(CPSR::UserMode);
+	setFPSCR(FPSCR::MainThreadDefault);
+	env.totalTicks = 0;
 
-    cp15->reset();
-    cp15->setTLSBase(VirtualAddrs::TLSBase); // Set cp15 TLS pointer to the main thread's thread-local storage
-    jit->Reset();
-    jit->ClearCache();
-    jit->Regs().fill(0);
-    jit->ExtRegs().fill(0);
+	cp15->reset();
+	cp15->setTLSBase(VirtualAddrs::TLSBase);  // Set cp15 TLS pointer to the main thread's thread-local storage
+	jit->Reset();
+	jit->ClearCache();
+	jit->Regs().fill(0);
+	jit->ExtRegs().fill(0);
+
+	// Reset scheduler and add a VBlank event
+	scheduler.reset();
+	scheduler.addEvent(Scheduler::EventType::VBlank, ticksPerSec / 60);
 }
 
-#endif // CPU_DYNARMIC
\ No newline at end of file
+#endif  // CPU_DYNARMIC
\ No newline at end of file

From 75663d0601e4920b8164e810f76679d27e894867 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sun, 21 Jan 2024 22:27:04 +0200
Subject: [PATCH 119/162] More app folder utilities

---
 include/emulator.hpp         |  2 ++
 src/emulator.cpp             | 45 ++++++++++++++++++++----------------
 src/panda_qt/main_window.cpp | 11 +++++++--
 3 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/include/emulator.hpp b/include/emulator.hpp
index f4537425..da12c1bd 100644
--- a/include/emulator.hpp
+++ b/include/emulator.hpp
@@ -128,6 +128,8 @@ class Emulator {
 
 	std::filesystem::path getConfigPath();
 	std::filesystem::path getAndroidAppPath();
+	// Get the root path for the emulator's app data
+	std::filesystem::path getAppDataRoot();
 
 	std::span<u8> getSMDH();
 };
diff --git a/src/emulator.cpp b/src/emulator.cpp
index e94170a2..673e0ebc 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -117,6 +117,30 @@ void Emulator::runFrame() {
 	}
 }
 
+// Get path for saving files (AppData on Windows, /home/user/.local/share/ApplicationName on Linux, etc)
+// Inside that path, we be use a game-specific folder as well. Eg if we were loading a ROM called PenguinDemo.3ds, the savedata would be in
+// %APPDATA%/Alber/PenguinDemo/SaveData on Windows, and so on. We do this because games save data in their own filesystem on the cart.
+// If the portable build setting is enabled, then those saves go in the executable directory instead
+std::filesystem::path Emulator::getAppDataRoot() {
+	std::filesystem::path appDataPath;
+
+#ifdef __ANDROID__
+	appDataPath = getAndroidAppPath();
+#else
+	char* appData;
+	if (!config.usePortableBuild) {
+		appData = SDL_GetPrefPath(nullptr, "Alber");
+		appDataPath = std::filesystem::path(appData);
+	} else {
+		appData = SDL_GetBasePath();
+		appDataPath = std::filesystem::path(appData) / "Emulator Files";
+	}
+	SDL_free(appData);
+#endif
+
+	return appDataPath;
+}
+
 bool Emulator::loadROM(const std::filesystem::path& path) {
 	// Reset the emulator if we've already loaded a ROM
 	if (romType != ROMType::None) {
@@ -127,26 +151,7 @@ bool Emulator::loadROM(const std::filesystem::path& path) {
 	memory.loadedCXI = std::nullopt;
 	memory.loaded3DSX = std::nullopt;
 
-	// Get path for saving files (AppData on Windows, /home/user/.local/share/ApplicationName on Linux, etc)
-	// Inside that path, we be use a game-specific folder as well. Eg if we were loading a ROM called PenguinDemo.3ds, the savedata would be in
-	// %APPDATA%/Alber/PenguinDemo/SaveData on Windows, and so on. We do this because games save data in their own filesystem on the cart.
-	// If the portable build setting is enabled, then those saves go in the executable directory instead
-	std::filesystem::path appDataPath;
-
-	#ifdef __ANDROID__
-	appDataPath = getAndroidAppPath();
-	#else
-	char* appData;
-	if (!config.usePortableBuild) {
-		appData = SDL_GetPrefPath(nullptr, "Alber");
-		appDataPath = std::filesystem::path(appData);
-	} else {
-		appData = SDL_GetBasePath();
-		appDataPath = std::filesystem::path(appData) / "Emulator Files";
-	}
-	SDL_free(appData);
-	#endif
-
+	const std::filesystem::path appDataPath = getAppDataRoot();
 	const std::filesystem::path dataPath = appDataPath / path.filename().stem();
 	const std::filesystem::path aesKeysPath = appDataPath / "sysdata" / "aes_keys.txt";
 	IOFile::setAppDataDir(dataPath);
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index e390aa44..5c661119 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -1,6 +1,8 @@
 #include "panda_qt/main_window.hpp"
 
+#include <QDesktopServices>
 #include <QFileDialog>
+#include <QString>
 #include <cstdio>
 #include <fstream>
 
@@ -26,8 +28,14 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 	// Create and bind actions for them
 	auto loadGameAction = fileMenu->addAction(tr("Load game"));
 	auto loadLuaAction = fileMenu->addAction(tr("Load Lua script"));
+	auto openAppFolderAction = fileMenu->addAction(tr("Open Panda3DS folder"));
+
 	connect(loadGameAction, &QAction::triggered, this, &MainWindow::selectROM);
 	connect(loadLuaAction, &QAction::triggered, this, &MainWindow::selectLuaFile);
+	connect(openAppFolderAction, &QAction::triggered, this, [this]() {
+		QString path = QString::fromStdU16String(emu->getAppDataRoot().u16string());
+		QDesktopServices::openUrl(QUrl::fromLocalFile(path));
+	});
 
 	auto pauseAction = emulationMenu->addAction(tr("Pause"));
 	auto resumeAction = emulationMenu->addAction(tr("Resume"));
@@ -194,8 +202,7 @@ void MainWindow::dumpRomFS() {
 		return;
 	}
 	std::filesystem::path path(folder.toStdU16String());
-	
-	// TODO: This might break if the game accesses RomFS while we're dumping, we should move it to the emulator thread when we've got a message queue going
+
 	messageQueueMutex.lock();
 	RomFS::DumpingResult res = emu->dumpRomFS(path);
 	messageQueueMutex.unlock();

From 97f97dc6e27d5e0ec673d7bad624787510a865bd Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 22 Jan 2024 00:38:11 +0200
Subject: [PATCH 120/162] Use CPU for counting ticks instead of scheduler

---
 include/cpu_dynarmic.hpp      | 64 ++++++++++++++++++-----------------
 include/scheduler.hpp         |  4 ---
 src/core/CPU/cpu_dynarmic.cpp |  4 ++-
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/include/cpu_dynarmic.hpp b/include/cpu_dynarmic.hpp
index e45705de..a3fb3378 100644
--- a/include/cpu_dynarmic.hpp
+++ b/include/cpu_dynarmic.hpp
@@ -11,14 +11,16 @@
 #include "memory.hpp"
 #include "scheduler.hpp"
 
+class Emulator;
 class CPU;
 
 class MyEnvironment final : public Dynarmic::A32::UserCallbacks {
-public:
-    u64 ticksLeft = 0;
-    u64 totalTicks = 0;
-    Memory& mem;
-    Kernel& kernel;
+  public:
+	u64 ticksLeft = 0;
+	u64 totalTicks = 0;
+	Memory& mem;
+	Kernel& kernel;
+	Scheduler& scheduler;
 
     u64 getCyclesForInstruction(bool isThumb, u32 instruction);
 
@@ -77,39 +79,39 @@ public:
         std::terminate();
     }
 
-    void CallSVC(u32 swi) override {
-        kernel.serviceSVC(swi);
-    }
+	void CallSVC(u32 swi) override {
+		kernel.serviceSVC(swi);
+	}
 
-    void ExceptionRaised(u32 pc, Dynarmic::A32::Exception exception) override {
-        switch (exception) {
-            case Dynarmic::A32::Exception::UnpredictableInstruction:
-                Helpers::panic("Unpredictable instruction at pc = %08X", pc);
-                break;
+	void ExceptionRaised(u32 pc, Dynarmic::A32::Exception exception) override {
+		switch (exception) {
+			case Dynarmic::A32::Exception::UnpredictableInstruction:
+				Helpers::panic("Unpredictable instruction at pc = %08X", pc);
+				break;
 
-            default: Helpers::panic("Fired exception oops");
-        }
-    }
+			default: Helpers::panic("Fired exception oops");
+		}
+	}
 
-    void AddTicks(u64 ticks) override {
-        totalTicks += ticks;
+	void AddTicks(u64 ticks) override {
+		totalTicks += ticks;
 
-        if (ticks > ticksLeft) {
-            ticksLeft = 0;
-            return;
-        }
-        ticksLeft -= ticks;
-    }
+		if (ticks > ticksLeft) {
+			ticksLeft = 0;
+			return;
+		}
+		ticksLeft -= ticks;
+	}
 
-    u64 GetTicksRemaining() override {
-        return ticksLeft;
-    }
+	u64 GetTicksRemaining() override {
+		return ticksLeft;
+	}
 
-    u64 GetTicksForCode(bool isThumb, u32 vaddr, u32 instruction) override {
-        return getCyclesForInstruction(isThumb, instruction);
-    }
+	u64 GetTicksForCode(bool isThumb, u32 vaddr, u32 instruction) override {
+		return getCyclesForInstruction(isThumb, instruction);
+	}
 
-    MyEnvironment(Memory& mem, Kernel& kernel) : mem(mem), kernel(kernel) {}
+    MyEnvironment(Memory& mem, Kernel& kernel, Scheduler& scheduler) : mem(mem), kernel(kernel), scheduler(scheduler) {}
 };
 
 class CPU {
diff --git a/include/scheduler.hpp b/include/scheduler.hpp
index e941259c..3d2f582c 100644
--- a/include/scheduler.hpp
+++ b/include/scheduler.hpp
@@ -18,12 +18,10 @@ struct Scheduler {
 	using EventMap = boost::container::flat_multimap<Key, Val, std::less<Key>, boost::container::static_vector<std::pair<Key, Val>, size>>;
 
 	EventMap<u64, EventType, totalNumberOfEvents> events;
-	u64 currentTimestamp = 0;
 	u64 nextTimestamp = 0;
 
 	// Set nextTimestamp to the timestamp of the next event
 	void updateNextTimestamp() { nextTimestamp = events.cbegin()->first; }
-	void addCycles(u64 cycles) { currentTimestamp += cycles; }
 
 	void addEvent(EventType type, u64 timestamp) {
 		events.emplace(timestamp, type);
@@ -40,8 +38,6 @@ struct Scheduler {
 	};
 
 	void reset() {
-		currentTimestamp = 0;
-
 		// Clear any pending events
 		events.clear();
 		// Add a dummy event to always keep the scheduler non-empty
diff --git a/src/core/CPU/cpu_dynarmic.cpp b/src/core/CPU/cpu_dynarmic.cpp
index 62e484be..caf8a66e 100644
--- a/src/core/CPU/cpu_dynarmic.cpp
+++ b/src/core/CPU/cpu_dynarmic.cpp
@@ -3,7 +3,7 @@
 
 #include "arm_defs.hpp"
 
-CPU::CPU(Memory& mem, Kernel& kernel) : mem(mem), env(mem, kernel) {
+CPU::CPU(Memory& mem, Kernel& kernel) : mem(mem), env(mem, kernel, scheduler) {
 	cp15 = std::make_shared<CP15>();
 
 	Dynarmic::A32::UserConfig config;
@@ -32,6 +32,8 @@ void CPU::reset() {
 	// Reset scheduler and add a VBlank event
 	scheduler.reset();
 	scheduler.addEvent(Scheduler::EventType::VBlank, ticksPerSec / 60);
+
+	printf("%lld\n", scheduler.nextTimestamp);
 }
 
 #endif  // CPU_DYNARMIC
\ No newline at end of file

From fa82dad38d412b7710ea3d9187cf267555b85171 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 22 Jan 2024 02:29:14 +0200
Subject: [PATCH 121/162] First stuff running with scheduler

---
 include/cpu_dynarmic.hpp      | 30 ++++++--------------
 include/emulator.hpp          |  7 +++++
 include/scheduler.hpp         |  3 ++
 src/core/CPU/cpu_dynarmic.cpp | 30 ++++++++++++++++----
 src/emulator.cpp              | 52 +++++++++++++++++++++++++++++------
 5 files changed, 86 insertions(+), 36 deletions(-)

diff --git a/include/cpu_dynarmic.hpp b/include/cpu_dynarmic.hpp
index a3fb3378..1ec50d9e 100644
--- a/include/cpu_dynarmic.hpp
+++ b/include/cpu_dynarmic.hpp
@@ -94,7 +94,7 @@ class MyEnvironment final : public Dynarmic::A32::UserCallbacks {
 	}
 
 	void AddTicks(u64 ticks) override {
-		totalTicks += ticks;
+		scheduler.currentTimestamp += ticks;
 
 		if (ticks > ticksLeft) {
 			ticksLeft = 0;
@@ -111,7 +111,7 @@ class MyEnvironment final : public Dynarmic::A32::UserCallbacks {
 		return getCyclesForInstruction(isThumb, instruction);
 	}
 
-    MyEnvironment(Memory& mem, Kernel& kernel, Scheduler& scheduler) : mem(mem), kernel(kernel), scheduler(scheduler) {}
+	MyEnvironment(Memory& mem, Kernel& kernel, Scheduler& scheduler) : mem(mem), kernel(kernel), scheduler(scheduler) {}
 };
 
 class CPU {
@@ -122,12 +122,13 @@ class CPU {
 	Dynarmic::ExclusiveMonitor exclusiveMonitor{1};
 	MyEnvironment env;
 	Memory& mem;
-	Scheduler scheduler;
+	Scheduler& scheduler;
+	Emulator& emu;
 
   public:
     static constexpr u64 ticksPerSec = 268111856;
 
-    CPU(Memory& mem, Kernel& kernel);
+    CPU(Memory& mem, Kernel& kernel, Emulator& emu);
     void reset();
 
     void setReg(int index, u32 value) {
@@ -166,29 +167,14 @@ class CPU {
     }
 
     u64 getTicks() {
-        return env.totalTicks;
+        return scheduler.currentTimestamp;
     }
 
     // Get reference to tick count. Memory needs access to this
     u64& getTicksRef() {
-        return env.totalTicks;
+        return scheduler.currentTimestamp;
     }
 
     void clearCache() { jit->ClearCache(); }
-
-    void runFrame() {
-		env.ticksLeft = ticksPerSec / 60;
-	execute:
-		const auto exitReason = jit->Run();
-
-		if (static_cast<u32>(exitReason) != 0) [[unlikely]] {
-			// Cache invalidation needs to exit the JIT so it returns a CacheInvalidation HaltReason. In our case, we just go back to executing
-            // The goto might be terrible but it does guarantee that this does not recursively call run and crash, instead getting optimized to a jump
-			if (Dynarmic::Has(exitReason, Dynarmic::HaltReason::CacheInvalidation)) {
-				goto execute;
-			} else {
-				Helpers::panic("Exit reason: %d\nPC: %08X", static_cast<u32>(exitReason), getReg(15));
-			}
-		}
-	}
+    void runFrame();
 };
\ No newline at end of file
diff --git a/include/emulator.hpp b/include/emulator.hpp
index f4537425..55ed8499 100644
--- a/include/emulator.hpp
+++ b/include/emulator.hpp
@@ -15,6 +15,7 @@
 #include "io_file.hpp"
 #include "lua_manager.hpp"
 #include "memory.hpp"
+#include "scheduler.hpp"
 
 #ifdef PANDA3DS_ENABLE_HTTP_SERVER
 #include "http_server.hpp"
@@ -42,6 +43,7 @@ class Emulator {
 	Kernel kernel;
 	Crypto::AESEngine aesEngine;
 	Cheats cheats;
+	Scheduler scheduler;
 
 	// Variables to keep track of whether the user is controlling the 3DS analog stick with their keyboard
 	// This is done so when a gamepad is connected, we won't automatically override the 3DS analog stick settings with the gamepad's state
@@ -85,6 +87,8 @@ class Emulator {
 	// change ROMs. If Reload is selected, the emulator will reload its selected ROM. This is useful for eg a "reset" button that keeps the current
 	// ROM and just resets the emu
 	enum class ReloadOption { NoReload, Reload };
+	// Used in CPU::runFrame
+	bool frameDone = false;
 
 	Emulator();
 	~Emulator();
@@ -94,6 +98,8 @@ class Emulator {
 	void reset(ReloadOption reload);
 	void run(void* frontend = nullptr);
 	void runFrame();
+	// Poll the scheduler for events
+	void pollScheduler();
 
 	void resume();  // Resume the emulator
 	void pause();   // Pause the emulator
@@ -121,6 +127,7 @@ class Emulator {
 	Cheats& getCheats() { return cheats; }
 	ServiceManager& getServiceManager() { return kernel.getServiceManager(); }
 	LuaManager& getLua() { return lua; }
+	Scheduler& getScheduler() { return scheduler; }
 
 	RendererType getRendererType() const { return config.rendererType; }
 	Renderer* getRenderer() { return gpu.getRenderer(); }
diff --git a/include/scheduler.hpp b/include/scheduler.hpp
index 3d2f582c..fb097618 100644
--- a/include/scheduler.hpp
+++ b/include/scheduler.hpp
@@ -18,6 +18,7 @@ struct Scheduler {
 	using EventMap = boost::container::flat_multimap<Key, Val, std::less<Key>, boost::container::static_vector<std::pair<Key, Val>, size>>;
 
 	EventMap<u64, EventType, totalNumberOfEvents> events;
+	u64 currentTimestamp = 0;
 	u64 nextTimestamp = 0;
 
 	// Set nextTimestamp to the timestamp of the next event
@@ -38,6 +39,8 @@ struct Scheduler {
 	};
 
 	void reset() {
+		currentTimestamp = 0;
+
 		// Clear any pending events
 		events.clear();
 		// Add a dummy event to always keep the scheduler non-empty
diff --git a/src/core/CPU/cpu_dynarmic.cpp b/src/core/CPU/cpu_dynarmic.cpp
index caf8a66e..f373dc06 100644
--- a/src/core/CPU/cpu_dynarmic.cpp
+++ b/src/core/CPU/cpu_dynarmic.cpp
@@ -2,8 +2,9 @@
 #include "cpu_dynarmic.hpp"
 
 #include "arm_defs.hpp"
+#include "emulator.hpp"
 
-CPU::CPU(Memory& mem, Kernel& kernel) : mem(mem), env(mem, kernel, scheduler) {
+CPU::CPU(Memory& mem, Kernel& kernel, Emulator& emu) : mem(mem), emu(emu), scheduler(emu.getScheduler()), env(mem, kernel, emu.getScheduler()) {
 	cp15 = std::make_shared<CP15>();
 
 	Dynarmic::A32::UserConfig config;
@@ -28,12 +29,31 @@ void CPU::reset() {
 	jit->ClearCache();
 	jit->Regs().fill(0);
 	jit->ExtRegs().fill(0);
+}
 
-	// Reset scheduler and add a VBlank event
-	scheduler.reset();
-	scheduler.addEvent(Scheduler::EventType::VBlank, ticksPerSec / 60);
+void CPU::runFrame() {
+	emu.frameDone = false;
 
-	printf("%lld\n", scheduler.nextTimestamp);
+	while (!emu.frameDone) {
+		// Run CPU until the next scheduler event
+		env.ticksLeft = scheduler.nextTimestamp;
+
+	execute:
+		const auto exitReason = jit->Run();
+
+		// Handle any scheduler events that need handling.
+		emu.pollScheduler();
+
+		if (static_cast<u32>(exitReason) != 0) [[unlikely]] {
+			// Cache invalidation needs to exit the JIT so it returns a CacheInvalidation HaltReason. In our case, we just go back to executing
+			// The goto might be terrible but it does guarantee that this does not recursively call run and crash, instead getting optimized to a jump
+			if (Dynarmic::Has(exitReason, Dynarmic::HaltReason::CacheInvalidation)) {
+				goto execute;
+			} else {
+				Helpers::panic("Exit reason: %d\nPC: %08X", static_cast<u32>(exitReason), getReg(15));
+			}
+		}
+	}
 }
 
 #endif  // CPU_DYNARMIC
\ No newline at end of file
diff --git a/src/emulator.cpp b/src/emulator.cpp
index e94170a2..46efd209 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -17,10 +17,11 @@ __declspec(dllexport) DWORD AmdPowerXpressRequestHighPerformance = 1;
 #endif
 
 Emulator::Emulator()
-	: config(getConfigPath()), kernel(cpu, memory, gpu, config), cpu(memory, kernel), gpu(memory, config),
-	  memory(cpu.getTicksRef(), config), cheats(memory, kernel.getServiceManager().getHID()), lua(memory), running(false), programRunning(false)
+	: config(getConfigPath()), kernel(cpu, memory, gpu, config), cpu(memory, kernel, *this), gpu(memory, config), memory(cpu.getTicksRef(), config),
+	  cheats(memory, kernel.getServiceManager().getHID()), lua(memory), running(false), programRunning(false)
 #ifdef PANDA3DS_ENABLE_HTTP_SERVER
-	  , httpServer(this)
+	  ,
+	  httpServer(this)
 #endif
 {
 #ifdef PANDA3DS_ENABLE_DISCORD_RPC
@@ -45,6 +46,10 @@ void Emulator::reset(ReloadOption reload) {
 	cpu.reset();
 	gpu.reset();
 	memory.reset();
+	// Reset scheduler and add a VBlank event
+	scheduler.reset();
+	scheduler.addEvent(Scheduler::EventType::VBlank, CPU::ticksPerSec / 60);
+
 	// Kernel must be reset last because it depends on CPU/Memory state
 	kernel.reset();
 
@@ -99,12 +104,6 @@ void Emulator::runFrame() {
 	if (running) {
 		cpu.runFrame(); // Run 1 frame of instructions
 		gpu.display();  // Display graphics
-		lua.signalEvent(LuaEvent::Frame);
-
-		// Send VBlank interrupts
-		ServiceManager& srv = kernel.getServiceManager();
-		srv.sendGPUInterrupt(GPUInterrupt::VBlank0);
-		srv.sendGPUInterrupt(GPUInterrupt::VBlank1);
 
 		// Run cheats if any are loaded
 		if (cheats.haveCheats()) [[unlikely]] {
@@ -117,6 +116,41 @@ void Emulator::runFrame() {
 	}
 }
 
+void Emulator::pollScheduler() {
+	auto& events = scheduler.events;
+
+	// Pop events until there's none pending anymore
+	while (scheduler.currentTimestamp > scheduler.nextTimestamp) {
+		// Read event timestamp and type, pop it from the scheduler and handle it
+		auto [time, eventType] = std::move(*events.begin());
+		events.erase(events.begin());
+
+		scheduler.updateNextTimestamp();
+
+		switch (eventType) {
+			case Scheduler::EventType::VBlank: {
+				// Signal that we've reached the end of a frame
+				frameDone = true;
+				lua.signalEvent(LuaEvent::Frame);
+
+				// Send VBlank interrupts
+				ServiceManager& srv = kernel.getServiceManager();
+				srv.sendGPUInterrupt(GPUInterrupt::VBlank0);
+				srv.sendGPUInterrupt(GPUInterrupt::VBlank1);
+				
+				// Queue next VBlank event
+				scheduler.addEvent(Scheduler::EventType::VBlank, time + CPU::ticksPerSec / 60);
+				break;
+			}
+
+			default: {
+				Helpers::panic("Scheduler: Unimplemented event type received: %d\n", static_cast<int>(eventType));
+				break;
+			}
+		}
+	}
+}
+
 bool Emulator::loadROM(const std::filesystem::path& path) {
 	// Reset the emulator if we've already loaded a ROM
 	if (romType != ROMType::None) {

From 0be099d1eae87f15c1ae0b73f6bbd6c279310752 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 22 Jan 2024 04:04:05 +0200
Subject: [PATCH 122/162] Hook up KTimer to scheduler

---
 include/cpu_dynarmic.hpp        |  6 +++-
 include/kernel/kernel.hpp       |  2 +-
 include/kernel/kernel_types.hpp |  5 ++-
 include/scheduler.hpp           | 38 +++++++++++++++++++-
 src/core/CPU/cpu_dynarmic.cpp   |  4 ++-
 src/core/kernel/timers.cpp      | 63 +++++++++++++++++++++++----------
 src/emulator.cpp                |  5 ++-
 7 files changed, 96 insertions(+), 27 deletions(-)

diff --git a/include/cpu_dynarmic.hpp b/include/cpu_dynarmic.hpp
index 1ec50d9e..97acddd0 100644
--- a/include/cpu_dynarmic.hpp
+++ b/include/cpu_dynarmic.hpp
@@ -126,7 +126,7 @@ class CPU {
 	Emulator& emu;
 
   public:
-    static constexpr u64 ticksPerSec = 268111856;
+    static constexpr u64 ticksPerSec = Scheduler::arm11Clock;
 
     CPU(Memory& mem, Kernel& kernel, Emulator& emu);
     void reset();
@@ -175,6 +175,10 @@ class CPU {
         return scheduler.currentTimestamp;
     }
 
+	Scheduler& getScheduler() {
+		return scheduler;
+	}
+
     void clearCache() { jit->ClearCache(); }
     void runFrame();
 };
\ No newline at end of file
diff --git a/include/kernel/kernel.hpp b/include/kernel/kernel.hpp
index 3f09bf12..217dd148 100644
--- a/include/kernel/kernel.hpp
+++ b/include/kernel/kernel.hpp
@@ -70,6 +70,7 @@ public:
 	Handle makeMutex(bool locked = false); // Needs to be public to be accessible to the APT/DSP services
 	Handle makeSemaphore(u32 initialCount, u32 maximumCount); // Needs to be public to be accessible to the service manager port
 	Handle makeTimer(ResetType resetType);
+	void pollTimers();
 
 	// Signals an event, returns true on success or false if the event does not exist
 	bool signalEvent(Handle e);
@@ -94,7 +95,6 @@ public:
 	void releaseMutex(Mutex* moo);
 	void cancelTimer(Timer* timer);
 	void signalTimer(Handle timerHandle, Timer* timer);
-	void updateTimer(Handle timerHandle, Timer* timer);
 
 	// Wake up the thread with the highest priority out of all threads in the waitlist
 	// Returns the index of the woken up thread
diff --git a/include/kernel/kernel_types.hpp b/include/kernel/kernel_types.hpp
index 53c60774..79684e17 100644
--- a/include/kernel/kernel_types.hpp
+++ b/include/kernel/kernel_types.hpp
@@ -177,13 +177,12 @@ struct Timer {
 	u64 waitlist;  // Refer to the getWaitlist function below for documentation
 	ResetType resetType = ResetType::OneShot;
 
-	u64 startTick;     // CPU tick the timer started
-	u64 currentDelay;  // Number of ns until the timer fires next time
+	u64 fireTick;      // CPU tick the timer will be fired
 	u64 interval;      // Number of ns until the timer fires for the second and future times
 	bool fired;        // Has this timer been signalled?
 	bool running;      // Is this timer running or stopped?
 
-	Timer(ResetType type) : resetType(type), startTick(0), currentDelay(0), interval(0), waitlist(0), fired(false), running(false) {}
+	Timer(ResetType type) : resetType(type), fireTick(0), interval(0), waitlist(0), fired(false), running(false) {}
 };
 
 struct MemoryBlock {
diff --git a/include/scheduler.hpp b/include/scheduler.hpp
index fb097618..69c91f06 100644
--- a/include/scheduler.hpp
+++ b/include/scheduler.hpp
@@ -5,14 +5,17 @@
 #include <ranges>
 
 #include "helpers.hpp"
+#include "logger.hpp"
 
 struct Scheduler {
 	enum class EventType {
 		VBlank = 0,          // End of frame event
-		Panic = 1,           // Dummy event that is always pending and should never be triggered (Timestamp = UINT64_MAX)
+		UpdateTimers = 1,    // Update kernel timer objects
+		Panic = 2,           // Dummy event that is always pending and should never be triggered (Timestamp = UINT64_MAX)
 		TotalNumberOfEvents  // How many event types do we have in total?
 	};
 	static constexpr usize totalNumberOfEvents = static_cast<usize>(EventType::TotalNumberOfEvents);
+	static constexpr u64 arm11Clock = 268111856;
 
 	template <typename Key, typename Val, usize size>
 	using EventMap = boost::container::flat_multimap<Key, Val, std::less<Key>, boost::container::static_vector<std::pair<Key, Val>, size>>;
@@ -46,4 +49,37 @@ struct Scheduler {
 		// Add a dummy event to always keep the scheduler non-empty
 		addEvent(EventType::Panic, std::numeric_limits<u64>::max());
 	}
+
+  private:
+	static constexpr u64 MAX_VALUE_TO_MULTIPLY = std::numeric_limits<s64>::max() / arm11Clock;
+
+  public:
+	// Function for converting time units to cycles for various kernel functions
+	// Thank you Citra
+	static constexpr s64 nsToCycles(float ns) { return s64(arm11Clock * (0.000000001f) * ns); }
+	static constexpr s64 nsToCycles(int ns) { return arm11Clock * s64(ns) / 1000000000; }
+
+	static constexpr s64 nsToCycles(s64 ns) {
+		if (ns / 1000000000 > static_cast<s64>(MAX_VALUE_TO_MULTIPLY)) {
+			return std::numeric_limits<s64>::max();
+		}
+
+		if (ns > static_cast<s64>(MAX_VALUE_TO_MULTIPLY)) {
+			return arm11Clock * (ns / 1000000000);
+		}
+
+		return (arm11Clock * ns) / 1000000000;
+	}
+
+	static constexpr s64 nsToCycles(u64 ns) {
+		if (ns / 1000000000 > MAX_VALUE_TO_MULTIPLY) {
+			return std::numeric_limits<s64>::max();
+		}
+
+		if (ns > MAX_VALUE_TO_MULTIPLY) {
+			return arm11Clock * (s64(ns) / 1000000000);
+		}
+
+		return (arm11Clock * s64(ns)) / 1000000000;
+	}
 };
\ No newline at end of file
diff --git a/src/core/CPU/cpu_dynarmic.cpp b/src/core/CPU/cpu_dynarmic.cpp
index f373dc06..94ce335e 100644
--- a/src/core/CPU/cpu_dynarmic.cpp
+++ b/src/core/CPU/cpu_dynarmic.cpp
@@ -36,7 +36,7 @@ void CPU::runFrame() {
 
 	while (!emu.frameDone) {
 		// Run CPU until the next scheduler event
-		env.ticksLeft = scheduler.nextTimestamp;
+		env.ticksLeft = scheduler.nextTimestamp - scheduler.currentTimestamp;
 
 	execute:
 		const auto exitReason = jit->Run();
@@ -54,6 +54,8 @@ void CPU::runFrame() {
 			}
 		}
 	}
+
+	printf("CPU END!\n");
 }
 
 #endif  // CPU_DYNARMIC
\ No newline at end of file
diff --git a/src/core/kernel/timers.cpp b/src/core/kernel/timers.cpp
index a9c95292..f245f9dc 100644
--- a/src/core/kernel/timers.cpp
+++ b/src/core/kernel/timers.cpp
@@ -1,5 +1,8 @@
-#include "kernel.hpp"
+#include <limits>
+
 #include "cpu.hpp"
+#include "kernel.hpp"
+#include "scheduler.hpp"
 
 Handle Kernel::makeTimer(ResetType type) {
 	Handle ret = makeObject(KernelObjectType::Timer);
@@ -13,30 +16,48 @@ Handle Kernel::makeTimer(ResetType type) {
 	return ret;
 }
 
-void Kernel::updateTimer(Handle handle, Timer* timer) {
-	if (timer->running) {
-		const u64 currentTicks = cpu.getTicks();
-		u64 elapsedTicks = currentTicks - timer->startTick;
+void Kernel::pollTimers() {
+	u64 currentTick = cpu.getTicks();
 
-		constexpr double ticksPerSec = double(CPU::ticksPerSec);
-		constexpr double nsPerTick = ticksPerSec / 1000000000.0;
-		const s64 elapsedNs = s64(double(elapsedTicks) * nsPerTick);
+	// Find the next timestamp we'll poll KTimers on. To do this, we find the minimum tick one of our timers will fire
+	u64 nextTimestamp = std::numeric_limits<u64>::max();
+	// Do we have any active timers anymore? If not, then we won't need to schedule a new timer poll event
+	bool haveActiveTimers = false;
 
-		// Timer has fired
-		if (elapsedNs >= timer->currentDelay) {
-			timer->startTick = currentTicks;
-			timer->currentDelay = timer->interval;
-			signalTimer(handle, timer);
+	for (auto handle : timerHandles) {
+		KernelObject* object = getObject(handle, KernelObjectType::Timer);
+		if (object != nullptr) {
+			Timer* timer = object->getData<Timer>();
+
+			if (timer->running) {
+				// If timer has fired, signal it and set the tick it will next time
+				if (currentTick >= timer->fireTick) {
+					signalTimer(handle, timer);
+				}
+
+				// Update our next timer fire timestamp and mark that we should schedule a new event to poll timers
+				// We recheck timer->running because signalling a timer stops it if interval == 0
+				if (timer->running) {
+					nextTimestamp = std::min<u64>(nextTimestamp, timer->fireTick);
+					haveActiveTimers = true;
+				}
+			}
 		}
 	}
+
+	// If we still have active timers, schedule next poll event
+	if (haveActiveTimers) {
+		Scheduler& scheduler = cpu.getScheduler();
+		scheduler.addEvent(Scheduler::EventType::UpdateTimers, nextTimestamp);
+	}
 }
 
 void Kernel::cancelTimer(Timer* timer) {
 	timer->running = false;
-	// TODO: When we have a scheduler this should properly cancel timer events in the scheduler
 }
 
 void Kernel::signalTimer(Handle timerHandle, Timer* timer) {
+	printf("DEEPFRIED\n");
 	timer->fired = true;
 	requireReschedule();
 
@@ -54,6 +75,8 @@ void Kernel::signalTimer(Handle timerHandle, Timer* timer) {
 
 	if (timer->interval == 0) {
 		cancelTimer(timer);
+	} else {
+		timer->fireTick = cpu.getTicks() + Scheduler::nsToCycles(timer->interval);
 	}
 }
 
@@ -87,18 +110,20 @@ void Kernel::svcSetTimer() {
 
 	Timer* timer = object->getData<Timer>();
 	cancelTimer(timer);
-	timer->currentDelay = initial;
 	timer->interval = interval;
 	timer->running = true;
-	timer->startTick = cpu.getTicks();
+	timer->fireTick = cpu.getTicks() + Scheduler::nsToCycles(initial);
+	
+	Scheduler& scheduler = cpu.getScheduler();
+	// Signal an event to poll timers as soon as possible
+	scheduler.removeEvent(Scheduler::EventType::UpdateTimers);
+	scheduler.addEvent(Scheduler::EventType::UpdateTimers, cpu.getTicks() + 1);
 
 	// If the initial delay is 0 then instantly signal the timer
 	if (initial == 0) {
 		signalTimer(handle, timer);
-	} else {
-		// This should schedule an event in the scheduler when we have one
 	}
-	
+
 	regs[0] = Result::Success;
 }
 
diff --git a/src/emulator.cpp b/src/emulator.cpp
index 46efd209..058fe868 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -120,7 +120,7 @@ void Emulator::pollScheduler() {
 	auto& events = scheduler.events;
 
 	// Pop events until there's none pending anymore
-	while (scheduler.currentTimestamp > scheduler.nextTimestamp) {
+	while (scheduler.currentTimestamp >= scheduler.nextTimestamp) {
 		// Read event timestamp and type, pop it from the scheduler and handle it
 		auto [time, eventType] = std::move(*events.begin());
 		events.erase(events.begin());
@@ -129,6 +129,7 @@ void Emulator::pollScheduler() {
 
 		switch (eventType) {
 			case Scheduler::EventType::VBlank: {
+				printf("VBLANK!!!!!!\n");
 				// Signal that we've reached the end of a frame
 				frameDone = true;
 				lua.signalEvent(LuaEvent::Frame);
@@ -143,6 +144,8 @@ void Emulator::pollScheduler() {
 				break;
 			}
 
+			case Scheduler::EventType::UpdateTimers: kernel.pollTimers(); break;
+
 			default: {
 				Helpers::panic("Scheduler: Unimplemented event type received: %d\n", static_cast<int>(eventType));
 				break;

From af996c55bae29d53cd02d5e973d08c03c6029cc0 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 22 Jan 2024 04:10:47 +0200
Subject: [PATCH 123/162] Remove debug printfs

---
 src/core/CPU/cpu_dynarmic.cpp | 2 --
 src/core/kernel/timers.cpp    | 1 -
 src/emulator.cpp              | 1 -
 3 files changed, 4 deletions(-)

diff --git a/src/core/CPU/cpu_dynarmic.cpp b/src/core/CPU/cpu_dynarmic.cpp
index 94ce335e..da5270b4 100644
--- a/src/core/CPU/cpu_dynarmic.cpp
+++ b/src/core/CPU/cpu_dynarmic.cpp
@@ -54,8 +54,6 @@ void CPU::runFrame() {
 			}
 		}
 	}
-
-	printf("CPU END!\n");
 }
 
 #endif  // CPU_DYNARMIC
\ No newline at end of file
diff --git a/src/core/kernel/timers.cpp b/src/core/kernel/timers.cpp
index f245f9dc..35fc57a4 100644
--- a/src/core/kernel/timers.cpp
+++ b/src/core/kernel/timers.cpp
@@ -57,7 +57,6 @@ void Kernel::cancelTimer(Timer* timer) {
 }
 
 void Kernel::signalTimer(Handle timerHandle, Timer* timer) {
-	printf("DEEPFRIED\n");
 	timer->fired = true;
 	requireReschedule();
 
diff --git a/src/emulator.cpp b/src/emulator.cpp
index 058fe868..098aba8c 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -129,7 +129,6 @@ void Emulator::pollScheduler() {
 
 		switch (eventType) {
 			case Scheduler::EventType::VBlank: {
-				printf("VBLANK!!!!!!\n");
 				// Signal that we've reached the end of a frame
 				frameDone = true;
 				lua.signalEvent(LuaEvent::Frame);

From 88dc2cc8647901e9af036df3f260225c65fbd47e Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 22 Jan 2024 14:57:02 +0200
Subject: [PATCH 124/162] Remove std::ranges usage

---
 include/scheduler.hpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/scheduler.hpp b/include/scheduler.hpp
index 69c91f06..92328878 100644
--- a/include/scheduler.hpp
+++ b/include/scheduler.hpp
@@ -2,7 +2,6 @@
 #include <boost/container/flat_map.hpp>
 #include <boost/container/static_vector.hpp>
 #include <limits>
-#include <ranges>
 
 #include "helpers.hpp"
 #include "logger.hpp"
@@ -33,11 +32,14 @@ struct Scheduler {
 	}
 
 	void removeEvent(EventType type) {
-		auto it = std::ranges::find_if(events, [type](decltype(events)::const_reference pair) { return pair.second == type; });
-
-		if (it != events.end()) {
-			events.erase(it);
-			updateNextTimestamp();
+		for (auto it = events.begin(); it != events.end(); it++) {
+			// Find first event of type "type" and remove it.
+			// Our scheduler shouldn't have duplicate events, so it's safe to exit when an event is found
+			if (it->second == type) {
+				events.erase(it);
+				updateNextTimestamp();
+				break;
+			}
 		}
 	};
 

From 3c06098ead6c913117f014fe9e06b58c4096d815 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 22 Jan 2024 15:07:52 +0200
Subject: [PATCH 125/162] Mark VBlank event likely

---
 src/emulator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/emulator.cpp b/src/emulator.cpp
index f0f24c59..1ac8d5b2 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -128,7 +128,7 @@ void Emulator::pollScheduler() {
 		scheduler.updateNextTimestamp();
 
 		switch (eventType) {
-			case Scheduler::EventType::VBlank: {
+			case Scheduler::EventType::VBlank: [[likely]] {
 				// Signal that we've reached the end of a frame
 				frameDone = true;
 				lua.signalEvent(LuaEvent::Frame);

From f78acb8049edc03cead982ec6482894c9c00802d Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 23 Jan 2024 15:32:21 +0200
Subject: [PATCH 126/162] Add more CAM definitions

---
 include/services/cam.hpp  | 6 ++++++
 src/core/services/cam.cpp | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/include/services/cam.hpp b/include/services/cam.hpp
index 611a3b6d..9c217082 100644
--- a/include/services/cam.hpp
+++ b/include/services/cam.hpp
@@ -23,11 +23,17 @@ class CAMService {
 
 	// Service commands
 	void driverInitialize(u32 messagePointer);
+	void driverFinalize(u32 messagePointer);
 	void getMaxLines(u32 messagePointer);
 	void getBufferErrorInterruptEvent(u32 messagePointer);
+	void getSuitableY2RCoefficients(u32 messagePointer);
+	void getTransferBytes(u32 messagePointer);
 	void setContrast(u32 messagePointer);
 	void setFrameRate(u32 messagePointer);
+	void setSize(u32 messagePointer);
 	void setTransferLines(u32 messagePointer);
+	void setTrimming(u32 messagePointer);
+	void setTrimminsParamsCenter(u32 messagePointer);
 
   public:
 	CAMService(Memory& mem, Kernel& kernel) : mem(mem), kernel(kernel) {}
diff --git a/src/core/services/cam.cpp b/src/core/services/cam.cpp
index a0206077..56a2c380 100644
--- a/src/core/services/cam.cpp
+++ b/src/core/services/cam.cpp
@@ -6,10 +6,16 @@ namespace CAMCommands {
 	enum : u32 {
 		GetBufferErrorInterruptEvent = 0x00060040,
 		DriverInitialize = 0x00390000,
+		DriverFinalize = 0x003A0000,
 		SetTransferLines = 0x00090100,
 		GetMaxLines = 0x000A0080,
+		GetTransferBytes = 0x000C0040,
+		SetTrimming = 0x000E0080,
+		SetTrimmingParamsCenter = 0x00120140,
+		SetSize = 0x001F00C0, // Set size has different headers between cam:u and New3DS QTM module
 		SetFrameRate = 0x00200080,
 		SetContrast = 0x00230080,
+		GetSuitableY2rStandardCoefficient = 0x00360000,
 	};
 }
 

From 84b8bc8c48a9922cae3c13ff504e12ee8dbe2ca1 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 23 Jan 2024 16:29:05 +0200
Subject: [PATCH 127/162] Properly implement camera ports, add more cam
 commands

---
 include/services/cam.hpp  |  19 ++++-
 src/core/services/cam.cpp | 150 +++++++++++++++++++++++++++++++++++---
 2 files changed, 153 insertions(+), 16 deletions(-)

diff --git a/include/services/cam.hpp b/include/services/cam.hpp
index 9c217082..57cb7e13 100644
--- a/include/services/cam.hpp
+++ b/include/services/cam.hpp
@@ -12,14 +12,25 @@
 class Kernel;
 
 class CAMService {
+	using Event = std::optional<Handle>;
+
+	struct Port {
+		Event bufferErrorInterruptevent = std::nullopt;
+		u16 transferBytes;
+
+		void reset() {
+			bufferErrorInterruptevent = std::nullopt;
+			transferBytes = 256;
+		}
+	};
+
 	Handle handle = KernelHandles::CAM;
 	Memory& mem;
 	Kernel& kernel;
 	MAKE_LOG_FUNCTION(log, camLogger)
 
-	using Event = std::optional<Handle>;
-	static constexpr size_t portCount = 4; // PORT_NONE, PORT_CAM1, PORT_CAM2, PORT_BOTH
-	std::array<Event, portCount> bufferErrorInterruptEvents;
+	static constexpr size_t portCount = 2;
+	std::array<Port, portCount> ports;
 
 	// Service commands
 	void driverInitialize(u32 messagePointer);
@@ -33,7 +44,7 @@ class CAMService {
 	void setSize(u32 messagePointer);
 	void setTransferLines(u32 messagePointer);
 	void setTrimming(u32 messagePointer);
-	void setTrimminsParamsCenter(u32 messagePointer);
+	void setTrimmingParamsCenter(u32 messagePointer);
 
   public:
 	CAMService(Memory& mem, Kernel& kernel) : mem(mem), kernel(kernel) {}
diff --git a/src/core/services/cam.cpp b/src/core/services/cam.cpp
index 56a2c380..38f3d6d7 100644
--- a/src/core/services/cam.cpp
+++ b/src/core/services/cam.cpp
@@ -19,17 +19,65 @@ namespace CAMCommands {
 	};
 }
 
-void CAMService::reset() { bufferErrorInterruptEvents.fill(std::nullopt); }
+// Helper struct for working with camera ports
+class PortSelect {
+	u32 value;
+
+  public:
+	PortSelect(u32 val) : value(val) {}
+	bool isValid() const { return value < 4; }
+
+	bool isSinglePort() const {
+		// 1 corresponds to the first camera port and 2 corresponds to the second port
+		return value == 1 || value == 2;
+	}
+
+	bool isBothPorts() const {
+		// 3 corresponds to both ports
+		return value == 3;
+	}
+
+	// Returns the index of the camera port, assuming that it's only a single port
+	int getSingleIndex() const {
+		if (!isSinglePort()) [[unlikely]] {
+			Helpers::panic("Camera: getSingleIndex called for port with invalid value");
+		}
+
+		return value - 1;
+	}
+
+	std::vector<int> getPortIndices() const {
+		switch (value) {
+			case 1: return {0};     // Only port 1
+			case 2: return {1};     // Only port 2
+			case 3: return {0, 1};  // Both port 1 and port 2
+			default: return {};     // No ports or invalid ports
+		}
+	}
+};
+
+void CAMService::reset() {
+	for (auto& port : ports) {
+		port.reset();
+	}
+}
 
 void CAMService::handleSyncRequest(u32 messagePointer) {
 	const u32 command = mem.read32(messagePointer);
 	switch (command) {
 		case CAMCommands::DriverInitialize: driverInitialize(messagePointer); break;
+		case CAMCommands::DriverFinalize: driverFinalize(messagePointer); break;
 		case CAMCommands::GetBufferErrorInterruptEvent: getBufferErrorInterruptEvent(messagePointer); break;
 		case CAMCommands::GetMaxLines: getMaxLines(messagePointer); break;
+		case CAMCommands::GetSuitableY2rStandardCoefficient: getSuitableY2RCoefficients(messagePointer); break;
+		case CAMCommands::GetTransferBytes: getTransferBytes(messagePointer); break;
 		case CAMCommands::SetContrast: setContrast(messagePointer); break;
 		case CAMCommands::SetFrameRate: setFrameRate(messagePointer); break;
 		case CAMCommands::SetTransferLines: setTransferLines(messagePointer); break;
+		case CAMCommands::SetTrimming: setTrimming(messagePointer); break;
+		case CAMCommands::SetTrimmingParamsCenter: setTrimmingParamsCenter(messagePointer); break;
+		case CAMCommands::SetSize: setSize(messagePointer); break;
+
 		default:
 			Helpers::panic("Unimplemented CAM service requested. Command: %08X\n", command);
 			break;
@@ -42,6 +90,12 @@ void CAMService::driverInitialize(u32 messagePointer) {
 	mem.write32(messagePointer + 4, Result::Success);
 }
 
+void CAMService::driverFinalize(u32 messagePointer) {
+	log("CAM::DriverFinalize\n");
+	mem.write32(messagePointer, IPC::responseHeader(0x3A, 1, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+}
+
 void CAMService::setContrast(u32 messagePointer) {
 	const u32 cameraSelect = mem.read32(messagePointer + 4);
 	const u32 contrast = mem.read32(messagePointer + 8);
@@ -53,12 +107,23 @@ void CAMService::setContrast(u32 messagePointer) {
 }
 
 void CAMService::setTransferLines(u32 messagePointer) {
-	const u32 port = mem.read32(messagePointer + 4);
-	const s16 lines = mem.read16(messagePointer + 8);
-	const s16 width = mem.read16(messagePointer + 12);
-	const s16 height = mem.read16(messagePointer + 16);
+	const u32 portIndex = mem.read32(messagePointer + 4);
+	const u16 lines = mem.read16(messagePointer + 8);
+	const u16 width = mem.read16(messagePointer + 12);
+	const u16 height = mem.read16(messagePointer + 16);
+	const PortSelect port(portIndex);
 
-	log("CAM::SetTransferLines (port = %d, lines = %d, width = %d, height = %d)\n", port, lines, width, height);
+	if (port.isValid()) {
+		const u32 transferBytes = lines * width * 2;
+	
+		for (int i : port.getPortIndices()) {
+			ports[i].transferBytes = transferBytes;
+		}
+	} else {
+		Helpers::warn("CAM::SetTransferLines: Invalid port\n");
+	}
+
+	log("CAM::SetTransferLines (port = %d, lines = %d, width = %d, height = %d)\n", portIndex, lines, width, height);
 
 	mem.write32(messagePointer, IPC::responseHeader(0x9, 1, 0));
 	mem.write32(messagePointer + 4, Result::Success);
@@ -74,6 +139,41 @@ void CAMService::setFrameRate(u32 messagePointer) {
 	mem.write32(messagePointer + 4, Result::Success);
 }
 
+void CAMService::setSize(u32 messagePointer) {
+	const u32 cameraSelect = mem.read32(messagePointer + 4);
+	const u32 size = mem.read32(messagePointer + 8);
+	const u32 context = mem.read32(messagePointer + 12);
+
+	log("CAM::SetSize (camera select = %d, size = %d, context = %d)\n", cameraSelect, size, context);
+	
+	mem.write32(messagePointer, IPC::responseHeader(0x1F, 1, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+}
+
+void CAMService::setTrimming(u32 messagePointer) {
+	const u32 port = mem.read32(messagePointer + 4);
+	const bool trim = mem.read8(messagePointer + 8) != 0;
+
+	log("CAM::SetTrimming (port = %d, trimming = %s)\n", port, trim ? "enabled" : "disabled");
+
+	mem.write32(messagePointer, IPC::responseHeader(0x0E, 1, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+}
+
+void CAMService::setTrimmingParamsCenter(u32 messagePointer) {
+	const u32 port = mem.read32(messagePointer + 4);
+	const s16 trimWidth = s16(mem.read16(messagePointer + 8));
+	const s16 trimHeight = s16(mem.read16(messagePointer + 12));
+	const s16 cameraWidth = s16(mem.read16(messagePointer + 16));
+	const s16 cameraHeight = s16(mem.read16(messagePointer + 20));
+
+	log("CAM::SetTrimmingParamsCenter (port = %d), trim size = (%d, %d), camera size = (%d, %d)\n", port, trimWidth, trimHeight, cameraWidth,
+		cameraHeight);
+
+	mem.write32(messagePointer, IPC::responseHeader(0x12, 1, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+}
+
 // Algorithm taken from Citra
 // https://github.com/citra-emu/citra/blob/master/src/core/hle/service/cam/cam.cpp#L465
 void CAMService::getMaxLines(u32 messagePointer) {
@@ -106,16 +206,40 @@ void CAMService::getMaxLines(u32 messagePointer) {
 	}
 }
 
+void CAMService::getSuitableY2RCoefficients(u32 messagePointer) {
+	log("CAM::GetSuitableY2RCoefficients\n");
+	mem.write32(messagePointer, IPC::responseHeader(0x36, 2, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+	// Y2R standard coefficient value
+	mem.write32(messagePointer + 8, 0);
+}
+
+void CAMService::getTransferBytes(u32 messagePointer) {
+	const u32 portIndex = mem.read32(messagePointer + 4);
+	const PortSelect port(portIndex);
+	log("CAM::GetTransferBytes (port = %d)\n", portIndex);
+
+	mem.write32(messagePointer, IPC::responseHeader(0x0C, 2, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+
+	if (port.isSinglePort()) {
+		mem.write32(messagePointer + 8, ports[port.getSingleIndex()].transferBytes);
+	} else {
+		// TODO: This should return the proper error code
+		Helpers::warn("CAM::GetTransferBytes: Invalid port index");
+		mem.write32(messagePointer + 8, 0);
+	}
+}
+
 void CAMService::getBufferErrorInterruptEvent(u32 messagePointer) {
-	const u32 port = mem.read32(messagePointer + 4);
-	log("CAM::GetBufferErrorInterruptEvent (port = %d)\n", port);
+	const u32 portIndex = mem.read32(messagePointer + 4);
+	const PortSelect port(portIndex);
+	log("CAM::GetBufferErrorInterruptEvent (port = %d)\n", portIndex);
 
 	mem.write32(messagePointer, IPC::responseHeader(0x6, 1, 2));
 
-	if (port >= portCount) {
-		Helpers::panic("CAM::GetBufferErrorInterruptEvent: Invalid port");
-	} else {
-		auto& event = bufferErrorInterruptEvents[port];
+	if (port.isSinglePort()) {
+		auto& event = ports[port.getSingleIndex()].bufferErrorInterruptevent;
 		if (!event.has_value()) {
 			event = kernel.makeEvent(ResetType::OneShot);
 		}
@@ -123,5 +247,7 @@ void CAMService::getBufferErrorInterruptEvent(u32 messagePointer) {
 		mem.write32(messagePointer + 4, Result::Success);
 		mem.write32(messagePointer + 8, 0);
 		mem.write32(messagePointer + 12, event.value());
+	} else {
+		Helpers::panic("CAM::GetBufferErrorInterruptEvent: Invalid port");
 	}
 }
\ No newline at end of file

From a3fda72f88e61ff14330842e697013bd186040db Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 23 Jan 2024 16:38:18 +0200
Subject: [PATCH 128/162] Add FS::SdmcArchiveResource

---
 include/services/fs.hpp  |  1 +
 src/core/services/fs.cpp | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/include/services/fs.hpp b/include/services/fs.hpp
index 2fe3ba5d..4d879e7f 100644
--- a/include/services/fs.hpp
+++ b/include/services/fs.hpp
@@ -61,6 +61,7 @@ class FSService {
 	void getFreeBytes(u32 messagePointer);
 	void getFormatInfo(u32 messagePointer);
 	void getPriority(u32 messagePointer);
+	void getSdmcArchiveResource(u32 messagePointer);
 	void getThisSaveDataSecureValue(u32 messagePointer);
 	void theGameboyVCFunction(u32 messagePointer);
 	void initialize(u32 messagePointer);
diff --git a/src/core/services/fs.cpp b/src/core/services/fs.cpp
index 1f3317fb..264abcab 100644
--- a/src/core/services/fs.cpp
+++ b/src/core/services/fs.cpp
@@ -27,6 +27,7 @@ namespace FSCommands {
 		CloseArchive = 0x080E0080,
 		FormatThisUserSaveData = 0x080F0180,
 		GetFreeBytes = 0x08120080,
+		GetSdmcArchiveResource = 0x08140000,
 		IsSdmcDetected = 0x08170000,
 		IsSdmcWritable = 0x08180000,
 		CardSlotIsInserted = 0x08210000,
@@ -179,6 +180,7 @@ void FSService::handleSyncRequest(u32 messagePointer) {
 		case FSCommands::GetFreeBytes: getFreeBytes(messagePointer); break;
 		case FSCommands::GetFormatInfo: getFormatInfo(messagePointer); break;
 		case FSCommands::GetPriority: getPriority(messagePointer); break;
+		case FSCommands::GetSdmcArchiveResource: getSdmcArchiveResource(messagePointer); break;
 		case FSCommands::GetThisSaveDataSecureValue: getThisSaveDataSecureValue(messagePointer); break;
 		case FSCommands::Initialize: initialize(messagePointer); break;
 		case FSCommands::InitializeWithSdkVersion: initializeWithSdkVersion(messagePointer); break;
@@ -764,3 +766,22 @@ void FSService::renameFile(u32 messagePointer) {
 	const HorizonResult res = sourceArchive->archive->renameFile(sourcePath, destPath);
 	mem.write32(messagePointer + 4, static_cast<u32>(res));
 }
+
+void FSService::getSdmcArchiveResource(u32 messagePointer) {
+	log("FS::GetSdmcArchiveResource");  // For the time being, return the same stubbed archive resource for every media type
+
+	static constexpr ArchiveResource resource = {
+		.sectorSize = 512,
+		.clusterSize = 16_KB,
+		.partitionCapacityInClusters = 0x80000,  // 0x80000 * 16 KB = 8GB
+		.freeSpaceInClusters = 0x80000,          // Same here
+	};
+
+	mem.write32(messagePointer, IPC::responseHeader(0x814, 5, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+
+	mem.write32(messagePointer + 8, resource.sectorSize);
+	mem.write32(messagePointer + 12, resource.clusterSize);
+	mem.write32(messagePointer + 16, resource.partitionCapacityInClusters);
+	mem.write32(messagePointer + 20, resource.freeSpaceInClusters);
+}
\ No newline at end of file

From ecf0416b64bf14eda770abf26eed296e593c3dca Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 23 Jan 2024 17:17:23 +0200
Subject: [PATCH 129/162] clang-format and IWYU fixes

---
 src/core/services/cam.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/core/services/cam.cpp b/src/core/services/cam.cpp
index 38f3d6d7..8c59321d 100644
--- a/src/core/services/cam.cpp
+++ b/src/core/services/cam.cpp
@@ -1,4 +1,7 @@
 #include "services/cam.hpp"
+
+#include <vector>
+
 #include "ipc.hpp"
 #include "kernel.hpp"
 
@@ -12,7 +15,7 @@ namespace CAMCommands {
 		GetTransferBytes = 0x000C0040,
 		SetTrimming = 0x000E0080,
 		SetTrimmingParamsCenter = 0x00120140,
-		SetSize = 0x001F00C0, // Set size has different headers between cam:u and New3DS QTM module
+		SetSize = 0x001F00C0,  // Set size has different headers between cam:u and New3DS QTM module
 		SetFrameRate = 0x00200080,
 		SetContrast = 0x00230080,
 		GetSuitableY2rStandardCoefficient = 0x00360000,
@@ -78,9 +81,7 @@ void CAMService::handleSyncRequest(u32 messagePointer) {
 		case CAMCommands::SetTrimmingParamsCenter: setTrimmingParamsCenter(messagePointer); break;
 		case CAMCommands::SetSize: setSize(messagePointer); break;
 
-		default:
-			Helpers::panic("Unimplemented CAM service requested. Command: %08X\n", command);
-			break;
+		default: Helpers::panic("Unimplemented CAM service requested. Command: %08X\n", command); break;
 	}
 }
 
@@ -115,7 +116,7 @@ void CAMService::setTransferLines(u32 messagePointer) {
 
 	if (port.isValid()) {
 		const u32 transferBytes = lines * width * 2;
-	
+
 		for (int i : port.getPortIndices()) {
 			ports[i].transferBytes = transferBytes;
 		}
@@ -145,7 +146,7 @@ void CAMService::setSize(u32 messagePointer) {
 	const u32 context = mem.read32(messagePointer + 12);
 
 	log("CAM::SetSize (camera select = %d, size = %d, context = %d)\n", cameraSelect, size, context);
-	
+
 	mem.write32(messagePointer, IPC::responseHeader(0x1F, 1, 0));
 	mem.write32(messagePointer + 4, Result::Success);
 }

From 442ae3a210a06fa19c6c1673682b174e025546a1 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 23 Jan 2024 18:10:18 +0200
Subject: [PATCH 130/162] Add CAM::SetReceiving, fix ports

---
 include/services/cam.hpp  |  7 ++++--
 src/core/services/cam.cpp | 47 ++++++++++++++++++++++++++++++++-------
 2 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/include/services/cam.hpp b/include/services/cam.hpp
index 57cb7e13..eec70208 100644
--- a/include/services/cam.hpp
+++ b/include/services/cam.hpp
@@ -15,11 +15,13 @@ class CAMService {
 	using Event = std::optional<Handle>;
 
 	struct Port {
-		Event bufferErrorInterruptevent = std::nullopt;
+		Event bufferErrorInterruptEvent = std::nullopt;
+		Event receiveEvent = std::nullopt;
 		u16 transferBytes;
 
 		void reset() {
-			bufferErrorInterruptevent = std::nullopt;
+			bufferErrorInterruptEvent = std::nullopt;
+			receiveEvent = std::nullopt;
 			transferBytes = 256;
 		}
 	};
@@ -41,6 +43,7 @@ class CAMService {
 	void getTransferBytes(u32 messagePointer);
 	void setContrast(u32 messagePointer);
 	void setFrameRate(u32 messagePointer);
+	void setReceiving(u32 messagePointer);
 	void setSize(u32 messagePointer);
 	void setTransferLines(u32 messagePointer);
 	void setTrimming(u32 messagePointer);
diff --git a/src/core/services/cam.cpp b/src/core/services/cam.cpp
index 8c59321d..c0335dcb 100644
--- a/src/core/services/cam.cpp
+++ b/src/core/services/cam.cpp
@@ -8,6 +8,7 @@
 namespace CAMCommands {
 	enum : u32 {
 		GetBufferErrorInterruptEvent = 0x00060040,
+		SetReceiving = 0x00070102,
 		DriverInitialize = 0x00390000,
 		DriverFinalize = 0x003A0000,
 		SetTransferLines = 0x00090100,
@@ -76,12 +77,16 @@ void CAMService::handleSyncRequest(u32 messagePointer) {
 		case CAMCommands::GetTransferBytes: getTransferBytes(messagePointer); break;
 		case CAMCommands::SetContrast: setContrast(messagePointer); break;
 		case CAMCommands::SetFrameRate: setFrameRate(messagePointer); break;
+		case CAMCommands::SetReceiving: setReceiving(messagePointer); break;
+		case CAMCommands::SetSize: setSize(messagePointer); break;
 		case CAMCommands::SetTransferLines: setTransferLines(messagePointer); break;
 		case CAMCommands::SetTrimming: setTrimming(messagePointer); break;
 		case CAMCommands::SetTrimmingParamsCenter: setTrimmingParamsCenter(messagePointer); break;
-		case CAMCommands::SetSize: setSize(messagePointer); break;
 
-		default: Helpers::panic("Unimplemented CAM service requested. Command: %08X\n", command); break;
+		default:
+			Helpers::warn("Unimplemented CAM service requested. Command: %08X\n", command);
+			mem.write32(messagePointer + 4, 0);
+			break;
 	}
 }
 
@@ -108,7 +113,7 @@ void CAMService::setContrast(u32 messagePointer) {
 }
 
 void CAMService::setTransferLines(u32 messagePointer) {
-	const u32 portIndex = mem.read32(messagePointer + 4);
+	const u32 portIndex = mem.read8(messagePointer + 4);
 	const u16 lines = mem.read16(messagePointer + 8);
 	const u16 width = mem.read16(messagePointer + 12);
 	const u16 height = mem.read16(messagePointer + 16);
@@ -152,7 +157,7 @@ void CAMService::setSize(u32 messagePointer) {
 }
 
 void CAMService::setTrimming(u32 messagePointer) {
-	const u32 port = mem.read32(messagePointer + 4);
+	const u32 port = mem.read8(messagePointer + 4);
 	const bool trim = mem.read8(messagePointer + 8) != 0;
 
 	log("CAM::SetTrimming (port = %d, trimming = %s)\n", port, trim ? "enabled" : "disabled");
@@ -162,7 +167,7 @@ void CAMService::setTrimming(u32 messagePointer) {
 }
 
 void CAMService::setTrimmingParamsCenter(u32 messagePointer) {
-	const u32 port = mem.read32(messagePointer + 4);
+	const u32 port = mem.read8(messagePointer + 4);
 	const s16 trimWidth = s16(mem.read16(messagePointer + 8));
 	const s16 trimHeight = s16(mem.read16(messagePointer + 12));
 	const s16 cameraWidth = s16(mem.read16(messagePointer + 16));
@@ -216,7 +221,7 @@ void CAMService::getSuitableY2RCoefficients(u32 messagePointer) {
 }
 
 void CAMService::getTransferBytes(u32 messagePointer) {
-	const u32 portIndex = mem.read32(messagePointer + 4);
+	const u32 portIndex = mem.read8(messagePointer + 4);
 	const PortSelect port(portIndex);
 	log("CAM::GetTransferBytes (port = %d)\n", portIndex);
 
@@ -233,14 +238,14 @@ void CAMService::getTransferBytes(u32 messagePointer) {
 }
 
 void CAMService::getBufferErrorInterruptEvent(u32 messagePointer) {
-	const u32 portIndex = mem.read32(messagePointer + 4);
+	const u32 portIndex = mem.read8(messagePointer + 4);
 	const PortSelect port(portIndex);
 	log("CAM::GetBufferErrorInterruptEvent (port = %d)\n", portIndex);
 
 	mem.write32(messagePointer, IPC::responseHeader(0x6, 1, 2));
 
 	if (port.isSinglePort()) {
-		auto& event = ports[port.getSingleIndex()].bufferErrorInterruptevent;
+		auto& event = ports[port.getSingleIndex()].bufferErrorInterruptEvent;
 		if (!event.has_value()) {
 			event = kernel.makeEvent(ResetType::OneShot);
 		}
@@ -251,4 +256,30 @@ void CAMService::getBufferErrorInterruptEvent(u32 messagePointer) {
 	} else {
 		Helpers::panic("CAM::GetBufferErrorInterruptEvent: Invalid port");
 	}
+}
+
+void CAMService::setReceiving(u32 messagePointer) {
+	const u32 destination = mem.read32(messagePointer + 4);
+	const u32 portIndex = mem.read8(messagePointer + 8);
+	const u32 size = mem.read32(messagePointer + 12);
+	const u16 transferUnit = mem.read16(messagePointer + 16);
+	const Handle process = mem.read32(messagePointer + 24);
+
+	const PortSelect port(portIndex);
+	log("CAM::SetReceiving (port = %d)\n", portIndex);
+
+	mem.write32(messagePointer, IPC::responseHeader(0x7, 1, 2));
+
+	if (port.isSinglePort()) {
+		auto& event = ports[port.getSingleIndex()].receiveEvent;
+		if (!event.has_value()) {
+			event = kernel.makeEvent(ResetType::OneShot);
+		}
+
+		mem.write32(messagePointer + 4, Result::Success);
+		mem.write32(messagePointer + 8, 0);
+		mem.write32(messagePointer + 12, event.value());
+	} else {
+		Helpers::panic("CAM::SetReceiving: Invalid port");
+	}
 }
\ No newline at end of file

From 707b11ccd84df170f9e57e9d5caaa7148cead27f Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 23 Jan 2024 18:23:16 +0200
Subject: [PATCH 131/162] Add CAM::StartCapture

---
 include/services/cam.hpp  |  1 +
 src/core/services/cam.cpp | 26 +++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/include/services/cam.hpp b/include/services/cam.hpp
index eec70208..5ef3edba 100644
--- a/include/services/cam.hpp
+++ b/include/services/cam.hpp
@@ -48,6 +48,7 @@ class CAMService {
 	void setTransferLines(u32 messagePointer);
 	void setTrimming(u32 messagePointer);
 	void setTrimmingParamsCenter(u32 messagePointer);
+	void startCapture(u32 messagePointer);
 
   public:
 	CAMService(Memory& mem, Kernel& kernel) : mem(mem), kernel(kernel) {}
diff --git a/src/core/services/cam.cpp b/src/core/services/cam.cpp
index c0335dcb..e617ef2f 100644
--- a/src/core/services/cam.cpp
+++ b/src/core/services/cam.cpp
@@ -7,6 +7,7 @@
 
 namespace CAMCommands {
 	enum : u32 {
+		StartCapture = 0x00010040,
 		GetBufferErrorInterruptEvent = 0x00060040,
 		SetReceiving = 0x00070102,
 		DriverInitialize = 0x00390000,
@@ -82,6 +83,7 @@ void CAMService::handleSyncRequest(u32 messagePointer) {
 		case CAMCommands::SetTransferLines: setTransferLines(messagePointer); break;
 		case CAMCommands::SetTrimming: setTrimming(messagePointer); break;
 		case CAMCommands::SetTrimmingParamsCenter: setTrimmingParamsCenter(messagePointer); break;
+		case CAMCommands::StartCapture: startCapture(messagePointer); break;
 
 		default:
 			Helpers::warn("Unimplemented CAM service requested. Command: %08X\n", command);
@@ -282,4 +284,26 @@ void CAMService::setReceiving(u32 messagePointer) {
 	} else {
 		Helpers::panic("CAM::SetReceiving: Invalid port");
 	}
-}
\ No newline at end of file
+}
+
+void CAMService::startCapture(u32 messagePointer) {
+	const u32 portIndex = mem.read8(messagePointer + 4);
+	const PortSelect port(portIndex);
+	log("CAM::StartCapture (port = %d)\n", portIndex);
+
+	mem.write32(messagePointer, IPC::responseHeader(0x01, 1, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+
+	if (port.isValid()) {
+		for (int i : port.getPortIndices()) {
+			auto& event = ports[port.getSingleIndex()].receiveEvent;
+
+			// Until we properly implement cameras, immediately signal the receive event
+			if (event.has_value()) {
+				kernel.signalEvent(event.value());
+			}
+		}
+	} else {
+		Helpers::warn("CAM::StartCapture: Invalid port index");
+	}
+}

From 194f29206b9dd759701a83b3c8cb6fcb340924e2 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 23 Jan 2024 18:31:26 +0200
Subject: [PATCH 132/162] Stub Y2R::SetSendingYUV

---
 include/services/y2r.hpp  |  1 +
 src/core/services/y2r.cpp | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/include/services/y2r.hpp b/include/services/y2r.hpp
index 0a1cae2f..a08c41a2 100644
--- a/include/services/y2r.hpp
+++ b/include/services/y2r.hpp
@@ -98,6 +98,7 @@ class Y2RService {
 	void setSendingY(u32 messagePointer);
 	void setSendingU(u32 messagePointer);
 	void setSendingV(u32 messagePointer);
+	void setSendingYUV(u32 messagePointer);
 	void setSpacialDithering(u32 messagePointer);
 	void setStandardCoeff(u32 messagePointer);
 	void setTemporalDithering(u32 messagePointer);
diff --git a/src/core/services/y2r.cpp b/src/core/services/y2r.cpp
index b5daf6bb..99b18418 100644
--- a/src/core/services/y2r.cpp
+++ b/src/core/services/y2r.cpp
@@ -18,6 +18,7 @@ namespace Y2RCommands {
 		SetSendingY = 0x00100102,
 		SetSendingU = 0x00110102,
 		SetSendingV = 0x00120102,
+		SetSendingYUV = 0x00130102,
 		SetReceiving = 0x00180102,
 		SetInputLineWidth = 0x001A0040,
 		GetInputLineWidth = 0x001B0000,
@@ -82,6 +83,7 @@ void Y2RService::handleSyncRequest(u32 messagePointer) {
 		case Y2RCommands::SetSendingY: setSendingY(messagePointer); break;
 		case Y2RCommands::SetSendingU: setSendingU(messagePointer); break;
 		case Y2RCommands::SetSendingV: setSendingV(messagePointer); break;
+		case Y2RCommands::SetSendingYUV: setSendingYUV(messagePointer); break;
 		case Y2RCommands::SetSpacialDithering: setSpacialDithering(messagePointer); break;
 		case Y2RCommands::SetStandardCoeff: setStandardCoeff(messagePointer); break;
 		case Y2RCommands::SetTemporalDithering: setTemporalDithering(messagePointer); break;
@@ -399,6 +401,14 @@ void Y2RService::setSendingV(u32 messagePointer) {
 	mem.write32(messagePointer + 4, Result::Success);
 }
 
+void Y2RService::setSendingYUV(u32 messagePointer) {
+	log("Y2R::SetSendingYUV\n");
+	Helpers::warn("Unimplemented Y2R::SetSendingYUV");
+
+	mem.write32(messagePointer, IPC::responseHeader(0x13, 1, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+}
+
 void Y2RService::setReceiving(u32 messagePointer) {
 	log("Y2R::SetReceiving\n");
 	Helpers::warn("Unimplemented Y2R::setReceiving");

From 76a14b3bae409c268e76daf721962136b690aa7e Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 23 Jan 2024 19:20:56 +0200
Subject: [PATCH 133/162] Implement CAM::GetMaxBytes/SetTransferBytes

---
 include/services/cam.hpp  |  2 ++
 src/core/services/cam.cpp | 49 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/include/services/cam.hpp b/include/services/cam.hpp
index 5ef3edba..60ede3b9 100644
--- a/include/services/cam.hpp
+++ b/include/services/cam.hpp
@@ -37,6 +37,7 @@ class CAMService {
 	// Service commands
 	void driverInitialize(u32 messagePointer);
 	void driverFinalize(u32 messagePointer);
+	void getMaxBytes(u32 messagePointer);
 	void getMaxLines(u32 messagePointer);
 	void getBufferErrorInterruptEvent(u32 messagePointer);
 	void getSuitableY2RCoefficients(u32 messagePointer);
@@ -45,6 +46,7 @@ class CAMService {
 	void setFrameRate(u32 messagePointer);
 	void setReceiving(u32 messagePointer);
 	void setSize(u32 messagePointer);
+	void setTransferBytes(u32 messagePointer);
 	void setTransferLines(u32 messagePointer);
 	void setTrimming(u32 messagePointer);
 	void setTrimmingParamsCenter(u32 messagePointer);
diff --git a/src/core/services/cam.cpp b/src/core/services/cam.cpp
index e617ef2f..b3dfd1dc 100644
--- a/src/core/services/cam.cpp
+++ b/src/core/services/cam.cpp
@@ -14,7 +14,9 @@ namespace CAMCommands {
 		DriverFinalize = 0x003A0000,
 		SetTransferLines = 0x00090100,
 		GetMaxLines = 0x000A0080,
+		SetTransferBytes = 0x000B0100,
 		GetTransferBytes = 0x000C0040,
+		GetMaxBytes = 0x000D0080,
 		SetTrimming = 0x000E0080,
 		SetTrimmingParamsCenter = 0x00120140,
 		SetSize = 0x001F00C0,  // Set size has different headers between cam:u and New3DS QTM module
@@ -73,6 +75,7 @@ void CAMService::handleSyncRequest(u32 messagePointer) {
 		case CAMCommands::DriverInitialize: driverInitialize(messagePointer); break;
 		case CAMCommands::DriverFinalize: driverFinalize(messagePointer); break;
 		case CAMCommands::GetBufferErrorInterruptEvent: getBufferErrorInterruptEvent(messagePointer); break;
+		case CAMCommands::GetMaxBytes: getMaxBytes(messagePointer); break;
 		case CAMCommands::GetMaxLines: getMaxLines(messagePointer); break;
 		case CAMCommands::GetSuitableY2rStandardCoefficient: getSuitableY2RCoefficients(messagePointer); break;
 		case CAMCommands::GetTransferBytes: getTransferBytes(messagePointer); break;
@@ -87,7 +90,7 @@ void CAMService::handleSyncRequest(u32 messagePointer) {
 
 		default:
 			Helpers::warn("Unimplemented CAM service requested. Command: %08X\n", command);
-			mem.write32(messagePointer + 4, 0);
+			mem.write32(messagePointer + 4, Result::Success);
 			break;
 	}
 }
@@ -114,6 +117,28 @@ void CAMService::setContrast(u32 messagePointer) {
 	mem.write32(messagePointer + 4, Result::Success);
 }
 
+void CAMService::setTransferBytes(u32 messagePointer) {
+	const u32 portIndex = mem.read8(messagePointer + 4);
+	const u32 bytes = mem.read16(messagePointer + 8);
+	// ...why do these parameters even exist?
+	const u16 width = mem.read16(messagePointer + 12);
+	const u16 height = mem.read16(messagePointer + 16);
+	const PortSelect port(portIndex);
+
+	if (port.isValid()) {
+		for (int i : port.getPortIndices()) {
+			ports[i].transferBytes = bytes;
+		}
+	} else {
+		Helpers::warn("CAM::SetTransferBytes: Invalid port\n");
+	}
+
+	log("CAM::SetTransferBytes (port = %d, bytes = %d, width = %d, height = %d)\n", portIndex, bytes, width, height);
+
+	mem.write32(messagePointer, IPC::responseHeader(0x9, 1, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+}
+
 void CAMService::setTransferLines(u32 messagePointer) {
 	const u32 portIndex = mem.read8(messagePointer + 4);
 	const u16 lines = mem.read16(messagePointer + 8);
@@ -214,6 +239,28 @@ void CAMService::getMaxLines(u32 messagePointer) {
 	}
 }
 
+void CAMService::getMaxBytes(u32 messagePointer) {
+	const u16 width = mem.read16(messagePointer + 4);
+	const u16 height = mem.read16(messagePointer + 8);
+	log("CAM::GetMaxBytes (width = %d, height = %d)\n", width, height);
+
+	constexpr u32 MIN_TRANSFER_UNIT = 256;
+	constexpr u32 MAX_BUFFER_SIZE = 2560;
+	if (width * height * 2 % MIN_TRANSFER_UNIT != 0) {
+		Helpers::panic("CAM::GetMaxLines out of range");
+	} else {
+		u32 bytes = MAX_BUFFER_SIZE;
+
+		while (width * height * 2 % bytes != 0) {
+			bytes -= MIN_TRANSFER_UNIT;
+		}
+
+		mem.write32(messagePointer, IPC::responseHeader(0xA, 2, 0));
+		mem.write32(messagePointer + 4, Result::Success);
+		mem.write32(messagePointer + 8, bytes);
+	}
+}
+
 void CAMService::getSuitableY2RCoefficients(u32 messagePointer) {
 	log("CAM::GetSuitableY2RCoefficients\n");
 	mem.write32(messagePointer, IPC::responseHeader(0x36, 2, 0));

From 313620cad9646c963289fdfcf88527b9b59783f9 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Tue, 23 Jan 2024 21:56:24 +0200
Subject: [PATCH 134/162] Implement SDMC Write-Only archive

---
 include/fs/archive_sdmc.hpp  |  6 ++++--
 include/services/fs.hpp      |  7 ++++---
 src/core/fs/archive_sdmc.cpp | 17 +++++++++++++++--
 src/core/services/fs.cpp     |  1 +
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/include/fs/archive_sdmc.hpp b/include/fs/archive_sdmc.hpp
index 4aa80eab..f63731c4 100644
--- a/include/fs/archive_sdmc.hpp
+++ b/include/fs/archive_sdmc.hpp
@@ -5,8 +5,10 @@
 using Result::HorizonResult;
 
 class SDMCArchive : public ArchiveBase {
-public:
-	SDMCArchive(Memory& mem) : ArchiveBase(mem) {}
+	bool isWriteOnly = false;  // There's 2 variants of the SDMC archive: Regular one (Read/Write) and write-only
+
+  public:
+	SDMCArchive(Memory& mem, bool writeOnly = false) : ArchiveBase(mem), isWriteOnly(writeOnly) {}
 
 	u64 getFreeBytes() override { return 1_GB; }
 	std::string name() override { return "SDMC"; }
diff --git a/include/services/fs.hpp b/include/services/fs.hpp
index 4d879e7f..4a613121 100644
--- a/include/services/fs.hpp
+++ b/include/services/fs.hpp
@@ -26,6 +26,7 @@ class FSService {
 	SelfNCCHArchive selfNcch;
 	SaveDataArchive saveData;
 	SDMCArchive sdmc;
+	SDMCArchive sdmcWriteOnly;
 	NCCHArchive ncch;
 
 	// UserSaveData archives
@@ -82,9 +83,9 @@ class FSService {
 
 public:
 	FSService(Memory& mem, Kernel& kernel, const EmulatorConfig& config)
-		: mem(mem), saveData(mem), sharedExtSaveData_nand(mem, "../SharedFiles/NAND", true), extSaveData_sdmc(mem, "SDMC"), sdmc(mem), selfNcch(mem),
-		  ncch(mem), userSaveData1(mem, ArchiveID::UserSaveData1), userSaveData2(mem, ArchiveID::UserSaveData2), kernel(kernel), config(config),
-		  systemSaveData(mem) {}
+		: mem(mem), saveData(mem), sharedExtSaveData_nand(mem, "../SharedFiles/NAND", true), extSaveData_sdmc(mem, "SDMC"), sdmc(mem),
+		  sdmcWriteOnly(mem, true), selfNcch(mem), ncch(mem), userSaveData1(mem, ArchiveID::UserSaveData1),
+		  userSaveData2(mem, ArchiveID::UserSaveData2), kernel(kernel), config(config), systemSaveData(mem) {}
 
 	void reset();
 	void handleSyncRequest(u32 messagePointer);
diff --git a/src/core/fs/archive_sdmc.cpp b/src/core/fs/archive_sdmc.cpp
index 232335d0..6c34de7a 100644
--- a/src/core/fs/archive_sdmc.cpp
+++ b/src/core/fs/archive_sdmc.cpp
@@ -45,8 +45,16 @@ HorizonResult SDMCArchive::deleteFile(const FSPath& path) {
 
 FileDescriptor SDMCArchive::openFile(const FSPath& path, const FilePerms& perms) {
 	FilePerms realPerms = perms;
-	// SD card always has read permission
-	realPerms.raw |= (1 << 0);
+
+	if (isWriteOnly) {
+		if (perms.read()) {
+			Helpers::warn("SDMC: Read flag is not allowed in SDMC Write-Only archive");
+			return FileError;
+		}
+	} else {
+		// Regular SDMC archive always has read permission
+		realPerms.raw |= (1 << 0);
+	}
 
 	if ((realPerms.create() && !realPerms.write())) {
 		Helpers::panic("[SDMC] Unsupported flags for OpenFile");
@@ -130,6 +138,11 @@ HorizonResult SDMCArchive::createDirectory(const FSPath& path) {
 }
 
 Rust::Result<DirectorySession, HorizonResult> SDMCArchive::openDirectory(const FSPath& path) {
+	if (isWriteOnly) {
+		Helpers::warn("SDMC: OpenDirectory is not allowed in SDMC Write-Only archive");
+		return Err(Result::FS::UnexpectedFileOrDir);
+	}
+
 	if (path.type == PathType::UTF16) {
 		if (!isPathSafe<PathType::UTF16>(path)) {
 			Helpers::panic("Unsafe path in SaveData::OpenDirectory");
diff --git a/src/core/services/fs.cpp b/src/core/services/fs.cpp
index 264abcab..2e102958 100644
--- a/src/core/services/fs.cpp
+++ b/src/core/services/fs.cpp
@@ -97,6 +97,7 @@ ArchiveBase* FSService::getArchiveFromID(u32 id, const FSPath& archivePath) {
 
 		case ArchiveID::SystemSaveData: return &systemSaveData;
 		case ArchiveID::SDMC: return &sdmc;
+		case ArchiveID::SDMCWriteOnly: return &sdmcWriteOnly;
 		case ArchiveID::SavedataAndNcch: return &ncch; // This can only access NCCH outside of FSPXI
 		default:
 			Helpers::panic("Unknown archive. ID: %d\n", id);

From c108da5e026b293d7efab583224fd7dd98be9bcf Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 24 Jan 2024 18:51:44 +0200
Subject: [PATCH 135/162] Moar appletting

---
 include/applets/applet.hpp             |  9 ++++---
 include/kernel/handles.hpp             |  1 +
 include/memory.hpp                     |  3 ++-
 include/services/gsp_gpu.hpp           | 18 +++++++++++++
 src/core/applets/mii_selector.cpp      | 12 +++++++++
 src/core/applets/software_keyboard.cpp |  3 +++
 src/core/kernel/memory_management.cpp  |  1 +
 src/core/services/apt.cpp              |  4 +--
 src/core/services/gsp_gpu.cpp          | 36 ++++++++++++++++++++++++--
 9 files changed, 78 insertions(+), 9 deletions(-)

diff --git a/include/applets/applet.hpp b/include/applets/applet.hpp
index 79fba1cb..8087ab82 100644
--- a/include/applets/applet.hpp
+++ b/include/applets/applet.hpp
@@ -65,10 +65,11 @@ namespace Applets {
 	};
 
 	struct Parameter {
-		u32 senderID;
-		u32 destID;
-		u32 signal;
-		std::vector<u8> data;
+		u32 senderID; // ID of the parameter sender
+		u32 destID;   // ID of the app to receive parameter
+		u32 signal;   // Signal type (eg request)
+		u32 object;   // Some applets will also respond with shared memory handles for transferring data between the sender and called
+		std::vector<u8> data; // Misc data
 	};
 
 	class AppletBase {
diff --git a/include/kernel/handles.hpp b/include/kernel/handles.hpp
index b038049f..fe746b65 100644
--- a/include/kernel/handles.hpp
+++ b/include/kernel/handles.hpp
@@ -53,6 +53,7 @@ namespace KernelHandles {
 		GSPSharedMemHandle = MaxServiceHandle + 1, // Handle for the GSP shared memory
 		FontSharedMemHandle,
 		CSNDSharedMemHandle,
+		APTCaptureSharedMemHandle, // Shared memory for display capture info,  
 		HIDSharedMemHandle,
 
 		MinSharedMemHandle = GSPSharedMemHandle,
diff --git a/include/memory.hpp b/include/memory.hpp
index 3ddd00cc..640ae5f0 100644
--- a/include/memory.hpp
+++ b/include/memory.hpp
@@ -112,11 +112,12 @@ class Memory {
 	// This tracks our OS' memory allocations
 	std::vector<KernelMemoryTypes::MemoryInfo> memoryInfo;
 
-	std::array<SharedMemoryBlock, 4> sharedMemBlocks = {
+	std::array<SharedMemoryBlock, 5> sharedMemBlocks = {
 		SharedMemoryBlock(0, 0, KernelHandles::FontSharedMemHandle), // Shared memory for the system font (size is 0 because we read the size from the cmrc filesystem
 		SharedMemoryBlock(0, 0x1000, KernelHandles::GSPSharedMemHandle), // GSP shared memory
 		SharedMemoryBlock(0, 0x1000, KernelHandles::HIDSharedMemHandle),  // HID shared memory
 		SharedMemoryBlock(0, 0x3000, KernelHandles::CSNDSharedMemHandle), // CSND shared memory
+		SharedMemoryBlock(0, 0xE7000, KernelHandles::APTCaptureSharedMemHandle),  // APT Capture Buffer memory
  	};
 
 public:
diff --git a/include/services/gsp_gpu.hpp b/include/services/gsp_gpu.hpp
index 68e24580..0a8f8a0a 100644
--- a/include/services/gsp_gpu.hpp
+++ b/include/services/gsp_gpu.hpp
@@ -60,6 +60,15 @@ class GPUService {
 	};
 	static_assert(sizeof(FramebufferUpdate) == 64, "GSP::GPU::FramebufferUpdate has the wrong size");
 
+	// Used for saving and restoring GPU state via ImportDisplayCaptureInfo
+	struct CaptureInfo {
+		u32 leftFramebuffer; // Left framebuffer VA
+		u32 rightFramebuffer; // Right framebuffer VA (Top screen only)
+		u32 format;
+		u32 stride;
+	};
+	static_assert(sizeof(CaptureInfo) == 16, "GSP::GPU::CaptureInfo has the wrong size");
+
 	// Service commands
 	void acquireRight(u32 messagePointer);
 	void flushDataCache(u32 messagePointer);
@@ -86,6 +95,15 @@ class GPUService {
 
 	void setBufferSwapImpl(u32 screen_id, const FramebufferInfo& info);
 
+	// Get the framebuffer info in shared memory for a given screen
+	FramebufferUpdate* getFramebufferInfo(int screen) {
+		// TODO: Offset depends on GSP thread being triggered
+		return reinterpret_cast<FramebufferUpdate*>(&sharedMem[0x200 + screen * sizeof(FramebufferUpdate)]);
+	}
+
+	FramebufferUpdate* getTopFramebufferInfo() { return getFramebufferInfo(0); }
+	FramebufferUpdate* getBottomFramebufferInfo() { return getFramebufferInfo(1); }
+
 public:
 	GPUService(Memory& mem, GPU& gpu, Kernel& kernel, u32& currentPID) : mem(mem), gpu(gpu),
 		kernel(kernel), currentPID(currentPID) {}
diff --git a/src/core/applets/mii_selector.cpp b/src/core/applets/mii_selector.cpp
index f392d846..6a06a01a 100644
--- a/src/core/applets/mii_selector.cpp
+++ b/src/core/applets/mii_selector.cpp
@@ -1,5 +1,7 @@
 #include "applets/mii_selector.hpp"
 
+#include "kernel/handles.hpp"
+
 using namespace Applets;
 
 void MiiSelectorApplet::reset() {}
@@ -7,5 +9,15 @@ Result::HorizonResult MiiSelectorApplet::start() { return Result::Success; }
 
 Result::HorizonResult MiiSelectorApplet::receiveParameter(const Applets::Parameter& parameter) {
 	Helpers::warn("Mii Selector: Unimplemented ReceiveParameter");
+
+	Applets::Parameter param = Applets::Parameter{
+		.senderID = parameter.destID,
+		.destID = AppletIDs::Application,
+		.signal = static_cast<u32>(APTSignal::Response),
+		.object = KernelHandles::APTCaptureSharedMemHandle,
+		.data = {},
+	};
+
+	nextParameter = param;
 	return Result::Success;
 }
\ No newline at end of file
diff --git a/src/core/applets/software_keyboard.cpp b/src/core/applets/software_keyboard.cpp
index be5a9e21..fd5f4afe 100644
--- a/src/core/applets/software_keyboard.cpp
+++ b/src/core/applets/software_keyboard.cpp
@@ -1,5 +1,7 @@
 #include "applets/software_keyboard.hpp"
 
+#include "kernel/handles.hpp"
+
 using namespace Applets;
 
 void SoftwareKeyboardApplet::reset() {}
@@ -12,6 +14,7 @@ Result::HorizonResult SoftwareKeyboardApplet::receiveParameter(const Applets::Pa
 		.senderID = parameter.destID,
 		.destID = AppletIDs::Application,
 		.signal = static_cast<u32>(APTSignal::Response),
+		.object = KernelHandles::APTCaptureSharedMemHandle,
 		.data = {},
 	};
 
diff --git a/src/core/kernel/memory_management.cpp b/src/core/kernel/memory_management.cpp
index e90a5697..7acc749b 100644
--- a/src/core/kernel/memory_management.cpp
+++ b/src/core/kernel/memory_management.cpp
@@ -144,6 +144,7 @@ void Kernel::mapMemoryBlock() {
 				printf("Mapping CSND memory block\n");
 				break;
 
+			case KernelHandles::APTCaptureSharedMemHandle: break;
 			default: Helpers::panic("Mapping unknown shared memory block: %X", block);
 		}
 	} else {
diff --git a/src/core/services/apt.cpp b/src/core/services/apt.cpp
index 830b8377..25d063c1 100644
--- a/src/core/services/apt.cpp
+++ b/src/core/services/apt.cpp
@@ -274,7 +274,7 @@ void APTService::receiveParameter(u32 messagePointer) {
 	// Size of parameter data
 	mem.write32(messagePointer + 16, parameter.data.size());
 	mem.write32(messagePointer + 20, 0x10);
-	mem.write32(messagePointer + 24, 0);
+	mem.write32(messagePointer + 24, parameter.object);
 	mem.write32(messagePointer + 28, 0);
 }
 
@@ -296,7 +296,7 @@ void APTService::glanceParameter(u32 messagePointer) {
 	// Size of parameter data
 	mem.write32(messagePointer + 16, parameter.data.size());
 	mem.write32(messagePointer + 20, 0);
-	mem.write32(messagePointer + 24, 0);
+	mem.write32(messagePointer + 24, parameter.object);
 	mem.write32(messagePointer + 28, 0);
 }
 
diff --git a/src/core/services/gsp_gpu.cpp b/src/core/services/gsp_gpu.cpp
index 861dfb0a..a698f7cc 100644
--- a/src/core/services/gsp_gpu.cpp
+++ b/src/core/services/gsp_gpu.cpp
@@ -143,8 +143,7 @@ void GPUService::requestInterrupt(GPUInterrupt type) {
 	// Not emulating this causes Yoshi's Wooly World, Captain Toad, Metroid 2 et al to hang
 	if (type == GPUInterrupt::VBlank0 || type == GPUInterrupt::VBlank1) {
 		int screen = static_cast<u32>(type) - static_cast<u32>(GPUInterrupt::VBlank0); // 0 for top screen, 1 for bottom
-		// TODO: Offset depends on GSP thread being triggered
-		FramebufferUpdate* update = reinterpret_cast<FramebufferUpdate*>(&sharedMem[0x200 + screen * sizeof(FramebufferUpdate)]);
+		FramebufferUpdate* update = getFramebufferInfo(screen);
 
 		if (update->dirtyFlag & 1) {
 			setBufferSwapImpl(screen, update->framebufferInfo[update->index]);
@@ -488,4 +487,37 @@ void GPUService::importDisplayCaptureInfo(u32 messagePointer) {
 
 	mem.write32(messagePointer, IPC::responseHeader(0x18, 9, 0));
 	mem.write32(messagePointer + 4, Result::Success);
+
+	if (sharedMem == nullptr) {
+		Helpers::warn("GSP::GPU::ImportDisplayCaptureInfo called without GSP module being properly initialized!");
+		return;
+	}
+
+	FramebufferUpdate* topScreen = getTopFramebufferInfo();
+	FramebufferUpdate* bottomScreen = getBottomFramebufferInfo();
+
+	// Capture the relevant data for both screens and return them to the caller
+	CaptureInfo topScreenCapture = {
+		.leftFramebuffer = topScreen->framebufferInfo[topScreen->index].leftFramebufferVaddr,
+		.rightFramebuffer = topScreen->framebufferInfo[topScreen->index].rightFramebufferVaddr,
+		.format = topScreen->framebufferInfo[topScreen->index].format,
+		.stride = topScreen->framebufferInfo[topScreen->index].stride,
+	};
+
+	CaptureInfo bottomScreenCapture = {
+		.leftFramebuffer = bottomScreen->framebufferInfo[bottomScreen->index].leftFramebufferVaddr,
+		.rightFramebuffer = bottomScreen->framebufferInfo[bottomScreen->index].rightFramebufferVaddr,
+		.format = bottomScreen->framebufferInfo[bottomScreen->index].format,
+		.stride = bottomScreen->framebufferInfo[bottomScreen->index].stride,
+	};
+
+	mem.write32(messagePointer + 8, topScreenCapture.leftFramebuffer);
+	mem.write32(messagePointer + 12, topScreenCapture.rightFramebuffer);
+	mem.write32(messagePointer + 16, topScreenCapture.format);
+	mem.write32(messagePointer + 20, topScreenCapture.stride);
+
+	mem.write32(messagePointer + 24, bottomScreenCapture.leftFramebuffer);
+	mem.write32(messagePointer + 28, bottomScreenCapture.rightFramebuffer);
+	mem.write32(messagePointer + 32, bottomScreenCapture.format);
+	mem.write32(messagePointer + 36, bottomScreenCapture.stride);
 }
\ No newline at end of file

From 85a2ca1bf4de5698a026a937393ffc6923979bb3 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 24 Jan 2024 19:04:55 +0200
Subject: [PATCH 136/162] Stub svcUnmapMemoryBlock

---
 include/kernel/kernel.hpp             | 1 +
 src/core/kernel/kernel.cpp            | 1 +
 src/core/kernel/memory_management.cpp | 9 +++++++++
 3 files changed, 11 insertions(+)

diff --git a/include/kernel/kernel.hpp b/include/kernel/kernel.hpp
index 217dd148..d35d9031 100644
--- a/include/kernel/kernel.hpp
+++ b/include/kernel/kernel.hpp
@@ -137,6 +137,7 @@ public:
 	void duplicateHandle();
 	void exitThread();
 	void mapMemoryBlock();
+	void unmapMemoryBlock();
 	void queryMemory();
 	void getCurrentProcessorNumber();
 	void getProcessID();
diff --git a/src/core/kernel/kernel.cpp b/src/core/kernel/kernel.cpp
index 2e4fffff..392b87fd 100644
--- a/src/core/kernel/kernel.cpp
+++ b/src/core/kernel/kernel.cpp
@@ -50,6 +50,7 @@ void Kernel::serviceSVC(u32 svc) {
 		case 0x1D: svcClearTimer(); break;
 		case 0x1E: createMemoryBlock(); break;
 		case 0x1F: mapMemoryBlock(); break;
+		case 0x20: unmapMemoryBlock(); break;
 		case 0x21: createAddressArbiter(); break;
 		case 0x22: arbitrateAddress(); break;
 		case 0x23: svcCloseHandle(); break;
diff --git a/src/core/kernel/memory_management.cpp b/src/core/kernel/memory_management.cpp
index 7acc749b..0d234be5 100644
--- a/src/core/kernel/memory_management.cpp
+++ b/src/core/kernel/memory_management.cpp
@@ -207,3 +207,12 @@ void Kernel::createMemoryBlock() {
 	regs[0] = Result::Success;
 	regs[1] = makeMemoryBlock(addr, size, myPermission, otherPermission);
 }
+
+void Kernel::unmapMemoryBlock() {
+	Handle block = regs[0];
+	u32 addr = regs[1];
+	logSVC("Unmap memory block (block handle = %X, addr = %08X)\n", block, addr);
+
+	Helpers::warn("Stubbed svcUnmapMemoryBlock!");
+	regs[0] = Result::Success;
+}

From 5fe1637e172771b5f870961efdc7277818427c60 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 24 Jan 2024 20:28:16 +0200
Subject: [PATCH 137/162] Add APT::StartLibraryApplet

---
 include/applets/applet.hpp             | 15 +++++----
 include/applets/mii_selector.hpp       |  2 +-
 include/applets/software_keyboard.hpp  |  2 +-
 src/core/applets/mii_selector.cpp      |  2 +-
 src/core/applets/software_keyboard.cpp | 27 ++++++++++------
 src/core/services/apt.cpp              | 44 ++++++++++++++++++++++++--
 6 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/include/applets/applet.hpp b/include/applets/applet.hpp
index 8087ab82..98fb6c20 100644
--- a/include/applets/applet.hpp
+++ b/include/applets/applet.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
+#include <vector>
+
 #include "helpers.hpp"
+#include "kernel/kernel_types.hpp"
 #include "memory.hpp"
 #include "result/result.hpp"
 
@@ -65,11 +68,11 @@ namespace Applets {
 	};
 
 	struct Parameter {
-		u32 senderID; // ID of the parameter sender
-		u32 destID;   // ID of the app to receive parameter
-		u32 signal;   // Signal type (eg request)
-		u32 object;   // Some applets will also respond with shared memory handles for transferring data between the sender and called
-		std::vector<u8> data; // Misc data
+		u32 senderID;          // ID of the parameter sender
+		u32 destID;            // ID of the app to receive parameter
+		u32 signal;            // Signal type (eg request)
+		u32 object;            // Some applets will also respond with shared memory handles for transferring data between the sender and called
+		std::vector<u8> data;  // Misc data
 	};
 
 	class AppletBase {
@@ -81,7 +84,7 @@ namespace Applets {
 		virtual const char* name() = 0;
 
 		// Called by APT::StartLibraryApplet and similar
-		virtual Result::HorizonResult start() = 0;
+		virtual Result::HorizonResult start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters) = 0;
 		// Transfer parameters from application -> applet
 		virtual Result::HorizonResult receiveParameter(const Parameter& parameter) = 0;
 		virtual void reset() = 0;
diff --git a/include/applets/mii_selector.hpp b/include/applets/mii_selector.hpp
index c90d4b59..8bd757dd 100644
--- a/include/applets/mii_selector.hpp
+++ b/include/applets/mii_selector.hpp
@@ -4,7 +4,7 @@ namespace Applets {
 	class MiiSelectorApplet final : public AppletBase {
 	  public:
 		virtual const char* name() override { return "Mii Selector"; }
-		virtual Result::HorizonResult start() override;
+		virtual Result::HorizonResult start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters) override;
 		virtual Result::HorizonResult receiveParameter(const Applets::Parameter& parameter) override;
 		virtual void reset() override;
 
diff --git a/include/applets/software_keyboard.hpp b/include/applets/software_keyboard.hpp
index f4179012..785ba20a 100644
--- a/include/applets/software_keyboard.hpp
+++ b/include/applets/software_keyboard.hpp
@@ -4,7 +4,7 @@ namespace Applets {
 	class SoftwareKeyboardApplet final : public AppletBase {
 	  public:
 		virtual const char* name() override { return "Software Keyboard"; }
-		virtual Result::HorizonResult start() override;
+		virtual Result::HorizonResult start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters) override;
 		virtual Result::HorizonResult receiveParameter(const Applets::Parameter& parameter) override;
 		virtual void reset() override;
 
diff --git a/src/core/applets/mii_selector.cpp b/src/core/applets/mii_selector.cpp
index 6a06a01a..ed1c4ad2 100644
--- a/src/core/applets/mii_selector.cpp
+++ b/src/core/applets/mii_selector.cpp
@@ -5,7 +5,7 @@
 using namespace Applets;
 
 void MiiSelectorApplet::reset() {}
-Result::HorizonResult MiiSelectorApplet::start() { return Result::Success; }
+Result::HorizonResult MiiSelectorApplet::start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters) { return Result::Success; }
 
 Result::HorizonResult MiiSelectorApplet::receiveParameter(const Applets::Parameter& parameter) {
 	Helpers::warn("Mii Selector: Unimplemented ReceiveParameter");
diff --git a/src/core/applets/software_keyboard.cpp b/src/core/applets/software_keyboard.cpp
index fd5f4afe..07259d0d 100644
--- a/src/core/applets/software_keyboard.cpp
+++ b/src/core/applets/software_keyboard.cpp
@@ -5,19 +5,28 @@
 using namespace Applets;
 
 void SoftwareKeyboardApplet::reset() {}
-Result::HorizonResult SoftwareKeyboardApplet::start() { return Result::Success; }
+Result::HorizonResult SoftwareKeyboardApplet::start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters) { return Result::Success; }
 
 Result::HorizonResult SoftwareKeyboardApplet::receiveParameter(const Applets::Parameter& parameter) {
 	Helpers::warn("Software keyboard: Unimplemented ReceiveParameter");
 
-	Applets::Parameter param = Applets::Parameter{
-		.senderID = parameter.destID,
-		.destID = AppletIDs::Application,
-		.signal = static_cast<u32>(APTSignal::Response),
-		.object = KernelHandles::APTCaptureSharedMemHandle,
-		.data = {},
-	};
+	switch (parameter.signal) {
+		// Signal == request -> Applet is asking swkbd for a shared memory handle for backing up the framebuffer before opening the applet
+		case u32(APTSignal::Request): {
+			Applets::Parameter param = Applets::Parameter{
+				.senderID = parameter.destID,
+				.destID = AppletIDs::Application,
+				.signal = static_cast<u32>(APTSignal::Response),
+				.object = KernelHandles::APTCaptureSharedMemHandle,
+				.data = {},
+			};
+
+			nextParameter = param;
+			break;
+		}
+
+		default: Helpers::panic("SWKBD SIGNAL %d\n", parameter.signal);
+	}
 
-	nextParameter = param;
 	return Result::Success;
 }
\ No newline at end of file
diff --git a/src/core/services/apt.cpp b/src/core/services/apt.cpp
index 25d063c1..b2f3e849 100644
--- a/src/core/services/apt.cpp
+++ b/src/core/services/apt.cpp
@@ -64,6 +64,7 @@ void APTService::handleSyncRequest(u32 messagePointer) {
 		case APTCommands::NotifyToWait: notifyToWait(messagePointer); break;
 		case APTCommands::PreloadLibraryApplet: preloadLibraryApplet(messagePointer); break;
 		case APTCommands::PrepareToStartLibraryApplet: prepareToStartLibraryApplet(messagePointer); break;
+		case APTCommands::StartLibraryApplet: startLibraryApplet(messagePointer); break;
 		case APTCommands::ReceiveParameter: [[likely]] receiveParameter(messagePointer); break;
 		case APTCommands::ReplySleepQuery: replySleepQuery(messagePointer); break;
 		case APTCommands::SetApplicationCpuTimeLimit: setApplicationCpuTimeLimit(messagePointer); break;
@@ -140,6 +141,43 @@ void APTService::prepareToStartLibraryApplet(u32 messagePointer) {
 	mem.write32(messagePointer + 4, Result::Success);
 }
 
+void APTService::startLibraryApplet(u32 messagePointer) {
+	const u32 appID = mem.read32(messagePointer + 4);
+	const u32 bufferSize = mem.read32(messagePointer + 8);
+	const Handle parameters = mem.read32(messagePointer + 16);
+	const u32 buffer = mem.read32(messagePointer + 24);
+	log("APT::StartLibraryApplet (app ID = %X)\n", appID);
+
+	mem.write32(messagePointer, IPC::responseHeader(0x16, 1, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+
+	Applets::AppletBase* destApplet = appletManager.getApplet(appID);
+	if (destApplet == nullptr) {
+		Helpers::warn("APT::StartLibraryApplet: Unimplemented dest applet ID");
+	} else {
+		KernelObject* sharedMemObject = kernel.getObject(parameters);
+		if (sharedMemObject == nullptr) {
+			Helpers::warn("Couldn't find shared memory block\n");
+			return;
+		}
+
+		const MemoryBlock* sharedMem = sharedMemObject->getData<MemoryBlock>();
+		std::vector<u8> data;
+		data.reserve(bufferSize);
+
+		for (u32 i = 0; i < bufferSize; i++) {
+			data.push_back(mem.read8(buffer + i));
+		}
+
+		Helpers::warn("DONE STARTED DAT STUFF");
+		destApplet->start(*sharedMem, data);
+
+		if (resumeEvent.has_value()) {
+			kernel.signalEvent(resumeEvent.value());
+		}
+	}
+}
+
 void APTService::checkNew3DS(u32 messagePointer) {
 	log("APT::CheckNew3DS\n");
 	mem.write32(messagePointer, IPC::responseHeader(0x102, 2, 0));
@@ -222,7 +260,7 @@ void APTService::sendParameter(u32 messagePointer) {
 
 	const u32 parameterHandle = mem.read32(messagePointer + 24); // What dis?
 	const u32 parameterPointer = mem.read32(messagePointer + 32);
-	log("APT::SendParameter (source app = %X, dest app = %X, cmd = %X, size = %X) (Stubbed)", sourceAppID, destAppID, cmd, paramSize);
+	log("APT::SendParameter (source app = %X, dest app = %X, cmd = %X, size = %X)", sourceAppID, destAppID, cmd, paramSize);
 
 	mem.write32(messagePointer, IPC::responseHeader(0x0C, 1, 0));
 	mem.write32(messagePointer + 4, Result::Success);
@@ -260,7 +298,7 @@ void APTService::sendParameter(u32 messagePointer) {
 void APTService::receiveParameter(u32 messagePointer) {
 	const u32 app = mem.read32(messagePointer + 4);
 	const u32 size = mem.read32(messagePointer + 8);
-	log("APT::ReceiveParameter(app ID = %X, size = %04X) (STUBBED)\n", app, size);
+	log("APT::ReceiveParameter(app ID = %X, size = %04X)\n", app, size);
 
 	if (size > 0x1000) Helpers::panic("APT::ReceiveParameter with size > 0x1000");
 	auto parameter = appletManager.receiveParameter();
@@ -281,7 +319,7 @@ void APTService::receiveParameter(u32 messagePointer) {
 void APTService::glanceParameter(u32 messagePointer) {
 	const u32 app = mem.read32(messagePointer + 4);
 	const u32 size = mem.read32(messagePointer + 8);
-	log("APT::GlanceParameter(app ID = %X, size = %04X) (STUBBED)\n", app, size);
+	log("APT::GlanceParameter(app ID = %X, size = %04X)\n", app, size);
 
 	if (size > 0x1000) Helpers::panic("APT::GlanceParameter with size > 0x1000");
 	auto parameter = appletManager.glanceParameter();

From d09254a8ae1d61160a20d3706b0815a7601f5c95 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 24 Jan 2024 21:47:18 +0200
Subject: [PATCH 138/162] Implement software keyboard kinda

---
 include/applets/applet.hpp             |   2 +-
 include/applets/mii_selector.hpp       |   2 +-
 include/applets/software_keyboard.hpp  | 151 ++++++++++++++++++++++++-
 src/core/applets/mii_selector.cpp      |   2 +-
 src/core/applets/software_keyboard.cpp |  44 ++++++-
 src/core/services/apt.cpp              |   9 +-
 6 files changed, 201 insertions(+), 9 deletions(-)

diff --git a/include/applets/applet.hpp b/include/applets/applet.hpp
index 98fb6c20..d9ba6143 100644
--- a/include/applets/applet.hpp
+++ b/include/applets/applet.hpp
@@ -84,7 +84,7 @@ namespace Applets {
 		virtual const char* name() = 0;
 
 		// Called by APT::StartLibraryApplet and similar
-		virtual Result::HorizonResult start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters) = 0;
+		virtual Result::HorizonResult start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters, u32 appID) = 0;
 		// Transfer parameters from application -> applet
 		virtual Result::HorizonResult receiveParameter(const Parameter& parameter) = 0;
 		virtual void reset() = 0;
diff --git a/include/applets/mii_selector.hpp b/include/applets/mii_selector.hpp
index 8bd757dd..3b6cf2ec 100644
--- a/include/applets/mii_selector.hpp
+++ b/include/applets/mii_selector.hpp
@@ -4,7 +4,7 @@ namespace Applets {
 	class MiiSelectorApplet final : public AppletBase {
 	  public:
 		virtual const char* name() override { return "Mii Selector"; }
-		virtual Result::HorizonResult start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters) override;
+		virtual Result::HorizonResult start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters, u32 appID) override;
 		virtual Result::HorizonResult receiveParameter(const Applets::Parameter& parameter) override;
 		virtual void reset() override;
 
diff --git a/include/applets/software_keyboard.hpp b/include/applets/software_keyboard.hpp
index 785ba20a..3a167ad0 100644
--- a/include/applets/software_keyboard.hpp
+++ b/include/applets/software_keyboard.hpp
@@ -1,13 +1,162 @@
+#include <array>
+
 #include "applets/applet.hpp"
+#include "swap.hpp"
 
 namespace Applets {
+	// Software keyboard definitions adapted from libctru/Citra
+	// Keyboard input filtering flags. Allows the caller to specify what input is explicitly not allowed
+	namespace SoftwareKeyboardFilter {
+		enum Filter : u32 {
+			Digits = 1,          // Disallow the use of more than a certain number of digits (0 or more)
+			At = 1 << 1,         // Disallow the use of the @ sign.
+			Percent = 1 << 2,    // Disallow the use of the % sign.
+			Backslash = 1 << 3,  // Disallow the use of the \ sign.
+			Profanity = 1 << 4,  // Disallow profanity using Nintendo's profanity filter.
+			Callback = 1 << 5,   // Use a callback in order to check the input.
+		};
+	}  // namespace SoftwareKeyboardFilter
+
+	// Keyboard features.
+	namespace SoftwareKeyboardFeature {
+		enum Feature {
+			Parental = 1,              // Parental PIN mode.
+			DarkenTopScreen = 1 << 1,  // Darken the top screen when the keyboard is shown.
+			PredictiveInput = 1 << 2,  // Enable predictive input (necessary for Kanji input in JPN systems).
+			Multiline = 1 << 3,        // Enable multiline input.
+			FixedWidth = 1 << 4,       // Enable fixed-width mode.
+			AllowHome = 1 << 5,        // Allow the usage of the HOME button.
+			AllowReset = 1 << 6,       // Allow the usage of a software-reset combination.
+			AllowPower = 1 << 7,       // Allow the usage of the POWER button.
+			DefaultQWERTY = 1 << 9,    // Default to the QWERTY page when the keyboard is shown.
+		};
+	}  // namespace SoftwareKeyboardFeature
+
 	class SoftwareKeyboardApplet final : public AppletBase {
 	  public:
+		static constexpr int MAX_BUTTON = 3;              // Maximum number of buttons that can be in the keyboard.
+		static constexpr int MAX_BUTTON_TEXT_LEN = 16;    // Maximum button text length, in UTF-16 code units.
+		static constexpr int MAX_HINT_TEXT_LEN = 64;      // Maximum hint text length, in UTF-16 code units.
+		static constexpr int MAX_CALLBACK_MSG_LEN = 256;  // Maximum filter callback error message length, in UTF-16 code units.
+
+		// Keyboard types
+		enum class SoftwareKeyboardType : u32 {
+			Normal,   // Normal keyboard with several pages (QWERTY/accents/symbol/mobile)
+			QWERTY,   // QWERTY keyboard only.
+			NumPad,   // Number pad.
+			Western,  // On JPN systems, a text keyboard without Japanese input capabilities, otherwise same as SWKBD_TYPE_NORMAL.
+		};
+
+		// Keyboard dialog buttons.
+		enum class SoftwareKeyboardButtonConfig : u32 {
+			SingleButton,  // Ok button
+			DualButton,    // Cancel | Ok buttons
+			TripleButton,  // Cancel | I Forgot | Ok buttons
+			NoButton,      // No button (returned by swkbdInputText in special cases)
+		};
+
+		// Accepted input types.
+		enum class SoftwareKeyboardValidInput : u32 {
+			Anything,          // All inputs are accepted.
+			NotEmpty,          // Empty inputs are not accepted.
+			NotEmptyNotBlank,  // Empty or blank inputs (consisting solely of whitespace) are not accepted.
+			NotBlank,          // Blank inputs (consisting solely of whitespace) are not accepted, but empty inputs are.
+			FixedLen,          // The input must have a fixed length (specified by maxTextLength in swkbdInit)
+		};
+
+		// Keyboard password modes.
+		enum class SoftwareKeyboardPasswordMode : u32 {
+			None,       // Characters are not concealed.
+			Hide,       // Characters are concealed immediately.
+			HideDelay,  // Characters are concealed a second after they've been typed.
+		};
+
+		// Keyboard filter callback return values.
+		enum class SoftwareKeyboardCallbackResult : u32 {
+			OK,        // Specifies that the input is valid.
+			Close,     // Displays an error message, then closes the keyboard.
+			Continue,  // Displays an error message and continues displaying the keyboard.
+		};
+
+		// Keyboard return values.
+		enum class SoftwareKeyboardResult : s32 {
+			None = -1,          // Dummy/unused.
+			InvalidInput = -2,  // Invalid parameters to swkbd.
+			OutOfMem = -3,      // Out of memory.
+
+			D0Click = 0,  // The button was clicked in 1-button dialogs.
+			D1Click0,     // The left button was clicked in 2-button dialogs.
+			D1Click1,     // The right button was clicked in 2-button dialogs.
+			D2Click0,     // The left button was clicked in 3-button dialogs.
+			D2Click1,     // The middle button was clicked in 3-button dialogs.
+			D2Click2,     // The right button was clicked in 3-button dialogs.
+
+			HomePressed = 10,  // The HOME button was pressed.
+			ResetPressed,      // The soft-reset key combination was pressed.
+			PowerPressed,      // The POWER button was pressed.
+
+			ParentalOK = 20,  // The parental PIN was verified successfully.
+			ParentalFail,     // The parental PIN was incorrect.
+
+			BannedInput = 30,  // The filter callback returned SoftwareKeyboardCallback::CLOSE.
+		};
+
+		struct SoftwareKeyboardConfig {
+			enum_le<SoftwareKeyboardType> type;
+			enum_le<SoftwareKeyboardButtonConfig> numButtonsM1;
+			enum_le<SoftwareKeyboardValidInput> validInput;
+			enum_le<SoftwareKeyboardPasswordMode> passwordMode;
+			s32_le isParentalScreen;
+			s32_le darkenTopScreen;
+			u32_le filterFlags;
+			u32_le saveStateFlags;
+			u16_le maxTextLength;
+			u16_le dictWordCount;
+			u16_le maxDigits;
+			std::array<std::array<u16_le, MAX_BUTTON_TEXT_LEN + 1>, MAX_BUTTON> buttonText;
+			std::array<u16_le, 2> numpadKeys;
+			std::array<u16_le, MAX_HINT_TEXT_LEN + 1> hintText;  // Text to display when asking the user for input
+			bool predictiveInput;
+			bool multiline;
+			bool fixedWidth;
+			bool allowHome;
+			bool allowReset;
+			bool allowPower;
+			bool unknown;
+			bool defaultQwerty;
+			std::array<bool, 4> buttonSubmitsText;
+			u16_le language;
+
+			u32_le initialTextOffset;  // Offset of the default text in the output SharedMemory
+			u32_le dictOffset;
+			u32_le initialStatusOffset;
+			u32_le initialLearningOffset;
+			u32_le sharedMemorySize;  // Size of the SharedMemory
+			u32_le version;
+
+			enum_le<SoftwareKeyboardResult> returnCode;
+
+			u32_le statusOffset;
+			u32_le learningOffset;
+
+			u32_le textOffset;  // Offset in the SharedMemory where the output text starts
+			u16_le textLength;  // Length in characters of the output text
+
+			enum_le<SoftwareKeyboardCallbackResult> callbackResult;
+			std::array<u16_le, MAX_CALLBACK_MSG_LEN + 1> callbackMessage;
+			bool skipAtCheck;
+			std::array<u8, 0xAB> pad;
+		};
+		static_assert(sizeof(SoftwareKeyboardConfig) == 0x400, "Software keyboard config size is wrong");
+
 		virtual const char* name() override { return "Software Keyboard"; }
-		virtual Result::HorizonResult start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters) override;
+		virtual Result::HorizonResult start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters, u32 appID) override;
 		virtual Result::HorizonResult receiveParameter(const Applets::Parameter& parameter) override;
 		virtual void reset() override;
 
 		SoftwareKeyboardApplet(Memory& memory, std::optional<Parameter>& nextParam) : AppletBase(memory, nextParam) {}
+		void closeKeyboard(u32 appID);
+
+		SoftwareKeyboardConfig config;
 	};
 }  // namespace Applets
\ No newline at end of file
diff --git a/src/core/applets/mii_selector.cpp b/src/core/applets/mii_selector.cpp
index ed1c4ad2..ede8de28 100644
--- a/src/core/applets/mii_selector.cpp
+++ b/src/core/applets/mii_selector.cpp
@@ -5,7 +5,7 @@
 using namespace Applets;
 
 void MiiSelectorApplet::reset() {}
-Result::HorizonResult MiiSelectorApplet::start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters) { return Result::Success; }
+Result::HorizonResult MiiSelectorApplet::start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters, u32 appID) { return Result::Success; }
 
 Result::HorizonResult MiiSelectorApplet::receiveParameter(const Applets::Parameter& parameter) {
 	Helpers::warn("Mii Selector: Unimplemented ReceiveParameter");
diff --git a/src/core/applets/software_keyboard.cpp b/src/core/applets/software_keyboard.cpp
index 07259d0d..2f3e2e35 100644
--- a/src/core/applets/software_keyboard.cpp
+++ b/src/core/applets/software_keyboard.cpp
@@ -1,11 +1,12 @@
 #include "applets/software_keyboard.hpp"
 
+#include <cstring>
+
 #include "kernel/handles.hpp"
 
 using namespace Applets;
 
 void SoftwareKeyboardApplet::reset() {}
-Result::HorizonResult SoftwareKeyboardApplet::start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters) { return Result::Success; }
 
 Result::HorizonResult SoftwareKeyboardApplet::receiveParameter(const Applets::Parameter& parameter) {
 	Helpers::warn("Software keyboard: Unimplemented ReceiveParameter");
@@ -25,8 +26,47 @@ Result::HorizonResult SoftwareKeyboardApplet::receiveParameter(const Applets::Pa
 			break;
 		}
 
-		default: Helpers::panic("SWKBD SIGNAL %d\n", parameter.signal);
+		default: Helpers::panic("Unimplemented swkbd signal %d\n", parameter.signal);
 	}
 
 	return Result::Success;
+}
+
+Result::HorizonResult SoftwareKeyboardApplet::start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters, u32 appID) {
+	if (parameters.size() < sizeof(SoftwareKeyboardConfig)) {
+		Helpers::warn("SoftwareKeyboard::Start: Invalid size for keyboard configuration");
+		return Result::Success;
+	}
+
+	std::memcpy(&config, &parameters[0], sizeof(config));
+
+	// Temporarily hardcode the pressed button to be the firs tone
+	switch (config.numButtonsM1) {
+		case SoftwareKeyboardButtonConfig::SingleButton: config.returnCode = SoftwareKeyboardResult::D0Click; break;
+		case SoftwareKeyboardButtonConfig::DualButton: config.returnCode = SoftwareKeyboardResult::D1Click0; break;
+		case SoftwareKeyboardButtonConfig::TripleButton: config.returnCode = SoftwareKeyboardResult::D2Click0; break;
+		case SoftwareKeyboardButtonConfig::NoButton: config.returnCode = SoftwareKeyboardResult::None; break;
+	}
+
+	if (config.filterFlags & SoftwareKeyboardFilter::Callback) {
+		Helpers::warn("Unimplemented software keyboard profanity callback");
+	}
+
+	closeKeyboard(appID);
+	return Result::Success;
+}
+
+void SoftwareKeyboardApplet::closeKeyboard(u32 appID) {
+	Applets::Parameter param = Applets::Parameter{
+		.senderID = appID,
+		.destID = AppletIDs::Application,
+		.signal = static_cast<u32>(APTSignal::WakeupByExit),
+		.object = 0,
+	};
+
+	// Copy software keyboard configuration into the response parameter
+	param.data.resize(sizeof(config));
+	std::memcpy(&param.data[0], &config, sizeof(config));
+
+	nextParameter = param;
 }
\ No newline at end of file
diff --git a/src/core/services/apt.cpp b/src/core/services/apt.cpp
index b2f3e849..f98c1bb5 100644
--- a/src/core/services/apt.cpp
+++ b/src/core/services/apt.cpp
@@ -154,6 +154,8 @@ void APTService::startLibraryApplet(u32 messagePointer) {
 	Applets::AppletBase* destApplet = appletManager.getApplet(appID);
 	if (destApplet == nullptr) {
 		Helpers::warn("APT::StartLibraryApplet: Unimplemented dest applet ID");
+		mem.write32(messagePointer, IPC::responseHeader(0x1E, 1, 0));
+		mem.write32(messagePointer + 4, Result::Success);
 	} else {
 		KernelObject* sharedMemObject = kernel.getObject(parameters);
 		if (sharedMemObject == nullptr) {
@@ -169,12 +171,13 @@ void APTService::startLibraryApplet(u32 messagePointer) {
 			data.push_back(mem.read8(buffer + i));
 		}
 
-		Helpers::warn("DONE STARTED DAT STUFF");
-		destApplet->start(*sharedMem, data);
-
+		Result::HorizonResult result = destApplet->start(*sharedMem, data, appID);
 		if (resumeEvent.has_value()) {
 			kernel.signalEvent(resumeEvent.value());
 		}
+
+		mem.write32(messagePointer, IPC::responseHeader(0x1E, 1, 0));
+		mem.write32(messagePointer + 4, result);
 	}
 }
 

From 29494efd94377121b380da6f91f9eb3a17f1996b Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 24 Jan 2024 22:21:17 +0200
Subject: [PATCH 139/162] Stub GSP::GPU::RestoreVramSysArea

---
 include/services/gsp_gpu.hpp           |  1 +
 src/core/applets/software_keyboard.cpp | 15 +++++++++++++++
 src/core/services/gsp_gpu.cpp          |  9 +++++++++
 3 files changed, 25 insertions(+)

diff --git a/include/services/gsp_gpu.hpp b/include/services/gsp_gpu.hpp
index 0a8f8a0a..1e48190c 100644
--- a/include/services/gsp_gpu.hpp
+++ b/include/services/gsp_gpu.hpp
@@ -75,6 +75,7 @@ class GPUService {
 	void importDisplayCaptureInfo(u32 messagePointer);
 	void registerInterruptRelayQueue(u32 messagePointer);
 	void releaseRight(u32 messagePointer);
+	void restoreVramSysArea(u32 messagePointer);
 	void saveVramSysArea(u32 messagePointer);
 	void setAxiConfigQoSMode(u32 messagePointer);
 	void setBufferSwap(u32 messagePointer);
diff --git a/src/core/applets/software_keyboard.cpp b/src/core/applets/software_keyboard.cpp
index 2f3e2e35..432d74c6 100644
--- a/src/core/applets/software_keyboard.cpp
+++ b/src/core/applets/software_keyboard.cpp
@@ -1,6 +1,7 @@
 #include "applets/software_keyboard.hpp"
 
 #include <cstring>
+#include <string>
 
 #include "kernel/handles.hpp"
 
@@ -38,8 +39,19 @@ Result::HorizonResult SoftwareKeyboardApplet::start(const MemoryBlock& sharedMem
 		return Result::Success;
 	}
 
+	// Get keyboard configuration from the application
 	std::memcpy(&config, &parameters[0], sizeof(config));
 
+	const std::u16string text = u"Pander";
+	u32 textAddress = sharedMem.addr;
+	
+	// Copy text to shared memory the app gave us
+	for (u32 i = 0; i < text.size(); i++) {
+		mem.write16(textAddress, u16(text[i]));
+		textAddress += sizeof(u16);
+	}
+	mem.write16(textAddress, 0); // Write UTF-16 null terminator
+
 	// Temporarily hardcode the pressed button to be the firs tone
 	switch (config.numButtonsM1) {
 		case SoftwareKeyboardButtonConfig::SingleButton: config.returnCode = SoftwareKeyboardResult::D0Click; break;
@@ -48,6 +60,9 @@ Result::HorizonResult SoftwareKeyboardApplet::start(const MemoryBlock& sharedMem
 		case SoftwareKeyboardButtonConfig::NoButton: config.returnCode = SoftwareKeyboardResult::None; break;
 	}
 
+	config.textOffset = 0;
+	config.textLength = static_cast<u16>(text.size());
+
 	if (config.filterFlags & SoftwareKeyboardFilter::Callback) {
 		Helpers::warn("Unimplemented software keyboard profanity callback");
 	}
diff --git a/src/core/services/gsp_gpu.cpp b/src/core/services/gsp_gpu.cpp
index a698f7cc..8dff6a79 100644
--- a/src/core/services/gsp_gpu.cpp
+++ b/src/core/services/gsp_gpu.cpp
@@ -18,6 +18,7 @@ namespace ServiceCommands {
 		ReleaseRight = 0x00170000,
 		ImportDisplayCaptureInfo = 0x00180000,
 		SaveVramSysArea = 0x00190000,
+		RestoreVramSysArea = 0x001A0000,
 		SetInternalPriorities = 0x001E0080,
 		StoreDataCache = 0x001F0082
 	};
@@ -51,6 +52,7 @@ void GPUService::handleSyncRequest(u32 messagePointer) {
 		case ServiceCommands::ImportDisplayCaptureInfo: importDisplayCaptureInfo(messagePointer); break;
 		case ServiceCommands::RegisterInterruptRelayQueue: registerInterruptRelayQueue(messagePointer); break;
 		case ServiceCommands::ReleaseRight: releaseRight(messagePointer); break;
+		case ServiceCommands::RestoreVramSysArea: restoreVramSysArea(messagePointer); break;
 		case ServiceCommands::SaveVramSysArea: saveVramSysArea(messagePointer); break;
 		case ServiceCommands::SetAxiConfigQoSMode: setAxiConfigQoSMode(messagePointer); break;
 		case ServiceCommands::SetBufferSwap: setBufferSwap(messagePointer); break;
@@ -481,6 +483,13 @@ void GPUService::saveVramSysArea(u32 messagePointer) {
 	mem.write32(messagePointer + 4, Result::Success);
 }
 
+void GPUService::restoreVramSysArea(u32 messagePointer) {
+	Helpers::warn("GSP::GPU::RestoreVramSysArea (stubbed)");
+
+	mem.write32(messagePointer, IPC::responseHeader(0x1A, 1, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+}
+
 // Used in similar fashion to the SaveVramSysArea function
 void GPUService::importDisplayCaptureInfo(u32 messagePointer) {
 	Helpers::warn("GSP::GPU::ImportDisplayCaptureInfo (stubbed)");

From ef3bd0281999f77cc7abe939724ec1873d6b590b Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Thu, 25 Jan 2024 02:09:14 +0200
Subject: [PATCH 140/162] Properly transfer data between apps and applets

---
 src/core/applets/software_keyboard.cpp |  9 ++++++---
 src/core/services/apt.cpp              | 17 ++++++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/core/applets/software_keyboard.cpp b/src/core/applets/software_keyboard.cpp
index 432d74c6..dfe68b60 100644
--- a/src/core/applets/software_keyboard.cpp
+++ b/src/core/applets/software_keyboard.cpp
@@ -42,7 +42,7 @@ Result::HorizonResult SoftwareKeyboardApplet::start(const MemoryBlock& sharedMem
 	// Get keyboard configuration from the application
 	std::memcpy(&config, &parameters[0], sizeof(config));
 
-	const std::u16string text = u"Pander";
+	const std::u16string text = u"Pand";
 	u32 textAddress = sharedMem.addr;
 	
 	// Copy text to shared memory the app gave us
@@ -55,13 +55,16 @@ Result::HorizonResult SoftwareKeyboardApplet::start(const MemoryBlock& sharedMem
 	// Temporarily hardcode the pressed button to be the firs tone
 	switch (config.numButtonsM1) {
 		case SoftwareKeyboardButtonConfig::SingleButton: config.returnCode = SoftwareKeyboardResult::D0Click; break;
-		case SoftwareKeyboardButtonConfig::DualButton: config.returnCode = SoftwareKeyboardResult::D1Click0; break;
-		case SoftwareKeyboardButtonConfig::TripleButton: config.returnCode = SoftwareKeyboardResult::D2Click0; break;
+		case SoftwareKeyboardButtonConfig::DualButton: config.returnCode = SoftwareKeyboardResult::D1Click1; break;
+		case SoftwareKeyboardButtonConfig::TripleButton: config.returnCode = SoftwareKeyboardResult::D2Click2; break;
 		case SoftwareKeyboardButtonConfig::NoButton: config.returnCode = SoftwareKeyboardResult::None; break;
+		default: Helpers::warn("Software keyboard: Invalid button mode specification"); break;
 	}
 
 	config.textOffset = 0;
 	config.textLength = static_cast<u16>(text.size());
+	static_assert(offsetof(SoftwareKeyboardConfig, textOffset) == 324);
+	static_assert(offsetof(SoftwareKeyboardConfig, textLength) == 328);
 
 	if (config.filterFlags & SoftwareKeyboardFilter::Callback) {
 		Helpers::warn("Unimplemented software keyboard profanity callback");
diff --git a/src/core/services/apt.cpp b/src/core/services/apt.cpp
index f98c1bb5..b475b89d 100644
--- a/src/core/services/apt.cpp
+++ b/src/core/services/apt.cpp
@@ -148,9 +148,6 @@ void APTService::startLibraryApplet(u32 messagePointer) {
 	const u32 buffer = mem.read32(messagePointer + 24);
 	log("APT::StartLibraryApplet (app ID = %X)\n", appID);
 
-	mem.write32(messagePointer, IPC::responseHeader(0x16, 1, 0));
-	mem.write32(messagePointer + 4, Result::Success);
-
 	Applets::AppletBase* destApplet = appletManager.getApplet(appID);
 	if (destApplet == nullptr) {
 		Helpers::warn("APT::StartLibraryApplet: Unimplemented dest applet ID");
@@ -301,6 +298,8 @@ void APTService::sendParameter(u32 messagePointer) {
 void APTService::receiveParameter(u32 messagePointer) {
 	const u32 app = mem.read32(messagePointer + 4);
 	const u32 size = mem.read32(messagePointer + 8);
+	// Parameter data pointer is in the thread static buffer, which starts 0x100 bytes after the command buffer
+	const u32 buffer = mem.read32(messagePointer + 0x100 + 4);
 	log("APT::ReceiveParameter(app ID = %X, size = %04X)\n", app, size);
 
 	if (size > 0x1000) Helpers::panic("APT::ReceiveParameter with size > 0x1000");
@@ -317,11 +316,18 @@ void APTService::receiveParameter(u32 messagePointer) {
 	mem.write32(messagePointer + 20, 0x10);
 	mem.write32(messagePointer + 24, parameter.object);
 	mem.write32(messagePointer + 28, 0);
+
+	const u32 transferSize = std::min<u32>(size, parameter.data.size());
+	for (u32 i = 0; i < transferSize; i++) {
+		mem.write8(buffer + i, parameter.data[i]);
+	}
 }
 
 void APTService::glanceParameter(u32 messagePointer) {
 	const u32 app = mem.read32(messagePointer + 4);
 	const u32 size = mem.read32(messagePointer + 8);
+	// Parameter data pointer is in the thread static buffer, which starts 0x100 bytes after the command buffer
+	const u32 buffer = mem.read32(messagePointer + 0x100 + 4);
 	log("APT::GlanceParameter(app ID = %X, size = %04X)\n", app, size);
 
 	if (size > 0x1000) Helpers::panic("APT::GlanceParameter with size > 0x1000");
@@ -339,6 +345,11 @@ void APTService::glanceParameter(u32 messagePointer) {
 	mem.write32(messagePointer + 20, 0);
 	mem.write32(messagePointer + 24, parameter.object);
 	mem.write32(messagePointer + 28, 0);
+
+	const u32 transferSize = std::min<u32>(size, parameter.data.size());
+	for (u32 i = 0; i < transferSize; i++) {
+		mem.write8(buffer + i, parameter.data[i]);
+	}
 }
 
 void APTService::replySleepQuery(u32 messagePointer) {

From 8fc61769abb6377e0a87c88fc12e24f1f4e65471 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Thu, 25 Jan 2024 02:31:01 +0200
Subject: [PATCH 141/162] Implement PTM::GetPedometerState

---
 include/services/boss.hpp  |  1 +
 include/services/ptm.hpp   |  1 +
 src/core/services/boss.cpp |  9 +++++++++
 src/core/services/ptm.cpp  | 13 ++++++++++++-
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/include/services/boss.hpp b/include/services/boss.hpp
index 57452e2d..769184e5 100644
--- a/include/services/boss.hpp
+++ b/include/services/boss.hpp
@@ -14,6 +14,7 @@ class BOSSService {
 	void cancelTask(u32 messagePointer);
 	void initializeSession(u32 messagePointer);
 	void getErrorCode(u32 messagePointer);
+	void getNewArrivalFlag(u32 messagePointer);
 	void getNsDataIdList(u32 messagePointer, u32 commandWord);
 	void getOptoutFlag(u32 messagePointer);
 	void getStorageEntryInfo(u32 messagePointer); // Unknown what this is, name taken from Citra
diff --git a/include/services/ptm.hpp b/include/services/ptm.hpp
index ae845725..f752839b 100644
--- a/include/services/ptm.hpp
+++ b/include/services/ptm.hpp
@@ -17,6 +17,7 @@ class PTMService {
 	void getAdapterState(u32 messagePointer);
 	void getBatteryChargeState(u32 messagePointer);
 	void getBatteryLevel(u32 messagePointer);
+	void getPedometerState(u32 messagePointer);
 	void getStepHistory(u32 messagePointer);
 	void getStepHistoryAll(u32 messagePointer);
 	void getTotalStepCount(u32 messagePointer);
diff --git a/src/core/services/boss.cpp b/src/core/services/boss.cpp
index 30190cd3..a8f7194b 100644
--- a/src/core/services/boss.cpp
+++ b/src/core/services/boss.cpp
@@ -6,6 +6,7 @@ namespace BOSSCommands {
 		InitializeSession = 0x00010082,
 		UnregisterStorage = 0x00030000,
 		GetTaskStorageInfo = 0x00040000,
+		GetNewArrivalFlag = 0x00070000,
 		RegisterNewArrivalEvent = 0x00080002,
 		SetOptoutFlag = 0x00090040,
 		GetOptoutFlag = 0x000A0000,
@@ -37,6 +38,7 @@ void BOSSService::handleSyncRequest(u32 messagePointer) {
 	switch (command) {
 		case BOSSCommands::CancelTask: cancelTask(messagePointer); break;
 		case BOSSCommands::GetErrorCode: getErrorCode(messagePointer); break;
+		case BOSSCommands::GetNewArrivalFlag: getNewArrivalFlag(messagePointer); break;
 		case BOSSCommands::GetNsDataIdList:
 		case BOSSCommands::GetNsDataIdList1: 
 			getNsDataIdList(messagePointer, command); break;
@@ -240,4 +242,11 @@ void BOSSService::unregisterStorage(u32 messagePointer) {
 	log("BOSS::UnregisterStorage (stubbed)\n");
 	mem.write32(messagePointer, IPC::responseHeader(0x3, 1, 0));
 	mem.write32(messagePointer + 4, Result::Success);
+}
+
+void BOSSService::getNewArrivalFlag(u32 messagePointer) {
+	log("BOSS::GetNewArrivalFlag (stubbed)\n");
+	mem.write32(messagePointer, IPC::responseHeader(0x7, 2, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+	mem.write8(messagePointer + 8, 0); // Flag
 }
\ No newline at end of file
diff --git a/src/core/services/ptm.cpp b/src/core/services/ptm.cpp
index 071fa012..4cd7e095 100644
--- a/src/core/services/ptm.cpp
+++ b/src/core/services/ptm.cpp
@@ -6,6 +6,7 @@ namespace PTMCommands {
 		GetAdapterState = 0x00050000,
 		GetBatteryLevel = 0x00070000,
 		GetBatteryChargeState = 0x00080000,
+		GetPedometerState = 0x00090000,
 		GetStepHistory = 0x000B00C2,
 		GetTotalStepCount = 0x000C0000,
 		GetStepHistoryAll = 0x000F0084,
@@ -30,6 +31,7 @@ void PTMService::handleSyncRequest(u32 messagePointer, PTMService::Type type) {
 			case PTMCommands::GetAdapterState: getAdapterState(messagePointer); break;
 			case PTMCommands::GetBatteryChargeState: getBatteryChargeState(messagePointer); break;
 			case PTMCommands::GetBatteryLevel: getBatteryLevel(messagePointer); break;
+			case PTMCommands::GetPedometerState: getPedometerState(messagePointer); break;
 			case PTMCommands::GetStepHistory: getStepHistory(messagePointer); break;
 			case PTMCommands::GetStepHistoryAll: getStepHistoryAll(messagePointer); break;
 			case PTMCommands::GetTotalStepCount: getTotalStepCount(messagePointer); break;
@@ -67,11 +69,20 @@ void PTMService::getBatteryChargeState(u32 messagePointer) {
 	// We're only charging if the battery is not already full
 	const bool charging = config.chargerPlugged && (config.batteryPercentage < 100);
 
-	mem.write32(messagePointer, IPC::responseHeader(0x7, 2, 0));
+	mem.write32(messagePointer, IPC::responseHeader(0x8, 2, 0));
 	mem.write32(messagePointer + 4, Result::Success);
 	mem.write8(messagePointer + 8, charging ? 1 : 0);
 }
 
+void PTMService::getPedometerState(u32 messagePointer) {
+	log("PTM::GetPedometerState");
+	const bool countingSteps = true;
+
+	mem.write32(messagePointer, IPC::responseHeader(0x9, 2, 0));
+	mem.write32(messagePointer + 4, Result::Success);
+	mem.write8(messagePointer + 8, countingSteps ? 1 : 0);
+}
+
 void PTMService::getBatteryLevel(u32 messagePointer) {
 	log("PTM::GetBatteryLevel");
 

From 6e6c84eebba714c8f21f9e5ae77a36a53f240079 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Thu, 25 Jan 2024 03:39:48 +0200
Subject: [PATCH 142/162] Add Mii Selector

---
 include/applets/applet.hpp             |  2 +-
 include/applets/mii_selector.hpp       | 72 +++++++++++++++++++++++++-
 include/applets/software_keyboard.hpp  |  2 +-
 src/core/applets/mii_selector.cpp      | 68 +++++++++++++++++++++++-
 src/core/applets/software_keyboard.cpp |  9 +++-
 src/core/services/apt.cpp              |  8 +--
 src/core/services/ptm.cpp              |  2 +-
 7 files changed, 150 insertions(+), 13 deletions(-)

diff --git a/include/applets/applet.hpp b/include/applets/applet.hpp
index d9ba6143..48f20b03 100644
--- a/include/applets/applet.hpp
+++ b/include/applets/applet.hpp
@@ -84,7 +84,7 @@ namespace Applets {
 		virtual const char* name() = 0;
 
 		// Called by APT::StartLibraryApplet and similar
-		virtual Result::HorizonResult start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters, u32 appID) = 0;
+		virtual Result::HorizonResult start(const MemoryBlock* sharedMem, const std::vector<u8>& parameters, u32 appID) = 0;
 		// Transfer parameters from application -> applet
 		virtual Result::HorizonResult receiveParameter(const Parameter& parameter) = 0;
 		virtual void reset() = 0;
diff --git a/include/applets/mii_selector.hpp b/include/applets/mii_selector.hpp
index 3b6cf2ec..36f9fe79 100644
--- a/include/applets/mii_selector.hpp
+++ b/include/applets/mii_selector.hpp
@@ -1,13 +1,83 @@
+#include <string>
+
 #include "applets/applet.hpp"
+#include "swap.hpp"
 
 namespace Applets {
+	struct MiiConfig {
+		u8 enableCancelButton;
+		u8 enableGuestMii;
+		u8 showOnTopScreen;
+		std::array<u8, 0x5> pad1;
+		std::array<u16_le, 0x40> title;
+		std::array<u8, 0x4> pad2;
+		u8 showGuestMiis;
+		std::array<u8, 0x3> pad3;
+		u32 initiallySelectedIndex;
+		std::array<u8, 0x6> guestMiiWhitelist;
+		std::array<u8, 0x64> userMiiWhitelist;
+		std::array<u8, 0x2> pad4;
+		u32 magicValue;
+	};
+	static_assert(sizeof(MiiConfig) == 0x104, "Mii config size is wrong");
+
+	// Some members of this struct are not properly aligned so we need pragma pack
+#pragma pack(push, 1)
+	struct MiiData {
+		u8 version;
+		u8 miiOptions;
+		u8 miiPos;
+		u8 consoleID;
+
+		u64_be systemID;
+		u32_be miiID;
+		std::array<u8, 0x6> creatorMAC;
+		u16 padding;
+
+		u16_be miiDetails;
+		std::array<char16_t, 0xA> miiName;
+		u8 height;
+		u8 width;
+
+		u8 faceStyle;
+		u8 faceDetails;
+		u8 hairStyle;
+		u8 hairDetails;
+		u32_be eyeDetails;
+		u32_be eyebrowDetails;
+		u16_be noseDetails;
+		u16_be mouthDetails;
+		u16_be moustacheDetails;
+		u16_be beardDetails;
+		u16_be glassesDetails;
+		u16_be moleDetails;
+
+		std::array<char16_t, 0xA> authorName;
+	};
+#pragma pack(pop)
+	static_assert(sizeof(MiiData) == 0x5C, "MiiData structure has incorrect size");
+
+	struct MiiResult {
+		u32_be returnCode;
+		u32_be isGuestMiiSelected;
+		u32_be selectedGuestMiiIndex;
+		MiiData selectedMiiData;
+		u16_be unknown1;
+		u16_be miiChecksum;
+		std::array<u16_le, 0xC> guestMiiName;
+	};
+	static_assert(sizeof(MiiResult) == 0x84, "MiiResult structure has incorrect size");
+
 	class MiiSelectorApplet final : public AppletBase {
 	  public:
 		virtual const char* name() override { return "Mii Selector"; }
-		virtual Result::HorizonResult start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters, u32 appID) override;
+		virtual Result::HorizonResult start(const MemoryBlock* sharedMem, const std::vector<u8>& parameters, u32 appID) override;
 		virtual Result::HorizonResult receiveParameter(const Applets::Parameter& parameter) override;
 		virtual void reset() override;
 
+		MiiResult output;
+		MiiConfig config;
+		MiiResult getDefaultMii();
 		MiiSelectorApplet(Memory& memory, std::optional<Parameter>& nextParam) : AppletBase(memory, nextParam) {}
 	};
 }  // namespace Applets
\ No newline at end of file
diff --git a/include/applets/software_keyboard.hpp b/include/applets/software_keyboard.hpp
index 3a167ad0..f753566d 100644
--- a/include/applets/software_keyboard.hpp
+++ b/include/applets/software_keyboard.hpp
@@ -150,7 +150,7 @@ namespace Applets {
 		static_assert(sizeof(SoftwareKeyboardConfig) == 0x400, "Software keyboard config size is wrong");
 
 		virtual const char* name() override { return "Software Keyboard"; }
-		virtual Result::HorizonResult start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters, u32 appID) override;
+		virtual Result::HorizonResult start(const MemoryBlock* sharedMem, const std::vector<u8>& parameters, u32 appID) override;
 		virtual Result::HorizonResult receiveParameter(const Applets::Parameter& parameter) override;
 		virtual void reset() override;
 
diff --git a/src/core/applets/mii_selector.cpp b/src/core/applets/mii_selector.cpp
index ede8de28..5b7637e3 100644
--- a/src/core/applets/mii_selector.cpp
+++ b/src/core/applets/mii_selector.cpp
@@ -1,11 +1,38 @@
 #include "applets/mii_selector.hpp"
 
+#include <boost/crc.hpp>
+#include <limits>
+
 #include "kernel/handles.hpp"
 
 using namespace Applets;
 
 void MiiSelectorApplet::reset() {}
-Result::HorizonResult MiiSelectorApplet::start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters, u32 appID) { return Result::Success; }
+Result::HorizonResult MiiSelectorApplet::start(const MemoryBlock* sharedMem, const std::vector<u8>& parameters, u32 appID) {
+	// Get mii configuration from the application
+	std::memcpy(&config, &parameters[0], sizeof(config));
+
+	Applets::Parameter param = Applets::Parameter{
+		.senderID = appID,
+		.destID = AppletIDs::Application,
+		.signal = static_cast<u32>(APTSignal::WakeupByExit),
+		.object = 0,
+	};
+
+	// Thanks to Citra devs as always for the default mii data and other applet help
+	output = getDefaultMii();
+	output.returnCode = 0;  // Success
+	// output.selectedMiiData = miiData;
+	output.selectedGuestMiiIndex = std::numeric_limits<u32>::max();
+	output.miiChecksum = boost::crc<16, 0x1021, 0, 0, false, false>(&output.selectedMiiData, sizeof(MiiData) + sizeof(output.unknown1));
+
+	// Copy output into the response parameter
+	param.data.resize(sizeof(output));
+	std::memcpy(&param.data[0], &output, sizeof(output));
+
+	nextParameter = param;
+	return Result::Success;
+}
 
 Result::HorizonResult MiiSelectorApplet::receiveParameter(const Applets::Parameter& parameter) {
 	Helpers::warn("Mii Selector: Unimplemented ReceiveParameter");
@@ -20,4 +47,43 @@ Result::HorizonResult MiiSelectorApplet::receiveParameter(const Applets::Paramet
 
 	nextParameter = param;
 	return Result::Success;
+}
+
+MiiResult MiiSelectorApplet::getDefaultMii() {
+	// This data was obtained from Citra
+	MiiData miiData;
+	miiData.version = 0x03;
+	miiData.miiOptions = 0x00;
+	miiData.miiPos = 0x10;
+	miiData.consoleID = 0x30;
+	miiData.systemID = 0xD285B6B300C8850A;
+	miiData.miiID = 0x98391EE4;
+	miiData.creatorMAC = {0x40, 0xF4, 0x07, 0xB7, 0x37, 0x10};
+	miiData.padding = 0x0000;
+	miiData.miiDetails = 0xA600;
+	miiData.miiName = {'P', 'a', 'n', 'd', 'a', '3', 'D', 'S', 0x0, 0x0};
+	miiData.height = 0x40;
+	miiData.width = 0x40;
+	miiData.faceStyle = 0x00;
+	miiData.faceDetails = 0x00;
+	miiData.hairStyle = 0x21;
+	miiData.hairDetails = 0x01;
+	miiData.eyeDetails = 0x02684418;
+	miiData.eyebrowDetails = 0x26344614;
+	miiData.noseDetails = 0x8112;
+	miiData.mouthDetails = 0x1768;
+	miiData.moustacheDetails = 0x0D00;
+	miiData.beardDetails = 0x0029;
+	miiData.glassesDetails = 0x0052;
+	miiData.moleDetails = 0x4850;
+	miiData.authorName = {u'B', u'O', u'N', u'K', u'E', u'R'};
+
+	MiiResult result;
+	result.returnCode = 0x0;
+	result.isGuestMiiSelected = 0x0;
+	result.selectedGuestMiiIndex = std::numeric_limits<u32>::max();
+	result.selectedMiiData = miiData;
+	result.guestMiiName.fill(0x0);
+
+	return result;
 }
\ No newline at end of file
diff --git a/src/core/applets/software_keyboard.cpp b/src/core/applets/software_keyboard.cpp
index dfe68b60..520e89c1 100644
--- a/src/core/applets/software_keyboard.cpp
+++ b/src/core/applets/software_keyboard.cpp
@@ -33,17 +33,22 @@ Result::HorizonResult SoftwareKeyboardApplet::receiveParameter(const Applets::Pa
 	return Result::Success;
 }
 
-Result::HorizonResult SoftwareKeyboardApplet::start(const MemoryBlock& sharedMem, const std::vector<u8>& parameters, u32 appID) {
+Result::HorizonResult SoftwareKeyboardApplet::start(const MemoryBlock* sharedMem, const std::vector<u8>& parameters, u32 appID) {
 	if (parameters.size() < sizeof(SoftwareKeyboardConfig)) {
 		Helpers::warn("SoftwareKeyboard::Start: Invalid size for keyboard configuration");
 		return Result::Success;
 	}
 
+	if (sharedMem == nullptr) {
+		Helpers::warn("SoftwareKeyboard: Missing shared memory");
+		return Result::Success;
+	}
+
 	// Get keyboard configuration from the application
 	std::memcpy(&config, &parameters[0], sizeof(config));
 
 	const std::u16string text = u"Pand";
-	u32 textAddress = sharedMem.addr;
+	u32 textAddress = sharedMem->addr;
 	
 	// Copy text to shared memory the app gave us
 	for (u32 i = 0; i < text.size(); i++) {
diff --git a/src/core/services/apt.cpp b/src/core/services/apt.cpp
index b475b89d..404a0e59 100644
--- a/src/core/services/apt.cpp
+++ b/src/core/services/apt.cpp
@@ -155,12 +155,8 @@ void APTService::startLibraryApplet(u32 messagePointer) {
 		mem.write32(messagePointer + 4, Result::Success);
 	} else {
 		KernelObject* sharedMemObject = kernel.getObject(parameters);
-		if (sharedMemObject == nullptr) {
-			Helpers::warn("Couldn't find shared memory block\n");
-			return;
-		}
 
-		const MemoryBlock* sharedMem = sharedMemObject->getData<MemoryBlock>();
+		const MemoryBlock* sharedMem = sharedMemObject ? sharedMemObject->getData<MemoryBlock>() : nullptr;
 		std::vector<u8> data;
 		data.reserve(bufferSize);
 
@@ -168,7 +164,7 @@ void APTService::startLibraryApplet(u32 messagePointer) {
 			data.push_back(mem.read8(buffer + i));
 		}
 
-		Result::HorizonResult result = destApplet->start(*sharedMem, data, appID);
+		Result::HorizonResult result = destApplet->start(sharedMem, data, appID);
 		if (resumeEvent.has_value()) {
 			kernel.signalEvent(resumeEvent.value());
 		}
diff --git a/src/core/services/ptm.cpp b/src/core/services/ptm.cpp
index 4cd7e095..67451cc2 100644
--- a/src/core/services/ptm.cpp
+++ b/src/core/services/ptm.cpp
@@ -76,7 +76,7 @@ void PTMService::getBatteryChargeState(u32 messagePointer) {
 
 void PTMService::getPedometerState(u32 messagePointer) {
 	log("PTM::GetPedometerState");
-	const bool countingSteps = true;
+	constexpr bool countingSteps = true;
 
 	mem.write32(messagePointer, IPC::responseHeader(0x9, 2, 0));
 	mem.write32(messagePointer + 4, Result::Success);

From f0c20d70bc82abdcd4182992fb688a44243828b2 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Thu, 25 Jan 2024 17:31:17 +0200
Subject: [PATCH 143/162] Add error/EULA applet

---
 CMakeLists.txt                         |  6 +++--
 include/applets/applet_manager.hpp     |  2 ++
 include/applets/error_applet.hpp       | 15 ++++++++++++
 src/core/applets/applet_manager.cpp    |  6 ++++-
 src/core/applets/error_applet.cpp      | 32 ++++++++++++++++++++++++++
 src/core/applets/mii_selector.cpp      |  2 --
 src/core/applets/software_keyboard.cpp |  2 --
 7 files changed, 58 insertions(+), 7 deletions(-)
 create mode 100644 include/applets/error_applet.hpp
 create mode 100644 src/core/applets/error_applet.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e557c5c8..baa37466 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,7 +188,9 @@ set(FS_SOURCE_FILES src/core/fs/archive_self_ncch.cpp src/core/fs/archive_save_d
                     src/core/fs/ivfc.cpp src/core/fs/archive_user_save_data.cpp src/core/fs/archive_system_save_data.cpp
 )
 
-set(APPLET_SOURCE_FILES src/core/applets/applet.cpp src/core/applets/mii_selector.cpp src/core/applets/software_keyboard.cpp src/core/applets/applet_manager.cpp)
+set(APPLET_SOURCE_FILES src/core/applets/applet.cpp src/core/applets/mii_selector.cpp src/core/applets/software_keyboard.cpp src/core/applets/applet_manager.cpp
+                        src/core/applets/error_applet.cpp
+)
 set(RENDERER_SW_SOURCE_FILES src/core/renderer_sw/renderer_sw.cpp)
 
 # Frontend source files
@@ -244,7 +246,7 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.hpp
                  include/services/news_u.hpp include/applets/software_keyboard.hpp include/applets/applet_manager.hpp include/fs/archive_user_save_data.hpp
                  include/services/amiibo_device.hpp include/services/nfc_types.hpp include/swap.hpp include/services/csnd.hpp include/services/nwm_uds.hpp
                  include/fs/archive_system_save_data.hpp include/lua_manager.hpp include/memory_mapped_file.hpp include/hydra_icon.hpp
-                 include/PICA/dynapica/shader_rec_emitter_arm64.hpp include/scheduler.hpp
+                 include/PICA/dynapica/shader_rec_emitter_arm64.hpp include/scheduler.hpp include/applets/error_applet.hpp
 )
 
 cmrc_add_resource_library(
diff --git a/include/applets/applet_manager.hpp b/include/applets/applet_manager.hpp
index e75e1268..d8cfff12 100644
--- a/include/applets/applet_manager.hpp
+++ b/include/applets/applet_manager.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include <optional>
 
+#include "applets/error_applet.hpp"
 #include "applets/mii_selector.hpp"
 #include "applets/software_keyboard.hpp"
 #include "helpers.hpp"
@@ -11,6 +12,7 @@ namespace Applets {
 	class AppletManager {
 		MiiSelectorApplet miiSelector;
 		SoftwareKeyboardApplet swkbd;
+		ErrorApplet error;
 		std::optional<Applets::Parameter> nextParameter = std::nullopt;
 
 	  public:
diff --git a/include/applets/error_applet.hpp b/include/applets/error_applet.hpp
new file mode 100644
index 00000000..4dcc319d
--- /dev/null
+++ b/include/applets/error_applet.hpp
@@ -0,0 +1,15 @@
+#include <string>
+
+#include "applets/applet.hpp"
+
+namespace Applets {
+	class ErrorApplet final : public AppletBase {
+	  public:
+		virtual const char* name() override { return "Error/EULA Agreement"; }
+		virtual Result::HorizonResult start(const MemoryBlock* sharedMem, const std::vector<u8>& parameters, u32 appID) override;
+		virtual Result::HorizonResult receiveParameter(const Applets::Parameter& parameter) override;
+		virtual void reset() override;
+
+		ErrorApplet(Memory& memory, std::optional<Parameter>& nextParam) : AppletBase(memory, nextParam) {}
+	};
+}  // namespace Applets
\ No newline at end of file
diff --git a/src/core/applets/applet_manager.cpp b/src/core/applets/applet_manager.cpp
index c2791777..cdb19319 100644
--- a/src/core/applets/applet_manager.cpp
+++ b/src/core/applets/applet_manager.cpp
@@ -4,13 +4,14 @@
 
 using namespace Applets;
 
-AppletManager::AppletManager(Memory& mem) : miiSelector(mem, nextParameter), swkbd(mem, nextParameter) {}
+AppletManager::AppletManager(Memory& mem) : miiSelector(mem, nextParameter), swkbd(mem, nextParameter), error(mem, nextParameter) {}
 
 void AppletManager::reset() {
 	nextParameter = std::nullopt;
 
 	miiSelector.reset();
 	swkbd.reset();
+	error.reset();
 }
 
 AppletBase* AppletManager::getApplet(u32 id) {
@@ -21,6 +22,9 @@ AppletBase* AppletManager::getApplet(u32 id) {
 		case AppletIDs::SoftwareKeyboard:
 		case AppletIDs::SoftwareKeyboard2: return &swkbd;
 
+		case AppletIDs::ErrDisp:
+		case AppletIDs::ErrDisp2: return &error;
+
 		default: return nullptr;
 	}
 }
diff --git a/src/core/applets/error_applet.cpp b/src/core/applets/error_applet.cpp
new file mode 100644
index 00000000..5acbcbba
--- /dev/null
+++ b/src/core/applets/error_applet.cpp
@@ -0,0 +1,32 @@
+#include "applets/error_applet.hpp"
+#include "kernel/handles.hpp"
+
+using namespace Applets;
+
+void ErrorApplet::reset() {}
+
+Result::HorizonResult ErrorApplet::start(const MemoryBlock* sharedMem, const std::vector<u8>& parameters, u32 appID) {
+	Applets::Parameter param = Applets::Parameter{
+		.senderID = appID,
+		.destID = AppletIDs::Application,
+		.signal = static_cast<u32>(APTSignal::WakeupByExit),
+		.object = 0,
+		.data = parameters, // TODO: Figure out how the data format for this applet
+	};
+
+	nextParameter = param;
+	return Result::Success;
+}
+
+Result::HorizonResult ErrorApplet::receiveParameter(const Applets::Parameter& parameter) {
+	Applets::Parameter param = Applets::Parameter{
+		.senderID = parameter.destID,
+		.destID = AppletIDs::Application,
+		.signal = static_cast<u32>(APTSignal::Response),
+		.object = KernelHandles::APTCaptureSharedMemHandle,
+		.data = {},
+	};
+
+	nextParameter = param;
+	return Result::Success;
+}
\ No newline at end of file
diff --git a/src/core/applets/mii_selector.cpp b/src/core/applets/mii_selector.cpp
index 5b7637e3..d6dd79da 100644
--- a/src/core/applets/mii_selector.cpp
+++ b/src/core/applets/mii_selector.cpp
@@ -35,8 +35,6 @@ Result::HorizonResult MiiSelectorApplet::start(const MemoryBlock* sharedMem, con
 }
 
 Result::HorizonResult MiiSelectorApplet::receiveParameter(const Applets::Parameter& parameter) {
-	Helpers::warn("Mii Selector: Unimplemented ReceiveParameter");
-
 	Applets::Parameter param = Applets::Parameter{
 		.senderID = parameter.destID,
 		.destID = AppletIDs::Application,
diff --git a/src/core/applets/software_keyboard.cpp b/src/core/applets/software_keyboard.cpp
index 520e89c1..4a91b790 100644
--- a/src/core/applets/software_keyboard.cpp
+++ b/src/core/applets/software_keyboard.cpp
@@ -10,8 +10,6 @@ using namespace Applets;
 void SoftwareKeyboardApplet::reset() {}
 
 Result::HorizonResult SoftwareKeyboardApplet::receiveParameter(const Applets::Parameter& parameter) {
-	Helpers::warn("Software keyboard: Unimplemented ReceiveParameter");
-
 	switch (parameter.signal) {
 		// Signal == request -> Applet is asking swkbd for a shared memory handle for backing up the framebuffer before opening the applet
 		case u32(APTSignal::Request): {

From 52accdde4334c7fdc16971cfe561634528edbb7d Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Thu, 25 Jan 2024 21:45:15 +0200
Subject: [PATCH 144/162] Test to fix android build

---
 include/scheduler.hpp | 2 ++
 src/emulator.cpp      | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/scheduler.hpp b/include/scheduler.hpp
index 92328878..5645f47d 100644
--- a/include/scheduler.hpp
+++ b/include/scheduler.hpp
@@ -48,6 +48,8 @@ struct Scheduler {
 
 		// Clear any pending events
 		events.clear();
+		addEvent(Scheduler::EventType::VBlank, arm11Clock / 60);
+
 		// Add a dummy event to always keep the scheduler non-empty
 		addEvent(EventType::Panic, std::numeric_limits<u64>::max());
 	}
diff --git a/src/emulator.cpp b/src/emulator.cpp
index 1ac8d5b2..c567cbc7 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -48,7 +48,6 @@ void Emulator::reset(ReloadOption reload) {
 	memory.reset();
 	// Reset scheduler and add a VBlank event
 	scheduler.reset();
-	scheduler.addEvent(Scheduler::EventType::VBlank, CPU::ticksPerSec / 60);
 
 	// Kernel must be reset last because it depends on CPU/Memory state
 	kernel.reset();

From 99a1a0133ddb4f575f49ae740a5cfa1e41d63ba7 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 27 Jan 2024 01:58:21 +0200
Subject: [PATCH 145/162] Initial idle skip implementation

---
 include/cpu_dynarmic.hpp        |  2 ++
 include/kernel/kernel.hpp       |  1 +
 include/kernel/kernel_types.hpp |  1 +
 src/core/kernel/events.cpp      |  2 ++
 src/core/kernel/threads.cpp     | 35 ++++++++++++++++++++++++++-------
 5 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/include/cpu_dynarmic.hpp b/include/cpu_dynarmic.hpp
index 97acddd0..048bc62a 100644
--- a/include/cpu_dynarmic.hpp
+++ b/include/cpu_dynarmic.hpp
@@ -179,6 +179,8 @@ class CPU {
 		return scheduler;
 	}
 
+    void addTicks(u64 ticks) { env.AddTicks(ticks); }
+
     void clearCache() { jit->ClearCache(); }
     void runFrame();
 };
\ No newline at end of file
diff --git a/include/kernel/kernel.hpp b/include/kernel/kernel.hpp
index d35d9031..e78a588a 100644
--- a/include/kernel/kernel.hpp
+++ b/include/kernel/kernel.hpp
@@ -95,6 +95,7 @@ public:
 	void releaseMutex(Mutex* moo);
 	void cancelTimer(Timer* timer);
 	void signalTimer(Handle timerHandle, Timer* timer);
+	u64 getWakeupTick(s64 ns);
 
 	// Wake up the thread with the highest priority out of all threads in the waitlist
 	// Returns the index of the woken up thread
diff --git a/include/kernel/kernel_types.hpp b/include/kernel/kernel_types.hpp
index 79684e17..2c357037 100644
--- a/include/kernel/kernel_types.hpp
+++ b/include/kernel/kernel_types.hpp
@@ -123,6 +123,7 @@ struct Thread {
     bool waitAll;
     // For WaitSynchronizationN: The "out" pointer
     u32 outPointer;
+	u64 wakeupTick;
 
     // Thread context used for switching between threads
     std::array<u32, 16> gprs;
diff --git a/src/core/kernel/events.cpp b/src/core/kernel/events.cpp
index 7da4788e..b5b1c06e 100644
--- a/src/core/kernel/events.cpp
+++ b/src/core/kernel/events.cpp
@@ -127,6 +127,7 @@ void Kernel::waitSynchronization1() {
 		t.waitList.resize(1);
 		t.status = ThreadStatus::WaitSync1;
 		t.sleepTick = cpu.getTicks();
+		t.wakeupTick = getWakeupTick(ns);
 		t.waitingNanoseconds = ns;
 		t.waitList[0] = handle;
 
@@ -222,6 +223,7 @@ void Kernel::waitSynchronizationN() {
 		t.outPointer = outPointer;
 		t.waitingNanoseconds = ns;
 		t.sleepTick = cpu.getTicks();
+		t.wakeupTick = getWakeupTick(ns);
 
 		for (s32 i = 0; i < handleCount; i++) {
 			t.waitList[i] = waitObjects[i].first; // Add object to this thread's waitlist
diff --git a/src/core/kernel/threads.cpp b/src/core/kernel/threads.cpp
index 239a6617..cea48bd2 100644
--- a/src/core/kernel/threads.cpp
+++ b/src/core/kernel/threads.cpp
@@ -52,14 +52,8 @@ bool Kernel::canThreadRun(const Thread& t) {
 		return true;
 	} else if (t.status == ThreadStatus::WaitSleep || t.status == ThreadStatus::WaitSync1
 		|| t.status == ThreadStatus::WaitSyncAny || t.status == ThreadStatus::WaitSyncAll) {
-		const u64 elapsedTicks = cpu.getTicks() - t.sleepTick;
-
-		constexpr double ticksPerSec = double(CPU::ticksPerSec);
-		constexpr double nsPerTick = ticksPerSec / 1000000000.0;
-
 		// TODO: Set r0 to the correct error code on timeout for WaitSync{1/Any/All}
-		const s64 elapsedNs = s64(double(elapsedTicks) * nsPerTick);
-		return elapsedNs >= t.waitingNanoseconds;
+		return cpu.getTicks() >= t.wakeupTick;
 	}
 
 	// Handle timeouts and stuff here
@@ -82,6 +76,14 @@ std::optional<int> Kernel::getNextThread() {
 	return std::nullopt;
 }
 
+u64 Kernel::getWakeupTick(s64 ns) {
+	if (ns == -1) {
+		return std::numeric_limits<u64>::max();
+	}
+
+	return cpu.getTicks() + Scheduler::nsToCycles(ns);
+}
+
 // See if there is a higher priority, ready thread and switch to that
 void Kernel::rescheduleThreads() {
 	Thread& current = threads[currentThreadIndex];  // Current running thread
@@ -368,6 +370,24 @@ void Kernel::sleepThread(s64 ns) {
 			if (index != idleThreadIndex) {
 				switchThread(index);
 			}
+		} else {
+			if (currentThreadIndex == idleThreadIndex) {
+				const Scheduler& scheduler = cpu.getScheduler();
+				u64 timestamp = scheduler.nextTimestamp;
+
+				for (auto i : threadIndices) {
+					const Thread& t = threads[i];
+					if (t.status == ThreadStatus::WaitSleep || t.status == ThreadStatus::WaitSync1 || t.status == ThreadStatus::WaitSyncAny ||
+						t.status == ThreadStatus::WaitSyncAll) {
+						timestamp = std::min<u64>(timestamp, t.wakeupTick);
+					}
+				}
+
+				if (timestamp > scheduler.currentTimestamp) {
+					u64 idleCycles = timestamp - scheduler.currentTimestamp;
+					cpu.addTicks(idleCycles);
+				}
+			}
 		}
 	} else {  // If we're sleeping for >= 0 ns
 		Thread& t = threads[currentThreadIndex];
@@ -375,6 +395,7 @@ void Kernel::sleepThread(s64 ns) {
 		t.status = ThreadStatus::WaitSleep;
 		t.waitingNanoseconds = ns;
 		t.sleepTick = cpu.getTicks();
+		t.wakeupTick = getWakeupTick(ns);
 
 		requireReschedule();
 	}

From 491b415759348c5cb5a93f7007e9865148a88ccb Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 27 Jan 2024 15:38:27 +0200
Subject: [PATCH 146/162] Remove thread sleepTick/waitingNs

---
 include/kernel/kernel_types.hpp | 76 ++++++++++++++++-----------------
 src/core/kernel/events.cpp      |  4 --
 src/core/kernel/idle_thread.cpp | 13 +-----
 src/core/kernel/threads.cpp     |  2 -
 4 files changed, 37 insertions(+), 58 deletions(-)

diff --git a/include/kernel/kernel_types.hpp b/include/kernel/kernel_types.hpp
index 2c357037..01af4bd9 100644
--- a/include/kernel/kernel_types.hpp
+++ b/include/kernel/kernel_types.hpp
@@ -83,57 +83,53 @@ struct Port {
 };
 
 struct Session {
-    Handle portHandle; // The port this session is subscribed to
-    Session(Handle portHandle) : portHandle(portHandle) {}
+	Handle portHandle;  // The port this session is subscribed to
+	Session(Handle portHandle) : portHandle(portHandle) {}
 };
 
 enum class ThreadStatus {
-    Running,     // Currently running
-    Ready,       // Ready to run
-    WaitArbiter, // Waiting on an address arbiter
-    WaitSleep,   // Waiting due to a SleepThread SVC
-    WaitSync1,   // Waiting for the single object in the wait list to be ready
-    WaitSyncAny, // Wait for one object of the many that might be in the wait list to be ready
-    WaitSyncAll, // Waiting for ALL sync objects in its wait list to be ready
-    WaitIPC,     // Waiting for the reply from an IPC request
-    Dormant,     // Created but not yet made ready
-    Dead         // Run to completion, or forcefully terminated
+	Running,      // Currently running
+	Ready,        // Ready to run
+	WaitArbiter,  // Waiting on an address arbiter
+	WaitSleep,    // Waiting due to a SleepThread SVC
+	WaitSync1,    // Waiting for the single object in the wait list to be ready
+	WaitSyncAny,  // Wait for one object of the many that might be in the wait list to be ready
+	WaitSyncAll,  // Waiting for ALL sync objects in its wait list to be ready
+	WaitIPC,      // Waiting for the reply from an IPC request
+	Dormant,      // Created but not yet made ready
+	Dead          // Run to completion, or forcefully terminated
 };
 
 struct Thread {
-    u32 initialSP;  // Initial r13 value
-    u32 entrypoint; // Initial r15 value
-    u32 priority;
-    u32 arg;
-    ProcessorID processorID;
-    ThreadStatus status;
-    Handle handle;  // OS handle for this thread
-    int index; // Index of the thread. 0 for the first thread, 1 for the second, and so on
+	u32 initialSP;   // Initial r13 value
+	u32 entrypoint;  // Initial r15 value
+	u32 priority;
+	u32 arg;
+	ProcessorID processorID;
+	ThreadStatus status;
+	Handle handle;  // OS handle for this thread
+	int index;      // Index of the thread. 0 for the first thread, 1 for the second, and so on
 
-    // The waiting address for threads that are waiting on an AddressArbiter
-    u32 waitingAddress;
+	// The waiting address for threads that are waiting on an AddressArbiter
+	u32 waitingAddress;
 
-    // The nanoseconds until a thread wakes up from being asleep or from timing out while waiting on an arbiter
-    u64 waitingNanoseconds;
-    // The tick this thread went to sleep on
-    u64 sleepTick;
-    // For WaitSynchronization(N): A vector of objects this thread is waiting for
-    std::vector<Handle> waitList;
-    // For WaitSynchronizationN: Shows whether the object should wait for all objects in the wait list or just one
-    bool waitAll;
-    // For WaitSynchronizationN: The "out" pointer
-    u32 outPointer;
+	// For WaitSynchronization(N): A vector of objects this thread is waiting for
+	std::vector<Handle> waitList;
+	// For WaitSynchronizationN: Shows whether the object should wait for all objects in the wait list or just one
+	bool waitAll;
+	// For WaitSynchronizationN: The "out" pointer
+	u32 outPointer;
 	u64 wakeupTick;
 
-    // Thread context used for switching between threads
-    std::array<u32, 16> gprs;
-    std::array<u32, 32> fprs; // Stored as u32 because dynarmic does it
-    u32 cpsr;
-    u32 fpscr;
-    u32 tlsBase; // Base pointer for thread-local storage
+	// Thread context used for switching between threads
+	std::array<u32, 16> gprs;
+	std::array<u32, 32> fprs;  // Stored as u32 because dynarmic does it
+	u32 cpsr;
+	u32 fpscr;
+	u32 tlsBase;  // Base pointer for thread-local storage
 
-    // A list of threads waiting for this thread to terminate. Yes, threads are sync objects too.
-    u64 threadsWaitingForTermination;
+	// A list of threads waiting for this thread to terminate. Yes, threads are sync objects too.
+	u64 threadsWaitingForTermination;
 };
 
 static const char* kernelObjectTypeToString(KernelObjectType t) {
diff --git a/src/core/kernel/events.cpp b/src/core/kernel/events.cpp
index b5b1c06e..b2f89fbf 100644
--- a/src/core/kernel/events.cpp
+++ b/src/core/kernel/events.cpp
@@ -126,9 +126,7 @@ void Kernel::waitSynchronization1() {
 		auto& t = threads[currentThreadIndex];
 		t.waitList.resize(1);
 		t.status = ThreadStatus::WaitSync1;
-		t.sleepTick = cpu.getTicks();
 		t.wakeupTick = getWakeupTick(ns);
-		t.waitingNanoseconds = ns;
 		t.waitList[0] = handle;
 
 		// Add the current thread to the object's wait list
@@ -221,8 +219,6 @@ void Kernel::waitSynchronizationN() {
 		t.waitList.resize(handleCount);
 		t.status = ThreadStatus::WaitSyncAny;
 		t.outPointer = outPointer;
-		t.waitingNanoseconds = ns;
-		t.sleepTick = cpu.getTicks();
 		t.wakeupTick = getWakeupTick(ns);
 
 		for (s32 i = 0; i < handleCount; i++) {
diff --git a/src/core/kernel/idle_thread.cpp b/src/core/kernel/idle_thread.cpp
index 5abba373..d666968b 100644
--- a/src/core/kernel/idle_thread.cpp
+++ b/src/core/kernel/idle_thread.cpp
@@ -8,13 +8,6 @@
 	The code for our idle thread looks like this
 
 idle_thread_main:
-	mov r0, #4096            @ Loop counter
-	
-	.loop:
-	nop; nop; nop; nop       @ NOP 4 times to waste some cycles
-	subs r0, #1              @ Decrement counter by 1, go back to looping if loop counter != 0
-	bne .loop
-
 	// Sleep for 0 seconds with the SleepThread SVC, which just yields execution
 	mov r0, #0
 	mov r1, #0
@@ -24,14 +17,10 @@ idle_thread_main:
 */
 
 static constexpr u8 idleThreadCode[] = {
-	0x01, 0x0A, 0xA0, 0xE3, // mov r0, #4096
-	0x00, 0xF0, 0x20, 0xE3, 0x00, 0xF0, 0x20, 0xE3, 0x00, 0xF0, 0x20, 0xE3, 0x00, 0xF0, 0x20, 0xE3, // nop (4 times)
-	0x01, 0x00, 0x50, 0xE2,  // subs r0, #1
-	0xF9, 0xFF, 0xFF, 0x1A,  // bne loop
 	0x00, 0x00, 0xA0, 0xE3,  // mov r0, #0
 	0x00, 0x10, 0xA0, 0xE3,  // mov r1, #0
 	0x0A, 0x00, 0x00, 0xEF,  // svc SleepThread
-	0xF4, 0xFF, 0xFF, 0xEA   // b idle_thread_main
+	0xFB, 0xFF, 0xFF, 0xEA   // b idle_thread_main
 };
 
 // Set up an idle thread to run when no thread is able to run
diff --git a/src/core/kernel/threads.cpp b/src/core/kernel/threads.cpp
index cea48bd2..bf05fd89 100644
--- a/src/core/kernel/threads.cpp
+++ b/src/core/kernel/threads.cpp
@@ -393,8 +393,6 @@ void Kernel::sleepThread(s64 ns) {
 		Thread& t = threads[currentThreadIndex];
 
 		t.status = ThreadStatus::WaitSleep;
-		t.waitingNanoseconds = ns;
-		t.sleepTick = cpu.getTicks();
 		t.wakeupTick = getWakeupTick(ns);
 
 		requireReschedule();

From 8ff2d7f9b2bb2b70a7420d6482ba99dd36d16a98 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 27 Jan 2024 15:44:01 +0200
Subject: [PATCH 147/162] Update comment

---
 src/core/kernel/threads.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/kernel/threads.cpp b/src/core/kernel/threads.cpp
index bf05fd89..3a6201c1 100644
--- a/src/core/kernel/threads.cpp
+++ b/src/core/kernel/threads.cpp
@@ -77,6 +77,7 @@ std::optional<int> Kernel::getNextThread() {
 }
 
 u64 Kernel::getWakeupTick(s64 ns) {
+	// Timeout == -1 means that the thread doesn't plan on waking up automatically
 	if (ns == -1) {
 		return std::numeric_limits<u64>::max();
 	}

From 63f54478f0840a168a942999c894edad83bc6b59 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Sat, 27 Jan 2024 17:01:02 +0200
Subject: [PATCH 148/162] Add cheat picker window

---
 CMakeLists.txt                     |   6 +-
 include/panda_qt/cheats_window.hpp |  26 +++
 include/panda_qt/main_window.hpp   |   5 +
 src/panda_qt/cheats_window.cpp     | 313 +++++++++++++++++++++++++++++
 src/panda_qt/main_window.cpp       |  14 +-
 5 files changed, 358 insertions(+), 6 deletions(-)
 create mode 100644 include/panda_qt/cheats_window.hpp
 create mode 100644 src/panda_qt/cheats_window.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index baa37466..9748b8f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION
 endif()
 
 if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE Release)
+    set(CMAKE_BUILD_TYPE RelWithDebInfo)
 endif()
 
 project(Alber)
@@ -197,10 +197,10 @@ set(RENDERER_SW_SOURCE_FILES src/core/renderer_sw/renderer_sw.cpp)
 if(NOT ANDROID)
     if(ENABLE_QT_GUI)
         set(FRONTEND_SOURCE_FILES src/panda_qt/main.cpp src/panda_qt/screen.cpp src/panda_qt/main_window.cpp src/panda_qt/about_window.cpp
-            src/panda_qt/config_window.cpp src/panda_qt/zep.cpp src/panda_qt/text_editor.cpp
+            src/panda_qt/config_window.cpp src/panda_qt/zep.cpp src/panda_qt/text_editor.cpp src/panda_qt/cheats_window.cpp
         )   
         set(FRONTEND_HEADER_FILES include/panda_qt/screen.hpp include/panda_qt/main_window.hpp include/panda_qt/about_window.hpp
-            include/panda_qt/config_window.hpp include/panda_qt/text_editor.hpp
+            include/panda_qt/config_window.hpp include/panda_qt/text_editor.hpp include/panda_qt/cheats_window.hpp
         )
 
         source_group("Source Files\\Qt" FILES ${FRONTEND_SOURCE_FILES})
diff --git a/include/panda_qt/cheats_window.hpp b/include/panda_qt/cheats_window.hpp
new file mode 100644
index 00000000..2160a1f6
--- /dev/null
+++ b/include/panda_qt/cheats_window.hpp
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <filesystem>
+#include <memory>
+#include <QAction>
+#include <QWidget>
+#include "emulator.hpp"
+
+class QListWidget;
+
+class CheatsWindow final : public QWidget
+{
+    Q_OBJECT
+
+public:
+    CheatsWindow(Emulator* emu, const std::filesystem::path& path, QWidget* parent = nullptr);
+    ~CheatsWindow() = default;
+
+private:
+    void addEntry();
+    void removeClicked();
+
+    QListWidget* cheatList;
+    std::filesystem::path cheatPath;
+    Emulator* emu;
+};
diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp
index 7dfb91b7..39a8b35f 100644
--- a/include/panda_qt/main_window.hpp
+++ b/include/panda_qt/main_window.hpp
@@ -12,6 +12,7 @@
 #include "emulator.hpp"
 #include "panda_qt/about_window.hpp"
 #include "panda_qt/config_window.hpp"
+#include "panda_qt/cheats_window.hpp"
 #include "panda_qt/screen.hpp"
 #include "panda_qt/text_editor.hpp"
 #include "services/hid.hpp"
@@ -54,15 +55,19 @@ class MainWindow : public QMainWindow {
 	ScreenWidget screen;
 	AboutWindow* aboutWindow;
 	ConfigWindow* configWindow;
+	CheatsWindow* cheatsEditor;
 	TextEditorWindow* luaEditor;
 	QMenuBar* menuBar = nullptr;
 
+	QAction* cheatsEditorAction = nullptr;
+
 	void swapEmuBuffer();
 	void emuThreadMainLoop();
 	void selectLuaFile();
 	void selectROM();
 	void dumpRomFS();
 	void openLuaEditor();
+	void openCheatsEditor();
 	void showAboutMenu();
 	void sendMessage(const EmulatorMessage& message);
 	void dispatchMessage(const EmulatorMessage& message);
diff --git a/src/panda_qt/cheats_window.cpp b/src/panda_qt/cheats_window.cpp
new file mode 100644
index 00000000..909ba0cb
--- /dev/null
+++ b/src/panda_qt/cheats_window.cpp
@@ -0,0 +1,313 @@
+#include "panda_qt/cheats_window.hpp"
+#include <qlistwidget.h>
+#include <QVBoxLayout>
+#include <QListWidget>
+#include <QPushButton>
+#include <QLabel>
+#include <QCheckBox>
+#include <QDialog>
+#include <QLineEdit>
+#include <QTextEdit>
+#include <QDialogButtonBox>
+#include "cheats.hpp"
+#include "emulator.hpp"
+
+using CheatHandle = u32;
+
+CheatHandle BAD_CHEAT = 0xFFFFFFFF;
+
+struct CheatMetadata
+{
+    CheatHandle handle = BAD_CHEAT;
+    std::string name = "New cheat";
+    std::string code;
+    bool enabled = true;
+};
+
+u32 addCheat(Emulator* emu, u8* data, size_t size)
+{
+    if ((size % 8) != 0) {
+		return BAD_CHEAT;
+	}
+
+	Cheats::Cheat cheat;
+	cheat.enabled = true;
+	cheat.type = Cheats::CheatType::ActionReplay;
+
+	for (size_t i = 0; i < size; i += 8) {
+		auto read32 = [](const u8* ptr) { return (u32(ptr[3]) << 24) | (u32(ptr[2]) << 16) | (u32(ptr[1]) << 8) | u32(ptr[0]); };
+
+		// Data is passed to us in big endian so we bswap
+		u32 firstWord = Common::swap32(read32(data + i));
+		u32 secondWord = Common::swap32(read32(data + i + 4));
+		cheat.instructions.insert(cheat.instructions.end(), {firstWord, secondWord});
+	}
+
+	return emu->getCheats().addCheat(cheat);
+}
+
+class CheatEntryWidget : public QWidget
+{
+public:
+    CheatEntryWidget(Emulator* emu, CheatMetadata metadata, QListWidget* parent);
+
+    void Update()
+    {
+        name->setText(metadata.name.c_str());
+        enabled->setChecked(metadata.enabled);
+        update();
+    }
+
+    void Remove()
+    {
+        emu->getCheats().removeCheat(metadata.handle);
+        cheatList->takeItem(cheatList->row(listItem));
+        deleteLater();
+    }
+
+    const CheatMetadata& GetMetadata()
+    {
+        return metadata;
+    }
+
+    void SetMetadata(const CheatMetadata& metadata)
+    {
+        this->metadata = metadata;
+    }
+
+private:
+    void checkboxChanged(int state);
+    void editClicked();
+
+    Emulator* emu;
+    CheatMetadata metadata;
+    u32 handle;
+    QLabel* name;
+    QCheckBox* enabled;
+    QListWidget* cheatList;
+    QListWidgetItem* listItem;
+};
+
+class CheatEditDialog : public QDialog
+{
+public:
+    CheatEditDialog(Emulator* emu, CheatEntryWidget& cheatEntry);
+
+    void accepted();
+    void rejected();
+private:
+    Emulator* emu;
+    CheatEntryWidget& cheatEntry;
+    QTextEdit* codeEdit;
+    QLineEdit* nameEdit;
+};
+
+CheatEntryWidget::CheatEntryWidget(Emulator* emu, CheatMetadata metadata, QListWidget* parent)
+    : QWidget(), emu(emu), metadata(metadata), cheatList(parent)
+{
+    QHBoxLayout* layout = new QHBoxLayout;
+
+    enabled = new QCheckBox;
+    enabled->setChecked(metadata.enabled);
+
+    name = new QLabel(metadata.name.c_str());
+    QPushButton* buttonEdit = new QPushButton(tr("Edit"));
+
+    connect(enabled, &QCheckBox::stateChanged, this, &CheatEntryWidget::checkboxChanged);
+    connect(buttonEdit, &QPushButton::clicked, this, &CheatEntryWidget::editClicked);
+
+    layout->addWidget(enabled);
+    layout->addWidget(name);
+    layout->addWidget(buttonEdit);
+    setLayout(layout);
+
+    listItem = new QListWidgetItem;
+    listItem->setSizeHint(sizeHint());
+    parent->addItem(listItem);
+    parent->setItemWidget(listItem, this);
+}
+
+void CheatEntryWidget::checkboxChanged(int state)
+{
+    bool enabled = state == Qt::Checked;
+    if (metadata.handle == BAD_CHEAT)
+    {
+        printf("Cheat handle is bad, this shouldn't happen\n");
+        return;
+    }
+
+    if (enabled)
+    {
+        emu->getCheats().enableCheat(metadata.handle);
+        metadata.enabled = true;
+    }
+    else
+    {
+        emu->getCheats().disableCheat(metadata.handle);
+        metadata.enabled = false;
+    }
+}
+
+void CheatEntryWidget::editClicked()
+{
+    CheatEditDialog* dialog = new CheatEditDialog(emu, *this);
+    dialog->show();
+}
+
+CheatEditDialog::CheatEditDialog(Emulator* emu, CheatEntryWidget& cheatEntry) : QDialog(), emu(emu), cheatEntry(cheatEntry)
+{
+    setAttribute(Qt::WA_DeleteOnClose);
+    setModal(true);
+
+    QVBoxLayout* layout = new QVBoxLayout;
+    const CheatMetadata& metadata = cheatEntry.GetMetadata();
+    codeEdit = new QTextEdit;
+    nameEdit = new QLineEdit;
+    nameEdit->setText(metadata.name.c_str());
+    nameEdit->setPlaceholderText(tr("Cheat name"));
+    layout->addWidget(nameEdit);
+
+    QFont font;
+    font.setFamily("Courier");
+    font.setFixedPitch(true);
+    font.setPointSize(10);
+    codeEdit->setFont(font);
+
+    if (metadata.code.size() != 0)
+    {
+        // Nicely format it like so:
+        // 01234567 89ABCDEF
+        // 01234567 89ABCDEF
+        std::string formattedCode;
+        for (size_t i = 0; i < metadata.code.size(); i += 2)
+        {
+            if (i != 0) {
+                if (i % 8 == 0 && i % 16 != 0)
+                {
+                    formattedCode += " ";
+                }
+                else if (i % 16 == 0)
+                {
+                    formattedCode += "\n";
+                }
+            }
+
+            formattedCode += metadata.code[i];
+            formattedCode += metadata.code[i + 1];
+        }
+        codeEdit->setText(formattedCode.c_str());
+    }
+
+    layout->addWidget(codeEdit);
+    setLayout(layout);
+
+    auto buttons = QDialogButtonBox::Ok | QDialogButtonBox::Cancel;
+    QDialogButtonBox* button_box = new QDialogButtonBox(buttons);
+    layout->addWidget(button_box);
+
+    connect(button_box, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(button_box, &QDialogButtonBox::rejected, this, &QDialog::reject);
+    connect(this, &QDialog::rejected, this, &CheatEditDialog::rejected);
+    connect(this, &QDialog::accepted, this, &CheatEditDialog::accepted);
+}
+
+void CheatEditDialog::accepted()
+{
+    QString code = codeEdit->toPlainText();
+    code.replace(QRegularExpression("[^0-9a-fA-F]"), "");
+
+    CheatMetadata metadata = cheatEntry.GetMetadata();
+    bool isEditing = metadata.handle != BAD_CHEAT;
+    metadata.name = nameEdit->text().toStdString();
+    metadata.code = code.toStdString();
+
+    std::vector<uint8_t> bytes;
+    for (size_t i = 0; i < metadata.code.size(); i += 2)
+    {
+        std::string hex = metadata.code.substr(i, 2);
+        bytes.push_back((uint8_t)std::stoul(hex, nullptr, 16));
+    }
+
+    if (isEditing)
+    {
+        emu->getCheats().removeCheat(metadata.handle);
+        u32 handle = addCheat(emu, bytes.data(), bytes.size());
+        metadata.handle = handle;
+        cheatEntry.SetMetadata(metadata);
+    }
+    else
+    {
+        if (metadata.name.empty())
+        {
+            metadata.name = tr("Cheat code").toStdString();
+        }
+        u32 handle = addCheat(emu, bytes.data(), bytes.size());
+        metadata.handle = handle;
+        cheatEntry.SetMetadata(metadata);
+    }
+
+    cheatEntry.Update();
+}
+
+void CheatEditDialog::rejected()
+{
+    bool isEditing = cheatEntry.GetMetadata().handle != BAD_CHEAT;
+
+    if (!isEditing)
+    {
+        // Was adding a cheat but pressed cancel
+        cheatEntry.Remove();
+    }
+}
+
+CheatsWindow::CheatsWindow(Emulator* emu, const std::filesystem::path& cheatPath, QWidget* parent)
+: QWidget(parent, Qt::Window), emu(emu), cheatPath(cheatPath)
+{
+    QVBoxLayout* layout = new QVBoxLayout;
+    layout->setContentsMargins(6, 6, 6, 6);
+    setLayout(layout);
+
+    cheatList = new QListWidget;
+    layout->addWidget(cheatList);
+
+    QWidget* buttonBox = new QWidget;
+    QHBoxLayout* buttonLayout = new QHBoxLayout;
+
+    QPushButton* buttonAdd = new QPushButton(tr("Add"));
+    QPushButton* buttonRemove = new QPushButton(tr("Remove"));
+
+    connect(buttonAdd, &QPushButton::clicked, this, &CheatsWindow::addEntry);
+    connect(buttonRemove, &QPushButton::clicked, this, &CheatsWindow::removeClicked);
+
+    buttonLayout->addWidget(buttonAdd);
+    buttonLayout->addWidget(buttonRemove);
+    buttonBox->setLayout(buttonLayout);
+
+    layout->addWidget(buttonBox);
+
+    // TODO: load cheats from saved cheats per game
+    // for (const CheatMetadata& metadata : getSavedCheats())
+    // {
+    //     new CheatEntryWidget(emu, metadata, cheatList);
+    // }
+}
+
+void CheatsWindow::addEntry()
+{
+    // CheatEntryWidget is added to the list when it's created
+    CheatEntryWidget* entry = new CheatEntryWidget(emu, {BAD_CHEAT, "New cheat", "", true}, cheatList);
+    CheatEditDialog* dialog = new CheatEditDialog(emu, *entry);
+    dialog->show();
+}
+
+void CheatsWindow::removeClicked()
+{
+    QListWidgetItem* item = cheatList->currentItem();
+    if (item == nullptr)
+    {
+        return;
+    }
+
+    CheatEntryWidget* entry = static_cast<CheatEntryWidget*>(cheatList->itemWidget(item));
+    entry->Remove();
+}
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index 5c661119..be5e4fd6 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -48,20 +48,24 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 
 	auto dumpRomFSAction = toolsMenu->addAction(tr("Dump RomFS"));
 	auto luaEditorAction = toolsMenu->addAction(tr("Open Lua Editor"));
+	cheatsEditorAction = toolsMenu->addAction(tr("Open Cheats Editor"));
+	cheatsEditorAction->setEnabled(false);
 	connect(dumpRomFSAction, &QAction::triggered, this, &MainWindow::dumpRomFS);
 	connect(luaEditorAction, &QAction::triggered, this, &MainWindow::openLuaEditor);
+	connect(cheatsEditorAction, &QAction::triggered, this, &MainWindow::openCheatsEditor);
 
 	auto aboutAction = aboutMenu->addAction(tr("About Panda3DS"));
 	connect(aboutAction, &QAction::triggered, this, &MainWindow::showAboutMenu);
 
+	emu = new Emulator();
+	emu->setOutputSize(screen.surfaceWidth, screen.surfaceHeight);
+
 	// Set up misc objects
 	aboutWindow = new AboutWindow(nullptr);
 	configWindow = new ConfigWindow(this);
+	cheatsEditor = new CheatsWindow(emu, {});
 	luaEditor = new TextEditorWindow(this, "script.lua", "");
 
-	emu = new Emulator();
-	emu->setOutputSize(screen.surfaceWidth, screen.surfaceHeight);
-
 	auto args = QCoreApplication::arguments();
 	if (args.size() > 1) {
 		auto romPath = std::filesystem::current_path() / args.at(1).toStdU16String();
@@ -184,6 +188,7 @@ MainWindow::~MainWindow() {
 	delete menuBar;
 	delete aboutWindow;
 	delete configWindow;
+	delete cheatsEditor;
 	delete luaEditor;
 }
 
@@ -234,10 +239,13 @@ void MainWindow::showAboutMenu() {
 
 void MainWindow::openLuaEditor() { luaEditor->show(); }
 
+void MainWindow::openCheatsEditor() { cheatsEditor->show(); }
+
 void MainWindow::dispatchMessage(const EmulatorMessage& message) {
 	switch (message.type) {
 		case MessageType::LoadROM:
 			emu->loadROM(*message.path.p);
+			cheatsEditorAction->setEnabled(true);
 			// Clean up the allocated path
 			delete message.path.p;
 			break;

From a473a34794e189c251079f50b95941ac1110fd91 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Sat, 27 Jan 2024 18:20:42 +0200
Subject: [PATCH 149/162] Use message queues

---
 CMakeLists.txt                     |   2 +-
 include/cheats.hpp                 |   3 +
 include/panda_qt/cheats_window.hpp |  28 +-
 include/panda_qt/main_window.hpp   |  16 +-
 src/core/cheats.cpp                |  22 ++
 src/panda_qt/cheats_window.cpp     | 429 ++++++++++++-----------------
 src/panda_qt/main_window.cpp       |  35 ++-
 7 files changed, 266 insertions(+), 269 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9748b8f8..ac6cdfb8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION
 endif()
 
 if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE RelWithDebInfo)
+    set(CMAKE_BUILD_TYPE Release)
 endif()
 
 project(Alber)
diff --git a/include/cheats.hpp b/include/cheats.hpp
index 2be25827..ca8abe1d 100644
--- a/include/cheats.hpp
+++ b/include/cheats.hpp
@@ -9,6 +9,8 @@
 // Forward-declare this since it's just passed and we don't want to include memory.hpp and increase compile time
 class Memory;
 
+constexpr u32 badCheatHandle = 0xFFFFFFFF;
+
 class Cheats {
   public:
 	enum class CheatType {
@@ -24,6 +26,7 @@ class Cheats {
 
 	Cheats(Memory& mem, HIDService& hid);
 	u32 addCheat(const Cheat& cheat);
+	u32 addCheat(const u8* data, size_t size);
 	void removeCheat(u32 id);
 	void enableCheat(u32 id);
 	void disableCheat(u32 id);
diff --git a/include/panda_qt/cheats_window.hpp b/include/panda_qt/cheats_window.hpp
index 2160a1f6..c82b2bd8 100644
--- a/include/panda_qt/cheats_window.hpp
+++ b/include/panda_qt/cheats_window.hpp
@@ -1,26 +1,26 @@
 #pragma once
 
-#include <filesystem>
-#include <memory>
 #include <QAction>
 #include <QWidget>
+#include <filesystem>
+#include <memory>
+
 #include "emulator.hpp"
 
 class QListWidget;
 
-class CheatsWindow final : public QWidget
-{
-    Q_OBJECT
+class CheatsWindow final : public QWidget {
+	Q_OBJECT
 
-public:
-    CheatsWindow(Emulator* emu, const std::filesystem::path& path, QWidget* parent = nullptr);
-    ~CheatsWindow() = default;
+  public:
+	CheatsWindow(Emulator* emu, const std::filesystem::path& path, QWidget* parent = nullptr);
+	~CheatsWindow() = default;
 
-private:
-    void addEntry();
-    void removeClicked();
+  private:
+	void addEntry();
+	void removeClicked();
 
-    QListWidget* cheatList;
-    std::filesystem::path cheatPath;
-    Emulator* emu;
+	QListWidget* cheatList;
+	std::filesystem::path cheatPath;
+	Emulator* emu;
 };
diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp
index 39a8b35f..d5eccc93 100644
--- a/include/panda_qt/main_window.hpp
+++ b/include/panda_qt/main_window.hpp
@@ -17,12 +17,19 @@
 #include "panda_qt/text_editor.hpp"
 #include "services/hid.hpp"
 
+struct CheatMessage
+{
+	u32 handle;
+	std::vector<uint8_t> cheat;
+	std::function<void(u32)> callback;
+};
+
 class MainWindow : public QMainWindow {
 	Q_OBJECT
 
   private:
 	// Types of messages we might send from the GUI thread to the emulator thread
-	enum class MessageType { LoadROM, Reset, Pause, Resume, TogglePause, DumpRomFS, PressKey, ReleaseKey, LoadLuaScript };
+	enum class MessageType { LoadROM, Reset, Pause, Resume, TogglePause, DumpRomFS, PressKey, ReleaseKey, LoadLuaScript, EditCheat };
 
 	// Tagged union representing our message queue messages
 	struct EmulatorMessage {
@@ -40,6 +47,10 @@ class MainWindow : public QMainWindow {
 			struct {
 				std::string* str;
 			} string;
+
+			struct {
+				CheatMessage* c;
+			} cheat;
 		};
 	};
 
@@ -59,8 +70,6 @@ class MainWindow : public QMainWindow {
 	TextEditorWindow* luaEditor;
 	QMenuBar* menuBar = nullptr;
 
-	QAction* cheatsEditorAction = nullptr;
-
 	void swapEmuBuffer();
 	void emuThreadMainLoop();
 	void selectLuaFile();
@@ -83,4 +92,5 @@ class MainWindow : public QMainWindow {
 	void keyPressEvent(QKeyEvent* event) override;
 	void keyReleaseEvent(QKeyEvent* event) override;
 	void loadLuaScript(const std::string& code);
+	void editCheat(u32 handle, const std::vector<uint8_t>& cheat, const std::function<void(u32)>& callback);
 };
\ No newline at end of file
diff --git a/src/core/cheats.cpp b/src/core/cheats.cpp
index 83e7cdc4..7b8b71c2 100644
--- a/src/core/cheats.cpp
+++ b/src/core/cheats.cpp
@@ -1,4 +1,5 @@
 #include "cheats.hpp"
+#include "swap.hpp"
 
 Cheats::Cheats(Memory& mem, HIDService& hid) : ar(mem, hid) { reset(); }
 
@@ -23,6 +24,27 @@ u32 Cheats::addCheat(const Cheat& cheat) {
 	return cheats.size() - 1;
 }
 
+u32 Cheats::addCheat(const u8* data, size_t size) {
+	if ((size % 8) != 0) {
+		return badCheatHandle;
+	}
+
+	Cheats::Cheat cheat;
+	cheat.enabled = true;
+	cheat.type = Cheats::CheatType::ActionReplay;
+
+	for (size_t i = 0; i < size; i += 8) {
+		auto read32 = [](const u8* ptr) { return (u32(ptr[3]) << 24) | (u32(ptr[2]) << 16) | (u32(ptr[1]) << 8) | u32(ptr[0]); };
+
+		// Data is passed to us in big endian so we bswap
+		u32 firstWord = Common::swap32(read32(data + i));
+		u32 secondWord = Common::swap32(read32(data + i + 4));
+		cheat.instructions.insert(cheat.instructions.end(), {firstWord, secondWord});
+	}
+
+	return addCheat(cheat);
+}
+
 void Cheats::removeCheat(u32 id) {
 	if (id >= cheats.size()) {
 		return;
diff --git a/src/panda_qt/cheats_window.cpp b/src/panda_qt/cheats_window.cpp
index 909ba0cb..c6628125 100644
--- a/src/panda_qt/cheats_window.cpp
+++ b/src/panda_qt/cheats_window.cpp
@@ -1,313 +1,248 @@
 #include "panda_qt/cheats_window.hpp"
-#include <qlistwidget.h>
-#include <QVBoxLayout>
-#include <QListWidget>
-#include <QPushButton>
-#include <QLabel>
+
 #include <QCheckBox>
 #include <QDialog>
-#include <QLineEdit>
-#include <QTextEdit>
 #include <QDialogButtonBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QPushButton>
+#include <QTextEdit>
+#include <QVBoxLayout>
+
 #include "cheats.hpp"
 #include "emulator.hpp"
+#include "panda_qt/main_window.hpp"
 
-using CheatHandle = u32;
+MainWindow* mainWindow = nullptr;
 
-CheatHandle BAD_CHEAT = 0xFFFFFFFF;
-
-struct CheatMetadata
-{
-    CheatHandle handle = BAD_CHEAT;
-    std::string name = "New cheat";
-    std::string code;
-    bool enabled = true;
+struct CheatMetadata {
+	u32 handle = badCheatHandle;
+	std::string name = "New cheat";
+	std::string code;
+	bool enabled = true;
 };
 
-u32 addCheat(Emulator* emu, u8* data, size_t size)
-{
-    if ((size % 8) != 0) {
-		return BAD_CHEAT;
+class CheatEntryWidget : public QWidget {
+  public:
+	CheatEntryWidget(Emulator* emu, CheatMetadata metadata, QListWidget* parent);
+
+	void Update() {
+		name->setText(metadata.name.c_str());
+		enabled->setChecked(metadata.enabled);
+		update();
 	}
 
-	Cheats::Cheat cheat;
-	cheat.enabled = true;
-	cheat.type = Cheats::CheatType::ActionReplay;
-
-	for (size_t i = 0; i < size; i += 8) {
-		auto read32 = [](const u8* ptr) { return (u32(ptr[3]) << 24) | (u32(ptr[2]) << 16) | (u32(ptr[1]) << 8) | u32(ptr[0]); };
-
-		// Data is passed to us in big endian so we bswap
-		u32 firstWord = Common::swap32(read32(data + i));
-		u32 secondWord = Common::swap32(read32(data + i + 4));
-		cheat.instructions.insert(cheat.instructions.end(), {firstWord, secondWord});
+	void Remove() {
+		emu->getCheats().removeCheat(metadata.handle);
+		cheatList->takeItem(cheatList->row(listItem));
+		deleteLater();
 	}
 
-	return emu->getCheats().addCheat(cheat);
-}
+	const CheatMetadata& GetMetadata() { return metadata; }
 
-class CheatEntryWidget : public QWidget
-{
-public:
-    CheatEntryWidget(Emulator* emu, CheatMetadata metadata, QListWidget* parent);
+	void SetMetadata(const CheatMetadata& metadata) { this->metadata = metadata; }
 
-    void Update()
-    {
-        name->setText(metadata.name.c_str());
-        enabled->setChecked(metadata.enabled);
-        update();
-    }
+  private:
+	void checkboxChanged(int state);
+	void editClicked();
 
-    void Remove()
-    {
-        emu->getCheats().removeCheat(metadata.handle);
-        cheatList->takeItem(cheatList->row(listItem));
-        deleteLater();
-    }
-
-    const CheatMetadata& GetMetadata()
-    {
-        return metadata;
-    }
-
-    void SetMetadata(const CheatMetadata& metadata)
-    {
-        this->metadata = metadata;
-    }
-
-private:
-    void checkboxChanged(int state);
-    void editClicked();
-
-    Emulator* emu;
-    CheatMetadata metadata;
-    u32 handle;
-    QLabel* name;
-    QCheckBox* enabled;
-    QListWidget* cheatList;
-    QListWidgetItem* listItem;
+	Emulator* emu;
+	CheatMetadata metadata;
+	u32 handle;
+	QLabel* name;
+	QCheckBox* enabled;
+	QListWidget* cheatList;
+	QListWidgetItem* listItem;
 };
 
-class CheatEditDialog : public QDialog
-{
-public:
-    CheatEditDialog(Emulator* emu, CheatEntryWidget& cheatEntry);
+class CheatEditDialog : public QDialog {
+  public:
+	CheatEditDialog(Emulator* emu, CheatEntryWidget& cheatEntry);
 
-    void accepted();
-    void rejected();
-private:
-    Emulator* emu;
-    CheatEntryWidget& cheatEntry;
-    QTextEdit* codeEdit;
-    QLineEdit* nameEdit;
+	void accepted();
+	void rejected();
+
+  private:
+	Emulator* emu;
+	CheatEntryWidget& cheatEntry;
+	QTextEdit* codeEdit;
+	QLineEdit* nameEdit;
 };
 
 CheatEntryWidget::CheatEntryWidget(Emulator* emu, CheatMetadata metadata, QListWidget* parent)
-    : QWidget(), emu(emu), metadata(metadata), cheatList(parent)
-{
-    QHBoxLayout* layout = new QHBoxLayout;
+	: QWidget(), emu(emu), metadata(metadata), cheatList(parent) {
+	QHBoxLayout* layout = new QHBoxLayout;
 
-    enabled = new QCheckBox;
-    enabled->setChecked(metadata.enabled);
+	enabled = new QCheckBox;
+	enabled->setChecked(metadata.enabled);
 
-    name = new QLabel(metadata.name.c_str());
-    QPushButton* buttonEdit = new QPushButton(tr("Edit"));
+	name = new QLabel(metadata.name.c_str());
+	QPushButton* buttonEdit = new QPushButton(tr("Edit"));
 
-    connect(enabled, &QCheckBox::stateChanged, this, &CheatEntryWidget::checkboxChanged);
-    connect(buttonEdit, &QPushButton::clicked, this, &CheatEntryWidget::editClicked);
+	connect(enabled, &QCheckBox::stateChanged, this, &CheatEntryWidget::checkboxChanged);
+	connect(buttonEdit, &QPushButton::clicked, this, &CheatEntryWidget::editClicked);
 
-    layout->addWidget(enabled);
-    layout->addWidget(name);
-    layout->addWidget(buttonEdit);
-    setLayout(layout);
+	layout->addWidget(enabled);
+	layout->addWidget(name);
+	layout->addWidget(buttonEdit);
+	setLayout(layout);
 
-    listItem = new QListWidgetItem;
-    listItem->setSizeHint(sizeHint());
-    parent->addItem(listItem);
-    parent->setItemWidget(listItem, this);
+	listItem = new QListWidgetItem;
+	listItem->setSizeHint(sizeHint());
+	parent->addItem(listItem);
+	parent->setItemWidget(listItem, this);
 }
 
-void CheatEntryWidget::checkboxChanged(int state)
-{
-    bool enabled = state == Qt::Checked;
-    if (metadata.handle == BAD_CHEAT)
-    {
-        printf("Cheat handle is bad, this shouldn't happen\n");
-        return;
-    }
+void CheatEntryWidget::checkboxChanged(int state) {
+	bool enabled = state == Qt::Checked;
+	if (metadata.handle == badCheatHandle) {
+		printf("Cheat handle is bad, this shouldn't happen\n");
+		return;
+	}
 
-    if (enabled)
-    {
-        emu->getCheats().enableCheat(metadata.handle);
-        metadata.enabled = true;
-    }
-    else
-    {
-        emu->getCheats().disableCheat(metadata.handle);
-        metadata.enabled = false;
-    }
+	if (enabled) {
+		emu->getCheats().enableCheat(metadata.handle);
+		metadata.enabled = true;
+	} else {
+		emu->getCheats().disableCheat(metadata.handle);
+		metadata.enabled = false;
+	}
 }
 
-void CheatEntryWidget::editClicked()
-{
-    CheatEditDialog* dialog = new CheatEditDialog(emu, *this);
-    dialog->show();
+void CheatEntryWidget::editClicked() {
+	CheatEditDialog* dialog = new CheatEditDialog(emu, *this);
+	dialog->show();
 }
 
-CheatEditDialog::CheatEditDialog(Emulator* emu, CheatEntryWidget& cheatEntry) : QDialog(), emu(emu), cheatEntry(cheatEntry)
-{
-    setAttribute(Qt::WA_DeleteOnClose);
-    setModal(true);
+CheatEditDialog::CheatEditDialog(Emulator* emu, CheatEntryWidget& cheatEntry) : QDialog(), emu(emu), cheatEntry(cheatEntry) {
+	setAttribute(Qt::WA_DeleteOnClose);
+	setModal(true);
 
-    QVBoxLayout* layout = new QVBoxLayout;
-    const CheatMetadata& metadata = cheatEntry.GetMetadata();
-    codeEdit = new QTextEdit;
-    nameEdit = new QLineEdit;
-    nameEdit->setText(metadata.name.c_str());
-    nameEdit->setPlaceholderText(tr("Cheat name"));
-    layout->addWidget(nameEdit);
+	QVBoxLayout* layout = new QVBoxLayout;
+	const CheatMetadata& metadata = cheatEntry.GetMetadata();
+	codeEdit = new QTextEdit;
+	nameEdit = new QLineEdit;
+	nameEdit->setText(metadata.name.c_str());
+	nameEdit->setPlaceholderText(tr("Cheat name"));
+	layout->addWidget(nameEdit);
 
-    QFont font;
-    font.setFamily("Courier");
-    font.setFixedPitch(true);
-    font.setPointSize(10);
-    codeEdit->setFont(font);
+	QFont font;
+	font.setFamily("Courier");
+	font.setFixedPitch(true);
+	font.setPointSize(10);
+	codeEdit->setFont(font);
 
-    if (metadata.code.size() != 0)
-    {
-        // Nicely format it like so:
-        // 01234567 89ABCDEF
-        // 01234567 89ABCDEF
-        std::string formattedCode;
-        for (size_t i = 0; i < metadata.code.size(); i += 2)
-        {
-            if (i != 0) {
-                if (i % 8 == 0 && i % 16 != 0)
-                {
-                    formattedCode += " ";
-                }
-                else if (i % 16 == 0)
-                {
-                    formattedCode += "\n";
-                }
-            }
+	if (metadata.code.size() != 0) {
+		// Nicely format it like so:
+		// 01234567 89ABCDEF
+		// 01234567 89ABCDEF
+		std::string formattedCode;
+		for (size_t i = 0; i < metadata.code.size(); i += 2) {
+			if (i != 0) {
+				if (i % 8 == 0 && i % 16 != 0) {
+					formattedCode += " ";
+				} else if (i % 16 == 0) {
+					formattedCode += "\n";
+				}
+			}
 
-            formattedCode += metadata.code[i];
-            formattedCode += metadata.code[i + 1];
-        }
-        codeEdit->setText(formattedCode.c_str());
-    }
+			formattedCode += metadata.code[i];
+			formattedCode += metadata.code[i + 1];
+		}
+		codeEdit->setText(formattedCode.c_str());
+	}
 
-    layout->addWidget(codeEdit);
-    setLayout(layout);
+	layout->addWidget(codeEdit);
+	setLayout(layout);
 
-    auto buttons = QDialogButtonBox::Ok | QDialogButtonBox::Cancel;
-    QDialogButtonBox* button_box = new QDialogButtonBox(buttons);
-    layout->addWidget(button_box);
+	auto buttons = QDialogButtonBox::Ok | QDialogButtonBox::Cancel;
+	QDialogButtonBox* button_box = new QDialogButtonBox(buttons);
+	layout->addWidget(button_box);
 
-    connect(button_box, &QDialogButtonBox::accepted, this, &QDialog::accept);
-    connect(button_box, &QDialogButtonBox::rejected, this, &QDialog::reject);
-    connect(this, &QDialog::rejected, this, &CheatEditDialog::rejected);
-    connect(this, &QDialog::accepted, this, &CheatEditDialog::accepted);
+	connect(button_box, &QDialogButtonBox::accepted, this, &QDialog::accept);
+	connect(button_box, &QDialogButtonBox::rejected, this, &QDialog::reject);
+	connect(this, &QDialog::rejected, this, &CheatEditDialog::rejected);
+	connect(this, &QDialog::accepted, this, &CheatEditDialog::accepted);
 }
 
-void CheatEditDialog::accepted()
-{
-    QString code = codeEdit->toPlainText();
-    code.replace(QRegularExpression("[^0-9a-fA-F]"), "");
+void CheatEditDialog::accepted() {
+	QString code = codeEdit->toPlainText();
+	code.replace(QRegularExpression("[^0-9a-fA-F]"), "");
 
-    CheatMetadata metadata = cheatEntry.GetMetadata();
-    bool isEditing = metadata.handle != BAD_CHEAT;
-    metadata.name = nameEdit->text().toStdString();
-    metadata.code = code.toStdString();
+	CheatMetadata metadata = cheatEntry.GetMetadata();
+	metadata.name = nameEdit->text().toStdString();
+	metadata.code = code.toStdString();
 
-    std::vector<uint8_t> bytes;
-    for (size_t i = 0; i < metadata.code.size(); i += 2)
-    {
-        std::string hex = metadata.code.substr(i, 2);
-        bytes.push_back((uint8_t)std::stoul(hex, nullptr, 16));
-    }
+	std::vector<uint8_t> bytes;
+	for (size_t i = 0; i < metadata.code.size(); i += 2) {
+		std::string hex = metadata.code.substr(i, 2);
+		bytes.push_back((uint8_t)std::stoul(hex, nullptr, 16));
+	}
 
-    if (isEditing)
-    {
-        emu->getCheats().removeCheat(metadata.handle);
-        u32 handle = addCheat(emu, bytes.data(), bytes.size());
-        metadata.handle = handle;
-        cheatEntry.SetMetadata(metadata);
-    }
-    else
-    {
-        if (metadata.name.empty())
-        {
-            metadata.name = tr("Cheat code").toStdString();
-        }
-        u32 handle = addCheat(emu, bytes.data(), bytes.size());
-        metadata.handle = handle;
-        cheatEntry.SetMetadata(metadata);
-    }
-
-    cheatEntry.Update();
+	mainWindow->editCheat(cheatEntry.GetMetadata().handle, bytes, [this](u32 handle) {
+		CheatMetadata metadata = cheatEntry.GetMetadata();
+		metadata.handle = handle;
+		cheatEntry.SetMetadata(metadata);
+		cheatEntry.Update();
+	});
 }
 
-void CheatEditDialog::rejected()
-{
-    bool isEditing = cheatEntry.GetMetadata().handle != BAD_CHEAT;
+void CheatEditDialog::rejected() {
+	bool isEditing = cheatEntry.GetMetadata().handle != badCheatHandle;
 
-    if (!isEditing)
-    {
-        // Was adding a cheat but pressed cancel
-        cheatEntry.Remove();
-    }
+	if (!isEditing) {
+		// Was adding a cheat but pressed cancel
+		cheatEntry.Remove();
+	}
 }
 
 CheatsWindow::CheatsWindow(Emulator* emu, const std::filesystem::path& cheatPath, QWidget* parent)
-: QWidget(parent, Qt::Window), emu(emu), cheatPath(cheatPath)
-{
-    QVBoxLayout* layout = new QVBoxLayout;
-    layout->setContentsMargins(6, 6, 6, 6);
-    setLayout(layout);
+	: QWidget(parent, Qt::Window), emu(emu), cheatPath(cheatPath) {
+    mainWindow = static_cast<MainWindow*>(parent);
 
-    cheatList = new QListWidget;
-    layout->addWidget(cheatList);
+	QVBoxLayout* layout = new QVBoxLayout;
+	layout->setContentsMargins(6, 6, 6, 6);
+	setLayout(layout);
 
-    QWidget* buttonBox = new QWidget;
-    QHBoxLayout* buttonLayout = new QHBoxLayout;
+	cheatList = new QListWidget;
+	layout->addWidget(cheatList);
 
-    QPushButton* buttonAdd = new QPushButton(tr("Add"));
-    QPushButton* buttonRemove = new QPushButton(tr("Remove"));
+	QWidget* buttonBox = new QWidget;
+	QHBoxLayout* buttonLayout = new QHBoxLayout;
 
-    connect(buttonAdd, &QPushButton::clicked, this, &CheatsWindow::addEntry);
-    connect(buttonRemove, &QPushButton::clicked, this, &CheatsWindow::removeClicked);
+	QPushButton* buttonAdd = new QPushButton(tr("Add"));
+	QPushButton* buttonRemove = new QPushButton(tr("Remove"));
 
-    buttonLayout->addWidget(buttonAdd);
-    buttonLayout->addWidget(buttonRemove);
-    buttonBox->setLayout(buttonLayout);
+	connect(buttonAdd, &QPushButton::clicked, this, &CheatsWindow::addEntry);
+	connect(buttonRemove, &QPushButton::clicked, this, &CheatsWindow::removeClicked);
 
-    layout->addWidget(buttonBox);
+	buttonLayout->addWidget(buttonAdd);
+	buttonLayout->addWidget(buttonRemove);
+	buttonBox->setLayout(buttonLayout);
 
-    // TODO: load cheats from saved cheats per game
-    // for (const CheatMetadata& metadata : getSavedCheats())
-    // {
-    //     new CheatEntryWidget(emu, metadata, cheatList);
-    // }
+	layout->addWidget(buttonBox);
+
+	// TODO: load cheats from saved cheats per game
+	// for (const CheatMetadata& metadata : getSavedCheats())
+	// {
+	//     new CheatEntryWidget(emu, metadata, cheatList);
+	// }
 }
 
-void CheatsWindow::addEntry()
-{
-    // CheatEntryWidget is added to the list when it's created
-    CheatEntryWidget* entry = new CheatEntryWidget(emu, {BAD_CHEAT, "New cheat", "", true}, cheatList);
-    CheatEditDialog* dialog = new CheatEditDialog(emu, *entry);
-    dialog->show();
+void CheatsWindow::addEntry() {
+	// CheatEntryWidget is added to the list when it's created
+	CheatEntryWidget* entry = new CheatEntryWidget(emu, {badCheatHandle, "New cheat", "", true}, cheatList);
+	CheatEditDialog* dialog = new CheatEditDialog(emu, *entry);
+	dialog->show();
 }
 
-void CheatsWindow::removeClicked()
-{
-    QListWidgetItem* item = cheatList->currentItem();
-    if (item == nullptr)
-    {
-        return;
-    }
+void CheatsWindow::removeClicked() {
+	QListWidgetItem* item = cheatList->currentItem();
+	if (item == nullptr) {
+		return;
+	}
 
-    CheatEntryWidget* entry = static_cast<CheatEntryWidget*>(cheatList->itemWidget(item));
-    entry->Remove();
+	CheatEntryWidget* entry = static_cast<CheatEntryWidget*>(cheatList->itemWidget(item));
+	entry->Remove();
 }
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index be5e4fd6..d1f86173 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -6,6 +6,8 @@
 #include <cstdio>
 #include <fstream>
 
+#include "cheats.hpp"
+
 MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent), screen(this) {
 	setWindowTitle("Alber");
 	// Enable drop events for loading ROMs
@@ -48,8 +50,7 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 
 	auto dumpRomFSAction = toolsMenu->addAction(tr("Dump RomFS"));
 	auto luaEditorAction = toolsMenu->addAction(tr("Open Lua Editor"));
-	cheatsEditorAction = toolsMenu->addAction(tr("Open Cheats Editor"));
-	cheatsEditorAction->setEnabled(false);
+	auto cheatsEditorAction = toolsMenu->addAction(tr("Open Cheats Editor"));
 	connect(dumpRomFSAction, &QAction::triggered, this, &MainWindow::dumpRomFS);
 	connect(luaEditorAction, &QAction::triggered, this, &MainWindow::openLuaEditor);
 	connect(cheatsEditorAction, &QAction::triggered, this, &MainWindow::openCheatsEditor);
@@ -63,7 +64,7 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 	// Set up misc objects
 	aboutWindow = new AboutWindow(nullptr);
 	configWindow = new ConfigWindow(this);
-	cheatsEditor = new CheatsWindow(emu, {});
+	cheatsEditor = new CheatsWindow(emu, {}, this);
 	luaEditor = new TextEditorWindow(this, "script.lua", "");
 
 	auto args = QCoreApplication::arguments();
@@ -245,7 +246,6 @@ void MainWindow::dispatchMessage(const EmulatorMessage& message) {
 	switch (message.type) {
 		case MessageType::LoadROM:
 			emu->loadROM(*message.path.p);
-			cheatsEditorAction->setEnabled(true);
 			// Clean up the allocated path
 			delete message.path.p;
 			break;
@@ -255,6 +255,21 @@ void MainWindow::dispatchMessage(const EmulatorMessage& message) {
 			delete message.string.str;
 			break;
 
+		case MessageType::EditCheat: {
+			u32 handle = message.cheat.c->handle;
+			const std::vector<uint8_t>& cheat = message.cheat.c->cheat;
+			const std::function<void(u32)>& callback = message.cheat.c->callback;
+			bool isEditing = handle != badCheatHandle;
+			if (isEditing) {
+				emu->getCheats().removeCheat(handle);
+				u32 handle = emu->getCheats().addCheat(cheat.data(), cheat.size());
+			} else {
+				u32 handle = emu->getCheats().addCheat(cheat.data(), cheat.size());
+				callback(handle);
+			}
+			delete message.cheat.c;
+		} break;
+
 		case MessageType::Pause: emu->pause(); break;
 		case MessageType::Resume: emu->resume(); break;
 		case MessageType::TogglePause: emu->togglePause(); break;
@@ -326,4 +341,16 @@ void MainWindow::loadLuaScript(const std::string& code) {
 	// Make a copy of the code on the heap to send via the message queue
 	message.string.str = new std::string(code);
 	sendMessage(message);
+}
+
+void MainWindow::editCheat(u32 handle, const std::vector<uint8_t>& cheat, const std::function<void(u32)>& callback) {
+	EmulatorMessage message{.type = MessageType::EditCheat};
+
+	CheatMessage* c = new CheatMessage();
+	c->handle = handle;
+	c->cheat = cheat;
+	c->callback = callback;
+
+	message.cheat.c = c;
+	sendMessage(message);
 }
\ No newline at end of file

From a2276c922f524629c5f3fe76be79b4eb454bc7c9 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Sat, 27 Jan 2024 18:21:44 +0200
Subject: [PATCH 150/162] Reduce code duplication

---
 src/hydra_core.cpp | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/hydra_core.cpp b/src/hydra_core.cpp
index d67ffe2f..acbf30a8 100644
--- a/src/hydra_core.cpp
+++ b/src/hydra_core.cpp
@@ -134,25 +134,7 @@ void HydraCore::setPollInputCallback(void (*callback)()) { pollInputCallback = c
 void HydraCore::setCheckButtonCallback(s32 (*callback)(u32 player, hydra::ButtonType button)) { checkButtonCallback = callback; }
 
 u32 HydraCore::addCheat(const u8* data, u32 size) {
-	// Every 3DS cheat is a multiple of 64 bits == 8 bytes
-	if ((size % 8) != 0) {
-		return hydra::BAD_CHEAT;
-	}
-
-	Cheats::Cheat cheat;
-	cheat.enabled = true;
-	cheat.type = Cheats::CheatType::ActionReplay;
-
-	for (u32 i = 0; i < size; i += 8) {
-		auto read32 = [](const u8* ptr) { return (u32(ptr[3]) << 24) | (u32(ptr[2]) << 16) | (u32(ptr[1]) << 8) | u32(ptr[0]); };
-
-		// Data is passed to us in big endian so we bswap
-		u32 firstWord = Common::swap32(read32(data + i));
-		u32 secondWord = Common::swap32(read32(data + i + 4));
-		cheat.instructions.insert(cheat.instructions.end(), {firstWord, secondWord});
-	}
-
-	return emulator->getCheats().addCheat(cheat);
+	return emulator->getCheats().addCheat(data, size);
 };
 
 void HydraCore::removeCheat(u32 id) { emulator->getCheats().removeCheat(id); }

From 3d52692536e541909f05e178305222b2f69d29c6 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Sat, 27 Jan 2024 19:01:05 +0200
Subject: [PATCH 151/162] Threading shenanigans

---
 include/panda_qt/main_window.hpp |  1 +
 src/panda_qt/cheats_window.cpp   | 31 ++++++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp
index d5eccc93..f7757d73 100644
--- a/include/panda_qt/main_window.hpp
+++ b/include/panda_qt/main_window.hpp
@@ -5,6 +5,7 @@
 #include <QtWidgets>
 #include <atomic>
 #include <filesystem>
+#include <functional>
 #include <mutex>
 #include <thread>
 #include <vector>
diff --git a/src/panda_qt/cheats_window.cpp b/src/panda_qt/cheats_window.cpp
index c6628125..74be1e94 100644
--- a/src/panda_qt/cheats_window.cpp
+++ b/src/panda_qt/cheats_window.cpp
@@ -9,6 +9,8 @@
 #include <QPushButton>
 #include <QTextEdit>
 #include <QVBoxLayout>
+#include <QTimer>
+#include <functional>
 
 #include "cheats.hpp"
 #include "emulator.hpp"
@@ -23,6 +25,19 @@ struct CheatMetadata {
 	bool enabled = true;
 };
 
+void dispatchToMainThread(std::function<void()> callback)
+{
+    QTimer* timer = new QTimer();
+    timer->moveToThread(qApp->thread());
+    timer->setSingleShot(true);
+    QObject::connect(timer, &QTimer::timeout, [=]()
+    {
+        callback();
+        timer->deleteLater();
+    });
+    QMetaObject::invokeMethod(timer, "start", Qt::QueuedConnection, Q_ARG(int, 0));
+}
+
 class CheatEntryWidget : public QWidget {
   public:
 	CheatEntryWidget(Emulator* emu, CheatMetadata metadata, QListWidget* parent);
@@ -181,16 +196,22 @@ void CheatEditDialog::accepted() {
 	}
 
 	mainWindow->editCheat(cheatEntry.GetMetadata().handle, bytes, [this](u32 handle) {
-		CheatMetadata metadata = cheatEntry.GetMetadata();
-		metadata.handle = handle;
-		cheatEntry.SetMetadata(metadata);
-		cheatEntry.Update();
+        dispatchToMainThread([this, handle]() {
+            if (handle == badCheatHandle) {
+                cheatEntry.Remove();
+                return;
+            } else {
+                CheatMetadata metadata = cheatEntry.GetMetadata();
+                metadata.handle = handle;
+                cheatEntry.SetMetadata(metadata);
+                cheatEntry.Update();
+            }
+        });
 	});
 }
 
 void CheatEditDialog::rejected() {
 	bool isEditing = cheatEntry.GetMetadata().handle != badCheatHandle;
-
 	if (!isEditing) {
 		// Was adding a cheat but pressed cancel
 		cheatEntry.Remove();

From 2229adbd21471aa1b0c693314c5a176214ff39c1 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 27 Jan 2024 19:52:54 +0200
Subject: [PATCH 152/162] More action replay opcodes

---
 src/core/action_replay.cpp | 59 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/src/core/action_replay.cpp b/src/core/action_replay.cpp
index e8467425..1ef494a2 100644
--- a/src/core/action_replay.cpp
+++ b/src/core/action_replay.cpp
@@ -139,6 +139,65 @@ void ActionReplay::executeDType(const Cheat& cheat, u32 instruction) {
 	switch (instruction) {
 		case 0xD3000000: offset1 = cheat[pc++]; break;
 		case 0xD3000001: offset2 = cheat[pc++]; break;
+
+		case 0xD6000000:
+			write32(*activeOffset + cheat[pc++], u32(*activeData));
+			*activeOffset += 4;
+			break;
+
+		case 0xD6000001:
+			write32(*activeOffset + cheat[pc++], u32(data1));
+			*activeOffset += 4;
+			break;
+
+		case 0xD6000002:
+			write32(*activeOffset + cheat[pc++], u32(data2));
+			*activeOffset += 4;
+			break;
+
+		case 0xD7000000:
+			write16(*activeOffset + cheat[pc++], u16(*activeData));
+			*activeOffset += 2;
+			break;
+
+		case 0xD7000001:
+			write16(*activeOffset + cheat[pc++], u16(data1));
+			*activeOffset += 2;
+			break;
+
+		case 0xD7000002:
+			write16(*activeOffset + cheat[pc++], u16(data2));
+			*activeOffset += 2;
+			break;
+
+		case 0xD8000000:
+			write8(*activeOffset + cheat[pc++], u8(*activeData));
+			*activeOffset += 1;
+			break;
+
+		case 0xD8000001:
+			write8(*activeOffset + cheat[pc++], u8(data1));
+			*activeOffset += 1;
+			break;
+
+		case 0xD8000002:
+			write8(*activeOffset + cheat[pc++], u8(data2));
+			*activeOffset += 1;
+			break;
+
+
+		case 0xD9000000: *activeData = read32(cheat[pc++] + *activeOffset); break;
+		case 0xD9000001: data1 = read32(cheat[pc++] + *activeOffset); break;
+		case 0xD9000002: data2 = read32(cheat[pc++] + *activeOffset); break;
+
+		case 0xDA000000: *activeData = read16(cheat[pc++] + *activeOffset); break;
+		case 0xDA000001: data1 = read16(cheat[pc++] + *activeOffset); break;
+		case 0xDA000002: data2 = read16(cheat[pc++] + *activeOffset); break;
+
+		case 0xDB000000: *activeData = read8(cheat[pc++] + *activeOffset); break;
+		case 0xDB000001: data1 = read8(cheat[pc++] + *activeOffset); break;
+		case 0xDB000002: data2 = read8(cheat[pc++] + *activeOffset); break;
+
 		case 0xDC000000: *activeOffset += cheat[pc++]; break;
 
 		// DD000000 XXXXXXXX - if KEYPAD has value XXXXXXXX execute next block

From e3c9f0b219618a72741ef168fd0b8b4bbcb5f629 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 27 Jan 2024 20:11:53 +0200
Subject: [PATCH 153/162] [Qt] Implement circlepad

---
 include/panda_qt/main_window.hpp | 19 ++++++++++++++++++-
 src/panda_qt/main_window.cpp     | 23 +++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp
index f7757d73..9be065cf 100644
--- a/include/panda_qt/main_window.hpp
+++ b/include/panda_qt/main_window.hpp
@@ -30,7 +30,20 @@ class MainWindow : public QMainWindow {
 
   private:
 	// Types of messages we might send from the GUI thread to the emulator thread
-	enum class MessageType { LoadROM, Reset, Pause, Resume, TogglePause, DumpRomFS, PressKey, ReleaseKey, LoadLuaScript, EditCheat };
+	enum class MessageType {
+		LoadROM,
+		Reset,
+		Pause,
+		Resume,
+		TogglePause,
+		DumpRomFS,
+		PressKey,
+		ReleaseKey,
+		SetCirclePadX,
+		SetCirclePadY,
+		LoadLuaScript,
+		EditCheat,
+	};
 
 	// Tagged union representing our message queue messages
 	struct EmulatorMessage {
@@ -45,6 +58,10 @@ class MainWindow : public QMainWindow {
 				u32 key;
 			} key;
 
+			struct {
+				s16 value;
+			} circlepad;
+
 			struct {
 				std::string* str;
 			} string;
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index d1f86173..e603b780 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -276,6 +276,8 @@ void MainWindow::dispatchMessage(const EmulatorMessage& message) {
 		case MessageType::Reset: emu->reset(Emulator::ReloadOption::Reload); break;
 		case MessageType::PressKey: emu->getServiceManager().getHID().pressKey(message.key.key); break;
 		case MessageType::ReleaseKey: emu->getServiceManager().getHID().releaseKey(message.key.key); break;
+		case MessageType::SetCirclePadX: emu->getServiceManager().getHID().setCirclepadX(message.circlepad.value); break;
+		case MessageType::SetCirclePadY: emu->getServiceManager().getHID().setCirclepadY(message.circlepad.value); break;
 	}
 }
 
@@ -283,7 +285,12 @@ void MainWindow::keyPressEvent(QKeyEvent* event) {
 	auto pressKey = [this](u32 key) {
 		EmulatorMessage message{.type = MessageType::PressKey};
 		message.key.key = key;
+		sendMessage(message);
+	};
 
+	auto setCirclePad = [this](MessageType type, s16 value) {
+		EmulatorMessage message{.type = type};
+		message.circlepad.value = value;
 		sendMessage(message);
 	};
 
@@ -296,6 +303,11 @@ void MainWindow::keyPressEvent(QKeyEvent* event) {
 		case Qt::Key_Q: pressKey(HID::Keys::L); break;
 		case Qt::Key_P: pressKey(HID::Keys::R); break;
 
+		case Qt::Key_W: setCirclePad(MessageType::SetCirclePadY, 0x9C); break;
+		case Qt::Key_A: setCirclePad(MessageType::SetCirclePadX, -0x9C); break;
+		case Qt::Key_S: setCirclePad(MessageType::SetCirclePadY, -0x9C); break;
+		case Qt::Key_D: setCirclePad(MessageType::SetCirclePadX, 0x9C); break;
+
 		case Qt::Key_Right: pressKey(HID::Keys::Right); break;
 		case Qt::Key_Left: pressKey(HID::Keys::Left); break;
 		case Qt::Key_Up: pressKey(HID::Keys::Up); break;
@@ -312,7 +324,12 @@ void MainWindow::keyReleaseEvent(QKeyEvent* event) {
 	auto releaseKey = [this](u32 key) {
 		EmulatorMessage message{.type = MessageType::ReleaseKey};
 		message.key.key = key;
+		sendMessage(message);
+	};
 
+	auto releaseCirclePad = [this](MessageType type) {
+		EmulatorMessage message{.type = type};
+		message.circlepad.value = 0;
 		sendMessage(message);
 	};
 
@@ -325,6 +342,12 @@ void MainWindow::keyReleaseEvent(QKeyEvent* event) {
 		case Qt::Key_Q: releaseKey(HID::Keys::L); break;
 		case Qt::Key_P: releaseKey(HID::Keys::R); break;
 
+		case Qt::Key_W:
+		case Qt::Key_S: releaseCirclePad(MessageType::SetCirclePadY); break;
+
+		case Qt::Key_A:
+		case Qt::Key_D: releaseCirclePad(MessageType::SetCirclePadX); break;
+
 		case Qt::Key_Right: releaseKey(HID::Keys::Right); break;
 		case Qt::Key_Left: releaseKey(HID::Keys::Left); break;
 		case Qt::Key_Up: releaseKey(HID::Keys::Up); break;

From 864604c1e7100e7622bc6ef7d208f2d04fbd6c14 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 27 Jan 2024 20:27:46 +0200
Subject: [PATCH 154/162] Formatting

---
 src/panda_qt/cheats_window.cpp | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/panda_qt/cheats_window.cpp b/src/panda_qt/cheats_window.cpp
index 74be1e94..1f359396 100644
--- a/src/panda_qt/cheats_window.cpp
+++ b/src/panda_qt/cheats_window.cpp
@@ -54,9 +54,8 @@ class CheatEntryWidget : public QWidget {
 		deleteLater();
 	}
 
-	const CheatMetadata& GetMetadata() { return metadata; }
-
-	void SetMetadata(const CheatMetadata& metadata) { this->metadata = metadata; }
+	const CheatMetadata& getMetadata() { return metadata; }
+	void setMetadata(const CheatMetadata& metadata) { this->metadata = metadata; }
 
   private:
 	void checkboxChanged(int state);
@@ -135,7 +134,7 @@ CheatEditDialog::CheatEditDialog(Emulator* emu, CheatEntryWidget& cheatEntry) :
 	setModal(true);
 
 	QVBoxLayout* layout = new QVBoxLayout;
-	const CheatMetadata& metadata = cheatEntry.GetMetadata();
+	const CheatMetadata& metadata = cheatEntry.getMetadata();
 	codeEdit = new QTextEdit;
 	nameEdit = new QLineEdit;
 	nameEdit->setText(metadata.name.c_str());
@@ -172,11 +171,11 @@ CheatEditDialog::CheatEditDialog(Emulator* emu, CheatEntryWidget& cheatEntry) :
 	setLayout(layout);
 
 	auto buttons = QDialogButtonBox::Ok | QDialogButtonBox::Cancel;
-	QDialogButtonBox* button_box = new QDialogButtonBox(buttons);
-	layout->addWidget(button_box);
+	QDialogButtonBox* buttonBox = new QDialogButtonBox(buttons);
+	layout->addWidget(buttonBox);
 
-	connect(button_box, &QDialogButtonBox::accepted, this, &QDialog::accept);
-	connect(button_box, &QDialogButtonBox::rejected, this, &QDialog::reject);
+	connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+	connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 	connect(this, &QDialog::rejected, this, &CheatEditDialog::rejected);
 	connect(this, &QDialog::accepted, this, &CheatEditDialog::accepted);
 }
@@ -185,25 +184,25 @@ void CheatEditDialog::accepted() {
 	QString code = codeEdit->toPlainText();
 	code.replace(QRegularExpression("[^0-9a-fA-F]"), "");
 
-	CheatMetadata metadata = cheatEntry.GetMetadata();
+	CheatMetadata metadata = cheatEntry.getMetadata();
 	metadata.name = nameEdit->text().toStdString();
 	metadata.code = code.toStdString();
 
-	std::vector<uint8_t> bytes;
+	std::vector<u8> bytes;
 	for (size_t i = 0; i < metadata.code.size(); i += 2) {
 		std::string hex = metadata.code.substr(i, 2);
-		bytes.push_back((uint8_t)std::stoul(hex, nullptr, 16));
+		bytes.push_back((u8)std::stoul(hex, nullptr, 16));
 	}
 
-	mainWindow->editCheat(cheatEntry.GetMetadata().handle, bytes, [this](u32 handle) {
+	mainWindow->editCheat(cheatEntry.getMetadata().handle, bytes, [this](u32 handle) {
         dispatchToMainThread([this, handle]() {
             if (handle == badCheatHandle) {
                 cheatEntry.Remove();
                 return;
             } else {
-                CheatMetadata metadata = cheatEntry.GetMetadata();
+                CheatMetadata metadata = cheatEntry.getMetadata();
                 metadata.handle = handle;
-                cheatEntry.SetMetadata(metadata);
+                cheatEntry.setMetadata(metadata);
                 cheatEntry.Update();
             }
         });
@@ -211,9 +210,9 @@ void CheatEditDialog::accepted() {
 }
 
 void CheatEditDialog::rejected() {
-	bool isEditing = cheatEntry.GetMetadata().handle != badCheatHandle;
+	bool isEditing = cheatEntry.getMetadata().handle != badCheatHandle;
 	if (!isEditing) {
-		// Was adding a cheat but pressed cancel
+		// Was adding a cheat but user pressed cancel
 		cheatEntry.Remove();
 	}
 }

From 31eea40ea54d985f82573c7ac15550b52423131b Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 27 Jan 2024 20:33:35 +0200
Subject: [PATCH 155/162] Fix cheat dialog forgetting cheat names/codes

---
 src/panda_qt/cheats_window.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/panda_qt/cheats_window.cpp b/src/panda_qt/cheats_window.cpp
index 1f359396..6636cae7 100644
--- a/src/panda_qt/cheats_window.cpp
+++ b/src/panda_qt/cheats_window.cpp
@@ -187,6 +187,7 @@ void CheatEditDialog::accepted() {
 	CheatMetadata metadata = cheatEntry.getMetadata();
 	metadata.name = nameEdit->text().toStdString();
 	metadata.code = code.toStdString();
+	cheatEntry.setMetadata(metadata);
 
 	std::vector<u8> bytes;
 	for (size_t i = 0; i < metadata.code.size(); i += 2) {

From 01b6380242e4deeee832ba2115b4c83d20fe8cc3 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 27 Jan 2024 20:38:17 +0200
Subject: [PATCH 156/162] Remove global definition of badCheatHandle

---
 include/cheats.hpp               |  3 +--
 include/panda_qt/main_window.hpp |  3 +--
 src/panda_qt/cheats_window.cpp   | 33 ++++++++++++++++----------------
 src/panda_qt/main_window.cpp     |  3 +--
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/include/cheats.hpp b/include/cheats.hpp
index ca8abe1d..b90c080b 100644
--- a/include/cheats.hpp
+++ b/include/cheats.hpp
@@ -9,8 +9,6 @@
 // Forward-declare this since it's just passed and we don't want to include memory.hpp and increase compile time
 class Memory;
 
-constexpr u32 badCheatHandle = 0xFFFFFFFF;
-
 class Cheats {
   public:
 	enum class CheatType {
@@ -35,6 +33,7 @@ class Cheats {
 
 	void clear();
 	bool haveCheats() const { return cheatsLoaded; }
+	static constexpr u32 badCheatHandle = 0xFFFFFFFF;
 
   private:
 	ActionReplay ar;  // An ActionReplay cheat machine for executing CTRPF codes
diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp
index 9be065cf..c03cffbb 100644
--- a/include/panda_qt/main_window.hpp
+++ b/include/panda_qt/main_window.hpp
@@ -18,8 +18,7 @@
 #include "panda_qt/text_editor.hpp"
 #include "services/hid.hpp"
 
-struct CheatMessage
-{
+struct CheatMessage {
 	u32 handle;
 	std::vector<uint8_t> cheat;
 	std::function<void(u32)> callback;
diff --git a/src/panda_qt/cheats_window.cpp b/src/panda_qt/cheats_window.cpp
index 6636cae7..dbd251cc 100644
--- a/src/panda_qt/cheats_window.cpp
+++ b/src/panda_qt/cheats_window.cpp
@@ -19,14 +19,13 @@
 MainWindow* mainWindow = nullptr;
 
 struct CheatMetadata {
-	u32 handle = badCheatHandle;
+	u32 handle = Cheats::badCheatHandle;
 	std::string name = "New cheat";
 	std::string code;
 	bool enabled = true;
 };
 
-void dispatchToMainThread(std::function<void()> callback)
-{
+void dispatchToMainThread(std::function<void()> callback) {
     QTimer* timer = new QTimer();
     timer->moveToThread(qApp->thread());
     timer->setSingleShot(true);
@@ -110,7 +109,7 @@ CheatEntryWidget::CheatEntryWidget(Emulator* emu, CheatMetadata metadata, QListW
 
 void CheatEntryWidget::checkboxChanged(int state) {
 	bool enabled = state == Qt::Checked;
-	if (metadata.handle == badCheatHandle) {
+	if (metadata.handle == Cheats::badCheatHandle) {
 		printf("Cheat handle is bad, this shouldn't happen\n");
 		return;
 	}
@@ -196,22 +195,22 @@ void CheatEditDialog::accepted() {
 	}
 
 	mainWindow->editCheat(cheatEntry.getMetadata().handle, bytes, [this](u32 handle) {
-        dispatchToMainThread([this, handle]() {
-            if (handle == badCheatHandle) {
-                cheatEntry.Remove();
-                return;
-            } else {
-                CheatMetadata metadata = cheatEntry.getMetadata();
-                metadata.handle = handle;
-                cheatEntry.setMetadata(metadata);
-                cheatEntry.Update();
-            }
-        });
+		dispatchToMainThread([this, handle]() {
+			if (handle == Cheats::badCheatHandle) {
+				cheatEntry.Remove();
+				return;
+			} else {
+				CheatMetadata metadata = cheatEntry.getMetadata();
+				metadata.handle = handle;
+				cheatEntry.setMetadata(metadata);
+				cheatEntry.Update();
+			}
+		});
 	});
 }
 
 void CheatEditDialog::rejected() {
-	bool isEditing = cheatEntry.getMetadata().handle != badCheatHandle;
+	bool isEditing = cheatEntry.getMetadata().handle != Cheats::badCheatHandle;
 	if (!isEditing) {
 		// Was adding a cheat but user pressed cancel
 		cheatEntry.Remove();
@@ -253,7 +252,7 @@ CheatsWindow::CheatsWindow(Emulator* emu, const std::filesystem::path& cheatPath
 
 void CheatsWindow::addEntry() {
 	// CheatEntryWidget is added to the list when it's created
-	CheatEntryWidget* entry = new CheatEntryWidget(emu, {badCheatHandle, "New cheat", "", true}, cheatList);
+	CheatEntryWidget* entry = new CheatEntryWidget(emu, {Cheats::badCheatHandle, "New cheat", "", true}, cheatList);
 	CheatEditDialog* dialog = new CheatEditDialog(emu, *entry);
 	dialog->show();
 }
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index e603b780..1d7118bc 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -239,7 +239,6 @@ void MainWindow::showAboutMenu() {
 }
 
 void MainWindow::openLuaEditor() { luaEditor->show(); }
-
 void MainWindow::openCheatsEditor() { cheatsEditor->show(); }
 
 void MainWindow::dispatchMessage(const EmulatorMessage& message) {
@@ -259,7 +258,7 @@ void MainWindow::dispatchMessage(const EmulatorMessage& message) {
 			u32 handle = message.cheat.c->handle;
 			const std::vector<uint8_t>& cheat = message.cheat.c->cheat;
 			const std::function<void(u32)>& callback = message.cheat.c->callback;
-			bool isEditing = handle != badCheatHandle;
+			bool isEditing = handle != Cheats::badCheatHandle;
 			if (isEditing) {
 				emu->getCheats().removeCheat(handle);
 				u32 handle = emu->getCheats().addCheat(cheat.data(), cheat.size());

From c6d0769a95b5a9a0d3a584351e072f34b559aa3a Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sun, 28 Jan 2024 00:32:20 +0200
Subject: [PATCH 157/162] Update text_editor.cpp

---
 src/panda_qt/text_editor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panda_qt/text_editor.cpp b/src/panda_qt/text_editor.cpp
index c189c2ce..a31a829f 100644
--- a/src/panda_qt/text_editor.cpp
+++ b/src/panda_qt/text_editor.cpp
@@ -16,8 +16,8 @@ TextEditorWindow::TextEditorWindow(QWidget* parent, const std::string& filename,
 	ZepReplExCommand::Register(zepWidget.GetEditor(), &replProvider);
 
 	// Default to standard mode instead of vim mode, initialize text box
-	zepWidget.GetEditor().SetGlobalMode(Zep::ZepMode_Standard::StaticName());
 	zepWidget.GetEditor().InitWithText(filename, initialText);
+	zepWidget.GetEditor().SetGlobalMode(Zep::ZepMode_Standard::StaticName());
 
 	// Layout for widgets
 	QVBoxLayout* mainLayout = new QVBoxLayout();
@@ -41,4 +41,4 @@ TextEditorWindow::TextEditorWindow(QWidget* parent, const std::string& filename,
 
 	mainLayout->addWidget(button);
 	mainLayout->addWidget(&zepWidget);
-}
\ No newline at end of file
+}

From fdc8bfd58e65626fbe4381336e38fe36baade770 Mon Sep 17 00:00:00 2001
From: Ishan09811 <156402647+Ishan09811@users.noreply.github.com>
Date: Mon, 29 Jan 2024 19:34:45 +0530
Subject: [PATCH 158/162] Make navigation Bar Fully Transparent (#381)

* Make navigation Bar Fully Transparent

* if the theme color is white then don't use the light navigation bar

* fixes navigation bar visibility in light mode
---
 src/pandroid/app/src/main/res/values/themes.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/pandroid/app/src/main/res/values/themes.xml b/src/pandroid/app/src/main/res/values/themes.xml
index 2ade7102..343fab28 100644
--- a/src/pandroid/app/src/main/res/values/themes.xml
+++ b/src/pandroid/app/src/main/res/values/themes.xml
@@ -24,7 +24,11 @@
         <item name="android:textSize">32sp</item>
     </style>
 
-    <style name="Theme.Pandroid" parent="Base.Theme.Pandroid" />
+    <style name="Theme.Pandroid" parent="Base.Theme.Pandroid">
+        <item name="android:enforceNavigationBarContrast">false</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+    </style>
 
     <style name="Theme.Pandroid.Custom" parent="Theme.Pandroid">
         <item name="android:textColor">?colorOnSurface</item>
@@ -54,6 +58,7 @@
         <item name="android:textColorPrimary">@color/text_secondary_light</item>
         <item name="android:textColorSecondary">@color/text_secondary_light</item>
         <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar">false</item>
     </style>
 
     <style name="Theme.Pandroid.Black" parent="Theme.Pandroid.Custom">
@@ -72,6 +77,7 @@
         <item name="android:textColorPrimary">@color/text_secondary_light</item>
         <item name="android:textColorSecondary">@color/text_secondary_light</item>
         <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar">false</item>
     </style>
 
     <style name="Theme.Pandroid.Light" parent="Theme.Pandroid.Custom">
@@ -90,6 +96,7 @@
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:textColorPrimary">@color/text_secondary_dark</item>
         <item name="android:textColorSecondary">@color/text_secondary_dark</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>

From eabd22423c4098be90776e86324035fa2172f5ff Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 29 Jan 2024 19:36:49 +0200
Subject: [PATCH 159/162] Remove outdated stubs in Mii Selector applet

---
 src/core/applets/mii_selector.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/core/applets/mii_selector.cpp b/src/core/applets/mii_selector.cpp
index d6dd79da..ab6455fc 100644
--- a/src/core/applets/mii_selector.cpp
+++ b/src/core/applets/mii_selector.cpp
@@ -22,7 +22,6 @@ Result::HorizonResult MiiSelectorApplet::start(const MemoryBlock* sharedMem, con
 	// Thanks to Citra devs as always for the default mii data and other applet help
 	output = getDefaultMii();
 	output.returnCode = 0;  // Success
-	// output.selectedMiiData = miiData;
 	output.selectedGuestMiiIndex = std::numeric_limits<u32>::max();
 	output.miiChecksum = boost::crc<16, 0x1021, 0, 0, false, false>(&output.selectedMiiData, sizeof(MiiData) + sizeof(output.unknown1));
 
@@ -84,4 +83,4 @@ MiiResult MiiSelectorApplet::getDefaultMii() {
 	result.guestMiiName.fill(0x0);
 
 	return result;
-}
\ No newline at end of file
+}

From 9cc3fc0c4c1f5a5ba5223f4341b83af9ad77ffc9 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Mon, 29 Jan 2024 21:07:21 +0200
Subject: [PATCH 160/162] [Qt] Add touchscreen

---
 include/panda_qt/main_window.hpp | 10 ++++++++
 src/panda_qt/main_window.cpp     | 39 ++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp
index c03cffbb..c2db9ac1 100644
--- a/include/panda_qt/main_window.hpp
+++ b/include/panda_qt/main_window.hpp
@@ -42,6 +42,8 @@ class MainWindow : public QMainWindow {
 		SetCirclePadY,
 		LoadLuaScript,
 		EditCheat,
+		PressTouchscreen,
+		ReleaseTouchscreen,
 	};
 
 	// Tagged union representing our message queue messages
@@ -68,6 +70,11 @@ class MainWindow : public QMainWindow {
 			struct {
 				CheatMessage* c;
 			} cheat;
+
+			struct {
+				u16 x;
+				u16 y;
+			} touchscreen;
 		};
 	};
 
@@ -108,6 +115,9 @@ class MainWindow : public QMainWindow {
 
 	void keyPressEvent(QKeyEvent* event) override;
 	void keyReleaseEvent(QKeyEvent* event) override;
+	void mousePressEvent(QMouseEvent* event) override;
+	void mouseReleaseEvent(QMouseEvent* event) override;
+
 	void loadLuaScript(const std::string& code);
 	void editCheat(u32 handle, const std::vector<uint8_t>& cheat, const std::function<void(u32)>& callback);
 };
\ No newline at end of file
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index 1d7118bc..de70cc18 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -3,6 +3,7 @@
 #include <QDesktopServices>
 #include <QFileDialog>
 #include <QString>
+#include <cmath>
 #include <cstdio>
 #include <fstream>
 
@@ -277,6 +278,10 @@ void MainWindow::dispatchMessage(const EmulatorMessage& message) {
 		case MessageType::ReleaseKey: emu->getServiceManager().getHID().releaseKey(message.key.key); break;
 		case MessageType::SetCirclePadX: emu->getServiceManager().getHID().setCirclepadX(message.circlepad.value); break;
 		case MessageType::SetCirclePadY: emu->getServiceManager().getHID().setCirclepadY(message.circlepad.value); break;
+		case MessageType::PressTouchscreen:
+			emu->getServiceManager().getHID().setTouchScreenPress(message.touchscreen.x, message.touchscreen.y);
+			break;
+		case MessageType::ReleaseTouchscreen: emu->getServiceManager().getHID().releaseTouchScreen(); break;
 	}
 }
 
@@ -357,6 +362,40 @@ void MainWindow::keyReleaseEvent(QKeyEvent* event) {
 	}
 }
 
+void MainWindow::mousePressEvent(QMouseEvent* event) {
+	if (event->button() == Qt::MouseButton::LeftButton) {
+		const QPointF clickPos = event->globalPosition();
+		const QPointF widgetPos = screen.mapFromGlobal(clickPos);
+
+		// Press is inside the screen area
+		if (widgetPos.x() >= 0 && widgetPos.x() < screen.width() && widgetPos.y() >= 0 && widgetPos.y() < screen.height()) {
+			// Go from widget positions to [0, 400) for x and [0, 480) for y
+			uint x = (uint)std::round(widgetPos.x() / screen.width() * 400.f);
+			uint y = (uint)std::round(widgetPos.y() / screen.height() * 480.f);
+
+			// Check if touch falls in the touch screen area
+			if (y >= 240 && y <= 480 && x >= 40 && x < 40 + 320) {
+				// Convert to 3DS coordinates
+				u16 x_converted = static_cast<u16>(x) - 40;
+				u16 y_converted = static_cast<u16>(y) - 240;
+
+				EmulatorMessage message{.type = MessageType::PressTouchscreen};
+				message.touchscreen.x = x_converted;
+				message.touchscreen.y = y_converted;
+				sendMessage(message);
+			} else {
+				sendMessage(EmulatorMessage{.type = MessageType::ReleaseTouchscreen});
+			}
+		}
+	}
+}
+
+void MainWindow::mouseReleaseEvent(QMouseEvent* event) {
+	if (event->button() == Qt::MouseButton::LeftButton) {
+		sendMessage(EmulatorMessage{.type = MessageType::ReleaseTouchscreen});
+	}
+}
+
 void MainWindow::loadLuaScript(const std::string& code) {
 	EmulatorMessage message{.type = MessageType::LoadLuaScript};
 

From e6d012d05d487ce2ceea7afc4da7372175a46754 Mon Sep 17 00:00:00 2001
From: Ishan09811 <156402647+Ishan09811@users.noreply.github.com>
Date: Thu, 1 Feb 2024 18:34:03 +0530
Subject: [PATCH 161/162] Compile release APK on CI

*Co-authored-by: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
---
 .github/workflows/Android_Build.yml           | 56 +++++++++++++------
 src/pandroid/app/build.gradle.kts             | 16 +++++-
 src/pandroid/app/src/main/AndroidManifest.xml |  2 +
 3 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/Android_Build.yml b/.github/workflows/Android_Build.yml
index 7625e18d..137577c1 100644
--- a/.github/workflows/Android_Build.yml
+++ b/.github/workflows/Android_Build.yml
@@ -6,15 +6,19 @@ on:
       - master
   pull_request:
 
-env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: Release
-
 jobs:
   x64:
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        build_type:
+          - release
+
     steps:
+    - name: Set BUILD_TYPE variable
+      run: echo "BUILD_TYPE=${{ matrix.build_type }}" >> $GITHUB_ENV
+
     - uses: actions/checkout@v2
     - name: Fetch submodules
       run: git submodule update --init --recursive
@@ -29,7 +33,7 @@ jobs:
     - name: Setup Java
       uses: actions/setup-java@v3
       with:
-        distribution: 'zulu' # See 'Supported distributions' for available options
+        distribution: 'zulu'
         java-version: '17'
 
     - name: Configure CMake
@@ -37,23 +41,36 @@ jobs:
 
     - name: Build
       run: |
+        # Apply patch for GLES compatibility
         git apply ./.github/gles.patch
-        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        # Build the project with CMake
+        cmake --build ${{github.workspace}}/build --config ${{ env.BUILD_TYPE }}
+        # Move the generated library to the appropriate location
         mv ./build/libAlber.so ./src/pandroid/app/src/main/jniLibs/x86_64/
+        # Build the Android app with Gradle
         cd src/pandroid
-        ./gradlew assembleDebug
+        ./gradlew assemble${{ env.BUILD_TYPE }}
         cd ../..
 
-    - name: Upload executable
+    - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with:
-        name: Android APK (x86-64)
-        path: './src/pandroid/app/build/outputs/apk/debug/app-debug.apk'
+        name: Android APKs (x86-64)
+        path: |
+          ./src/pandroid/app/build/outputs/apk/${{ env.BUILD_TYPE }}/app-${{ env.BUILD_TYPE }}.apk
 
   arm64:
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        build_type:
+          - release
+
     steps:
+    - name: Set BUILD_TYPE variable
+      run: echo "BUILD_TYPE=${{ matrix.build_type }}" >> $GITHUB_ENV
+
     - uses: actions/checkout@v2
     - name: Fetch submodules
       run: git submodule update --init --recursive
@@ -68,7 +85,7 @@ jobs:
     - name: Setup Java
       uses: actions/setup-java@v3
       with:
-        distribution: 'zulu' # See 'Supported distributions' for available options
+        distribution: 'zulu'
         java-version: '17'
 
     - name: Configure CMake
@@ -76,16 +93,21 @@ jobs:
 
     - name: Build
       run: |
+        # Apply patch for GLES compatibility
         git apply ./.github/gles.patch
-        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        # Build the project with CMake
+        cmake --build ${{github.workspace}}/build --config ${{ env.BUILD_TYPE }}
+        # Move the generated library to the appropriate location
         mv ./build/libAlber.so ./src/pandroid/app/src/main/jniLibs/arm64-v8a/
+        # Build the Android app with Gradle
         cd src/pandroid
-        ./gradlew assembleDebug
+        ./gradlew assemble${{ env.BUILD_TYPE }}
+        ls -R app/build/outputs
         cd ../..
 
-    - name: Upload executable
+    - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with:
-        name: Android APK (arm64)
-        path: './src/pandroid/app/build/outputs/apk/debug/app-debug.apk'
-
+        name: Android APKs (arm64)
+        path: |
+          ./src/pandroid/app/build/outputs/apk/${{ env.BUILD_TYPE }}/app-${{ env.BUILD_TYPE }}.apk
diff --git a/src/pandroid/app/build.gradle.kts b/src/pandroid/app/build.gradle.kts
index f1feaf0d..201d5db1 100644
--- a/src/pandroid/app/build.gradle.kts
+++ b/src/pandroid/app/build.gradle.kts
@@ -21,8 +21,20 @@ android {
     }
 
     buildTypes {
-        release {
+        getByName("release") {
             isMinifyEnabled = false
+            isShrinkResources = false
+            isDebuggable = false
+            signingConfig = signingConfigs.getByName("debug")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+        getByName("debug") {
+            isMinifyEnabled = false
+            isShrinkResources = false
+            isDebuggable = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -41,4 +53,4 @@ dependencies {
     implementation("androidx.preference:preference:1.2.1")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("com.google.code.gson:gson:2.10.1")
-}
\ No newline at end of file
+}
diff --git a/src/pandroid/app/src/main/AndroidManifest.xml b/src/pandroid/app/src/main/AndroidManifest.xml
index 9f767654..b6276493 100644
--- a/src/pandroid/app/src/main/AndroidManifest.xml
+++ b/src/pandroid/app/src/main/AndroidManifest.xml
@@ -20,6 +20,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:isGame="true"
+        android:hardwareAccelerated="true"
         android:theme="@style/Theme.Pandroid"
         tools:targetApi="31">
         <activity

From 28ca4cd79560ee1ce1cdba9d0f67bbfeeb9b5186 Mon Sep 17 00:00:00 2001
From: Gabriel Machado <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Thu, 1 Feb 2024 11:46:15 -0400
Subject: [PATCH 162/162] Logger (#397)

* Initial commit

* add shader-jit option

* add translate to word "graphics' for ptbr

* Native logger

* Bonk

* fix

---------

Co-authored-by: gabriel <gabriel>
Co-authored-by: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
---
 include/logger.hpp                            |  10 +-
 src/jni_driver.cpp                            |   7 ++
 src/pandroid/app/src/main/AndroidManifest.xml |   2 +
 .../com/panda3ds/pandroid/AlberDriver.java    |   2 +
 .../panda3ds/pandroid/app/GameActivity.java   |   6 +
 .../pandroid/app/PandroidApplication.java     |   6 +
 .../app/base/BasePreferenceFragment.java      |   9 ++
 .../pandroid/app/main/SettingsFragment.java   |   2 +
 .../app/preferences/DeveloperPreferences.java |  49 +++++++++
 .../pandroid/app/services/LoggerService.java  | 104 ++++++++++++++++++
 .../pandroid/data/config/GlobalConfig.java    |   4 +-
 .../pandroid/lang/PipeStreamTask.java         |  40 +++++++
 .../java/com/panda3ds/pandroid/lang/Task.java |   2 +
 .../panda3ds/pandroid/utils/FileUtils.java    |  19 ++++
 .../pandroid/utils/PerformanceMonitor.java    |  64 +++++++++++
 .../pandroid/view/PandaGlRenderer.java        |  12 +-
 .../pandroid/view/utils/PerformanceView.java  |  64 +++++++++++
 .../src/main/res/values-pt-rBR/strings.xml    |  11 +-
 .../app/src/main/res/values/strings.xml       |   9 ++
 .../main/res/xml/developer_preferences.xml    |  29 +++++
 .../src/main/res/xml/start_preferences.xml    |   7 ++
 21 files changed, 454 insertions(+), 4 deletions(-)
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/DeveloperPreferences.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/services/LoggerService.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/PipeStreamTask.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PerformanceMonitor.java
 create mode 100644 src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/utils/PerformanceView.java
 create mode 100644 src/pandroid/app/src/main/res/xml/developer_preferences.xml

diff --git a/include/logger.hpp b/include/logger.hpp
index 82d90410..e021a685 100644
--- a/include/logger.hpp
+++ b/include/logger.hpp
@@ -2,6 +2,10 @@
 #include <cstdarg>
 #include <fstream>
 
+#ifdef __ANDROID__
+#include <android/log.h>
+#endif
+
 namespace Log {
 	// Our logger class
 	template <bool enabled>
@@ -12,7 +16,11 @@ namespace Log {
 
 			std::va_list args;
 			va_start(args, fmt);
+#ifdef __ANDROID__
+			__android_log_vprint(ANDROID_LOG_DEFAULT, "Panda3DS", fmt, args);
+#else
 			std::vprintf(fmt, args);
+#endif
 			va_end(args);
 		}
 	};
@@ -81,4 +89,4 @@ namespace Log {
 #else
 #define MAKE_LOG_FUNCTION(functionName, logger) MAKE_LOG_FUNCTION_USER(functionName, logger)
 #endif
-}
+}
\ No newline at end of file
diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp
index 6eeb727a..d962f23e 100644
--- a/src/jni_driver.cpp
+++ b/src/jni_driver.cpp
@@ -35,6 +35,13 @@ JNIEnv* jniEnv() {
 
 extern "C" {
 
+#define MAKE_SETTING(functionName, type, settingName) \
+AlberFunction(void, functionName) (JNIEnv* env, jobject obj, type value) { emulator->getConfig().settingName = value; }
+
+MAKE_SETTING(setShaderJitEnabled, jboolean, shaderJitEnabled)
+
+#undef MAKE_SETTING
+
 AlberFunction(void, Setup)(JNIEnv* env, jobject obj) { env->GetJavaVM(&jvm); }
 AlberFunction(void, Pause)(JNIEnv* env, jobject obj) { emulator->pause(); }
 AlberFunction(void, Resume)(JNIEnv* env, jobject obj) { emulator->resume(); }
diff --git a/src/pandroid/app/src/main/AndroidManifest.xml b/src/pandroid/app/src/main/AndroidManifest.xml
index b6276493..c66d37af 100644
--- a/src/pandroid/app/src/main/AndroidManifest.xml
+++ b/src/pandroid/app/src/main/AndroidManifest.xml
@@ -48,5 +48,7 @@
 
         <activity android:name=".app.preferences.InputMapActivity"
             android:configChanges="density|orientation|screenSize"/>
+
+        <service android:name=".app.services.LoggerService" android:process=":logger_service"/>
     </application>
 </manifest>
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
index 5cff703c..00b7842b 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/AlberDriver.java
@@ -22,5 +22,7 @@ public class AlberDriver {
 	public static native void LoadLuaScript(String script);
 	public static native byte[] GetSmdh();
 
+	public static native void setShaderJitEnabled(boolean enable);
+
 	static { System.loadLibrary("Alber"); }
 }
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
index aced6faa..f7050e99 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
@@ -21,6 +21,7 @@ import com.panda3ds.pandroid.input.InputMap;
 import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.view.PandaGlSurfaceView;
 import com.panda3ds.pandroid.view.PandaLayoutController;
+import com.panda3ds.pandroid.view.utils.PerformanceView;
 
 public class GameActivity extends BaseActivity {
 	private final DrawerFragment drawerFragment = new DrawerFragment();
@@ -56,6 +57,11 @@ public class GameActivity extends BaseActivity {
 		((CheckBox) findViewById(R.id.hide_screen_controller)).setChecked(GlobalConfig.get(GlobalConfig.KEY_SCREEN_GAMEPAD_VISIBLE));
 
 		getSupportFragmentManager().beginTransaction().replace(R.id.drawer_fragment, drawerFragment).commitNow();
+
+		if (GlobalConfig.get(GlobalConfig.KEY_SHOW_PERFORMANCE_OVERLAY)) {
+			PerformanceView view = new PerformanceView(this);
+			((FrameLayout) findViewById(R.id.panda_gl_frame)).addView(view, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+		}
 	}
 
 	@Override
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
index 02fbbbcc..b0cdc935 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/PandroidApplication.java
@@ -2,11 +2,13 @@ package com.panda3ds.pandroid.app;
 
 import android.app.Application;
 import android.content.Context;
+import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 
 import com.panda3ds.pandroid.AlberDriver;
 import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.app.services.LoggerService;
 import com.panda3ds.pandroid.data.config.GlobalConfig;
 import com.panda3ds.pandroid.input.InputMap;
 import com.panda3ds.pandroid.utils.GameUtils;
@@ -24,6 +26,10 @@ public class PandroidApplication extends Application {
 		GameUtils.initialize();
 		InputMap.initialize();
 		AlberDriver.Setup();
+
+		if (GlobalConfig.get(GlobalConfig.KEY_LOGGER_SERVICE)) {
+			startService(new Intent(this, LoggerService.class));
+		}
 	}
 
 	public static int getThemeId() {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java
index 3cd28f4b..9482df1d 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java
@@ -1,8 +1,13 @@
 package com.panda3ds.pandroid.app.base;
 
 import android.annotation.SuppressLint;
+
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.SwitchPreference;
+
 import com.panda3ds.pandroid.lang.Function;
 
 
@@ -15,4 +20,8 @@ public abstract class BasePreferenceFragment extends PreferenceFragmentCompat {
 			return false;
 		});
 	}
+
+	protected void setActivityTitle(@StringRes int titleId) {
+		((AppCompatActivity) requireActivity()).getSupportActionBar().setTitle(titleId);
+	}
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java
index b3bebf8f..bfe33a2b 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java
@@ -8,6 +8,7 @@ import com.panda3ds.pandroid.R;
 import com.panda3ds.pandroid.app.PreferenceActivity;
 import com.panda3ds.pandroid.app.base.BasePreferenceFragment;
 import com.panda3ds.pandroid.app.preferences.AppearancePreferences;
+import com.panda3ds.pandroid.app.preferences.DeveloperPreferences;
 import com.panda3ds.pandroid.app.preferences.InputPreferences;
 
 public class SettingsFragment extends BasePreferenceFragment {
@@ -16,5 +17,6 @@ public class SettingsFragment extends BasePreferenceFragment {
         setPreferencesFromResource(R.xml.start_preferences, rootKey);
         setItemClick("input", (item) -> PreferenceActivity.launch(requireContext(), InputPreferences.class));
         setItemClick("appearance", (item)-> PreferenceActivity.launch(requireContext(), AppearancePreferences.class));
+        setItemClick("developer", (item)-> PreferenceActivity.launch(requireContext(), DeveloperPreferences.class));
     }
 }
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/DeveloperPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/DeveloperPreferences.java
new file mode 100644
index 00000000..f131f0a0
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/DeveloperPreferences.java
@@ -0,0 +1,49 @@
+package com.panda3ds.pandroid.app.preferences;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.preference.SwitchPreference;
+
+import com.panda3ds.pandroid.R;
+import com.panda3ds.pandroid.app.PandroidApplication;
+import com.panda3ds.pandroid.app.base.BasePreferenceFragment;
+import com.panda3ds.pandroid.app.services.LoggerService;
+import com.panda3ds.pandroid.data.config.GlobalConfig;
+
+public class DeveloperPreferences extends BasePreferenceFragment {
+    @Override
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+        setPreferencesFromResource(R.xml.developer_preferences, rootKey);
+        setActivityTitle(R.string.developer_options);
+
+        setItemClick("performanceMonitor", pref -> GlobalConfig.set(GlobalConfig.KEY_SHOW_PERFORMANCE_OVERLAY, ((SwitchPreference) pref).isChecked()));
+        setItemClick("shaderJit", pref -> GlobalConfig.set(GlobalConfig.KEY_SHADER_JIT, ((SwitchPreference) pref).isChecked()));
+        setItemClick("loggerService", pref -> {
+            boolean checked = ((SwitchPreference) pref).isChecked();
+            Context ctx = PandroidApplication.getAppContext();
+            if (checked) {
+                ctx.startService(new Intent(ctx, LoggerService.class));
+            } else {
+                ctx.stopService(new Intent(ctx, LoggerService.class));
+            }
+            GlobalConfig.set(GlobalConfig.KEY_LOGGER_SERVICE, checked);
+        });
+
+        refresh();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        refresh();
+    }
+
+    private void refresh() {
+        ((SwitchPreference) findPreference("performanceMonitor")).setChecked(GlobalConfig.get(GlobalConfig.KEY_SHOW_PERFORMANCE_OVERLAY));
+        ((SwitchPreference) findPreference("loggerService")).setChecked(GlobalConfig.get(GlobalConfig.KEY_LOGGER_SERVICE));
+        ((SwitchPreference) findPreference("shaderJit")).setChecked(GlobalConfig.get(GlobalConfig.KEY_SHADER_JIT));
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/services/LoggerService.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/services/LoggerService.java
new file mode 100644
index 00000000..e44f3503
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/services/LoggerService.java
@@ -0,0 +1,104 @@
+package com.panda3ds.pandroid.app.services;
+
+import android.app.Service;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.os.Build;
+import android.os.IBinder;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+
+import com.panda3ds.pandroid.lang.PipeStreamTask;
+import com.panda3ds.pandroid.lang.Task;
+import com.panda3ds.pandroid.utils.Constants;
+import com.panda3ds.pandroid.utils.FileUtils;
+
+import java.io.OutputStream;
+import java.util.Arrays;
+
+public class LoggerService extends Service {
+    private static final long MAX_LOG_SIZE = 1024 * 1024 * 4; // 4MB
+
+    private PipeStreamTask errorTask;
+    private PipeStreamTask outputTask;
+    private Process logcat;
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        try {
+            Runtime.getRuntime().exec(new String[]{"logcat", "-c"}).waitFor();
+            logcat = Runtime.getRuntime().exec(new String[]{"logcat"});
+            String logPath = getExternalMediaDirs()[0].getAbsolutePath();
+            FileUtils.createDir(logPath, "logs");
+            logPath = logPath + "/logs";
+
+            if (FileUtils.exists(logPath + "/last.txt")) {
+                FileUtils.delete(logPath + "/last.txt");
+            }
+
+            if (FileUtils.exists(logPath + "/current.txt")) {
+                FileUtils.rename(logPath + "/current.txt", "last.txt");
+            }
+
+            OutputStream stream = FileUtils.getOutputStream(logPath + "/current.txt");
+            errorTask = new PipeStreamTask(logcat.getErrorStream(), stream, MAX_LOG_SIZE);
+            outputTask = new PipeStreamTask(logcat.getInputStream(), stream, MAX_LOG_SIZE);
+
+            errorTask.start();
+            outputTask.start();
+
+            Log.i(Constants.LOG_TAG, "Started logger service");
+            logDeviceInfo();
+        } catch (Exception e) {
+            stopSelf();
+            Log.e(Constants.LOG_TAG, "Failed to start logger service");
+        }
+    }
+
+    private void logDeviceInfo() {
+        Log.i(Constants.LOG_TAG, "----------------------");
+        Log.i(Constants.LOG_TAG, "Android SDK: " + Build.VERSION.SDK_INT);
+        Log.i(Constants.LOG_TAG, "Device: " + Build.DEVICE);
+        Log.i(Constants.LOG_TAG, "Model: " + Build.MANUFACTURER + " " + Build.MODEL);
+        Log.i(Constants.LOG_TAG, "ABIs: " + Arrays.toString(Build.SUPPORTED_ABIS));
+        try {
+            PackageInfo info = getPackageManager().getPackageInfo(getPackageName(), 0);
+            Log.i(Constants.LOG_TAG, "");
+            Log.i(Constants.LOG_TAG, "Package: " + info.packageName);
+            Log.i(Constants.LOG_TAG, "Install location: " + info.installLocation);
+            Log.i(Constants.LOG_TAG, "App version: " + info.versionName + " (" + info.versionCode + ")");
+        } catch (Exception e) {
+            Log.e(Constants.LOG_TAG, "Error obtaining package info: " + e);
+        }
+        Log.i(Constants.LOG_TAG, "----------------------");
+    }
+
+    @Override
+    public void onTaskRemoved(Intent rootIntent) {
+        stopSelf();
+        //This is a time for app save save log file
+        try {
+            Thread.sleep(1000);
+        } catch (Exception e) {}
+        super.onTaskRemoved(rootIntent);
+    }
+
+    @Override
+    public void onDestroy() {
+        Log.i(Constants.LOG_TAG, "Logger service terminating");
+        errorTask.close();
+        outputTask.close();
+        try {
+            logcat.destroy();
+        } catch (Throwable t) {}
+        super.onDestroy();
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
index d6dbe3b8..bff1f9e0 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java
@@ -5,7 +5,6 @@ import com.panda3ds.pandroid.data.GsonConfigParser;
 import com.panda3ds.pandroid.utils.Constants;
 
 import java.io.Serializable;
-import java.util.HashMap;
 import java.util.Map;
 
 public class GlobalConfig {
@@ -19,6 +18,9 @@ public class GlobalConfig {
 
     public static DataModel data;
 
+    public static final Key<Boolean> KEY_SHADER_JIT = new Key<>("emu.shader_jit", false);
+    public static final Key<Boolean> KEY_SHOW_PERFORMANCE_OVERLAY = new Key<>("dev.performanceOverlay", false);
+    public static final Key<Boolean> KEY_LOGGER_SERVICE = new Key<>("dev.loggerService", false);
     public static final Key<Integer> KEY_APP_THEME = new Key<>("app.theme", THEME_ANDROID);
     public static final Key<Boolean> KEY_SCREEN_GAMEPAD_VISIBLE = new Key<>("app.screen_gamepad.visible", true);
 
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/PipeStreamTask.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/PipeStreamTask.java
new file mode 100644
index 00000000..e4bbda98
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/PipeStreamTask.java
@@ -0,0 +1,40 @@
+package com.panda3ds.pandroid.lang;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class PipeStreamTask extends Task {
+    private final InputStream input;
+    private final OutputStream output;
+    private final long limit;
+    private long size;
+
+    public PipeStreamTask(InputStream input, OutputStream output, long limit) {
+        this.input = input;
+        this.output = output;
+        this.limit = limit;
+    }
+
+    @Override
+    public void run() {
+        super.run();
+        int data;
+        try {
+            while ((data = input.read()) != -1) {
+                output.write(data);
+                if (++size > limit) {
+                    break;
+                }
+            }
+        } catch (Exception e) {}
+        close();
+    }
+
+    public void close() {
+        try {
+            output.flush();
+            output.close();
+            input.close();
+        } catch (Exception e) {}
+    }
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java
index 7745883d..8de344b4 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Task.java
@@ -5,6 +5,8 @@ public class Task extends Thread {
         super(runnable);
     }
 
+    protected Task() {}
+
     public void runSync() {
         start();
         waitFinish();
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
index 45faf5a4..1746f1c9 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/FileUtils.java
@@ -70,6 +70,25 @@ public class FileUtils {
         return parseFile(path).exists();
     }
 
+    public static void rename(String path, String newName){
+        parseFile(path).renameTo(newName);
+    }
+
+    public static void delete(String path) {
+        DocumentFile file = parseFile(path);
+
+        if (file.exists()) {
+            if (file.isDirectory()) {
+                String[] children = listFiles(path);
+                for (String child : children) {
+                    delete(path + "/" + child);
+                }
+            }
+
+            file.delete();
+        }
+    }
+
     public static boolean createDir(String path, String name) {
         DocumentFile folder = parseFile(path);
         if (folder.findFile(name) != null) {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PerformanceMonitor.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PerformanceMonitor.java
new file mode 100644
index 00000000..23adbf13
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/utils/PerformanceMonitor.java
@@ -0,0 +1,64 @@
+package com.panda3ds.pandroid.utils;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.os.Debug;
+import android.os.Process;
+
+import com.panda3ds.pandroid.app.PandroidApplication;
+import com.panda3ds.pandroid.data.config.GlobalConfig;
+
+public class PerformanceMonitor {
+    private static int fps = 1;
+    private static String backend = "";
+    private static int frames = 0;
+    private static long lastUpdate = 0;
+    private static long totalMemory = 1;
+    private static long availableMemory = 0;
+
+    public static void initialize(String backendName) {
+        fps = 1;
+        backend = backendName;
+    }
+
+    public static void runFrame() {
+        if (GlobalConfig.get(GlobalConfig.KEY_SHOW_PERFORMANCE_OVERLAY)) {
+            frames++;
+            if (System.currentTimeMillis() - lastUpdate > 1000) {
+                lastUpdate = System.currentTimeMillis();
+                fps = frames;
+                frames = 0;
+                try {
+                    Context ctx = PandroidApplication.getAppContext();
+                    ActivityManager manager = (ActivityManager) ctx.getSystemService(Context.ACTIVITY_SERVICE);
+                    ActivityManager.MemoryInfo info = new ActivityManager.MemoryInfo();
+                    manager.getMemoryInfo(info);
+                    totalMemory = info.totalMem;
+                    availableMemory = info.availMem;
+                } catch (Exception e) {}
+            }
+        }
+    }
+
+    public static long getUsedMemory() {
+        return Math.max(1, totalMemory - availableMemory);
+    }
+
+    public static long getTotalMemory() {
+        return totalMemory;
+    }
+
+    public static long getAvailableMemory() {
+        return availableMemory;
+    }
+
+    public static int getFps() {
+        return fps;
+    }
+
+    public static String getBackend() {
+        return backend;
+    }
+
+    public static void destroy() {}
+}
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
index 52e609a3..c39b36b3 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/PandaGlRenderer.java
@@ -7,8 +7,10 @@ import android.graphics.Rect;
 import android.opengl.GLSurfaceView;
 import android.util.Log;
 import com.panda3ds.pandroid.AlberDriver;
+import com.panda3ds.pandroid.data.config.GlobalConfig;
 import com.panda3ds.pandroid.utils.Constants;
 import com.panda3ds.pandroid.utils.GameUtils;
+import com.panda3ds.pandroid.utils.PerformanceMonitor;
 import com.panda3ds.pandroid.view.renderer.ConsoleRenderer;
 import com.panda3ds.pandroid.view.renderer.layout.ConsoleLayout;
 import com.panda3ds.pandroid.view.renderer.layout.DefaultScreenLayout;
@@ -38,9 +40,12 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
 		if (screenTexture != 0) {
 			glDeleteTextures(1, new int[] {screenTexture}, 0);
 		}
-		if (screenFbo != 0) {
+		
+        if (screenFbo != 0) {
 			glDeleteFramebuffers(1, new int[] {screenFbo}, 0);
 		}
+
+		PerformanceMonitor.destroy();
 		super.finalize();
 	}
 
@@ -78,6 +83,7 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
 		glBindFramebuffer(GL_FRAMEBUFFER, 0);
 
 		AlberDriver.Initialize();
+		AlberDriver.setShaderJitEnabled(GlobalConfig.get(GlobalConfig.KEY_SHADER_JIT));
 		AlberDriver.LoadRom(romPath);
 
 		// Load the SMDH
@@ -92,6 +98,8 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
 			GameUtils.removeGame(game);
 			GameUtils.addGame(GameMetadata.applySMDH(game, smdh));
 		}
+    
+		PerformanceMonitor.initialize(getBackendName());
 	}
 
 	public void onDrawFrame(GL10 unused) {
@@ -114,6 +122,8 @@ public class PandaGlRenderer implements GLSurfaceView.Renderer, ConsoleRenderer
 				screenHeight - bottomScreen.bottom, GL_COLOR_BUFFER_BIT, GL_LINEAR
 			);
 		}
+
+		PerformanceMonitor.runFrame();
 	}
 
 	public void onSurfaceChanged(GL10 unused, int width, int height) {
diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/utils/PerformanceView.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/utils/PerformanceView.java
new file mode 100644
index 00000000..e4d7be15
--- /dev/null
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/view/utils/PerformanceView.java
@@ -0,0 +1,64 @@
+package com.panda3ds.pandroid.view.utils;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.text.Html;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import com.panda3ds.pandroid.data.config.GlobalConfig;
+import com.panda3ds.pandroid.utils.PerformanceMonitor;
+
+public class PerformanceView extends AppCompatTextView {
+    private boolean running = false;
+
+    public PerformanceView(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public PerformanceView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs,0);
+    }
+
+    public PerformanceView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        int padding = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, getResources().getDisplayMetrics());
+        setPadding(padding,padding,padding,padding);
+        setTextColor(Color.WHITE);
+        setShadowLayer(padding,0,0,Color.BLACK);
+    }
+
+    public void refresh(){
+        running = isShown();
+        if (!running) {
+            return;
+        }
+
+        String debug = "";
+
+        // Calculate total memory in MB and the current memory usage
+        int memoryTotalMb = (int) Math.round(PerformanceMonitor.getTotalMemory() / (1024.0 * 1024.0));
+        int memoryUsageMb = (int) Math.round(PerformanceMonitor.getUsedMemory() / (1024.0 * 1024.0));
+
+        debug += "<b>FPS: </b>" + PerformanceMonitor.getFps() + "<br>";
+        debug += "<b>RAM: </b>" + Math.round(((float) memoryUsageMb / memoryTotalMb) * 100) + "%  (" + memoryUsageMb + "MB/" + memoryTotalMb + "MB)<br>";
+        debug += "<b>BACKEND: </b>" + PerformanceMonitor.getBackend() + (GlobalConfig.get(GlobalConfig.KEY_SHADER_JIT) ? " + JIT" : "") + "<br>";
+        setText(Html.fromHtml(debug, Html.FROM_HTML_MODE_COMPACT));
+        postDelayed(this::refresh, 250);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        
+        if (!running) {
+            refresh();
+        }
+    }
+}
diff --git a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
index 065b9e4f..1198d66b 100644
--- a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
+++ b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml
@@ -45,4 +45,13 @@
     <string name="open_file">Abrir arquivo</string>
     <string name="create_new">Criar novo</string>
     <string name="running_ff">Executando \"%s\" ...</string>
-</resources>
\ No newline at end of file
+    <string name="developer_options">Opções de desenvolvedor</string>
+    <string name="pref_developer_summary">Depuração, mostrar fps, etc.</string>
+    <string name="pref_performance_monitor_title">Monitor de desempenho</string>
+    <string name="pref_performance_monitor_summary">Mostrar um overlay com fps, memoria, etc.</string>
+    <string name="pref_logger_service_title">Depuração</string>
+    <string name="pref_logger_service_summary">Grave os registros para um arquivo.</string>
+    <string name="pref_shader_jit_title">Shader Jit</string>
+    <string name="pref_shader_jit_summary">Usar recompilador de shaders.</string>
+    <string name="graphics">Gráficos</string>
+</resources>
diff --git a/src/pandroid/app/src/main/res/values/strings.xml b/src/pandroid/app/src/main/res/values/strings.xml
index e0de62e1..4c64439c 100644
--- a/src/pandroid/app/src/main/res/values/strings.xml
+++ b/src/pandroid/app/src/main/res/values/strings.xml
@@ -46,4 +46,13 @@
     <string name="open_file">Open file</string>
     <string name="create_new">Create new</string>
     <string name="running_ff">Running \"%s\" ...</string>
+    <string name="developer_options">Developer options</string>
+    <string name="pref_developer_summary">Logger, FPS Counter, etc.</string>
+    <string name="pref_performance_monitor_title">Performance monitor</string>
+    <string name="pref_performance_monitor_summary">Show overlay with fps, memory, etc.</string>
+    <string name="pref_logger_service_title">Logger</string>
+    <string name="pref_logger_service_summary">Store application logs to file.</string>
+    <string name="pref_shader_jit_title">Shader JIT</string>
+    <string name="pref_shader_jit_summary">Use shader recompiler.</string>
+    <string name="graphics">Graphics</string>
 </resources>
diff --git a/src/pandroid/app/src/main/res/xml/developer_preferences.xml b/src/pandroid/app/src/main/res/xml/developer_preferences.xml
new file mode 100644
index 00000000..96ce8906
--- /dev/null
+++ b/src/pandroid/app/src/main/res/xml/developer_preferences.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <SwitchPreference
+        android:key="performanceMonitor"
+        app:title="@string/pref_performance_monitor_title"
+        app:summary="@string/pref_performance_monitor_summary"
+        app:iconSpaceReserved="false"/>
+
+    <SwitchPreference
+        android:key="loggerService"
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_logger_service_title"
+        android:summary="@string/pref_logger_service_summary"/>
+
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:title="@string/graphics">
+
+        <SwitchPreference
+            app:key="shaderJit"
+            app:title="@string/pref_shader_jit_title"
+            app:summary="@string/pref_shader_jit_summary"
+            app:iconSpaceReserved="false"/>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/xml/start_preferences.xml b/src/pandroid/app/src/main/res/xml/start_preferences.xml
index 878aa920..5eeb1954 100644
--- a/src/pandroid/app/src/main/res/xml/start_preferences.xml
+++ b/src/pandroid/app/src/main/res/xml/start_preferences.xml
@@ -23,4 +23,11 @@
         app:summary="@string/pref_appearance_summary"
         app:layout="@layout/preference_start_item"/>
 
+    <Preference
+        app:key="developer"
+        app:icon="@drawable/ic_code"
+        app:title="@string/developer_options"
+        app:summary="@string/pref_developer_summary"
+        app:layout="@layout/preference_start_item"/>
+
 </PreferenceScreen>
\ No newline at end of file