diff --git a/.gitignore b/.gitignore index 8478bc7d7f..8585eeebbf 100644 --- a/.gitignore +++ b/.gitignore @@ -10,12 +10,14 @@ __pycache__/ CMakeLists.txt cmake-build-debug venv/ +.venv/ # Project-specific ignores build/ expected/ notes/ baserom/ +baseroms/*/segments/ docs/doxygen/ *.elf *.sra @@ -25,6 +27,7 @@ docs/doxygen/ *.map *.dump out.txt +*.ram # Tool artifacts tools/mipspro7.2_compiler/ diff --git a/Jenkinsfile b/Jenkinsfile index 7505174cc8..958b46590f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { stages { stage('Setup') { steps { - sh 'cp /usr/local/etc/roms/baserom_oot.z64 baserom_original.z64' + sh 'cp /usr/local/etc/roms/baserom_oot.z64 baseroms/gc-eu-mq-dbg/baserom.z64' sh 'make -j setup' } } @@ -15,7 +15,7 @@ pipeline { branch 'main' } steps { - sh 'ORIG_COMPILER=1 make -j' + sh 'make -j ORIG_COMPILER=1' } } stage('Build') { diff --git a/Makefile b/Makefile index c201d2a358..a8869f3fea 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,8 @@ COMPILER := ido # Target game version. Currently only the following version is supported: # gc-eu-mq-dbg GameCube Europe/PAL Master Quest Debug (default) VERSION := gc-eu-mq-dbg +# Number of threads to extract and compress with +N_THREADS := $(shell nproc) CFLAGS ?= CPPFLAGS ?= @@ -53,6 +55,7 @@ endif PROJECT_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) BUILD_DIR := build/$(VERSION) +VENV := .venv MAKE = make CFLAGS += -DOOT_DEBUG @@ -72,8 +75,6 @@ else endif endif -N_THREADS := $(shell nproc) - #### Tools #### ifneq ($(shell type $(MIPS_BINUTILS_PREFIX)ld >/dev/null 2>/dev/null; echo $$?), 0) $(error Unable to find $(MIPS_BINUTILS_PREFIX)ld. Please install or build MIPS binutils, commonly mips-linux-gnu. (or set MIPS_BINUTILS_PREFIX if your MIPS binutils install uses another prefix)) @@ -105,6 +106,7 @@ AS := $(MIPS_BINUTILS_PREFIX)as LD := $(MIPS_BINUTILS_PREFIX)ld OBJCOPY := $(MIPS_BINUTILS_PREFIX)objcopy OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump +NM := $(MIPS_BINUTILS_PREFIX)nm N64_EMULATOR ?= @@ -119,6 +121,7 @@ MKDMADATA := tools/mkdmadata ELF2ROM := tools/elf2rom ZAPD := tools/ZAPD/ZAPD.out FADO := tools/fado/fado.elf +PYTHON ?= $(VENV)/bin/python3 # Command to replace path variables in the spec file. We can't use the C # preprocessor for this because it won't substitute inside string literals. @@ -161,6 +164,7 @@ OBJDUMP_FLAGS := -d -r -z -Mreg-names=32 #### Files #### # ROM image +ROMC := oot-$(VERSION)-compressed.z64 ROM := oot-$(VERSION).z64 ELF := $(ROM:.z64=.elf) # description of ROM segments @@ -184,9 +188,10 @@ UNDECOMPILED_DATA_DIRS := $(shell find data -type d) # source files C_FILES := $(filter-out %.inc.c,$(foreach dir,$(SRC_DIRS) $(ASSET_BIN_DIRS),$(wildcard $(dir)/*.c))) S_FILES := $(foreach dir,$(SRC_DIRS) $(UNDECOMPILED_DATA_DIRS),$(wildcard $(dir)/*.s)) +BASEROM_BIN_FILES := $(wildcard baseroms/$(VERSION)/segments/*) O_FILES := $(foreach f,$(S_FILES:.s=.o),$(BUILD_DIR)/$f) \ $(foreach f,$(C_FILES:.c=.o),$(BUILD_DIR)/$f) \ - $(foreach f,$(wildcard baserom/*),$(BUILD_DIR)/$f.o) + $(foreach f,$(BASEROM_BIN_FILES),$(BUILD_DIR)/baserom/$(notdir $f).o) OVL_RELOC_FILES := $(shell $(CPP) $(CPPFLAGS) $(SPEC) | $(SPEC_REPLACE_VARS) | grep -o '[^"]*_reloc.o' ) @@ -246,11 +251,11 @@ $(BUILD_DIR)/src/libultra/rmon/%.o: CC := $(CC_OLD) $(BUILD_DIR)/src/code/jpegutils.o: CC := $(CC_OLD) $(BUILD_DIR)/src/code/jpegdecoder.o: CC := $(CC_OLD) -$(BUILD_DIR)/src/boot/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) -- -$(BUILD_DIR)/src/code/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) -- -$(BUILD_DIR)/src/overlays/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) -- +$(BUILD_DIR)/src/boot/%.o: CC := $(PYTHON) tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) -- +$(BUILD_DIR)/src/code/%.o: CC := $(PYTHON) tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) -- +$(BUILD_DIR)/src/overlays/%.o: CC := $(PYTHON) tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) -- -$(BUILD_DIR)/assets/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) -- +$(BUILD_DIR)/assets/%.o: CC := $(PYTHON) tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) -- else $(BUILD_DIR)/src/libultra/libc/ll.o: OPTFLAGS := -Ofast $(BUILD_DIR)/src/%.o: CC := $(CC) -fexec-charset=euc-jp @@ -258,14 +263,22 @@ endif #### Main Targets ### -all: $(ROM) -ifeq ($(COMPARE),1) +all: rom compress + +rom: $(ROM) +ifneq ($(COMPARE),0) @md5sum $(ROM) - @md5sum -c checksum.md5 + @md5sum -c baseroms/$(VERSION)/checksum.md5 +endif + +compress: $(ROMC) +ifneq ($(COMPARE),0) + @md5sum $(ROMC) + @md5sum -c baseroms/$(VERSION)/checksum-compressed.md5 endif clean: - $(RM) -r $(ROM) $(ELF) $(BUILD_DIR) + $(RM) -r $(ROMC) $(ROM) $(ELF) $(BUILD_DIR) assetclean: $(RM) -r $(ASSET_BIN_DIRS) @@ -274,14 +287,19 @@ assetclean: $(RM) -r .extracted-assets.json distclean: clean assetclean - $(RM) -r baserom/ + $(RM) -r baseroms/$(VERSION)/segments $(MAKE) -C tools distclean -setup: +venv: + test -d $(VENV) || python3 -m venv $(VENV) + $(PYTHON) -m pip install -U pip + $(PYTHON) -m pip install -U -r requirements.txt + +setup: venv $(MAKE) -C tools - python3 fixbaserom.py - python3 extract_baserom.py - python3 extract_assets.py -j$(N_THREADS) + $(PYTHON) tools/decompress_baserom.py $(VERSION) + $(PYTHON) extract_baserom.py + $(PYTHON) extract_assets.py -j$(N_THREADS) run: $(ROM) ifeq ($(N64_EMULATOR),) @@ -290,13 +308,19 @@ endif $(N64_EMULATOR) $< -.PHONY: all clean setup run distclean assetclean +.PHONY: all rom compress clean assetclean distclean venv setup run +.DEFAULT_GOAL := rom #### Various Recipes #### $(ROM): $(ELF) $(ELF2ROM) -cic 6105 $< $@ +$(ROMC): $(ROM) $(ELF) $(BUILD_DIR)/compress_ranges.txt +# note: $(BUILD_DIR)/compress_ranges.txt should only be used for nonmatching builds. it works by chance for matching builds too though + $(PYTHON) tools/compress.py --in $(ROM) --out $@ --dma-range `./tools/dmadata_range.sh $(NM) $(ELF)` --compress `cat $(BUILD_DIR)/compress_ranges.txt` --threads $(N_THREADS) + $(PYTHON) -m ipl3checksum sum --cic 6105 --update $@ + $(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(O_FILES) $(OVL_RELOC_FILES) $(BUILD_DIR)/ldscript.txt $(BUILD_DIR)/undefined_syms.txt $(LD) -T $(BUILD_DIR)/undefined_syms.txt -T $(BUILD_DIR)/ldscript.txt --no-check-sections --accept-unknown-input-arch --emit-relocs -Map $(BUILD_DIR)/z64.map -o $@ @@ -321,14 +345,14 @@ $(BUILD_DIR)/ldscript.txt: $(BUILD_DIR)/$(SPEC) $(BUILD_DIR)/undefined_syms.txt: undefined_syms.txt $(CPP) $(CPPFLAGS) $< > $@ -$(BUILD_DIR)/baserom/%.o: baserom/% +$(BUILD_DIR)/baserom/%.o: baseroms/$(VERSION)/segments/% $(OBJCOPY) -I binary -O elf32-big $< $@ $(BUILD_DIR)/data/%.o: data/%.s $(AS) $(ASFLAGS) $< -o $@ $(BUILD_DIR)/assets/text/%.enc.h: assets/text/%.h assets/text/charmap.txt - python3 tools/msgenc.py assets/text/charmap.txt $< $@ + $(PYTHON) tools/msgenc.py assets/text/charmap.txt $< $@ # Dependencies for files including message data headers # TODO remove when full header dependencies are used. @@ -345,8 +369,8 @@ $(BUILD_DIR)/assets/%.o: assets/%.c $(BUILD_DIR)/src/%.o: src/%.s $(CPP) $(CPPFLAGS) -Iinclude $< | $(AS) $(ASFLAGS) -o $@ -$(BUILD_DIR)/dmadata_table_spec.h: $(BUILD_DIR)/$(SPEC) - $(MKDMADATA) $< $@ +$(BUILD_DIR)/dmadata_table_spec.h $(BUILD_DIR)/compress_ranges.txt: $(BUILD_DIR)/$(SPEC) + $(MKDMADATA) $< $(BUILD_DIR)/dmadata_table_spec.h $(BUILD_DIR)/compress_ranges.txt # Dependencies for files that may include the dmadata header automatically generated from the spec file $(BUILD_DIR)/src/boot/z_std_dma.o: $(BUILD_DIR)/dmadata_table_spec.h @@ -370,13 +394,13 @@ $(BUILD_DIR)/src/%.o: src/%.c $(BUILD_DIR)/src/libultra/libc/ll.o: src/libultra/libc/ll.c $(CC_CHECK) $< $(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $< - python3 tools/set_o32abi_bit.py $@ + $(PYTHON) tools/set_o32abi_bit.py $@ @$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s) $(BUILD_DIR)/src/libultra/libc/llcvt.o: src/libultra/libc/llcvt.c $(CC_CHECK) $< $(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $< - python3 tools/set_o32abi_bit.py $@ + $(PYTHON) tools/set_o32abi_bit.py $@ @$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s) $(BUILD_DIR)/src/overlays/%_reloc.o: $(BUILD_DIR)/$(SPEC) @@ -393,3 +417,6 @@ $(BUILD_DIR)/assets/%.jpg.inc.c: assets/%.jpg $(ZAPD) bren -eh -i $< -o $@ -include $(DEP_FILES) + +# Print target for debugging +print-% : ; $(info $* is a $(flavor $*) variable set to [$($*)]) @true diff --git a/README.md b/README.md index 9ed58a7e64..f58d22d95f 100644 --- a/README.md +++ b/README.md @@ -68,13 +68,15 @@ The build process has the following package requirements: * build-essential * binutils-mips-linux-gnu * python3 +* python3-pip +* python3-venv * libpng-dev Under Debian / Ubuntu (which we recommend using), you can install them with the following commands: ```bash sudo apt-get update -sudo apt-get install git build-essential binutils-mips-linux-gnu python3 libpng-dev +sudo apt-get install git build-essential binutils-mips-linux-gnu python3 python3-pip python3-venv libpng-dev ``` If you are using GCC as the compiler for Ocarina of Time, you will also need: @@ -100,8 +102,9 @@ cd oot #### 3. Prepare a base ROM -Copy over your copy of the Master Quest (Debug) ROM inside the root of this new project directory. -Rename the file to "baserom_original.z64", "baserom_original.n64" or "baserom_original.v64", depending on the original extension. +Place a copy of the Master Quest (Debug) ROM inside the `baseroms/gc-eu-mq-dbg/` folder. + +Rename the file to `baserom.z64`, `baserom.n64` or `baserom.v64`, depending on the original extension. #### 4. Setup the ROM and build process @@ -111,7 +114,8 @@ Setup and extract everything from your ROM with the following command: make setup ``` -This will generate a new ROM called "baserom.z64" that will have the overdump removed and the header patched. +This downloads some dependencies (from pip), and compiles tools for the build process. +Then it generates a new ROM "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64" that will have the overdump removed and the header patched. It will also extract the individual assets from the ROM. #### 5. Build the ROM @@ -145,7 +149,6 @@ This means that the built ROM isn't the same as the base one, so something went Both of these have the disadvantage that the ordering of the terminal output is scrambled, so for debugging it is best to stick to one thread (i.e. not pass `-j` or `-jN`). - ## Contributing All contributions are welcome. This is a group effort, and even small contributions can make a difference. diff --git a/baseroms/gc-eu-mq-dbg/checksum-compressed.md5 b/baseroms/gc-eu-mq-dbg/checksum-compressed.md5 new file mode 100644 index 0000000000..260d2cc4e4 --- /dev/null +++ b/baseroms/gc-eu-mq-dbg/checksum-compressed.md5 @@ -0,0 +1 @@ +5831385a7f216370cdbea55616b12fed oot-gc-eu-mq-dbg-compressed.z64 diff --git a/checksum.md5 b/baseroms/gc-eu-mq-dbg/checksum.md5 similarity index 100% rename from checksum.md5 rename to baseroms/gc-eu-mq-dbg/checksum.md5 diff --git a/data/audio_tables.rodata.s b/data/audio_tables.rodata.s index fb31af24b2..5e76a127b8 100644 --- a/data/audio_tables.rodata.s +++ b/data/audio_tables.rodata.s @@ -10,13 +10,13 @@ .balign 16 glabel gSoundFontTable - .incbin "baserom.z64", 0xBCC270, 0x270 + .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCC270, 0x270 glabel gSequenceFontTable - .incbin "baserom.z64", 0xBCC4E0, 0x1C0 + .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCC4E0, 0x1C0 glabel gSequenceTable - .incbin "baserom.z64", 0xBCC6A0, 0x6F0 + .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCC6A0, 0x6F0 glabel gSampleBankTable - .incbin "baserom.z64", 0xBCCD90, 0x80 + .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCCD90, 0x80 diff --git a/data/rsp.rodata.s b/data/rsp.rodata.s index 10044b9400..f3df8983f1 100644 --- a/data/rsp.rodata.s +++ b/data/rsp.rodata.s @@ -10,21 +10,21 @@ .balign 16 glabel aspMainDataStart - .incbin "baserom.z64", 0xBCCE10, 0x2E0 + .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCCE10, 0x2E0 glabel aspMainDataEnd glabel gspF3DZEX2_NoN_PosLight_fifoTextStart - .incbin "baserom.z64", 0xBCD0F0, 0x1630 + .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCD0F0, 0x1630 glabel gspF3DZEX2_NoN_PosLight_fifoTextEnd glabel gspF3DZEX2_NoN_PosLight_fifoDataStart - .incbin "baserom.z64", 0xBCE720, 0x420 + .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCE720, 0x420 glabel gspF3DZEX2_NoN_PosLight_fifoDataEnd glabel gspS2DEX2d_fifoDataStart - .incbin "baserom.z64", 0xBCEB40, 0x390 + .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCEB40, 0x390 glabel gspS2DEX2d_fifoDataEnd glabel njpgdspMainDataStart - .incbin "baserom.z64", 0xBCEED0, 0x60 + .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBCEED0, 0x60 glabel njpgdspMainDataEnd diff --git a/data/rsp.text.s b/data/rsp.text.s index 1b29541d8f..045d8d6143 100644 --- a/data/rsp.text.s +++ b/data/rsp.text.s @@ -10,13 +10,13 @@ .balign 16 glabel aspMainTextStart - .incbin "baserom.z64", 0xB89260, 0xFB0 + .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xB89260, 0xFB0 glabel aspMainTextEnd glabel gspS2DEX2d_fifoTextStart - .incbin "baserom.z64", 0xB8A210, 0x18C0 + .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xB8A210, 0x18C0 glabel gspS2DEX2d_fifoTextEnd glabel njpgdspMainTextStart - .incbin "baserom.z64", 0xB8BAD0, 0xAF0 + .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xB8BAD0, 0xAF0 glabel njpgdspMainTextEnd diff --git a/data/rsp_boot.text.s b/data/rsp_boot.text.s index 507eafd6c4..01fe3f0a76 100644 --- a/data/rsp_boot.text.s +++ b/data/rsp_boot.text.s @@ -10,5 +10,5 @@ .balign 16 glabel rspbootTextStart - .incbin "baserom.z64", 0x9F20, 0xD0 + .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0x9F20, 0xD0 glabel rspbootTextEnd diff --git a/data/z_text.data.s b/data/z_text.data.s index a9cda47f02..3fe890cdb6 100644 --- a/data/z_text.data.s +++ b/data/z_text.data.s @@ -12,7 +12,7 @@ # temporary file name, rename to something more appropriate when decompiled glabel gMojiFontTLUTs - .incbin "baserom.z64", 0xBA18E0, 0x80 + .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBA18E0, 0x80 glabel gMojiFontTex - .incbin "baserom.z64", 0xBA1960, 0x400 + .incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0xBA1960, 0x400 diff --git a/diff_settings.py b/diff_settings.py index 8e5d595293..5bdc2113de 100644 --- a/diff_settings.py +++ b/diff_settings.py @@ -1,6 +1,6 @@ def apply(config, args): config['mapfile'] = 'build/gc-eu-mq-dbg/z64.map' config['myimg'] = 'oot-gc-eu-mq-dbg.z64' - config['baseimg'] = 'baserom.z64' + config['baseimg'] = 'baseroms/gc-eu-mq-dbg/baserom-decompressed.z64' config['makeflags'] = [] config['source_directories'] = ['src', 'include', 'spec'] diff --git a/docs/tutorial/beginning_decomp.md b/docs/tutorial/beginning_decomp.md index 49f25784e4..54fde940b8 100644 --- a/docs/tutorial/beginning_decomp.md +++ b/docs/tutorial/beginning_decomp.md @@ -229,7 +229,7 @@ which initialises common properties of actor using an InitChain, which is usuall The InitChain script is also in the tools directory, and is called `ichaindis.py`. Simply passing it the ROM address will spit out the entire contents of the InitChain, in this case: ``` -$ ./tools/ichaindis.py baserom.z64 80A88CE0 +$ ./tools/ichaindis.py baseroms/gc-eu-mq-dbg/baserom-decompressed.z64 80A88CE0 static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(unk_50, 87, ICHAIN_CONTINUE), ICHAIN_F32(unk_F4, 4000, ICHAIN_CONTINUE), @@ -240,7 +240,7 @@ static InitChainEntry sInitChain[] = { However, some of these variables have now been given names in the Actor struct. Pass it `--names` to fill these in automatically: ``` -$ ./tools/ichaindis.py --names baserom.z64 80A88CE0 +$ ./tools/ichaindis.py --names baseroms/gc-eu-mq-dbg/baserom-decompressed.z64 80A88CE0 static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 87, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), diff --git a/docs/tutorial/data.md b/docs/tutorial/data.md index 421bc0fe60..a96d26d84f 100644 --- a/docs/tutorial/data.md +++ b/docs/tutorial/data.md @@ -557,7 +557,7 @@ Ignore the first line: `gDmaDataTable` is always different if the ROM is shifted To fix this, we use a binary diff program. A suitable one is `vbindiff`: run it on the baserom and the zelda_whatever one the compiler generates: ``` -vbindiff baserom.z64 oot-gc-eu-mq-dbg.z64 +vbindiff baseroms/gc-eu-mq-dbg/baserom-decompressed.z64 oot-gc-eu-mq-dbg.z64 ``` In this, press `g` to open up goto position, and paste in the address `0xE3ED10` from the first important line of the `first_diff` output. This gives us the following: diff --git a/docs/tutorial/helper_scripts.md b/docs/tutorial/helper_scripts.md index cef356392d..74c580904a 100644 --- a/docs/tutorial/helper_scripts.md +++ b/docs/tutorial/helper_scripts.md @@ -2,6 +2,27 @@ This list gives brief information on the most common usage cases. For more information, first try using `-h` or `--help` as an argument, and failing that, ask in #oot-decomp-help or #tools-other in the Discord. +Many tools require activating a Python virtual environment that contains Python +dependencies. This virtual environment is automatically installed into the +`.venv` directory by `make setup`, but you need to **activate** it in your +current terminal session in order to run Python tools. To start using the +virtual environment in your current terminal run: + +```bash +source .venv/bin/activate +``` + +Keep in mind that for each new terminal session, you will need to activate the +Python virtual environment again. That is, run the above `source .venv/bin/activate` command. + +To deactivate the virtual environment, run + +```bash +deactivate +``` + +and your terminal session state will be restored to what it was before. + ## m2ctx This generates the context for mips2c to use to type objects in its output. It lives in the tools directory. Running diff --git a/docs/vscode.md b/docs/vscode.md index 6ba1ebcf37..bc4088496c 100644 --- a/docs/vscode.md +++ b/docs/vscode.md @@ -74,7 +74,7 @@ Add the following to (or create) the `.vscode/settings.json` file for VSCode to "search.useIgnoreFiles": false, "search.exclude": { "**/.git": true, - "baserom/**": true, + "baseroms/**": true, "build/**": true, "expected/**": true, }, diff --git a/extract_assets.py b/extract_assets.py index 47e65ca23e..defac57dcd 100755 --- a/extract_assets.py +++ b/extract_assets.py @@ -28,7 +28,7 @@ def ExtractFile(xmlPath, outputPath, outputSourcePath): Path(outputPath).mkdir(parents=True, exist_ok=True) Path(outputSourcePath).mkdir(parents=True, exist_ok=True) - execStr = f"{zapdPath} e -eh -i {xmlPath} -b baserom -o {outputPath} -osf {outputSourcePath} -gsf 1 -rconf {configPath} {ZAPDArgs}" + execStr = f"{zapdPath} e -eh -i {xmlPath} -b baseroms/gc-eu-mq-dbg/segments -o {outputPath} -osf {outputSourcePath} -gsf 1 -rconf {configPath} {ZAPDArgs}" if "overlays" in xmlPath: execStr += " --static" diff --git a/extract_baserom.py b/extract_baserom.py index e45bdea5e5..43686e4033 100755 --- a/extract_baserom.py +++ b/extract_baserom.py @@ -1,12 +1,12 @@ #!/usr/bin/python3 -import os -import sys import struct from multiprocessing import Pool, cpu_count +from pathlib import Path -ROM_FILE_NAME = 'baserom.z64' +ROM_FILE_PATH = Path('baseroms/gc-eu-mq-dbg/baserom-decompressed.z64') +SEGMENTS_PATH = Path('baseroms/gc-eu-mq-dbg/segments/') FILE_TABLE_OFFSET = 0x12F70 FILE_NAMES = [ @@ -1562,7 +1562,7 @@ def write_output_file(name, offset, size): print('failed to write file ' + name) def ExtractFunc(i): - filename = 'baserom/' + FILE_NAMES[i] + filename = SEGMENTS_PATH / FILE_NAMES[i] entryOffset = FILE_TABLE_OFFSET + 16 * i virtStart = read_uint32_be(entryOffset + 0) @@ -1571,32 +1571,24 @@ def ExtractFunc(i): physEnd = read_uint32_be(entryOffset + 12) if physEnd == 0: # uncompressed - compressed = False size = virtEnd - virtStart else: # compressed - compressed = True size = physEnd - physStart - print('extracting ' + filename + " (0x%08X, 0x%08X)" % (virtStart, virtEnd)) + print(f'extracting {filename} (0x{virtStart:08X}, 0x{virtEnd:08X})') write_output_file(filename, physStart, size) - if compressed: - os.system('tools/yaz0 -d ' + filename + ' ' + filename) ##################################################################### def main(): - try: - os.mkdir('baserom') - except: - pass + SEGMENTS_PATH.mkdir(parents=True, exist_ok=True) # read baserom data try: - with open(ROM_FILE_NAME, 'rb') as f: - rom_data = f.read() + rom_data = ROM_FILE_PATH.read_bytes() except IOError: - print('failed to read file' + ROM_FILE_NAME) - sys.exit(1) + print(f'failed to read file {ROM_FILE_PATH}') + exit(1) # extract files num_cores = cpu_count() diff --git a/first_diff.py b/first_diff.py index 360eb42dc1..0ffa0f672a 100755 --- a/first_diff.py +++ b/first_diff.py @@ -3,17 +3,8 @@ import argparse from pathlib import Path -try: - import rabbitizer -except ImportError: - print("Missing dependency rabbitizer, install it with `python3 -m pip install 'rabbitizer>=1.0.0,<2.0.0'`") - exit(1) - -try: - import mapfile_parser -except ImportError: - print("Missing dependency mapfile_parser, install it with `python3 -m pip install 'mapfile-parser>=1.2.1,<2.0.0'`") - exit(1) +import rabbitizer +import mapfile_parser def decodeInstruction(bytesDiff: bytes, mapFile: mapfile_parser.MapFile) -> str: @@ -49,7 +40,7 @@ def firstDiffMain(): BUILTROM = Path(f"oot-{args.version}.z64") BUILTMAP = buildFolder / "z64.map" - EXPECTEDROM = Path("baserom.z64") + EXPECTEDROM = Path(f"baseroms/{args.version}/baserom-decompressed.z64") EXPECTEDMAP = "expected" / BUILTMAP mapfile_parser.frontends.first_diff.doFirstDiff(BUILTMAP, EXPECTEDMAP, BUILTROM, EXPECTEDROM, args.count, mismatchSize=True, addColons=args.add_colons, bytesConverterCallback=decodeInstruction) diff --git a/fixbaserom.py b/fixbaserom.py deleted file mode 100644 index edad6bda26..0000000000 --- a/fixbaserom.py +++ /dev/null @@ -1,96 +0,0 @@ -from os import path -import sys -import struct -import hashlib - - -def get_str_hash(byte_array): - return str(hashlib.md5(byte_array).hexdigest()) - - -# If the baserom exists and is correct, we don't need to change anything -if path.exists("baserom.z64"): - with open("baserom.z64", mode="rb") as file: - fileContent = bytearray(file.read()) - if get_str_hash(fileContent) == "f0b7f35375f9cc8ca1b2d59d78e35405": - print("Found valid baserom - exiting early") - sys.exit(0) - -# Determine if we have a ROM file -romFileExtensions = ["z64", "n64", "v64"] - -def find_baserom_original(): - for romFileExtLower in romFileExtensions: - for romFileExt in (romFileExtLower, romFileExtLower.upper()): - romFileNameCandidate = "baserom_original." + romFileExt - if path.exists(romFileNameCandidate): - return romFileNameCandidate - return None - -romFileName = find_baserom_original() - -if romFileName is None: - print("Error: Could not find baserom_original.z64/baserom_original.n64/baserom_original.v64.") - sys.exit(1) - -# Read in the original ROM -print("File '" + romFileName + "' found.") -with open(romFileName, mode="rb") as file: - fileContent = bytearray(file.read()) - -# Strip the overdump -print("Stripping overdump...") -fileContent = fileContent[0:0x3600000] - -fileContentLen = len(fileContent) - -# Check if ROM needs to be byte/word swapped -# Little-endian -if fileContent[0] == 0x40: - # Word Swap ROM - print("ROM needs to be word swapped...") - words = str(int(fileContentLen/4)) - little_byte_format = "<" + words + "I" - big_byte_format = ">" + words + "I" - tmp = struct.unpack_from(little_byte_format, fileContent, 0) - struct.pack_into(big_byte_format, fileContent, 0, *tmp) - - print("Word swapping done.") - -# Byte-swapped -elif fileContent[0] == 0x37: - # Byte Swap ROM - print("ROM needs to be byte swapped...") - halfwords = str(int(fileContentLen/2)) - little_byte_format = "<" + halfwords + "H" - big_byte_format = ">" + halfwords + "H" - tmp = struct.unpack_from(little_byte_format, fileContent, 0) - struct.pack_into(big_byte_format, fileContent, 0, *tmp) - - print("Byte swapping done.") - -# Patch the header -print("Patching header...") -fileContent[0x3E] = 0x50 - -for i in range(0x35CF000, len(fileContent)): - fileContent[i] = 0xFF - -# Check to see if the ROM is a "vanilla" Debug ROM -str_hash = get_str_hash(bytearray(fileContent)) -if str_hash != "f0b7f35375f9cc8ca1b2d59d78e35405": - print("Error: Expected a hash of f0b7f35375f9cc8ca1b2d59d78e35405 but got " + str_hash + ". " + - "The baserom has probably been tampered, find a new one") - - if str_hash == "32fe2770c0f9b1a9cd2a4d449348c1cb": - print("The provided baserom is a rom which has been edited with ZeldaEdit and is not suitable for use with decomp. " + - "Find a new one.") - - sys.exit(1) - -# Write out our new ROM -print("Writing new ROM 'baserom.z64'.") -with open("baserom.z64", mode="wb") as file: - file.write(bytes(fileContent)) - -print("Done!") diff --git a/include/functions.h b/include/functions.h index 7e9cc99ac5..29ddbfca8a 100644 --- a/include/functions.h +++ b/include/functions.h @@ -354,8 +354,9 @@ void Actor_MoveXZGravity(Actor* actor); void Actor_UpdateVelocityXYZ(Actor* actor); void Actor_MoveXYZ(Actor* actor); void Actor_SetProjectileSpeed(Actor* actor, f32 speedXYZ); -s16 Actor_WorldYawTowardActor(Actor* actorA, Actor* actorB); -s16 Actor_WorldYawTowardPoint(Actor* actor, Vec3f* refPoint); +s16 Actor_WorldYawTowardActor(Actor* origin, Actor* target); +s16 Actor_FocusYawTowardActor(Actor* origin, Actor* target); +s16 Actor_WorldYawTowardPoint(Actor* origin, Vec3f* point); f32 Actor_WorldDistXYZToActor(Actor* actorA, Actor* actorB); f32 Actor_WorldDistXYZToPoint(Actor* actor, Vec3f* refPoint); s16 Actor_WorldPitchTowardActor(Actor* actorA, Actor* actorB); @@ -856,7 +857,7 @@ void Math_Vec3f_Scale(Vec3f* vec, f32 scaleF); f32 Math_Vec3f_DistXYZ(Vec3f* a, Vec3f* b); f32 Math_Vec3f_DistXYZAndStoreDiff(Vec3f* a, Vec3f* b, Vec3f* dest); f32 Math_Vec3f_DistXZ(Vec3f* a, Vec3f* b); -s16 Math_Vec3f_Yaw(Vec3f* a, Vec3f* b); +s16 Math_Vec3f_Yaw(Vec3f* origin, Vec3f* point); s16 Math_Vec3f_Pitch(Vec3f* a, Vec3f* b); void Actor_ProcessInitChain(Actor* actor, InitChainEntry* ichain); f32 Math_SmoothStepToF(f32* pValue, f32 target, f32 fraction, f32 step, f32 minStep); diff --git a/include/macros.h b/include/macros.h index 46f7efdfd2..05fa693e2e 100644 --- a/include/macros.h +++ b/include/macros.h @@ -103,14 +103,14 @@ #ifdef OOT_DEBUG #define PRINTF osSyncPrintf #else -#ifdef __GNUC__ -#define PRINTF(format, ...) (void)0 -#else +#ifdef __sgi /* IDO compiler */ // IDO doesn't support variadic macros, but it merely throws a warning for the // number of arguments not matching the definition (warning 609) instead of // throwing an error. We suppress this warning and rely on GCC to catch macro // argument errors instead. #define PRINTF(args) (void)0 +#else +#define PRINTF(format, ...) (void)0 #endif #endif @@ -189,6 +189,8 @@ extern struct GraphicsContext* __gfxCtx; #define ZELDA_ARENA_MALLOC(size, file, line) ZeldaArena_MallocDebug(size, file, line) #define ZELDA_ARENA_MALLOC_R(size, file, line) ZeldaArena_MallocRDebug(size, file, line) #define ZELDA_ARENA_FREE(size, file, line) ZeldaArena_FreeDebug(size, file, line) +#define LOG_UTILS_CHECK_NULL_POINTER(exp, ptr, file, line) LogUtils_CheckNullPointer(exp, ptr, file, line) +#define LOG_UTILS_CHECK_VALID_POINTER(exp, ptr, file, line) LogUtils_CheckValidPointer(exp, ptr, file, line) #else @@ -215,6 +217,8 @@ extern struct GraphicsContext* __gfxCtx; #define ZELDA_ARENA_MALLOC(size, file, line) ZeldaArena_Malloc(size) #define ZELDA_ARENA_MALLOC_R(size, file, line) ZeldaArena_MallocR(size) #define ZELDA_ARENA_FREE(size, file, line) ZeldaArena_Free(size) +#define LOG_UTILS_CHECK_NULL_POINTER(exp, ptr, file, line) (void)0 +#define LOG_UTILS_CHECK_VALID_POINTER(exp, ptr, file, line) (void)0 #endif /* OOT_DEBUG */ diff --git a/include/z64actor.h b/include/z64actor.h index fd38b002b2..779fcad840 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -140,36 +140,90 @@ typedef struct { /* 0x18 */ Vec3f feetPos[2]; // Update by using `Actor_SetFeetPos` in PostLimbDraw } ActorShape; // size = 0x30 +// #define ACTOR_FLAG_0 (1 << 0) + +// #define ACTOR_FLAG_2 (1 << 2) + +// #define ACTOR_FLAG_3 (1 << 3) + +// #define ACTOR_FLAG_4 (1 << 4) + +// #define ACTOR_FLAG_5 (1 << 5) + +// #define ACTOR_FLAG_6 (1 << 6) -#define ACTOR_FLAG_7 (1 << 7) + +// hidden or revealed by Lens of Truth (depending on room lensMode) +#define ACTOR_FLAG_REACT_TO_LENS (1 << 7) + // Signals that player has accepted an offer to talk to an actor // Player will retain this flag until the player is finished talking // Actor will retain this flag until `Actor_TalkOfferAccepted` is called or manually turned off by the actor #define ACTOR_FLAG_TALK (1 << 8) + +// #define ACTOR_FLAG_9 (1 << 9) + +// #define ACTOR_FLAG_10 (1 << 10) + +// #define ACTOR_FLAG_ENKUSA_CUT (1 << 11) -#define ACTOR_FLAG_IGNORE_QUAKE (1 << 12) // actor will not shake when a quake occurs + +// Actor will not shake when a quake occurs +#define ACTOR_FLAG_IGNORE_QUAKE (1 << 12) + +// #define ACTOR_FLAG_13 (1 << 13) + +// #define ACTOR_FLAG_14 (1 << 14) + +// #define ACTOR_FLAG_15 (1 << 15) + +// #define ACTOR_FLAG_16 (1 << 16) + +// #define ACTOR_FLAG_17 (1 << 17) + +// #define ACTOR_FLAG_18 (1 << 18) + +// #define ACTOR_FLAG_19 (1 << 19) + +// #define ACTOR_FLAG_20 (1 << 20) + +// #define ACTOR_FLAG_21 (1 << 21) -#define ACTOR_FLAG_22 (1 << 22) + +// ignores point lights but not directional lights (such as environment lights) +#define ACTOR_FLAG_IGNORE_POINT_LIGHTS (1 << 22) + +// #define ACTOR_FLAG_23 (1 << 23) + +// #define ACTOR_FLAG_24 (1 << 24) + +// #define ACTOR_FLAG_25 (1 << 25) + +// #define ACTOR_FLAG_26 (1 << 26) + +// #define ACTOR_FLAG_27 (1 << 27) + +// #define ACTOR_FLAG_28 (1 << 28) #define COLORFILTER_GET_COLORINTENSITY(colorFilterParams) (((colorFilterParams) & 0x1F00) >> 5) @@ -251,7 +305,9 @@ typedef struct Actor { /* 0x130 */ ActorFunc update; // Update Routine. Called by `Actor_UpdateAll` /* 0x134 */ ActorFunc draw; // Draw Routine. Called by `Actor_Draw` /* 0x138 */ ActorOverlay* overlayEntry; // Pointer to the overlay table entry for this actor - /* 0x13C */ char dbgPad[0x10]; // Padding that only exists in the debug rom +#ifdef OOT_DEBUG + /* 0x13C */ char dbgPad[0x10]; +#endif } Actor; // size = 0x14C typedef enum { diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000000..9030b9a454 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,18 @@ +# Setup and compression +crunch64>=0.3.1,<1.0.0 +ipl3checksum>=1.2.0,<2.0.0 + +# asm-differ +argcomplete +colorama +cxxfilt +python-Levenshtein +watchdog + +# decomp-permuter +pycparser +toml + +# tools +mapfile-parser>=1.2.1,<2.0.0 +rabbitizer>=1.0.0,<2.0.0 diff --git a/spec b/spec index 846fa3b72c..3cb0fa38e6 100644 --- a/spec +++ b/spec @@ -158,6 +158,7 @@ endseg beginseg name "icon_item_field_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/icon_item_field_static/icon_item_field_static.o" number 12 @@ -165,6 +166,7 @@ endseg beginseg name "icon_item_dungeon_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/icon_item_dungeon_static/icon_item_dungeon_static.o" number 12 @@ -172,6 +174,7 @@ endseg beginseg name "icon_item_gameover_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/icon_item_gameover_static/icon_item_gameover_static.o" number 12 @@ -179,6 +182,7 @@ endseg beginseg name "icon_item_nes_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/icon_item_nes_static/icon_item_nes_static.o" number 13 @@ -186,6 +190,7 @@ endseg beginseg name "icon_item_ger_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/icon_item_ger_static/icon_item_ger_static.o" number 13 @@ -193,6 +198,7 @@ endseg beginseg name "icon_item_fra_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/icon_item_fra_static/icon_item_fra_static.o" number 13 @@ -291,6 +297,7 @@ endseg beginseg name "code" + compress after "dmadata" include "$(BUILD_DIR)/src/code/z_en_a_keep.o" include "$(BUILD_DIR)/src/code/z_en_item00.o" @@ -538,6 +545,7 @@ endseg beginseg name "ovl_title" + compress address 0x80800000 include "$(BUILD_DIR)/src/overlays/gamestates/ovl_title/z_title.o" include "$(BUILD_DIR)/src/overlays/gamestates/ovl_title/ovl_title_reloc.o" @@ -545,18 +553,21 @@ endseg beginseg name "ovl_select" + compress include "$(BUILD_DIR)/src/overlays/gamestates/ovl_select/z_select.o" include "$(BUILD_DIR)/src/overlays/gamestates/ovl_select/ovl_select_reloc.o" endseg beginseg name "ovl_opening" + compress include "$(BUILD_DIR)/src/overlays/gamestates/ovl_opening/z_opening.o" include "$(BUILD_DIR)/src/overlays/gamestates/ovl_opening/ovl_opening_reloc.o" endseg beginseg name "ovl_file_choose" + compress include "$(BUILD_DIR)/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.o" include "$(BUILD_DIR)/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.o" include "$(BUILD_DIR)/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.o" @@ -566,6 +577,7 @@ endseg beginseg name "ovl_kaleido_scope" + compress include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.o" include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.o" include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.o" @@ -580,738 +592,861 @@ endseg beginseg name "ovl_player_actor" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_player_actor/z_player.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_player_actor/ovl_player_actor_reloc.o" endseg beginseg name "ovl_map_mark_data" + compress include "$(BUILD_DIR)/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.o" include "$(BUILD_DIR)/src/overlays/misc/ovl_map_mark_data/ovl_map_mark_data_reloc.o" endseg beginseg name "ovl_En_Test" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Test/z_en_test.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Test/ovl_En_Test_reloc.o" endseg beginseg name "ovl_Arms_Hook" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Arms_Hook/ovl_Arms_Hook_reloc.o" endseg beginseg name "ovl_Arrow_Fire" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Arrow_Fire/ovl_Arrow_Fire_reloc.o" endseg beginseg name "ovl_Arrow_Ice" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Arrow_Ice/ovl_Arrow_Ice_reloc.o" endseg beginseg name "ovl_Arrow_Light" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Arrow_Light/ovl_Arrow_Light_reloc.o" endseg beginseg name "ovl_Bg_Bdan_Objects" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Bdan_Objects/ovl_Bg_Bdan_Objects_reloc.o" endseg beginseg name "ovl_Bg_Bdan_Switch" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Bdan_Switch/ovl_Bg_Bdan_Switch_reloc.o" endseg beginseg name "ovl_Bg_Bom_Guard" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Bom_Guard/ovl_Bg_Bom_Guard_reloc.o" endseg beginseg name "ovl_Bg_Bombwall" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Bombwall/ovl_Bg_Bombwall_reloc.o" endseg beginseg name "ovl_Bg_Bowl_Wall" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Bowl_Wall/ovl_Bg_Bowl_Wall_reloc.o" endseg beginseg name "ovl_Bg_Breakwall" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Breakwall/ovl_Bg_Breakwall_reloc.o" endseg beginseg name "ovl_Bg_Ddan_Jd" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ddan_Jd/ovl_Bg_Ddan_Jd_reloc.o" endseg beginseg name "ovl_Bg_Ddan_Kd" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ddan_Kd/ovl_Bg_Ddan_Kd_reloc.o" endseg beginseg name "ovl_Bg_Dodoago" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Dodoago/ovl_Bg_Dodoago_reloc.o" endseg beginseg name "ovl_Bg_Dy_Yoseizo" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Dy_Yoseizo/ovl_Bg_Dy_Yoseizo_reloc.o" endseg beginseg name "ovl_Bg_Ganon_Otyuka" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka_reloc.o" endseg beginseg name "ovl_Bg_Gate_Shutter" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Gate_Shutter/ovl_Bg_Gate_Shutter_reloc.o" endseg beginseg name "ovl_Bg_Gjyo_Bridge" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Gjyo_Bridge/ovl_Bg_Gjyo_Bridge_reloc.o" endseg beginseg name "ovl_Bg_Gnd_Darkmeiro" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/ovl_Bg_Gnd_Darkmeiro_reloc.o" endseg beginseg name "ovl_Bg_Gnd_Firemeiro" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/ovl_Bg_Gnd_Firemeiro_reloc.o" endseg beginseg name "ovl_Bg_Gnd_Iceblock" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Gnd_Iceblock/ovl_Bg_Gnd_Iceblock_reloc.o" endseg beginseg name "ovl_Bg_Gnd_Nisekabe" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/ovl_Bg_Gnd_Nisekabe_reloc.o" endseg beginseg name "ovl_Bg_Gnd_Soulmeiro" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/ovl_Bg_Gnd_Soulmeiro_reloc.o" endseg beginseg name "ovl_Bg_Haka" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka/ovl_Bg_Haka_reloc.o" endseg beginseg name "ovl_Bg_Haka_Gate" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Gate/ovl_Bg_Haka_Gate_reloc.o" endseg beginseg name "ovl_Bg_Haka_Huta" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Huta/ovl_Bg_Haka_Huta_reloc.o" endseg beginseg name "ovl_Bg_Haka_Megane" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Megane/ovl_Bg_Haka_Megane_reloc.o" endseg beginseg name "ovl_Bg_Haka_MeganeBG" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_MeganeBG/ovl_Bg_Haka_MeganeBG_reloc.o" endseg beginseg name "ovl_Bg_Haka_Sgami" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Sgami/ovl_Bg_Haka_Sgami_reloc.o" endseg beginseg name "ovl_Bg_Haka_Ship" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Ship/ovl_Bg_Haka_Ship_reloc.o" endseg beginseg name "ovl_Bg_Haka_Trap" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Trap/ovl_Bg_Haka_Trap_reloc.o" endseg beginseg name "ovl_Bg_Haka_Tubo" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Tubo/ovl_Bg_Haka_Tubo_reloc.o" endseg beginseg name "ovl_Bg_Haka_Water" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Water/ovl_Bg_Haka_Water_reloc.o" endseg beginseg name "ovl_Bg_Haka_Zou" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Haka_Zou/ovl_Bg_Haka_Zou_reloc.o" endseg beginseg name "ovl_Bg_Heavy_Block" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Heavy_Block/ovl_Bg_Heavy_Block_reloc.o" endseg beginseg name "ovl_Bg_Hidan_Curtain" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Curtain/ovl_Bg_Hidan_Curtain_reloc.o" endseg beginseg name "ovl_Bg_Hidan_Dalm" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Dalm/ovl_Bg_Hidan_Dalm_reloc.o" endseg beginseg name "ovl_Bg_Hidan_Firewall" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Firewall/ovl_Bg_Hidan_Firewall_reloc.o" endseg beginseg name "ovl_Bg_Hidan_Fslift" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Fslift/ovl_Bg_Hidan_Fslift_reloc.o" endseg beginseg name "ovl_Bg_Hidan_Fwbig" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Fwbig/ovl_Bg_Hidan_Fwbig_reloc.o" endseg beginseg name "ovl_Bg_Hidan_Hamstep" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Hamstep/ovl_Bg_Hidan_Hamstep_reloc.o" endseg beginseg name "ovl_Bg_Hidan_Hrock" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Hrock/ovl_Bg_Hidan_Hrock_reloc.o" endseg beginseg name "ovl_Bg_Hidan_Kousi" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Kousi/ovl_Bg_Hidan_Kousi_reloc.o" endseg beginseg name "ovl_Bg_Hidan_Kowarerukabe" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/ovl_Bg_Hidan_Kowarerukabe_reloc.o" endseg beginseg name "ovl_Bg_Hidan_Rock" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Rock/ovl_Bg_Hidan_Rock_reloc.o" endseg beginseg name "ovl_Bg_Hidan_Rsekizou" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/ovl_Bg_Hidan_Rsekizou_reloc.o" endseg beginseg name "ovl_Bg_Hidan_Sekizou" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Sekizou/ovl_Bg_Hidan_Sekizou_reloc.o" endseg beginseg name "ovl_Bg_Hidan_Sima" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Sima/ovl_Bg_Hidan_Sima_reloc.o" endseg beginseg name "ovl_Bg_Hidan_Syoku" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Hidan_Syoku/ovl_Bg_Hidan_Syoku_reloc.o" endseg beginseg name "ovl_Bg_Ice_Objects" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ice_Objects/ovl_Bg_Ice_Objects_reloc.o" endseg beginseg name "ovl_Bg_Ice_Shelter" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ice_Shelter/ovl_Bg_Ice_Shelter_reloc.o" endseg beginseg name "ovl_Bg_Ice_Shutter" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ice_Shutter/ovl_Bg_Ice_Shutter_reloc.o" endseg beginseg name "ovl_Bg_Ice_Turara" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ice_Turara/ovl_Bg_Ice_Turara_reloc.o" endseg beginseg name "ovl_Bg_Ingate" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ingate/ovl_Bg_Ingate_reloc.o" endseg beginseg name "ovl_Bg_Jya_1flift" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_1flift/ovl_Bg_Jya_1flift_reloc.o" endseg beginseg name "ovl_Bg_Jya_Amishutter" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Amishutter/ovl_Bg_Jya_Amishutter_reloc.o" endseg beginseg name "ovl_Bg_Jya_Bigmirror" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Bigmirror/ovl_Bg_Jya_Bigmirror_reloc.o" endseg beginseg name "ovl_Bg_Jya_Block" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Block/ovl_Bg_Jya_Block_reloc.o" endseg beginseg name "ovl_Bg_Jya_Bombchuiwa" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/ovl_Bg_Jya_Bombchuiwa_reloc.o" endseg beginseg name "ovl_Bg_Jya_Bombiwa" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Bombiwa/ovl_Bg_Jya_Bombiwa_reloc.o" endseg beginseg name "ovl_Bg_Jya_Cobra" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra_reloc.o" endseg beginseg name "ovl_Bg_Jya_Goroiwa" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Goroiwa/ovl_Bg_Jya_Goroiwa_reloc.o" endseg beginseg name "ovl_Bg_Jya_Haheniron" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Haheniron/ovl_Bg_Jya_Haheniron_reloc.o" endseg beginseg name "ovl_Bg_Jya_Ironobj" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Ironobj/ovl_Bg_Jya_Ironobj_reloc.o" endseg beginseg name "ovl_Bg_Jya_Kanaami" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Kanaami/ovl_Bg_Jya_Kanaami_reloc.o" endseg beginseg name "ovl_Bg_Jya_Lift" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Lift/ovl_Bg_Jya_Lift_reloc.o" endseg beginseg name "ovl_Bg_Jya_Megami" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Megami/ovl_Bg_Jya_Megami_reloc.o" endseg beginseg name "ovl_Bg_Jya_Zurerukabe" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/ovl_Bg_Jya_Zurerukabe_reloc.o" endseg beginseg name "ovl_Bg_Menkuri_Eye" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Menkuri_Eye/ovl_Bg_Menkuri_Eye_reloc.o" endseg beginseg name "ovl_Bg_Menkuri_Kaiten" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/ovl_Bg_Menkuri_Kaiten_reloc.o" endseg beginseg name "ovl_Bg_Menkuri_Nisekabe" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/ovl_Bg_Menkuri_Nisekabe_reloc.o" endseg beginseg name "ovl_Bg_Mizu_Bwall" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mizu_Bwall/ovl_Bg_Mizu_Bwall_reloc.o" endseg beginseg name "ovl_Bg_Mizu_Movebg" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mizu_Movebg/ovl_Bg_Mizu_Movebg_reloc.o" endseg beginseg name "ovl_Bg_Mizu_Shutter" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mizu_Shutter/ovl_Bg_Mizu_Shutter_reloc.o" endseg beginseg name "ovl_Bg_Mizu_Uzu" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mizu_Uzu/ovl_Bg_Mizu_Uzu_reloc.o" endseg beginseg name "ovl_Bg_Mizu_Water" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mizu_Water/ovl_Bg_Mizu_Water_reloc.o" endseg beginseg name "ovl_Bg_Mjin" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mjin/ovl_Bg_Mjin_reloc.o" endseg beginseg name "ovl_Bg_Mori_Bigst" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Bigst/ovl_Bg_Mori_Bigst_reloc.o" endseg beginseg name "ovl_Bg_Mori_Elevator" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Elevator/ovl_Bg_Mori_Elevator_reloc.o" endseg beginseg name "ovl_Bg_Mori_Hashigo" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Hashigo/ovl_Bg_Mori_Hashigo_reloc.o" endseg beginseg name "ovl_Bg_Mori_Hashira4" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Hashira4/ovl_Bg_Mori_Hashira4_reloc.o" endseg beginseg name "ovl_Bg_Mori_Hineri" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Hineri/ovl_Bg_Mori_Hineri_reloc.o" endseg beginseg name "ovl_Bg_Mori_Idomizu" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Idomizu/ovl_Bg_Mori_Idomizu_reloc.o" endseg beginseg name "ovl_Bg_Mori_Kaitenkabe" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/ovl_Bg_Mori_Kaitenkabe_reloc.o" endseg beginseg name "ovl_Bg_Mori_Rakkatenjo" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/ovl_Bg_Mori_Rakkatenjo_reloc.o" endseg beginseg name "ovl_Bg_Po_Event" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Po_Event/ovl_Bg_Po_Event_reloc.o" endseg beginseg name "ovl_Bg_Po_Syokudai" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Po_Syokudai/ovl_Bg_Po_Syokudai_reloc.o" endseg beginseg name "ovl_Bg_Pushbox" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Pushbox/ovl_Bg_Pushbox_reloc.o" endseg beginseg name "ovl_Bg_Relay_Objects" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Relay_Objects/ovl_Bg_Relay_Objects_reloc.o" endseg beginseg name "ovl_Bg_Spot00_Break" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot00_Break/ovl_Bg_Spot00_Break_reloc.o" endseg beginseg name "ovl_Bg_Spot00_Hanebasi" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/ovl_Bg_Spot00_Hanebasi_reloc.o" endseg beginseg name "ovl_Bg_Spot01_Fusya" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot01_Fusya/ovl_Bg_Spot01_Fusya_reloc.o" endseg beginseg name "ovl_Bg_Spot01_Idohashira" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot01_Idohashira/ovl_Bg_Spot01_Idohashira_reloc.o" endseg beginseg name "ovl_Bg_Spot01_Idomizu" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot01_Idomizu/ovl_Bg_Spot01_Idomizu_reloc.o" endseg beginseg name "ovl_Bg_Spot01_Idosoko" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot01_Idosoko/ovl_Bg_Spot01_Idosoko_reloc.o" endseg beginseg name "ovl_Bg_Spot01_Objects2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot01_Objects2/ovl_Bg_Spot01_Objects2_reloc.o" endseg beginseg name "ovl_Bg_Spot02_Objects" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot02_Objects/ovl_Bg_Spot02_Objects_reloc.o" endseg beginseg name "ovl_Bg_Spot03_Taki" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot03_Taki/ovl_Bg_Spot03_Taki_reloc.o" endseg beginseg name "ovl_Bg_Spot05_Soko" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot05_Soko/ovl_Bg_Spot05_Soko_reloc.o" endseg beginseg name "ovl_Bg_Spot06_Objects" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot06_Objects/ovl_Bg_Spot06_Objects_reloc.o" endseg beginseg name "ovl_Bg_Spot07_Taki" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot07_Taki/ovl_Bg_Spot07_Taki_reloc.o" endseg beginseg name "ovl_Bg_Spot08_Bakudankabe" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/ovl_Bg_Spot08_Bakudankabe_reloc.o" endseg beginseg name "ovl_Bg_Spot08_Iceblock" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot08_Iceblock/ovl_Bg_Spot08_Iceblock_reloc.o" endseg beginseg name "ovl_Bg_Spot09_Obj" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot09_Obj/ovl_Bg_Spot09_Obj_reloc.o" endseg beginseg name "ovl_Bg_Spot11_Bakudankabe" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/ovl_Bg_Spot11_Bakudankabe_reloc.o" endseg beginseg name "ovl_Bg_Spot11_Oasis" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot11_Oasis/ovl_Bg_Spot11_Oasis_reloc.o" endseg beginseg name "ovl_Bg_Spot12_Gate" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot12_Gate/ovl_Bg_Spot12_Gate_reloc.o" endseg beginseg name "ovl_Bg_Spot12_Saku" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot12_Saku/ovl_Bg_Spot12_Saku_reloc.o" endseg beginseg name "ovl_Bg_Spot15_Rrbox" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot15_Rrbox/ovl_Bg_Spot15_Rrbox_reloc.o" endseg beginseg name "ovl_Bg_Spot15_Saku" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot15_Saku/ovl_Bg_Spot15_Saku_reloc.o" endseg beginseg name "ovl_Bg_Spot16_Bombstone" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot16_Bombstone/ovl_Bg_Spot16_Bombstone_reloc.o" endseg beginseg name "ovl_Bg_Spot16_Doughnut" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot16_Doughnut/ovl_Bg_Spot16_Doughnut_reloc.o" endseg beginseg name "ovl_Bg_Spot17_Bakudankabe" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/ovl_Bg_Spot17_Bakudankabe_reloc.o" endseg beginseg name "ovl_Bg_Spot17_Funen" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot17_Funen/ovl_Bg_Spot17_Funen_reloc.o" endseg beginseg name "ovl_Bg_Spot18_Basket" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot18_Basket/ovl_Bg_Spot18_Basket_reloc.o" endseg beginseg name "ovl_Bg_Spot18_Futa" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot18_Futa/ovl_Bg_Spot18_Futa_reloc.o" endseg beginseg name "ovl_Bg_Spot18_Obj" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot18_Obj/ovl_Bg_Spot18_Obj_reloc.o" endseg beginseg name "ovl_Bg_Spot18_Shutter" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Spot18_Shutter/ovl_Bg_Spot18_Shutter_reloc.o" endseg beginseg name "ovl_Bg_Sst_Floor" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Sst_Floor/ovl_Bg_Sst_Floor_reloc.o" endseg beginseg name "ovl_Bg_Toki_Hikari" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Toki_Hikari/ovl_Bg_Toki_Hikari_reloc.o" endseg beginseg name "ovl_Bg_Toki_Swd" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.o" @@ -1321,6 +1456,7 @@ endseg beginseg name "ovl_Bg_Treemouth" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Treemouth/ovl_Bg_Treemouth_reloc.o" @@ -1328,174 +1464,203 @@ endseg beginseg name "ovl_Bg_Umajump" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Umajump/ovl_Bg_Umajump_reloc.o" endseg beginseg name "ovl_Bg_Vb_Sima" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Vb_Sima/ovl_Bg_Vb_Sima_reloc.o" endseg beginseg name "ovl_Bg_Ydan_Hasi" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ydan_Hasi/ovl_Bg_Ydan_Hasi_reloc.o" endseg beginseg name "ovl_Bg_Ydan_Maruta" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ydan_Maruta/ovl_Bg_Ydan_Maruta_reloc.o" endseg beginseg name "ovl_Bg_Ydan_Sp" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Ydan_Sp/ovl_Bg_Ydan_Sp_reloc.o" endseg beginseg name "ovl_Bg_Zg" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Bg_Zg/ovl_Bg_Zg_reloc.o" endseg beginseg name "ovl_Boss_Dodongo" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Dodongo/ovl_Boss_Dodongo_reloc.o" endseg beginseg name "ovl_Boss_Fd" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Fd/ovl_Boss_Fd_reloc.o" endseg beginseg name "ovl_Boss_Fd2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Fd2/ovl_Boss_Fd2_reloc.o" endseg beginseg name "ovl_Boss_Ganon" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Ganon/ovl_Boss_Ganon_reloc.o" endseg beginseg name "ovl_Boss_Ganon2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Ganon2/ovl_Boss_Ganon2_reloc.o" endseg beginseg name "ovl_Boss_Ganondrof" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Ganondrof/ovl_Boss_Ganondrof_reloc.o" endseg beginseg name "ovl_Boss_Goma" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Goma/ovl_Boss_Goma_reloc.o" endseg beginseg name "ovl_Boss_Mo" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Mo/ovl_Boss_Mo_reloc.o" endseg beginseg name "ovl_Boss_Sst" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Sst/ovl_Boss_Sst_reloc.o" endseg beginseg name "ovl_Boss_Tw" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Tw/ovl_Boss_Tw_reloc.o" endseg beginseg name "ovl_Boss_Va" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Va/z_boss_va.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Boss_Va/ovl_Boss_Va_reloc.o" endseg beginseg name "ovl_Demo_6K" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_6K/z_demo_6k.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_6K/ovl_Demo_6K_reloc.o" endseg beginseg name "ovl_Demo_Du" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Du/z_demo_du.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Du/ovl_Demo_Du_reloc.o" endseg beginseg name "ovl_Demo_Ec" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Ec/ovl_Demo_Ec_reloc.o" endseg beginseg name "ovl_Demo_Effect" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Effect/ovl_Demo_Effect_reloc.o" endseg beginseg name "ovl_Demo_Ext" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Ext/ovl_Demo_Ext_reloc.o" endseg beginseg name "ovl_Demo_Geff" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Geff/ovl_Demo_Geff_reloc.o" endseg beginseg name "ovl_Demo_Gj" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Gj/ovl_Demo_Gj_reloc.o" endseg beginseg name "ovl_Demo_Go" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Go/z_demo_go.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Go/ovl_Demo_Go_reloc.o" endseg beginseg name "ovl_Demo_Gt" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Gt/ovl_Demo_Gt_reloc.o" endseg beginseg name "ovl_Demo_Ik" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Ik/ovl_Demo_Ik_reloc.o" endseg beginseg name "ovl_Demo_Im" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Im/z_demo_im.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Im/ovl_Demo_Im_reloc.o" endseg beginseg name "ovl_Demo_Kankyo" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.o" @@ -1510,1158 +1675,1351 @@ endseg beginseg name "ovl_Demo_Kekkai" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kekkai/ovl_Demo_Kekkai_reloc.o" endseg beginseg name "ovl_Demo_Sa" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Sa/ovl_Demo_Sa_reloc.o" endseg beginseg name "ovl_Demo_Shd" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Shd/ovl_Demo_Shd_reloc.o" endseg beginseg name "ovl_Demo_Tre_Lgt" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Tre_Lgt/ovl_Demo_Tre_Lgt_reloc.o" endseg beginseg name "ovl_Door_Ana" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Door_Ana/z_door_ana.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Door_Ana/ovl_Door_Ana_reloc.o" endseg beginseg name "ovl_Door_Gerudo" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Door_Gerudo/ovl_Door_Gerudo_reloc.o" endseg beginseg name "ovl_Door_Killer" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Door_Killer/z_door_killer.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Door_Killer/ovl_Door_Killer_reloc.o" endseg beginseg name "ovl_Door_Shutter" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Door_Shutter/ovl_Door_Shutter_reloc.o" endseg beginseg name "ovl_Door_Toki" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Door_Toki/z_door_toki.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Door_Toki/ovl_Door_Toki_reloc.o" endseg beginseg name "ovl_Door_Warp1" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Door_Warp1/ovl_Door_Warp1_reloc.o" endseg beginseg name "ovl_Efc_Erupc" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Efc_Erupc/ovl_Efc_Erupc_reloc.o" endseg beginseg name "ovl_Eff_Dust" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Eff_Dust/ovl_Eff_Dust_reloc.o" endseg beginseg name "ovl_Effect_Ss_Blast" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Blast/ovl_Effect_Ss_Blast_reloc.o" endseg beginseg name "ovl_Effect_Ss_Bomb" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Bomb/ovl_Effect_Ss_Bomb_reloc.o" endseg beginseg name "ovl_Effect_Ss_Bomb2" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Bomb2/ovl_Effect_Ss_Bomb2_reloc.o" endseg beginseg name "ovl_Effect_Ss_Bubble" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Bubble/ovl_Effect_Ss_Bubble_reloc.o" endseg beginseg name "ovl_Effect_Ss_D_Fire" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_D_Fire/ovl_Effect_Ss_D_Fire_reloc.o" endseg beginseg name "ovl_Effect_Ss_Dead_Db" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Dead_Db/ovl_Effect_Ss_Dead_Db_reloc.o" endseg beginseg name "ovl_Effect_Ss_Dead_Dd" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/ovl_Effect_Ss_Dead_Dd_reloc.o" endseg beginseg name "ovl_Effect_Ss_Dead_Ds" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/ovl_Effect_Ss_Dead_Ds_reloc.o" endseg beginseg name "ovl_Effect_Ss_Dead_Sound" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/ovl_Effect_Ss_Dead_Sound_reloc.o" endseg beginseg name "ovl_Effect_Ss_Dt_Bubble" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/ovl_Effect_Ss_Dt_Bubble_reloc.o" endseg beginseg name "ovl_Effect_Ss_Dust" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Dust/ovl_Effect_Ss_Dust_reloc.o" endseg beginseg name "ovl_Effect_Ss_En_Fire" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_En_Fire/ovl_Effect_Ss_En_Fire_reloc.o" endseg beginseg name "ovl_Effect_Ss_En_Ice" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_En_Ice/ovl_Effect_Ss_En_Ice_reloc.o" endseg beginseg name "ovl_Effect_Ss_Extra" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Extra/ovl_Effect_Ss_Extra_reloc.o" endseg beginseg name "ovl_Effect_Ss_Fcircle" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Fcircle/ovl_Effect_Ss_Fcircle_reloc.o" endseg beginseg name "ovl_Effect_Ss_Fhg_Flash" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/ovl_Effect_Ss_Fhg_Flash_reloc.o" endseg beginseg name "ovl_Effect_Ss_Fire_Tail" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/ovl_Effect_Ss_Fire_Tail_reloc.o" endseg beginseg name "ovl_Effect_Ss_G_Fire" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_G_Fire/ovl_Effect_Ss_G_Fire_reloc.o" endseg beginseg name "ovl_Effect_Ss_G_Magma" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_G_Magma/ovl_Effect_Ss_G_Magma_reloc.o" endseg beginseg name "ovl_Effect_Ss_G_Magma2" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_G_Magma2/ovl_Effect_Ss_G_Magma2_reloc.o" endseg beginseg name "ovl_Effect_Ss_G_Ripple" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_G_Ripple/ovl_Effect_Ss_G_Ripple_reloc.o" endseg beginseg name "ovl_Effect_Ss_G_Spk" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_G_Spk/ovl_Effect_Ss_G_Spk_reloc.o" endseg beginseg name "ovl_Effect_Ss_G_Splash" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_G_Splash/ovl_Effect_Ss_G_Splash_reloc.o" endseg beginseg name "ovl_Effect_Ss_Hahen" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Hahen/ovl_Effect_Ss_Hahen_reloc.o" endseg beginseg name "ovl_Effect_Ss_HitMark" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_HitMark/ovl_Effect_Ss_HitMark_reloc.o" endseg beginseg name "ovl_Effect_Ss_Ice_Piece" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/ovl_Effect_Ss_Ice_Piece_reloc.o" endseg beginseg name "ovl_Effect_Ss_Ice_Smoke" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/ovl_Effect_Ss_Ice_Smoke_reloc.o" endseg beginseg name "ovl_Effect_Ss_K_Fire" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_K_Fire/ovl_Effect_Ss_K_Fire_reloc.o" endseg beginseg name "ovl_Effect_Ss_Kakera" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Kakera/ovl_Effect_Ss_Kakera_reloc.o" endseg beginseg name "ovl_Effect_Ss_KiraKira" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_KiraKira/ovl_Effect_Ss_KiraKira_reloc.o" endseg beginseg name "ovl_Effect_Ss_Lightning" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Lightning/ovl_Effect_Ss_Lightning_reloc.o" endseg beginseg name "ovl_Effect_Ss_Sibuki" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Sibuki/ovl_Effect_Ss_Sibuki_reloc.o" endseg beginseg name "ovl_Effect_Ss_Sibuki2" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Sibuki2/ovl_Effect_Ss_Sibuki2_reloc.o" endseg beginseg name "ovl_Effect_Ss_Solder_Srch_Ball" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/ovl_Effect_Ss_Solder_Srch_Ball_reloc.o" endseg beginseg name "ovl_Effect_Ss_Stick" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Stick/ovl_Effect_Ss_Stick_reloc.o" endseg beginseg name "ovl_Effect_Ss_Stone1" + compress include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.o" include "$(BUILD_DIR)/src/overlays/effects/ovl_Effect_Ss_Stone1/ovl_Effect_Ss_Stone1_reloc.o" endseg beginseg name "ovl_Elf_Msg" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Elf_Msg/ovl_Elf_Msg_reloc.o" endseg beginseg name "ovl_Elf_Msg2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Elf_Msg2/ovl_Elf_Msg2_reloc.o" endseg beginseg name "ovl_En_Am" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Am/z_en_am.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Am/ovl_En_Am_reloc.o" endseg beginseg name "ovl_En_Ani" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ani/z_en_ani.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ani/ovl_En_Ani_reloc.o" endseg beginseg name "ovl_En_Anubice" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Anubice/z_en_anubice.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Anubice/ovl_En_Anubice_reloc.o" endseg beginseg name "ovl_En_Anubice_Fire" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Anubice_Fire/ovl_En_Anubice_Fire_reloc.o" endseg beginseg name "ovl_En_Anubice_Tag" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Anubice_Tag/ovl_En_Anubice_Tag_reloc.o" endseg beginseg name "ovl_En_Arow_Trap" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Arow_Trap/ovl_En_Arow_Trap_reloc.o" endseg beginseg name "ovl_En_Arrow" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Arrow/z_en_arrow.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Arrow/ovl_En_Arrow_reloc.o" endseg beginseg name "ovl_En_Attack_Niw" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Attack_Niw/ovl_En_Attack_Niw_reloc.o" endseg beginseg name "ovl_En_Ba" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ba/z_en_ba.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ba/ovl_En_Ba_reloc.o" endseg beginseg name "ovl_En_Bb" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bb/z_en_bb.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bb/ovl_En_Bb_reloc.o" endseg beginseg name "ovl_En_Bdfire" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bdfire/ovl_En_Bdfire_reloc.o" endseg beginseg name "ovl_En_Bigokuta" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bigokuta/ovl_En_Bigokuta_reloc.o" endseg beginseg name "ovl_En_Bili" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bili/z_en_bili.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bili/ovl_En_Bili_reloc.o" endseg beginseg name "ovl_En_Bird" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bird/z_en_bird.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bird/ovl_En_Bird_reloc.o" endseg beginseg name "ovl_En_Blkobj" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Blkobj/ovl_En_Blkobj_reloc.o" endseg beginseg name "ovl_En_Bom" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bom/z_en_bom.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bom/ovl_En_Bom_reloc.o" endseg beginseg name "ovl_En_Bom_Bowl_Man" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bom_Bowl_Man/ovl_En_Bom_Bowl_Man_reloc.o" endseg beginseg name "ovl_En_Bom_Bowl_Pit" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bom_Bowl_Pit/ovl_En_Bom_Bowl_Pit_reloc.o" endseg beginseg name "ovl_En_Bom_Chu" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bom_Chu/ovl_En_Bom_Chu_reloc.o" endseg beginseg name "ovl_En_Bombf" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bombf/z_en_bombf.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bombf/ovl_En_Bombf_reloc.o" endseg beginseg name "ovl_En_Boom" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Boom/z_en_boom.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Boom/ovl_En_Boom_reloc.o" endseg beginseg name "ovl_En_Box" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Box/z_en_box.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Box/ovl_En_Box_reloc.o" endseg beginseg name "ovl_En_Brob" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Brob/z_en_brob.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Brob/ovl_En_Brob_reloc.o" endseg beginseg name "ovl_En_Bubble" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bubble/z_en_bubble.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bubble/ovl_En_Bubble_reloc.o" endseg beginseg name "ovl_En_Butte" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Butte/z_en_butte.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Butte/ovl_En_Butte_reloc.o" endseg beginseg name "ovl_En_Bw" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bw/z_en_bw.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bw/ovl_En_Bw_reloc.o" endseg beginseg name "ovl_En_Bx" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bx/z_en_bx.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Bx/ovl_En_Bx_reloc.o" endseg beginseg name "ovl_En_Changer" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Changer/z_en_changer.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Changer/ovl_En_Changer_reloc.o" endseg beginseg name "ovl_En_Clear_Tag" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Clear_Tag/ovl_En_Clear_Tag_reloc.o" endseg beginseg name "ovl_En_Cow" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Cow/z_en_cow.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Cow/ovl_En_Cow_reloc.o" endseg beginseg name "ovl_En_Crow" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Crow/z_en_crow.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Crow/ovl_En_Crow_reloc.o" endseg beginseg name "ovl_En_Cs" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Cs/z_en_cs.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Cs/ovl_En_Cs_reloc.o" endseg beginseg name "ovl_En_Daiku" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Daiku/z_en_daiku.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Daiku/ovl_En_Daiku_reloc.o" endseg beginseg name "ovl_En_Daiku_Kakariko" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Daiku_Kakariko/ovl_En_Daiku_Kakariko_reloc.o" endseg beginseg name "ovl_En_Dekubaba" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dekubaba/ovl_En_Dekubaba_reloc.o" endseg beginseg name "ovl_En_Dekunuts" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dekunuts/ovl_En_Dekunuts_reloc.o" endseg beginseg name "ovl_En_Dh" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dh/z_en_dh.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dh/ovl_En_Dh_reloc.o" endseg beginseg name "ovl_En_Dha" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dha/z_en_dha.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dha/ovl_En_Dha_reloc.o" endseg beginseg name "ovl_En_Diving_Game" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Diving_Game/ovl_En_Diving_Game_reloc.o" endseg beginseg name "ovl_En_Dns" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dns/z_en_dns.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dns/ovl_En_Dns_reloc.o" endseg beginseg name "ovl_En_Dnt_Demo" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dnt_Demo/ovl_En_Dnt_Demo_reloc.o" endseg beginseg name "ovl_En_Dnt_Jiji" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dnt_Jiji/ovl_En_Dnt_Jiji_reloc.o" endseg beginseg name "ovl_En_Dnt_Nomal" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dnt_Nomal/ovl_En_Dnt_Nomal_reloc.o" endseg beginseg name "ovl_En_Dodojr" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dodojr/ovl_En_Dodojr_reloc.o" endseg beginseg name "ovl_En_Dodongo" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dodongo/ovl_En_Dodongo_reloc.o" endseg beginseg name "ovl_En_Dog" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dog/z_en_dog.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dog/ovl_En_Dog_reloc.o" endseg beginseg name "ovl_En_Door" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Door/z_en_door.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Door/ovl_En_Door_reloc.o" endseg beginseg name "ovl_En_Ds" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ds/z_en_ds.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ds/ovl_En_Ds_reloc.o" endseg beginseg name "ovl_En_Du" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Du/z_en_du.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Du/ovl_En_Du_reloc.o" endseg beginseg name "ovl_En_Dy_Extra" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Dy_Extra/ovl_En_Dy_Extra_reloc.o" endseg beginseg name "ovl_En_Eg" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Eg/z_en_eg.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Eg/ovl_En_Eg_reloc.o" endseg beginseg name "ovl_En_Eiyer" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Eiyer/ovl_En_Eiyer_reloc.o" endseg beginseg name "ovl_En_Elf" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Elf/z_en_elf.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Elf/ovl_En_Elf_reloc.o" endseg beginseg name "ovl_En_Encount1" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Encount1/z_en_encount1.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Encount1/ovl_En_Encount1_reloc.o" endseg beginseg name "ovl_En_Encount2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Encount2/z_en_encount2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Encount2/ovl_En_Encount2_reloc.o" endseg beginseg name "ovl_En_Ex_Item" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ex_Item/ovl_En_Ex_Item_reloc.o" endseg beginseg name "ovl_En_Ex_Ruppy" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ex_Ruppy/ovl_En_Ex_Ruppy_reloc.o" endseg beginseg name "ovl_En_Fd" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fd/z_en_fd.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fd/ovl_En_Fd_reloc.o" endseg beginseg name "ovl_En_Fd_Fire" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fd_Fire/ovl_En_Fd_Fire_reloc.o" endseg beginseg name "ovl_En_Fhg_Fire" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fhg_Fire/ovl_En_Fhg_Fire_reloc.o" endseg beginseg name "ovl_En_Fire_Rock" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fire_Rock/ovl_En_Fire_Rock_reloc.o" endseg beginseg name "ovl_En_Firefly" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Firefly/z_en_firefly.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Firefly/ovl_En_Firefly_reloc.o" endseg beginseg name "ovl_En_Fish" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fish/z_en_fish.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fish/ovl_En_Fish_reloc.o" endseg beginseg name "ovl_En_Floormas" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Floormas/z_en_floormas.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Floormas/ovl_En_Floormas_reloc.o" endseg beginseg name "ovl_En_Fr" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fr/z_en_fr.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fr/ovl_En_Fr_reloc.o" endseg beginseg name "ovl_En_Fu" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fu/z_en_fu.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fu/ovl_En_Fu_reloc.o" endseg beginseg name "ovl_En_Fw" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fw/z_en_fw.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fw/ovl_En_Fw_reloc.o" endseg beginseg name "ovl_En_Fz" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fz/z_en_fz.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Fz/ovl_En_Fz_reloc.o" endseg beginseg name "ovl_En_G_Switch" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_G_Switch/ovl_En_G_Switch_reloc.o" endseg beginseg name "ovl_En_Ganon_Mant" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ganon_Mant/ovl_En_Ganon_Mant_reloc.o" endseg beginseg name "ovl_En_Ganon_Organ" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ganon_Organ/ovl_En_Ganon_Organ_reloc.o" endseg beginseg name "ovl_En_Gb" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Gb/z_en_gb.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Gb/ovl_En_Gb_reloc.o" endseg beginseg name "ovl_En_Ge1" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ge1/z_en_ge1.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ge1/ovl_En_Ge1_reloc.o" endseg beginseg name "ovl_En_Ge2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ge2/z_en_ge2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ge2/ovl_En_Ge2_reloc.o" endseg beginseg name "ovl_En_Ge3" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ge3/z_en_ge3.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ge3/ovl_En_Ge3_reloc.o" endseg beginseg name "ovl_En_GeldB" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_GeldB/z_en_geldb.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_GeldB/ovl_En_GeldB_reloc.o" endseg beginseg name "ovl_En_GirlA" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_GirlA/z_en_girla.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_GirlA/ovl_En_GirlA_reloc.o" endseg beginseg name "ovl_En_Gm" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Gm/z_en_gm.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Gm/ovl_En_Gm_reloc.o" endseg beginseg name "ovl_En_Go" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Go/z_en_go.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Go/ovl_En_Go_reloc.o" endseg beginseg name "ovl_En_Go2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Go2/z_en_go2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Go2/ovl_En_Go2_reloc.o" endseg beginseg name "ovl_En_Goma" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Goma/z_en_goma.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Goma/ovl_En_Goma_reloc.o" endseg beginseg name "ovl_En_Goroiwa" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Goroiwa/ovl_En_Goroiwa_reloc.o" endseg beginseg name "ovl_En_Gs" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Gs/z_en_gs.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Gs/ovl_En_Gs_reloc.o" endseg beginseg name "ovl_En_Guest" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Guest/z_en_guest.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Guest/ovl_En_Guest_reloc.o" endseg beginseg name "ovl_En_Hata" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Hata/z_en_hata.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Hata/ovl_En_Hata_reloc.o" endseg beginseg name "ovl_En_Heishi1" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Heishi1/ovl_En_Heishi1_reloc.o" endseg beginseg name "ovl_En_Heishi2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Heishi2/ovl_En_Heishi2_reloc.o" endseg beginseg name "ovl_En_Heishi3" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Heishi3/ovl_En_Heishi3_reloc.o" endseg beginseg name "ovl_En_Heishi4" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Heishi4/ovl_En_Heishi4_reloc.o" endseg beginseg name "ovl_En_Hintnuts" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Hintnuts/ovl_En_Hintnuts_reloc.o" endseg beginseg name "ovl_En_Holl" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Holl/z_en_holl.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Holl/ovl_En_Holl_reloc.o" endseg beginseg name "ovl_En_Honotrap" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Honotrap/ovl_En_Honotrap_reloc.o" endseg beginseg name "ovl_En_Horse" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Horse/z_en_horse.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Horse/ovl_En_Horse_reloc.o" endseg beginseg name "ovl_En_Horse_Game_Check" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Horse_Game_Check/ovl_En_Horse_Game_Check_reloc.o" endseg beginseg name "ovl_En_Horse_Ganon" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Horse_Ganon/ovl_En_Horse_Ganon_reloc.o" endseg beginseg name "ovl_En_Horse_Link_Child" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Horse_Link_Child/ovl_En_Horse_Link_Child_reloc.o" endseg beginseg name "ovl_En_Horse_Normal" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Horse_Normal/ovl_En_Horse_Normal_reloc.o" endseg beginseg name "ovl_En_Horse_Zelda" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Horse_Zelda/ovl_En_Horse_Zelda_reloc.o" endseg beginseg name "ovl_En_Hs" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Hs/z_en_hs.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Hs/ovl_En_Hs_reloc.o" endseg beginseg name "ovl_En_Hs2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Hs2/z_en_hs2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Hs2/ovl_En_Hs2_reloc.o" endseg beginseg name "ovl_En_Hy" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Hy/z_en_hy.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Hy/ovl_En_Hy_reloc.o" endseg beginseg name "ovl_En_Ice_Hono" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ice_Hono/ovl_En_Ice_Hono_reloc.o" endseg beginseg name "ovl_En_Ik" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ik/z_en_ik.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ik/ovl_En_Ik_reloc.o" endseg beginseg name "ovl_En_In" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_In/z_en_in.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_In/ovl_En_In_reloc.o" endseg beginseg name "ovl_En_Insect" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Insect/z_en_insect.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Insect/ovl_En_Insect_reloc.o" endseg beginseg name "ovl_En_Ishi" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ishi/z_en_ishi.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ishi/ovl_En_Ishi_reloc.o" endseg beginseg name "ovl_En_It" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_It/z_en_it.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_It/ovl_En_It_reloc.o" endseg beginseg name "ovl_En_Jj" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Jj/z_en_jj.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Jj/ovl_En_Jj_reloc.o" endseg beginseg name "ovl_En_Js" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Js/z_en_js.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Js/ovl_En_Js_reloc.o" endseg beginseg name "ovl_En_Jsjutan" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Jsjutan/ovl_En_Jsjutan_reloc.o" endseg beginseg name "ovl_En_Kakasi" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Kakasi/ovl_En_Kakasi_reloc.o" endseg beginseg name "ovl_En_Kakasi2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Kakasi2/ovl_En_Kakasi2_reloc.o" endseg beginseg name "ovl_En_Kakasi3" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Kakasi3/ovl_En_Kakasi3_reloc.o" endseg beginseg name "ovl_En_Kanban" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Kanban/z_en_kanban.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Kanban/ovl_En_Kanban_reloc.o" endseg beginseg name "ovl_En_Karebaba" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Karebaba/ovl_En_Karebaba_reloc.o" endseg beginseg name "ovl_En_Ko" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ko/z_en_ko.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ko/ovl_En_Ko_reloc.o" endseg beginseg name "ovl_En_Kusa" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Kusa/z_en_kusa.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Kusa/ovl_En_Kusa_reloc.o" endseg beginseg name "ovl_En_Kz" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Kz/z_en_kz.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Kz/ovl_En_Kz_reloc.o" endseg beginseg name "ovl_En_Light" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Light/z_en_light.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Light/ovl_En_Light_reloc.o" endseg beginseg name "ovl_En_Lightbox" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Lightbox/ovl_En_Lightbox_reloc.o" endseg beginseg name "ovl_En_M_Fire1" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_M_Fire1/ovl_En_M_Fire1_reloc.o" endseg beginseg name "ovl_En_M_Thunder" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_M_Thunder/ovl_En_M_Thunder_reloc.o" endseg beginseg name "ovl_En_Ma1" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ma1/z_en_ma1.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ma1/ovl_En_Ma1_reloc.o" endseg beginseg name "ovl_En_Ma2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ma2/z_en_ma2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ma2/ovl_En_Ma2_reloc.o" endseg beginseg name "ovl_En_Ma3" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ma3/z_en_ma3.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ma3/ovl_En_Ma3_reloc.o" endseg beginseg name "ovl_En_Mag" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Mag/z_en_mag.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Mag/ovl_En_Mag_reloc.o" endseg beginseg name "ovl_En_Mb" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Mb/z_en_mb.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Mb/ovl_En_Mb_reloc.o" endseg beginseg name "ovl_En_Md" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Md/z_en_md.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Md/ovl_En_Md_reloc.o" endseg beginseg name "ovl_En_Mk" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Mk/z_en_mk.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Mk/ovl_En_Mk_reloc.o" endseg beginseg name "ovl_En_Mm" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Mm/z_en_mm.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Mm/ovl_En_Mm_reloc.o" endseg beginseg name "ovl_En_Mm2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Mm2/z_en_mm2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Mm2/ovl_En_Mm2_reloc.o" endseg beginseg name "ovl_En_Ms" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ms/z_en_ms.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ms/ovl_En_Ms_reloc.o" endseg beginseg name "ovl_En_Mu" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Mu/z_en_mu.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Mu/ovl_En_Mu_reloc.o" endseg beginseg name "ovl_En_Nb" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Nb/z_en_nb.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Nb/ovl_En_Nb_reloc.o" endseg beginseg name "ovl_En_Niw" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Niw/z_en_niw.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Niw/ovl_En_Niw_reloc.o" endseg beginseg name "ovl_En_Niw_Girl" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Niw_Girl/ovl_En_Niw_Girl_reloc.o" endseg beginseg name "ovl_En_Niw_Lady" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Niw_Lady/ovl_En_Niw_Lady_reloc.o" endseg beginseg name "ovl_En_Nutsball" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Nutsball/ovl_En_Nutsball_reloc.o" endseg beginseg name "ovl_En_Nwc" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Nwc/z_en_nwc.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Nwc/ovl_En_Nwc_reloc.o" endseg beginseg name "ovl_En_Ny" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ny/z_en_ny.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ny/ovl_En_Ny_reloc.o" endseg beginseg name "ovl_En_OE2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_OE2/z_en_oe2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_OE2/ovl_En_OE2_reloc.o" endseg beginseg name "ovl_En_Okarina_Effect" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Okarina_Effect/ovl_En_Okarina_Effect_reloc.o" endseg beginseg name "ovl_En_Okarina_Tag" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Okarina_Tag/ovl_En_Okarina_Tag_reloc.o" @@ -2669,408 +3027,476 @@ endseg beginseg name "ovl_En_Okuta" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Okuta/z_en_okuta.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Okuta/ovl_En_Okuta_reloc.o" endseg beginseg name "ovl_En_Ossan" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ossan/ovl_En_Ossan_reloc.o" endseg beginseg name "ovl_En_Owl" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Owl/z_en_owl.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Owl/ovl_En_Owl_reloc.o" endseg beginseg name "ovl_En_Part" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Part/z_en_part.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Part/ovl_En_Part_reloc.o" endseg beginseg name "ovl_En_Peehat" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Peehat/z_en_peehat.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Peehat/ovl_En_Peehat_reloc.o" endseg beginseg name "ovl_En_Po_Desert" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Po_Desert/ovl_En_Po_Desert_reloc.o" endseg beginseg name "ovl_En_Po_Field" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Po_Field/ovl_En_Po_Field_reloc.o" endseg beginseg name "ovl_En_Po_Relay" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Po_Relay/ovl_En_Po_Relay_reloc.o" endseg beginseg name "ovl_En_Po_Sisters" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Po_Sisters/ovl_En_Po_Sisters_reloc.o" endseg beginseg name "ovl_En_Poh" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Poh/z_en_poh.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Poh/ovl_En_Poh_reloc.o" endseg beginseg name "ovl_En_Pu_box" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Pu_box/ovl_En_Pu_box_reloc.o" endseg beginseg name "ovl_En_Rd" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Rd/z_en_rd.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Rd/ovl_En_Rd_reloc.o" endseg beginseg name "ovl_En_Reeba" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Reeba/z_en_reeba.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Reeba/ovl_En_Reeba_reloc.o" endseg beginseg name "ovl_En_River_Sound" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_River_Sound/ovl_En_River_Sound_reloc.o" endseg beginseg name "ovl_En_Rl" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Rl/z_en_rl.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Rl/ovl_En_Rl_reloc.o" endseg beginseg name "ovl_En_Rr" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Rr/z_en_rr.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Rr/ovl_En_Rr_reloc.o" endseg beginseg name "ovl_En_Ru1" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ru1/z_en_ru1.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ru1/ovl_En_Ru1_reloc.o" endseg beginseg name "ovl_En_Ru2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ru2/z_en_ru2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ru2/ovl_En_Ru2_reloc.o" endseg beginseg name "ovl_En_Sa" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Sa/z_en_sa.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Sa/ovl_En_Sa_reloc.o" endseg beginseg name "ovl_En_Sb" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Sb/z_en_sb.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Sb/ovl_En_Sb_reloc.o" endseg beginseg name "ovl_En_Scene_Change" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Scene_Change/ovl_En_Scene_Change_reloc.o" endseg beginseg name "ovl_En_Sda" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Sda/z_en_sda.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Sda/ovl_En_Sda_reloc.o" endseg beginseg name "ovl_En_Shopnuts" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Shopnuts/ovl_En_Shopnuts_reloc.o" endseg beginseg name "ovl_En_Si" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Si/z_en_si.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Si/ovl_En_Si_reloc.o" endseg beginseg name "ovl_En_Siofuki" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Siofuki/ovl_En_Siofuki_reloc.o" endseg beginseg name "ovl_En_Skb" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Skb/z_en_skb.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Skb/ovl_En_Skb_reloc.o" endseg beginseg name "ovl_En_Skj" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Skj/z_en_skj.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Skj/ovl_En_Skj_reloc.o" endseg beginseg name "ovl_En_Skjneedle" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Skjneedle/ovl_En_Skjneedle_reloc.o" endseg beginseg name "ovl_En_Ssh" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ssh/z_en_ssh.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ssh/ovl_En_Ssh_reloc.o" endseg beginseg name "ovl_En_St" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_St/z_en_st.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_St/ovl_En_St_reloc.o" endseg beginseg name "ovl_En_Sth" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Sth/z_en_sth.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Sth/ovl_En_Sth_reloc.o" endseg beginseg name "ovl_En_Stream" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Stream/z_en_stream.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Stream/ovl_En_Stream_reloc.o" endseg beginseg name "ovl_En_Sw" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Sw/z_en_sw.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Sw/ovl_En_Sw_reloc.o" endseg beginseg name "ovl_En_Syateki_Itm" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Syateki_Itm/ovl_En_Syateki_Itm_reloc.o" endseg beginseg name "ovl_En_Syateki_Man" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Syateki_Man/ovl_En_Syateki_Man_reloc.o" endseg beginseg name "ovl_En_Syateki_Niw" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Syateki_Niw/ovl_En_Syateki_Niw_reloc.o" endseg beginseg name "ovl_En_Ta" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ta/z_en_ta.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Ta/ovl_En_Ta_reloc.o" endseg beginseg name "ovl_En_Takara_Man" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Takara_Man/ovl_En_Takara_Man_reloc.o" endseg beginseg name "ovl_En_Tana" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tana/z_en_tana.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tana/ovl_En_Tana_reloc.o" endseg beginseg name "ovl_En_Tg" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tg/z_en_tg.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tg/ovl_En_Tg_reloc.o" endseg beginseg name "ovl_En_Tite" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tite/z_en_tite.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tite/ovl_En_Tite_reloc.o" endseg beginseg name "ovl_En_Tk" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tk/z_en_tk.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tk/ovl_En_Tk_reloc.o" endseg beginseg name "ovl_En_Torch" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Torch/z_en_torch.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Torch/ovl_En_Torch_reloc.o" endseg beginseg name "ovl_En_Torch2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Torch2/z_en_torch2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Torch2/ovl_En_Torch2_reloc.o" endseg beginseg name "ovl_En_Toryo" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Toryo/z_en_toryo.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Toryo/ovl_En_Toryo_reloc.o" endseg beginseg name "ovl_En_Tp" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tp/z_en_tp.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tp/ovl_En_Tp_reloc.o" endseg beginseg name "ovl_En_Tr" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tr/z_en_tr.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tr/ovl_En_Tr_reloc.o" endseg beginseg name "ovl_En_Trap" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Trap/z_en_trap.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Trap/ovl_En_Trap_reloc.o" endseg beginseg name "ovl_En_Tubo_Trap" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tubo_Trap/ovl_En_Tubo_Trap_reloc.o" endseg beginseg name "ovl_En_Vali" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Vali/z_en_vali.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Vali/ovl_En_Vali_reloc.o" endseg beginseg name "ovl_En_Vase" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Vase/z_en_vase.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Vase/ovl_En_Vase_reloc.o" endseg beginseg name "ovl_En_Vb_Ball" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Vb_Ball/ovl_En_Vb_Ball_reloc.o" endseg beginseg name "ovl_En_Viewer" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Viewer/z_en_viewer.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Viewer/ovl_En_Viewer_reloc.o" endseg beginseg name "ovl_En_Vm" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Vm/z_en_vm.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Vm/ovl_En_Vm_reloc.o" endseg beginseg name "ovl_En_Wall_Tubo" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Wall_Tubo/ovl_En_Wall_Tubo_reloc.o" endseg beginseg name "ovl_En_Wallmas" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Wallmas/ovl_En_Wallmas_reloc.o" endseg beginseg name "ovl_En_Weather_Tag" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Weather_Tag/ovl_En_Weather_Tag_reloc.o" endseg beginseg name "ovl_En_Weiyer" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Weiyer/ovl_En_Weiyer_reloc.o" endseg beginseg name "ovl_En_Wf" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Wf/z_en_wf.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Wf/ovl_En_Wf_reloc.o" endseg beginseg name "ovl_En_Wonder_Item" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Wonder_Item/ovl_En_Wonder_Item_reloc.o" endseg beginseg name "ovl_En_Wonder_Talk" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Wonder_Talk/ovl_En_Wonder_Talk_reloc.o" endseg beginseg name "ovl_En_Wonder_Talk2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Wonder_Talk2/ovl_En_Wonder_Talk2_reloc.o" endseg beginseg name "ovl_En_Wood02" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Wood02/z_en_wood02.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Wood02/ovl_En_Wood02_reloc.o" endseg beginseg name "ovl_En_Xc" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Xc/z_en_xc.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Xc/ovl_En_Xc_reloc.o" endseg beginseg name "ovl_En_Yabusame_Mark" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Yabusame_Mark/ovl_En_Yabusame_Mark_reloc.o" endseg beginseg name "ovl_En_Yukabyun" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Yukabyun/ovl_En_Yukabyun_reloc.o" endseg beginseg name "ovl_En_Zf" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zf/z_en_zf.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zf/ovl_En_Zf_reloc.o" endseg beginseg name "ovl_En_Zl1" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zl1/z_en_zl1.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zl1/ovl_En_Zl1_reloc.o" @@ -3078,306 +3504,357 @@ endseg beginseg name "ovl_En_Zl2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zl2/z_en_zl2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zl2/ovl_En_Zl2_reloc.o" endseg beginseg name "ovl_En_Zl3" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zl3/z_en_zl3.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zl3/ovl_En_Zl3_reloc.o" endseg beginseg name "ovl_En_Zl4" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zl4/z_en_zl4.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zl4/ovl_En_Zl4_reloc.o" endseg beginseg name "ovl_En_Zo" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zo/z_en_zo.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zo/ovl_En_Zo_reloc.o" endseg beginseg name "ovl_En_fHG" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_En_fHG/z_en_fhg.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_fHG/ovl_En_fHG_reloc.o" endseg beginseg name "ovl_End_Title" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_End_Title/z_end_title.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_End_Title/ovl_End_Title_reloc.o" endseg beginseg name "ovl_Fishing" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Fishing/z_fishing.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Fishing/ovl_Fishing_reloc.o" endseg beginseg name "ovl_Item_B_Heart" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Item_B_Heart/ovl_Item_B_Heart_reloc.o" endseg beginseg name "ovl_Item_Etcetera" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Item_Etcetera/ovl_Item_Etcetera_reloc.o" endseg beginseg name "ovl_Item_Inbox" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Item_Inbox/ovl_Item_Inbox_reloc.o" endseg beginseg name "ovl_Item_Ocarina" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Item_Ocarina/ovl_Item_Ocarina_reloc.o" endseg beginseg name "ovl_Item_Shield" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Item_Shield/z_item_shield.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Item_Shield/ovl_Item_Shield_reloc.o" endseg beginseg name "ovl_Magic_Dark" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Magic_Dark/ovl_Magic_Dark_reloc.o" endseg beginseg name "ovl_Magic_Fire" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Magic_Fire/ovl_Magic_Fire_reloc.o" endseg beginseg name "ovl_Magic_Wind" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Magic_Wind/ovl_Magic_Wind_reloc.o" endseg beginseg name "ovl_Mir_Ray" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Mir_Ray/ovl_Mir_Ray_reloc.o" endseg beginseg name "ovl_Obj_Bean" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Bean/ovl_Obj_Bean_reloc.o" endseg beginseg name "ovl_Obj_Blockstop" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Blockstop/ovl_Obj_Blockstop_reloc.o" endseg beginseg name "ovl_Obj_Bombiwa" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Bombiwa/ovl_Obj_Bombiwa_reloc.o" endseg beginseg name "ovl_Obj_Comb" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Comb/ovl_Obj_Comb_reloc.o" endseg beginseg name "ovl_Obj_Dekujr" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Dekujr/ovl_Obj_Dekujr_reloc.o" endseg beginseg name "ovl_Obj_Elevator" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Elevator/ovl_Obj_Elevator_reloc.o" endseg beginseg name "ovl_Obj_Hamishi" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Hamishi/ovl_Obj_Hamishi_reloc.o" endseg beginseg name "ovl_Obj_Hana" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Hana/ovl_Obj_Hana_reloc.o" endseg beginseg name "ovl_Obj_Hsblock" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Hsblock/ovl_Obj_Hsblock_reloc.o" endseg beginseg name "ovl_Obj_Ice_Poly" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Ice_Poly/ovl_Obj_Ice_Poly_reloc.o" endseg beginseg name "ovl_Obj_Kibako" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Kibako/ovl_Obj_Kibako_reloc.o" endseg beginseg name "ovl_Obj_Kibako2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Kibako2/ovl_Obj_Kibako2_reloc.o" endseg beginseg name "ovl_Obj_Lift" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Lift/ovl_Obj_Lift_reloc.o" endseg beginseg name "ovl_Obj_Lightswitch" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Lightswitch/ovl_Obj_Lightswitch_reloc.o" endseg beginseg name "ovl_Obj_Makekinsuta" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Makekinsuta/ovl_Obj_Makekinsuta_reloc.o" endseg beginseg name "ovl_Obj_Makeoshihiki" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Makeoshihiki/ovl_Obj_Makeoshihiki_reloc.o" endseg beginseg name "ovl_Obj_Mure" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Mure/ovl_Obj_Mure_reloc.o" endseg beginseg name "ovl_Obj_Mure2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Mure2/ovl_Obj_Mure2_reloc.o" endseg beginseg name "ovl_Obj_Mure3" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Mure3/ovl_Obj_Mure3_reloc.o" endseg beginseg name "ovl_Obj_Oshihiki" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Oshihiki/ovl_Obj_Oshihiki_reloc.o" endseg beginseg name "ovl_Obj_Roomtimer" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Roomtimer/ovl_Obj_Roomtimer_reloc.o" endseg beginseg name "ovl_Obj_Switch" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Switch/ovl_Obj_Switch_reloc.o" endseg beginseg name "ovl_Obj_Syokudai" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Syokudai/ovl_Obj_Syokudai_reloc.o" endseg beginseg name "ovl_Obj_Timeblock" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Timeblock/ovl_Obj_Timeblock_reloc.o" endseg beginseg name "ovl_Obj_Tsubo" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Tsubo/ovl_Obj_Tsubo_reloc.o" endseg beginseg name "ovl_Obj_Warp2block" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Obj_Warp2block/ovl_Obj_Warp2block_reloc.o" endseg beginseg name "ovl_Object_Kankyo" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Object_Kankyo/ovl_Object_Kankyo_reloc.o" endseg beginseg name "ovl_Oceff_Spot" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Oceff_Spot/ovl_Oceff_Spot_reloc.o" endseg beginseg name "ovl_Oceff_Storm" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Oceff_Storm/ovl_Oceff_Storm_reloc.o" endseg beginseg name "ovl_Oceff_Wipe" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Oceff_Wipe/ovl_Oceff_Wipe_reloc.o" endseg beginseg name "ovl_Oceff_Wipe2" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Oceff_Wipe2/ovl_Oceff_Wipe2_reloc.o" endseg beginseg name "ovl_Oceff_Wipe3" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Oceff_Wipe3/ovl_Oceff_Wipe3_reloc.o" endseg beginseg name "ovl_Oceff_Wipe4" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Oceff_Wipe4/ovl_Oceff_Wipe4_reloc.o" endseg beginseg name "ovl_Shot_Sun" + compress include "$(BUILD_DIR)/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_Shot_Sun/ovl_Shot_Sun_reloc.o" endseg beginseg name "gameplay_keep" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep.o" number 4 @@ -3385,6 +3862,7 @@ endseg beginseg name "gameplay_field_keep" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/gameplay_field_keep/gameplay_field_keep.o" number 5 @@ -3392,6 +3870,7 @@ endseg beginseg name "gameplay_dangeon_keep" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.o" number 5 @@ -3399,12 +3878,14 @@ endseg beginseg name "gameplay_object_exchange_static" + compress romalign 0x1000 include "$(BUILD_DIR)/baserom/gameplay_object_exchange_static.o" endseg beginseg name "object_link_boy" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_link_boy/object_link_boy.o" number 6 @@ -3412,6 +3893,7 @@ endseg beginseg name "object_link_child" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_link_child/object_link_child.o" number 6 @@ -3419,6 +3901,7 @@ endseg beginseg name "object_box" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_box/object_box.o" number 6 @@ -3426,6 +3909,7 @@ endseg beginseg name "object_human" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_human/object_human.o" number 6 @@ -3433,6 +3917,7 @@ endseg beginseg name "object_okuta" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_okuta/object_okuta.o" number 6 @@ -3440,6 +3925,7 @@ endseg beginseg name "object_poh" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_poh/object_poh.o" number 6 @@ -3447,6 +3933,7 @@ endseg beginseg name "object_wallmaster" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_wallmaster/object_wallmaster.o" number 6 @@ -3454,6 +3941,7 @@ endseg beginseg name "object_dy_obj" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_dy_obj/object_dy_obj.o" number 6 @@ -3461,6 +3949,7 @@ endseg beginseg name "object_firefly" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_firefly/object_firefly.o" number 6 @@ -3468,6 +3957,7 @@ endseg beginseg name "object_dodongo" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_dodongo/object_dodongo.o" number 6 @@ -3475,6 +3965,7 @@ endseg beginseg name "object_fire" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_fire/object_fire.o" number 6 @@ -3482,6 +3973,7 @@ endseg beginseg name "object_niw" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_niw/object_niw.o" number 6 @@ -3489,6 +3981,7 @@ endseg beginseg name "object_tite" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_tite/object_tite.o" number 6 @@ -3496,6 +3989,7 @@ endseg beginseg name "object_reeba" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_reeba/object_reeba.o" number 6 @@ -3503,6 +3997,7 @@ endseg beginseg name "object_peehat" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_peehat/object_peehat.o" number 6 @@ -3510,6 +4005,7 @@ endseg beginseg name "object_kingdodongo" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_kingdodongo/object_kingdodongo.o" number 6 @@ -3517,6 +4013,7 @@ endseg beginseg name "object_horse" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_horse/object_horse.o" number 6 @@ -3524,6 +4021,7 @@ endseg beginseg name "object_zf" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_zf/object_zf.o" number 6 @@ -3531,6 +4029,7 @@ endseg beginseg name "object_goma" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_goma/object_goma.o" number 6 @@ -3538,6 +4037,7 @@ endseg beginseg name "object_zl1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_zl1/object_zl1.o" number 6 @@ -3545,6 +4045,7 @@ endseg beginseg name "object_gol" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gol/object_gol.o" number 6 @@ -3552,6 +4053,7 @@ endseg beginseg name "object_bubble" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bubble/object_bubble.o" number 6 @@ -3559,6 +4061,7 @@ endseg beginseg name "object_dodojr" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_dodojr/object_dodojr.o" number 6 @@ -3566,6 +4069,7 @@ endseg beginseg name "object_torch2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_torch2/object_torch2.o" number 6 @@ -3573,6 +4077,7 @@ endseg beginseg name "object_bl" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bl/object_bl.o" number 6 @@ -3580,6 +4085,7 @@ endseg beginseg name "object_tp" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_tp/object_tp.o" number 6 @@ -3587,6 +4093,7 @@ endseg beginseg name "object_oA1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oA1/object_oA1.o" number 6 @@ -3594,6 +4101,7 @@ endseg beginseg name "object_st" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_st/object_st.o" number 6 @@ -3601,6 +4109,7 @@ endseg beginseg name "object_bw" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bw/object_bw.o" number 6 @@ -3608,6 +4117,7 @@ endseg beginseg name "object_ei" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ei/object_ei.o" number 6 @@ -3615,6 +4125,7 @@ endseg beginseg name "object_horse_normal" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_horse_normal/object_horse_normal.o" number 6 @@ -3622,6 +4133,7 @@ endseg beginseg name "object_oB1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oB1/object_oB1.o" number 6 @@ -3629,6 +4141,7 @@ endseg beginseg name "object_o_anime" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_o_anime/object_o_anime.o" number 6 @@ -3636,6 +4149,7 @@ endseg beginseg name "object_spot04_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot04_objects/object_spot04_objects.o" number 6 @@ -3643,6 +4157,7 @@ endseg beginseg name "object_ddan_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ddan_objects/object_ddan_objects.o" number 6 @@ -3650,6 +4165,7 @@ endseg beginseg name "object_hidan_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_hidan_objects/object_hidan_objects.o" number 6 @@ -3657,6 +4173,7 @@ endseg beginseg name "object_horse_ganon" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_horse_ganon/object_horse_ganon.o" number 6 @@ -3664,6 +4181,7 @@ endseg beginseg name "object_oA2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oA2/object_oA2.o" number 6 @@ -3671,6 +4189,7 @@ endseg beginseg name "object_spot00_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot00_objects/object_spot00_objects.o" number 6 @@ -3678,6 +4197,7 @@ endseg beginseg name "object_mb" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mb/object_mb.o" number 6 @@ -3685,6 +4205,7 @@ endseg beginseg name "object_bombf" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bombf/object_bombf.o" number 6 @@ -3692,6 +4213,7 @@ endseg beginseg name "object_sk2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_sk2/object_sk2.o" number 6 @@ -3699,6 +4221,7 @@ endseg beginseg name "object_oE1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oE1/object_oE1.o" number 6 @@ -3706,6 +4229,7 @@ endseg beginseg name "object_oE_anime" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oE_anime/object_oE_anime.o" number 6 @@ -3713,6 +4237,7 @@ endseg beginseg name "object_oE2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oE2/object_oE2.o" number 6 @@ -3720,6 +4245,7 @@ endseg beginseg name "object_ydan_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ydan_objects/object_ydan_objects.o" number 6 @@ -3727,6 +4253,7 @@ endseg beginseg name "object_gnd" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gnd/object_gnd.o" number 6 @@ -3734,6 +4261,7 @@ endseg beginseg name "object_am" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_am/object_am.o" number 6 @@ -3741,6 +4269,7 @@ endseg beginseg name "object_dekubaba" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_dekubaba/object_dekubaba.o" number 6 @@ -3748,6 +4277,7 @@ endseg beginseg name "object_oA3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oA3/object_oA3.o" number 6 @@ -3755,6 +4285,7 @@ endseg beginseg name "object_oA4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oA4/object_oA4.o" number 6 @@ -3762,6 +4293,7 @@ endseg beginseg name "object_oA5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oA5/object_oA5.o" number 6 @@ -3769,6 +4301,7 @@ endseg beginseg name "object_oA6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oA6/object_oA6.o" number 6 @@ -3776,6 +4309,7 @@ endseg beginseg name "object_oA7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oA7/object_oA7.o" number 6 @@ -3783,6 +4317,7 @@ endseg beginseg name "object_jj" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_jj/object_jj.o" number 6 @@ -3790,6 +4325,7 @@ endseg beginseg name "object_oA8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oA8/object_oA8.o" number 6 @@ -3797,6 +4333,7 @@ endseg beginseg name "object_oA9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oA9/object_oA9.o" number 6 @@ -3804,6 +4341,7 @@ endseg beginseg name "object_oB2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oB2/object_oB2.o" number 6 @@ -3811,6 +4349,7 @@ endseg beginseg name "object_oB3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oB3/object_oB3.o" number 6 @@ -3818,6 +4357,7 @@ endseg beginseg name "object_oB4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oB4/object_oB4.o" number 6 @@ -3825,6 +4365,7 @@ endseg beginseg name "object_horse_zelda" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_horse_zelda/object_horse_zelda.o" number 6 @@ -3832,6 +4373,7 @@ endseg beginseg name "object_opening_demo1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_opening_demo1/object_opening_demo1.o" number 6 @@ -3839,6 +4381,7 @@ endseg beginseg name "object_warp1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_warp1/object_warp1.o" number 6 @@ -3846,6 +4389,7 @@ endseg beginseg name "object_b_heart" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_b_heart/object_b_heart.o" number 6 @@ -3853,6 +4397,7 @@ endseg beginseg name "object_dekunuts" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_dekunuts/object_dekunuts.o" number 6 @@ -3860,6 +4405,7 @@ endseg beginseg name "object_oE3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oE3/object_oE3.o" number 6 @@ -3867,6 +4413,7 @@ endseg beginseg name "object_oE4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oE4/object_oE4.o" number 6 @@ -3874,6 +4421,7 @@ endseg beginseg name "object_menkuri_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_menkuri_objects/object_menkuri_objects.o" number 6 @@ -3881,6 +4429,7 @@ endseg beginseg name "object_oE5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oE5/object_oE5.o" number 6 @@ -3888,6 +4437,7 @@ endseg beginseg name "object_oE6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oE6/object_oE6.o" number 6 @@ -3895,6 +4445,7 @@ endseg beginseg name "object_oE7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oE7/object_oE7.o" number 6 @@ -3902,6 +4453,7 @@ endseg beginseg name "object_oE8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oE8/object_oE8.o" number 6 @@ -3909,6 +4461,7 @@ endseg beginseg name "object_oE9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oE9/object_oE9.o" number 6 @@ -3916,6 +4469,7 @@ endseg beginseg name "object_oE10" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oE10/object_oE10.o" number 6 @@ -3923,6 +4477,7 @@ endseg beginseg name "object_oE11" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oE11/object_oE11.o" number 6 @@ -3930,6 +4485,7 @@ endseg beginseg name "object_oE12" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oE12/object_oE12.o" number 6 @@ -3937,6 +4493,7 @@ endseg beginseg name "object_vali" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_vali/object_vali.o" number 6 @@ -3944,6 +4501,7 @@ endseg beginseg name "object_oA10" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oA10/object_oA10.o" number 6 @@ -3951,6 +4509,7 @@ endseg beginseg name "object_oA11" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oA11/object_oA11.o" number 6 @@ -3958,6 +4517,7 @@ endseg beginseg name "object_mizu_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mizu_objects/object_mizu_objects.o" number 6 @@ -3965,6 +4525,7 @@ endseg beginseg name "object_fhg" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_fhg/object_fhg.o" number 6 @@ -3972,6 +4533,7 @@ endseg beginseg name "object_ossan" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ossan/object_ossan.o" number 6 @@ -3979,6 +4541,7 @@ endseg beginseg name "object_mori_hineri1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mori_hineri1/object_mori_hineri1.o" number 6 @@ -3986,6 +4549,7 @@ endseg beginseg name "object_Bb" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_Bb/object_Bb.o" number 6 @@ -3993,6 +4557,7 @@ endseg beginseg name "object_toki_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_toki_objects/object_toki_objects.o" number 6 @@ -4000,6 +4565,7 @@ endseg beginseg name "object_yukabyun" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_yukabyun/object_yukabyun.o" number 6 @@ -4007,6 +4573,7 @@ endseg beginseg name "object_zl2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_zl2/object_zl2.o" number 6 @@ -4014,6 +4581,7 @@ endseg beginseg name "object_mjin" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mjin/object_mjin.o" number 6 @@ -4021,6 +4589,7 @@ endseg beginseg name "object_mjin_flash" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mjin_flash/object_mjin_flash.o" number 6 @@ -4028,6 +4597,7 @@ endseg beginseg name "object_mjin_dark" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mjin_dark/object_mjin_dark.o" number 6 @@ -4035,6 +4605,7 @@ endseg beginseg name "object_mjin_flame" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mjin_flame/object_mjin_flame.o" number 6 @@ -4042,6 +4613,7 @@ endseg beginseg name "object_mjin_ice" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mjin_ice/object_mjin_ice.o" number 6 @@ -4049,6 +4621,7 @@ endseg beginseg name "object_mjin_soul" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mjin_soul/object_mjin_soul.o" number 6 @@ -4056,6 +4629,7 @@ endseg beginseg name "object_mjin_wind" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mjin_wind/object_mjin_wind.o" number 6 @@ -4063,6 +4637,7 @@ endseg beginseg name "object_mjin_oka" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mjin_oka/object_mjin_oka.o" number 6 @@ -4070,6 +4645,7 @@ endseg beginseg name "object_haka_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_haka_objects/object_haka_objects.o" number 6 @@ -4077,6 +4653,7 @@ endseg beginseg name "object_spot06_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot06_objects/object_spot06_objects.o" number 6 @@ -4084,6 +4661,7 @@ endseg beginseg name "object_ice_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ice_objects/object_ice_objects.o" number 6 @@ -4091,6 +4669,7 @@ endseg beginseg name "object_relay_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_relay_objects/object_relay_objects.o" number 6 @@ -4098,6 +4677,7 @@ endseg beginseg name "object_mori_hineri1a" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mori_hineri1a/object_mori_hineri1a.o" number 6 @@ -4105,6 +4685,7 @@ endseg beginseg name "object_mori_hineri2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mori_hineri2/object_mori_hineri2.o" number 6 @@ -4112,6 +4693,7 @@ endseg beginseg name "object_mori_hineri2a" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mori_hineri2a/object_mori_hineri2a.o" number 6 @@ -4119,6 +4701,7 @@ endseg beginseg name "object_mori_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mori_objects/object_mori_objects.o" number 6 @@ -4126,6 +4709,7 @@ endseg beginseg name "object_mori_tex" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mori_tex/object_mori_tex.o" number 8 @@ -4133,6 +4717,7 @@ endseg beginseg name "object_spot08_obj" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot08_obj/object_spot08_obj.o" number 6 @@ -4140,6 +4725,7 @@ endseg beginseg name "object_warp2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_warp2/object_warp2.o" number 6 @@ -4147,6 +4733,7 @@ endseg beginseg name "object_hata" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_hata/object_hata.o" number 6 @@ -4154,6 +4741,7 @@ endseg beginseg name "object_bird" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bird/object_bird.o" number 6 @@ -4161,6 +4749,7 @@ endseg beginseg name "object_wood02" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_wood02/object_wood02.o" number 6 @@ -4168,6 +4757,7 @@ endseg beginseg name "object_lightbox" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_lightbox/object_lightbox.o" number 6 @@ -4175,6 +4765,7 @@ endseg beginseg name "object_pu_box" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_pu_box/object_pu_box.o" number 6 @@ -4182,6 +4773,7 @@ endseg beginseg name "object_trap" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_trap/object_trap.o" number 6 @@ -4189,6 +4781,7 @@ endseg beginseg name "object_vase" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_vase/object_vase.o" number 6 @@ -4196,6 +4789,7 @@ endseg beginseg name "object_im" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_im/object_im.o" number 6 @@ -4203,6 +4797,7 @@ endseg beginseg name "object_ta" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ta/object_ta.o" number 6 @@ -4210,6 +4805,7 @@ endseg beginseg name "object_tk" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_tk/object_tk.o" number 6 @@ -4217,6 +4813,7 @@ endseg beginseg name "object_xc" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_xc/object_xc.o" number 6 @@ -4224,6 +4821,7 @@ endseg beginseg name "object_vm" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_vm/object_vm.o" number 6 @@ -4231,6 +4829,7 @@ endseg beginseg name "object_bv" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bv/object_bv.o" number 6 @@ -4238,6 +4837,7 @@ endseg beginseg name "object_hakach_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_hakach_objects/object_hakach_objects.o" number 6 @@ -4245,6 +4845,7 @@ endseg beginseg name "object_efc_crystal_light" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_efc_crystal_light/object_efc_crystal_light.o" number 6 @@ -4252,6 +4853,7 @@ endseg beginseg name "object_efc_fire_ball" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_efc_fire_ball/object_efc_fire_ball.o" number 6 @@ -4259,6 +4861,7 @@ endseg beginseg name "object_efc_flash" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_efc_flash/object_efc_flash.o" number 6 @@ -4266,6 +4869,7 @@ endseg beginseg name "object_efc_lgt_shower" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_efc_lgt_shower/object_efc_lgt_shower.o" number 6 @@ -4273,6 +4877,7 @@ endseg beginseg name "object_efc_star_field" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_efc_star_field/object_efc_star_field.o" number 6 @@ -4280,6 +4885,7 @@ endseg beginseg name "object_god_lgt" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_god_lgt/object_god_lgt.o" number 6 @@ -4287,6 +4893,7 @@ endseg beginseg name "object_light_ring" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_light_ring/object_light_ring.o" number 6 @@ -4294,6 +4901,7 @@ endseg beginseg name "object_triforce_spot" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_triforce_spot/object_triforce_spot.o" number 6 @@ -4301,6 +4909,7 @@ endseg beginseg name "object_medal" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_medal/object_medal.o" number 6 @@ -4308,6 +4917,7 @@ endseg beginseg name "object_bdan_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bdan_objects/object_bdan_objects.o" number 6 @@ -4315,6 +4925,7 @@ endseg beginseg name "object_sd" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_sd/object_sd.o" number 6 @@ -4322,6 +4933,7 @@ endseg beginseg name "object_rd" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_rd/object_rd.o" number 6 @@ -4329,6 +4941,7 @@ endseg beginseg name "object_po_sisters" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_po_sisters/object_po_sisters.o" number 6 @@ -4336,6 +4949,7 @@ endseg beginseg name "object_heavy_object" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_heavy_object/object_heavy_object.o" number 6 @@ -4343,6 +4957,7 @@ endseg beginseg name "object_gndd" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gndd/object_gndd.o" number 6 @@ -4350,6 +4965,7 @@ endseg beginseg name "object_fd" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_fd/object_fd.o" number 6 @@ -4357,6 +4973,7 @@ endseg beginseg name "object_du" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_du/object_du.o" number 6 @@ -4364,6 +4981,7 @@ endseg beginseg name "object_fw" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_fw/object_fw.o" number 6 @@ -4371,6 +4989,7 @@ endseg beginseg name "object_horse_link_child" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_horse_link_child/object_horse_link_child.o" number 6 @@ -4378,6 +4997,7 @@ endseg beginseg name "object_spot02_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot02_objects/object_spot02_objects.o" number 6 @@ -4385,6 +5005,7 @@ endseg beginseg name "object_haka" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_haka/object_haka.o" number 6 @@ -4392,6 +5013,7 @@ endseg beginseg name "object_ru1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ru1/object_ru1.o" number 6 @@ -4399,6 +5021,7 @@ endseg beginseg name "object_syokudai" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_syokudai/object_syokudai.o" number 6 @@ -4406,6 +5029,7 @@ endseg beginseg name "object_fd2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_fd2/object_fd2.o" number 6 @@ -4413,6 +5037,7 @@ endseg beginseg name "object_dh" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_dh/object_dh.o" number 6 @@ -4420,6 +5045,7 @@ endseg beginseg name "object_rl" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_rl/object_rl.o" number 6 @@ -4427,6 +5053,7 @@ endseg beginseg name "object_efc_tw" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_efc_tw/object_efc_tw.o" number 6 @@ -4434,6 +5061,7 @@ endseg beginseg name "object_demo_tre_lgt" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_demo_tre_lgt/object_demo_tre_lgt.o" number 6 @@ -4441,6 +5069,7 @@ endseg beginseg name "object_gi_key" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_key/object_gi_key.o" number 6 @@ -4448,6 +5077,7 @@ endseg beginseg name "object_mir_ray" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mir_ray/object_mir_ray.o" number 6 @@ -4455,6 +5085,7 @@ endseg beginseg name "object_brob" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_brob/object_brob.o" number 6 @@ -4462,6 +5093,7 @@ endseg beginseg name "object_gi_jewel" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_jewel/object_gi_jewel.o" number 6 @@ -4469,6 +5101,7 @@ endseg beginseg name "object_spot09_obj" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot09_obj/object_spot09_obj.o" number 6 @@ -4476,6 +5109,7 @@ endseg beginseg name "object_spot18_obj" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot18_obj/object_spot18_obj.o" number 6 @@ -4483,6 +5117,7 @@ endseg beginseg name "object_bdoor" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bdoor/object_bdoor.o" number 6 @@ -4490,6 +5125,7 @@ endseg beginseg name "object_spot17_obj" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot17_obj/object_spot17_obj.o" number 6 @@ -4497,6 +5133,7 @@ endseg beginseg name "object_shop_dungen" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_shop_dungen/object_shop_dungen.o" number 6 @@ -4504,6 +5141,7 @@ endseg beginseg name "object_nb" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_nb/object_nb.o" number 6 @@ -4511,6 +5149,7 @@ endseg beginseg name "object_mo" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mo/object_mo.o" number 6 @@ -4518,6 +5157,7 @@ endseg beginseg name "object_sb" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_sb/object_sb.o" number 6 @@ -4525,6 +5165,7 @@ endseg beginseg name "object_gi_melody" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_melody/object_gi_melody.o" number 6 @@ -4532,6 +5173,7 @@ endseg beginseg name "object_gi_heart" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_heart/object_gi_heart.o" number 6 @@ -4539,6 +5181,7 @@ endseg beginseg name "object_gi_compass" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_compass/object_gi_compass.o" number 6 @@ -4546,6 +5189,7 @@ endseg beginseg name "object_gi_bosskey" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_bosskey/object_gi_bosskey.o" number 6 @@ -4553,6 +5197,7 @@ endseg beginseg name "object_gi_medal" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_medal/object_gi_medal.o" number 6 @@ -4560,6 +5205,7 @@ endseg beginseg name "object_gi_nuts" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_nuts/object_gi_nuts.o" number 6 @@ -4567,6 +5213,7 @@ endseg beginseg name "object_sa" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_sa/object_sa.o" number 6 @@ -4574,6 +5221,7 @@ endseg beginseg name "object_gi_hearts" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_hearts/object_gi_hearts.o" number 6 @@ -4581,6 +5229,7 @@ endseg beginseg name "object_gi_arrowcase" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_arrowcase/object_gi_arrowcase.o" number 6 @@ -4588,6 +5237,7 @@ endseg beginseg name "object_gi_bombpouch" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_bombpouch/object_gi_bombpouch.o" number 6 @@ -4595,6 +5245,7 @@ endseg beginseg name "object_in" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_in/object_in.o" number 6 @@ -4602,6 +5253,7 @@ endseg beginseg name "object_tr" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_tr/object_tr.o" number 6 @@ -4609,6 +5261,7 @@ endseg beginseg name "object_spot16_obj" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot16_obj/object_spot16_obj.o" number 6 @@ -4616,6 +5269,7 @@ endseg beginseg name "object_oE1s" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oE1s/object_oE1s.o" number 6 @@ -4623,6 +5277,7 @@ endseg beginseg name "object_oE4s" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oE4s/object_oE4s.o" number 6 @@ -4630,6 +5285,7 @@ endseg beginseg name "object_os_anime" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_os_anime/object_os_anime.o" number 6 @@ -4637,6 +5293,7 @@ endseg beginseg name "object_gi_bottle" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_bottle/object_gi_bottle.o" number 6 @@ -4644,6 +5301,7 @@ endseg beginseg name "object_gi_stick" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_stick/object_gi_stick.o" number 6 @@ -4651,6 +5309,7 @@ endseg beginseg name "object_gi_map" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_map/object_gi_map.o" number 6 @@ -4658,6 +5317,7 @@ endseg beginseg name "object_oF1d_map" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oF1d_map/object_oF1d_map.o" number 6 @@ -4665,6 +5325,7 @@ endseg beginseg name "object_ru2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ru2/object_ru2.o" number 6 @@ -4672,6 +5333,7 @@ endseg beginseg name "object_gi_shield_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_shield_1/object_gi_shield_1.o" number 6 @@ -4679,6 +5341,7 @@ endseg beginseg name "object_dekujr" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_dekujr/object_dekujr.o" number 6 @@ -4686,6 +5349,7 @@ endseg beginseg name "object_gi_magicpot" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_magicpot/object_gi_magicpot.o" number 6 @@ -4693,6 +5357,7 @@ endseg beginseg name "object_gi_bomb_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_bomb_1/object_gi_bomb_1.o" number 6 @@ -4700,6 +5365,7 @@ endseg beginseg name "object_oF1s" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_oF1s/object_oF1s.o" number 6 @@ -4707,6 +5373,7 @@ endseg beginseg name "object_ma2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ma2/object_ma2.o" number 6 @@ -4714,6 +5381,7 @@ endseg beginseg name "object_gi_purse" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_purse/object_gi_purse.o" number 6 @@ -4721,6 +5389,7 @@ endseg beginseg name "object_hni" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_hni/object_hni.o" number 6 @@ -4728,6 +5397,7 @@ endseg beginseg name "object_tw" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_tw/object_tw.o" number 6 @@ -4735,6 +5405,7 @@ endseg beginseg name "object_rr" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_rr/object_rr.o" number 6 @@ -4742,6 +5413,7 @@ endseg beginseg name "object_bxa" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bxa/object_bxa.o" number 6 @@ -4749,6 +5421,7 @@ endseg beginseg name "object_anubice" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_anubice/object_anubice.o" number 6 @@ -4756,6 +5429,7 @@ endseg beginseg name "object_gi_gerudo" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_gerudo/object_gi_gerudo.o" number 6 @@ -4763,6 +5437,7 @@ endseg beginseg name "object_gi_arrow" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_arrow/object_gi_arrow.o" number 6 @@ -4770,6 +5445,7 @@ endseg beginseg name "object_gi_bomb_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_bomb_2/object_gi_bomb_2.o" number 6 @@ -4777,6 +5453,7 @@ endseg beginseg name "object_gi_egg" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_egg/object_gi_egg.o" number 6 @@ -4784,6 +5461,7 @@ endseg beginseg name "object_gi_scale" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_scale/object_gi_scale.o" number 6 @@ -4791,6 +5469,7 @@ endseg beginseg name "object_gi_shield_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_shield_2/object_gi_shield_2.o" number 6 @@ -4798,6 +5477,7 @@ endseg beginseg name "object_gi_hookshot" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_hookshot/object_gi_hookshot.o" number 6 @@ -4805,6 +5485,7 @@ endseg beginseg name "object_gi_ocarina" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_ocarina/object_gi_ocarina.o" number 6 @@ -4812,6 +5493,7 @@ endseg beginseg name "object_gi_milk" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_milk/object_gi_milk.o" number 6 @@ -4819,6 +5501,7 @@ endseg beginseg name "object_ma1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ma1/object_ma1.o" number 6 @@ -4826,6 +5509,7 @@ endseg beginseg name "object_ganon" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ganon/object_ganon.o" number 6 @@ -4833,6 +5517,7 @@ endseg beginseg name "object_sst" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_sst/object_sst.o" number 6 @@ -4840,6 +5525,7 @@ endseg beginseg name "object_ny" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ny/object_ny.o" number 6 @@ -4847,6 +5533,7 @@ endseg beginseg name "object_fr" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_fr/object_fr.o" number 6 @@ -4854,6 +5541,7 @@ endseg beginseg name "object_gi_pachinko" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_pachinko/object_gi_pachinko.o" number 6 @@ -4861,6 +5549,7 @@ endseg beginseg name "object_gi_boomerang" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_boomerang/object_gi_boomerang.o" number 6 @@ -4868,6 +5557,7 @@ endseg beginseg name "object_gi_bow" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_bow/object_gi_bow.o" number 6 @@ -4875,6 +5565,7 @@ endseg beginseg name "object_gi_glasses" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_glasses/object_gi_glasses.o" number 6 @@ -4882,6 +5573,7 @@ endseg beginseg name "object_gi_liquid" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_liquid/object_gi_liquid.o" number 6 @@ -4889,6 +5581,7 @@ endseg beginseg name "object_ani" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ani/object_ani.o" number 6 @@ -4896,6 +5589,7 @@ endseg beginseg name "object_demo_6k" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_demo_6k/object_demo_6k.o" number 6 @@ -4903,6 +5597,7 @@ endseg beginseg name "object_gi_shield_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_shield_3/object_gi_shield_3.o" number 6 @@ -4910,6 +5605,7 @@ endseg beginseg name "object_gi_letter" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_letter/object_gi_letter.o" number 6 @@ -4917,6 +5613,7 @@ endseg beginseg name "object_spot15_obj" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot15_obj/object_spot15_obj.o" number 6 @@ -4924,6 +5621,7 @@ endseg beginseg name "object_jya_obj" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_jya_obj/object_jya_obj.o" number 6 @@ -4931,6 +5629,7 @@ endseg beginseg name "object_gi_clothes" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_clothes/object_gi_clothes.o" number 6 @@ -4938,6 +5637,7 @@ endseg beginseg name "object_gi_bean" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_bean/object_gi_bean.o" number 6 @@ -4945,6 +5645,7 @@ endseg beginseg name "object_gi_fish" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_fish/object_gi_fish.o" number 6 @@ -4952,6 +5653,7 @@ endseg beginseg name "object_gi_saw" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_saw/object_gi_saw.o" number 6 @@ -4959,6 +5661,7 @@ endseg beginseg name "object_gi_hammer" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_hammer/object_gi_hammer.o" number 6 @@ -4966,6 +5669,7 @@ endseg beginseg name "object_gi_grass" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_grass/object_gi_grass.o" number 6 @@ -4973,6 +5677,7 @@ endseg beginseg name "object_gi_longsword" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_longsword/object_gi_longsword.o" number 6 @@ -4980,6 +5685,7 @@ endseg beginseg name "object_spot01_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot01_objects/object_spot01_objects.o" number 6 @@ -4987,6 +5693,7 @@ endseg beginseg name "object_md" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_md/object_md.o" number 6 @@ -4994,6 +5701,7 @@ endseg beginseg name "object_km1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_km1/object_km1.o" number 6 @@ -5001,6 +5709,7 @@ endseg beginseg name "object_kw1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_kw1/object_kw1.o" number 6 @@ -5008,6 +5717,7 @@ endseg beginseg name "object_zo" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_zo/object_zo.o" number 6 @@ -5015,6 +5725,7 @@ endseg beginseg name "object_kz" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_kz/object_kz.o" number 6 @@ -5022,6 +5733,7 @@ endseg beginseg name "object_umajump" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_umajump/object_umajump.o" number 6 @@ -5029,6 +5741,7 @@ endseg beginseg name "object_masterkokiri" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_masterkokiri/object_masterkokiri.o" number 6 @@ -5036,6 +5749,7 @@ endseg beginseg name "object_masterkokirihead" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_masterkokirihead/object_masterkokirihead.o" number 6 @@ -5043,6 +5757,7 @@ endseg beginseg name "object_mastergolon" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mastergolon/object_mastergolon.o" number 6 @@ -5050,6 +5765,7 @@ endseg beginseg name "object_masterzoora" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_masterzoora/object_masterzoora.o" number 6 @@ -5057,6 +5773,7 @@ endseg beginseg name "object_aob" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_aob/object_aob.o" number 6 @@ -5064,6 +5781,7 @@ endseg beginseg name "object_ik" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ik/object_ik.o" number 6 @@ -5071,6 +5789,7 @@ endseg beginseg name "object_ahg" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ahg/object_ahg.o" number 6 @@ -5078,6 +5797,7 @@ endseg beginseg name "object_cne" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_cne/object_cne.o" number 6 @@ -5085,6 +5805,7 @@ endseg beginseg name "object_gi_niwatori" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_niwatori/object_gi_niwatori.o" number 6 @@ -5092,6 +5813,7 @@ endseg beginseg name "object_skj" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_skj/object_skj.o" number 6 @@ -5099,6 +5821,7 @@ endseg beginseg name "object_gi_bottle_letter" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_bottle_letter/object_gi_bottle_letter.o" number 6 @@ -5106,6 +5829,7 @@ endseg beginseg name "object_bji" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bji/object_bji.o" number 6 @@ -5113,6 +5837,7 @@ endseg beginseg name "object_bba" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bba/object_bba.o" number 6 @@ -5120,6 +5845,7 @@ endseg beginseg name "object_gi_ocarina_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.o" number 6 @@ -5127,6 +5853,7 @@ endseg beginseg name "object_ds" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ds/object_ds.o" number 6 @@ -5134,6 +5861,7 @@ endseg beginseg name "object_ane" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ane/object_ane.o" number 6 @@ -5141,6 +5869,7 @@ endseg beginseg name "object_boj" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_boj/object_boj.o" number 6 @@ -5148,6 +5877,7 @@ endseg beginseg name "object_spot03_object" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot03_object/object_spot03_object.o" number 6 @@ -5155,6 +5885,7 @@ endseg beginseg name "object_spot07_object" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot07_object/object_spot07_object.o" number 6 @@ -5162,6 +5893,7 @@ endseg beginseg name "object_fz" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_fz/object_fz.o" number 6 @@ -5169,6 +5901,7 @@ endseg beginseg name "object_bob" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bob/object_bob.o" number 6 @@ -5176,6 +5909,7 @@ endseg beginseg name "object_ge1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ge1/object_ge1.o" number 6 @@ -5183,6 +5917,7 @@ endseg beginseg name "object_yabusame_point" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_yabusame_point/object_yabusame_point.o" number 6 @@ -5190,6 +5925,7 @@ endseg beginseg name "object_gi_boots_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_boots_2/object_gi_boots_2.o" number 6 @@ -5197,6 +5933,7 @@ endseg beginseg name "object_gi_seed" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_seed/object_gi_seed.o" number 6 @@ -5204,6 +5941,7 @@ endseg beginseg name "object_gnd_magic" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gnd_magic/object_gnd_magic.o" number 6 @@ -5211,6 +5949,7 @@ endseg beginseg name "object_d_elevator" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_d_elevator/object_d_elevator.o" number 6 @@ -5218,6 +5957,7 @@ endseg beginseg name "object_d_hsblock" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_d_hsblock/object_d_hsblock.o" number 6 @@ -5225,6 +5965,7 @@ endseg beginseg name "object_d_lift" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_d_lift/object_d_lift.o" number 6 @@ -5232,6 +5973,7 @@ endseg beginseg name "object_mamenoki" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mamenoki/object_mamenoki.o" number 6 @@ -5239,6 +5981,7 @@ endseg beginseg name "object_goroiwa" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_goroiwa/object_goroiwa.o" number 6 @@ -5246,6 +5989,7 @@ endseg beginseg name "object_toryo" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_toryo/object_toryo.o" number 6 @@ -5253,6 +5997,7 @@ endseg beginseg name "object_daiku" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_daiku/object_daiku.o" number 6 @@ -5260,6 +6005,7 @@ endseg beginseg name "object_nwc" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_nwc/object_nwc.o" number 6 @@ -5267,6 +6013,7 @@ endseg beginseg name "object_blkobj" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_blkobj/object_blkobj.o" number 6 @@ -5274,6 +6021,7 @@ endseg beginseg name "object_gm" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gm/object_gm.o" number 6 @@ -5281,6 +6029,7 @@ endseg beginseg name "object_ms" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ms/object_ms.o" number 6 @@ -5288,6 +6037,7 @@ endseg beginseg name "object_hs" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_hs/object_hs.o" number 6 @@ -5295,6 +6045,7 @@ endseg beginseg name "object_ingate" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ingate/object_ingate.o" number 6 @@ -5302,6 +6053,7 @@ endseg beginseg name "object_lightswitch" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_lightswitch/object_lightswitch.o" number 6 @@ -5309,6 +6061,7 @@ endseg beginseg name "object_kusa" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_kusa/object_kusa.o" number 6 @@ -5316,6 +6069,7 @@ endseg beginseg name "object_tsubo" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_tsubo/object_tsubo.o" number 6 @@ -5323,6 +6077,7 @@ endseg beginseg name "object_gi_gloves" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_gloves/object_gi_gloves.o" number 6 @@ -5330,6 +6085,7 @@ endseg beginseg name "object_gi_coin" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_coin/object_gi_coin.o" number 6 @@ -5337,6 +6093,7 @@ endseg beginseg name "object_kanban" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_kanban/object_kanban.o" number 6 @@ -5344,6 +6101,7 @@ endseg beginseg name "object_gjyo_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gjyo_objects/object_gjyo_objects.o" number 6 @@ -5351,6 +6109,7 @@ endseg beginseg name "object_owl" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_owl/object_owl.o" number 6 @@ -5358,6 +6117,7 @@ endseg beginseg name "object_mk" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mk/object_mk.o" number 6 @@ -5365,6 +6125,7 @@ endseg beginseg name "object_fu" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_fu/object_fu.o" number 6 @@ -5372,6 +6133,7 @@ endseg beginseg name "object_gi_ki_tan_mask" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.o" number 6 @@ -5379,6 +6141,7 @@ endseg beginseg name "object_gi_redead_mask" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_redead_mask/object_gi_redead_mask.o" number 6 @@ -5386,6 +6149,7 @@ endseg beginseg name "object_gi_skj_mask" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_skj_mask/object_gi_skj_mask.o" number 6 @@ -5393,6 +6157,7 @@ endseg beginseg name "object_gi_rabit_mask" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.o" number 6 @@ -5400,6 +6165,7 @@ endseg beginseg name "object_gi_truth_mask" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_truth_mask/object_gi_truth_mask.o" number 6 @@ -5407,6 +6173,7 @@ endseg beginseg name "object_ganon_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ganon_objects/object_ganon_objects.o" number 6 @@ -5414,6 +6181,7 @@ endseg beginseg name "object_siofuki" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_siofuki/object_siofuki.o" number 6 @@ -5421,6 +6189,7 @@ endseg beginseg name "object_stream" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_stream/object_stream.o" number 6 @@ -5428,6 +6197,7 @@ endseg beginseg name "object_mm" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mm/object_mm.o" number 6 @@ -5435,6 +6205,7 @@ endseg beginseg name "object_fa" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_fa/object_fa.o" number 6 @@ -5442,6 +6213,7 @@ endseg beginseg name "object_os" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_os/object_os.o" number 6 @@ -5449,6 +6221,7 @@ endseg beginseg name "object_gi_eye_lotion" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_eye_lotion/object_gi_eye_lotion.o" number 6 @@ -5456,6 +6229,7 @@ endseg beginseg name "object_gi_powder" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_powder/object_gi_powder.o" number 6 @@ -5463,6 +6237,7 @@ endseg beginseg name "object_gi_mushroom" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_mushroom/object_gi_mushroom.o" number 6 @@ -5470,6 +6245,7 @@ endseg beginseg name "object_gi_ticketstone" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_ticketstone/object_gi_ticketstone.o" number 6 @@ -5477,6 +6253,7 @@ endseg beginseg name "object_gi_brokensword" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_brokensword/object_gi_brokensword.o" number 6 @@ -5484,6 +6261,7 @@ endseg beginseg name "object_js" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_js/object_js.o" number 6 @@ -5491,6 +6269,7 @@ endseg beginseg name "object_cs" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_cs/object_cs.o" number 6 @@ -5498,6 +6277,7 @@ endseg beginseg name "object_gi_prescription" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_prescription/object_gi_prescription.o" number 6 @@ -5505,6 +6285,7 @@ endseg beginseg name "object_gi_bracelet" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_bracelet/object_gi_bracelet.o" number 6 @@ -5512,6 +6293,7 @@ endseg beginseg name "object_gi_soldout" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_soldout/object_gi_soldout.o" number 6 @@ -5519,6 +6301,7 @@ endseg beginseg name "object_gi_frog" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_frog/object_gi_frog.o" number 6 @@ -5526,6 +6309,7 @@ endseg beginseg name "object_mag" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mag/object_mag.o" number 6 @@ -5533,6 +6317,7 @@ endseg beginseg name "object_door_gerudo" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_door_gerudo/object_door_gerudo.o" number 6 @@ -5540,6 +6325,7 @@ endseg beginseg name "object_gt" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gt/object_gt.o" number 6 @@ -5547,6 +6333,7 @@ endseg beginseg name "object_efc_erupc" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_efc_erupc/object_efc_erupc.o" number 6 @@ -5554,6 +6341,7 @@ endseg beginseg name "object_zl2_anime1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_zl2_anime1/object_zl2_anime1.o" number 6 @@ -5561,6 +6349,7 @@ endseg beginseg name "object_zl2_anime2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_zl2_anime2/object_zl2_anime2.o" number 6 @@ -5568,6 +6357,7 @@ endseg beginseg name "object_gi_golonmask" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_golonmask/object_gi_golonmask.o" number 6 @@ -5575,6 +6365,7 @@ endseg beginseg name "object_gi_zoramask" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_zoramask/object_gi_zoramask.o" number 6 @@ -5582,6 +6373,7 @@ endseg beginseg name "object_gi_gerudomask" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_gerudomask/object_gi_gerudomask.o" number 6 @@ -5589,6 +6381,7 @@ endseg beginseg name "object_ganon2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ganon2/object_ganon2.o" number 6 @@ -5596,6 +6389,7 @@ endseg beginseg name "object_ka" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ka/object_ka.o" number 6 @@ -5603,6 +6397,7 @@ endseg beginseg name "object_ts" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ts/object_ts.o" number 6 @@ -5610,6 +6405,7 @@ endseg beginseg name "object_zg" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_zg/object_zg.o" number 6 @@ -5617,6 +6413,7 @@ endseg beginseg name "object_gi_hoverboots" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_hoverboots/object_gi_hoverboots.o" number 6 @@ -5624,6 +6421,7 @@ endseg beginseg name "object_gi_m_arrow" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_m_arrow/object_gi_m_arrow.o" number 6 @@ -5631,6 +6429,7 @@ endseg beginseg name "object_ds2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ds2/object_ds2.o" number 6 @@ -5638,6 +6437,7 @@ endseg beginseg name "object_ec" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ec/object_ec.o" number 6 @@ -5645,6 +6445,7 @@ endseg beginseg name "object_fish" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_fish/object_fish.o" number 6 @@ -5652,6 +6453,7 @@ endseg beginseg name "object_gi_sutaru" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_sutaru/object_gi_sutaru.o" number 6 @@ -5659,6 +6461,7 @@ endseg beginseg name "object_gi_goddess" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_goddess/object_gi_goddess.o" number 6 @@ -5666,6 +6469,7 @@ endseg beginseg name "object_ssh" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ssh/object_ssh.o" number 6 @@ -5673,6 +6477,7 @@ endseg beginseg name "object_bigokuta" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bigokuta/object_bigokuta.o" number 6 @@ -5680,6 +6485,7 @@ endseg beginseg name "object_bg" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bg/object_bg.o" number 6 @@ -5687,6 +6493,7 @@ endseg beginseg name "object_spot05_objects" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot05_objects/object_spot05_objects.o" number 6 @@ -5694,6 +6501,7 @@ endseg beginseg name "object_spot12_obj" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot12_obj/object_spot12_obj.o" number 6 @@ -5701,6 +6509,7 @@ endseg beginseg name "object_bombiwa" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bombiwa/object_bombiwa.o" number 6 @@ -5708,6 +6517,7 @@ endseg beginseg name "object_hintnuts" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_hintnuts/object_hintnuts.o" number 6 @@ -5715,6 +6525,7 @@ endseg beginseg name "object_rs" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_rs/object_rs.o" number 6 @@ -5722,6 +6533,7 @@ endseg beginseg name "object_spot00_break" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot00_break/object_spot00_break.o" number 6 @@ -5729,6 +6541,7 @@ endseg beginseg name "object_gla" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gla/object_gla.o" number 6 @@ -5736,6 +6549,7 @@ endseg beginseg name "object_shopnuts" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_shopnuts/object_shopnuts.o" number 6 @@ -5743,6 +6557,7 @@ endseg beginseg name "object_geldb" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_geldb/object_geldb.o" number 6 @@ -5750,6 +6565,7 @@ endseg beginseg name "object_gr" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gr/object_gr.o" number 6 @@ -5757,6 +6573,7 @@ endseg beginseg name "object_dog" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_dog/object_dog.o" number 6 @@ -5764,6 +6581,7 @@ endseg beginseg name "object_jya_iron" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_jya_iron/object_jya_iron.o" number 6 @@ -5771,6 +6589,7 @@ endseg beginseg name "object_jya_door" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_jya_door/object_jya_door.o" number 6 @@ -5778,6 +6597,7 @@ endseg beginseg name "object_spot01_objects2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot01_objects2/object_spot01_objects2.o" number 6 @@ -5785,6 +6605,7 @@ endseg beginseg name "object_spot11_obj" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot11_obj/object_spot11_obj.o" number 6 @@ -5792,6 +6613,7 @@ endseg beginseg name "object_kibako2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_kibako2/object_kibako2.o" number 6 @@ -5799,6 +6621,7 @@ endseg beginseg name "object_dns" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_dns/object_dns.o" number 6 @@ -5806,6 +6629,7 @@ endseg beginseg name "object_dnk" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_dnk/object_dnk.o" number 6 @@ -5813,6 +6637,7 @@ endseg beginseg name "object_gi_fire" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_fire/object_gi_fire.o" number 6 @@ -5820,6 +6645,7 @@ endseg beginseg name "object_gi_insect" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_insect/object_gi_insect.o" number 6 @@ -5827,6 +6653,7 @@ endseg beginseg name "object_gi_butterfly" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_butterfly/object_gi_butterfly.o" number 6 @@ -5834,6 +6661,7 @@ endseg beginseg name "object_gi_ghost" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_ghost/object_gi_ghost.o" number 6 @@ -5841,6 +6669,7 @@ endseg beginseg name "object_gi_soul" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_soul/object_gi_soul.o" number 6 @@ -5848,6 +6677,7 @@ endseg beginseg name "object_bowl" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bowl/object_bowl.o" number 6 @@ -5855,6 +6685,7 @@ endseg beginseg name "object_po_field" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_po_field/object_po_field.o" number 6 @@ -5862,6 +6693,7 @@ endseg beginseg name "object_demo_kekkai" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_demo_kekkai/object_demo_kekkai.o" number 6 @@ -5869,6 +6701,7 @@ endseg beginseg name "object_efc_doughnut" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_efc_doughnut/object_efc_doughnut.o" number 6 @@ -5876,6 +6709,7 @@ endseg beginseg name "object_gi_dekupouch" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_dekupouch/object_gi_dekupouch.o" number 6 @@ -5883,6 +6717,7 @@ endseg beginseg name "object_ganon_anime1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ganon_anime1/object_ganon_anime1.o" number 6 @@ -5890,6 +6725,7 @@ endseg beginseg name "object_ganon_anime2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ganon_anime2/object_ganon_anime2.o" number 6 @@ -5897,6 +6733,7 @@ endseg beginseg name "object_ganon_anime3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ganon_anime3/object_ganon_anime3.o" number 6 @@ -5904,6 +6741,7 @@ endseg beginseg name "object_gi_rupy" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_rupy/object_gi_rupy.o" number 6 @@ -5911,6 +6749,7 @@ endseg beginseg name "object_spot01_matoya" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot01_matoya/object_spot01_matoya.o" number 6 @@ -5918,6 +6757,7 @@ endseg beginseg name "object_spot01_matoyab" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_spot01_matoyab/object_spot01_matoyab.o" number 6 @@ -5925,6 +6765,7 @@ endseg beginseg name "object_po_composer" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_po_composer/object_po_composer.o" number 6 @@ -5932,6 +6773,7 @@ endseg beginseg name "object_mu" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_mu/object_mu.o" number 6 @@ -5939,6 +6781,7 @@ endseg beginseg name "object_wf" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_wf/object_wf.o" number 6 @@ -5946,6 +6789,7 @@ endseg beginseg name "object_skb" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_skb/object_skb.o" number 6 @@ -5953,6 +6797,7 @@ endseg beginseg name "object_gj" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gj/object_gj.o" number 6 @@ -5960,6 +6805,7 @@ endseg beginseg name "object_geff" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_geff/object_geff.o" number 6 @@ -5967,6 +6813,7 @@ endseg beginseg name "object_haka_door" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_haka_door/object_haka_door.o" number 6 @@ -5974,6 +6821,7 @@ endseg beginseg name "object_gs" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gs/object_gs.o" number 6 @@ -5981,6 +6829,7 @@ endseg beginseg name "object_ps" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ps/object_ps.o" number 6 @@ -5988,6 +6837,7 @@ endseg beginseg name "object_bwall" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_bwall/object_bwall.o" number 6 @@ -5995,6 +6845,7 @@ endseg beginseg name "object_crow" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_crow/object_crow.o" number 6 @@ -6002,6 +6853,7 @@ endseg beginseg name "object_cow" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_cow/object_cow.o" number 6 @@ -6009,6 +6861,7 @@ endseg beginseg name "object_cob" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_cob/object_cob.o" number 6 @@ -6016,6 +6869,7 @@ endseg beginseg name "object_gi_sword_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_gi_sword_1/object_gi_sword_1.o" number 6 @@ -6023,6 +6877,7 @@ endseg beginseg name "object_door_killer" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_door_killer/object_door_killer.o" number 6 @@ -6030,6 +6885,7 @@ endseg beginseg name "object_ouke_haka" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_ouke_haka/object_ouke_haka.o" number 6 @@ -6037,6 +6893,7 @@ endseg beginseg name "object_timeblock" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_timeblock/object_timeblock.o" number 6 @@ -6044,6 +6901,7 @@ endseg beginseg name "object_zl4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/object_zl4/object_zl4.o" number 6 @@ -6051,348 +6909,406 @@ endseg beginseg name "g_pn_01" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_01.o" endseg beginseg name "g_pn_02" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_02.o" endseg beginseg name "g_pn_03" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_03.o" endseg beginseg name "g_pn_04" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_04.o" endseg beginseg name "g_pn_05" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_05.o" endseg beginseg name "g_pn_06" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_06.o" endseg beginseg name "g_pn_07" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_07.o" endseg beginseg name "g_pn_08" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_08.o" endseg beginseg name "g_pn_09" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_09.o" endseg beginseg name "g_pn_10" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_10.o" endseg beginseg name "g_pn_11" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_11.o" endseg beginseg name "g_pn_12" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_12.o" endseg beginseg name "g_pn_13" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_13.o" endseg beginseg name "g_pn_14" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_14.o" endseg beginseg name "g_pn_15" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_15.o" endseg beginseg name "g_pn_16" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_16.o" endseg beginseg name "g_pn_17" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_17.o" endseg beginseg name "g_pn_18" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_18.o" endseg beginseg name "g_pn_19" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_19.o" endseg beginseg name "g_pn_20" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_20.o" endseg beginseg name "g_pn_21" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_21.o" endseg beginseg name "g_pn_22" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_22.o" endseg beginseg name "g_pn_23" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_23.o" endseg beginseg name "g_pn_24" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_24.o" endseg beginseg name "g_pn_25" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_25.o" endseg beginseg name "g_pn_26" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_26.o" endseg beginseg name "g_pn_27" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_27.o" endseg beginseg name "g_pn_28" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_28.o" endseg beginseg name "g_pn_29" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_29.o" endseg beginseg name "g_pn_30" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_30.o" endseg beginseg name "g_pn_31" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_31.o" endseg beginseg name "g_pn_32" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_32.o" endseg beginseg name "g_pn_33" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_33.o" endseg beginseg name "g_pn_34" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_34.o" endseg beginseg name "g_pn_35" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_35.o" endseg beginseg name "g_pn_36" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_36.o" endseg beginseg name "g_pn_37" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_37.o" endseg beginseg name "g_pn_38" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_38.o" endseg beginseg name "g_pn_39" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_39.o" endseg beginseg name "g_pn_40" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_40.o" endseg beginseg name "g_pn_41" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_41.o" endseg beginseg name "g_pn_42" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_42.o" endseg beginseg name "g_pn_43" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_43.o" endseg beginseg name "g_pn_44" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_44.o" endseg beginseg name "g_pn_45" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_45.o" endseg beginseg name "g_pn_46" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_46.o" endseg beginseg name "g_pn_47" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_47.o" endseg beginseg name "g_pn_48" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_48.o" endseg beginseg name "g_pn_49" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_49.o" endseg beginseg name "g_pn_50" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_50.o" endseg beginseg name "g_pn_51" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_51.o" endseg beginseg name "g_pn_52" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_52.o" endseg beginseg name "g_pn_53" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_53.o" endseg beginseg name "g_pn_54" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_54.o" endseg beginseg name "g_pn_55" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_55.o" endseg beginseg name "g_pn_56" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_56.o" endseg beginseg name "g_pn_57" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/place_title_cards/g_pn_57.o" endseg beginseg name "z_select_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/misc/z_select_static/z_select_static.o" number 1 @@ -6400,6 +7316,7 @@ endseg beginseg name "nintendo_rogo_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/nintendo_rogo_static/nintendo_rogo_static.o" number 1 @@ -6407,6 +7324,7 @@ endseg beginseg name "title_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/title_static/title_static.o" number 1 @@ -6414,6 +7332,7 @@ endseg beginseg name "parameter_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/parameter_static/parameter_static.o" number 2 @@ -6421,6 +7340,7 @@ endseg beginseg name "vr_fine0_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/skyboxes/vr_fine0_static.o" endseg @@ -6433,6 +7353,7 @@ endseg beginseg name "vr_fine1_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/skyboxes/vr_fine1_static.o" endseg @@ -6445,6 +7366,7 @@ endseg beginseg name "vr_fine2_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/skyboxes/vr_fine2_static.o" endseg @@ -6457,6 +7379,7 @@ endseg beginseg name "vr_fine3_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/skyboxes/vr_fine3_static.o" endseg @@ -6469,6 +7392,7 @@ endseg beginseg name "vr_cloud0_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/skyboxes/vr_cloud0_static.o" endseg @@ -6481,6 +7405,7 @@ endseg beginseg name "vr_cloud1_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/skyboxes/vr_cloud1_static.o" endseg @@ -6493,6 +7418,7 @@ endseg beginseg name "vr_cloud2_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/skyboxes/vr_cloud2_static.o" endseg @@ -6505,6 +7431,7 @@ endseg beginseg name "vr_cloud3_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/skyboxes/vr_cloud3_static.o" endseg @@ -6517,6 +7444,7 @@ endseg beginseg name "vr_holy0_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/skyboxes/vr_holy0_static.o" endseg @@ -6529,6 +7457,7 @@ endseg beginseg name "vr_holy1_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/skyboxes/vr_holy1_static.o" endseg @@ -6541,6 +7470,7 @@ endseg beginseg name "vr_MDVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_MDVR_static.o" endseg @@ -6553,6 +7483,7 @@ endseg beginseg name "vr_MNVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_MNVR_static.o" endseg @@ -6565,6 +7496,7 @@ endseg beginseg name "vr_RUVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_RUVR_static.o" endseg @@ -6577,6 +7509,7 @@ endseg beginseg name "vr_LHVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_LHVR_static.o" endseg @@ -6589,6 +7522,7 @@ endseg beginseg name "vr_KHVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_KHVR_static.o" endseg @@ -6601,6 +7535,7 @@ endseg beginseg name "vr_K3VR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_K3VR_static.o" endseg @@ -6613,6 +7548,7 @@ endseg beginseg name "vr_K4VR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_K4VR_static.o" endseg @@ -6625,6 +7561,7 @@ endseg beginseg name "vr_K5VR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_K5VR_static.o" endseg @@ -6637,6 +7574,7 @@ endseg beginseg name "vr_SP1a_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_SP1a_static.o" endseg @@ -6649,6 +7587,7 @@ endseg beginseg name "vr_MLVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_MLVR_static.o" endseg @@ -6661,6 +7600,7 @@ endseg beginseg name "vr_KKRVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_KKRVR_static.o" endseg @@ -6673,6 +7613,7 @@ endseg beginseg name "vr_KR3VR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_KR3VR_static.o" endseg @@ -6685,6 +7626,7 @@ endseg beginseg name "vr_IPVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_IPVR_static.o" endseg @@ -6697,6 +7639,7 @@ endseg beginseg name "vr_KSVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_KSVR_static.o" endseg @@ -6709,6 +7652,7 @@ endseg beginseg name "vr_GLVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_GLVR_static.o" endseg @@ -6721,6 +7665,7 @@ endseg beginseg name "vr_ZRVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_ZRVR_static.o" endseg @@ -6733,6 +7678,7 @@ endseg beginseg name "vr_DGVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_DGVR_static.o" endseg @@ -6745,6 +7691,7 @@ endseg beginseg name "vr_ALVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_ALVR_static.o" endseg @@ -6757,6 +7704,7 @@ endseg beginseg name "vr_NSVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_NSVR_static.o" endseg @@ -6769,6 +7717,7 @@ endseg beginseg name "vr_LBVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_LBVR_static.o" endseg @@ -6781,6 +7730,7 @@ endseg beginseg name "vr_TTVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_TTVR_static.o" endseg @@ -6793,6 +7743,7 @@ endseg beginseg name "vr_FCVR_static" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/textures/backgrounds/vr_FCVR_static.o" endseg @@ -6805,6 +7756,7 @@ endseg beginseg name "elf_message_field" + compress romalign 0x1000 include "$(BUILD_DIR)/src/elf_message/elf_message_field.o" number 0 @@ -6812,6 +7764,7 @@ endseg beginseg name "elf_message_ydan" + compress romalign 0x1000 include "$(BUILD_DIR)/src/elf_message/elf_message_ydan.o" number 0 @@ -6819,6 +7772,7 @@ endseg beginseg name "ydan_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan/ydan_scene.o" number 2 @@ -6826,6 +7780,7 @@ endseg beginseg name "ydan_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan/ydan_room_0.o" number 3 @@ -6833,6 +7788,7 @@ endseg beginseg name "ydan_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan/ydan_room_1.o" number 3 @@ -6840,6 +7796,7 @@ endseg beginseg name "ydan_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan/ydan_room_2.o" number 3 @@ -6847,6 +7804,7 @@ endseg beginseg name "ydan_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan/ydan_room_3.o" number 3 @@ -6854,6 +7812,7 @@ endseg beginseg name "ydan_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan/ydan_room_4.o" number 3 @@ -6861,6 +7820,7 @@ endseg beginseg name "ydan_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan/ydan_room_5.o" number 3 @@ -6868,6 +7828,7 @@ endseg beginseg name "ydan_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan/ydan_room_6.o" number 3 @@ -6875,6 +7836,7 @@ endseg beginseg name "ydan_room_7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan/ydan_room_7.o" number 3 @@ -6882,6 +7844,7 @@ endseg beginseg name "ydan_room_8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan/ydan_room_8.o" number 3 @@ -6889,6 +7852,7 @@ endseg beginseg name "ydan_room_9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan/ydan_room_9.o" number 3 @@ -6896,6 +7860,7 @@ endseg beginseg name "ydan_room_10" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan/ydan_room_10.o" number 3 @@ -6903,6 +7868,7 @@ endseg beginseg name "ydan_room_11" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan/ydan_room_11.o" number 3 @@ -6910,6 +7876,7 @@ endseg beginseg name "ddan_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_scene.o" number 2 @@ -6917,6 +7884,7 @@ endseg beginseg name "ddan_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_0.o" number 3 @@ -6924,6 +7892,7 @@ endseg beginseg name "ddan_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_1.o" number 3 @@ -6931,6 +7900,7 @@ endseg beginseg name "ddan_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_2.o" number 3 @@ -6938,6 +7908,7 @@ endseg beginseg name "ddan_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_3.o" number 3 @@ -6945,6 +7916,7 @@ endseg beginseg name "ddan_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_4.o" number 3 @@ -6952,6 +7924,7 @@ endseg beginseg name "ddan_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_5.o" number 3 @@ -6959,6 +7932,7 @@ endseg beginseg name "ddan_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_6.o" number 3 @@ -6966,6 +7940,7 @@ endseg beginseg name "ddan_room_7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_7.o" number 3 @@ -6973,6 +7948,7 @@ endseg beginseg name "ddan_room_8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_8.o" number 3 @@ -6980,6 +7956,7 @@ endseg beginseg name "ddan_room_9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_9.o" number 3 @@ -6987,6 +7964,7 @@ endseg beginseg name "ddan_room_10" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_10.o" number 3 @@ -6994,6 +7972,7 @@ endseg beginseg name "ddan_room_11" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_11.o" number 3 @@ -7001,6 +7980,7 @@ endseg beginseg name "ddan_room_12" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_12.o" number 3 @@ -7008,6 +7988,7 @@ endseg beginseg name "ddan_room_13" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_13.o" number 3 @@ -7015,6 +7996,7 @@ endseg beginseg name "ddan_room_14" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_14.o" number 3 @@ -7022,6 +8004,7 @@ endseg beginseg name "ddan_room_15" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_15.o" number 3 @@ -7029,6 +8012,7 @@ endseg beginseg name "ddan_room_16" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan/ddan_room_16.o" number 3 @@ -7036,6 +8020,7 @@ endseg beginseg name "bdan_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_scene.o" number 2 @@ -7043,6 +8028,7 @@ endseg beginseg name "bdan_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_0.o" number 3 @@ -7050,6 +8036,7 @@ endseg beginseg name "bdan_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_1.o" number 3 @@ -7057,6 +8044,7 @@ endseg beginseg name "bdan_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_2.o" number 3 @@ -7064,6 +8052,7 @@ endseg beginseg name "bdan_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_3.o" number 3 @@ -7071,6 +8060,7 @@ endseg beginseg name "bdan_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_4.o" number 3 @@ -7078,6 +8068,7 @@ endseg beginseg name "bdan_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_5.o" number 3 @@ -7085,6 +8076,7 @@ endseg beginseg name "bdan_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_6.o" number 3 @@ -7092,6 +8084,7 @@ endseg beginseg name "bdan_room_7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_7.o" number 3 @@ -7099,6 +8092,7 @@ endseg beginseg name "bdan_room_8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_8.o" number 3 @@ -7106,6 +8100,7 @@ endseg beginseg name "bdan_room_9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_9.o" number 3 @@ -7113,6 +8108,7 @@ endseg beginseg name "bdan_room_10" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_10.o" number 3 @@ -7120,6 +8116,7 @@ endseg beginseg name "bdan_room_11" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_11.o" number 3 @@ -7127,6 +8124,7 @@ endseg beginseg name "bdan_room_12" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_12.o" number 3 @@ -7134,6 +8132,7 @@ endseg beginseg name "bdan_room_13" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_13.o" number 3 @@ -7141,6 +8140,7 @@ endseg beginseg name "bdan_room_14" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_14.o" number 3 @@ -7148,6 +8148,7 @@ endseg beginseg name "bdan_room_15" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan/bdan_room_15.o" number 3 @@ -7155,6 +8156,7 @@ endseg beginseg name "Bmori1_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_scene.o" number 2 @@ -7162,6 +8164,7 @@ endseg beginseg name "Bmori1_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_0.o" number 3 @@ -7169,6 +8172,7 @@ endseg beginseg name "Bmori1_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_1.o" number 3 @@ -7176,6 +8180,7 @@ endseg beginseg name "Bmori1_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_2.o" number 3 @@ -7183,6 +8188,7 @@ endseg beginseg name "Bmori1_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_3.o" number 3 @@ -7190,6 +8196,7 @@ endseg beginseg name "Bmori1_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_4.o" number 3 @@ -7197,6 +8204,7 @@ endseg beginseg name "Bmori1_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_5.o" number 3 @@ -7204,6 +8212,7 @@ endseg beginseg name "Bmori1_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_6.o" number 3 @@ -7211,6 +8220,7 @@ endseg beginseg name "Bmori1_room_7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_7.o" number 3 @@ -7218,6 +8228,7 @@ endseg beginseg name "Bmori1_room_8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_8.o" number 3 @@ -7225,6 +8236,7 @@ endseg beginseg name "Bmori1_room_9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_9.o" number 3 @@ -7232,6 +8244,7 @@ endseg beginseg name "Bmori1_room_10" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_10.o" number 3 @@ -7239,6 +8252,7 @@ endseg beginseg name "Bmori1_room_11" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_11.o" number 3 @@ -7246,6 +8260,7 @@ endseg beginseg name "Bmori1_room_12" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_12.o" number 3 @@ -7253,6 +8268,7 @@ endseg beginseg name "Bmori1_room_13" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_13.o" number 3 @@ -7260,6 +8276,7 @@ endseg beginseg name "Bmori1_room_14" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_14.o" number 3 @@ -7267,6 +8284,7 @@ endseg beginseg name "Bmori1_room_15" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_15.o" number 3 @@ -7274,6 +8292,7 @@ endseg beginseg name "Bmori1_room_16" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_16.o" number 3 @@ -7281,6 +8300,7 @@ endseg beginseg name "Bmori1_room_17" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_17.o" number 3 @@ -7288,6 +8308,7 @@ endseg beginseg name "Bmori1_room_18" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_18.o" number 3 @@ -7295,6 +8316,7 @@ endseg beginseg name "Bmori1_room_19" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_19.o" number 3 @@ -7302,6 +8324,7 @@ endseg beginseg name "Bmori1_room_20" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_20.o" number 3 @@ -7309,6 +8332,7 @@ endseg beginseg name "Bmori1_room_21" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_21.o" number 3 @@ -7316,6 +8340,7 @@ endseg beginseg name "Bmori1_room_22" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/Bmori1/Bmori1_room_22.o" number 3 @@ -7323,6 +8348,7 @@ endseg beginseg name "HIDAN_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_scene.o" number 2 @@ -7330,6 +8356,7 @@ endseg beginseg name "HIDAN_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_0.o" number 3 @@ -7337,6 +8364,7 @@ endseg beginseg name "HIDAN_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_1.o" number 3 @@ -7344,6 +8372,7 @@ endseg beginseg name "HIDAN_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_2.o" number 3 @@ -7351,6 +8380,7 @@ endseg beginseg name "HIDAN_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_3.o" number 3 @@ -7358,6 +8388,7 @@ endseg beginseg name "HIDAN_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_4.o" number 3 @@ -7365,6 +8396,7 @@ endseg beginseg name "HIDAN_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_5.o" number 3 @@ -7372,6 +8404,7 @@ endseg beginseg name "HIDAN_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_6.o" number 3 @@ -7379,6 +8412,7 @@ endseg beginseg name "HIDAN_room_7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_7.o" number 3 @@ -7386,6 +8420,7 @@ endseg beginseg name "HIDAN_room_8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_8.o" number 3 @@ -7393,6 +8428,7 @@ endseg beginseg name "HIDAN_room_9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_9.o" number 3 @@ -7400,6 +8436,7 @@ endseg beginseg name "HIDAN_room_10" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_10.o" number 3 @@ -7407,6 +8444,7 @@ endseg beginseg name "HIDAN_room_11" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_11.o" number 3 @@ -7414,6 +8452,7 @@ endseg beginseg name "HIDAN_room_12" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_12.o" number 3 @@ -7421,6 +8460,7 @@ endseg beginseg name "HIDAN_room_13" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_13.o" number 3 @@ -7428,6 +8468,7 @@ endseg beginseg name "HIDAN_room_14" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_14.o" number 3 @@ -7435,6 +8476,7 @@ endseg beginseg name "HIDAN_room_15" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_15.o" number 3 @@ -7442,6 +8484,7 @@ endseg beginseg name "HIDAN_room_16" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_16.o" number 3 @@ -7449,6 +8492,7 @@ endseg beginseg name "HIDAN_room_17" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_17.o" number 3 @@ -7456,6 +8500,7 @@ endseg beginseg name "HIDAN_room_18" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_18.o" number 3 @@ -7463,6 +8508,7 @@ endseg beginseg name "HIDAN_room_19" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_19.o" number 3 @@ -7470,6 +8516,7 @@ endseg beginseg name "HIDAN_room_20" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_20.o" number 3 @@ -7477,6 +8524,7 @@ endseg beginseg name "HIDAN_room_21" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_21.o" number 3 @@ -7484,6 +8532,7 @@ endseg beginseg name "HIDAN_room_22" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_22.o" number 3 @@ -7491,6 +8540,7 @@ endseg beginseg name "HIDAN_room_23" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_23.o" number 3 @@ -7498,6 +8548,7 @@ endseg beginseg name "HIDAN_room_24" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_24.o" number 3 @@ -7505,6 +8556,7 @@ endseg beginseg name "HIDAN_room_25" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_25.o" number 3 @@ -7512,6 +8564,7 @@ endseg beginseg name "HIDAN_room_26" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HIDAN/HIDAN_room_26.o" number 3 @@ -7519,6 +8572,7 @@ endseg beginseg name "MIZUsin_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_scene.o" number 2 @@ -7526,6 +8580,7 @@ endseg beginseg name "MIZUsin_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.o" number 3 @@ -7533,6 +8588,7 @@ endseg beginseg name "MIZUsin_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.o" number 3 @@ -7540,6 +8596,7 @@ endseg beginseg name "MIZUsin_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_2.o" number 3 @@ -7547,6 +8604,7 @@ endseg beginseg name "MIZUsin_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_3.o" number 3 @@ -7554,6 +8612,7 @@ endseg beginseg name "MIZUsin_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_4.o" number 3 @@ -7561,6 +8620,7 @@ endseg beginseg name "MIZUsin_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_5.o" number 3 @@ -7568,6 +8628,7 @@ endseg beginseg name "MIZUsin_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.o" number 3 @@ -7575,6 +8636,7 @@ endseg beginseg name "MIZUsin_room_7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.o" number 3 @@ -7582,6 +8644,7 @@ endseg beginseg name "MIZUsin_room_8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_8.o" number 3 @@ -7589,6 +8652,7 @@ endseg beginseg name "MIZUsin_room_9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_9.o" number 3 @@ -7596,6 +8660,7 @@ endseg beginseg name "MIZUsin_room_10" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_10.o" number 3 @@ -7603,6 +8668,7 @@ endseg beginseg name "MIZUsin_room_11" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_11.o" number 3 @@ -7610,6 +8676,7 @@ endseg beginseg name "MIZUsin_room_12" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.o" number 3 @@ -7617,6 +8684,7 @@ endseg beginseg name "MIZUsin_room_13" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_13.o" number 3 @@ -7624,6 +8692,7 @@ endseg beginseg name "MIZUsin_room_14" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.o" number 3 @@ -7631,6 +8700,7 @@ endseg beginseg name "MIZUsin_room_15" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.o" number 3 @@ -7638,6 +8708,7 @@ endseg beginseg name "MIZUsin_room_16" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_16.o" number 3 @@ -7645,6 +8716,7 @@ endseg beginseg name "MIZUsin_room_17" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.o" number 3 @@ -7652,6 +8724,7 @@ endseg beginseg name "MIZUsin_room_18" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_18.o" number 3 @@ -7659,6 +8732,7 @@ endseg beginseg name "MIZUsin_room_19" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_19.o" number 3 @@ -7666,6 +8740,7 @@ endseg beginseg name "MIZUsin_room_20" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_20.o" number 3 @@ -7673,6 +8748,7 @@ endseg beginseg name "MIZUsin_room_21" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_21.o" number 3 @@ -7680,6 +8756,7 @@ endseg beginseg name "MIZUsin_room_22" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin/MIZUsin_room_22.o" number 3 @@ -7687,6 +8764,7 @@ endseg beginseg name "jyasinzou_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.o" number 2 @@ -7694,6 +8772,7 @@ endseg beginseg name "jyasinzou_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.o" number 3 @@ -7701,6 +8780,7 @@ endseg beginseg name "jyasinzou_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_1.o" number 3 @@ -7708,6 +8788,7 @@ endseg beginseg name "jyasinzou_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.o" number 3 @@ -7715,6 +8796,7 @@ endseg beginseg name "jyasinzou_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_3.o" number 3 @@ -7722,6 +8804,7 @@ endseg beginseg name "jyasinzou_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_4.o" number 3 @@ -7729,6 +8812,7 @@ endseg beginseg name "jyasinzou_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.o" number 3 @@ -7736,6 +8820,7 @@ endseg beginseg name "jyasinzou_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.o" number 3 @@ -7743,6 +8828,7 @@ endseg beginseg name "jyasinzou_room_7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.o" number 3 @@ -7750,6 +8836,7 @@ endseg beginseg name "jyasinzou_room_8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.o" number 3 @@ -7757,6 +8844,7 @@ endseg beginseg name "jyasinzou_room_9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.o" number 3 @@ -7764,6 +8852,7 @@ endseg beginseg name "jyasinzou_room_10" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.o" number 3 @@ -7771,6 +8860,7 @@ endseg beginseg name "jyasinzou_room_11" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_11.o" number 3 @@ -7778,6 +8868,7 @@ endseg beginseg name "jyasinzou_room_12" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_12.o" number 3 @@ -7785,6 +8876,7 @@ endseg beginseg name "jyasinzou_room_13" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_13.o" number 3 @@ -7792,6 +8884,7 @@ endseg beginseg name "jyasinzou_room_14" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.o" number 3 @@ -7799,6 +8892,7 @@ endseg beginseg name "jyasinzou_room_15" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_15.o" number 3 @@ -7806,6 +8900,7 @@ endseg beginseg name "jyasinzou_room_16" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_16.o" number 3 @@ -7813,6 +8908,7 @@ endseg beginseg name "jyasinzou_room_17" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_17.o" number 3 @@ -7820,6 +8916,7 @@ endseg beginseg name "jyasinzou_room_18" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_18.o" number 3 @@ -7827,6 +8924,7 @@ endseg beginseg name "jyasinzou_room_19" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_19.o" number 3 @@ -7834,6 +8932,7 @@ endseg beginseg name "jyasinzou_room_20" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_20.o" number 3 @@ -7841,6 +8940,7 @@ endseg beginseg name "jyasinzou_room_21" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_21.o" number 3 @@ -7848,6 +8948,7 @@ endseg beginseg name "jyasinzou_room_22" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_22.o" number 3 @@ -7855,6 +8956,7 @@ endseg beginseg name "jyasinzou_room_23" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_23.o" number 3 @@ -7862,6 +8964,7 @@ endseg beginseg name "jyasinzou_room_24" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.o" number 3 @@ -7869,6 +8972,7 @@ endseg beginseg name "jyasinzou_room_25" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_25.o" number 3 @@ -7876,6 +8980,7 @@ endseg beginseg name "jyasinzou_room_26" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.o" number 3 @@ -7883,6 +8988,7 @@ endseg beginseg name "jyasinzou_room_27" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_27.o" number 3 @@ -7890,6 +8996,7 @@ endseg beginseg name "jyasinzou_room_28" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.o" number 3 @@ -7897,6 +9004,7 @@ endseg beginseg name "HAKAdan_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_scene.o" number 2 @@ -7904,6 +9012,7 @@ endseg beginseg name "HAKAdan_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.o" number 3 @@ -7911,6 +9020,7 @@ endseg beginseg name "HAKAdan_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_1.o" number 3 @@ -7918,6 +9028,7 @@ endseg beginseg name "HAKAdan_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_2.o" number 3 @@ -7925,6 +9036,7 @@ endseg beginseg name "HAKAdan_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_3.o" number 3 @@ -7932,6 +9044,7 @@ endseg beginseg name "HAKAdan_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_4.o" number 3 @@ -7939,6 +9052,7 @@ endseg beginseg name "HAKAdan_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_5.o" number 3 @@ -7946,6 +9060,7 @@ endseg beginseg name "HAKAdan_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.o" number 3 @@ -7953,6 +9068,7 @@ endseg beginseg name "HAKAdan_room_7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_7.o" number 3 @@ -7960,6 +9076,7 @@ endseg beginseg name "HAKAdan_room_8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_8.o" number 3 @@ -7967,6 +9084,7 @@ endseg beginseg name "HAKAdan_room_9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.o" number 3 @@ -7974,6 +9092,7 @@ endseg beginseg name "HAKAdan_room_10" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_10.o" number 3 @@ -7981,6 +9100,7 @@ endseg beginseg name "HAKAdan_room_11" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_11.o" number 3 @@ -7988,6 +9108,7 @@ endseg beginseg name "HAKAdan_room_12" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.o" number 3 @@ -7995,6 +9116,7 @@ endseg beginseg name "HAKAdan_room_13" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_13.o" number 3 @@ -8002,6 +9124,7 @@ endseg beginseg name "HAKAdan_room_14" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_14.o" number 3 @@ -8009,6 +9132,7 @@ endseg beginseg name "HAKAdan_room_15" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_15.o" number 3 @@ -8016,6 +9140,7 @@ endseg beginseg name "HAKAdan_room_16" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_16.o" number 3 @@ -8023,6 +9148,7 @@ endseg beginseg name "HAKAdan_room_17" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_17.o" number 3 @@ -8030,6 +9156,7 @@ endseg beginseg name "HAKAdan_room_18" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.o" number 3 @@ -8037,6 +9164,7 @@ endseg beginseg name "HAKAdan_room_19" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_19.o" number 3 @@ -8044,6 +9172,7 @@ endseg beginseg name "HAKAdan_room_20" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_20.o" number 3 @@ -8051,6 +9180,7 @@ endseg beginseg name "HAKAdan_room_21" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_21.o" number 3 @@ -8058,6 +9188,7 @@ endseg beginseg name "HAKAdan_room_22" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan/HAKAdan_room_22.o" number 3 @@ -8065,6 +9196,7 @@ endseg beginseg name "HAKAdanCH_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.o" number 2 @@ -8072,6 +9204,7 @@ endseg beginseg name "HAKAdanCH_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.o" number 3 @@ -8079,6 +9212,7 @@ endseg beginseg name "HAKAdanCH_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.o" number 3 @@ -8086,6 +9220,7 @@ endseg beginseg name "HAKAdanCH_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.o" number 3 @@ -8093,6 +9228,7 @@ endseg beginseg name "HAKAdanCH_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.o" number 3 @@ -8100,6 +9236,7 @@ endseg beginseg name "HAKAdanCH_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.o" number 3 @@ -8107,6 +9244,7 @@ endseg beginseg name "HAKAdanCH_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.o" number 3 @@ -8114,6 +9252,7 @@ endseg beginseg name "HAKAdanCH_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.o" number 3 @@ -8121,6 +9260,7 @@ endseg beginseg name "ice_doukutu_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.o" number 2 @@ -8128,6 +9268,7 @@ endseg beginseg name "ice_doukutu_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.o" number 3 @@ -8135,6 +9276,7 @@ endseg beginseg name "ice_doukutu_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.o" number 3 @@ -8142,6 +9284,7 @@ endseg beginseg name "ice_doukutu_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.o" number 3 @@ -8149,6 +9292,7 @@ endseg beginseg name "ice_doukutu_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.o" number 3 @@ -8156,6 +9300,7 @@ endseg beginseg name "ice_doukutu_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.o" number 3 @@ -8163,6 +9308,7 @@ endseg beginseg name "ice_doukutu_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.o" number 3 @@ -8170,6 +9316,7 @@ endseg beginseg name "ice_doukutu_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.o" number 3 @@ -8177,6 +9324,7 @@ endseg beginseg name "ice_doukutu_room_7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.o" number 3 @@ -8184,6 +9332,7 @@ endseg beginseg name "ice_doukutu_room_8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_8.o" number 3 @@ -8191,6 +9340,7 @@ endseg beginseg name "ice_doukutu_room_9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.o" number 3 @@ -8198,6 +9348,7 @@ endseg beginseg name "ice_doukutu_room_10" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.o" number 3 @@ -8205,6 +9356,7 @@ endseg beginseg name "ice_doukutu_room_11" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.o" number 3 @@ -8212,6 +9364,7 @@ endseg beginseg name "men_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/men/men_scene.o" number 2 @@ -8219,6 +9372,7 @@ endseg beginseg name "men_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/men/men_room_0.o" number 3 @@ -8226,6 +9380,7 @@ endseg beginseg name "men_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/men/men_room_1.o" number 3 @@ -8233,6 +9388,7 @@ endseg beginseg name "men_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/men/men_room_2.o" number 3 @@ -8240,6 +9396,7 @@ endseg beginseg name "men_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/men/men_room_3.o" number 3 @@ -8247,6 +9404,7 @@ endseg beginseg name "men_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/men/men_room_4.o" number 3 @@ -8254,6 +9412,7 @@ endseg beginseg name "men_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/men/men_room_5.o" number 3 @@ -8261,6 +9420,7 @@ endseg beginseg name "men_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/men/men_room_6.o" number 3 @@ -8268,6 +9428,7 @@ endseg beginseg name "men_room_7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/men/men_room_7.o" number 3 @@ -8275,6 +9436,7 @@ endseg beginseg name "men_room_8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/men/men_room_8.o" number 3 @@ -8282,6 +9444,7 @@ endseg beginseg name "men_room_9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/men/men_room_9.o" number 3 @@ -8289,6 +9452,7 @@ endseg beginseg name "men_room_10" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/men/men_room_10.o" number 3 @@ -8296,6 +9460,7 @@ endseg beginseg name "ganontika_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_scene.o" number 2 @@ -8303,6 +9468,7 @@ endseg beginseg name "ganontika_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_0.o" number 3 @@ -8310,6 +9476,7 @@ endseg beginseg name "ganontika_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_1.o" number 3 @@ -8317,6 +9484,7 @@ endseg beginseg name "ganontika_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_2.o" number 3 @@ -8324,6 +9492,7 @@ endseg beginseg name "ganontika_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_3.o" number 3 @@ -8331,6 +9500,7 @@ endseg beginseg name "ganontika_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_4.o" number 3 @@ -8338,6 +9508,7 @@ endseg beginseg name "ganontika_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_5.o" number 3 @@ -8345,6 +9516,7 @@ endseg beginseg name "ganontika_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_6.o" number 3 @@ -8352,6 +9524,7 @@ endseg beginseg name "ganontika_room_7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_7.o" number 3 @@ -8359,6 +9532,7 @@ endseg beginseg name "ganontika_room_8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_8.o" number 3 @@ -8366,6 +9540,7 @@ endseg beginseg name "ganontika_room_9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_9.o" number 3 @@ -8373,6 +9548,7 @@ endseg beginseg name "ganontika_room_10" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_10.o" number 3 @@ -8380,6 +9556,7 @@ endseg beginseg name "ganontika_room_11" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_11.o" number 3 @@ -8387,6 +9564,7 @@ endseg beginseg name "ganontika_room_12" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_12.o" number 3 @@ -8394,6 +9572,7 @@ endseg beginseg name "ganontika_room_13" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_13.o" number 3 @@ -8401,6 +9580,7 @@ endseg beginseg name "ganontika_room_14" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_14.o" number 3 @@ -8408,6 +9588,7 @@ endseg beginseg name "ganontika_room_15" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_15.o" number 3 @@ -8415,6 +9596,7 @@ endseg beginseg name "ganontika_room_16" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_16.o" number 3 @@ -8422,6 +9604,7 @@ endseg beginseg name "ganontika_room_17" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_17.o" number 3 @@ -8429,6 +9612,7 @@ endseg beginseg name "ganontika_room_18" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_18.o" number 3 @@ -8436,6 +9620,7 @@ endseg beginseg name "ganontika_room_19" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontika/ganontika_room_19.o" number 3 @@ -8485,6 +9670,7 @@ endseg beginseg name "spot00_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot00/spot00_scene.o" number 2 @@ -8492,6 +9678,7 @@ endseg beginseg name "spot00_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot00/spot00_room_0.o" number 3 @@ -8499,6 +9686,7 @@ endseg beginseg name "spot01_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot01/spot01_scene.o" number 2 @@ -8506,6 +9694,7 @@ endseg beginseg name "spot01_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot01/spot01_room_0.o" number 3 @@ -8513,6 +9702,7 @@ endseg beginseg name "spot02_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot02/spot02_scene.o" number 2 @@ -8520,6 +9710,7 @@ endseg beginseg name "spot02_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot02/spot02_room_0.o" number 3 @@ -8527,6 +9718,7 @@ endseg beginseg name "spot02_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot02/spot02_room_1.o" number 3 @@ -8534,6 +9726,7 @@ endseg beginseg name "spot03_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot03/spot03_scene.o" number 2 @@ -8541,6 +9734,7 @@ endseg beginseg name "spot03_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot03/spot03_room_0.o" number 3 @@ -8548,6 +9742,7 @@ endseg beginseg name "spot03_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot03/spot03_room_1.o" number 3 @@ -8555,6 +9750,7 @@ endseg beginseg name "spot04_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot04/spot04_scene.o" number 2 @@ -8562,6 +9758,7 @@ endseg beginseg name "spot04_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot04/spot04_room_0.o" number 3 @@ -8569,6 +9766,7 @@ endseg beginseg name "spot04_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot04/spot04_room_1.o" number 3 @@ -8576,6 +9774,7 @@ endseg beginseg name "spot04_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot04/spot04_room_2.o" number 3 @@ -8583,6 +9782,7 @@ endseg beginseg name "spot05_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot05/spot05_scene.o" number 2 @@ -8590,6 +9790,7 @@ endseg beginseg name "spot05_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot05/spot05_room_0.o" number 3 @@ -8597,6 +9798,7 @@ endseg beginseg name "spot06_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot06/spot06_scene.o" number 2 @@ -8604,6 +9806,7 @@ endseg beginseg name "spot06_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot06/spot06_room_0.o" number 3 @@ -8611,6 +9814,7 @@ endseg beginseg name "spot07_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot07/spot07_scene.o" number 2 @@ -8618,6 +9822,7 @@ endseg beginseg name "spot07_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot07/spot07_room_0.o" number 3 @@ -8625,6 +9830,7 @@ endseg beginseg name "spot07_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot07/spot07_room_1.o" number 3 @@ -8632,6 +9838,7 @@ endseg beginseg name "spot08_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot08/spot08_scene.o" number 2 @@ -8639,6 +9846,7 @@ endseg beginseg name "spot08_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot08/spot08_room_0.o" number 3 @@ -8646,6 +9854,7 @@ endseg beginseg name "spot09_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot09/spot09_scene.o" number 2 @@ -8653,6 +9862,7 @@ endseg beginseg name "spot09_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot09/spot09_room_0.o" number 3 @@ -8660,6 +9870,7 @@ endseg beginseg name "spot10_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot10/spot10_scene.o" number 2 @@ -8667,6 +9878,7 @@ endseg beginseg name "spot10_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot10/spot10_room_0.o" number 3 @@ -8674,6 +9886,7 @@ endseg beginseg name "spot10_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot10/spot10_room_1.o" number 3 @@ -8681,6 +9894,7 @@ endseg beginseg name "spot10_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot10/spot10_room_2.o" number 3 @@ -8688,6 +9902,7 @@ endseg beginseg name "spot10_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot10/spot10_room_3.o" number 3 @@ -8695,6 +9910,7 @@ endseg beginseg name "spot10_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot10/spot10_room_4.o" number 3 @@ -8702,6 +9918,7 @@ endseg beginseg name "spot10_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot10/spot10_room_5.o" number 3 @@ -8709,6 +9926,7 @@ endseg beginseg name "spot10_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot10/spot10_room_6.o" number 3 @@ -8716,6 +9934,7 @@ endseg beginseg name "spot10_room_7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot10/spot10_room_7.o" number 3 @@ -8723,6 +9942,7 @@ endseg beginseg name "spot10_room_8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot10/spot10_room_8.o" number 3 @@ -8730,6 +9950,7 @@ endseg beginseg name "spot10_room_9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot10/spot10_room_9.o" number 3 @@ -8737,6 +9958,7 @@ endseg beginseg name "spot11_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot11/spot11_scene.o" number 2 @@ -8744,6 +9966,7 @@ endseg beginseg name "spot11_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot11/spot11_room_0.o" number 3 @@ -8751,6 +9974,7 @@ endseg beginseg name "spot12_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot12/spot12_scene.o" number 2 @@ -8758,6 +9982,7 @@ endseg beginseg name "spot12_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot12/spot12_room_0.o" number 3 @@ -8765,6 +9990,7 @@ endseg beginseg name "spot12_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot12/spot12_room_1.o" number 3 @@ -8772,6 +9998,7 @@ endseg beginseg name "spot13_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot13/spot13_scene.o" number 2 @@ -8779,6 +10006,7 @@ endseg beginseg name "spot13_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot13/spot13_room_0.o" number 3 @@ -8786,6 +10014,7 @@ endseg beginseg name "spot13_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot13/spot13_room_1.o" number 3 @@ -8793,6 +10022,7 @@ endseg beginseg name "spot15_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot15/spot15_scene.o" number 2 @@ -8800,6 +10030,7 @@ endseg beginseg name "spot15_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot15/spot15_room_0.o" number 3 @@ -8807,6 +10038,7 @@ endseg beginseg name "spot16_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot16/spot16_scene.o" number 2 @@ -8814,6 +10046,7 @@ endseg beginseg name "spot16_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot16/spot16_room_0.o" number 3 @@ -8821,6 +10054,7 @@ endseg beginseg name "spot17_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot17/spot17_scene.o" number 2 @@ -8828,6 +10062,7 @@ endseg beginseg name "spot17_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot17/spot17_room_0.o" number 3 @@ -8835,6 +10070,7 @@ endseg beginseg name "spot17_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot17/spot17_room_1.o" number 3 @@ -8842,6 +10078,7 @@ endseg beginseg name "spot18_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot18/spot18_scene.o" number 2 @@ -8849,6 +10086,7 @@ endseg beginseg name "spot18_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot18/spot18_room_0.o" number 3 @@ -8856,6 +10094,7 @@ endseg beginseg name "spot18_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot18/spot18_room_1.o" number 3 @@ -8863,6 +10102,7 @@ endseg beginseg name "spot18_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot18/spot18_room_2.o" number 3 @@ -8870,6 +10110,7 @@ endseg beginseg name "spot18_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot18/spot18_room_3.o" number 3 @@ -8877,6 +10118,7 @@ endseg beginseg name "market_day_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/market_day/market_day_scene.o" number 2 @@ -8884,6 +10126,7 @@ endseg beginseg name "market_day_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/market_day/market_day_room_0.o" number 3 @@ -8891,6 +10134,7 @@ endseg beginseg name "market_night_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/market_night/market_night_scene.o" number 2 @@ -8898,6 +10142,7 @@ endseg beginseg name "market_night_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/market_night/market_night_room_0.o" number 3 @@ -8947,6 +10192,7 @@ endseg beginseg name "kenjyanoma_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/kenjyanoma/kenjyanoma_scene.o" number 2 @@ -8954,6 +10200,7 @@ endseg beginseg name "kenjyanoma_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/kenjyanoma/kenjyanoma_room_0.o" number 3 @@ -8961,6 +10208,7 @@ endseg beginseg name "tokinoma_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/tokinoma/tokinoma_scene.o" number 2 @@ -8968,6 +10216,7 @@ endseg beginseg name "tokinoma_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/tokinoma/tokinoma_room_0.o" number 3 @@ -8975,6 +10224,7 @@ endseg beginseg name "tokinoma_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/tokinoma/tokinoma_room_1.o" number 3 @@ -8996,6 +10246,7 @@ endseg beginseg name "link_home_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/link_home/link_home_scene.o" number 2 @@ -9003,6 +10254,7 @@ endseg beginseg name "link_home_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/link_home/link_home_room_0.o" number 3 @@ -9010,6 +10262,7 @@ endseg beginseg name "kokiri_shop_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.o" number 2 @@ -9017,6 +10270,7 @@ endseg beginseg name "kokiri_shop_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.o" number 3 @@ -9024,6 +10278,7 @@ endseg beginseg name "kokiri_home_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/kokiri_home/kokiri_home_scene.o" number 2 @@ -9031,6 +10286,7 @@ endseg beginseg name "kokiri_home_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/kokiri_home/kokiri_home_room_0.o" number 3 @@ -9038,6 +10294,7 @@ endseg beginseg name "kakusiana_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakusiana/kakusiana_scene.o" number 2 @@ -9045,6 +10302,7 @@ endseg beginseg name "kakusiana_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakusiana/kakusiana_room_0.o" number 3 @@ -9052,6 +10310,7 @@ endseg beginseg name "kakusiana_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakusiana/kakusiana_room_1.o" number 3 @@ -9059,6 +10318,7 @@ endseg beginseg name "kakusiana_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakusiana/kakusiana_room_2.o" number 3 @@ -9066,6 +10326,7 @@ endseg beginseg name "kakusiana_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakusiana/kakusiana_room_3.o" number 3 @@ -9073,6 +10334,7 @@ endseg beginseg name "kakusiana_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakusiana/kakusiana_room_4.o" number 3 @@ -9080,6 +10342,7 @@ endseg beginseg name "kakusiana_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakusiana/kakusiana_room_5.o" number 3 @@ -9087,6 +10350,7 @@ endseg beginseg name "kakusiana_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakusiana/kakusiana_room_6.o" number 3 @@ -9094,6 +10358,7 @@ endseg beginseg name "kakusiana_room_7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakusiana/kakusiana_room_7.o" number 3 @@ -9101,6 +10366,7 @@ endseg beginseg name "kakusiana_room_8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakusiana/kakusiana_room_8.o" number 3 @@ -9108,6 +10374,7 @@ endseg beginseg name "kakusiana_room_9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakusiana/kakusiana_room_9.o" number 3 @@ -9115,6 +10382,7 @@ endseg beginseg name "kakusiana_room_10" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakusiana/kakusiana_room_10.o" number 3 @@ -9122,6 +10390,7 @@ endseg beginseg name "kakusiana_room_11" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakusiana/kakusiana_room_11.o" number 3 @@ -9129,6 +10398,7 @@ endseg beginseg name "kakusiana_room_12" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakusiana/kakusiana_room_12.o" number 3 @@ -9136,6 +10406,7 @@ endseg beginseg name "kakusiana_room_13" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakusiana/kakusiana_room_13.o" number 3 @@ -9143,6 +10414,7 @@ endseg beginseg name "entra_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/entra/entra_scene.o" number 2 @@ -9150,6 +10422,7 @@ endseg beginseg name "entra_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/entra/entra_room_0.o" number 3 @@ -9157,6 +10430,7 @@ endseg beginseg name "moribossroom_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/moribossroom/moribossroom_scene.o" number 2 @@ -9164,6 +10438,7 @@ endseg beginseg name "moribossroom_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/moribossroom/moribossroom_room_0.o" number 3 @@ -9171,6 +10446,7 @@ endseg beginseg name "moribossroom_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/moribossroom/moribossroom_room_1.o" number 3 @@ -9178,6 +10454,7 @@ endseg beginseg name "syatekijyou_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/syatekijyou/syatekijyou_scene.o" number 2 @@ -9185,6 +10462,7 @@ endseg beginseg name "syatekijyou_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/syatekijyou/syatekijyou_room_0.o" number 3 @@ -9192,6 +10470,7 @@ endseg beginseg name "shop1_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/shop1/shop1_scene.o" number 2 @@ -9199,6 +10478,7 @@ endseg beginseg name "shop1_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/shop1/shop1_room_0.o" number 3 @@ -9206,6 +10486,7 @@ endseg beginseg name "hairal_niwa_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.o" number 2 @@ -9213,6 +10494,7 @@ endseg beginseg name "hairal_niwa_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.o" number 3 @@ -9220,6 +10502,7 @@ endseg beginseg name "ganon_tou_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.o" number 2 @@ -9227,6 +10510,7 @@ endseg beginseg name "ganon_tou_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.o" number 3 @@ -9248,6 +10532,7 @@ endseg beginseg name "market_alley_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/market_alley/market_alley_scene.o" number 2 @@ -9255,6 +10540,7 @@ endseg beginseg name "market_alley_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/market_alley/market_alley_room_0.o" number 3 @@ -9262,6 +10548,7 @@ endseg beginseg name "spot20_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot20/spot20_scene.o" number 2 @@ -9269,6 +10556,7 @@ endseg beginseg name "spot20_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/spot20/spot20_room_0.o" number 3 @@ -9276,6 +10564,7 @@ endseg beginseg name "market_ruins_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/market_ruins/market_ruins_scene.o" number 2 @@ -9283,6 +10572,7 @@ endseg beginseg name "market_ruins_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/market_ruins/market_ruins_room_0.o" number 3 @@ -9290,6 +10580,7 @@ endseg beginseg name "entra_n_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/entra_n/entra_n_scene.o" number 2 @@ -9297,6 +10588,7 @@ endseg beginseg name "entra_n_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/entra_n/entra_n_room_0.o" number 3 @@ -9304,6 +10596,7 @@ endseg beginseg name "enrui_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/enrui/enrui_scene.o" number 2 @@ -9311,6 +10604,7 @@ endseg beginseg name "enrui_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/enrui/enrui_room_0.o" number 3 @@ -9318,6 +10612,7 @@ endseg beginseg name "market_alley_n_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/market_alley_n/market_alley_n_scene.o" number 2 @@ -9325,6 +10620,7 @@ endseg beginseg name "market_alley_n_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/market_alley_n/market_alley_n_room_0.o" number 3 @@ -9332,6 +10628,7 @@ endseg beginseg name "hiral_demo_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/hiral_demo/hiral_demo_scene.o" number 2 @@ -9339,6 +10636,7 @@ endseg beginseg name "hiral_demo_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/hiral_demo/hiral_demo_room_0.o" number 3 @@ -9346,6 +10644,7 @@ endseg beginseg name "kokiri_home3_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/kokiri_home3/kokiri_home3_scene.o" number 2 @@ -9353,6 +10652,7 @@ endseg beginseg name "kokiri_home3_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/kokiri_home3/kokiri_home3_room_0.o" number 3 @@ -9360,6 +10660,7 @@ endseg beginseg name "malon_stable_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/malon_stable/malon_stable_scene.o" number 2 @@ -9367,6 +10668,7 @@ endseg beginseg name "malon_stable_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/malon_stable/malon_stable_room_0.o" number 3 @@ -9374,6 +10676,7 @@ endseg beginseg name "kakariko_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/kakariko/kakariko_scene.o" number 2 @@ -9381,6 +10684,7 @@ endseg beginseg name "kakariko_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/kakariko/kakariko_room_0.o" number 3 @@ -9388,6 +10692,7 @@ endseg beginseg name "bdan_boss_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan_boss/bdan_boss_scene.o" number 2 @@ -9395,6 +10700,7 @@ endseg beginseg name "bdan_boss_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan_boss/bdan_boss_room_0.o" number 3 @@ -9402,6 +10708,7 @@ endseg beginseg name "bdan_boss_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/bdan_boss/bdan_boss_room_1.o" number 3 @@ -9409,6 +10716,7 @@ endseg beginseg name "FIRE_bs_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/FIRE_bs/FIRE_bs_scene.o" number 2 @@ -9416,6 +10724,7 @@ endseg beginseg name "FIRE_bs_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.o" number 3 @@ -9423,6 +10732,7 @@ endseg beginseg name "FIRE_bs_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.o" number 3 @@ -9430,6 +10740,7 @@ endseg beginseg name "hut_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hut/hut_scene.o" number 2 @@ -9437,6 +10748,7 @@ endseg beginseg name "hut_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hut/hut_room_0.o" number 3 @@ -9444,6 +10756,7 @@ endseg beginseg name "daiyousei_izumi_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.o" number 2 @@ -9451,6 +10764,7 @@ endseg beginseg name "daiyousei_izumi_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.o" number 3 @@ -9458,6 +10772,7 @@ endseg beginseg name "hakaana_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/hakaana/hakaana_scene.o" number 2 @@ -9465,6 +10780,7 @@ endseg beginseg name "hakaana_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/hakaana/hakaana_room_0.o" number 3 @@ -9472,6 +10788,7 @@ endseg beginseg name "yousei_izumi_tate_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.o" number 2 @@ -9479,6 +10796,7 @@ endseg beginseg name "yousei_izumi_tate_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.o" number 3 @@ -9486,6 +10804,7 @@ endseg beginseg name "yousei_izumi_yoko_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.o" number 2 @@ -9493,6 +10812,7 @@ endseg beginseg name "yousei_izumi_yoko_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.o" number 3 @@ -9500,6 +10820,7 @@ endseg beginseg name "golon_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/golon/golon_scene.o" number 2 @@ -9507,6 +10828,7 @@ endseg beginseg name "golon_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/golon/golon_room_0.o" number 3 @@ -9514,6 +10836,7 @@ endseg beginseg name "zoora_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/zoora/zoora_scene.o" number 2 @@ -9521,6 +10844,7 @@ endseg beginseg name "zoora_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/zoora/zoora_room_0.o" number 3 @@ -9528,6 +10852,7 @@ endseg beginseg name "drag_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/drag/drag_scene.o" number 2 @@ -9535,6 +10860,7 @@ endseg beginseg name "drag_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/drag/drag_room_0.o" number 3 @@ -9542,6 +10868,7 @@ endseg beginseg name "alley_shop_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/alley_shop/alley_shop_scene.o" number 2 @@ -9549,6 +10876,7 @@ endseg beginseg name "alley_shop_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/alley_shop/alley_shop_room_0.o" number 3 @@ -9556,6 +10884,7 @@ endseg beginseg name "night_shop_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/night_shop/night_shop_scene.o" number 2 @@ -9563,6 +10892,7 @@ endseg beginseg name "night_shop_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/night_shop/night_shop_room_0.o" number 3 @@ -9570,6 +10900,7 @@ endseg beginseg name "impa_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/impa/impa_scene.o" number 2 @@ -9577,6 +10908,7 @@ endseg beginseg name "impa_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/impa/impa_room_0.o" number 3 @@ -9584,6 +10916,7 @@ endseg beginseg name "labo_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/labo/labo_scene.o" number 2 @@ -9591,6 +10924,7 @@ endseg beginseg name "labo_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/labo/labo_room_0.o" number 3 @@ -9598,6 +10932,7 @@ endseg beginseg name "tent_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/tent/tent_scene.o" number 2 @@ -9605,6 +10940,7 @@ endseg beginseg name "tent_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/tent/tent_room_0.o" number 3 @@ -9612,6 +10948,7 @@ endseg beginseg name "nakaniwa_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/nakaniwa/nakaniwa_scene.o" number 2 @@ -9619,6 +10956,7 @@ endseg beginseg name "nakaniwa_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/nakaniwa/nakaniwa_room_0.o" number 3 @@ -9626,6 +10964,7 @@ endseg beginseg name "ddan_boss_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.o" number 2 @@ -9633,6 +10972,7 @@ endseg beginseg name "ddan_boss_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.o" number 3 @@ -9640,6 +10980,7 @@ endseg beginseg name "ddan_boss_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.o" number 3 @@ -9647,6 +10988,7 @@ endseg beginseg name "ydan_boss_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan_boss/ydan_boss_scene.o" number 2 @@ -9654,6 +10996,7 @@ endseg beginseg name "ydan_boss_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan_boss/ydan_boss_room_0.o" number 3 @@ -9661,6 +11004,7 @@ endseg beginseg name "ydan_boss_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ydan_boss/ydan_boss_room_1.o" number 3 @@ -9668,6 +11012,7 @@ endseg beginseg name "HAKAdan_bs_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.o" number 2 @@ -9675,6 +11020,7 @@ endseg beginseg name "HAKAdan_bs_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.o" number 3 @@ -9682,6 +11028,7 @@ endseg beginseg name "HAKAdan_bs_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.o" number 3 @@ -9689,6 +11036,7 @@ endseg beginseg name "MIZUsin_bs_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.o" number 2 @@ -9696,6 +11044,7 @@ endseg beginseg name "MIZUsin_bs_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.o" number 3 @@ -9703,6 +11052,7 @@ endseg beginseg name "MIZUsin_bs_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.o" number 3 @@ -9710,6 +11060,7 @@ endseg beginseg name "ganon_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon/ganon_scene.o" number 2 @@ -9717,6 +11068,7 @@ endseg beginseg name "ganon_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon/ganon_room_0.o" number 3 @@ -9724,6 +11076,7 @@ endseg beginseg name "ganon_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon/ganon_room_1.o" number 3 @@ -9731,6 +11084,7 @@ endseg beginseg name "ganon_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon/ganon_room_2.o" number 3 @@ -9738,6 +11092,7 @@ endseg beginseg name "ganon_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon/ganon_room_3.o" number 3 @@ -9745,6 +11100,7 @@ endseg beginseg name "ganon_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon/ganon_room_4.o" number 3 @@ -9752,6 +11108,7 @@ endseg beginseg name "ganon_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon/ganon_room_5.o" number 3 @@ -9759,6 +11116,7 @@ endseg beginseg name "ganon_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon/ganon_room_6.o" number 3 @@ -9766,6 +11124,7 @@ endseg beginseg name "ganon_room_7" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon/ganon_room_7.o" number 3 @@ -9773,6 +11132,7 @@ endseg beginseg name "ganon_room_8" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon/ganon_room_8.o" number 3 @@ -9780,6 +11140,7 @@ endseg beginseg name "ganon_room_9" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon/ganon_room_9.o" number 3 @@ -9787,6 +11148,7 @@ endseg beginseg name "ganon_boss_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_boss/ganon_boss_scene.o" number 2 @@ -9794,6 +11156,7 @@ endseg beginseg name "ganon_boss_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_boss/ganon_boss_room_0.o" number 3 @@ -9801,6 +11164,7 @@ endseg beginseg name "jyasinboss_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.o" number 2 @@ -9808,6 +11172,7 @@ endseg beginseg name "jyasinboss_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinboss/jyasinboss_room_0.o" number 3 @@ -9815,6 +11180,7 @@ endseg beginseg name "jyasinboss_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinboss/jyasinboss_room_1.o" number 3 @@ -9822,6 +11188,7 @@ endseg beginseg name "jyasinboss_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.o" number 3 @@ -9829,6 +11196,7 @@ endseg beginseg name "jyasinboss_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/jyasinboss/jyasinboss_room_3.o" number 3 @@ -9836,6 +11204,7 @@ endseg beginseg name "kokiri_home4_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/kokiri_home4/kokiri_home4_scene.o" number 2 @@ -9843,6 +11212,7 @@ endseg beginseg name "kokiri_home4_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/kokiri_home4/kokiri_home4_room_0.o" number 3 @@ -9850,6 +11220,7 @@ endseg beginseg name "kokiri_home5_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/kokiri_home5/kokiri_home5_scene.o" number 2 @@ -9857,6 +11228,7 @@ endseg beginseg name "kokiri_home5_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/kokiri_home5/kokiri_home5_room_0.o" number 3 @@ -9864,6 +11236,7 @@ endseg beginseg name "ganon_final_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_final/ganon_final_scene.o" number 2 @@ -9871,6 +11244,7 @@ endseg beginseg name "ganon_final_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_final/ganon_final_room_0.o" number 3 @@ -9878,6 +11252,7 @@ endseg beginseg name "kakariko3_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakariko3/kakariko3_scene.o" number 2 @@ -9885,6 +11260,7 @@ endseg beginseg name "kakariko3_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kakariko3/kakariko3_room_0.o" number 3 @@ -9906,6 +11282,7 @@ endseg beginseg name "hakasitarelay_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.o" number 2 @@ -9913,6 +11290,7 @@ endseg beginseg name "hakasitarelay_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_0.o" number 3 @@ -9920,6 +11298,7 @@ endseg beginseg name "hakasitarelay_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_1.o" number 3 @@ -9927,6 +11306,7 @@ endseg beginseg name "hakasitarelay_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_2.o" number 3 @@ -9934,6 +11314,7 @@ endseg beginseg name "hakasitarelay_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_3.o" number 3 @@ -9941,6 +11322,7 @@ endseg beginseg name "hakasitarelay_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_4.o" number 3 @@ -9948,6 +11330,7 @@ endseg beginseg name "hakasitarelay_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_5.o" number 3 @@ -9955,6 +11338,7 @@ endseg beginseg name "hakasitarelay_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_6.o" number 3 @@ -9962,6 +11346,7 @@ endseg beginseg name "shrine_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/shrine/shrine_scene.o" number 2 @@ -9969,6 +11354,7 @@ endseg beginseg name "shrine_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/shrine/shrine_room_0.o" number 3 @@ -9976,6 +11362,7 @@ endseg beginseg name "turibori_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/turibori/turibori_scene.o" number 2 @@ -9983,6 +11370,7 @@ endseg beginseg name "turibori_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/turibori/turibori_room_0.o" number 3 @@ -9990,6 +11378,7 @@ endseg beginseg name "shrine_n_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/shrine_n/shrine_n_scene.o" number 2 @@ -9997,6 +11386,7 @@ endseg beginseg name "shrine_n_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/shrine_n/shrine_n_room_0.o" number 3 @@ -10004,6 +11394,7 @@ endseg beginseg name "shrine_r_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/shrine_r/shrine_r_scene.o" number 2 @@ -10011,6 +11402,7 @@ endseg beginseg name "shrine_r_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/shrine_r/shrine_r_room_0.o" number 3 @@ -10018,6 +11410,7 @@ endseg beginseg name "hakaana2_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/hakaana2/hakaana2_scene.o" number 2 @@ -10025,6 +11418,7 @@ endseg beginseg name "hakaana2_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/hakaana2/hakaana2_room_0.o" number 3 @@ -10032,6 +11426,7 @@ endseg beginseg name "gerudoway_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/gerudoway/gerudoway_scene.o" number 2 @@ -10039,6 +11434,7 @@ endseg beginseg name "gerudoway_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/gerudoway/gerudoway_room_0.o" number 3 @@ -10046,6 +11442,7 @@ endseg beginseg name "gerudoway_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/gerudoway/gerudoway_room_1.o" number 3 @@ -10053,6 +11450,7 @@ endseg beginseg name "gerudoway_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/gerudoway/gerudoway_room_2.o" number 3 @@ -10060,6 +11458,7 @@ endseg beginseg name "gerudoway_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/gerudoway/gerudoway_room_3.o" number 3 @@ -10067,6 +11466,7 @@ endseg beginseg name "gerudoway_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/gerudoway/gerudoway_room_4.o" number 3 @@ -10074,6 +11474,7 @@ endseg beginseg name "gerudoway_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/gerudoway/gerudoway_room_5.o" number 3 @@ -10081,6 +11482,7 @@ endseg beginseg name "hairal_niwa_n_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.o" number 2 @@ -10088,6 +11490,7 @@ endseg beginseg name "hairal_niwa_n_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.o" number 3 @@ -10095,6 +11498,7 @@ endseg beginseg name "bowling_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/bowling/bowling_scene.o" number 2 @@ -10102,6 +11506,7 @@ endseg beginseg name "bowling_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/bowling/bowling_room_0.o" number 3 @@ -10109,6 +11514,7 @@ endseg beginseg name "hakaana_ouke_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.o" number 2 @@ -10116,6 +11522,7 @@ endseg beginseg name "hakaana_ouke_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.o" number 3 @@ -10123,6 +11530,7 @@ endseg beginseg name "hakaana_ouke_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.o" number 3 @@ -10130,6 +11538,7 @@ endseg beginseg name "hakaana_ouke_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.o" number 3 @@ -10137,6 +11546,7 @@ endseg beginseg name "hylia_labo_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hylia_labo/hylia_labo_scene.o" number 2 @@ -10144,6 +11554,7 @@ endseg beginseg name "hylia_labo_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/hylia_labo/hylia_labo_room_0.o" number 3 @@ -10151,6 +11562,7 @@ endseg beginseg name "souko_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/souko/souko_scene.o" number 2 @@ -10158,6 +11570,7 @@ endseg beginseg name "souko_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/souko/souko_room_0.o" number 3 @@ -10165,6 +11578,7 @@ endseg beginseg name "souko_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/souko/souko_room_1.o" number 3 @@ -10172,6 +11586,7 @@ endseg beginseg name "souko_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/overworld/souko/souko_room_2.o" number 3 @@ -10179,6 +11594,7 @@ endseg beginseg name "miharigoya_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/miharigoya/miharigoya_scene.o" number 2 @@ -10186,6 +11602,7 @@ endseg beginseg name "miharigoya_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/miharigoya/miharigoya_room_0.o" number 3 @@ -10193,6 +11610,7 @@ endseg beginseg name "mahouya_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/mahouya/mahouya_scene.o" number 2 @@ -10200,6 +11618,7 @@ endseg beginseg name "mahouya_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/mahouya/mahouya_room_0.o" number 3 @@ -10207,6 +11626,7 @@ endseg beginseg name "takaraya_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/takaraya/takaraya_scene.o" number 2 @@ -10214,6 +11634,7 @@ endseg beginseg name "takaraya_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/takaraya/takaraya_room_0.o" number 3 @@ -10221,6 +11642,7 @@ endseg beginseg name "takaraya_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/takaraya/takaraya_room_1.o" number 3 @@ -10228,6 +11650,7 @@ endseg beginseg name "takaraya_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/takaraya/takaraya_room_2.o" number 3 @@ -10235,6 +11658,7 @@ endseg beginseg name "takaraya_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/takaraya/takaraya_room_3.o" number 3 @@ -10242,6 +11666,7 @@ endseg beginseg name "takaraya_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/takaraya/takaraya_room_4.o" number 3 @@ -10249,6 +11674,7 @@ endseg beginseg name "takaraya_room_5" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/takaraya/takaraya_room_5.o" number 3 @@ -10256,6 +11682,7 @@ endseg beginseg name "takaraya_room_6" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/indoors/takaraya/takaraya_room_6.o" number 3 @@ -10263,6 +11690,7 @@ endseg beginseg name "ganon_sonogo_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.o" number 2 @@ -10270,6 +11698,7 @@ endseg beginseg name "ganon_sonogo_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.o" number 3 @@ -10277,6 +11706,7 @@ endseg beginseg name "ganon_sonogo_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.o" number 3 @@ -10284,6 +11714,7 @@ endseg beginseg name "ganon_sonogo_room_2" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.o" number 3 @@ -10291,6 +11722,7 @@ endseg beginseg name "ganon_sonogo_room_3" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.o" number 3 @@ -10298,6 +11730,7 @@ endseg beginseg name "ganon_sonogo_room_4" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.o" number 3 @@ -10305,6 +11738,7 @@ endseg beginseg name "ganon_demo_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.o" number 2 @@ -10312,6 +11746,7 @@ endseg beginseg name "ganon_demo_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.o" number 3 @@ -10333,6 +11768,7 @@ endseg beginseg name "face_shop_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/face_shop/face_shop_scene.o" number 2 @@ -10340,6 +11776,7 @@ endseg beginseg name "face_shop_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/shops/face_shop/face_shop_room_0.o" number 3 @@ -10347,6 +11784,7 @@ endseg beginseg name "kinsuta_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kinsuta/kinsuta_scene.o" number 2 @@ -10354,6 +11792,7 @@ endseg beginseg name "kinsuta_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/misc/kinsuta/kinsuta_room_0.o" number 3 @@ -10361,6 +11800,7 @@ endseg beginseg name "ganontikasonogo_scene" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.o" number 2 @@ -10368,6 +11808,7 @@ endseg beginseg name "ganontikasonogo_room_0" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.o" number 3 @@ -10375,6 +11816,7 @@ endseg beginseg name "ganontikasonogo_room_1" + compress romalign 0x1000 include "$(BUILD_DIR)/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.o" number 3 @@ -10396,84 +11838,98 @@ endseg beginseg name "bump_texture_static" + compress romalign 0x1000 include "$(BUILD_DIR)/baserom/bump_texture_static.o" endseg beginseg name "anime_model_1_static" + compress romalign 0x1000 include "$(BUILD_DIR)/baserom/anime_model_1_static.o" endseg beginseg name "anime_model_2_static" + compress romalign 0x1000 include "$(BUILD_DIR)/baserom/anime_model_2_static.o" endseg beginseg name "anime_model_3_static" + compress romalign 0x1000 include "$(BUILD_DIR)/baserom/anime_model_3_static.o" endseg beginseg name "anime_model_4_static" + compress romalign 0x1000 include "$(BUILD_DIR)/baserom/anime_model_4_static.o" endseg beginseg name "anime_model_5_static" + compress romalign 0x1000 include "$(BUILD_DIR)/baserom/anime_model_5_static.o" endseg beginseg name "anime_model_6_static" + compress romalign 0x1000 include "$(BUILD_DIR)/baserom/anime_model_6_static.o" endseg beginseg name "anime_texture_1_static" + compress romalign 0x1000 include "$(BUILD_DIR)/baserom/anime_texture_1_static.o" endseg beginseg name "anime_texture_2_static" + compress romalign 0x1000 include "$(BUILD_DIR)/baserom/anime_texture_2_static.o" endseg beginseg name "anime_texture_3_static" + compress romalign 0x1000 include "$(BUILD_DIR)/baserom/anime_texture_3_static.o" endseg beginseg name "anime_texture_4_static" + compress romalign 0x1000 include "$(BUILD_DIR)/baserom/anime_texture_4_static.o" endseg beginseg name "anime_texture_5_static" + compress romalign 0x1000 include "$(BUILD_DIR)/baserom/anime_texture_5_static.o" endseg beginseg name "anime_texture_6_static" + compress romalign 0x1000 include "$(BUILD_DIR)/baserom/anime_texture_6_static.o" endseg beginseg name "softsprite_matrix_static" + compress romalign 0x1000 include "$(BUILD_DIR)/baserom/softsprite_matrix_static.o" endseg diff --git a/src/code/PreRender.c b/src/code/PreRender.c index fdfea81291..962d148d7e 100644 --- a/src/code/PreRender.c +++ b/src/code/PreRender.c @@ -53,10 +53,10 @@ void PreRender_CopyImage(PreRender* this, Gfx** gfxP, void* img, void* imgDst) { s32 curRow; s32 nRows; - LogUtils_CheckNullPointer("this", this, "../PreRender.c", 215); - LogUtils_CheckNullPointer("glistpp", gfxP, "../PreRender.c", 216); + LOG_UTILS_CHECK_NULL_POINTER("this", this, "../PreRender.c", 215); + LOG_UTILS_CHECK_NULL_POINTER("glistpp", gfxP, "../PreRender.c", 216); gfx = *gfxP; - LogUtils_CheckNullPointer("glistp", gfx, "../PreRender.c", 218); + LOG_UTILS_CHECK_NULL_POINTER("glistp", gfx, "../PreRender.c", 218); gDPPipeSync(gfx++); // Configure the cycle type to COPY mode, disable blending @@ -114,10 +114,10 @@ void PreRender_CopyImageRegionImpl(PreRender* this, Gfx** gfxP) { s32 curRow; s32 nRows; - LogUtils_CheckNullPointer("this", this, "../PreRender.c", 278); - LogUtils_CheckNullPointer("glistpp", gfxP, "../PreRender.c", 279); + LOG_UTILS_CHECK_NULL_POINTER("this", this, "../PreRender.c", 278); + LOG_UTILS_CHECK_NULL_POINTER("glistpp", gfxP, "../PreRender.c", 279); gfx = *gfxP; - LogUtils_CheckNullPointer("glistp", gfx, "../PreRender.c", 281); + LOG_UTILS_CHECK_NULL_POINTER("glistp", gfx, "../PreRender.c", 281); gDPPipeSync(gfx++); // Configure the cycle type to COPY mode, disable blending @@ -177,10 +177,10 @@ void func_800C170C(PreRender* this, Gfx** gfxP, void* buf, void* bufSave, u32 r, s32 curRow; s32 nRows; - LogUtils_CheckNullPointer("this", this, "../PreRender.c", 343); - LogUtils_CheckNullPointer("glistpp", gfxP, "../PreRender.c", 344); + LOG_UTILS_CHECK_NULL_POINTER("this", this, "../PreRender.c", 343); + LOG_UTILS_CHECK_NULL_POINTER("glistpp", gfxP, "../PreRender.c", 344); gfx = *gfxP; - LogUtils_CheckNullPointer("glistp", gfx, "../PreRender.c", 346); + LOG_UTILS_CHECK_NULL_POINTER("glistp", gfx, "../PreRender.c", 346); gDPPipeSync(gfx++); // Set the cycle type to 1-cycle mode to use the color combiner @@ -256,10 +256,10 @@ void PreRender_CoverageRgba16ToI8(PreRender* this, Gfx** gfxP, void* img, void* s32 curRow; s32 nRows; - LogUtils_CheckNullPointer("this", this, "../PreRender.c", 422); - LogUtils_CheckNullPointer("glistpp", gfxP, "../PreRender.c", 423); + LOG_UTILS_CHECK_NULL_POINTER("this", this, "../PreRender.c", 422); + LOG_UTILS_CHECK_NULL_POINTER("glistpp", gfxP, "../PreRender.c", 423); gfx = *gfxP; - LogUtils_CheckNullPointer("glistp", gfx, "../PreRender.c", 425); + LOG_UTILS_CHECK_NULL_POINTER("glistp", gfx, "../PreRender.c", 425); gDPPipeSync(gfx++); gDPSetOtherMode(gfx++, @@ -333,8 +333,8 @@ void PreRender_CoverageRgba16ToI8(PreRender* this, Gfx** gfxP, void* img, void* * Saves zbuf to zbufSave */ void PreRender_SaveZBuffer(PreRender* this, Gfx** gfxP) { - LogUtils_CheckNullPointer("this->zbuf_save", this->zbufSave, "../PreRender.c", 481); - LogUtils_CheckNullPointer("this->zbuf", this->zbuf, "../PreRender.c", 482); + LOG_UTILS_CHECK_NULL_POINTER("this->zbuf_save", this->zbufSave, "../PreRender.c", 481); + LOG_UTILS_CHECK_NULL_POINTER("this->zbuf", this->zbuf, "../PreRender.c", 482); if ((this->zbufSave != NULL) && (this->zbuf != NULL)) { PreRender_CopyImage(this, gfxP, this->zbuf, this->zbufSave); @@ -345,8 +345,8 @@ void PreRender_SaveZBuffer(PreRender* this, Gfx** gfxP) { * Saves fbuf to fbufSave */ void PreRender_SaveFramebuffer(PreRender* this, Gfx** gfxP) { - LogUtils_CheckNullPointer("this->fbuf_save", this->fbufSave, "../PreRender.c", 495); - LogUtils_CheckNullPointer("this->fbuf", this->fbuf, "../PreRender.c", 496); + LOG_UTILS_CHECK_NULL_POINTER("this->fbuf_save", this->fbufSave, "../PreRender.c", 495); + LOG_UTILS_CHECK_NULL_POINTER("this->fbuf", this->fbuf, "../PreRender.c", 496); if ((this->fbufSave != NULL) && (this->fbuf != NULL)) { func_800C1AE8(this, gfxP, this->fbuf, this->fbufSave); @@ -401,7 +401,7 @@ void PreRender_FetchFbufCoverage(PreRender* this, Gfx** gfxP) { */ void PreRender_DrawCoverage(PreRender* this, Gfx** gfxP) { PreRender_FetchFbufCoverage(this, gfxP); - LogUtils_CheckNullPointer("this->cvg_save", this->cvgSave, "../PreRender.c", 532); + LOG_UTILS_CHECK_NULL_POINTER("this->cvg_save", this->cvgSave, "../PreRender.c", 532); if (this->cvgSave != NULL) { PreRender_CoverageRgba16ToI8(this, gfxP, this->fbuf, this->cvgSave); } @@ -426,10 +426,10 @@ void func_800C213C(PreRender* this, Gfx** gfxP) { s32 rtile = 1; if (this->cvgSave != NULL) { - LogUtils_CheckNullPointer("this", this, "../PreRender.c", 563); - LogUtils_CheckNullPointer("glistpp", gfxP, "../PreRender.c", 564); + LOG_UTILS_CHECK_NULL_POINTER("this", this, "../PreRender.c", 563); + LOG_UTILS_CHECK_NULL_POINTER("glistpp", gfxP, "../PreRender.c", 564); gfx = *gfxP; - LogUtils_CheckNullPointer("glistp", gfx, "../PreRender.c", 566); + LOG_UTILS_CHECK_NULL_POINTER("glistp", gfx, "../PreRender.c", 566); gDPPipeSync(gfx++); gDPSetEnvColor(gfx++, 255, 255, 255, 32); diff --git a/src/code/game.c b/src/code/game.c index 91f58733b7..e73d01adda 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -415,7 +415,7 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g PRINTF("init 処理時間 %d us\n", OS_CYCLES_TO_USEC(endTime - startTime)); startTime = endTime; - LogUtils_CheckNullPointer("this->cleanup", gameState->destroy, "../game.c", 1088); + LOG_UTILS_CHECK_NULL_POINTER("this->cleanup", gameState->destroy, "../game.c", 1088); VisCvg_Init(&sVisCvg); VisZBuf_Init(&sVisZBuf); VisMono_Init(&sVisMono); @@ -440,7 +440,7 @@ void GameState_Destroy(GameState* gameState) { AudioMgr_StopAllSfx(); func_800F3054(); osRecvMesg(&gameState->gfxCtx->queue, NULL, OS_MESG_BLOCK); - LogUtils_CheckNullPointer("this->cleanup", gameState->destroy, "../game.c", 1139); + LOG_UTILS_CHECK_NULL_POINTER("this->cleanup", gameState->destroy, "../game.c", 1139); if (gameState->destroy != NULL) { gameState->destroy(gameState); } diff --git a/src/code/gamealloc.c b/src/code/gamealloc.c index 59f280acac..ee981d2be4 100644 --- a/src/code/gamealloc.c +++ b/src/code/gamealloc.c @@ -49,8 +49,8 @@ void GameAlloc_Free(GameAlloc* this, void* data) { if (data != NULL) { ptr = &((GameAllocEntry*)data)[-1]; - LogUtils_CheckNullPointer("ptr->prev", ptr->prev, "../gamealloc.c", 120); - LogUtils_CheckNullPointer("ptr->next", ptr->next, "../gamealloc.c", 121); + LOG_UTILS_CHECK_NULL_POINTER("ptr->prev", ptr->prev, "../gamealloc.c", 120); + LOG_UTILS_CHECK_NULL_POINTER("ptr->next", ptr->next, "../gamealloc.c", 121); ptr->prev->next = ptr->next; ptr->next->prev = ptr->prev; this->head = this->base.prev; diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c index 271cd9f006..b258bc9652 100644 --- a/src/code/irqmgr.c +++ b/src/code/irqmgr.c @@ -59,9 +59,9 @@ u32 sIrqMgrRetraceCount = 0; void IrqMgr_AddClient(IrqMgr* irqMgr, IrqMgrClient* client, OSMesgQueue* msgQueue) { OSIntMask prevInt; - LogUtils_CheckNullPointer("this", irqMgr, "../irqmgr.c", 96); - LogUtils_CheckNullPointer("c", client, "../irqmgr.c", 97); - LogUtils_CheckNullPointer("msgQ", msgQueue, "../irqmgr.c", 98); + LOG_UTILS_CHECK_NULL_POINTER("this", irqMgr, "../irqmgr.c", 96); + LOG_UTILS_CHECK_NULL_POINTER("c", client, "../irqmgr.c", 97); + LOG_UTILS_CHECK_NULL_POINTER("msgQ", msgQueue, "../irqmgr.c", 98); prevInt = osSetIntMask(OS_IM_NONE); @@ -85,8 +85,8 @@ void IrqMgr_RemoveClient(IrqMgr* irqMgr, IrqMgrClient* client) { IrqMgrClient* lastClient = NULL; OSIntMask prevInt; - LogUtils_CheckNullPointer("this", irqMgr, "../irqmgr.c", 129); - LogUtils_CheckNullPointer("c", client, "../irqmgr.c", 130); + LOG_UTILS_CHECK_NULL_POINTER("this", irqMgr, "../irqmgr.c", 129); + LOG_UTILS_CHECK_NULL_POINTER("c", client, "../irqmgr.c", 130); // Disable interrupts to prevent a thread context switch while the linked list is modified prevInt = osSetIntMask(OS_IM_NONE); @@ -290,8 +290,8 @@ void IrqMgr_ThreadEntry(void* arg) { } void IrqMgr_Init(IrqMgr* irqMgr, void* stack, OSPri pri, u8 retraceCount) { - LogUtils_CheckNullPointer("this", irqMgr, "../irqmgr.c", 346); - LogUtils_CheckNullPointer("stack", stack, "../irqmgr.c", 347); + LOG_UTILS_CHECK_NULL_POINTER("this", irqMgr, "../irqmgr.c", 346); + LOG_UTILS_CHECK_NULL_POINTER("stack", stack, "../irqmgr.c", 347); irqMgr->clients = NULL; // Messages to send to each client message queue on each interrupt event diff --git a/src/code/mtxuty-cvt.c b/src/code/mtxuty-cvt.c index 18c7a36f3a..1cad0f9091 100644 --- a/src/code/mtxuty-cvt.c +++ b/src/code/mtxuty-cvt.c @@ -4,8 +4,8 @@ void MtxConv_F2L(Mtx* m1, MtxF* m2) { s32 i; s32 j; - LogUtils_CheckNullPointer("m1", m1, "../mtxuty-cvt.c", 31); - LogUtils_CheckNullPointer("m2", m2, "../mtxuty-cvt.c", 32); + LOG_UTILS_CHECK_NULL_POINTER("m1", m1, "../mtxuty-cvt.c", 31); + LOG_UTILS_CHECK_NULL_POINTER("m2", m2, "../mtxuty-cvt.c", 32); for (i = 0; i < 4; i++) { for (j = 0; j < 4; j++) { @@ -18,7 +18,7 @@ void MtxConv_F2L(Mtx* m1, MtxF* m2) { } void MtxConv_L2F(MtxF* m1, Mtx* m2) { - LogUtils_CheckNullPointer("m1", m1, "../mtxuty-cvt.c", 55); - LogUtils_CheckNullPointer("m2", m2, "../mtxuty-cvt.c", 56); + LOG_UTILS_CHECK_NULL_POINTER("m1", m1, "../mtxuty-cvt.c", 55); + LOG_UTILS_CHECK_NULL_POINTER("m2", m2, "../mtxuty-cvt.c", 56); guMtxL2F(m1, m2); } diff --git a/src/code/padmgr.c b/src/code/padmgr.c index eade378f00..7258f0b7ee 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -477,7 +477,7 @@ void PadMgr_ThreadEntry(PadMgr* padMgr) { } osRecvMesg(&padMgr->interruptQueue, (OSMesg*)&msg, OS_MESG_BLOCK); - LogUtils_CheckNullPointer("msg", msg, "../padmgr.c", 563); + LOG_UTILS_CHECK_NULL_POINTER("msg", msg, "../padmgr.c", 563); switch (*msg) { case OS_SC_RETRACE_MSG: diff --git a/src/code/sched.c b/src/code/sched.c index b5b30cc2e2..444e01e96f 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -58,7 +58,7 @@ OSTime sRDPTimeStart; void Sched_SwapFrameBufferImpl(CfbInfo* cfbInfo) { u16 width; - LogUtils_CheckValidPointer("cfbinfo->swapbuffer", cfbInfo->swapBuffer, "../sched.c", 340); + LOG_UTILS_CHECK_VALID_POINTER("cfbinfo->swapbuffer", cfbInfo->swapBuffer, "../sched.c", 340); if (cfbInfo->swapBuffer != NULL) { // Register the swapbuffer to display on next VI @@ -330,7 +330,7 @@ void Sched_SetNextFramebufferFromTask(Scheduler* sc, OSScTask* task) { if (sc->pendingSwapBuf1 == NULL) { sc->pendingSwapBuf1 = task->framebuffer; - LogUtils_CheckValidPointer("sc->pending_swapbuffer1", sc->pendingSwapBuf1, "../sched.c", 618); + LOG_UTILS_CHECK_VALID_POINTER("sc->pending_swapbuffer1", sc->pendingSwapBuf1, "../sched.c", 618); if (sc->curBuf == NULL || sc->curBuf->updateTimer <= 0) { Sched_SwapFrameBuffer(sc, task->framebuffer); diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index d4da6770bb..086c3ea70c 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -92,7 +92,7 @@ typedef struct { gDPPipeSync(gfx) void SpeedMeter_InitImpl(SpeedMeter* this, u32 x, u32 y) { - LogUtils_CheckNullPointer("this", this, "../speed_meter.c", 181); + LOG_UTILS_CHECK_NULL_POINTER("this", this, "../speed_meter.c", 181); this->x = x; this->y = y; } diff --git a/src/code/z_actor.c b/src/code/z_actor.c index fd6bb0e716..73793558af 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -915,16 +915,25 @@ void Actor_UpdatePosByAnimation(Actor* actor, SkelAnime* skelAnime) { actor->world.pos.z += posDiff.z * actor->scale.z; } -s16 Actor_WorldYawTowardActor(Actor* actorA, Actor* actorB) { - return Math_Vec3f_Yaw(&actorA->world.pos, &actorB->world.pos); +/** + * @return Yaw towards `target` for `origin`, using world positions. + */ +s16 Actor_WorldYawTowardActor(Actor* origin, Actor* target) { + return Math_Vec3f_Yaw(&origin->world.pos, &target->world.pos); } -s16 Actor_FocusYawTowardActor(Actor* actorA, Actor* actorB) { - return Math_Vec3f_Yaw(&actorA->focus.pos, &actorB->focus.pos); +/** + * @return Yaw towards `target` for `origin`, using focus positions. + */ +s16 Actor_FocusYawTowardActor(Actor* origin, Actor* target) { + return Math_Vec3f_Yaw(&origin->focus.pos, &target->focus.pos); } -s16 Actor_WorldYawTowardPoint(Actor* actor, Vec3f* refPoint) { - return Math_Vec3f_Yaw(&actor->world.pos, refPoint); +/** + * @return Yaw towards `point` for `origin`. + */ +s16 Actor_WorldYawTowardPoint(Actor* origin, Vec3f* point) { + return Math_Vec3f_Yaw(&origin->world.pos, point); } s16 Actor_WorldPitchTowardActor(Actor* actorA, Actor* actorB) { @@ -2302,7 +2311,8 @@ void Actor_Draw(PlayState* play, Actor* actor) { lights = LightContext_NewLights(&play->lightCtx, play->state.gfxCtx); - Lights_BindAll(lights, play->lightCtx.listHead, (actor->flags & ACTOR_FLAG_22) ? NULL : &actor->world.pos); + Lights_BindAll(lights, play->lightCtx.listHead, + (actor->flags & ACTOR_FLAG_IGNORE_POINT_LIGHTS) ? NULL : &actor->world.pos); Lights_Draw(lights, play->state.gfxCtx); if (actor->flags & ACTOR_FLAG_IGNORE_QUAKE) { @@ -2552,7 +2562,7 @@ void func_800315AC(PlayState* play, ActorContext* actorCtx) { if ((HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(71) == 0)) { if ((actor->init == NULL) && (actor->draw != NULL) && (actor->flags & (ACTOR_FLAG_5 | ACTOR_FLAG_6))) { - if ((actor->flags & ACTOR_FLAG_7) && + if ((actor->flags & ACTOR_FLAG_REACT_TO_LENS) && ((play->roomCtx.curRoom.lensMode == LENS_MODE_HIDE_ACTORS) || play->actorCtx.lensActive || (actor->room != play->roomCtx.curRoom.num))) { ASSERT(invisibleActorCounter < INVISIBLE_ACTOR_MAX, diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c index ab75c4be86..35a6bc4a7c 100644 --- a/src/code/z_kaleido_manager.c +++ b/src/code/z_kaleido_manager.c @@ -17,7 +17,7 @@ KaleidoMgrOverlay* gKaleidoMgrCurOvl = NULL; u8 gBossMarkState = 0; void KaleidoManager_LoadOvl(KaleidoMgrOverlay* ovl) { - LogUtils_CheckNullPointer("KaleidoArea_allocp", sKaleidoAreaPtr, "../z_kaleido_manager.c", 99); + LOG_UTILS_CHECK_NULL_POINTER("KaleidoArea_allocp", sKaleidoAreaPtr, "../z_kaleido_manager.c", 99); ovl->loadedRamAddr = sKaleidoAreaPtr; Overlay_Load(ovl->vromStart, ovl->vromEnd, ovl->vramStart, ovl->vramEnd, ovl->loadedRamAddr); @@ -58,7 +58,7 @@ void KaleidoManager_Init(PlayState* play) { PRINTF(VT_RST); sKaleidoAreaPtr = GAME_STATE_ALLOC(&play->state, largestSize, "../z_kaleido_manager.c", 150); - LogUtils_CheckNullPointer("KaleidoArea_allocp", sKaleidoAreaPtr, "../z_kaleido_manager.c", 151); + LOG_UTILS_CHECK_NULL_POINTER("KaleidoArea_allocp", sKaleidoAreaPtr, "../z_kaleido_manager.c", 151); PRINTF(VT_FGCOL(GREEN)); PRINTF("KaleidoArea %08x - %08x\n", sKaleidoAreaPtr, (uintptr_t)sKaleidoAreaPtr + largestSize); diff --git a/src/code/z_lib.c b/src/code/z_lib.c index fbea9dce45..cc665fd0c7 100644 --- a/src/code/z_lib.c +++ b/src/code/z_lib.c @@ -300,9 +300,14 @@ f32 Math_Vec3f_DiffY(Vec3f* a, Vec3f* b) { return b->y - a->y; } -s16 Math_Vec3f_Yaw(Vec3f* a, Vec3f* b) { - f32 dx = b->x - a->x; - f32 dz = b->z - a->z; +/** + * @param origin Position of the origin, the location from which to look at the target `point` + * @param point Position of the target point, in the same space as `origin` + * @return The yaw towards `point` when at `origin`, assuming +z is forwards. + */ +s16 Math_Vec3f_Yaw(Vec3f* origin, Vec3f* point) { + f32 dx = point->x - origin->x; + f32 dz = point->z - origin->z; return Math_Atan2S(dz, dx); } diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 3e805ea0c3..47d3d2bdae 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -58,7 +58,7 @@ void MapMark_Init(PlayState* play) { u32 overlaySize = (uintptr_t)overlay->vramEnd - (uintptr_t)overlay->vramStart; overlay->loadedRamAddr = GAME_STATE_ALLOC(&play->state, overlaySize, "../z_map_mark.c", 235); - LogUtils_CheckNullPointer("dlftbl->allocp", overlay->loadedRamAddr, "../z_map_mark.c", 236); + LOG_UTILS_CHECK_NULL_POINTER("dlftbl->allocp", overlay->loadedRamAddr, "../z_map_mark.c", 236); Overlay_Load(overlay->vromStart, overlay->vromEnd, overlay->vramStart, overlay->vramEnd, overlay->loadedRamAddr); diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index b8e3c2cba8..41834bacec 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -20,8 +20,11 @@ Vec3f OnePointCutscene_AddVecGeoToVec3f(Vec3f* a, VecGeo* geo) { return sum; } -s16 OnePointCutscene_Vec3fYaw(Vec3f* vec1, Vec3f* vec2) { - return CAM_DEG_TO_BINANG(RAD_TO_DEG(Math_FAtan2F(vec2->x - vec1->x, vec2->z - vec1->z))); +/** + * @see Math_Vec3f_Yaw + */ +s16 OnePointCutscene_Vec3fYaw(Vec3f* origin, Vec3f* point) { + return CAM_DEG_TO_BINANG(RAD_TO_DEG(Math_FAtan2F(point->x - origin->x, point->z - origin->z))); } void OnePointCutscene_Vec3sToVec3f(Vec3f* src, Vec3s* dst) { diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 19d2e98a6f..d90fbc3b1d 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -483,6 +483,26 @@ void Scene_CommandMiscSettings(PlayState* play, SceneCmd* cmd) { } } +void Scene_SetTransitionForNextEntrance(PlayState* play) { + s16 entranceIndex; + + if (!IS_DAY) { + if (!LINK_IS_ADULT) { + entranceIndex = play->nextEntranceIndex + 1; + } else { + entranceIndex = play->nextEntranceIndex + 3; + } + } else { + if (!LINK_IS_ADULT) { + entranceIndex = play->nextEntranceIndex; + } else { + entranceIndex = play->nextEntranceIndex + 2; + } + } + + play->transitionType = ENTRANCE_INFO_START_TRANS_TYPE(gEntranceTable[entranceIndex].field); +} + void (*gSceneCmdHandlers[SCENE_CMD_ID_MAX])(PlayState*, SceneCmd*) = { Scene_CommandPlayerEntryList, // SCENE_CMD_ID_SPAWN_LIST Scene_CommandActorEntryList, // SCENE_CMD_ID_ACTOR_LIST diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 334880e06e..5171562721 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -77,26 +77,6 @@ Gfx sDefaultDisplayList[] = { gsSPEndDisplayList(), }; -void Scene_SetTransitionForNextEntrance(PlayState* play) { - s16 entranceIndex; - - if (!IS_DAY) { - if (!LINK_IS_ADULT) { - entranceIndex = play->nextEntranceIndex + 1; - } else { - entranceIndex = play->nextEntranceIndex + 3; - } - } else { - if (!LINK_IS_ADULT) { - entranceIndex = play->nextEntranceIndex; - } else { - entranceIndex = play->nextEntranceIndex + 2; - } - } - - play->transitionType = ENTRANCE_INFO_START_TRANS_TYPE(gEntranceTable[entranceIndex].field); -} - void Scene_DrawConfigDefault(PlayState* play) { OPEN_DISPS(play->state.gfxCtx, "../z_scene_table.c", 4725); diff --git a/src/code/z_view.c b/src/code/z_view.c index 47b787bed8..4b16385613 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -292,7 +292,7 @@ s32 View_ApplyPerspective(View* view) { // Viewport vp = GRAPH_ALLOC(gfxCtx, sizeof(Vp)); - LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 601); + LOG_UTILS_CHECK_NULL_POINTER("vp", vp, "../z_view.c", 601); View_ViewportToVp(vp, &view->viewport); view->vp = *vp; @@ -303,7 +303,7 @@ s32 View_ApplyPerspective(View* view) { // Perspective projection projection = GRAPH_ALLOC(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 616); + LOG_UTILS_CHECK_NULL_POINTER("projection", projection, "../z_view.c", 616); view->projectionPtr = projection; width = view->viewport.rightX - view->viewport.leftX; @@ -351,7 +351,7 @@ s32 View_ApplyPerspective(View* view) { // View matrix (look-at) viewing = GRAPH_ALLOC(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 667); + LOG_UTILS_CHECK_NULL_POINTER("viewing", viewing, "../z_view.c", 667); view->viewingPtr = viewing; if (view->eye.x == view->at.x && view->eye.y == view->at.y && view->eye.z == view->at.z) { @@ -395,7 +395,7 @@ s32 View_ApplyOrtho(View* view) { OPEN_DISPS(gfxCtx, "../z_view.c", 726); vp = GRAPH_ALLOC(gfxCtx, sizeof(Vp)); - LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 730); + LOG_UTILS_CHECK_NULL_POINTER("vp", vp, "../z_view.c", 730); View_ViewportToVp(vp, &view->viewport); view->vp = *vp; @@ -406,7 +406,7 @@ s32 View_ApplyOrtho(View* view) { gSPViewport(OVERLAY_DISP++, vp); projection = GRAPH_ALLOC(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 744); + LOG_UTILS_CHECK_NULL_POINTER("projection", projection, "../z_view.c", 744); view->projectionPtr = projection; guOrtho(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f, @@ -435,7 +435,7 @@ s32 View_ApplyOrthoToOverlay(View* view) { OPEN_DISPS(gfxCtx, "../z_view.c", 777); vp = GRAPH_ALLOC(gfxCtx, sizeof(Vp)); - LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 781); + LOG_UTILS_CHECK_NULL_POINTER("vp", vp, "../z_view.c", 781); View_ViewportToVp(vp, &view->viewport); view->vp = *vp; @@ -445,7 +445,7 @@ s32 View_ApplyOrthoToOverlay(View* view) { gSPViewport(OVERLAY_DISP++, vp); projection = GRAPH_ALLOC(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 791); + LOG_UTILS_CHECK_NULL_POINTER("projection", projection, "../z_view.c", 791); view->projectionPtr = projection; guOrtho(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f, @@ -476,7 +476,7 @@ s32 View_ApplyPerspectiveToOverlay(View* view) { OPEN_DISPS(gfxCtx, "../z_view.c", 816); vp = GRAPH_ALLOC(gfxCtx, sizeof(Vp)); - LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 821); + LOG_UTILS_CHECK_NULL_POINTER("vp", vp, "../z_view.c", 821); View_ViewportToVp(vp, &view->viewport); view->vp = *vp; @@ -486,7 +486,7 @@ s32 View_ApplyPerspectiveToOverlay(View* view) { gSPViewport(OVERLAY_DISP++, vp); projection = GRAPH_ALLOC(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 833); + LOG_UTILS_CHECK_NULL_POINTER("projection", projection, "../z_view.c", 833); view->projectionPtr = projection; width = view->viewport.rightX - view->viewport.leftX; @@ -501,7 +501,7 @@ s32 View_ApplyPerspectiveToOverlay(View* view) { gSPMatrix(OVERLAY_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); viewing = GRAPH_ALLOC(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 848); + LOG_UTILS_CHECK_NULL_POINTER("viewing", viewing, "../z_view.c", 848); view->viewingPtr = viewing; // This check avoids a divide-by-zero in guLookAt if eye == at @@ -552,7 +552,7 @@ s32 View_ApplyTo(View* view, s32 mask, Gfx** gfxP) { if (mask & VIEW_VIEWPORT) { vp = GRAPH_ALLOC(gfxCtx, sizeof(Vp)); - LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 910); + LOG_UTILS_CHECK_NULL_POINTER("vp", vp, "../z_view.c", 910); View_ViewportToVp(vp, &view->viewport); view->vp = *vp; @@ -565,7 +565,7 @@ s32 View_ApplyTo(View* view, s32 mask, Gfx** gfxP) { if (mask & VIEW_PROJECTION_ORTHO) { projection = GRAPH_ALLOC(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 921); + LOG_UTILS_CHECK_NULL_POINTER("projection", projection, "../z_view.c", 921); view->projectionPtr = projection; guOrtho(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f, @@ -576,7 +576,7 @@ s32 View_ApplyTo(View* view, s32 mask, Gfx** gfxP) { gSPMatrix(gfx++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } else if (mask & (VIEW_PROJECTION_PERSPECTIVE | VIEW_VIEWPORT)) { projection = GRAPH_ALLOC(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 932); + LOG_UTILS_CHECK_NULL_POINTER("projection", projection, "../z_view.c", 932); view->projectionPtr = projection; width = view->viewport.rightX - view->viewport.leftX; @@ -593,7 +593,7 @@ s32 View_ApplyTo(View* view, s32 mask, Gfx** gfxP) { if (mask & VIEW_VIEWING) { viewing = GRAPH_ALLOC(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 948); + LOG_UTILS_CHECK_NULL_POINTER("viewing", viewing, "../z_view.c", 948); view->viewingPtr = viewing; View_ErrorCheckEyePosition(view->eye.x, view->eye.y, view->eye.z); diff --git a/src/makerom/ipl3.s b/src/makerom/ipl3.s index 2efa7b53d8..be02f7e2fc 100644 --- a/src/makerom/ipl3.s +++ b/src/makerom/ipl3.s @@ -1,4 +1,4 @@ .section .text -.incbin "baserom.z64", 0x40, 0xFC0 +.incbin "baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", 0x40, 0xFC0 diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index 19d53090ea..3d12a423bc 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -7,7 +7,7 @@ #include "z_bg_bombwall.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" -#define FLAGS ACTOR_FLAG_22 +#define FLAGS ACTOR_FLAG_IGNORE_POINT_LIGHTS void BgBombwall_Init(Actor* thisx, PlayState* play); void BgBombwall_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index da1e50e89a..287cd60ea0 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -55,7 +55,7 @@ void BgGndDarkmeiro_Init(Actor* thisx, PlayState* play2) { switch (this->dyna.actor.params & 0xFF) { case DARKMEIRO_INVISIBLE_PATH: this->dyna.actor.draw = BgGndDarkmeiro_DrawInvisiblePath; - this->dyna.actor.flags |= ACTOR_FLAG_7; + this->dyna.actor.flags |= ACTOR_FLAG_REACT_TO_LENS; break; case DARKMEIRO_CLEAR_BLOCK: CollisionHeader_GetVirtual(&gClearBlockCol, &colHeader); diff --git a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c index 8b3c4a2225..a6766c62af 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c @@ -40,9 +40,9 @@ void BgGndNisekabe_Update(Actor* thisx, PlayState* play) { BgGndNisekabe* this = (BgGndNisekabe*)thisx; if (play->actorCtx.lensActive) { - this->actor.flags |= ACTOR_FLAG_7; + this->actor.flags |= ACTOR_FLAG_REACT_TO_LENS; } else { - this->actor.flags &= ~ACTOR_FLAG_7; + this->actor.flags &= ~ACTOR_FLAG_REACT_TO_LENS; } } @@ -55,7 +55,7 @@ void BgGndNisekabe_Draw(Actor* thisx, PlayState* play) { BgGndNisekabe* this = (BgGndNisekabe*)thisx; u32 index = this->actor.params & 0xFF; - if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7)) { + if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) { Gfx_DrawDListXlu(play, dLists[index]); } else { Gfx_DrawDListOpa(play, dLists[index]); diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index 95f185e4ea..8e129ae40e 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -292,9 +292,9 @@ void BgHakaGate_FalseSkull(BgHakaGate* this, PlayState* play) { Math_StepToS(&this->vFlameScale, 350, 20); } if (play->actorCtx.lensActive) { - this->dyna.actor.flags |= ACTOR_FLAG_7; + this->dyna.actor.flags |= ACTOR_FLAG_REACT_TO_LENS; } else { - this->dyna.actor.flags &= ~ACTOR_FLAG_7; + this->dyna.actor.flags &= ~ACTOR_FLAG_REACT_TO_LENS; } } @@ -345,7 +345,7 @@ void BgHakaGate_Draw(Actor* thisx, PlayState* play) { BgHakaGate* this = (BgHakaGate*)thisx; MtxF currentMtxF; - if (CHECK_FLAG_ALL(thisx->flags, ACTOR_FLAG_7)) { + if (CHECK_FLAG_ALL(thisx->flags, ACTOR_FLAG_REACT_TO_LENS)) { Gfx_DrawDListXlu(play, object_haka_objects_DL_00F1B0); } else { Gfx_SetupDL_25Opa(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index 44690a3765..8caf50d340 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -8,7 +8,7 @@ #include "assets/objects/object_hakach_objects/object_hakach_objects.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_7) +#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_REACT_TO_LENS) void BgHakaMegane_Init(Actor* thisx, PlayState* play); void BgHakaMegane_Destroy(Actor* thisx, PlayState* play); @@ -109,10 +109,10 @@ void func_8087DBF0(BgHakaMegane* this, PlayState* play) { Actor* thisx = &this->dyna.actor; if (play->actorCtx.lensActive) { - thisx->flags |= ACTOR_FLAG_7; + thisx->flags |= ACTOR_FLAG_REACT_TO_LENS; DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); } else { - thisx->flags &= ~ACTOR_FLAG_7; + thisx->flags &= ~ACTOR_FLAG_REACT_TO_LENS; DynaPoly_EnableCollision(play, &play->colCtx.dyna, this->dyna.bgId); } } @@ -129,7 +129,7 @@ void BgHakaMegane_Update(Actor* thisx, PlayState* play) { void BgHakaMegane_Draw(Actor* thisx, PlayState* play) { BgHakaMegane* this = (BgHakaMegane*)thisx; - if (CHECK_FLAG_ALL(thisx->flags, ACTOR_FLAG_7)) { + if (CHECK_FLAG_ALL(thisx->flags, ACTOR_FLAG_REACT_TO_LENS)) { Gfx_DrawDListXlu(play, sDLists[thisx->params]); } else { Gfx_DrawDListOpa(play, sDLists[thisx->params]); diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c index 7374103639..6c8e3bf119 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c @@ -72,7 +72,7 @@ void BgHakaMeganeBG_Init(Actor* thisx, PlayState* play) { if (thisx->params == 0) { CollisionHeader_GetVirtual(&object_haka_objects_Col_009168, &colHeader); - thisx->flags |= ACTOR_FLAG_7; + thisx->flags |= ACTOR_FLAG_REACT_TO_LENS; this->unk_16A = 20; this->actionFunc = func_8087DFF8; } else if (thisx->params == 3) { diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c index d59affce0a..6a1963aeab 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c @@ -142,7 +142,7 @@ void BgHakaSgami_Init(Actor* thisx, PlayState* play) { thisx->params = (thisx->params >> 8) & 0xFF; if (this->unk_151 != 0) { - thisx->flags |= ACTOR_FLAG_7; + thisx->flags |= ACTOR_FLAG_REACT_TO_LENS; } Collider_InitTris(play, colliderScythe); diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c index ab8e39b8de..0d3c4635e2 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c @@ -41,9 +41,9 @@ void BgMenkuriNisekabe_Update(Actor* thisx, PlayState* play) { BgMenkuriNisekabe* this = (BgMenkuriNisekabe*)thisx; if (play->actorCtx.lensActive) { - this->actor.flags |= ACTOR_FLAG_7; + this->actor.flags |= ACTOR_FLAG_REACT_TO_LENS; } else { - this->actor.flags &= ~ACTOR_FLAG_7; + this->actor.flags &= ~ACTOR_FLAG_REACT_TO_LENS; } } @@ -51,7 +51,7 @@ void BgMenkuriNisekabe_Draw(Actor* thisx, PlayState* play) { BgMenkuriNisekabe* this = (BgMenkuriNisekabe*)thisx; u32 index = this->actor.params & 0xFF; - if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7)) { + if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) { Gfx_DrawDListXlu(play, sDLists[index]); } else { Gfx_DrawDListOpa(play, sDLists[index]); diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index db26994676..a652df6420 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -74,7 +74,7 @@ void BgSpot02Objects_Init(Actor* thisx, PlayState* play) { } else if (thisx->params == 1) { this->actionFunc = func_808AC8FC; CollisionHeader_GetVirtual(&object_spot02_objects_Col_0128D8, &colHeader); - thisx->flags |= ACTOR_FLAG_22; + thisx->flags |= ACTOR_FLAG_IGNORE_POINT_LIGHTS; } else { if (play->sceneId == SCENE_GRAVEYARD) { this->actionFunc = func_808AC908; diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index 8b9d4f48ff..17cdba2f1a 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -9,7 +9,7 @@ #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" -#define FLAGS ACTOR_FLAG_22 +#define FLAGS ACTOR_FLAG_IGNORE_POINT_LIGHTS void BgSpot08Bakudankabe_Init(Actor* thisx, PlayState* play); void BgSpot08Bakudankabe_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index f0fc45e9bd..f70e75bfdf 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -1878,8 +1878,8 @@ void func_80902348(BossGanon2* this, PlayState* play) { } } -void func_80902524(BossGanon2* this, PlayState* play) { - s8 temp_v0_4; +void BossGanon2_CollisionCheck(BossGanon2* this, PlayState* play) { + s8 health; ColliderElement* acHitElem; s16 i; u8 phi_v1_2; @@ -1909,11 +1909,11 @@ void func_80902524(BossGanon2* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_EN_MGANON_DAMAGE); Audio_StopSfxById(NA_SE_EN_MGANON_UNARI); this->actor.colChkInfo.health -= 2; - temp_v0_4 = this->actor.colChkInfo.health; - if (temp_v0_4 < 0x15 && this->unk_334 == 0) { + health = this->actor.colChkInfo.health; + if (health <= 20 && this->unk_334 == 0) { func_80900818(this, play); } else { - if (temp_v0_4 <= 0) { + if (health <= 0) { func_80901020(this, play); } else { func_80900210(this, play); @@ -1943,13 +1943,13 @@ void func_80902524(BossGanon2* this, PlayState* play) { } } this->actor.colChkInfo.health -= phi_v1_2; - temp_v0_4 = this->actor.colChkInfo.health; - if ((temp_v0_4 < 0x15) && (this->unk_334 == 0)) { + health = this->actor.colChkInfo.health; + if ((health <= 20) && (this->unk_334 == 0)) { func_80900818(this, play); - } else if ((temp_v0_4 <= 0) && (phi_v1_2 >= 2)) { + } else if ((health <= 0) && (phi_v1_2 >= 2)) { func_80901020(this, play); } else { - if (temp_v0_4 <= 0) { + if (health <= 0) { this->actor.colChkInfo.health = 1; } func_80900210(this, play); @@ -2067,7 +2067,7 @@ void BossGanon2_Update(Actor* thisx, PlayState* play) { func_80902348(this, play); CollisionCheck_SetOC(play, &play->colChkCtx, &this->unk_424.base); if (this->actionFunc != func_8090120C) { - func_80902524(this, play); + BossGanon2_CollisionCheck(this, play); CollisionCheck_SetAC(play, &play->colChkCtx, &this->unk_424.base); CollisionCheck_SetOC(play, &play->colChkCtx, &this->unk_444.base); CollisionCheck_SetAC(play, &play->colChkCtx, &this->unk_444.base); diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index ac481ba0c7..df893e790e 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -581,7 +581,7 @@ void BossSst_HeadIntro(BossSst* this, PlayState* play) { sSubCamEye.y += 400.0f * 0.01f; sSubCamEye.z += 1550.0f * 0.01f; this->vVanish = true; - this->actor.flags |= ACTOR_FLAG_7; + this->actor.flags |= ACTOR_FLAG_REACT_TO_LENS; } else if (revealStateTimer < 40) { sSubCamAt.x += 125.0f * 0.01f; sSubCamAt.y += 350.0f * 0.01f; @@ -819,7 +819,7 @@ void BossSst_HeadSetupStunned(BossSst* this) { this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); this->colliderCyl.base.acFlags &= ~AC_ON; this->vVanish = false; - this->actor.flags &= ~ACTOR_FLAG_7; + this->actor.flags &= ~ACTOR_FLAG_REACT_TO_LENS; BossSst_HeadSfx(this, NA_SE_EN_SHADEST_FREEZE); this->actionFunc = BossSst_HeadStunned; } @@ -2646,9 +2646,9 @@ void BossSst_UpdateHead(Actor* thisx, PlayState* play) { this->actionFunc(this, play); if (this->vVanish) { if (!play->actorCtx.lensActive || (thisx->colorFilterTimer != 0)) { - this->actor.flags &= ~ACTOR_FLAG_7; + this->actor.flags &= ~ACTOR_FLAG_REACT_TO_LENS; } else { - this->actor.flags |= ACTOR_FLAG_7; + this->actor.flags |= ACTOR_FLAG_REACT_TO_LENS; } } @@ -2668,7 +2668,7 @@ void BossSst_UpdateHead(Actor* thisx, PlayState* play) { } BossSst_MoveAround(this); - if ((!this->vVanish || CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7)) && + if ((!this->vVanish || CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) && ((this->actionFunc == BossSst_HeadReadyCharge) || (this->actionFunc == BossSst_HeadCharge) || (this->actionFunc == BossSst_HeadFrozenHand) || (this->actionFunc == BossSst_HeadStunned) || (this->actionFunc == BossSst_HeadVulnerable) || (this->actionFunc == BossSst_HeadDamage))) { @@ -2777,7 +2777,7 @@ s32 BossSst_OverrideHeadDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* s32 timer12; f32 shakeMod; - if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7) && this->vVanish) { + if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS) && this->vVanish) { *dList = NULL; } else if (this->actionFunc == BossSst_HeadThrash) { // Animation modifications for death cutscene shakeAmp = (this->timer / 10) + 1; @@ -2868,7 +2868,7 @@ void BossSst_DrawHead(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx, "../z_boss_sst.c", 6810); - if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7)) { + if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) { Gfx_SetupDL_25Opa(play->state.gfxCtx); gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0x80, sBodyColor.r, sBodyColor.g, sBodyColor.b, 255); if (!sBodyStatic) { @@ -2895,7 +2895,7 @@ void BossSst_DrawHead(Actor* thisx, PlayState* play) { Matrix_RotateY(-randYaw, MTXMODE_APPLY); } - if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7)) { + if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) { POLY_OPA_DISP = SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, BossSst_OverrideHeadDraw, BossSst_PostHeadDraw, this, POLY_OPA_DISP); diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index fe2fb6e3d0..77eba65b88 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -160,7 +160,7 @@ void EnBox_Init(Actor* thisx, PlayState* play2) { this->dyna.actor.flags |= ACTOR_FLAG_4; } else { if (this->type == ENBOX_TYPE_4 || this->type == ENBOX_TYPE_6) { - this->dyna.actor.flags |= ACTOR_FLAG_7; + this->dyna.actor.flags |= ACTOR_FLAG_REACT_TO_LENS; } EnBox_SetupAction(this, EnBox_WaitOpen); this->movementFlags |= ENBOX_MOVE_IMMOBILE; @@ -438,7 +438,7 @@ void EnBox_WaitOpen(EnBox* this, PlayState* play) { void EnBox_Open(EnBox* this, PlayState* play) { u16 sfxId; - this->dyna.actor.flags &= ~ACTOR_FLAG_7; + this->dyna.actor.flags &= ~ACTOR_FLAG_REACT_TO_LENS; if (SkelAnime_Update(&this->skelanime)) { if (this->unk_1F4 > 0) { @@ -621,11 +621,11 @@ void EnBox_Draw(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx, "../z_en_box.c", 1581); /* - this->dyna.actor.flags & ACTOR_FLAG_7 is set by Init (if type is 4 or 6) + this->dyna.actor.flags & ACTOR_FLAG_REACT_TO_LENS is set by Init (if type is 4 or 6) and cleared by Open */ if ((this->alpha == 255 && !(this->type == ENBOX_TYPE_4 || this->type == ENBOX_TYPE_6)) || - (!CHECK_FLAG_ALL(this->dyna.actor.flags, ACTOR_FLAG_7) && + (!CHECK_FLAG_ALL(this->dyna.actor.flags, ACTOR_FLAG_REACT_TO_LENS) && (this->type == ENBOX_TYPE_4 || this->type == ENBOX_TYPE_6))) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index eb3d0b2502..14c454455f 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -191,7 +191,7 @@ void EnDh_SetupWait(EnDh* this) { this->actor.shape.yOffset = -15000.0f; this->dirtWaveSpread = this->actor.speed = 0.0f; this->actor.world.rot.y = this->actor.shape.rot.y; - this->actor.flags |= ACTOR_FLAG_7; + this->actor.flags |= ACTOR_FLAG_REACT_TO_LENS; this->dirtWavePhase = this->actionState = this->actor.params = ENDH_WAIT_UNDERGROUND; EnDh_SetupAction(this, EnDh_Wait); } @@ -208,7 +208,7 @@ void EnDh_Wait(EnDh* this, PlayState* play) { case 0: this->actor.flags |= ACTOR_FLAG_0; this->actor.shape.rot.y = this->actor.yawTowardsPlayer; - this->actor.flags &= ~ACTOR_FLAG_7; + this->actor.flags &= ~ACTOR_FLAG_REACT_TO_LENS; this->actionState++; this->drawDirtWave++; Actor_PlaySfx(&this->actor, NA_SE_EN_DEADHAND_HIDE); diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 341d98dfbf..d48103610b 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -147,7 +147,7 @@ void EnFirefly_Init(Actor* thisx, PlayState* play) { CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit); if ((this->actor.params & 0x8000) != 0) { - this->actor.flags |= ACTOR_FLAG_7; + this->actor.flags |= ACTOR_FLAG_REACT_TO_LENS; if (1) {} this->actor.draw = EnFirefly_DrawInvisible; this->actor.params &= 0x7FFF; diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 1c358be368..e1ed9d58e1 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -138,7 +138,7 @@ void EnFloormas_Init(Actor* thisx, PlayState* play2) { // s16 cast needed this->actor.params &= (s16) ~(SPAWN_INVISIBLE); if (invisble) { - this->actor.flags |= ACTOR_FLAG_7; + this->actor.flags |= ACTOR_FLAG_REACT_TO_LENS; this->actor.draw = EnFloormas_DrawHighlighted; } @@ -280,7 +280,7 @@ void EnFloormas_SetupLand(EnFloormas* this) { void EnFloormas_SetupSplit(EnFloormas* this) { Actor_SetScale(&this->actor, 0.004f); this->actor.flags |= ACTOR_FLAG_4; - if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7)) { + if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) { this->actor.draw = EnFloormas_DrawHighlighted; } else { this->actor.draw = EnFloormas_Draw; diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index cf28f207c5..8870dffd5b 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -18,7 +18,8 @@ typedef enum { /* 0 */ HONOTRAP_EYE_OPEN, /* 1 */ HONOTRAP_EYE_HALF, /* 2 */ HONOTRAP_EYE_CLOSE, - /* 3 */ HONOTRAP_EYE_SHUT + /* 3 */ HONOTRAP_EYE_SHUT, + /* 4 */ HONOTRAP_EYE_MAX } EnHonotrapEyeState; void EnHonotrap_Init(Actor* thisx, PlayState* play); @@ -35,8 +36,8 @@ void EnHonotrap_EyeAttack(EnHonotrap* this, PlayState* play); void EnHonotrap_SetupEyeClose(EnHonotrap* this); void EnHonotrap_EyeClose(EnHonotrap* this, PlayState* play); -void EnHonotrap_SetupFlame(EnHonotrap* this); -void EnHonotrap_Flame(EnHonotrap* this, PlayState* play); +void EnHonotrap_SetupFlameGrow(EnHonotrap* this); +void EnHonotrap_FlameGrow(EnHonotrap* this, PlayState* play); void EnHonotrap_SetupFlameDrop(EnHonotrap* this); void EnHonotrap_FlameDrop(EnHonotrap* this, PlayState* play); @@ -138,17 +139,17 @@ void EnHonotrap_FlameCollisionCheck(EnHonotrap* this, PlayState* play) { } void EnHonotrap_GetNormal(Vec3f* normal, Vec3f* vec) { - f32 mag = Math3D_Vec3fMagnitude(vec); + f32 magnitude = Math3D_Vec3fMagnitude(vec); - if (mag < 0.001f) { + if (magnitude < 0.001f) { PRINTF("Warning : vector size zero (%s %d)\n", "../z_en_honotrap.c", 328, normal); normal->x = normal->y = 0.0f; normal->z = 1.0f; } else { - normal->x = vec->x * (1.0f / mag); - normal->y = vec->y * (1.0f / mag); - normal->z = vec->z * (1.0f / mag); + normal->x = vec->x * (1.0f / magnitude); + normal->y = vec->y * (1.0f / magnitude); + normal->z = vec->z * (1.0f / magnitude); } } @@ -198,9 +199,9 @@ void EnHonotrap_InitFlame(Actor* thisx, PlayState* play) { this->targetPos = GET_PLAYER(play)->actor.world.pos; this->targetPos.y += 10.0f; this->flameScroll = Rand_ZeroOne() * 511.0f; - EnHonotrap_SetupFlame(this); + EnHonotrap_SetupFlameGrow(this); Actor_PlaySfx(&this->actor, NA_SE_EV_FLAME_IGNITION); - if (this->actor.params == HONOTRAP_FLAME_DROP) { + if (this->actor.params == HONOTRAP_TYPE_FLAME_DROP) { this->actor.room = -1; this->collider.cyl.dim.radius = 12; this->collider.cyl.dim.height = 30; @@ -210,7 +211,7 @@ void EnHonotrap_InitFlame(Actor* thisx, PlayState* play) { void EnHonotrap_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(thisx, sInitChain); - if (thisx->params == HONOTRAP_EYE) { + if (thisx->params == HONOTRAP_TYPE_EYE) { EnHonotrap_InitEye(thisx, play); } else { EnHonotrap_InitFlame(thisx, play); @@ -221,7 +222,7 @@ void EnHonotrap_Destroy(Actor* thisx, PlayState* play) { s32 pad; EnHonotrap* this = (EnHonotrap*)thisx; - if (this->actor.params == HONOTRAP_EYE) { + if (this->actor.params == HONOTRAP_TYPE_EYE) { Collider_DestroyTris(play, &this->collider.tris); } else { Collider_DestroyCylinder(play, &this->collider.cyl); @@ -236,11 +237,14 @@ void EnHonotrap_SetupEyeIdle(EnHonotrap* this) { void EnHonotrap_EyeIdle(EnHonotrap* this, PlayState* play) { if (this->actor.child != NULL) { this->timer = 200; - } else if ((this->timer <= 0) && (this->actor.xzDistToPlayer < 750.0f) && (0.0f > this->actor.yDistToPlayer) && - (this->actor.yDistToPlayer > -700.0f) && - (-0x4000 < (this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) && - ((this->actor.yawTowardsPlayer - this->actor.shape.rot.y) < 0x4000)) { - EnHonotrap_SetupEyeOpen(this); + } else if ((this->timer <= 0) && (this->actor.xzDistToPlayer < 750.0f)) { + if ((this->actor.yDistToPlayer < 0.0f) && (this->actor.yDistToPlayer > -700.0f)) { + s32 angle = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; + + if ((angle > -0x4000) && (angle < 0x4000)) { + EnHonotrap_SetupEyeOpen(this); + } + } } } @@ -252,18 +256,14 @@ void EnHonotrap_SetupEyeOpen(EnHonotrap* this) { } void EnHonotrap_EyeOpen(EnHonotrap* this, PlayState* play) { - f32 cos; - f32 sin; - this->eyeState--; if (this->eyeState <= HONOTRAP_EYE_OPEN) { EnHonotrap_SetupEyeAttack(this); - sin = Math_SinS(this->actor.shape.rot.y); - cos = Math_CosS(this->actor.shape.rot.y); - Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_HONOTRAP, - (sin * 12.0f) + this->actor.home.pos.x, this->actor.home.pos.y - 10.0f, - (cos * 12.0f) + this->actor.home.pos.z, this->actor.home.rot.x, this->actor.home.rot.y, - this->actor.home.rot.z, HONOTRAP_FLAME_MOVE); + Actor_SpawnAsChild( + &play->actorCtx, &this->actor, play, ACTOR_EN_HONOTRAP, + (Math_SinS(this->actor.shape.rot.y) * 12.0f) + this->actor.home.pos.x, this->actor.home.pos.y - 10.0f, + (Math_CosS(this->actor.shape.rot.y) * 12.0f) + this->actor.home.pos.z, this->actor.home.rot.x, + this->actor.home.rot.y, this->actor.home.rot.z, HONOTRAP_TYPE_FLAME_MOVE); } } @@ -290,20 +290,19 @@ void EnHonotrap_EyeClose(EnHonotrap* this, PlayState* play) { } } -void EnHonotrap_SetupFlame(EnHonotrap* this) { - this->actionFunc = EnHonotrap_Flame; +void EnHonotrap_SetupFlameGrow(EnHonotrap* this) { + this->actionFunc = EnHonotrap_FlameGrow; } -void EnHonotrap_Flame(EnHonotrap* this, PlayState* play) { - s32 pad; - s32 ready = - Math_StepToF(&this->actor.scale.x, (this->actor.params == HONOTRAP_FLAME_MOVE) ? 0.004f : 0.0048f, 0.0006f); +void EnHonotrap_FlameGrow(EnHonotrap* this, PlayState* play) { + f32 targetScale = (this->actor.params == HONOTRAP_TYPE_FLAME_MOVE) ? 0.004f : 0.0048f; + s32 targetReached = Math_StepToF(&this->actor.scale.x, targetScale, 0.0006f); this->actor.scale.z = this->actor.scale.y = this->actor.scale.x; - if (ready) { - if (this->actor.params == HONOTRAP_FLAME_MOVE) { + if (targetReached) { + if (this->actor.params == HONOTRAP_TYPE_FLAME_MOVE) { EnHonotrap_SetupFlameMove(this); - } else { + } else { // HONOTRAP_TYPE_FLAME_DROP EnHonotrap_SetupFlameDrop(this); } } @@ -324,49 +323,46 @@ void EnHonotrap_FlameDrop(EnHonotrap* this, PlayState* play) { } this->actor.velocity.x = this->actor.velocity.y = this->actor.velocity.z = 0.0f; EnHonotrap_SetupFlameVanish(this); - } else { - if (this->actor.velocity.y > 0.0f) { - this->actor.world.pos.x += this->actor.velocity.x; - this->actor.world.pos.z += this->actor.velocity.z; - Actor_UpdateBgCheckInfo(play, &this->actor, 7.0f, 12.0f, 0.0f, - UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2); - } - if (!Math_StepToF(&this->actor.world.pos.y, this->actor.floorHeight + 1.0f, this->actor.velocity.y)) { - this->actor.velocity.y += 1.0f; - } else { - this->actor.velocity.y = 0.0f; - } - EnHonotrap_FlameCollisionCheck(this, play); + return; } + if (this->actor.velocity.y > 0.0f) { + this->actor.world.pos.x += this->actor.velocity.x; + this->actor.world.pos.z += this->actor.velocity.z; + Actor_UpdateBgCheckInfo(play, &this->actor, 7.0f, 12.0f, 0.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2); + } + if (!Math_StepToF(&this->actor.world.pos.y, this->actor.floorHeight + 1.0f, this->actor.velocity.y)) { + this->actor.velocity.y += 1.0f; + } else { + this->actor.velocity.y = 0.0f; + } + EnHonotrap_FlameCollisionCheck(this, play); } void EnHonotrap_SetupFlameMove(EnHonotrap* this) { - f32 distFrac; + f32 distInverse; this->actionFunc = EnHonotrap_FlameMove; - - distFrac = 1.0f / (Actor_WorldDistXYZToPoint(&this->actor, &this->targetPos) + 1.0f); - this->actor.velocity.x = (this->targetPos.x - this->actor.world.pos.x) * distFrac; - this->actor.velocity.y = (this->targetPos.y - this->actor.world.pos.y) * distFrac; - this->actor.velocity.z = (this->targetPos.z - this->actor.world.pos.z) * distFrac; + distInverse = 1.0f / (Actor_WorldDistXYZToPoint(&this->actor, &this->targetPos) + 1.0f); + this->actor.velocity.x = (this->targetPos.x - this->actor.world.pos.x) * distInverse; + this->actor.velocity.y = (this->targetPos.y - this->actor.world.pos.y) * distInverse; + this->actor.velocity.z = (this->targetPos.z - this->actor.world.pos.z) * distInverse; this->speedMod = 0.0f; - this->timer = 160; } void EnHonotrap_FlameMove(EnHonotrap* this, PlayState* play) { - s32 pad; + Actor* thisx = &this->actor; Vec3f speed; - s32 ready; + s32 targetReached; Math_StepToF(&this->speedMod, 13.0f, 0.5f); - speed.x = fabsf(this->speedMod * this->actor.velocity.x); - speed.y = fabsf(this->speedMod * this->actor.velocity.y); - speed.z = fabsf(this->speedMod * this->actor.velocity.z); - ready = true; - ready &= Math_StepToF(&this->actor.world.pos.x, this->targetPos.x, speed.x); - ready &= Math_StepToF(&this->actor.world.pos.y, this->targetPos.y, speed.y); - ready &= Math_StepToF(&this->actor.world.pos.z, this->targetPos.z, speed.z); + speed.x = fabsf(this->speedMod * thisx->velocity.x); + speed.y = fabsf(this->speedMod * thisx->velocity.y); + speed.z = fabsf(this->speedMod * thisx->velocity.z); + targetReached = true; + targetReached &= Math_StepToF(&thisx->world.pos.x, this->targetPos.x, speed.x); + targetReached &= Math_StepToF(&thisx->world.pos.y, this->targetPos.y, speed.y); + targetReached &= Math_StepToF(&thisx->world.pos.z, this->targetPos.z, speed.z); Actor_UpdateBgCheckInfo(play, &this->actor, 7.0f, 10.0f, 0.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | UPDBGCHECKINFO_FLAG_4); @@ -382,19 +378,20 @@ void EnHonotrap_FlameMove(EnHonotrap* this, PlayState* play) { shieldVec.z = -player->shieldMf.zz; EnHonotrap_GetNormal(&shieldNorm, &shieldVec); - tempVel = this->actor.velocity; - Math3D_Vec3fReflect(&tempVel, &shieldNorm, &this->actor.velocity); - this->actor.speed = this->speedMod * 0.5f; - this->actor.world.rot.y = Math_Atan2S(this->actor.velocity.z, this->actor.velocity.x); + tempVel = thisx->velocity; + Math3D_Vec3fReflect(&tempVel, &shieldNorm, &thisx->velocity); + thisx->speed = this->speedMod * 0.5f; + thisx->world.rot.y = Math_Atan2S(thisx->velocity.z, thisx->velocity.x); EnHonotrap_SetupFlameVanish(this); } else if (this->collider.tris.base.atFlags & AT_HIT) { - this->actor.velocity.y = this->actor.speed = 0.0f; + thisx->speed = 0.0f; + thisx->velocity.y = 0.0f; EnHonotrap_SetupFlameVanish(this); } else if (this->timer <= 0) { EnHonotrap_SetupFlameVanish(this); } else { EnHonotrap_FlameCollisionCheck(this, play); - if (ready) { + if (targetReached) { EnHonotrap_SetupFlameChase(this); } } @@ -402,10 +399,9 @@ void EnHonotrap_FlameMove(EnHonotrap* this, PlayState* play) { void EnHonotrap_SetupFlameChase(EnHonotrap* this) { this->actionFunc = EnHonotrap_FlameChase; - - this->actor.velocity.x = this->actor.velocity.y = this->actor.velocity.z = this->actor.speed = 0.0f; + this->actor.speed = 0.0f; + this->actor.velocity.x = this->actor.velocity.y = this->actor.velocity.z = 0.0f; this->actor.world.rot.x = this->actor.world.rot.y = this->actor.world.rot.z = 0; - this->timer = 100; } @@ -448,28 +444,27 @@ void EnHonotrap_SetupFlameVanish(EnHonotrap* this) { void EnHonotrap_FlameVanish(EnHonotrap* this, PlayState* play) { s32 pad; - s32 ready = Math_StepToF(&this->actor.scale.x, 0.0001f, 0.00015f); + s32 targetReached = Math_StepToF(&this->actor.scale.x, 0.0001f, 0.00015f); this->actor.scale.z = this->actor.scale.y = this->actor.scale.x; Actor_MoveXZGravity(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 7.0f, 10.0f, 0.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | UPDBGCHECKINFO_FLAG_4); - if (ready) { + if (targetReached) { Actor_Kill(&this->actor); } } void EnHonotrap_Update(Actor* thisx, PlayState* play) { - static Vec3f velocity = { 0.0f, 0.0f, 0.0f }; - static Vec3f accel = { 0.0f, 0.1f, 0.0f }; - s32 pad; + static Vec3f sVelocity = { 0.0f, 0.0f, 0.0f }; + static Vec3f sAccel = { 0.0f, 0.1f, 0.0f }; EnHonotrap* this = (EnHonotrap*)thisx; if (this->timer > 0) { this->timer--; } - if (this->actor.params == HONOTRAP_EYE) { + if (this->actor.params == HONOTRAP_TYPE_EYE) { if ((this->actor.child != NULL) && (this->actor.child->update == NULL)) { this->actor.child = NULL; } @@ -481,9 +476,9 @@ void EnHonotrap_Update(Actor* thisx, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_EV_BURN_OUT - SFX_FLAG); } this->actionFunc(this, play); - if (this->actor.params == HONOTRAP_EYE) { + if (this->actor.params == HONOTRAP_TYPE_EYE) { if (this->collider.tris.base.acFlags & AC_HIT) { - EffectSsBomb2_SpawnLayered(play, &this->actor.world.pos, &velocity, &accel, 15, 8); + EffectSsBomb2_SpawnLayered(play, &this->actor.world.pos, &sVelocity, &sAccel, 15, 8); Actor_Kill(&this->actor); } else if (this->eyeState < HONOTRAP_EYE_SHUT) { this->collider.tris.base.acFlags &= ~AC_HIT; @@ -493,7 +488,7 @@ void EnHonotrap_Update(Actor* thisx, PlayState* play) { } void EnHonotrap_DrawEye(Actor* thisx, PlayState* play) { - static void* eyeTextures[] = { + static void* sSilverEyeTextures[HONOTRAP_EYE_MAX] = { gEyeSwitchSilverOpenTex, gEyeSwitchSilverHalfTex, gEyeSwitchSilverClosedTex, @@ -504,7 +499,7 @@ void EnHonotrap_DrawEye(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx, "../z_en_honotrap.c", 982); Gfx_SetupDL_25Opa(play->state.gfxCtx); - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeState])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sSilverEyeTextures[this->eyeState])); gSPMatrix(POLY_OPA_DISP++, MATRIX_NEW(play->state.gfxCtx, "../z_en_honotrap.c", 987), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gEyeSwitch2DL); @@ -520,10 +515,9 @@ void EnHonotrap_DrawFlame(Actor* thisx, PlayState* play) { Gfx_SetupDL_25Xlu(play->state.gfxCtx); this->flameScroll -= 20; - this->flameScroll &= 0x1FF; - gSPSegment( - POLY_XLU_DISP++, 0x08, - Gfx_TwoTexScroll(play->state.gfxCtx, G_TX_RENDERTILE, 0, 0, 0x20, 0x40, 1, 0, this->flameScroll, 0x20, 0x80)); + this->flameScroll %= (128U << 2); + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TwoTexScroll(play->state.gfxCtx, G_TX_RENDERTILE, 0, 0, 32, 64, 1, 0, this->flameScroll, 32, 128)); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 200, 0, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0); Matrix_RotateY(BINANG_TO_RAD((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) - this->actor.shape.rot.y + 0x8000)), @@ -537,11 +531,12 @@ void EnHonotrap_DrawFlame(Actor* thisx, PlayState* play) { void EnHonotrap_Draw(Actor* thisx, PlayState* play) { switch (thisx->params) { - case HONOTRAP_EYE: + case HONOTRAP_TYPE_EYE: EnHonotrap_DrawEye(thisx, play); break; - case HONOTRAP_FLAME_MOVE: - case HONOTRAP_FLAME_DROP: + + case HONOTRAP_TYPE_FLAME_MOVE: + case HONOTRAP_TYPE_FLAME_DROP: EnHonotrap_DrawFlame(thisx, play); break; } diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h index f576377b11..f9e3908bfe 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h @@ -10,10 +10,10 @@ typedef void (*EnHonotrapActionFunc)(struct EnHonotrap*, PlayState*); typedef union { struct { - ColliderTris tris; - ColliderTrisElement elements[2]; + /* 0x00 */ ColliderTris tris; + /* 0x20 */ ColliderTrisElement elements[2]; }; - ColliderCylinder cyl; + /* 0x00 */ ColliderCylinder cyl; } EnHonotrapCollider; // size = 0xD8 typedef struct EnHonotrap { @@ -30,9 +30,9 @@ typedef struct EnHonotrap { } EnHonotrap; // size = 0x0244 typedef enum { - HONOTRAP_EYE, - HONOTRAP_FLAME_MOVE, - HONOTRAP_FLAME_DROP + HONOTRAP_TYPE_EYE, + HONOTRAP_TYPE_FLAME_MOVE, + HONOTRAP_TYPE_FLAME_DROP } EnHonotrapType; #endif diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index ee7795db8e..2f6a161cec 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -7,7 +7,7 @@ #include "z_en_po_desert.h" #include "assets/objects/object_po_field/object_po_field.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_7 | ACTOR_FLAG_IGNORE_QUAKE) +#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_REACT_TO_LENS | ACTOR_FLAG_IGNORE_QUAKE) void EnPoDesert_Init(Actor* thisx, PlayState* play); void EnPoDesert_Destroy(Actor* thisx, PlayState* play); @@ -197,11 +197,11 @@ void EnPoDesert_Update(Actor* thisx, PlayState* play) { Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); if (play->actorCtx.lensActive) { - this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_7; + this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_REACT_TO_LENS; this->actor.shape.shadowDraw = ActorShadow_DrawCircle; } else { this->actor.shape.shadowDraw = NULL; - this->actor.flags &= ~(ACTOR_FLAG_0 | ACTOR_FLAG_7); + this->actor.flags &= ~(ACTOR_FLAG_0 | ACTOR_FLAG_REACT_TO_LENS); } } @@ -214,7 +214,7 @@ s32 EnPoDesert_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec mtxScale = this->actionTimer / 16.0f; Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY); } - if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7)) { + if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) { *dList = NULL; } return false; @@ -234,7 +234,7 @@ void EnPoDesert_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* color.r = (s16)(rand * 30.0f) + 225; color.g = (s16)(rand * 100.0f) + 155; color.b = (s16)(rand * 160.0f) + 95; - if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7)) { + if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) { gDPPipeSync((*gfxP)++); gDPSetEnvColor((*gfxP)++, color.r, color.g, color.b, 255); gSPMatrix((*gfxP)++, MATRIX_NEW(play->state.gfxCtx, "../z_en_po_desert.c", 523), diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index 8ac9f9f439..f526e0508d 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -204,7 +204,7 @@ void EnPoRelay_Race(EnPoRelay* this, PlayState* play) { Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HONOTRAP, Math_CosS(this->unk_19A) * speedXZ + this->actor.world.pos.x, this->actor.world.pos.y, Math_SinS(this->unk_19A) * speedXZ + this->actor.world.pos.z, 0, - (this->unk_19A + 0x8000) - (0x2000 * multiplier), 0, HONOTRAP_FLAME_DROP); + (this->unk_19A + 0x8000) - (0x2000 * multiplier), 0, HONOTRAP_TYPE_FLAME_DROP); } } Math_SmoothStepToS(&this->actor.world.rot.y, this->unk_19A, 2, 0x1000, 0x100); diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index b258cb28bc..21a4869bbe 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -181,7 +181,7 @@ void EnRd_Init(Actor* thisx, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (this->actor.params == REDEAD_TYPE_INVISIBLE) { - this->actor.flags |= ACTOR_FLAG_7; + this->actor.flags |= ACTOR_FLAG_REACT_TO_LENS; } } diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index a65aca9455..55aa065dd4 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -790,7 +790,7 @@ void EnSt_Init(Actor* thisx, PlayState* play) { this->blureIdx = EnSt_CreateBlureEffect(play); EnSt_InitColliders(this, play); if (thisx->params == 2) { - this->actor.flags |= ACTOR_FLAG_7; + this->actor.flags |= ACTOR_FLAG_REACT_TO_LENS; } if (this->actor.params == 1) { this->actor.naviEnemyId = NAVI_ENEMY_BIG_SKULLTULA; diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index 40f36cc669..e050fc3321 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -306,7 +306,7 @@ void EnTest_Init(Actor* thisx, PlayState* play) { } if (this->actor.params == STALFOS_TYPE_INVISIBLE) { - this->actor.flags |= ACTOR_FLAG_7; + this->actor.flags |= ACTOR_FLAG_REACT_TO_LENS; } } @@ -1810,10 +1810,10 @@ void EnTest_Update(Actor* thisx, PlayState* play) { if (this->actor.params == STALFOS_TYPE_INVISIBLE) { if (play->actorCtx.lensActive) { - this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_7; + this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_REACT_TO_LENS; this->actor.shape.shadowDraw = ActorShadow_DrawFeet; } else { - this->actor.flags &= ~(ACTOR_FLAG_0 | ACTOR_FLAG_7); + this->actor.flags &= ~(ACTOR_FLAG_0 | ACTOR_FLAG_REACT_TO_LENS); this->actor.shape.shadowDraw = NULL; } } @@ -1836,7 +1836,8 @@ s32 EnTest_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* CLOSE_DISPS(play->state.gfxCtx, "../z_en_test.c", 3587); } - if ((this->actor.params == STALFOS_TYPE_INVISIBLE) && !CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7)) { + if ((this->actor.params == STALFOS_TYPE_INVISIBLE) && + !CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) { *dList = NULL; } diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index ac0524ea35..fb7db74af1 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_22 +#define FLAGS ACTOR_FLAG_IGNORE_POINT_LIGHTS void ObjBean_Init(Actor* thisx, PlayState* play); void ObjBean_Destroy(Actor* thisx, PlayState* play); diff --git a/sym_info.py b/sym_info.py index 9a279593db..28a927c68f 100755 --- a/sym_info.py +++ b/sym_info.py @@ -3,11 +3,7 @@ import argparse from pathlib import Path -try: - import mapfile_parser -except ImportError: - print("Missing dependency mapfile_parser, install it with `python3 -m pip install 'mapfile-parser>=1.2.1,<2.0.0'`") - exit(1) +import mapfile_parser def symInfoMain(): diff --git a/tools/assist.py b/tools/assist.py index 8c8c877453..666232ffac 100755 --- a/tools/assist.py +++ b/tools/assist.py @@ -13,7 +13,7 @@ asm_dir = root_dir + "asm/non_matchings/overlays/actors" build_dir = root_dir + "build/gc-eu-mq-dbg/" def read_rom(): - with open("baserom.z64", "rb") as f: + with open("baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", "rb") as f: return f.read() diff --git a/tools/compress.py b/tools/compress.py new file mode 100644 index 0000000000..d72b5f2cc4 --- /dev/null +++ b/tools/compress.py @@ -0,0 +1,342 @@ +# SPDX-FileCopyrightText: 2024 zeldaret +# SPDX-License-Identifier: CC0-1.0 + +from __future__ import annotations + +import argparse +from pathlib import Path +import dataclasses +import struct +import time +import multiprocessing +import multiprocessing.pool + +import crunch64 + + +STRUCT_IIII = struct.Struct(">IIII") + + +@dataclasses.dataclass +class DmaEntry: + """ + A Python counterpart to the dmadata entry struct: + ```c + typedef struct { + /* 0x00 */ uintptr_t vromStart; + /* 0x04 */ uintptr_t vromEnd; + /* 0x08 */ uintptr_t romStart; + /* 0x0C */ uintptr_t romEnd; + } DmaEntry; + ``` + """ + + vromStart: int + vromEnd: int + romStart: int + romEnd: int + + def __repr__(self): + return ( + "DmaEntry(" + f"vromStart=0x{self.vromStart:08X}, " + f"vromEnd=0x{self.vromEnd:08X}, " + f"romStart=0x{self.romStart:08X}, " + f"romEnd=0x{self.romEnd:08X}" + ")" + ) + + SIZE_BYTES = STRUCT_IIII.size + + def to_bin(self, data: memoryview): + STRUCT_IIII.pack_into( + data, + 0, + self.vromStart, + self.vromEnd, + self.romStart, + self.romEnd, + ) + + @staticmethod + def from_bin(data: memoryview): + return DmaEntry(*STRUCT_IIII.unpack_from(data)) + + +DMA_ENTRY_ZERO = DmaEntry(0, 0, 0, 0) + + +def align(v: int): + v += 0xF + return v // 0x10 * 0x10 + + +@dataclasses.dataclass +class RomSegment: + vromStart: int + vromEnd: int + is_compressed: bool + data: memoryview | None + data_async: multiprocessing.pool.AsyncResult | None + + @property + def uncompressed_size(self): + return self.vromEnd - self.vromStart + + +# Make interrupting the compression with ^C less jank +# https://stackoverflow.com/questions/72967793/keyboardinterrupt-with-python-multiprocessing-pool +def set_sigint_ignored(): + import signal + + signal.signal(signal.SIGINT, signal.SIG_IGN) + + +def compress_rom( + rom_data: memoryview, + dmadata_offset_start: int, + dmadata_offset_end: int, + compress_entries_indices: set[int], + n_threads: int = None, +): + """ + rom_data: the uncompressed rom data + dmadata_offset_start: the offset in the rom where the dmadata starts (inclusive) + dmadata_offset_end: the offset in the rom where the dmadata ends (exclusive) + compress_entries_indices: the indices in the dmadata of the segments that should be compressed + n_threads: how many cores to use for compression + """ + + # Segments of the compressed rom (not all are compressed) + compressed_rom_segments: list[RomSegment] = [] + + with multiprocessing.Pool(n_threads, initializer=set_sigint_ignored) as p: + # Extract each segment from the input rom + for entry_index, dmadata_offset in enumerate( + range(dmadata_offset_start, dmadata_offset_end, DmaEntry.SIZE_BYTES) + ): + dma_entry = DmaEntry.from_bin(rom_data[dmadata_offset:]) + if dma_entry == DMA_ENTRY_ZERO: + continue + + segment_rom_start = dma_entry.romStart + segment_rom_end = dma_entry.romStart + ( + dma_entry.vromEnd - dma_entry.vromStart + ) + segment_data_uncompressed = rom_data[segment_rom_start:segment_rom_end] + + is_compressed = entry_index in compress_entries_indices + + if is_compressed: + segment_data = None + segment_data_async = p.apply_async( + crunch64.yaz0.compress, + (bytes(segment_data_uncompressed),), + ) + else: + segment_data = segment_data_uncompressed + segment_data_async = None + + compressed_rom_segments.append( + RomSegment( + dma_entry.vromStart, + dma_entry.vromEnd, + is_compressed, + segment_data, + segment_data_async, + ) + ) + + # Technically optional but required for matching. + compressed_rom_segments.sort(key=lambda segment: segment.vromStart) + + # Wait on compression of all compressed segments + waiting_on_segments = [ + segment for segment in compressed_rom_segments if segment.is_compressed + ] + total_uncompressed_size_of_data_to_compress = sum( + segment.uncompressed_size for segment in waiting_on_segments + ) + uncompressed_size_of_data_compressed_so_far = 0 + while waiting_on_segments: + # Show progress + progress = ( + uncompressed_size_of_data_compressed_so_far + / total_uncompressed_size_of_data_to_compress + ) + print(f"Compressing... {progress * 100:.1f}%", end="\r") + + # The segments for which the compression is not finished yet are + # added to this list + still_waiting_on_segments = [] + got_some_results = False + for segment in waiting_on_segments: + assert segment.data is None + assert segment.data_async is not None + + try: + compressed_data = segment.data_async.get(0) + except multiprocessing.TimeoutError: + # Compression not finished yet + still_waiting_on_segments.append(segment) + else: + # Compression finished! + assert isinstance(compressed_data, bytes) + segment.data = memoryview(compressed_data) + uncompressed_size_of_data_compressed_so_far += ( + segment.uncompressed_size + ) + got_some_results = True + segment.data_async = None + + if not got_some_results and still_waiting_on_segments: + # Nothing happened this wait iteration, idle a bit + time.sleep(0.010) + + waiting_on_segments = still_waiting_on_segments + + print("Putting together the compressed rom...") + + # Put together the compressed rom + compressed_rom_size = sum( + align(len(segment.data)) for segment in compressed_rom_segments + ) + pad_to_multiple_of = 8 * 2**20 # 8 MiB + compressed_rom_size_padded = ( + (compressed_rom_size + pad_to_multiple_of - 1) + // pad_to_multiple_of + * pad_to_multiple_of + ) + compressed_rom_data = memoryview(bytearray(compressed_rom_size_padded)) + compressed_rom_dma_entries: list[DmaEntry] = [] + rom_offset = 0 + for segment in compressed_rom_segments: + assert segment.data is not None + + segment_rom_start = rom_offset + segment_rom_end = align(segment_rom_start + len(segment.data)) + + i = segment_rom_start + len(segment.data) + assert i <= len(compressed_rom_data) + compressed_rom_data[segment_rom_start:i] = segment.data + + compressed_rom_dma_entries.append( + DmaEntry( + segment.vromStart, + segment.vromEnd, + segment_rom_start, + segment_rom_end if segment.is_compressed else 0, + ) + ) + + rom_offset = segment_rom_end + + assert rom_offset == compressed_rom_size + # Pad the compressed rom with the pattern matching the baseroms + for i in range(compressed_rom_size, compressed_rom_size_padded): + compressed_rom_data[i] = i % 256 + + # Write the new dmadata + dmadata_offset = dmadata_offset_start + for dma_entry in compressed_rom_dma_entries: + assert dmadata_offset + DmaEntry.SIZE_BYTES <= dmadata_offset_end + + dma_entry.to_bin(compressed_rom_data[dmadata_offset:]) + + dmadata_offset += DmaEntry.SIZE_BYTES + + return compressed_rom_data + + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument( + "--in", + dest="in_rom", + required=True, + help="path to an uncompressed rom to be compressed", + ) + parser.add_argument( + "--out", + dest="out_rom", + required=True, + help="path of the compressed rom to write out", + ) + parser.add_argument( + "--dma-range", + dest="dma_range", + required=True, + help=( + "The dmadata location in the rom, in format" + " 'start_inclusive-end_exclusive' and using hexadecimal offsets" + " (e.g. '0x12f70-0x19030')." + ), + ) + parser.add_argument( + "--compress", + dest="compress_ranges", + required=True, + help=( + "The indices in the dmadata of the entries to be compressed," + " where 0 is the first entry." + " It is a comma-separated list of individual indices and inclusive ranges." + " e.g. '0-1,3,5,6-9' is all indices from 0 to 9 (included) except 2 and 4." + ), + ) + parser.add_argument( + "--threads", + dest="n_threads", + type=int, + default=1, + help="how many cores to use for parallel compression", + ) + args = parser.parse_args() + + in_rom_p = Path(args.in_rom) + if not in_rom_p.exists(): + parser.error(f"Input rom file {in_rom_p} doesn't exist.") + + out_rom_p = Path(args.out_rom) + + dma_range_str: str = args.dma_range + dma_range_ends_str = dma_range_str.split("-") + assert len(dma_range_ends_str) == 2, dma_range_str + dmadata_offset_start, dmadata_offset_end = ( + int(v_str, 16) for v_str in dma_range_ends_str + ) + assert dmadata_offset_start < dmadata_offset_end, dma_range_str + + compress_ranges_str: str = args.compress_ranges + compress_entries_indices = set() + for compress_range_str in compress_ranges_str.split(","): + compress_range_ends_str = compress_range_str.split("-") + assert len(compress_range_ends_str) <= 2, ( + compress_range_ends_str, + compress_range_str, + compress_ranges_str, + ) + compress_range_ends = [int(v_str) for v_str in compress_range_ends_str] + if len(compress_range_ends) == 1: + compress_entries_indices.add(compress_range_ends[0]) + else: + assert len(compress_range_ends) == 2 + compress_range_first, compress_range_last = compress_range_ends + compress_entries_indices.update( + range(compress_range_first, compress_range_last + 1) + ) + + n_threads = args.n_threads + + in_rom_data = in_rom_p.read_bytes() + out_rom_data = compress_rom( + memoryview(in_rom_data), + dmadata_offset_start, + dmadata_offset_end, + compress_entries_indices, + n_threads, + ) + out_rom_p.write_bytes(out_rom_data) + + +if __name__ == "__main__": + main() diff --git a/tools/csdis.py b/tools/csdis.py index ce0de398f9..2ecbf32318 100755 --- a/tools/csdis.py +++ b/tools/csdis.py @@ -496,7 +496,7 @@ def main(): script_dir = os.path.dirname(os.path.realpath(__file__)) cs_data = None - with open(script_dir + "/../baserom/" + file_result.name, "rb") as ovl_file: + with open(script_dir + "/../baseroms/gc-eu-mq-dbg/segments/" + file_result.name, "rb") as ovl_file: ovl_file.seek(file_result.offset) cs_data = [i[0] for i in struct.iter_unpack(">I", bytearray(ovl_file.read()))] if cs_data is not None: diff --git a/tools/decompress_baserom.py b/tools/decompress_baserom.py new file mode 100755 index 0000000000..a58791887a --- /dev/null +++ b/tools/decompress_baserom.py @@ -0,0 +1,273 @@ +#!/usr/bin/env python3 + +# SPDX-FileCopyrightText: © 2024 ZeldaRET +# SPDX-License-Identifier: CC0-1.0 + +from __future__ import annotations + +import hashlib +import io +import struct +from pathlib import Path +import argparse + +import crunch64 +import ipl3checksum +import zlib + + +def decompress_zlib(data: bytes) -> bytes: + decomp = zlib.decompressobj(-zlib.MAX_WBITS) + output = bytearray() + output.extend(decomp.decompress(data)) + while decomp.unconsumed_tail: + output.extend(decomp.decompress(decomp.unconsumed_tail)) + output.extend(decomp.flush()) + return bytes(output) + + +def decompress(data: bytes, is_zlib_compressed: bool) -> bytes: + if is_zlib_compressed: + return decompress_zlib(data) + return crunch64.yaz0.decompress(data) + + +FILE_TABLE_OFFSET = { + "gc-eu-mq-dbg": 0x12F70, +} + +VERSIONS_MD5S = { + "gc-eu-mq-dbg": "f0b7f35375f9cc8ca1b2d59d78e35405", +} + + +def round_up(n, shift): + mod = 1 << shift + return (n + mod - 1) >> shift << shift + + +def as_word_list(b) -> list[int]: + return [i[0] for i in struct.iter_unpack(">I", b)] + + +def read_dmadata_entry(file_content: bytearray, addr: int) -> list[int]: + return as_word_list(file_content[addr : addr + 0x10]) + + +def read_dmadata(file_content: bytearray, start) -> list[list[int]]: + dmadata = [] + addr = start + entry = read_dmadata_entry(file_content, addr) + i = 0 + while any([e != 0 for e in entry]): + dmadata.append(entry) + addr += 0x10 + i += 1 + entry = read_dmadata_entry(file_content, addr) + return dmadata + + +def update_crc(decompressed: io.BytesIO) -> io.BytesIO: + print("Recalculating crc...") + calculated_checksum = ipl3checksum.CICKind.CIC_X105.calculateChecksum( + bytes(decompressed.getbuffer()) + ) + new_crc = struct.pack(f">II", calculated_checksum[0], calculated_checksum[1]) + + decompressed.seek(0x10) + decompressed.write(new_crc) + return decompressed + + +def decompress_rom( + file_content: bytearray, dmadata_addr: int, dmadata: list[list[int]], version: str +) -> bytearray: + rom_segments = {} # vrom start : data s.t. len(data) == vrom_end - vrom_start + new_dmadata = bytearray() # new dmadata: {vrom start , vrom end , vrom start , 0} + + decompressed = io.BytesIO(b"") + + for v_start, v_end, p_start, p_end in dmadata: + if p_start == 0xFFFFFFFF and p_end == 0xFFFFFFFF: + new_dmadata.extend(struct.pack(">IIII", v_start, v_end, p_start, p_end)) + continue + if p_end == 0: # uncompressed + rom_segments.update( + {v_start: file_content[p_start : p_start + v_end - v_start]} + ) + else: # compressed + rom_segments.update( + { + v_start: decompress( + file_content[p_start:p_end], version in {"ique-cn", "ique-zh"} + ) + } + ) + new_dmadata.extend(struct.pack(">IIII", v_start, v_end, v_start, 0)) + + # write rom segments to vaddrs + for vrom_st, data in rom_segments.items(): + decompressed.seek(vrom_st) + decompressed.write(data) + # write new dmadata + decompressed.seek(dmadata_addr) + decompressed.write(new_dmadata) + # pad to size + padding_end = round_up(dmadata[-1][1], 14) + decompressed.seek(padding_end - 1) + decompressed.write(bytearray([0])) + # re-calculate crc + return bytearray(update_crc(decompressed).getbuffer()) + + +def get_str_hash(byte_array): + return str(hashlib.md5(byte_array).hexdigest()) + + +def check_existing_rom(rom_path: Path, correct_str_hash: str): + # If the baserom exists and is correct, we don't need to change anything + if rom_path.exists(): + if get_str_hash(rom_path.read_bytes()) == correct_str_hash: + return True + return False + + +def word_swap(file_content: bytearray) -> bytearray: + words = str(int(len(file_content) / 4)) + little_byte_format = "<" + words + "I" + big_byte_format = ">" + words + "I" + tmp = struct.unpack_from(little_byte_format, file_content, 0) + struct.pack_into(big_byte_format, file_content, 0, *tmp) + return file_content + + +def byte_swap(file_content: bytearray) -> bytearray: + halfwords = str(int(len(file_content) / 2)) + little_byte_format = "<" + halfwords + "H" + big_byte_format = ">" + halfwords + "H" + tmp = struct.unpack_from(little_byte_format, file_content, 0) + struct.pack_into(big_byte_format, file_content, 0, *tmp) + return file_content + + +def per_version_fixes(file_content: bytearray, version: str) -> bytearray: + if version == "gc-eu-mq-dbg": + # Strip the overdump + print("Stripping overdump...") + file_content = file_content[0:0x3600000] + + # Patch the header + print("Patching header...") + file_content[0x3E] = 0x50 + return file_content + + +def pad_rom(file_content: bytearray, dmadata: list[list[int]]) -> bytearray: + padding_start = round_up(dmadata[-1][1], 12) + padding_end = round_up(dmadata[-1][1], 14) + print(f"Padding from {padding_start:X} to {padding_end:X}...") + for i in range(padding_start, padding_end): + file_content[i] = 0xFF + return file_content + +# Determine if we have a ROM file +ROM_FILE_EXTENSIONS = ["z64", "n64", "v64"] + +def find_baserom(version: str) -> Path | None: + for rom_file_ext_lower in ROM_FILE_EXTENSIONS: + for rom_file_ext in (rom_file_ext_lower, rom_file_ext_lower.upper()): + rom_file_name_candidate = Path(f"baseroms/{version}/baserom.{rom_file_ext}") + if rom_file_name_candidate.exists(): + return rom_file_name_candidate + return None + + +def main(): + description = "Convert a rom that uses dmadata to an uncompressed one." + + parser = argparse.ArgumentParser(description=description) + parser.add_argument("version", help="Version of the game to decompress.", choices=list(VERSIONS_MD5S.keys())) + + args = parser.parse_args() + + version = args.version + + uncompressed_path = Path(f"baseroms/{version}/baserom-decompressed.z64") + + file_table_offset = FILE_TABLE_OFFSET[version] + correct_str_hash = VERSIONS_MD5S[version] + + if check_existing_rom(uncompressed_path, correct_str_hash): + print("Found valid baserom - exiting early") + return + + rom_file_name = find_baserom(version) + + if rom_file_name is None: + path_list = [ + f"baseroms/{version}/baserom.{rom_file_ext}" for rom_file_ext in ROM_FILE_EXTENSIONS + ] + print(f"Error: Could not find {','.join(path_list)}.") + exit(1) + + # Read in the original ROM + print(f"File '{rom_file_name}' found.") + + file_content = bytearray(rom_file_name.read_bytes()) + + # Check if ROM needs to be byte/word swapped + # Little-endian + if file_content[0] == 0x40: + # Word Swap ROM + print("ROM needs to be word swapped...") + file_content = word_swap(file_content) + print("Word swapping done.") + + # Byte-swapped + elif file_content[0] == 0x37: + # Byte Swap ROM + print("ROM needs to be byte swapped...") + file_content = byte_swap(file_content) + print("Byte swapping done.") + + file_content = per_version_fixes(file_content, version) + + dmadata = read_dmadata(file_content, file_table_offset) + # Decompress + if any( + [ + b != 0 + for b in file_content[ + file_table_offset + 0xAC : file_table_offset + 0xAC + 0x4 + ] + ] + ): + print("Decompressing rom...") + file_content = decompress_rom(file_content, file_table_offset, dmadata, version) + + file_content = pad_rom(file_content, dmadata) + + # Check to see if the ROM is a "vanilla" ROM + str_hash = get_str_hash(file_content) + if str_hash != correct_str_hash: + print( + f"Error: Expected a hash of {correct_str_hash} but got {str_hash}. The baserom has probably been tampered, find a new one" + ) + + if version == "gc-eu-mq-dbg": + if str_hash == "32fe2770c0f9b1a9cd2a4d449348c1cb": + print( + "The provided baserom is a rom which has been edited with ZeldaEdit and is not suitable for use with decomp. Find a new one." + ) + + exit(1) + + # Write out our new ROM + print(f"Writing new ROM {uncompressed_path}.") + uncompressed_path.write_bytes(file_content) + + print("Done!") + + +if __name__ == "__main__": + main() diff --git a/tools/disasm_elf_msg.py b/tools/disasm_elf_msg.py index 97297f7017..d2fe2bb884 100644 --- a/tools/disasm_elf_msg.py +++ b/tools/disasm_elf_msg.py @@ -166,7 +166,7 @@ item_ids = { def disas_elfmsgs(start): baserom = None - with open("baserom.z64", "rb") as infile: + with open("baseroms/gc-eu-mq-dbg/baserom-decompressed.z64", "rb") as infile: baserom = bytearray(infile.read()) branches = [] diff --git a/tools/dmadata_range.sh b/tools/dmadata_range.sh new file mode 100755 index 0000000000..905322c9cb --- /dev/null +++ b/tools/dmadata_range.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +NM=$1 +ELF=$2 + +# dmadata_syms contents look like: +# ffffffff80015850 T _dmadataSegmentTextStart +# 00000000 A _dmadataSegmentTextSize +# 00011a40 A _dmadataSegmentRomStart +# ffffffff8001b920 T _dmadataSegmentRoDataEnd +dmadata_syms=`$NM $ELF --no-sort --radix=x --format=bsd | grep dmadata` + +_dmadataSegmentRomStart=`echo "$dmadata_syms" | grep '\b_dmadataSegmentRomStart\b' | cut -d' ' -f1` +_dmadataSegmentRomEnd=` echo "$dmadata_syms" | grep '\b_dmadataSegmentRomEnd\b' | cut -d' ' -f1` + +echo 0x"$_dmadataSegmentRomStart"-0x"$_dmadataSegmentRomEnd" diff --git a/tools/mkdmadata.c b/tools/mkdmadata.c index b15c401573..c83864b559 100644 --- a/tools/mkdmadata.c +++ b/tools/mkdmadata.c @@ -20,22 +20,53 @@ static void write_dmadata_table(FILE *fout) fprintf(fout, "DEFINE_DMA_ENTRY(%s, \"%s\")\n", g_segments[i].name, g_segments[i].name); } +static void write_compress_ranges(FILE *fout) +{ + int i; + bool continue_list = false; + int stride_first = -1; + + for (i = 0; i < g_segmentsCount; i++) { + if (g_segments[i].compress) { + if (stride_first == -1) + stride_first = i; + } + if (!g_segments[i].compress || i == g_segmentsCount - 1) { + if (stride_first != -1) { + int stride_last = i - 1; + if (continue_list) { + fprintf(fout, ","); + } + if (stride_first == stride_last) { + fprintf(fout, "%d", stride_first); + } else { + fprintf(fout, "%d-%d", stride_first, stride_last); + } + continue_list = true; + stride_first = -1; + } + } + } +} + static void usage(const char *execname) { fprintf(stderr, "zelda64 dmadata generation tool v0.01\n" - "usage: %s SPEC_FILE DMADATA_TABLE\n" + "usage: %s SPEC_FILE DMADATA_TABLE COMPRESS_RANGES\n" "SPEC_FILE file describing the organization of object files into segments\n" - "DMADATA_TABLE filename of output dmadata table header\n", + "DMADATA_TABLE filename of output dmadata table header\n" + "COMPRESS_RANGES filename to write which files are compressed (e.g. 0-5,7,10-20)\n", execname); } int main(int argc, char **argv) { FILE *dmaout; + FILE *compress_ranges_out; void *spec; size_t size; - if (argc != 3) + if (argc != 4) { usage(argv[0]); return 1; @@ -49,6 +80,13 @@ int main(int argc, char **argv) util_fatal_error("failed to open file '%s' for writing", argv[2]); write_dmadata_table(dmaout); fclose(dmaout); + + compress_ranges_out = fopen(argv[3], "w"); + if (compress_ranges_out == NULL) + util_fatal_error("failed to open file '%s' for writing", argv[3]); + write_compress_ranges(compress_ranges_out); + fclose(compress_ranges_out); + free_rom_spec(g_segments, g_segmentsCount); free(spec); diff --git a/tools/msgdis.py b/tools/msgdis.py index 9329ea7a89..a946779fac 100644 --- a/tools/msgdis.py +++ b/tools/msgdis.py @@ -282,7 +282,7 @@ def read_tables(): global staff_message_entry_table baserom = None - with open("baserom.z64","rb") as infile: + with open("baseroms/gc-eu-mq-dbg/baserom-decompressed.z64","rb") as infile: baserom = infile.read() nes_message_entry_table = as_message_table_entry(baserom[nes_message_entry_table_addr:ger_message_entry_table_addr]) @@ -326,7 +326,7 @@ def dump_all_text(): nes_offset = segmented_to_physical(entry[3]) nes_length = next_entry[3] - entry[3] nes_text = "" - with open("baserom/nes_message_data_static","rb") as infile: + with open("baseroms/gc-eu-mq-dbg/segments/nes_message_data_static","rb") as infile: infile.seek(nes_offset) nes_text = fixup_message(decode(infile.read(nes_length), entry[1]).replace("\x00","",-1)) @@ -337,13 +337,13 @@ def dump_all_text(): next_entry = combined_message_entry_table[i+2] ger_offset = segmented_to_physical(entry[4]) ger_length = next_entry[4] - entry[4] - with open("baserom/ger_message_data_static","rb") as infile: + with open("baseroms/gc-eu-mq-dbg/segments/ger_message_data_static","rb") as infile: infile.seek(ger_offset) ger_text = fixup_message(decode(infile.read(ger_length), entry[1]).replace("\x00","",-1)) fra_offset = segmented_to_physical(entry[5]) fra_length = next_entry[5] - entry[5] - with open("baserom/fra_message_data_static","rb") as infile: + with open("baseroms/gc-eu-mq-dbg/segments/fra_message_data_static","rb") as infile: infile.seek(fra_offset) fra_text = fixup_message(decode(infile.read(fra_length), entry[1]).replace("\x00","",-1)) @@ -352,7 +352,7 @@ def dump_all_text(): return messages def dump_staff_text(): - staff_message_data_static_size = path.getsize("baserom/staff_message_data_static") + staff_message_data_static_size = path.getsize("baseroms/gc-eu-mq-dbg/segments/staff_message_data_static") # text id, ypos, type, staff messages = [] for i,entry in enumerate(staff_message_entry_table,0): @@ -361,7 +361,7 @@ def dump_staff_text(): staff_offset = segmented_to_physical(entry[3]) # hacky way to ensure the staff message entry table is read all the way to the end staff_length = (staff_message_data_static_size if entry[0] == 0x052F else segmented_to_physical(next_entry[3])) - segmented_to_physical(entry[3]) - with open("baserom/staff_message_data_static","rb") as infile: + with open("baseroms/gc-eu-mq-dbg/segments/staff_message_data_static","rb") as infile: infile.seek(staff_offset) messages.append((entry[0], entry[1], entry[2], fixup_message(decode(infile.read(staff_length), entry[1]).replace("\x00","",-1)))) else: diff --git a/tools/overlayhelpers/colliderinit.py b/tools/overlayhelpers/colliderinit.py index 61fb42e7cd..94f9685dbe 100755 --- a/tools/overlayhelpers/colliderinit.py +++ b/tools/overlayhelpers/colliderinit.py @@ -387,7 +387,7 @@ def GetColliderInit(address, type, num, path): else: return("ItemInit type must specify number of elements") - ovlFile = open(path + "/baserom/" + fileResult.name, "rb") + ovlFile = open(path + "/baseroms/gc-eu-mq-dbg/segments/" + fileResult.name, "rb") ovlData = bytearray(ovlFile.read()) ovlFile.close() @@ -470,7 +470,7 @@ print(GetColliderInitFull(args.address, args.type, args.num, repo)) # script_dir = os.path.dirname(os.path.realpath(__file__)) -# ovlFile = open(script_dir + "/../../baserom/" + fileResult.name, "rb") +# ovlFile = open(script_dir + "/../../baseroms/" + fileResult.name, "rb") # ovlData = bytearray(ovlFile.read()) # ovlFile.close() diff --git a/tools/overlayhelpers/damage_table.py b/tools/overlayhelpers/damage_table.py index 47ee6d8fa6..63587f5365 100755 --- a/tools/overlayhelpers/damage_table.py +++ b/tools/overlayhelpers/damage_table.py @@ -132,7 +132,7 @@ def get_damage_bytes(address, repo): print(file_result) - with open(repo + os.sep + "baserom" + os.sep + file_result.name, "rb") as ovl_file: + with open(repo + os.sep + "baseroms/gc-eu-mq-dbg/segments" + os.sep + file_result.name, "rb") as ovl_file: ovl_data = bytearray(ovl_file.read()) damage_data = ovl_data[file_result.offset:file_result.offset+0x20] diff --git a/tools/overlayhelpers/lmapmark.py b/tools/overlayhelpers/lmapmark.py index cd13ea98cc..cf5f111872 100644 --- a/tools/overlayhelpers/lmapmark.py +++ b/tools/overlayhelpers/lmapmark.py @@ -72,7 +72,7 @@ repo = scriptDir + os.sep + ".." + os.sep + ".." kaleido_scope_data = [] -with open(repo + "/baserom/ovl_kaleido_scope", "rb") as file: +with open(repo + "/baseroms/gc-eu-mq-dbg/segments/ovl_kaleido_scope", "rb") as file: kaleido_scope_data = bytearray(file.read()) scenemaps = [] diff --git a/tools/overlayhelpers/mapmark.py b/tools/overlayhelpers/mapmark.py index 44b2ec92a8..b354bd9d0e 100644 --- a/tools/overlayhelpers/mapmark.py +++ b/tools/overlayhelpers/mapmark.py @@ -97,7 +97,7 @@ repo = scriptDir + os.sep + ".." + os.sep + ".." map_mark_data = [] -with open(repo + "/baserom/ovl_map_mark_data", "rb") as file: +with open(repo + "/baseroms/gc-eu-mq-dbg/segments/ovl_map_mark_data", "rb") as file: map_mark_data = bytearray(file.read()) scenemaps = [] diff --git a/tools/spec.c b/tools/spec.c index 7966a1f326..3f130b07a5 100644 --- a/tools/spec.c +++ b/tools/spec.c @@ -127,6 +127,7 @@ static const char *const stmtNames[] = [STMT_after] = "after", [STMT_align] = "align", [STMT_beginseg] = "beginseg", + [STMT_compress] = "compress", [STMT_endseg] = "endseg", [STMT_entry] = "entry", [STMT_flags] = "flags", @@ -216,10 +217,13 @@ bool parse_segment_statement(struct Segment *currSeg, STMTId stmt, char* args, i currSeg->includes[currSeg->includesCount - 1].linkerPadding = 0; currSeg->includes[currSeg->includesCount - 1].dataWithRodata = (stmt == STMT_include_data_with_rodata); break; - case STMT_increment: + case STMT_increment: if (!parse_number(args, &currSeg->increment)) util_fatal_error("line %i: expected number after 'increment'", lineNum); break; + case STMT_compress: + currSeg->compress = true; + break; case STMT_pad_text: currSeg->includes[currSeg->includesCount - 1].linkerPadding += 0x10; break; diff --git a/tools/spec.h b/tools/spec.h index f87f83ec80..8591a6b372 100644 --- a/tools/spec.h +++ b/tools/spec.h @@ -9,6 +9,7 @@ typedef enum { STMT_after, STMT_align, STMT_beginseg, + STMT_compress, STMT_endseg, STMT_entry, STMT_flags, @@ -48,6 +49,7 @@ typedef struct Segment { uint32_t number; struct Include* includes; int includesCount; + bool compress; } Segment; void parse_rom_spec(char* spec, struct Segment** segments, int* segment_count);