mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-09 19:51:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

En_Ru: OK (Unused OoT Ruto) (#1035)

Browse Source 
* Ruto: OK

* Ruto: better walking water sfx function name and less fake match

* Ruto: formater pls

* Ruto: Requested changes, better display list documentation

* Ruto: requested changes

* Ruto: formater pass

* Ruto: casts were removeable

* Apply suggestions from code review

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Ru/z_en_ru.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Ruto: array size fix

* Ruto: data shuffle solved

* Ruto: requested name changes

* Ru: requested changes

* Ru: count instead of size

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
Isghj
2022-09-29 17:29:25 -07:00
committed by GitHub
parent 8f2fe9b3c7
commit 7ed0d14bfe
5 changed files with 400 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_ru2.xml
+94 -74
View File
@@ -1,78 +1,98 @@
<Root>
<!-- Adult Ruto from OoT (Unused). -->
<!-- Object is Copy from OoT, including documentation. -->
<File Name="object_ru2" Segment="6">
<Animation Name="object_ru2_Anim_0004CC" Offset="0x4CC" />
<Animation Name="object_ru2_Anim_000DE8" Offset="0xDE8" />
<!-- <Blob Name="object_ru2_Blob_000DF8" Size="0x128" Offset="0xDF8" /> -->
<Texture Name="object_ru2_Tex_000F20" OutName="tex_000F20" Format="rgba16" Width="32" Height="32" Offset="0xF20" />
<Texture Name="object_ru2_Tex_001720" OutName="tex_001720" Format="ci8" Width="8" Height="8" Offset="0x1720" />
<Texture Name="object_ru2_Tex_001760" OutName="tex_001760" Format="ci8" Width="16" Height="16" Offset="0x1760" />
<Texture Name="object_ru2_Tex_001860" OutName="tex_001860" Format="ci8" Width="16" Height="16" Offset="0x1860" />
<Texture Name="object_ru2_Tex_001960" OutName="tex_001960" Format="ci8" Width="8" Height="8" Offset="0x1960" />
<Texture Name="object_ru2_Tex_0019A0" OutName="tex_0019A0" Format="rgba16" Width="32" Height="32" Offset="0x19A0" />
<Texture Name="object_ru2_Tex_0021A0" OutName="tex_0021A0" Format="ci8" Width="8" Height="8" Offset="0x21A0" />
<Texture Name="object_ru2_Tex_0021E0" OutName="tex_0021E0" Format="ci8" Width="16" Height="16" Offset="0x21E0" />
<!-- <Blob Name="object_ru2_Blob_0022E0" Size="0x1000" Offset="0x22E0" /> -->
<Texture Name="object_ru2_Tex_0032E0" OutName="tex_0032E0" Format="rgba16" Width="8" Height="16" Offset="0x32E0" />
<DList Name="object_ru2_DL_003EB0" Offset="0x3EB0" />
<Texture Name="object_ru2_TLUT_0043C0" OutName="tlut_0043C0" Format="rgba16" Width="16" Height="16" Offset="0x43C0" />
<Texture Name="object_ru2_Tex_0045C0" OutName="tex_0045C0" Format="ci8" Width="8" Height="8" Offset="0x45C0" />
<Texture Name="object_ru2_Tex_004600" OutName="tex_004600" Format="ci8" Width="8" Height="8" Offset="0x4600" />
<Texture Name="object_ru2_Tex_004640" OutName="tex_004640" Format="ci8" Width="16" Height="16" Offset="0x4640" />
<Texture Name="object_ru2_Tex_004740" OutName="tex_004740" Format="ci8" Width="16" Height="16" Offset="0x4740" />
<Texture Name="object_ru2_Tex_004840" OutName="tex_004840" Format="ci8" Width="32" Height="64" Offset="0x4840" />
<Texture Name="object_ru2_Tex_005040" OutName="tex_005040" Format="ci8" Width="32" Height="32" Offset="0x5040" />
<Texture Name="object_ru2_Tex_005440" OutName="tex_005440" Format="ci8" Width="8" Height="8" Offset="0x5440" />
<Texture Name="object_ru2_Tex_005480" OutName="tex_005480" Format="ci8" Width="16" Height="16" Offset="0x5480" />
<Texture Name="object_ru2_Tex_005580" OutName="tex_005580" Format="ci8" Width="8" Height="8" Offset="0x5580" />
<Texture Name="object_ru2_Tex_0055C0" OutName="tex_0055C0" Format="ci8" Width="8" Height="32" Offset="0x55C0" />
<Texture Name="object_ru2_Tex_0056C0" OutName="tex_0056C0" Format="rgba16" Width="32" Height="32" Offset="0x56C0" />
<DList Name="object_ru2_DL_0088F0" Offset="0x88F0" />
<DList Name="object_ru2_DL_008D30" Offset="0x8D30" />
<DList Name="object_ru2_DL_009680" Offset="0x9680" />
<DList Name="object_ru2_DL_009998" Offset="0x9998" />
<DList Name="object_ru2_DL_009B80" Offset="0x9B80" />
<DList Name="object_ru2_DL_009F50" Offset="0x9F50" />
<DList Name="object_ru2_DL_00A030" Offset="0xA030" />
<DList Name="object_ru2_DL_00A150" Offset="0xA150" />
<DList Name="object_ru2_DL_00A468" Offset="0xA468" />
<DList Name="object_ru2_DL_00A650" Offset="0xA650" />
<DList Name="object_ru2_DL_00AA20" Offset="0xAA20" />
<DList Name="object_ru2_DL_00AB00" Offset="0xAB00" />
<DList Name="object_ru2_DL_00AC20" Offset="0xAC20" />
<DList Name="object_ru2_DL_00B048" Offset="0xB048" />
<DList Name="object_ru2_DL_00B178" Offset="0xB178" />
<DList Name="object_ru2_DL_00B568" Offset="0xB568" />
<DList Name="object_ru2_DL_00B8E0" Offset="0xB8E0" />
<DList Name="object_ru2_DL_00BD08" Offset="0xBD08" />
<DList Name="object_ru2_DL_00BE38" Offset="0xBE38" />
<DList Name="object_ru2_DL_00C228" Offset="0xC228" />
<Limb Name="object_ru2_Standardlimb_00C5A0" Type="Standard" EnumName="OBJECT_RU2_LIMB_01" Offset="0xC5A0" />
<Limb Name="object_ru2_Standardlimb_00C5AC" Type="Standard" EnumName="OBJECT_RU2_LIMB_02" Offset="0xC5AC" />
<Limb Name="object_ru2_Standardlimb_00C5B8" Type="Standard" EnumName="OBJECT_RU2_LIMB_03" Offset="0xC5B8" />
<Limb Name="object_ru2_Standardlimb_00C5C4" Type="Standard" EnumName="OBJECT_RU2_LIMB_04" Offset="0xC5C4" />
<Limb Name="object_ru2_Standardlimb_00C5D0" Type="Standard" EnumName="OBJECT_RU2_LIMB_05" Offset="0xC5D0" />
<Limb Name="object_ru2_Standardlimb_00C5DC" Type="Standard" EnumName="OBJECT_RU2_LIMB_06" Offset="0xC5DC" />
<Limb Name="object_ru2_Standardlimb_00C5E8" Type="Standard" EnumName="OBJECT_RU2_LIMB_07" Offset="0xC5E8" />
<Limb Name="object_ru2_Standardlimb_00C5F4" Type="Standard" EnumName="OBJECT_RU2_LIMB_08" Offset="0xC5F4" />
<Limb Name="object_ru2_Standardlimb_00C600" Type="Standard" EnumName="OBJECT_RU2_LIMB_09" Offset="0xC600" />
<Limb Name="object_ru2_Standardlimb_00C60C" Type="Standard" EnumName="OBJECT_RU2_LIMB_0A" Offset="0xC60C" />
<Limb Name="object_ru2_Standardlimb_00C618" Type="Standard" EnumName="OBJECT_RU2_LIMB_0B" Offset="0xC618" />
<Limb Name="object_ru2_Standardlimb_00C624" Type="Standard" EnumName="OBJECT_RU2_LIMB_0C" Offset="0xC624" />
<Limb Name="object_ru2_Standardlimb_00C630" Type="Standard" EnumName="OBJECT_RU2_LIMB_0D" Offset="0xC630" />
<Limb Name="object_ru2_Standardlimb_00C63C" Type="Standard" EnumName="OBJECT_RU2_LIMB_0E" Offset="0xC63C" />
<Limb Name="object_ru2_Standardlimb_00C648" Type="Standard" EnumName="OBJECT_RU2_LIMB_0F" Offset="0xC648" />
<Limb Name="object_ru2_Standardlimb_00C654" Type="Standard" EnumName="OBJECT_RU2_LIMB_10" Offset="0xC654" />
<Limb Name="object_ru2_Standardlimb_00C660" Type="Standard" EnumName="OBJECT_RU2_LIMB_11" Offset="0xC660" />
<Limb Name="object_ru2_Standardlimb_00C66C" Type="Standard" EnumName="OBJECT_RU2_LIMB_12" Offset="0xC66C" />
<Limb Name="object_ru2_Standardlimb_00C678" Type="Standard" EnumName="OBJECT_RU2_LIMB_13" Offset="0xC678" />
<Limb Name="object_ru2_Standardlimb_00C684" Type="Standard" EnumName="OBJECT_RU2_LIMB_14" Offset="0xC684" />
<Limb Name="object_ru2_Standardlimb_00C690" Type="Standard" EnumName="OBJECT_RU2_LIMB_15" Offset="0xC690" />
<Limb Name="object_ru2_Standardlimb_00C69C" Type="Standard" EnumName="OBJECT_RU2_LIMB_16" Offset="0xC69C" />
<Skeleton Name="object_ru2_Skel_00C700" Type="Flex" LimbType="Standard" LimbNone="OBJECT_RU2_LIMB_NONE" LimbMax="OBJECT_RU2_LIMB_MAX" EnumName="ObjectRu2Limb" Offset="0xC700" />
<Animation Name="object_ru2_Anim_00D3DC" Offset="0xD3DC" />
<Animation Name="object_ru2_Anim_00DCAC" Offset="0xDCAC" />
<Animation Name="object_ru2_Anim_00E630" Offset="0xE630" />
<Animation Name="object_ru2_Anim_00F03C" Offset="0xF03C" />
<Animation Name="object_ru2_Anim_00F8B8" Offset="0xF8B8" />
<!-- Adult Ruto Animations -->
<!-- gAdultRutoCrossingArmsAnim: Used in OoT when the sages seal ganon in the Evil Realm. -->
<Animation Name="gAdultRutoCrossingArmsAnim" Offset="0x04CC"/>
<Animation Name="gAdultRutoIdleAnim" Offset="0xDE8"/>
<!-- Adult Ruto Palettes -->
<Texture Name="gAdultRutoTLUT1" OutName="adult_ruto_tlut_1" Format="rgba16" Width="144" Height="1" Offset="0xE00"/>
<Texture Name="gAdultRutoTLUT2" OutName="adult_ruto_tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x43C0"/>
<!-- Adult Ruto Eye Textures -->
<Texture Name="gAdultRutoEyeOpenTex" OutName="adult_ruto_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xF20"/>
<Texture Name="gAdultRutoEyeHalfTex" OutName="adult_ruto_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x22E0"/>
<Texture Name="gAdultRutoEyeClosedTex" OutName="adult_ruto_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x2AE0"/>
<!-- Adult Ruto Textures -->
<Texture Name="gAdultRutoSkinGradient" OutName="adult_ruto_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x1720" TlutOffset="0xE00"/>
<Texture Name="gAdultRutoEar1Tex" OutName="adult_ruto_ear_1" Format="ci8" Width="16" Height="16" Offset="0x1760" TlutOffset="0xE00"/>
<Texture Name="gAdultRutoHeadGradientTex" OutName="adult_ruto_head_gradient" Format="ci8" Width="16" Height="16" Offset="0x1860" TlutOffset="0xE00"/>
<Texture Name="gAdultRutoHeadHoleTex" OutName="adult_ruto_head_hole" Format="ci8" Width="8" Height="8" Offset="0x1960" TlutOffset="0xE00"/>
<Texture Name="gAdultRutoMouthTex" OutName="adult_ruto_mouth" Format="rgba16" Width="32" Height="32" Offset="0x19A0"/>
<Texture Name="gAdultRutoTex_21A0" OutName="adult_ruto_tex_21A0" Format="ci8" Width="8" Height="8" Offset="0x21A0" TlutOffset="0xE00"/>
<Texture Name="gAdultRutoEar2Tex" OutName="adult_ruto_ear_2" Format="ci8" Width="16" Height="16" Offset="0x21E0" TlutOffset="0xE00"/>
<Texture Name="gAdultRutoEarringTex" OutName="adult_ruto_earring" Format="rgba16" Width="8" Height="16" Offset="0x32E0"/>
<Texture Name="gAdultRutoTailGradientTex" OutName="adult_ruto_tail_gradient" Format="ci8" Width="8" Height="8" Offset="0x45C0" TlutOffset="0x43C0"/>
<Texture Name="gAdultRutoTex_4600" OutName="adult_ruto_tex_4600" Format="ci8" Width="8" Height="8" Offset="0x4600" TlutOffset="0x43C0"/>
<Texture Name="gAdultRutoBackOfHandTex" OutName="adult_ruto_back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x4640" TlutOffset="0x43C0"/>
<Texture Name="gAdultRutoTex_4740" OutName="adult_ruto_tex_4740" Format="ci8" Width="16" Height="16" Offset="0x4740" TlutOffset="0x43C0"/>
<Texture Name="gAdultRutoSkinPattern1Tex" OutName="adult_ruto_skin_pattern_1" Format="ci8" Width="32" Height="64" Offset="0x4840" TlutOffset="0x43C0"/>
<Texture Name="gAdultRutoSkinPattern2Tex" OutName="adult_ruto_skin_pattern_2" Format="ci8" Width="32" Height="32" Offset="0x5040" TlutOffset="0x43C0"/>
<Texture Name="gAdultRutoTex_5440" OutName="adult_ruto_tex_5440" Format="ci8" Width="8" Height="8" Offset="0x5440" TlutOffset="0x43C0"/>
<Texture Name="gAdultRutoTex_5480" OutName="adult_ruto_tex_5480" Format="ci8" Width="16" Height="16" Offset="0x5480" TlutOffset="0x43C0"/>
<Texture Name="gAdultRutoTex_5580" OutName="adult_ruto_tex_5580" Format="ci8" Width="8" Height="8" Offset="0x5580" TlutOffset="0x43C0"/>
<!-- Adult Ruto Limb DisplayLists -->
<DList Name="gAdultRutoLeftThighDL" Offset="0xB8E0"/>
<DList Name="gAdultRutoLeftLegDL" Offset="0xBE38"/>
<DList Name="gAdultRutoLeftFootDL" Offset="0xC228"/>
<DList Name="gAdultRutoLeftTailDL" Offset="0xBD08"/>
<DList Name="gAdultRutoRightThighDL" Offset="0xAC20"/>
<DList Name="gAdultRutoRightLegDL" Offset="0xB178"/>
<DList Name="gAdultRutoRightFootDL" Offset="0xB568"/>
<DList Name="gAdultRutoRightTailDL" Offset="0xB048"/>
<DList Name="gAdultRutoTorsoDL" Offset="0x8D30"/>
<DList Name="gAdultRutoLeftUpperArmDL" Offset="0xA150"/>
<DList Name="gAdultRutoLeftUpperWingDL" Offset="0xAA20"/>
<DList Name="gAdultRutoLeftLowerWingDL" Offset="0xAB00"/>
<DList Name="gAdultRutoLeftForearmDL" Offset="0xA468"/>
<DList Name="gAdultRutoLeftHandDL" Offset="0xA650"/>
<DList Name="gAdultRutoRightUpperArmDL" Offset="0x9680"/>
<DList Name="gAdultRutoRightUpperWingDL" Offset="0x9F50"/>
<DList Name="gAdultRutoRightLowerWingDL" Offset="0xA030"/>
<DList Name="gAdultRutoRightForearmDL" Offset="0x9998"/>
<DList Name="gAdultRutoRightHandDL" Offset="0x9B80"/>
<DList Name="gAdultRutoHeadDL" Offset="0x3EB0"/>
<DList Name="gAdultRutoWaistDL" Offset="0x88F0"/>
<!-- Adult Ruto Limbs -->
<Limb Name="gAdultRutoRootLimb" LimbType="Standard" EnumName="RU2_LIMB_ROOT" Offset="0xC5A0"/>
<Limb Name="gAdultRutoLeftThighLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_THIGH" Offset="0xC5AC"/>
<Limb Name="gAdultRutoLeftLegLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_LEG" Offset="0xC5B8"/>
<Limb Name="gAdultRutoLeftFootLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_FOOT" Offset="0xC5C4"/>
<Limb Name="gAdultRutoLeftTailLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_TAIL" Offset="0xC5D0"/>
<Limb Name="gAdultRutoRightThighLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_THIGH" Offset="0xC5DC"/>
<Limb Name="gAdultRutoRightLegLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_LEG" Offset="0xC5E8"/>
<Limb Name="gAdultRutoRightFootLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_FOOT" Offset="0xC5F4"/>
<Limb Name="gAdultRutoRightTailLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_TAIL" Offset="0xC600"/>
<Limb Name="gAdultRutoTorsoLimb" LimbType="Standard" EnumName="RU2_LIMB_TORSO" Offset="0xC60C"/>
<Limb Name="gAdultRutoLeftUpperArmLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_UPPER_ARM" Offset="0xC618"/>
<Limb Name="gAdultRutoLeftUpperWingLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_UPPER_WING" Offset="0xC624"/>
<Limb Name="gAdultRutoLeftLowerWingLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_LOWER_WING" Offset="0xC630"/>
<Limb Name="gAdultRutoLeftForearmLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_FORARM" Offset="0xC63C"/>
<Limb Name="gAdultRutoLeftHandLimb" LimbType="Standard" EnumName="RU2_LIMB_LEFT_HAND" Offset="0xC648"/>
<Limb Name="gAdultRutoRightUpperArmLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_UPPER_ARM" Offset="0xC654"/>
<Limb Name="gAdultRutoRightUpperWingLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_UPPER_WING" Offset="0xC660"/>
<Limb Name="gAdultRutoRightLowerWingLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_LOWER_WING" Offset="0xC66C"/>
<Limb Name="gAdultRutoRightForearmLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_FORARM" Offset="0xC678"/>
<Limb Name="gAdultRutoRightHandLimb" LimbType="Standard" EnumName="RU2_LIMB_RIGHT_HAND" Offset="0xC684"/>
<Limb Name="gAdultRutoHeadLimb" LimbType="Standard" EnumName="RU2_LIMB_HEAD" Offset="0xC690"/>
<Limb Name="gAdultRutoWaistLimb" LimbType="Standard" EnumName="RU2_LIMB_WAIST" Offset="0xC69C"/>
<Skeleton Name="gAdultRutoSkel" Type="Flex" LimbType="Standard" LimbNone="RU2_LIMB_NONE" LimbMax="RU2_LIMB_MAX" EnumName="Ru2Limb" Offset="0xC700" />
<!-- (More) Adult Ruto Animations -->
<Animation Name="gAdultRutoRaisingArmsUpAnim" Offset="0xD3DC"/>
<!-- HeadTurnDownLeft is intro to gAdultRutoLookingDownLeftAnim, used in OoT Credits scene -->
<!-- Looking down at Nabooru with the other sages on Death Mountain after the party -->
<Animation Name="gAdultRutoHeadTurnDownLeftAnim" Offset="0xDCAC"/>
<Animation Name="gAdultRutoIdleHandsOnHipsAnim" Offset="0xE630"/>
<Animation Name="gAdultRutoLookingDownLeftAnim" Offset="0xF03C"/>
<Animation Name="gAdultRutoSwimmingUpAnim" Offset="0xF8B8"/>
</File>
</Root>