Merge branch 'main' into textures

.gitattributes

@@ -2,3 +2,8 @@
 
 # suppress asm/nonmatchings/ in GitHub diffs
 asm/nonmatchings/**/*.s linguist-generated
+
+*.c	diff=cpp
+*.h	diff=cpp
+
+src/world/dead/**/* merge=ours

.github/workflows/build.yaml

@@ -18,14 +18,8 @@ jobs:
         run: ./install_compilers.sh
       - name: Install cargo-binstall
         uses: cargo-bins/cargo-binstall@main
-      - name: Install pigment64
-        run: cargo binstall pigment64 -y
-      - name: Setup Flips
-        run: |
-          curl -L https://dl.smwcentral.net/11474/floating.zip -o floating.zip
-          unzip floating.zip
-          rm floating.zip
-          chmod +x flips-linux
+      - name: Install pigment64 and crunch64
+        run: cargo binstall pigment64 crunch64-cli -y
       - name: Download baserom
         run: curl -L $BASEROM_US_URL -o ver/us/baserom.z64
         env:
@@ -35,23 +29,20 @@ jobs:
       - name: Configure
         run: ./configure
       - name: Build
-        run: ninja
-      - name: Create patch file
-        # flips works but returns a non-zero exit code if the rom shrunk
-        run: ./flips-linux ver/us/baserom.z64 ver/us/build/papermario.z64 papermario.bps || true
+        run: ninja ver/us/build/papermario.bps
       - name: Upload patch as artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: papermario.bps
-          path: papermario.bps
+          path: ver/us/build/papermario.bps
   prerelease:
     name: Prerelease
     runs-on: ubuntu-latest
     needs: game
     if: github.ref == 'refs/heads/main'
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: papermario.bps
           path: papermario.bps
@@ -69,7 +60,7 @@ jobs:
     if: github.ref == 'refs/tags/v*'
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: papermario.bps
           path: papermario.bps

.github/workflows/sync.yml

@@ -3,7 +3,6 @@
 # If the tests pass then the PR is automatically merged by GitHub.
 name: Sync upstream
 env:
-  UPSTREAM: pmret/papermario # If you forked dx, change this to star-haven/papermario-dx!
   UPSTREAM_BRANCH: main
   BASE_BRANCH: main
 on:
@@ -21,19 +20,27 @@ jobs:
         with:
           fetch-depth: 0
           ref: ${{ env.BASE_BRANCH }}
+      - name: Determine upstream
+        run: |
+          if [[ "${{ github.repository }}" == "bates64/papermario-dx" ]]; then
+            echo "UPSTREAM=pmret/papermario" >> $GITHUB_ENV
+          else
+            echo "UPSTREAM=bates64/papermario-dx" >> $GITHUB_ENV
+          fi
       - name: Fetch upstream
-        run: git fetch https://github.com/${{ env.UPSTREAM }}.git ${UPSTREAM_BRANCH}
+        run: git fetch https://github.com/$UPSTREAM.git $UPSTREAM_BRANCH
+      - name: Set git user
+        # https://github.com/orgs/community/discussions/26560
+        run: |
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config user.name "github-actions[bot]"
       - name: Merge upstream
         run: |
           git checkout ${BASE_BRANCH}
           git merge --no-ff --log FETCH_HEAD -m "Merge upstream changes"
-      - name: Push changes
-        run: git push origin ${BASE_BRANCH}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Create Pull Request
         run: |
-          gh pr create --title "Sync with ${{ env.UPSTREAM }}" --body "Automated PR to keep this repository in sync with upstream. Beep boop." --base ${BASE_BRANCH}
+          gh pr create --title "Sync with $UPSTREAM" --body "Automated PR to keep this repository in sync with upstream. Beep boop." --base ${BASE_BRANCH}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  
+

.gitignore

@@ -56,5 +56,4 @@ build/
 *.backup
 *.crash
 
-/tools/Yay0compress
 /tools/n64crc

.vscode/settings.json

@@ -70,4 +70,6 @@
         "-l 120"
     ],
     "search.useIgnoreFiles": false,
+    "nixEnvSelector.nixFile": "${workspaceFolder}/shell.nix",
+    "workbench.editor.labelFormat": "short",
 }

Jenkinsfile

@@ -17,8 +17,9 @@ pipeline {
                 sh 'curl -L "https://github.com/decompals/mips-binutils-2.6/releases/download/main/binutils-2.6-linux.tar.gz" | tar zx -C tools/build/cc/gcc2.7.2'
                 sh 'curl -L "https://github.com/decompals/mips-binutils-egcs-2.9.5/releases/latest/download/mips-binutils-egcs-2.9.5-linux.tar.gz" | tar zx -C tools/build/cc/egcs'
                 sh 'curl -L "https://github.com/decompals/mips-gcc-egcs-2.91.66/releases/latest/download/mips-gcc-egcs-2.91.66-linux.tar.gz" | tar zx -C tools/build/cc/egcs'
-                sh 'pip install -U -r requirements.txt'
+                sh 'pip install -U -r requirements.txt --break-system-packages'
                 sh 'cargo install pigment64'
+                sh 'cargo install crunch64-cli'
                 sh './configure'
             }
         }

