stuff

.vscode/settings.json

@@ -14,5 +14,6 @@
         "tools/gfxsotn/**": false,
     },
     "files.associations": {
+        "functions.h": "c"
     },
 }

Makefile

@@ -98,6 +98,8 @@ SPLAT           ?= $(TOOLS)/splat/split.py
 SPLAT_YAML      ?= $(TARGET).$(VERSION).yaml
 
 COMPTOOL		:= $(TOOLS)/comptool.py
+COMPTOOL_DIR	:= baserom
+MIO0			:= $(TOOLS)/mio0
 
 
 IINC := -Iinclude -Ibin/$(VERSION) -I.
@@ -218,7 +220,7 @@ endif
 
 decompress: $(BASEROM)
 	@echo "Decompressing ROM..."
-	@$(PYTHON) $(COMPTOOL) -d $(BASEROM) $(BASEROM_UNCOMPRESSED)
+	@$(PYTHON) $(COMPTOOL) -de $(COMPTOOL_DIR) -m $(MIO0) $(BASEROM) $(BASEROM_UNCOMPRESSED)
 
 extract:
 	$(RM) -r asm/$(VERSION) bin/$(VERSION)

include/global.h

@@ -1,7 +1,8 @@
 #ifndef GLOBAL_H
 #define GLOBAL_H
 
-#include "libultra/PR/ultratypes.h"
+#include "PR/ultratypes.h"
+#include "PR/mbi.h"
 #include "functions.h"
 #include "variables.h"
 #include "macros.h"

src/main/B99D0.c

@@ -1,10 +1,15 @@
-#include "common.h"
+#include "global.h"
+
+extern Gfx D_800D31B0[];
+extern Gfx* D_80137E64;
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B8DD0.s")
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B8E14.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B8F18.s")
+void func_800B8F18(void) {
+    gSPDisplayList(D_80137E64++, D_800D31B0);
+}
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B8F48.s")
 

tools/comptool.py

@@ -4,6 +4,7 @@ import os
 from subprocess import run
 import struct
 import argparse
+import sys
 
 def int32(x):
     return x & 0xFFFFFFFF
@@ -173,8 +174,8 @@ def decompress(baserom, decomprom, mio0, extract_dest=None):
                 dec_msg = 'compressed'
                 v_file_size = len(file_bytes)
             else:
-                print('You dun goofed')
-                exit
+                print('Invalid compression flag. This should be impossible, so please tell us if you get this error anyways.')
+                sys.exit(2)
             
             decompfile.seek(0, 2)
 
@@ -186,7 +187,7 @@ def decompress(baserom, decomprom, mio0, extract_dest=None):
                 if not os.path.exists(extract_dest):
                     os.mkdir(extract_dest)
 
-                file_name = 'file_' + str(file_count)+'_'+format(v_file_begin, 'X') + '.bin'
+                file_name = 'segment_' + str(file_count)+'_'+format(v_file_begin, 'X') + '.bin'
 
                 with open(extract_dest + os.sep + file_name, 'wb') as extract_file:
                     extract_file.write(file_bytes)