Splat merge (#470)

* First pass

* Fix n64crc and add submodules properly

* Fix other versions

* Match func_8005B818 for v80 code.

* Formatting

* Fix build for JPN in last commit. Still broken in post v77 roms though.

* Fix builds for other versions.

* Match load_menu_text for other versions.

* Fix progress script

* update m2c

* Modify asset tools to remove the LD script code.

* Fix asm file macro inclue

* Get a working splat version for us_1.0 to build from the assets tool.

* update asm differ

* Update tools again

* Fix the makefile to only compile assets when requested. This will build all versions successfully, and compile assets for us_1.0 when requested.

* First round of suggestions

* Small cleanup

* Fix the gcc_generate.py path.

* Make entrypointThreadStack

* Small addition to the last commit

* "Fix" score script. Still need to fix the score values themselves, but at least it runs and is kind of close.

* Much closer matching score script

* Fix the splat version due to a breaking change in 0.33.0 for this repo for now.

* Fix the main function name

* Add gitignore entries

* Fix the padding problem to be handled by objcopy instead of a binary pad from splat.

* Update the README and change dependencies to setup.

* Have a hasm header that can be tweaked.

* Still calculate the checksum on no_verify builds or they won't work.

* Add support for boot_custom.bin

* Fix custom boot ld code.

* Fix score script

* Fix gcc building.

* Update m2c

* Fix warning, stop ignoring mod assets, and add some handy make rules.

* Uggh, serves me right for not testing.

* First stab at modifiable entrypoint.

* Fix typo, and small README change

* Stop n64crd from defaulting to returning 6105, so we can properly fail if the CIC checksum fails. Also, fix the

* Extract custom boot script

* Update automated scripts.

* Woops, fixed the MAXCONTROLLERS thing now.

* Add the method for building binutils back. Sorry!

* Only use -m32 when the longbit says we're on a 64 bit platform.

* Woops....

* Hopefully fix arm detection for raspi ido downloads.

.github/workflows/UpdateScore.yml

@@ -17,36 +17,27 @@ jobs:
       - name: Install packages
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential pkg-config git python3 libssl-dev wget binutils-mips-linux-gnu
+          sudo apt-get install -y build-essential libssl-dev pkg-config git python3 python3-pip binutils-mips-linux-gnu python3-venv libpcre2-dev libpcre2-8-0
 
       - name: Get ROM
-        run: wget -q -O baseroms/dkr.z64 ${{secrets.ROMURL}}
+        run: wget -q -O baseroms/baserom.us.v77.z64 ${{secrets.ROMURL}}
 
       - name: Verify ROM
-        run: if [[ $(echo "0cb115d8716dbbc2922fda38e533b9fe63bb9670 baseroms/dkr.z64" | sha1sum -c --quiet -) = "" ]]; then echo "Signature OK"; else echo "Failed"; exit 1; fi
+        run: if [[ $(echo "0cb115d8716dbbc2922fda38e533b9fe63bb9670 baseroms/baserom.us.v77.z64" | sha1sum -c --quiet -) = "" ]]; then echo "Signature OK"; else echo "Failed"; exit 1; fi
 
-      - name: Download Recomp
+      - name: Make Setup
         run: |
-          wget -q -O ido-static-recomp.tar.gz https://github.com/decompals/ido-static-recomp/releases/download/v1.2/ido-5.3-recomp-linux.tar.gz
-          mkdir -p tools/ido-static-recomp/build5.3/out
-          tar -xvzf ido-static-recomp.tar.gz -C tools/ido-static-recomp/build5.3/out
+          make setup -j4
 
-      - name: Build Tools
+      - name: Make Extract
         run: |
-          cd tools
-          make -j4
-          cd ..
-
-      - name: Extract Assets
-        run: |
-          ./extract.sh
-          python3 tools/python/check_if_need_to_extract.py us_1.0
+          make extract
 
       - name: Build ROM
         run: make -j4
 
       - name: Verify Build
-        run: if [[ $(sha1sum -c --quiet sha1/dkr.us_1.0.sha1) = "" ]]; then echo "Signature OK"; else echo "Failed"; exit 1; fi
+        run: if [[ $(sha1sum -c --quiet ver/verification/dkr.us.v77.sha1) = "" ]]; then echo "Signature OK"; else echo "Failed"; exit 1; fi
 
       - name: Update Score
         run: ./update-score.sh

.github/workflows/VerifyBuild.yml

@@ -21,33 +21,25 @@ jobs:
       - name: Install packages
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential pkg-config git python3 libssl-dev wget binutils-mips-linux-gnu
+          sudo apt-get install -y build-essential libssl-dev pkg-config git python3 python3-pip binutils-mips-linux-gnu python3-venv libpcre2-dev libpcre2-8-0
 
       - name: Get ROM
-        run: wget -q -O baseroms/dkr.z64 ${{secrets.ROMURL}}
+        run: wget -q -O baseroms/baserom.us.v77.z64 ${{secrets.ROMURL}}
 
       - name: Verify ROM
-        run: if [[ $(echo "0cb115d8716dbbc2922fda38e533b9fe63bb9670 baseroms/dkr.z64" | sha1sum -c --quiet -) = "" ]]; then echo "Signature OK"; else echo "Failed"; exit 1; fi
+        run: if [[ $(echo "0cb115d8716dbbc2922fda38e533b9fe63bb9670 baseroms/baserom.us.v77.z64" | sha1sum -c --quiet -) = "" ]]; then echo "Signature OK"; else echo "Failed"; exit 1; fi
 
-      - name: Download Recomp
-        run: |
-          wget -q -O ido-static-recomp.tar.gz https://github.com/decompals/ido-static-recomp/releases/download/v1.2/ido-5.3-recomp-linux.tar.gz
-          mkdir -p tools/ido-static-recomp/build5.3/out
-          tar -xvzf ido-static-recomp.tar.gz -C tools/ido-static-recomp/build5.3/out
+      - name: Make Setup
+        run: make setup -j4
 
-      - name: Build Tools
-        run: |
-          cd tools
-          make -j4
-          cd ..
+      - name: Make Extract
+        run: make extract
 
       - name: Extract Assets
-        run: |
-          ./extract.sh
-          python3 tools/python/check_if_need_to_extract.py us_1.0
+        run: make assets -j4
 
       - name: Build ROM
         run: make -j4
 
       - name: Verify Build
-        run: if [[ $(sha1sum -c --quiet sha1/dkr.us_1.0.sha1) = "" ]]; then echo "Signature OK"; else echo "Failed"; exit 1; fi
+        run: if [[ $(sha1sum -c --quiet ver/verification/dkr.us.v77.sha1) = "" ]]; then echo "Signature OK"; else echo "Failed"; exit 1; fi

.github/workflows/VerifyNonEquivalent.yml

@@ -21,30 +21,22 @@ jobs:
       - name: Install packages
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential pkg-config git python3 libssl-dev wget binutils-mips-linux-gnu
+          sudo apt-get install -y build-essential libssl-dev pkg-config git python3 python3-pip binutils-mips-linux-gnu python3-venv libpcre2-dev libpcre2-8-0
 
       - name: Get ROM
-        run: wget -q -O baseroms/dkr.z64 ${{secrets.ROMURL}}
+        run: wget -q -O baseroms/baserom.us.v77.z64 ${{secrets.ROMURL}}
 
       - name: Verify ROM
-        run: if [[ $(echo "0cb115d8716dbbc2922fda38e533b9fe63bb9670 baseroms/dkr.z64" | sha1sum -c --quiet -) = "" ]]; then echo "Signature OK"; else echo "Failed"; exit 1; fi
+        run: if [[ $(echo "0cb115d8716dbbc2922fda38e533b9fe63bb9670 baseroms/baserom.us.v77.z64" | sha1sum -c --quiet -) = "" ]]; then echo "Signature OK"; else echo "Failed"; exit 1; fi
 
-      - name: Download Recomp
-        run: |
-          wget -q -O ido-static-recomp.tar.gz https://github.com/decompals/ido-static-recomp/releases/download/v1.2/ido-5.3-recomp-linux.tar.gz
-          mkdir -p tools/ido-static-recomp/build5.3/out
-          tar -xvzf ido-static-recomp.tar.gz -C tools/ido-static-recomp/build5.3/out
+      - name: Make Setup
+        run: make setup -j4
 
-      - name: Build Tools
-        run: |
-          cd tools
-          make -j4
-          cd ..
+      - name: Make Extract
+        run: make extract
 
       - name: Extract Assets
-        run: |
-          ./extract.sh
-          python3 tools/python/check_if_need_to_extract.py us_1.0
+        run: make assets -j4
 
       - name: Verify NON_EQUIVALENT
         run: make -j4 NON_EQUIVALENT=1

.github/workflows/VerifyNonMatching.yml

@@ -21,30 +21,22 @@ jobs:
       - name: Install packages
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential pkg-config git python3 libssl-dev wget binutils-mips-linux-gnu
+          sudo apt-get install -y build-essential libssl-dev pkg-config git python3 python3-pip binutils-mips-linux-gnu python3-venv libpcre2-dev libpcre2-8-0
 
       - name: Get ROM
-        run: wget -q -O baseroms/dkr.z64 ${{secrets.ROMURL}}
+        run: wget -q -O baseroms/baserom.us.v77.z64 ${{secrets.ROMURL}}
 
       - name: Verify ROM
-        run: if [[ $(echo "0cb115d8716dbbc2922fda38e533b9fe63bb9670 baseroms/dkr.z64" | sha1sum -c --quiet -) = "" ]]; then echo "Signature OK"; else echo "Failed"; exit 1; fi
+        run: if [[ $(echo "0cb115d8716dbbc2922fda38e533b9fe63bb9670 baseroms/baserom.us.v77.z64" | sha1sum -c --quiet -) = "" ]]; then echo "Signature OK"; else echo "Failed"; exit 1; fi
 
-      - name: Download Recomp
-        run: |
-          wget -q -O ido-static-recomp.tar.gz https://github.com/decompals/ido-static-recomp/releases/download/v1.2/ido-5.3-recomp-linux.tar.gz
-          mkdir -p tools/ido-static-recomp/build5.3/out
-          tar -xvzf ido-static-recomp.tar.gz -C tools/ido-static-recomp/build5.3/out
+      - name: Make Setup
+        run: make setup -j4
 
-      - name: Build Tools
-        run: |
-          cd tools
-          make -j4
-          cd ..
+      - name: Make Extract
+        run: make extract
 
       - name: Extract Assets
-        run: |
-          ./extract.sh
-          python3 tools/python/check_if_need_to_extract.py us_1.0
+        run: make assets -j4
 
       - name: Verify NON_MATCHING
         run: make -j4 NON_MATCHING=1