Merge remote-tracking branch 'origin/master' into z_map_

This commit is contained in:
mzxrules
2023-05-28 14:08:53 -04:00
1126 changed files with 53542 additions and 31101 deletions
+2
View File
@@ -14,6 +14,8 @@ tags
# Project-specific ignores
*.z64
*.n64
*.v64
*.sra
*.bin
*.elf
+3 -3
View File
@@ -90,7 +90,7 @@ OBJCOPY := $(MIPS_BINUTILS_PREFIX)objcopy
OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump
ASM_PROC := python3 tools/asm-processor/build.py
ASM_PROC_FLAGS := --input-enc=utf-8 --output-enc=euc-jp
ASM_PROC_FLAGS := --input-enc=utf-8 --output-enc=euc-jp --convert-statics=global-with-filename
IINC := -Iinclude -Isrc -Iassets -Ibuild -I.
@@ -210,7 +210,7 @@ build/src/libultra/rmon/%.o: OPTFLAGS := -O2
build/src/libultra/flash/%.o: OPTFLAGS := -g
build/src/libultra/flash/%.o: MIPS_VERSION := -mips1
build/src/code/audio/%.o: OPTFLAGS := -O2
build/src/audio/%.o: OPTFLAGS := -O2
build/assets/%.o: OPTFLAGS := -O1
build/assets/%.o: ASM_PROC_FLAGS :=
@@ -238,7 +238,7 @@ build/src/libultra/%.o: CC := $(CC_OLD)
build/src/libultra/voice/%.o: CC := $(ASM_PROC) $(ASM_PROC_FLAGS) $(CC_OLD) -- $(AS) $(ASFLAGS) --
build/src/code/%.o: CC := $(ASM_PROC) $(ASM_PROC_FLAGS) $(CC) -- $(AS) $(ASFLAGS) --
build/src/code/audio/%.o: CC := $(ASM_PROC) $(ASM_PROC_FLAGS) $(CC) -- $(AS) $(ASFLAGS) --
build/src/audio/%.o: CC := $(ASM_PROC) $(ASM_PROC_FLAGS) $(CC) -- $(AS) $(ASFLAGS) --
build/src/overlays/%.o: CC := $(ASM_PROC) $(ASM_PROC_FLAGS) $(CC) -- $(AS) $(ASFLAGS) --
+1 -1
View File
@@ -4,7 +4,7 @@
<Vtx/>
</Array>
<DList Name="sDebugDisplay1DL" Offset="0x114CD0"/>
<Array Name="sDebugDisplay2Vtx" Count="8" Offset="0x114D30">
<Vtx/>
</Array>
+9
View File
@@ -0,0 +1,9 @@
<Root>
<File Name="code" BaseAddress="0x800A5AC0" RangeStart="0x116750" RangeEnd="0x1167E0" OutName="eff_footmark">
<Array Name="gEffFootprintVtx" Count="3" Offset="0x116750">
<Vtx/>
</Array>
<DList Name="gEffFootprintMaterialDL" Offset="0x116780"/>
<DList Name="gEffFootprintModelDL" Offset="0x1167C8"/>
</File>
</Root>
+7 -5
View File
@@ -787,7 +787,7 @@
<PlayerAnimation Name="gPlayerAnim_Link_muku" Offset="0xE4E0" />
<PlayerAnimation Name="gPlayerAnim_Link_otituku_w" Offset="0xE4E8" />
<PlayerAnimation Name="gPlayerAnim_Link_ue_wait" Offset="0xE4F0" />
<DList Name="gameplay_keep_DL_00E5C0" Offset="0xE5C0" />
<!-- Deku Flower -->
@@ -1145,8 +1145,8 @@
<Texture Name="gElegyShellGoronNecklaceTex" OutName="elegy_shell_goron_necklace" Format="i8" Width="32" Height="32" Offset="0x4DDA0" />
<Texture Name="gElegyShellGoronPlatformTex" OutName="elegy_shell_goron_platform" Format="ci8" Width="8" Height="16" Offset="0x4E1A0" />
<Texture Name="gameplay_keep_Tex_04E220" OutName="tex_04E220" Format="i8" Width="64" Height="64" Offset="0x4E220" />
<DList Name="gameplay_keep_DL_04F250" Offset="0x4F250" />
<Texture Name="gHookshotReticleTex" OutName="tex_04E220" Format="i8" Width="64" Height="64" Offset="0x4E220" />
<DList Name="gHookshotReticleDL" Offset="0x4F250" />
<Texture Name="gameplay_keep_Tex_04F2C0" OutName="tex_04F2C0" Format="ia16" Width="32" Height="64" Offset="0x4F2C0" />
<DList Name="gEffIceFragment1DL" Offset="0x50550" />
<DList Name="gEffIceFragment2MaterialDL" Offset="0x50648" />
@@ -1223,7 +1223,9 @@
<DList Name="gameplay_keep_DL_054C90" Offset="0x54C90" />
<Texture Name="gameplay_keep_Tex_054D90" OutName="tex_054D90" Format="i4" Width="16" Height="16" Offset="0x54D90" />
<Texture Name="gameplay_keep_Tex_054E10" OutName="tex_054E10" Format="i8" Width="16" Height="16" Offset="0x54E10" />
<TextureAnimation Name="gameplay_keep_Matanimheader_054F18" Offset="0x54F18" />
<Texture Name="gameplay_keep_Tex_054F20" OutName="tex_054F20" Format="i8" Width="32" Height="32" Offset="0x54F20" />
<DList Name="gameplay_keep_DL_055360" Offset="0x55360" />
<DList Name="gameplay_keep_DL_055620" Offset="0x55620" />
@@ -1477,7 +1479,7 @@
<Texture Name="gElegyShellZoraPlatformTex" OutName="elegy_shell_zora_platform" Format="rgba16" Width="8" Height="16" Offset="0x8D2E0" />
<Texture Name="gameplay_keep_Tex_08D3E0" OutName="tex_08D3E0" Format="i8" Width="64" Height="32" Offset="0x8D3E0" />
<!-- Dust Textures -->
<Texture Name="gEffDust1Tex" OutName="eff_dust_1" Format="i8" Width="32" Height="32" Offset="0x8DBE0" />
<Texture Name="gEffDust2Tex" OutName="eff_dust_2" Format="i8" Width="32" Height="32" Offset="0x8DFE0" />
@@ -1487,7 +1489,7 @@
<Texture Name="gEffDust6Tex" OutName="eff_dust_6" Format="i8" Width="32" Height="32" Offset="0x8EFE0" />
<Texture Name="gEffDust7Tex" OutName="eff_dust_7" Format="i8" Width="32" Height="32" Offset="0x8F3E0" />
<Texture Name="gEffDust8Tex" OutName="eff_dust_8" Format="i8" Width="32" Height="32" Offset="0x8F7E0" />
<Texture Name="gameplay_keep_Tex_08FBE0" OutName="tex_08FBE0" Format="i8" Width="32" Height="64" Offset="0x8FBE0" />
<Texture Name="gameplay_keep_Tex_0903E0" OutName="tex_0903E0" Format="i8" Width="32" Height="64" Offset="0x903E0" />
<Texture Name="gameplay_keep_Tex_090BE0" OutName="tex_090BE0" Format="i8" Width="32" Height="64" Offset="0x90BE0" />
+58 -49
View File
@@ -1,53 +1,62 @@
<Root>
<!-- Assets for the bearded man from OOT, body is reused in MM for Cured Swamp Spider House Man (head substituted from overlay data). -->
<File Name="object_ahg" Segment="6">
<Texture Name="object_ahg_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" />
<Texture Name="object_ahg_Tex_000200" OutName="tex_000200" Format="ci8" Width="16" Height="16" Offset="0x200" />
<Texture Name="object_ahg_Tex_000300" OutName="tex_000300" Format="ci8" Width="16" Height="16" Offset="0x300" />
<Texture Name="object_ahg_Tex_000400" OutName="tex_000400" Format="ci8" Width="8" Height="8" Offset="0x400" />
<Texture Name="object_ahg_Tex_000440" OutName="tex_000440" Format="ci8" Width="8" Height="8" Offset="0x440" />
<!-- <Blob Name="object_ahg_Blob_000480" Size="0x300" Offset="0x480" /> -->
<Texture Name="object_ahg_Tex_000780" OutName="tex_000780" Format="ci8" Width="16" Height="16" Offset="0x780" />
<Texture Name="object_ahg_Tex_000880" OutName="tex_000880" Format="i8" Width="8" Height="8" Offset="0x880" />
<Texture Name="object_ahg_Tex_0008C0" OutName="tex_0008C0" Format="i8" Width="8" Height="8" Offset="0x8C0" />
<Texture Name="object_ahg_Tex_000900" OutName="tex_000900" Format="ci8" Width="32" Height="16" Offset="0x900" />
<Texture Name="object_ahg_Tex_000B00" OutName="tex_000B00" Format="ci8" Width="16" Height="16" Offset="0xB00" />
<DList Name="object_ahg_DL_002FF0" Offset="0x2FF0" />
<DList Name="object_ahg_DL_003400" Offset="0x3400" />
<DList Name="object_ahg_DL_003570" Offset="0x3570" />
<DList Name="object_ahg_DL_0036A0" Offset="0x36A0" />
<DList Name="object_ahg_DL_0037D8" Offset="0x37D8" />
<DList Name="object_ahg_DL_003948" Offset="0x3948" />
<DList Name="object_ahg_DL_003A78" Offset="0x3A78" />
<DList Name="object_ahg_DL_003BB0" Offset="0x3BB0" />
<DList Name="object_ahg_DL_003DD8" Offset="0x3DD8" />
<DList Name="object_ahg_DL_003F18" Offset="0x3F18" />
<DList Name="object_ahg_DL_004048" Offset="0x4048" />
<DList Name="object_ahg_DL_004180" Offset="0x4180" />
<DList Name="object_ahg_DL_0042C0" Offset="0x42C0" />
<DList Name="object_ahg_DL_0043F0" Offset="0x43F0" />
<DList Name="object_ahg_DL_004528" Offset="0x4528" />
<!-- <Blob Name="object_ahg_Blob_0046C8" Size="0x180" Offset="0x46C8" /> -->
<Texture Name="object_ahg_Tex_004848" OutName="tex_004848" Format="ci8" Width="8" Height="8" Offset="0x4848" />
<Texture Name="object_ahg_Tex_004888" OutName="tex_004888" Format="ci8" Width="32" Height="16" Offset="0x4888" />
<Texture Name="object_ahg_Tex_004A88" OutName="tex_004A88" Format="ci8" Width="16" Height="16" Offset="0x4A88" />
<Texture Name="object_ahg_Tex_004B88" OutName="tex_004B88" Format="ci8" Width="8" Height="16" Offset="0x4B88" />
<DList Name="object_ahg_DL_005408" Offset="0x5408" />
<DList Name="object_ahg_DL_005628" Offset="0x5628" />
<Limb Name="object_ahg_Standardlimb_0058A8" Type="Standard" EnumName="OBJECT_AHG_LIMB_01" Offset="0x58A8" />
<Limb Name="object_ahg_Standardlimb_0058B4" Type="Standard" EnumName="OBJECT_AHG_LIMB_02" Offset="0x58B4" />
<Limb Name="object_ahg_Standardlimb_0058C0" Type="Standard" EnumName="OBJECT_AHG_LIMB_03" Offset="0x58C0" />
<Limb Name="object_ahg_Standardlimb_0058CC" Type="Standard" EnumName="OBJECT_AHG_LIMB_04" Offset="0x58CC" />
<Limb Name="object_ahg_Standardlimb_0058D8" Type="Standard" EnumName="OBJECT_AHG_LIMB_05" Offset="0x58D8" />
<Limb Name="object_ahg_Standardlimb_0058E4" Type="Standard" EnumName="OBJECT_AHG_LIMB_06" Offset="0x58E4" />
<Limb Name="object_ahg_Standardlimb_0058F0" Type="Standard" EnumName="OBJECT_AHG_LIMB_07" Offset="0x58F0" />
<Limb Name="object_ahg_Standardlimb_0058FC" Type="Standard" EnumName="OBJECT_AHG_LIMB_08" Offset="0x58FC" />
<Limb Name="object_ahg_Standardlimb_005908" Type="Standard" EnumName="OBJECT_AHG_LIMB_09" Offset="0x5908" />
<Limb Name="object_ahg_Standardlimb_005914" Type="Standard" EnumName="OBJECT_AHG_LIMB_0A" Offset="0x5914" />
<Limb Name="object_ahg_Standardlimb_005920" Type="Standard" EnumName="OBJECT_AHG_LIMB_0B" Offset="0x5920" />
<Limb Name="object_ahg_Standardlimb_00592C" Type="Standard" EnumName="OBJECT_AHG_LIMB_0C" Offset="0x592C" />
<Limb Name="object_ahg_Standardlimb_005938" Type="Standard" EnumName="OBJECT_AHG_LIMB_0D" Offset="0x5938" />
<Limb Name="object_ahg_Standardlimb_005944" Type="Standard" EnumName="OBJECT_AHG_LIMB_0E" Offset="0x5944" />
<Limb Name="object_ahg_Standardlimb_005950" Type="Standard" EnumName="OBJECT_AHG_LIMB_0F" Offset="0x5950" />
<Skeleton Name="object_ahg_Skel_005998" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AHG_LIMB_NONE" LimbMax="OBJECT_AHG_LIMB_MAX" EnumName="ObjectAhgLimb" Offset="0x5998" />
<Texture Name="gAhgTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x0" />
<Texture Name="gAhgHairLineTex" OutName="hair_line" Format="ci8" Width="16" Height="16" Offset="0x200" />
<Texture Name="gAhgHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x300" />
<Texture Name="gAhgEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x400" />
<Texture Name="gAhgSkinGradientTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x440"/>
<Texture Name="gAhgEyeOpenTex" OutName="eye_open" Format="ci8" Width="16" Height="16" Offset="0x480" TlutOffset="0x0"/>
<Texture Name="gAhgEyeHalfTex" OutName="eye_half" Format="ci8" Width="16" Height="16" Offset="0x580" TlutOffset="0x0"/>
<Texture Name="gAhgEyeClosedTex" OutName="eye_closed" Format="ci8" Width="16" Height="16" Offset="0x680" TlutOffset="0x0"/>
<Texture Name="gAhgFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x780" />
<Texture Name="gAhgShirtTex" OutName="shirt" Format="i8" Width="8" Height="8" Offset="0x880" />
<Texture Name="gAhgShoesTex" OutName="shoes" Format="i8" Width="8" Height="8" Offset="0x8C0" />
<Texture Name="gAhgBeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="32" Height="16" Offset="0x900" />
<Texture Name="gAhgBeltLoopTex" OutName="belt_loop" Format="ci8" Width="16" Height="16" Offset="0xB00" />
<!-- This head is overwritten in EnSth draw. -->
<DList Name="gAhgBeardedHeadDL" Offset="0x2FF0" />
<DList Name="gAhgRightHandDL" Offset="0x3400" />
<DList Name="gAhgRightForearmDL" Offset="0x3570" />
<DList Name="gAhgRightUpperArmDL" Offset="0x36A0" />
<DList Name="gAhgLeftHandDL" Offset="0x37D8" />
<DList Name="gAhgLeftForearmDL" Offset="0x3948" />
<DList Name="gAhgLeftUpperArmDL" Offset="0x3A78" />
<DList Name="gAhgTorsoDL" Offset="0x3BB0" />
<DList Name="gAhgRightFootDL" Offset="0x3DD8" />
<DList Name="gAhgRightShinDL" Offset="0x3F18" />
<DList Name="gAhgRightThighDL" Offset="0x4048" />
<DList Name="gAhgLeftFootDL" Offset="0x4180" />
<DList Name="gAhgLeftShinDL" Offset="0x42C0" />
<DList Name="gAhgLeftThighDL" Offset="0x43F0" />
<DList Name="gAhgPelvisDL" Offset="0x4528" />
<!-- Assets for alternate heads for Ahg, left over from OOT (Unused). -->
<Texture Name="gAhg2TLUT" OutName="tlut2" Format="rgba16" Width="16" Height="12" Offset="0x46C8" />
<Texture Name="gAhgEar2Tex" OutName="ear2" Format="ci8" Width="8" Height="8" Offset="0x4848" TlutOffset="0x46C8" />
<Texture Name="gAhgMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x4888" TlutOffset="0x46C8" />
<Texture Name="gAhgEyeAndEyebrowTex" OutName="eye_with_eyebrow" Format="ci8" Width="16" Height="16" Offset="0x4A88" TlutOffset="0x46C8" />
<Texture Name="gAhgRedHairTex" OutName="red_hair" Format="ci8" Width="8" Height="16" Offset="0x4B88" TlutOffset="0x46C8" />
<DList Name="gAhgRedHeadDL" Offset="0x5408" />
<DList Name="gAhgShortHairHeadDL" Offset="0x5628" />
<Limb Name="gAhgPelvisLimb" Type="Standard" EnumName="AHG_LIMB_PELVIS" Offset="0x58A8" />
<Limb Name="gAhgLeftThighLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_THIGH" Offset="0x58B4" />
<Limb Name="gAhgLeftShinLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_SHIN" Offset="0x58C0" />
<Limb Name="gAhgLeftFootLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_FOOT" Offset="0x58CC" />
<Limb Name="gAhgRightThighLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_THIGH" Offset="0x58D8" />
<Limb Name="gAhgRightShinLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_SHIN" Offset="0x58E4" />
<Limb Name="gAhgRightFootLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_FOOT" Offset="0x58F0" />
<Limb Name="gAhgTorsoLimb" Type="Standard" EnumName="AHG_LIMB_CHEST" Offset="0x58FC" />
<Limb Name="gAhgLeftUpperArmLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_UPPER_ARM" Offset="0x5908" />
<Limb Name="gAhgLeftForearmLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_FOREARM" Offset="0x5914" />
<Limb Name="gAhgLeftHandLimb" Type="Standard" EnumName="AHG_LIMB_LEFT_HAND" Offset="0x5920" />
<Limb Name="gAhgRightUpperArmLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_UPPER_ARM" Offset="0x592C" />
<Limb Name="gAhgRightForearmLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_FOREARM" Offset="0x5938" />
<Limb Name="gAhgRightHandLimb" Type="Standard" EnumName="AHG_LIMB_RIGHT_HAND" Offset="0x5944" />
<Limb Name="gAhgHeadLimb" Type="Standard" EnumName="AHG_LIMB_HEAD" Offset="0x5950" />
<Skeleton Name="gAhgSkel" Type="Flex" LimbType="Standard" LimbNone="AHG_LIMB_NONE" LimbMax="AHG_LIMB_MAX" EnumName="ObjectAhgLimb" Offset="0x5998" />
</File>
</Root>
+2 -2
View File
@@ -1,6 +1,6 @@
<Root>
<File Name="object_am" Segment="6">
<Collision Name="object_am_Colheader_000118" Offset="0x118" />
<Collision Name="object_am_Colheader_000118" Offset="0x118" /> <!-- Original name is "am_bgdatainfo" -->
<Animation Name="gArmosHopAnim" Offset="0x238" /> <!-- Original name is "am_jump" -->
<Animation Name="gArmosPushedBackAnim" Offset="0x33C" /> <!-- Original name is "am_mamori" ("protection; defense") -->
<DList Name="object_am_DL_0005D0" Offset="0x5D0" />
@@ -36,6 +36,6 @@
<Limb Name="object_am_Standardlimb_005908" Type="Standard" EnumName="OBJECT_AM_LIMB_0D" Offset="0x5908" />
<Skeleton Name="object_am_Skel_005948" Type="Normal" LimbType="Standard" LimbNone="OBJECT_AM_LIMB_NONE" LimbMax="OBJECT_AM_LIMB_MAX" EnumName="ObjectAmLimb" Offset="0x5948" />
<Animation Name="gArmosTakeDamageAnim" Offset="0x5B3C" /> <!-- Original name is "am_yarare" ("to suffer damage") -->
<Collision Name="object_am_Colheader_005CF8" Offset="0x5CF8" />
<Collision Name="object_am_Colheader_005CF8" Offset="0x5CF8" /> <!-- Original name is "armos_test_bgdatainfo" -->
</File>
</Root>
+76 -75
View File
@@ -1,79 +1,80 @@
<Root>
<!-- Assets for Anju in a wedding dress -->
<File Name="object_and" Segment="6">
<Animation Name="object_and_Anim_0000C8" Offset="0xC8" /> <!-- Original name is "and_test" -->
<DList Name="object_and_DL_004670" Offset="0x4670" />
<DList Name="object_and_DL_004708" Offset="0x4708" />
<DList Name="object_and_DL_0047F0" Offset="0x47F0" />
<DList Name="object_and_DL_004998" Offset="0x4998" />
<DList Name="object_and_DL_004BE0" Offset="0x4BE0" />
<DList Name="object_and_DL_004D90" Offset="0x4D90" />
<DList Name="object_and_DL_004E50" Offset="0x4E50" />
<DList Name="object_and_DL_004F20" Offset="0x4F20" />
<DList Name="object_and_DL_005038" Offset="0x5038" />
<DList Name="object_and_DL_0056C0" Offset="0x56C0" />
<DList Name="object_and_DL_005888" Offset="0x5888" />
<DList Name="object_and_DL_005938" Offset="0x5938" />
<DList Name="object_and_DL_0059C8" Offset="0x59C8" />
<DList Name="object_and_DL_005A80" Offset="0x5A80" />
<DList Name="object_and_DL_005BA8" Offset="0x5BA8" />
<DList Name="object_and_DL_005C60" Offset="0x5C60" />
<DList Name="object_and_DL_005D80" Offset="0x5D80" />
<DList Name="object_and_DL_005F10" Offset="0x5F10" />
<DList Name="object_and_DL_005FF8" Offset="0x5FF8" />
<DList Name="object_and_DL_006240" Offset="0x6240" />
<DList Name="object_and_DL_0063D8" Offset="0x63D8" />
<DList Name="object_and_DL_0064C0" Offset="0x64C0" />
<DList Name="object_and_DL_006708" Offset="0x6708" />
<DList Name="object_and_DL_0067E0" Offset="0x67E0" />
<Texture Name="object_and_Tex_006C30" OutName="tex_006C30" Format="rgba16" Width="8" Height="8" Offset="0x6C30" />
<Texture Name="object_and_Tex_006CB0" OutName="tex_006CB0" Format="rgba16" Width="8" Height="16" Offset="0x6CB0" />
<Texture Name="object_and_Tex_006DB0" OutName="tex_006DB0" Format="rgba16" Width="16" Height="16" Offset="0x6DB0" />
<Texture Name="object_and_Tex_006FB0" OutName="tex_006FB0" Format="rgba16" Width="16" Height="16" Offset="0x6FB0" />
<Texture Name="object_and_Tex_0071B0" OutName="tex_0071B0" Format="i8" Width="8" Height="8" Offset="0x71B0" />
<Texture Name="object_and_Tex_0071F0" OutName="tex_0071F0" Format="i8" Width="32" Height="32" Offset="0x71F0" />
<Texture Name="object_and_Tex_0075F0" OutName="tex_0075F0" Format="rgba16" Width="16" Height="16" Offset="0x75F0" />
<Texture Name="object_and_Tex_0077F0" OutName="tex_0077F0" Format="rgba16" Width="32" Height="16" Offset="0x77F0" />
<Texture Name="object_and_Tex_007BF0" OutName="tex_007BF0" Format="rgba16" Width="16" Height="16" Offset="0x7BF0" />
<Texture Name="object_and_Tex_007DF0" OutName="tex_007DF0" Format="rgba16" Width="32" Height="32" Offset="0x7DF0" />
<Texture Name="object_and_Tex_0085F0" OutName="tex_0085F0" Format="rgba16" Width="32" Height="32" Offset="0x85F0" />
<Texture Name="object_and_Tex_008DF0" OutName="tex_008DF0" Format="rgba16" Width="32" Height="32" Offset="0x8DF0" />
<Texture Name="object_and_Tex_0095F0" OutName="tex_0095F0" Format="rgba16" Width="32" Height="32" Offset="0x95F0" />
<Texture Name="object_and_Tex_009DF0" OutName="tex_009DF0" Format="rgba16" Width="32" Height="16" Offset="0x9DF0" />
<Texture Name="object_and_Tex_00A1F0" OutName="tex_00A1F0" Format="rgba16" Width="32" Height="16" Offset="0xA1F0" />
<Texture Name="object_and_Tex_00A5F0" OutName="tex_00A5F0" Format="i8" Width="32" Height="64" Offset="0xA5F0" />
<Texture Name="object_and_Tex_00ADF0" OutName="tex_00ADF0" Format="i8" Width="32" Height="32" Offset="0xADF0" />
<Limb Name="object_and_Standardlimb_00B1F0" Type="Standard" EnumName="OBJECT_AND_LIMB_01" Offset="0xB1F0" />
<Limb Name="object_and_Standardlimb_00B1FC" Type="Standard" EnumName="OBJECT_AND_LIMB_02" Offset="0xB1FC" />
<Limb Name="object_and_Standardlimb_00B208" Type="Standard" EnumName="OBJECT_AND_LIMB_03" Offset="0xB208" />
<Limb Name="object_and_Standardlimb_00B214" Type="Standard" EnumName="OBJECT_AND_LIMB_04" Offset="0xB214" />
<Limb Name="object_and_Standardlimb_00B220" Type="Standard" EnumName="OBJECT_AND_LIMB_05" Offset="0xB220" />
<Limb Name="object_and_Standardlimb_00B22C" Type="Standard" EnumName="OBJECT_AND_LIMB_06" Offset="0xB22C" />
<Limb Name="object_and_Standardlimb_00B238" Type="Standard" EnumName="OBJECT_AND_LIMB_07" Offset="0xB238" />
<Limb Name="object_and_Standardlimb_00B244" Type="Standard" EnumName="OBJECT_AND_LIMB_08" Offset="0xB244" />
<Limb Name="object_and_Standardlimb_00B250" Type="Standard" EnumName="OBJECT_AND_LIMB_09" Offset="0xB250" />
<Limb Name="object_and_Standardlimb_00B25C" Type="Standard" EnumName="OBJECT_AND_LIMB_0A" Offset="0xB25C" />
<Limb Name="object_and_Standardlimb_00B268" Type="Standard" EnumName="OBJECT_AND_LIMB_0B" Offset="0xB268" />
<Limb Name="object_and_Standardlimb_00B274" Type="Standard" EnumName="OBJECT_AND_LIMB_0C" Offset="0xB274" />
<Limb Name="object_and_Standardlimb_00B280" Type="Standard" EnumName="OBJECT_AND_LIMB_0D" Offset="0xB280" />
<Limb Name="object_and_Standardlimb_00B28C" Type="Standard" EnumName="OBJECT_AND_LIMB_0E" Offset="0xB28C" />
<Limb Name="object_and_Standardlimb_00B298" Type="Standard" EnumName="OBJECT_AND_LIMB_0F" Offset="0xB298" />
<Limb Name="object_and_Standardlimb_00B2A4" Type="Standard" EnumName="OBJECT_AND_LIMB_10" Offset="0xB2A4" />
<Limb Name="object_and_Standardlimb_00B2B0" Type="Standard" EnumName="OBJECT_AND_LIMB_11" Offset="0xB2B0" />
<Limb Name="object_and_Standardlimb_00B2BC" Type="Standard" EnumName="OBJECT_AND_LIMB_12" Offset="0xB2BC" />
<Limb Name="object_and_Standardlimb_00B2C8" Type="Standard" EnumName="OBJECT_AND_LIMB_13" Offset="0xB2C8" />
<Limb Name="object_and_Standardlimb_00B2D4" Type="Standard" EnumName="OBJECT_AND_LIMB_14" Offset="0xB2D4" />
<Limb Name="object_and_Standardlimb_00B2E0" Type="Standard" EnumName="OBJECT_AND_LIMB_15" Offset="0xB2E0" />
<Limb Name="object_and_Standardlimb_00B2EC" Type="Standard" EnumName="OBJECT_AND_LIMB_16" Offset="0xB2EC" />
<Limb Name="object_and_Standardlimb_00B2F8" Type="Standard" EnumName="OBJECT_AND_LIMB_17" Offset="0xB2F8" />
<Limb Name="object_and_Standardlimb_00B304" Type="Standard" EnumName="OBJECT_AND_LIMB_18" Offset="0xB304" />
<Limb Name="object_and_Standardlimb_00B310" Type="Standard" EnumName="OBJECT_AND_LIMB_19" Offset="0xB310" />
<Skeleton Name="object_and_Skel_00B380" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AND_LIMB_NONE" LimbMax="OBJECT_AND_LIMB_MAX" EnumName="ObjectAndLimb" Offset="0xB380" />
<Animation Name="object_and_Anim_00DA58" Offset="0xDA58" /> <!-- Original name is "wa_aruku" ("walk") -->
<Animation Name="object_and_Anim_00EE00" Offset="0xEE00" /> <!-- Original name is "wa_hidari" ("left; left hand side") -->
<Animation Name="object_and_Anim_00F6C4" Offset="0xF6C4" /> <!-- Original name is "wa_hidari_loop" -->
<Animation Name="object_and_Anim_00FE64" Offset="0xFE64" /> <!-- Original name is "wa_kaoage" ("raising face") -->
<Animation Name="object_and_Anim_01067C" Offset="0x1067C" /> <!-- Original name is "wa_kaoage_loop" -->
<Animation Name="object_and_Anim_011AFC" Offset="0x11AFC" /> <!-- Original name is "wa_kaoaruki" (probably a combination of "kaoage" and "aruki") -->
<Animation Name="object_and_Anim_0122D0" Offset="0x122D0" /> <!-- Original name is "wa_utumuki_loop" ("looking down") -->
<Animation Name="gAndStaticAnim" Offset="0xC8" /> <!-- Original name is "and_test" -->
<DList Name="gAndTrainDL" Offset="0x4670" />
<DList Name="gAndCalvesDL" Offset="0x4708" />
<DList Name="gAndShinsDL" Offset="0x47F0" />
<DList Name="gAndThighsDL" Offset="0x4998" />
<DList Name="gAndPelvisDL" Offset="0x4BE0" />
<DList Name="gAndLowerVeilDL" Offset="0x4D90" />
<DList Name="gAndUpperVeilDL" Offset="0x4E50" />
<DList Name="gAndVeilBaseDL" Offset="0x4F20" />
<DList Name="gAndHeadDL" Offset="0x5038" />
<DList Name="gAndBouquetDL" Offset="0x56C0" />
<DList Name="gAndCenterLeavesTipDL" Offset="0x5888" />
<DList Name="gAndCenterLeavesDL" Offset="0x5938" />
<DList Name="gAndRightLeavesTipDL" Offset="0x59C8" />
<DList Name="gAndRightLeavesDL" Offset="0x5A80" />
<DList Name="gAndLeftLeavesTipDL" Offset="0x5BA8" />
<DList Name="gAndLeftLeavesDL" Offset="0x5C60" />
<DList Name="gAndRightHandDL" Offset="0x5D80" />
<DList Name="gAndRightForearmDL" Offset="0x5F10" />
<DList Name="gAndRightUpperArmDL" Offset="0x5FF8" />
<DList Name="gAndLeftHandDL" Offset="0x6240" />
<DList Name="gAndLeftForearmDL" Offset="0x63D8" />
<DList Name="gAndLeftUpperArmDL" Offset="0x64C0" />
<DList Name="gAndSymbolDL" Offset="0x6708" />
<DList Name="gAndTorsoDL" Offset="0x67E0" />
<Texture Name="gAndSkinShadowTex" OutName="and_skin_shadow" Format="rgba16" Width="8" Height="8" Offset="0x6C30" />
<Texture Name="gAndHairTex" OutName="and_hair" Format="rgba16" Width="8" Height="16" Offset="0x6CB0" />
<Texture Name="gAndEarTex" OutName="and_ear" Format="rgba16" Width="16" Height="16" Offset="0x6DB0" />
<Texture Name="gAndFingersTex" OutName="and_fingers" Format="rgba16" Width="16" Height="16" Offset="0x6FB0" />
<Texture Name="gAndDressGradientTex" OutName="and_dress_gradient" Format="i8" Width="8" Height="8" Offset="0x71B0" />
<Texture Name="gAndDressSymbolTex" OutName="and_dress_symbol" Format="i8" Width="32" Height="32" Offset="0x71F0" />
<Texture Name="gAndPearlTex" OutName="and_pearl" Format="rgba16" Width="16" Height="16" Offset="0x75F0" />
<Texture Name="gAndLeavesTex" OutName="and_leaves" Format="rgba16" Width="32" Height="16" Offset="0x77F0" />
<Texture Name="gAndFlowerTex" OutName="and_flower" Format="rgba16" Width="16" Height="16" Offset="0x7BF0" />
<Texture Name="gAndEyeOpenTex" OutName="and_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x7DF0" />
<Texture Name="gAndEyeClosingTex" OutName="and_eye_closing" Format="rgba16" Width="32" Height="32" Offset="0x85F0" />
<Texture Name="gAndEyeClosedTex" OutName="and_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x8DF0" />
<Texture Name="gAndEyeOpeningTex" OutName="and_eye_opening" Format="rgba16" Width="32" Height="32" Offset="0x95F0" />
<Texture Name="gAndMouthNeutralTex" OutName="and_mouth_neutral" Format="rgba16" Width="32" Height="16" Offset="0x9DF0" />
<Texture Name="gAndMouthSmileTex" OutName="and_mouth_smile" Format="rgba16" Width="32" Height="16" Offset="0xA1F0" />
<Texture Name="gAndDressSpotsTex" OutName="and_dress_spots" Format="i8" Width="32" Height="64" Offset="0xA5F0" />
<Texture Name="gAndDressCircleTex" OutName="and_dress_circle" Format="i8" Width="32" Height="32" Offset="0xADF0" />
<Limb Name="gAndRootLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_ROOT" Offset="0xB1F0" />
<Limb Name="gAndTorsoLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_TORSO" Offset="0xB1FC" />
<Limb Name="gAndSymbolLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_SYMBOL" Offset="0xB208" />
<Limb Name="gAndLeftUpperArmLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LEFT_UPPER_ARM" Offset="0xB214" />
<Limb Name="gAndLeftForearmLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LEFT_FOREARM" Offset="0xB220" />
<Limb Name="gAndLeftHandLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LEFT_HAND" Offset="0xB22C" />
<Limb Name="gAndRightUpperArmLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_RIGHT_UPPER_ARM" Offset="0xB238" />
<Limb Name="gAndRightForearmLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_RIGHT_FOREARM" Offset="0xB244" />
<Limb Name="gAndRightHandLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_RIGHT_HAND" Offset="0xB250" />
<Limb Name="gAndBouquetLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_BOUQUET" Offset="0xB25C" />
<Limb Name="gAndLeftLeavesLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LEFT_LEAVES" Offset="0xB268" />
<Limb Name="gAndLeftLeavesTipLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LEFT_LEAVES_TIP" Offset="0xB274" />
<Limb Name="gAndRightLeavesLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_RIGHT_LEAVES" Offset="0xB280" />
<Limb Name="gAndRightLeavesTipLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_RIGHT_LEAVES_TIP" Offset="0xB28C" />
<Limb Name="gAndCenterLeavesLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_CENTER_LEAVES" Offset="0xB298" />
<Limb Name="gAndCenterLeavesTipLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_CENTER_LEAVES_TIP" Offset="0xB2A4" />
<Limb Name="gAndVeilBaseLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_VEIL_BASE" Offset="0xB2B0" />
<Limb Name="gAndHeadLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_HEAD" Offset="0xB2BC" />
<Limb Name="gAndUpperVeilLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_UPPER_VEIL" Offset="0xB2C8" />
<Limb Name="gAndLowerVeilLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_LOWER_VEIL" Offset="0xB2D4" />
<Limb Name="gAndPelvisLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_PELVIS" Offset="0xB2E0" />
<Limb Name="gAndThighsLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_THIGHS" Offset="0xB2EC" />
<Limb Name="gAndShinsLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_SHINS" Offset="0xB2F8" />
<Limb Name="gAndCalvesLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_CALVES" Offset="0xB304" />
<Limb Name="gAndTrainLimb" Type="Standard" EnumName="OBJECT_AND_LIMB_TRAIN" Offset="0xB310" />
<Skeleton Name="gAndSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AND_LIMB_NONE" LimbMax="OBJECT_AND_LIMB_MAX" EnumName="ObjectAndLimb" Offset="0xB380" />
<Animation Name="gAndWalkAnim" Offset="0xDA58" /> <!-- Original name is "wa_aruku" ("walk") -->
<Animation Name="gAndRaiseHandAnim" Offset="0xEE00" /> <!-- Original name is "wa_hidari" ("left; left hand side") -->
<Animation Name="gAndRaisedHandLoopAnim" Offset="0xF6C4" /> <!-- Original name is "wa_hidari_loop" -->
<Animation Name="gAndRaiseHeadAnim" Offset="0xFE64" /> <!-- Original name is "wa_kaoage" ("raising face") -->
<Animation Name="gAndRaisedHeadLoopAnim" Offset="0x1067C" /> <!-- Original name is "wa_kaoage_loop" -->
<Animation Name="gAndRaisedHandWalkAnim" Offset="0x11AFC" /> <!-- Original name is "wa_kaoaruki" (probably a combination of "kaoage" and "aruki") -->
<Animation Name="gAndIdleAnim" Offset="0x122D0" /> <!-- Original name is "wa_utumuki_loop" ("looking down") -->
</File>
</Root>
+1 -1
View File
@@ -8,6 +8,6 @@
<DList Name="object_astr_obj_DL_002178" Offset="0x2178" /> <!-- Original name is "z2_tennmondai_hahen_model" ("tennmondai" = "astronomical observatory", "hahen" = "fragment") -->
<DList Name="object_astr_obj_DL_0022E0" Offset="0x22E0" />
<DList Name="object_astr_obj_DL_002380" Offset="0x2380" /> <!-- Original name is "z2_tennmondai_kabe_model" ("tennmondai" = "astronomical observatory", "kabe" = "wall") -->
<Collision Name="object_astr_obj_Colheader_002498" Offset="0x2498" />
<Collision Name="object_astr_obj_Colheader_002498" Offset="0x2498" /> <!-- Original name is "z2_tennmondai_kabe_bgdatainfo" -->
</File>
</Root>
+1 -1
View File
@@ -46,7 +46,7 @@
<DList Name="gGyorgBubbleModelDL" Offset="0x7EB0" />
<!-- Gyorg Title Card -->
<Texture Name="gGyorgTitleCardTex" OutName="gyorg_title_card" Format="i8" Width="128" Height="40" Offset="0x7EC8" />
<Texture Name="gGyorgTitleCardTex" OutName="gyorg_title_card" Format="ia8" Width="128" Height="40" Offset="0x7EC8" />
<!-- Gyorg Limbs -->
<Limb Name="gGyorgRootLimb" Type="Standard" EnumName="GYORG_LIMB_ROOT" Offset="0x92C8" />
+3 -3
View File
@@ -200,9 +200,9 @@
<DList Name="gMajorasWrathSpinningTopDL" Offset="0x2F640" />
<!-- Majora Title Cards -->
<Texture Name="gMajorasMaskTitleCardTex" OutName="majoras_mask_title_card" Format="i8" Width="128" Height="40" Offset="0x2F840" />
<Texture Name="gMajorasIncarnationTitleCardTex" OutName="majoras_incarnation_title_card" Format="i8" Width="128" Height="40" Offset="0x30C40" />
<Texture Name="gMajorasWrathTitleCardTex" OutName="majoras_wrath_title_card" Format="i8" Width="128" Height="40" Offset="0x32040" />
<Texture Name="gMajorasMaskTitleCardTex" OutName="majoras_mask_title_card" Format="ia8" Width="128" Height="40" Offset="0x2F840" />
<Texture Name="gMajorasIncarnationTitleCardTex" OutName="majoras_incarnation_title_card" Format="ia8" Width="128" Height="40" Offset="0x30C40" />
<Texture Name="gMajorasWrathTitleCardTex" OutName="majoras_wrath_title_card" Format="ia8" Width="128" Height="40" Offset="0x32040" />
<!-- Majora's Wrath Limbs -->
<Limb Name="gMajorasWrathRootLimb" Type="Standard" EnumName="MAJORAS_WRATH_LIMB_ROOT" Offset="0x33440" />
+1 -1
View File
@@ -101,6 +101,6 @@
<Animation Name="gGohtGetUpFromSideAnim" Offset="0x14024" /> <!-- Unused. Original name is "iceb_up" -->
<!-- Goht Title Card -->
<Texture Name="gGohtTitleCardTex" OutName="goht_title_card" Format="i8" Width="128" Height="40" Offset="0x14040" />
<Texture Name="gGohtTitleCardTex" OutName="goht_title_card" Format="ia8" Width="128" Height="40" Offset="0x14040" />
</File>
</Root>
+1 -1
View File
@@ -6,6 +6,6 @@
<Texture Name="object_botihasira_Tex_000648" OutName="tex_000648" Format="rgba16" Width="32" Height="64" Offset="0x648" />
<Texture Name="object_botihasira_Tex_001648" OutName="tex_001648" Format="rgba16" Width="32" Height="16" Offset="0x1648" />
<!-- <Blob Name="object_botihasira_Blob_001A48" Size="0x18" Offset="0x1A48" /> -->
<Collision Name="object_botihasira_Colheader_001BD8" Offset="0x1BD8" />
<Collision Name="object_botihasira_Colheader_001BD8" Offset="0x1BD8" /> <!-- Original name is "z2_botihasira_bgdatainfo" -->
</File>
</Root>
+1 -1
View File
@@ -48,6 +48,6 @@
<Animation Name="gBoxBigChestOpenGoronAnim" Offset="0x7E54" /> <!-- Original name is "pg_Tbox" -->
<Animation Name="gBoxBigChestOpenDekuAnim" Offset="0x7F30" /> <!-- Original name is "pn_Tbox" -->
<Blob Name="object_box_zeroes_unk_00007F40" Size="0xA0" Offset="0x7F40" />
<Collision Name="gBoxChestCol" Offset="0x80E8" />
<Collision Name="gBoxChestCol" Offset="0x80E8" /> <!-- Original name is "takara_hako_bgdatainfo" -->
</File>
</Root>
+1 -1
View File
@@ -4,6 +4,6 @@
<DList Name="gDekuShrineSlidingDoorDL" Offset="0x3A0" /> <!-- Original name is "Y2_DANPEI_shutter_model" -->
<Texture Name="gDekuShrineSlidingDoorTLUT" OutName="deku_shrine_sliding_door_tlut" Format="rgba16" Width="4" Height="4" Offset="0x540" />
<Texture Name="gDekuShrineSlidingDoorTex" OutName="deku_shrine_sliding_door" Format="ci4" Width="32" Height="128" Offset="0x560" />
<Collision Name="gDekuShrineSlidingDoorCol" Offset="0xE00" />
<Collision Name="gDekuShrineSlidingDoorCol" Offset="0xE00" /> <!-- Original name is "Y2_DANPEI_shutter_bgdatainfo" -->
</File>
</Root>
+5 -5
View File
@@ -73,12 +73,12 @@
<!-- Corridor -->
<DList Name="gClockTowerCorridorFoliageDL" Offset="0x129D0" />
<DList Name="gClockTowerCorridorDL" Offset="0x12DA0" /> <!-- Original name is "w2_hineri_model" ("twist; spin") -->
<Collision Name="gClockTowerCorridorCol" Offset="0x142E8" />
<Collision Name="gClockTowerCorridorCol" Offset="0x142E8" /> <!-- Original name is "w2_hineri_bgdatainfo" -->
<!-- Organ -->
<DList Name="gClockTowerOrganPipesDL" Offset="0x15F30" /> <!-- Original name is "w2_piano_modelT" -->
<DList Name="gClockTowerOrganDL" Offset="0x160A0" /> <!-- Original name is "w2_piano_model" -->
<Collision Name="gClockTowerOrganCol" Offset="0x16E70" />
<Collision Name="gClockTowerOrganCol" Offset="0x16E70" /> <!-- Original name is "w2_piano_bgdatainfo" -->
<!-- CenterCog -->
<DList Name="gClockTowerEmpty2DL" Offset="0x17010" /> <!-- Original name is "w2_shaft_modelT" -->
@@ -86,15 +86,15 @@
<!-- StoneDoorMain -->
<DList Name="gClockTowerStoneDoorMainDL" Offset="0x17220" /> <!-- Original name is "w2_shatter_higashi_model" ("higashi" = "east") -->
<Collision Name="gClockTowerStoneDoorMainCol" Offset="0x17410" />
<Collision Name="gClockTowerStoneDoorMainCol" Offset="0x17410" /> <!-- Original name is "w2_shatter_higashi_bgdatainfo" -->
<!-- StoneDoor -->
<DList Name="gClockTowerStoneDoorDL" Offset="0x174E0" /> <!-- Original name is "w2_shatter_nishi_model" ("nishi" = "west") -->
<Collision Name="gClockTowerStoneDoorCol" Offset="0x17650" />
<Collision Name="gClockTowerStoneDoorCol" Offset="0x17650" /> <!-- Original name is "w2_shatter_nishi_bgdatainfo" -->
<!-- WaterWheel -->
<DList Name="gClockTowerEmpty3DL" Offset="0x18110" /> <!-- Original name is "w2_suisha_modelT" ("water wheel") -->
<DList Name="gClockTowerWaterWheelDL" Offset="0x18118" /> <!-- Original name is "w2_suisha_model" -->
<Collision Name="gClockTowerWaterWheelCol" Offset="0x18588" />
<Collision Name="gClockTowerWaterWheelCol" Offset="0x18588" /> <!-- Original name is "w2_suisha_bgdatainfo" -->
</File>
</Root>
+4 -4
View File
@@ -1,10 +1,10 @@
<Root>
<!-- Assets for the hookshot post -->
<File Name="object_d_hsblock" Segment="6">
<DList Name="gHookshotPostDL" Offset="0x210" />
<DList Name="gHookshotTargetDL" Offset="0x470" />
<Collision Name="gHookshotTargetCol" Offset="0x578" />
<Collision Name="gHookshotPostCol" Offset="0x730" />
<DList Name="gHookshotPostDL" Offset="0x210" /> <!-- Original name is "field_fshot_model" -->
<DList Name="gHookshotTargetDL" Offset="0x470" /> <!-- Original name is "field_fshot2_model" -->
<Collision Name="gHookshotTargetCol" Offset="0x578" /> <!-- Original name is "field_fshot2_bgdatainfo" -->
<Collision Name="gHookshotPostCol" Offset="0x730" /> <!-- Original name is "field_fshot_bgdatainfo" -->
<Texture Name="gHookshotTargetTex" OutName="tex_000760" Format="i4" Width="64" Height="64" Offset="0x760" />
<Texture Name="gHookshotPostTex" OutName="tex_000F60" Format="i8" Width="32" Height="64" Offset="0xF60" />
</File>
+2 -2
View File
@@ -3,8 +3,8 @@
<DList Name="object_d_lift_DL_000180" Offset="0x180" />
<Texture Name="object_d_lift_Tex_000298" OutName="tex_000298" Format="rgba16" Width="32" Height="32" Offset="0x298" />
<Collision Name="object_d_lift_Colheader_000BA0" Offset="0xBA0" />
<DList Name="gDampeGraveBrownElevatorDL" Offset="0xD10" />
<Collision Name="gDampeGraveBrownElevatorCol" Offset="0xF00" />
<DList Name="gDampeGraveBrownElevatorDL" Offset="0xD10" /> <!-- Original name is "lift_l_model" -->
<Collision Name="gDampeGraveBrownElevatorCol" Offset="0xF00" /> <!-- Original name is "lift_l_bgdatainfo" -->
<Texture Name="gDampeGraveBrownElevatorSideTex" OutName="brown_elevator_side" Format="i8" Width="64" Height="16" Offset="0xF30" />
<Texture Name="gDampeGraveBrownElevatorTopBottomTex" OutName="brown_elevator_top_bottom" Format="i8" Width="64" Height="64" Offset="0x1330" />
</File>
+15 -15
View File
@@ -2,21 +2,21 @@
<File Name="object_dai" Segment="6">
<Texture Name="object_dai_Tex_000000" OutName="tex_000000" Format="i4" Width="32" Height="32" Offset="0x0" />
<DList Name="object_dai_DL_000230" Offset="0x230" />
<DList Name="object_dai_DL_0002E8" Offset="0x2E8" />
<Animation Name="object_dai_Anim_000CEC" Offset="0xCEC" />
<Animation Name="object_dai_Anim_0010F8" Offset="0x10F8" />
<Animation Name="object_dai_Anim_0014BC" Offset="0x14BC" />
<Animation Name="object_dai_Anim_001E44" Offset="0x1E44" />
<Animation Name="object_dai_Anim_002E58" Offset="0x2E58" />
<Animation Name="object_dai_Anim_003CAC" Offset="0x3CAC" />
<Animation Name="object_dai_Anim_0040E0" Offset="0x40E0" />
<Animation Name="object_dai_Anim_0048B4" Offset="0x48B4" />
<Animation Name="object_dai_Anim_005100" Offset="0x5100" />
<Animation Name="object_dai_Anim_00563C" Offset="0x563C" />
<Animation Name="object_dai_Anim_006590" Offset="0x6590" />
<Animation Name="object_dai_Anim_0069DC" Offset="0x69DC" />
<Animation Name="object_dai_Anim_007354" Offset="0x7354" />
<Animation Name="object_dai_Anim_0079E4" Offset="0x79E4" />
<DList Name="object_dai_DL_0002E8" Offset="0x2E8" /> <!-- Original name is "dai_ball_modelT" -->
<Animation Name="object_dai_Anim_000CEC" Offset="0xCEC" /> <!-- Original name is "dg_haku" ("to breathe out") -->
<Animation Name="object_dai_Anim_0010F8" Offset="0x10F8" /> <!-- Original name is "dg_iare" ("are" = "huh?; eh?"") -->
<Animation Name="object_dai_Anim_0014BC" Offset="0x14BC" /> <!-- Original name is "dg_iareend" -->
<Animation Name="object_dai_Anim_001E44" Offset="0x1E44" /> <!-- Original name is "dg_iareloop" -->
<Animation Name="object_dai_Anim_002E58" Offset="0x2E58" /> <!-- Original name is "dg_inemuri" ("nemuri" = "to fall asleep") -->
<Animation Name="object_dai_Anim_003CAC" Offset="0x3CAC" /> <!-- Original name is "dg_isuwaru" ("suwari" = "to sit" )-->
<Animation Name="object_dai_Anim_0040E0" Offset="0x40E0" /> <!-- Original name is "dg_isuwaruloop" -->
<Animation Name="object_dai_Anim_0048B4" Offset="0x48B4" /> <!-- Original name is "dg_iwait" -->
<Animation Name="object_dai_Anim_005100" Offset="0x5100" /> <!-- Original name is "dg_iwalk" -->
<Animation Name="object_dai_Anim_00563C" Offset="0x563C" /> <!-- Original name is "dg_korogeoti" ("to fall off; to tumble down") -->
<Animation Name="object_dai_Anim_006590" Offset="0x6590" /> <!-- Original name is "dg_marumari" ("to roll into a ball") -->
<Animation Name="object_dai_Anim_0069DC" Offset="0x69DC" /> <!-- Original name is "dg_modoru" ("to return; to go back") -->
<Animation Name="object_dai_Anim_007354" Offset="0x7354" /> <!-- Original name is "dg_tame" ("to amass; to accumulate; to store") -->
<Animation Name="object_dai_Anim_0079E4" Offset="0x79E4" /> <!-- Original name is "dg_wait" -->
<DList Name="object_dai_DL_008710" Offset="0x8710" />
<DList Name="object_dai_DL_0087B8" Offset="0x87B8" />
<DList Name="object_dai_DL_0089D8" Offset="0x89D8" />
+14 -14
View File
@@ -1,11 +1,11 @@
<Root>
<File Name="object_daiku" Segment="6">
<Animation Name="object_daiku_Anim_000600" Offset="0x600" />
<Animation Name="object_daiku_Anim_000C44" Offset="0xC44" />
<Animation Name="object_daiku_Anim_001114" Offset="0x1114" />
<Animation Name="object_daiku_Anim_001A24" Offset="0x1A24" />
<Animation Name="object_daiku_Anim_002134" Offset="0x2134" />
<Animation Name="object_daiku_Anim_002FA0" Offset="0x2FA0" />
<Animation Name="object_daiku_Anim_000600" Offset="0x600" /> <!-- Original name is "dk2_hanasi" ("talk") -->
<Animation Name="object_daiku_Anim_000C44" Offset="0xC44" /> <!-- Original name is "dk2_hashiru" ("to run") -->
<Animation Name="object_daiku_Anim_001114" Offset="0x1114" /> <!-- Original name is "dk2_katugi" ("to carry") -->
<Animation Name="object_daiku_Anim_001A24" Offset="0x1A24" /> <!-- Original name is "dk2_kowasu" ("to break; to destroy; to demolish") -->
<Animation Name="object_daiku_Anim_002134" Offset="0x2134" /> <!-- Original name is "dk2_kowasu2wait" -->
<Animation Name="object_daiku_Anim_002FA0" Offset="0x2FA0" /> <!-- Original name is "dk2_matsu" ("to wait") -->
<Texture Name="object_daiku_TLUT_002FB0" OutName="tlut_002FB0" Format="rgba16" Width="16" Height="16" Offset="0x2FB0" />
<Texture Name="object_daiku_Tex_0031B0" OutName="tex_0031B0" Format="ci8" Width="8" Height="8" Offset="0x31B0" />
<Texture Name="object_daiku_Tex_0031F0" OutName="tex_0031F0" Format="ci8" Width="16" Height="16" Offset="0x31F0" />
@@ -39,10 +39,10 @@
<DList Name="object_daiku_DL_008870" Offset="0x8870" />
<DList Name="object_daiku_DL_008B20" Offset="0x8B20" />
<DList Name="object_daiku_DL_008C30" Offset="0x8C30" />
<DList Name="object_daiku_DL_008EC8" Offset="0x8EC8" />
<DList Name="object_daiku_DL_008EC8" Offset="0x8EC8" /> <!-- Original name is "dk2_hashira_model" -->
<Texture Name="object_daiku_TLUT_008FA8" OutName="tlut_008FA8" Format="rgba16" Width="16" Height="16" Offset="0x8FA8" />
<Texture Name="object_daiku_Tex_0091A8" OutName="tex_0091A8" Format="ci8" Width="16" Height="16" Offset="0x91A8" />
<DList Name="object_daiku_DL_009638" Offset="0x9638" />
<DList Name="object_daiku_DL_009638" Offset="0x9638" /> <!-- Original name is "dk2_2_turuhashi_model" -->
<Texture Name="object_daiku_TLUT_0097B0" OutName="tlut_0097B0" Format="rgba16" Width="16" Height="16" Offset="0x97B0" />
<Texture Name="object_daiku_Tex_0099B0" OutName="tex_0099B0" Format="i8" Width="32" Height="32" Offset="0x99B0" />
<Texture Name="object_daiku_Tex_009DB0" OutName="tex_009DB0" Format="ci8" Width="16" Height="16" Offset="0x9DB0" />
@@ -66,11 +66,11 @@
<Limb Name="object_daiku_Standardlimb_00A7F8" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_0F" Offset="0xA7F8" />
<Limb Name="object_daiku_Standardlimb_00A804" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_10" Offset="0xA804" />
<Skeleton Name="object_daiku_Skel_00A850" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DAIKU_LIMB_NONE" LimbMax="OBJECT_DAIKU_LIMB_MAX" EnumName="ObjectDaikuLimb" Offset="0xA850" />
<Animation Name="object_daiku_Anim_00ACD0" Offset="0xACD0" />
<Animation Name="object_daiku_Anim_00B690" Offset="0xB690" />
<Animation Name="object_daiku_Anim_00BEAC" Offset="0xBEAC" />
<Animation Name="object_daiku_Anim_00C234" Offset="0xC234" />
<Animation Name="object_daiku_Anim_00C92C" Offset="0xC92C" />
<Animation Name="object_daiku_Anim_00D328" Offset="0xD328" />
<Animation Name="object_daiku_Anim_00ACD0" Offset="0xACD0" /> <!-- Original name is "dk2_roya" -->
<Animation Name="object_daiku_Anim_00B690" Offset="0xB690" /> <!-- Original name is "dk2_shiji" (perhaps "instructions; directions"?) -->
<Animation Name="object_daiku_Anim_00BEAC" Offset="0xBEAC" /> <!-- Original name is "dk2_shiji02" -->
<Animation Name="object_daiku_Anim_00C234" Offset="0xC234" /> <!-- Original name is "dk2_suwari" ("sitting") -->
<Animation Name="object_daiku_Anim_00C92C" Offset="0xC92C" /> <!-- Original name is "dk2_tasuke" ("to save; to rescue") -->
<Animation Name="object_daiku_Anim_00D328" Offset="0xD328" /> <!-- Original name is "dk2_turuwait" ("turu" = "to hang; to suspend; to sling") -->
</File>
</Root>

Some files were not shown because too many files have changed in this diff Show More