From f97d418f5b932c13ce1ffe7edf4c901cbec67063 Mon Sep 17 00:00:00 2001 From: petrie911 Date: Mon, 16 Oct 2023 08:54:41 -0500 Subject: [PATCH] stuff --- .vscode/settings.json | 1 + Makefile | 4 +++- include/{libultra => }/PR/abi.h | 0 include/{libultra => }/PR/gbi.h | 0 include/{libultra => }/PR/gt.h | 0 include/{libultra => }/PR/gu.h | 0 include/{libultra => }/PR/leo.h | 0 include/{libultra => }/PR/leoappli.h | 0 include/{libultra => }/PR/libaudio.h | 0 include/{libultra => }/PR/libnos.h | 0 include/{libultra => }/PR/mbi.h | 0 include/{libultra => }/PR/ncode.h | 0 include/{libultra => }/PR/os.h | 0 include/{libultra => }/PR/os_inter.h | 0 include/{libultra => }/PR/os_internal.h | 0 include/{libultra => }/PR/primage.h | 0 include/{libultra => }/PR/r4300.h | 0 include/{libultra => }/PR/ramrom.h | 0 include/{libultra => }/PR/rcp.h | 0 include/{libultra => }/PR/rdb.h | 0 include/{libultra => }/PR/region.h | 0 include/{libultra => }/PR/rmon.h | 0 include/{libultra => }/PR/sched.h | 0 include/{libultra => }/PR/sp.h | 0 include/{libultra => }/PR/sptask.h | 0 include/{libultra => }/PR/ucode.h | 0 include/{libultra => }/PR/ultraerr.h | 0 include/{libultra => }/PR/ultraerror.h | 0 include/{libultra => }/PR/ultralog.h | 0 include/{libultra => }/PR/ultratypes.h | 0 include/{libultra => }/PR/uportals.h | 0 include/global.h | 3 ++- src/main/B99D0.c | 9 +++++++-- tools/comptool.py | 7 ++++--- 34 files changed, 17 insertions(+), 7 deletions(-) rename include/{libultra => }/PR/abi.h (100%) rename include/{libultra => }/PR/gbi.h (100%) rename include/{libultra => }/PR/gt.h (100%) rename include/{libultra => }/PR/gu.h (100%) rename include/{libultra => }/PR/leo.h (100%) rename include/{libultra => }/PR/leoappli.h (100%) rename include/{libultra => }/PR/libaudio.h (100%) rename include/{libultra => }/PR/libnos.h (100%) rename include/{libultra => }/PR/mbi.h (100%) rename include/{libultra => }/PR/ncode.h (100%) rename include/{libultra => }/PR/os.h (100%) rename include/{libultra => }/PR/os_inter.h (100%) rename include/{libultra => }/PR/os_internal.h (100%) rename include/{libultra => }/PR/primage.h (100%) rename include/{libultra => }/PR/r4300.h (100%) rename include/{libultra => }/PR/ramrom.h (100%) rename include/{libultra => }/PR/rcp.h (100%) rename include/{libultra => }/PR/rdb.h (100%) rename include/{libultra => }/PR/region.h (100%) rename include/{libultra => }/PR/rmon.h (100%) rename include/{libultra => }/PR/sched.h (100%) rename include/{libultra => }/PR/sp.h (100%) rename include/{libultra => }/PR/sptask.h (100%) rename include/{libultra => }/PR/ucode.h (100%) rename include/{libultra => }/PR/ultraerr.h (100%) rename include/{libultra => }/PR/ultraerror.h (100%) rename include/{libultra => }/PR/ultralog.h (100%) rename include/{libultra => }/PR/ultratypes.h (100%) rename include/{libultra => }/PR/uportals.h (100%) diff --git a/.vscode/settings.json b/.vscode/settings.json index ec06a287..4c4b984f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,5 +14,6 @@ "tools/gfxsotn/**": false, }, "files.associations": { + "functions.h": "c" }, } \ No newline at end of file diff --git a/Makefile b/Makefile index 49c75f4e..badd35e2 100644 --- a/Makefile +++ b/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) diff --git a/include/libultra/PR/abi.h b/include/PR/abi.h similarity index 100% rename from include/libultra/PR/abi.h rename to include/PR/abi.h diff --git a/include/libultra/PR/gbi.h b/include/PR/gbi.h similarity index 100% rename from include/libultra/PR/gbi.h rename to include/PR/gbi.h diff --git a/include/libultra/PR/gt.h b/include/PR/gt.h similarity index 100% rename from include/libultra/PR/gt.h rename to include/PR/gt.h diff --git a/include/libultra/PR/gu.h b/include/PR/gu.h similarity index 100% rename from include/libultra/PR/gu.h rename to include/PR/gu.h diff --git a/include/libultra/PR/leo.h b/include/PR/leo.h similarity index 100% rename from include/libultra/PR/leo.h rename to include/PR/leo.h diff --git a/include/libultra/PR/leoappli.h b/include/PR/leoappli.h similarity index 100% rename from include/libultra/PR/leoappli.h rename to include/PR/leoappli.h diff --git a/include/libultra/PR/libaudio.h b/include/PR/libaudio.h similarity index 100% rename from include/libultra/PR/libaudio.h rename to include/PR/libaudio.h diff --git a/include/libultra/PR/libnos.h b/include/PR/libnos.h similarity index 100% rename from include/libultra/PR/libnos.h rename to include/PR/libnos.h diff --git a/include/libultra/PR/mbi.h b/include/PR/mbi.h similarity index 100% rename from include/libultra/PR/mbi.h rename to include/PR/mbi.h diff --git a/include/libultra/PR/ncode.h b/include/PR/ncode.h similarity index 100% rename from include/libultra/PR/ncode.h rename to include/PR/ncode.h diff --git a/include/libultra/PR/os.h b/include/PR/os.h similarity index 100% rename from include/libultra/PR/os.h rename to include/PR/os.h diff --git a/include/libultra/PR/os_inter.h b/include/PR/os_inter.h similarity index 100% rename from include/libultra/PR/os_inter.h rename to include/PR/os_inter.h diff --git a/include/libultra/PR/os_internal.h b/include/PR/os_internal.h similarity index 100% rename from include/libultra/PR/os_internal.h rename to include/PR/os_internal.h diff --git a/include/libultra/PR/primage.h b/include/PR/primage.h similarity index 100% rename from include/libultra/PR/primage.h rename to include/PR/primage.h diff --git a/include/libultra/PR/r4300.h b/include/PR/r4300.h similarity index 100% rename from include/libultra/PR/r4300.h rename to include/PR/r4300.h diff --git a/include/libultra/PR/ramrom.h b/include/PR/ramrom.h similarity index 100% rename from include/libultra/PR/ramrom.h rename to include/PR/ramrom.h diff --git a/include/libultra/PR/rcp.h b/include/PR/rcp.h similarity index 100% rename from include/libultra/PR/rcp.h rename to include/PR/rcp.h diff --git a/include/libultra/PR/rdb.h b/include/PR/rdb.h similarity index 100% rename from include/libultra/PR/rdb.h rename to include/PR/rdb.h diff --git a/include/libultra/PR/region.h b/include/PR/region.h similarity index 100% rename from include/libultra/PR/region.h rename to include/PR/region.h diff --git a/include/libultra/PR/rmon.h b/include/PR/rmon.h similarity index 100% rename from include/libultra/PR/rmon.h rename to include/PR/rmon.h diff --git a/include/libultra/PR/sched.h b/include/PR/sched.h similarity index 100% rename from include/libultra/PR/sched.h rename to include/PR/sched.h diff --git a/include/libultra/PR/sp.h b/include/PR/sp.h similarity index 100% rename from include/libultra/PR/sp.h rename to include/PR/sp.h diff --git a/include/libultra/PR/sptask.h b/include/PR/sptask.h similarity index 100% rename from include/libultra/PR/sptask.h rename to include/PR/sptask.h diff --git a/include/libultra/PR/ucode.h b/include/PR/ucode.h similarity index 100% rename from include/libultra/PR/ucode.h rename to include/PR/ucode.h diff --git a/include/libultra/PR/ultraerr.h b/include/PR/ultraerr.h similarity index 100% rename from include/libultra/PR/ultraerr.h rename to include/PR/ultraerr.h diff --git a/include/libultra/PR/ultraerror.h b/include/PR/ultraerror.h similarity index 100% rename from include/libultra/PR/ultraerror.h rename to include/PR/ultraerror.h diff --git a/include/libultra/PR/ultralog.h b/include/PR/ultralog.h similarity index 100% rename from include/libultra/PR/ultralog.h rename to include/PR/ultralog.h diff --git a/include/libultra/PR/ultratypes.h b/include/PR/ultratypes.h similarity index 100% rename from include/libultra/PR/ultratypes.h rename to include/PR/ultratypes.h diff --git a/include/libultra/PR/uportals.h b/include/PR/uportals.h similarity index 100% rename from include/libultra/PR/uportals.h rename to include/PR/uportals.h diff --git a/include/global.h b/include/global.h index 3fc55dc5..9ceef36c 100644 --- a/include/global.h +++ b/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" diff --git a/src/main/B99D0.c b/src/main/B99D0.c index bcbb9a5a..b42485f0 100644 --- a/src/main/B99D0.c +++ b/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") diff --git a/tools/comptool.py b/tools/comptool.py index 688f8ea7..18e799a6 100644 --- a/tools/comptool.py +++ b/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)