izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
engineer124
2022-11-08 17:05:34 -05:00
parent 9a5444ca33 a0c65bb3c6
commit 962428840d
413 changed files with 13541 additions and 4927 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/gameplay_dangeon_keep.xml
+1 -1
View File
@@ -88,6 +88,6 @@
<DList Name="gWarpTagGoronTrialBaseDL" Offset="0x21EF0" />
<Texture Name="gWarpTagRainbowTex" OutName="warptag_rainbow" Format="rgba32" Width="32" Height="32" Offset="0x21FF8" />
<TextureAnimation Name="gWarpTagRainbowTexAnim" Offset="0x23008" />
<Collision Name="gWarpTagGoronTrialBaseCollider" Offset="0x2324C" />
<Collision Name="gWarpTagGoronTrialBaseCol" Offset="0x2324C" />
</File>
</Root>
assets/xml/objects/gameplay_field_keep.xml
+2 -2
View File
@@ -40,8 +40,8 @@
<DList Name="gameplay_field_keep_DL_006760" Offset="0x6760" />
<Texture Name="gameplay_field_keep_Tex_006810" OutName="tex_006810" Format="rgba16" Width="32" Height="32" Offset="0x6810" />
<Texture Name="gameplay_field_keep_Tex_007010" OutName="tex_007010" Format="rgba16" Width="32" Height="32" Offset="0x7010" />
<DList Name="gKusaBushType1" Offset="0x78A0" />
<DList Name="gKusaBushType2" Offset="0x7938" />
<DList Name="gKusaBushType1DL" Offset="0x78A0" />
<DList Name="gKusaBushType2DL" Offset="0x7938" />
<Texture Name="gameplay_field_keep_Tex_0079D0" OutName="tex_0079D0" Format="i8" Width="64" Height="32" Offset="0x79D0" />
<Texture Name="gameplay_field_keep_Tex_0081D0" OutName="tex_0081D0" Format="ia8" Width="64" Height="32" Offset="0x81D0" />
<DList Name="gameplay_field_keep_DL_0089D0" Offset="0x89D0" />
assets/xml/objects/gameplay_keep.xml
+19 -19
View File
@@ -932,16 +932,16 @@
<Animation Name="gameplay_keep_Anim_022FF0" Offset="0x22FF0" />
<Collision Name="gDoorCol" Offset="0x23100" />
<DList Name="gEffDustDL" Offset="0x23130" />
<DList Name="gOwlStatueWhiteFlashDL" Offset="0x23210" />
<DList Name="gameplay_keep_DL_023288" Offset="0x23288" />
<DList Name="gLightOrb1DL" Offset="0x23348" />
<DList Name="gLightOrb2DL" Offset="0x233B8" />
<DList Name="gLightOrbVtxDL" Offset="0x23428" />
<DList Name="gElectricSparkDL" Offset="0x23480" />
<DList Name="gElectricSparkVtxDL" Offset="0x234F0" />
<Texture Name="gLightOrbTex" OutName="light_orb" Format="i8" Width="64" Height="64" Offset="0x23508" />
<DList Name="gEffFlash1DL" Offset="0x23210" />
<DList Name="gEffFlash2DL" Offset="0x23288" />
<DList Name="gLightOrbMaterial1DL" Offset="0x23348" />
<DList Name="gLightOrbMaterial2DL" Offset="0x233B8" />
<DList Name="gLightOrbModelDL" Offset="0x23428" />
<DList Name="gElectricSparkMaterialDL" Offset="0x23480" />
<DList Name="gElectricSparkModelDL" Offset="0x234F0" />
<Texture Name="gFlashTex" OutName="flash" Format="i8" Width="64" Height="64" Offset="0x23508" />
<!-- EnMThunder (Spin Attack and Sword Beams)-->
<!-- EnMThunder (Spin Attack and Sword Beams) -->
<!-- Spin Attack -->
<Texture Name="gSpinAttack1Tex" OutName="spin_attack_1" Format="i8" Width="64" Height="32" Offset="0x24510" />
<Texture Name="gSpinAttack2Tex" OutName="spin_attack_2" Format="i8" Width="64" Height="32" Offset="0x24D10" />
@@ -1039,14 +1039,14 @@
<Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x2F100" />
<DList Name="gEffShockwaveDL" Offset="0x30100" />
<DList Name="gEffBubbleDL" Offset="0x301B0" />
<Texture Name="gEffFireFootprint1Tex" OutName="tex_030270" Format="ia8" Width="32" Height="32" Offset="0x30270" />
<Texture Name="gEffFireFootprint2Tex" OutName="tex_030670" Format="ia8" Width="32" Height="32" Offset="0x30670" />
<Texture Name="gEffFireFootprint3Tex" OutName="tex_030A70" Format="ia8" Width="32" Height="32" Offset="0x30A70" />
<Texture Name="gEffFireFootprint4Tex" OutName="tex_030E70" Format="ia8" Width="32" Height="32" Offset="0x30E70" />
<Texture Name="gEffFireFootprint5Tex" OutName="tex_031270" Format="ia8" Width="32" Height="32" Offset="0x31270" />
<Texture Name="gEffFireFootprint6Tex" OutName="tex_031670" Format="ia8" Width="32" Height="32" Offset="0x31670" />
<Texture Name="gEffFireFootprint7Tex" OutName="tex_031A70" Format="ia8" Width="32" Height="32" Offset="0x31A70" />
<Texture Name="gEffFireFootprint8Tex" OutName="tex_031E70" Format="ia8" Width="32" Height="32" Offset="0x31E70" />
<Texture Name="gEffFireFootprint1Tex" OutName="eff_fire_footprint_1" Format="ia8" Width="32" Height="32" Offset="0x30270" />
<Texture Name="gEffFireFootprint2Tex" OutName="eff_fire_footprint_2" Format="ia8" Width="32" Height="32" Offset="0x30670" />
<Texture Name="gEffFireFootprint3Tex" OutName="eff_fire_footprint_3" Format="ia8" Width="32" Height="32" Offset="0x30A70" />
<Texture Name="gEffFireFootprint4Tex" OutName="eff_fire_footprint_4" Format="ia8" Width="32" Height="32" Offset="0x30E70" />
<Texture Name="gEffFireFootprint5Tex" OutName="eff_fire_footprint_5" Format="ia8" Width="32" Height="32" Offset="0x31270" />
<Texture Name="gEffFireFootprint6Tex" OutName="eff_fire_footprint_6" Format="ia8" Width="32" Height="32" Offset="0x31670" />
<Texture Name="gEffFireFootprint7Tex" OutName="eff_fire_footprint_7" Format="ia8" Width="32" Height="32" Offset="0x31A70" />
<Texture Name="gEffFireFootprint8Tex" OutName="eff_fire_footprint_8" Format="ia8" Width="32" Height="32" Offset="0x31E70" />
<DList Name="gEffFireFootprintDL" Offset="0x32270" />
<Texture Name="gameplay_keep_Tex_032310" OutName="tex_032310" Format="rgba32" Width="16" Height="64" Offset="0x32310" />
<Texture Name="gEffHitmarkWhiteMetal1Tex" OutName="eff_hitmark_white_metal_1" Format="i4" Width="32" Height="24" Offset="0x33310" />
@@ -1154,8 +1154,8 @@
<DList Name="gEffIceFragment3DL" Offset="0x50D10" />
<Texture Name="gEffIceSmokeTex" OutName="eff_ice_smoke" Format="i4" Width="32" Height="32" Offset="0x50E80" />
<DList Name="gEffIceSmokeDL" Offset="0x510B0" />
<DList Name="gFrozenSteamDL" Offset="0x51180" />
<DList Name="gFrozenSteamVtxDL" Offset="0x51238" />
<DList Name="gFrozenSteamMaterialDL" Offset="0x51180" />
<DList Name="gFrozenSteamModelDL" Offset="0x51238" />
<Animation Name="gameplay_keep_Anim_05140C" Offset="0x5140C" />
<DList Name="gameplay_keep_DL_051420" Offset="0x51420" />
<DList Name="gameplay_keep_DL_0514C0" Offset="0x514C0" />
assets/xml/objects/object_bigslime.xml
+3 -3
View File
@@ -101,12 +101,12 @@
<Texture Name="gBigslimeShockwave2Tex" OutName="bigslime_shockwave_2" Format="i4" Width="16" Height="16" Offset="0x10428" />
<Blob Name="object_bigslime_zeroes_Blob_0104A8" Size="0x88" Offset="0x104A8" />
<DList Name="gBigslimeNormalDL" Offset="0x10530" />
<DList Name="gBigslimeNormalMaterialDL" Offset="0x10530" />
<!-- Reads vtx from segment 9 set by sBigslimeDynamicVtx -->
<DList Name="gBigslimeVtxDL" Offset="0x105E8" />
<DList Name="gBigslimeModelDL" Offset="0x105E8" />
<!-- Reads vtx from segment 9 set by sBigslimeTargetVtx -->
<DList Name="gBigslimeFrozenVtxDL" Offset="0x10B80" />
<DList Name="gBigslimeFrozenMaterialDL" Offset="0x10B80" />
<TextureAnimation Name="gBigslimeFrozenTexAnim" Offset="0x10C48" />
<DList Name="gMinislimeFrozenDL" Offset="0x10DB0" />
assets/xml/objects/object_eg.xml
+150 -102
View File
@@ -1,106 +1,154 @@
<Root>
<!-- Assets for the Eyegore enemy and associated props -->
<File Name="object_eg" Segment="6">
<DList Name="object_eg_DL_000040" Offset="0x40" />
<Texture Name="object_eg_Tex_0000C0" OutName="tex_0000C0" Format="ia8" Width="64" Height="64" Offset="0xC0" />
<!-- <Blob Name="object_eg_Blob_0010C0" Size="0x10" Offset="0x10C0" /> -->
<DList Name="object_eg_DL_001170" Offset="0x1170" />
<Texture Name="object_eg_Tex_001210" OutName="tex_001210" Format="rgba16" Width="8" Height="16" Offset="0x1210" />
<DList Name="object_eg_DL_0013B0" Offset="0x13B0" />
<Texture Name="object_eg_Tex_001450" OutName="tex_001450" Format="rgba16" Width="8" Height="16" Offset="0x1450" />
<DList Name="object_eg_DL_001690" Offset="0x1690" />
<DList Name="object_eg_DL_001698" Offset="0x1698" />
<Collision Name="object_eg_Colheader_001820" Offset="0x1820" />
<DList Name="object_eg_DL_001910" Offset="0x1910" />
<DList Name="object_eg_DL_001918" Offset="0x1918" />
<Texture Name="object_eg_Tex_0019B0" OutName="tex_0019B0" Format="rgba16" Width="16" Height="16" Offset="0x19B0" />
<!-- <Blob Name="object_eg_Blob_001BB0" Size="0x10" Offset="0x1BB0" /> -->
<DList Name="object_eg_DL_001BF0" Offset="0x1BF0" />
<DList Name="object_eg_DL_001BF8" Offset="0x1BF8" />
<Texture Name="object_eg_Tex_001C78" OutName="tex_001C78" Format="rgba16" Width="16" Height="16" Offset="0x1C78" />
<!-- <Blob Name="object_eg_Blob_001E80" Size="0x18" Offset="0x1E80" /> -->
<Animation Name="object_eg_Anim_002460" Offset="0x2460" />
<!-- <Blob Name="object_eg_Blob_002470" Size="0x1D00" Offset="0x2470" /> -->
<DList Name="object_eg_DL_0041F0" Offset="0x41F0" />
<!-- <Blob Name="object_eg_Blob_004280" Size="0xE80" Offset="0x4280" /> -->
<Texture Name="object_eg_Tex_005100" OutName="tex_005100" Format="rgba16" Width="8" Height="8" Offset="0x5100" />
<!-- <Blob Name="object_eg_Blob_005180" Size="0x800" Offset="0x5180" /> -->
<DList Name="object_eg_DL_007C80" Offset="0x7C80" />
<DList Name="object_eg_DL_007DF8" Offset="0x7DF8" />
<DList Name="object_eg_DL_007EB0" Offset="0x7EB0" />
<DList Name="object_eg_DL_007FF0" Offset="0x7FF0" />
<DList Name="object_eg_DL_008180" Offset="0x8180" />
<DList Name="object_eg_DL_0082F0" Offset="0x82F0" />
<DList Name="object_eg_DL_008430" Offset="0x8430" />
<DList Name="object_eg_DL_0085C0" Offset="0x85C0" />
<DList Name="object_eg_DL_008730" Offset="0x8730" />
<DList Name="object_eg_DL_0088E0" Offset="0x88E0" />
<DList Name="object_eg_DL_0089F8" Offset="0x89F8" />
<DList Name="object_eg_DL_008A40" Offset="0x8A40" />
<DList Name="object_eg_DL_008A88" Offset="0x8A88" />
<DList Name="object_eg_DL_008B28" Offset="0x8B28" />
<DList Name="object_eg_DL_008C28" Offset="0x8C28" />
<DList Name="object_eg_DL_008D28" Offset="0x8D28" />
<DList Name="object_eg_DL_008E40" Offset="0x8E40" />
<DList Name="object_eg_DL_008ED8" Offset="0x8ED8" />
<DList Name="object_eg_DL_0090A0" Offset="0x90A0" />
<DList Name="object_eg_DL_0091B8" Offset="0x91B8" />
<DList Name="object_eg_DL_009250" Offset="0x9250" />
<DList Name="object_eg_DL_009418" Offset="0x9418" />
<TextureAnimation Name="object_eg_Matanimheader_0094E4" Offset="0x94E4" />
<Limb Name="object_eg_Standardlimb_0094F4" Type="Standard" EnumName="OBJECT_EG_LIMB_01" Offset="0x94F4" />
<Limb Name="object_eg_Standardlimb_009500" Type="Standard" EnumName="OBJECT_EG_LIMB_02" Offset="0x9500" />
<Limb Name="object_eg_Standardlimb_00950C" Type="Standard" EnumName="OBJECT_EG_LIMB_03" Offset="0x950C" />
<Limb Name="object_eg_Standardlimb_009518" Type="Standard" EnumName="OBJECT_EG_LIMB_04" Offset="0x9518" />
<Limb Name="object_eg_Standardlimb_009524" Type="Standard" EnumName="OBJECT_EG_LIMB_05" Offset="0x9524" />
<Limb Name="object_eg_Standardlimb_009530" Type="Standard" EnumName="OBJECT_EG_LIMB_06" Offset="0x9530" />
<Limb Name="object_eg_Standardlimb_00953C" Type="Standard" EnumName="OBJECT_EG_LIMB_07" Offset="0x953C" />
<Limb Name="object_eg_Standardlimb_009548" Type="Standard" EnumName="OBJECT_EG_LIMB_08" Offset="0x9548" />
<Limb Name="object_eg_Standardlimb_009554" Type="Standard" EnumName="OBJECT_EG_LIMB_09" Offset="0x9554" />
<Limb Name="object_eg_Standardlimb_009560" Type="Standard" EnumName="OBJECT_EG_LIMB_0A" Offset="0x9560" />
<Limb Name="object_eg_Standardlimb_00956C" Type="Standard" EnumName="OBJECT_EG_LIMB_0B" Offset="0x956C" />
<Limb Name="object_eg_Standardlimb_009578" Type="Standard" EnumName="OBJECT_EG_LIMB_0C" Offset="0x9578" />
<Limb Name="object_eg_Standardlimb_009584" Type="Standard" EnumName="OBJECT_EG_LIMB_0D" Offset="0x9584" />
<Limb Name="object_eg_Standardlimb_009590" Type="Standard" EnumName="OBJECT_EG_LIMB_0E" Offset="0x9590" />
<Limb Name="object_eg_Standardlimb_00959C" Type="Standard" EnumName="OBJECT_EG_LIMB_0F" Offset="0x959C" />
<Limb Name="object_eg_Standardlimb_0095A8" Type="Standard" EnumName="OBJECT_EG_LIMB_10" Offset="0x95A8" />
<Limb Name="object_eg_Standardlimb_0095B4" Type="Standard" EnumName="OBJECT_EG_LIMB_11" Offset="0x95B4" />
<Limb Name="object_eg_Standardlimb_0095C0" Type="Standard" EnumName="OBJECT_EG_LIMB_12" Offset="0x95C0" />
<Limb Name="object_eg_Standardlimb_0095CC" Type="Standard" EnumName="OBJECT_EG_LIMB_13" Offset="0x95CC" />
<Limb Name="object_eg_Standardlimb_0095D8" Type="Standard" EnumName="OBJECT_EG_LIMB_14" Offset="0x95D8" />
<Limb Name="object_eg_Standardlimb_0095E4" Type="Standard" EnumName="OBJECT_EG_LIMB_15" Offset="0x95E4" />
<Limb Name="object_eg_Standardlimb_0095F0" Type="Standard" EnumName="OBJECT_EG_LIMB_16" Offset="0x95F0" />
<Limb Name="object_eg_Standardlimb_0095FC" Type="Standard" EnumName="OBJECT_EG_LIMB_17" Offset="0x95FC" />
<Skeleton Name="object_eg_Skel_009664" Type="Flex" LimbType="Standard" LimbNone="OBJECT_EG_LIMB_NONE" LimbMax="OBJECT_EG_LIMB_MAX" EnumName="ObjectEgLimb" Offset="0x9664" />
<Animation Name="object_eg_Anim_009D2C" Offset="0x9D2C" />
<Animation Name="object_eg_Anim_00A204" Offset="0xA204" />
<Animation Name="object_eg_Anim_00A484" Offset="0xA484" />
<Animation Name="object_eg_Anim_00A73C" Offset="0xA73C" />
<Animation Name="object_eg_Anim_00ADF8" Offset="0xADF8" />
<Animation Name="object_eg_Anim_00BC60" Offset="0xBC60" />
<Animation Name="object_eg_Anim_00BEB8" Offset="0xBEB8" />
<Animation Name="object_eg_Anim_00C434" Offset="0xC434" />
<Animation Name="object_eg_Anim_00C9B4" Offset="0xC9B4" />
<Animation Name="object_eg_Anim_00CC4C" Offset="0xCC4C" />
<Animation Name="object_eg_Anim_00CE54" Offset="0xCE54" />
<Animation Name="object_eg_Anim_00D3D8" Offset="0xD3D8" />
<DList Name="object_eg_DL_00DCC0" Offset="0xDCC0" />
<Texture Name="object_eg_Tex_00DEA8" OutName="tex_00DEA8" Format="i4" Width="64" Height="64" Offset="0xDEA8" />
<Animation Name="object_eg_Anim_00EA10" Offset="0xEA10" />
<Animation Name="object_eg_Anim_00EE4C" Offset="0xEE4C" />
<Animation Name="object_eg_Anim_00F524" Offset="0xF524" />
<Animation Name="object_eg_Anim_00FB0C" Offset="0xFB0C" />
<Animation Name="object_eg_Anim_0100C0" Offset="0x100C0" />
<DList Name="object_eg_DL_010240" Offset="0x10240" />
<Texture Name="object_eg_Tex_010310" OutName="tex_010310" Format="rgba16" Width="36" Height="36" Offset="0x10310" />
<!-- <Blob Name="object_eg_Blob_010D30" Size="0x1000" Offset="0x10D30" /> -->
<Texture Name="object_eg_Tex_011D30" OutName="tex_011D30" Format="rgba16" Width="8" Height="16" Offset="0x11D30" />
<Texture Name="object_eg_Tex_011E30" OutName="tex_011E30" Format="rgba16" Width="16" Height="16" Offset="0x11E30" />
<Texture Name="object_eg_Tex_012030" OutName="tex_012030" Format="rgba16" Width="4" Height="4" Offset="0x12030" />
<Texture Name="object_eg_Tex_012050" OutName="tex_012050" Format="rgba16" Width="8" Height="16" Offset="0x12050" />
<Texture Name="object_eg_Tex_012150" OutName="tex_012150" Format="rgba16" Width="8" Height="8" Offset="0x12150" />
<Texture Name="object_eg_Tex_0121D0" OutName="tex_0121D0" Format="i4" Width="16" Height="32" Offset="0x121D0" />
<Texture Name="object_eg_Tex_0122D0" OutName="tex_0122D0" Format="rgba16" Width="16" Height="32" Offset="0x122D0" />
<!-- <Blob Name="object_eg_Blob_0126D0" Size="0xA20" Offset="0x126D0" /> -->
<Texture Name="object_eg_Tex_0130F0" OutName="tex_0130F0" Format="i4" Width="16" Height="32" Offset="0x130F0" />
<!-- Display lists and textures for Eyegore's effects -->
<DList Name="gEyegoreEffectImpactDL" Offset="0x40" />
<Texture Name="gEyegoreEffectImpactTex" OutName="eyegore_effect_impact" Format="ia8" Width="64" Height="64" Offset="0xC0" />
<TextureAnimation Name="gEyegoreEmpty1TexAnim" Offset="0x10C0" />
<DList Name="gEyegoreEffectLargeBodyPieceDL" Offset="0x1170" />
<Texture Name="gEyegoreEffectLargeBodyPieceTex" OutName="eyegore_effect_large_piece" Format="rgba16" Width="8" Height="16" Offset="0x1210" />
<DList Name="gEyegoreEffectSmallBodyPieceDL" Offset="0x13B0" />
<Texture Name="gEyegoreEffectSmallBodyPieceTex" OutName="eyegore_effect_small_piece" Format="rgba16" Width="8" Height="16" Offset="0x1450" />
<DList Name="gEyegoreEmpty1DL" Offset="0x1690" />
<!-- Assets for Eyegore's destructible pillars (unused) -->
<DList Name="gEyegoreBlockDL" Offset="0x1698" />
<Collision Name="gEyegoreBlockCol" Offset="0x1820" />
<DList Name="gEyegoreEmpty2DL" Offset="0x1910" />
<DList Name="gEyegoreEffectSolidDebrisDL" Offset="0x1918" />
<Texture Name="gEyegoreEffectSolidDebrisTex" OutName="eyegore_effect_solid_debris" Format="rgba16" Width="16" Height="16" Offset="0x19B0" />
<TextureAnimation Name="gEyegoreEmpty2TexAnim" Offset="0x1BB0" />
<DList Name="gEyegoreEmpty3DL" Offset="0x1BF0" />
<DList Name="gEyegoreEffectFlatDebrisDL" Offset="0x1BF8" />
<Texture Name="gEyegoreEffectFlatDebrisTex" OutName="eyegore_effect_flat_debris" Format="rgba16" Width="16" Height="16" Offset="0x1C78" />
<TextureAnimation Name="gEyegoreEmpty3TexAnim" Offset="0x1E80" />
<!-- Slam attack animation -->
<Animation Name="gEyegoreSlamAnim" Offset="0x2460" />
<!-- Unused vertex mesh. Purpose unknown. -->
<Array Name="gEyegoreUnusedVtx" Count="464" Offset="0x2470"> <!-- type is uncertain -->
<Vtx/>
</Array>
<!-- Display list for Eyegore's laser attack -->
<DList Name="gEyegoreLaserDL" Offset="0x41F0" />
<!-- Several unused textures. Purpose unknown. -->
<Texture Name="gEyegoreUnusedUnknown1Tex" OutName="eyegore_unused_unknown_1" Format="rgba16" Width="8" Height="8" Offset="0x4280" /> <!-- unused -->
<Texture Name="gEyegoreUnusedUnknown2Tex" OutName="eyegore_unused_unknown_2" Format="i4" Width="16" Height="32" Offset="0x4300" /> <!-- type is uncertain -->
<Texture Name="gEyegoreUnusedUnknown3Tex" OutName="eyegore_unused_unknown_3" Format="rgba16" Width="16" Height="32" Offset="0x4400" /> <!-- unused -->
<Texture Name="gEyegoreUnusedUnknown4Tex" OutName="eyegore_unused_unknown_4" Format="rgba16" Width="16" Height="8" Offset="0x4800" /> <!-- unused -->
<Texture Name="gEyegoreUnusedUnknown5Tex" OutName="eyegore_unused_unknown_5" Format="rgba16" Width="16" Height="16" Offset="0x4900" /> <!-- unused -->
<Texture Name="gEyegoreUnusedEyeTex" OutName="eyegore_unused_eye" Format="rgba16" Width="32" Height="16" Offset="0x4B00" /> <!-- unused -->
<Texture Name="gEyegoreUnusedUnknown6Tex" OutName="eyegore_unused_unknown_6" Format="rgba16" Width="16" Height="16" Offset="0x4F00" /> <!-- unused -->
<!-- Animated texture for Eyegore's laser attack. Uses gEyegoreEyeLaserTexAnim. -->
<Texture Name="gEyegoreLaserTex" OutName="eyegore_laser" Format="rgba16" Width="8" Height="8" Offset="0x5100" />
<!-- Unused teeth texture. Purpose unknown. -->
<Texture Name="gEyegoreUnusedTeethTex" OutName="eyegore_unused_teeth" Format="rgba16" Width="32" Height="32" Offset="0x5180" /> <!-- unused -->
<!-- Eyegore limb display lists -->
<DList Name="gEyegoreHipsDL" Offset="0x7C80" />
<DList Name="gEyegoreFauldsDL" Offset="0x7DF8" />
<DList Name="gEyegoreRightShinDL" Offset="0x7EB0" />
<DList Name="gEyegoreRightFootDL" Offset="0x7FF0" />
<DList Name="gEyegoreRightThighDL" Offset="0x8180" />
<DList Name="gEyegoreLeftShinDL" Offset="0x82F0" />
<DList Name="gEyegoreLeftFootDL" Offset="0x8430" />
<DList Name="gEyegoreLeftThighDL" Offset="0x85C0" />
<DList Name="gEyegoreHeadDL" Offset="0x8730" />
<DList Name="gEyegoreEyeballDL" Offset="0x88E0" />
<DList Name="gEyegoreEyeColliderLimbDL" Offset="0x89F8" />
<DList Name="gEyegoreLaserAttachLimbDL" Offset="0x8A40" />
<DList Name="gEyegorePupilDL" Offset="0x8A88" />
<DList Name="gEyegoreLowerEyelidDL" Offset="0x8B28" />
<DList Name="gEyegoreUpperEyelidDL" Offset="0x8C28" />
<DList Name="gEyegoreRightHandDL" Offset="0x8D28" />
<DList Name="gEyegoreRightShoulderDL" Offset="0x8E40" />
<DList Name="gEyegoreRightArmDL" Offset="0x8ED8" />
<DList Name="gEyegoreLeftHandDL" Offset="0x90A0" />
<DList Name="gEyegoreLeftShoulderDL" Offset="0x91B8" />
<DList Name="gEyegoreLeftArmDL" Offset="0x9250" />
<DList Name="gEyegoreTorsoDL" Offset="0x9418" />
<!-- Texture animation for Eyegore's eye and laser -->
<TextureAnimation Name="gEyegoreEyeLaserTexAnim" Offset="0x94E4" />
<!-- Eyegore limbs -->
<Limb Name="gEyegoreRootLimb" Type="Standard" EnumName="EYEGORE_LIMB_ROOT" Offset="0x94F4" />
<Limb Name="gEyegoreTorsoLimb" Type="Standard" EnumName="EYEGORE_LIMB_TORSO" Offset="0x9500" />
<Limb Name="gEyegoreHeadLimb" Type="Standard" EnumName="EYEGORE_LIMB_HEAD" Offset="0x950C" />
<Limb Name="gEyegoreLeftShoulderLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_SHOULDER" Offset="0x9518" />
<Limb Name="gEyegoreLeftArmLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_ARM" Offset="0x9524" />
<Limb Name="gEyegoreLeftHandLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_HAND" Offset="0x9530" />
<Limb Name="gEyegoreRightShoulderLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_SHOULDER" Offset="0x953C" />
<Limb Name="gEyegoreRightArmLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_ARM" Offset="0x9548" />
<Limb Name="gEyegoreRightHandLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_HAND" Offset="0x9554" />
<Limb Name="gEyegoreUpperEyelidLimb" Type="Standard" EnumName="EYEGORE_LIMB_UPPER_EYELID" Offset="0x9560" />
<Limb Name="gEyegoreLowerEyelidLimb" Type="Standard" EnumName="EYEGORE_LIMB_LOWER_EYELID" Offset="0x956C" />
<Limb Name="gEyegorePupilLimb" Type="Standard" EnumName="EYEGORE_LIMB_PUPIL" Offset="0x9578" />
<Limb Name="gEyegoreLaserAttachLimb" Type="Standard" EnumName="EYEGORE_LIMB_LASER_ATTACH" Offset="0x9584" />
<Limb Name="gEyegoreEyeColliderLimb" Type="Standard" EnumName="EYEGORE_LIMB_EYE_COLLIDER" Offset="0x9590" />
<Limb Name="gEyegoreEyeballLimb" Type="Standard" EnumName="EYEGORE_LIMB_EYEBALL" Offset="0x959C" />
<Limb Name="gEyegoreHipsLimb" Type="Standard" EnumName="EYEGORE_LIMB_HIPS" Offset="0x95A8" />
<Limb Name="gEyegoreLeftThighLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_THIGH" Offset="0x95B4" />
<Limb Name="gEyegoreLeftShinLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_SHIN" Offset="0x95C0" />
<Limb Name="gEyegoreLeftFootLimb" Type="Standard" EnumName="EYEGORE_LIMB_LEFT_FOOT" Offset="0x95CC" />
<Limb Name="gEyegoreRightThighLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_THIGH" Offset="0x95D8" />
<Limb Name="gEyegoreRightShinLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_SHIN" Offset="0x95E4" />
<Limb Name="gEyegoreRightFootLimb" Type="Standard" EnumName="EYEGORE_LIMB_RIGHT_FOOT" Offset="0x95F0" />
<Limb Name="gEyegoreFauldsLimb" Type="Standard" EnumName="EYEGORE_LIMB_FAULDS" Offset="0x95FC" />
<!-- Eyegore skeleton -->
<Skeleton Name="gEyegoreSkel" Type="Flex" LimbType="Standard" LimbNone="EYEGORE_LIMB_NONE" LimbMax="EYEGORE_LIMB_MAX" EnumName="EyegoreLimb" Offset="0x9664" />
<!-- Various fight animations -->
<Animation Name="gEyegoreSlamWaitAnim" Offset="0x9D2C" />
<Animation Name="gEyegoreSlamEndAnim" Offset="0xA204" />
<Animation Name="gEyegoreLaserAnim" Offset="0xA484" />
<Animation Name="gEyegoreUnusedLaserEndAnim" Offset="0xA73C" />
<Animation Name="gEyegoreDamagedAnim" Offset="0xADF8" />
<Animation Name="gEyegoreDeathAnim" Offset="0xBC60" />
<Animation Name="gEyegoreRetreatAnim" Offset="0xBEB8" />
<Animation Name="gEyegoreLeftPunchAnim" Offset="0xC434" />
<Animation Name="gEyegoreRightPunchAnim" Offset="0xC9B4" />
<Animation Name="gEyegoreStunnedAnim" Offset="0xCC4C" />
<Animation Name="gEyegoreStunEndAnim" Offset="0xCE54" />
<Animation Name="gEyegoreSitAnim" Offset="0xD3D8" />
<!-- Unused stone display list and texture. Could be prototype of final stone assets. -->
<DList Name="gEyegoreUnusedStoneDL" Offset="0xDCC0" />
<Texture Name="gEyegoreUnusedStoneTex" OutName="eyegore_unused_stone" Format="i4" Width="64" Height="64" Offset="0xDEA8" />
<!-- Various walking and idle animations. Contains several unused ones. -->
<Animation Name="gEyegoreUnusedChaseAnim" Offset="0xEA10" />
<Animation Name="gEyegoreStandAnim" Offset="0xEE4C" />
<Animation Name="gEyegoreUnusedWalkAnim" Offset="0xF524" />
<Animation Name="gEyegoreUnusedIdleAnim" Offset="0xFB0C" />
<Animation Name="gEyegoreWalkAnim" Offset="0x100C0" />
<!-- Display list and texture for the stones created by Eyegore's attacks -->
<DList Name="gEyegoreStoneDL" Offset="0x10240" />
<Texture Name="gEyegoreStoneTex" OutName="eyegore_stone" Format="rgba16" Width="36" Height="36" Offset="0x10310" />
<!-- Duplicate of gEyegoreEffectImpactTex -->
<Texture Name="gEyegoreDuplicateEffectImpactTex" OutName="eyegore_duplicate_effect_impact" Format="ia8" Width="64" Height="64" Offset="0x10D30" />
<!-- Textures for Eyegore's body -->
<Texture Name="gEyegoreDarkBodyTex" OutName="eyegore_dark_body" Format="rgba16" Width="8" Height="16" Offset="0x11D30" />
<Texture Name="gEyegoreBlockTex" OutName="eyegore_block" Format="rgba16" Width="16" Height="16" Offset="0x11E30" />
<Texture Name="gEyegoreClawTex" OutName="eyegore_claw" Format="rgba16" Width="4" Height="4" Offset="0x12030" />
<Texture Name="gEyegoreLightBodyTex" OutName="eyegore_light_body" Format="rgba16" Width="8" Height="16" Offset="0x12050" />
<Texture Name="gEyegoreArmorTex" OutName="eyegore_armor" Format="rgba16" Width="8" Height="8" Offset="0x12150" />
<Texture Name="gEyegoreHeadTex" OutName="eyegore_head" Format="i4" Width="16" Height="32" Offset="0x121D0" />
<Texture Name="gEyegorePupilTex" OutName="eyegore_pupil" Format="rgba16" Width="16" Height="32" Offset="0x122D0" />
<!-- Duplicate of gEyegoreStoneTex -->
<Texture Name="gEyegoreDuplicateStoneTex" OutName="eyegore_duplicate_stone" Format="rgba16" Width="36" Height="36" Offset="0x126D0" />
<!-- Animated texture for Eyegore's eye. Uses gEyegoreEyeLaserTexAnim. -->
<Texture Name="gEyegoreEyeballTex" OutName="eyegore_eyeball" Format="i4" Width="16" Height="32" Offset="0x130F0" />
</File>
</Root>
assets/xml/objects/object_fish.xml
+24 -24
View File
@@ -43,17 +43,17 @@
<Texture Name="object_fish_Tex_0030E0" OutName="tex_0030E0" Format="i4" Width="16" Height="16" Offset="0x30E0" />
<DList Name="gFishingStreamSplashDL" Offset="0x3230" />
<Texture Name="object_fish_Tex_003320" OutName="tex_003320" Format="ia8" Width="16" Height="16" Offset="0x3320" />
<DList Name="gFishingBubbleSetupDL" Offset="0x3460" />
<DList Name="gFishingBubbleVtxDL" Offset="0x34C0" />
<DList Name="gFishingBubbleMaterialDL" Offset="0x3460" />
<DList Name="gFishingBubbleModelDL" Offset="0x34C0" />
<Texture Name="object_fish_Tex_0034E0" OutName="tex_0034E0" Format="i8" Width="16" Height="16" Offset="0x34E0" />
<DList Name="gFishingDustSplashSetupDL" Offset="0x3610" />
<DList Name="gFishingDustSplashVtxDL" Offset="0x3680" />
<DList Name="gFishingDustSplashMaterialDL" Offset="0x3610" />
<DList Name="gFishingDustSplashModelDL" Offset="0x3680" />
<DList Name="object_fish_DL_0036E0" Offset="0x36E0" />
<DList Name="gFishingLineVtxDL" Offset="0x3710" />
<DList Name="gFishingRainDropVtxDL" Offset="0x3760" />
<DList Name="gFishingLineModelDL" Offset="0x3710" />
<DList Name="gFishingRainDropModelDL" Offset="0x3760" />
<Texture Name="object_fish_Tex_003778" OutName="tex_003778" Format="rgba16" Width="16" Height="16" Offset="0x3778" />
<DList Name="gFishingRainSplashSetupDL" Offset="0x39A8" />
<DList Name="gFishingRainSplashVtxDL" Offset="0x3A18" />
<DList Name="gFishingRainSplashMaterialDL" Offset="0x39A8" />
<DList Name="gFishingRainSplashModelDL" Offset="0x3A18" />
<Animation Name="gFishingOwnerAnim" Offset="0x453C" />
<DList Name="object_fish_DL_006F60" Offset="0x6F60" />
<DList Name="gFishingOwnerHairDL" Offset="0x7350" />
@@ -74,11 +74,11 @@
<Limb Name="object_fish_Standardlimb_0085C0" Type="Standard" EnumName="OBJECT_FISH_2_LIMB_07" Offset="0x85C0" />
<Limb Name="object_fish_Standardlimb_0085CC" Type="Standard" EnumName="OBJECT_FISH_2_LIMB_08" Offset="0x85CC" />
<Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FISH_2_LIMB_NONE" LimbMax="OBJECT_FISH_2_LIMB_MAX" EnumName="ObjectFish2Limb" Offset="0x85F8" />
<DList Name="gFishingRippleSetupDL" Offset="0x8610" />
<DList Name="gFishingRippleVtxDL" Offset="0x8678" />
<DList Name="gFishingRippleMaterialDL" Offset="0x8610" />
<DList Name="gFishingRippleModelDL" Offset="0x8678" />
<Texture Name="object_fish_Tex_008690" OutName="tex_008690" Format="i4" Width="32" Height="32" Offset="0x8690" />
<DList Name="gFishingWaterDustSetupDL" Offset="0x88C0" />
<DList Name="gFishingWaterDustVtxDL" Offset="0x8970" />
<DList Name="gFishingWaterDustMaterialDL" Offset="0x88C0" />
<DList Name="gFishingWaterDustModelDL" Offset="0x8970" />
<Texture Name="object_fish_TLUT_008990" OutName="tlut_008990" Format="rgba16" Width="16" Height="16" Offset="0x8990" />
<Texture Name="object_fish_Tex_008B90" OutName="tex_008B90" Format="ci8" Width="8" Height="8" Offset="0x8B90" />
<Texture Name="object_fish_Tex_008BD0" OutName="tex_008BD0" Format="ci8" Width="16" Height="16" Offset="0x8BD0" />
@@ -95,11 +95,11 @@
<Texture Name="object_fish_Tex_00A790" OutName="tex_00A790" Format="ci8" Width="8" Height="16" Offset="0xA790" />
<Texture Name="object_fish_Tex_00A810" OutName="tex_00A810" Format="ci8" Width="16" Height="16" Offset="0xA810" />
<Texture Name="object_fish_Tex_00A910" OutName="tex_00A910" Format="ia8" Width="64" Height="64" Offset="0xA910" />
<DList Name="gFishingSinkingLureSegmentSetupDL" Offset="0xB950" />
<DList Name="gFishingSinkingLureSegmentVtxDL" Offset="0xB9C0" />
<DList Name="gFishingSinkingLureSegmentMaterialDL" Offset="0xB950" />
<DList Name="gFishingSinkingLureSegmentModelDL" Offset="0xB9C0" />
<Texture Name="object_fish_Tex_00B9E0" OutName="tex_00B9E0" Format="rgba16" Width="64" Height="16" Offset="0xB9E0" />
<DList Name="gFishingGroupFishSetupDL" Offset="0xC220" />
<DList Name="gFishingGroupFishVtxDL" Offset="0xC298" />
<DList Name="gFishingGroupFishMaterialDL" Offset="0xC220" />
<DList Name="gFishingGroupFishModelDL" Offset="0xC298" />
<DList Name="object_fish_DL_00C650" Offset="0xC650" />
<Texture Name="object_fish_Tex_00C780" OutName="tex_00C780" Format="rgba16" Width="32" Height="32" Offset="0xC780" />
<Animation Name="gFishingLoachAnim" Offset="0xCFE0" />
@@ -144,15 +144,15 @@
<DList Name="gFishingLureFloatDL" Offset="0x121F0" />
<Texture Name="object_fish_Tex_0122E0" OutName="tex_0122E0" Format="rgba16" Width="32" Height="32" Offset="0x122E0" />
<Texture Name="object_fish_Tex_012AE0" OutName="tex_012AE0" Format="rgba16" Width="32" Height="32" Offset="0x12AE0" />
<DList Name="gFishingLilyPadSetupDL" Offset="0x13330" />
<DList Name="gFishingLilyPadVtxDL" Offset="0x133B0" />
<DList Name="gFishingRockSetupDL" Offset="0x13590" />
<DList Name="gFishingRockVtxDL" Offset="0x13610" />
<DList Name="gFishingLilyPadMaterialDL" Offset="0x13330" />
<DList Name="gFishingLilyPadModelDL" Offset="0x133B0" />
<DList Name="gFishingRockMaterialDL" Offset="0x13590" />
<DList Name="gFishingRockModelDL" Offset="0x13610" />
<Texture Name="object_fish_Tex_013660" OutName="tex_013660" Format="rgba16" Width="32" Height="32" Offset="0x13660" />
<DList Name="gFishingWoodPostSetupDL" Offset="0x13F50" />
<DList Name="gFishingWoodPostVtxDL" Offset="0x13FD0" />
<DList Name="gFishingReedSetupDL" Offset="0x14030" />
<DList Name="gFishingReedVtxDL" Offset="0x140B0" />
<DList Name="gFishingWoodPostMaterialDL" Offset="0x13F50" />
<DList Name="gFishingWoodPostModelDL" Offset="0x13FD0" />
<DList Name="gFishingReedMaterialDL" Offset="0x14030" />
<DList Name="gFishingReedModelDL" Offset="0x140B0" />
<Texture Name="object_fish_Tex_0140D0" OutName="tex_0140D0" Format="rgba16" Width="16" Height="16" Offset="0x140D0" />
<Texture Name="object_fish_Tex_0142D0" OutName="tex_0142D0" Format="rgba16" Width="32" Height="32" Offset="0x142D0" />
<Texture Name="object_fish_Tex_014AD0" OutName="tex_014AD0" Format="i8" Width="32" Height="32" Offset="0x14AD0" />
assets/xml/objects/object_ge1.xml
+1 -1
View File
@@ -38,7 +38,7 @@
<Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x2EB8" TlutOffset="0x2CB8" />
<Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x2EF8" TlutOffset="0x2CB8" />
<Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x2FF8" TlutOffset="0x2CB8" />
<!-- White-clothed Gerudo Eye Textures -->
<Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3078"/>
<Texture Name="gGerudoWhiteEyeHalfTex" OutName="gerudo_white_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x3878"/>
assets/xml/objects/object_ice_block.xml
+3 -3
View File
@@ -5,7 +5,7 @@
<DList Name="gIceBlockCubeEndDL" Offset="0x310" />
<!-- this TexAnim is for the cube surface -->
<TextureAnimation Name="gIceBlockCubeSublimatingAirTexAnim" Offset="0x328" />
<Collision Name="gIceBlockDynaColHeader" Offset="0x438" />
<Collision Name="gIceBlockCol" Offset="0x438" />
<!-- IceArrow Freezes Octarock into a floating Iceberg platform -->
<DList Name="gIceBlockIceBergDL" Offset="0x7F0" />
@@ -21,8 +21,8 @@
<!-- These two appear to be identical (but different hash) -->
<!-- first is used in CubeDL and ShardDL -->
<Texture Name="gIceBlockIceTex1" OutName="ice_texture_1" Format="i4" Width="64" Height="64" Offset="0xAE0" />
<Texture Name="gIceBlockIce1Tex" OutName="iceblock_ice_1" Format="i4" Width="64" Height="64" Offset="0xAE0" />
<!-- second is used in CubeDL and IceBergDL -->
<Texture Name="gIceBlockIceTex2" OutName="ice_texture_2" Format="i4" Width="64" Height="64" Offset="0x12E0" />
<Texture Name="gIceBlockIce2Tex" OutName="iceblock_ice_2" Format="i4" Width="64" Height="64" Offset="0x12E0" />
</File>
</Root>
assets/xml/objects/object_kz.xml
+33 -27
View File
@@ -12,6 +12,7 @@
<Animation Name="object_kz_Anim_004860" Offset="0x4860" />
<Animation Name="object_kz_Anim_005644" Offset="0x5644" />
<Animation Name="object_kz_Anim_0058B8" Offset="0x58B8" />
<Texture Name="object_kz_TLUT_0058D0" OutName="tlut_0058D0" Format="rgba16" Width="16" Height="16" Offset="0x58D0" />
<Texture Name="object_kz_Tex_005AD0" OutName="tex_005AD0" Format="ci8" Width="8" Height="8" Offset="0x5AD0" />
<Texture Name="object_kz_Tex_005B10" OutName="tex_005B10" Format="ci8" Width="8" Height="8" Offset="0x5B10" />
@@ -20,6 +21,7 @@
<Texture Name="object_kz_Tex_005D50" OutName="tex_005D50" Format="ci8" Width="16" Height="16" Offset="0x5D50" />
<Texture Name="object_kz_Tex_005E50" OutName="tex_005E50" Format="i8" Width="16" Height="16" Offset="0x5E50" />
<Texture Name="object_kz_Tex_005F50" OutName="tex_005F50" Format="i8" Width="8" Height="16" Offset="0x5F50" />
<DList Name="object_kz_DL_007CB0" Offset="0x7CB0" />
<DList Name="object_kz_DL_008130" Offset="0x8130" />
<DList Name="object_kz_DL_008268" Offset="0x8268" />
@@ -30,19 +32,21 @@
<DList Name="object_kz_DL_008B10" Offset="0x8B10" />
<DList Name="object_kz_DL_008D80" Offset="0x8D80" />
<DList Name="object_kz_DL_008E80" Offset="0x8E80" />
<!-- <Texture Name="object_kz_TLUT_009100" OutName="tlut_009100" Format="rgba16" Width="16" Height="16" Offset="0x9100" /> -->
<!-- <Blob Name="object_kz_Blob_009300" Size="0x38" Offset="0x9300" /> -->
<Texture Name="object_kz_Tex_009338" OutName="tex_009338" Format="ci8" Width="8" Height="16" Offset="0x9338" />
<!-- <Blob Name="object_kz_Blob_0093B8" Size="0x400" Offset="0x93B8" /> -->
<Texture Name="gKaizokuEyeOpenTex" OutName="kaizoku_eye_open" Format="ci8" Width="32" Height="32" Offset="0x93B8" TlutOffset="0x9100" />
<Texture Name="object_kz_Tex_0097B8" OutName="tex_0097B8" Format="i8" Width="16" Height="16" Offset="0x97B8" />
<Texture Name="object_kz_Tex_0098B8" OutName="tex_0098B8" Format="ci8" Width="8" Height="16" Offset="0x98B8" />
<Texture Name="object_kz_Tex_009938" OutName="tex_009938" Format="ci8" Width="8" Height="8" Offset="0x9938" />
<!-- <Blob Name="object_kz_Blob_009978" Size="0x400" Offset="0x9978" /> -->
<Texture Name="gKaizokuEyeHalfTex" OutName="kaizoku_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9978" TlutOffset="0x9100" />
<Texture Name="object_kz_Tex_009D78" OutName="tex_009D78" Format="i8" Width="8" Height="16" Offset="0x9D78" />
<Texture Name="object_kz_Tex_009DF8" OutName="tex_009DF8" Format="ci8" Width="16" Height="16" Offset="0x9DF8" />
<Texture Name="object_kz_Tex_009EF8" OutName="tex_009EF8" Format="ci8" Width="16" Height="16" Offset="0x9EF8" />
<Texture Name="object_kz_Tex_009FF8" OutName="tex_009FF8" Format="ci8" Width="16" Height="16" Offset="0x9FF8" />
<!-- <Blob Name="object_kz_Blob_00A0F8" Size="0x400" Offset="0xA0F8" /> -->
<Texture Name="gKaizokuEyeClosedTex" OutName="kaizoku_eye_closed" Format="ci8" Width="32" Height="32" Offset="0xA0F8" TlutOffset="0x9100" />
<DList Name="object_kz_DL_00C318" Offset="0xC318" />
<DList Name="object_kz_DL_00C4D8" Offset="0xC4D8" />
<DList Name="object_kz_DL_00C698" Offset="0xC698" />
@@ -52,30 +56,32 @@
<DList Name="object_kz_DL_00CD78" Offset="0xCD78" />
<DList Name="object_kz_DL_00CE30" Offset="0xCE30" />
<DList Name="object_kz_DL_00CF20" Offset="0xCF20" />
<Limb Name="object_kz_Standardlimb_00D6B8" Type="Standard" EnumName="OBJECT_KZ_LIMB_01" Offset="0xD6B8" />
<Limb Name="object_kz_Standardlimb_00D6C4" Type="Standard" EnumName="OBJECT_KZ_LIMB_02" Offset="0xD6C4" />
<Limb Name="object_kz_Standardlimb_00D6D0" Type="Standard" EnumName="OBJECT_KZ_LIMB_03" Offset="0xD6D0" />
<Limb Name="object_kz_Standardlimb_00D6DC" Type="Standard" EnumName="OBJECT_KZ_LIMB_04" Offset="0xD6DC" />
<Limb Name="object_kz_Standardlimb_00D6E8" Type="Standard" EnumName="OBJECT_KZ_LIMB_05" Offset="0xD6E8" />
<Limb Name="object_kz_Standardlimb_00D6F4" Type="Standard" EnumName="OBJECT_KZ_LIMB_06" Offset="0xD6F4" />
<Limb Name="object_kz_Standardlimb_00D700" Type="Standard" EnumName="OBJECT_KZ_LIMB_07" Offset="0xD700" />
<Limb Name="object_kz_Standardlimb_00D70C" Type="Standard" EnumName="OBJECT_KZ_LIMB_08" Offset="0xD70C" />
<Limb Name="object_kz_Standardlimb_00D718" Type="Standard" EnumName="OBJECT_KZ_LIMB_09" Offset="0xD718" />
<Limb Name="object_kz_Standardlimb_00D724" Type="Standard" EnumName="OBJECT_KZ_LIMB_0A" Offset="0xD724" />
<Limb Name="object_kz_Standardlimb_00D730" Type="Standard" EnumName="OBJECT_KZ_LIMB_0B" Offset="0xD730" />
<Limb Name="object_kz_Standardlimb_00D73C" Type="Standard" EnumName="OBJECT_KZ_LIMB_0C" Offset="0xD73C" />
<Limb Name="object_kz_Standardlimb_00D748" Type="Standard" EnumName="OBJECT_KZ_LIMB_0D" Offset="0xD748" />
<Limb Name="object_kz_Standardlimb_00D754" Type="Standard" EnumName="OBJECT_KZ_LIMB_0E" Offset="0xD754" />
<Limb Name="object_kz_Standardlimb_00D760" Type="Standard" EnumName="OBJECT_KZ_LIMB_0F" Offset="0xD760" />
<Limb Name="object_kz_Standardlimb_00D76C" Type="Standard" EnumName="OBJECT_KZ_LIMB_10" Offset="0xD76C" />
<Limb Name="object_kz_Standardlimb_00D778" Type="Standard" EnumName="OBJECT_KZ_LIMB_11" Offset="0xD778" />
<Limb Name="object_kz_Standardlimb_00D784" Type="Standard" EnumName="OBJECT_KZ_LIMB_12" Offset="0xD784" />
<Limb Name="object_kz_Standardlimb_00D790" Type="Standard" EnumName="OBJECT_KZ_LIMB_13" Offset="0xD790" />
<Limb Name="object_kz_Standardlimb_00D79C" Type="Standard" EnumName="OBJECT_KZ_LIMB_14" Offset="0xD79C" />
<Limb Name="object_kz_Standardlimb_00D7A8" Type="Standard" EnumName="OBJECT_KZ_LIMB_15" Offset="0xD7A8" />
<Limb Name="object_kz_Standardlimb_00D7B4" Type="Standard" EnumName="OBJECT_KZ_LIMB_16" Offset="0xD7B4" />
<Limb Name="object_kz_Standardlimb_00D7C0" Type="Standard" EnumName="OBJECT_KZ_LIMB_17" Offset="0xD7C0" />
<Skeleton Name="object_kz_Skel_00D828" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KZ_LIMB_NONE" LimbMax="OBJECT_KZ_LIMB_MAX" EnumName="ObjectKzLimb" Offset="0xD828" />
<Limb Name="object_kz_Standardlimb_00D6B8" Type="Standard" EnumName="KAIZOKU_LIMB_01" Offset="0xD6B8" />
<Limb Name="object_kz_Standardlimb_00D6C4" Type="Standard" EnumName="KAIZOKU_LIMB_02" Offset="0xD6C4" />
<Limb Name="object_kz_Standardlimb_00D6D0" Type="Standard" EnumName="KAIZOKU_LIMB_03" Offset="0xD6D0" />
<Limb Name="object_kz_Standardlimb_00D6DC" Type="Standard" EnumName="KAIZOKU_LIMB_04" Offset="0xD6DC" />
<Limb Name="object_kz_Standardlimb_00D6E8" Type="Standard" EnumName="KAIZOKU_LIMB_05" Offset="0xD6E8" />
<Limb Name="object_kz_Standardlimb_00D6F4" Type="Standard" EnumName="KAIZOKU_LIMB_06" Offset="0xD6F4" />
<Limb Name="object_kz_Standardlimb_00D700" Type="Standard" EnumName="KAIZOKU_LIMB_07" Offset="0xD700" />
<Limb Name="object_kz_Standardlimb_00D70C" Type="Standard" EnumName="KAIZOKU_LIMB_08" Offset="0xD70C" />
<Limb Name="object_kz_Standardlimb_00D718" Type="Standard" EnumName="KAIZOKU_LIMB_09" Offset="0xD718" />
<Limb Name="object_kz_Standardlimb_00D724" Type="Standard" EnumName="KAIZOKU_LIMB_0A" Offset="0xD724" />
<Limb Name="object_kz_Standardlimb_00D730" Type="Standard" EnumName="KAIZOKU_LIMB_R_SWORD" Offset="0xD730" />
<Limb Name="object_kz_Standardlimb_00D73C" Type="Standard" EnumName="KAIZOKU_LIMB_0C" Offset="0xD73C" />
<Limb Name="object_kz_Standardlimb_00D748" Type="Standard" EnumName="KAIZOKU_LIMB_0D" Offset="0xD748" />
<Limb Name="object_kz_Standardlimb_00D754" Type="Standard" EnumName="KAIZOKU_LIMB_0E" Offset="0xD754" />
<Limb Name="object_kz_Standardlimb_00D760" Type="Standard" EnumName="KAIZOKU_LIMB_0F" Offset="0xD760" />
<Limb Name="object_kz_Standardlimb_00D76C" Type="Standard" EnumName="KAIZOKU_LIMB_10" Offset="0xD76C" />
<Limb Name="object_kz_Standardlimb_00D778" Type="Standard" EnumName="KAIZOKU_LIMB_11" Offset="0xD778" />
<Limb Name="object_kz_Standardlimb_00D784" Type="Standard" EnumName="KAIZOKU_LIMB_12" Offset="0xD784" />
<Limb Name="object_kz_Standardlimb_00D790" Type="Standard" EnumName="KAIZOKU_LIMB_L_FOOT" Offset="0xD790" />
<Limb Name="object_kz_Standardlimb_00D79C" Type="Standard" EnumName="KAIZOKU_LIMB_14" Offset="0xD79C" />
<Limb Name="object_kz_Standardlimb_00D7A8" Type="Standard" EnumName="KAIZOKU_LIMB_15" Offset="0xD7A8" />
<Limb Name="object_kz_Standardlimb_00D7B4" Type="Standard" EnumName="KAIZOKU_LIMB_R_FOOT" Offset="0xD7B4" />
<Limb Name="object_kz_Standardlimb_00D7C0" Type="Standard" EnumName="KAIZOKU_LIMB_17" Offset="0xD7C0" />
<Skeleton Name="gKaizokuSkel" Type="Flex" LimbType="Standard" LimbNone="KAIZOKU_LIMB_NONE" LimbMax="KAIZOKU_LIMB_MAX" EnumName="KaizokuLimb" Offset="0xD828" />
<Animation Name="object_kz_Anim_00DBE4" Offset="0xDBE4" />
<Animation Name="object_kz_Anim_00E1C8" Offset="0xE1C8" />
<Animation Name="object_kz_Anim_00E8BC" Offset="0xE8BC" />
assets/xml/objects/object_test3.xml
+12 -2
View File
@@ -7,7 +7,8 @@
<Texture Name="object_test3_Tex_000800" OutName="tex_000800" Format="ci8" Width="8" Height="8" Offset="0x800" />
<Texture Name="object_test3_Tex_000840" OutName="tex_000840" Format="ci8" Width="8" Height="16" Offset="0x840" />
<Texture Name="object_test3_Tex_0008C0" OutName="tex_0008C0" Format="ci8" Width="16" Height="16" Offset="0x8C0" />
<!-- <Blob Name="object_test3_Blob_0009C0" Size="0xC00" Offset="0x9C0" /> -->
<Texture Name="object_test3_Tex_0009C0" OutName="tex_0009C0" Format="ci8" Width="32" Height="32" Offset="0x9C0" />
<Texture Name="object_test3_Tex_000DC0" OutName="tex_000DC0" Format="ci8" Width="64" Height="32" Offset="0xDC0" />
<Texture Name="object_test3_Tex_0015C0" OutName="tex_0015C0" Format="ci8" Width="8" Height="16" Offset="0x15C0" />
<Texture Name="object_test3_Tex_001640" OutName="tex_001640" Format="ci8" Width="16" Height="16" Offset="0x1640" />
<Texture Name="object_test3_Tex_001740" OutName="tex_001740" Format="ci8" Width="32" Height="32" Offset="0x1740" />
@@ -17,7 +18,16 @@
<Texture Name="object_test3_Tex_002180" OutName="tex_002180" Format="rgba16" Width="32" Height="64" Offset="0x2180" />
<Texture Name="object_test3_Tex_003180" OutName="tex_003180" Format="ci8" Width="16" Height="64" Offset="0x3180" />
<Texture Name="object_test3_Tex_003580" OutName="tex_003580" Format="ci8" Width="16" Height="16" Offset="0x3580" />
<!-- <Blob Name="object_test3_Blob_003680" Size="0x4400" Offset="0x3680" /> -->
<Texture Name="object_test3_Tex_003680" OutName="tex_003680" Format="ci8" Width="64" Height="32" Offset="0x3680" />
<Texture Name="object_test3_Tex_003E80" OutName="tex_003E80" Format="ci8" Width="64" Height="32" Offset="0x3E80" />
<Texture Name="object_test3_Tex_004680" OutName="tex_004680" Format="ci8" Width="64" Height="32" Offset="0x4680" />
<Texture Name="object_test3_Tex_004E80" OutName="tex_004E80" Format="ci8" Width="64" Height="32" Offset="0x4E80" />
<Texture Name="object_test3_Tex_005680" OutName="tex_005680" Format="ci8" Width="64" Height="32" Offset="0x5680" />
<Texture Name="object_test3_Tex_005E80" OutName="tex_005E80" Format="ci8" Width="64" Height="32" Offset="0x5E80" />
<Texture Name="object_test3_Tex_006680" OutName="tex_006680" Format="ci8" Width="64" Height="32" Offset="0x6680" />
<Texture Name="object_test3_Tex_006E80" OutName="tex_006E80" Format="ci8" Width="32" Height="32" Offset="0x6E80" />
<Texture Name="object_test3_Tex_007280" OutName="tex_007280" Format="ci8" Width="32" Height="32" Offset="0x7280" />
<Texture Name="object_test3_Tex_007680" OutName="tex_007680" Format="ci8" Width="32" Height="32" Offset="0x7680" />
<DList Name="object_test3_DL_00BF10" Offset="0xBF10" />
<DList Name="object_test3_DL_00C198" Offset="0xC198" />
<DList Name="object_test3_DL_00C300" Offset="0xC300" />
include/PR/gbi.h
+2 -2
View File
@@ -4132,7 +4132,7 @@ _DW({ \
#define gDPLoadMultiTile(pkt, timg, tmem, rtile, fmt, siz, width, height,\
uls, ult, lrs, lrt, pal, \
cms, cmt, masks, maskt, shifts, shiftt) \
{ \
_DW({ \
gDPSetTextureImage(pkt, fmt, siz, width, timg); \
gDPSetTile(pkt, fmt, siz, \
(((((lrs)-(uls)+1) * siz##_TILE_BYTES)+7)>>3), tmem, \
@@ -4154,7 +4154,7 @@ _DW({ \
(ult)<<G_TEXTURE_IMAGE_FRAC, \
(lrs)<<G_TEXTURE_IMAGE_FRAC, \
(lrt)<<G_TEXTURE_IMAGE_FRAC); \
}
})
#define gsDPLoadTextureTile(timg, fmt, siz, width, height, \
include/alignment.h
+28
View File
@@ -0,0 +1,28 @@
#ifndef ALIGNMENT_H
#define ALIGNMENT_H
#define ALIGN8(val) (((val) + 7) & ~7)
#define ALIGN16(val) (((val) + 0xF) & ~0xF)
#define ALIGN32(val) (((val) + 0x1F) & ~0x1F)
#define ALIGN64(val) (((val) + 0x3F) & ~0x3F)
#define ALIGN256(val) (((val) + 0xFF) & ~0xFF)
#ifdef __GNUC__
#define ALIGNED8 __attribute__ ((aligned (8)))
#else
#define ALIGNED8
#endif
#ifdef __sgi /* IDO compiler */
#define ALIGNOF(x) __builtin_alignof(x)
#elif (__STDC_VERSION__ >= 201112L) /* C11 */
#define ALIGNOF(x) _Alignof(x)
#else /* __GNUC__ */
#define ALIGNOF(x) __alignof__(x)
#endif
#define ALIGN_MASK(n) (~((n) - 1))
#define ALIGNOF_MASK(x) ALIGN_MASK(ALIGNOF(x))
#endif
include/functions.h
+52 -52
View File
@@ -473,7 +473,7 @@ void func_800AE5A0(PlayState* play);
void func_800AE5E4(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3);
void func_800AE778(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3);
void func_800AE8EC(PlayState* play);
void func_800AE930(CollisionContext* colCtx, EffectTireMark* this, Vec3f* pos, f32 arg3, s16 arg4, CollisionPoly* colPoly, s32 arg6);
void func_800AE930(CollisionContext* colCtx, EffectTireMark* this, Vec3f* pos, f32 arg3, s16 angle, CollisionPoly* colPoly, s32 bgId);
void func_800AEF44(EffectTireMark* this);
void EffectTireMark_Init(void* thisx, void* initParamsx);
void EffectTireMark_Destroy(void* thisx);
@@ -549,24 +549,24 @@ void EffectSsDtBubble_SpawnCustomColor(PlayState* play, Vec3f* pos, Vec3f* veloc
void EffectSsHahen_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 flags, s16 scale, s16 objId, s16 life, Gfx* dList);
void EffectSsHahen_SpawnBurst(PlayState* play, Vec3f* pos, f32 burstScale, s16 flags, s16 scale, s16 randScaleRange, s16 count, s16 objId, s16 life, Gfx* dList);
// void func_800B2364(void);
// void EffectSsStick_Spawn(UNK_TYPE4 uParm1, UNK_PTR puParm2, UNK_TYPE2 uParm3);
void EffectSsStick_Spawn(PlayState* play, Vec3f* pos, s16 yaw);
// void EffectSsSibuki_Spawn(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7);
void EffectSsSibuki_SpawnBurst(PlayState* play, Vec3f* pos);
void EffectSsStone1_Spawn(PlayState* play, Vec3f* pos, s32 reg0);
void EffectSsHitmark_SpawnFixedScale(PlayState* play, s32 type, Vec3f* pos);
void EffectSsHitmark_SpawnCustomScale(PlayState* play, s32 type, s16 scale, Vec3f* pos);
void EffectSsFhgFlash_SpawnShock(PlayState* play, Actor* actor, Vec3f* pos, s16 scale, u8 params);
// void EffectSsKFire_Spawn(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE2 param_5, UNK_TYPE1 param_6);
void EffectSsKFire_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scaleMax, u8 type);
void EffectSsSolderSrchBall_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16* playerDetected, s16 flags);
void EffectSsKakera_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* arg3, s16 gravity, s16 arg5, s16 arg6, s16 arg7, s16 arg8, s16 scale, s16 arg10, s16 arg11, s32 life, s16 colorIdx, s16 objId, Gfx* dList);
// void EffectSsIcePiece_Spawn(UNK_TYPE4 uParm1, Vec3f* pzParm2, UNK_TYPE4 uParm3, Vec3f* pzParm4, Vec3f* param_5, UNK_TYPE4 param_6);
// void EffectSsIcePiece_SpawnBurst(void);
void EffectSsIcePiece_SpawnBurst(PlayState* play, Vec3f* refPos, f32 scale);
void func_800B2B44(PlayState* play, Actor* actor, Vec3f* pos, f32 scale);
// void func_800B2B7C(void);
void EffectSsEnIce_Spawn(PlayState* play, Vec3f* pos, f32 scale, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, Color_RGBA8* envColor, s32 life);
// void EffectSsFireTail_Spawn(UNK_TYPE4 uParm1, UNK_TYPE4 uParm2, Vec3f* pzParm3, UNK_TYPE4 uParm4, Vec3f* param_5, UNK_TYPE2 param_6, Color_RGBA8* param_7, Color_RGBA8* param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10, UNK_TYPE4 param_11);
// void EffectSsFireTail_SpawnFlame(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE4 param_6);
// void EffectSsFireTail_SpawnFlameOnPlayer(void);
void EffectSsFireTail_SpawnFlameOnPlayer(PlayState* play, f32 scale, s16 bodyPart, f32 colorIntensity);
void EffectSsEnFire_SpawnVec3f(PlayState* play, Actor* actor, Vec3f* pos, s16 scale, s16 params, s16 flags, s16 bodyPart);
// void EffectSsEnFire_SpawnVec3s(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7);
void EffectSsExtra_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scoreIdx);
@@ -656,7 +656,7 @@ s32 func_800B715C(PlayState* play);
void Actor_SetCameraHorseSetting(PlayState* play, Player* player);
void Actor_MountHorse(PlayState* play, Player* player, Actor* horse);
s32 func_800B724C(PlayState* play, Actor* actor, u8 csMode);
u32 func_800B7298(PlayState* play, Actor* actor, u8 csMode);
s32 func_800B7298(PlayState* play, Actor* actor, u8 csMode);
void func_800B72F8(DynaPolyActor* dyna, f32 extraPushForce, s16 yRotation);
s32 Player_IsFacingActor(Actor* actor, s16 maxAngleDiff, PlayState* play);
@@ -666,7 +666,7 @@ s32 Actor_ActorAIsFacingActorB(Actor* actorA, Actor* actorB, s16 maxAngleDiff);
s32 Actor_IsFacingAndNearPlayer(Actor* actor, f32 range, s16 maxAngleDiff);
s32 Actor_ActorAIsFacingAndNearActorB(Actor* actorA, Actor* actorB, f32 range, s16 maxAngleDiff);
void func_800B75A0(CollisionPoly* poly, Vec3f* normal, s16* azimuth);
void Actor_GetSlopeDirection(CollisionPoly* floorPoly, Vec3f* slopeNormal, s16* downwardSlopeYaw);
void Actor_UpdateBgCheckInfo(PlayState* play, Actor* actor, f32 wallCheckHeight, f32 wallCheckRadius, f32 ceilingCheckHeight, u32 flags);
Hilite* Hilite_DrawOpa(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* gfxCtx);
void func_800B8050(Actor* actor, PlayState* play, s32 flag);
@@ -677,13 +677,13 @@ PosRot* Actor_GetWorldPosShapeRot(PosRot* dest, Actor* actor);
s32 func_800B83F8(Actor* actor, Player* player, s32 flag);
s32 Actor_ProcessTalkRequest(Actor* actor, GameState* gameState);
s32 func_800B8500(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, PlayerActionParam exchangeItemId);
s32 func_800B85E0(Actor* actor, PlayState* play, f32 radius, PlayerActionParam exchangeItemId);
s32 func_800B8500(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, PlayerItemAction exchangeItemId);
s32 func_800B85E0(Actor* actor, PlayState* play, f32 radius, PlayerItemAction exchangeItemId);
s32 func_800B8614(Actor* actor, PlayState* play, f32 radius);
s32 func_800B863C(Actor* actor, PlayState* play);
s32 Actor_TextboxIsClosing(Actor* actor, PlayState* play);
s32 Actor_ChangeFocus(Actor* actor1, PlayState* play, Actor* actor2);
s32 Player_GetExchangeItemId(PlayState* play);
PlayerItemAction Player_GetExchangeItemId(PlayState* play);
s32 func_800B8718(Actor* actor, GameState* gameState);
s32 func_800B874C(Actor* actor, PlayState* play, f32 xzRange, f32 yRange);
s32 func_800B8804(Actor* actor, PlayState* play, f32 xzRange);
@@ -691,10 +691,10 @@ s32 func_800B886C(Actor* actor, PlayState* play);
void Actor_GetScreenPos(PlayState* play, Actor* actor, s16* x, s16* y);
s32 Actor_OnScreen(PlayState* play, Actor* actor);
s32 Actor_HasParent(Actor* actor, PlayState* play);
s32 Actor_PickUp(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange, f32 yRange);
s32 Actor_PickUpNearby(Actor* actor, PlayState* play, s32 getItemId);
s32 Actor_PickUp(Actor* actor, PlayState* play, GetItemId getItemId, f32 xzRange, f32 yRange);
s32 Actor_PickUpNearby(Actor* actor, PlayState* play, GetItemId getItemId);
s32 Actor_LiftActor(Actor* actor, PlayState* play);
s32 Actor_PickUpFar(Actor* actor, PlayState* play, s32 getItemId);
s32 Actor_PickUpFar(Actor* actor, PlayState* play, GetItemId getItemId);
s32 Actor_HasNoParent(Actor* actor, PlayState* play);
void func_800B8C20(Actor* actorA, Actor* actorB, PlayState* play);
void func_800B8C50(Actor* actor, PlayState* play);
@@ -716,7 +716,7 @@ void func_800B9010(Actor* actor, u16 sfxId);
void func_800B9038(Actor* actor, s32 timer);
void func_800B9084(Actor* actor);
void func_800B9098(Actor* actor);
s32 func_800B90AC(PlayState* play, Actor* actor, CollisionPoly* polygon, s32 bgId, s32 arg4);
s32 func_800B90AC(PlayState* play, Actor* actor, CollisionPoly* polygon, s32 bgId, Vec3f* arg4);
void Actor_DeactivateLens(PlayState* play);
void func_800B9120(ActorContext* actorCtx);
void Actor_InitContext(PlayState* play, ActorContext* actorCtx, ActorEntry* actorEntry);
@@ -975,7 +975,7 @@ Vec3s* Camera_Update(Vec3s* param_1, Camera* camera);
// void func_800DF498(void);
u32 Camera_SetMode(Camera* camera, s16 mode, s8 param_3);
s32 Camera_ChangeMode(Camera* camera, s16 mode);
// void func_800DF86C(void);
s32 func_800DF86C(Camera* camera, s16 arg1);
// void func_800DF8EC(void);
s32 Camera_ChangeSetting(Camera* camera, s16 setting);
u32 Camera_ChangeDataIdx(Camera* camera, u32 camDataIdx);
@@ -999,7 +999,7 @@ s32 Camera_Copy(Camera* dstCamera, Camera* srcCamera);
Vec3f* Camera_GetQuakeOffset(Vec3f* dst, Camera* camera);
// void func_800E01DC(s32 param_1, u32 param_2, UNK_TYPE4 param_3, UNK_TYPE4 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6);
// UNK_TYPE4 func_800E0228(void);
// void func_800E0238(void);
void func_800E0238(Camera* camera);
void Camera_SetToTrackActor(Camera* camera, Actor* actor);
void Camera_SetTargetActor(Camera* camera, Actor* actor);
f32 Camera_GetWaterYPos(Camera* camera);
@@ -1556,7 +1556,7 @@ void func_80106644(PlayState* play, s16 arg1, s16 arg2, s16 arg3);
// void func_8010683C(void);
// void func_801068B4(void);
// void func_801068D8(void);
// void func_801068FC(void);
void* func_801068FC(PlayState* play, void* arg1, size_t size);
// void func_80106BEC(void);
// void func_80106D08(void);
// void func_80106D5C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7);
@@ -1569,7 +1569,7 @@ void func_80108AF8(PlayState* play);
s32 func_801090B0(s32 arg0);
s32 func_80109124(s16 arg0);
// void func_801091F0(void);
// void func_80109428(void);
void func_80109428(PlayState* play);
// void func_801094A0(void);
// void func_801094C8(void);
// void func_801094F8(void);
@@ -1756,7 +1756,7 @@ s32 func_80122744(PlayState* play, struct_80122744_arg1* arg1, u32 arg2, Vec3s*
s32 func_80122760(PlayState* play, struct_80122744_arg1* arg1, f32 arg2);
void func_80122868(PlayState* play, Player* player);
void func_801229A0(PlayState* play, Player* player);
void func_801229EC(UNK_TYPE arg0, UNK_TYPE arg1);
void func_801229EC(Actor* thisx, PlayState* play);
void func_801229FC(Player* player);
void func_80122BA4(PlayState* play, struct_80122D44_arg1* arg1, s32 arg2, s32 alpha);
void func_80122C20(PlayState* play, struct_80122D44_arg1* arg1);
@@ -1767,7 +1767,7 @@ void func_80122F28(Player* player);
s32 func_80122F9C(PlayState* play);
s32 func_80122FCC(PlayState* play);
void func_8012300C(PlayState* play, s32 arg1);
void func_8012301C(Player* player, PlayState* play2);
void func_8012301C(Actor* thisx, PlayState* play2);
void func_80123140(PlayState* play, Player* player);
s32 Player_InBlockingCsMode(PlayState* play, Player* player);
s32 Player_InCsMode(PlayState* play);
@@ -1778,14 +1778,14 @@ s32 Player_IsGoronOrDeku(Player* player);
s32 func_801234D4(PlayState* play);
s32 func_80123590(PlayState* play, Actor* actor);
ItemId func_8012364C(PlayState* play, Player* player, s32 arg2);
s32 func_80123810(PlayState* play);
PlayerModelGroup Player_ActionToModelGroup(Player* player, PlayerActionParam actionParam);
PlayerItemAction func_80123810(PlayState* play);
PlayerModelGroup Player_ActionToModelGroup(Player* player, PlayerItemAction itemAction);
void Player_SetModelsForHoldingShield(Player* player);
void Player_SetModels(Player* player, PlayerModelGroup modelGroup);
void Player_SetModelGroup(Player* player, PlayerModelGroup modelGroup);
void func_80123C58(Player* player);
void Player_SetEquipmentData(PlayState* play, Player* player);
void func_80123D50(PlayState* play, Player* player, ItemId itemId, PlayerActionParam actionParam);
void Player_UpdateBottleHeld(PlayState* play, Player* player, ItemId itemId, PlayerItemAction itemAction);
void func_80123DA4(Player* player);
void func_80123DC0(Player* player);
void func_80123E90(PlayState* play, Actor* actor);
@@ -1798,16 +1798,16 @@ s32 Player_HasMirrorShieldEquipped(PlayState* play);
s32 Player_IsHoldingMirrorShield(PlayState* play);
s32 Player_IsHoldingHookshot(Player* player);
s32 func_801240DC(Player* player);
s32 func_80124110(Player* player, PlayerActionParam actionParam);
s32 func_80124110(Player* player, PlayerItemAction itemAction);
s32 func_80124148(Player* player);
s32 Player_ActionToMeleeWeapon(PlayerActionParam actionParam);
s32 Player_ActionToMeleeWeapon(PlayerItemAction itemAction);
s32 Player_GetMeleeWeaponHeld(Player* player);
s32 Player_IsHoldingTwoHandedWeapon(Player* player);
s32 Player_ActionToBottle(Player* player, PlayerActionParam actionParam);
s32 Player_ActionToBottle(Player* player, PlayerItemAction itemAction);
s32 Player_GetBottleHeld(Player* Player);
s32 Player_ActionToExplosive(Player* player, PlayerActionParam actionParam);
s32 Player_ActionToExplosive(Player* player, PlayerItemAction itemAction);
s32 Player_GetExplosiveHeld(Player* player);
s32 Player_ActionToSword(Actor* actor, PlayerActionParam actionParam);
s32 Player_ActionToSword(Actor* actor, PlayerItemAction itemAction);
s32 func_801242B4(Player* player);
s32 Player_GetEnvTimerType(PlayState* play);
void func_80124420(Player* player);
@@ -2055,7 +2055,7 @@ void AnimationContext_CopyTrue(PlayState* play, AnimationEntryData* data);
void AnimationContext_CopyFalse(PlayState* play, AnimationEntryData* data);
void AnimationContext_MoveActor(PlayState* play, AnimationEntryData* data);
void AnimationContext_Update(PlayState* play, AnimationContext* animationCtx);
void SkelAnime_InitLink(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeader* skeletonHeaderSeg, LinkAnimationHeader* animation, s32 flags, Vec3s* jointTable, Vec3s* morphTable, s32 limbBufCount);
void SkelAnime_InitLink(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeader* skeletonHeaderSeg, LinkAnimationHeader* animation, s32 flags, void* jointTableBuffer, void* morphTableBuffer, s32 limbBufCount);
void LinkAnimation_SetUpdateFunction(SkelAnime* skelAnime);
s32 LinkAnimation_Update(PlayState* play, SkelAnime* skelAnime);
s32 LinkAnimation_Morph(PlayState* play, SkelAnime* skelAnime);
@@ -2073,8 +2073,8 @@ void LinkAnimation_CopyMorphToJoint(PlayState* play, SkelAnime* skelAnime);
void LinkAnimation_LoadToMorph(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation, f32 frame);
void LinkAnimation_LoadToJoint(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation, f32 frame);
void LinkAnimation_InterpJointMorph(PlayState* play, SkelAnime* skelAnime, f32 weight);
void LinkAnimation_BlendToJoint(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation1, f32 frame1, LinkAnimationHeader* animation2, f32 frame2, f32 blendWeight, Vec3s* blendTable);
void LinkAnimation_BlendToMorph(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation1, f32 frame1, LinkAnimationHeader* animation2, f32 frame2, f32 blendWeight, Vec3s* blendTable);
void LinkAnimation_BlendToJoint(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation1, f32 frame1, LinkAnimationHeader* animation2, f32 frame2, f32 blendWeight, void* blendTableBuffer);
void LinkAnimation_BlendToMorph(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation1, f32 frame1, LinkAnimationHeader* animation2, f32 frame2, f32 blendWeight, void* blendTableBuffer);
void LinkAnimation_EndLoop(SkelAnime* skelAnime);
s32 Animation_OnFrameImpl(SkelAnime* skelAnime, f32 frame, f32 updateRate);
s32 LinkAnimation_OnFrame(SkelAnime* skelAnime, f32 frame);
@@ -2160,11 +2160,12 @@ void VisMono_Draw(VisMono* this, Gfx** gfxp);
void func_801420C0(void* arg0);
void func_801420F4(void* arg0);
void func_80142100(void* arg0, Gfx** gfx, u32 arg2);
s32 func_80142440(SkyboxContext* skyboxCtx, Vtx* vtx, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8);
s32 func_80142440(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8);
void func_80143148(SkyboxContext* skyboxCtx, s32 arg1);
void func_801431E8(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyType);
void func_80143324(PlayState* play, SkyboxContext* skyboxCtx, s16 skyType);
void func_801434E4(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyType);
void Skybox_Setup(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyboxId);
void func_80143324(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId);
void Skybox_Init(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyboxId);
Mtx* SkyboxDraw_UpdateMatrix(SkyboxContext* skyboxCtx, f32 x, f32 y, f32 z);
void SkyboxDraw_SetColors(SkyboxContext* skyboxCtx, u8 primR, u8 primG, u8 primB, u8 envR, u8 envG, u8 envB);
void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId, s16 blend, f32 x, f32 y, f32 z);
@@ -2315,8 +2316,8 @@ void func_80165658(u32 arg0);
void func_8016566C(u32 arg0);
void func_80165690(void);
// void func_801656A4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8);
// void func_80165DCC(void);
// void func_80165DF0(void);
void func_80165DCC(s32 arg0);
void func_80165DF0(void);
// void func_80165E1C(void);
// void func_80165E7C(void);
// void func_80165EC0(void);
@@ -2567,7 +2568,7 @@ s32 func_80178A94(s32 param_1, s32 param_2);
// void func_80178D7C(void);
// void func_80178DAC(void);
void func_80178E3C(u32 romSegment, u32 arg1, void* dst, u32 size);
// void func_80178E7C(void);
void func_80178E7C(uintptr_t arg0, void* arg1, size_t size);
// void Check_WriteRGBA16Pixel(u16* buffer, u32 x, u32 y, u32 value);
// void Check_WriteI4Pixel(u16* buffer, u32 x, u32 y, u32 value);
// void Check_DrawI4Texture(u16* buffer, u32 x, u32 y, u32 width, u32 height, u8* texture);
@@ -2678,11 +2679,10 @@ s32 Math3D_YZInSphere(Sphere16* sphere, f32 y, f32 z);
// void func_8017FB1C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE4 param_9, UNK_TYPE4 param_10, UNK_TYPE4 param_11);
// void func_8017FD44(void);
u16 Math_GetAtan2Tbl(f32 y, f32 x);
s16 Math_Atan2S(f32 y, f32 x);
f32 Math_Atan2F(f32 y, f32 x);
s16 Math_FAtan2F(f32 adjacent, f32 opposite);
f32 Math_Acot2F(f32 adjacent, f32 opposite);
s16 Math_Atan2S_XY(f32 x, f32 y);
f32 Math_Atan2F_XY(f32 x, f32 y);
u64* SysUcode_GetUCodeBoot(void);
size_t SysUcode_GetUCodeBootSize(void);
@@ -2928,19 +2928,19 @@ void func_8019F420(Vec3f* pos, u16 sfxId);
void func_8019F4AC(Vec3f* pos, u16 sfxId);
void func_8019F540(s8 arg0);
void AudioSfx_LowerSfxSettingsReverb(Vec3f* pos, s8 isReverbLowered);
// void func_8019F5AC(void);
// void func_8019F638(void);
// void func_8019F780(void);
f32 func_8019F5AC(f32 arg0);
void func_8019F638(Vec3f* arg0, u16 sfxId, f32 arg2);
void func_8019F780(Vec3f* arg0, u16 sfxId, f32 arg2);
// void func_8019F7D8(void);
// void func_8019F830(void);
void func_8019F830(Vec3f* arg0, u16 arg1);
void func_8019F88C(Vec3f* arg0, u16 sfxId, UNK_TYPE arg2);
void func_8019F900(Vec3f* pos, u8 chargeLevel);
// void func_8019FA18(void);
void func_8019FAD8(Vec3f* param_1, u16 sfxId, f32 param_3);
void func_8019FB0C(Vec3f* arg0, u16 sfxId, f32 arg2, s32 arg3);
void func_8019FC20(Vec3f* pos, u16 sfxId);
// void func_8019FCB8(void);
// void func_8019FD90(void);
void func_8019FCB8(Vec3f* arg0, u16 arg1, f32 arg2);
void func_8019FD90(s8 arg0, s8 arg1);
void func_8019FDC8(UNK_PTR arg0, u16 sfxId, UNK_TYPE arg2);
// void func_8019FE1C(void);
void func_8019FE74(f32* arg0, f32 arg1, s32 arg2);
@@ -2950,8 +2950,8 @@ void Audio_PlaySfxForRiver(Vec3f* pos, f32 freqScale);
// void Audio_PlaySfxForWaterfall(void);
// void Audio_StepFreqLerp(void);
void func_801A0124(Vec3f* pos, u8 arg1);
// void func_801A0184(void);
// void func_801A01C4(void);
void func_801A0184(void);
void func_801A01C4(void);
void func_801A0204(s8 seqId);
void func_801A0238(s32 arg0, s32 arg1);
// void Audio_SetGanonsTowerBgmVolumeLevel(void);
@@ -3010,9 +3010,9 @@ void func_801A3AEC(s32 arg0);
void func_801A3B48(UNK_TYPE arg0);
// void func_801A3B90(void);
void func_801A3CD8(s8 param_1);
// void func_801A3CF4(void);
void func_801A3CF4(s8 arg0);
void func_801A3D98(s8 audioSetting);
// void func_801A3E38(void);
void func_801A3E38(u8 arg0);
// void func_801A3EC0(void);
void Audio_SetCutsceneFlag(s8 flag);
// void func_801A3F6C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
@@ -3021,7 +3021,7 @@ void Audio_SetCutsceneFlag(s8 flag);
void Audio_SetSpec(u32 specId);
void func_801A4058(UNK_TYPE arg0);
// void func_801A41C8(void);
// void func_801A41F8(void);
void func_801A41F8(UNK_TYPE arg0);
// void func_801A429C(void);
// void func_801A42C8(void);
// void func_801A4324(void);
include/macros.h
+6 -12
View File
@@ -69,6 +69,11 @@
#define CHECK_FLAG_ALL(flags, mask) (((flags) & (mask)) == (mask))
#define ALIGN8(val) (((val) + 7) & ~7)
#define ALIGN16(val) (((val) + 0xF) & ~0xF)
#define ALIGN64(val) (((val) + 0x3F) & ~0x3F)
#define ALIGN256(val) (((val) + 0xFF) & ~0xFF)
extern GraphicsContext* __gfxCtx;
#define WORK_DISP __gfxCtx->work.p
@@ -106,7 +111,7 @@ extern GraphicsContext* __gfxCtx;
#define VTX_T(x, y, z, s, t, cr, cg, cb, a) \
{ { x, y, z }, 0, { s, t }, { cr, cg, cb, a }, }
#define GRAPH_ALLOC(gfxCtx, size) ((void*)((gfxCtx)->polyOpa.d = (Gfx*)((u8*)(gfxCtx)->polyOpa.d - (size))))
#define GRAPH_ALLOC(gfxCtx, size) ((void*)((gfxCtx)->polyOpa.d = (Gfx*)((u8*)(gfxCtx)->polyOpa.d - ALIGN16(size))))
// Custom gbi macro
#define gDPSetTileCustom(pkt, fmt, siz, width, height, pal, cms, cmt, masks, maskt, shifts, shiftt) \
@@ -123,11 +128,6 @@ extern GraphicsContext* __gfxCtx;
} \
(void)0
#define ALIGN8(val) (((val) + 7) & ~7)
#define ALIGN16(val) (((val) + 0xF) & ~0xF)
#define ALIGN64(val) (((val) + 0x3F) & ~0x3F)
#define ALIGN256(val) (((val) + 0xFF) & ~0xFF)
#define SQ(x) ((x) * (x))
#define ABS(x) ((x) >= 0 ? (x) : -(x))
#define ABS_ALT(x) ((x) < 0 ? -(x) : (x))
@@ -149,10 +149,4 @@ extern GraphicsContext* __gfxCtx;
#define OVERLAY_RELOCATION_OFFSET(overlayEntry) ((uintptr_t)((overlayEntry)->vramStart) - (uintptr_t)((overlayEntry)->loadedRamAddr))
#define VRAM_PTR_SIZE(entry) ((uintptr_t)((entry)->vramEnd) - (uintptr_t)((entry)->vramStart))
#ifdef __GNUC__
#define ALIGNED8 __attribute__ ((aligned (8)))
#else
#define ALIGNED8
#endif
#endif // MACROS_H
include/regs.h
+1 -2
View File
@@ -48,8 +48,7 @@
#define R_ENABLE_ARENA_DBG SREG(0) // Same as OoT
#define R_UPDATE_RATE SREG(30)
#define R_PAUSE_MENU_MODE SREG(94)
#define R_PAUSE_BG_PRERENDER_STATE SREG(94)
#define R_PLAY_FILL_SCREEN_ON MREG(64)
#define R_PLAY_FILL_SCREEN_R MREG(65)
#define R_PLAY_FILL_SCREEN_G MREG(66)
include/segment_symbols.h
+2
View File
@@ -53,7 +53,9 @@ DECLARE_ROM_SEGMENT(map_grand_static)
DECLARE_ROM_SEGMENT(item_name_static)
DECLARE_ROM_SEGMENT(map_name_static)
DECLARE_ROM_SEGMENT(icon_item_static_test)
DECLARE_ROM_SEGMENT(icon_item_static_old)
DECLARE_ROM_SEGMENT(icon_item_24_static_test)
DECLARE_ROM_SEGMENT(icon_item_24_static_old)
DECLARE_ROM_SEGMENT(schedule_dma_static_test)
DECLARE_ROM_SEGMENT(schedule_static)
DECLARE_ROM_SEGMENT(story_static)
include/variables.h
+3 -10
View File
@@ -427,7 +427,7 @@ extern Gfx D_801AEFA0[];
// extern UNK_TYPE1 D_801AEFBC;
// extern UNK_TYPE1 D_801AEFC0;
extern ActorOverlay gActorOverlayTable[ACTOR_ID_MAX];
extern s32 gMaxActorId;
extern ActorId gMaxActorId;
extern BgCheckSceneSubdivisionEntry sSceneSubdivisionList[];
extern BgSpecialSceneMaxObjects sCustomDynapolyMem[];
// extern UNK_TYPE1 D_801B4708;
@@ -797,7 +797,7 @@ extern TexturePtr gItemIcons[];
extern u8 gItemSlots[];
extern s16 gItemPrices[];
extern u16 gSceneIdsPerRegion[11][27];
extern u8 gPlayerFormItemRestrictions[5][114];
extern u8 gPlayerFormItemRestrictions[PLAYER_FORM_MAX][114];
extern s16 gPlayerFormObjectIndices[8];
extern RomFile gObjectTable[643];
extern SceneTableEntry gSceneTable[];
@@ -808,13 +808,6 @@ extern UNK_PTR D_801C5CB0;
// extern UNK_TYPE1 D_801C5DE0;
// extern UNK_TYPE1 D_801C5DF0;
// extern UNK_TYPE1 D_801C5E00;
extern s32 D_801C5E30[]; // D_801C5E30
extern u16 D_801C5E48[]; // D_801C5E48
extern s32 D_801C5E88[]; // D_801C5E88
extern s32 D_801C5E9C[]; // D_801C5E9C
extern s32 D_801C5EB0[]; // D_801C5EB0
extern s16 D_801C5EC4[]; // D_801C5EC4
extern struct_801C5F44 D_801C5F44[]; // D_801C5F44
// extern UNK_TYPE1 D_801C6A70;
// extern UNK_TYPE2 D_801C6A74;
@@ -826,7 +819,7 @@ extern struct_801C5F44 D_801C5F44[]; // D_801C5F44
// extern UNK_TYPE2 D_801C6A8C;
// extern UNK_TYPE2 D_801C6A90;
// extern UNK_TYPE2 D_801C6A94;
// extern UNK_TYPE1 D_801C6A98;
extern u8 D_801C6A98[5][5];
// extern UNK_TYPE1 D_801C6AB8;
// extern UNK_TYPE1 D_801C6B28;
// extern UNK_TYPE1 D_801CED40;
include/z64.h
+25 -25
View File
@@ -387,10 +387,10 @@ typedef struct {
/* 0x000 */ View view;
/* 0x168 */ u8* iconItemSegment;
/* 0x16C */ u8* iconItem24Segment;
/* 0x170 */ u8* unk_170;
/* 0x174 */ u8* unk_174;
/* 0x178 */ u8* unk_178;
/* 0x17C */ u8* unk_17C;
/* 0x170 */ u8* iconItemAltSegment;
/* 0x174 */ u8* iconItemLangSegment;
/* 0x178 */ u8* nameSegment;
/* 0x17C */ u8* iconItemVtxSegment;
/* 0x180 */ Vtx* itemPageVtx;
/* 0x184 */ Vtx* mapPageVtx;
/* 0x188 */ Vtx* questPageVtx;
@@ -403,24 +403,24 @@ typedef struct {
/* 0x1A4 */ Vtx* unk_1A4;
/* 0x1A8 */ Vtx* cursorVtx;
/* 0x1AC */ OcarinaStaff* ocarinaStaff;
/* 0x1B0 */ DmaRequest unk_1B0;
/* 0x1B0 */ UNK_TYPE1 unk_1B0[0x20];
/* 0x1D0 */ OSMesgQueue loadQueue;
/* 0x1E8 */ OSMesg loadMsg;
/* 0x1EC */ u16 state;
/* 0x1EE */ u16 debugEditor;
/* 0x1F0 */ u8 bombersNotebookOpen;
/* 0x1F4 */ Vec3f eye;
/* 0x200 */ u16 unk_200;
/* 0x202 */ u16 mode;
/* 0x200 */ u16 mainState;
/* 0x202 */ u16 nextPageMode; // (2 * prev pageIndex) + (scroll left ? 1 : 0)
/* 0x204 */ u16 pageIndex;
/* 0x206 */ u16 unk_206;
/* 0x208 */ u16 unk_208;
/* 0x206 */ u16 switchPageTimer;
/* 0x208 */ u16 savePromptState;
/* 0x20C */ f32 unk_20C;
/* 0x210 */ f32 unk_210;
/* 0x214 */ f32 unk_214;
/* 0x218 */ f32 unk_218;
/* 0x21C */ f32 unk_21C;
/* 0x220 */ f32 unk_220;
/* 0x210 */ f32 itemPageRoll; // rotation (-z) of the item page into the screen
/* 0x214 */ f32 mapPageRoll; // rotation (+x) of the map page into the screen
/* 0x218 */ f32 questPageRoll; // rotation (+z) of the quest page into the screen
/* 0x21C */ f32 maskPageRoll; // rotation (-z) of the mask page into the screen
/* 0x220 */ f32 roll;
/* 0x224 */ u16 alpha;
/* 0x226 */ s16 offsetY;
/* 0x228 */ UNK_TYPE1 unk_228[0x8];
@@ -432,7 +432,7 @@ typedef struct {
/* 0x256 */ s16 unk_256; // Uses DungeonItem enum
/* 0x258 */ s16 cursorSpecialPos;
/* 0x25A */ s16 pageSwitchTimer;
/* 0x25C */ u16 unk_25C;
/* 0x25C */ u16 namedItem;
/* 0x25E */ u16 cursorItem[5];
/* 0x268 */ u16 cursorSlot[5];
/* 0x272 */ u16 equipTargetItem;
@@ -441,7 +441,7 @@ typedef struct {
/* 0x278 */ s16 equipAnimX;
/* 0x27A */ s16 equipAnimY;
/* 0x27C */ s16 equipAnimAlpha;
/* 0x27E */ s16 unk_27E;
/* 0x27E */ s16 infoPanelOffsetY;
/* 0x280 */ u16 unk_280;
/* 0x282 */ u16 nameColorSet;
/* 0x284 */ s16 cursorColorSet;
@@ -455,9 +455,9 @@ typedef struct {
/* 0x29E */ s16 promptAlpha;
/* 0x2A0 */ s16 ocarinaSongIndex;
/* 0x2A2 */ u8 worldMapPoints[20];
/* 0x2B6 */ u8 unk_2B6;
/* 0x2B7 */ u8 unk_2B7;
/* 0x2B8 */ u8 unk_2B8;
/* 0x2B6 */ u8 unk_2B6; // unused red?
/* 0x2B7 */ u8 unk_2B7; // unused green?
/* 0x2B8 */ u8 unk_2B8; // unused blue?
/* 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
@@ -546,9 +546,9 @@ typedef struct {
typedef struct {
/* 0x000 */ View view;
/* 0x168 */ void* skyboxStaticSegment[4];
/* 0x178 */ void* skyboxPaletteStaticSegment;
/* 0x17C */ Gfx* dListBuf;
/* 0x168 */ void* staticSegments[4];
/* 0x178 */ void* paletteStaticSegment;
/* 0x17C */ Gfx (*dListBuf)[150];
/* 0x180 */ Gfx* roomDL;
/* 0x184 */ Vtx* roomVtx;
/* 0x188 */ DmaRequest unk188;
@@ -948,9 +948,9 @@ struct PlayState {
/* 0x18784 */ s32 (*damagePlayer)(struct PlayState* play, s32 damage);
/* 0x18788 */ void (*talkWithPlayer)(struct PlayState* play, Actor* actor);
/* 0x1878C */ void (*unk_1878C)(struct PlayState* play);
/* 0x18790 */ void (*unk_18790)(struct PlayState* play, s16 arg1, Actor* actor);
/* 0x18794 */ s32 (*unk_18794)(struct PlayState* play, Player* player, s32 itemId, s32 arg3);
/* 0x18798 */ s32 (*setPlayerTalkAnim)(struct PlayState* play, void* talkAnim, s32 arg2);
/* 0x18790 */ void (*unk_18790)(struct PlayState* play, s16 arg1);
/* 0x18794 */ PlayerItemAction (*unk_18794)(struct PlayState* play, Player* player, ItemId itemId);
/* 0x18798 */ s32 (*setPlayerTalkAnim)(struct PlayState* play, LinkAnimationHeader* talkAnim, s32 animMode);
/* 0x1879C */ s16 playerActorCsIds[10];
/* 0x187B0 */ MtxF viewProjectionMtxF;
/* 0x187F0 */ Vec3f unk_187F0;
include/z64actor.h
+4 -3
View File
@@ -19,6 +19,7 @@ struct Lights;
struct CollisionPoly;
struct EnBox;
struct EnTorch2;
typedef void(*ActorFunc)(struct Actor* this, struct PlayState* play);
@@ -208,7 +209,7 @@ typedef enum {
* 0x040 : Has touched water (actor is responsible for unsetting this the frame it touches the water)
* 0x080 : Similar to & 0x1 but with no velocity check and is cleared every frame
* 0x100 : Crushed between a floor and ceiling (triggers a void for player)
* 0x200 : Unknown (only set/used by player so far)
* 0x200 : Only set/used by player, related to interacting with walls
*/
typedef struct {
@@ -224,7 +225,7 @@ typedef struct {
} DynaPolyActor; // size = 0x15C
typedef enum {
typedef enum Item00Type {
/* 0x00 */ ITEM00_RUPEE_GREEN,
/* 0x01 */ ITEM00_RUPEE_BLUE,
/* 0x02 */ ITEM00_RUPEE_RED,
@@ -404,7 +405,7 @@ typedef struct ActorContext {
/* 0x20C */ ActorContext_unk_20C unk_20C[8];
/* 0x24C */ UNK_TYPE1 unk_24C[0x4];
/* 0x250 */ void* absoluteSpace; // Space used to allocate actor overlays of alloc type ALLOCTYPE_ABSOLUTE
/* 0x254 */ u32 unk254[5];
/* 0x254 */ struct EnTorch2* elegyShells[5]; // PLAYER_FORM_MAX
/* 0x268 */ u8 unk268;
/* 0x269 */ UNK_TYPE1 pad269[0x3];
/* 0x26C */ Input unk_26C;
include/z64animation.h
+10 -4
View File
@@ -9,23 +9,26 @@
struct PlayState;
struct Actor;
struct SkelAnime;
struct PlayerAnimationFrame;
#define LINK_ANIMETION_OFFSET(addr, offset) \
(SEGMENT_ROM_START(link_animetion) + ((u32)addr & 0xFFFFFF) + ((u32)offset))
(SEGMENT_ROM_START(link_animetion) + ((uintptr_t)addr & 0xFFFFFF) + ((u32)offset))
#define LIMB_DONE 0xFF
#define ANIMATION_ENTRY_MAX 50
#define ANIM_FLAG_1 (1 << 0)
#define ANIM_FLAG_UPDATEY (1 << 1)
#define ANIM_FLAG_4 (1 << 2)
#define ANIM_FLAG_NOMOVE (1 << 4)
typedef enum {
typedef enum AnimationMode {
/* 0 */ ANIMMODE_LOOP,
/* 1 */ ANIMMODE_LOOP_INTERP,
/* 2 */ ANIMMODE_ONCE,
/* 3 */ ANIMMODE_ONCE_INTERP,
/* 4 */ ANIMMODE_LOOP_PARTIAL,
/* 5 */ ANIMMODE_LOOP_PARTIAL_INTERP
} AnimationModes;
} AnimationMode;
typedef enum {
/* -1 */ ANIMTAPER_DECEL = -1,
@@ -168,7 +171,10 @@ typedef struct AnimationContext {
typedef struct {
/* 0x0 */ AnimationHeaderCommon common;
/* 0x4 */ u32 segment;
/* 0x4 */ union {
void* segmentVoid;
struct PlayerAnimationFrame* segment;
};
} LinkAnimationHeader; // size = 0x8
typedef struct SkelAnime {

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