Merge remote-tracking branch 'upstream/main'

.github/workflows/build.yml

@@ -67,20 +67,30 @@ jobs:
           name: ${{ matrix.version }}_maps
           path: build/${{ matrix.version }}/**/*.MAP
 
-      - name: Generate Progress Report
+      - name: Generate Progress Reports
         if: github.ref == 'refs/heads/main'
         run: |
           ./objdiff-cli report generate -o progress.json
+          git log -1 --pretty='{"id": "%H", "email": "%ae", "time": "%ad", "message": "%s"}' --date=format:"%Y-%m-%dT%H:%M:%S" > progress-commit.json
+          git checkout HEAD~1
+          rm -rf ./build/
+          ninja all_source
+          ./objdiff-cli report generate -o previous.json
 
-      - name: Save Artifact
+      - name: Save Progress Artifacts
         if: github.ref == 'refs/heads/main'
         uses: actions/upload-artifact@v4
         with:
           name: progress
-          path: progress.json
+          path: |
+            progress.json
+            previous.json
+            progress-commit.json
 
   website:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     needs: build
     if: github.ref == 'refs/heads/main'
     steps:
@@ -89,7 +99,7 @@ jobs:
         with:
           repository: bfbbdecomp/website
 
-      - name: Download artifact
+      - name: Download Progress Artifacts
         uses: actions/download-artifact@v4
         with:
           name: progress
@@ -110,3 +120,20 @@ jobs:
           folder: dist # The folder the action should deploy.
           clean: true
           single-commit: true
+
+      - name: Commit Changes
+        continue-on-error: true
+        run: |
+          git status
+          git pull origin main
+          git config --global user.name "BFBB Actions Bot"
+          git config --global user.email "[email protected]"
+          git add .
+          git commit -m "automated commit cache update"
+
+      - name: Push changes
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.WEBSITE_TOKEN }}
+          repository: bfbbdecomp/website
+          branch: ${{ github.ref }}

configure.py

@@ -283,7 +283,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(NonMatching, "SB/Core/x/xCamera.cpp"),
             Object(NonMatching, "SB/Core/x/xClimate.cpp"),
             Object(NonMatching, "SB/Core/x/xCollide.cpp"),
-            Object(NonMatching, "SB/Core/x/xCollideFast.cpp"),
+            Object(Matching, "SB/Core/x/xCollideFast.cpp"),
             Object(NonMatching, "SB/Core/x/xColor.cpp"),
             Object(Matching, "SB/Core/x/xCounter.cpp"),
             Object(NonMatching, "SB/Core/x/xCutscene.cpp"),
@@ -302,7 +302,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(NonMatching, "SB/Core/x/xHud.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Core/x/xHudFontMeter.cpp"),
             Object(NonMatching, "SB/Core/x/xHudMeter.cpp"),
-            Object(NonMatching, "SB/Core/x/xHudModel.cpp"),
+            Object(Equivalent, "SB/Core/x/xHudModel.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Core/x/xHudUnitMeter.cpp"),
             Object(Matching, "SB/Core/x/xIni.cpp"),
             Object(NonMatching, "SB/Core/x/xMath.cpp"),
@@ -345,22 +345,22 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(NonMatching, "SB/Game/zDispatcher.cpp"),
             Object(NonMatching, "SB/Game/zEGenerator.cpp"),
             Object(NonMatching, "SB/Game/zEnt.cpp"),
-            Object(NonMatching, "SB/Game/zEntButton.cpp"),
+            Object(Equivalent, "SB/Game/zEntButton.cpp"),
             Object(NonMatching, "SB/Game/zEntCruiseBubble.cpp"),
             Object(NonMatching, "SB/Game/zEntDestructObj.cpp"),
             Object(NonMatching, "SB/Game/zEntHangable.cpp"),
             Object(NonMatching, "SB/Game/zEntPickup.cpp"),
             Object(NonMatching, "SB/Game/zEntPlayer.cpp"),
             Object(NonMatching, "SB/Game/zEntSimpleObj.cpp"),
-            Object(NonMatching, "SB/Game/zEntTrigger.cpp"),
+            Object(Matching, "SB/Game/zEntTrigger.cpp", extra_cflags=["-sym on"]),
             Object(Matching, "SB/Game/zEnv.cpp"),
             Object(Matching, "SB/Game/zEvent.cpp"),
             Object(Matching, "SB/Game/zFeet.cpp"),
             Object(Matching, "SB/Game/zFMV.cpp"),
             Object(NonMatching, "SB/Game/zFX.cpp"),
             Object(NonMatching, "SB/Game/zGame.cpp"),
             Object(Equivalent, "SB/Game/zGameExtras.cpp"),
