Merge remote-tracking branch 'decomp/main' into decomp_update_3

2026-01-21 10:37:37 -08:00 · 2024-06-24 23:34:56 +02:00
parent 7a323ae479 9def6f4d0d
commit abc07bb848
96 changed files with 6087 additions and 1987 deletions
--- a/21
+++ b/21
@@ -276,11 +276,12 @@ ifeq ($(COMPILER),gcc)
 SRC_DIRS := $(shell find src -type d)
 endif

-ASSET_BIN_DIRS := $(shell find assets/* -type d -not -path "assets/xml*" -not -path "assets/text")
-ASSET_FILES_XML := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.xml))
+# create extracted directories
+$(shell mkdir -p $(EXTRACTED_DIR) $(EXTRACTED_DIR)/assets $(EXTRACTED_DIR)/text)
+
+ASSET_BIN_DIRS := $(shell find $(EXTRACTED_DIR)/assets -type d)
 ASSET_FILES_BIN := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.bin))
-ASSET_FILES_OUT := $(foreach f,$(ASSET_FILES_XML:.xml=.c),$f) \
-				   $(foreach f,$(ASSET_FILES_BIN:.bin=.bin.inc.c),$(BUILD_DIR)/$f) \
+ASSET_FILES_OUT := $(foreach f,$(ASSET_FILES_BIN:.bin=.bin.inc.c),$(f:$(EXTRACTED_DIR)/%=$(BUILD_DIR)/%)) \
 				   $(foreach f,$(wildcard assets/text/*.c),$(BUILD_DIR)/$(f:.c=.o))

 UNDECOMPILED_DATA_DIRS := $(shell find data -type d)
@@ -288,10 +289,12 @@ UNDECOMPILED_DATA_DIRS := $(shell find data -type d)
 BASEROM_BIN_FILES := $(wildcard $(EXTRACTED_DIR)/baserom/*)

 # source files
-C_FILES       := $(filter-out %.inc.c,$(foreach dir,$(SRC_DIRS) $(ASSET_BIN_DIRS),$(wildcard $(dir)/*.c)))
+SRC_C_FILES   := $(filter-out %.inc.c,$(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)))
+ASSET_C_FILES := $(filter-out %.inc.c,$(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.c)))
 S_FILES       := $(foreach dir,$(SRC_DIRS) $(UNDECOMPILED_DATA_DIRS),$(wildcard $(dir)/*.s))
 O_FILES       := $(foreach f,$(S_FILES:.s=.o),$(BUILD_DIR)/$f) \
-                 $(foreach f,$(C_FILES:.c=.o),$(BUILD_DIR)/$f) \
+                 $(foreach f,$(SRC_C_FILES:.c=.o),$(BUILD_DIR)/$f) \
+                 $(foreach f,$(ASSET_C_FILES:.c=.o),$(f:$(EXTRACTED_DIR)/%=$(BUILD_DIR)/%)) \
                 $(foreach f,$(BASEROM_BIN_FILES),$(BUILD_DIR)/baserom/$(notdir $f).o)
 UCODE_PATCHES := $(wildcard F3DEX3/*.bps)
 UCODE_FILES   := $(foreach f,$(UCODE_PATCHES:.bps=),$f)
@@ -306,11 +309,11 @@ 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))
-TEXTURE_FILES_OUT := $(foreach f,$(TEXTURE_FILES_PNG:.png=.inc.c),$(BUILD_DIR)/$f) \
-					 $(foreach f,$(TEXTURE_FILES_JPG:.jpg=.jpg.inc.c),$(BUILD_DIR)/$f) \
+TEXTURE_FILES_OUT := $(foreach f,$(TEXTURE_FILES_PNG:.png=.inc.c),$(f:$(EXTRACTED_DIR)/%=$(BUILD_DIR)/%)) \
+					 $(foreach f,$(TEXTURE_FILES_JPG:.jpg=.jpg.inc.c),$(f:$(EXTRACTED_DIR)/%=$(BUILD_DIR)/%))

 # create build directories
-$(shell mkdir -p $(BUILD_DIR)/baserom $(EXTRACTED_DIR)/text $(BUILD_DIR)/assets/text $(foreach dir,$(SRC_DIRS) $(UNDECOMPILED_DATA_DIRS) $(ASSET_BIN_DIRS),$(BUILD_DIR)/$(dir)))
+$(shell mkdir -p $(BUILD_DIR)/baserom $(BUILD_DIR)/assets/text $(foreach dir,$(SRC_DIRS) $(UNDECOMPILED_DATA_DIRS),$(BUILD_DIR)/$(dir)) $(foreach dir,$(ASSET_BIN_DIRS),$(dir:$(EXTRACTED_DIR)/%=$(BUILD_DIR)/%)))

 ifeq ($(COMPILER),gcc)
 # Note that if adding additional assets directories for modding reasons these flags must also be used there
--- a/assets/.gitignore
+++ b/assets/.gitignore
@@ -1,7 +0,0 @@
-*.bin
-*.c
-*.h
-!text/*.[ch]
-*.cfg
-*.vtx.inc
-*.dlist.inc
--- a/assets/xml/code/fbdemo_circle.xml
+++ b/assets/xml/code/fbdemo_circle.xml
@@ -1,13 +1,13 @@
 <Root>
-    <File Name="code" OutName="z_fbdemo_circle" RangeStart="0x10ED48" RangeEnd="0x10FF68">
-        <Texture Name="sTransCircleNormalTex" OutName="trans_circle_normal" Format="i8" Width="16" Height="64" Offset="0x10ED48"/>
-        <Texture Name="sTransCircleWaveTex" OutName="trans_circle_wave" Format="i8" Width="16" Height="64" Offset="0x10F148"/>
-        <Texture Name="sTransCircleRippleTex" OutName="trans_circle_ripple" Format="i8" Width="16" Height="64" Offset="0x10F548"/>
-        <Texture Name="sTransCircleStarburstTex" OutName="trans_circle_starburst" Format="i8" Width="16" Height="64" Offset="0x10F948"/>
-        <Array Name="sTransCircleVtx" Count="34" Offset="0x10FD48">
+    <File Name="code" OutName="z_fbdemo_circle">
+        <Texture Name="sTransCircleNormalTex" OutName="trans_circle_normal" Format="i8" Width="16" Height="64" Offset="0x0"/>
+        <Texture Name="sTransCircleWaveTex" OutName="trans_circle_wave" Format="i8" Width="16" Height="64" Offset="0x400"/>
+        <Texture Name="sTransCircleRippleTex" OutName="trans_circle_ripple" Format="i8" Width="16" Height="64" Offset="0x800"/>
+        <Texture Name="sTransCircleStarburstTex" OutName="trans_circle_starburst" Format="i8" Width="16" Height="64" Offset="0xC00"/>
+        <Array Name="sTransCircleVtx" Count="34" Offset="0x1000">
            <Vtx/>
        </Array>
        <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
-        <!--<DList Name="sTransCircleDL" Offset="0x10FF68"/>-->
+        <!--<DList Name="sTransCircleDL" Offset="0x1220"/>-->
    </File>
 </Root>
--- a/assets/xml/code/fbdemo_triforce.xml
+++ b/assets/xml/code/fbdemo_triforce.xml
@@ -1,7 +1,7 @@
 <Root>
-    <File Name="code" OutName="z_fbdemo_triforce" RangeStart="0x10E1D0" RangeEnd="0x10E2A0">
-        <DList Name="sTransTriforceDL" Offset="0x10E1D0"/>
-        <Array Name="sTransTriforceVtx" Count="10" Offset="0x10E200">
+    <File Name="code" OutName="z_fbdemo_triforce">
+        <DList Name="sTransTriforceDL" Offset="0x0"/>
+        <Array Name="sTransTriforceVtx" Count="10" Offset="0x30">
            <Vtx/>
        </Array>
    </File>
--- a/assets/xml/code/fbdemo_wipe1.xml
+++ b/assets/xml/code/fbdemo_wipe1.xml
@@ -1,10 +1,10 @@
 <Root>
-    <File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0x10E2A0" RangeEnd="0x10EC30">
-        <Array Name="sTransWipeVtx" Count="25" Offset="0x10E2A0">
+    <File Name="code" OutName="z_fbdemo_wipe1">
+        <Array Name="sTransWipeVtx" Count="25" Offset="0x0">
            <Vtx/>
        </Array>
-        <Texture Name="sTransWipeTex" OutName="trans_wipe" Format="i4" Width="64" Height="64" Offset="0x10E430"/>
+        <Texture Name="sTransWipeTex" OutName="trans_wipe" Format="i4" Width="64" Height="64" Offset="0x190"/>
        <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
-        <!-- <DList Name="sTransWipeDL" Offset="0x10EC30"/> -->
+        <!-- <DList Name="sTransWipeDL" Offset="0x990"/> -->
    </File>
 </Root>
--- a/assets/xml/objects/object_mag.xml
+++ b/assets/xml/objects/object_mag.xml
@@ -3,21 +3,19 @@
        <Texture Name="gTitleZeldaShieldLogoMQTex" OutName="title_zelda_shield_logo_mq" Format="rgba32" Width="160" Height="160" Offset="0x0"/>
        <Texture Name="gTitleCopyright19982002Tex" OutName="title_copyright_19982002" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
        <Texture Name="gTitleCopyright19982003Tex" OutName="title_copyright_19982003" Format="ia8" Width="160" Height="16" Offset="0x19A00"/>
-        <Texture Name="gTitleMasterQuestSubtitleTex" OutName="title_master_quest_subtitle" Format="rgba32" Width="128" Height="32" Offset="0x1A400"/>
-        <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x20000"/>
-        <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x20800"/>
-        <Texture Name="gTitleEffectMask02Tex" OutName="title_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0x21000"/>
-        <Texture Name="gTitleEffectMask10Tex" OutName="title_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0x21800"/>
-        <Texture Name="gTitleEffectMask11Tex" OutName="title_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0x22000"/>
-        <Texture Name="gTitleEffectMask12Tex" OutName="title_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0x22800"/>
-        <Texture Name="gTitleEffectMask20Tex" OutName="title_effect_mask_2_0" Format="i4" Width="64" Height="64" Offset="0x23000"/>
-        <Texture Name="gTitleEffectMask21Tex" OutName="title_effect_mask_2_1" Format="i4" Width="64" Height="64" Offset="0x23800"/>
-        <Texture Name="gTitleEffectMask22Tex" OutName="title_effect_mask_2_2" Format="i4" Width="64" Height="64" Offset="0x24000"/>
-        <Texture Name="gTitleFlameEffectTex" OutName="title_flame_effect" Format="i8" Width="32" Height="32" Offset="0x24800"/>
-        <Texture Name="gTitleTheLegendOfTextTex" OutName="title_the_legend_of_text" Format="i8" Width="72" Height="8" Offset="0x24C00"/>
-        <Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x24E40"/>
-        <Texture Name="gTitleUraLogoTex" OutName="title_ura_logo" Format="rgba32" Width="40" Height="40" Offset="0x1E400"/>
-        <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x1FD00"/>
-        <Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x25140"/>
+        <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x1A400"/>
+        <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x1A700"/>
+        <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x1AF00"/>
+        <Texture Name="gTitleEffectMask02Tex" OutName="title_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0x1B700"/>
+        <Texture Name="gTitleEffectMask10Tex" OutName="title_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0x1BF00"/>
+        <Texture Name="gTitleEffectMask11Tex" OutName="title_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0x1C700"/>
+        <Texture Name="gTitleEffectMask12Tex" OutName="title_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0x1CF00"/>
+        <Texture Name="gTitleEffectMask20Tex" OutName="title_effect_mask_2_0" Format="i4" Width="64" Height="64" Offset="0x1D700"/>
+        <Texture Name="gTitleEffectMask21Tex" OutName="title_effect_mask_2_1" Format="i4" Width="64" Height="64" Offset="0x1DF00"/>
+        <Texture Name="gTitleEffectMask22Tex" OutName="title_effect_mask_2_2" Format="i4" Width="64" Height="64" Offset="0x1E700"/>
+        <Texture Name="gTitleFlameEffectTex" OutName="title_flame_effect" Format="i8" Width="32" Height="32" Offset="0x1EF00"/>
+        <Texture Name="gTitleTheLegendOfTextTex" OutName="title_the_legend_of_text" Format="i8" Width="72" Height="8" Offset="0x1F300"/>
+        <Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x1F540"/>
+        <Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x1F840"/>
    </File>
 </Root>
--- a/assets/xml/objects/object_mag_mq.xml
+++ b/assets/xml/objects/object_mag_mq.xml
@@ -0,0 +1,23 @@
+<Root>
+    <File Name="object_mag" Segment="6">
+        <Texture Name="gTitleZeldaShieldLogoMQTex" OutName="title_zelda_shield_logo_mq" Format="rgba32" Width="160" Height="160" Offset="0x0"/>
+        <Texture Name="gTitleCopyright19982002Tex" OutName="title_copyright_19982002" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
+        <Texture Name="gTitleCopyright19982003Tex" OutName="title_copyright_19982003" Format="ia8" Width="160" Height="16" Offset="0x19A00"/>
+        <Texture Name="gTitleMasterQuestSubtitleTex" OutName="title_master_quest_subtitle" Format="rgba32" Width="128" Height="32" Offset="0x1A400"/>
+        <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x20000"/>
+        <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x20800"/>
+        <Texture Name="gTitleEffectMask02Tex" OutName="title_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0x21000"/>
+        <Texture Name="gTitleEffectMask10Tex" OutName="title_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0x21800"/>
+        <Texture Name="gTitleEffectMask11Tex" OutName="title_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0x22000"/>
+        <Texture Name="gTitleEffectMask12Tex" OutName="title_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0x22800"/>
+        <Texture Name="gTitleEffectMask20Tex" OutName="title_effect_mask_2_0" Format="i4" Width="64" Height="64" Offset="0x23000"/>
+        <Texture Name="gTitleEffectMask21Tex" OutName="title_effect_mask_2_1" Format="i4" Width="64" Height="64" Offset="0x23800"/>
+        <Texture Name="gTitleEffectMask22Tex" OutName="title_effect_mask_2_2" Format="i4" Width="64" Height="64" Offset="0x24000"/>
+        <Texture Name="gTitleFlameEffectTex" OutName="title_flame_effect" Format="i8" Width="32" Height="32" Offset="0x24800"/>
+        <Texture Name="gTitleTheLegendOfTextTex" OutName="title_the_legend_of_text" Format="i8" Width="72" Height="8" Offset="0x24C00"/>
+        <Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x24E40"/>
+        <Texture Name="gTitleUraLogoTex" OutName="title_ura_logo" Format="rgba32" Width="40" Height="40" Offset="0x1E400"/>
+        <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x1FD00"/>
+        <Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x25140"/>
+    </File>
+</Root>
--- a/assets/xml/overlays/ovl_Arrow_Fire.xml
+++ b/assets/xml/overlays/ovl_Arrow_Fire.xml
@@ -1,11 +1,11 @@
 <Root>
-    <File Name="ovl_Arrow_Fire" BaseAddress="0x80865d10" RangeStart="0x9D0" RangeEnd="0x1DF0">
-        <Texture Name="s1Tex" OutName="fire_tex_1" Format="i8" Width="32" Height="64" Offset="0x9D0" Static="On"/>
-        <Texture Name="s2Tex" OutName="fire_tex_2" Format="i8" Width="32" Height="64" Offset="0x11D0" Static="On"/>
-        <Array Name="sVtx" Count="43" Offset="0x19D0" Static="On">
+    <File Name="ovl_Arrow_Fire">
+        <Texture Name="s1Tex" OutName="fire_tex_1" Format="i8" Width="32" Height="64" Offset="0x0" Static="On"/>
+        <Texture Name="s2Tex" OutName="fire_tex_2" Format="i8" Width="32" Height="64" Offset="0x800" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1000" Static="On">
            <Vtx/>
        </Array>
-        <DList Name="sMaterialDL" Offset="0x1C80" Static="On"/>
-        <DList Name="sModelDL" Offset="0x1D30" Static="On"/>
+        <DList Name="sMaterialDL" Offset="0x12B0" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1360" Static="On"/>
    </File>
 </Root>
--- a/assets/xml/overlays/ovl_Arrow_Ice.xml
+++ b/assets/xml/overlays/ovl_Arrow_Ice.xml
@@ -1,11 +1,11 @@
 <Root>
-    <File Name="ovl_Arrow_Ice" BaseAddress="0x80867cd0" RangeStart="0x9F0" RangeEnd="0x1E10">
-        <Texture Name="s1Tex" OutName="ice_tex_1" Format="i8" Width="32" Height="64" Offset="0x9F0" Static="On"/>
-        <Texture Name="s2Tex" OutName="ice_tex_2" Format="i8" Width="32" Height="64" Offset="0x11F0" Static="On"/>
-        <Array Name="sVtx" Count="43" Offset="0x19F0" Static="On">
+    <File Name="ovl_Arrow_Ice">
+        <Texture Name="s1Tex" OutName="ice_tex_1" Format="i8" Width="32" Height="64" Offset="0x0" Static="On"/>
+        <Texture Name="s2Tex" OutName="ice_tex_2" Format="i8" Width="32" Height="64" Offset="0x800" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1000" Static="On">
            <Vtx/>
        </Array>
-        <DList Name="sMaterialDL" Offset="0x1CA0" Static="On"/>
-        <DList Name="sModelDL" Offset="0x1D50" Static="On"/>
+        <DList Name="sMaterialDL" Offset="0x12B0" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1360" Static="On"/>
    </File>
 </Root>
--- a/assets/xml/overlays/ovl_Arrow_Light.xml
+++ b/assets/xml/overlays/ovl_Arrow_Light.xml
@@ -1,11 +1,11 @@
 <Root>
-    <File Name="ovl_Arrow_Light" BaseAddress="0x80869cb0" RangeStart="0xA00" RangeEnd="0x1E20">
-        <Texture Name="s1Tex" OutName="light_tex_1" Format="i8" Width="32" Height="64" Offset="0xA00" Static="On"/>
-        <Texture Name="s2Tex" OutName="light_tex_2" Format="i8" Width="32" Height="64" Offset="0x1200" Static="On"/>
-        <Array Name="sVtx" Count="43" Offset="0x1A00" Static="On">
+    <File Name="ovl_Arrow_Light">
+        <Texture Name="s1Tex" OutName="light_tex_1" Format="i8" Width="32" Height="64" Offset="0x0" Static="On"/>
+        <Texture Name="s2Tex" OutName="light_tex_2" Format="i8" Width="32" Height="64" Offset="0x800" Static="On"/>
+        <Array Name="sVtx" Count="43" Offset="0x1000" Static="On">
            <Vtx/>
        </Array>
-        <DList Name="sMaterialDL" Offset="0x1CB0" Static="On"/>
-        <DList Name="sModelDL" Offset="0x1D60" Static="On"/>
+        <DList Name="sMaterialDL" Offset="0x12B0" Static="On"/>
+        <DList Name="sModelDL" Offset="0x1360" Static="On"/>
    </File>
 </Root>
--- a/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml
+++ b/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml
@@ -1,29 +1,29 @@
 <Root>
-    <File Name="ovl_Bg_Ganon_Otyuka" BaseAddress="0x80875920" RangeStart="0x11C0" RangeEnd="0x259C">
-        <Texture Name="sPlatformTex" OutName="platform_tex" Format="rgba16" Width="32" Height="32" Offset="0x11C0"/>
+    <File Name="ovl_Bg_Ganon_Otyuka">
+        <Texture Name="sPlatformTex" OutName="platform_tex" Format="rgba16" Width="32" Height="32" Offset="0x0"/>

-        <Array Name="sPlatformTopVtx" Count="4" Offset="0x19C8">
+        <Array Name="sPlatformTopVtx" Count="4" Offset="0x808">
            <Vtx/>
        </Array>
-        <DList Name="sPlatformMaterialDL" Offset="0x1A08"/>
-        <DList Name="sPlatformTopDL" Offset="0x1A90"/>
+        <DList Name="sPlatformMaterialDL" Offset="0x848"/>
+        <DList Name="sPlatformTopDL" Offset="0x8D0"/>

-        <Array Name="sPlatformBottomVtx" Count="4" Offset="0x1AA8">
+        <Array Name="sPlatformBottomVtx" Count="4" Offset="0x8E8">
            <Vtx/>
        </Array>
-        <DList Name="sPlatformBottomDL" Offset="0x1AE8"/>
+        <DList Name="sPlatformBottomDL" Offset="0x928"/>

-        <Array Name="sPlatformSideVtx" Count="4" Offset="0x01B00">
+        <Array Name="sPlatformSideVtx" Count="4" Offset="0x940">
            <Vtx/>
        </Array>
-        <DList Name="sPlatformSideDL" Offset="0x1B40"/>
+        <DList Name="sPlatformSideDL" Offset="0x980"/>

-        <Texture Name="sFlashTex" OutName="flash_tex" Format="i8" Width="32" Height="64" Offset="0x1B58"/>
-        <Array Name="sFlashVtx" Count="8" Offset="0x2358">
+        <Texture Name="sFlashTex" OutName="flash_tex" Format="i8" Width="32" Height="64" Offset="0x998"/>
+        <Array Name="sFlashVtx" Count="8" Offset="0x1198">
            <Vtx/>
        </Array>
-        <DList Name="sFlashDL" Offset="0x23D8"/>
+        <DList Name="sFlashDL" Offset="0x1218"/>

-        <Collision Name="sCol" Offset="0x2570"/>
+        <Collision Name="sCol" Offset="0x13B0"/>
    </File>
 </Root>
--- a/assets/xml/overlays/ovl_Bg_Jya_Cobra.xml
+++ b/assets/xml/overlays/ovl_Bg_Jya_Cobra.xml
@@ -1,10 +1,10 @@
 <Root>
-    <File Name="ovl_Bg_Jya_Cobra" BaseAddress="0x808958f0" RangeStart="0x1980" RangeEnd="0x19F8">
-        <Array Name="sShadowVtx" Count="4" Offset="0x1980">
+    <File Name="ovl_Bg_Jya_Cobra">
+        <Array Name="sShadowVtx" Count="4" Offset="0x0">
            <Vtx/>
        </Array>

-        <DList Name="sShadowDL" Offset="0x19C0"/>
+        <DList Name="sShadowDL" Offset="0x40"/>

    </File>
 </Root>
--- a/assets/xml/overlays/ovl_Boss_Dodongo.xml
+++ b/assets/xml/overlays/ovl_Boss_Dodongo.xml
@@ -1,6 +1,6 @@
 <Root>
-    <File Name="ovl_Boss_Dodongo" BaseAddress="0x808C1190" RangeStart="0x6238" RangeEnd="0x9238">
-        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x6238"/>
-        <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x8238"/>
+    <File Name="ovl_Boss_Dodongo">
+        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x0"/>
+        <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x2000"/>
    </File>
 </Root>
--- a/assets/xml/overlays/ovl_Boss_Ganon.xml
+++ b/assets/xml/overlays/ovl_Boss_Ganon.xml
@@ -1,53 +1,53 @@
 <Root>
    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-    <File Name="ovl_Boss_Ganon" BaseAddress="0x808D6870" RangeStart="0xE6B8" RangeEnd="0x211D8">
-        <Texture Name="gGanondorfLightning1Tex" OutName="lightning_1" Format="i8" Width="32" Height="96" Offset="0x11600" Static="Off"/>
-        <Texture Name="gGanondorfLightning2Tex" OutName="lightning_2" Format="i8" Width="32" Height="96" Offset="0x12200" Static="Off"/>
-        <Texture Name="gGanondorfLightning3Tex" OutName="lightning_3" Format="i8" Width="32" Height="96" Offset="0x12E00" Static="Off"/>
-        <Texture Name="gGanondorfLightning4Tex" OutName="lightning_4" Format="i8" Width="32" Height="96" Offset="0x13A00" Static="Off"/>
-        <Texture Name="gGanondorfLightning5Tex" OutName="lightning_5" Format="i8" Width="32" Height="96" Offset="0x14600" Static="Off"/>
-        <Texture Name="gGanondorfLightning6Tex" OutName="lightning_6" Format="i8" Width="32" Height="96" Offset="0x15200" Static="Off"/>
-        <Texture Name="gGanondorfLightning7Tex" OutName="lightning_7" Format="i8" Width="32" Height="96" Offset="0x15E00" Static="Off"/>
-        <Texture Name="gGanondorfLightning8Tex" OutName="lightning_8" Format="i8" Width="32" Height="96" Offset="0x16A00" Static="Off"/>
-        <Texture Name="gGanondorfLightning9Tex" OutName="lightning_9" Format="i8" Width="32" Height="96" Offset="0x17600" Static="Off"/>
-        <Texture Name="gGanondorfLightning10Tex" OutName="lightning_10" Format="i8" Width="32" Height="96" Offset="0x18200" Static="Off"/>
-        <Texture Name="gGanondorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18E00" Static="Off"/>
-        <Texture Name="gGanondorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x19A00" Static="Off"/>
+    <File Name="ovl_Boss_Ganon">
+        <Texture Name="gGanondorfLightning1Tex" OutName="lightning_1" Format="i8" Width="32" Height="96" Offset="0x2F48" Static="Off"/>
+        <Texture Name="gGanondorfLightning2Tex" OutName="lightning_2" Format="i8" Width="32" Height="96" Offset="0x3B48" Static="Off"/>
+        <Texture Name="gGanondorfLightning3Tex" OutName="lightning_3" Format="i8" Width="32" Height="96" Offset="0x4748" Static="Off"/>
+        <Texture Name="gGanondorfLightning4Tex" OutName="lightning_4" Format="i8" Width="32" Height="96" Offset="0x5348" Static="Off"/>
+        <Texture Name="gGanondorfLightning5Tex" OutName="lightning_5" Format="i8" Width="32" Height="96" Offset="0x5F48" Static="Off"/>
+        <Texture Name="gGanondorfLightning6Tex" OutName="lightning_6" Format="i8" Width="32" Height="96" Offset="0x6B48" Static="Off"/>
+        <Texture Name="gGanondorfLightning7Tex" OutName="lightning_7" Format="i8" Width="32" Height="96" Offset="0x7748" Static="Off"/>
+        <Texture Name="gGanondorfLightning8Tex" OutName="lightning_8" Format="i8" Width="32" Height="96" Offset="0x8348" Static="Off"/>
+        <Texture Name="gGanondorfLightning9Tex" OutName="lightning_9" Format="i8" Width="32" Height="96" Offset="0x8F48" Static="Off"/>
+        <Texture Name="gGanondorfLightning10Tex" OutName="lightning_10" Format="i8" Width="32" Height="96" Offset="0x9B48" Static="Off"/>
+        <Texture Name="gGanondorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0xA748" Static="Off"/>
+        <Texture Name="gGanondorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0xB348" Static="Off"/>

-        <Texture Name="gGanondorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="i8" Width="32" Height="64" Offset="0xFD38" Static="Off"/>
+        <Texture Name="gGanondorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="i8" Width="32" Height="64" Offset="0x1680" Static="Off"/>

-        <DList Name="gGanondorfLightStreak1DL" Offset="0x1FCF0" Static="Off"/>
-        <DList Name="gGanondorfLightStreak2DL" Offset="0x1FD28" Static="Off"/>
-        <DList Name="gGanondorfLightStreak3DL" Offset="0x1FD60" Static="Off"/>
-        <DList Name="gGanondorfLightStreak4DL" Offset="0x1FD98" Static="Off"/>
-        <DList Name="gGanondorfLightStreak5DL" Offset="0x1FDD0" Static="Off"/>
-        <DList Name="gGanondorfLightStreak6DL" Offset="0x1FE08" Static="Off"/>
-        <DList Name="gGanondorfLightStreak7DL" Offset="0x1FE40" Static="Off"/>
-        <DList Name="gGanondorfLightStreak8DL" Offset="0x1FE78" Static="Off"/>
-        <DList Name="gGanondorfLightStreak9DL" Offset="0x1FEB0" Static="Off"/>
-        <DList Name="gGanondorfLightStreak10DL" Offset="0x1FEE8" Static="Off"/>
-        <DList Name="gGanondorfLightStreak11DL" Offset="0x1FF20" Static="Off"/>
-        <DList Name="gGanondorfLightStreak12DL" Offset="0x1FF58" Static="Off"/>
+        <DList Name="gGanondorfLightStreak1DL" Offset="0x11638" Static="Off"/>
+        <DList Name="gGanondorfLightStreak2DL" Offset="0x11670" Static="Off"/>
+        <DList Name="gGanondorfLightStreak3DL" Offset="0x116A8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak4DL" Offset="0x116E0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak5DL" Offset="0x11718" Static="Off"/>
+        <DList Name="gGanondorfLightStreak6DL" Offset="0x11750" Static="Off"/>
+        <DList Name="gGanondorfLightStreak7DL" Offset="0x11788" Static="Off"/>
+        <DList Name="gGanondorfLightStreak8DL" Offset="0x117C0" Static="Off"/>
+        <DList Name="gGanondorfLightStreak9DL" Offset="0x117F8" Static="Off"/>
+        <DList Name="gGanondorfLightStreak10DL" Offset="0x11830" Static="Off"/>
+        <DList Name="gGanondorfLightStreak11DL" Offset="0x11868" Static="Off"/>
+        <DList Name="gGanondorfLightStreak12DL" Offset="0x118A0" Static="Off"/>

-        <DList Name="gGanondorfShadowSetupDL" Offset="0xE6F8" Static="Off"/>
-        <DList Name="gGanondorfShadowModelDL" Offset="0xE718" Static="Off"/>
-        <DList Name="gGanondorfTriforceDL" Offset="0xF788" Static="Off"/>
-        <DList Name="gGanondorfWindowShardMaterialDL" Offset="0xFC78" Static="Off"/>
-        <DList Name="gGanondorfWindowShardModelDL" Offset="0xFD20" Static="Off"/>
-        <DList Name="gGanondorfLightBallMaterialDL" Offset="0x11578" Static="Off"/>
-        <DList Name="gGanondorfSquareDL" Offset="0x115E8" Static="Off"/>
-        <DList Name="gGanondorfLightningDL" Offset="0x1A640" Static="Off"/>
-        <DList Name="gGanondorfUnusedDL" Offset="0x1A6F0" Static="Off"/>
-        <DList Name="gGanondorfLightRayTriDL" Offset="0x1A768" Static="Off"/>
-        <DList Name="gGanondorfLightFlecksDL" Offset="0x1C1C0" Static="Off"/>
-        <DList Name="gGanondorfBigMagicBGCircleDL" Offset="0x1C2B0" Static="Off"/>
-        <DList Name="gGanondorfDotDL" Offset="0x1C358" Static="Off"/>
-        <DList Name="gGanondorfShockwaveDL" Offset="0x1CDC0" Static="Off"/>
-        <DList Name="gGanondorfImpactDarkDL" Offset="0x1DC58" Static="Off"/>
-        <DList Name="gGanondorfImpactLightDL" Offset="0x1DD70" Static="Off"/>
-        <DList Name="gGanondorfShockGlowDL" Offset="0x1EEC8" Static="Off"/>
-        <DList Name="gGanondorfLightCoreDL" Offset="0x20228" Static="Off"/>
-        <DList Name="gGanondorfShockDL" Offset="0x202F0" Static="Off"/>
-        <DList Name="gGanondorfVortexDL" Offset="0x210D0" Static="Off"/>
+        <DList Name="gGanondorfShadowSetupDL" Offset="0x40" Static="Off"/>
+        <DList Name="gGanondorfShadowModelDL" Offset="0x60" Static="Off"/>
+        <DList Name="gGanondorfTriforceDL" Offset="0x10D0" Static="Off"/>
+        <DList Name="gGanondorfWindowShardMaterialDL" Offset="0x15C0" Static="Off"/>
+        <DList Name="gGanondorfWindowShardModelDL" Offset="0x1668" Static="Off"/>
+        <DList Name="gGanondorfLightBallMaterialDL" Offset="0x2EC0" Static="Off"/>
+        <DList Name="gGanondorfSquareDL" Offset="0x2F30" Static="Off"/>
+        <DList Name="gGanondorfLightningDL" Offset="0xBF88" Static="Off"/>
+        <DList Name="gGanondorfUnusedDL" Offset="0xC038" Static="Off"/>
+        <DList Name="gGanondorfLightRayTriDL" Offset="0xC0B0" Static="Off"/>
+        <DList Name="gGanondorfLightFlecksDL" Offset="0xDB08" Static="Off"/>
+        <DList Name="gGanondorfBigMagicBGCircleDL" Offset="0xDBF8" Static="Off"/>
+        <DList Name="gGanondorfDotDL" Offset="0xDCA0" Static="Off"/>
+        <DList Name="gGanondorfShockwaveDL" Offset="0xE708" Static="Off"/>
+        <DList Name="gGanondorfImpactDarkDL" Offset="0xF5A0" Static="Off"/>
+        <DList Name="gGanondorfImpactLightDL" Offset="0xF6B8" Static="Off"/>
+        <DList Name="gGanondorfShockGlowDL" Offset="0x10810" Static="Off"/>
+        <DList Name="gGanondorfLightCoreDL" Offset="0x11B70" Static="Off"/>
+        <DList Name="gGanondorfShockDL" Offset="0x11C38" Static="Off"/>
+        <DList Name="gGanondorfVortexDL" Offset="0x12A18" Static="Off"/>
    </File>
 </Root>
--- a/assets/xml/overlays/ovl_Boss_Ganon2.xml
+++ b/assets/xml/overlays/ovl_Boss_Ganon2.xml
@@ -1,29 +1,29 @@
 <Root>
    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
-    <File Name="ovl_Boss_Ganon2" BaseAddress="0x808FCF40" RangeStart="0xA2C8" RangeEnd="0x10778">
-        <Texture Name="gGanonLightOrbTex" OutName="ganon_light_orb" Format="i8" Width="64" Height="64" Offset="0xA2C8"/>
-        <DList Name="gGanonLightOrbMaterialDL" Offset="0xB308"/>
-        <DList Name="gGanonLightOrbModelDL" Offset="0xB378"/>
-        <DList Name="gGanonShadowMaterialDL" Offset="0xB3D0"/>
-        <DList Name="gGanonShadowModelDL" Offset="0xB3F0"/>
-        <Texture Name="gGanonSwordTrailTex" OutName="ganon_sword_trail" Format="i8" Width="32" Height="32" Offset="0xB420"/>
-        <Texture Name="gGanonSwordTrailMaskTex" OutName="ganon_sword_trail_mask" Format="i4" Width="32" Height="32" Offset="0xB820"/>
-        <Array Name="gGanonSwordTrailVtx" Count="22" Offset="0xBA20">
+    <File Name="ovl_Boss_Ganon2">
+        <Texture Name="gGanonLightOrbTex" OutName="ganon_light_orb" Format="i8" Width="64" Height="64" Offset="0x0"/>
+        <DList Name="gGanonLightOrbMaterialDL" Offset="0x1040"/>
+        <DList Name="gGanonLightOrbModelDL" Offset="0x10B0"/>
+        <DList Name="gGanonShadowMaterialDL" Offset="0x1108"/>
+        <DList Name="gGanonShadowModelDL" Offset="0x1128"/>
+        <Texture Name="gGanonSwordTrailTex" OutName="ganon_sword_trail" Format="i8" Width="32" Height="32" Offset="0x1158"/>
+        <Texture Name="gGanonSwordTrailMaskTex" OutName="ganon_sword_trail_mask" Format="i4" Width="32" Height="32" Offset="0x1558"/>
+        <Array Name="gGanonSwordTrailVtx" Count="22" Offset="0x1758">
            <Vtx/>
        </Array>
-        <DList Name="gGanonSwordTrailDL" Offset="0xBB80"/>
-        <Texture Name="gGanonTriforceTex" OutName="ganon_triforce" Format="i8" Width="64" Height="64" Offset="0xBC98"/>
-        <DList Name="gGanonTriforceDL" Offset="0xCCD8"/>
-        <Texture Name="gGanonLightningTex" OutName="ganon_lightning" Format="i4" Width="32" Height="160" Offset="0xCD58"/>
-        <DList Name="gGanonLightningDL" Offset="0xD798"/> <!-- Original name might be "efc_fg2_thunder1_modelT" -->
-        <Texture Name="gGanonFireRingTex" OutName="ganon_fire_ring" Format="i8" Width="32" Height="64" Offset="0xD820"/>
-        <DList Name="gGanonFireRingDL" Offset="0xE1C0"/> <!-- Original name is "ganon_fire_modelT" -->
-        <Texture Name="gGanonZeldaMagicTex" OutName="ganon_zelda_magic" Format="i8" Width="32" Height="64" Offset="0xE2E0"/>
-        <DList Name="gGanonZeldaMagicDL" Offset="0xEC40"/> <!-- Original name is "efc_ganon2_hadou_modelT" ("wave motion; undulation; surge") -->
-        <Texture Name="gGanonMasterSwordShadowTex" OutName="ganon_master_sword_shadow" Format="i8" Width="32" Height="32" Offset="0xED48"/>
-        <DList Name="gGanonMasterSwordShadowDL" Offset="0xF188"/> <!-- Original name is "master_sword_shadow_model" -->
-        <Texture Name="gGanonMasterSwordPommelTex" OutName="ganon_master_sword_pommel" Format="rgba16" Width="16" Height="16" Offset="0xF208"/>
-        <Texture Name="gGanonMasterSwordGuardTex" OutName="ganon_master_sword_guard" Format="rgba16" Width="32" Height="32" Offset="0xF408"/>
-        <DList Name="gGanonMasterSwordDL" Offset="0x103A8"/> <!-- Original name is "master_gn2_swordB_model" -->
+        <DList Name="gGanonSwordTrailDL" Offset="0x18B8"/>
+        <Texture Name="gGanonTriforceTex" OutName="ganon_triforce" Format="i8" Width="64" Height="64" Offset="0x19D0"/>
+        <DList Name="gGanonTriforceDL" Offset="0x2A10"/>
+        <Texture Name="gGanonLightningTex" OutName="ganon_lightning" Format="i4" Width="32" Height="160" Offset="0x2A90"/>
+        <DList Name="gGanonLightningDL" Offset="0x34D0"/> <!-- Original name might be "efc_fg2_thunder1_modelT" -->
+        <Texture Name="gGanonFireRingTex" OutName="ganon_fire_ring" Format="i8" Width="32" Height="64" Offset="0x3558"/>
+        <DList Name="gGanonFireRingDL" Offset="0x3EF8"/> <!-- Original name is "ganon_fire_modelT" -->
+        <Texture Name="gGanonZeldaMagicTex" OutName="ganon_zelda_magic" Format="i8" Width="32" Height="64" Offset="0x4018"/>
+        <DList Name="gGanonZeldaMagicDL" Offset="0x4978"/> <!-- Original name is "efc_ganon2_hadou_modelT" ("wave motion; undulation; surge") -->
+        <Texture Name="gGanonMasterSwordShadowTex" OutName="ganon_master_sword_shadow" Format="i8" Width="32" Height="32" Offset="0x4A80"/>
+        <DList Name="gGanonMasterSwordShadowDL" Offset="0x4EC0"/> <!-- Original name is "master_sword_shadow_model" -->
+        <Texture Name="gGanonMasterSwordPommelTex" OutName="ganon_master_sword_pommel" Format="rgba16" Width="16" Height="16" Offset="0x4F40"/>
+        <Texture Name="gGanonMasterSwordGuardTex" OutName="ganon_master_sword_guard" Format="rgba16" Width="32" Height="32" Offset="0x5140"/>
+        <DList Name="gGanonMasterSwordDL" Offset="0x60E0"/> <!-- Original name is "master_gn2_swordB_model" -->
    </File>
 </Root>
--- a/assets/xml/overlays/ovl_Boss_Sst.xml
+++ b/assets/xml/overlays/ovl_Boss_Sst.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="ovl_Boss_Sst" BaseAddress="0x8092C5D0" RangeStart="0xA3C0" RangeEnd="0xAD70">
-        <DList Name="sBodyStaticDList" Offset="0xA3C0"/>
-        <DList Name="sHandTrailDList" Offset="0xA3D8"/>
-        <DList Name="sIntroVanishDList" Offset="0xA838"/>
-        <DList Name="sShadowDList" Offset="0xACF0"/>
+    <File Name="ovl_Boss_Sst">
+        <DList Name="sBodyStaticDList" Offset="0x0"/>
+        <DList Name="sHandTrailDList" Offset="0x18"/>
+        <DList Name="sIntroVanishDList" Offset="0x478"/>
+        <DList Name="sShadowDList" Offset="0x930"/>
    </File>
 </Root>
--- a/assets/xml/overlays/ovl_Demo_Shd.xml
+++ b/assets/xml/overlays/ovl_Demo_Shd.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="ovl_Demo_Shd" BaseAddress="0x80991230" RangeStart="0x450" RangeEnd="0x23D0">
+    <File Name="ovl_Demo_Shd">

-    <DList Name="D_809932D0" Offset="0x20A0"/>
-    <DList Name="D_80993390" Offset="0x2160"/>
-    <DList Name="D_809934B8" Offset="0x2288"/>
+    <DList Name="D_809932D0" Offset="0x1C50"/>
+    <DList Name="D_80993390" Offset="0x1D10"/>
+    <DList Name="D_809934B8" Offset="0x1E38"/>
    </File>
 </Root>
--- a/assets/xml/overlays/ovl_Effect_Ss_Fhg_Flash.xml
+++ b/assets/xml/overlays/ovl_Effect_Ss_Fhg_Flash.xml
@@ -1,9 +1,9 @@
 <Root>
-    <File Name="ovl_Effect_Ss_Fhg_Flash" BaseAddress="0x809A4660" RangeStart="0xA60" RangeEnd="0xF18">
-        <Array Name="sShockVtx" Count="4" Offset="0xA60">
+    <File Name="ovl_Effect_Ss_Fhg_Flash">
+        <Array Name="sShockVtx" Count="4" Offset="0x0">
            <Vtx/>
        </Array>
-        <DList Name="sShockDL" Offset="0xAA0"/>
-        <Texture Name="sShockTex" OutName="shock" Format="i8" Width="32" Height="32" Offset="0xB18"/>
+        <DList Name="sShockDL" Offset="0x40"/>
+        <Texture Name="sShockTex" OutName="shock" Format="i8" Width="32" Height="32" Offset="0xB8"/>
    </File>
 </Root>
--- a/assets/xml/overlays/ovl_Elf_Msg.xml
+++ b/assets/xml/overlays/ovl_Elf_Msg.xml
@@ -1,16 +1,16 @@
 <Root>
-    <File Name="ovl_Elf_Msg" BaseAddress="0x809ACB20" RangeStart="0x758" RangeEnd="0x9D8">
+    <File Name="ovl_Elf_Msg">

-        <DList Name="D_809AD278" Offset="0x758"/>
+        <DList Name="D_809AD278" Offset="0x0"/>

-        <Array Name="sCylinderVtx" Count="16" Offset="0x798">
+        <Array Name="sCylinderVtx" Count="16" Offset="0x40">
            <Vtx/>
        </Array>
-        <DList Name="sCylinderDL" Offset="0x898"/>
+        <DList Name="sCylinderDL" Offset="0x140"/>

-        <Array Name="sCubeVtx" Count="8" Offset="0x918">
+        <Array Name="sCubeVtx" Count="8" Offset="0x1C0">
            <Vtx/>
        </Array>
-        <DList Name="sCubeDL" Offset="0x998"/>
+        <DList Name="sCubeDL" Offset="0x240"/>
    </File>
 </Root>
--- a/assets/xml/overlays/ovl_Elf_Msg2.xml
+++ b/assets/xml/overlays/ovl_Elf_Msg2.xml
@@ -1,11 +1,11 @@
 <Root>
-    <File Name="ovl_Elf_Msg2" BaseAddress="0x809AD700" RangeStart="0x538" RangeEnd="0x638">
+    <File Name="ovl_Elf_Msg2">

-        <DList Name="D_809ADC38" Offset="0x538"/>
+        <DList Name="D_809ADC38" Offset="0x0"/>

-        <Array Name="sCubeVtx" Count="8" Offset="0x578">
+        <Array Name="sCubeVtx" Count="8" Offset="0x40">
            <Vtx/>
        </Array>
-        <DList Name="sCubeDL" Offset="0x5F8"/>
+        <DList Name="sCubeDL" Offset="0xC0"/>
    </File>
 </Root>
--- a/Show More
+++ b/Show More