Update splat to 0.24.4 (#1112)

Still work in progress. I removed splat as a submodule and started using it as a pip package instead. Everything is matching but the memory card icons part in both DRA and SEL. I still have no idea what the issue is. Once this PR is good to be merged, we can get rid of the splat fork too.
2024-11-22 20:49:50 +00:00 · 2024-06-12 18:50:32 +01:00 · 2024-06-12 18:50:32 +01:00 · 8abb09e3ff
commit 8abb09e3ff
parent 4ae980706e
42 changed files with 1736 additions and 1660 deletions
--- a/.github/workflows/validate-and-report.yml
+++ b/.github/workflows/validate-and-report.yml
@ -43,6 +43,8 @@ jobs:
        with:
          ref: ${{ github.ref }}
          submodules: false
+      - name: Install tools requirements
+        run: make update-dependencies
      - name: Get dependencies
        uses: actions/cache@v4
        id: get-dependencies
@ -115,6 +117,8 @@ jobs:
        uses: actions/checkout@v4
        with:
          submodules: false
+      - name: Install requirements
+        run: make update-dependencies
      - name: Get dependencies
        uses: actions/cache@v4
        with:
@ -155,6 +159,8 @@ jobs:
        uses: actions/checkout@v4
        with:
          submodules: false
+      - name: Install requirements
+        run: make update-dependencies
      - name: Get dependencies
        uses: actions/cache@v4
        with:
--- a/.gitmodules
+++ b/.gitmodules
@ -1,6 +1,3 @@
-[submodule "tools/n64splat"]
-	path = tools/n64splat
-	url = https://github.com/Xeeynamo/splat.git
 [submodule "tools/asm-differ"]
 	path = tools/asm-differ
 	url = https://github.com/simonlindholm/asm-differ.git
--- a/10
+++ b/10
@ -51,9 +51,7 @@ MAIN_TARGET     := $(BUILD_DIR)/$(MAIN)

 # Tooling
 PYTHON          := python3
-SPLAT_DIR       := $(TOOLS_DIR)/n64splat
-SPLAT_APP       := $(SPLAT_DIR)/split.py
-SPLAT           := $(PYTHON) $(SPLAT_APP)
+SPLAT           := splat split
 ASMDIFFER_DIR   := $(TOOLS_DIR)/asm-differ
 ASMDIFFER_APP   := $(ASMDIFFER_DIR)/diff.py
 M2CTX_APP       := $(TOOLS_DIR)/m2ctx.py
@ -402,7 +400,7 @@ extract_disk_psp%:
 	mkdir -p disks/psp$*
 	7z x -y disks/sotn.psp$*.iso -odisks/psp$*/

-update-dependencies: $(SPLAT_APP) $(ASMDIFFER_APP) $(M2CTX_APP) $(M2C_APP) $(MASPSX_APP) $(SATURN_SPLITTER_APP) $(GO)
+update-dependencies: $(ASMDIFFER_APP) $(M2CTX_APP) $(M2C_APP) $(MASPSX_APP) $(SATURN_SPLITTER_APP) $(GO)
 	cd $(SATURN_SPLITTER_DIR)/rust-dis && cargo build --release
 	cd $(SATURN_SPLITTER_DIR)/adpcm-extract && cargo build --release
 	pip3 install -r $(TOOLS_DIR)/requirements-python.txt
@ -417,10 +415,6 @@ bin/%: bin/%.tar.gz
 	touch $@
 bin/%.tar.gz: bin/%.tar.gz.sha256
 	wget -O $@ https://github.com/Xeeynamo/sotn-decomp/releases/download/cc1-psx-26/$*.tar.gz
-$(SPLAT_APP):
-	git submodule init $(SPLAT_DIR)
-	git submodule update $(SPLAT_DIR)
-	pip3 install -r $(TOOLS_DIR)/requirements-python.txt
 $(ASMDIFFER_APP):
 	git submodule init $(ASMDIFFER_DIR)
 	git submodule update $(ASMDIFFER_DIR)
--- a/config/splat.hd.dra.yaml
+++ b/config/splat.hd.dra.yaml
@ -23,11 +23,13 @@ options:
    - ".rodata"
    - ".text"
    - ".bss"
+    - ".sbss"
 segments:
  - name: dra
    type: code
    start: 0x00000000
    vram:  0x800A0000
+    align: 4
    subalign: 4
    subsegments:
      - [0x0, .data, dra_header]
--- a/config/splat.hd.tt_000.yaml
+++ b/config/splat.hd.tt_000.yaml
@ -29,6 +29,7 @@ segments:
    type: code
    start: 0x00000000
    vram:  0x80170000
+    align: 4
    subalign: 4
    subsegments:
      - [0x0, .data, 10E8]
--- a/config/splat.us.dra.yaml
+++ b/config/splat.us.dra.yaml
@ -23,11 +23,13 @@ options:
    - ".rodata"
    - ".text"
    - ".bss"
+    - ".sbss"
 segments:
  - name: dra
    type: code
    start: 0x00000000
    vram:  0x800A0000
+    align: 4
    subalign: 4
    subsegments:
      - [0x0, .data, dra_header]
--- a/config/splat.us.main.yaml
+++ b/config/splat.us.main.yaml
@ -28,6 +28,7 @@ segments:
    type: code
    start: 0x00000800
    vram:  0x80010000
+    align: 4
    subalign: 4
    subsegments:
      - [0x800, .rodata, main]
--- a/config/splat.us.ric.yaml
+++ b/config/splat.us.ric.yaml
@ -24,11 +24,13 @@ options:
    - ".rodata"
    - ".text"
    - ".bss"
+    - ".sbss"
 segments:
  - name: ric
    type: code
    start: 0x00000000
    vram:  0x8013C000
+    align: 4
    subalign: 4
    subsegments:
      - [0x0, data]
--- a/config/splat.us.stcen.yaml
+++ b/config/splat.us.stcen.yaml
@ -24,12 +24,14 @@ options:
    - ".rodata"
    - ".text"
    - ".bss"
+    - ".sbss"
 segments:
  - name: stcen
    type: code
    start: 0x00000000
    vram:  0x80180000
-    subalign: 2
+    align: 4
+    subalign: 4
    subsegments:
      - [0x0, data]
      - [0x7E4, .data, collision]
--- a/config/splat.us.stdre.yaml
+++ b/config/splat.us.stdre.yaml
@ -24,11 +24,13 @@ options:
    - ".rodata"
    - ".text"
    - ".bss"
+    - ".sbss"
 segments:
  - name: stdre
    type: code
    start: 0x00000000
    vram:  0x80180000
+    align: 4
    subalign: 4
    subsegments:
      - [0x0, data]
--- a/config/splat.us.stmad.yaml
+++ b/config/splat.us.stmad.yaml
@ -26,12 +26,14 @@ options:
    - ".rodata"
    - ".text"
    - ".bss"
+    - ".sbss"
 segments:
  - name: stmad
    type: code
    start: 0x00000000
    vram:  0x80180000
-    subalign: 2
+    align: 4
+    subalign: 4
    subsegments:
      - [0x0, data]
      - [0x6DC, .data, collision]
--- a/config/splat.us.stno3.yaml
+++ b/config/splat.us.stno3.yaml
@ -24,11 +24,13 @@ options:
    - ".rodata"
    - ".text"
    - ".bss"
+    - ".sbss"
 segments:
  - name: stno3
    type: code
    start: 0x00000000
    vram:  0x80180000
+    align: 4
    subalign: 4
    subsegments:
      - [0x0, data]
--- a/config/splat.us.stnp3.yaml
+++ b/config/splat.us.stnp3.yaml
@ -24,11 +24,13 @@ options:
    - ".rodata"
    - ".text"
    - ".bss"
+    - ".sbss"
 segments:
  - name: stnp3
    type: code
    start: 0x00000000
    vram:  0x80180000
+    align: 4
    subalign: 4
    subsegments:
      - [0x0, data]
--- a/config/splat.us.stnz0.yaml
+++ b/config/splat.us.stnz0.yaml
@ -24,11 +24,13 @@ options:
    - ".rodata"
    - ".text"
    - ".bss"
+    - ".sbss"
 segments:
  - name: stnz0
    type: code
    start: 0x00000000
    vram:  0x80180000
+    align: 4
    subalign: 4
    subsegments:
      - [0x0, data]
--- a/config/splat.us.strwrp.yaml
+++ b/config/splat.us.strwrp.yaml
@ -24,11 +24,13 @@ options:
    - ".rodata"
    - ".text"
    - ".bss"
+    - ".sbss"
 segments:
  - name: strwrp
    type: code
    start: 0x00000000
    vram:  0x80180000
+    align: 4
    subalign: 4
    subsegments:
      - [0x0, data]
--- a/config/splat.us.stsel.yaml
+++ b/config/splat.us.stsel.yaml
@ -24,11 +24,13 @@ options:
    - ".rodata"
    - ".text"
    - ".bss"
+    - ".sbss"
 segments:
  - name: stsel
    type: code
    start: 0x00000000
    vram:  0x80180000
+    align: 4
    subalign: 4
    subsegments:
      - [0x0, .data, 2C048]
--- a/config/splat.us.stst0.yaml
+++ b/config/splat.us.stst0.yaml
@ -23,12 +23,14 @@ options:
    - ".data"
    - ".rodata"
    - ".text"
+    - ".bss"
    - ".sbss"
 segments:
  - name: stst0
    type: code
    start: 0x00000000
    vram:  0x80180000
+    align: 4
    subalign: 4
    subsegments:
      - [0x0, data]
--- a/config/splat.us.stwrp.yaml
+++ b/config/splat.us.stwrp.yaml
@ -24,11 +24,13 @@ options:
    - ".rodata"
    - ".text"
    - ".bss"
+    - ".sbss"
 segments:
  - name: stwrp
    type: code
    start: 0x00000000
    vram:  0x80180000
+    align: 4
    subalign: 4
    subsegments:
      - [0x0, .data, header]
--- a/config/splat.us.tt_000.yaml
+++ b/config/splat.us.tt_000.yaml
@ -29,6 +29,7 @@ segments:
    type: code
    start: 0x00000000
    vram:  0x80170000
+    align: 4
    subalign: 4
    subsegments:
      - [0x0, .data, 10E8]
--- a/config/splat.us.weapon.yaml
+++ b/config/splat.us.weapon.yaml
@ -35,6 +35,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x04000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x04040, animset, w_000_1]
@ -53,6 +54,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x0B000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x0B040, animset, w_001_1]
@ -71,6 +73,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x12000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x12040, animset, w_002_1]
@ -88,6 +91,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x19000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x19040, animset, w_003_1]
@ -105,6 +109,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x20000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x20040, animset, w_004_1]
@ -122,6 +127,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x27000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x27040, animset, w_005_1]
@ -139,6 +145,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x2E000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x2E040, animset, w_006_1]
@ -157,6 +164,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x35000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x35040, animset, w_007_1]
@ -174,6 +182,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x3C000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x3C040, animset, w_008_1]
@ -192,6 +201,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x43000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x43040, animset, w_009_1]
@ -210,6 +220,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x4A000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x4A040, animset, w_010_1]
@ -228,6 +239,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x51000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x51040, animset, w_011_1]
@ -246,6 +258,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x58000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x58040, animset, w_012_1]
@ -263,6 +276,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x5F000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x5F040, animset, w_013_1]
@ -281,6 +295,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x66000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x66040, animset, w_014_1]
@ -298,6 +313,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x6D000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x6D040, animset, w_015_1]
@ -315,6 +331,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x74000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x74040, animset, w_016_1]
@ -333,6 +350,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x7B000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x7B040, animset, w_017_1]
@ -350,6 +368,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x82000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x82040, animset, w_018_1]
@ -367,6 +386,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x89000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x89040, animset, w_019_1]
@ -384,6 +404,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x90000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x90040, animset, w_020_1]
@ -402,6 +423,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x97000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x97040, animset, w_021_1]
@ -420,6 +442,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x9E000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x9E040, animset, w_022_1]
@ -437,6 +460,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0xA5000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0xA5040, animset, w_023_1]
@ -455,6 +479,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0xAC000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0xAC040, animset, w_024_1]
@ -473,6 +498,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0xB3000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0xB3040, animset, w_025_1]
@ -491,6 +517,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0xBA000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0xBA040, animset, w_026_1]
@ -509,6 +536,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0xC1000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0xC1040, animset, w_027_1]
@ -527,6 +555,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0xC8000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0xC8040, animset, w_028_1]
@ -545,6 +574,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0xCF000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0xCF040, animset, w_029_1]
@ -563,6 +593,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0xD6000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0xD6040, animset, w_030_1]
@ -581,6 +612,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0xDD000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0xDD040, animset, w_031_1]
@ -598,6 +630,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0xE4000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0xE4040, animset, w_032_1]
@ -615,6 +648,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0xEB000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0xEB040, animset, w_033_1]
@ -632,6 +666,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0xF2000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0xF2040, animset, w_034_1]
@ -649,6 +684,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0xF9000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0xF9040, animset, w_035_1]
@ -666,6 +702,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x100000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x100040, animset, w_036_1]
@ -683,6 +720,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x107000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x107040, animset, w_037_1]
@ -700,6 +738,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x10E000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x10E040, animset, w_038_1]
@ -717,6 +756,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x115000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x115040, animset, w_039_1]
@ -734,6 +774,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x11C000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x11C040, animset, w_040_1]
@ -751,6 +792,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x123000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x123040, animset, w_041_1]
@ -769,6 +811,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x12A000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x12A040, animset, w_042_1]
@ -786,6 +829,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x131000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x131040, animset, w_043_1]
@ -803,6 +847,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x138000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x138040, animset, w_044_1]
@ -821,6 +866,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x13F000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x13F040, animset, w_045_1]
@ -838,6 +884,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x146000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x146040, animset, w_046_1]
@ -855,6 +902,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x14D000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x14D040, animset, w_047_1]
@ -873,6 +921,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x154000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x154040, animset, w_048_1]
@ -890,6 +939,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x15B000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x15B040, animset, w_049_1]
@ -907,6 +957,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x162000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x162040, animset, w_050_1]
@ -924,6 +975,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x169000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x169040, animset, w_051_1]
@ -941,6 +993,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x170000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x170040, animset, w_052_1]
@ -959,6 +1012,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x177000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x177040, animset, w_053_1]
@ -977,6 +1031,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x17E000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x17E040, animset, w_054_1]
@ -994,6 +1049,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x185000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x185040, animset, w_055_1]
@ -1011,6 +1067,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x18C000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x18C040, animset, w_056_1]
@ -1028,6 +1085,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x193000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x193040, animset, w_057_1]
@ -1045,6 +1103,7 @@ segments:
    exclusive_ram_id: weapon
    start: 0x19A000
    vram: 0x8017A000
