Merge branch 'main' of https://github.com/PackProject/APClient

Author: cyndifusic

base/symbols_resort.txt

@@ -3034,6 +3034,7 @@ GXGetTevOrder__Q34nw4r3g3d6ResTevCF13_GXTevStageIDP13_GXTexCoordIDP11_GXTexMapID
 GXSetTevOrder__Q34nw4r3g3d6ResTevF13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID=0x8016dec0
 CallDisplayList__Q34nw4r3g3d6ResTevCFb=0x8016dfe0
 CopyTo__Q34nw4r3g3d6ResTevFPv=0x8016e040
+DCStore__Q34nw4r3g3d6ResTevFb=0x8016e0b0
 DCStore__Q34nw4r3g3d14ResMatTevColorFb=0x8016e110
 DCStore__Q34nw4r3g3d20ResMatIndMtxAndScaleFb=0x8016e130
 DCStore__Q34nw4r3g3d17ResMatTexCoordGenFb=0x8016e150
@@ -3050,6 +3051,7 @@ SetEffectMtx__Q34nw4r3g3d9ResTexSrtFUlPCQ34nw4r4math5MTX34=0x8016e610
 GetEffectMtx__Q34nw4r3g3d9ResTexSrtCFUlPQ34nw4r4math5MTX34=0x8016e690
 SetMapMode__Q34nw4r3g3d9ResTexSrtFUlUlii=0x8016e6e0
 GetMapMode__Q34nw4r3g3d9ResTexSrtCFUlPUlPiPi=0x8016e760
+GXSetNumTevStages__Q34nw4r3g3d10ResGenModeFUc=0x8016e800
 CopyTo__Q34nw4r3g3d10ResGenModeCFPv=0x8016e860
 GXGetZCompLoc__Q34nw4r3g3d10ResMatMiscCFv=0x8016e8a0
 SetLightSetIdx__Q34nw4r3g3d10ResMatMiscFi=0x8016e8c0

include/Pack/RPGraphics.h

@@ -7,6 +7,7 @@
 #include <RPGraphics/RPGrpModelBoundingInfo.h>
 #include <RPGraphics/RPGrpModelG3D.h>
 #include <RPGraphics/RPGrpModelManager.h>
+#include <RPGraphics/RPGrpModelMaterial.h>
 #include <RPGraphics/RPGrpModelResManager.h>
 #include <RPGraphics/RPGrpRenderer.h>
 #include <RPGraphics/RPGrpScreen.h>

include/Pack/RPGraphics/RPGrpModel.h

@@ -4,18 +4,28 @@
 
 #include <egg/gfx/eggModelEx.h>
 
+class RPGrpModelMaterial;
+
 class RPGrpModel {
 public:
     EGG::ModelEx* GetModelEx() const {
         return mModelEx;
     }
 
+    RPGrpModelMaterial* GetMaterial(u32 id) const {
+        return mppMaterials[id];
+    }
+
 private:
-    char _00[0x40];
 #if defined(PACK_RESORT)
-    char _40[0x4];
-#endif
+    char _00[0x38];
+    RPGrpModelMaterial** mppMaterials; // at 0x38
+    char _3C[0x44 - 0x3C];
+    EGG::ModelEx* mModelEx; // at 0x44
+#else
+    char _00[0x40];
     EGG::ModelEx* mModelEx; // at 0x40
+#endif
 };
 
 #endif

include/Pack/RPGraphics/RPGrpModelMaterial.h

@@ -0,0 +1,29 @@
+#ifndef RP_GRAPHICS_MODEL_MATERIAL_H
+#define RP_GRAPHICS_MODEL_MATERIAL_H
+#include "RPTypes.h"
+
+#include <nw4r/g3d.h>
+
+class RPGrpModelMaterial {
+public:
+    void SetTevKColor(GXTevKColorID id, GXColor color) {
+        mTevKColors[id] = color;
+    }
+    void SetTevColor(GXTevRegID id, GXColorS10 color) {
+        mTevColors[id - GX_TEVREG0] = color;
+    }
+
+    nw4r::g3d::ScnMdl::CopiedMatAccess& GetCopiedMatAccess() {
+        return mCopiedMatAccess;
+    }
+
+private:
+    char _00[0xC];
+    GXColor mTevKColors[GX_MAX_KCOLOR];                // at 0xC
+    GXColorS10 mTevColors[GX_MAX_TEVREG - GX_TEVREG0]; // at 0x1C
+    char _34[0x80 - 0x34];
+    nw4r::g3d::ScnMdl::CopiedMatAccess mCopiedMatAccess; // at 0x80
+    // . . .
+};
+
+#endif

