Merge 237f4daaa0 into d99a84f04f

.github/linux/appimage.sh

@@ -20,7 +20,7 @@ chmod a+x linuxdeploy*
 mkdir -p AppDir/usr/bin
 cp Zelda64Recompiled AppDir/usr/bin/
 cp -r assets/ AppDir/usr/bin/
-cp gamecontrollerdb.txt AppDir/usr/bin/
+cp recompcontrollerdb.txt AppDir/usr/bin/
 cp icons/512.png AppDir/Zelda64Recompiled.png
 cp .github/linux/Zelda64Recompiled.desktop AppDir/
 

.github/workflows/validate.yml

@@ -9,7 +9,7 @@ on:
       N64RECOMP_COMMIT:
         type: string
         required: false
-        default: 'f8d439aeee6048b7365d1cb3bcd2578ec27a0288'
+        default: '5b17bf8bb556d2544c6161487232a455eae8f188'
       DXC_CHECKSUM:
         type: string
         required: false
@@ -64,7 +64,7 @@ jobs:
           
           # Build N64Recomp & RSPRecomp
           cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build
-          cmake --build cmake-build --config Release --target N64Recomp -j $(nproc)
+          cmake --build cmake-build --config Release --target N64RecompCLI -j $(nproc)
           cmake --build cmake-build --config Release --target RSPRecomp -j $(nproc)
           
           # Copy N64Recomp & RSPRecomp to root directory
@@ -93,7 +93,7 @@ jobs:
         run: |
           mv cmake-build/Zelda64Recompiled Zelda64Recompiled
           rm -rf assets/scss
-          tar -czf Zelda64Recompiled.tar.gz Zelda64Recompiled assets/ gamecontrollerdb.txt
+          tar -czf Zelda64Recompiled.tar.gz Zelda64Recompiled assets/ recompcontrollerdb.txt
       - name: Archive Zelda64Recomp
         uses: actions/upload-artifact@v3
         with:
@@ -160,7 +160,7 @@ jobs:
           
           # Build N64Recomp & RSPRecomp
           cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build
-          cmake --build cmake-build --config Release --target N64Recomp -j $(nproc)
+          cmake --build cmake-build --config Release --target N64RecompCLI -j $(nproc)
           cmake --build cmake-build --config Release --target RSPRecomp -j $(nproc)
           
           # Copy N64Recomp & RSPRecomp to root directory
@@ -182,7 +182,7 @@ jobs:
         run: |
           mv cmake-build/Zelda64Recompiled Zelda64Recompiled
           rm -rf assets/scss
-          tar -czf Zelda64Recompiled.tar.gz Zelda64Recompiled assets/ gamecontrollerdb.txt
+          tar -czf Zelda64Recompiled.tar.gz Zelda64Recompiled assets/ recompcontrollerdb.txt
       - name: Archive Zelda64Recomp
         uses: actions/upload-artifact@v4
         with:
@@ -234,7 +234,7 @@ jobs:
           $cpuCores = (Get-CimInstance -ClassName Win32_Processor).NumberOfLogicalProcessors
 
           cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build
-          cmake --build cmake-build --config Release --target N64Recomp -j $cpuCores
+          cmake --build cmake-build --config Release --target N64RecompCLI -j $cpuCores
           cmake --build cmake-build --config Release --target RSPRecomp -j $cpuCores
 
           # Copy N64Recomp & RSPRecomp to root directory
@@ -275,4 +275,4 @@ jobs:
             dxil.dll
             SDL2.dll
             assets/
-            gamecontrollerdb.txt
+            recompcontrollerdb.txt

.gitignore

@@ -12,7 +12,7 @@ RecompiledFuncs/
 RecompiledPatches/
 
 # Linux build output
-build/
+build*/
 *.o
 
 # Windows build output
@@ -59,6 +59,3 @@ node_modules/
 N64Recomp
 RSPRecomp
 .DS_Store
-
-# Controller mappings file
-gamecontrollerdb.txt

CMakeLists.txt

@@ -124,19 +124,8 @@ add_custom_command(OUTPUT
                    DEPENDS ${CMAKE_SOURCE_DIR}/patches/patches.elf
 )
 
-# Download controller db file for controller support via SDL2
-set(GAMECONTROLLERDB_COMMIT "b1e4090b3d4266e55feb0793efa35792e05faf66")
-set(GAMECONTROLLERDB_URL "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/${GAMECONTROLLERDB_COMMIT}/gamecontrollerdb.txt")
-
-file(DOWNLOAD ${GAMECONTROLLERDB_URL} ${CMAKE_SOURCE_DIR}/gamecontrollerdb.txt
-     TLS_VERIFY ON)
-
-add_custom_target(DownloadGameControllerDB
-    DEPENDS ${CMAKE_SOURCE_DIR}/gamecontrollerdb.txt)
-
 # Main executable
 add_executable(Zelda64Recompiled)
-add_dependencies(Zelda64Recompiled DownloadGameControllerDB)
 
 # Generate mm_shader_cache.c from the MM shader cache if it exists
 if (EXISTS ${CMAKE_SOURCE_DIR}/shadercache/mm_shader_cache.bin)

patches/specific_actor_transform_tagging.c

@@ -1266,7 +1266,7 @@ extern Gfx ovl_En_Tanron1_DL_001888[];
 extern Gfx ovl_En_Tanron1_DL_001900[];
 
 // @recomp Patched to interpolate the moths that circle torches.
-void func_80BB5AAC(EnTanron1* this, PlayState* play) {
+RECOMP_PATCH void func_80BB5AAC(EnTanron1* this, PlayState* play) {
     EnTanron1Struct* ptrBase = &this->unk_160[0];
     s16 i;
     u8 flag = 0;

recompcontrollerdb.txt

@@ -0,0 +1,6 @@
+# Game Controller DB for SDL in 2.0.16 format
+# Used for Zelda64Recomp: https://github.com/Zelda64Recomp/Zelda64Recomp
+
+# Test configs from https://github.com/Zelda64Recomp/Zelda64Recomp/issues/399#issuecomment-2182166615
+030000009b2800006000000000000000,Raphnet GC and N64 Adapter,a:b0,b:b1,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,-rightx:b8,+rightx:b9,-righty:b6,+righty:b7,start:b3,platform:Windows,
+03000000242e0000ff0b000000000000,Hyperkin N64 Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,start:b9,+righty:a2,-righty:-a2,+rightx:a5,-rightx:-a5,platform:Windows,

src/main/main.cpp

@@ -564,7 +564,7 @@ int main(int argc, char** argv) {
     reset_audio(48000);
 
     // Source controller mappings file
-    if (SDL_GameControllerAddMappingsFromFile("gamecontrollerdb.txt") < 0) {
+    if (SDL_GameControllerAddMappingsFromFile("recompcontrollerdb.txt") < 0) {
         fprintf(stderr, "Failed to load controller mappings: %s\n", SDL_GetError());
     }