-            Object(NonMatching, "SB/Game/zGameState.cpp"),
+            Object(Equivalent, "SB/Game/zGameState.cpp"),
             Object(NonMatching, "SB/Game/zGust.cpp"),
             Object(NonMatching, "SB/Game/zHud.cpp"),
             Object(NonMatching, "SB/Game/zLasso.cpp"),
@@ -406,7 +406,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(NonMatching, "SB/Core/gc/iMix.c"),
             Object(NonMatching, "SB/Core/gc/iModel.cpp"),
             Object(NonMatching, "SB/Core/gc/iMorph.cpp"),
-            Object(NonMatching, "SB/Core/gc/iPad.cpp"),
+            Object(Equivalent, "SB/Core/gc/iPad.cpp"),
             Object(NonMatching, "SB/Core/gc/iParMgr.cpp"),
             Object(NonMatching, "SB/Core/gc/isavegame.cpp"),
             Object(NonMatching, "SB/Core/gc/iScrFX.cpp"),
@@ -416,9 +416,9 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(NonMatching, "SB/Core/gc/ngcrad3d.c"),
             Object(Matching, "SB/Game/zNPCGoals.cpp"),
             Object(NonMatching, "SB/Game/zNPCGoalCommon.cpp"), # wrong function order
-            Object(NonMatching, "SB/Game/zNPCGoalStd.cpp"),
+            Object(NonMatching, "SB/Game/zNPCGoalStd.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Game/zNPCGoalRobo.cpp"),
-            Object(NonMatching, "SB/Game/zNPCGoalTiki.cpp"),
+            Object(Matching, "SB/Game/zNPCGoalTiki.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Game/zNPCMessenger.cpp"),
             Object(NonMatching, "SB/Game/zNPCMgr.cpp"),
             Object(Matching, "SB/Game/zNPCTypes.cpp"),
@@ -431,7 +431,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(NonMatching, "SB/Core/x/xBehaviour.cpp"), # breaks build (weak functions)
             Object(NonMatching, "SB/Core/x/xBehaveGoalSimple.cpp"), # breaks build (weak functions)
             Object(NonMatching, "SB/Core/x/xSkyDome.cpp"),
-            Object(NonMatching, "SB/Core/x/xRMemData.cpp"),
+            Object(Matching, "SB/Core/x/xRMemData.cpp", extra_cflags=["-sym on"]),
             Object(Matching, "SB/Core/x/xFactory.cpp"),
             Object(NonMatching, "SB/Core/x/xNPCBasic.cpp"),
             Object(NonMatching, "SB/Game/zEntPlayerBungeeState.cpp"),
@@ -450,13 +450,13 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(Matching, "SB/Game/zCamMarker.cpp"),
             Object(NonMatching, "SB/Game/zGoo.cpp"),
             Object(NonMatching, "SB/Game/zGrid.cpp"),
-            Object(NonMatching, "SB/Game/zNPCGoalScript.cpp"),
+            Object(Matching, "SB/Game/zNPCGoalScript.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Game/zNPCSndTable.cpp"),
             Object(NonMatching, "SB/Game/zNPCSndLists.cpp"),
             Object(NonMatching, "SB/Game/zNPCTypeDuplotron.cpp"),
             Object(NonMatching, "SB/Core/x/xModelBucket.cpp"),
             Object(NonMatching, "SB/Game/zShrapnel.cpp"),
-            Object(NonMatching, "SB/Game/zNPCGoalDuplotron.cpp"),
+            Object(Matching, "SB/Game/zNPCGoalDuplotron.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Game/zNPCSpawner.cpp"),
             Object(NonMatching, "SB/Game/zEntTeleportBox.cpp"),
             Object(Matching, "SB/Game/zBusStop.cpp"),
@@ -468,16 +468,16 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(Matching, "SB/Game/zNPCTypeTest.cpp"),
             Object(NonMatching, "SB/Game/zNPCTypeSubBoss.cpp"),
             Object(NonMatching, "SB/Game/zNPCTypeBoss.cpp"),
-            Object(NonMatching, "SB/Game/zNPCGoalVillager.cpp"),
-            Object(NonMatching, "SB/Game/zNPCGoalSubBoss.cpp"),
+            Object(NonMatching, "SB/Game/zNPCGoalVillager.cpp", extra_cflags=["-sym on"]),
+            Object(Matching, "SB/Game/zNPCGoalSubBoss.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Core/x/xShadowSimple.cpp"),
             Object(NonMatching, "SB/Core/x/xUpdateCull.cpp"),
             Object(NonMatching, "SB/Game/zDiscoFloor.cpp"),
             Object(NonMatching, "SB/Game/zNPCTypeBossSandy.cpp"),
             Object(NonMatching, "SB/Game/zNPCTypeKingJelly.cpp"),
             Object(Matching, "SB/Game/zNPCGoalBoss.cpp"),
             Object(NonMatching, "SB/Game/zNPCTypePrawn.cpp"),
