mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-21 22:10:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Object names rename/comments from the OoT equivalent (#1282)

Browse Source 
* object_fu(Bean Seller)

* object_bombf (Bomb flower)

* object_ds2 (Potion Shop Guy)

* object_fu (guruguru)

* object_hata (Red Flag on Post)

* object_lightswitch (Sun Switch)

* object_rr (Like Like)

* Tower Collapse Bars?

* object_vm (Beamos)

* ups

* object_fu EnumName

* improvements

* Offset

* improvements

* object_ms enums and outnames

* missing prefix

* improvements

* improvements
This commit is contained in:
Nuss
2023-07-03 22:08:30 +02:00
committed by GitHub
parent 5fd8afd1db
commit 3b1b054e93
15 changed files with 231 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_fu.xml
+57 -48
View File
@@ -1,52 +1,61 @@
<Root>
<File Name="object_fu" Segment="6">
<Animation Name="object_fu_Anim_00057C" Offset="0x57C" /> <!-- Original name is "are_are" -->
<Animation Name="object_fu_Anim_000B04" Offset="0xB04" /> <!-- Original name is "fu_mawasu" -->
<DList Name="object_fu_DL_003130" Offset="0x3130" />
<DList Name="object_fu_DL_003320" Offset="0x3320" />
<DList Name="object_fu_DL_0036A0" Offset="0x36A0" />
<DList Name="object_fu_DL_003BD8" Offset="0x3BD8" />
<DList Name="object_fu_DL_003D08" Offset="0x3D08" />
<DList Name="object_fu_DL_003E38" Offset="0x3E38" />
<DList Name="object_fu_DL_0040E0" Offset="0x40E0" />
<DList Name="object_fu_DL_004390" Offset="0x4390" />
<DList Name="object_fu_DL_004460" Offset="0x4460" />
<DList Name="object_fu_DL_004570" Offset="0x4570" />
<DList Name="object_fu_DL_004690" Offset="0x4690" />
<DList Name="object_fu_DL_0047E0" Offset="0x47E0" />
<DList Name="object_fu_DL_0048E8" Offset="0x48E8" />
<DList Name="object_fu_DL_004A08" Offset="0x4A08" />
<DList Name="object_fu_DL_004B58" Offset="0x4B58" />
<Texture Name="object_fu_TLUT_004C60" OutName="tlut_004C60" Format="rgba16" Width="16" Height="16" Offset="0x4C60" />
<Texture Name="object_fu_TLUT_004E60" OutName="tlut_004E60" Format="rgba16" Width="16" Height="16" Offset="0x4E60" />
<Texture Name="object_fu_Tex_005060" OutName="tex_005060" Format="ci8" Width="16" Height="16" Offset="0x5060" />
<Texture Name="object_fu_Tex_005160" OutName="tex_005160" Format="ci8" Width="8" Height="8" Offset="0x5160" />
<Texture Name="object_fu_Tex_0051A0" OutName="tex_0051A0" Format="ci8" Width="32" Height="32" Offset="0x51A0" />
<Texture Name="object_fu_Tex_0055A0" OutName="tex_0055A0" Format="ci8" Width="16" Height="16" Offset="0x55A0" />
<Texture Name="object_fu_Tex_0056A0" OutName="tex_0056A0" Format="ci8" Width="8" Height="8" Offset="0x56A0" />
<Texture Name="object_fu_Tex_0056E0" OutName="tex_0056E0" Format="ci8" Width="32" Height="32" Offset="0x56E0" />
<Texture Name="object_fu_Tex_005AE0" OutName="tex_005AE0" Format="ci8" Width="32" Height="32" Offset="0x5AE0" />
<Texture Name="object_fu_Tex_005EE0" OutName="tex_005EE0" Format="ci8" Width="8" Height="8" Offset="0x5EE0" />
<Texture Name="object_fu_Tex_005F20" OutName="tex_005F20" Format="ci8" Width="32" Height="32" Offset="0x5F20" />
<Texture Name="object_fu_Tex_006320" OutName="tex_006320" Format="ci8" Width="32" Height="32" Offset="0x6320" />
<Texture Name="object_fu_Tex_006720" OutName="tex_006720" Format="ci8" Width="32" Height="16" Offset="0x6720" />
<Texture Name="object_fu_Tex_006920" OutName="tex_006920" Format="ci8" Width="32" Height="16" Offset="0x6920" />
<Texture Name="object_fu_Tex_006B20" OutName="tex_006B20" Format="ci8" Width="8" Height="16" Offset="0x6B20" />
<Limb Name="object_fu_Standardlimb_006BA0" Type="Standard" EnumName="OBJECT_FU_LIMB_01" Offset="0x6BA0" />
<Limb Name="object_fu_Standardlimb_006BAC" Type="Standard" EnumName="OBJECT_FU_LIMB_02" Offset="0x6BAC" />
<Limb Name="object_fu_Standardlimb_006BB8" Type="Standard" EnumName="OBJECT_FU_LIMB_03" Offset="0x6BB8" />
<Limb Name="object_fu_Standardlimb_006BC4" Type="Standard" EnumName="OBJECT_FU_LIMB_04" Offset="0x6BC4" />
<Limb Name="object_fu_Standardlimb_006BD0" Type="Standard" EnumName="OBJECT_FU_LIMB_05" Offset="0x6BD0" />
<Limb Name="object_fu_Standardlimb_006BDC" Type="Standard" EnumName="OBJECT_FU_LIMB_06" Offset="0x6BDC" />
<Limb Name="object_fu_Standardlimb_006BE8" Type="Standard" EnumName="OBJECT_FU_LIMB_07" Offset="0x6BE8" />
<Limb Name="object_fu_Standardlimb_006BF4" Type="Standard" EnumName="OBJECT_FU_LIMB_08" Offset="0x6BF4" />
<Limb Name="object_fu_Standardlimb_006C00" Type="Standard" EnumName="OBJECT_FU_LIMB_09" Offset="0x6C00" />
<Limb Name="object_fu_Standardlimb_006C0C" Type="Standard" EnumName="OBJECT_FU_LIMB_0A" Offset="0x6C0C" />
<Limb Name="object_fu_Standardlimb_006C18" Type="Standard" EnumName="OBJECT_FU_LIMB_0B" Offset="0x6C18" />
<Limb Name="object_fu_Standardlimb_006C24" Type="Standard" EnumName="OBJECT_FU_LIMB_0C" Offset="0x6C24" />
<Limb Name="object_fu_Standardlimb_006C30" Type="Standard" EnumName="OBJECT_FU_LIMB_0D" Offset="0x6C30" />
<Limb Name="object_fu_Standardlimb_006C3C" Type="Standard" EnumName="OBJECT_FU_LIMB_0E" Offset="0x6C3C" />
<Limb Name="object_fu_Standardlimb_006C48" Type="Standard" EnumName="OBJECT_FU_LIMB_0F" Offset="0x6C48" />
<Skeleton Name="object_fu_Skel_006C90" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FU_LIMB_NONE" LimbMax="OBJECT_FU_LIMB_MAX" EnumName="ObjectFuLimb" Offset="0x6C90" />
<!-- Animations -->
<Animation Name="gGuruGuruPlayAndMoveHeadAnim" Offset="0x57C"/> <!-- Original name is "are_are" -->
<Animation Name="gGuruGuruPlayStillAnim" Offset="0xB04"/> <!-- Original name is "fu_mawasu" -->
<!-- Guru Guru Limb DisplayLists -->
<DList Name="gGuruGuruHornDL" Offset="0x3130"/>
<DList Name="gGuruGuruChestAndMusicBoxPipeDL" Offset="0x3320"/>
<DList Name="gGuruGuruHeadDL" Offset="0x36A0"/>
<DList Name="gGuruGuruRightShoulderDL" Offset="0x3BD8"/>
<DList Name="gGuruGuruRightArmDL" Offset="0x3D08"/>
<DList Name="gGuruGuruRightHandAndCrankDL" Offset="0x3E38"/>
<DList Name="gGuruGuruLeftArmAndMusicBoxDL" Offset="0x40E0"/>
<DList Name="gGuruGuruBlueTriangleDL" Offset="0x4390"/>
<DList Name="gGuruGuruTorsoDL" Offset="0x4460"/>
<DList Name="gGuruGuruRightThighDL" Offset="0x4570"/>
<DList Name="gGuruGuruRightLegDL" Offset="0x4690"/>
<DList Name="gGuruGuruRightFootDL" Offset="0x47E0"/>
<DList Name="gGuruGuruLeftThighDL" Offset="0x48E8"/>
<DList Name="gGuruGuruLeftLegDL" Offset="0x4A08"/>
<DList Name="gGuruGuruLeftFootDL" Offset="0x4B58"/>
<!-- Textures -->
<Texture Name="gGuruGuruClothesTLUT" OutName="guru_guru_clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C60"/>
<Texture Name="gGuruGuruSkinTLUT" OutName="guru_guru_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4E60"/>
<Texture Name="gGuruGuruPantsTex" OutName="guru_guru_pants" Format="ci8" Width="16" Height="16" Offset="0x5060" TlutOffset="0x4C60"/>
<Texture Name="gGuruGuruHeadSkinTex" OutName="guru_guru_head_skin" Format="ci8" Width="8" Height="8" Offset="0x5160" TlutOffset="0x4E60"/>
<Texture Name="gGuruGuruMusicBoxTex" OutName="guru_guru_music_box" Format="ci8" Width="32" Height="32" Offset="0x51A0" TlutOffset="0x4C60"/>
<Texture Name="gGuruGuruFingersAndToesTex" OutName="guru_guru_fingers_and_toes" Format="ci8" Width="16" Height="16" Offset="0x55A0" TlutOffset="0x4E60"/>
<Texture Name="gGuruGuruEarTex" OutName="guru_guru_ear" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x4E60"/>
<Texture Name="gGuruGuruUpperHornAndCrankTex" OutName="guru_guru_upper_horn_and_crank" Format="ci8" Width="32" Height="32" Offset="0x56E0" TlutOffset="0x4C60"/>
<Texture Name="gGuruGuruShirtTex" OutName="guru_guru_shirt" Format="ci8" Width="32" Height="32" Offset="0x5AE0" TlutOffset="0x4C60"/>
<Texture Name="gGuruGuruHornAndPipeTex" OutName="guru_guru_horn_and_pipe" Format="ci8" Width="8" Height="8" Offset="0x5EE0" TlutOffset="0x4C60"/>
<Texture Name="gGuruGuruEyeClosedTex" OutName="guru_guru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20" TlutOffset="0x4E60"/>
<Texture Name="gGuruGuruEyeAngryTex" OutName="guru_guru_eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320" TlutOffset="0x4E60"/>
<Texture Name="gGuruGuruMouthOpenTex" OutName="guru_guru_mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720" TlutOffset="0x4E60"/>
<Texture Name="gGuruGuruMouthAngryTex" OutName="guru_guru_mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920" TlutOffset="0x4E60"/>
<Texture Name="gGuruGuruHairTex" OutName="guru_guru_hair" Format="ci8" Width="8" Height="16" Offset="0x6B20" TlutOffset="0x4E60"/>
<!-- Guru Guru Limbs -->
<Limb Name="gGuruGuruTorsoLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_TORSO" Offset="0x6BA0"/>
<Limb Name="gGuruGuruLeftThighLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_LEFT_THIGH" Offset="0x6BAC"/>
<Limb Name="gGuruGuruLeftLegLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_LEFT_LEG" Offset="0x6BB8"/>
<Limb Name="gGuruGuruLeftFootLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_LEFT_FOOT" Offset="0x6BC4"/>
<Limb Name="gGuruGuruRightThighLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_THIGH" Offset="0x6BD0"/>
<Limb Name="gGuruGuruRightLegLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_LEG" Offset="0x6BDC"/>
<Limb Name="gGuruGuruRightFootLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_FOOT" Offset="0x6BE8"/>
<Limb Name="gGuruGuruChestAndMusicBoxPipeLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_CHEST_AND_MUSIC_BOX_PIPE" Offset="0x6BF4"/>
<Limb Name="gGuruGuruLeftArmAndMusicBoxLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_LEFT_ARM_AND_MUSIC_BOX" Offset="0x6C00"/>
<Limb Name="gGuruGuruTriangleLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_TRIANGLE" Offset="0x6C0C"/> <!--A random triangle near the right side of the music box-->
<Limb Name="gGuruGuruRightShoulderLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_SHOULDER" Offset="0x6C18"/>
<Limb Name="gGuruGuruRightArmLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT" Offset="0x6C24"/>
<Limb Name="gGuruGuruRightHandAndCrankLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_HAND_AND_CRANK" Offset="0x6C30"/>
<Limb Name="gGuruGuruHeadLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_HEAD" Offset="0x6C3C"/>
<Limb Name="gGuruGuruHornLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_HORN" Offset="0x6C48"/>
<!-- Guru Guru Skeleton -->
<Skeleton Name="gGuruGuruSkel" Type="Flex" LimbType="Standard" LimbNone="GURU_GURU_LIMB_NONE" LimbMax="GURU_GURU_LIMB_MAX" EnumName="GuruGuruLimb" Offset="0x6C90" />
</File>
</Root>