merge

Dockerfile

@@ -1,21 +1,22 @@
-FROM ubuntu:18.04 as build
+FROM ubuntu:21.10 as build
+ENV TZ=UTC
 
-RUN apt-get update && \
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
+    apt-get update && \
     apt-get install -y \
         binutils-mips-linux-gnu \
         build-essential \
         pkg-config \
         python3 \
         python3-pip \
-        wget \
         git \
+        wget \
         unzip \
         clang-tidy \
         clang-format \
-        clang-format-11 \
+        libpng-dev && \
-        nano \
+    apt-get clean && \
-        vbindiff \
+    rm -rf /var/lib/apt/lists/*
-        libpng-dev
 
 RUN python3 -m pip install --user colorama ansiwrap attrs watchdog python-Levenshtein
 RUN python3 -m pip install --upgrade attrs pycparser
@@ -24,3 +25,6 @@ ENV LANG C.UTF-8
 
 RUN mkdir /oot
 WORKDIR /oot
+
+CMD ["/bin/sh", "-c", \
+    "echo 'usage:\n  docker run --rm --mount type=bind,source=\"$(pwd)\",destination=/oot oot make -j$(nproc) setup\n  docker run --rm --mount type=bind,source=\"$(pwd)\",destination=/oot oot make -j$(nproc)'"]

Jenkinsfile

@@ -39,9 +39,9 @@ pipeline {
             }
             steps {
                 sh 'mkdir reports'
-                sh 'python3 progress.py csv >> reports/progress.csv'
+                sh 'python3 progress.py csv >> reports/progress-oot-nonmatching.csv'
-                sh 'python3 progress.py csv -m >> reports/progress_matching.csv'
+                sh 'python3 progress.py csv -m >> reports/progress-oot-matching.csv'
-                sh 'python3 progress.py shield-json > reports/progress_shield.json'
+                sh 'python3 progress.py shield-json > reports/progress-oot-shield.json'
                 stash includes: 'reports/*', name: 'reports'
             }
         }
@@ -54,9 +54,9 @@ pipeline {
             }
             steps {
                 unstash 'reports'
-                sh 'cat reports/progress.csv >> /var/www/html/reports/progress.csv'
+                sh 'cat reports/progress-oot-nonmatching.csv >> /var/www/zelda64.dev/assets/csv/progress-oot-nonmatching.csv'
-                sh 'cat reports/progress_matching.csv >> /var/www/html/reports/progress_matching.csv'
+                sh 'cat reports/progress-oot-matching.csv >> /var/www/zelda64.dev/assets/csv/progress-oot-matching.csv'
-                sh 'cat reports/progress_shield.json > /var/www/html/reports/progress_shield.json'
+                sh 'cat reports/progress-oot-shield.json > /var/www/zelda64.dev/assets/csv/progress-oot-shield.json'
             }
         }
     }

Makefile

@@ -30,6 +30,10 @@ ifeq ($(COMPILER),gcc)
   NON_MATCHING := 1
 endif
 
+# Set prefix to mips binutils binaries (mips-linux-gnu-ld => 'mips-linux-gnu-') - Change at your own risk!
+# In nearly all cases, not having 'mips-linux-gnu-*' binaries on the PATH is indicative of missing dependencies
+MIPS_BINUTILS_PREFIX ?= mips-linux-gnu-
+
 ifeq ($(NON_MATCHING),1)
   CFLAGS += -DNON_MATCHING
   CPPFLAGS += -DNON_MATCHING
@@ -55,11 +59,11 @@ else
     endif
 endif
 
+N_THREADS ?= $(shell nproc)
+
 #### Tools ####
-ifeq ($(shell type mips-linux-gnu-ld >/dev/null 2>/dev/null; echo $$?), 0)
+ifneq ($(shell type $(MIPS_BINUTILS_PREFIX)ld >/dev/null 2>/dev/null; echo $$?), 0)
-  MIPS_BINUTILS_PREFIX := mips-linux-gnu-
+  $(error Please install or build $(MIPS_BINUTILS_PREFIX))
-else
-  $(error Please install or build mips-linux-gnu)
 endif
 
 # Detect compiler and set variables appropriately.
@@ -105,6 +109,7 @@ MKLDSCRIPT := tools/mkldscript
 MKDMADATA  := tools/mkdmadata
 ELF2ROM    := tools/elf2rom
 ZAPD       := tools/ZAPD/ZAPD.out
+FADO       := tools/fado/fado.elf
 
 OPTFLAGS := -O2
 ASFLAGS := -march=vr4300 -32 -Iinclude
@@ -150,9 +155,12 @@ O_FILES       := $(foreach f,$(S_FILES:.s=.o),build/$f) \
                  $(foreach f,$(C_FILES:.c=.o),build/$f) \
                  $(foreach f,$(wildcard baserom/*),build/$f.o)
 
+OVL_RELOC_FILES := $(shell $(CPP) $(CPPFLAGS) $(SPEC) | grep -o '[^"]*_reloc.o' )
+
 # Automatic dependency files
-# (Only asm_processor dependencies are handled for now)
+# (Only asm_processor dependencies and reloc dependencies are handled for now)
-DEP_FILES := $(O_FILES:.o=.asmproc.d)
+DEP_FILES := $(O_FILES:.o=.asmproc.d) $(OVL_RELOC_FILES:.o=.d)
+
 
 TEXTURE_FILES_PNG := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.png))
 TEXTURE_FILES_JPG := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.jpg))
@@ -185,6 +193,8 @@ build/src/libultra/libc/%.o: OPTFLAGS := -O2
 build/src/libultra/rmon/%.o: OPTFLAGS := -O2
 build/src/libultra/gu/%.o: OPTFLAGS := -O2
 
+build/assets/misc/z_select_static/%.o: CFLAGS += -DF3DEX_GBI
+
 build/src/libultra/gu/%.o: CC := $(CC_OLD)
 build/src/libultra/io/%.o: CC := $(CC_OLD)
 build/src/libultra/libc/%.o: CC := $(CC_OLD)
@@ -211,21 +221,6 @@ ifeq ($(COMPARE),1)
 	@md5sum -c checksum.md5
 endif
 
-$(ROM): $(ELF)
-	$(ELF2ROM) -cic 6105 $< $@
-
-$(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(O_FILES) build/ldscript.txt build/undefined_syms.txt
-	$(LD) -T build/undefined_syms.txt -T build/ldscript.txt --no-check-sections --accept-unknown-input-arch --emit-relocs -Map build/z64.map -o $@
-
-build/$(SPEC): $(SPEC)
-	$(CPP) $(CPPFLAGS) $< > $@
-
-build/ldscript.txt: build/$(SPEC)
-	$(MKLDSCRIPT) $< $@
-
-build/undefined_syms.txt: undefined_syms.txt
-	$(CPP) $(CPPFLAGS) $< > build/undefined_syms.txt
-
 clean:
 	$(RM) -r $(ROM) $(ELF) build
 
@@ -243,16 +238,44 @@ setup:
 	$(MAKE) -C tools
 	python3 fixbaserom.py
 	python3 extract_baserom.py
-	python3 extract_assets.py
+	python3 extract_assets.py -j$(N_THREADS)
 
-resources: $(ASSET_FILES_OUT)
 test: $(ROM)
 	$(EMULATOR) $(EMU_FLAGS) $<
 
+
 .PHONY: all clean setup test distclean assetclean
 
 #### Various Recipes ####
 
+$(ROM): $(ELF)
+	$(ELF2ROM) -cic 6105 $< $@
+
+$(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(O_FILES) $(OVL_RELOC_FILES) build/ldscript.txt build/undefined_syms.txt
+	$(LD) -T build/undefined_syms.txt -T build/ldscript.txt --no-check-sections --accept-unknown-input-arch --emit-relocs -Map build/z64.map -o $@
+
+## Order-only prerequisites 
+# These ensure e.g. the O_FILES are built before the OVL_RELOC_FILES.
+# The intermediate phony targets avoid quadratically-many dependencies between the targets and prerequisites.
+
+o_files: $(O_FILES)
+$(OVL_RELOC_FILES): | o_files
+
+asset_files: $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT)
+$(O_FILES): | asset_files
+
+.PHONY: o_files asset_files
+
+
+build/$(SPEC): $(SPEC)
+	$(CPP) $(CPPFLAGS) $< > $@
+
+build/ldscript.txt: build/$(SPEC)
+	$(MKLDSCRIPT) $< $@
+
+build/undefined_syms.txt: undefined_syms.txt
+	$(CPP) $(CPPFLAGS) $< > $@
+
 build/baserom/%.o: baserom/%
 	$(OBJCOPY) -I binary -O elf32-big $< $@
 
@@ -260,7 +283,7 @@ build/asm/%.o: asm/%.s
 	$(AS) $(ASFLAGS) $< -o $@
 
 build/data/%.o: data/%.s
-	iconv --from UTF-8 --to EUC-JP $< | $(AS) $(ASFLAGS) -o $@
+	$(AS) $(ASFLAGS) $< -o $@
 
 build/assets/text/%.enc.h: assets/text/%.h assets/text/charmap.txt
 	python3 tools/msgenc.py assets/text/charmap.txt $< $@
@@ -280,13 +303,6 @@ build/dmadata_table_spec.h: build/$(SPEC)
 build/src/boot/z_std_dma.o: build/dmadata_table_spec.h
 build/src/dmadata/dmadata.o: build/dmadata_table_spec.h
 
-build/src/overlays/%.o: src/overlays/%.c
-	$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $<
-	$(CC_CHECK) $<
-	$(ZAPD) bovl -eh -i $@ -cfg $< --outputpath $(@D)/$(notdir $(@D))_reloc.s $(ZAPDFLAGS)
-	-test -f $(@D)/$(notdir $(@D))_reloc.s && $(AS) $(ASFLAGS) $(@D)/$(notdir $(@D))_reloc.s -o $(@D)/$(notdir $(@D))_reloc.o
-	@$(OBJDUMP) -d $@ > $(@:.o=.s)
-
 build/src/%.o: src/%.c
 	$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $<
 	$(CC_CHECK) $<
@@ -304,6 +320,10 @@ build/src/libultra/libc/llcvt.o: src/libultra/libc/llcvt.c
 	python3 tools/set_o32abi_bit.py $@
 	@$(OBJDUMP) -d $@ > $(@:.o=.s)
 
+build/src/overlays/%_reloc.o: build/$(SPEC)
+	$(FADO) $$(tools/reloc_prereq $< $(notdir $*)) -n $(notdir $*) -o $(@:.o=.s) -M $(@:.o=.d)
+	$(AS) $(ASFLAGS) $(@:.o=.s) -o $@
+
 build/%.inc.c: %.png
 	$(ZAPD) btex -eh -tt $(subst .,,$(suffix $*)) -i $< -o $@
 

README.md

@@ -5,8 +5,8 @@
 [jenkins]: https://jenkins.deco.mp/job/OOT/job/master
 [jenkins-badge]: https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins.deco.mp%2Fjob%2FOOT%2Fjob%2Fmaster
 
-[progress]: https://zelda64.dev/progress.html
+[progress]: https://zelda64.dev/games/oot
-[progress-badge]: https://img.shields.io/endpoint?url=https://zelda64.dev/reports/progress_shield.json
+[progress-badge]: https://img.shields.io/endpoint?url=https://zelda64.dev/assets/csv/progress-oot-shield.json
 
 [contributors]: https://github.com/zeldaret/oot/graphs/contributors
 [contributors-badge]: https://img.shields.io/github/contributors/zeldaret/oot
@@ -39,37 +39,24 @@ It builds the following ROM:
 
 ## Installation
 
+We recommend using WSL on Windows, or native Linux, which the rest of this readme describes. We currently have instructions for
+
+* [Windows](#Windows), with and without WSL
+* [macOS](docs/BUILDING_MACOS.md)
+* [Linux](#Linux-Native-or-under-WSL--VM), natively or using WSL / VM
+* [Docker](docs/BUILDING_DOCKER.md)
+
+(These will also depend on the Linux instructions.)
+Some of these may also be out of date or unmaintained; usually our contributors use WSL, Linux, and macOS, so these instructions should be up to date.
+
 ### Windows
 
-For Windows 10, install WSL and a distribution by following this
+For Windows 10 or 11, install WSL and a distribution by following this
-[Windows Subsystem for Linux Installation Guide](https://docs.microsoft.com/en-us/windows/wsl/install-win10).
+[WSL Installation Guide](https://docs.microsoft.com/en-us/windows/wsl/install).
-We recommend using Debian or Ubuntu 18.04 Linux distributions.
+We recommend using Ubuntu 20.04 as the Linux distribution.
 
-For older versions of Windows, install a Linux VM or refer to either [Cygwin](#Cygwin) or [Docker](#Docker) instructions.
+For older versions of Windows, install a Linux VM or refer to either [Cygwin](docs/BUILDING_CYGWIN.md) or [Docker](docs/BUILDING_DOCKER.md) instructions.
 
-### macOS
-
-For macOS, use homebrew to install the following dependencies:
-
-* coreutils
-* make
-* python3
-* md5sha1sum
-* libpng
-
-You can install them with the following commands:
-
-```bash
-brew update
-brew install coreutils make python3 md5sha1sum libpng
-```
-
-You'll also need to [build and install mips-linux-binutils](docs/BUILDING_BINUTILS_MACOS.md).
-
-Going forward in this guide, please use `gmake` whenever you encounter a `make` command.
-The `make` that comes with MacOS behaves differently than GNU make and is incompatible with this project.
-
-You should now be able to continue from [step 2](#2-clone-the-repository) of the Linux instructions.
 
 ### Linux (Native or under WSL / VM)
 
@@ -90,6 +77,12 @@ sudo apt-get update
 sudo apt-get install git build-essential binutils-mips-linux-gnu python3 libpng-dev
 ```
 
+To install the Python dependencies simply run in a terminal:
+
+```bash
+python3 -m pip install colorama
+```
+
 If you are using GCC as the compiler for Ocarina of Time, you will also need:
 
 * gcc-mips-linux-gnu
@@ -102,6 +95,12 @@ Clone `https://github.com/zeldaret/oot.git` where you wish to have the project,
 git clone https://github.com/zeldaret/oot.git
 ```
 
+This will copy the GitHub repository contents into a new folder in the current directory called `oot`. Change into this directory before doing anything else:
+
+```bash
+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.
@@ -143,62 +142,12 @@ md5sum: WARNING: 1 computed checksum did NOT match
 This means that the built ROM isn't the same as the base one, so something went wrong or some part of the code doesn't match.
 
 **NOTE:** to speed up the build, you can either:
+
 * pass `-jN` to `make setup` and `make`, where N is the number of threads to use in the build. The generally-accepted wisdom is to use the number of virtual cores your computer has.
 * pass `-j` to `make setup` and `make`, to use as many threads as possible, but beware that this can use too much memory on lower-end systems.
 
 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`).
 
-### Cygwin
-
-If you want to use Cygwin, you will need to:
-
-* Download and install [Git Bash](https://git-scm.com/download/win).
-* Download and install [Cygwin](https://cygwin.com).
-* [Build and install mips-linux-binutils](docs/BUILDING_BINUTILS_CYGWIN.md).
-
-Once mips-linux-binutils is installed you will need to install the following packages using Cygwin's installer:
-
-* libiconv
-* dos2unix
-* python3
-* libpng-devel
-
-Then you can continue from step [step 2](#2-clone-the-repository) of the Linux instructions.
-
-Note that, before building anything, you will need to run the following commands to fix line endings:
-
-```bash
-dos2unix fixle.sh
-./fixle.sh
-```
-
-### Docker
-
-#### 1. Setup requirements
-
-To use Docker, you'll need either Docker Desktop or Docker Toolbox installed and setup based on your system.
-
-You'll also need to prepare a local version of the project with a copied base ROM (see steps [2](#2-clone-the-repository) and [3](#3-prepare-a-base-rom) of the Linux instructions).
-
-#### 2. Create the docker image
-
-From inside your local project, run the following command:
-
-```bash
-docker build . -t oot
-```
-
-#### 3. Start the container
-
-To start the container, you can mount your local filesystem into the docker container and run an interactive bash session.
-
-```bash
-docker run -it --rm --mount type=bind,source="$(pwd)",destination=/oot oot /bin/bash
-```
-
-#### 4. Setup and Build the ROM
-
-Once inside the container, you can follow steps [4](#4-setup-the-rom-and-build-process) and [5](#5-build-the-rom) of the Linux instructions to setup and build the ROM, or run any other command you need.
 
 ## Contributing
 

assets/xml/misc/z_select_static.xml

@@ -0,0 +1,40 @@
+<Root>
+    <File Name="z_select_static" Segment="1">
+        <DList Name="gSelectStatic1DL" Ucode="f3dex" Offset="0x0"/>
+        <DList Name="gSelectStatic2DL" Ucode="f3dex" Offset="0x68"/>
+        <DList Name="gSelectStatic3DL" Ucode="f3dex" Offset="0xD0"/>
+        <DList Name="gSelectStatic4DL" Ucode="f3dex" Offset="0x140"/>
+        <DList Name="gSelectStatic5DL" Ucode="f3dex" Offset="0x1A8"/>
+        <DList Name="gSelectStatic6DL" Ucode="f3dex" Offset="0x210"/>
+        <DList Name="gSelectStatic7DL" Ucode="f3dex" Offset="0x278"/>
+        <DList Name="gSelectStatic8DL" Ucode="f3dex" Offset="0x2E8"/>
+        <DList Name="gSelectStatic9DL" Ucode="f3dex" Offset="0x350"/>
+        <DList Name="gSelectStatic10DL" Ucode="f3dex" Offset="0x3B8"/>
+        <DList Name="gSelectStatic11DL" Ucode="f3dex" Offset="0x420"/>
+        <DList Name="gSelectStatic12DL" Ucode="f3dex" Offset="0x488"/>
+        <DList Name="gSelectStatic13DL" Ucode="f3dex" Offset="0x4F8"/>
+        <DList Name="gSelectStatic14DL" Ucode="f3dex" Offset="0x560"/>
+        <DList Name="gSelectStatic15DL" Ucode="f3dex" Offset="0x5C8"/>
+        <DList Name="gSelectStatic16DL" Ucode="f3dex" Offset="0x630"/>
+        <DList Name="gSelectStatic17DL" Ucode="f3dex" Offset="0x698"/>
+        <DList Name="gSelectStatic18DL" Ucode="f3dex" Offset="0x700"/>
+        <DList Name="gSelectStatic19DL" Ucode="f3dex" Offset="0x770"/>
+        <DList Name="gSelectStatic20DL" Ucode="f3dex" Offset="0x7D8"/>
+        <DList Name="gSelectStatic21DL" Ucode="f3dex" Offset="0x840"/>
+        <DList Name="gSelectStatic22DL" Ucode="f3dex" Offset="0x8A8"/>
+        <DList Name="gSelectStatic23DL" Ucode="f3dex" Offset="0x918"/>
+        <DList Name="gSelectStatic24DL" Ucode="f3dex" Offset="0x980"/>
+        <DList Name="gSelectStatic25DL" Ucode="f3dex" Offset="0x9E8"/>
+        <DList Name="gSelectStatic26DL" Ucode="f3dex" Offset="0xA50"/>
+        <DList Name="gSelectStatic27DL" Ucode="f3dex" Offset="0xAB8"/>
+        <DList Name="gSelectStatic28DL" Ucode="f3dex" Offset="0xB20"/>
+        <DList Name="gSelectStatic29DL" Ucode="f3dex" Offset="0xB88"/>
+        <DList Name="gSelectStatic30DL" Ucode="f3dex" Offset="0xBF0"/>
+        <DList Name="gSelectStatic31DL" Ucode="f3dex" Offset="0xC60"/>
+        <DList Name="gSelectStatic32DL" Ucode="f3dex" Offset="0xCD0"/>
+        <DList Name="gSelectStaticMasterDL" Ucode="f3dex" Offset="0xE88"/>
+        <Array Name="gSelectStaticVtx" Count="294" Offset="0xF98">
+            <Vtx/>
+        </Array>
+    </File>
+</Root>

assets/xml/objects/gameplay_dangeon_keep.xml

@@ -6,6 +6,7 @@
         <DList Name="gDoorLockDL" Offset="0x1100"/>
         <DList Name="gDoorChainsDL" Offset="0x11F0"/>
         <Texture Name="gUnusedGoldLockTex" OutName="unused_gold_lock" Format="rgba16" Width="32" Height="32" Offset="0x1A80"/>
+        <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x2280"/>
         <DList Name="gUnusedBombBagDL" Offset="0x32C0"/>
         <Texture Name="gPushBlockSilverTex" OutName="block_silver" Format="i4" Width="64" Height="64" Offset="0x3350"/>
         <Texture Name="gPushBlockBaseTex" OutName="block_base" Format="i4" Width="64" Height="64" Offset="0x3B50"/>
@@ -39,6 +40,7 @@
         <Texture Name="gEyeSwitchSilverHalfTex" OutName="eye_silver_half" Format="rgba16" Width="32" Height="32" Offset="0xB8A0"/>
         <Texture Name="gEyeSwitchSilverClosedTex" OutName="eye_silver_closed" Format="rgba16" Width="32" Height="32" Offset="0xC0A0"/>
         <Texture Name="gDungeonKeepTex_00C8A0" OutName="dungeon_keep_tex_00C8A0" Format="rgba16" Width="32" Height="32" Offset="0xC8A0"/>
+        <Texture Name="gDungeonkeepTex_00D0A0" OutName="dungeon_keep_tex_00D0A0" Format="rgba16" Width="32" Height="32" Offset="0xD0A0"/>
         <Texture Name="gDungeonKeepTex_00E8A0" OutName="dungeon_keep_tex_00E8A0" Format="i8" Width="32" Height="32" Offset="0xE8A0"/>
         <Texture Name="gDungeonKeepTex_00ECA0" OutName="dungeon_keep_tex_00ECA0" Format="i8" Width="32" Height="32" Offset="0xECA0"/>
         <Texture Name="gDungeonKeepTex_00F0A0" OutName="dungeon_keep_tex_00F0A0" Format="rgba16" Width="32" Height="32" Offset="0xF0A0"/>

assets/xml/objects/gameplay_field_keep.xml

@@ -23,7 +23,7 @@
         <Texture Name="gButterflyWingTex" OutName="butterfly_wing" Format="rgba16" Width="32" Height="64" Offset="0x2680"/>
         <Skeleton Name="gButterflySkel" Type="Normal" LimbType="Standard" Offset="0x36F0"/>
         <Animation Name="gButterflyAnim" Offset="0x2470"/>
-        <Texture Name="gBgBombwallTLUT" OutName="bombwall_palette" Format="rgba16" Width="4" Height="4" Offset="0x3700"/>
+        <Texture Name="gBgBombwallTLUT" OutName="bombwall_tlut" Format="rgba16" Width="4" Height="4" Offset="0x3700"/>
         <Texture Name="gBgBombwallNormalTex" OutName="bombwall_normal" Format="ci4" Width="32" Height="64" Offset="0x3720" TlutOffset="0x3700"/>
         <Texture Name="gBgBombWallBrokenTex" OutName="bombwall_broken" Format="ci4" Width="32" Height="64" Offset="0x3B20" TlutOffset="0x3700"/>
         <DList Name="gFieldDoorDL_004720" Offset="0x4720"/>
@@ -52,11 +52,11 @@
         <Texture Name="gFieldBeehiveTex" OutName="beehive" Format="rgba16" Width="32" Height="32" Offset="0x8900"/>
         <Texture Name="gFieldBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0x9710"/>
         <Texture Name="gFieldSilverRockTex" OutName="silver_rock" Format="ci4" Width="64" Height="64" Offset="0x99F8" TlutOffset="0x99D0"/>
-        <Texture Name="gFieldSilverRockTLUT" OutName="silver_rock_palette" Format="rgba16" Width="4" Height="4" Offset="0x99D0"/>
+        <Texture Name="gFieldSilverRockTLUT" OutName="silver_rock_tlut" Format="rgba16" Width="4" Height="4" Offset="0x99D0"/>
 
         <Texture Name="gFieldSandstorm1Tex" OutName="sandstorm_1" Format="i8" Width="64" Height="32" Offset="0xBA70"/>
         <Texture Name="gFieldSandstorm2Tex" OutName="sandstorm_2" Format="ia8" Width="64" Height="32" Offset="0xC270"/>
         <DList Name="gFieldSandstormDL" Offset="0xCA70"/>
-        <Blob Name="gFieldUnaccounted_00CB30" Size="0x800"/>
+        <Texture Name="gFieldKeepTex_00CB30" OutName="gFieldKeep_00CB30" Format="rgba16" Width="32" Height="32" Offset="0xCB30"/>
     </File>
 </Root>

assets/xml/objects/gameplay_keep.xml

@@ -704,6 +704,10 @@
         <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x190B0"/>
         <DList Name="gEffShockwaveDL" Offset="0x1A0B0"/>
         <DList Name="gEffBubbleDL" Offset="0x1A160"/>
+        <Array Name="gGameplayKeepVtx_01A120" Count="4" Offset="0x1A120">
+            <Vtx/>
+        </Array>
+
         <Texture Name="gEffFireFootprint1Tex" OutName="eff_fire_footprint_1" Format="ia8" Width="32" Height="32" Offset="0x1A220"/>
         <Texture Name="gEffFireFootprint2Tex" OutName="eff_fire_footprint_2" Format="ia8" Width="32" Height="32" Offset="0x1A620"/>
         <Texture Name="gEffFireFootprint3Tex" OutName="eff_fire_footprint_3" Format="ia8" Width="32" Height="32" Offset="0x1AA20"/>

assets/xml/objects/object_ahg.xml

@@ -1,7 +1,6 @@
 <Root>
     <File Name="object_ahg" Segment="6">
-        <!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
-        <!-- 
         <Limb Name="object_ahg_Limb_000000" LimbType="Standard" Offset="0x0"/>
         <Limb Name="object_ahg_Limb_00000C" LimbType="Standard" Offset="0xC"/>
         <Limb Name="object_ahg_Limb_000018" LimbType="Standard" Offset="0x18"/>
@@ -17,28 +16,24 @@
         <Limb Name="object_ahg_Limb_000090" LimbType="Standard" Offset="0x90"/>
         <Limb Name="object_ahg_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
         <Limb Name="object_ahg_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
-        -->
 
-        <!-- 
         <Skeleton Name="object_ahg_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
-        -->
 
         <!-- 32-bit aligned textures. -->
-        <!--
         <Texture Name="object_ahg_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
         <Texture Name="object_ahg_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="16" Height="16" Offset="0x2FC"/>
         <Texture Name="object_ahg_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="16" Height="16" Offset="0x3FC"/>
         <Texture Name="object_ahg_Tex_0004FC" OutName="tex_000004FC" Format="ci8" Width="8" Height="8" Offset="0x4FC"/>
         <Texture Name="object_ahg_Tex_00053C" OutName="tex_0000053C" Format="ci8" Width="8" Height="8" Offset="0x53C"/>
-        <Blob Name="object_ahg_Blob_00057C" Size="0x300" Offset="0x57C"/>
+        <Texture Name="object_ahg_Tex_00057C" OutName="tex_0000057C" Format="ci8" Width="16" Height="16" Offset="0x57C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00067C" OutName="tex_0000067C" Format="ci8" Width="16" Height="16" Offset="0x67C" TlutOffset="0xFC"/>
+        <Texture Name="object_ahg_Tex_00077C" OutName="tex_0000077C" Format="ci8" Width="16" Height="16" Offset="0x77C" TlutOffset="0xFC"/>
         <Texture Name="object_ahg_Tex_00087C" OutName="tex_0000087C" Format="ci8" Width="16" Height="16" Offset="0x87C"/>
         <Texture Name="object_ahg_Tex_00097C" OutName="tex_0000097C" Format="i8" Width="8" Height="8" Offset="0x97C"/>
         <Texture Name="object_ahg_Tex_0009BC" OutName="tex_000009BC" Format="i8" Width="8" Height="8" Offset="0x9BC"/>
         <Texture Name="object_ahg_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="16" Offset="0x9FC"/>
         <Texture Name="object_ahg_Tex_000BFC" OutName="tex_00000BFC" Format="ci8" Width="16" Height="16" Offset="0xBFC"/>
-        -->
 
-        <!--
         <DList Name="object_ahg_DL_0030F0" Offset="0x30F0"/>
         <DList Name="object_ahg_DL_003500" Offset="0x3500"/>
         <DList Name="object_ahg_DL_003670" Offset="0x3670"/>
@@ -54,7 +49,6 @@
         <DList Name="object_ahg_DL_0043C0" Offset="0x43C0"/>
         <DList Name="object_ahg_DL_0044F0" Offset="0x44F0"/>
         <DList Name="object_ahg_DL_004628" Offset="0x4628"/>
-        -->
 
         <!-- <Blob Name="object_ahg_Blob_0047C8" Size="0x180" Offset="0x47C8"/> -->
         <Texture Name="object_ahg_Tex_004948" OutName="tex_00004948" Format="ci8" Width="8" Height="8" Offset="0x4948"/>

assets/xml/objects/object_bdoor.xml

@@ -1,10 +1,15 @@
 <Root>
     <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
     <File Name="object_bdoor" Segment="6">
-        <Blob Name="object_bdoor_Blob_000000" Size="0x1000" Offset="0x0"/>
+        <Texture Name="object_bdoor_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
         <DList Name="object_bdoor_DL_0010C0" Offset="0x10C0"/>
         <DList Name="object_bdoor_DL_001400" Offset="0x1400"/>
         <DList Name="object_bdoor_DL_001530" Offset="0x1530"/>
-        <Blob Name="object_bdoor_Blob_0015C0" Size="0x6000" Offset="0x15C0"/>
+        <Texture Name="object_bdoor_Tex_0015C0" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
+        <Texture Name="object_bdoor_Tex_0025C0" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
+        <Texture Name="object_bdoor_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
+        <Texture Name="object_bdoor_Tex_0045C0" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
+        <Texture Name="object_bdoor_Tex_0055C0" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Texture Name="object_bdoor_Tex_0065C0" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
     </File>
 </Root>

assets/xml/objects/object_bji.xml

@@ -1,7 +1,6 @@
 <Root>
     <File Name="object_bji" Segment="6">
-        <!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
-        <!-- 
         <Limb Name="object_bji_Limb_000000" LimbType="Standard" Offset="0x0"/>
         <Limb Name="object_bji_Limb_00000C" LimbType="Standard" Offset="0xC"/>
         <Limb Name="object_bji_Limb_000018" LimbType="Standard" Offset="0x18"/>
@@ -17,14 +16,10 @@
         <Limb Name="object_bji_Limb_000090" LimbType="Standard" Offset="0x90"/>
         <Limb Name="object_bji_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
         <Limb Name="object_bji_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
-        -->
 
-        <!-- 
         <Skeleton Name="object_bji_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
-        -->
 
         <!-- 32-bit aligned textures. -->
-        <!--
         <Texture Name="object_bji_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
         <Texture Name="object_bji_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC"/>
         <Texture Name="object_bji_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C"/>
@@ -32,11 +27,11 @@
         <Texture Name="object_bji_Tex_00047C" OutName="tex_0000047C" Format="ci8" Width="8" Height="8" Offset="0x47C"/>
         <Texture Name="object_bji_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC"/>
         <Texture Name="object_bji_Tex_0004FC" OutName="tex_000004FC" Format="i8" Width="16" Height="16" Offset="0x4FC"/>
-        <Blob Name="object_bji_Blob_0005FC" Size="0xC00" Offset="0x5FC"/>
+        <Texture Name="object_bji_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="32" Height="32" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="32" Offset="0x9FC" TlutOffset="0xFC"/>
+        <Texture Name="object_bji_Tex_000DFC" OutName="tex_00000DFC" Format="ci8" Width="32" Height="32" Offset="0xDFC" TlutOffset="0xFC"/>
         <Texture Name="object_bji_Tex_0011FC" OutName="tex_000011FC" Format="i8" Width="8" Height="8" Offset="0x11FC"/>
-        -->
 
-        <!--
         <DList Name="object_bji_DL_002560" Offset="0x2560"/>
         <DList Name="object_bji_DL_002B88" Offset="0x2B88"/>
         <DList Name="object_bji_DL_002C50" Offset="0x2C50"/>
@@ -52,7 +47,6 @@
         <DList Name="object_bji_DL_003648" Offset="0x3648"/>
         <DList Name="object_bji_DL_003710" Offset="0x3710"/>
         <DList Name="object_bji_DL_0037D8" Offset="0x37D8"/>
-        -->
 
         <Texture Name="object_bji_Tex_003908" OutName="tex_00003908" Format="rgba16" Width="8" Height="8" Offset="0x3908"/>
         <Texture Name="object_bji_Tex_003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>

assets/xml/objects/object_bob.xml

@@ -21,7 +21,9 @@
         <Texture Name="object_bob_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
         <Texture Name="object_bob_Tex_000388" OutName="tex_00000388" Format="ci8" Width="32" Height="32" Offset="0x388" TlutOffset="0x108"/>
         <Texture Name="object_bob_Tex_000788" OutName="tex_00000788" Format="ci8" Width="8" Height="8" Offset="0x788" TlutOffset="0x108"/>
-        <Blob Name="object_bob_Blob_0007C8" Size="0x1800" Offset="0x7C8"/>
+        <Texture Name="object_bob_Tex_0007C8" OutName="tex_000007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8"/>
+        <Texture Name="object_bob_Tex_000FC8" OutName="tex_00000FC8" Format="rgba16" Width="32" Height="32" Offset="0xFC8"/>
+        <Texture Name="object_bob_Tex_0017C8" OutName="tex_000017C8" Format="rgba16" Width="32" Height="32" Offset="0x17C8"/>
         <Texture Name="object_bob_Tex_001FC8" OutName="tex_00001FC8" Format="ci8" Width="16" Height="16" Offset="0x1FC8" TlutOffset="0x108"/>
         <Texture Name="object_bob_Tex_0020C8" OutName="tex_000020C8" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x108"/>
         <Texture Name="object_bob_Tex_0021C8" OutName="tex_000021C8" Format="ci8" Width="8" Height="8" Offset="0x21C8" TlutOffset="0x108"/>

assets/xml/objects/object_boj.xml

@@ -1,7 +1,6 @@
 <Root>
     <File Name="object_boj" Segment="6">
-        <!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
-        <!-- 
         <Limb Name="object_boj_Limb_000000" LimbType="Standard" Offset="0x0"/>
         <Limb Name="object_boj_Limb_00000C" LimbType="Standard" Offset="0xC"/>
         <Limb Name="object_boj_Limb_000018" LimbType="Standard" Offset="0x18"/>
@@ -17,20 +16,18 @@
         <Limb Name="object_boj_Limb_000090" LimbType="Standard" Offset="0x90"/>
         <Limb Name="object_boj_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
         <Limb Name="object_boj_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
-        -->
 
-        <!--
         <Skeleton Name="object_boj_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
-        -->
 
         <!-- 32-bit aligned textures. -->
-        <!--
         <Texture Name="object_boj_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
         <Texture Name="object_boj_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="16" Offset="0x2FC"/>
         <Texture Name="object_boj_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="8" Height="8" Offset="0x37C"/>
         <Texture Name="object_boj_Tex_0003BC" OutName="tex_000003BC" Format="ci8" Width="32" Height="16" Offset="0x3BC"/>
         <Texture Name="object_boj_Tex_0005BC" OutName="tex_000005BC" Format="ci8" Width="8" Height="8" Offset="0x5BC"/>
-        <Blob Name="object_boj_Blob_0005FC" Size="0x300" Offset="0x5FC"/>
+        <Texture Name="object_boj_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="16" Height="16" Offset="0x5FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0006FC" OutName="tex_000006FC" Format="ci8" Width="16" Height="16" Offset="0x6FC" TlutOffset="0xFC"/>
+        <Texture Name="object_boj_Tex_0007FC" OutName="tex_000007FC" Format="ci8" Width="16" Height="16" Offset="0x7FC" TlutOffset="0xFC"/>
         <Texture Name="object_boj_Tex_0008FC" OutName="tex_000008FC" Format="ci8" Width="8" Height="8" Offset="0x8FC"/>
         <Texture Name="object_boj_Tex_00093C" OutName="tex_0000093C" Format="i8" Width="16" Height="16" Offset="0x93C"/>
         <Texture Name="object_boj_Tex_000A3C" OutName="tex_00000A3C" Format="ci8" Width="8" Height="8" Offset="0xA3C"/>
@@ -50,7 +47,6 @@
         <DList Name="object_boj_DL_003798" Offset="0x3798"/>
         <DList Name="object_boj_DL_0038A8" Offset="0x38A8"/>
         <DList Name="object_boj_DL_0039B0" Offset="0x39B0"/>
-        -->
 
         <!-- <Blob Name="object_boj_Blob_003B98" Size="0x1F8" Offset="0x3B98"/> -->
         <Texture Name="object_boj_Tex_003D90" OutName="tex_00003D90" Format="ci8" Width="8" Height="8" Offset="0x3D90"/>

assets/xml/objects/object_bxa.xml

@@ -5,8 +5,9 @@
         <Texture Name="object_bxa_Tex_001440" OutName="tex_00001440" Format="rgba16" Width="32" Height="32" Offset="0x1440"/>
         <DList Name="object_bxa_DL_001D80" Offset="0x1D80"/>
         <DList Name="object_bxa_DL_0022F0" Offset="0x22F0"/>
-        <Blob Name="object_bxa_Blob_0024F0" Size="0x200" Offset="0x24F0"/>
+        <Texture Name="object_bxa_Tex_0024F0" OutName="tex_000024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
         <Texture Name="object_bxa_Tex_0026F0" OutName="tex_000026F0" Format="i8" Width="16" Height="16" Offset="0x26F0"/>
-        <Blob Name="object_bxa_Blob_0027F0" Size="0x400" Offset="0x27F0"/>
+        <Texture Name="object_bxa_Tex_0027F0" OutName="tex_000027F0" Format="rgba16" Width="16" Height="16" Offset="0x27F0"/>
+        <Texture Name="object_bxa_Tex_0029F0" OutName="tex_000029F0" Format="rgba16" Width="16" Height="16" Offset="0x29F0"/>
     </File>
 </Root>

assets/xml/objects/object_cne.xml

@@ -1,7 +1,6 @@
 <Root>
     <File Name="object_cne" Segment="6">
-        <!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
+        <!-- The textures used by these limbs aren't 64-bit aligned -->
-        <!-- 
         <Limb Name="object_cne_Limb_000000" LimbType="Standard" Offset="0x0"/>
         <Limb Name="object_cne_Limb_00000C" LimbType="Standard" Offset="0xC"/>
         <Limb Name="object_cne_Limb_000018" LimbType="Standard" Offset="0x18"/>
@@ -17,14 +16,10 @@
         <Limb Name="object_cne_Limb_000090" LimbType="Standard" Offset="0x90"/>
         <Limb Name="object_cne_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
         <Limb Name="object_cne_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
-        -->
 
-        <!--
         <Skeleton Name="object_cne_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
-        -->
 
         <!-- 32-bit aligned textures. -->
-        <!--
         <Texture Name="object_cne_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
         <Texture Name="object_cne_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC"/>
         <Texture Name="object_cne_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C"/>
@@ -33,9 +28,7 @@
         <Texture Name="object_cne_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="8" Height="16" Offset="0x3FC"/>
         <Texture Name="object_cne_Tex_00047C" OutName="tex_0000047C" Format="i8" Width="8" Height="8" Offset="0x47C"/>
         <Texture Name="object_cne_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC"/>
-        -->
 
-        <!--
         <DList Name="object_cne_DL_001300" Offset="0x1300"/>
         <DList Name="object_cne_DL_001608" Offset="0x1608"/>
         <DList Name="object_cne_DL_0016E8" Offset="0x16E8"/>
@@ -51,7 +44,6 @@
         <DList Name="object_cne_DL_002170" Offset="0x2170"/>
         <DList Name="object_cne_DL_002238" Offset="0x2238"/>
         <DList Name="object_cne_DL_002300" Offset="0x2300"/>
-        -->
 
         <Texture Name="object_cne_Tex_0023D0" OutName="tex_000023D0" Format="rgba16" Width="8" Height="16" Offset="0x23D0"/>
         <Texture Name="object_cne_Tex_0024D0" OutName="tex_000024D0" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/>

assets/xml/objects/object_ddan_objects.xml

@@ -20,7 +20,7 @@
         <!-- Dodongo's Cavern DisplayLists -->
         <DList Name="gDodongoDoorDL" Offset="0xC0"/>
         <DList Name="gDodongoBarsDL" Offset="0x1F0"/>
-        <DList Name="gDodongoLowerJarDL" Offset="0x1350"/>
+        <DList Name="gDodongoLowerJawDL" Offset="0x1350"/>
         <DList Name="gDodongoRisingPlatformDL" Offset="0x37B8"/>
         <DList Name="gDodongoFallingStairsDL" Offset="0x48A8"/>
 

assets/xml/objects/object_demo_6k.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_demo_6k" Segment="6">
         <Texture Name="object_demo_6k_Tex_000000" OutName="tex_00000000" Format="i8" Width="64" Height="64" Offset="0x0"/>
         <DList Name="object_demo_6k_DL_001040" Offset="0x1040"/>

assets/xml/objects/object_demo_kekkai.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_demo_kekkai" Segment="6">
         <!-- Demo_Kekkai -->
         <DList Name="gTowerBarrierDL" Offset="0x4930"/>

assets/xml/objects/object_dog.xml

@@ -1,41 +1,41 @@
 <Root>
     <File Name="object_dog" Segment="6">
-        <Animation Name="object_dog_Anim_000278" Offset="0x278"/>
+        <Animation Name="gDogBarkAnim" Offset="0x278"/>
-        <Animation Name="object_dog_Anim_000928" Offset="0x928"/>
+        <Animation Name="gDogBowAnim" Offset="0x928"/>
-        <Animation Name="object_dog_Anim_000C28" Offset="0xC28"/>
+        <Animation Name="gDogBow2Anim" Offset="0xC28"/>
-        <Animation Name="object_dog_Anim_000D78" Offset="0xD78"/>
+        <Animation Name="gDogRunAnim" Offset="0xD78"/>
-        <Animation Name="object_dog_Anim_001150" Offset="0x1150"/>
+        <Animation Name="gDogSitAnim" Offset="0x1150"/>
-        <Animation Name="object_dog_Anim_001368" Offset="0x1368"/>
+        <Animation Name="gDogWalkAnim" Offset="0x1368"/>
-        <Texture Name="object_dog_Tex_001380" OutName="tex_001380" Format="rgba16" Width="32" Height="32" Offset="0x1380"/>
+        <Texture Name="gDogFur1Tex" OutName="fur_1" Format="rgba16" Width="32" Height="32" Offset="0x1380"/> <!-- Lower body-->
-        <Texture Name="object_dog_Tex_001B80" OutName="tex_001B80" Format="rgba16" Width="32" Height="32" Offset="0x1B80"/>
+        <Texture Name="gDogFur2Tex" OutName="fur_2" Format="rgba16" Width="32" Height="32" Offset="0x1B80"/> <!-- Front of ears, upper part of the tail, and around the feet-->
-        <Texture Name="object_dog_Tex_002380" OutName="tex_002380" Format="rgba16" Width="32" Height="32" Offset="0x2380"/>
+        <Texture Name="gDogFur3Tex" OutName="fur_3" Format="rgba16" Width="32" Height="32" Offset="0x2380"/> <!-- Upper body, top of head-->
-        <Texture Name="object_dog_Tex_002B80" OutName="tex_002B80" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="gDogFaceEyeTex" OutName="face_and_eye" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
-        <Texture Name="object_dog_Tex_003380" OutName="tex_003380" Format="rgba16" Width="32" Height="32" Offset="0x3380"/>
+        <Texture Name="gDogFaceNoseTex" OutName="face_and_nose" Format="rgba16" Width="32" Height="32" Offset="0x3380"/>
-        <Texture Name="object_dog_Tex_003B80" OutName="tex_003B80" Format="rgba16" Width="32" Height="32" Offset="0x3B80"/>
+        <Texture Name="gDogFur4Tex" OutName="fur_4" Format="rgba16" Width="32" Height="32" Offset="0x3B80"/> <!-- Back of ears, side of head, and part of front body-->
-        <Texture Name="object_dog_Tex_004380" OutName="tex_004380" Format="rgba16" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="gDogPawTex" OutName="paw" Format="rgba16" Width="16" Height="16" Offset="0x4380"/>
-        <Texture Name="object_dog_Tex_004580" OutName="tex_004580" Format="rgba16" Width="32" Height="32" Offset="0x4580"/>
+        <Texture Name="gDogFaceHairTex" OutName="face_hair" Format="rgba16" Width="32" Height="32" Offset="0x4580"/>
-        <DList Name="object_dog_DL_0060E0" Offset="0x60E0"/>
+        <DList Name="gDogHeadDL" Offset="0x60E0"/>
-        <DList Name="object_dog_DL_006448" Offset="0x6448"/>
+        <DList Name="gDogRightFaceHairDL" Offset="0x6448"/>
-        <DList Name="object_dog_DL_0064E8" Offset="0x64E8"/>
+        <DList Name="gDogLeftFaceHairDL" Offset="0x64E8"/>
-        <DList Name="object_dog_DL_006588" Offset="0x6588"/>
+        <DList Name="gDogFrontBodyDL" Offset="0x6588"/>
-        <DList Name="object_dog_DL_0067A0" Offset="0x67A0"/>
+        <DList Name="gDogFrontRightLegDL" Offset="0x67A0"/>
-        <DList Name="object_dog_DL_006950" Offset="0x6950"/>
+        <DList Name="gDogFrontLeftLegDL" Offset="0x6950"/>
-        <DList Name="object_dog_DL_006B00" Offset="0x6B00"/>
+        <DList Name="gDogBackBodyDL" Offset="0x6B00"/>
-        <DList Name="object_dog_DL_006CA0" Offset="0x6CA0"/>
+        <DList Name="gDogBackRightLegDL" Offset="0x6CA0"/>
-        <DList Name="object_dog_DL_006E50" Offset="0x6E50"/>
+        <DList Name="gDogBackLeftLegDL" Offset="0x6E50"/>
-        <DList Name="object_dog_DL_007000" Offset="0x7000"/>
+        <DList Name="gDogTailDL" Offset="0x7000"/>
-        <Limb Name="object_dog_Limb_0071D0" LimbType="Standard" Offset="0x71D0"/>
+        <Limb Name="gDogRootLimb" LimbType="Standard" Offset="0x71D0"/>
-        <Limb Name="object_dog_Limb_0071DC" LimbType="Standard" Offset="0x71DC"/>
+        <Limb Name="gDogBodyBackLimb" LimbType="Standard" Offset="0x71DC"/>
-        <Limb Name="object_dog_Limb_0071E8" LimbType="Standard" Offset="0x71E8"/>
+        <Limb Name="gDogBodyFrontLimb" LimbType="Standard" Offset="0x71E8"/>
-        <Limb Name="object_dog_Limb_0071F4" LimbType="Standard" Offset="0x71F4"/>
+        <Limb Name="gDogHeadControlLimb" LimbType="Standard" Offset="0x71F4"/>
-        <Limb Name="object_dog_Limb_007200" LimbType="Standard" Offset="0x7200"/>
+        <Limb Name="gDogHeadLimb" LimbType="Standard" Offset="0x7200"/>
-        <Limb Name="object_dog_Limb_00720C" LimbType="Standard" Offset="0x720C"/>
+        <Limb Name="gDogRightFaceHairLimb" LimbType="Standard" Offset="0x720C"/>
-        <Limb Name="object_dog_Limb_007218" LimbType="Standard" Offset="0x7218"/>
+        <Limb Name="gDogLeftFaceHairLimb" LimbType="Standard" Offset="0x7218"/>
-        <Limb Name="object_dog_Limb_007224" LimbType="Standard" Offset="0x7224"/>
+        <Limb Name="gDogFrontRightLegLimb" LimbType="Standard" Offset="0x7224"/>
-        <Limb Name="object_dog_Limb_007230" LimbType="Standard" Offset="0x7230"/>
+        <Limb Name="gDogFrontLeftLegLimb" LimbType="Standard" Offset="0x7230"/>
-        <Limb Name="object_dog_Limb_00723C" LimbType="Standard" Offset="0x723C"/>
+        <Limb Name="gDogBackRightLegLimb" LimbType="Standard" Offset="0x723C"/>
-        <Limb Name="object_dog_Limb_007248" LimbType="Standard" Offset="0x7248"/>
+        <Limb Name="gDogBackLeftLegLimb" LimbType="Standard" Offset="0x7248"/>
-        <Limb Name="object_dog_Limb_007254" LimbType="Standard" Offset="0x7254"/>
+        <Limb Name="gDogTailLimb" LimbType="Standard" Offset="0x7254"/>
-        <Skeleton Name="object_dog_Skel_007290" Type="Flex" LimbType="Standard" Offset="0x7290"/>
+        <Skeleton Name="gDogSkel" Type="Flex" LimbType="Standard" Offset="0x7290"/>
     </File>
 </Root>

assets/xml/objects/object_efc_erupc.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_efc_erupc" Segment="6">
         <Texture Name="object_efc_erupc_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
         <Texture Name="object_efc_erupc_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>

assets/xml/objects/object_fish.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_fish" Segment="6">
         <Animation Name="gFishingFishAnim" Offset="0x7C"/>
         <DList Name="gFishingFishDL_000940" Offset="0x940"/>

assets/xml/objects/object_fr.xml

@@ -11,7 +11,8 @@
         <Texture Name="object_fr_Tex_004BA0" OutName="tex_00004BA0" Format="rgba16" Width="16" Height="16" Offset="0x4BA0"/>
         <Texture Name="object_fr_Tex_004DA0" OutName="tex_00004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0"/>
         <Texture Name="object_fr_Tex_0055A0" OutName="tex_000055A0" Format="i8" Width="32" Height="32" Offset="0x55A0"/>
-        <Blob Name="object_fr_Blob_0059A0" Size="0x400" Offset="0x59A0"/>
+        <Texture Name="object_fr_Tex_0059A0" OutName="tex_000059A0" Format="rgba16" Width="16" Height="16" Offset="0x59A0"/>
+        <Texture Name="object_fr_Tex_005BA0" OutName="tex_00005BA0" Format="rgba16" Width="16" Height="16" Offset="0x5BA0"/>
         <Texture Name="object_fr_Tex_005DA0" OutName="tex_00005DA0" Format="ia16" Width="32" Height="32" Offset="0x5DA0"/>
         <Texture Name="object_fr_Tex_0065A0" OutName="tex_000065A0" Format="ia16" Width="32" Height="32" Offset="0x65A0"/>
         <DList Name="object_fr_DL_008EC0" Offset="0x8EC0"/>

assets/xml/objects/object_fz.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_fz" Segment="6">
         <DList Name="gFreezardIntactDL" Offset="0x1130"/>
         <DList Name="gFreezardTopRightHornChippedDL" Offset="0x21A0"/>

assets/xml/objects/object_gi_arrow.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_arrow" Segment="6">
         <DList Name="gGiArrowSmallDL" Offset="0x0340"/>
         <DList Name="gGiArrowMediumDL" Offset="0x0B90"/>

assets/xml/objects/object_gi_arrowcase.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_arrowcase" Segment="6">
         <DList Name="gGiQuiver30InnerColorDL" Offset="0x08D0"/>
         <DList Name="gGiQuiver40InnerColorDL" Offset="0x08F0"/>

assets/xml/objects/object_gi_bean.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_bean" Segment="6">
         <DList Name="gGiBeanDL" Offset="0x0580"/>
     </File>

assets/xml/objects/object_gi_bomb_1.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_bomb_1" Segment="6">
         <DList Name="gGiBombDL" Offset="0x09A0"/>
     </File>

assets/xml/objects/object_gi_bomb_2.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_bomb_2" Segment="6">
         <DList Name="gGiBombchuDL" Offset="0x04B0"/>
     </File>

assets/xml/objects/object_gi_bombpouch.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_bombpouch" Segment="6">
         <DList Name="gGiBombBag20BagColorDL" Offset="0x0AD0"/>
         <DList Name="gGiBombBag30BagColorDL" Offset="0x0AF0"/>

assets/xml/objects/object_gi_boomerang.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_boomerang" Segment="6">
         <DList Name="gGiBoomerangDL" Offset="0x0A30"/>
     </File>

assets/xml/objects/object_gi_boots_2.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_boots_2" Segment="6">
         <DList Name="gGiIronBootsDL" Offset="0x1630"/>
         <DList Name="gGiIronBootsRivetsDL" Offset="0x1A98"/>

assets/xml/objects/object_gi_bosskey.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_bosskey" Segment="6">
         <DList Name="gGiBossKeyDL" Offset="0x0CA0"/>
         <DList Name="gGiBossKeyGemDL" Offset="0x0F08"/>

assets/xml/objects/object_gi_bottle.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_bottle" Segment="6">
         <DList Name="gGiBottleStopperDL" Offset="0x0670"/>
         <DList Name="gGiBottleDL" Offset="0x0750"/>

assets/xml/objects/object_gi_bottle_letter.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_bottle_letter" Segment="6">
         <DList Name="gGiLetterBottleContentsDL" Offset="0x08E0"/>
         <DList Name="gGiLetterBottleDL" Offset="0x0AE0"/>

assets/xml/objects/object_gi_bow.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_bow" Segment="6">
         <DList Name="gGiBowDL" Offset="0x0990"/>
     </File>

assets/xml/objects/object_gi_bracelet.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_bracelet" Segment="6">
         <DList Name="gGiGoronBraceletDL" Offset="0x0960"/>
     </File>

assets/xml/objects/object_gi_brokensword.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_brokensword" Segment="6">
         <DList Name="gGiBrokenGoronSwordDL" Offset="0x06E0"/>
     </File>

assets/xml/objects/object_gi_butterfly.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_butterfly" Segment="6">
         <DList Name="gGiButterflyContainerDL" Offset="0x0830"/>
         <DList Name="gGiButterflyGlassDL" Offset="0x0A70"/>

assets/xml/objects/object_gi_coin.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_coin" Segment="6">
         <DList Name="gGiYellowCoinColorDL" Offset="0x0560"/>
         <DList Name="gGiRedCoinColorDL" Offset="0x0580"/>

assets/xml/objects/object_gi_compass.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_compass" Segment="6">
         <DList Name="gGiCompassDL" Offset="0x0960"/>
         <DList Name="gGiCompassGlassDL" Offset="0x0C50"/>

assets/xml/objects/object_gi_dekupouch.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_dekupouch" Segment="6">
         <DList Name="gGiBulletBagColorDL" Offset="0x0AF0"/>
         <DList Name="gGiBulletBag50ColorDL" Offset="0x0B10"/>

assets/xml/objects/object_gi_egg.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_egg" Segment="6">
         <DList Name="gGiEggMaterialDL" Offset="0x0FD0"/>
         <DList Name="gGiEggDL" Offset="0x1008"/>

assets/xml/objects/object_gi_eye_lotion.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_eye_lotion" Segment="6">
         <DList Name="gGiEyeDropsCapDL" Offset="0x0680"/>
         <DList Name="gGiEyeDropsBottleDL" Offset="0x0768"/>

assets/xml/objects/object_gi_fire.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_fire" Segment="6">
         <DList Name="gGiBlueFireChamberstickDL" Offset="0x0C60"/>
         <DList Name="gGiBlueFireFlameDL" Offset="0x0F08"/>

assets/xml/objects/object_gi_fish.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_fish" Segment="6">
         <DList Name="gGiFishDL" Offset="0x0600"/>
     </File>

assets/xml/objects/object_gi_frog.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_frog" Segment="6">
         <DList Name="gGiFrogDL" Offset="0x0D60"/>
         <DList Name="gGiFrogEyesDL" Offset="0x1060"/>

assets/xml/objects/object_gi_gerudo.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_gerudo" Segment="6">
         <DList Name="gGiGerudoCardDL" Offset="0x0F60"/>
     </File>

assets/xml/objects/object_gi_gerudomask.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_gerudomask" Segment="6">
         <DList Name="gGiGerudoMaskDL" Offset="0x10E8"/>
     </File>

assets/xml/objects/object_gi_ghost.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_ghost" Segment="6">
         <DList Name="gGiPoeColorDL" Offset="0x0950"/>
         <DList Name="gGiBigPoeColorDL" Offset="0x0970"/>

assets/xml/objects/object_gi_glasses.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_glasses" Segment="6">
         <DList Name="gGiLensDL" Offset="0x0D80"/>
         <DList Name="gGiLensGlassDL" Offset="0x1010"/>

assets/xml/objects/object_gi_gloves.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_gloves" Segment="6">
         <DList Name="gGiSilverGauntletsColorDL" Offset="0x14C0"/>
         <DList Name="gGiGoldenGauntletsColorDL" Offset="0x14E0"/>

assets/xml/objects/object_gi_goddess.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_goddess" Segment="6">
         <DList Name="gGiMagicSpellDiamondDL" Offset="0x0920"/>
         <DList Name="gGiDinsFireColorDL" Offset="0x09E0"/>

assets/xml/objects/object_gi_grass.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_grass" Segment="6">
         <DList Name="gGiGrassDL" Offset="0x08E0"/>
     </File>

assets/xml/objects/object_gi_hammer.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_hammer" Segment="6">
         <DList Name="gGiHammerDL" Offset="0x09D0"/>
     </File>

assets/xml/objects/object_gi_heart.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_heart" Segment="6">
         <DList Name="gGiRecoveryHeartDL" Offset="0x00E0"/>
     </File>

assets/xml/objects/object_gi_hearts.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_hearts" Segment="6">
         <DList Name="gGiHeartBorderDL" Offset="0x1290"/>
         <DList Name="gGiHeartContainerDL" Offset="0x1470"/>

assets/xml/objects/object_gi_hookshot.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_hookshot" Segment="6">
         <DList Name="gGiHookshotDL" Offset="0x0750"/>
         <DList Name="gGiLongshotDL" Offset="0x1240"/>

assets/xml/objects/object_gi_hoverboots.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_hoverboots" Segment="6">
         <DList Name="gGiHoverBootsDL" Offset="0x1850"/>
     </File>

assets/xml/objects/object_gi_insect.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_insect" Segment="6">
         <DList Name="gGiBugsContainerDL" Offset="0x0830"/>
         <DList Name="gGiBugsGlassDL" Offset="0x0B20"/>

assets/xml/objects/object_gi_jewel.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_jewel" Segment="6">
         <Texture Name="gGiKokiriEmeraldScintillationTex" OutName="kokiri_emerald_scintillation" Format="i4" Width="64" Height="64" Offset="0x0000"/>
         <DList Name="gGiKokiriEmeraldSettingDL" Offset="0x10E0"/>

assets/xml/objects/object_gi_key.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_key" Segment="6">
         <DList Name="gGiSmallKeyDL" Offset="0x0800"/>
     </File>

assets/xml/objects/object_gi_ki_tan_mask.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_ki_tan_mask" Segment="6">
         <DList Name="gGiKeatonMaskDL" Offset="0x0AC0"/>
         <DList Name="gGiKeatonMaskEyesDL" Offset="0x0D50"/>

assets/xml/objects/object_gi_liquid.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_liquid" Segment="6">
         <DList Name="gGiGreenPotColorDL" Offset="0x1270"/>
         <DList Name="gGiRedPotColorDL" Offset="0x1290"/>

assets/xml/objects/object_gi_longsword.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_longsword" Segment="6">
         <DList Name="gGiBiggoronSwordDL" Offset="0x0600"/>
     </File>

assets/xml/objects/object_gi_m_arrow.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_m_arrow" Segment="6">
         <DList Name="gGiMagicArrowDL" Offset="0x0AE0"/>
         <DList Name="gGiFireArrowColorDL" Offset="0x0CA0"/>

assets/xml/objects/object_gi_magicpot.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_magicpot" Segment="6">
         <DList Name="gGiMagicJarSmallDL" Offset="0x0580"/>
         <DList Name="gGiMagicJarLargeDL" Offset="0x0EE0"/>

assets/xml/objects/object_gi_map.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_map" Segment="6">
         <DList Name="gGiDungeonMapDL" Offset="0x03C0"/>
         <DList Name="gGiStoneOfAgonyDL" Offset="0x0B70"/>

assets/xml/objects/object_gi_medal.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_medal" Segment="6">
         <DList Name="gGiForestMedallionFaceDL" Offset="0x0CB0"/>
         <DList Name="gGiMedallionDL" Offset="0x0E18"/>

assets/xml/objects/object_gi_melody.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_melody" Segment="6">
         <DList Name="gGiMinuetColorDL" Offset="0x0A80"/>
         <DList Name="gGiBoleroColorDL" Offset="0x0A90"/>

assets/xml/objects/object_gi_milk.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_milk" Segment="6">
         <DList Name="gGiMilkBottleContentsDL" Offset="0x1060"/>
         <DList Name="gGiMilkBottleDL" Offset="0x1288"/>

assets/xml/objects/object_gi_mushroom.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_mushroom" Segment="6">
         <DList Name="gGiOddMushroomDL" Offset="0x09D0"/>
     </File>

assets/xml/objects/object_gi_niwatori.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_niwatori" Segment="6">
         <DList Name="gGiChickenColorDL" Offset="0x15F0"/>
         <DList Name="gGiCojiroColorDL" Offset="0x1610"/>

assets/xml/objects/object_gi_nuts.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_nuts" Segment="6">
         <DList Name="gGiNutDL" Offset="0x0E90"/>
     </File>

assets/xml/objects/object_gi_ocarina.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_ocarina" Segment="6">
         <DList Name="gGiOcarinaTimeDL" Offset="0x08C0"/>
         <DList Name="gGiOcarinaTimeHolesDL" Offset="0x0AF8"/>

assets/xml/objects/object_gi_ocarina_0.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_ocarina_0" Segment="6">
         <DList Name="gGiOcarinaFairyDL" Offset="0x08E0"/>
         <DList Name="gGiOcarinaFairyHolesDL" Offset="0x0B58"/>

assets/xml/objects/object_gi_pachinko.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_pachinko" Segment="6">
         <DList Name="gGiSlingshotDL" Offset="0x0940"/>
     </File>

assets/xml/objects/object_gi_powder.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_powder" Segment="6">
         <DList Name="gGiOddPotionDL" Offset="0x08B0"/>
     </File>

assets/xml/objects/object_gi_prescription.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_prescription" Segment="6">
         <DList Name="gGiPrescriptionDL" Offset="0x09C0"/>
         <DList Name="gGiPrescriptionWritingDL" Offset="0x0AF0"/>

assets/xml/objects/object_gi_rabit_mask.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_rabit_mask" Segment="6">
         <DList Name="gGiBunnyHoodDL" Offset="0x0BC0"/>
         <DList Name="gGiBunnyHoodEyesDL" Offset="0x0E58"/>

assets/xml/objects/object_gi_redead_mask.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_redead_mask" Segment="6">
         <DList Name="gGiSpookyMaskDL" Offset="0x07E0"/>
     </File>

assets/xml/objects/object_gi_rupy.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_rupy" Segment="6">
         <DList Name="gGiGreenRupeeInnerColorDL" Offset="0x04A0"/>
         <DList Name="gGiBlueRupeeInnerColorDL" Offset="0x04C0"/>

assets/xml/objects/object_gi_saw.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_saw" Segment="6">
         <DList Name="gGiSawDL" Offset="0x07E0"/>
     </File>

assets/xml/objects/object_gi_scale.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_scale" Segment="6">
         <DList Name="gGiSilverScaleWaterColorDL" Offset="0x0A20"/>
         <DList Name="gGiGoldenScaleWaterColorDL" Offset="0x0A40"/>

assets/xml/objects/object_gi_seed.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_seed" Segment="6">
         <DList Name="gGiSeedDL" Offset="0x0810"/>
     </File>

assets/xml/objects/object_gi_shield_1.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_shield_1" Segment="6">
         <DList Name="gGiDekuShieldDL" Offset="0x0A50"/>
     </File>

assets/xml/objects/object_gi_shield_2.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_shield_2" Segment="6">
         <DList Name="gGiHylianShieldDL" Offset="0x0C70"/>
     </File>

assets/xml/objects/object_gi_shield_3.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_shield_3" Segment="6">
         <DList Name="gGiMirrorShieldDL" Offset="0x0FB0"/>
         <DList Name="gGiMirrorShieldSymbolDL" Offset="0x11C8"/>

assets/xml/objects/object_gi_skj_mask.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_skj_mask" Segment="6">
         <DList Name="gGiSkullMaskDL" Offset="0x09D0"/>
     </File>

assets/xml/objects/object_gi_soul.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_soul" Segment="6">
         <DList Name="gGiFairyContainerBaseCapDL" Offset="0x0BD0"/>
         <DList Name="gGiFairyContainerGlassDL" Offset="0x0DB8"/>

assets/xml/objects/object_gi_stick.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_stick" Segment="6">
         <DList Name="gGiStickDL" Offset="0x04D0"/>
     </File>

assets/xml/objects/object_gi_sutaru.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_sutaru" Segment="6">
         <DList Name="gGiSkulltulaTokenDL" Offset="0x0330"/>
         <DList Name="gGiSkulltulaTokenFlameDL" Offset="0x0438"/>

assets/xml/objects/object_gi_sword_1.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_sword_1" Segment="6">
         <DList Name="gGiKokiriSwordDL" Offset="0x0960"/>
     </File>

assets/xml/objects/object_gi_ticketstone.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_ticketstone" Segment="6">
         <DList Name="gGiClaimCheckDL" Offset="0x0F00"/>
         <DList Name="gGiClaimCheckWritingDL" Offset="0x1188"/>

assets/xml/objects/object_gi_truth_mask.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_gi_truth_mask" Segment="6">
         <DList Name="gGiMaskOfTruthDL" Offset="0x13D0"/>
         <DList Name="gGiMaskOfTruthAccentsDL" Offset="0x16B0"/>

assets/xml/objects/object_gnd.xml

@@ -66,8 +66,8 @@
         <DList Name="gPhantomGanonFaceDL" Offset="0x4EC0"/>
 
         <!-- Face textures-->
-        <Texture Name="gPhantomGanonEyeTLUT" OutName="phantom_ganon_eye_palette" Format="rgba16" Width="16" Height="5" Offset="0x3CC0"/>
+        <Texture Name="gPhantomGanonEyeTLUT" OutName="phantom_ganon_eye_tlut" Format="rgba16" Width="16" Height="5" Offset="0x3CC0"/>
-        <Texture Name="gPhantomGanonMouthTLUT" OutName="phantom_ganon_mouth_palette" Format="rgba16" Width="8" Height="5" Offset="0x3D60"/>
+        <Texture Name="gPhantomGanonMouthTLUT" OutName="phantom_ganon_mouth_tlut" Format="rgba16" Width="8" Height="5" Offset="0x3D60"/>
         <Texture Name="gPhantomGanonEyeTex" OutName="phantom_ganon_eye_tex" Format="ci8" Width="32" Height="16" Offset="0x3DB0" TlutOffset="0x3CC0"/>
         <Texture Name="gPhantomGanonSmileTex" OutName="phantom_ganon_smile_tex" Format="ci8" Width="16" Height="16" Offset="0x3FB0" TlutOffset="0x3D60"/>
         <Texture Name="gPhantomGanonMouthTex" OutName="phantom_ganon_mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x40B0" TlutOffset="0x3D60"/>

assets/xml/objects/object_god_lgt.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_god_lgt" Segment="6">
         <DList Name="gGoldenGoddessAuraDL" Offset="0x0330"/>
         <Texture Name="gGoldenGoddessAuraHTailTex" OutName="golden_goddess_aura_tail" Format="i8" Width="32" Height="32" Offset="0x0530"/>

assets/xml/objects/object_horse_link_child.xml

@@ -13,7 +13,7 @@
         <!-- Running. -->
         <Animation Name="gChildEponaGallopingAnim" Offset="0x2F98"/>
 
-        <Texture Name="gChildEponaEyePal" OutName="child_epona_eye_pal" Format="rgba16" Width="16" Height="16" Offset="0x1728"/>
+        <Texture Name="gChildEponaEyeTLUT" OutName="child_epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1728"/>
         <Texture Name="gChildEponaEyeOpenTex" OutName="child_epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28"  TlutOffset="0x1728"/>
         <Texture Name="gChildEponaEyeHalfTex" OutName="child_epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928"  TlutOffset="0x1728"/>
         <Texture Name="gChildEponaEyeCloseTex" OutName="child_epona_eye_close" Format="ci8" Width="32" Height="16" Offset="0x1B28"  TlutOffset="0x1728"/>

assets/xml/objects/object_human.xml

@@ -44,7 +44,7 @@
         <Texture Name="object_human_Tex_007200" OutName="object_human_Tex_007200" Format="ci8" Width="32" Height="32" Offset="0x7200" TlutOffset="0x7A00"/>
         <Texture Name="object_human_Tex_007600" OutName="object_human_Tex_007600" Format="ci8" Width="32" Height="32" Offset="0x7600" TlutOffset="0x7A00"/>
 
-        <Texture Name="gHumanTLUT" OutName="face_palette" Format="rgba16" Width="16" Height="16" Offset="0x7A00"/>
+        <Texture Name="gHumanTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7A00"/>
 
         <LegacyAnimation Name="gHumanLookingBackAnim" Offset="0x8354"/>
         <LegacyAnimation Name="gHumanLookingBackStartsAnim" Offset="0x8784"/>

assets/xml/objects/object_jya_obj.xml

@@ -55,15 +55,15 @@
         <DList Name="gMegamiPiece11DL" Offset="0xA7E0"/>
         <DList Name="gMegamiPiece12DL" Offset="0xA978"/>
         <DList Name="gMegamiPiece13DL" Offset="0xAAC8"/>
-        <Texture Name="gMegami1TLUT" OutName="megami_palette_1" Format="rgba16" Width="4" Height="4" Offset="0x5C80"/>
+        <Texture Name="gMegami1TLUT" OutName="megami_tlut_1" Format="rgba16" Width="4" Height="4" Offset="0x5C80"/>
         <Texture Name="gMegami1Tex" OutName="megami_tex_1" Format="ci4" Width="64" Height="64" Offset="0x5CE8" TlutOffset="0x5C80"/>
-        <Texture Name="gMegami2TLUT" OutName="megami_palette_2" Format="rgba16" Width="4" Height="4" Offset="0xAC50"/>
+        <Texture Name="gMegami2TLUT" OutName="megami_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xAC50"/>
         <Texture Name="gMegami2Tex" OutName="megami_tex_2" Format="ci4" Width="64" Height="64" Offset="0xACB8" TlutOffset="0xAC50"/>
-        <Texture Name="gMegami3TLUT" OutName="megami_palette_3" Format="rgba16" Width="4" Height="64" Offset="0x6CE8"/>
+        <Texture Name="gMegami3TLUT" OutName="megami_tlut_3" Format="rgba16" Width="4" Height="64" Offset="0x6CE8"/>
         <Texture Name="gMegami3Tex" OutName="megami_tex_3" Format="ci4" Width="64" Height="64" Offset="0x64E8" TlutOffset="0x5C80"/>
-        <Texture Name="gMegami4TLUT" OutName="megami_palette_4" Format="rgba16" Width="4" Height="4" Offset="0x5CA0"/>
+        <Texture Name="gMegami4TLUT" OutName="megami_tlut_4" Format="rgba16" Width="4" Height="4" Offset="0x5CA0"/>
-        <Texture Name="gMegami5TLUT" OutName="megami_palette_5" Format="rgba16" Width="4" Height="4" Offset="0xAC70"/>
+        <Texture Name="gMegami5TLUT" OutName="megami_tlut_5" Format="rgba16" Width="4" Height="4" Offset="0xAC70"/>
-        <Texture Name="gMegamiCrumbleTLUT" OutName="megami_crumble_palette" Format="rgba16" Width="4" Height="4" Offset="0x4E0"/>
+        <Texture Name="gMegamiCrumbleTLUT" OutName="megami_crumble_tlut" Format="rgba16" Width="4" Height="4" Offset="0x4E0"/>
         <Texture Name="gMegamiRightCrumble1Tex" OutName="megami_right_crumble_1" Format="ci4" Width="64" Height="64" Offset="0xD00" TlutOffset="0x4E0"/>
         <Texture Name="gMegamiRightCrumble2Tex" OutName="megami_right_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x1D00" TlutOffset="0x4E0"/>
         <Texture Name="gMegamiRightCrumble3Tex" OutName="megami_right_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x2500" TlutOffset="0x4E0"/>

assets/xml/objects/object_kanban.xml

@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
     <File Name="object_kanban" Segment="6">
         <DList Name="object_kanban_DL_000C30" Offset="0xC30"/>
         <DList Name="object_kanban_DL_000CB0" Offset="0xCB0"/>