Dragorn421 · Jul 30, 2026 · Jul 30, 2026 · Jul 30, 2026 · Jul 30, 2026 · Jul 30, 2026
diff --git a/Dockerfile b/Dockerfile
@@ -1,26 +1,28 @@
-FROM ubuntu:24.04 AS build
-
+FROM ubuntu:24.04
 ENV TZ=UTC
 ENV LANG=C.UTF-8
+ENV N64_GCCPREFIX=/opt/libdragon
+
+ADD https://github.com/DragonMinded/libdragon/releases/download/toolchain-continuous-prerelease/gcc-toolchain-mips64-x86_64.deb gcc-toolchain-mips64-x86_64.deb
 
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
-    apt-get update && \
-    apt-get install -y \
-        binutils-mips-linux-gnu \
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+RUN apt-get update
+RUN apt-get install -y \
         build-essential \
         python3 \
         python3-pip \
-        python3-venv \
         git \
         curl \
-        clang-tidy \
-        clang-format \
-     && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
+        clang-tidy-14 \
+        clang-format-14
+RUN apt-get install -y ./gcc-toolchain-mips64-x86_64.deb
+RUN apt-get clean
+RUN rm -rf /var/lib/apt/lists/*
 
+RUN mkdir /oot
 WORKDIR /oot
+
 RUN git config --global --add safe.directory /oot
 
-CMD make -j $(nproc) setup && make -j $(nproc) && tail -f /dev/null
+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)'"]
diff --git a/Doxyfile b/Doxyfile
@@ -187,7 +187,7 @@ SHORT_NAMES            = NO
 # description.)
 # The default value is: NO.
 
-JAVADOC_AUTOBRIEF      = YES
+JAVADOC_AUTOBRIEF      = NO
 
 # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
 # line (until the first dot) of a Qt-style comment as the brief description. If

diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ COMPILER ?= ido
 #   gc-jp-ce       GameCube Japan (Collector's Edition disc)
 #   ique-cn        iQue Player (Simplified Chinese)
 VERSION ?= gc-eu-mq-dbg
-# Number of threads to extract and compress with.
+# Number of threads to extract assets and compress with.
 N_THREADS ?= $(shell nproc)
 # If DEBUG_OBJECTS is 1, produce additional debugging files such as objdump output or raw binaries for assets
 DEBUG_OBJECTS ?= 0
@@ -400,7 +400,7 @@ SFCFLAGS := --matching
 
 # Extra debugging steps
 ifeq ($(DEBUG_OBJECTS),1)
-  OBJDUMP_CMD = @$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s)
+  OBJDUMP_CMD = @$(OBJDUMP) -d $@ > $(@:.o=.s)
   OBJCOPY_CMD = @$(OBJCOPY) -O binary $@ $(@:.o=.bin)
 else
   OBJDUMP_CMD = @:
@@ -454,8 +454,6 @@ else
   CC_CHECK = @:
 endif
 
-OBJDUMP_FLAGS := -d -r -z -Mreg-names=32
-
 #### Files ####
 
 # ROM image
@@ -611,13 +609,13 @@ else
 SEGMENT_FILES :=
 OVL_SEGMENT_FILES :=
 endif
-OVL_RELOC_FILES := $(OVL_SEGMENT_FILES:.plf=.reloc.o)
+RELOC_O_FILES := $(OVL_SEGMENT_FILES:.plf=.reloc.o)
 
 O_FILES := $(shell $(CPP) $(CPPFLAGS) -I. $(SPEC) | $(BUILD_DIR_REPLACE) | sed -n -E 's/^[ \t]*include[ \t]*"([a-zA-Z0-9/_.-]+\.o)"/\1/p')
 MAKEROM_O_FILES := $(BUILD_DIR)/src/makerom/rom_header.o $(BUILD_DIR)/src/makerom/ipl3.o $(BUILD_DIR)/src/makerom/entry.o
 
 # Automatic dependency files
-DEP_FILES := $(O_FILES:.o=.d) $(O_FILES:.o=.asmproc.d) $(OVL_RELOC_FILES:.o=.d) $(BUILD_DIR)/spec.d $(MAKEROM_O_FILES:.o=.d)
+DEP_FILES := $(O_FILES:.o=.d) $(O_FILES:.o=.asmproc.d) $(RELOC_O_FILES:.o=.d) $(BUILD_DIR)/spec.d $(MAKEROM_O_FILES:.o=.d)
 
 $(BUILD_DIR)/src/boot/build.o: CPP_DEFINES += -DBUILD_CREATOR="\"$(BUILD_CREATOR)\"" -DBUILD_DATE="\"$(BUILD_DATE)\"" -DBUILD_TIME="\"$(BUILD_TIME)\""
 
@@ -689,7 +687,7 @@ $(BUILD_DIR)/src/libc/%.o: CFLAGS := $(EGCS_CFLAGS) -mno-abicalls
 $(BUILD_DIR)/src/libc/%.o: CCASFLAGS := $(EGCS_CCASFLAGS)
 $(BUILD_DIR)/src/libc/%.o: OPTFLAGS := -O1
 $(BUILD_DIR)/src/libc/%.o: MIPS_VERSION :=
-$(BUILD_DIR)/src/libc/memmove.o: MIPS_VERSION := -mips2
+$(BUILD_DIR)/src/libc/code_801068B0.o: MIPS_VERSION := -mips2
 else ifeq ($(DEBUG_FEATURES),1)
 $(BUILD_DIR)/src/libc/%.o: OPTFLAGS := -g
 $(BUILD_DIR)/src/libc/%.o: ASOPTFLAGS := -g
@@ -884,13 +882,13 @@ disasm:
 	$(RM) -r $(EXPECTED_DIR)
 	VERSION=$(VERSION) DISASM_BASEROM=$(BASEROM_DIR)/baserom-decompressed.z64 DISASM_DIR=$(EXPECTED_DIR) PYTHON=$(PYTHON) AS_CMD='$(AS) $(ASFLAGS)' LD=$(LD) ./tools/disasm/do_disasm.sh
 
+resources: $(ASSET_FILES_OUT)
 run: $(ROM)
 ifeq ($(N64_EMULATOR),)
 	$(error Emulator path not set. Set N64_EMULATOR in the Makefile or define it as an environment variable)
 endif
 	$(N64_EMULATOR) $<
 
-
 .PHONY: all rom compress clean assetclean distclean venv setup disasm run
 .DEFAULT_GOAL := rom
 
@@ -915,7 +913,7 @@ $(ROMC): $(ROM) $(ELF) $(BUILD_DIR)/compress_ranges.txt
 
 LDFLAGS := -T $(LDSCRIPT) -T $(BUILD_DIR)/linker_scripts/makerom.ld -T $(BUILD_DIR)/undefined_syms.txt --emit-relocs -Map $(MAP)
 
-$(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(SEGMENT_FILES) $(OVL_RELOC_FILES) $(LDSCRIPT) $(MAKEROM_O_FILES) \
+$(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(SEGMENT_FILES) $(RELOC_O_FILES) $(LDSCRIPT) $(MAKEROM_O_FILES) \
         $(BUILD_DIR)/linker_scripts/makerom.ld $(BUILD_DIR)/undefined_syms.txt \
         $(SAMPLEBANK_O_FILES) $(SOUNDFONT_O_FILES) $(SEQUENCE_O_FILES) \
         $(BUILD_DIR)/assets/audio/sequence_font_table.o $(BUILD_DIR)/assets/audio/audiobank_padding.o
@@ -924,17 +922,9 @@ $(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(SEGMENT_FILES) $(OVL_RELOC_FIL
 $(BUILD_DIR)/linker_scripts/makerom.ld: linker_scripts/makerom.ld
 	$(CPP) -I include $(CPPFLAGS) $< > $@
 
-## 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
+$(RELOC_O_FILES): | o_files
+.PHONY: o_files
 
 $(BUILD_DIR)/spec: $(SPEC) $(SPEC_INCLUDES)
 	$(CPP) $(CPPFLAGS) -MD -MP -MF $@.d -MT $@ -I. $< | $(BUILD_DIR_REPLACE) > $@
@@ -956,13 +946,13 @@ $(SEGMENTS_DIR)/%.reloc.o: $(SEGMENTS_DIR)/%.plf
 	$(AS) $(ASFLAGS) $(@:.o=.s) -o $@
 
 $(BUILD_DIR)/undefined_syms.txt: undefined_syms.txt
-	$(CPP) $(CPPFLAGS) $< > $@
+	$(CPP) $(CPPFLAGS) $< > $(BUILD_DIR)/undefined_syms.txt
 
 $(BUILD_DIR)/baserom/%.o: $(EXTRACTED_DIR)/baserom/%
 	$(OBJCOPY) -I binary -O $(LD_OFORMAT) $< $@
 
 $(BUILD_DIR)/data/%.o: data/%.s
-	$(CPP) $(CPPFLAGS) -MD -MP -MF $(@:.o=.d) -MT $@ -Iinclude $< | $(AS) $(ASFLAGS) -o $@
+	$(CPP) $(CPPFLAGS) -MD -MP -MF $(@:.o=.d) -MT $@ -Iinclude $< | iconv --from UTF-8 --to EUC-JP | $(AS) $(ASFLAGS) -o $@
 
 ifeq ($(PLATFORM),IQUE)
   NES_CHARMAP := assets/text/charmap.chn.txt

diff --git a/README.md b/README.md
@@ -23,7 +23,8 @@ the codebase can drastically change at any time. Also note that some parts of th
 'shiftable' yet, so modifying them could be difficult at this point.
 ```
 
-This is a WIP **decompilation** of ***The Legend of Zelda: Ocarina of Time***. The purpose of the project is to recreate a source code base for the game from scratch, using information found inside the game along with static and/or dynamic analysis. **It is not producing a PC port.** For more information you can get in touch with the team on our [Discord server][discord].
+This is a WIP decompilation of The Legend of Zelda: Ocarina of Time.
+The purpose of the project is to recreate a source code base for the game from scratch, using information found inside the game along with static and/or dynamic analysis.
 
 It builds the following versions:
 
@@ -56,24 +57,37 @@ The default version is `gc-eu-mq-dbg`, i.e. the GameCube Europe/PAL Master Quest
 
 ## 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 or 11, install WSL and a distribution by following this
 [WSL Installation Guide](https://learn.microsoft.com/en-us/windows/wsl/install).
-We recommend using Ubuntu as the Linux distribution.
+We recommend using Debian or Ubuntu Linux distributions.
+
+For older versions of Windows, install a Linux VM or refer to [Docker](docs/building/docker.md) instructions.
+
+### macOS
+
+For macOS, use homebrew to install the following dependencies:
 
-For older versions of Windows, install a Linux VM or refer to [Docker](docs/BUILDING_DOCKER.md) instructions.
+* coreutils
+* make
+* python3
+* md5sha1sum
+* libiconv
+
+You can install them with the following commands:
+
+```bash
+brew update
+brew install coreutils make python3 md5sha1sum libiconv
+```
 
+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)
 
@@ -110,21 +124,12 @@ If you are using GCC as the compiler for Ocarina of Time, you will also need the
 
 #### 2. Clone the repository
 
-**N.B.** If using WSL, we strongly encourage you to clone into WSL's Linux filesystem using Linux's `git`.
-Cloning into the Windows filesystem will result in much slower read/write speeds, and often causes issues when Windows copies the files with the wrong line endings, which the compiler IDO cannot handle correctly.
-
 Clone `https://github.com/zeldaret/oot.git` where you wish to have the project, with a command such as:
 
 ```bash
 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
 
 First, pick the version of the game you want to build.
@@ -180,13 +185,6 @@ 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`).
-
 ## Changing build options
 
 By default, if you don't specify a version to build with `VERSION=<the-version>` in the make commands, the `gc-eu-mq-dbg` version is used.

diff --git a/assets/objects/object_triforce_spot/object_triforce_spot.c b/assets/objects/object_triforce_spot/object_triforce_spot.c
diff --git a/assets/objects/object_triforce_spot/object_triforce_spot.h b/assets/objects/object_triforce_spot/object_triforce_spot.h
diff --git a/assets/xml/n64dd/error_textures.xml → assets/xml/misc/n64dd_error_textures.xml b/assets/xml/n64dd/error_textures.xml → assets/xml/misc/n64dd_error_textures.xml
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
@@ -26,7 +26,6 @@
         <Array Name="gLinkPauseAdultShieldJointTable" Count="24" Offset="0x2280">
             <Vector Type="s16" Dimensions="3"/>
         </Array>
-
         <PlayerAnimation Name="gPlayerAnim_clink_demo_DDbox_open" Offset="0x2310"/>
         <PlayerAnimation Name="gPlayerAnim_clink_demo_Tbox_open" Offset="0x2318"/>
         <PlayerAnimation Name="gPlayerAnim_clink_demo_atozusari" Offset="0x2320"/>

diff --git a/assets/xml/objects/object_efc_crystal_light.xml b/assets/xml/objects/object_efc_crystal_light.xml
@@ -1,9 +1,9 @@
 <Root>
     <File Name="object_efc_crystal_light" Segment="6">
-        <Texture Name="gCrystalLightTex" Format="i4" Width="64" Height="64" Offset="0x0000"/>
-        <Array Name="gCrystalLightVtx" Count="24" Offset="0x800">
+        <Texture Name="object_efc_crystal_light_000000_Tex" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Array Name="object_efc_crystal_light_000800_Vtx" Count="24" Offset="0x800">
             <Vtx/>
         </Array>
-        <DList Name="gCrystalLightDL" Offset="0x0980"/>
+        <DList Name="object_efc_crystal_light_000980_DL" Offset="0x980"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_efc_fire_ball.xml b/assets/xml/objects/object_efc_fire_ball.xml
@@ -1,10 +1,10 @@
 <Root>
     <File Name="object_efc_fire_ball" Segment="6">
-        <Array Name="gCreationFireBallVtx" Count="4" Offset="0x0">
+        <Array Name="object_efc_fire_ball_000000_Vtx" Count="4" Offset="0x0">
             <Vtx/>
         </Array>
-        <DList Name="gCreationFireBallDL" Offset="0x0040"/>
-        <Texture Name="gCreationFireBallMaskTex" Format="i8" Width="32" Height="32" Offset="0x0100"/>
-        <Texture Name="gCreationFireBallFlameEffectTex" Format="i8" Width="32" Height="64" Offset="0x0500"/>
+        <DList Name="object_efc_fire_ball_000040_DL" Offset="0x40"/>
+        <Texture Name="object_efc_fire_ball_000100_Tex" Format="i8" Width="32" Height="32" Offset="0x100"/>
+        <Texture Name="object_efc_fire_ball_000500_Tex" Format="i8" Width="32" Height="64" Offset="0x500"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_efc_lgt_shower.xml b/assets/xml/objects/object_efc_lgt_shower.xml
@@ -1,9 +1,9 @@
 <Root>
     <File Name="object_efc_lgt_shower" Segment="6">
-        <Texture Name="gEnliveningLightTex" Format="i8" Width="64" Height="64" Offset="0x0000"/>
-        <Array Name="gEnliveningLightVtx" Count="29" Offset="0x1000">
+        <Texture Name="object_efc_lgt_shower_000000_Tex" Format="i8" Width="64" Height="64" Offset="0x0"/>
+        <Array Name="object_efc_lgt_shower_001000_Vtx" Count="29" Offset="0x1000">
             <Vtx/>
         </Array>
-        <DList Name="gEnliveningLightDL" Offset="0x11D0"/>
+        <DList Name="object_efc_lgt_shower_0011D0_DL" Offset="0x11D0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_efc_tw.xml b/assets/xml/objects/object_efc_tw.xml
@@ -1,13 +1,13 @@
 <Root>
     <File Name="object_efc_tw" Segment="6">
-
-        <Skeleton Name="gTimeWarpSkel" Type="Curve" LimbType="Curve" Offset="0x12E8"/>
-        <CurveAnimation Name="gTimeWarpAnim" SkelOffset="0x12E8" Offset="0x0050"/>
-
-        <Array Name="gTimeWarpVtx" Count="21" Offset="0x0060">
+        <CurveAnimation Name="object_efc_tw_000050_Anim" SkelOffset="0x12E8" Offset="0x50"/> <!-- timewarpTransformUpdateIndex -->
+        <Array Name="object_efc_tw_000060_Vtx" Count="21" Offset="0x60">
             <Vtx/>
         </Array>
-        <DList Name="gTimeWarpDL" Offset="0x01B0"/>
-        <Texture Name="gTimeWarpTex" Format="i8" Width="64" Height="64" Offset="0x02C8"/>
+        <DList Name="object_efc_tw_0001B0_DL" Offset="0x1B0"/>
+        <Texture Name="object_efc_tw_0002C8_Tex" Format="i8" Width="64" Height="64" Offset="0x2C8"/>
+        <Limb Name="object_efc_tw_0012C8_Limb" LimbType="Curve" Offset="0x12C8"/>
+        <Limb Name="object_efc_tw_0012D4_Limb" LimbType="Curve" Offset="0x12D4"/>
+        <Skeleton Name="object_efc_tw_0012E8_Skel" Type="Curve" LimbType="Curve" Offset="0x12E8"/> <!-- timewarpLimbList -->
     </File>
 </Root>