+    align: 4
    subalign: 4
    subsegments:
      - [0x19A040, animset, w_058_1]
--- a/config/symbols.hd.dra.txt
+++ b/config/symbols.hd.dra.txt
@ -558,7 +558,6 @@ D_8013B690 = 0x8013B25C;
 D_8013B694 = 0x8013B260;
 g_volumeR = 0x8013B264;
 D_8013B69C = 0x8013B268;
-D_8013B6A0 = 0x8013B26C
 D_8013B6A0 = 0x8013B26C;
 g_imgUnk8013C200 = 0x8013C200;
 g_imgUnk8013C270 = 0x8013C270;
--- a/config/symbols.us.txt
+++ b/config/symbols.us.txt
@ -628,7 +628,6 @@ CD_TestParmNum = 0x80032D4C;
 CD_ReadCallbackFunc = 0x80032DB8;
 _snd_seq_tick_env = 0x80032EF0;
 _spu_trans_mode =  0x8003309C;
-_spu_trans_mode = 0x8003309C;
 _spu_rev_flag = 0x800330A0;
 _spu_rev_reserve_wa  =  0x800330A4;
 _spu_rev_offsetaddr = 0x800330A8;
--- a/config/symbols.us.weapon.txt.in
+++ b/config/symbols.us.weapon.txt.in
--- a/src/st/wrp/6FD0.c
+++ b/src/st/wrp/6FD0.c
@ -14,8 +14,8 @@ void func_8018CAB0(void);
 void func_801916C4(u16);
 void BottomCornerText(u8*, u8);