-            Object(NonMatching, "SB/Game/zNPCTypeBossSB1.cpp"),
+            Object(Equivalent, "SB/Game/zNPCTypeBossSB1.cpp"),
             Object(NonMatching, "SB/Game/zNPCTypeBossSB2.cpp"),
             Object(Matching, "SB/Core/x/xJaw.cpp"),
             Object(NonMatching, "SB/Game/zNPCTypeBossPatrick.cpp"),

include/dolphin/dolphin.h

@@ -165,9 +165,43 @@ typedef struct OSContext
     u32 gqr[8];
     u32 psf_pad;
     f64 psf[32];
-
 } OSContext;
 
+
+#define PAD_MAX_CONTROLLERS 4
+
+#define PAD_BUTTON_LEFT  0x0001
+#define PAD_BUTTON_RIGHT 0x0002
+#define PAD_BUTTON_DOWN  0x0004
+#define PAD_BUTTON_UP    0x0008
+#define PAD_TRIGGER_Z    0x0010
+#define PAD_TRIGGER_R    0x0020
+#define PAD_TRIGGER_L    0x0040
+#define PAD_BUTTON_A     0x0100
+#define PAD_BUTTON_B     0x0200
+#define PAD_BUTTON_X     0x0400
+#define PAD_BUTTON_Y     0x0800
+#define PAD_BUTTON_START 0x1000
+
+#define PAD_ERR_NONE           0
+#define PAD_ERR_NO_CONTROLLER -1
+#define PAD_ERR_NOT_READY     -2
+#define PAD_ERR_TRANSFER      -3
+
+typedef struct PADStatus
+{
+    u16 button;
+    s8 stickX;
+    s8 stickY;
+    s8 substickX;
+    s8 substickY;
+    u8 triggerLeft;
+    u8 triggerRight;
+    u8 analogA;
+    u8 analogB;
+    s8 err;
+} PADStatus;
+
 extern volatile OSHeapHandle __OSCurrHeap;
 
 #define OSAlloc(size) OSAllocFromHeap(__OSCurrHeap, (size))
@@ -196,6 +230,9 @@ OSTime OSGetTime();
 void OSTicksToCalendarTime(OSTime ticks, OSCalendarTime* td);
 BOOL PADInit();
 void PADControlMotor(int chan, u32 command);
+void PADRead(PADStatus* status);
+void PADClamp(PADStatus* status);
+void PADReset(u32 mask);
 void AXQuit();
 void AXFreeVoice(_AXVPB*);
 void OSSetSoundMode(u32 mode);

src/SB/Core/gc/iAnim.h

@@ -7,8 +7,9 @@ extern U8* giAnimScratch;
 
 void iAnimInit();
 U32 iAnimBoneCount(void* RawData);
-void iAnimBlend(F32 BlendFactor, F32 BlendRecip, U16* BlendTimeOffset,
-                F32* BoneTable, U32 BoneCount, xVec3* Tran1, xQuat* Quat1, xVec3* Tran2,
-                xQuat* Quat2, xVec3* TranDest, xQuat* QuatDest);
+void iAnimBlend(F32 BlendFactor, F32 BlendRecip, U16* BlendTimeOffset, F32* BoneTable,
+                U32 BoneCount, xVec3* Tran1, xQuat* Quat1, xVec3* Tran2, xQuat* Quat2,
+                xVec3* TranDest, xQuat* QuatDest);
+void iAnimEval(void* RawData, float time, unsigned int flags, class xVec3* tran, class xQuat* quat);
 
 #endif

src/SB/Core/gc/iModel.h

@@ -15,8 +15,9 @@ void iModelSetMaterialTexture(RpAtomic* model, void* texture);
 void iModelResetMaterial(RpAtomic* model);
 S32 iModelCullPlusShadow(RpAtomic* model, RwMatrix* mat, xVec3* shadowVec, S32* shadowOutside);
 void iModelTagEval(RpAtomic* model, const xModelTag* tag, RwMatrixTag* mat, xVec3* dest);
-U32 iModelTagSetup(xModelTag tag, RpAtomic* model, F32 x, F32 y, F32 z);
+U32 iModelTagSetup(xModelTag* tag, RpAtomic* model, F32 x, F32 y, F32 z);
 void iModelSetMaterialAlpha(RpAtomic* model, U8 alpha);
+void iModelMaterialMul(RpAtomic* model, F32 rm, F32 gm, F32 bm);
 RpAtomic* iModelFileNew(void* buffer, U32 size);
 void iModelRender(RpAtomic* model, RwMatrix* mat);
 void iModelUnload(RpAtomic* userdata);