Merge branch 'master' into otr

.gitignore

@@ -4,16 +4,21 @@ __pycache__
 .splat/
 starfox64.ld
 starfox64.uncompressed.ld
-starfox64.us.yaml
+starfox64.*.*.yaml
+starfox64.us.modded.map
 ctx.c
 ctx.c.m2c
 *.d
 *_auto.ld
 *.n64
 *.z64
+*.v64
+*.u64
 *.bin
 *.otr
+*.eeprom
 assets/yaml/us/ast_test.yaml
+/audio_data
 src/assets/*
 include/assets/*
 /build
@@ -27,3 +32,4 @@ TempComp.bin.mio0
 torch.hash.yml
 cmake-build-*/
 .idea/
+.vs

.vscode/settings.json

@@ -45,7 +45,7 @@
     "cstdlib": "c",
     "typeinfo": "c",
     "sym_addrs_funcs": "c",
-    "*.txt": "c",
+    "*.txt": "plaintext",
     "fox_title.h": "c",
     "prevent_bss_reordering.h": "c",
     "fox_map.h": "c",
@@ -89,7 +89,7 @@
     "tuple": "c",
     "type_traits": "c",
     "ast_allies.h": "c",
-    "ast_font.h": "c",
+    "ast_text.h": "c",
     "fox_std_lib_assets.h": "c",
     "fox_versus_assets.h": "c",
     "guint.h": "c",
@@ -136,7 +136,22 @@
     "ast_vs_menu.h": "c",
     "sf64mesg.h": "c",
     "sf64audio_external.h": "c",
-    "audioseq_cmd.h": "c"
+    "audioseq_cmd.h": "c",
+    "ultralog.h": "c",
+    "charconv": "c",
+    "compare": "c",
+    "os_motor.h": "c",
+    "os_pfs.h": "c",
+    "semaphore": "c",
+    "bgm.h": "c",
+    "*.tcc": "c",
+    "object_ram.h": "c",
+    "sf64dma.h": "c",
+    "string": "c",
+    "prevent_bss_reordering3.h": "c",
+    "ast_a_ti.h": "c",
+    "fox_co.h": "c",
+    "ast_map.h": "c"
   },
   "C_Cpp_Runner.msvcBatchPath": ""
 }

Makefile

@@ -25,6 +25,8 @@ CC_CHECK_COMP ?= gcc
 OBJDUMP_BUILD ?= 0
 # Number of threads to compress with
 N_THREADS ?= $(shell nproc)
+# If COMPILER is GCC, compile with GCC instead of IDO.
+COMPILER ?= ido
 # Whether to colorize build messages
 COLOR ?= 1
 # Whether to hide commands or not
@@ -45,9 +47,10 @@ else
 endif
 
 VERSION ?= us
+REV ?= rev1
 
-BASEROM              := baserom.$(VERSION).z64
-BASEROM_UNCOMPRESSED := baserom.$(VERSION).uncompressed.z64
+BASEROM              := baserom.$(VERSION).$(REV).z64
+BASEROM_UNCOMPRESSED := baserom.$(VERSION).$(REV).uncompressed.z64
 TARGET               := starfox64
 
 ### Output ###
@@ -55,25 +58,94 @@ TARGET               := starfox64
 BUILD_DIR := build
 TOOLS	  := tools
 PYTHON	  := python3
-ROM       := $(BUILD_DIR)/$(TARGET).$(VERSION).uncompressed.z64
-ROMC 	  := $(BUILD_DIR)/$(TARGET).$(VERSION).z64
-ELF       := $(BUILD_DIR)/$(TARGET).$(VERSION).elf
-LD_MAP    := $(BUILD_DIR)/$(TARGET).$(VERSION).map
-LD_SCRIPT := linker_scripts/$(VERSION)/$(TARGET).ld
+ROM       := $(BUILD_DIR)/$(TARGET).$(VERSION).$(REV).uncompressed.z64
+ROMC 	  := $(BUILD_DIR)/$(TARGET).$(VERSION).$(REV).z64
+ELF       := $(BUILD_DIR)/$(TARGET).$(VERSION).$(REV).elf
+LD_MAP    := $(BUILD_DIR)/$(TARGET).$(VERSION).$(REV).map
+LD_SCRIPT := linker_scripts/$(VERSION)/$(REV)/$(TARGET).ld
 
 #### Setup ####
 
+# If gcc is used, define the NON_MATCHING flag respectively so the files that
+# are safe to be used can avoid using GLOBAL_ASM which doesn't work with gcc.
+ifeq ($(COMPILER),gcc)
+  $(warning WARNING: GCC support is experimental. Use at your own risk.)
+  CFLAGS += -DCOMPILER_GCC
+  NON_MATCHING := 1
+endif
+
+# Detect compiler and set variables appropriately.
+ifeq ($(COMPILER),gcc)
+  CC       := $(MIPS_BINUTILS_PREFIX)gcc
+else
+ifeq ($(COMPILER),ido)
+  CC       := $(TOOLS)/ido_recomp/$(DETECTED_OS)/7.1/cc
+  CC_OLD   := $(TOOLS)/ido_recomp/$(DETECTED_OS)/5.3/cc
+else
+$(error Unsupported compiler. Please use either ido or gcc as the COMPILER variable.)
+endif
+endif
+
+ifeq ($(COMPILER),gcc)
+  OPTFLAGS := -Os
+else
+  OPTFLAGS := -O2 -g3
+endif
+
+ifeq ($(COMPILER),gcc)
+  CFLAGS += -G 0 -ffast-math -fno-unsafe-math-optimizations -march=vr4300 -mfix4300 -mabi=32 -mno-abicalls -mdivide-breaks -fno-zero-initialized-in-bss -fno-toplevel-reorder -ffreestanding -fno-common -fno-merge-constants -mno-explicit-relocs -mno-split-addresses $(CHECK_WARNINGS) -funsigned-char
+  MIPS_VERSION := -mips3
+else
+  # we support Microsoft extensions such as anonymous structs, which the compiler does support but warns for their usage. Surpress the warnings with -woff.
+  CFLAGS += -G 0 -non_shared -fullwarn -verbose -Xcpluscomm $(IINC) -nostdinc -Wab,-r4300_mul -woff 649,838,712,516
+  MIPS_VERSION := -mips2
+  WARNINGS := -fullwarn -verbose -woff 624,649,838,712,516,513,596,564,594,709,807
+endif
+
+ifeq ($(COMPILER),ido)
+  # Have CC_CHECK pretend to be a MIPS compiler
+  MIPS_BUILTIN_DEFS := -D_MIPS_ISA_MIPS2=2 -D_MIPS_ISA=_MIPS_ISA_MIPS2 -D_ABIO32=1 -D_MIPS_SIM=_ABIO32 -D_MIPS_SZINT=32 -D_MIPS_SZLONG=32 -D_MIPS_SZPTR=32
+  CC_CHECK  = gcc -fno-builtin -fsyntax-only -funsigned-char -std=gnu90 -D_LANGUAGE_C -DNON_MATCHING $(MIPS_BUILTIN_DEFS) $(IINC) $(CHECK_WARNINGS)
+  ifeq ($(shell getconf LONG_BIT), 32)
+    # Work around memory allocation bug in QEMU
+    export QEMU_GUEST_BASE := 1
+  else
+    # Ensure that gcc (warning check) treats the code as 32-bit
+    CC_CHECK += -m32
+  endif
+else
+  CC_CHECK  = @:
+endif
+
 BUILD_DEFINES ?=
 
+# Version check
+ifeq ($(VERSION),jp)
+    BUILD_DEFINES   += -DVERSION_JP=1
+endif
+
 ifeq ($(VERSION),us)
     BUILD_DEFINES   += -DVERSION_US=1
-else
-$(error Invalid VERSION variable detected. Please use 'us')
+endif
+
+ifeq ($(VERSION),eu)
+    BUILD_DEFINES   += -DVERSION_EU=1
+	REV := rev0
+endif
+
+ifeq ($(VERSION),au)
+	BUILD_DEFINES	+= -DVERSION_AU=1
+	REV := rev0
+endif
+
+ifeq ($(VERSION),ln)
+	BUILD_DEFINES	+= -DVERSION_LN=1
+	REV := rev0
 endif
 
 ifeq ($(NON_MATCHING),1)
     BUILD_DEFINES   += -DNON_MATCHING -DAVOID_UB
-    COMPARE  := 0
+    CPPFLAGS += -DNON_MATCHING -DAVOID_UB
 endif
 
 MAKE = make
@@ -95,6 +167,7 @@ else ifeq ($(UNAME_S),Darwin)
     DETECTED_OS := macos
     MAKE := gmake
     CPPFLAGS += -xc++
+    CC_CHECK_COMP := clang
 endif
 
 # Support python venv's if one is installed.
@@ -137,7 +210,7 @@ OBJDUMP         := $(MIPS_BINUTILS_PREFIX)objdump
 ICONV           := iconv
 ASM_PROC        := $(PYTHON) $(TOOLS)/asm-processor/build.py
 CAT             := cat
-TORCH           := tools/Torch/cmake-build-release/torch
+TORCH           := $(TOOLS)/Torch/cmake-build-release/torch
 
 # Prefer clang as C preprocessor if installed on the system
 ifneq (,$(call find-command,clang))
@@ -151,14 +224,14 @@ endif
 ASM_PROC_FLAGS  := --input-enc=utf-8 --output-enc=euc-jp --convert-statics=global-with-filename
 
 SPLAT           ?= $(PYTHON) $(TOOLS)/splat/split.py
-SPLAT_YAML      ?= $(TARGET).$(VERSION).yaml
+SPLAT_YAML      ?= $(TARGET).$(VERSION).$(REV).yaml
 
 COMPTOOL		:= $(TOOLS)/comptool.py
 COMPTOOL_DIR	:= baserom
 MIO0			:= $(TOOLS)/mio0
 
 
-IINC := -Iinclude -Ibin/$(VERSION) -I.
+IINC := -Iinclude -Ibin/$(VERSION).$(REV) -I.
 IINC += -Ilib/ultralib/include -Ilib/ultralib/include/PR -Ilib/ultralib/include/ido
 
 ifeq ($(KEEP_MDEBUG),0)
@@ -190,10 +263,6 @@ else
     CC_CHECK          := @:
 endif
 
-
-CFLAGS          += -G 0 -non_shared -Xcpluscomm -nostdinc -Wab,-r4300_mul
-
-WARNINGS        := -fullwarn -verbose -woff 624,649,838,712,516,513,596,564,594,709
 ASFLAGS         := -march=vr4300 -32 -G0
 COMMON_DEFINES  := -D_MIPS_SZLONG=32
 GBI_DEFINES     := -DF3DEX_GBI
@@ -202,8 +271,6 @@ AS_DEFINES      := -DMIPSEB -D_LANGUAGE_ASSEMBLY -D_ULTRA64
 C_DEFINES       := -DLANGUAGE_C -D_LANGUAGE_C -DBUILD_VERSION=VERSION_H ${RELEASE_DEFINES}
 ENDIAN          := -EB
 
-OPTFLAGS        := -O2 -g3
-MIPS_VERSION    := -mips2
 ICONV_FLAGS     := --from-code=UTF-8 --to-code=EUC-JP
 
 # Use relocations and abi fpr names in the dump
@@ -225,12 +292,20 @@ endif
 
 #### Files ####
 
-$(shell mkdir -p asm bin linker_scripts/$(VERSION)/auto)
+$(shell mkdir -p asm bin linker_scripts/$(VERSION)/$(REV)/auto)
 
 SRC_DIRS      := $(shell find src -type d)
-ASM_DIRS      := $(shell find asm/$(VERSION) -type d -not -path "asm/$(VERSION)/nonmatchings/*")
+# Temporary, until we decide how we're gonna handle other versions
+ifeq ($(VERSION), jp)
+SRC_DIRS      := $(shell find srcjp -type d)
+endif
+ifeq ($(VERSION), eu)
+SRC_DIRS      := $(shell find srceu -type d)
+endif
+ASM_DIRS      := $(shell find asm/$(VERSION)/$(REV) -type d -not -path "asm/$(VERSION)/$(REV)/nonmatchings/*")
 BIN_DIRS      := $(shell find bin -type d)
 