README.md

@@ -3,7 +3,6 @@
 [![Release](https://img.shields.io/github/v/release/star-haven/papermario-dx)][releases]
 [![Download](https://img.shields.io/github/downloads/star-haven/papermario-dx/total)][download]
 ![Build Status](https://img.shields.io/github/actions/workflow/status/star-haven/papermario-dx/build.yaml)
-[![Discord Channel][discord-badge]][discord]
 
 This is a fork of the [Paper Mario decompilation][papermario-repo] which provides a flexible, easy-to-use base for creating romhacks.
 

decomp.yaml

@@ -0,0 +1,41 @@
+name: Paper Mario
+github: https://github.com/pmret/papermario
+platform: n64
+versions:
+- name: us
+  fullname: US
+  paths:
+    baserom: "ver/us/baserom.z64"
+    build: "ver/us/build/papermario.z64"
+    asm: "ver/us/asm"
+    nonmatchings: "ver/us/asm/nonmatchings"
+    map: "ver/us/build/papermario.map"
+    elf: "ver/us/build/papermario.elf"
+- name: pal
+  fullname: PAL
+  paths:
+    baserom: "ver/pal/baserom.z64"
+    build: "ver/pal/build/papermario.z64"
+    asm: "ver/pal/asm"
+    nonmatchings: "ver/pal/asm/nonmatchings"
+    map: "ver/pal/build/papermario.map"
+    elf: "ver/pal/build/papermario.elf"
+- name: ique
+  fullname: iQue
+  paths:
+    baserom: "ver/ique/baserom.z64"
+    build: "ver/ique/build/papermario.z64"
+    asm: "ver/ique/asm"
+    nonmatchings: "ver/ique/asm/nonmatchings"
+    map: "ver/ique/build/papermario.map"
+    elf: "ver/ique/build/papermario.elf"
+- name: jp
+  fullname: JP
+  paths:
+    baserom: "ver/jp/baserom.z64"
+    build: "ver/jp/build/papermario.z64"
+    asm: "ver/jp/asm"
+    nonmatchings: "ver/jp/asm/nonmatchings"
+    map: "ver/jp/build/papermario.map"
+    elf: "ver/jp/build/papermario.elf"
+tools:

include/PR/os_message.h

@@ -76,7 +76,11 @@ typedef struct OSMesgQueue_s {
 
 /* Events */
 #ifdef _FINALROM
-#define OS_NUM_EVENTS           15
+#  ifndef BBPLAYER
+#    define OS_NUM_EVENTS           15
+#  else
+#    define OS_NUM_EVENTS           32
+#  endif
 #else
 #define OS_NUM_EVENTS           23
 #endif

include/PR/osint.h

@@ -41,7 +41,6 @@ extern u32 __osShutdown;
 
 extern __OSEventState __osEventStateTab[OS_NUM_EVENTS];
 
-
 //not sure if this should be here
 extern s32 osViClock;
 extern void __osTimerServicesInit(void);

include/camera.h

@@ -1,17 +1,19 @@
 #ifndef _CAMERA_H_
 #define _CAMERA_H_
 
-extern f32 D_8009A5EC;
-
-void update_camera_mode_0(Camera*);
-void update_camera_mode_1(Camera*);
-void update_camera_mode_2(Camera*);
-void update_camera_mode_4(Camera*);
-void update_camera_mode_5(Camera*);
-void update_camera_mode_6(Camera*);
-void create_camera_leadplayer_matrix(Camera*);
+extern f32 CamLengthScale;
 
+void update_camera_minimal(Camera*);
+void update_camera_no_interp(Camera*);
+void update_camera_interp_pos(Camera*);
 void update_camera_zone_interp(Camera* camera);
+
+void update_camera_unused_confined(Camera*);
+void update_camera_unused_leading(Camera*);
+void update_camera_unused_radial(Camera*);
+void update_camera_unused_ahead(Camera*);
+
+void create_camera_leadplayer_matrix(Camera*);
 Camera* initialize_next_camera(CameraInitData* data);
 
 #endif

include/common.h

@@ -11,12 +11,8 @@
 #include "enums.h"
 #include "evt.h"
 #include "messages.h"
-#include "battle/formation_names.h"
+#include "battle/battle_names.h"
 #include "battle/stage_names.h"
 #include "battle/actor_types.h"
 
-#ifdef PERMUTER
-extern int TEXEL0, TEXEL1, PRIMITIVE, PRIMITIVE_ALPHA;
-#endif
-
 #endif