-u32 D_80181420[];
-u32 D_80181764[];
+extern u32 D_80181420[];
+extern u32 D_80181764[];
 void* D_801801B8[] = {
    /* 0x1B8 */ (void*)0x00000000,
    /* 0x1BC */ (void*)0x00000000,
@ -58,13 +58,13 @@ void* g_EntityGfxs[] = {
 // *** Layout definition end ***

 // *** Layout entity definition start ***
-LayoutEntity D_80181228[];
-LayoutEntity D_80181250[];
-LayoutEntity D_801812A0[];
-LayoutEntity D_801812C8[];
-LayoutEntity D_80181278[];
-LayoutEntity D_801812F0[];
-LayoutEntity D_80181304[];
+extern LayoutEntity D_80181228[];
+extern LayoutEntity D_80181250[];
+extern LayoutEntity D_801812A0[];
+extern LayoutEntity D_801812C8[];
+extern LayoutEntity D_80181278[];
+extern LayoutEntity D_801812F0[];
+extern LayoutEntity D_80181304[];
 LayoutEntity* g_pStObjLayoutHorizontal[] = {
    /* 0x23C */ D_801812F0,
    /* 0x240 */ D_80181228,
@ -121,13 +121,13 @@ LayoutEntity* g_pStObjLayoutHorizontal[] = {
    /* 0x30C */ D_80181304,
 };

-LayoutEntity D_80181324[];
-LayoutEntity D_8018134C[];
-LayoutEntity D_80181374[];
-LayoutEntity D_8018139C[];
-LayoutEntity D_801813C4[];
-LayoutEntity D_801813EC[];
-LayoutEntity D_80181400[];
+extern LayoutEntity D_80181324[];
+extern LayoutEntity D_8018134C[];
+extern LayoutEntity D_80181374[];
+extern LayoutEntity D_8018139C[];
+extern LayoutEntity D_801813C4[];
+extern LayoutEntity D_801813EC[];
+extern LayoutEntity D_80181400[];
 LayoutEntity* g_pStObjLayoutVertical[] = {
    /* 310 */ D_801813EC,
    /* 314 */ D_80181324,
--- a/tools/n64splat
+++ b/tools/n64splat
@ -1 +0,0 @@
-Subproject commit 828c34950bc599805d26968dc0e675428074982d
--- a/tools/requirements-python.txt
+++ b/tools/requirements-python.txt
@ -2,21 +2,16 @@ pre-commit
 black
 pycparser
 watchdog
-tqdm
-intervaltree
-colorama
 python-Levenshtein
 cxxfilt
 mapfile-parser==2.1.4
 tabulate
 requests
 graphviz
-splat64>=0.24.1,<0.25.0
+splat64>=0.24.4,<0.25.0
 crunch64
-spimdisasm>=1.25.0
-rabbitizer>=1.10.0
+spimdisasm>=1.26.0
+rabbitizer>=1.11.0
 n64img==0.3.3
-PyYAML
-pylibyaml
 pygfxd
 pillow
--- a/tools/splat_ext/animset.py
+++ b/tools/splat_ext/animset.py
@ -8,10 +8,10 @@ import sys
 from typing import Optional
 from pathlib import Path

-sys.path.append(f"{os.getcwd()}/tools/n64splat")
+
 sys.path.append(f"{os.getcwd()}/tools/splat_ext")
-from util import options
-from segtypes.n64.segment import N64Segment
+from splat.util import options
+from splat.segtypes.n64.segment import N64Segment
 import utils


--- a/tools/splat_ext/assets.py
+++ b/tools/splat_ext/assets.py
@ -19,10 +19,10 @@ import sys
 from typing import Optional
 from pathlib import Path

-sys.path.append(f"{os.getcwd()}/tools/n64splat")
+
 sys.path.append(f"{os.getcwd()}/tools/splat_ext")
-from util import options, log
-from segtypes.n64.segment import N64Segment
+from splat.util import options, log
+from splat.segtypes.n64.segment import N64Segment
 import utils


--- a/tools/splat_ext/ci4.py
+++ b/tools/splat_ext/ci4.py
@ -1,4 +1,4 @@
-from segtypes.n64.ci4 import N64SegCi4
+from splat.segtypes.n64.ci4 import N64SegCi4


 class PSXSegCi4(N64SegCi4):
--- a/tools/splat_ext/cmp.py
+++ b/tools/splat_ext/cmp.py
@ -1,7 +1,7 @@
 from pathlib import Path
 from typing import Optional
-from segtypes.n64.segment import N64Segment
-from util import options, log
+from splat.segtypes.n64.segment import N64Segment
+from splat.util import options, log


 class PSXSegCmp(N64Segment):
--- a/tools/splat_ext/grey4.py
+++ b/tools/splat_ext/grey4.py
@ -1,7 +1,7 @@
 import n64img.image
 from typing import List, Tuple

-from segtypes.n64.img import N64SegImg
+from splat.segtypes.n64.img import N64SegImg


 def generate_grey_palette() -> List[Tuple[int, int, int, int]]:
--- a/tools/splat_ext/i4.py
+++ b/tools/splat_ext/i4.py
@ -1,6 +1,6 @@
 import n64img.image

-from segtypes.n64.i4 import N64SegI4
+from splat.segtypes.n64.i4 import N64SegI4


 class PSXSegI4(N64SegI4):
--- a/tools/splat_ext/layers.py
+++ b/tools/splat_ext/layers.py
@ -7,11 +7,11 @@ import sys
 from typing import Optional
 from pathlib import Path

-sys.path.append(f"{os.getcwd()}/tools/n64splat")
+
 sys.path.append(f"{os.getcwd()}/tools/splat_ext")
-from util import options, log
-from segtypes.n64.segment import N64Segment
-from util.symbols import spim_context
+from splat.util import options, log
+from splat.segtypes.n64.segment import N64Segment
+from splat.util.symbols import spim_context
 import utils


--- a/tools/splat_ext/layoutobj.py
+++ b/tools/splat_ext/layoutobj.py
@ -6,10 +6,10 @@ import sys
 from typing import Optional
 from pathlib import Path

-sys.path.append(f"{os.getcwd()}/tools/n64splat")
+
 sys.path.append(f"{os.getcwd()}/tools/splat_ext")
-from util import options, log
-from segtypes.n64.segment import N64Segment
+from splat.util import options, log
+from splat.segtypes.n64.segment import N64Segment
 import utils

 item_size = 0xA  # sizeof(LayoutEntity)
--- a/tools/splat_ext/palette.py
+++ b/tools/splat_ext/palette.py
@ -1,7 +1,7 @@
 from itertools import zip_longest
 from math import ceil
 from typing import List, Tuple
-from segtypes.n64.palette import N64SegPalette
+from splat.segtypes.n64.palette import N64SegPalette


 # ABBBBBGG GGGRRRRR
--- a/tools/splat_ext/raw.py
+++ b/tools/splat_ext/raw.py
@ -1,7 +1,7 @@
-from util import options, log
-from segtypes.n64.i4 import N64SegI4
-from segtypes.n64.rgba16 import N64SegRgba16
-from segtypes.n64.segment import N64Segment
+from splat.util import options, log
+from splat.segtypes.n64.i4 import N64SegI4
+from splat.segtypes.n64.rgba16 import N64SegRgba16
+from splat.segtypes.n64.segment import N64Segment
 from typing import Optional
 from pathlib import Path

--- a/tools/splat_ext/rgba16.py
+++ b/tools/splat_ext/rgba16.py
@ -1,6 +1,6 @@
 import n64img.image

-from segtypes.n64.rgba16 import N64SegRgba16
+from splat.segtypes.n64.rgba16 import N64SegRgba16


 class PSXSegRgba16(N64SegRgba16):
--- a/tools/splat_ext/roomdef.py
+++ b/tools/splat_ext/roomdef.py
@ -6,10 +6,10 @@ import sys
 from typing import Optional
 from pathlib import Path

-sys.path.append(f"{os.getcwd()}/tools/n64splat")
+
 sys.path.append(f"{os.getcwd()}/tools/splat_ext")
-from util import options, log
-from segtypes.n64.segment import N64Segment
+from splat.util import options, log
+from splat.segtypes.n64.segment import N64Segment

 item_size = 0x8  # sizeof(RoomHeader)

--- a/tools/splat_ext/spritesheet.py
+++ b/tools/splat_ext/spritesheet.py
@ -11,10 +11,10 @@ from typing import Optional
 from pathlib import Path
 import n64img.image

-sys.path.append(f"{os.getcwd()}/tools/n64splat")
+
 sys.path.append(f"{os.getcwd()}/tools/splat_ext")
-from util import options, log
-from segtypes.n64.segment import N64Segment
+from splat.util import options, log
+from splat.segtypes.n64.segment import N64Segment
 import utils

 max_width = 256
--- a/tools/splat_ext/tiledef.py
+++ b/tools/splat_ext/tiledef.py
@ -8,11 +8,11 @@ import sys
 from typing import Optional
 from pathlib import Path

-sys.path.append(f"{os.getcwd()}/tools/n64splat")
+
 sys.path.append(f"{os.getcwd()}/tools/splat_ext")
-from util import options
-from segtypes.n64.segment import N64Segment
-from util.symbols import spim_context
+from splat.util import options
+from splat.segtypes.n64.segment import N64Segment
+from splat.util.symbols import spim_context
 import utils


--- a/tools/splat_ext/tilelayout.py
+++ b/tools/splat_ext/tilelayout.py
@ -1,6 +1,6 @@
 import os
 import sys
-from util import options
+from splat.util import options
 from typing import Optional
 from pathlib import Path

--- a/tools/splat_ext/utils.py
+++ b/tools/splat_ext/utils.py
@ -2,9 +2,8 @@ import ctypes
 import os
 import sys

-sys.path.append(f"{os.getcwd()}/tools/n64splat")
 sys.path.append(f"{os.getcwd()}/tools/splat_ext")
-from util import log
+from splat.util import log

 subchar81_dict = {
    0x44: 0x2E,  # '.'
				`@ -1 +0,0 @@`
				`Subproject commit 828c34950bc599805d26968dc0e675428074982d`