+
 C_FILES       := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c))
 C_FILES       := $(filter-out %.inc.c,$(C_FILES))
 S_FILES       := $(foreach dir,$(ASM_DIRS) $(SRC_DIRS),$(wildcard $(dir)/*.s))
@@ -245,8 +320,9 @@ DEP_FILES := $(O_FILES:.o=.d) \
              $(O_FILES:.o=.asmproc.d)
 
 # create build directories
-$(shell mkdir -p $(BUILD_DIR)/linker_scripts/$(VERSION) $(BUILD_DIR)/linker_scripts/$(VERSION)/auto $(foreach dir,$(SRC_DIRS) $(ASM_DIRS) $(BIN_DIRS),$(BUILD_DIR)/$(dir)))
+$(shell mkdir -p $(BUILD_DIR)/linker_scripts/$(VERSION)/$(REV) $(BUILD_DIR)/linker_scripts/$(VERSION)/$(REV)/auto $(foreach dir,$(SRC_DIRS) $(ASM_DIRS) $(BIN_DIRS),$(BUILD_DIR)/$(dir)))
 
+ifeq ($(COMPILER),ido)
 
 # directory flags
 build/src/libultra/gu/%.o: OPTFLAGS := -O3 -g0
@@ -258,6 +334,13 @@ build/src/libultra/host/%.o:	OPTFLAGS := -O1 -g0
 build/src/audio/%.o: OPTFLAGS := -O2 -g0
 
 # per-file flags
+build/src/audio/audio_effects.o: CFLAGS += -use_readwrite_const
+build/src/audio/audio_heap.o: CFLAGS += -use_readwrite_const
+build/src/audio/audio_load.o: CFLAGS += -use_readwrite_const
+build/src/audio/audio_seqplayer.o: CFLAGS += -use_readwrite_const
+build/src/audio/audio_playback.o: CFLAGS += -use_readwrite_const
+build/src/audio/audio_synthesis.o: CFLAGS += -use_readwrite_const
+
 build/src/libc_sprintf.o: OPTFLAGS := -O2 -g0
 build/src/libc_math64.o: OPTFLAGS := -O2 -g0
 
@@ -281,16 +364,55 @@ build/src/libultra/gu/mtxutil.o: CC := $(IDO)
 build/src/libultra/gu/cosf.o: CC := $(IDO)
 build/src/libultra/libc/xprintf.o: CC := $(IDO)
 build/src/libultra/libc/xldtob.o: CC := $(IDO)
+else
+# directory flags
+build/src/libultra/gu/%.o:    OPTFLAGS := -Os
+build/src/libultra/io/%.o:    OPTFLAGS := -Os
+build/src/libultra/os/%.o:    OPTFLAGS := -Os
+build/src/libultra/rmon/%.o:  OPTFLAGS := -Os
+build/src/libultra/debug/%.o: OPTFLAGS := -Os
+build/src/libultra/host/%.o:  OPTFLAGS := -Os
 
-#build/src/%.o: CC := $(ASM_PROC) $(ASM_PROC_FLAGS) $(IDO) -- $(AS) $(ASFLAGS) --
+# per-file flags
+build/src/audio/audio_load.o:      OPTFLAGS := -Os
+build/src/audio/audio_heap.o:      OPTFLAGS := -Os
+build/src/audio/audio_effects.o:   OPTFLAGS := -Os
+build/src/audio/audio_general.o:   OPTFLAGS := -Os
+build/src/audio/audio_playback.o:  OPTFLAGS := -Os
+build/src/audio/audio_seqplayer.o: OPTFLAGS := -Os
+build/src/audio/audio_thread.o:    OPTFLAGS := -Os
+
+build/src/libc_sprintf.o: OPTFLAGS := -Os
+build/src/libc_math64.o:  OPTFLAGS := -Os
+
+build/src/libultra/libc/ldiv.o:    OPTFLAGS := -Os
+build/src/libultra/libc/string.o:  OPTFLAGS := -Os
+build/src/libultra/libc/xlitob.o:  OPTFLAGS := -Os
+build/src/libultra/libc/xldtob.o:  OPTFLAGS := -Os
+build/src/libultra/libc/xprintf.o: OPTFLAGS := -Os
+build/src/libultra/libc/ll.o:      OPTFLAGS := -O2
+build/src/libultra/libc/ll.o: MIPS_VERSION := -mips3
+
+# cc & asm-processor
+build/src/libultra/gu/sqrtf.o:       OPTFLAGS := -Os
+build/src/libultra/gu/sinf.o:        OPTFLAGS := -Os
+build/src/libultra/gu/lookat.o:      OPTFLAGS := -Os
+build/src/libultra/gu/ortho.o:       OPTFLAGS := -Os
+build/src/libultra/gu/perspective.o: OPTFLAGS := -Os
+build/src/libultra/gu/mtxutil.o:     OPTFLAGS := -Os
+build/src/libultra/gu/cosf.o:        OPTFLAGS := -Os
+build/src/libultra/libc/xprintf.o:   OPTFLAGS := -Os
+build/src/libultra/libc/xldtob.o:    OPTFLAGS := -Os
+endif
 
 all: uncompressed
 
 toolchain:
-	@$(MAKE) -s -C tools
+	@$(MAKE) -s -C $(TOOLS)
 
 torch:
-	@$(MAKE) -s -C tools torch
+	@$(MAKE) -s -C $(TOOLS) torch
+	rm -f torch.hash.yml
 
 init:
 	@$(MAKE) clean
@@ -305,50 +427,57 @@ uncompressed: $(ROM)
 ifneq ($(COMPARE),0)
 	@echo "$(GREEN)Calculating Rom Header Checksum... $(YELLOW)$<$(NO_COL)"
 	@$(PYTHON) $(COMPTOOL) -r $(ROM) .
-	@md5sum --status -c $(TARGET).$(VERSION).uncompressed.md5 && \
-	$(PRINT) "$(BLUE)$(TARGET).$(VERSION).uncompressed.z64$(NO_COL): $(GREEN)OK$(NO_COL)\n$(YELLOW) $(SF)" || \
-	$(PRINT) "$(BLUE)$(TARGET).$(VERSION).uncompressed.z64 $(RED)FAILED$(NO_COL)\n\
+	@md5sum --status -c $(TARGET).$(VERSION).$(REV).uncompressed.md5 && \
+	$(PRINT) "$(BLUE)$(TARGET).$(VERSION).$(REV).uncompressed.z64$(NO_COL): $(GREEN)OK$(NO_COL)\n$(YELLOW) $(SF)" || \
+	$(PRINT) "$(BLUE)$(TARGET).$(VERSION).$(REV).uncompressed.z64 $(RED)FAILED$(NO_COL)\n\
 	$(RED)CAN'T LET YOU DO THAT, STARFOX.$(NO_COL)\n"
-	@md5sum --status -c $(TARGET).$(VERSION).uncompressed.md5
+	@md5sum --status -c $(TARGET).$(VERSION).$(REV).uncompressed.md5
 endif
 
 compressed: $(ROMC)
 ifeq ($(COMPARE),1)
 	@echo "$(GREEN)Calculating Rom Header Checksum... $(YELLOW)$<$(NO_COL)"
 	@$(PYTHON) $(COMPTOOL) -r $(ROMC) .
-	@md5sum --status -c $(TARGET).$(VERSION).md5 && \
-	$(PRINT) "$(BLUE)$(TARGET).$(VERSION).z64$(NO_COL): $(GREEN)OK$(NO_COL)\n" || \
-	$(PRINT) "$(BLUE)$(TARGET).$(VERSION).z64 $(RED)FAILED$(NO_COL)\n"
-	@md5sum --status -c $(TARGET).$(VERSION).uncompressed.md5
+	@md5sum --status -c $(TARGET).$(VERSION).$(REV).md5 && \
+	$(PRINT) "$(BLUE)$(TARGET).$(VERSION).$(REV).z64$(NO_COL): $(GREEN)OK$(NO_COL)\n" || \
+	$(PRINT) "$(BLUE)$(TARGET).$(VERSION).$(REV).z64 $(RED)FAILED$(NO_COL)\n"
+	@md5sum --status -c $(TARGET).$(VERSION).$(REV).uncompressed.md5
 endif
 
 #### Main Targets ###
 
 decompress: $(BASEROM)
 	@echo "Decompressing ROM..."
-	@$(PYTHON) $(COMPTOOL) -de $(COMPTOOL_DIR) -m $(MIO0) $(BASEROM) $(BASEROM_UNCOMPRESSED)
+	@$(PYTHON) $(COMPTOOL) $(DECOMPRESS_OPT) -dse $(COMPTOOL_DIR) -m $(MIO0) $(BASEROM) $(BASEROM_UNCOMPRESSED)
+
+compress: $(BASEROM)
+	@echo "Compressing ROM..."
+	@$(PYTHON) $(COMPTOOL) $(COMPRESS_OPT) -c -m $(MIO0) $(ROM) $(ROMC)
 
 extract:
-	@$(RM) -r asm/$(VERSION) bin/$(VERSION)
+	@$(RM) -r asm/$(VERSION)/$(REV) bin/$(VERSION)/$(REV)
 	@echo "Unifying yamls..."
-	@$(CAT) yamls/$(VERSION)/header.yaml yamls/$(VERSION)/main.yaml yamls/$(VERSION)/assets.yaml yamls/$(VERSION)/overlays.yaml > $(SPLAT_YAML)
+	@$(CAT) yamls/$(VERSION)/$(REV)/header.yaml yamls/$(VERSION)/$(REV)/main.yaml yamls/$(VERSION)/$(REV)/assets.yaml yamls/$(VERSION)/$(REV)/overlays.yaml > $(SPLAT_YAML)
 	@echo "Extracting..."
 	@$(SPLAT) $(SPLAT_YAML)
 
 assets:
 	@echo "Extracting assets from ROM..."
-	@$(TORCH) code $(BASEROM_UNCOMPRESSED) -v
+	@$(TORCH) code $(BASEROM_UNCOMPRESSED)
 	@$(TORCH) header $(BASEROM_UNCOMPRESSED)
 	@$(TORCH) modding export $(BASEROM_UNCOMPRESSED)
 
+mod:
+	@$(TORCH) modding import code $(BASEROM_UNCOMPRESSED)
+
 clean:
 	rm -f torch.hash.yml
-	@git clean -fdx asm/
-	@git clean -fdx bin/
+	@git clean -fdx asm/$(VERSION)/$(REV)
+	@git clean -fdx bin/$(VERSION)/$(REV)
 	@git clean -fdx build/
 	@git clean -fdx src/assets/
 	@git clean -fdx include/assets/
-	@git clean -fdx linker_scripts/*.ld
+	@git clean -fdx linker_scripts/$(VERSION)/$(REV)/*.ld
 
 format:
 	@$(PYTHON) $(TOOLS)/format.py -j $(N_THREADS)
@@ -364,12 +493,12 @@ expected:
 
 context:
 	@echo "Generating ctx.c ..."
-	@$(PYTHON) ./tools/m2ctx.py $(filter-out $@, $(MAKECMDGOALS))
+	@$(PYTHON) ./$(TOOLS)/m2ctx.py $(filter-out $@, $(MAKECMDGOALS))
 
 disasm:
-	@$(RM) -r asm/$(VERSION) bin/$(VERSION)
+	@$(RM) -r asm/$(VERSION)/$(REV) bin/$(VERSION)/$(REV)
 	@echo "Unifying yamls..."
-	@$(CAT) yamls/$(VERSION)/header.yaml yamls/$(VERSION)/main.yaml yamls/$(VERSION)/assets.yaml yamls/$(VERSION)/overlays.yaml > $(SPLAT_YAML)
+	@$(CAT) yamls/$(VERSION)/$(REV)/header.yaml yamls/$(VERSION)/$(REV)/main.yaml yamls/$(VERSION)/$(REV)/assets.yaml yamls/$(VERSION)/$(REV)/overlays.yaml > $(SPLAT_YAML)
 	@echo "Extracting..."
 	@$(SPLAT) $(SPLAT_YAML) --disassemble-all
 
@@ -378,7 +507,7 @@ disasm:
 # Final ROM
 $(ROMC): $(BASEROM_UNCOMPRESSED)
 	$(call print,Compressing ROM...,$<,$@)
-	@$(PYTHON) $(COMPTOOL) -c $(ROM) $(ROMC)
+	@$(PYTHON) $(COMPTOOL) -c -m $(MIO0) $(ROM) $(ROMC)
 
 # Uncompressed ROM
 $(ROM): $(ELF)
@@ -386,10 +515,10 @@ $(ROM): $(ELF)
 	$(V)$(OBJCOPY) -O binary $< $@
 
 # Link
-$(ELF): $(LIBULTRA_O) $(O_FILES) $(LD_SCRIPT) $(BUILD_DIR)/linker_scripts/$(VERSION)/hardware_regs.ld $(BUILD_DIR)/linker_scripts/$(VERSION)/undefined_syms.ld $(BUILD_DIR)/linker_scripts/$(VERSION)/pif_syms.ld
+$(ELF): $(LIBULTRA_O) $(O_FILES) $(LD_SCRIPT) $(BUILD_DIR)/linker_scripts/$(VERSION)/$(REV)/hardware_regs.ld $(BUILD_DIR)/linker_scripts/$(VERSION)/$(REV)/undefined_syms.ld $(BUILD_DIR)/linker_scripts/$(VERSION)/$(REV)/pif_syms.ld
 	$(call print,Linking:,$<,$@)
 	$(V)$(LD) $(LDFLAGS) -T $(LD_SCRIPT) \
-		-T $(BUILD_DIR)/linker_scripts/$(VERSION)/hardware_regs.ld -T $(BUILD_DIR)/linker_scripts/$(VERSION)/undefined_syms.ld -T $(BUILD_DIR)/linker_scripts/$(VERSION)/pif_syms.ld \
+		-T $(BUILD_DIR)/linker_scripts/$(VERSION)/$(REV)/hardware_regs.ld -T $(BUILD_DIR)/linker_scripts/$(VERSION)/$(REV)/undefined_syms.ld -T $(BUILD_DIR)/linker_scripts/$(VERSION)/$(REV)/pif_syms.ld \
 		-Map $(LD_MAP) -o $@
 
 # PreProcessor
@@ -421,7 +550,7 @@ build/src/libultra/libc/ll.o: src/libultra/libc/ll.c
 	$(call print,Patching:,$<,$@)
 	@$(CC_CHECK) $(CC_CHECK_FLAGS) $(IINC) -I $(dir $*) $(CHECK_WARNINGS) $(BUILD_DEFINES) $(COMMON_DEFINES) $(RELEASE_DEFINES) $(GBI_DEFINES) $(C_DEFINES) $(MIPS_BUILTIN_DEFS) -o $@ $<
 	$(V)$(CC) -c $(CFLAGS) $(BUILD_DEFINES) $(IINC) $(WARNINGS) $(MIPS_VERSION) $(ENDIAN) $(COMMON_DEFINES) $(RELEASE_DEFINES) $(GBI_DEFINES) $(C_DEFINES) $(OPTFLAGS) -o $@ $<
-	$(V)$(PYTHON) tools/set_o32abi_bit.py $@
+	$(V)$(PYTHON) $(TOOLS)/set_o32abi_bit.py $@
 	$(V)$(OBJDUMP_CMD)
 	$(V)$(RM_MDEBUG)
 
@@ -430,4 +559,4 @@ build/src/libultra/libc/ll.o: src/libultra/libc/ll.c
 # Print target for debugging
 print-% : ; $(info $* is a $(flavor $*) variable set to [$($*)]) @true
 
-.PHONY: all uncompressed compressed clean init extract expected format checkformat decompress assets context disasm toolchain
+.PHONY: all uncompressed compressed clean init extract expected format checkformat decompress compress assets context disasm toolchain

README.md

@@ -6,7 +6,7 @@ This is a WIP **matching decompilation** of ***Starfox 64***. The purpose of the
 
 It currently builds the following ROM:
 
-* starfox64.us.z64 `MD5: 741a94eee093c4c8684e66b89f8685e8`
+* starfox64.us.rev1.z64 `MD5: 741a94eee093c4c8684e66b89f8685e8`
 
 **This repo does not include any assets or assembly code necessary for compiling the ROM. A prior copy of the game is required to extract the required assets.**
 
@@ -68,8 +68,9 @@ The build process has a few python packages required that are located in `/tools
 To install them simply run in a terminal:
 
 ```bash
-python3 -m pip install -r ./tools/requirements-python.txt --break-system-packages
+python3 -m pip install -r ./tools/requirements-python.txt
 ```
+* Depending on your python version, you might need to add  --break-system-packages, or use venv.
 
 #### 4. Update submodules & build toolchain
 
@@ -80,7 +81,8 @@ make toolchain
 
 #### 5. Prepare a base ROM
 
-Copy your ROM to the root of this new project directory, and rename the file of the baserom to reflect the version of ROM you are using. ex: `baserom.us.z64`
+Copy your ROM to the root of this new project directory, and rename the file of the baserom to reflect the version of ROM you are using. ex: `baserom.us.rev1.z64`
+* Make sure the ROM is the US version, revision 1.1 (REV A).
 
 #### 6. Make and Build the ROM
 
@@ -91,17 +93,17 @@ make init
 ```
 This will create the build folders, a new folder with the assembly as well as containing the disassembly of nearly all the files containing code.
 
-this make target will also build the ROM. If all goes well, a new ROM called "starfox64.us.z64" should be built and the following text should be printed:
+this make target will also build the ROM. If all goes well, a new ROM called "starfox64.us.rev1.z64" should be built and the following text should be printed:
 
 ```bash
-741a94eee093c4c8684e66b89f8685e8  build/starfox64.us.z64
-./build/starfox64.us.z64: OK
+741a94eee093c4c8684e66b89f8685e8  build/starfox64.us.rev1.z64
+./build/starfox64.us.rev1.z64: OK
 ```
 
 If you instead see the following:
 
 ```bash
-./build/starfox64.us.z64: FAILED
+./build/starfox64.us.rev1.z64: FAILED
 md5sum: WARNING: 1 computed checksum did NOT match
 ```
 

assets/yaml/jp/rev0/ast_7_ti_1.yaml

@@ -0,0 +1,269 @@
+:config:
+  segments:
+    - [0x07, 0x9DE6E0]
+  header:
+    code:
+      - '#include "assets/ast_7_ti_1.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+
+D_AST_7_TI_1_7000000:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 28, offset: 0x07000000, symbol: D_AST_7_TI_1_7000000, tlut: 0x07001108 }
+
+D_TI1_7000A80:
+  { type: GFX, offset: 0x7000A80, symbol: D_TI1_7000A80 }
+
+D_TI1_7000D08:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x07000D08, symbol: D_TI1_7000D08, tlut: 0x07001108 }
+
+D_TI1_7001108:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 176, offset: 0x07001108, symbol: D_TI1_7001108 }
+
+D_TI1_7001268:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x7001268, symbol: D_TI1_7001268 }
+
+D_TI1_7002270:
+  { type: GFX, offset: 0x7002270, symbol: D_TI1_7002270 }
+
+D_TI1_7002490:
+  { type: GFX, offset: 0x7002490, symbol: D_TI1_7002490 }
+
+D_TI1_7002730:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07002730, symbol: D_TI1_7002730 }
+
+D_TI1_7002930:
+  { type: GFX, offset: 0x7002930, symbol: D_TI1_7002930 }
+
+D_TI1_7002C88:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x7002C88, symbol: D_TI1_7002C88 }
+
+D_TI1_7003488:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x07003488, symbol: D_TI1_7003488, tlut: 0x07003888 }
+
+D_TI1_7003888:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x07003888, symbol: D_TI1_7003888 }
+
+D_TI1_7003A90:
+  { type: GFX, offset: 0x7003A90, symbol: D_TI1_7003A90 }
+
+D_TI1_7003C50:
+  { type: GFX, offset: 0x7003C50, symbol: D_TI1_7003C50 }
+
+D_TI1_7003E30:
+  { type: GFX, offset: 0x7003E30, symbol: D_TI1_7003E30 }
+
+D_TI1_7003FC0:
+  { type: GFX, offset: 0x7003FC0, symbol: D_TI1_7003FC0 }
+
+D_TI1_7004170:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07004170, symbol: D_TI1_7004170 }
+
+D_TI1_7004370:
+  { type: GFX, offset: 0x7004370, symbol: D_TI1_7004370 }
+
+D_TI1_7004560:
+  { type: GFX, offset: 0x7004560, symbol: D_TI1_7004560 }
+
+D_TI1_7004780:
+  { type: GFX, offset: 0x7004780, symbol: D_TI1_7004780 }
+
+D_TI1_70049A0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x070049A0, symbol: D_TI1_70049A0 }
+
+D_TI1_7004BA0:
+  { type: GFX, offset: 0x7004BA0, symbol: D_TI1_7004BA0 }
+
+D_TI1_7004E78:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07004E78, symbol: D_TI1_7004E78 }
+
+D_TI1_7005078:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07005078, symbol: D_TI1_7005078 }
+
+D_TI1_7005280:
+  { type: GFX, offset: 0x7005280, symbol: D_TI1_7005280 }
+
+D_TI1_7005420:
+  { type: GFX, offset: 0x7005420, symbol: D_TI1_7005420 }
+
+D_TI1_70067C4:
+  { type: SF64:ANIM, offset: 0x70067C4, symbol: D_TI1_70067C4 }
+
+aTi1DesertCrawlerSkel:
+  { type: SF64:SKELETON, offset: 0x7006990, symbol: aTi1DesertCrawlerSkel}
+
+D_TI1_7006F74:
+  { type: SF64:ANIM, offset: 0x7006F74, symbol: D_TI1_7006F74 }
+
+D_TI1_7007130:
+  { type: SF64:ANIM, offset: 0x7007130, symbol: D_TI1_7007130 }
+
+D_TI1_7007234:
+  { type: SF64:ANIM, offset: 0x7007234, symbol: D_TI1_7007234 }
+
+D_TI1_700733C:
+  { type: SF64:ANIM, offset: 0x700733C, symbol: D_TI1_700733C }
+
+D_TI1_7007350:
+  { type: GFX, offset: 0x7007350, symbol: D_TI1_7007350 }
+
+D_TI1_7007AB0:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x7007AB0, symbol: D_TI1_7007AB0, tlut: 0x07007EB0 }
+
+D_TI1_7007EB0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 240, offset: 0x07007EB0, symbol: D_TI1_7007EB0 }
+
+D_TI1_7008090:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x07008090, symbol: D_TI1_7008090, tlut: 0x07008490 }
+
+D_TI1_7008490:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x07008490, symbol: D_TI1_7008490 }
+
+D_TI1_7008680:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x07008680, symbol: D_TI1_7008680, tlut: 0x07008490 }
+
+D_TI1_7008780:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 216, offset: 0x07008780, symbol: D_TI1_7008780 }
+
+D_TI1_7008930:
+  { type: GFX, offset: 0x7008930, symbol: D_TI1_7008930 }
+
+D_TI1_7008D10:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x7008D10, symbol: D_TI1_7008D10 }
+
+D_TI1_7008F10:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x7008F10, symbol: D_TI1_7008F10 }
+
+D_TI1_7009110:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009110, symbol: D_TI1_7009110 }
+
+D_TI1_7009310:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009310, symbol: D_TI1_7009310 }
+
+D_TI1_7009510:
+  { type: GFX, offset: 0x7009510, symbol: D_TI1_7009510 }
+
+D_TI1_70096D8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x070096D8, symbol: D_TI1_70096D8 }
+
+aTiDelphorDL:
+  { type: GFX, offset: 0x70098E0, symbol: aTiDelphorDL }
+
+D_TI1_7009B58:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009B58, symbol: D_TI1_7009B58 }
+
+aTi1Bomb1DL:
+  { type: GFX, offset: 0x7009D60, symbol: aTi1Bomb1DL }
+
+D_TI1_700A190:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0700A190, symbol: D_TI1_700A190 }
+
+aTi1Bomb2DL:
+  { type: GFX, offset: 0x700A990, symbol: aTi1Bomb2DL }
+
+D_TI1_700AAD8:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x700AAD8, symbol: D_TI1_700AAD8, tlut: 0x700AB58 }
+
+D_TI1_700AB58:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x700AB58, symbol: D_TI1_700AB58 }
+
+aTi1LandmineDL:
+  { type: GFX, offset: 0x700AB70, symbol: aTi1LandmineDL }
+
+D_TI1_700AEA8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0700AEA8, symbol: D_TI1_700AEA8 }
+
+D_TI1_700AF30:
+  { type: GFX, offset: 0x700AF30, symbol: D_TI1_700AF30 }
+
+D_TI1_700B5B8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700B5B8, symbol: D_TI1_700B5B8 }
+
+D_TI1_700B7B8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700B7B8, symbol: D_TI1_700B7B8 }
+
+aTi1FekudaGun1DL:
+  { type: GFX, offset: 0x700B9C0, symbol: aTi1FekudaGun1DL }
+
+D_TI1_700BB10:
+  { type: GFX, offset: 0x700BB10, symbol: D_TI1_700BB10 }
+
+aTiBridgeDL:
+  { type: GFX, offset: 0x700BE00, symbol: aTiBridgeDL }
+
+D_TI1_700BFB0:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x0700BFB0, symbol: D_TI1_700BFB0, tlut: 0x0700C3B0 }
+
+D_TI1_700C3B0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 128, offset: 0x0700C3B0, symbol: D_TI1_700C3B0 }
+
+aTi1FekudaDL:
+  { type: GFX, offset: 0x700C4B0, symbol: aTi1FekudaDL }
+
+aTi1DesertRoverAnim:
+  { type: SF64:ANIM, offset: 0x700C8D8, symbol: aTi1DesertRoverAnim }
+
+aTi1DesertRoverSkel:
+  { type: SF64:SKELETON, offset: 0x700C964, symbol: aTi1DesertRoverSkel }
+
+aTi1FekudaGun2DL:
+  { type: GFX, offset: 0x700C980, symbol: aTi1FekudaGun2DL }
+
+aTiBomberAnim:
+  { type: SF64:ANIM, offset: 0x700CAF4, symbol: aTiBomberAnim}
+
+aTiBomberSkel:
+  {type: SF64:SKELETON, offset: 0x700CB60, symbol: aTiBomberSkel}
+
+aTiRascoAnim:
+  { type: SF64:ANIM, offset: 0x700D534, symbol: aTiRascoAnim }
+
+aTiRascoSkel:
+  {type: SF64:SKELETON, offset: 0x700D700, symbol: aTiRascoSkel}
+
+D_TI1_700D740:
+  { type: GFX, offset: 0x700D740, symbol: D_TI1_700D740 }
+
+D_TI1_700D880:
+  { type: GFX, offset: 0x700D880, symbol: D_TI1_700D880 }
+
+D_TI1_700D9B0:
+  { type: GFX, offset: 0x700D9B0, symbol: D_TI1_700D9B0 }
+
+D_TI1_700DAD0:
+  { type: GFX, offset: 0x700DAD0, symbol: D_TI1_700DAD0 }
+
+D_TI1_700DBB0:
+  { type: GFX, offset: 0x700DBB0, symbol: D_TI1_700DBB0 }
+
+D_TI1_700DC50:
+  { type: GFX, offset: 0x700DC50, symbol: D_TI1_700DC50 }
+
+D_TI1_700DD68:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0700DD68, symbol: D_TI1_700DD68 }
+
+D_TI1_700DDF0:
+  { type: GFX, offset: 0x700DDF0, symbol: D_TI1_700DDF0 }
+
+D_TI1_700DED0:
+  { type: GFX, offset: 0x700DED0, symbol: D_TI1_700DED0 }
+
+D_TI1_700DF70:
+  { type: GFX, offset: 0x700DF70, symbol: D_TI1_700DF70 }
+
+D_TI1_700E030:
+  { type: GFX, offset: 0x700E030, symbol: D_TI1_700E030 }
+
+D_TI1_700E1E8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E1E8, symbol: D_TI1_700E1E8 }
+
+aTiBoulderDL:
+  { type: GFX, offset: 0x700E3F0, symbol: aTiBoulderDL }
+
+D_TI1_700E858:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E858, symbol: D_TI1_700E858 }
+
+D_TI1_700EA60:
+  { type: GFX, offset: 0x700EA60, symbol: D_TI1_700EA60 }
+
+# size = 0xEDB0

assets/yaml/jp/rev0/ast_7_ti_2.yaml

@@ -1,13 +1,12 @@
 :config:
   segments:
-    - [0x07, 0x9DD390]
+    - [0x07, 0x9AD730]
   header:
     code:
       - '#include "assets/ast_7_ti_2.h"'
     header:
       - '#include "gfx.h"'
       - '#include "sf64object.h"'
-      - '#include "structs.h"'
 
 D_TI2_7003EE8:
   { type: SF64:ANIM, offset: 0x7003EE8, symbol: D_TI2_7003EE8 }

assets/yaml/jp/rev0/ast_8_ti.yaml

@@ -1,13 +1,12 @@
 :config:
   segments:
-    - [0x08, 0x9EB5E0]
+    - [0x08, 0x9BB980]
   header:
     code:
       - '#include "assets/ast_8_ti.h"'
     header:
       - '#include "gfx.h"'
       - '#include "sf64object.h"'
-      - '#include "structs.h"'
 
 D_TI_8000708: { type: SF64:ANIM, offset: 0x8000708, symbol: D_TI_8000708 }
 

assets/yaml/jp/rev0/ast_9_ti.yaml

@@ -1,13 +1,12 @@
 :config:
   segments:
-    - [0x09, 0x9F4880]
+    - [0x09, 0x9C4C20]
   header:
     code:
       - '#include "assets/ast_9_ti.h"'
     header:
       - '#include "gfx.h"'
       - '#include "sf64object.h"'
-      - '#include "structs.h"'
 
 D_TI_9004288:
   { type: SF64:ANIM, offset: 0x9004288, symbol: D_TI_9004288 }

assets/yaml/jp/rev0/ast_A_ti.yaml

@@ -1,14 +1,13 @@
 :config:
   segments:
-    - [0x0A, 0xA049A0]
+    - [0x0A, 0x9D4D40]
   header:
     code:
       - '#include "assets/ast_A_ti.h"'
     header:
       - '#include "gfx.h"'
       - '#include "sf64object.h"'
-      - '#include "structs.h"'
-      
+
 D_TI_A000000:
   {type: GFX, offset: 0xA000000, symbol: D_TI_A000000}
 
@@ -59,4 +58,3 @@ D_TI_A002170:
 
 D_TI_A009990:
   {type: SF64:ANIM, offset: 0xA009990, symbol: D_TI_A009990}
-

assets/yaml/jp/rev0/ast_allies.yaml

@@ -0,0 +1,113 @@
+:config:
+  segments:
+    - [0x0D, 0x9257A0]
+  header:
+    code:
+      - '#include "assets/ast_allies.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+
+aKattMarkDL:
+  { type: GFX, offset: 0xD000000, symbol: aKattMarkDL }
+
+ast_allies_seg13_vtx_00000098:
+  { type: VTX, count: 3, offset: 0x0D000098, symbol: ast_allies_seg13_vtx_00000098 }
+
+D_D0000C8:
+  { type: BLOB, size: 0x18, offset: 0x0D0000C8, symbol: D_D0000C8 }
+
+aKattMarkTex:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D0000E0, symbol: aKattMarkTex, tlut: 0x0D000160 }
+
+aKattMarkTLUT:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD000160, symbol: aKattMarkTLUT }
+
+D_D000170:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD000170, symbol: D_D000170 }
+
+D_D001090:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD001090, symbol: D_D001090 }
+
+D_D001FB0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD001FB0, symbol: D_D001FB0 }
+
+D_D002ED0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD002ED0, symbol: D_D002ED0 }
+
+D_D003DF0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD003DF0, symbol: D_D003DF0 }
+
+D_D004D10:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD004D10, symbol: D_D004D10 }
+
+D_D005C30:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD005C30, symbol: D_D005C30 }
+
+D_D006B50:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD006B50, symbol: D_D006B50 }
+
+D_D007A70:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD007A70, symbol: D_D007A70 }
+
+D_D008990:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD008990, symbol: D_D008990 }
+
+aKattRadarMarkDL:
+  { type: GFX, offset: 0xD0098B0, symbol: aKattRadarMarkDL }
+
+aKattRadarMarkTex:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x0D009938, symbol: aKattRadarMarkTex }
+
+aKattShipDL:
+  { type: GFX, offset: 0xD009A40, symbol: aKattShipDL }
+
+D_D00A3B8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0D00A3B8, symbol: D_D00A3B8 }
+
+D_D00ABB8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00ABB8, symbol: D_D00ABB8 }
+
+D_D00ADB8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00ADB8, symbol: D_D00ADB8 }
+
+D_D00AFB8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x0D00AFB8, symbol: D_D00AFB8 }
+
+D_D00B3B8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00B3B8, symbol: D_D00B3B8 }
+
+aBillMarkDL:
+  { type: GFX, offset: 0xD00B5C0, symbol: aBillMarkDL }
+
+# Letter B
+aBillMarkTex:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B688, symbol: aBillMarkTex, tlut: 0xD00B708 }
+
+aBillMarkTLUT:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B708, symbol: aBillMarkTLUT }
+
+aJamesMarkDL:
+  { type: GFX, offset: 0xD00B720, symbol: aJamesMarkDL }
+
+# Letter J ?
+aJamesMarkTex:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B7F0, symbol: aJamesMarkTex, tlut: 0xD00B870 }
+
+aJamesMarkTLUT:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B870, symbol: aJamesMarkTLUT }
+
+aBillShipDL:
+  { type: GFX, offset: 0xD00B880, symbol: aBillShipDL }
+
+ast_allies_seg13_vtx_BB70:
+  { type: VTX, count: 144, offset: 0xD00BB70, symbol: ast_allies_seg13_vtx_BB70 }
+
+D_D00C470:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0xD00C470, symbol: D_D00C470 }
+
+D_D00C670:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00C670, symbol: D_D00C670 }
+
+D_D00C870:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00C870, symbol: D_D00C870 }

assets/yaml/jp/rev0/ast_andross.yaml

@@ -0,0 +1,269 @@
+:config:
+  segments:
+    - [0x0C, 0xCAEA30]
+  header:
+    code:
+      - '#include "assets/ast_andross.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+      - '#include "sf64level.h"'
+      - '#include "sf64event.h"'
+      - '#include "sf64player.h"'
+      - '#include "sf64audio_external.h"'
+      - '#include "sf64mesg.h"'
+
+D_ANDROSS_C000000:
+  {type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 28, offset: 0xC000000, symbol: D_ANDROSS_C000000}
+
+aAndTitleCardTex:
+  {type: TEXTURE, ctype: u8, format: IA8, width: 128, height: 28, offset: 0xC000A80, symbol: aAndTitleCardTex}
+
+D_ANDROSS_C001880:
+  {type: GFX, offset: 0xC001880, symbol: D_ANDROSS_C001880}
+
+D_ANDROSS_C0019E8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0xC0019E8, symbol: D_ANDROSS_C0019E8}
+
+D_ANDROSS_C00208C:
+  {type: SF64:ANIM, offset: 0xC00208C, symbol: D_ANDROSS_C00208C}
+
+D_ANDROSS_C002654:
+  {type: SF64:ANIM, offset: 0xC002654, symbol: D_ANDROSS_C002654}
+
+D_ANDROSS_C002B08:
+  {type: SF64:ANIM, offset: 0xC002B08, symbol: D_ANDROSS_C002B08}
+
+D_ANDROSS_C002B20:
+  {type: GFX, offset: 0xC002B20, symbol: D_ANDROSS_C002B20}
+
+D_ANDROSS_C002F00:
+  {type: GFX, offset: 0xC002F00, symbol: D_ANDROSS_C002F00}
+
+D_ANDROSS_C0031D0:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0xC0031D0, symbol: D_ANDROSS_C0031D0}
+
+D_ANDROSS_C0039D0:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0xC0039D0, symbol: D_ANDROSS_C0039D0}
+
+D_ANDROSS_C0041D0:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0xC0041D0, symbol: D_ANDROSS_C0041D0}
+
+D_ANDROSS_C0043D0:
+  {type: GFX, offset: 0xC0043D0, symbol: D_ANDROSS_C0043D0}
+
+D_ANDROSS_C004658:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0xC004658, symbol: D_ANDROSS_C004658}
+
+D_ANDROSS_C004860:
+  {type: GFX, offset: 0xC004860, symbol: D_ANDROSS_C004860}
+
+D_ANDROSS_C006F08:
+  {type: SF64:ANIM, offset: 0xC006F08, symbol: D_ANDROSS_C006F08}
+
+D_ANDROSS_C007FC0:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0xC007FC0, symbol: D_ANDROSS_C007FC0}
+
+D_ANDROSS_C0087C0:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0xC0087C0, symbol: D_ANDROSS_C0087C0}
+
+D_ANDROSS_C00DE48:
+  {type: SF64:ANIM, offset: 0xC00DE48, symbol: D_ANDROSS_C00DE48}
+
+D_ANDROSS_C00E598:
+  {type: SF64:ANIM, offset: 0xC00E598, symbol: D_ANDROSS_C00E598}
+
+D_ANDROSS_C00F108:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0xC00F108, symbol: D_ANDROSS_C00F108}
+
+D_ANDROSS_C010108:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0xC010108, symbol: D_ANDROSS_C010108}
+
+D_ANDROSS_C010188:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0xC010188, symbol: D_ANDROSS_C010188}
+
+D_ANDROSS_C010988:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0xC010988, symbol: D_ANDROSS_C010988}
+
+D_ANDROSS_C011988:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0xC011988, symbol: D_ANDROSS_C011988}
+
+D_ANDROSS_C012188:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0xC012188, symbol: D_ANDROSS_C012188}
+
+D_ANDROSS_C012988:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0xC012988, symbol: D_ANDROSS_C012988}
+
+D_ANDROSS_C013738:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0xC013738, symbol: D_ANDROSS_C013738}
+
+D_ANDROSS_C013F38:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0xC013F38, symbol: D_ANDROSS_C013F38}
+
+D_ANDROSS_C014738:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0xC014738, symbol: D_ANDROSS_C014738}
+
+D_ANDROSS_C015740:
+  {type: GFX, offset: 0xC015740, symbol: D_ANDROSS_C015740}
+
+D_ANDROSS_C016100:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0xC016100, symbol: D_ANDROSS_C016100}
+
+D_ANDROSS_C017050:
+  {type: SF64:ANIM, offset: 0xC017050, symbol: D_ANDROSS_C017050}
+
+D_ANDROSS_C017430:
+  {type: SF64:ANIM, offset: 0xC017430, symbol: D_ANDROSS_C017430}
+
+D_ANDROSS_C017440:
+  {type: GFX, offset: 0xC017440, symbol: D_ANDROSS_C017440}
+
+D_ANDROSS_C017598:
+  {type: VTX, count: 34, offset: 0xC017598, symbol: D_ANDROSS_C017598}
+
+D_ANDROSS_C0177B8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0xC0177B8, symbol: D_ANDROSS_C0177B8}
+
+D_ANDROSS_C018BC4:
+  {type: SF64:ANIM, offset: 0xC018BC4, symbol: D_ANDROSS_C018BC4}
+
+D_ANDROSS_C01C490:
+  {type: SF64:ANIM, offset: 0xC01C490, symbol: D_ANDROSS_C01C490}
+
+D_ANDROSS_C01CC3C:
+  {type: SF64:SKELETON, offset: 0xC01CC3C, symbol: D_ANDROSS_C01CC3C}
+
+D_ANDROSS_C020128:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0xC020128, symbol: D_ANDROSS_C020128}
+
+D_ANDROSS_C022520:
+  {type: GFX, offset: 0xC022520, symbol: D_ANDROSS_C022520}
+
+D_ANDROSS_C022A10:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0xC022A10, symbol: D_ANDROSS_C022A10}
+
+D_ANDROSS_C022A90:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0xC022A90, symbol: D_ANDROSS_C022A90}
+
+D_ANDROSS_C023B54:
+  {type: SF64:ANIM, offset: 0xC023B54, symbol: D_ANDROSS_C023B54}
+
+D_ANDROSS_C0240D0:
+  {type: SF64:ANIM, offset: 0xC0240D0, symbol: D_ANDROSS_C0240D0}
+
+D_ANDROSS_C025C00:
+  {type: SF64:ANIM, offset: 0xC025C00, symbol: D_ANDROSS_C025C00}
+
+D_ANDROSS_C029F74:
+  {type: SF64:ANIM, offset: 0xC029F74, symbol: D_ANDROSS_C029F74}
+
+D_ANDROSS_C02E494:
+  {type: SF64:ANIM, offset: 0xC02E494, symbol: D_ANDROSS_C02E494}
+
+D_ANDROSS_C02EDA0:
+  {type: SF64:ANIM, offset: 0xC02EDA0, symbol: D_ANDROSS_C02EDA0}
+
+D_ANDROSS_C02F634:
+  {type: SF64:ANIM, offset: 0xC02F634, symbol: D_ANDROSS_C02F634}
+
+D_ANDROSS_C030244:
+  {type: SF64:ANIM, offset: 0xC030244, symbol: D_ANDROSS_C030244}
+
+D_ANDROSS_C033780:
+  {type: SF64:ANIM, offset: 0xC033780, symbol: D_ANDROSS_C033780}
+
+D_ANDROSS_C033D98:
+  {type: SF64:ANIM, offset: 0xC033D98, symbol: D_ANDROSS_C033D98}
+
+D_ANDROSS_C035110:
+  {type: SF64:ENVIRONMENT, offset: 0xC035110, symbol: D_ANDROSS_C035110}
+
+D_ANDROSS_C035154:
+  {type: SF64:OBJECT_INIT, offset: 0xC035154, symbol: D_ANDROSS_C035154}
+
+D_ANDROSS_C0356A4:
+  {type: SF64:OBJECT_INIT, offset: 0xC0356A4, symbol: D_ANDROSS_C0356A4}
+
+D_ANDROSS_C0356CC:
+  {type: SF64:OBJECT_INIT, offset: 0xC0356CC, symbol: D_ANDROSS_C0356CC}
+
+D_ANDROSS_C036310:
+  {type: SF64:OBJECT_INIT, offset: 0xC036310, symbol: D_ANDROSS_C036310}
+
+D_ANDROSS_C036B6C:
+  {type: SF64:OBJECT_INIT, offset: 0xC036B6C, symbol: D_ANDROSS_C036B6C}
+
+D_ANDROSS_C03733C:
+  {type: SF64:OBJECT_INIT, offset: 0xC03733C, symbol: D_ANDROSS_C03733C}
+
+D_ANDROSS_C037E3C:
+  {type: SF64:SCRIPT, offset: 0xC037E3C, symbol: D_ANDROSS_C037E3C}
+
+D_ANDROSS_C037FCC:
+  {type: SF64:HITBOX, offset: 0xC037FCC, symbol: D_ANDROSS_C037FCC}
+
+D_ANDROSS_C0380C0:
+  {type: SF64:HITBOX, offset: 0xC0380C0, symbol: D_ANDROSS_C0380C0}
+
+D_ANDROSS_C0381B4:
+  {type: SF64:HITBOX, offset: 0xC0381B4, symbol: D_ANDROSS_C0381B4}
+
+D_ANDROSS_C0382A8:
+  {type: SF64:HITBOX, offset: 0xC0382A8, symbol: D_ANDROSS_C0382A8}
+
+D_ANDROSS_C03839C:
+  {type: SF64:HITBOX, offset: 0xC03839C, symbol: D_ANDROSS_C03839C}
+
+D_ANDROSS_C038490:
+  {type: SF64:HITBOX, offset: 0xC038490, symbol: D_ANDROSS_C038490}
+
+D_ANDROSS_C038584:
+  {type: SF64:HITBOX, offset: 0xC038584, symbol: D_ANDROSS_C038584}
+
+D_ANDROSS_C038678:
+  {type: SF64:HITBOX, offset: 0xC038678, symbol: D_ANDROSS_C038678}
+
+D_ANDROSS_C03876C:
+  {type: SF64:HITBOX, offset: 0xC03876C, symbol: D_ANDROSS_C03876C}
+
+D_ANDROSS_C038860:
+  {type: SF64:HITBOX, offset: 0xC038860, symbol: D_ANDROSS_C038860}
+
+D_ANDROSS_C038954:
+  {type: SF64:HITBOX, offset: 0xC038954, symbol: D_ANDROSS_C038954}
+
+aAndDoorHitbox:
+  {type: SF64:HITBOX, offset: 0xC038A48, symbol: aAndDoorHitbox}
+
+D_ANDROSS_C038AC4:
+  {type: SF64:HITBOX, offset: 0xC038AC4, symbol: D_ANDROSS_C038AC4}
+
+aAndPathHitbox:
+  {type: SF64:HITBOX, offset: 0xC038B40, symbol: aAndPathHitbox}
+
+aAndPathIntersectionHitbox:
+  {type: SF64:HITBOX, offset: 0xC038BA4, symbol: aAndPathIntersectionHitbox}
+
+aAndPassageHitbox:
+  {type: SF64:HITBOX, offset: 0xC038BD8, symbol: aAndPassageHitbox}
+
+D_ANDROSS_C038CCC:
+  {type: SF64:HITBOX, offset: 0xC038CCC, symbol: D_ANDROSS_C038CCC}
+
+aAndAndrossHitbox:
+  {type: SF64:HITBOX, offset: 0xC038DC0, symbol: aAndAndrossHitbox}
+
+aAndBrainHitbox:
+  {type: SF64:HITBOX, offset: 0xC038F24, symbol: aAndBrainHitbox}
+
+D_ANDROSS_C038FE8:
+  {type: VTX, count: 34, offset: 0xC038FE8, symbol: D_ANDROSS_C038FE8}
+
+D_ANDROSS_C039208:
+  {type: GFX, offset: 0xC039208, symbol: D_ANDROSS_C039208}
+
+D_ANDROSS_C039290:
+  {type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0xC039290, symbol: D_ANDROSS_C039290}
+
+D_ANDROSS_C03A290:
+  {type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0xC03A290, symbol: D_ANDROSS_C03A290}

assets/yaml/jp/rev0/ast_area_6.yaml

@@ -0,0 +1,253 @@
+:config:
+  segments:
+    - [0x06, 0xA5B8F0]
+  header:
+    code:
+      - '#include "assets/ast_area_6.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+      - '#include "sf64level.h"'
+      - '#include "sf64event.h"'
+      - '#include "sf64player.h"'
+      - '#include "sf64audio_external.h"'
+      - '#include "sf64mesg.h"'
+aA6TitleCardTex:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 104, height: 28, offset: 0x6000000, symbol: aA6TitleCardTex }
+
+D_A6_6000B60:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06000B60, symbol: D_A6_6000B60 }
+
+D_A6_6001A80:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06001A80, symbol: D_A6_6001A80 }
+
+D_A6_60029A0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x060029A0, symbol: D_A6_60029A0 }
+
+D_A6_60038C0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x060038C0, symbol: D_A6_60038C0 }
+
+D_A6_60047E0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x060047E0, symbol: D_A6_60047E0 }
+
+D_A6_6005700:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06005700, symbol: D_A6_6005700 }
+
+D_A6_6006620:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 48, height: 44, offset: 0x06006620, symbol: D_A6_6006620, tlut: 0x06006A40 }
+
+D_A6_6006A40:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 4, offset: 0x6006A40, symbol: D_A6_6006A40}
+
+D_A6_6008918:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06008918, symbol: D_A6_6008918 }
+
+D_A6_6008B18:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06008B18, symbol: D_A6_6008B18 }
+
+D_A6_6008D18:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06008D18, symbol: D_A6_6008D18 }
+
+D_A6_6008F18:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06008F18, symbol: D_A6_6008F18 }
+
+D_A6_6009718:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x06009718, symbol: D_A6_6009718 }
+
+D_A6_6009B18:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06009B18, symbol: D_A6_6009B18 }
+
+aA6UmbraStationDL:
+  { type: GFX, offset: 0x600E0C0, symbol: aA6UmbraStationDL }
+
+D_A6_600EBE8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x0600EBE8, symbol: D_A6_600EBE8 }
+
+D_A6_600EFE8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0600EFE8, symbol: D_A6_600EFE8 }
+
+D_A6_600F1F0:
+  { type: GFX, offset: 0x600F1F0, symbol: D_A6_600F1F0 }
+
+D_A6_600F850:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600F850, symbol: D_A6_600F850 }
+
+D_A6_6010A88:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06010A88, symbol: D_A6_6010A88 }
+
+D_A6_6011288:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x06011288, symbol: D_A6_6011288 }
+
+D_A6_6011688:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06011688, symbol: D_A6_6011688 }
+
+D_A6_6011888:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x06011888, symbol: D_A6_6011888 }
+
+D_A6_6011910:
+  { type: GFX, offset: 0x6011910, symbol: D_A6_6011910 }
+
+D_A6_6011D48:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06011D48, symbol: D_A6_6011D48 }
+
+D_A6_6012550:
+  { type: GFX, offset: 0x6012550, symbol: D_A6_6012550 }
+
+D_A6_6012840:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012840, symbol: D_A6_6012840 }
+
+aA6HarlockFrigateDL:
+  { type: GFX, offset: 0x6012A40, symbol: aA6HarlockFrigateDL }
+
+D_A6_6013CD8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06013CD8, symbol: D_A6_6013CD8 }
+
+D_A6_60144D8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060144D8, symbol: D_A6_60144D8 }
+
+D_A6_6014CD8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06014CD8, symbol: D_A6_6014CD8 }
+
+D_A6_60154D8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060154D8, symbol: D_A6_60154D8 }
+
+D_A6_6015CD8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06015CD8, symbol: D_A6_6015CD8 }
+
+D_A6_6015EE0:
+  { type: GFX, offset: 0x6015EE0, symbol: D_A6_6015EE0 }
+
+aA6ZeramClassCruiserDL:
+  { type: GFX, offset: 0x6016190, symbol: aA6ZeramClassCruiserDL }
+
+D_A6_6017120:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06017120, symbol: D_A6_6017120 }
+
+D_A6_6017920:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06017920, symbol: D_A6_6017920 }
+
+D_A6_6017B20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06017B20, symbol: D_A6_6017B20 }
+
+D_A6_6017D20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06017D20, symbol: D_A6_6017D20 }
+
+D_A6_6017F20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06017F20, symbol: D_A6_6017F20 }
+
+D_A6_6018720:
+  { type: GFX, offset: 0x6018720, symbol: D_A6_6018720 }
+
+D_A6_60187F8:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x60187F8, symbol: D_A6_60187F8, tlut: 0x6018878}
+
+D_A6_6018878:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x6018878, symbol: D_A6_6018878}
+
+D_A6_6018994:
+  { type: SF64:ANIM, offset: 0x6018994, symbol: D_A6_6018994 }
+
+D_A6_6018BA0:
+  { type: SF64:SKELETON, offset: 0x6018BA0, symbol: D_A6_6018BA0 }
+
+aA6NinjinMissileDL:
+  { type: GFX, offset: 0x6018BF0, symbol: aA6NinjinMissileDL }
+
+D_A6_6019130:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019130, symbol: D_A6_6019130 }
+
+D_A6_6019330:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019330, symbol: D_A6_6019330 }
+
+D_A6_6019530:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019530, symbol: D_A6_6019530 }
+
+aA6RocketDL:
+  { type: GFX, offset: 0x6019730, symbol: aA6RocketDL }
+
+D_A6_6019B20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019B20, symbol: D_A6_6019B20 }
+
+D_A6_6019D20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019D20, symbol: D_A6_6019D20 }
+
+D_A6_6019F20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019F20, symbol: D_A6_6019F20 }
+
+aA6SpaceMineDL:
+  { type: GFX, offset: 0x601A120, symbol: aA6SpaceMineDL }
+
+D_A6_601A220:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601A220, symbol: D_A6_601A220 }
+
+D_A6_601AA20:
+  { type: GFX, offset: 0x601AA20, symbol: D_A6_601AA20 }
+
+D_A6_601AAA8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AAA8, symbol: D_A6_601AAA8 }
+
+D_A6_601B2B0:
+  { type: GFX, offset: 0x601B2B0, symbol: D_A6_601B2B0 }
+
+D_A6_601B338:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601B338, symbol: D_A6_601B338 }
+
+D_A6_601BB40:
+  { type: GFX, offset: 0x601BB40, symbol: D_A6_601BB40 }
+
+D_A6_601BF20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601BF20, symbol: D_A6_601BF20 }
+
+D_A6_601CF20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601CF20, symbol: D_A6_601CF20 }
+
+D_A6_601DF20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601DF20, symbol: D_A6_601DF20 }
+
+D_A6_601EF20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601EF20, symbol: D_A6_601EF20 }
+
+D_A6_601FF20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601FF20, symbol: D_A6_601FF20 }
+
+D_A6_6020F20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06020F20, symbol: D_A6_6020F20 }
+
+D_A6_6021F20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06021F20, symbol: D_A6_6021F20 }
+
+D_A6_6022F20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06022F20, symbol: D_A6_6022F20 }
+
+D_A6_6023F20:
+  { type: SF64:ENVIRONMENT, offset: 0x6023F20, symbol: D_A6_6023F20}
+
+D_A6_6023F64:
+  { type: SF64:OBJECT_INIT, offset: 0x6023F64, symbol: D_A6_6023F64}
+
+D_A6_6027F50:
+  { type: SF64:SCRIPT, offset: 0x6027F50, symbol: D_A6_6027F50}
+
+aA6UmbraStationHitbox:
+  { type: SF64:HITBOX, offset: 0x60280E0, symbol: aA6UmbraStationHitbox }
+
+aA6HarlockFrigateHitbox:
+  { type: SF64:HITBOX, offset: 0x6028254, symbol: aA6HarlockFrigateHitbox }
+
+aA6ZeramClassCruiserHitbox:
+  { type: SF64:HITBOX, offset: 0x60282A0, symbol: aA6ZeramClassCruiserHitbox }
+
+aA6GorgonHitbox:
+  { type: SF64:HITBOX, offset: 0x6028454, symbol: aA6GorgonHitbox }
+
+D_A6_6028578:
+  { type: SF64:HITBOX, offset: 0x6028578, symbol: D_A6_6028578 }
+
+D_A6_6028760:
+  { type: SF64:ENVIRONMENT, offset: 0x6028760, symbol: D_A6_6028760}
+
+D_A6_60287A4:
+  { type: SF64:OBJECT_INIT, offset: 0x60287A4, symbol: D_A6_60287A4}
+
+D_A6_60289FC:
+  { type: SF64:SCRIPT, offset: 0x60289FC, symbol: D_A6_60289FC}

assets/yaml/jp/rev0/ast_arwing.yaml

@@ -1,25 +1,24 @@
 :config:
   segments:
-    - [0x3, 0x8BFC00]
+    - [0x3, 0x88F730]
   header:
     code:
       - '#include "assets/ast_arwing.h"'
     header:
       - '#include "gfx.h"'
       - '#include "sf64object.h"'
-      - '#include "structs.h"'
 
-D_arwing_3000000:
-  { type: TEXTURE, format: CI4, offset: 0x3000000, width: 16, height: 16, ctype: u8, tlut: 0x3000080, symbol: D_arwing_3000000 }
+aArwingLifeIconTex:
+  { type: TEXTURE, format: CI4, offset: 0x3000000, width: 16, height: 16, ctype: u8, tlut: 0x3000080, symbol: aArwingLifeIconTex }
 
-D_arwing_3000080:
-  { type: TEXTURE, format: TLUT, offset: 0x3000080, colors: 8, ctype: u16, symbol: D_arwing_3000080 }
+aArwingLifeIconTLUT:
+  { type: TEXTURE, format: TLUT, offset: 0x3000080, colors: 8, ctype: u16, symbol: aArwingLifeIconTLUT }
 
-D_arwing_3000090:
-  { type: GFX, offset: 0x3000090, symbol: D_arwing_3000090 }
+aAwFoxHeadDL:
+  { type: GFX, offset: 0x3000090, symbol: aAwFoxHeadDL }
 
-D_arwing_3001C90:
-  { type: GFX, offset: 0x3001C90, symbol: D_arwing_3001C90 }
+aAwJamesHeadDL:
+  { type: GFX, offset: 0x3001C90, symbol: aAwJamesHeadDL }
 
 D_arwing_3003960:
   { type: TEXTURE, format: RGBA16, offset: 0x3003960, width: 8, height: 8, ctype: u16, symbol: D_arwing_3003960 }
@@ -42,11 +41,11 @@ D_arwing_3003BE0:
 D_arwing_3003C60:
   { type: TEXTURE, format: RGBA16, offset: 0x3003C60, width: 8, height: 8, ctype: u16, symbol: D_arwing_3003C60 }
 
-D_arwing_3003CE0:
-  { type: GFX, offset: 0x3003CE0, symbol: D_arwing_3003CE0 }
+aAwPeppyHeadDL:
+  { type: GFX, offset: 0x3003CE0, symbol: aAwPeppyHeadDL }
 
-D_arwing_3005AB0:
-  { type: GFX, offset: 0x3005AB0, symbol: D_arwing_3005AB0 }
+aAwSlippyHeadDL:
+  { type: GFX, offset: 0x3005AB0, symbol: aAwSlippyHeadDL }
 
 D_arwing_30074D0:
   { type: TEXTURE, format: RGBA16, offset: 0x30074D0, width: 8, height: 8, ctype: u16, symbol: D_arwing_30074D0 }
@@ -57,8 +56,8 @@ D_arwing_3007550:
 D_arwing_30075D0:
   { type: TEXTURE, format: RGBA16, offset: 0x30075D0, width: 8, height: 8, ctype: u16, symbol: D_arwing_30075D0 }
 
-D_arwing_3007650:
-  { type: GFX, offset: 0x3007650, symbol: D_arwing_3007650 }
+aArwingItemLasersDL:
+  { type: GFX, offset: 0x3007650, symbol: aArwingItemLasersDL }
 
 ast_arwing_seg3_vtx_7A20:
   { type: VTX, offset: 0x3007A20, count: 244, symbol: ast_arwing_seg3_vtx_7A20 }
@@ -69,8 +68,8 @@ D_arwing_3008960:
 D_arwing_3009960:
   { type: TEXTURE, format: RGBA16, offset: 0x3009960, width: 16, height: 16, ctype: u16, symbol: D_arwing_3009960 }
 
-D_arwing_3009B60:
-  { type: GFX, offset: 0x3009B60, symbol: D_arwing_3009B60 }
+aAwBodyDL:
+  { type: GFX, offset: 0x3009B60, symbol: aAwBodyDL }
 
 D_arwing_300AC48:
   { type: TEXTURE, format: RGBA16, offset: 0x300AC48, width: 32, height: 32, ctype: u16, symbol: D_arwing_300AC48 }
@@ -105,8 +104,8 @@ D_arwing_300F448:
 D_arwing_3010448:
   { type: TEXTURE, format: RGBA16, offset: 0x3010448, width: 64, height: 32, ctype: u16, symbol: D_arwing_3010448 }
 
-D_arwing_3011720:
-  { type: GFX, offset: 0x3011720, symbol: D_arwing_3011720 }
+aAwLaserGun1DL:
+  { type: GFX, offset: 0x3011720, symbol: aAwLaserGun1DL }
 
 D_arwing_30119F0:
   { type: TEXTURE, format: RGBA16, offset: 0x30119F0, width: 32, height: 32, ctype: u16, symbol: D_arwing_30119F0 }
@@ -117,8 +116,8 @@ D_arwing_30121F0:
 D_arwing_30129F0:
   { type: TEXTURE, format: RGBA16, offset: 0x30129F0, width: 32, height: 32, ctype: u16, symbol: D_arwing_30129F0 }
 
-D_arwing_30131F0:
-  { type: GFX, offset: 0x30131F0, symbol: D_arwing_30131F0 }
+aAwCockpitViewDL:
+  { type: GFX, offset: 0x30131F0, symbol: aAwCockpitViewDL }
 
 D_arwing_30137E8:
   { type: TEXTURE, format: RGBA16, offset: 0x30137E8, width: 32, height: 32, ctype: u16, symbol: D_arwing_30137E8 }
@@ -129,17 +128,17 @@ D_arwing_3013FE8:
 D_arwing_30147E8:
   { type: TEXTURE, format: RGBA16, offset: 0x30147E8, width: 16, height: 32, ctype: u16, symbol: D_arwing_30147E8 }
 
-D_arwing_3014BF0:
-  { type: GFX, offset: 0x3014BF0, symbol: D_arwing_3014BF0 }
+aAwRightWingBrokenDL:
+  { type: GFX, offset: 0x3014BF0, symbol: aAwRightWingBrokenDL }
 
 D_arwing_3014F20:
   { type: TEXTURE, format: RGBA16, offset: 0x3014F20, width: 16, height: 16, ctype: u16, symbol: D_arwing_3014F20 }
 
-D_arwing_3015120:
-  { type: GFX, offset: 0x3015120, symbol: D_arwing_3015120 }
+aAwLeftWingBrokenDL:
+  { type: GFX, offset: 0x3015120, symbol: aAwLeftWingBrokenDL }
 
-D_arwing_30155E0:
-  { type: GFX, offset: 0x30155E0, symbol: D_arwing_30155E0}
+aAwFlap1DL:
+  { type: GFX, offset: 0x30155E0, symbol: aAwFlap1DL}
 
 D_arwing_3015AF4:
   { type: SF64:ANIM, offset: 0x3015AF4, symbol: D_arwing_3015AF4 }
@@ -150,8 +149,8 @@ D_arwing_3015C28:
 D_arwing_3015D68:
   { type: SF64:ANIM, offset: 0x3015D68, symbol: D_arwing_3015D68 }
 
-D_arwing_3015D80:
-  { type: GFX, offset: 0x3015D80, symbol: D_arwing_3015D80 }
+aAwRightWingDL:
+  { type: GFX, offset: 0x3015D80, symbol: aAwRightWingDL }
 
 D_arwing_30163C4:
   { type: SF64:ANIM, offset: 0x30163C4, symbol: D_arwing_30163C4 }
@@ -159,8 +158,8 @@ D_arwing_30163C4:
 D_arwing_3016610:
   { type: SF64:SKELETON, offset: 0x3016610, symbol: D_arwing_3016610 }
 
-D_arwing_3016660:
-  { type: GFX, offset: 0x3016660, symbol: D_arwing_3016660}
+aAwLeftWingDL:
+  { type: GFX, offset: 0x3016660, symbol: aAwLeftWingDL}
 
 D_arwing_3016B30:
   { type: GFX, offset: 0x3016B30, symbol: D_arwing_3016B30 }
@@ -168,8 +167,8 @@ D_arwing_3016B30:
 D_arwing_3016BB8:
   { type: TEXTURE, format: IA8, offset: 0x3016BB8, width: 16, height: 16, ctype: u8, symbol: D_arwing_3016BB8 }
 
-D_arwing_3016CC0:
-  { type: GFX, offset: 0x3016CC0, symbol: D_arwing_3016CC0 }
+aAwFalcoHeadDL:
+  { type: GFX, offset: 0x3016CC0, symbol: aAwFalcoHeadDL }
 
 D_arwing_30182C8:
   { type: TEXTURE, format: RGBA16, offset: 0x30182C8, width: 8, height: 8, ctype: u16, symbol: D_arwing_30182C8 }
@@ -180,8 +179,8 @@ D_arwing_3018348:
 D_arwing_30183D0:
   { type: GFX, offset: 0x30183D0, symbol: D_arwing_30183D0 }
 
-D_arwing_30184D8:
-  { type: TEXTURE, format: RGBA16, offset: 0x30184D8, width: 32, height: 32, ctype: u16, symbol: D_arwing_30184D8 }
+aWindshieldClouldReflextionTex:
+  { type: TEXTURE, format: RGBA16, offset: 0x30184D8, width: 32, height: 32, ctype: u16, symbol: aWindshieldClouldReflextionTex }
 
 D_arwing_3018CD8:
   { type: TEXTURE, format: RGBA16, offset: 0x3018CD8, width: 64, height: 16, ctype: u16, symbol: D_arwing_3018CD8 }

assets/yaml/jp/rev0/ast_bg_planet.yaml

@@ -0,0 +1,129 @@
+:config:
+  segments:
+    - [0x02, 0x87DBD0]
+  header:
+    code:
+      - '#include "assets/ast_bg_planet.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+
+D_BG_PLANET_2000000:
+  { type: GFX, offset: 0x2000000, symbol: D_BG_PLANET_2000000 }
+
+D_BG_PLANET_2000088:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x2000088, symbol: D_BG_PLANET_2000088 }
+
+D_BG_PLANET_2001090:
+  { type: GFX, offset: 0x2001090, symbol: D_BG_PLANET_2001090 }
+
+D_BG_PLANET_2001118:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02001118, symbol: D_BG_PLANET_2001118 }
+
+D_BG_PLANET_2002120:
+  { type: GFX, offset: 0x2002120, symbol: D_BG_PLANET_2002120 }
+
+D_BG_PLANET_20021A8:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x020021A8, symbol: D_BG_PLANET_20021A8 }
+
+D_BG_PLANET_20031B0:
+  { type: GFX, offset: 0x20031B0, symbol: D_BG_PLANET_20031B0 }
+
+D_BG_PLANET_2003238:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02003238, symbol: D_BG_PLANET_2003238 }
+
+D_BG_PLANET_2004240:
+  { type: GFX, offset: 0x2004240, symbol: D_BG_PLANET_2004240 }
+
+D_BG_PLANET_20042C8:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x020042C8, symbol: D_BG_PLANET_20042C8 }
+
+D_BG_PLANET_20052D0:
+  { type: GFX, offset: 0x20052D0, symbol: D_BG_PLANET_20052D0 }
+
+D_BG_PLANET_2005358:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02005358, symbol: D_BG_PLANET_2005358 }
+
+D_BG_PLANET_2006360:
+  { type: GFX, offset: 0x2006360, symbol: D_BG_PLANET_2006360 }
+
+D_BG_PLANET_20063E8:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x020063E8, symbol: D_BG_PLANET_20063E8 }
+
+D_BG_PLANET_20073F0:
+  { type: GFX, offset: 0x20073F0, symbol: D_BG_PLANET_20073F0 }
+
+D_BG_PLANET_2007478:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02007478, symbol: D_BG_PLANET_2007478 }
+
+D_BG_PLANET_2008480:
+  { type: GFX, offset: 0x2008480, symbol: D_BG_PLANET_2008480 }
+
+D_BG_PLANET_2008508:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02008508, symbol: D_BG_PLANET_2008508 }
+
+D_BG_PLANET_2009510:
+  { type: GFX, offset: 0x2009510, symbol: D_BG_PLANET_2009510 }
+
+D_BG_PLANET_2009598:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02009598, symbol: D_BG_PLANET_2009598 }
+
+D_BG_PLANET_200A5A0:
+  { type: GFX, offset: 0x200A5A0, symbol: D_BG_PLANET_200A5A0 }
+
+D_BG_PLANET_200A628:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x0200A628, symbol: D_BG_PLANET_200A628 }
+
+D_BG_PLANET_200B630:
+  { type: GFX, offset: 0x200B630, symbol: D_BG_PLANET_200B630 }
+
+D_BG_PLANET_200B6B8:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x0200B6B8, symbol: D_BG_PLANET_200B6B8 }
+
+D_BG_PLANET_200C6C0:
+  { type: GFX, offset: 0x200C6C0, symbol: D_BG_PLANET_200C6C0 }
+
+D_BG_PLANET_200C748:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x0200C748, symbol: D_BG_PLANET_200C748 }
+
+D_BG_PLANET_200D750:
+  { type: GFX, offset: 0x200D750, symbol: D_BG_PLANET_200D750 }
+
+D_BG_PLANET_200D7E8:
+  { type: TEXTURE, ctype: u16, format: IA16, width: 64, height: 32, offset: 0x0200D7E8, symbol: D_BG_PLANET_200D7E8 }
+
+D_BG_PLANET_200E7F0:
+  { type: GFX, offset: 0x200E7F0, symbol: D_BG_PLANET_200E7F0 }
+
+D_BG_PLANET_200E878:
+  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x0200E878, symbol: D_BG_PLANET_200E878 }
+
+D_BG_PLANET_200F080:
+  { type: GFX, offset: 0x200F080, symbol: D_BG_PLANET_200F080 }
+
+D_BG_PLANET_200F108:
+  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x0200F108, symbol: D_BG_PLANET_200F108 }
+
+D_BG_PLANET_200F910:
+  { type: GFX, offset: 0x200F910, symbol: D_BG_PLANET_200F910 }
+
+D_BG_PLANET_200F998:
+  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x0200F998, symbol: D_BG_PLANET_200F998 }
+
+D_BG_PLANET_20101A0:
+  { type: GFX, offset: 0x20101A0, symbol: D_BG_PLANET_20101A0 }
+
+D_BG_PLANET_2010228:
+  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x02010228, symbol: D_BG_PLANET_2010228 }
+
+D_BG_PLANET_2010A30:
+  { type: GFX, offset: 0x2010A30, symbol: D_BG_PLANET_2010A30 }
+
+D_BG_PLANET_2010AB8:
+  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x02010AB8, symbol: D_BG_PLANET_2010AB8 }
+
+D_BG_PLANET_20112C0:
+  { type: GFX, offset: 0x20112C0, symbol: D_BG_PLANET_20112C0 }
+
+D_BG_PLANET_2011358:
+  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x02011358, symbol: D_BG_PLANET_2011358 }

assets/yaml/jp/rev0/ast_bg_space.yaml

@@ -0,0 +1,93 @@
+:config:
+  segments:
+    - [0x02, 0x8763F0]
+  header:
+    code:
+      - '#include "assets/ast_bg_space.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+
+D_BG_SPACE_2000000:
+  { type: GFX, offset: 0x2000000, symbol: D_BG_SPACE_2000000 }
+
+D_BG_SPACE_2000088:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x2000088, symbol: D_BG_SPACE_2000088 }
+
+D_BG_SPACE_2000890:
+  { type: GFX, offset: 0x2000890, symbol: D_BG_SPACE_2000890 }
+
+D_BG_SPACE_2000918:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x2000918, symbol: D_BG_SPACE_2000918 }
+
+D_BG_SPACE_2001120:
+  { type: GFX, offset: 0x2001120, symbol: D_BG_SPACE_2001120 }
+
+D_BG_SPACE_20011A8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020011A8, symbol: D_BG_SPACE_20011A8 }
+
+D_BG_SPACE_20019B0:
+  { type: GFX, offset: 0x20019B0, symbol: D_BG_SPACE_20019B0 }
+
+D_BG_SPACE_2001A38:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02001A38, symbol: D_BG_SPACE_2001A38 }
+
+D_BG_SPACE_2002240:
+  { type: GFX, offset: 0x2002240, symbol: D_BG_SPACE_2002240 }
+
+D_BG_SPACE_20022C8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020022C8, symbol: D_BG_SPACE_20022C8 }
+
+D_BG_SPACE_2002AD0:
+  { type: GFX, offset: 0x2002AD0, symbol: D_BG_SPACE_2002AD0 }
+
+D_BG_SPACE_2002B58:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02002B58, symbol: D_BG_SPACE_2002B58 }
+
+D_BG_SPACE_2003360:
+  { type: GFX, offset: 0x2003360, symbol: D_BG_SPACE_2003360 }
+
+D_BG_SPACE_20033E8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020033E8, symbol: D_BG_SPACE_20033E8 }
+
+D_BG_SPACE_2003BF0:
+  { type: GFX, offset: 0x2003BF0, symbol: D_BG_SPACE_2003BF0 }
+
+D_BG_SPACE_2003C78:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02003C78, symbol: D_BG_SPACE_2003C78 }
+
+D_BG_SPACE_2004480:
+  { type: GFX, offset: 0x2004480, symbol: D_BG_SPACE_2004480 }
+
+D_BG_SPACE_2004508:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02004508, symbol: D_BG_SPACE_2004508 }
+
+D_BG_SPACE_2004D10:
+  { type: GFX, offset: 0x2004D10, symbol: D_BG_SPACE_2004D10 }
+
+D_BG_SPACE_2004D98:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02004D98, symbol: D_BG_SPACE_2004D98 }
+
+D_BG_SPACE_20055A0:
+  { type: GFX, offset: 0x20055A0, symbol: D_BG_SPACE_20055A0 }
+
+D_BG_SPACE_2005628:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02005628, symbol: D_BG_SPACE_2005628 }
+
+D_BG_SPACE_2005E30:
+  { type: GFX, offset: 0x2005E30, symbol: D_BG_SPACE_2005E30 }
+
+D_BG_SPACE_2005EB8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02005EB8, symbol: D_BG_SPACE_2005EB8 }
+
+D_BG_SPACE_20066C0:
+  { type: GFX, offset: 0x20066C0, symbol: D_BG_SPACE_20066C0 }
+
+D_BG_SPACE_2006748:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02006748, symbol: D_BG_SPACE_2006748 }
+
+D_BG_SPACE_2006F50:
+  { type: GFX, offset: 0x2006F50, symbol: D_BG_SPACE_2006F50 }
+
+D_BG_SPACE_2006FD8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02006FD8, symbol: D_BG_SPACE_2006FD8 }

assets/yaml/jp/rev0/ast_blue_marine.yaml

@@ -1,19 +1,18 @@
 :config:
   segments:
-    - [0x03, 0x8E1F80]
+    - [0x03, 0x8B1AB0]
   header:
     code:
       - '#include "assets/ast_blue_marine.h"'
     header:
       - '#include "gfx.h"'
       - '#include "sf64object.h"'
-      - '#include "structs.h"'
 
-D_blue_marine_3000000:
-  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x3000000, symbol: D_blue_marine_3000000, tlut: 0x3000080 }
+aBlueMarineLifeIconTex:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x3000000, symbol: aBlueMarineLifeIconTex, tlut: 0x3000080 }
 
-D_blue_marine_3000080:
-  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x3000080, symbol: D_blue_marine_3000080 }
+aBlueMarineLifeIconTLUT:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x3000080, symbol: aBlueMarineLifeIconTLUT }
 
 D_blue_marine_3000090:
   { type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 9, offset: 0x3000090, symbol: D_blue_marine_3000090, tlut: 0x3000120 }

assets/yaml/jp/rev0/ast_bolse.yaml

@@ -0,0 +1,200 @@
+:config:
+  segments:
+    - [0x06, 0xAD8050]
+  header:
+    code:
+      - '#include "assets/ast_bolse.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+      - '#include "sf64level.h"'
+      - '#include "sf64event.h"'
+      - '#include "sf64player.h"'
+      - '#include "sf64audio_external.h"'
+      - '#include "sf64mesg.h"'
+# Bolse Defense Outpost
+aBoTitleCardTex:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 168, height: 19, offset: 0x6000000, symbol: aBoTitleCardTex }
+
+D_BO_6000C80:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x6000C80, symbol: D_BO_6000C80 }
+
+D_BO_6000D80:
+  { type: GFX, offset: 0x6000D80, symbol: D_BO_6000D80 }
+
+D_BO_6001908:
+  { type: TEXTURE, format: RGBA16, offset: 0x6001908, width: 16, height: 16, ctype: u16, symbol: D_BO_6001908 }
+
+aBoBaseCoreAnim:
+  { type: SF64:ANIM, offset: 0x6001C64, symbol: aBoBaseCoreAnim }
+
+aBoBaseCoreSkel:
+  { type: SF64:SKELETON, offset: 0x6001FB0, symbol: aBoBaseCoreSkel }
+
+D_BO_6002020:
+  { type: GFX, offset: 0x6002020, symbol: D_BO_6002020 }
+
+D_BO_6004848:
+  { type: TEXTURE, format: RGBA16, offset: 0x06004848, width: 32, height: 32, ctype: u16, symbol: D_BO_6004848 }
+
+D_BO_6005048:
+  { type: TEXTURE, format: RGBA16, offset: 0x06005048, width: 16, height: 32, ctype: u16, symbol: D_BO_6005048 }
+
+D_BO_6005908:
+  { type: TEXTURE, format: RGBA16, offset: 0x06005908, width: 32, height: 32, ctype: u16, symbol: D_BO_6005908 }
+
+D_BO_6006108:
+  { type: TEXTURE, format: RGBA16, offset: 0x06006108, width: 32, height: 32, ctype: u16, symbol: D_BO_6006108 }
+
+D_BO_6006910:
+  { type: GFX, offset: 0x6006910, symbol: D_BO_6006910 }
+
+D_BO_6006AD0:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x6006AD0, symbol: D_BO_6006AD0 }
+
+D_BO_6006ED0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 64, offset: 0x06006ED0, symbol: D_BO_6006ED0 }
+
+D_BO_6006F50:
+  { type: TEXTURE, format: RGBA16, offset: 0x06006F50, width: 4, height: 16, ctype: u16, symbol: D_BO_6006F50 }
+
+D_BO_6006FD0:
+  { type: TEXTURE, format: RGBA16, offset: 0x06006FD0, width: 32, height: 32, ctype: u16, symbol: D_BO_6006FD0 }
+
+D_BO_60077D0:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x60077D0, symbol: D_BO_60077D0 }
+
+D_BO_6007BD0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 64, offset: 0x06007BD0, symbol: D_BO_6007BD0 }
+
+D_BO_6007DF8:
+  { type: TEXTURE, format: RGBA16, offset: 0x06007DF8, width: 16, height: 32, ctype: u16, symbol: D_BO_6007DF8 }
+
+D_BO_6008440:
+  { type: TEXTURE, format: RGBA16, offset: 0x06008440, width: 16, height: 16, ctype: u16, symbol: D_BO_6008440 }
+
+# Unused Animation
+D_BO_6008668:
+  { type: SF64:ANIM, offset: 0x6008668, symbol: D_BO_6008668 }
+
+# Unused Skeleton
+D_BO_60086B4:
+  { type: SF64:SKELETON, offset: 0x60086B4, symbol: D_BO_60086B4 }
+
+# Unused Animation
+D_BO_60086F4:
+  { type: SF64:ANIM, offset: 0x60086F4, symbol: D_BO_60086F4 }
+
+# Unused Skeleton
+D_BO_6008760:
+  { type: SF64:SKELETON, offset: 0x6008760, symbol: D_BO_6008760 }
+
+D_BO_6008770:
+  { type: GFX, offset: 0x6008770, symbol: D_BO_6008770 }
+
+D_BO_6008BB8:
+  { type: TEXTURE, format: RGBA16, offset: 0x06008BB8, width: 32, height: 32, ctype: u16, symbol: D_BO_6008BB8 }
+
+D_BO_60093B8:
+  { type: TEXTURE, format: RGBA16, offset: 0x060093B8, width: 32, height: 32, ctype: u16, symbol: D_BO_60093B8 }
+
+D_BO_6009BC0:
+  { type: GFX, offset: 0x6009BC0, symbol: D_BO_6009BC0 }
+
+# Unused DisplayList, looks like a tube.
+D_BO_600A2C0:
+  { type: GFX, offset: 0x600A2C0, symbol: D_BO_600A2C0 }
+
+D_BO_600A810:
+  { type: GFX, offset: 0x600A810, symbol: D_BO_600A810 }
+
+# Unused DisplayList, looks like a cube with an entrance.
+D_BO_600AB90:
+  { type: GFX, offset: 0x600AB90, symbol: D_BO_600AB90 }
+
+D_BO_600AD80:
+  { type: TEXTURE, format: RGBA16, offset: 0x0600AD80, width: 32, height: 32, ctype: u16, symbol: D_BO_600AD80 }
+
+aBoBuildingDL:
+  { type: GFX, offset: 0x600B8B0, symbol: aBoBuildingDL }
+
+D_BO_600BAA0:
+  { type: GFX, offset: 0x600BAA0, symbol: D_BO_600BAA0 }
+
+D_BO_600BEC0:
+  { type: GFX, offset: 0x600BEC0, symbol: D_BO_600BEC0 }
+
+D_BO_600BF30:
+  { type: GFX, offset: 0x600BF30, symbol: D_BO_600BF30 }
+
+D_BO_600C0B8:
+  { type: VTX, count: 34, offset: 0x600C0B8, symbol: D_BO_600C0B8 }
+
+D_BO_600C2D8:
+  { type: TEXTURE, format: IA8, offset: 0x0600C2D8, width: 32, height: 16, ctype: u8, symbol: D_BO_600C2D8 }
+
+aBoBaseShieldDL:
+  { type: GFX, offset: 0x600C4E0, symbol: aBoBaseShieldDL }
+
+aBoBaseShieldTex:
+  { type: TEXTURE, format: RGBA16, offset: 0x0600CF88, width: 16, height: 16, ctype: u16, symbol: aBoBaseShieldTex }
+
+D_BO_600D190:
+  { type: GFX, offset: 0x600D190, symbol: D_BO_600D190 }
+
+D_BO_600D2A0:
+  { type: TEXTURE, format: RGBA16, offset: 0x0600D2A0, width: 32, height: 64, ctype: u16, symbol: D_BO_600D2A0 }
+
+D_BO_600E2A0:
+  { type: TEXTURE, format: RGBA16, offset: 0x0600E2A0, width: 32, height: 64, ctype: u16, symbol: D_BO_600E2A0 }
+
+aBoLaserCannonAnim:
+  { type: SF64:ANIM, offset: 0x600F2E0, symbol: aBoLaserCannonAnim }
+
+aBoLaserCannonSkel:
+  { type: SF64:SKELETON, offset: 0x600F36C, symbol: aBoLaserCannonSkel }
+
+aBoShieldReactorAnim:
+  { type: SF64:ANIM, offset: 0x600F3D8, symbol: aBoShieldReactorAnim }
+
+aBoShieldReactorSkel:
+  { type: SF64:SKELETON, offset: 0x600F4A4, symbol: aBoShieldReactorSkel }
+
+aBoPoleDL:
+  { type: GFX, offset: 0x600F4C0, symbol: aBoPoleDL }
+
+D_BO_600F728:
+  { type: TEXTURE, format: RGBA16, offset: 0x0600F728, width: 32, height: 32, ctype: u16, symbol: D_BO_600F728 }
+
+D_BO_600FF30:
+  { type: SF64:ENVIRONMENT, offset: 0x600FF30, symbol: D_BO_600FF30 }
+
+D_BO_600FF74:
+  { type: SF64:OBJECT_INIT, offset: 0x600FF74, symbol: D_BO_600FF74 }
+
+D_BO_6010294:
+  { type: SF64:COLPOLY, count: 262, offset: 0x6010294, symbol: D_BO_6010294, mesh_symbol: D_BO_OFFSET }
+
+PAD_BO_6011B20:
+  { type: BLOB, size: 0x4, offset: 0x6011B20, symbol: PAD_BO_6011B20, mesh_symbol: D_BO_OFFSET }
+
+aBoShieldReactorHitbox:
+  { type: SF64:HITBOX, offset: 0x6011B24, symbol: aBoShieldReactorHitbox }
+
+D_BO_6011BA4:
+  { type: SF64:HITBOX, offset: 0x6011BA4, symbol: D_BO_6011BA4 }
+
+aBoLaserCannonHitbox:
+  { type: SF64:HITBOX, offset: 0x6011BF4, symbol: aBoLaserCannonHitbox }
+
+aBoPoleHitbox:
+  { type: SF64:HITBOX, offset: 0x6011C10, symbol: aBoPoleHitbox }
+
+aBoBuildingHitbox:
+  { type: SF64:HITBOX, offset: 0x6011C48, symbol: aBoBuildingHitbox }
+
+aBoBaseCoreHitbox:
+  { type: SF64:HITBOX, offset: 0x6011C80, symbol: aBoBaseCoreHitbox }
+
+D_BO_6011E28:
+  { type: VTX, count: 34, offset: 0x6011E28, symbol: D_BO_6011E28 }