Merge branch 'main' of https://github.com/CTR-tools/CTR-ModSDK

Author: Niko

.github/workflows/main.yml

@@ -38,6 +38,6 @@ jobs:
         run: nix build -L --no-link --keep-going '.?submodules=1#online-server.release.aarch64.gcc'
       # -- PC Port
       - name: Build Decomp Debug Mingw32 GCC
-        run: nix build -L --no-link --keep-going '.?submodules=1#pc-decomp.debug.mingw32.gcc' 2>&1 | grep -A3 'error:'
+        run: nix build -L --no-link --keep-going '.?submodules=1#pc-decomp.debug.mingw32.gcc' 2>&1 | grep -A3 'error:' || true
       - name: Build Decomp Debug Linux32 GCC
-        run: nix build -L --no-link --keep-going '.?submodules=1#pc-decomp.debug.native32.gcc' 2>&1 | grep -A3 'error:'
+        run: nix build -L --no-link --keep-going '.?submodules=1#pc-decomp.debug.native32.gcc' 2>&1 | grep -A3 'error:' || true

decompile/General/MAIN/MAIN_AAA_BigBlock1.c

@@ -15,7 +15,7 @@
 #include "MainMain.c"
 
 // byte budget requirement
-#include "../MATH/Math_0_Sin.c"
+#include "../MATH/MATH_0_Sin.c"
 #include "../LibraryOfModels/LibraryOfModels_0_Store.c"
 
 #if defined (USE_ALTMODS)

include/namespace_Display.h

@@ -62,4 +62,6 @@ struct DB
 
 _Static_assert(sizeof(struct PrimMem) == 0x1C);
 _Static_assert(sizeof(struct OTMem) == 0x14);
-_Static_assert(sizeof(struct DB) == 0xA4);
+#ifndef REBUILD_PC
+_Static_assert(sizeof(struct DB) == 0xA4);
+#endif

include/namespace_Main.h

@@ -1321,6 +1321,7 @@ struct GameTracker
 	#endif
 };
 
+#ifndef REBUILD_PC
 #if BUILD == SepReview
 _Static_assert(sizeof(struct GameTracker) == 0x24F8);
 #elif BUILD == UsaRetail
@@ -1329,4 +1330,5 @@ _Static_assert(sizeof(struct GameTracker) == 0x2584);
 _Static_assert(sizeof(struct GameTracker) == 0x258C);
 #elif BUILD >= EurRetail
 _Static_assert(sizeof(struct GameTracker) == 0x2594);
+#endif
 #endif

rebuild_PC/CMakeLists.txt

@@ -3,6 +3,7 @@ project(CTR-PC)
 include(CMakeDependentOption)
 
 # === OPTIONS ===
+option(CTR_ALTMODS "Enables defragged decomp sections" ON)
 
 option(CTR_60FPS "60 frames per second" ON)
 option(CTR_16BY9 "Widescreen" ON)
@@ -12,15 +13,19 @@ option(CTR_PENTA "Penta Max Stats" ON)
 option(CTR_HARDER "Difficulty Selector (Arcade)" ON)
 option(CTR_NEWCUPS "Cup Randomizer" ON)
 option(CTR_BOOSTBAR "Super's reserve bar" ON)
+cmake_dependent_option(CTR_PROFILER "Debug profiler from PizzaHut" ON "CTR_ALTMODS" OFF)
 
+option(USE_4PADTEST "1 controller for all 4 players" OFF)
 option(CTR_RAMEX "8mb RAM expansion" OFF)
 cmake_dependent_option(CTR_BIGQUEUE "Extended loading queue" OFF "CTR_RAMEX" OFF)
 cmake_dependent_option(CTR_HIGH1P "All high model drivers" OFF "CTR_BIGQUEUE" OFF)
 cmake_dependent_option(CTR_RANDOM "Character Randomizer" OFF "CTR_HIGH1P" OFF)
 cmake_dependent_option(CTR_ONLINE "Online Multiplayer" OFF "CTR_HIGH1P" OFF)
 cmake_dependent_option(CTR_HIGHMP "Multiplayer Maxed mod" OFF "CTR_RAMEX" OFF)
