Move copied libultra archive to the libultra build folder (#199)

* Combine makefile defines to avoid duplication

* Move libultra archive in build to the libultra folder

3 files changed, 212 insertions, 215 deletions

diff --git a/Makefile b/Makefile
index a6e7bdb..df90e5e 100644
--- a/Makefile
+++ b/Makefile
@@ -165,12 +165,12 @@ CFLAGS          += -G 0 -non_shared -Xcpluscomm -nostdinc -Wab,-r4300_mul
 
 WARNINGS         := -fullwarn -verbose -woff 624,649,838,712,516,513,596,564,594
 ASFLAGS          := -march=vr4300 -32 -G0
-COMMON_DEFINES   := -D_MIPS_SZLONG=32
 GBI_DEFINES      := -DF3DEX_GBI_2
 RELEASE_DEFINES  := -DNDEBUG -D_FINALROM
-AS_DEFINES       := -DMIPSEB -D_LANGUAGE_ASSEMBLY -D_ULTRA64
-C_DEFINES        := -DLANGUAGE_C -D_LANGUAGE_C
 LIBULTRA_DEFINES := -DBUILD_VERSION=VERSION_$(ULTRALIB_VERSION)
+COMMON_DEFINES   := -D_MIPS_SZLONG=32 $(GBI_DEFINES) $(RELEASE_DEFINES) $(LIBULTRA_DEFINES)
+C_DEFINES        := -DLANGUAGE_C -D_LANGUAGE_C $(COMMON_DEFINES)
+AS_DEFINES       := -DMIPSEB -D_LANGUAGE_ASSEMBLY -D_ULTRA64 $(COMMON_DEFINES)
 ENDIAN           := -EB
 
 OPTFLAGS        := -O2 -g3
@@ -183,7 +183,7 @@ OBJDUMP_FLAGS := --disassemble --reloc --disassemble-zeroes -Mreg-names=32 -Mno-
 ifneq ($(OBJDUMP_BUILD), 0)
   OBJDUMP_CMD = $(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s)
   OBJCOPY_BIN = $(OBJCOPY) -O binary $@ $@.bin
-  LIBDUMP_CMD = $(AR) xo --output $(@:.a=) $@
+  LIBDUMP_CMD = $(AR) xo --output $(@D) $@
 else
   OBJDUMP_CMD = @:
   OBJCOPY_BIN = @:
@@ -206,12 +206,12 @@ $(shell mkdir -p asm/$(VERSION) assets/$(VERSION) linker_scripts/$(VERSION)/auto
 ULTRALIB_DIR  := lib/ultralib
 ULTRALIB_LIB  := $(ULTRALIB_DIR)/build/$(ULTRALIB_VERSION)/$(ULTRALIB_TARGET)/$(ULTRALIB_TARGET).a
 LIBULTRA_DIR  := lib/libultra
-LIBULTRA_LIB  := $(BUILD_DIR)/$(LIBULTRA_DIR).a
+LIBULTRA_LIB  := $(BUILD_DIR)/$(LIBULTRA_DIR)/libultra.a
 
 SRC_DIRS      := $(shell find src -type d)
 ASM_DIRS      := $(shell find asm/$(VERSION) -type d -not -path "asm/$(VERSION)/nonmatchings/*" -not -path "asm/$(VERSION)/lib/*")
 ASSET_DIRS    := $(shell find assets/$(VERSION) -type d)
-LIB_DIRS      := $(foreach f, $(LIBULTRA_DIR), $f)
+LIB_DIRS      := $(foreach f,$(LIBULTRA_DIR),$f)
 
 C_FILES       := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c))
 S_FILES       := $(foreach dir,$(ASM_DIRS) $(SRC_DIRS),$(wildcard $(dir)/*.s))
@@ -362,8 +362,8 @@ $(BUILD_DIR)/%.o: %.s
 	$(OBJDUMP_CMD)
 
 $(BUILD_DIR)/%.o: %.c
-	$(CC_CHECK) $(CC_CHECK_FLAGS) $(IINC) -I $(dir $*) $(CHECK_WARNINGS) $(BUILD_DEFINES) $(COMMON_DEFINES) $(RELEASE_DEFINES) $(GBI_DEFINES) $(LIBULTRA_DEFINES) $(C_DEFINES) $(MIPS_BUILTIN_DEFS) -o $@ $<
-	$(CC) -c $(CFLAGS) $(BUILD_DEFINES) $(IINC) $(WARNINGS) $(MIPS_VERSION) $(ENDIAN) $(COMMON_DEFINES) $(RELEASE_DEFINES) $(GBI_DEFINES) $(LIBULTRA_DEFINES) $(C_DEFINES) $(OPTFLAGS) -o $@ $<
+	$(CC_CHECK) $(CC_CHECK_FLAGS) $(BUILD_DEFINES) $(IINC) -I $(dir $*) $(CHECK_WARNINGS) $(C_DEFINES) $(MIPS_BUILTIN_DEFS) -o $@ $<
+	$(CC) -c $(CFLAGS) $(BUILD_DEFINES) $(IINC) $(WARNINGS) $(MIPS_VERSION) $(ENDIAN) $(C_DEFINES) $(OPTFLAGS) -o $@ $<
 	$(OBJDUMP_CMD)
 	$(RM_MDEBUG)
 
diff --git a/tools/progress.py b/tools/progress.py
index 552eb33..c4e99a4 100755
--- a/tools/progress.py
+++ b/tools/progress.py
@@ -25,9 +25,6 @@ def getProgressFromMapFile(mapFile: mapfile_parser.MapFile, asmPath: Path, nonma
 
             folder = file.filepath.parts[pathIndex]
 
-            if ".a" in folder:
-                folder = folder.split('.a')[0]
-
             if folder in aliases:
                 folder = aliases[folder]
 
diff --git a/yamls/jp/boot.yaml b/yamls/jp/boot.yaml
index d8fd80b..85c36c3 100644
--- a/yamls/jp/boot.yaml
+++ b/yamls/jp/boot.yaml
@@ -43,164 +43,164 @@
       - [0x008D80, c, boot/libc64/sleep]
 
       # libultra
-      - [0x008F20, lib, libultra, sendmesg]
-      - [0x009070, lib, libultra, pfsfreeblocks]
-      - [0x009210, lib, libultra, stopthread]
-      - [0x0092D0, lib, libultra, flashreadid]
-      - [0x0093A0, lib, libultra, recvmesg]
-      - [0x0094E0, lib, libultra, setintmask]
-      - [0x009580, lib, libultra, getintmask]
-      - [0x0095E0, lib, libultra, scale]
-      - [0x009690, lib, libultra, sinf]
-      - [0x009850, lib, libultra, sins]
-      - [0x0098C0, lib, libultra, sptask]
-      - [0x009B80, lib, libultra, destroythread]
-      - [0x009C90, lib, libultra, ll]
-      - [0x009F50, lib, libultra, exceptasm]
-      - [0x00A880, lib, libultra, thread]
-      - [0x00A8C0, lib, libultra, bzero]
-      - [0x00A960, lib, libultra, controller]
-      - [0x00AC40, lib, libultra, siacs]
-      - [0x00AD00, lib, libultra, flashsectorerase]
-      - [0x00AE50, lib, libultra, createthread]
-      - [0x00AFA0, lib, libultra, contreaddata]
-      - [0x00B180, lib, libultra, virtualtophysical]
-      - [0x00B200, lib, libultra, writebackdcache]
-      - [0x00B280, lib, libultra, initialize]
-      - [0x00B5D0, lib, libultra, parameters]
-      - [0x00B630, lib, libultra, setsr]
-      - [0x00B640, lib, libultra, getsr]
-      - [0x00B650, lib, libultra, vigetnextframebuf]
-      - [0x00B690, lib, libultra, perspective]
-      - [0x00B920, lib, libultra, sprawdma]
-      - [0x00B9B0, lib, libultra, sirawdma]
-      - [0x00BA60, lib, libultra, epilinkhandle]
-      - [0x00BAB0, lib, libultra, viblack]
-      - [0x00BB20, lib, libultra, sirawread]
-      - [0x00BB70, lib, libultra, getthreadid]
-      - [0x00BB90, lib, libultra, sptaskyield]
-      - [0x00BBB0, lib, libultra, pfsreadwritefile]
-      - [0x00C000, lib, libultra, pfsgetstatus]
+      - [0x008F20, lib, libultra/libultra, sendmesg]
+      - [0x009070, lib, libultra/libultra, pfsfreeblocks]
+      - [0x009210, lib, libultra/libultra, stopthread]
+      - [0x0092D0, lib, libultra/libultra, flashreadid]
+      - [0x0093A0, lib, libultra/libultra, recvmesg]
+      - [0x0094E0, lib, libultra/libultra, setintmask]
+      - [0x009580, lib, libultra/libultra, getintmask]
+      - [0x0095E0, lib, libultra/libultra, scale]
+      - [0x009690, lib, libultra/libultra, sinf]
+      - [0x009850, lib, libultra/libultra, sins]
+      - [0x0098C0, lib, libultra/libultra, sptask]
+      - [0x009B80, lib, libultra/libultra, destroythread]
+      - [0x009C90, lib, libultra/libultra, ll]
+      - [0x009F50, lib, libultra/libultra, exceptasm]
+      - [0x00A880, lib, libultra/libultra, thread]
+      - [0x00A8C0, lib, libultra/libultra, bzero]
+      - [0x00A960, lib, libultra/libultra, controller]
+      - [0x00AC40, lib, libultra/libultra, siacs]
+      - [0x00AD00, lib, libultra/libultra, flashsectorerase]
+      - [0x00AE50, lib, libultra/libultra, createthread]
+      - [0x00AFA0, lib, libultra/libultra, contreaddata]
+      - [0x00B180, lib, libultra/libultra, virtualtophysical]
+      - [0x00B200, lib, libultra/libultra, writebackdcache]
+      - [0x00B280, lib, libultra/libultra, initialize]
+      - [0x00B5D0, lib, libultra/libultra, parameters]
+      - [0x00B630, lib, libultra/libultra, setsr]
+      - [0x00B640, lib, libultra/libultra, getsr]
+      - [0x00B650, lib, libultra/libultra, vigetnextframebuf]
+      - [0x00B690, lib, libultra/libultra, perspective]
+      - [0x00B920, lib, libultra/libultra, sprawdma]
+      - [0x00B9B0, lib, libultra/libultra, sirawdma]
+      - [0x00BA60, lib, libultra/libultra, epilinkhandle]
+      - [0x00BAB0, lib, libultra/libultra, viblack]
+      - [0x00BB20, lib, libultra/libultra, sirawread]
+      - [0x00BB70, lib, libultra/libultra, getthreadid]
+      - [0x00BB90, lib, libultra/libultra, sptaskyield]
+      - [0x00BBB0, lib, libultra/libultra, pfsreadwritefile]
+      - [0x00C000, lib, libultra/libultra, pfsgetstatus]
       - [0x00C230, pad]
-      - [0x00C240, lib, libultra, mtxidentf]
-      - [0x00C290, lib, libultra, visetmode]
-      - [0x00C2F0, lib, libultra, flashinit]
-      - [0x00C3E0, lib, libultra, lookat]
-      - [0x00C700, lib, libultra, motor]
-      - [0x00CAD0, lib, libultra, pfsallocatefile]
-      - [0x00CF50, lib, libultra, stoptimer]
-      - [0x00D040, lib, libultra, probetlb]
-      - [0x00D100, lib, libultra, pimgr]
-      - [0x00D270, lib, libultra, piacs]
+      - [0x00C240, lib, libultra/libultra, mtxidentf]
+      - [0x00C290, lib, libultra/libultra, visetmode]
+      - [0x00C2F0, lib, libultra/libultra, flashinit]
+      - [0x00C3E0, lib, libultra/libultra, lookat]
+      - [0x00C700, lib, libultra/libultra, motor]
+      - [0x00CAD0, lib, libultra/libultra, pfsallocatefile]
+      - [0x00CF50, lib, libultra/libultra, stoptimer]
+      - [0x00D040, lib, libultra/libultra, probetlb]
+      - [0x00D100, lib, libultra/libultra, pimgr]
+      - [0x00D270, lib, libultra/libultra, piacs]
       - [0x00D330, pad]
-      - [0x00D340, lib, libultra, devmgr]
-      - [0x00D750, lib, libultra, pirawdma]
-      - [0x00D820, lib, libultra, contpfs]
-      - [0x00E3A0, lib, libultra, getcount]
+      - [0x00D340, lib, libultra/libultra, devmgr]
+      - [0x00D750, lib, libultra/libultra, pirawdma]
+      - [0x00D820, lib, libultra/libultra, contpfs]
+      - [0x00E3A0, lib, libultra/libultra, getcount]
       - [0x00E3B0, pad]
-      - [0x00E3C0, lib, libultra, mtxl2f]
-      - [0x00E430, lib, libultra, flashreadstatus]
-      - [0x00E4C0, lib, libultra, getmemsize]
-      - [0x00E5E0, lib, libultra, pfssearchfile]
-      - [0x00E7B0, lib, libultra, seteventmesg]
-      - [0x00E870, lib, libultra, sqrtf]
-      - [0x00E880, lib, libultra, afterprenmi]
-      - [0x00E8A0, lib, libultra, contquery]
-      - [0x00E940, lib, libultra, lookathil]
-      - [0x00F1C0, lib, libultra, xprintf]
-      - [0x00FEA0, lib, libultra, unmaptlball]
-      - [0x00FEF0, lib, libultra, epidma]
-      - [0x00FF90, lib, libultra, string]
-      - [0x010030, lib, libultra, invaldcache]
-      - [0x0100E0, lib, libultra, invalicache]
-      - [0x010160, lib, libultra, createmesgqueue]
-      - [0x010190, lib, libultra, pfsrepairid]
-      - [0x0101F0, lib, libultra, timerintr]
-      - [0x010620, lib, libultra, sp]
-      - [0x010650, lib, libultra, si]
-      - [0x010680, lib, libultra, mtxident]
-      - [0x0106D0, lib, libultra, jammesg]
-      - [0x010820, lib, libultra, setthreadpri]
-      - [0x010900, lib, libultra, getthreadpri]
-      - [0x010920, lib, libultra, epirawread]
-      - [0x010A80, lib, libultra, viswapbuf]
-      - [0x010AD0, lib, libultra, position]
-      - [0x010CE0, lib, libultra, epirawdma]
-      - [0x010EC0, lib, libultra, sptaskyielded]
-      - [0x010F20, lib, libultra, bcmp]
-      - [0x011040, lib, libultra, gettime]
-      - [0x0110D0, lib, libultra, rotate]
-      - [0x0112A0, lib, libultra, setglobalintmask]
-      - [0x0112F0, lib, libultra, aisetfreq]
-      - [0x011440, lib, libultra, getactivequeue]
+      - [0x00E3C0, lib, libultra/libultra, mtxl2f]
+      - [0x00E430, lib, libultra/libultra, flashreadstatus]
+      - [0x00E4C0, lib, libultra/libultra, getmemsize]
+      - [0x00E5E0, lib, libultra/libultra, pfssearchfile]
+      - [0x00E7B0, lib, libultra/libultra, seteventmesg]
+      - [0x00E870, lib, libultra/libultra, sqrtf]
+      - [0x00E880, lib, libultra/libultra, afterprenmi]
+      - [0x00E8A0, lib, libultra/libultra, contquery]
+      - [0x00E940, lib, libultra/libultra, lookathil]
+      - [0x00F1C0, lib, libultra/libultra, xprintf]
+      - [0x00FEA0, lib, libultra/libultra, unmaptlball]
+      - [0x00FEF0, lib, libultra/libultra, epidma]
+      - [0x00FF90, lib, libultra/libultra, string]
+      - [0x010030, lib, libultra/libultra, invaldcache]
+      - [0x0100E0, lib, libultra/libultra, invalicache]
+      - [0x010160, lib, libultra/libultra, createmesgqueue]
+      - [0x010190, lib, libultra/libultra, pfsrepairid]
+      - [0x0101F0, lib, libultra/libultra, timerintr]
+      - [0x010620, lib, libultra/libultra, sp]
+      - [0x010650, lib, libultra/libultra, si]
+      - [0x010680, lib, libultra/libultra, mtxident]
+      - [0x0106D0, lib, libultra/libultra, jammesg]
+      - [0x010820, lib, libultra/libultra, setthreadpri]
+      - [0x010900, lib, libultra/libultra, getthreadpri]
+      - [0x010920, lib, libultra/libultra, epirawread]
+      - [0x010A80, lib, libultra/libultra, viswapbuf]
+      - [0x010AD0, lib, libultra/libultra, position]
+      - [0x010CE0, lib, libultra/libultra, epirawdma]
+      - [0x010EC0, lib, libultra/libultra, sptaskyielded]
+      - [0x010F20, lib, libultra/libultra, bcmp]
+      - [0x011040, lib, libultra/libultra, gettime]
+      - [0x0110D0, lib, libultra/libultra, rotate]
+      - [0x0112A0, lib, libultra/libultra, setglobalintmask]
+      - [0x0112F0, lib, libultra/libultra, aisetfreq]
+      - [0x011440, lib, libultra/libultra, getactivequeue]
       - [0x011450, pad]
-      - [0x011460, lib, libultra, normalize]
-      - [0x0114C0, lib, libultra, setcompare]
-      - [0x0114D0, lib, libultra, aigetstat]
-      - [0x0114E0, lib, libultra, bcopy]
-      - [0x0117F0, lib, libultra, resetglobalintmask]
-      - [0x011850, lib, libultra, pfsdeletefile]
-      - [0x011AC0, lib, libultra, ortho]
-      - [0x011C80, lib, libultra, gbpakinit]
-      - [0x011EB0, lib, libultra, vi]
-      - [0x011FD0, lib, libultra, viswapcontext]
-      - [0x0122D0, lib, libultra, interrupt]
-      - [0x012360, lib, libultra, pigetcmdq]
-      - [0x012390, lib, libultra, cosf]
-      - [0x012500, lib, libultra, epiread]
-      - [0x012550, lib, libultra, visetspecial]
-      - [0x0126B0, lib, libultra, coss]
-      - [0x0126E0, lib, libultra, flashwritearray]
-      - [0x012840, lib, libultra, flashallerase]
-      - [0x012980, lib, libultra, flashclearstatus]
-      - [0x0129D0, lib, libultra, visetevent]
-      - [0x012A30, lib, libultra, pfsisplug]
-      - [0x012D20, lib, libultra, flashwritebuffer]
-      - [0x012DB0, lib, libultra, pfsnumfiles]
-      - [0x012EE0, lib, libultra, cartrominit]
-      - [0x013040, lib, libultra, us2dex]
-      - [0x0131C0, lib, libultra, pfsselectbank]
-      - [0x013240, lib, libultra, contsetch]
-      - [0x0132A0, lib, libultra, setfpccsr]
-      - [0x0132B0, lib, libultra, getfpccsr]
-      - [0x0132C0, lib, libultra, pfsfilestate]
-      - [0x0134A0, lib, libultra, pfsinitpak]
-      - [0x0137B0, lib, libultra, pfschecker]
-      - [0x014160, lib, libultra, aigetlen]
-      - [0x014170, lib, libultra, epiwrite]
-      - [0x0141C0, lib, libultra, maptlbrdb]
-      - [0x014220, lib, libultra, yieldthread]
+      - [0x011460, lib, libultra/libultra, normalize]
+      - [0x0114C0, lib, libultra/libultra, setcompare]
+      - [0x0114D0, lib, libultra/libultra, aigetstat]
+      - [0x0114E0, lib, libultra/libultra, bcopy]
+      - [0x0117F0, lib, libultra/libultra, resetglobalintmask]
+      - [0x011850, lib, libultra/libultra, pfsdeletefile]
+      - [0x011AC0, lib, libultra/libultra, ortho]
+      - [0x011C80, lib, libultra/libultra, gbpakinit]
+      - [0x011EB0, lib, libultra/libultra, vi]
+      - [0x011FD0, lib, libultra/libultra, viswapcontext]
+      - [0x0122D0, lib, libultra/libultra, interrupt]
+      - [0x012360, lib, libultra/libultra, pigetcmdq]
+      - [0x012390, lib, libultra/libultra, cosf]
+      - [0x012500, lib, libultra/libultra, epiread]
+      - [0x012550, lib, libultra/libultra, visetspecial]
+      - [0x0126B0, lib, libultra/libultra, coss]
+      - [0x0126E0, lib, libultra/libultra, flashwritearray]
+      - [0x012840, lib, libultra/libultra, flashallerase]
+      - [0x012980, lib, libultra/libultra, flashclearstatus]
+      - [0x0129D0, lib, libultra/libultra, visetevent]
+      - [0x012A30, lib, libultra/libultra, pfsisplug]
+      - [0x012D20, lib, libultra/libultra, flashwritebuffer]
+      - [0x012DB0, lib, libultra/libultra, pfsnumfiles]
+      - [0x012EE0, lib, libultra/libultra, cartrominit]
+      - [0x013040, lib, libultra/libultra, us2dex]
+      - [0x0131C0, lib, libultra/libultra, pfsselectbank]
+      - [0x013240, lib, libultra/libultra, contsetch]
+      - [0x0132A0, lib, libultra/libultra, setfpccsr]
+      - [0x0132B0, lib, libultra/libultra, getfpccsr]
+      - [0x0132C0, lib, libultra/libultra, pfsfilestate]
+      - [0x0134A0, lib, libultra/libultra, pfsinitpak]
+      - [0x0137B0, lib, libultra/libultra, pfschecker]
+      - [0x014160, lib, libultra/libultra, aigetlen]
+      - [0x014170, lib, libultra/libultra, epiwrite]
+      - [0x0141C0, lib, libultra/libultra, maptlbrdb]
+      - [0x014220, lib, libultra/libultra, yieldthread]
       - [0x014270, pad]
-      - [0x014280, lib, libultra, translate]
-      - [0x014350, lib, libultra, getcause]
-      - [0x014360, lib, libultra, contramwrite]
-      - [0x0145B0, lib, libultra, contramread]
-      - [0x0147E0, lib, libultra, crc]
-      - [0x014950, lib, libultra, epirawwrite]
-      - [0x014AB0, lib, libultra, settimer]
-      - [0x014C40, lib, libultra, xldtob]
-      - [0x015750, lib, libultra, ldiv]
-      - [0x0158E0, lib, libultra, xlitob]
-      - [0x015B80, lib, libultra, sirawwrite]
-      - [0x015BD0, lib, libultra, spsetstat]
-      - [0x015BE0, lib, libultra, spgetstat]
+      - [0x014280, lib, libultra/libultra, translate]
+      - [0x014350, lib, libultra/libultra, getcause]
+      - [0x014360, lib, libultra/libultra, contramwrite]
+      - [0x0145B0, lib, libultra/libultra, contramread]
+      - [0x0147E0, lib, libultra/libultra, crc]
+      - [0x014950, lib, libultra/libultra, epirawwrite]
+      - [0x014AB0, lib, libultra/libultra, settimer]
+      - [0x014C40, lib, libultra/libultra, xldtob]
+      - [0x015750, lib, libultra/libultra, ldiv]
+      - [0x0158E0, lib, libultra/libultra, xlitob]
+      - [0x015B80, lib, libultra/libultra, sirawwrite]
+      - [0x015BD0, lib, libultra/libultra, spsetstat]
+      - [0x015BE0, lib, libultra/libultra, spgetstat]
       - [0x015BF0, pad]
-      - [0x015C00, lib, libultra, vimgr]
-      - [0x015F10, lib, libultra, vigetcurrcontext]
-      - [0x015F20, lib, libultra, writebackdcacheall]
-      - [0x015F50, lib, libultra, getcurrfaultthread]
-      - [0x015F60, lib, libultra, mtxf2l]
-      - [0x015FD0, lib, libultra, startthread]
-      - [0x016120, lib, libultra, llcvt]
-      - [0x016330, lib, libultra, visetyscale]
-      - [0x016380, lib, libultra, visetxscale]
-      - [0x016490, lib, libultra, conteepread]
-      - [0x0166F0, lib, libultra, conteepwrite]
-      - [0x016B10, lib, libultra, vigetcurrframebuf]
-      - [0x016B50, lib, libultra, spsetpc]
-      - [0x016B80, lib, libultra, flashreadarray]
-      - [0x016D20, lib, libultra, flashgetaddr]
-      - [0x016D50, lib, libultra, setwatchlo]
+      - [0x015C00, lib, libultra/libultra, vimgr]
+      - [0x015F10, lib, libultra/libultra, vigetcurrcontext]
+      - [0x015F20, lib, libultra/libultra, writebackdcacheall]
+      - [0x015F50, lib, libultra/libultra, getcurrfaultthread]
+      - [0x015F60, lib, libultra/libultra, mtxf2l]
+      - [0x015FD0, lib, libultra/libultra, startthread]
+      - [0x016120, lib, libultra/libultra, llcvt]
+      - [0x016330, lib, libultra/libultra, visetyscale]
+      - [0x016380, lib, libultra/libultra, visetxscale]
+      - [0x016490, lib, libultra/libultra, conteepread]
+      - [0x0166F0, lib, libultra/libultra, conteepwrite]
+      - [0x016B10, lib, libultra/libultra, vigetcurrframebuf]
+      - [0x016B50, lib, libultra/libultra, spsetpc]
+      - [0x016B80, lib, libultra/libultra, flashreadarray]
+      - [0x016D20, lib, libultra/libultra, flashgetaddr]
+      - [0x016D50, lib, libultra/libultra, setwatchlo]
 
       # libm
       - [0x016D60, c, boot/libm/fmodf]
@@ -235,30 +235,30 @@
       - [0x017990, .data, boot/libc64/qrand]
 
       # libultra
-      - [0x0179A0, lib, libultra, vimodepallan1, .data]
-      - [0x0179F0, lib, libultra, sins, .data]
-      - [0x0181F0, lib, libultra, exceptasm, .data]
-      - [0x018220, lib, libultra, thread, .data]
-      - [0x018240, lib, libultra, controller, .data]
-      - [0x018250, lib, libultra, siacs, .data]
-      - [0x018260, lib, libultra, initialize, .data]
-      - [0x018280, lib, libultra, pimgr, .data]
-      - [0x0182B0, lib, libultra, piacs, .data]
-      - [0x0182C0, lib, libultra, vimodentsclpn1, .data]
-      - [0x018310, lib, libultra, contpfs, .data]
-      - [0x018320, lib, libultra, seteventmesg, .data]
-      - [0x018330, lib, libultra, xprintf, .data]
-      - [0x018380, lib, libultra, timerintr, .data]
-      - [0x018390, lib, libultra, position, .data]
-      - [0x0183A0, lib, libultra, rotate, .data]
-      - [0x0183B0, lib, libultra, vimodentsclan1, .data]
-      - [0x018400, lib, libultra, vimodempallan1, .data]
-      - [0x018450, lib, libultra, vi, .data]
-      - [0x0184C0, lib, libultra, cartrominit, .data]
-      - [0x0184D0, lib, libultra, vimodefpallan1, .data]
-      - [0x018520, lib, libultra, contramread, .data]
-      - [0x018530, lib, libultra, xlitob, .data]
-      - [0x018560, lib, libultra, vimgr, .data]
+      - [0x0179A0, lib, libultra/libultra, vimodepallan1, .data]
+      - [0x0179F0, lib, libultra/libultra, sins, .data]
+      - [0x0181F0, lib, libultra/libultra, exceptasm, .data]
+      - [0x018220, lib, libultra/libultra, thread, .data]
+      - [0x018240, lib, libultra/libultra, controller, .data]
+      - [0x018250, lib, libultra/libultra, siacs, .data]
+      - [0x018260, lib, libultra/libultra, initialize, .data]
+      - [0x018280, lib, libultra/libultra, pimgr, .data]
+      - [0x0182B0, lib, libultra/libultra, piacs, .data]
+      - [0x0182C0, lib, libultra/libultra, vimodentsclpn1, .data]
+      - [0x018310, lib, libultra/libultra, contpfs, .data]
+      - [0x018320, lib, libultra/libultra, seteventmesg, .data]
+      - [0x018330, lib, libultra/libultra, xprintf, .data]
+      - [0x018380, lib, libultra/libultra, timerintr, .data]
+      - [0x018390, lib, libultra/libultra, position, .data]
+      - [0x0183A0, lib, libultra/libultra, rotate, .data]
+      - [0x0183B0, lib, libultra/libultra, vimodentsclan1, .data]
+      - [0x018400, lib, libultra/libultra, vimodempallan1, .data]
+      - [0x018450, lib, libultra/libultra, vi, .data]
+      - [0x0184C0, lib, libultra/libultra, cartrominit, .data]
+      - [0x0184D0, lib, libultra/libultra, vimodefpallan1, .data]
+      - [0x018520, lib, libultra/libultra, contramread, .data]
+      - [0x018530, lib, libultra/libultra, xlitob, .data]
+      - [0x018560, lib, libultra/libultra, vimgr, .data]
 
 
       - [0x018580, .rodata, boot/boot_main]
@@ -278,17 +278,17 @@
       - [0x019710, .rodata, boot/libc64/__osMalloc]
 
       # libultra
-      - [0x0199D0, lib, libultra, setintmask, .rodata]
-      - [0x019A50, lib, libultra, sinf, .rodata]
-      - [0x019AA0, lib, libultra, exceptasm, .rodata]
-      - [0x019AF0, lib, libultra, perspective, .rodata]
-      - [0x019B00, lib, libultra, devmgr, .rodata]
-      - [0x019B20, lib, libultra, lookathil, .rodata]
-      - [0x019B30, lib, libultra, xprintf, .rodata]
-      - [0x019C30, lib, libultra, cosf, .rodata]
-      - [0x019C80, lib, libultra, libm_vals, .rodata]
-      - [0x019C90, lib, libultra, xldtob, .rodata]
-      - [0x019CF0, lib, libultra, llcvt, .rodata]
+      - [0x0199D0, lib, libultra/libultra, setintmask, .rodata]
+      - [0x019A50, lib, libultra/libultra, sinf, .rodata]
+      - [0x019AA0, lib, libultra/libultra, exceptasm, .rodata]
+      - [0x019AF0, lib, libultra/libultra, perspective, .rodata]
+      - [0x019B00, lib, libultra/libultra, devmgr, .rodata]
+      - [0x019B20, lib, libultra/libultra, lookathil, .rodata]
+      - [0x019B30, lib, libultra/libultra, xprintf, .rodata]
+      - [0x019C30, lib, libultra/libultra, cosf, .rodata]
+      - [0x019C80, lib, libultra/libultra, libm_vals, .rodata]
+      - [0x019C90, lib, libultra/libultra, xldtob, .rodata]
+      - [0x019CF0, lib, libultra/libultra, llcvt, .rodata]
 
       - [0x019D00, rodata, boot/version]
 
@@ -311,23 +311,23 @@
       - {type: .bss, vram: 0x80041A00, name: boot/libc64/__osMalloc}
 
       # libultra
-      - {type: lib, vram: 0x80041A10, name: libultra, object: sptask, section: .bss}
-      - {type: lib, vram: 0x80041A50, name: libultra, object: controller, section: .bss}
-      - {type: lib, vram: 0x80041AE0, name: libultra, object: siacs, section: .bss}
-      - {type: lib, vram: 0x80041B00, name: libultra, object: initialize, section: .bss}
-      - {type: lib, vram: 0x80041B10, name: libultra, object: kdebugserver, section: .bss}
-      - {type: lib, vram: 0x80041CC0, name: libultra, object: flashinit, section: .bss}
-      - {type: lib, vram: 0x80041D80, name: libultra, object: motor, section: .bss}
-      - {type: lib, vram: 0x80041E80, name: libultra, object: pimgr, section: .bss}
-      - {type: lib, vram: 0x80043140, name: libultra, object: piacs, section: .bss}
-      - {type: lib, vram: 0x80043160, name: libultra, object: contpfs, section: .bss}
-      - {type: lib, vram: 0x80043260, name: libultra, object: seteventmesg, section: .bss}
-      - {type: lib, vram: 0x800432E0, name: libultra, object: timerintr, section: .bss}
-      - {type: lib, vram: 0x80043320, name: libultra, object: gbpakinit, section: .bss}
-      - {type: lib, vram: 0x80043360, name: libultra, object: pfsisplug, section: .bss}
-      - {type: lib, vram: 0x800433A0, name: libultra, object: cartrominit, section: .bss}
-      - {type: lib, vram: 0x80043420, name: libultra, object: vimgr, section: .bss}
-      - {type: lib, vram: 0x80044640, name: libultra, object: conteepread, section: .bss}
+      - {type: lib, vram: 0x80041A10, name: libultra/libultra, object: sptask, section: .bss}
+      - {type: lib, vram: 0x80041A50, name: libultra/libultra, object: controller, section: .bss}
+      - {type: lib, vram: 0x80041AE0, name: libultra/libultra, object: siacs, section: .bss}
+      - {type: lib, vram: 0x80041B00, name: libultra/libultra, object: initialize, section: .bss}
+      - {type: lib, vram: 0x80041B10, name: libultra/libultra, object: kdebugserver, section: .bss}
+      - {type: lib, vram: 0x80041CC0, name: libultra/libultra, object: flashinit, section: .bss}
+      - {type: lib, vram: 0x80041D80, name: libultra/libultra, object: motor, section: .bss}
+      - {type: lib, vram: 0x80041E80, name: libultra/libultra, object: pimgr, section: .bss}
+      - {type: lib, vram: 0x80043140, name: libultra/libultra, object: piacs, section: .bss}
+      - {type: lib, vram: 0x80043160, name: libultra/libultra, object: contpfs, section: .bss}
+      - {type: lib, vram: 0x80043260, name: libultra/libultra, object: seteventmesg, section: .bss}
+      - {type: lib, vram: 0x800432E0, name: libultra/libultra, object: timerintr, section: .bss}
+      - {type: lib, vram: 0x80043320, name: libultra/libultra, object: gbpakinit, section: .bss}
+      - {type: lib, vram: 0x80043360, name: libultra/libultra, object: pfsisplug, section: .bss}
+      - {type: lib, vram: 0x800433A0, name: libultra/libultra, object: cartrominit, section: .bss}
+      - {type: lib, vram: 0x80043420, name: libultra/libultra, object: vimgr, section: .bss}
+      - {type: lib, vram: 0x80044640, name: libultra/libultra, object: conteepread, section: .bss}
 
 
   - name: dmadata