merge master

This commit is contained in:
engineer124
2022-09-28 19:40:44 -04:00
79 changed files with 3363 additions and 1217 deletions
+86
View File
@@ -0,0 +1,86 @@
<Root>
<File Name="object_dnj" Segment="6">
<Animation Name="object_dnj_Anim_000470" Offset="0x470" />
<Animation Name="object_dnj_Anim_0008F0" Offset="0x8F0" />
<Animation Name="object_dnj_Anim_000F6C" Offset="0xF6C" />
<Animation Name="object_dnj_Anim_001A50" Offset="0x1A50" />
<Animation Name="object_dnj_Anim_002530" Offset="0x2530" />
<Animation Name="object_dnj_Anim_003320" Offset="0x3320" />
<Animation Name="object_dnj_Anim_0036D0" Offset="0x36D0" />
<Animation Name="object_dnj_Anim_0041CC" Offset="0x41CC" />
<Animation Name="object_dnj_Anim_004DD8" Offset="0x4DD8" />
<Animation Name="object_dnj_Anim_0051E4" Offset="0x51E4" />
<Animation Name="object_dnj_Anim_005E20" Offset="0x5E20" />
<Animation Name="object_dnj_Anim_005F98" Offset="0x5F98" />
<Animation Name="object_dnj_Anim_006488" Offset="0x6488" />
<Animation Name="object_dnj_Anim_006F84" Offset="0x6F84" />
<Animation Name="object_dnj_Anim_0073E4" Offset="0x73E4" />
<Animation Name="object_dnj_Anim_0077A8" Offset="0x77A8" />
<Animation Name="object_dnj_Anim_007CA4" Offset="0x7CA4" />
<Animation Name="object_dnj_Anim_008324" Offset="0x8324" />
<Animation Name="object_dnj_Anim_008AE4" Offset="0x8AE4" />
<Animation Name="object_dnj_Anim_009100" Offset="0x9100" />
<DList Name="object_dnj_DL_00B7C0" Offset="0xB7C0" />
<DList Name="object_dnj_DL_00B850" Offset="0xB850" />
<DList Name="object_dnj_DL_00BC68" Offset="0xBC68" />
<DList Name="object_dnj_DL_00BDD8" Offset="0xBDD8" />
<DList Name="object_dnj_DL_00BEF0" Offset="0xBEF0" />
<DList Name="object_dnj_DL_00C118" Offset="0xC118" />
<DList Name="object_dnj_DL_00C1A0" Offset="0xC1A0" />
<DList Name="object_dnj_DL_00C248" Offset="0xC248" />
<DList Name="object_dnj_DL_00C370" Offset="0xC370" />
<DList Name="object_dnj_DL_00C450" Offset="0xC450" />
<DList Name="object_dnj_DL_00C4E0" Offset="0xC4E0" />
<DList Name="object_dnj_DL_00C5C0" Offset="0xC5C0" />
<DList Name="object_dnj_DL_00C650" Offset="0xC650" />
<DList Name="object_dnj_DL_00C7C0" Offset="0xC7C0" />
<DList Name="object_dnj_DL_00C8D8" Offset="0xC8D8" />
<DList Name="object_dnj_DL_00C988" Offset="0xC988" />
<DList Name="object_dnj_DL_00CA38" Offset="0xCA38" />
<DList Name="object_dnj_DL_00CAE8" Offset="0xCAE8" />
<DList Name="object_dnj_DL_00CBE8" Offset="0xCBE8" />
<DList Name="object_dnj_DL_00CC90" Offset="0xCC90" />
<DList Name="object_dnj_DL_00CD48" Offset="0xCD48" />
<DList Name="object_dnj_DL_00CE00" Offset="0xCE00" />
<DList Name="object_dnj_DL_00CEC8" Offset="0xCEC8" />
<DList Name="object_dnj_DL_00CF88" Offset="0xCF88" />
<DList Name="object_dnj_DL_00D040" Offset="0xD040" />
<DList Name="object_dnj_DL_00D108" Offset="0xD108" />
<Texture Name="object_dnj_Tex_00D1C8" OutName="tex_00D1C8" Format="rgba16" Width="16" Height="16" Offset="0xD1C8" />
<Texture Name="object_dnj_Tex_00D3C8" OutName="tex_00D3C8" Format="rgba16" Width="16" Height="16" Offset="0xD3C8" />
<Texture Name="object_dnj_Tex_00D5C8" OutName="tex_00D5C8" Format="rgba16" Width="8" Height="8" Offset="0xD5C8" />
<Texture Name="object_dnj_Tex_00D648" OutName="tex_00D648" Format="rgba16" Width="16" Height="16" Offset="0xD648" />
<Texture Name="object_dnj_Tex_00D848" OutName="tex_00D848" Format="rgba16" Width="16" Height="32" Offset="0xD848" />
<Texture Name="object_dnj_Tex_00DC48" OutName="tex_00DC48" Format="rgba16" Width="16" Height="8" Offset="0xDC48" />
<Texture Name="object_dnj_Tex_00DD48" OutName="tex_00DD48" Format="rgba16" Width="16" Height="16" Offset="0xDD48" />
<Texture Name="object_dnj_Tex_00DF48" OutName="tex_00DF48" Format="rgba16" Width="8" Height="16" Offset="0xDF48" />
<Limb Name="object_dnj_Standardlimb_00E048" Type="Standard" EnumName="OBJECT_DNJ_LIMB_01" Offset="0xE048" />
<Limb Name="object_dnj_Standardlimb_00E054" Type="Standard" EnumName="OBJECT_DNJ_LIMB_02" Offset="0xE054" />
<Limb Name="object_dnj_Standardlimb_00E060" Type="Standard" EnumName="OBJECT_DNJ_LIMB_03" Offset="0xE060" />
<Limb Name="object_dnj_Standardlimb_00E06C" Type="Standard" EnumName="OBJECT_DNJ_LIMB_04" Offset="0xE06C" />
<Limb Name="object_dnj_Standardlimb_00E078" Type="Standard" EnumName="OBJECT_DNJ_LIMB_05" Offset="0xE078" />
<Limb Name="object_dnj_Standardlimb_00E084" Type="Standard" EnumName="OBJECT_DNJ_LIMB_06" Offset="0xE084" />
<Limb Name="object_dnj_Standardlimb_00E090" Type="Standard" EnumName="OBJECT_DNJ_LIMB_07" Offset="0xE090" />
<Limb Name="object_dnj_Standardlimb_00E09C" Type="Standard" EnumName="OBJECT_DNJ_LIMB_08" Offset="0xE09C" />
<Limb Name="object_dnj_Standardlimb_00E0A8" Type="Standard" EnumName="OBJECT_DNJ_LIMB_09" Offset="0xE0A8" />
<Limb Name="object_dnj_Standardlimb_00E0B4" Type="Standard" EnumName="OBJECT_DNJ_LIMB_0A" Offset="0xE0B4" />
<Limb Name="object_dnj_Standardlimb_00E0C0" Type="Standard" EnumName="OBJECT_DNJ_LIMB_0B" Offset="0xE0C0" />
<Limb Name="object_dnj_Standardlimb_00E0CC" Type="Standard" EnumName="OBJECT_DNJ_LIMB_0C" Offset="0xE0CC" />
<Limb Name="object_dnj_Standardlimb_00E0D8" Type="Standard" EnumName="OBJECT_DNJ_LIMB_0D" Offset="0xE0D8" />
<Limb Name="object_dnj_Standardlimb_00E0E4" Type="Standard" EnumName="OBJECT_DNJ_LIMB_0E" Offset="0xE0E4" />
<Limb Name="object_dnj_Standardlimb_00E0F0" Type="Standard" EnumName="OBJECT_DNJ_LIMB_0F" Offset="0xE0F0" />
<Limb Name="object_dnj_Standardlimb_00E0FC" Type="Standard" EnumName="OBJECT_DNJ_LIMB_10" Offset="0xE0FC" />
<Limb Name="object_dnj_Standardlimb_00E108" Type="Standard" EnumName="OBJECT_DNJ_LIMB_11" Offset="0xE108" />
<Limb Name="object_dnj_Standardlimb_00E114" Type="Standard" EnumName="OBJECT_DNJ_LIMB_12" Offset="0xE114" />
<Limb Name="object_dnj_Standardlimb_00E120" Type="Standard" EnumName="OBJECT_DNJ_LIMB_13" Offset="0xE120" />
<Limb Name="object_dnj_Standardlimb_00E12C" Type="Standard" EnumName="OBJECT_DNJ_LIMB_14" Offset="0xE12C" />
<Limb Name="object_dnj_Standardlimb_00E138" Type="Standard" EnumName="OBJECT_DNJ_LIMB_15" Offset="0xE138" />
<Limb Name="object_dnj_Standardlimb_00E144" Type="Standard" EnumName="OBJECT_DNJ_LIMB_16" Offset="0xE144" />
<Limb Name="object_dnj_Standardlimb_00E150" Type="Standard" EnumName="OBJECT_DNJ_LIMB_17" Offset="0xE150" />
<Limb Name="object_dnj_Standardlimb_00E15C" Type="Standard" EnumName="OBJECT_DNJ_LIMB_18" Offset="0xE15C" />
<Limb Name="object_dnj_Standardlimb_00E168" Type="Standard" EnumName="OBJECT_DNJ_LIMB_19" Offset="0xE168" />
<Limb Name="object_dnj_Standardlimb_00E174" Type="Standard" EnumName="OBJECT_DNJ_LIMB_1A" Offset="0xE174" />
<Limb Name="object_dnj_Standardlimb_00E180" Type="Standard" EnumName="OBJECT_DNJ_LIMB_1B" Offset="0xE180" />
<Skeleton Name="object_dnj_Skel_00E1F8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DNJ_LIMB_NONE" LimbMax="OBJECT_DNJ_LIMB_MAX" EnumName="ObjectDnoLimb" Offset="0xE1F8" />
</File>
</Root>
+90 -82
View File
@@ -1,86 +1,94 @@
<Root>
<File Name="object_dno" Segment="6">
<Animation Name="object_dno_Anim_000470" Offset="0x470" />
<Animation Name="object_dno_Anim_0008F0" Offset="0x8F0" />
<Animation Name="object_dno_Anim_000F6C" Offset="0xF6C" />
<Animation Name="object_dno_Anim_001A50" Offset="0x1A50" />
<Animation Name="object_dno_Anim_002530" Offset="0x2530" />
<Animation Name="object_dno_Anim_003320" Offset="0x3320" />
<Animation Name="object_dno_Anim_0036D0" Offset="0x36D0" />
<Animation Name="object_dno_Anim_0041CC" Offset="0x41CC" />
<Animation Name="object_dno_Anim_004DD8" Offset="0x4DD8" />
<Animation Name="object_dno_Anim_0051E4" Offset="0x51E4" />
<Animation Name="object_dno_Anim_005E20" Offset="0x5E20" />
<Animation Name="object_dno_Anim_005F98" Offset="0x5F98" />
<Animation Name="object_dno_Anim_006488" Offset="0x6488" />
<Animation Name="object_dno_Anim_006F84" Offset="0x6F84" />
<Animation Name="object_dno_Anim_0073E4" Offset="0x73E4" />
<Animation Name="object_dno_Anim_0077A8" Offset="0x77A8" />
<Animation Name="object_dno_Anim_007CA4" Offset="0x7CA4" />
<Animation Name="object_dno_Anim_008324" Offset="0x8324" />
<Animation Name="object_dno_Anim_008AE4" Offset="0x8AE4" />
<Animation Name="object_dno_Anim_009100" Offset="0x9100" />
<DList Name="object_dno_DL_00B7C0" Offset="0xB7C0" />
<DList Name="object_dno_DL_00B850" Offset="0xB850" />
<DList Name="object_dno_DL_00BC68" Offset="0xBC68" />
<DList Name="object_dno_DL_00BDD8" Offset="0xBDD8" />
<DList Name="object_dno_DL_00BEF0" Offset="0xBEF0" />
<DList Name="object_dno_DL_00C118" Offset="0xC118" />
<DList Name="object_dno_DL_00C1A0" Offset="0xC1A0" />
<DList Name="object_dno_DL_00C248" Offset="0xC248" />
<DList Name="object_dno_DL_00C370" Offset="0xC370" />
<DList Name="object_dno_DL_00C450" Offset="0xC450" />
<DList Name="object_dno_DL_00C4E0" Offset="0xC4E0" />
<DList Name="object_dno_DL_00C5C0" Offset="0xC5C0" />
<DList Name="object_dno_DL_00C650" Offset="0xC650" />
<DList Name="object_dno_DL_00C7C0" Offset="0xC7C0" />
<DList Name="object_dno_DL_00C8D8" Offset="0xC8D8" />
<DList Name="object_dno_DL_00C988" Offset="0xC988" />
<DList Name="object_dno_DL_00CA38" Offset="0xCA38" />
<DList Name="object_dno_DL_00CAE8" Offset="0xCAE8" />
<DList Name="object_dno_DL_00CBE8" Offset="0xCBE8" />
<DList Name="object_dno_DL_00CC90" Offset="0xCC90" />
<DList Name="object_dno_DL_00CD48" Offset="0xCD48" />
<DList Name="object_dno_DL_00CE00" Offset="0xCE00" />
<DList Name="object_dno_DL_00CEC8" Offset="0xCEC8" />
<DList Name="object_dno_DL_00CF88" Offset="0xCF88" />
<DList Name="object_dno_DL_00D040" Offset="0xD040" />
<DList Name="object_dno_DL_00D108" Offset="0xD108" />
<Texture Name="object_dno_Tex_00D1C8" OutName="tex_00D1C8" Format="rgba16" Width="16" Height="16" Offset="0xD1C8" />
<Texture Name="object_dno_Tex_00D3C8" OutName="tex_00D3C8" Format="rgba16" Width="16" Height="16" Offset="0xD3C8" />
<Texture Name="object_dno_Tex_00D5C8" OutName="tex_00D5C8" Format="rgba16" Width="8" Height="8" Offset="0xD5C8" />
<Texture Name="object_dno_Tex_00D648" OutName="tex_00D648" Format="rgba16" Width="16" Height="16" Offset="0xD648" />
<Texture Name="object_dno_Tex_00D848" OutName="tex_00D848" Format="rgba16" Width="16" Height="32" Offset="0xD848" />
<Texture Name="object_dno_Tex_00DC48" OutName="tex_00DC48" Format="rgba16" Width="16" Height="8" Offset="0xDC48" />
<Texture Name="object_dno_Tex_00DD48" OutName="tex_00DD48" Format="rgba16" Width="16" Height="16" Offset="0xDD48" />
<Texture Name="object_dno_Tex_00DF48" OutName="tex_00DF48" Format="rgba16" Width="8" Height="16" Offset="0xDF48" />
<Limb Name="object_dno_Standardlimb_00E048" Type="Standard" EnumName="OBJECT_DNO_LIMB_01" Offset="0xE048" />
<Limb Name="object_dno_Standardlimb_00E054" Type="Standard" EnumName="OBJECT_DNO_LIMB_02" Offset="0xE054" />
<Limb Name="object_dno_Standardlimb_00E060" Type="Standard" EnumName="OBJECT_DNO_LIMB_03" Offset="0xE060" />
<Limb Name="object_dno_Standardlimb_00E06C" Type="Standard" EnumName="OBJECT_DNO_LIMB_04" Offset="0xE06C" />
<Limb Name="object_dno_Standardlimb_00E078" Type="Standard" EnumName="OBJECT_DNO_LIMB_05" Offset="0xE078" />
<Limb Name="object_dno_Standardlimb_00E084" Type="Standard" EnumName="OBJECT_DNO_LIMB_06" Offset="0xE084" />
<Limb Name="object_dno_Standardlimb_00E090" Type="Standard" EnumName="OBJECT_DNO_LIMB_07" Offset="0xE090" />
<Limb Name="object_dno_Standardlimb_00E09C" Type="Standard" EnumName="OBJECT_DNO_LIMB_08" Offset="0xE09C" />
<Limb Name="object_dno_Standardlimb_00E0A8" Type="Standard" EnumName="OBJECT_DNO_LIMB_09" Offset="0xE0A8" />
<Limb Name="object_dno_Standardlimb_00E0B4" Type="Standard" EnumName="OBJECT_DNO_LIMB_0A" Offset="0xE0B4" />
<Limb Name="object_dno_Standardlimb_00E0C0" Type="Standard" EnumName="OBJECT_DNO_LIMB_0B" Offset="0xE0C0" />
<Limb Name="object_dno_Standardlimb_00E0CC" Type="Standard" EnumName="OBJECT_DNO_LIMB_0C" Offset="0xE0CC" />
<Limb Name="object_dno_Standardlimb_00E0D8" Type="Standard" EnumName="OBJECT_DNO_LIMB_0D" Offset="0xE0D8" />
<Limb Name="object_dno_Standardlimb_00E0E4" Type="Standard" EnumName="OBJECT_DNO_LIMB_0E" Offset="0xE0E4" />
<Limb Name="object_dno_Standardlimb_00E0F0" Type="Standard" EnumName="OBJECT_DNO_LIMB_0F" Offset="0xE0F0" />
<Limb Name="object_dno_Standardlimb_00E0FC" Type="Standard" EnumName="OBJECT_DNO_LIMB_10" Offset="0xE0FC" />
<Limb Name="object_dno_Standardlimb_00E108" Type="Standard" EnumName="OBJECT_DNO_LIMB_11" Offset="0xE108" />
<Limb Name="object_dno_Standardlimb_00E114" Type="Standard" EnumName="OBJECT_DNO_LIMB_12" Offset="0xE114" />
<Limb Name="object_dno_Standardlimb_00E120" Type="Standard" EnumName="OBJECT_DNO_LIMB_13" Offset="0xE120" />
<Limb Name="object_dno_Standardlimb_00E12C" Type="Standard" EnumName="OBJECT_DNO_LIMB_14" Offset="0xE12C" />
<Limb Name="object_dno_Standardlimb_00E138" Type="Standard" EnumName="OBJECT_DNO_LIMB_15" Offset="0xE138" />
<Limb Name="object_dno_Standardlimb_00E144" Type="Standard" EnumName="OBJECT_DNO_LIMB_16" Offset="0xE144" />
<Limb Name="object_dno_Standardlimb_00E150" Type="Standard" EnumName="OBJECT_DNO_LIMB_17" Offset="0xE150" />
<Limb Name="object_dno_Standardlimb_00E15C" Type="Standard" EnumName="OBJECT_DNO_LIMB_18" Offset="0xE15C" />
<Limb Name="object_dno_Standardlimb_00E168" Type="Standard" EnumName="OBJECT_DNO_LIMB_19" Offset="0xE168" />
<Limb Name="object_dno_Standardlimb_00E174" Type="Standard" EnumName="OBJECT_DNO_LIMB_1A" Offset="0xE174" />
<Limb Name="object_dno_Standardlimb_00E180" Type="Standard" EnumName="OBJECT_DNO_LIMB_1B" Offset="0xE180" />
<Skeleton Name="object_dno_Skel_00E1F8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DNO_LIMB_NONE" LimbMax="OBJECT_DNO_LIMB_MAX" EnumName="ObjectDnoLimb" Offset="0xE1F8" />
<Animation Name="object_dno_Anim_0006F0" Offset="0x6F0" />
<Animation Name="object_dno_Anim_000BF8" Offset="0xBF8" />
<Animation Name="object_dno_Anim_001100" Offset="0x1100" />
<Animation Name="object_dno_Anim_001AEC" Offset="0x1AEC" />
<Animation Name="object_dno_Anim_002690" Offset="0x2690" />
<Animation Name="object_dno_Anim_003408" Offset="0x3408" />
<Animation Name="object_dno_Anim_003DBC" Offset="0x3DBC" />
<Animation Name="object_dno_Anim_0047B8" Offset="0x47B8" />
<Animation Name="object_dno_Anim_004EA0" Offset="0x4EA0" />
<Animation Name="object_dno_Anim_005284" Offset="0x5284" />
<Animation Name="object_dno_Anim_005A14" Offset="0x5A14" />
<Animation Name="object_dno_Anim_005E18" Offset="0x5E18" />
<Animation Name="object_dno_Anim_006984" Offset="0x6984" />
<Animation Name="object_dno_Anim_007528" Offset="0x7528" />
<Animation Name="object_dno_Anim_008328" Offset="0x8328" />
<Texture Name="object_dno_Tex_008340" OutName="tex_008340" Format="rgba16" Width="16" Height="16" Offset="0x8340" />
<Texture Name="object_dno_Tex_008540" OutName="tex_008540" Format="rgba16" Width="16" Height="16" Offset="0x8540" />
<Texture Name="object_dno_Tex_008740" OutName="tex_008740" Format="rgba16" Width="32" Height="32" Offset="0x8740" />
<Texture Name="object_dno_Tex_008F40" OutName="tex_008F40" Format="rgba16" Width="32" Height="64" Offset="0x8F40" />
<Texture Name="object_dno_Tex_009F40" OutName="tex_009F40" Format="rgba16" Width="32" Height="32" Offset="0x9F40" />
<Texture Name="object_dno_Tex_00A740" OutName="tex_00A740" Format="rgba16" Width="16" Height="16" Offset="0xA740" />
<Texture Name="object_dno_Tex_00A940" OutName="tex_00A940" Format="rgba16" Width="8" Height="8" Offset="0xA940" />
<Texture Name="object_dno_Tex_00A9C0" OutName="tex_00A9C0" Format="rgba16" Width="16" Height="16" Offset="0xA9C0" />
<Texture Name="object_dno_Tex_00ABC0" OutName="tex_00ABC0" Format="rgba16" Width="8" Height="8" Offset="0xABC0" />
<Texture Name="object_dno_Tex_00AC40" OutName="tex_00AC40" Format="rgba16" Width="8" Height="8" Offset="0xAC40" />
<DList Name="object_dno_DL_00C9B0" Offset="0xC9B0" />
<DList Name="object_dno_DL_00CB70" Offset="0xCB70" />
<DList Name="object_dno_DL_00CC10" Offset="0xCC10" />
<DList Name="object_dno_DL_00CE38" Offset="0xCE38" />
<DList Name="object_dno_DL_00CED0" Offset="0xCED0" />
<DList Name="object_dno_DL_00CFA8" Offset="0xCFA8" />
<DList Name="object_dno_DL_00D050" Offset="0xD050" />
<DList Name="object_dno_DL_00D140" Offset="0xD140" />
<DList Name="object_dno_DL_00D230" Offset="0xD230" />
<DList Name="object_dno_DL_00D2E8" Offset="0xD2E8" />
<DList Name="object_dno_DL_00D3D8" Offset="0xD3D8" />
<DList Name="object_dno_DL_00D4C8" Offset="0xD4C8" />
<DList Name="object_dno_DL_00D668" Offset="0xD668" />
<DList Name="object_dno_DL_00D758" Offset="0xD758" />
<DList Name="object_dno_DL_00D848" Offset="0xD848" />
<DList Name="object_dno_DL_00D938" Offset="0xD938" />
<DList Name="object_dno_DL_00DA28" Offset="0xDA28" />
<DList Name="object_dno_DL_00DB00" Offset="0xDB00" />
<DList Name="object_dno_DL_00DCA8" Offset="0xDCA8" />
<DList Name="object_dno_DL_00DD50" Offset="0xDD50" />
<DList Name="object_dno_DL_00DE40" Offset="0xDE40" />
<DList Name="object_dno_DL_00DF30" Offset="0xDF30" />
<DList Name="object_dno_DL_00DFE8" Offset="0xDFE8" />
<DList Name="object_dno_DL_00E0D8" Offset="0xE0D8" />
<DList Name="object_dno_DL_00E1C8" Offset="0xE1C8" />
<DList Name="object_dno_DL_00E318" Offset="0xE318" />
<DList Name="object_dno_DL_00E420" Offset="0xE420" />
<DList Name="object_dno_DL_00E538" Offset="0xE538" />
<DList Name="object_dno_DL_00E630" Offset="0xE630" />
<DList Name="object_dno_DL_00E738" Offset="0xE738" />
<DList Name="object_dno_DL_00E850" Offset="0xE850" />
<Limb Name="object_dno_Standardlimb_00E948" Type="Standard" EnumName="OBJECT_DNO_LIMB_01" Offset="0xE948" />
<Limb Name="object_dno_Standardlimb_00E954" Type="Standard" EnumName="OBJECT_DNO_LIMB_02" Offset="0xE954" />
<Limb Name="object_dno_Standardlimb_00E960" Type="Standard" EnumName="OBJECT_DNO_LIMB_03" Offset="0xE960" />
<Limb Name="object_dno_Standardlimb_00E96C" Type="Standard" EnumName="OBJECT_DNO_LIMB_04" Offset="0xE96C" />
<Limb Name="object_dno_Standardlimb_00E978" Type="Standard" EnumName="OBJECT_DNO_LIMB_05" Offset="0xE978" />
<Limb Name="object_dno_Standardlimb_00E984" Type="Standard" EnumName="OBJECT_DNO_LIMB_06" Offset="0xE984" />
<Limb Name="object_dno_Standardlimb_00E990" Type="Standard" EnumName="OBJECT_DNO_LIMB_07" Offset="0xE990" />
<Limb Name="object_dno_Standardlimb_00E99C" Type="Standard" EnumName="OBJECT_DNO_LIMB_08" Offset="0xE99C" />
<Limb Name="object_dno_Standardlimb_00E9A8" Type="Standard" EnumName="OBJECT_DNO_LIMB_09" Offset="0xE9A8" />
<Limb Name="object_dno_Standardlimb_00E9B4" Type="Standard" EnumName="OBJECT_DNO_LIMB_0A" Offset="0xE9B4" />
<Limb Name="object_dno_Standardlimb_00E9C0" Type="Standard" EnumName="OBJECT_DNO_LIMB_0B" Offset="0xE9C0" />
<Limb Name="object_dno_Standardlimb_00E9CC" Type="Standard" EnumName="OBJECT_DNO_LIMB_0C" Offset="0xE9CC" />
<Limb Name="object_dno_Standardlimb_00E9D8" Type="Standard" EnumName="OBJECT_DNO_LIMB_0D" Offset="0xE9D8" />
<Limb Name="object_dno_Standardlimb_00E9E4" Type="Standard" EnumName="OBJECT_DNO_LIMB_0E" Offset="0xE9E4" />
<Limb Name="object_dno_Standardlimb_00E9F0" Type="Standard" EnumName="OBJECT_DNO_LIMB_0F" Offset="0xE9F0" />
<Limb Name="object_dno_Standardlimb_00E9FC" Type="Standard" EnumName="OBJECT_DNO_LIMB_10" Offset="0xE9FC" />
<Limb Name="object_dno_Standardlimb_00EA08" Type="Standard" EnumName="OBJECT_DNO_LIMB_11" Offset="0xEA08" />
<Limb Name="object_dno_Standardlimb_00EA14" Type="Standard" EnumName="OBJECT_DNO_LIMB_12" Offset="0xEA14" />
<Limb Name="object_dno_Standardlimb_00EA20" Type="Standard" EnumName="OBJECT_DNO_LIMB_13" Offset="0xEA20" />
<Limb Name="object_dno_Standardlimb_00EA2C" Type="Standard" EnumName="OBJECT_DNO_LIMB_14" Offset="0xEA2C" />
<Limb Name="object_dno_Standardlimb_00EA38" Type="Standard" EnumName="OBJECT_DNO_LIMB_15" Offset="0xEA38" />
<Limb Name="object_dno_Standardlimb_00EA44" Type="Standard" EnumName="OBJECT_DNO_LIMB_16" Offset="0xEA44" />
<Limb Name="object_dno_Standardlimb_00EA50" Type="Standard" EnumName="OBJECT_DNO_LIMB_17" Offset="0xEA50" />
<Limb Name="object_dno_Standardlimb_00EA5C" Type="Standard" EnumName="OBJECT_DNO_LIMB_18" Offset="0xEA5C" />
<Limb Name="object_dno_Standardlimb_00EA68" Type="Standard" EnumName="OBJECT_DNO_LIMB_19" Offset="0xEA68" />
<Limb Name="object_dno_Standardlimb_00EA74" Type="Standard" EnumName="OBJECT_DNO_LIMB_1A" Offset="0xEA74" />
<Limb Name="object_dno_Standardlimb_00EA80" Type="Standard" EnumName="OBJECT_DNO_LIMB_1B" Offset="0xEA80" />
<Limb Name="object_dno_Standardlimb_00EA8C" Type="Standard" EnumName="OBJECT_DNO_LIMB_1C" Offset="0xEA8C" />
<Limb Name="object_dno_Standardlimb_00EA98" Type="Standard" EnumName="OBJECT_DNO_LIMB_1D" Offset="0xEA98" />
<Limb Name="object_dno_Standardlimb_00EAA4" Type="Standard" EnumName="OBJECT_DNO_LIMB_1E" Offset="0xEAA4" />
<Limb Name="object_dno_Standardlimb_00EAB0" Type="Standard" EnumName="OBJECT_DNO_LIMB_1F" Offset="0xEAB0" />
<Limb Name="object_dno_Standardlimb_00EABC" Type="Standard" EnumName="OBJECT_DNO_LIMB_20" Offset="0xEABC" />
<Skeleton Name="object_dno_Skel_00EB48" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DNO_LIMB_NONE" LimbMax="OBJECT_DNO_LIMB_MAX" EnumName="ObjectDnqLimb" Offset="0xEB48" />
<Animation Name="object_dno_Anim_00F504" Offset="0xF504" />
</File>
</Root>
-88
View File
@@ -1,88 +0,0 @@
<Root>
<File Name="object_dnp" Segment="6">
<Animation Name="object_dnp_Anim_0007D8" Offset="0x7D8" />
<Animation Name="object_dnp_Anim_00125C" Offset="0x125C" />
<Animation Name="object_dnp_Anim_0017F8" Offset="0x17F8" />
<Animation Name="object_dnp_Anim_001C1C" Offset="0x1C1C" />
<Animation Name="object_dnp_Anim_0021DC" Offset="0x21DC" />
<Animation Name="object_dnp_Anim_0026B8" Offset="0x26B8" />
<Animation Name="object_dnp_Anim_004D08" Offset="0x4D08" />
<Animation Name="object_dnp_Anim_0057AC" Offset="0x57AC" />
<Animation Name="object_dnp_Anim_00625C" Offset="0x625C" />
<Animation Name="object_dnp_Anim_00674C" Offset="0x674C" />
<Animation Name="object_dnp_Anim_006B74" Offset="0x6B74" />
<Animation Name="object_dnp_Anim_0071F4" Offset="0x71F4" />
<Animation Name="object_dnp_Anim_007960" Offset="0x7960" />
<Animation Name="object_dnp_Anim_008588" Offset="0x8588" />
<Animation Name="object_dnp_Anim_00923C" Offset="0x923C" />
<Animation Name="object_dnp_Anim_009AA0" Offset="0x9AA0" />
<Animation Name="object_dnp_Anim_00A900" Offset="0xA900" />
<Animation Name="object_dnp_Anim_00AEB8" Offset="0xAEB8" />
<Animation Name="object_dnp_Anim_00B324" Offset="0xB324" />
<Animation Name="object_dnp_Anim_00B754" Offset="0xB754" />
<Animation Name="object_dnp_Anim_00BAD8" Offset="0xBAD8" />
<DList Name="object_dnp_DL_00D670" Offset="0xD670" />
<DList Name="object_dnp_DL_00D978" Offset="0xD978" />
<DList Name="object_dnp_DL_00DA08" Offset="0xDA08" />
<DList Name="object_dnp_DL_00DAA0" Offset="0xDAA0" />
<DList Name="object_dnp_DL_00DB38" Offset="0xDB38" />
<DList Name="object_dnp_DL_00DBD0" Offset="0xDBD0" />
<DList Name="object_dnp_DL_00DC68" Offset="0xDC68" />
<DList Name="object_dnp_DL_00DD00" Offset="0xDD00" />
<DList Name="object_dnp_DL_00DD98" Offset="0xDD98" />
<DList Name="object_dnp_DL_00DE30" Offset="0xDE30" />
<DList Name="object_dnp_DL_00DEC8" Offset="0xDEC8" />
<DList Name="object_dnp_DL_00E018" Offset="0xE018" />
<DList Name="object_dnp_DL_00E1C8" Offset="0xE1C8" />
<DList Name="object_dnp_DL_00E260" Offset="0xE260" />
<DList Name="object_dnp_DL_00E2F8" Offset="0xE2F8" />
<DList Name="object_dnp_DL_00E340" Offset="0xE340" />
<DList Name="object_dnp_DL_00E410" Offset="0xE410" />
<DList Name="object_dnp_DL_00E530" Offset="0xE530" />
<DList Name="object_dnp_DL_00E650" Offset="0xE650" />
<DList Name="object_dnp_DL_00E768" Offset="0xE768" />
<DList Name="object_dnp_DL_00E888" Offset="0xE888" />
<DList Name="object_dnp_DL_00E9A8" Offset="0xE9A8" />
<DList Name="object_dnp_DL_00EAC0" Offset="0xEAC0" />
<DList Name="object_dnp_DL_00EBD8" Offset="0xEBD8" />
<Texture Name="object_dnp_Tex_00ECD0" OutName="tex_00ECD0" Format="rgba16" Width="16" Height="32" Offset="0xECD0" />
<Texture Name="object_dnp_Tex_00F0D0" OutName="tex_00F0D0" Format="rgba16" Width="16" Height="32" Offset="0xF0D0" />
<Texture Name="object_dnp_Tex_00F4D0" OutName="tex_00F4D0" Format="rgba16" Width="4" Height="16" Offset="0xF4D0" />
<Texture Name="object_dnp_Tex_00F550" OutName="tex_00F550" Format="rgba16" Width="8" Height="8" Offset="0xF550" />
<Texture Name="object_dnp_Tex_00F5D0" OutName="tex_00F5D0" Format="rgba16" Width="16" Height="16" Offset="0xF5D0" />
<Texture Name="object_dnp_Tex_00F7D0" OutName="tex_00F7D0" Format="rgba16" Width="32" Height="32" Offset="0xF7D0" />
<Texture Name="object_dnp_Tex_00FFD0" OutName="tex_00FFD0" Format="rgba16" Width="16" Height="32" Offset="0xFFD0" />
<Texture Name="object_dnp_Tex_0103D0" OutName="tex_0103D0" Format="rgba16" Width="16" Height="16" Offset="0x103D0" />
<Texture Name="object_dnp_Tex_0105D0" OutName="tex_0105D0" Format="rgba16" Width="16" Height="16" Offset="0x105D0" />
<Texture Name="object_dnp_Tex_0107D0" OutName="tex_0107D0" Format="rgba16" Width="16" Height="16" Offset="0x107D0" />
<Texture Name="object_dnp_Tex_0109D0" OutName="tex_0109D0" Format="rgba16" Width="16" Height="16" Offset="0x109D0" />
<Limb Name="object_dnp_Standardlimb_010BD0" Type="Standard" EnumName="OBJECT_DNP_LIMB_01" Offset="0x10BD0" />
<Limb Name="object_dnp_Standardlimb_010BDC" Type="Standard" EnumName="OBJECT_DNP_LIMB_02" Offset="0x10BDC" />
<Limb Name="object_dnp_Standardlimb_010BE8" Type="Standard" EnumName="OBJECT_DNP_LIMB_03" Offset="0x10BE8" />
<Limb Name="object_dnp_Standardlimb_010BF4" Type="Standard" EnumName="OBJECT_DNP_LIMB_04" Offset="0x10BF4" />
<Limb Name="object_dnp_Standardlimb_010C00" Type="Standard" EnumName="OBJECT_DNP_LIMB_05" Offset="0x10C00" />
<Limb Name="object_dnp_Standardlimb_010C0C" Type="Standard" EnumName="OBJECT_DNP_LIMB_06" Offset="0x10C0C" />
<Limb Name="object_dnp_Standardlimb_010C18" Type="Standard" EnumName="OBJECT_DNP_LIMB_07" Offset="0x10C18" />
<Limb Name="object_dnp_Standardlimb_010C24" Type="Standard" EnumName="OBJECT_DNP_LIMB_08" Offset="0x10C24" />
<Limb Name="object_dnp_Standardlimb_010C30" Type="Standard" EnumName="OBJECT_DNP_LIMB_09" Offset="0x10C30" />
<Limb Name="object_dnp_Standardlimb_010C3C" Type="Standard" EnumName="OBJECT_DNP_LIMB_0A" Offset="0x10C3C" />
<Limb Name="object_dnp_Standardlimb_010C48" Type="Standard" EnumName="OBJECT_DNP_LIMB_0B" Offset="0x10C48" />
<Limb Name="object_dnp_Standardlimb_010C54" Type="Standard" EnumName="OBJECT_DNP_LIMB_0C" Offset="0x10C54" />
<Limb Name="object_dnp_Standardlimb_010C60" Type="Standard" EnumName="OBJECT_DNP_LIMB_0D" Offset="0x10C60" />
<Limb Name="object_dnp_Standardlimb_010C6C" Type="Standard" EnumName="OBJECT_DNP_LIMB_0E" Offset="0x10C6C" />
<Limb Name="object_dnp_Standardlimb_010C78" Type="Standard" EnumName="OBJECT_DNP_LIMB_0F" Offset="0x10C78" />
<Limb Name="object_dnp_Standardlimb_010C84" Type="Standard" EnumName="OBJECT_DNP_LIMB_10" Offset="0x10C84" />
<Limb Name="object_dnp_Standardlimb_010C90" Type="Standard" EnumName="OBJECT_DNP_LIMB_11" Offset="0x10C90" />
<Limb Name="object_dnp_Standardlimb_010C9C" Type="Standard" EnumName="OBJECT_DNP_LIMB_12" Offset="0x10C9C" />
<Limb Name="object_dnp_Standardlimb_010CA8" Type="Standard" EnumName="OBJECT_DNP_LIMB_13" Offset="0x10CA8" />
<Limb Name="object_dnp_Standardlimb_010CB4" Type="Standard" EnumName="OBJECT_DNP_LIMB_14" Offset="0x10CB4" />
<Limb Name="object_dnp_Standardlimb_010CC0" Type="Standard" EnumName="OBJECT_DNP_LIMB_15" Offset="0x10CC0" />
<Limb Name="object_dnp_Standardlimb_010CCC" Type="Standard" EnumName="OBJECT_DNP_LIMB_16" Offset="0x10CCC" />
<Limb Name="object_dnp_Standardlimb_010CD8" Type="Standard" EnumName="OBJECT_DNP_LIMB_17" Offset="0x10CD8" />
<Limb Name="object_dnp_Standardlimb_010CE4" Type="Standard" EnumName="OBJECT_DNP_LIMB_18" Offset="0x10CE4" />
<Limb Name="object_dnp_Standardlimb_010CF0" Type="Standard" EnumName="OBJECT_DNP_LIMB_19" Offset="0x10CF0" />
<Skeleton Name="object_dnp_Skel_010D60" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DNP_LIMB_NONE" LimbMax="OBJECT_DNP_LIMB_MAX" EnumName="ObjectDnpLimb" Offset="0x10D60" />
<Animation Name="object_dnp_Anim_0115B8" Offset="0x115B8" />
<Animation Name="object_dnp_Anim_012428" Offset="0x12428" />
</File>
</Root>
+83 -89
View File
@@ -1,94 +1,88 @@
<Root>
<File Name="object_dnq" Segment="6">
<Animation Name="object_dnq_Anim_0006F0" Offset="0x6F0" />
<Animation Name="object_dnq_Anim_000BF8" Offset="0xBF8" />
<Animation Name="object_dnq_Anim_001100" Offset="0x1100" />
<Animation Name="object_dnq_Anim_001AEC" Offset="0x1AEC" />
<Animation Name="object_dnq_Anim_002690" Offset="0x2690" />
<Animation Name="object_dnq_Anim_003408" Offset="0x3408" />
<Animation Name="object_dnq_Anim_003DBC" Offset="0x3DBC" />
<Animation Name="object_dnq_Anim_0047B8" Offset="0x47B8" />
<Animation Name="object_dnq_Anim_004EA0" Offset="0x4EA0" />
<Animation Name="object_dnq_Anim_005284" Offset="0x5284" />
<Animation Name="object_dnq_Anim_005A14" Offset="0x5A14" />
<Animation Name="object_dnq_Anim_005E18" Offset="0x5E18" />
<Animation Name="object_dnq_Anim_006984" Offset="0x6984" />
<Animation Name="object_dnq_Anim_007528" Offset="0x7528" />
<Animation Name="object_dnq_Anim_008328" Offset="0x8328" />
<Texture Name="object_dnq_Tex_008340" OutName="tex_008340" Format="rgba16" Width="16" Height="16" Offset="0x8340" />
<Texture Name="object_dnq_Tex_008540" OutName="tex_008540" Format="rgba16" Width="16" Height="16" Offset="0x8540" />
<Texture Name="object_dnq_Tex_008740" OutName="tex_008740" Format="rgba16" Width="32" Height="32" Offset="0x8740" />
<Texture Name="object_dnq_Tex_008F40" OutName="tex_008F40" Format="rgba16" Width="32" Height="64" Offset="0x8F40" />
<Texture Name="object_dnq_Tex_009F40" OutName="tex_009F40" Format="rgba16" Width="32" Height="32" Offset="0x9F40" />
<Texture Name="object_dnq_Tex_00A740" OutName="tex_00A740" Format="rgba16" Width="16" Height="16" Offset="0xA740" />
<Texture Name="object_dnq_Tex_00A940" OutName="tex_00A940" Format="rgba16" Width="8" Height="8" Offset="0xA940" />
<Texture Name="object_dnq_Tex_00A9C0" OutName="tex_00A9C0" Format="rgba16" Width="16" Height="16" Offset="0xA9C0" />
<Texture Name="object_dnq_Tex_00ABC0" OutName="tex_00ABC0" Format="rgba16" Width="8" Height="8" Offset="0xABC0" />
<Texture Name="object_dnq_Tex_00AC40" OutName="tex_00AC40" Format="rgba16" Width="8" Height="8" Offset="0xAC40" />
<DList Name="object_dnq_DL_00C9B0" Offset="0xC9B0" />
<DList Name="object_dnq_DL_00CB70" Offset="0xCB70" />
<DList Name="object_dnq_DL_00CC10" Offset="0xCC10" />
<DList Name="object_dnq_DL_00CE38" Offset="0xCE38" />
<DList Name="object_dnq_DL_00CED0" Offset="0xCED0" />
<DList Name="object_dnq_DL_00CFA8" Offset="0xCFA8" />
<DList Name="object_dnq_DL_00D050" Offset="0xD050" />
<DList Name="object_dnq_DL_00D140" Offset="0xD140" />
<DList Name="object_dnq_DL_00D230" Offset="0xD230" />
<DList Name="object_dnq_DL_00D2E8" Offset="0xD2E8" />
<DList Name="object_dnq_DL_00D3D8" Offset="0xD3D8" />
<DList Name="object_dnq_DL_00D4C8" Offset="0xD4C8" />
<DList Name="object_dnq_DL_00D668" Offset="0xD668" />
<DList Name="object_dnq_DL_00D758" Offset="0xD758" />
<DList Name="object_dnq_DL_00D848" Offset="0xD848" />
<DList Name="object_dnq_DL_00D938" Offset="0xD938" />
<DList Name="object_dnq_DL_00DA28" Offset="0xDA28" />
<DList Name="object_dnq_DL_00DB00" Offset="0xDB00" />
<DList Name="object_dnq_DL_00DCA8" Offset="0xDCA8" />
<DList Name="object_dnq_DL_00DD50" Offset="0xDD50" />
<DList Name="object_dnq_DL_00DE40" Offset="0xDE40" />
<DList Name="object_dnq_DL_00DF30" Offset="0xDF30" />
<DList Name="object_dnq_DL_00DFE8" Offset="0xDFE8" />
<DList Name="object_dnq_DL_00E0D8" Offset="0xE0D8" />
<Animation Name="object_dnq_Anim_0007D8" Offset="0x7D8" />
<Animation Name="object_dnq_Anim_00125C" Offset="0x125C" />
<Animation Name="object_dnq_Anim_0017F8" Offset="0x17F8" />
<Animation Name="object_dnq_Anim_001C1C" Offset="0x1C1C" />
<Animation Name="object_dnq_Anim_0021DC" Offset="0x21DC" />
<Animation Name="object_dnq_Anim_0026B8" Offset="0x26B8" />
<Animation Name="object_dnq_Anim_004D08" Offset="0x4D08" />
<Animation Name="object_dnq_Anim_0057AC" Offset="0x57AC" />
<Animation Name="object_dnq_Anim_00625C" Offset="0x625C" />
<Animation Name="object_dnq_Anim_00674C" Offset="0x674C" />
<Animation Name="object_dnq_Anim_006B74" Offset="0x6B74" />
<Animation Name="object_dnq_Anim_0071F4" Offset="0x71F4" />
<Animation Name="object_dnq_Anim_007960" Offset="0x7960" />
<Animation Name="object_dnq_Anim_008588" Offset="0x8588" />
<Animation Name="object_dnq_Anim_00923C" Offset="0x923C" />
<Animation Name="object_dnq_Anim_009AA0" Offset="0x9AA0" />
<Animation Name="object_dnq_Anim_00A900" Offset="0xA900" />
<Animation Name="object_dnq_Anim_00AEB8" Offset="0xAEB8" />
<Animation Name="object_dnq_Anim_00B324" Offset="0xB324" />
<Animation Name="object_dnq_Anim_00B754" Offset="0xB754" />
<Animation Name="object_dnq_Anim_00BAD8" Offset="0xBAD8" />
<DList Name="object_dnq_DL_00D670" Offset="0xD670" />
<DList Name="object_dnq_DL_00D978" Offset="0xD978" />
<DList Name="object_dnq_DL_00DA08" Offset="0xDA08" />
<DList Name="object_dnq_DL_00DAA0" Offset="0xDAA0" />
<DList Name="object_dnq_DL_00DB38" Offset="0xDB38" />
<DList Name="object_dnq_DL_00DBD0" Offset="0xDBD0" />
<DList Name="object_dnq_DL_00DC68" Offset="0xDC68" />
<DList Name="object_dnq_DL_00DD00" Offset="0xDD00" />
<DList Name="object_dnq_DL_00DD98" Offset="0xDD98" />
<DList Name="object_dnq_DL_00DE30" Offset="0xDE30" />
<DList Name="object_dnq_DL_00DEC8" Offset="0xDEC8" />
<DList Name="object_dnq_DL_00E018" Offset="0xE018" />
<DList Name="object_dnq_DL_00E1C8" Offset="0xE1C8" />
<DList Name="object_dnq_DL_00E318" Offset="0xE318" />
<DList Name="object_dnq_DL_00E420" Offset="0xE420" />
<DList Name="object_dnq_DL_00E538" Offset="0xE538" />
<DList Name="object_dnq_DL_00E630" Offset="0xE630" />
<DList Name="object_dnq_DL_00E738" Offset="0xE738" />
<DList Name="object_dnq_DL_00E850" Offset="0xE850" />
<Limb Name="object_dnq_Standardlimb_00E948" Type="Standard" EnumName="OBJECT_DNQ_LIMB_01" Offset="0xE948" />
<Limb Name="object_dnq_Standardlimb_00E954" Type="Standard" EnumName="OBJECT_DNQ_LIMB_02" Offset="0xE954" />
<Limb Name="object_dnq_Standardlimb_00E960" Type="Standard" EnumName="OBJECT_DNQ_LIMB_03" Offset="0xE960" />
<Limb Name="object_dnq_Standardlimb_00E96C" Type="Standard" EnumName="OBJECT_DNQ_LIMB_04" Offset="0xE96C" />
<Limb Name="object_dnq_Standardlimb_00E978" Type="Standard" EnumName="OBJECT_DNQ_LIMB_05" Offset="0xE978" />
<Limb Name="object_dnq_Standardlimb_00E984" Type="Standard" EnumName="OBJECT_DNQ_LIMB_06" Offset="0xE984" />
<Limb Name="object_dnq_Standardlimb_00E990" Type="Standard" EnumName="OBJECT_DNQ_LIMB_07" Offset="0xE990" />
<Limb Name="object_dnq_Standardlimb_00E99C" Type="Standard" EnumName="OBJECT_DNQ_LIMB_08" Offset="0xE99C" />
<Limb Name="object_dnq_Standardlimb_00E9A8" Type="Standard" EnumName="OBJECT_DNQ_LIMB_09" Offset="0xE9A8" />
<Limb Name="object_dnq_Standardlimb_00E9B4" Type="Standard" EnumName="OBJECT_DNQ_LIMB_0A" Offset="0xE9B4" />
<Limb Name="object_dnq_Standardlimb_00E9C0" Type="Standard" EnumName="OBJECT_DNQ_LIMB_0B" Offset="0xE9C0" />
<Limb Name="object_dnq_Standardlimb_00E9CC" Type="Standard" EnumName="OBJECT_DNQ_LIMB_0C" Offset="0xE9CC" />
<Limb Name="object_dnq_Standardlimb_00E9D8" Type="Standard" EnumName="OBJECT_DNQ_LIMB_0D" Offset="0xE9D8" />
<Limb Name="object_dnq_Standardlimb_00E9E4" Type="Standard" EnumName="OBJECT_DNQ_LIMB_0E" Offset="0xE9E4" />
<Limb Name="object_dnq_Standardlimb_00E9F0" Type="Standard" EnumName="OBJECT_DNQ_LIMB_0F" Offset="0xE9F0" />
<Limb Name="object_dnq_Standardlimb_00E9FC" Type="Standard" EnumName="OBJECT_DNQ_LIMB_10" Offset="0xE9FC" />
<Limb Name="object_dnq_Standardlimb_00EA08" Type="Standard" EnumName="OBJECT_DNQ_LIMB_11" Offset="0xEA08" />
<Limb Name="object_dnq_Standardlimb_00EA14" Type="Standard" EnumName="OBJECT_DNQ_LIMB_12" Offset="0xEA14" />
<Limb Name="object_dnq_Standardlimb_00EA20" Type="Standard" EnumName="OBJECT_DNQ_LIMB_13" Offset="0xEA20" />
<Limb Name="object_dnq_Standardlimb_00EA2C" Type="Standard" EnumName="OBJECT_DNQ_LIMB_14" Offset="0xEA2C" />
<Limb Name="object_dnq_Standardlimb_00EA38" Type="Standard" EnumName="OBJECT_DNQ_LIMB_15" Offset="0xEA38" />
<Limb Name="object_dnq_Standardlimb_00EA44" Type="Standard" EnumName="OBJECT_DNQ_LIMB_16" Offset="0xEA44" />
<Limb Name="object_dnq_Standardlimb_00EA50" Type="Standard" EnumName="OBJECT_DNQ_LIMB_17" Offset="0xEA50" />
<Limb Name="object_dnq_Standardlimb_00EA5C" Type="Standard" EnumName="OBJECT_DNQ_LIMB_18" Offset="0xEA5C" />
<Limb Name="object_dnq_Standardlimb_00EA68" Type="Standard" EnumName="OBJECT_DNQ_LIMB_19" Offset="0xEA68" />
<Limb Name="object_dnq_Standardlimb_00EA74" Type="Standard" EnumName="OBJECT_DNQ_LIMB_1A" Offset="0xEA74" />
<Limb Name="object_dnq_Standardlimb_00EA80" Type="Standard" EnumName="OBJECT_DNQ_LIMB_1B" Offset="0xEA80" />
<Limb Name="object_dnq_Standardlimb_00EA8C" Type="Standard" EnumName="OBJECT_DNQ_LIMB_1C" Offset="0xEA8C" />
<Limb Name="object_dnq_Standardlimb_00EA98" Type="Standard" EnumName="OBJECT_DNQ_LIMB_1D" Offset="0xEA98" />
<Limb Name="object_dnq_Standardlimb_00EAA4" Type="Standard" EnumName="OBJECT_DNQ_LIMB_1E" Offset="0xEAA4" />
<Limb Name="object_dnq_Standardlimb_00EAB0" Type="Standard" EnumName="OBJECT_DNQ_LIMB_1F" Offset="0xEAB0" />
<Limb Name="object_dnq_Standardlimb_00EABC" Type="Standard" EnumName="OBJECT_DNQ_LIMB_20" Offset="0xEABC" />
<Skeleton Name="object_dnq_Skel_00EB48" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DNQ_LIMB_NONE" LimbMax="OBJECT_DNQ_LIMB_MAX" EnumName="ObjectDnqLimb" Offset="0xEB48" />
<Animation Name="object_dnq_Anim_00F504" Offset="0xF504" />
<DList Name="object_dnq_DL_00E260" Offset="0xE260" />
<DList Name="object_dnq_DL_00E2F8" Offset="0xE2F8" />
<DList Name="object_dnq_DL_00E340" Offset="0xE340" />
<DList Name="object_dnq_DL_00E410" Offset="0xE410" />
<DList Name="object_dnq_DL_00E530" Offset="0xE530" />
<DList Name="object_dnq_DL_00E650" Offset="0xE650" />
<DList Name="object_dnq_DL_00E768" Offset="0xE768" />
<DList Name="object_dnq_DL_00E888" Offset="0xE888" />
<DList Name="object_dnq_DL_00E9A8" Offset="0xE9A8" />
<DList Name="object_dnq_DL_00EAC0" Offset="0xEAC0" />
<DList Name="object_dnq_DL_00EBD8" Offset="0xEBD8" />
<Texture Name="object_dnq_Tex_00ECD0" OutName="tex_00ECD0" Format="rgba16" Width="16" Height="32" Offset="0xECD0" />
<Texture Name="object_dnq_Tex_00F0D0" OutName="tex_00F0D0" Format="rgba16" Width="16" Height="32" Offset="0xF0D0" />
<Texture Name="object_dnq_Tex_00F4D0" OutName="tex_00F4D0" Format="rgba16" Width="4" Height="16" Offset="0xF4D0" />
<Texture Name="object_dnq_Tex_00F550" OutName="tex_00F550" Format="rgba16" Width="8" Height="8" Offset="0xF550" />
<Texture Name="object_dnq_Tex_00F5D0" OutName="tex_00F5D0" Format="rgba16" Width="16" Height="16" Offset="0xF5D0" />
<Texture Name="object_dnq_Tex_00F7D0" OutName="tex_00F7D0" Format="rgba16" Width="32" Height="32" Offset="0xF7D0" />
<Texture Name="object_dnq_Tex_00FFD0" OutName="tex_00FFD0" Format="rgba16" Width="16" Height="32" Offset="0xFFD0" />
<Texture Name="object_dnq_Tex_0103D0" OutName="tex_0103D0" Format="rgba16" Width="16" Height="16" Offset="0x103D0" />
<Texture Name="object_dnq_Tex_0105D0" OutName="tex_0105D0" Format="rgba16" Width="16" Height="16" Offset="0x105D0" />
<Texture Name="object_dnq_Tex_0107D0" OutName="tex_0107D0" Format="rgba16" Width="16" Height="16" Offset="0x107D0" />
<Texture Name="object_dnq_Tex_0109D0" OutName="tex_0109D0" Format="rgba16" Width="16" Height="16" Offset="0x109D0" />
<Limb Name="object_dnq_Standardlimb_010BD0" Type="Standard" EnumName="OBJECT_DNQ_LIMB_01" Offset="0x10BD0" />
<Limb Name="object_dnq_Standardlimb_010BDC" Type="Standard" EnumName="OBJECT_DNQ_LIMB_02" Offset="0x10BDC" />
<Limb Name="object_dnq_Standardlimb_010BE8" Type="Standard" EnumName="OBJECT_DNQ_LIMB_03" Offset="0x10BE8" />
<Limb Name="object_dnq_Standardlimb_010BF4" Type="Standard" EnumName="OBJECT_DNQ_LIMB_04" Offset="0x10BF4" />
<Limb Name="object_dnq_Standardlimb_010C00" Type="Standard" EnumName="OBJECT_DNQ_LIMB_05" Offset="0x10C00" />
<Limb Name="object_dnq_Standardlimb_010C0C" Type="Standard" EnumName="OBJECT_DNQ_LIMB_06" Offset="0x10C0C" />
<Limb Name="object_dnq_Standardlimb_010C18" Type="Standard" EnumName="OBJECT_DNQ_LIMB_07" Offset="0x10C18" />
<Limb Name="object_dnq_Standardlimb_010C24" Type="Standard" EnumName="OBJECT_DNQ_LIMB_08" Offset="0x10C24" />
<Limb Name="object_dnq_Standardlimb_010C30" Type="Standard" EnumName="OBJECT_DNQ_LIMB_09" Offset="0x10C30" />
<Limb Name="object_dnq_Standardlimb_010C3C" Type="Standard" EnumName="OBJECT_DNQ_LIMB_0A" Offset="0x10C3C" />
<Limb Name="object_dnq_Standardlimb_010C48" Type="Standard" EnumName="OBJECT_DNQ_LIMB_0B" Offset="0x10C48" />
<Limb Name="object_dnq_Standardlimb_010C54" Type="Standard" EnumName="OBJECT_DNQ_LIMB_0C" Offset="0x10C54" />
<Limb Name="object_dnq_Standardlimb_010C60" Type="Standard" EnumName="OBJECT_DNQ_LIMB_0D" Offset="0x10C60" />
<Limb Name="object_dnq_Standardlimb_010C6C" Type="Standard" EnumName="OBJECT_DNQ_LIMB_0E" Offset="0x10C6C" />
<Limb Name="object_dnq_Standardlimb_010C78" Type="Standard" EnumName="OBJECT_DNQ_LIMB_0F" Offset="0x10C78" />
<Limb Name="object_dnq_Standardlimb_010C84" Type="Standard" EnumName="OBJECT_DNQ_LIMB_10" Offset="0x10C84" />
<Limb Name="object_dnq_Standardlimb_010C90" Type="Standard" EnumName="OBJECT_DNQ_LIMB_11" Offset="0x10C90" />
<Limb Name="object_dnq_Standardlimb_010C9C" Type="Standard" EnumName="OBJECT_DNQ_LIMB_12" Offset="0x10C9C" />
<Limb Name="object_dnq_Standardlimb_010CA8" Type="Standard" EnumName="OBJECT_DNQ_LIMB_13" Offset="0x10CA8" />
<Limb Name="object_dnq_Standardlimb_010CB4" Type="Standard" EnumName="OBJECT_DNQ_LIMB_14" Offset="0x10CB4" />
<Limb Name="object_dnq_Standardlimb_010CC0" Type="Standard" EnumName="OBJECT_DNQ_LIMB_15" Offset="0x10CC0" />
<Limb Name="object_dnq_Standardlimb_010CCC" Type="Standard" EnumName="OBJECT_DNQ_LIMB_16" Offset="0x10CCC" />
<Limb Name="object_dnq_Standardlimb_010CD8" Type="Standard" EnumName="OBJECT_DNQ_LIMB_17" Offset="0x10CD8" />
<Limb Name="object_dnq_Standardlimb_010CE4" Type="Standard" EnumName="OBJECT_DNQ_LIMB_18" Offset="0x10CE4" />
<Limb Name="object_dnq_Standardlimb_010CF0" Type="Standard" EnumName="OBJECT_DNQ_LIMB_19" Offset="0x10CF0" />
<Skeleton Name="object_dnq_Skel_010D60" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DNQ_LIMB_NONE" LimbMax="OBJECT_DNQ_LIMB_MAX" EnumName="ObjectDnpLimb" Offset="0x10D60" />
<Animation Name="object_dnq_Anim_0115B8" Offset="0x115B8" />
<Animation Name="object_dnq_Anim_012428" Offset="0x12428" />
</File>
</Root>
+75 -63
View File
@@ -1,67 +1,79 @@
<Root>
<!-- Assets for Dragonflies. -->
<File Name="object_grasshopper" Segment="6">
<Animation Name="object_grasshopper_Anim_00066C" Offset="0x66C" />
<Animation Name="object_grasshopper_Anim_0008D4" Offset="0x8D4" />
<Animation Name="object_grasshopper_Anim_0009E0" Offset="0x9E0" />
<Animation Name="object_grasshopper_Anim_000F9C" Offset="0xF9C" />
<Texture Name="object_grasshopper_Tex_000FB0" OutName="tex_000FB0" Format="rgba16" Width="8" Height="8" Offset="0xFB0" />
<Texture Name="object_grasshopper_Tex_001030" OutName="tex_001030" Format="rgba16" Width="16" Height="32" Offset="0x1030" />
<Texture Name="object_grasshopper_Tex_001430" OutName="tex_001430" Format="rgba16" Width="16" Height="16" Offset="0x1430" />
<Texture Name="object_grasshopper_Tex_001630" OutName="tex_001630" Format="rgba16" Width="8" Height="8" Offset="0x1630" />
<Texture Name="object_grasshopper_Tex_0016B0" OutName="tex_0016B0" Format="rgba16" Width="32" Height="8" Offset="0x16B0" />
<Texture Name="object_grasshopper_Tex_0018B0" OutName="tex_0018B0" Format="rgba16" Width="16" Height="8" Offset="0x18B0" />
<Texture Name="object_grasshopper_Tex_0019B0" OutName="tex_0019B0" Format="rgba16" Width="8" Height="8" Offset="0x19B0" />
<Texture Name="object_grasshopper_Tex_001A30" OutName="tex_001A30" Format="rgba16" Width="8" Height="8" Offset="0x1A30" />
<Texture Name="object_grasshopper_Tex_001AB0" OutName="tex_001AB0" Format="rgba16" Width="16" Height="16" Offset="0x1AB0" />
<DList Name="object_grasshopper_DL_002BE0" Offset="0x2BE0" />
<DList Name="object_grasshopper_DL_002C70" Offset="0x2C70" />
<DList Name="object_grasshopper_DL_002D00" Offset="0x2D00" />
<DList Name="object_grasshopper_DL_002D90" Offset="0x2D90" />
<DList Name="object_grasshopper_DL_002E28" Offset="0x2E28" />
<DList Name="object_grasshopper_DL_002EC0" Offset="0x2EC0" />
<DList Name="object_grasshopper_DL_002F50" Offset="0x2F50" />
<DList Name="object_grasshopper_DL_002FE0" Offset="0x2FE0" />
<DList Name="object_grasshopper_DL_003078" Offset="0x3078" />
<DList Name="object_grasshopper_DL_003110" Offset="0x3110" />
<DList Name="object_grasshopper_DL_0031A8" Offset="0x31A8" />
<DList Name="object_grasshopper_DL_003240" Offset="0x3240" />
<DList Name="object_grasshopper_DL_0032E8" Offset="0x32E8" />
<DList Name="object_grasshopper_DL_0033E0" Offset="0x33E0" />
<DList Name="object_grasshopper_DL_003520" Offset="0x3520" />
<DList Name="object_grasshopper_DL_003660" Offset="0x3660" />
<DList Name="object_grasshopper_DL_003798" Offset="0x3798" />
<DList Name="object_grasshopper_DL_003900" Offset="0x3900" />
<DList Name="object_grasshopper_DL_0039E0" Offset="0x39E0" />
<DList Name="object_grasshopper_DL_003BE0" Offset="0x3BE0" />
<DList Name="object_grasshopper_DL_003C70" Offset="0x3C70" />
<DList Name="object_grasshopper_DL_003D00" Offset="0x3D00" />
<Limb Name="object_grasshopper_Standardlimb_003D90" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_01" Offset="0x3D90" />
<Limb Name="object_grasshopper_Standardlimb_003D9C" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_02" Offset="0x3D9C" />
<Limb Name="object_grasshopper_Standardlimb_003DA8" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_03" Offset="0x3DA8" />
<Limb Name="object_grasshopper_Standardlimb_003DB4" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_04" Offset="0x3DB4" />
<Limb Name="object_grasshopper_Standardlimb_003DC0" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_05" Offset="0x3DC0" />
<Limb Name="object_grasshopper_Standardlimb_003DCC" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_06" Offset="0x3DCC" />
<Limb Name="object_grasshopper_Standardlimb_003DD8" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_07" Offset="0x3DD8" />
<Limb Name="object_grasshopper_Standardlimb_003DE4" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_08" Offset="0x3DE4" />
<Limb Name="object_grasshopper_Standardlimb_003DF0" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_09" Offset="0x3DF0" />
<Limb Name="object_grasshopper_Standardlimb_003DFC" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_0A" Offset="0x3DFC" />
<Limb Name="object_grasshopper_Standardlimb_003E08" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_0B" Offset="0x3E08" />
<Limb Name="object_grasshopper_Standardlimb_003E14" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_0C" Offset="0x3E14" />
<Limb Name="object_grasshopper_Standardlimb_003E20" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_0D" Offset="0x3E20" />
<Limb Name="object_grasshopper_Standardlimb_003E2C" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_0E" Offset="0x3E2C" />
<Limb Name="object_grasshopper_Standardlimb_003E38" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_0F" Offset="0x3E38" />
<Limb Name="object_grasshopper_Standardlimb_003E44" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_10" Offset="0x3E44" />
<Limb Name="object_grasshopper_Standardlimb_003E50" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_11" Offset="0x3E50" />
<Limb Name="object_grasshopper_Standardlimb_003E5C" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_12" Offset="0x3E5C" />
<Limb Name="object_grasshopper_Standardlimb_003E68" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_13" Offset="0x3E68" />
<Limb Name="object_grasshopper_Standardlimb_003E74" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_14" Offset="0x3E74" />
<Limb Name="object_grasshopper_Standardlimb_003E80" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_15" Offset="0x3E80" />
<Limb Name="object_grasshopper_Standardlimb_003E8C" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_16" Offset="0x3E8C" />
<Limb Name="object_grasshopper_Standardlimb_003E98" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_17" Offset="0x3E98" />
<Skeleton Name="object_grasshopper_Skel_003F00" Type="Normal" LimbType="Standard" LimbNone="OBJECT_GRASSHOPPER_LIMB_NONE" LimbMax="OBJECT_GRASSHOPPER_LIMB_MAX" EnumName="ObjectGrasshopperLimb" Offset="0x3F00" />
<Animation Name="object_grasshopper_Anim_0042F0" Offset="0x42F0" />
<Animation Name="object_grasshopper_Anim_0047AC" Offset="0x47AC" />
<Animation Name="object_grasshopper_Anim_004BC8" Offset="0x4BC8" />
<Animation Name="object_grasshopper_Anim_00524C" Offset="0x524C" />
<!-- Dragonfly Animations -->
<Animation Name="gDragonflyAttackAnim" Offset="0x66C" /> <!-- Original name is "kdz_attack" -->
<Animation Name="gDragonflyDeadAnim" Offset="0x8D4" /> <!-- Original name is "kdz_dead_hit" -->
<Animation Name="gDragonflyFallAnim" Offset="0x9E0" /> <!-- Original name is "kdz_down" -->
<Animation Name="gDragonflyFlyAnim" Offset="0xF9C" /> <!-- Original name is "kdz_fly" -->
<!-- Dragonfly Textures -->
<Texture Name="gDragonflyMouthAndTailSegmentUndersideTex" OutName="dragonfly_mouth_and_tail_segment_underside" Format="rgba16" Width="8" Height="8" Offset="0xFB0" />
<Texture Name="gDragonflyTailBackTex" OutName="dragonfly_tail_back" Format="rgba16" Width="16" Height="32" Offset="0x1030" />
<Texture Name="gDragonflyThoraxBackAndLegsTex" OutName="dragonfly_thorax_back_and_legs" Format="rgba16" Width="16" Height="16" Offset="0x1430" />
<Texture Name="gDragonflyStripeTex" OutName="dragonfly_stripe" Format="rgba16" Width="8" Height="8" Offset="0x1630" />
<Texture Name="gDragonflyHeadAndTailTipTex" OutName="dragonfly_head_and_tail_tip" Format="rgba16" Width="32" Height="8" Offset="0x16B0" />
<Texture Name="gDragonflyThoraxSidesTex" OutName="dragonfly_thorax_sides" Format="rgba16" Width="16" Height="8" Offset="0x18B0" />
<Texture Name="gDragonflyWingTex" OutName="dragonfly_wing" Format="rgba16" Width="8" Height="8" Offset="0x19B0" />
<Texture Name="gDragonflyEyeTex" OutName="dragonfly_eye" Format="rgba16" Width="8" Height="8" Offset="0x1A30" />
<Texture Name="gDragonflyFaceTex" OutName="dragonfly_face" Format="rgba16" Width="16" Height="16" Offset="0x1AB0" />
<!-- Dragonfly Limb DisplayLists -->
<DList Name="gDragonflyBackRightFootDL" Offset="0x2BE0" />
<DList Name="gDragonflyBackLeftLowerLegDL" Offset="0x2C70" />
<DList Name="gDragonflyBackRightLowerLegDL" Offset="0x2D00" />
<DList Name="gDragonflyFrontLeftUpperLegDL" Offset="0x2D90" />
<DList Name="gDragonflyFrontRightUpperLegDL" Offset="0x2E28" />
<DList Name="gDragonflyFrontLeftLowerLegDL" Offset="0x2EC0" />
<DList Name="gDragonflyFrontRightLowerLegDL" Offset="0x2F50" />
<DList Name="gDragonflyLeftWingDL" Offset="0x2FE0" />
<DList Name="gDragonflyRightWingDL" Offset="0x3078" />
<DList Name="gDragonflyBackRightUpperLegDL" Offset="0x3110" />
<DList Name="gDragonflyBackLeftUpperLegDL" Offset="0x31A8" />
<DList Name="gDragonflyTailTipDL" Offset="0x3240" />
<DList Name="gDragonflyTailSegment4DL" Offset="0x32E8" />
<DList Name="gDragonflyTailSegment3DL" Offset="0x33E0" />
<DList Name="gDragonflyTailSegment2DL" Offset="0x3520" />
<DList Name="gDragonflyTailSegment1DL" Offset="0x3660" />
<DList Name="gDragonflyThoraxDL" Offset="0x3798" />
<DList Name="gDragonflyJawDL" Offset="0x3900" />
<DList Name="gDragonflyHeadDL" Offset="0x39E0" />
<DList Name="gDragonflyBackLeftFootDL" Offset="0x3BE0" />
<DList Name="gDragonflyFrontLeftFootDL" Offset="0x3C70" />
<DList Name="gDragonflyFrontRightFootDL" Offset="0x3D00" />
<!-- Dragonfly Limbs -->
<Limb Name="gDragonflyRootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_ROOT" Offset="0x3D90" />
<Limb Name="gDragonflyTailSegment1Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_1" Offset="0x3D9C" />
<Limb Name="gDragonflyTailSegment2Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_2" Offset="0x3DA8" />
<Limb Name="gDragonflyTailSegment3Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_3" Offset="0x3DB4" />
<Limb Name="gDragonflyTailSegment4Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_4" Offset="0x3DC0" />
<Limb Name="gDragonflyTailTipLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_TIP" Offset="0x3DCC" />
<Limb Name="gDragonflyThoraxLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_THORAX" Offset="0x3DD8" />
<Limb Name="gDragonflyLeftWingLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_LEFT_WING" Offset="0x3DE4" />
<Limb Name="gDragonflyRightWingLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_RIGHT_WING" Offset="0x3DF0" />
<Limb Name="gDragonflyBackLeftUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_LEFT_UPPER_LEG" Offset="0x3DFC" />
<Limb Name="gDragonflyBackLeftLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_LEFT_LOWER_LEG" Offset="0x3E08" />
<Limb Name="gDragonflyBackLeftFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_LEFT_FOOT" Offset="0x3E14" />
<Limb Name="gDragonflyBackRightUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_RIGHT_UPPER_LEG" Offset="0x3E20" />
<Limb Name="gDragonflyBackRightLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_RIGHT_LOWER_LEG" Offset="0x3E2C" />
<Limb Name="gDragonflyBackRightFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_RIGHT_FOOT" Offset="0x3E38" />
<Limb Name="gDragonflyFrontLeftUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x3E44" />
<Limb Name="gDragonflyFrontLeftLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x3E50" />
<Limb Name="gDragonflyFrontLeftFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_LEFT_FOOT" Offset="0x3E5C" />
<Limb Name="gDragonflyFrontRightUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x3E68" />
<Limb Name="gDragonflyFrontRightLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x3E74" />
<Limb Name="gDragonflyFrontRightFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_RIGHT_FOOT" Offset="0x3E80" />
<Limb Name="gDragonflyHeadLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_HEAD" Offset="0x3E8C" />
<Limb Name="gDragonflyJawLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_JAW" Offset="0x3E98" />
<!-- Dragonfly Skeleton -->
<Skeleton Name="gDragonflySkel" Type="Normal" LimbType="Standard" LimbNone="DRAGONFLY_LIMB_NONE" LimbMax="DRAGONFLY_LIMB_MAX" EnumName="DragonflyLimb" Offset="0x3F00" />
<!-- Dragonfly Animations -->
<Animation Name="gDragonflyRaiseTailAnim" Offset="0x42F0" /> <!-- Original name is "kdz_hight" -->
<Animation Name="gDragonflyDamageAnim" Offset="0x47AC" /> <!-- Original name is "kdz_hit" -->
<Animation Name="gDragonflyLowerTailAnim" Offset="0x4BC8" /> <!-- Original name is "kdz_low" -->
<Animation Name="gDragonflyHoverAnim" Offset="0x524C" /> <!-- Original name is "kdz_wait" -->
</File>
</Root>
+80 -65
View File
@@ -1,69 +1,84 @@
<Root>
<!-- Assets for Evan, the pianist of The Indigo-Go's. -->
<File Name="object_zos" Segment="6">
<Animation Name="object_zos_Anim_001CFC" Offset="0x1CFC" />
<Animation Name="object_zos_Anim_0048D4" Offset="0x48D4" />
<Animation Name="object_zos_Anim_005E04" Offset="0x5E04" />
<Animation Name="object_zos_Anim_007334" Offset="0x7334" />
<Animation Name="object_zos_Anim_007C40" Offset="0x7C40" />
<Animation Name="object_zos_Anim_008630" Offset="0x8630" />
<Animation Name="object_zos_Anim_0090CC" Offset="0x90CC" />
<Animation Name="object_zos_Anim_009830" Offset="0x9830" />
<Animation Name="object_zos_Anim_00A164" Offset="0xA164" />
<DList Name="object_zos_DL_00D2B0" Offset="0xD2B0" />
<DList Name="object_zos_DL_00D3E0" Offset="0xD3E0" />
<DList Name="object_zos_DL_00D658" Offset="0xD658" />
<DList Name="object_zos_DL_00D7A8" Offset="0xD7A8" />
<DList Name="object_zos_DL_00D900" Offset="0xD900" />
<DList Name="object_zos_DL_00DA90" Offset="0xDA90" />
<DList Name="object_zos_DL_00DB90" Offset="0xDB90" />
<DList Name="object_zos_DL_00DCE8" Offset="0xDCE8" />
<DList Name="object_zos_DL_00DE78" Offset="0xDE78" />
<DList Name="object_zos_DL_00E328" Offset="0xE328" />
<DList Name="object_zos_DL_00E400" Offset="0xE400" />
<DList Name="object_zos_DL_00E4C8" Offset="0xE4C8" />
<DList Name="object_zos_DL_00E700" Offset="0xE700" />
<DList Name="object_zos_DL_00E8A0" Offset="0xE8A0" />
<DList Name="object_zos_DL_00EA80" Offset="0xEA80" />
<DList Name="object_zos_DL_00EC98" Offset="0xEC98" />
<DList Name="object_zos_DL_00EE38" Offset="0xEE38" />
<Texture Name="object_zos_TLUT_00F018" OutName="tlut_00F018" Format="rgba16" Width="16" Height="16" Offset="0xF018" />
<Texture Name="object_zos_Tex_00F218" OutName="tex_00F218" Format="rgba16" Width="32" Height="32" Offset="0xF218" />
<Texture Name="object_zos_Tex_00FA18" OutName="tex_00FA18" Format="ci8" Width="16" Height="16" Offset="0xFA18" />
<Texture Name="object_zos_Tex_00FB18" OutName="tex_00FB18" Format="rgba16" Width="8" Height="8" Offset="0xFB18" />
<Texture Name="object_zos_Tex_00FB98" OutName="tex_00FB98" Format="rgba16" Width="8" Height="8" Offset="0xFB98" />
<Texture Name="object_zos_Tex_00FC18" OutName="tex_00FC18" Format="rgba16" Width="8" Height="8" Offset="0xFC18" />
<Texture Name="object_zos_Tex_00FC98" OutName="tex_00FC98" Format="rgba16" Width="32" Height="32" Offset="0xFC98" />
<Texture Name="object_zos_Tex_010498" OutName="tex_010498" Format="rgba16" Width="16" Height="32" Offset="0x10498" />
<Texture Name="object_zos_Tex_010898" OutName="tex_010898" Format="rgba16" Width="8" Height="8" Offset="0x10898" />
<Texture Name="object_zos_Tex_010918" OutName="tex_010918" Format="rgba16" Width="32" Height="32" Offset="0x10918" />
<Texture Name="object_zos_Tex_011118" OutName="tex_011118" Format="rgba16" Width="32" Height="32" Offset="0x11118" />
<Texture Name="object_zos_Tex_011918" OutName="tex_011918" Format="rgba16" Width="32" Height="32" Offset="0x11918" />
<!-- <Blob Name="object_zos_Blob_012118" Size="0xF70" Offset="0x12118" /> -->
<DList Name="object_zos_DL_013088" Offset="0x13088" />
<DList Name="object_zos_DL_0136E0" Offset="0x136E0" />
<Texture Name="object_zos_Tex_013728" OutName="tex_013728" Format="rgba16" Width="32" Height="32" Offset="0x13728" />
<Texture Name="object_zos_Tex_013F28" OutName="tex_013F28" Format="rgba16" Width="32" Height="32" Offset="0x13F28" />
<Texture Name="object_zos_Tex_014728" OutName="tex_014728" Format="rgba16" Width="32" Height="32" Offset="0x14728" />
<Texture Name="object_zos_Tex_014F28" OutName="tex_014F28" Format="rgba16" Width="16" Height="16" Offset="0x14F28" />
<Limb Name="object_zos_Standardlimb_015128" Type="Standard" EnumName="OBJECT_ZOS_LIMB_01" Offset="0x15128" />
<Limb Name="object_zos_Standardlimb_015134" Type="Standard" EnumName="OBJECT_ZOS_LIMB_02" Offset="0x15134" />
<Limb Name="object_zos_Standardlimb_015140" Type="Standard" EnumName="OBJECT_ZOS_LIMB_03" Offset="0x15140" />
<Limb Name="object_zos_Standardlimb_01514C" Type="Standard" EnumName="OBJECT_ZOS_LIMB_04" Offset="0x1514C" />
<Limb Name="object_zos_Standardlimb_015158" Type="Standard" EnumName="OBJECT_ZOS_LIMB_05" Offset="0x15158" />
<Limb Name="object_zos_Standardlimb_015164" Type="Standard" EnumName="OBJECT_ZOS_LIMB_06" Offset="0x15164" />
<Limb Name="object_zos_Standardlimb_015170" Type="Standard" EnumName="OBJECT_ZOS_LIMB_07" Offset="0x15170" />
<Limb Name="object_zos_Standardlimb_01517C" Type="Standard" EnumName="OBJECT_ZOS_LIMB_08" Offset="0x1517C" />
<Limb Name="object_zos_Standardlimb_015188" Type="Standard" EnumName="OBJECT_ZOS_LIMB_09" Offset="0x15188" />
<Limb Name="object_zos_Standardlimb_015194" Type="Standard" EnumName="OBJECT_ZOS_LIMB_0A" Offset="0x15194" />
<Limb Name="object_zos_Standardlimb_0151A0" Type="Standard" EnumName="OBJECT_ZOS_LIMB_0B" Offset="0x151A0" />
<Limb Name="object_zos_Standardlimb_0151AC" Type="Standard" EnumName="OBJECT_ZOS_LIMB_0C" Offset="0x151AC" />
<Limb Name="object_zos_Standardlimb_0151B8" Type="Standard" EnumName="OBJECT_ZOS_LIMB_0D" Offset="0x151B8" />
<Limb Name="object_zos_Standardlimb_0151C4" Type="Standard" EnumName="OBJECT_ZOS_LIMB_0E" Offset="0x151C4" />
<Limb Name="object_zos_Standardlimb_0151D0" Type="Standard" EnumName="OBJECT_ZOS_LIMB_0F" Offset="0x151D0" />
<Limb Name="object_zos_Standardlimb_0151DC" Type="Standard" EnumName="OBJECT_ZOS_LIMB_10" Offset="0x151DC" />
<Limb Name="object_zos_Standardlimb_0151E8" Type="Standard" EnumName="OBJECT_ZOS_LIMB_11" Offset="0x151E8" />
<Skeleton Name="object_zos_Skel_015238" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZOS_LIMB_NONE" LimbMax="OBJECT_ZOS_LIMB_MAX" EnumName="ObjectZosLimb" Offset="0x15238" />
<Animation Name="object_zos_Anim_01621C" Offset="0x1621C" />
<Animation Name="object_zos_Anim_016980" Offset="0x16980" />
<!-- Evan Animations -->
<Animation Name="gEvanSlowPlayAnim" Offset="0x1CFC" /> <!-- Original name is "ev_ensou_loop" ("musical performance") -->
<Animation Name="gEvanInspiredAnim" Offset="0x48D4" /> <!-- Original name is "zK_furimuki" ("to turn around") -->
<Animation Name="gEvanPlayRightAnim" Offset="0x5E04" /> <!-- Original name is "zK_play01" -->
<Animation Name="gEvanPlayLeftAnim" Offset="0x7334" /> <!-- Original name is "zK_play02" -->
<Animation Name="gEeanTalkFootTapAnim" Offset="0x7C40" /> <!-- Original name is "zK_talk01" -->
<Animation Name="gEvanTalkLookDownAnim" Offset="0x8630" /> <!-- Original name is "zK_talk02" -->
<Animation Name="gEvanTalkArmsOutAnim" Offset="0x90CC" /> <!-- Original name is "zK_talk03" -->
<Animation Name="gEvanTalkHandsOnHipsAnim" Offset="0x9830" /> <!-- Original name is "zK_talk04" -->
<Animation Name="gEvanLeanOnKeyboardAnim" Offset="0xA164" /> <!-- Original name is "zK_wait01" -->
<!-- Evan Limb DisplayLists -->
<DList Name="gEvanPelvisDL" Offset="0xD2B0" />
<DList Name="gEvanTorsoDL" Offset="0xD3E0" />
<DList Name="gEvanRightUpperArmDL" Offset="0xD658" />
<DList Name="gEvanRightForearmDL" Offset="0xD7A8" />
<DList Name="gEvanRightHandDL" Offset="0xD900" />
<DList Name="gEvanLeftUpperArmDL" Offset="0xDA90" />
<DList Name="gEvanLeftForearmDL" Offset="0xDB90" />
<DList Name="gEvanLeftHandDL" Offset="0xDCE8" />
<DList Name="gEvanHeadDL" Offset="0xDE78" />
<DList Name="gEvanUpperHeadFinDL" Offset="0xE328" />
<DList Name="gEvanLowerHeadFinDL" Offset="0xE400" />
<DList Name="gEvanRightThighDL" Offset="0xE4C8" />
<DList Name="gEvanRightShinDL" Offset="0xE700" />
<DList Name="gEvanRightFootDL" Offset="0xE8A0" />
<DList Name="gEvanLeftThighDL" Offset="0xEA80" />
<DList Name="gEvanLeftShinDL" Offset="0xEC98" />
<DList Name="gEvanLeftFootDL" Offset="0xEE38" />
<!-- Evan Textures -->
<Texture Name="gEvanFingersTLUT" OutName="evan_fingers_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF018" />
<Texture Name="gEvanSpottedSkinTex" OutName="evan_spotted_skin" Format="rgba16" Width="32" Height="32" Offset="0xF218" />
<Texture Name="gEvanFingersTex" OutName="evan_fingers" Format="ci8" Width="16" Height="16" Offset="0xFA18" />
<Texture Name="gEvanMouthEdgeTex" OutName="evan_mouth_edge" Format="rgba16" Width="8" Height="8" Offset="0xFB18" />
<Texture Name="gEvanMouthAndFinsTex" OutName="evan_mouth_and_fins" Format="rgba16" Width="8" Height="8" Offset="0xFB98" />
<Texture Name="gEvanSkinTex" OutName="evan_skin" Format="rgba16" Width="8" Height="8" Offset="0xFC18" />
<Texture Name="gEvanHeadphoneClamTex" OutName="evan_headphone_clam" Format="rgba16" Width="32" Height="32" Offset="0xFC98" />
<Texture Name="gEvanHeadphoneBoneTex" OutName="evan_headphone_bone" Format="rgba16" Width="16" Height="32" Offset="0x10498" />
<Texture Name="gEvanArmbandTex" OutName="evan_armband" Format="rgba16" Width="8" Height="8" Offset="0x10898" />
<Texture Name="gEvanEyeOpenTex" OutName="evan_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x10918" />
<Texture Name="gEvanEyeHalfTex" OutName="evan_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x11118" />
<Texture Name="gEvanEyeClosedTex" OutName="evan_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x11918" />
<!-- Evan's Keyboard DisplayLists -->
<DList Name="gEvanKeyboardDL" Offset="0x13088" /> <!-- Original name is "zK_gakki_model" -->
<DList Name="gEvanUnknownWhiteTriangleDL" Offset="0x136E0" /> <!-- The purpose of this is unknown. It cannot be seen in-game. -->
<!-- Evan's Keyboard Textures -->
<Texture Name="gEvanKeyboardRibKeysTex" OutName="evan_keyboard_rib_keys" Format="rgba16" Width="32" Height="32" Offset="0x13728" />
<Texture Name="gEvanKeyboardSkullTex" OutName="evan_keyboard_skull" Format="rgba16" Width="32" Height="32" Offset="0x13F28" />
<Texture Name="gEvanKeyboardBoneTex" OutName="evan_keyboard_bone" Format="rgba16" Width="32" Height="32" Offset="0x14728" />
<Texture Name="gEvanKeyboardOtherKeysTex" OutName="evan_keyboard_other_keys" Format="rgba16" Width="16" Height="16" Offset="0x14F28" />
<!-- Evan Limbs -->
<Limb Name="gEvanPelvisLimb" Type="Standard" EnumName="EVAN_LIMB_PELVIS" Offset="0x15128" />
<Limb Name="gEvanLeftThighLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_THIGH" Offset="0x15134" />
<Limb Name="gEvanLeftShinLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_SHIN" Offset="0x15140" />
<Limb Name="gEvanLeftFootLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_FOOT" Offset="0x1514C" />
<Limb Name="gEvanRightThighLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_THIGH" Offset="0x15158" />
<Limb Name="gEvanRightShinLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_SHIN" Offset="0x15164" />
<Limb Name="gEvanRightFootLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_FOOT" Offset="0x15170" />
<Limb Name="gEvanTorsoLimb" Type="Standard" EnumName="EVAN_LIMB_TORSO" Offset="0x1517C" />
<Limb Name="gEvanHeadLimb" Type="Standard" EnumName="EVAN_LIMB_HEAD" Offset="0x15188" />
<Limb Name="gEvanUpperHeadFinLimb" Type="Standard" EnumName="EVAN_LIMB_UPPER_HEAD_FIN" Offset="0x15194" />
<Limb Name="gEvanLowerHeadFinLimb" Type="Standard" EnumName="EVAN_LIMB_LOWER_HEAD_FIN" Offset="0x151A0" />
<Limb Name="gEvanLeftUpperArmLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_UPPER_ARM" Offset="0x151AC" />
<Limb Name="gEvanLeftForearmLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_FOREARM" Offset="0x151B8" />
<Limb Name="gEvanLeftHandLimb" Type="Standard" EnumName="EVAN_LIMB_LEFT_HAND" Offset="0x151C4" />
<Limb Name="gEvanRightUpperArmLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_UPPER_ARM" Offset="0x151D0" />
<Limb Name="gEvanRightForearmLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_FOREARM" Offset="0x151DC" />
<Limb Name="gEvanRightHandLimb" Type="Standard" EnumName="EVAN_LIMB_RIGHT_HAND" Offset="0x151E8" />
<!-- Evan Skeleton -->
<Skeleton Name="gEvanSkel" Type="Flex" LimbType="Standard" LimbNone="EVAN_LIMB_NONE" LimbMax="EVAN_LIMB_MAX" EnumName="EvanLimb" Offset="0x15238" />
<!-- Evan Animations -->
<Animation Name="gEvanLeanOnKeyboardAndSighAnim" Offset="0x1621C" /> <!-- Original name is "zK_wait02" -->
<Animation Name="gEvanHandsOnHipsAnim" Offset="0x16980" /> <!-- Original name is "zK_wait03" -->
</File>
</Root>
+12
View File
@@ -0,0 +1,12 @@
<Root>
<ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
<File Name="ovl_Oceff_Wipe4" BaseAddress="0x8099D780" RangeStart="0x430" RangeEnd="0xF18">
<Texture Name="sScarecrowSongEffectTex" OutName="scarecrow_song_effect" Format="i8" Width="32" Height="64" Offset="0x430"/>
<Array Name="sScarecrowSongFrustumVtx" Count="22" Offset="0xC30">
<Vtx/>
</Array>
<DList Name="sScarecrowSongMaterialDL" Offset="0xD90"/>
<DList Name="sScarecrowSongUnusedMaterialDL" Offset="0xDF8"/>
<DList Name="sScarecrowSongModelDL" Offset="0xE60"/>
</File>
</Root>
+1 -1
View File
@@ -149,7 +149,7 @@ Gfx object_dns_DL_001A50[] = {
};
```
Using `0x08000000` with `gsDPLoadTextureBlock` signals that this display list is expecting a texture in segment 8. What kind of texture is it expecting? We can look at the arguments after the `0x08000000`. It's looking for an RBGA16 texture with dimensions of 8x8, so we can define these textures in the XML like so:
Using `0x08000000` with `gsDPLoadTextureBlock` signals that this display list is expecting a texture in segment 8. What kind of texture is it expecting? We can look at the arguments after the `0x08000000`. It's looking for an RGBA16 texture with dimensions of 8x8, so we can define these textures in the XML like so:
```xml
<Texture Name="object_dns_Tex_0028E8" OutName="tex_0028E8" Format="rgba16" Width="8" Height="8" Offset="0x28E8" />
+7 -7
View File
@@ -1807,11 +1807,11 @@ Vec3s* OLib_Vec3fDiffBinAng(Vec3s* dest, Vec3f* a, Vec3f* b);
void OLib_DbCameraVec3fDiff(PosRot* a, Vec3f* b, Vec3f* dest, s16 mode);
void OLib_DbCameraVec3fSum(PosRot* a, Vec3f* b, Vec3f* dest, s16 mode);
Gfx* Gfx_DrawRectTextureRGBA16(Gfx* displayListHead, TexturePtr texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy);
Gfx* Gfx_DrawRectTextureIA8(Gfx* displayListHead, TexturePtr texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy);
Gfx* Gfx_DrawRectTextureI8(Gfx* displayListHead, TexturePtr texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy);
Gfx* Gfx_DrawQuadTextureIA8(Gfx* displayListHead, TexturePtr texture, s16 textureWidth, s16 textureHeight, u16 point);
Gfx* Gfx_DrawQuadTexture(Gfx* displayListHead, TexturePtr texture, s32 fmt, s16 textureWidth, s16 textureHeight, u16 point);
Gfx* Gfx_DrawRectTextureRGBA16(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy);
Gfx* Gfx_DrawRectTextureIA8(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy);
Gfx* Gfx_DrawRectTextureI8(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy);
Gfx* Gfx_DrawQuadTextureIA8(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, u16 point);
Gfx* Gfx_DrawQuadTexture(Gfx* gfx, TexturePtr texture, s32 fmt, s16 textureWidth, s16 textureHeight, u16 point);
void Interface_StartTimer(s16 timerId, s16 timeLimit);
void Interface_StartPostmanTimer(s16 timeLimit, s16 bunnyHoodState);
@@ -1870,7 +1870,7 @@ void func_80122BA4(PlayState* play, struct_80122D44_arg1* arg1, s32 arg2, s32 al
void func_80122C20(PlayState* play, struct_80122D44_arg1* arg1);
void func_80122D44(PlayState* play, struct_80122D44_arg1* arg1);
u8 Player_MaskIdToItemId(s32 maskIdMinusOne);
u8 Player_GetCurMaskItemId(PlayState* play);
s32 Player_GetCurMaskItemId(PlayState* play);
void func_80122F28(Player* player);
s32 func_80122F9C(PlayState* play);
s32 func_80122FCC(PlayState* play);
@@ -2369,7 +2369,7 @@ void func_8014D304(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_
// void func_8014D7B4(void);
void func_80150A84(PlayState* play);
void func_80150D08(PlayState* play, u32 uParm2);
// void func_801514B0(void);
void func_801514B0(PlayState* play, u16 arg1, u8 arg2);
void Message_StartTextbox(PlayState* play, u16 textId, Actor* Actor);
void func_80151938(PlayState* play, u16 textId);
void func_80151A68(PlayState* play, u16 textId);
+3 -3
View File
@@ -922,7 +922,7 @@ DECLARE_ROM_SEGMENT(object_driftice)
DECLARE_ROM_SEGMENT(object_fall)
DECLARE_ROM_SEGMENT(object_hanareyama_obj)
DECLARE_ROM_SEGMENT(object_crace_object)
DECLARE_ROM_SEGMENT(object_dnq)
DECLARE_ROM_SEGMENT(object_dno)
DECLARE_ROM_SEGMENT(object_obj_tokeidai)
DECLARE_ROM_SEGMENT(object_eg)
DECLARE_ROM_SEGMENT(object_tru)
@@ -993,7 +993,7 @@ DECLARE_ROM_SEGMENT(object_gg)
DECLARE_ROM_SEGMENT(object_maruta)
DECLARE_ROM_SEGMENT(object_ghaka)
DECLARE_ROM_SEGMENT(object_oyu)
DECLARE_ROM_SEGMENT(object_dnp)
DECLARE_ROM_SEGMENT(object_dnq)
DECLARE_ROM_SEGMENT(object_dai)
DECLARE_ROM_SEGMENT(object_kgy)
DECLARE_ROM_SEGMENT(object_fb)
@@ -1014,7 +1014,7 @@ DECLARE_ROM_SEGMENT(object_gi_loach)
DECLARE_ROM_SEGMENT(object_gi_seahorse)
DECLARE_ROM_SEGMENT(object_bigpo)
DECLARE_ROM_SEGMENT(object_hariko)
DECLARE_ROM_SEGMENT(object_dno)
DECLARE_ROM_SEGMENT(object_dnj)
DECLARE_ROM_SEGMENT(object_sinkai_kabe)
DECLARE_ROM_SEGMENT(object_kin2_obj)
DECLARE_ROM_SEGMENT(object_ishi)
+11 -11
View File
@@ -444,15 +444,15 @@ typedef struct {
/* 0x22C */ s32 unk_22C;
/* 0x230 */ s32 stickRelX;
/* 0x234 */ s32 stickRelY;
/* 0x238 */ s16 unk_238[5];
/* 0x242 */ s16 unk_242[5];
/* 0x24C */ s16 unk_24C[5];
/* 0x238 */ s16 cursorPoint[5];
/* 0x242 */ s16 cursorX[5];
/* 0x24C */ s16 cursorY[5];
/* 0x256 */ s16 unk_256;
/* 0x258 */ s16 unk_258;
/* 0x25A */ s16 unk_25A;
/* 0x258 */ s16 cursorSpecialPos;
/* 0x25A */ s16 pageSwitchTimer;
/* 0x25C */ u16 unk_25C;
/* 0x25E */ u16 cursorItem[5];
/* 0x268 */ u16 unk_268[5];
/* 0x268 */ u16 cursorSlot[5];
/* 0x272 */ u16 equipTargetItem;
/* 0x274 */ u16 equipTargetSlot;
/* 0x276 */ u16 equipTargetCBtn;
@@ -461,8 +461,8 @@ typedef struct {
/* 0x27C */ s16 equipAnimAlpha;
/* 0x27E */ s16 unk_27E;
/* 0x280 */ u16 unk_280;
/* 0x282 */ u16 unk_282;
/* 0x284 */ s16 unk_284;
/* 0x282 */ u16 nameColorSet;
/* 0x284 */ s16 cursorColorSet;
/* 0x286 */ s16 unk_286;
/* 0x288 */ f32 unk_288;
/* 0x28C */ f32 unk_28C;
@@ -476,9 +476,9 @@ typedef struct {
/* 0x2B6 */ u8 unk_2B6;
/* 0x2B7 */ u8 unk_2B7;
/* 0x2B8 */ u8 unk_2B8;
/* 0x2B9 */ u8 unk_2B9;
/* 0x2BA */ s16 unk_2BA;
/* 0x2BC */ s16 unk_2BC;
/* 0x2B9 */ u8 itemDescriptionOn; // helpful description of item given through a message box
/* 0x2BA */ s16 equipAnimScale; // scale of item icon while moving being equipped to c-button
/* 0x2BC */ s16 equipAnimShrinkRate; // rate the scale is shrinking for the item icon while moving being equipped to c-button
/* 0x2BE */ s16 unk_2BE[5];
/* 0x2C8 */ u16 unk_2C8;
/* 0x2CA */ s16 unk_2CA;
+1 -1
View File
@@ -437,7 +437,7 @@ typedef enum {
/* 0xB8 */ GI_TINGLE_MAP_GREAT_BAY,
/* 0xB9 */ GI_TINGLE_MAP_STONE_TOWER,
/* 0xBA */ GI_MAX
} GetItemID;
} GetItemId;
typedef enum {
/* 0x00 */ GID_BOTTLE,
+3 -3
View File
@@ -404,7 +404,7 @@ typedef enum {
/* 0x188 */ OBJECT_FALL,
/* 0x189 */ OBJECT_HANAREYAMA_OBJ,
/* 0x18A */ OBJECT_CRACE_OBJECT,
/* 0x18B */ OBJECT_DNQ,
/* 0x18B */ OBJECT_DNO,
/* 0x18C */ OBJECT_OBJ_TOKEIDAI,
/* 0x18D */ OBJECT_EG,
/* 0x18E */ OBJECT_TRU,
@@ -477,7 +477,7 @@ typedef enum {
/* 0x1D1 */ OBJECT_MARUTA,
/* 0x1D2 */ OBJECT_GHAKA,
/* 0x1D3 */ OBJECT_OYU,
/* 0x1D4 */ OBJECT_DNP,
/* 0x1D4 */ OBJECT_DNQ,
/* 0x1D5 */ OBJECT_DAI,
/* 0x1D6 */ OBJECT_KGY,
/* 0x1D7 */ OBJECT_FB,
@@ -508,7 +508,7 @@ typedef enum {
/* 0x1F0 */ OBJECT_GI_SEAHORSE,
/* 0x1F1 */ OBJECT_BIGPO,
/* 0x1F2 */ OBJECT_HARIKO,
/* 0x1F3 */ OBJECT_DNO,
/* 0x1F3 */ OBJECT_DNJ,
/* 0x1F4 */ OBJECT_SINKAI_KABE,
/* 0x1F5 */ OBJECT_KIN2_OBJ,
/* 0x1F6 */ OBJECT_ISHI,
+9 -9
View File
@@ -107,19 +107,19 @@ typedef enum {
typedef enum {
/* 0 */ HUD_VISIBILITY_IDLE,
/* 1 */ HUD_VISIBILITY_OFF,
/* 2 */ HUD_VISIBILITY_OFF_ALT, // Identical to HUD_VISIBILITY_OFF
/* 3 */ HUD_VISIBILITY_HEARTS_WITH_DIM_BTN, // Uses Interface_UpdateButtonAlphas so gives the opportunity to dim only disabled buttons
/* 1 */ HUD_VISIBILITY_NONE,
/* 2 */ HUD_VISIBILITY_NONE_ALT, // Identical to HUD_VISIBILITY_NONE
/* 3 */ HUD_VISIBILITY_HEARTS_WITH_OVERWRITE, // Uses Interface_UpdateButtonAlphas so gives the opportunity to dim only disabled buttons
/* 4 */ HUD_VISIBILITY_A,
/* 5 */ HUD_VISIBILITY_A_HEARTS_MAGIC_WITH_DIM_BTN, // Uses Interface_UpdateButtonAlphas so gives the opportunity to dim only disabled buttons
/* 6 */ HUD_VISIBILITY_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN, // Uses Interface_UpdateButtonAlphas so gives the opportunity to dim only disabled buttons
/* 5 */ HUD_VISIBILITY_A_HEARTS_MAGIC_WITH_OVERWRITE, // Uses Interface_UpdateButtonAlphas so gives the opportunity to dim only disabled buttons
/* 6 */ HUD_VISIBILITY_A_HEARTS_MAGIC_MINIMAP_WITH_OVERWRITE, // Uses Interface_UpdateButtonAlphas so gives the opportunity to dim only disabled buttons
/* 7 */ HUD_VISIBILITY_ALL_NO_MINIMAP_W_DISABLED, // Only raises button alphas if not disabled
/* 8 */ HUD_VISIBILITY_B_FAST, // reaches target twice as fast
/* 8 */ HUD_VISIBILITY_B,
/* 9 */ HUD_VISIBILITY_HEARTS_MAGIC,
/* 10 */ HUD_VISIBILITY_B,
/* 10 */ HUD_VISIBILITY_B_ALT,
/* 11 */ HUD_VISIBILITY_HEARTS,
/* 12 */ HUD_VISIBILITY_A_B_MINIMAP,
/* 13 */ HUD_VISIBILITY_HEARTS_MAGIC_WITH_DIM_BTN, // Uses Interface_UpdateButtonAlphas so gives the opportunity to dim only disabled buttons
/* 13 */ HUD_VISIBILITY_HEARTS_MAGIC_WITH_OVERWRITE, // Uses Interface_UpdateButtonAlphas so gives the opportunity to dim only disabled buttons
/* 14 */ HUD_VISIBILITY_HEARTS_MAGIC_C,
/* 15 */ HUD_VISIBILITY_ALL_NO_MINIMAP,
/* 16 */ HUD_VISIBILITY_A_B_C,
@@ -130,7 +130,7 @@ typedef enum {
/* 21 */ HUD_VISIBILITY_A_B,
/* 22 */ HUD_VISIBILITY_A_B_HEARTS_MAGIC_MINIMAP,
/* 50 */ HUD_VISIBILITY_ALL = 50,
/* 52 */ HUD_VISIBILITY_OFF_NOW = 52
/* 52 */ HUD_VISIBILITY_NONE_INSTANT = 52
} HudVisibility;
typedef struct SramContext {
+106 -106
View File
@@ -271,7 +271,7 @@ typedef struct {
} Room; // size = 0x14
typedef struct {
/* 0x00 */ Room currRoom;
/* 0x00 */ Room curRoom;
/* 0x14 */ Room prevRoom;
/* 0x28 */ void* roomMemPages[2]; // In a scene with transitions, roomMemory is split between two pages that toggle each transition. This is one continuous range, as the second page allocates from the end
/* 0x30 */ u8 activeMemPage; // 0 - First page in memory, 1 - Second page
@@ -534,119 +534,119 @@ typedef union {
} SceneCmd; // size = 0x8
typedef enum {
/* 0x00 */ SCENE_20SICHITAI2,
/* 0x00 */ SCENE_20SICHITAI2, // Southern Swamp (Clear)
/* 0x01 */ SCENE_UNSET_1,
/* 0x02 */ SCENE_UNSET_2,
/* 0x03 */ SCENE_UNSET_3,
/* 0x04 */ SCENE_UNSET_4,
/* 0x05 */ SCENE_UNSET_5,
/* 0x06 */ SCENE_UNSET_6,
/* 0x07 */ SCENE_KAKUSIANA,
/* 0x08 */ SCENE_SPOT00,
/* 0x07 */ SCENE_KAKUSIANA, // Lone Peak Shrine & Grottos
/* 0x08 */ SCENE_SPOT00, // Cutscene Scene
/* 0x09 */ SCENE_UNSET_9,
/* 0x0A */ SCENE_WITCH_SHOP,
/* 0x0B */ SCENE_LAST_BS,
/* 0x0C */ SCENE_HAKASHITA,
/* 0x0D */ SCENE_AYASHIISHOP,
/* 0x0A */ SCENE_WITCH_SHOP, // Magic Hags' Potion Shop
/* 0x0B */ SCENE_LAST_BS, // Majora's Lair
/* 0x0C */ SCENE_HAKASHITA, // Beneath the Graveyard
/* 0x0D */ SCENE_AYASHIISHOP, // Curiosity Shop
/* 0x0E */ SCENE_UNSET_E,
/* 0x0F */ SCENE_UNSET_F,
/* 0x10 */ SCENE_OMOYA,
/* 0x11 */ SCENE_BOWLING,
/* 0x12 */ SCENE_SONCHONOIE,
/* 0x13 */ SCENE_IKANA,
/* 0x14 */ SCENE_KAIZOKU,
/* 0x15 */ SCENE_MILK_BAR,
/* 0x16 */ SCENE_INISIE_N,
/* 0x17 */ SCENE_TAKARAYA,
/* 0x18 */ SCENE_INISIE_R,
/* 0x19 */ SCENE_OKUJOU,
/* 0x1A */ SCENE_OPENINGDAN,
/* 0x1B */ SCENE_MITURIN,
/* 0x1C */ SCENE_13HUBUKINOMITI,
/* 0x1D */ SCENE_CASTLE,
/* 0x1E */ SCENE_DEKUTES,
/* 0x1F */ SCENE_MITURIN_BS,
/* 0x20 */ SCENE_SYATEKI_MIZU,
/* 0x21 */ SCENE_HAKUGIN,
/* 0x22 */ SCENE_ROMANYMAE,
/* 0x23 */ SCENE_PIRATE,
/* 0x24 */ SCENE_SYATEKI_MORI,
/* 0x25 */ SCENE_SINKAI,
/* 0x26 */ SCENE_YOUSEI_IZUMI,
/* 0x27 */ SCENE_KINSTA1,
/* 0x28 */ SCENE_KINDAN2,
/* 0x29 */ SCENE_TENMON_DAI,
/* 0x2A */ SCENE_LAST_DEKU,
/* 0x2B */ SCENE_22DEKUCITY,
/* 0x2C */ SCENE_KAJIYA,
/* 0x2D */ SCENE_00KEIKOKU,
/* 0x2E */ SCENE_POSTHOUSE,
/* 0x2F */ SCENE_LABO,
/* 0x30 */ SCENE_DANPEI2TEST,
/* 0x10 */ SCENE_OMOYA, // Mama's House (Ranch House in PAL) & Barn
/* 0x11 */ SCENE_BOWLING, // Honey & Darling's Shop
/* 0x12 */ SCENE_SONCHONOIE, // The Mayor's Residence
/* 0x13 */ SCENE_IKANA, // Ikana Canyon
/* 0x14 */ SCENE_KAIZOKU, // Pirates' Fortress
/* 0x15 */ SCENE_MILK_BAR, // Milk Bar
/* 0x16 */ SCENE_INISIE_N, // Stone Tower Temple
/* 0x17 */ SCENE_TAKARAYA, // Treasure Chest Shop
/* 0x18 */ SCENE_INISIE_R, // Inverted Stone Tower Temple
/* 0x19 */ SCENE_OKUJOU, // Clock Tower Rooftop
/* 0x1A */ SCENE_OPENINGDAN, // Before Clock Town
/* 0x1B */ SCENE_MITURIN, // Woodfall Temple
/* 0x1C */ SCENE_13HUBUKINOMITI, // Path to Mountain Village
/* 0x1D */ SCENE_CASTLE, // Ancient Castle of Ikana
/* 0x1E */ SCENE_DEKUTES, // Deku Scrub Playground
/* 0x1F */ SCENE_MITURIN_BS, // Odolwa's Lair
/* 0x20 */ SCENE_SYATEKI_MIZU, // Town Shooting Gallery
/* 0x21 */ SCENE_HAKUGIN, // Snowhead Temple
/* 0x22 */ SCENE_ROMANYMAE, // Milk Road
/* 0x23 */ SCENE_PIRATE, // Pirates' Fortress Interior
/* 0x24 */ SCENE_SYATEKI_MORI, // Swamp Shooting Gallery
/* 0x25 */ SCENE_SINKAI, // Pinnacle Rock
/* 0x26 */ SCENE_YOUSEI_IZUMI, // Fairy's Fountain
/* 0x27 */ SCENE_KINSTA1, // Swamp Spider House
/* 0x28 */ SCENE_KINDAN2, // Oceanside Spider House
/* 0x29 */ SCENE_TENMON_DAI, // Astral Observatory
/* 0x2A */ SCENE_LAST_DEKU, // Moon Deku Trial
/* 0x2B */ SCENE_22DEKUCITY, // Deku Palace
/* 0x2C */ SCENE_KAJIYA, // Mountain Smithy
/* 0x2D */ SCENE_00KEIKOKU, // Termina Field
/* 0x2E */ SCENE_POSTHOUSE, // Post Office
/* 0x2F */ SCENE_LABO, // Marine Research Lab
/* 0x30 */ SCENE_DANPEI2TEST, // Beneath the Graveyard (Day 3) and Dampe's House
/* 0x31 */ SCENE_UNSET_31,
/* 0x32 */ SCENE_16GORON_HOUSE,
/* 0x33 */ SCENE_33ZORACITY,
/* 0x34 */ SCENE_8ITEMSHOP,
/* 0x35 */ SCENE_F01,
/* 0x36 */ SCENE_INISIE_BS,
/* 0x37 */ SCENE_30GYOSON,
/* 0x38 */ SCENE_31MISAKI,
/* 0x39 */ SCENE_TAKARAKUJI,
/* 0x32 */ SCENE_16GORON_HOUSE, // Goron Shrine
/* 0x33 */ SCENE_33ZORACITY, // Zora Hall
/* 0x34 */ SCENE_8ITEMSHOP, // Trading Post
/* 0x35 */ SCENE_F01, // Romani Ranch
/* 0x36 */ SCENE_INISIE_BS, // Twinmold's Lair
/* 0x37 */ SCENE_30GYOSON, // Great Bay Coast
/* 0x38 */ SCENE_31MISAKI, // Zora Cape
/* 0x39 */ SCENE_TAKARAKUJI, // Lottery Shop
/* 0x3A */ SCENE_UNSET_3A,
/* 0x3B */ SCENE_TORIDE,
/* 0x3C */ SCENE_FISHERMAN,
/* 0x3D */ SCENE_GORONSHOP,
/* 0x3E */ SCENE_DEKU_KING,
/* 0x3F */ SCENE_LAST_GORON,
/* 0x40 */ SCENE_24KEMONOMITI,
/* 0x41 */ SCENE_F01_B,
/* 0x42 */ SCENE_F01C,
/* 0x43 */ SCENE_BOTI,
/* 0x44 */ SCENE_HAKUGIN_BS,
/* 0x45 */ SCENE_20SICHITAI,
/* 0x46 */ SCENE_21MITURINMAE,
/* 0x47 */ SCENE_LAST_ZORA,
/* 0x48 */ SCENE_11GORONNOSATO2,
/* 0x49 */ SCENE_SEA,
/* 0x4A */ SCENE_35TAKI,
/* 0x4B */ SCENE_REDEAD,
/* 0x4C */ SCENE_BANDROOM,
/* 0x4D */ SCENE_11GORONNOSATO,
/* 0x4E */ SCENE_GORON_HAKA,
/* 0x4F */ SCENE_SECOM,
/* 0x50 */ SCENE_10YUKIYAMANOMURA,
/* 0x51 */ SCENE_TOUGITES,
/* 0x52 */ SCENE_DANPEI,
/* 0x53 */ SCENE_IKANAMAE,
/* 0x54 */ SCENE_DOUJOU,
/* 0x55 */ SCENE_MUSICHOUSE,
/* 0x56 */ SCENE_IKNINSIDE,
/* 0x57 */ SCENE_MAP_SHOP,
/* 0x58 */ SCENE_F40,
/* 0x59 */ SCENE_F41,
/* 0x5A */ SCENE_10YUKIYAMANOMURA2,
/* 0x5B */ SCENE_14YUKIDAMANOMITI,
/* 0x5C */ SCENE_12HAKUGINMAE,
/* 0x5D */ SCENE_17SETUGEN,
/* 0x5E */ SCENE_17SETUGEN2,
/* 0x5F */ SCENE_SEA_BS,
/* 0x60 */ SCENE_RANDOM,
/* 0x61 */ SCENE_YADOYA,
/* 0x62 */ SCENE_KONPEKI_ENT,
/* 0x63 */ SCENE_INSIDETOWER,
/* 0x64 */ SCENE_26SARUNOMORI,
/* 0x65 */ SCENE_LOST_WOODS,
/* 0x66 */ SCENE_LAST_LINK,
/* 0x67 */ SCENE_SOUGEN,
/* 0x68 */ SCENE_BOMYA,
/* 0x69 */ SCENE_KYOJINNOMA,
/* 0x6A */ SCENE_KOEPONARACE,
/* 0x6B */ SCENE_GORONRACE,
/* 0x6C */ SCENE_TOWN,
/* 0x6D */ SCENE_ICHIBA,
/* 0x6E */ SCENE_BACKTOWN,
/* 0x6F */ SCENE_CLOCKTOWER,
/* 0x70 */ SCENE_ALLEY,
/* 0x3B */ SCENE_TORIDE, // Pirates' Fortress Moat
/* 0x3C */ SCENE_FISHERMAN, // Fisherman's Hut
/* 0x3D */ SCENE_GORONSHOP, // Goron Shop
/* 0x3E */ SCENE_DEKU_KING, // Deku King's Chamber
/* 0x3F */ SCENE_LAST_GORON, // Moon Goron Trial
/* 0x40 */ SCENE_24KEMONOMITI, // Road to Southern Swamp
/* 0x41 */ SCENE_F01_B, // Doggy Racetrack
/* 0x42 */ SCENE_F01C, // Cucco Shack
/* 0x43 */ SCENE_BOTI, // Ikana Graveyard
/* 0x44 */ SCENE_HAKUGIN_BS, // Goht's Lair
/* 0x45 */ SCENE_20SICHITAI, // Southern Swamp (poison)
/* 0x46 */ SCENE_21MITURINMAE, // Woodfall
/* 0x47 */ SCENE_LAST_ZORA, // Moon Zora Trial
/* 0x48 */ SCENE_11GORONNOSATO2, // Goron Village (spring)
/* 0x49 */ SCENE_SEA, // Great Bay Temple
/* 0x4A */ SCENE_35TAKI, // Waterfall Rapids
/* 0x4B */ SCENE_REDEAD, // Beneath the Well
/* 0x4C */ SCENE_BANDROOM, // Zora Hall Rooms
/* 0x4D */ SCENE_11GORONNOSATO, // Goron Village (winter)
/* 0x4E */ SCENE_GORON_HAKA, // Goron Graveyard
/* 0x4F */ SCENE_SECOM, // Sakon's Hideout
/* 0x50 */ SCENE_10YUKIYAMANOMURA, // Mountain Village (winter)
/* 0x51 */ SCENE_TOUGITES, // Ghost Hut
/* 0x52 */ SCENE_DANPEI, // Deku Shrine
/* 0x53 */ SCENE_IKANAMAE, // Road to Ikana
/* 0x54 */ SCENE_DOUJOU, // Swordsman's School
/* 0x55 */ SCENE_MUSICHOUSE, // Music Box House
/* 0x56 */ SCENE_IKNINSIDE, // Igos du Ikana's Lair
/* 0x57 */ SCENE_MAP_SHOP, // Tourist Information
/* 0x58 */ SCENE_F40, // Stone Tower
/* 0x59 */ SCENE_F41, // Inverted Stone Tower
/* 0x5A */ SCENE_10YUKIYAMANOMURA2, // Mountain Village (spring)
/* 0x5B */ SCENE_14YUKIDAMANOMITI, // Path to Snowhead
/* 0x5C */ SCENE_12HAKUGINMAE, // Snowhead
/* 0x5D */ SCENE_17SETUGEN, // Path to Goron Village (winter)
/* 0x5E */ SCENE_17SETUGEN2, // Path to Goron Village (spring)
/* 0x5F */ SCENE_SEA_BS, // Gyorg's Lair
/* 0x60 */ SCENE_RANDOM, // Secret Shrine
/* 0x61 */ SCENE_YADOYA, // Stock Pot Inn
/* 0x62 */ SCENE_KONPEKI_ENT, // Great Bay Cutscene
/* 0x63 */ SCENE_INSIDETOWER, // Clock Tower Interior
/* 0x64 */ SCENE_26SARUNOMORI, // Woods of Mystery
/* 0x65 */ SCENE_LOST_WOODS, // Lost Woods (Intro)
/* 0x66 */ SCENE_LAST_LINK, // Moon Link Trial
/* 0x67 */ SCENE_SOUGEN, // The Moon
/* 0x68 */ SCENE_BOMYA, // Bomb Shop
/* 0x69 */ SCENE_KYOJINNOMA, // Giants' Chamber
/* 0x6A */ SCENE_KOEPONARACE, // Gorman Track
/* 0x6B */ SCENE_GORONRACE, // Goron Racetrack
/* 0x6C */ SCENE_TOWN, // East Clock Town
/* 0x6D */ SCENE_ICHIBA, // West Clock Town
/* 0x6E */ SCENE_BACKTOWN, // North Clock Town
/* 0x6F */ SCENE_CLOCKTOWER, // South Clock Town
/* 0x70 */ SCENE_ALLEY, // Laundry Pool
/* 0x71 */ SCENE_MAX
} SceneId;
@@ -843,11 +843,11 @@ typedef enum {
#define SCENE_CMD_SPECIAL_FILES(elfMessageFile, keepObjectId) \
{ SCENE_CMD_ID_SPECIAL_FILES, elfMessageFile, CMD_W(keepObjectId) }
#define SCENE_CMD_ROOM_BEHAVIOR(currRoomUnk3, currRoomUnk2, currRoomUnk5, msgCtxunk12044, enablePosLights, \
#define SCENE_CMD_ROOM_BEHAVIOR(curRoomUnk3, curRoomUnk2, curRoomUnk5, msgCtxunk12044, enablePosLights, \
kankyoContextUnkE2) \
{ \
SCENE_CMD_ID_ROOM_BEHAVIOR, currRoomUnk3, \
currRoomUnk2 | _SHIFTL(currRoomUnk5, 8, 1) | _SHIFTL(msgCtxunk12044, 10, 1) | \
SCENE_CMD_ID_ROOM_BEHAVIOR, curRoomUnk3, \
curRoomUnk2 | _SHIFTL(curRoomUnk5, 8, 1) | _SHIFTL(msgCtxunk12044, 10, 1) | \
_SHIFTL(enablePosLights, 11, 1) | _SHIFTL(kankyoContextUnkE2, 12, 1) \
}
+8 -11
View File
@@ -2080,9 +2080,7 @@ beginseg
name "ovl_Oceff_Wipe4"
compress
include "build/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.o"
include "build/data/ovl_Oceff_Wipe4/ovl_Oceff_Wipe4.data.o"
include "build/data/ovl_Oceff_Wipe4/ovl_Oceff_Wipe4.bss.o"
include "build/data/ovl_Oceff_Wipe4/ovl_Oceff_Wipe4.reloc.o"
include "build/src/overlays/actors/ovl_Oceff_Wipe4/ovl_Oceff_Wipe4_reloc.o"
endseg
beginseg
@@ -2175,8 +2173,7 @@ beginseg
name "ovl_En_Grasshopper"
compress
include "build/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.o"
include "build/data/ovl_En_Grasshopper/ovl_En_Grasshopper.data.o"
include "build/data/ovl_En_Grasshopper/ovl_En_Grasshopper.reloc.o"
include "build/src/overlays/actors/ovl_En_Grasshopper/ovl_En_Grasshopper_reloc.o"
endseg
beginseg
@@ -7013,11 +7010,11 @@ beginseg
endseg
beginseg
name "object_dnq"
name "object_dno"
compress
romalign 0x1000
number 6
include "build/assets/objects/object_dnq/object_dnq.o"
include "build/assets/objects/object_dno/object_dno.o"
endseg
beginseg
@@ -7581,11 +7578,11 @@ beginseg
endseg
beginseg
name "object_dnp"
name "object_dnq"
compress
romalign 0x1000
number 6
include "build/assets/objects/object_dnp/object_dnp.o"
include "build/assets/objects/object_dnq/object_dnq.o"
endseg
beginseg
@@ -7749,11 +7746,11 @@ beginseg
endseg
beginseg
name "object_dno"
name "object_dnj"
compress
romalign 0x1000
number 6
include "build/assets/objects/object_dno/object_dno.o"
include "build/assets/objects/object_dnj/object_dnj.o"
endseg
beginseg
+14 -14
View File
@@ -1336,7 +1336,7 @@ s32 func_800B715C(PlayState* play) {
}
void Actor_SetCameraHorseSetting(PlayState* play, Player* player) {
if ((play->roomCtx.currRoom.unk3 != 4) && (player->actor.id == ACTOR_PLAYER)) {
if ((play->roomCtx.curRoom.unk3 != 4) && (player->actor.id == ACTOR_PLAYER)) {
EnHorse* rideActor = (EnHorse*)player->rideActor;
if ((rideActor != NULL) && !(rideActor->unk_1EC & 0x10)) {
@@ -2499,7 +2499,7 @@ void Actor_Draw(PlayState* play, Actor* actor) {
OPEN_DISPS(play->state.gfxCtx);
light = LightContext_NewLights(&play->lightCtx, play->state.gfxCtx);
if ((actor->flags & ACTOR_FLAG_10000000) && (play->roomCtx.currRoom.enablePosLights || (MREG(93) != 0))) {
if ((actor->flags & ACTOR_FLAG_10000000) && (play->roomCtx.curRoom.enablePosLights || (MREG(93) != 0))) {
light->enablePosLights = true;
}
@@ -2669,7 +2669,7 @@ void Actor_DrawLensActors(PlayState* play, s32 numActors, Actor** actors) {
gDPSetPrimColor(spAC++, 0, 0, 0, 0, 0, 255);
// temp_s1_5 = spAC;
if (play->roomCtx.currRoom.unk5 == 0) {
if (play->roomCtx.curRoom.unk5 == 0) {
// temp_s1_5->words.w0 = 0xFC61E6C3;
// temp_s1_5->words.w1 = 0x11CF9FCF;
// phi_s1 = temp_s1_5 + 8;
@@ -2719,7 +2719,7 @@ void Actor_DrawLensActors(PlayState* play, s32 numActors, Actor** actors) {
// temp_a0_2 = &spAC;
// if (sp34->unk_6E5 == 0) {
if (play->roomCtx.currRoom.unk5 == 0) {
if (play->roomCtx.curRoom.unk5 == 0) {
// temp_s1_10->unk_0 = 0xFC119623;
// temp_s1_10->unk_4 = 0xFF2FFFFF;
// phi_s1_4 = temp_s1_10 + 8;
@@ -2882,8 +2882,8 @@ void Actor_DrawAll(PlayState* play, ActorContext* actorCtx) {
actor->isDrawn = false;
if ((actor->init == NULL) && (actor->draw != NULL) && (actor->flags & actorFlags)) {
if ((actor->flags & ACTOR_FLAG_80) &&
((play->roomCtx.currRoom.unk5 == 0) || (play->actorCtx.lensMaskSize == LENS_MASK_ACTIVE_SIZE) ||
(actor->room != play->roomCtx.currRoom.num))) {
((play->roomCtx.curRoom.unk5 == 0) || (play->actorCtx.lensMaskSize == LENS_MASK_ACTIVE_SIZE) ||
(actor->room != play->roomCtx.curRoom.num))) {
if (Actor_RecordUndrawnActor(play, actor)) {}
} else {
Actor_Draw(play, actor);
@@ -2960,7 +2960,7 @@ void func_800BA798(PlayState* play, ActorContext* actorCtx) {
actor = actorCtx->actorLists[i].first;
while (actor != NULL) {
if ((actor->room >= 0) && (actor->room != play->roomCtx.currRoom.num) &&
if ((actor->room >= 0) && (actor->room != play->roomCtx.curRoom.num) &&
(actor->room != play->roomCtx.prevRoom.num)) {
if (!actor->isDrawn) {
actor = Actor_Delete(actorCtx, actor, play);
@@ -3091,9 +3091,9 @@ Actor* Actor_RemoveFromCategory(PlayState* play, ActorContext* actorCtx, Actor*
actorToRemove->next = NULL;
actorToRemove->prev = NULL;
if ((actorToRemove->room == play->roomCtx.currRoom.num) && (actorToRemove->category == ACTORCAT_ENEMY) &&
if ((actorToRemove->room == play->roomCtx.curRoom.num) && (actorToRemove->category == ACTORCAT_ENEMY) &&
(actorCtx->actorLists[ACTORCAT_ENEMY].length == 0)) {
Flags_SetClearTemp(play, play->roomCtx.currRoom.num);
Flags_SetClearTemp(play, play->roomCtx.curRoom.num);
}
return newHead;
@@ -3180,8 +3180,8 @@ Actor* Actor_SpawnAsChildAndCutscene(ActorContext* actorCtx, PlayState* play, s1
}
objBankIndex = Object_GetIndex(&play->objectCtx, actorInit->objectId);
if ((objBankIndex < 0) || ((actorInit->type == ACTORCAT_ENEMY) &&
Flags_GetClear(play, play->roomCtx.currRoom.num) && (actorInit->id != ACTOR_BOSS_05))) {
if ((objBankIndex < 0) || ((actorInit->type == ACTORCAT_ENEMY) && Flags_GetClear(play, play->roomCtx.curRoom.num) &&
(actorInit->id != ACTOR_BOSS_05))) {
Actor_FreeOverlay(&gActorOverlayTable[index]);
return NULL;
}
@@ -3219,7 +3219,7 @@ Actor* Actor_SpawnAsChildAndCutscene(ActorContext* actorCtx, PlayState* play, s1
actor->parent = parent;
parent->child = actor;
} else {
actor->room = play->roomCtx.currRoom.num;
actor->room = play->roomCtx.curRoom.num;
}
actor->home.pos.x = x;
@@ -3267,10 +3267,10 @@ void Actor_SpawnTransitionActors(PlayState* play, ActorContext* actorCtx) {
for (i = 0; i < numTransitionActors; transitionActorList++, i++) {
if (transitionActorList->id >= 0) {
if ((transitionActorList->sides[0].room >= 0 &&
(play->roomCtx.currRoom.num == transitionActorList->sides[0].room ||
(play->roomCtx.curRoom.num == transitionActorList->sides[0].room ||
play->roomCtx.prevRoom.num == transitionActorList->sides[0].room)) ||
(transitionActorList->sides[1].room >= 0 &&
(play->roomCtx.currRoom.num == transitionActorList->sides[1].room ||
(play->roomCtx.curRoom.num == transitionActorList->sides[1].room ||
play->roomCtx.prevRoom.num == transitionActorList->sides[1].room))) {
s16 rotY = ((transitionActorList->rotY >> 7) & 0x1FF) * (0x10000 / 360.0f);
+3 -3
View File
@@ -4405,7 +4405,7 @@ s32 WaterBox_GetSurfaceImpl(PlayState* play, CollisionContext* colCtx, f32 x, f3
for (curWaterBox = colHeader->waterBoxes; curWaterBox < colHeader->waterBoxes + colHeader->numWaterBoxes;
curWaterBox++) {
room = 0x3F & (curWaterBox->properties >> 13);
if (room == (u32)play->roomCtx.currRoom.num || room == 0x3F) {
if (room == (u32)play->roomCtx.curRoom.num || room == 0x3F) {
if (curWaterBox->properties & 0x80000) {
continue;
}
@@ -4490,7 +4490,7 @@ s32 WaterBox_GetSurface2(PlayState* play, CollisionContext* colCtx, Vec3f* pos,
waterBox = &colHeader->waterBoxes[i];
room = WATERBOX_ROOM(waterBox->properties);
if (!(room == play->roomCtx.currRoom.num || room == 0x3F)) {
if (!(room == play->roomCtx.curRoom.num || room == 0x3F)) {
continue;
}
if ((waterBox->properties & 0x80000)) {
@@ -4632,7 +4632,7 @@ s32 func_800CA6F0(PlayState* play, CollisionContext* colCtx, f32 x, f32 z, f32*
for (curWaterBox = colHeader->waterBoxes; curWaterBox < colHeader->waterBoxes + colHeader->numWaterBoxes;
curWaterBox++) {
room = WATERBOX_ROOM(curWaterBox->properties);
if (room == (u32)play->roomCtx.currRoom.num || room == 0x3F) {
if (room == (u32)play->roomCtx.curRoom.num || room == 0x3F) {
if ((curWaterBox->properties & 0x80000) != 0) {
if (curWaterBox->minPos.x < x && x < curWaterBox->minPos.x + curWaterBox->xLength) {
if (curWaterBox->minPos.z < z && z < curWaterBox->minPos.z + curWaterBox->zLength) {
+5 -5
View File
@@ -105,7 +105,7 @@ s32 func_800EA220(PlayState* play, CutsceneContext* csCtx, f32 target) {
}
void func_800EA258(PlayState* play, CutsceneContext* csCtx) {
Interface_SetHudVisibility(HUD_VISIBILITY_OFF);
Interface_SetHudVisibility(HUD_VISIBILITY_NONE);
ShrinkWindow_SetLetterboxTarget(32);
if (func_800EA220(play, csCtx, 1.0f)) {
Audio_SetCutsceneFlag(true);
@@ -115,7 +115,7 @@ void func_800EA258(PlayState* play, CutsceneContext* csCtx) {
void func_800EA2B8(PlayState* play, CutsceneContext* csCtx) {
func_800ED980(play, csCtx);
Interface_SetHudVisibility(HUD_VISIBILITY_OFF);
Interface_SetHudVisibility(HUD_VISIBILITY_NONE);
ShrinkWindow_SetLetterboxTarget(32);
if (func_800EA220(play, csCtx, 1.0f)) {
Audio_SetCutsceneFlag(true);
@@ -215,7 +215,7 @@ void Cutscene_Command_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdBase* c
D_801F6D30.a = 255 * progress;
break;
case 0xC:
play->roomCtx.currRoom.segment = NULL;
play->roomCtx.curRoom.segment = NULL;
break;
case 0xD:
if (play->state.frames & 8) {
@@ -1078,7 +1078,7 @@ void Cutscene_Command_Textbox(PlayState* play, CutsceneContext* csCtx, CsCmdText
}
if (originalCsFrames == csCtx->frames) {
Interface_SetHudVisibility(HUD_VISIBILITY_OFF);
Interface_SetHudVisibility(HUD_VISIBILITY_NONE);
D_801BB124 = 0;
D_801BB128 = 0;
func_80161C0C();
@@ -1451,7 +1451,7 @@ void func_800EDA84(PlayState* play, CutsceneContext* csCtx) {
csCtx->unk_18 = 0xFFFF;
if (gSaveContext.cutsceneTrigger == 0) {
Interface_SetHudVisibility(HUD_VISIBILITY_OFF);
Interface_SetHudVisibility(HUD_VISIBILITY_NONE);
ShrinkWindow_SetLetterboxTarget(32);
ShrinkWindow_SetLetterboxMagnitude(0x20);
csCtx->state++;
+14 -14
View File
@@ -33,12 +33,12 @@ void func_800F4A10(PlayState* play) {
for (i = 9; i >= 0; i--) {
if ((gSaveContext.save.playerData.owlActivationFlags >> i) & 1) {
pauseCtx->worldMapPoints[i] = 1;
pauseCtx->unk_238[4] = i;
pauseCtx->cursorPoint[PAUSE_WORLD_MAP] = i;
}
}
if ((gSaveContext.save.playerData.owlActivationFlags >> 4) & 1) {
pauseCtx->unk_238[4] = 4;
pauseCtx->cursorPoint[PAUSE_WORLD_MAP] = 4;
}
}
@@ -82,7 +82,7 @@ void KaleidoSetup_Update(PlayState* play) {
!(play->actorCtx.flags & ACTORCTX_FLAG_2)) {
if ((play->actorCtx.unk268 == 0) && CHECK_BTN_ALL(input->press.button, BTN_START)) {
gSaveContext.prevHudVisibility = gSaveContext.hudVisibility;
pauseCtx->unk_2B9 = 0;
pauseCtx->itemDescriptionOn = false;
pauseCtx->state = 1;
func_800F4A10(play);
pauseCtx->mode = pauseCtx->pageIndex * 2 + 1;
@@ -122,23 +122,23 @@ void KaleidoSetup_Init(PlayState* play) {
pauseCtx->unk_20C = 936.0f;
pauseCtx->unk_220 = -314.0f;
pauseCtx->unk_238[PAUSE_MAP] = XREG(94) + 3;
pauseCtx->cursorPoint[PAUSE_MAP] = XREG(94) + 3;
pauseCtx->unk_258 = 11;
pauseCtx->unk_25A = 0;
pauseCtx->cursorSpecialPos = PAUSE_CURSOR_PAGE_RIGHT;
pauseCtx->pageSwitchTimer = 0;
pauseCtx->cursorItem[PAUSE_ITEM] = 999;
pauseCtx->cursorItem[PAUSE_ITEM] = PAUSE_ITEM_NONE;
pauseCtx->cursorItem[PAUSE_MAP] = XREG(94) + 3;
pauseCtx->cursorItem[PAUSE_QUEST] = 999;
pauseCtx->cursorItem[PAUSE_MASK] = 999;
pauseCtx->cursorItem[PAUSE_QUEST] = PAUSE_ITEM_NONE;
pauseCtx->cursorItem[PAUSE_MASK] = PAUSE_ITEM_NONE;
pauseCtx->unk_268[PAUSE_ITEM] = 0;
pauseCtx->unk_268[PAUSE_MAP] = XREG(94) + 3;
pauseCtx->cursorSlot[PAUSE_ITEM] = 0;
pauseCtx->cursorSlot[PAUSE_MAP] = XREG(94) + 3;
pauseCtx->unk_284 = 2;
pauseCtx->cursorColorSet = 2;
pauseCtx->unk_2A0 = -1;
pauseCtx->unk_2BA = 320;
pauseCtx->unk_2BC = 40;
pauseCtx->equipAnimScale = 320;
pauseCtx->equipAnimShrinkRate = 40;
pauseCtx->promptAlpha = 100;
View_Init(&pauseCtx->view, play->state.gfxCtx);

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