include/nw4r/g3d/g3d_draw.h

@@ -24,6 +24,9 @@ G3DState::IndMtxOp* GetIndMtxOp(ResMat mat, ResNode node, ResShp shp);
 } // namespace detail
 
 struct DrawResMdlReplacement {
+#if defined(PACK_RESORT)
+    u32 flag;
+#endif
     u8* visArray;                               // at 0x0
     ResTexObjData* texObjDataArray;             // at 0x4
     ResTlutObjData* tlutObjDataArray;           // at 0x8

include/nw4r/g3d/g3d_scnmdl.h

@@ -159,6 +159,9 @@ class ScnMdl : public ScnMdlSimple {
     u32 mFlagVisBuffer;                 // at 0x13C
     u32* mpMatBufferDirtyFlag;          // at 0x140
     DrawResMdlReplacement mReplacement; // at 0x144
+#if defined(PACK_RESORT)
+    u32 mReplacementFlag; // at 0x184
+#endif
 
     NW4R_G3D_RTTI_DECL_DERIVED(ScnMdl, ScnMdlSimple);
 };

include/nw4r/g3d/res/g3d_restev.h

@@ -79,6 +79,9 @@ class ResTev : public ResCommon<ResTevData> {
     void GXSetTevColorIn(GXTevStageID stage, GXTevColorArg a, GXTevColorArg b,
                          GXTevColorArg c, GXTevColorArg d);
 
+    void GXSetTevColorOp(GXTevStageID stage, GXTevOp op, GXTevBias bias,
+                         GXTevScale scale, GXBool clamp, GXTevRegID output);
+
     void CallDisplayList(bool sync) const;
 
     ResTev CopyTo(void* pDst);

lib/libkiwi/core/kiwiColor.cpp

@@ -14,6 +14,14 @@ Color Color::ToYuv() const {
     return Color(y, u, v, a);
 }
 
+/**
+ * @brief Converts RGB color to GX signed 10-bit format
+ */
+GXColorS10 Color::ToS10() const {
+    const GXColorS10 color = {r, g, b, a};
+    return color;
+}
+
 /**
  * @brief Creates RGB color from HSV format
  *

lib/libkiwi/core/kiwiColor.h

@@ -83,6 +83,11 @@ class Color : public nw4r::ut::Color {
      */
     Color ToYuv() const;
 
+    /**
+     * @brief Converts RGB color to GX signed 10-bit format
+     */
+    GXColorS10 ToS10() const;
+
     /**
      * @brief Converts HSV color to RGB format
      *

lib/libkiwi/fun/kiwiGameCorruptor.cpp

@@ -23,7 +23,7 @@ void** GetRandomAddr(const void* pBegin, const void* pEnd) {
 
     do {
         // Make sure to align the address to 4 bytes
-        offset = Random().NextU32(size);
+        offset = RNG.NextU32(size);
         offset = RoundUp(offset, 4);
     }
     // Adjusting for alignment may take us out of the range
@@ -89,7 +89,7 @@ void GameCorruptor::Corrupt() const {
 
     case ECorruptDomain_DolData: {
         // 50/50 between .data and .rodata
-        if (Random().CoinFlip()) {
+        if (RNG.CoinFlip()) {
             CorruptData(GetDolDataStart(), GetDolDataEnd());
         } else {
             CorruptData(GetDolRodataStart(), GetDolRodataEnd());
@@ -170,11 +170,11 @@ void GameCorruptor::CorruptData(const void* pBegin, const void* pEnd) const {
         // Corrupt float
         if (PtrUtil::IsFloat(ppAddr)) {
             *reinterpret_cast<f32*>(ppAddr) =
-                Random().NextF32(10000000.0f) * Random().Sign();
+                RNG.NextF32(10000000.0f) * RNG.Sign();
         }
         // Corrupt integer
         else {
-            *reinterpret_cast<u32*>(ppAddr) = Random().NextU32();
+            *reinterpret_cast<u32*>(ppAddr) = RNG.NextU32();
         }
 
         i++;