merge upstream

Author: farisawan2000

.github/workflows/pr.yml

@@ -22,14 +22,8 @@ jobs:
       run: sudo dpkg -i qemu-irix-2.11.0-2169-g32ab296eef_amd64.deb
     - name: Install Dependencies
       run: sudo apt update && sudo apt install -y binutils-mips-linux-gnu gcc git gcc-mips-linux-gnu
-    - name: Install Python 3.10
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.10'
-    - name: Install Python Dependencies
-      run: pip3 install gitpython splat64[mips] spimdisasm pyelftools
-    - name: Install Splat Dependencies
-      run: pip3 install -r splat/requirements.txt
+    - name: Install uv
+        uses: astral-sh/setup-uv@v6
     - name: More Dependencies
       uses: actions/checkout@v2
       with:
@@ -49,4 +43,4 @@ jobs:
     - name: Prepare Kirby 64 for building
       run: make setup
     - name: Build Kirby 64
-      run: ./rebuild.sh
+      run: make -j$(nproc)

.github/workflows/push.yml

@@ -20,12 +20,8 @@ jobs:
       run: sudo dpkg -i qemu-irix-2.11.0-2169-g32ab296eef_amd64.deb
     - name: Install Dependencies
       run: sudo apt update && sudo apt install -y binutils-mips-linux-gnu gcc git gcc-mips-linux-gnu
-    - name: Install Python 3.10
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.10'
-    - name: Install Python Dependencies
-      run: pip3 install gitpython
+    - name: Install uv
+        uses: astral-sh/setup-uv@v6
     - name: More dependencies
       uses: actions/checkout@v2
       with:
@@ -45,4 +41,4 @@ jobs:
     - name: Prepare Kirby 64 for building
       run: make setup
     - name: Build Kirby 64
-      run: make -j4 VERBOSE=0
+      run: make -j$(nproc) VERBOSE=0

README.md

@@ -4,6 +4,8 @@ This repository contains a work-in-progress decompilation effort for Kirby 64.
 
 You will need an original copy of the ROM to proceed.
 
+# Development is done on the `splat` branch. Please point all PR's to that branch.
+
 ## Exclusive Dependencies
  - Works best on the latest version of Ubuntu, Fedora, or Arch. PR's to support other Linux versions are welcome, but as of current those three are the only ones we can reliably test.
  - Python 3.10 with `pip`