+cmake_dependent_option(CTR_NEWLEV "Enables custom levels" OFF "CTR_RAMEX" OFF)
 
 option(CTR_VR "Virtual Reality" OFF)
+cmake_dependent_option(CTR_PCDRV "Enables custom levels" OFF "CTR_DEFRAG" OFF)
 
 option(CTR_PRIM "PsyX USE_EXTENDED_PRIM_POINTERS" 0)
 
@@ -36,6 +41,10 @@ target_include_directories(ctr_bin PUBLIC "../include")
 set_property(TARGET ctr_bin PROPERTY C_STANDARD 99)
 target_compile_options(ctr_bin PUBLIC -DUSE_EXTENDED_PRIM_POINTERS=${CTR_PRIM})
 
+if(CTR_ALTMODS)
+  target_compile_options(ctr_bin PUBLIC -DUSE_ALTMODS)
+endif()
+
 if(CTR_60FPS)
   target_compile_options(ctr_bin PUBLIC -DUSE_60FPS)
 endif()
@@ -60,6 +69,9 @@ endif()
 if(CTR_BOOSTBAR)
   target_compile_options(ctr_bin PUBLIC -DUSE_BOOSTBAR)
 endif()
+if(CTR_PROFILER)
+  target_compile_options(ctr_bin PUBLIC -DUSE_PROFILER)
+endif()
 
 if(CTR_RAMEX)
   target_compile_options(ctr_bin PUBLIC -DUSE_RAMEX)
@@ -79,10 +91,16 @@ endif()
 if(CTR_HIGHMP)
   target_compile_options(ctr_bin PUBLIC -DUSE_HIGHMP)
 endif()
+if(CTR_NEWLEV)
+  target_compile_options(ctr_bin PUBLIC -DUSE_NEWLEV)
+endif()
 
 if(CTR_VR)
   target_compile_options(ctr_bin PUBLIC -DUSE_VR)
 endif()
+if(CTR_PCDRV)
+  target_compile_options(ctr_bin PUBLIC -DUSE_PCDRV)
+endif()
 
 # Compiler options
 if(CMAKE_C_COMPILER_ID MATCHES "Clang")
@@ -94,7 +112,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
   endif()
 else()
   # Assume GCC
-  target_compile_options(ctr_bin PRIVATE -Wno-implicit-function-declaration -Wno-incompatible-pointer-types -Wno-implicit-int)
+  target_compile_options(ctr_bin PRIVATE -Wno-int-conversion -Wno-implicit-function-declaration -Wno-incompatible-pointer-types -Wno-implicit-int)
 endif()
 
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")

rebuild_PC/CrashTeamRacingPC.c

@@ -44,7 +44,9 @@ clock_t startClock;
 #define u_long unsigned int
 
 // these two should do nothing
+#ifndef __GNUC__
 #define _Static_assert(x) 
+#endif
 #define __attribute__(x)
 
 // ======= Replace Psn00bsdk Data =============

rebuild_PC/default.nix

@@ -49,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags =
     lib.optionals withDebug [ "-DCMAKE_BUILD_TYPE=Debug" ]
     ++ lib.optionals (!withMods) [
+      "-DCTR_ALTMODS=OFF"
       "-DCTR_60FPS=OFF"
       "-DCTR_16BY9=OFF"
       "-DCTR_NEW2P=OFF"
@@ -58,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
       "-DCTR_NEWCUPS=OFF"
       "-DCTR_BOOSTBAR=OFF"
       "-DCTR_RAMEX=OFF"
+      "-DCTR_PROFILER=OFF"
     ] ++ lib.optionals trustCompiler [ "-DCMAKE_C_COMPILER_WORKS=1" "-DCMAKE_CXX_COMPILER_WORKS=1" ]
     ++ lib.optionals vendoredDeps [ "-DCMAKE_SKIP_BUILD_RPATH=TRUE" ];