Merge pull request #129 from ThePixelGamer/libs

Update libraries and adjust code to match again
zeldaret · Aug 31, 2024 · 0f88ba6 · 0f88ba6
2 parents 96f611f + 878f95d
commit 0f88ba6
Show file tree

Hide file tree

Showing 165 changed files with 323 additions and 336 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.15)
 project(uking CXX)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -30,16 +30,9 @@ target_compile_options(uking PRIVATE -Wno-unused-parameter -Wno-unused-private-f
 target_compile_options(uking PRIVATE -Wno-invalid-offsetof)
 target_compile_options(uking PRIVATE -Wextra-semi)
 
-set(NN_SDK_MAJOR 4)
-set(NN_SDK_MINOR 4)
-set(NN_SDK_PATCH 0)
+set(NN_SDK 4.4.0)
+set(NN_WARE 1.6.1)
 set(NN_SDK_TYPE "Release")
-
-# todo: figure out actual number, in between odyssey and splatoon
-set(NN_WARE_MAJOR 1)
-set(NN_WARE_MINOR 6)
-set(NN_WARE_PATCH 1)
-
 add_subdirectory(lib/NintendoSDK)
 target_link_libraries(uking PUBLIC NintendoSDK)
 

diff --git a/data/uking_functions.csv b/data/uking_functions.csv
@@ -39763,7 +39763,7 @@ Address,Quality,Size,Name
 0x0000007100654244,U,000076,apQueryNavMeshFace
 0x0000007100654290,U,000008,apQueryUnknown
 0x0000007100654298,U,000916,sinitSomeBfevflStrings
-0x000000710065462c,U,000100,_ZN4sead15DebugFontMgrNvn18SingletonDisposer_D1Ev
+0x000000710065462c,O,000100,_ZN4sead15DebugFontMgrNvn18SingletonDisposer_D1Ev
 0x0000007100654690,U,000108,
 0x00000071006546fc,W,000140,_ZN4ksys3map16AutoPlacementMgr14createInstanceEPN4sead4HeapE
 0x0000007100654788,O,000088,_ZN4ksys3map16AutoPlacementMgr14deleteInstanceEv
@@ -54787,7 +54787,7 @@ Address,Quality,Size,Name
 0x00000071009221ec,U,000012,
 0x00000071009221f8,U,000012,
 0x0000007100922204,U,000008,
-0x000000710092220c,U,000008,_ZNK4sead15DebugFontMgrNvn12getCharWidthEDs
+0x000000710092220c,O,000008,_ZNK4sead15DebugFontMgrNvn12getCharWidthEDs
 0x0000007100922214,U,000008,
 0x000000710092221c,U,000012,
 0x0000007100922228,U,000012,
@@ -63192,33 +63192,33 @@ Address,Quality,Size,Name
 0x0000007100afe640,U,000024,
 0x0000007100afe658,U,000100,
 0x0000007100afe6bc,U,000108,
-0x0000007100afe728,U,000168,_ZN4sead19DebugFontMgrJis1Nvn14createInstanceEPNS_4HeapE
+0x0000007100afe728,M,000168,_ZN4sead19DebugFontMgrJis1Nvn14createInstanceEPNS_4HeapE
 0x0000007100afe7d0,U,000004,nullsub_3181
 0x0000007100afe7d4,U,000004,j__ZdlPv_592
-0x0000007100afe7d8,U,000300,_ZN4sead19DebugFontMgrJis1Nvn10initializeEPNS_4HeapEPKcS4_S4_j
+0x0000007100afe7d8,M,000300,_ZN4sead19DebugFontMgrJis1Nvn10initializeEPNS_4HeapEPKcS4_S4_j
 0x0000007100afe904,U,001252,
-0x0000007100afede8,U,000044,_ZN4sead19DebugFontMgrJis1Nvn22swapUniformBlockBufferEv
-0x0000007100afee14,U,000008,_ZNK4sead19DebugFontMgrJis1Nvn9getHeightEv
-0x0000007100afee1c,U,000008,_ZNK4sead19DebugFontMgrJis1Nvn8getWidthEv
-0x0000007100afee24,U,000024,_ZNK4sead19DebugFontMgrJis1Nvn12getCharWidthEDs
+0x0000007100afede8,O,000044,_ZN4sead19DebugFontMgrJis1Nvn22swapUniformBlockBufferEv
+0x0000007100afee14,O,000008,_ZNK4sead19DebugFontMgrJis1Nvn9getHeightEv
+0x0000007100afee1c,O,000008,_ZNK4sead19DebugFontMgrJis1Nvn8getWidthEv
+0x0000007100afee24,O,000024,_ZNK4sead19DebugFontMgrJis1Nvn12getCharWidthEDs
 0x0000007100afee3c,U,000008,
-0x0000007100afee44,U,000044,_ZNK4sead19DebugFontMgrJis1Nvn5beginEPNS_11DrawContextE
+0x0000007100afee44,O,000044,_ZNK4sead19DebugFontMgrJis1Nvn5beginEPNS_11DrawContextE
 0x0000007100afee70,U,000004,_ZN2nn4ui2d13FontContainerD2Ev
 0x0000007100afee74,U,000836,_ZNK4sead19DebugFontMgrJis1Nvn5printEPNS_11DrawContextERKNS_10ProjectionERKNS_6CameraERKNS_8Matrix34IfEERKNS_7Color4fEPKvi
 0x0000007100aff1b8,U,000008,
 0x0000007100aff1c0,U,000100,
 0x0000007100aff224,U,000108,
-0x0000007100aff290,U,000164,_ZN4sead15DebugFontMgrNvn14createInstanceEPNS_4HeapE
+0x0000007100aff290,O,000164,_ZN4sead15DebugFontMgrNvn14createInstanceEPNS_4HeapE
 0x0000007100aff334,U,000004,nullsub_3183
 0x0000007100aff338,U,000004,j__ZdlPv_593
-0x0000007100aff33c,U,000240,_ZN4sead15DebugFontMgrNvn10initializeEPNS_4HeapEPKcS4_j
+0x0000007100aff33c,O,000240,_ZN4sead15DebugFontMgrNvn10initializeEPNS_4HeapEPKcS4_j
 0x0000007100aff42c,U,001188,_ZN4sead15DebugFontMgrNvn20initializeFromBinaryEPNS_4HeapEPvmS3_mj
-0x0000007100aff8d0,U,000044,_ZN4sead15DebugFontMgrNvn22swapUniformBlockBufferEv
-0x0000007100aff8fc,U,000008,_ZNK4sead15DebugFontMgrNvn9getHeightEv
+0x0000007100aff8d0,O,000044,_ZN4sead15DebugFontMgrNvn22swapUniformBlockBufferEv
+0x0000007100aff8fc,O,000008,_ZNK4sead15DebugFontMgrNvn9getHeightEv
 0x0000007100aff904,U,000008,
 0x0000007100aff90c,U,000008,
 0x0000007100aff914,U,000008,
-0x0000007100aff91c,U,000044,_ZNK4sead15DebugFontMgrNvn5beginEPNS_11DrawContextE
+0x0000007100aff91c,O,000044,_ZNK4sead15DebugFontMgrNvn5beginEPNS_11DrawContextE
 0x0000007100aff948,U,000004,nullsub_3184
 0x0000007100aff94c,U,000716,_ZNK4sead15DebugFontMgrNvn5printEPNS_11DrawContextERKNS_10ProjectionERKNS_6CameraERKNS_8Matrix34IfEERKNS_7Color4fEPKvi
 0x0000007100affc18,U,000008,
@@ -64200,7 +64200,7 @@ Address,Quality,Size,Name
 0x0000007100b2e4b8,U,000092,sead::MethodTreeMgr::rtti2
 0x0000007100b2e514,U,000028,_ZN3agl3utl16DebugTexturePageD2Ev
 0x0000007100b2e530,U,000004,nullsub_6141
-0x0000007100b2e534,U,000008,_ZN4sead15DrawLockContext4lockEv
+0x0000007100b2e534,O,000008,_ZN4sead15DrawLockContext4lockEv
 0x0000007100b2e53c,U,000008,
 0x0000007100b2e544,U,000012,
 0x0000007100b2e550,U,000004,nullsub_3254
@@ -65292,7 +65292,7 @@ Address,Quality,Size,Name
 0x0000007100b66350,U,018288,
 0x0000007100b6aac0,U,000016,
 0x0000007100b6aad0,U,001144,_ZN3agl6detail15TextureDataUtil20convFormatNNGfxToAGLEN2nn3gfx11ImageFormatE
-0x0000007100b6af48,U,000012,_ZN3agl26ResBinaryShaderArchiveData12getExtensionEv
+0x0000007100b6af48,O,000012,_ZN3agl26ResBinaryShaderArchiveData12getExtensionEv
 0x0000007100b6af54,U,001332,
 0x0000007100b6b488,U,000844,
 0x0000007100b6b7d4,U,000072,_ZN3agl22ResBinaryShaderArchive7cleanUpEv
@@ -65329,11 +65329,11 @@ Address,Quality,Size,Name
 0x0000007100b6d070,U,000072,_ZNK3agl11IndexStream13flushCPUCacheEjj
 0x0000007100b6d0b8,O,000112,_ZN3agl15ModifyEndianU32EbPvm
 0x0000007100b6d128,U,000012,
-0x0000007100b6d134,U,001140,_ZN3agl16ResShaderArchive5setUpEv
+0x0000007100b6d134,M,001140,_ZN3agl16ResShaderArchive5setUpEv
 0x0000007100b6d5a8,U,000112,
-0x0000007100b6d618,U,000048,_ZNK3agl16ResShaderProgram26getResShaderVariationArrayEv
-0x0000007100b6d648,U,000068,_ZNK3agl18ResShaderVariation8getValueEi
-0x0000007100b6d68c,U,000068,_ZNK3agl18ResShaderVariation5getIDEv
+0x0000007100b6d618,M,000048,_ZNK3agl16ResShaderProgram26getResShaderVariationArrayEv
+0x0000007100b6d648,O,000068,_ZNK3agl18ResShaderVariation8getValueEi
+0x0000007100b6d68c,O,000068,_ZNK3agl18ResShaderVariation5getIDEv
 0x0000007100b6d6d0,U,000024,_ZN3agl6ShaderC2Ev
 0x0000007100b6d6e8,U,000008,
 0x0000007100b6d6f0,U,000004,j__ZdlPv_655

diff --git a/lib/NintendoSDK b/lib/NintendoSDK
diff --git a/lib/agl b/lib/agl
diff --git a/lib/gsys/include/gsys/gsysLightRigObj.h b/lib/gsys/include/gsys/gsysLightRigObj.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <agl/env/aglEnvObj.h>
+#include <environment/aglEnvObj.h>
 
 namespace gsys {
 

diff --git a/lib/gsys/include/gsys/gsysMaskedProjLight.h b/lib/gsys/include/gsys/gsysMaskedProjLight.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <agl/env/aglEnvObj.h>
+#include <environment/aglEnvObj.h>
 
 namespace gsys {
 

diff --git a/lib/gsys/include/gsys/gsysMaskedSpotLight.h b/lib/gsys/include/gsys/gsysMaskedSpotLight.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <agl/env/aglEnvObj.h>
+#include <environment/aglEnvObj.h>
 
 namespace gsys {
 

diff --git a/lib/gsys/include/gsys/gsysModelSceneConfig.h b/lib/gsys/include/gsys/gsysModelSceneConfig.h
@@ -1,16 +1,16 @@
 #pragma once
 
-#include <agl/env/aglEnvObjBuffer.h>
-#include <agl/env/aglEnvObjMgr.h>
-#include <agl/env/aglEnvObjSetMgr.h>
-#include <agl/utl/aglParameter.h>
-#include <agl/utl/aglParameterIO.h>
-#include <agl/utl/aglParameterObj.h>
 #include <basis/seadTypes.h>
 #include <container/seadSafeArray.h>
+#include <environment/aglEnvObjBuffer.h>
+#include <environment/aglEnvObjMgr.h>
+#include <environment/aglEnvObjSetMgr.h>
 #include <hostio/seadHostIONode.h>
 #include <math/seadVector.h>
 #include <prim/seadSafeString.h>
+#include <utility/aglParameter.h>
+#include <utility/aglParameterIO.h>
+#include <utility/aglParameterObj.h>
 
 namespace gsys {
 

diff --git a/lib/gsys/include/gsys/gsysOfxLensFlareRig.h b/lib/gsys/include/gsys/gsysOfxLensFlareRig.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <agl/env/aglEnvObj.h>
+#include <environment/aglEnvObj.h>
 
 namespace gsys {
 

diff --git a/lib/gsys/include/gsys/gsysParticleConfig.h b/lib/gsys/include/gsys/gsysParticleConfig.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <agl/utl/aglParameter.h>
-#include <agl/utl/aglParameterIO.h>
-#include <agl/utl/aglParameterObj.h>
 #include <hostio/seadHostIONode.h>
+#include <utility/aglParameter.h>
+#include <utility/aglParameterIO.h>
+#include <utility/aglParameterObj.h>
 
 namespace gsys {
 

diff --git a/lib/gsys/include/gsys/gsysPointLight.h b/lib/gsys/include/gsys/gsysPointLight.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <agl/env/aglEnvObj.h>
+#include <environment/aglEnvObj.h>
 
 namespace gsys {
 

diff --git a/lib/gsys/include/gsys/gsysSpotLight.h b/lib/gsys/include/gsys/gsysSpotLight.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <agl/env/aglEnvObj.h>
+#include <environment/aglEnvObj.h>
 
 namespace gsys {
 

diff --git a/lib/gsys/src/gsys/gsysModelSceneConfig.cpp b/lib/gsys/src/gsys/gsysModelSceneConfig.cpp
@@ -1,13 +1,13 @@
 #include "gsys/gsysModelSceneConfig.h"
-#include <agl/detail/aglPrivateResource.h>
-#include <agl/env/aglFog.h>
-#include <agl/env/aglLight.h>
-#include <agl/env/aglProjector.h>
-#include <agl/pfx/aglBloom.h>
-#include <agl/pfx/aglDepthOfField.h>
 #include <basis/seadRawPrint.h>
+#include <detail/aglPrivateResource.h>
+#include <environment/aglFog.h>
+#include <environment/aglLight.h>
+#include <environment/aglProjector.h>
+#include <postfx/aglBloom.h>
+#include <postfx/aglDepthOfField.h>
 #include <prim/seadEnum.h>
-#include "agl/fx/aglFxOfxLensFlare.h"
+#include "effect/aglFxOfxLensFlare.h"
 #include "gsys/gsysLightRigObj.h"
 #include "gsys/gsysMaskedProjLight.h"
 #include "gsys/gsysMaskedSpotLight.h"

diff --git a/lib/sead b/lib/sead
diff --git a/src/Game/DLC/aocHardModeManager.cpp b/src/Game/DLC/aocHardModeManager.cpp
@@ -66,15 +66,15 @@ void HardModeManager::init_() {
 }
 
 void HardModeManager::nerfHpRestore(f32* hp) const {
-    *hp = sead::Mathf::max(*hp * getMultiplier(MultiplierType::HpRestore), 1.0f);
+    *hp = sead::Mathf::clampMin(*hp * getMultiplier(MultiplierType::HpRestore), 1.0f);
 }
 
 void HardModeManager::nerfHpRestore(s32* hp) const {
-    *hp = sead::Mathi::max(*hp * getMultiplier(MultiplierType::HpRestore), 1);
+    *hp = sead::Mathi::clampMin(*hp * getMultiplier(MultiplierType::HpRestore), 1);
 }
 
 void HardModeManager::modifyEnemyNoticeDuration(f32* value) const {
-    *value = sead::Mathf::max(*value * getMultiplier(MultiplierType::EnemyNoticeDuration), 0);
+    *value = sead::Mathf::clampMin(*value * getMultiplier(MultiplierType::EnemyNoticeDuration), 0);
 }
 
 bool HardModeManager::shouldCreateLifeRecoverInfo(ksys::act::Actor* actor) {

diff --git a/src/KingSystem/ActorSystem/Awareness/actAwareness.cpp b/src/KingSystem/ActorSystem/Awareness/actAwareness.cpp
@@ -1,9 +1,9 @@
 #include "KingSystem/ActorSystem/Awareness/actAwareness.h"
-#include <agl/utl/aglParameter.h>
-#include <agl/utl/aglResParameter.h>
 #include <container/seadSafeArray.h>
 #include <cstring>
 #include <prim/seadScopedLock.h>
+#include <utility/aglParameter.h>
+#include <utility/aglResParameter.h>
 #include "KingSystem/ActorSystem/Awareness/actAwarenessDefs.h"
 #include "KingSystem/ActorSystem/Awareness/actAwarenessInstance.h"
 #include "KingSystem/Resource/resHandle.h"

diff --git a/src/KingSystem/ActorSystem/Awareness/actAwarenessDefs.cpp b/src/KingSystem/ActorSystem/Awareness/actAwarenessDefs.cpp
@@ -1,6 +1,6 @@
 #include "KingSystem/ActorSystem/Awareness/actAwarenessDefs.h"
-#include <agl/utl/aglParameter.h>
 #include <container/seadSafeArray.h>
+#include <utility/aglParameter.h>
 
 namespace ksys::act {
 

diff --git a/src/KingSystem/ActorSystem/actAiParam.cpp b/src/KingSystem/ActorSystem/actAiParam.cpp
@@ -1,5 +1,5 @@
 #include "KingSystem/ActorSystem/actAiParam.h"
-#include <agl/utl/aglParameter.h>
+#include <utility/aglParameter.h>
 #include "KingSystem/ActorSystem/actActor.h"
 #include "KingSystem/ActorSystem/actAiClassDef.h"
 #include "KingSystem/ActorSystem/actAiInlineParam.h"

diff --git a/src/KingSystem/ActorSystem/actBaseProcJobQue.h b/src/KingSystem/ActorSystem/actBaseProcJobQue.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <agl/utl/aglAtomicPtrArray.h>
 #include <array>
 #include <basis/seadTypes.h>
 #include <container/seadSafeArray.h>
 #include <mc/seadJob.h>
 #include <mc/seadJobQueue.h>
 #include <thread/seadAtomic.h>
+#include <utility/aglAtomicPtrArray.h>
 #include "KingSystem/ActorSystem/actBaseProcJob.h"
 #include "KingSystem/Utils/Types.h"
 

diff --git a/src/KingSystem/ActorSystem/actBaseProcMgr.h b/src/KingSystem/ActorSystem/actBaseProcMgr.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <agl/utl/aglAtomicPtrArray.h>
 #include <container/seadBuffer.h>
 #include <container/seadOffsetList.h>
 #include <container/seadPtrArray.h>
@@ -12,6 +11,7 @@
 #include <prim/seadTypedBitFlag.h>
 #include <thread/seadAtomic.h>
 #include <thread/seadCriticalSection.h>
+#include <utility/aglAtomicPtrArray.h>
 #include "KingSystem/ActorSystem/actBaseProc.h"
 #include "KingSystem/ActorSystem/actBaseProcJob.h"
 #include "KingSystem/ActorSystem/actBaseProcMap.h"

diff --git a/src/KingSystem/Chemical/chmRigid.h b/src/KingSystem/Chemical/chmRigid.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <agl/utl/aglParameter.h>
-#include <agl/utl/aglParameterObj.h>
+#include <utility/aglParameter.h>
+#include <utility/aglParameterObj.h>
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::chm {

diff --git a/src/KingSystem/Chemical/chmRoot.h b/src/KingSystem/Chemical/chmRoot.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <agl/utl/aglParameter.h>
-#include <agl/utl/aglParameterIO.h>
-#include <agl/utl/aglParameterList.h>
-#include <agl/utl/aglParameterObj.h>
 #include <container/seadBuffer.h>
 #include <hostio/seadHostIONode.h>
+#include <utility/aglParameter.h>
+#include <utility/aglParameterIO.h>
+#include <utility/aglParameterList.h>
+#include <utility/aglParameterObj.h>
 #include "KingSystem/Chemical/chmRigid.h"
 #include "KingSystem/Chemical/chmShape.h"
 #include "KingSystem/Utils/Types.h"

diff --git a/src/KingSystem/Chemical/chmShape.h b/src/KingSystem/Chemical/chmShape.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <agl/utl/aglParameter.h>
-#include <agl/utl/aglParameterIO.h>
-#include <agl/utl/aglParameterList.h>
-#include <agl/utl/aglParameterObj.h>
 #include <hostio/seadHostIONode.h>
+#include <utility/aglParameter.h>
+#include <utility/aglParameterIO.h>
+#include <utility/aglParameterList.h>
+#include <utility/aglParameterObj.h>
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::chm {

diff --git a/src/KingSystem/Chemical/chmSystemConfig.h b/src/KingSystem/Chemical/chmSystemConfig.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <agl/utl/aglParameter.h>
-#include <agl/utl/aglParameterIO.h>
-#include <agl/utl/aglParameterList.h>
-#include <agl/utl/aglParameterObj.h>
 #include <basis/seadTypes.h>
 #include <container/seadBuffer.h>
 #include <heap/seadDisposer.h>
 #include <hostio/seadHostIONode.h>
+#include <utility/aglParameter.h>
+#include <utility/aglParameterIO.h>
+#include <utility/aglParameterList.h>
+#include <utility/aglParameterObj.h>
 
 namespace ksys::chm {
 

diff --git a/src/KingSystem/Mii/miiUMii.h b/src/KingSystem/Mii/miiUMii.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <agl/utl/aglParameter.h>
-#include <agl/utl/aglParameterIO.h>
-#include <agl/utl/aglParameterObj.h>
 #include <prim/seadSafeString.h>
+#include <utility/aglParameter.h>
+#include <utility/aglParameterIO.h>
+#include <utility/aglParameterObj.h>
 #include "KingSystem/Resource/resHandle.h"
 #include "KingSystem/Utils/Types.h"
 

diff --git a/src/KingSystem/Physics/Cloth/physClothParam.h b/src/KingSystem/Physics/Cloth/physClothParam.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <agl/utl/aglParameter.h>
-#include <agl/utl/aglParameterList.h>
-#include <agl/utl/aglParameterObj.h>
 #include <container/seadBuffer.h>
 #include <prim/seadSafeString.h>
+#include <utility/aglParameter.h>
+#include <utility/aglParameterList.h>
+#include <utility/aglParameterObj.h>
 
 namespace ksys::phys {