mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
merge and warning fix
This commit is contained in:
@@ -14,6 +14,8 @@ tags
|
||||
|
||||
# Project-specific ignores
|
||||
*.z64
|
||||
*.n64
|
||||
*.v64
|
||||
*.sra
|
||||
*.bin
|
||||
*.elf
|
||||
|
||||
@@ -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) --
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<DList Name="sDebugDisplay1DL" Offset="0x114CD0"/>
|
||||
|
||||
|
||||
<Array Name="sDebugDisplay2Vtx" Count="8" Offset="0x114D30">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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" />
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
<DList Name="object_danpei_object_DL_000300" Offset="0x300" />
|
||||
<Texture Name="object_danpei_object_TLUT_000438" OutName="tlut_000438" Format="rgba16" Width="4" Height="4" Offset="0x438" />
|
||||
<Texture Name="object_danpei_object_Tex_000458" OutName="tex_000458" Format="ci4" Width="64" Height="64" Offset="0x458" />
|
||||
<Collision Name="object_danpei_object_Colheader_000D60" Offset="0xD60" />
|
||||
<DList Name="object_danpei_object_DL_0012C0" Offset="0x12C0" />
|
||||
<DList Name="object_danpei_object_DL_002110" Offset="0x2110" />
|
||||
<Collision Name="object_danpei_object_Colheader_000D60" Offset="0xD60" /> <!-- Original name is "y2_kanokefuta_bgdatainfo" -->
|
||||
<DList Name="object_danpei_object_DL_0012C0" Offset="0x12C0" /> <!-- Original name is "Y2_DP2_RASENsita_model" ("rasen" = "spiral", "sita" = "below") -->
|
||||
<DList Name="object_danpei_object_DL_002110" Offset="0x2110" /> <!-- Original name is "Y2_DP2_RASENue_model" ("ue" = "above") -->
|
||||
<Texture Name="object_danpei_object_TLUT_002B10" OutName="tlut_002B10" Format="rgba16" Width="16" Height="16" Offset="0x2B10" />
|
||||
<Texture Name="object_danpei_object_Tex_002D10" OutName="tex_002D10" Format="ci8" Width="32" Height="64" Offset="0x2D10" />
|
||||
<Texture Name="object_danpei_object_Tex_003510" OutName="tex_003510" Format="ci8" Width="32" Height="32" Offset="0x3510" />
|
||||
|
||||
@@ -4,17 +4,17 @@
|
||||
<!-- DisplayLists and Collision for the elevator platforms. -->
|
||||
<DList Name="gGreatBayTempleObjectElevatorEmptyDL" Offset="0x2C0" /> <!-- Probably was the transparent component for the below DL -->
|
||||
<DList Name="gGreatBayTempleObjectElevatorDL" Offset="0x2C8" /> <!-- Original name is "m2_KON_ELE_model" -->
|
||||
<Collision Name="gGreatBayTempleObjectElevatorCol" Offset="0x5C4" />
|
||||
<Collision Name="gGreatBayTempleObjectElevatorCol" Offset="0x5C4" /> <!-- Original name is "m2_KON_ELE_bgdatainfo" -->
|
||||
|
||||
<!-- DisplayLists and Collision for the rotating waterwheel with two platforms. -->
|
||||
<DList Name="gGreatBayTempleObjectWaterwheelWithPlatformsEmptyDL" Offset="0x1E60" /> <!-- Probably was the transparent component for the below DL -->
|
||||
<DList Name="gGreatBayTempleObjectWaterwheelWithPlatformsDL" Offset="0x1E68" /> <!-- Original name is "m2_KON_GEAR09_model" -->
|
||||
<Collision Name="gGreatBayTempleObjectWaterwheelWithPlatformsCol" Offset="0x2E78" />
|
||||
<Collision Name="gGreatBayTempleObjectWaterwheelWithPlatformsCol" Offset="0x2E78" /> <!-- Original name is "m2_KON_GEAR09_bgdatainfo" -->
|
||||
|
||||
<!-- DisplayLists and Collision for the ice stalactites that can be thawed with Fire Arrows. -->
|
||||
<DList Name="gGreatBayTempleObjectIceStalactiteRimDL" Offset="0x3250" />
|
||||
<DList Name="gGreatBayTempleObjectIceStalactiteDL" Offset="0x3358" /> <!-- Original name is "m2_KON_ICE_model" -->
|
||||
<Collision Name="gGreatBayTempleObjectIceStalactiteCol" Offset="0x3540" /> <!-- Unused -->
|
||||
<Collision Name="gGreatBayTempleObjectIceStalactiteCol" Offset="0x3540" /> <!-- Original name is "m2_KON_ICE_bgdatainfo". Unused -->
|
||||
|
||||
<!-- DisplayLists for the frozen version of the waterfall that briefly appears when you hit it with an Ice Arrow. -->
|
||||
<DList Name="gGreatBayTempleObjectFrozenWaterfallDL" Offset="0x3770" />
|
||||
@@ -25,22 +25,22 @@
|
||||
<DList Name="gGreatBayTempleObjectGearShaftWithPlatformsDL" Offset="0x4848" /> <!-- Original name is "m2_KON_Screw_model" -->
|
||||
<DList Name="gGreatBayTempleObjectGearShaftEmptyDL" Offset="0x52B0" /> <!-- Probably was the transparent component for the below DL -->
|
||||
<DList Name="gGreatBayTempleObjectGearShaftDL" Offset="0x52B8" /> <!-- Original name is "m2_KON_ScrewFor8_model" -->
|
||||
<Collision Name="gGreatBayTempleObjectGearShaftWithPlatformsCol" Offset="0x5D28" />
|
||||
<Collision Name="gGreatBayTempleObjectGearShaftWithPlatformsCol" Offset="0x5D28" /> <!-- Original name is "m2_KON_Screw_bgdatainfo" -->
|
||||
|
||||
<!-- DisplayLists and Collision for the switches that can be pushed or pulled. -->
|
||||
<DList Name="gGreatBayTempleObjectOneWaySwitchEmptyDL" Offset="0x61B0" /> <!-- Probably was the transparent component for the below DL -->
|
||||
<DList Name="gGreatBayTempleObjectOneWaySwitchDL" Offset="0x61B8" /> <!-- Original name is "m2_KON_Sen_model" (perhaps "tap; faucet") -->
|
||||
<DList Name="gGreatBayTempleObjectTwoWaySwitchEmptyDL" Offset="0x69D0" /> <!-- Probably was the transparent component for the below DL -->
|
||||
<DList Name="gGreatBayTempleObjectTwoWaySwitchDL" Offset="0x69D8" /> <!-- Original name is "m2_KON_SenP2_model" -->
|
||||
<Collision Name="gGreatBayTempleObjectTwoWaySwitchCol" Offset="0x6EA8" />
|
||||
<Collision Name="gGreatBayTempleObjectOneWaySwitchCol" Offset="0x714C" />
|
||||
<Collision Name="gGreatBayTempleObjectTwoWaySwitchCol" Offset="0x6EA8" /> <!-- Original name is "m2_KON_SenP2_bgdatainfo" -->
|
||||
<Collision Name="gGreatBayTempleObjectOneWaySwitchCol" Offset="0x714C" /> <!-- Original name is "m2_KON_Sen_bgdatainfo" -->
|
||||
|
||||
<!-- DisplayLists and Collision for the giant waterwheel near the start of the dungeon. -->
|
||||
<DList Name="gGreatBayTempleObjectWaterwheelEmptyDL" Offset="0x8770" /> <!-- Probably was the transparent component for the below DL -->
|
||||
<DList Name="gGreatBayTempleObjectWaterwheelDL" Offset="0x8778" /> <!-- Original name is "m2_KON_SuisyaFor0_model" ("waterwheel") -->
|
||||
<DList Name="gGreatBayTempleObjectWaterwheelWithFakeGearEmptyDL" Offset="0xA520" /> <!-- Probably was the transparent component for the below DL -->
|
||||
<DList Name="gGreatBayTempleObjectWaterwheelWithFakeGearDL" Offset="0xA528" /> <!-- Original name is "m2_KON_SuisyaFor8_model" -->
|
||||
<Collision Name="gGreatBayTempleObjectWaterwheelCol" Offset="0xAED0" />
|
||||
<Collision Name="gGreatBayTempleObjectWaterwheelCol" Offset="0xAED0" /> <!-- Original name is "m2_KON_SuisyaFor8_bgdatainfo" -->
|
||||
|
||||
<!-- DisplayLists and TextureAnimation for the waterfalls that can be frozen with Ice Arrows. -->
|
||||
<DList Name="gGreatBayTempleObjectWaterfallDL" Offset="0xB280" /> <!-- Original name is "m2_KON_TAKI_modelT" ("waterfall") -->
|
||||
@@ -50,17 +50,17 @@
|
||||
<!-- DisplayLists and Collision for the "shaft" of the seesaw, i.e., the bar that connects the two platforms. -->
|
||||
<DList Name="gGreatBayTempleObjectSeesawShaftEmptyDL" Offset="0xB8F0" /> <!-- Probably was the transparent component for the below DL -->
|
||||
<DList Name="gGreatBayTempleObjectSeesawShaftDL" Offset="0xB8F8" /> <!-- Original name is "m2_KON_TENBIN_model" ("(balance) scales") -->
|
||||
<Collision Name="gGreatBayTempleObjectSeesawShaftCol" Offset="0xBC08" />
|
||||
<Collision Name="gGreatBayTempleObjectSeesawShaftCol" Offset="0xBC08" /> <!-- Original name is "m2_KON_TENBIN_bgdatainfo" -->
|
||||
|
||||
<!-- DisplayLists and Collision for the large seesaw platform. -->
|
||||
<DList Name="gGreatBayTempleObjectLargeSeesawPlatformEmptyDL" Offset="0xBF40" /> <!-- Probably was the transparent component for the below DL -->
|
||||
<DList Name="gGreatBayTempleObjectLargeSeesawPlatformDL" Offset="0xBF48" /> <!-- Original name is "m2_KON_TENBINstepBIG_model" -->
|
||||
<Collision Name="gGreatBayTempleObjectLargeSeesawPlatformCol" Offset="0xC180" />
|
||||
<Collision Name="gGreatBayTempleObjectLargeSeesawPlatformCol" Offset="0xC180" /> <!-- Original name is "m2_KON_TENBINstepBIG_bgdatainfo" -->
|
||||
|
||||
<!-- DisplayLists and Collision for the small seesaw platform. -->
|
||||
<DList Name="gGreatBayTempleObjectSmallSeesawPlatformEmptyDL" Offset="0xC4B0" /> <!-- Probably was the transparent component for the below DL -->
|
||||
<DList Name="gGreatBayTempleObjectSmallSeesawPlatformDL" Offset="0xC4B8" /> <!-- Original name is "m2_KON_TENBINstepSML_model" -->
|
||||
<Collision Name="gGreatBayTempleObjectSmallSeesawPlatformCol" Offset="0xC700" />
|
||||
<Collision Name="gGreatBayTempleObjectSmallSeesawPlatformCol" Offset="0xC700" /> <!-- Original name is "m2_KON_TENBINstepSML_bgdatainfo" -->
|
||||
|
||||
<!-- DisplayLists and TextureAnimation for the large whirlpool at the bottom of the main room. -->
|
||||
<DList Name="gGreatBayTempleObjectWhirlpoolDL" Offset="0xCAA0" /> <!-- Original name is "m2_KON_UZUdis_modelT" ("whirlpool; swirl") -->
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
<Root>
|
||||
<File Name="object_death" Segment="6">
|
||||
<Animation Name="object_death_Anim_000E64" Offset="0xE64" />
|
||||
<Animation Name="object_death_Anim_0015B4" Offset="0x15B4" />
|
||||
<Animation Name="object_death_Anim_001834" Offset="0x1834" />
|
||||
<Animation Name="object_death_Anim_001F80" Offset="0x1F80" />
|
||||
<Animation Name="object_death_Anim_002DE8" Offset="0x2DE8" />
|
||||
<Animation Name="object_death_Anim_00352C" Offset="0x352C" />
|
||||
<Animation Name="object_death_Anim_003CAC" Offset="0x3CAC" />
|
||||
<Animation Name="object_death_Anim_000E64" Offset="0xE64" /> <!-- Original name is "d13_atack" -->
|
||||
<Animation Name="object_death_Anim_0015B4" Offset="0x15B4" /> <!-- Original name is "d13_callenemy" -->
|
||||
<Animation Name="object_death_Anim_001834" Offset="0x1834" /> <!-- Original name is "d13_callingenemy" -->
|
||||
<Animation Name="object_death_Anim_001F80" Offset="0x1F80" /> <!-- Original name is "d13_damage" -->
|
||||
<Animation Name="object_death_Anim_002DE8" Offset="0x2DE8" /> <!-- Original name is "d13_deadhit" -->
|
||||
<Animation Name="object_death_Anim_00352C" Offset="0x352C" /> <!-- Original name is "d13_deadwait" -->
|
||||
<Animation Name="object_death_Anim_003CAC" Offset="0x3CAC" /> <!-- Original name is "d13_fly" -->
|
||||
<DList Name="object_death_DL_006B80" Offset="0x6B80" />
|
||||
<DList Name="object_death_DL_006D18" Offset="0x6D18" />
|
||||
<DList Name="object_death_DL_006E08" Offset="0x6E08" />
|
||||
<DList Name="object_death_DL_006F88" Offset="0x6F88" />
|
||||
<DList Name="object_death_DL_0073D0" Offset="0x73D0" />
|
||||
<DList Name="object_death_DL_006F88" Offset="0x6F88" /> <!-- Original name is "d13_kama_model" ("sickle") -->
|
||||
<DList Name="object_death_DL_0073D0" Offset="0x73D0" /> <!-- Original name is "d13_kamahaA_model" -->
|
||||
<DList Name="object_death_DL_0074B8" Offset="0x74B8" />
|
||||
<DList Name="object_death_DL_007560" Offset="0x7560" />
|
||||
<DList Name="object_death_DL_007638" Offset="0x7638" />
|
||||
@@ -41,7 +41,7 @@
|
||||
<Texture Name="object_death_Tex_009808" OutName="tex_009808" Format="i4" Width="16" Height="16" Offset="0x9808" />
|
||||
<DList Name="object_death_DL_009988" Offset="0x9988" />
|
||||
<Texture Name="object_death_Tex_009AA0" OutName="tex_009AA0" Format="i4" Width="16" Height="16" Offset="0x9AA0" />
|
||||
<DList Name="object_death_DL_009BA0" Offset="0x9BA0" />
|
||||
<DList Name="object_death_DL_009BA0" Offset="0x9BA0" /> <!-- Original name is "d13_cover_model" -->
|
||||
<Texture Name="object_death_Tex_009C40" OutName="tex_009C40" Format="rgba16" Width="16" Height="16" Offset="0x9C40" />
|
||||
<DList Name="object_death_DL_009F10" Offset="0x9F10" />
|
||||
<DList Name="object_death_DL_009F88" Offset="0x9F88" />
|
||||
@@ -76,9 +76,9 @@
|
||||
<Limb Name="object_death_Standardlimb_00AC9C" Type="Standard" EnumName="OBJECT_DEATH_LIMB_14" Offset="0xAC9C" />
|
||||
<Limb Name="object_death_Standardlimb_00ACA8" Type="Standard" EnumName="OBJECT_DEATH_LIMB_15" Offset="0xACA8" />
|
||||
<Skeleton Name="object_death_Skel_00AD08" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DEATH_LIMB_NONE" LimbMax="OBJECT_DEATH_LIMB_MAX" EnumName="ObjectDeathLimb" Offset="0xAD08" />
|
||||
<Animation Name="object_death_Anim_00B284" Offset="0xB284" />
|
||||
<Animation Name="object_death_Anim_00B508" Offset="0xB508" />
|
||||
<Animation Name="object_death_Anim_00CB2C" Offset="0xCB2C" />
|
||||
<Animation Name="object_death_Anim_00B284" Offset="0xB284" /> <!-- Original name is "d13_gahaha" -->
|
||||
<Animation Name="object_death_Anim_00B508" Offset="0xB508" /> <!-- Original name is "d13_guard" -->
|
||||
<Animation Name="object_death_Anim_00CB2C" Offset="0xCB2C" /> <!-- Original name is "d13_jakin" -->
|
||||
<TextureAnimation Name="object_death_Matanimheader_00CB84" Offset="0xCB84" />
|
||||
<TextureAnimation Name="object_death_Matanimheader_00CBC0" Offset="0xCBC0" />
|
||||
</File>
|
||||
|
||||
@@ -1,27 +1,40 @@
|
||||
<Root>
|
||||
<!-- Deku Baba and withered Deku Baba assets. Identical to OoT -->
|
||||
<File Name="object_dekubaba" Segment="6">
|
||||
<Animation Name="object_dekubaba_Anim_000208" Offset="0x208" />
|
||||
<Animation Name="object_dekubaba_Anim_0002B8" Offset="0x2B8" />
|
||||
<DList Name="object_dekubaba_DL_000580" Offset="0x580" />
|
||||
<DList Name="object_dekubaba_DL_000B68" Offset="0xB68" />
|
||||
<DList Name="object_dekubaba_DL_0010F0" Offset="0x10F0" />
|
||||
<DList Name="object_dekubaba_DL_001330" Offset="0x1330" />
|
||||
<DList Name="object_dekubaba_DL_001628" Offset="0x1628" />
|
||||
<DList Name="object_dekubaba_DL_001828" Offset="0x1828" />
|
||||
<Texture Name="object_dekubaba_Tex_0018D0" OutName="tex_0018D0" Format="rgba16" Width="16" Height="32" Offset="0x18D0" />
|
||||
<Texture Name="object_dekubaba_Tex_001CD0" OutName="tex_001CD0" Format="rgba16" Width="32" Height="32" Offset="0x1CD0" />
|
||||
<Texture Name="object_dekubaba_Tex_0024D0" OutName="tex_0024D0" Format="rgba16" Width="16" Height="32" Offset="0x24D0" />
|
||||
<Texture Name="object_dekubaba_Tex_0028D0" OutName="tex_0028D0" Format="rgba16" Width="8" Height="8" Offset="0x28D0" />
|
||||
<Texture Name="object_dekubaba_Tex_002950" OutName="tex_002950" Format="rgba16" Width="8" Height="8" Offset="0x2950" />
|
||||
<Limb Name="object_dekubaba_Standardlimb_0029D0" Type="Standard" EnumName="OBJECT_DEKUBABA_LIMB_01" Offset="0x29D0" />
|
||||
<Limb Name="object_dekubaba_Standardlimb_0029DC" Type="Standard" EnumName="OBJECT_DEKUBABA_LIMB_02" Offset="0x29DC" />
|
||||
<Limb Name="object_dekubaba_Standardlimb_0029E8" Type="Standard" EnumName="OBJECT_DEKUBABA_LIMB_03" Offset="0x29E8" />
|
||||
<Limb Name="object_dekubaba_Standardlimb_0029F4" Type="Standard" EnumName="OBJECT_DEKUBABA_LIMB_04" Offset="0x29F4" />
|
||||
<Limb Name="object_dekubaba_Standardlimb_002A00" Type="Standard" EnumName="OBJECT_DEKUBABA_LIMB_05" Offset="0x2A00" />
|
||||
<Limb Name="object_dekubaba_Standardlimb_002A0C" Type="Standard" EnumName="OBJECT_DEKUBABA_LIMB_06" Offset="0x2A0C" />
|
||||
<Limb Name="object_dekubaba_Standardlimb_002A18" Type="Standard" EnumName="OBJECT_DEKUBABA_LIMB_07" Offset="0x2A18" />
|
||||
<Skeleton Name="object_dekubaba_Skel_002A40" Type="Normal" LimbType="Standard" LimbNone="OBJECT_DEKUBABA_LIMB_NONE" LimbMax="OBJECT_DEKUBABA_LIMB_MAX" EnumName="ObjectDekubabaLimb" Offset="0x2A40" />
|
||||
<DList Name="object_dekubaba_DL_003070" Offset="0x3070" />
|
||||
<Texture Name="object_dekubaba_Tex_0031C0" OutName="tex_0031C0" Format="rgba16" Width="32" Height="32" Offset="0x31C0" />
|
||||
|
||||
<!-- Deku Baba animations -->
|
||||
<Animation Name="gDekuBabaPauseChompAnim" Offset="0x208"/> <!-- Original name is "db_P_kougeki" ("attack; assault") -->
|
||||
<Animation Name="gDekuBabaFastChompAnim" Offset="0x2B8"/> <!-- Original name is "db_P_tobidasu" ("to appear (suddenly)") -->
|
||||
|
||||
<!-- Deku Baba body DLists (not all are limb DLists) -->
|
||||
<DList Name="gDekuBabaLowerJawDL" Offset="0x580"/>
|
||||
<DList Name="gDekuBabaUpperJawDL" Offset="0xB68"/>
|
||||
<DList Name="gDekuBabaBaseLeavesDL" Offset="0x10F0"/> <!-- Original name is "db_ha_model" ("leaf; blade of grass") -->
|
||||
<DList Name="gDekuBabaStemTopDL" Offset="0x1330"/> <!-- Original name is "db_miki1_model" ("miki" = "trunk") -->
|
||||
<DList Name="gDekuBabaStemMiddleDL" Offset="0x1628"/> <!-- Original name is "db_miki2_model" -->
|
||||
<DList Name="gDekuBabaStemBaseDL" Offset="0x1828"/> <!-- Original name is "db_miki3_model" -->
|
||||
|
||||
<!-- Deku Baba body textures -->
|
||||
<Texture Name="gDekuBabaJawOuterTex" OutName="deku_baba_jaw_outer" Format="rgba16" Width="16" Height="32" Offset="0x18D0"/>
|
||||
<Texture Name="gDekuBabaJawInnerTex" OutName="deku_baba_jaw_inner" Format="rgba16" Width="32" Height="32" Offset="0x1CD0"/>
|
||||
<Texture Name="gDekuBabaLeafTex" OutName="deku_baba_leaf" Format="rgba16" Width="16" Height="32" Offset="0x24D0"/>
|
||||
<Texture Name="gDekuBabaBulbTex" OutName="deku_baba_bulb" Format="rgba16" Width="8" Height="8" Offset="0x28D0"/>
|
||||
<Texture Name="gDekuBabaStemTex" OutName="deku_baba_stem" Format="rgba16" Width="8" Height="8" Offset="0x2950"/>
|
||||
|
||||
<!-- Deku Baba limbs (upper/lower is only based on the "tongue" being in the lower) -->
|
||||
<Limb Name="gDekuBabaRootLimb" Type="Standard" EnumName="DEKUBABA_LIMB_ROOT" Offset="0x29D0" />
|
||||
<Limb Name="gDekuBabaUpperJawRootLimb" Type="Standard" EnumName="DEKUBABA_LIMB_UPPER_JAW_ROOT" Offset="0x29DC" />
|
||||
<Limb Name="gDekuBabaUpperJawRooWrappertLimb" Type="Standard" EnumName="DEKUBABA_LIMB_UPPER_JAW_WRAPPER" Offset="0x29E8" />
|
||||
<Limb Name="gDekuBabaUpperJawLimb" Type="Standard" EnumName="DEKUBABA_LIMB_UPPER_JAW" Offset="0x29F4" />
|
||||
<Limb Name="gDekuBabaLowerJawRootLimb" Type="Standard" EnumName="DEKUBABA_LIMB_LOWER_JAW_ROOT" Offset="0x2A00" />
|
||||
<Limb Name="gDekuBabaLowerJawWrapperLimb" Type="Standard" EnumName="DEKUBABA_LIMB_LOWER_JAW_WRAPPER" Offset="0x2A0C" />
|
||||
<Limb Name="gDekuBabaLowerJawLimb" Type="Standard" EnumName="DEKUBABA_LIMB_LOWER_JAW" Offset="0x2A18" />
|
||||
|
||||
<!-- Deku Baba skeleton (only used for jaws) -->
|
||||
<Skeleton Name="gDekuBabaSkel" Type="Normal" LimbType="Standard" LimbNone="DEKUBABA_LIMB_NONE" LimbMax="DEKUBABA_LIMB_MAX" EnumName="DekuBabaLimb" Offset="0x2A40" />
|
||||
|
||||
<!-- Deku Baba stick drop -->
|
||||
<DList Name="gDekuBabaStickDropDL" Offset="0x3070"/>
|
||||
<Texture Name="gDekuBabaStickDropTex" OutName="deku_baba_stick_drop" Format="rgba16" Width="32" Height="32" Offset="0x31C0"/>
|
||||
</File>
|
||||
</Root>
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
<Root>
|
||||
<File Name="object_dekucity_obj" Segment="6">
|
||||
<Collision Name="object_dekucity_obj_Colheader_0002AC" Offset="0x2AC" />
|
||||
<DList Name="object_dekucity_obj_DL_0004E0" Offset="0x4E0" />
|
||||
<Collision Name="object_dekucity_obj_Colheader_0002AC" Offset="0x2AC" /> <!-- Original name is "z2_22_DOKUcode_bgdatainfo" ("doku" = "poison") -->
|
||||
<DList Name="object_dekucity_obj_DL_0004E0" Offset="0x4E0" /> <!-- Original name is "z2_22_DOKUwter_modelT" -->
|
||||
<DList Name="object_dekucity_obj_DL_000610" Offset="0x610" />
|
||||
<Texture Name="object_dekucity_obj_Tex_000618" OutName="tex_000618" Format="rgba16" Width="32" Height="32" Offset="0x618" />
|
||||
<TextureAnimation Name="object_dekucity_obj_Matanimheader_000E28" Offset="0xE28" />
|
||||
<DList Name="object_dekucity_obj_DL_001030" Offset="0x1030" />
|
||||
<DList Name="object_dekucity_obj_DL_001030" Offset="0x1030" /> <!-- Original name is "z2_22_wter_modelT" -->
|
||||
<DList Name="object_dekucity_obj_DL_001160" Offset="0x1160" />
|
||||
<Texture Name="object_dekucity_obj_Tex_001168" OutName="tex_001168" Format="rgba16" Width="32" Height="32" Offset="0x1168" />
|
||||
<TextureAnimation Name="object_dekucity_obj_Matanimheader_001978" Offset="0x1978" />
|
||||
<DList Name="object_dekucity_obj_DL_001D80" Offset="0x1D80" />
|
||||
<DList Name="object_dekucity_obj_DL_001ED8" Offset="0x1ED8" />
|
||||
<DList Name="object_dekucity_obj_DL_001ED8" Offset="0x1ED8" /> <!-- Original name is "z2_22_yama01_model" ("yama" = "mountain; hill") -->
|
||||
<Texture Name="object_dekucity_obj_Tex_002008" OutName="tex_002008" Format="rgba16" Width="16" Height="64" Offset="0x2008" />
|
||||
<Texture Name="object_dekucity_obj_Tex_002808" OutName="tex_002808" Format="rgba16" Width="32" Height="32" Offset="0x2808" />
|
||||
<Texture Name="object_dekucity_obj_Tex_003008" OutName="tex_003008" Format="i4" Width="64" Height="64" Offset="0x3008" />
|
||||
<TextureAnimation Name="object_dekucity_obj_Matanimheader_003820" Offset="0x3820" />
|
||||
<DList Name="object_dekucity_obj_DL_003990" Offset="0x3990" />
|
||||
<DList Name="object_dekucity_obj_DL_003998" Offset="0x3998" />
|
||||
<DList Name="object_dekucity_obj_DL_003998" Offset="0x3998" /> <!-- Original name is "z2_22_yama02_model" -->
|
||||
<Texture Name="object_dekucity_obj_Tex_003AC0" OutName="tex_003AC0" Format="rgba16" Width="16" Height="32" Offset="0x3AC0" />
|
||||
<Texture Name="object_dekucity_obj_Tex_003EC0" OutName="tex_003EC0" Format="rgba16" Width="32" Height="32" Offset="0x3EC0" />
|
||||
</File>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user