falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

* 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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 231 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
assets/xml/objects/object_bombf.xml
View File

@ -1,11 +1,14 @@
<Root> <Root>
<File Name="object_bombf" Segment="6"> <File Name="object_bombf" Segment="6">
<DList Name="object_bombf_DL_000340" Offset="0x340" /> <!-- Original name is "bm_leaf_model" --> <!-- Bomb Flower DisplayLists -->
<DList Name="object_bombf_DL_000408" Offset="0x408" /> <!-- Original name is "bm_flower_model" --> <DList Name="gBombFlowerLeavesDL" Offset="0x340"/> <!-- Original name is "bm_leaf_model" -->
<DList Name="object_bombf_DL_000530" Offset="0x530" /> <!-- Original name is "bm_leaf2_model" --> <DList Name="gBombFlowerBombAndSparkDL" Offset="0x408"/> <!-- Original name is "bm_flower_model" -->
<Texture Name="object_bombf_Tex_0005D8" OutName="tex_0005D8" Format="rgba16" Width="32" Height="32" Offset="0x5D8" /> <DList Name="gBombFlowerBaseLeavesDL" Offset="0x530"/> <!-- Original name is "bm_leaf2_model" -->
<Texture Name="object_bombf_Tex_000DD8" OutName="tex_000DD8" Format="rgba16" Width="16" Height="32" Offset="0xDD8" />
<Texture Name="object_bombf_Tex_0011D8" OutName="tex_0011D8" Format="ia16" Width="32" Height="32" Offset="0x11D8" /> <!-- Bomb Flower DisplayList Textures -->
<Texture Name="object_bombf_Tex_0019D8" OutName="tex_0019D8" Format="rgba16" Width="4" Height="4" Offset="0x19D8" /> <Texture Name="gBombFlowerLeafOutwardsTex" OutName="bomb_flower_leaf_outwards" Format="rgba16" Width="32" Height="32" Offset="0x5D8"/>
<Texture Name="gBombFlowerLeafUpwardsTex" OutName="bomb_flower_leaf_upwards" Format="rgba16" Width="16" Height="32" Offset="0xDD8"/>
<Texture Name="gBombFlowerBombTex" OutName="bomb_flower_bomb" Format="ia16" Width="32" Height="32" Offset="0x11D8"/>
<Texture Name="gBombFlowerFuseTex" OutName="bomb_flower_fuse" Format="rgba16" Width="4" Height="4" Offset="0x19D8"/>
</File> </File>
</Root> </Root>

105
assets/xml/objects/object_fu.xml
View File

@ -1,52 +1,61 @@
<Root> <Root>
<File Name="object_fu" Segment="6"> <File Name="object_fu" Segment="6">
<Animation Name="object_fu_Anim_00057C" Offset="0x57C" /> <!-- Original name is "are_are" --> <!-- Animations -->
<Animation Name="object_fu_Anim_000B04" Offset="0xB04" /> <!-- Original name is "fu_mawasu" --> <Animation Name="gGuruGuruPlayAndMoveHeadAnim" Offset="0x57C"/> <!-- Original name is "are_are" -->
<DList Name="object_fu_DL_003130" Offset="0x3130" /> <Animation Name="gGuruGuruPlayStillAnim" Offset="0xB04"/> <!-- Original name is "fu_mawasu" -->
<DList Name="object_fu_DL_003320" Offset="0x3320" />
<DList Name="object_fu_DL_0036A0" Offset="0x36A0" /> <!-- Guru Guru Limb DisplayLists -->
<DList Name="object_fu_DL_003BD8" Offset="0x3BD8" /> <DList Name="gGuruGuruHornDL" Offset="0x3130"/>
<DList Name="object_fu_DL_003D08" Offset="0x3D08" /> <DList Name="gGuruGuruChestAndMusicBoxPipeDL" Offset="0x3320"/>
<DList Name="object_fu_DL_003E38" Offset="0x3E38" /> <DList Name="gGuruGuruHeadDL" Offset="0x36A0"/>
<DList Name="object_fu_DL_0040E0" Offset="0x40E0" /> <DList Name="gGuruGuruRightShoulderDL" Offset="0x3BD8"/>
<DList Name="object_fu_DL_004390" Offset="0x4390" /> <DList Name="gGuruGuruRightArmDL" Offset="0x3D08"/>
<DList Name="object_fu_DL_004460" Offset="0x4460" /> <DList Name="gGuruGuruRightHandAndCrankDL" Offset="0x3E38"/>
<DList Name="object_fu_DL_004570" Offset="0x4570" /> <DList Name="gGuruGuruLeftArmAndMusicBoxDL" Offset="0x40E0"/>
<DList Name="object_fu_DL_004690" Offset="0x4690" /> <DList Name="gGuruGuruBlueTriangleDL" Offset="0x4390"/>
<DList Name="object_fu_DL_0047E0" Offset="0x47E0" /> <DList Name="gGuruGuruTorsoDL" Offset="0x4460"/>
<DList Name="object_fu_DL_0048E8" Offset="0x48E8" /> <DList Name="gGuruGuruRightThighDL" Offset="0x4570"/>
<DList Name="object_fu_DL_004A08" Offset="0x4A08" /> <DList Name="gGuruGuruRightLegDL" Offset="0x4690"/>
<DList Name="object_fu_DL_004B58" Offset="0x4B58" /> <DList Name="gGuruGuruRightFootDL" Offset="0x47E0"/>
<Texture Name="object_fu_TLUT_004C60" OutName="tlut_004C60" Format="rgba16" Width="16" Height="16" Offset="0x4C60" /> <DList Name="gGuruGuruLeftThighDL" Offset="0x48E8"/>
<Texture Name="object_fu_TLUT_004E60" OutName="tlut_004E60" Format="rgba16" Width="16" Height="16" Offset="0x4E60" /> <DList Name="gGuruGuruLeftLegDL" Offset="0x4A08"/>
<Texture Name="object_fu_Tex_005060" OutName="tex_005060" Format="ci8" Width="16" Height="16" Offset="0x5060" /> <DList Name="gGuruGuruLeftFootDL" Offset="0x4B58"/>
<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" /> <!-- Textures -->
<Texture Name="object_fu_Tex_0055A0" OutName="tex_0055A0" Format="ci8" Width="16" Height="16" Offset="0x55A0" /> <Texture Name="gGuruGuruClothesTLUT" OutName="guru_guru_clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C60"/>
<Texture Name="object_fu_Tex_0056A0" OutName="tex_0056A0" Format="ci8" Width="8" Height="8" Offset="0x56A0" /> <Texture Name="gGuruGuruSkinTLUT" OutName="guru_guru_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4E60"/>
<Texture Name="object_fu_Tex_0056E0" OutName="tex_0056E0" Format="ci8" Width="32" Height="32" Offset="0x56E0" /> <Texture Name="gGuruGuruPantsTex" OutName="guru_guru_pants" Format="ci8" Width="16" Height="16" Offset="0x5060" TlutOffset="0x4C60"/>
<Texture Name="object_fu_Tex_005AE0" OutName="tex_005AE0" Format="ci8" Width="32" Height="32" Offset="0x5AE0" /> <Texture Name="gGuruGuruHeadSkinTex" OutName="guru_guru_head_skin" Format="ci8" Width="8" Height="8" Offset="0x5160" TlutOffset="0x4E60"/>
<Texture Name="object_fu_Tex_005EE0" OutName="tex_005EE0" Format="ci8" Width="8" Height="8" Offset="0x5EE0" /> <Texture Name="gGuruGuruMusicBoxTex" OutName="guru_guru_music_box" Format="ci8" Width="32" Height="32" Offset="0x51A0" TlutOffset="0x4C60"/>
<Texture Name="object_fu_Tex_005F20" OutName="tex_005F20" Format="ci8" Width="32" Height="32" Offset="0x5F20" /> <Texture Name="gGuruGuruFingersAndToesTex" OutName="guru_guru_fingers_and_toes" Format="ci8" Width="16" Height="16" Offset="0x55A0" TlutOffset="0x4E60"/>
<Texture Name="object_fu_Tex_006320" OutName="tex_006320" Format="ci8" Width="32" Height="32" Offset="0x6320" /> <Texture Name="gGuruGuruEarTex" OutName="guru_guru_ear" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x4E60"/>
<Texture Name="object_fu_Tex_006720" OutName="tex_006720" Format="ci8" Width="32" Height="16" Offset="0x6720" /> <Texture Name="gGuruGuruUpperHornAndCrankTex" OutName="guru_guru_upper_horn_and_crank" Format="ci8" Width="32" Height="32" Offset="0x56E0" TlutOffset="0x4C60"/>
<Texture Name="object_fu_Tex_006920" OutName="tex_006920" Format="ci8" Width="32" Height="16" Offset="0x6920" /> <Texture Name="gGuruGuruShirtTex" OutName="guru_guru_shirt" Format="ci8" Width="32" Height="32" Offset="0x5AE0" TlutOffset="0x4C60"/>
<Texture Name="object_fu_Tex_006B20" OutName="tex_006B20" Format="ci8" Width="8" Height="16" Offset="0x6B20" /> <Texture Name="gGuruGuruHornAndPipeTex" OutName="guru_guru_horn_and_pipe" Format="ci8" Width="8" Height="8" Offset="0x5EE0" TlutOffset="0x4C60"/>
<Limb Name="object_fu_Standardlimb_006BA0" Type="Standard" EnumName="OBJECT_FU_LIMB_01" Offset="0x6BA0" /> <Texture Name="gGuruGuruEyeClosedTex" OutName="guru_guru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20" TlutOffset="0x4E60"/>
<Limb Name="object_fu_Standardlimb_006BAC" Type="Standard" EnumName="OBJECT_FU_LIMB_02" Offset="0x6BAC" /> <Texture Name="gGuruGuruEyeAngryTex" OutName="guru_guru_eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320" TlutOffset="0x4E60"/>
<Limb Name="object_fu_Standardlimb_006BB8" Type="Standard" EnumName="OBJECT_FU_LIMB_03" Offset="0x6BB8" /> <Texture Name="gGuruGuruMouthOpenTex" OutName="guru_guru_mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720" TlutOffset="0x4E60"/>
<Limb Name="object_fu_Standardlimb_006BC4" Type="Standard" EnumName="OBJECT_FU_LIMB_04" Offset="0x6BC4" /> <Texture Name="gGuruGuruMouthAngryTex" OutName="guru_guru_mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920" TlutOffset="0x4E60"/>
<Limb Name="object_fu_Standardlimb_006BD0" Type="Standard" EnumName="OBJECT_FU_LIMB_05" Offset="0x6BD0" /> <Texture Name="gGuruGuruHairTex" OutName="guru_guru_hair" Format="ci8" Width="8" Height="16" Offset="0x6B20" TlutOffset="0x4E60"/>
<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" /> <!-- Guru Guru Limbs -->
<Limb Name="object_fu_Standardlimb_006BF4" Type="Standard" EnumName="OBJECT_FU_LIMB_08" Offset="0x6BF4" /> <Limb Name="gGuruGuruTorsoLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_TORSO" Offset="0x6BA0"/>
<Limb Name="object_fu_Standardlimb_006C00" Type="Standard" EnumName="OBJECT_FU_LIMB_09" Offset="0x6C00" /> <Limb Name="gGuruGuruLeftThighLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_LEFT_THIGH" Offset="0x6BAC"/>
<Limb Name="object_fu_Standardlimb_006C0C" Type="Standard" EnumName="OBJECT_FU_LIMB_0A" Offset="0x6C0C" /> <Limb Name="gGuruGuruLeftLegLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_LEFT_LEG" Offset="0x6BB8"/>
<Limb Name="object_fu_Standardlimb_006C18" Type="Standard" EnumName="OBJECT_FU_LIMB_0B" Offset="0x6C18" /> <Limb Name="gGuruGuruLeftFootLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_LEFT_FOOT" Offset="0x6BC4"/>
<Limb Name="object_fu_Standardlimb_006C24" Type="Standard" EnumName="OBJECT_FU_LIMB_0C" Offset="0x6C24" /> <Limb Name="gGuruGuruRightThighLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_THIGH" Offset="0x6BD0"/>
<Limb Name="object_fu_Standardlimb_006C30" Type="Standard" EnumName="OBJECT_FU_LIMB_0D" Offset="0x6C30" /> <Limb Name="gGuruGuruRightLegLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_LEG" Offset="0x6BDC"/>
<Limb Name="object_fu_Standardlimb_006C3C" Type="Standard" EnumName="OBJECT_FU_LIMB_0E" Offset="0x6C3C" /> <Limb Name="gGuruGuruRightFootLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_RIGHT_FOOT" Offset="0x6BE8"/>
<Limb Name="object_fu_Standardlimb_006C48" Type="Standard" EnumName="OBJECT_FU_LIMB_0F" Offset="0x6C48" /> <Limb Name="gGuruGuruChestAndMusicBoxPipeLimb" LimbType="Standard" EnumName="GURU_GURU_LIMB_CHEST_AND_MUSIC_BOX_PIPE" Offset="0x6BF4"/>
<Skeleton Name="object_fu_Skel_006C90" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FU_LIMB_NONE" LimbMax="OBJECT_FU_LIMB_MAX" EnumName="ObjectFuLimb" Offset="0x6C90" /> <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> </File>
</Root> </Root>

81
assets/xml/objects/object_hata.xml
View File

@ -1,39 +1,50 @@
<Root> <Root>
<File Name="object_hata" Segment="6"> <File Name="object_hata" Segment="6">
<Collision Name="object_hata_Colheader_0000C0" Offset="0xC0" /> <!-- Flagpole Collision -->
<Animation Name="object_hata_Anim_000444" Offset="0x444" /> <Collision Name="gFlagpoleCol" Offset="0xC0" />
<Texture Name="object_hata_Tex_000460" OutName="tex_000460" Format="rgba16" Width="32" Height="32" Offset="0x460" />
<Texture Name="object_hata_Tex_000C60" OutName="tex_000C60" Format="rgba16" Width="32" Height="32" Offset="0xC60" /> <!-- Flagpole Animation -->
<Texture Name="object_hata_Tex_001460" OutName="tex_001460" Format="ia8" Width="128" Height="32" Offset="0x1460" /> <Animation Name="gFlagpoleFlapAnim" Offset="0x444" />
<DList Name="object_hata_DL_0026D0" Offset="0x26D0" />
<DList Name="object_hata_DL_002850" Offset="0x2850" /> <!-- Flagpole Textures -->
<DList Name="object_hata_DL_002920" Offset="0x2920" /> <Texture Name="gFlagpolePoleTex" OutName="flagpole_pole" Format="rgba16" Width="32" Height="32" Offset="0x460" />
<DList Name="object_hata_DL_0029F0" Offset="0x29F0" /> <Texture Name="gFlagpoleTopTex" OutName="flagpole_top" Format="rgba16" Width="32" Height="32" Offset="0xC60" />
<DList Name="object_hata_DL_002AC0" Offset="0x2AC0" /> <Texture Name="gFlagpoleFlagTex" OutName="flagpole_flag" Format="ia8" Width="128" Height="32" Offset="0x1460" />
<DList Name="object_hata_DL_002B90" Offset="0x2B90" />
<DList Name="object_hata_DL_002C60" Offset="0x2C60" /> <!-- Flagpole DLists -->
<DList Name="object_hata_DL_002D30" Offset="0x2D30" /> <DList Name="gFlagpolePoleDL" Offset="0x26D0"/>
<DList Name="object_hata_DL_002E00" Offset="0x2E00" /> <DList Name="gFlagpoleFlag1FlyEndDL" Offset="0x2AC0"/>
<Limb Name="object_hata_Standardlimb_002E90" Type="Standard" EnumName="OBJECT_HATA_LIMB_01" Offset="0x2E90" /> <DList Name="gFlagpoleFlag1FlyMidDL" Offset="0x29F0"/>
<Limb Name="object_hata_Standardlimb_002E9C" Type="Standard" EnumName="OBJECT_HATA_LIMB_02" Offset="0x2E9C" /> <DList Name="gFlagpoleFlag1HoistMidDL" Offset="0x2920"/>
<Limb Name="object_hata_Standardlimb_002EA8" Type="Standard" EnumName="OBJECT_HATA_LIMB_03" Offset="0x2EA8" /> <DList Name="gFlagpoleFlag1HoistEndDL" Offset="0x2850"/>
<Limb Name="object_hata_Standardlimb_002EB4" Type="Standard" EnumName="OBJECT_HATA_LIMB_04" Offset="0x2EB4" /> <DList Name="gFlagpoleFlag2FlyEndDL" Offset="0x2E00"/>
<Limb Name="object_hata_Standardlimb_002EC0" Type="Standard" EnumName="OBJECT_HATA_LIMB_05" Offset="0x2EC0" /> <DList Name="gFlagpoleFlag2FlyMidDL" Offset="0x2D30"/>
<Limb Name="object_hata_Standardlimb_002ECC" Type="Standard" EnumName="OBJECT_HATA_LIMB_06" Offset="0x2ECC" /> <DList Name="gFlagpoleFlag2HoistMidDL" Offset="0x2C60"/>
<Limb Name="object_hata_Standardlimb_002ED8" Type="Standard" EnumName="OBJECT_HATA_LIMB_07" Offset="0x2ED8" /> <DList Name="gFlagpoleFlag2HoistEndDL" Offset="0x2B90"/>
<Limb Name="object_hata_Standardlimb_002EE4" Type="Standard" EnumName="OBJECT_HATA_LIMB_08" Offset="0x2EE4" />
<Limb Name="object_hata_Standardlimb_002EF0" Type="Standard" EnumName="OBJECT_HATA_LIMB_09" Offset="0x2EF0" /> <!-- Flagpole Limbs -->
<Limb Name="object_hata_Standardlimb_002EFC" Type="Standard" EnumName="OBJECT_HATA_LIMB_0A" Offset="0x2EFC" /> <Limb Name="gFlagpolePoleBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_BASE" Offset="0x2E90" />
<Limb Name="object_hata_Standardlimb_002F08" Type="Standard" EnumName="OBJECT_HATA_LIMB_0B" Offset="0x2F08" /> <Limb Name="gFlagpolePoleLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_POLE" Offset="0x2E9C" />
<Limb Name="object_hata_Standardlimb_002F14" Type="Standard" EnumName="OBJECT_HATA_LIMB_0C" Offset="0x2F14" /> <Limb Name="gFlagpoleFlag1BaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_BASE" Offset="0x2EA8" />
<Limb Name="object_hata_Standardlimb_002F20" Type="Standard" EnumName="OBJECT_HATA_LIMB_0D" Offset="0x2F20" /> <Limb Name="gFlagpoleFlag1HoistEndBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_HOIST_END_BASE" Offset="0x2EB4" />
<Limb Name="object_hata_Standardlimb_002F2C" Type="Standard" EnumName="OBJECT_HATA_LIMB_0E" Offset="0x2F2C" /> <Limb Name="gFlagpoleFlag1HoistMidBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_HOIST_MID_BASE" Offset="0x2EC0" />
<Limb Name="object_hata_Standardlimb_002F38" Type="Standard" EnumName="OBJECT_HATA_LIMB_0F" Offset="0x2F38" /> <Limb Name="gFlagpoleFlag1FlyMidBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_FLY_MID_BASE" Offset="0x2ECC" />
<Limb Name="object_hata_Standardlimb_002F44" Type="Standard" EnumName="OBJECT_HATA_LIMB_10" Offset="0x2F44" /> <Limb Name="gFlagpoleFlag1FlyEndBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_FLY_END_BASE" Offset="0x2ED8" />
<Limb Name="object_hata_Standardlimb_002F50" Type="Standard" EnumName="OBJECT_HATA_LIMB_11" Offset="0x2F50" /> <Limb Name="gFlagpoleFlag1FlyEndLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_FLY_END" Offset="0x2EE4" />
<Limb Name="object_hata_Standardlimb_002F5C" Type="Standard" EnumName="OBJECT_HATA_LIMB_12" Offset="0x2F5C" /> <Limb Name="gFlagpoleFlag1FlyMidLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_FLY_MID" Offset="0x2EF0" />
<Limb Name="object_hata_Standardlimb_002F68" Type="Standard" EnumName="OBJECT_HATA_LIMB_13" Offset="0x2F68" /> <Limb Name="gFlagpoleFlag1HoistMidLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_HOIST_MID" Offset="0x2EFC" />
<Limb Name="object_hata_Standardlimb_002F74" Type="Standard" EnumName="OBJECT_HATA_LIMB_14" Offset="0x2F74" /> <Limb Name="gFlagpoleFlag1HoistEndLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG1_HOIST_END" Offset="0x2F08" />
<Skeleton Name="object_hata_Skel_002FD0" Type="Normal" LimbType="Standard" LimbNone="OBJECT_HATA_LIMB_NONE" LimbMax="OBJECT_HATA_LIMB_MAX" EnumName="ObjectHataLimb" Offset="0x2FD0" /> <Limb Name="gFlagpoleFlag2BaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_BASE" Offset="0x2F14" />
<Limb Name="gFlagpoleFlag2HoistEndBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_HOIST_END_BASE" Offset="0x2F20" />
<Limb Name="gFlagpoleFlag2HoistMidBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_HOIST_MID_BASE" Offset="0x2F2C" />
<Limb Name="gFlagpoleFlag2FlyMidBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_FLY_MID_BASE" Offset="0x2F38" />
<Limb Name="gFlagpoleFlag2FlyEndBaseLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_FLY_END_BASE" Offset="0x2F44" />
<Limb Name="gFlagpoleFlag2FlyEndLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_FLY_END" Offset="0x2F50" />
<Limb Name="gFlagpoleFlag2FlyMidLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_FLY_MID" Offset="0x2F5C" />
<Limb Name="gFlagpoleFlag2HoistMidLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_HOIST_MID" Offset="0x2F68" />
<Limb Name="gFlagpoleFlag2HoistEndLimb" Type="Standard" EnumName="FLAGPOLE_LIMB_FLAG2_HOIST_END" Offset="0x2F74" />
<!-- Flagpole Skeleton -->
<Skeleton Name="gFlagpoleSkel" Type="Normal" LimbType="Standard" LimbNone="FLAGPOLE_LIMB_NONE" LimbMax="FLAGPOLE_LIMB_MAX" EnumName="FlagpoleLimb" Offset="0x2FD0" />
</File> </File>
</Root> </Root>

7
assets/xml/objects/object_lightswitch.xml
View File

@ -2,10 +2,11 @@
<File Name="object_lightswitch" Segment="6"> <File Name="object_lightswitch" Segment="6">
<DList Name="object_lightswitch_DL_000260" Offset="0x260" /> <DList Name="object_lightswitch_DL_000260" Offset="0x260" />
<DList Name="object_lightswitch_DL_000398" Offset="0x398" /> <DList Name="object_lightswitch_DL_000398" Offset="0x398" />
<!-- a square, geometry only -->
<DList Name="object_lightswitch_DL_000408" Offset="0x408" /> <DList Name="object_lightswitch_DL_000408" Offset="0x408" />
<Texture Name="object_lightswitch_Tex_000420" OutName="tex_000420" Format="rgba16" Width="32" Height="32" Offset="0x420" /> <Texture Name="object_lightswitch_Tex_000420" OutName="tex_000420" Format="rgba16" Width="32" Height="32" Offset="0x420" /> <!-- eyes open -->
<Texture Name="object_lightswitch_Tex_000C20" OutName="tex_000C20" Format="rgba16" Width="32" Height="32" Offset="0xC20" /> <Texture Name="object_lightswitch_Tex_000C20" OutName="tex_000C20" Format="rgba16" Width="32" Height="32" Offset="0xC20" /> <!-- eyes closed -->
<Texture Name="object_lightswitch_Tex_001420" OutName="tex_001420" Format="rgba16" Width="32" Height="32" Offset="0x1420" /> <Texture Name="object_lightswitch_Tex_001420" OutName="tex_001420" Format="rgba16" Width="32" Height="32" Offset="0x1420" /> <!-- eyes open, smiling -->
<Texture Name="object_lightswitch_Tex_001C20" OutName="tex_001C20" Format="rgba16" Width="32" Height="32" Offset="0x1C20" /> <Texture Name="object_lightswitch_Tex_001C20" OutName="tex_001C20" Format="rgba16" Width="32" Height="32" Offset="0x1C20" />
</File> </File>
</Root> </Root>

67
assets/xml/objects/object_ms.xml
View File

@ -1,32 +1,43 @@
<Root> <Root>
<File Name="object_ms" Segment="6"> <File Name="object_ms" Segment="6">
<Animation Name="object_ms_Anim_0005EC" Offset="0x5EC" /> <!-- Bean Salesman Animations -->
<DList Name="object_ms_DL_0021E0" Offset="0x21E0" /> <Animation Name="gBeanSalesmanEatingAnim" Offset="0x5EC"/>
<DList Name="object_ms_DL_002300" Offset="0x2300" />
<DList Name="object_ms_DL_0028A0" Offset="0x28A0" /> <!-- Bean Salesman Limb DisplayLists -->
<DList Name="object_ms_DL_002CC8" Offset="0x2CC8" /> <DList Name="gBeanSalesmanLeftUpperArmDL" Offset="0x2E58"/>
<DList Name="object_ms_DL_002E58" Offset="0x2E58" /> <DList Name="gBeanSalesmanLeftForearmDL" Offset="0x2F90"/>
<DList Name="object_ms_DL_002F90" Offset="0x2F90" /> <DList Name="gBeanSalesmanLeftHandDL" Offset="0x30C0"/>
<DList Name="object_ms_DL_0030C0" Offset="0x30C0" /> <DList Name="gBeanSalesmanHeadDL" Offset="0x28A0"/>
<Texture Name="object_ms_TLUT_003230" OutName="tlut_003230" Format="rgba16" Width="16" Height="16" Offset="0x3230" /> <DList Name="gBeanSalesmanMouthDL" Offset="0x2CC8"/>
<Texture Name="object_ms_Tex_003430" OutName="tex_003430" Format="ci8" Width="16" Height="16" Offset="0x3430" /> <DList Name="gBeanSalesmanBodyDL" Offset="0x2300"/>
<Texture Name="object_ms_Tex_003530" OutName="tex_003530" Format="ci8" Width="32" Height="32" Offset="0x3530" /> <DList Name="gBeanSalesmanBeanbagDL" Offset="0x21E0"/>
<Texture Name="object_ms_Tex_003930" OutName="tex_003930" Format="ci8" Width="16" Height="16" Offset="0x3930" />
<Texture Name="object_ms_Tex_003A30" OutName="tex_003A30" Format="ci8" Width="8" Height="8" Offset="0x3A30" /> <!-- Bean Salesman Palettes -->
<Texture Name="object_ms_Tex_003A70" OutName="tex_003A70" Format="ci8" Width="8" Height="8" Offset="0x3A70" /> <Texture Name="gBeanSalesmanTLUT" OutName="bean_salesman_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3230"/>
<Texture Name="object_ms_Tex_003AB0" OutName="tex_003AB0" Format="ci8" Width="8" Height="8" Offset="0x3AB0" />
<Texture Name="object_ms_Tex_003AF0" OutName="tex_003AF0" Format="ci8" Width="16" Height="16" Offset="0x3AF0" /> <!-- Bean Salesman DisplayList Textures -->
<Texture Name="object_ms_Tex_003BF0" OutName="tex_003BF0" Format="ci8" Width="8" Height="8" Offset="0x3BF0" /> <Texture Name="gBeanSalesmanBackOfHandTex" OutName="bean_salesman_back_of_hand" Format="ci8" Width="16" Height="16" Offset="0x3430" TlutOffset="0x3230"/>
<Texture Name="object_ms_Tex_003C30" OutName="tex_003C30" Format="ci8" Width="4" Height="4" Offset="0x3C30" /> <Texture Name="gBeanSalesmanTattooTex" OutName="bean_salesman_tattoo" Format="ci8" Width="32" Height="32" Offset="0x3530" TlutOffset="0x3230"/>
<Texture Name="object_ms_Tex_003C40" OutName="tex_003C40" Format="ci8" Width="16" Height="16" Offset="0x3C40" /> <Texture Name="gBeanSalesmanMouthTex" OutName="bean_salesman_mouth" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x3230"/>
<Limb Name="object_ms_Standardlimb_003D40" Type="Standard" EnumName="OBJECT_MS_LIMB_01" Offset="0x3D40" /> <Texture Name="gBeanSalesmanEarTex" OutName="bean_salesman_ear" Format="ci8" Width="8" Height="8" Offset="0x3A30" TlutOffset="0x3230"/>
<Limb Name="object_ms_Standardlimb_003D4C" Type="Standard" EnumName="OBJECT_MS_LIMB_02" Offset="0x3D4C" /> <Texture Name="gBeanSalesmanNoseTex" OutName="bean_salesman_nose" Format="ci8" Width="8" Height="8" Offset="0x3A70" TlutOffset="0x3230"/>
<Limb Name="object_ms_Standardlimb_003D58" Type="Standard" EnumName="OBJECT_MS_LIMB_03" Offset="0x3D58" /> <Texture Name="gBeanSalesmanEyeTex" OutName="bean_salesman_eye" Format="ci8" Width="8" Height="8" Offset="0x3AB0" TlutOffset="0x3230"/>
<Limb Name="object_ms_Standardlimb_003D64" Type="Standard" EnumName="OBJECT_MS_LIMB_04" Offset="0x3D64" /> <Texture Name="gBeanSalesmanPantsTex" OutName="bean_salesman_pants" Format="ci8" Width="16" Height="16" Offset="0x3AF0" TlutOffset="0x3230"/>
<Limb Name="object_ms_Standardlimb_003D70" Type="Standard" EnumName="OBJECT_MS_LIMB_05" Offset="0x3D70" /> <Texture Name="gBeanSalesmanShoeTex" OutName="bean_salesman_shoe" Format="ci8" Width="8" Height="8" Offset="0x3BF0" TlutOffset="0x3230"/>
<Limb Name="object_ms_Standardlimb_003D7C" Type="Standard" EnumName="OBJECT_MS_LIMB_06" Offset="0x3D7C" /> <Texture Name="gBeanSalesmanSkinGradientTex" OutName="bean_salesman_skin_gradient" Format="ci8" Width="4" Height="4" Offset="0x3C30" TlutOffset="0x3230"/>
<Limb Name="object_ms_Standardlimb_003D88" Type="Standard" EnumName="OBJECT_MS_LIMB_07" Offset="0x3D88" /> <Texture Name="gBeanSalesmanBeanbagTex" OutName="bean_salesman_beanbag" Format="ci8" Width="16" Height="16" Offset="0x3C40" TlutOffset="0x3230"/>
<Limb Name="object_ms_Standardlimb_003D94" Type="Standard" EnumName="OBJECT_MS_LIMB_08" Offset="0x3D94" />
<Skeleton Name="object_ms_Skel_003DC0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MS_LIMB_NONE" LimbMax="OBJECT_MS_LIMB_MAX" EnumName="ObjectMsLimb" Offset="0x3DC0" /> <!-- Bean Salesman Limbs -->
<Limb Name="gBeanSalesmanRootLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_ROOT" Offset="0x3D40"/>
<Limb Name="gBeanSalesmanLeftUpperArmLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_LEFT_UPPER_ARM" Offset="0x3D4C"/>
<Limb Name="gBeanSalesmanLeftForearmLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_LEFT_FOREARM" Offset="0x3D58"/>
<Limb Name="gBeanSalesmanLeftHandLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_LEFT_HAND" Offset="0x3D64"/>
<Limb Name="gBeanSalesmanHeadLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_HEAD" Offset="0x3D70"/>
<Limb Name="gBeanSalesmanMouthLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_MOUTH" Offset="0x3D7C"/>
<Limb Name="gBeanSalesmanBodyLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_BODY" Offset="0x3D88"/>
<Limb Name="gBeanSalesmanBeanbagLimb" LimbType="Standard" EnumName="BEAN_SALESMAN_LIMB_BEANBAG" Offset="0x3D94"/>
<!-- Bean Salesman Skeleton -->
<Skeleton Name="gBeanSalesmanSkel" Type="Flex" LimbType="Standard" LimbNone="BEAN_SALESMAN_LIMB_NONE" LimbMax="BEAN_SALESMAN_LIMB_MAX" EnumName="BeanSalesmanLimb" Offset="0x3DC0"/>
</File> </File>
</Root> </Root>

8
assets/xml/objects/object_rr.xml
View File

@ -1,8 +1,8 @@
<Root> <Root>
<File Name="object_rr" Segment="6"> <File Name="object_rr" Segment="6">
<DList Name="object_rr_DL_000470" Offset="0x470" /> <DList Name="gLikeLikeDL" Offset="0x470"/>
<Texture Name="object_rr_Tex_000800" OutName="tex_000800" Format="rgba16" Width="16" Height="16" Offset="0x800" /> <Texture Name="gLikeLikeBodyPattern1Tex" OutName="like_like_body_pattern_1" Format="rgba16" Width="16" Height="16" Offset="0x800"/>
<Texture Name="object_rr_Tex_000A00" OutName="tex_000A00" Format="rgba16" Width="16" Height="16" Offset="0xA00" /> <Texture Name="gLikeLikeBodyPattern2Tex" OutName="like_like_body_pattern_2" Format="rgba16" Width="16" Height="16" Offset="0xA00"/>
<Texture Name="object_rr_Tex_000C00" OutName="tex_000C00" Format="ia16" Width="16" Height="16" Offset="0xC00" /> <Texture Name="gLikeLikeHoleTex" OutName="like_like_hole" Format="ia16" Width="16" Height="16" Offset="0xC00"/>
</File> </File>
</Root> </Root>

63
assets/xml/objects/object_vm.xml
View File

@ -1,30 +1,41 @@
<Root> <Root>
<File Name="object_vm" Segment="6"> <File Name="object_vm" Segment="6">
<Animation Name="object_vm_Anim_000068" Offset="0x68" /> <!-- Beamos Animations -->
<DList Name="object_vm_DL_001E00" Offset="0x1E00" /> <Animation Name="gBeamosAnim" Offset="0x68" />
<DList Name="object_vm_DL_0022B0" Offset="0x22B0" />
<DList Name="object_vm_DL_002460" Offset="0x2460" /> <!-- Beamos Limb DisplayLists -->
<DList Name="object_vm_DL_002610" Offset="0x2610" /> <DList Name="gBeamosBodyDL" Offset="0x1E00" />
<DList Name="object_vm_DL_002728" Offset="0x2728" /> <DList Name="gBeamosTopEyelidDL" Offset="0x22B0" />
<Texture Name="object_vm_Tex_0027C0" OutName="tex_0027C0" Format="rgba16" Width="8" Height="8" Offset="0x27C0" /> <DList Name="gBeamosBottomEyelidDL" Offset="0x2460" />
<Texture Name="object_vm_Tex_002840" OutName="tex_002840" Format="i4" Width="16" Height="32" Offset="0x2840" /> <DList Name="gBeamosEyeDL" Offset="0x2610" />
<Texture Name="object_vm_Tex_002940" OutName="tex_002940" Format="rgba16" Width="16" Height="32" Offset="0x2940" />
<Texture Name="object_vm_Tex_002D40" OutName="tex_002D40" Format="rgba16" Width="16" Height="8" Offset="0x2D40" /> <!-- Beamos Laser DisplayList -->
<Texture Name="object_vm_Tex_002E40" OutName="tex_002E40" Format="rgba16" Width="16" Height="16" Offset="0x2E40" /> <DList Name="gBeamosLaserDL" Offset="0x2728" />
<Texture Name="object_vm_Tex_003040" OutName="tex_003040" Format="rgba16" Width="32" Height="16" Offset="0x3040" />
<Texture Name="object_vm_Tex_003440" OutName="tex_003440" Format="rgba16" Width="16" Height="16" Offset="0x3440" /> <!-- Beamos DisplayList Textures -->
<Texture Name="object_vm_Tex_003640" OutName="tex_003640" Format="rgba16" Width="8" Height="8" Offset="0x3640" /> <Texture Name="gBeamosBodyGradientTex" OutName="beamos_body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x27C0" />
<Texture Name="object_vm_Tex_0036C0" OutName="tex_0036C0" Format="rgba16" Width="32" Height="32" Offset="0x36C0" /> <Texture Name="gBeamosGrayMetalTex" OutName="beamos_gray_metal" Format="i4" Width="16" Height="32" Offset="0x2840" />
<Limb Name="object_vm_Standardlimb_003EC0" Type="Standard" EnumName="OBJECT_VM_LIMB_01" Offset="0x3EC0" /> <Texture Name="gBeamosBoltAndMetalTex" OutName="beamos_bolt_and_metal" Format="rgba16" Width="16" Height="32" Offset="0x2940" />
<Limb Name="object_vm_Standardlimb_003ECC" Type="Standard" EnumName="OBJECT_VM_LIMB_02" Offset="0x3ECC" /> <Texture Name="gBeamosInnerEyeLidTex" OutName="beamos_inner_eye_lid" Format="rgba16" Width="16" Height="8" Offset="0x2D40" />
<Limb Name="object_vm_Standardlimb_003ED8" Type="Standard" EnumName="OBJECT_VM_LIMB_03" Offset="0x3ED8" /> <Texture Name="gBeamosEyeOutlineTex" OutName="beamos_eye_outline" Format="rgba16" Width="16" Height="16" Offset="0x2E40" />
<Limb Name="object_vm_Standardlimb_003EE4" Type="Standard" EnumName="OBJECT_VM_LIMB_04" Offset="0x3EE4" /> <Texture Name="gBeamosEyeTex" OutName="beamos_eye" Format="rgba16" Width="32" Height="16" Offset="0x3040" />
<Limb Name="object_vm_Standardlimb_003EF0" Type="Standard" EnumName="OBJECT_VM_LIMB_05" Offset="0x3EF0" /> <Texture Name="gBeamosBodyTex" OutName="beamos_body" Format="rgba16" Width="16" Height="16" Offset="0x3440" />
<Limb Name="object_vm_Standardlimb_003EFC" Type="Standard" EnumName="OBJECT_VM_LIMB_06" Offset="0x3EFC" /> <Texture Name="gBeamosLaserTex" OutName="beamos_laser" Format="rgba16" Width="8" Height="8" Offset="0x3640" />
<Limb Name="object_vm_Standardlimb_003F08" Type="Standard" EnumName="OBJECT_VM_LIMB_07" Offset="0x3F08" /> <Texture Name="gBeamosTeethTex" OutName="beamos_teeth" Format="rgba16" Width="32" Height="32" Offset="0x36C0" />
<Limb Name="object_vm_Standardlimb_003F14" Type="Standard" EnumName="OBJECT_VM_LIMB_08" Offset="0x3F14" />
<Limb Name="object_vm_Standardlimb_003F20" Type="Standard" EnumName="OBJECT_VM_LIMB_09" Offset="0x3F20" /> <!-- Beamos Skeleton Limbs -->
<Limb Name="object_vm_Standardlimb_003F2C" Type="Standard" EnumName="OBJECT_VM_LIMB_0A" Offset="0x3F2C" /> <Limb Name="gBeamosRootLimb" Type="Standard" EnumName="BEAMOS_LIMB_ROOT" Offset="0x3EC0" />
<Skeleton Name="object_vm_Skel_003F60" Type="Normal" LimbType="Standard" LimbNone="OBJECT_VM_LIMB_NONE" LimbMax="OBJECT_VM_LIMB_MAX" EnumName="ObjectVmLimb" Offset="0x3F60" /> <Limb Name="gBeamosHeadRootLimb" Type="Standard" EnumName="BEAMOS_LIMB_HEAD_ROOT" Offset="0x3ECC" />
<Limb Name="gBeamosTopEyelidRootLimb" Type="Standard" EnumName="BEAMOS_LIMB_TOP_EYELID_ROOT" Offset="0x3ED8" />
<Limb Name="gBeamosTopEyelidWrapperLimb" Type="Standard" EnumName="BEAMOS_LIMB_TOP_EYELID_WRAPPER" Offset="0x3EE4" />
<Limb Name="gBeamosTopEyelidLimb" Type="Standard" EnumName="BEAMOS_LIMB_TOP_EYELID" Offset="0x3EF0" />
<Limb Name="gBeamosBottomEyelidRootLimb" Type="Standard" EnumName="BEAMOS_LIMB_BOTTOM_EYELID_ROOT" Offset="0x3EFC" />
<Limb Name="gBeamosBottomEyelidWrapperLimb" Type="Standard" EnumName="BEAMOS_LIMB_BOTTOM_EYELID_WRAPPER" Offset="0x3F08" />
<Limb Name="gBeamosBottomEyelidLimb" Type="Standard" EnumName="BEAMOS_LIMB_BOTTEM_EYELID" Offset="0x3F14" />
<Limb Name="gBeamosEyeLimb" Type="Standard" EnumName="BEAMOS_LIMB_EYE" Offset="0x3F20" />
<Limb Name="gBeamosBodyLimb" Type="Standard" EnumName="BEAMOS_LIMB_BODY" Offset="0x3F2C" />
<!-- Beamos Skeleton -->
<Skeleton Name="gBeamosSkel" Type="Normal" LimbType="Standard" LimbNone="BEAMOS_LIMB_NONE" LimbMax="BEAMOS_LIMB_MAX" EnumName="BeamosLimb" Offset="0x3F60" />
</File> </File>
</Root> </Root>

8
assets/xml/objects/object_zg.xml
View File

@ -1,8 +1,8 @@
<Root> <Root>
<File Name="object_zg" Segment="6"> <File Name="object_zg" Segment="6">
<Texture Name="object_zg_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0" /> <Texture Name="gTowerCollapseBarMetalTex" OutName="tower_collapse_bar_metal" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
<Texture Name="object_zg_Tex_000800" OutName="tex_000800" Format="rgba16" Width="32" Height="32" Offset="0x800" /> <Texture Name="gTowerCollapseBarFlameTex" OutName="tower_collapse_bar_flame" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
<DList Name="object_zg_DL_001080" Offset="0x1080" /> <DList Name="gTowerCollapseBarsDL" Offset="0x1080"/>
<!-- <Blob Name="object_zg_Blob_001160" Size="0xA0" Offset="0x1160" /> --> <Collision Name="gTowerCollapseBarsCol" Offset="0x11D4"/>
</File> </File>
</Root> </Root>

6
src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
View File

@ -477,8 +477,8 @@ void EnBombf_Draw(Actor* thisx, PlayState* play) {
if (ENBOMBF_GET(&this->actor) != ENBOMBF_0) { if (ENBOMBF_GET(&this->actor) != ENBOMBF_0) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_bombf_DL_000340); gSPDisplayList(POLY_OPA_DISP++, gBombFlowerLeavesDL);
gSPDisplayList(POLY_OPA_DISP++, object_bombf_DL_000530); gSPDisplayList(POLY_OPA_DISP++, gBombFlowerBaseLeavesDL);
Matrix_Translate(0.0f, 1000.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, 1000.0f, 0.0f, MTXMODE_APPLY);
Matrix_Scale(this->unk_204, this->unk_204, this->unk_204, MTXMODE_APPLY); Matrix_Scale(this->unk_204, this->unk_204, this->unk_204, MTXMODE_APPLY);
@ -495,7 +495,7 @@ void EnBombf_Draw(Actor* thisx, PlayState* play) {
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gfx)); gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gfx));
} }
gSPDisplayList(POLY_OPA_DISP++, object_bombf_DL_000408); gSPDisplayList(POLY_OPA_DISP++, gBombFlowerBombAndSparkDL);
} else { } else {
Collider_UpdateSpheres(0, &this->colliderJntSph); Collider_UpdateSpheres(0, &this->colliderJntSph);
} }

8
src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c
View File

@ -62,18 +62,18 @@ static ColliderCylinderInit sCylinderInit = {
{ 15, 20, 0, { 0, 0, 0 } }, { 15, 20, 0, { 0, 0, 0 } },
}; };
static AnimationHeader* sAnimations[] = { &object_fu_Anim_000B04, &object_fu_Anim_00057C }; static AnimationHeader* sAnimations[] = { &gGuruGuruPlayStillAnim, &gGuruGuruPlayAndMoveHeadAnim };
static u8 sAnimationModes[] = { ANIMMODE_LOOP, ANIMMODE_LOOP }; static u8 sAnimationModes[] = { ANIMMODE_LOOP, ANIMMODE_LOOP };
static f32 sPlaySpeeds[] = { 1.0f, 1.0f }; static f32 sPlaySpeeds[] = { 1.0f, 1.0f };
static TexturePtr sEyeTextures[] = { object_fu_Tex_005F20, object_fu_Tex_006320 }; static TexturePtr sEyeTextures[] = { gGuruGuruEyeClosedTex, gGuruGuruEyeAngryTex };
static TexturePtr sMouthTextures[] = { object_fu_Tex_006720, object_fu_Tex_006920 }; static TexturePtr sMouthTextures[] = { gGuruGuruMouthOpenTex, gGuruGuruMouthAngryTex };
void EnGuruguru_Init(Actor* thisx, PlayState* play) { void EnGuruguru_Init(Actor* thisx, PlayState* play) {
EnGuruguru* this = THIS; EnGuruguru* this = THIS;
this->actor.colChkInfo.mass = MASS_IMMOVABLE; this->actor.colChkInfo.mass = MASS_IMMOVABLE;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 19.0f); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 19.0f);
SkelAnime_InitFlex(play, &this->skelAnime, &object_fu_Skel_006C90, &object_fu_Anim_000B04, this->jointTable, SkelAnime_InitFlex(play, &this->skelAnime, &gGuruGuruSkel, &gGuruGuruPlayStillAnim, this->jointTable,
this->morphTable, 16); this->morphTable, 16);
this->actor.targetMode = 0; this->actor.targetMode = 0;
if (this->actor.params != 2) { if (this->actor.params != 2) {

11
src/overlays/actors/ovl_En_Hata/z_en_hata.c
View File

@ -33,13 +33,12 @@ void EnHata_Init(Actor* thisx, PlayState* play) {
s32 rand; s32 rand;
f32 endFrame; f32 endFrame;
SkelAnime_Init(play, &this->skelAnime, &object_hata_Skel_002FD0, NULL, this->jointTable, this->morphTable, SkelAnime_Init(play, &this->skelAnime, &gFlagpoleSkel, NULL, this->jointTable, this->morphTable, FLAGPOLE_LIMB_MAX);
OBJECT_HATA_LIMB_MAX); endFrame = Animation_GetLastFrame(&gFlagpoleFlapAnim);
endFrame = Animation_GetLastFrame(&object_hata_Anim_000444); Animation_Change(&this->skelAnime, &gFlagpoleFlapAnim, 1.0f, 0.0f, endFrame, ANIMMODE_LOOP, 0.0f);
Animation_Change(&this->skelAnime, &object_hata_Anim_000444, 1.0f, 0.0f, endFrame, ANIMMODE_LOOP, 0.0f);
rand = Rand_ZeroFloat(endFrame); rand = Rand_ZeroFloat(endFrame);
this->skelAnime.curFrame = rand; this->skelAnime.curFrame = rand;
DynaPolyActor_LoadMesh(play, &this->dyna, &object_hata_Colheader_0000C0); DynaPolyActor_LoadMesh(play, &this->dyna, &gFlagpoleCol);
Actor_SetScale(&this->dyna.actor, 0.013f); Actor_SetScale(&this->dyna.actor, 0.013f);
this->dyna.actor.uncullZoneScale = 500.0f; this->dyna.actor.uncullZoneScale = 500.0f;
this->dyna.actor.uncullZoneDownward = 500.0f; this->dyna.actor.uncullZoneDownward = 500.0f;
@ -84,7 +83,7 @@ void EnHata_Update(Actor* thisx, PlayState* play2) {
s32 EnHata_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { s32 EnHata_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
EnHata* this = THIS; EnHata* this = THIS;
if ((limbIndex == OBJECT_HATA_LIMB_04) || (limbIndex == OBJECT_HATA_LIMB_0D)) { if ((limbIndex == FLAGPOLE_LIMB_FLAG1_HOIST_END_BASE) || (limbIndex == FLAGPOLE_LIMB_FLAG2_HOIST_END_BASE)) {
rot->y += this->unk_29C; rot->y += this->unk_29C;
rot->z += this->unk_2A0; rot->z += this->unk_2A0;
} }

4
src/overlays/actors/ovl_En_Hata/z_en_hata.h
View File

@ -9,8 +9,8 @@ struct EnHata;
typedef struct EnHata { typedef struct EnHata {
/* 0x000 */ DynaPolyActor dyna; /* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ SkelAnime skelAnime; /* 0x15C */ SkelAnime skelAnime;
/* 0x1A0 */ Vec3s jointTable[OBJECT_HATA_LIMB_MAX]; /* 0x1A0 */ Vec3s jointTable[FLAGPOLE_LIMB_MAX];
/* 0x21E */ Vec3s morphTable[OBJECT_HATA_LIMB_MAX]; /* 0x21E */ Vec3s morphTable[FLAGPOLE_LIMB_MAX];
/* 0x29C */ s16 unk_29C; /* 0x29C */ s16 unk_29C;
/* 0x29E */ UNK_TYPE1 pad_29E[2]; /* 0x29E */ UNK_TYPE1 pad_29E[2];
/* 0x2A0 */ s16 unk_2A0; /* 0x2A0 */ s16 unk_2A0;

2
src/overlays/actors/ovl_En_Ms/z_en_ms.c
View File

@ -61,7 +61,7 @@ void EnMs_Init(Actor* thisx, PlayState* play) {
EnMs* this = THIS; EnMs* this = THIS;
Actor_ProcessInitChain(thisx, sInitChain); Actor_ProcessInitChain(thisx, sInitChain);
SkelAnime_InitFlex(play, &this->skelAnime, &object_ms_Skel_003DC0, &object_ms_Anim_0005EC, this->jointTable, SkelAnime_InitFlex(play, &this->skelAnime, &gBeanSalesmanSkel, &gBeanSalesmanEatingAnim, this->jointTable,
this->morphTable, 9); this->morphTable, 9);
Collider_InitCylinder(play, &this->collider); Collider_InitCylinder(play, &this->collider);
Collider_SetCylinderType1(play, &this->collider, &this->actor, &sCylinderInit); Collider_SetCylinderType1(play, &this->collider, &this->actor, &sCylinderInit);

2
src/overlays/actors/ovl_En_Rr/z_en_rr.c
View File

@ -936,7 +936,7 @@ void EnRr_Draw(Actor* thisx, PlayState* play2) {
this->collider2.dim.pos.y = ((this->unk_228.y - spA4.y) * 0.85f) + spA4.y; this->collider2.dim.pos.y = ((this->unk_228.y - spA4.y) * 0.85f) + spA4.y;
this->collider2.dim.pos.z = ((this->unk_228.z - spA4.z) * 0.85f) + spA4.z; this->collider2.dim.pos.z = ((this->unk_228.z - spA4.z) * 0.85f) + spA4.z;
gSPDisplayList(POLY_OPA_DISP++, object_rr_DL_000470); gSPDisplayList(POLY_OPA_DISP++, gLikeLikeDL);
Actor_DrawDamageEffects(play, &this->actor, this->limbPos, ARRAY_COUNT(this->limbPos), Actor_DrawDamageEffects(play, &this->actor, this->limbPos, ARRAY_COUNT(this->limbPos),
this->actor.scale.y * 66.66667f * this->drawDmgEffScale, this->drawDmgEffFrozenSteamScale, this->actor.scale.y * 66.66667f * this->drawDmgEffScale, this->drawDmgEffFrozenSteamScale,

29
src/overlays/actors/ovl_En_Vm/z_en_vm.c
View File

@ -167,8 +167,7 @@ void EnVm_Init(Actor* thisx, PlayState* play) {
Actor_ProcessInitChain(&this->actor, sInitChain); Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 35.0f); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 35.0f);
SkelAnime_Init(play, &this->skelAnime, &object_vm_Skel_003F60, &object_vm_Anim_000068, this->jointTable, SkelAnime_Init(play, &this->skelAnime, &gBeamosSkel, &gBeamosAnim, this->jointTable, this->morphTable, 11);
this->morphTable, 11);
Collider_InitAndSetTris(play, &this->colliderTris, &this->actor, &sTrisInit, this->colliderTrisElements); Collider_InitAndSetTris(play, &this->colliderTris, &this->actor, &sTrisInit, this->colliderTrisElements);
Collider_InitAndSetJntSph(play, &this->colliderJntSph, &this->actor, &sJntSphInit, this->colliderJntSphElements); Collider_InitAndSetJntSph(play, &this->colliderJntSph, &this->actor, &sJntSphInit, this->colliderJntSphElements);
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit); CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
@ -199,9 +198,9 @@ void EnVm_Destroy(Actor* thisx, PlayState* play) {
} }
void func_808CC420(EnVm* this) { void func_808CC420(EnVm* this) {
f32 lastFrame = Animation_GetLastFrame(&object_vm_Anim_000068); f32 lastFrame = Animation_GetLastFrame(&gBeamosAnim);
Animation_Change(&this->skelAnime, &object_vm_Anim_000068, 1.0f, lastFrame, lastFrame, ANIMMODE_ONCE, 0.0f); Animation_Change(&this->skelAnime, &gBeamosAnim, 1.0f, lastFrame, lastFrame, ANIMMODE_ONCE, 0.0f);
this->actionFunc = func_808CC490; this->actionFunc = func_808CC490;
} }
@ -231,7 +230,7 @@ void func_808CC490(EnVm* this, PlayState* play) {
} }
void func_808CC5C4(EnVm* this) { void func_808CC5C4(EnVm* this) {
Animation_PlayLoopSetSpeed(&this->skelAnime, &object_vm_Anim_000068, 2.0f); Animation_PlayLoopSetSpeed(&this->skelAnime, &gBeamosAnim, 2.0f);
this->unk_214 = 10; this->unk_214 = 10;
this->actionFunc = func_808CC610; this->actionFunc = func_808CC610;
} }
@ -266,7 +265,7 @@ void func_808CC610(EnVm* this, PlayState* play) {
void func_808CC788(EnVm* this) { void func_808CC788(EnVm* this) {
Actor_PlaySfx(&this->actor, NA_SE_EN_BIMOS_AIM); Actor_PlaySfx(&this->actor, NA_SE_EN_BIMOS_AIM);
Animation_Change(&this->skelAnime, &object_vm_Anim_000068, 3.0f, 3.0f, 7.0f, ANIMMODE_ONCE, 0.0f); Animation_Change(&this->skelAnime, &gBeamosAnim, 3.0f, 3.0f, 7.0f, ANIMMODE_ONCE, 0.0f);
this->unk_214 = 305; this->unk_214 = 305;
this->unk_220 = 0.06f; this->unk_220 = 0.06f;
this->colliderTris.base.atFlags &= ~AT_HIT; this->colliderTris.base.atFlags &= ~AT_HIT;
@ -322,8 +321,8 @@ void func_808CC820(EnVm* this, PlayState* play) {
} }
void func_808CCA10(EnVm* this) { void func_808CCA10(EnVm* this) {
Animation_Change(&this->skelAnime, &object_vm_Anim_000068, -1.0f, Animation_GetLastFrame(&object_vm_Anim_000068), Animation_Change(&this->skelAnime, &gBeamosAnim, -1.0f, Animation_GetLastFrame(&gBeamosAnim), 0.0f, ANIMMODE_ONCE,
0.0f, ANIMMODE_ONCE, 0.0f); 0.0f);
this->unk_214 = 100; this->unk_214 = 100;
this->unk_210 = 0; this->unk_210 = 0;
this->unk_224 = 0.0f; this->unk_224 = 0.0f;
@ -343,7 +342,7 @@ void func_808CCAA4(EnVm* this, PlayState* play) {
} }
void func_808CCB08(EnVm* this) { void func_808CCB08(EnVm* this) {
Animation_PlayOnce(&this->skelAnime, &object_vm_Anim_000068); Animation_PlayOnce(&this->skelAnime, &gBeamosAnim);
this->unk_214 = -1; this->unk_214 = -1;
this->actionFunc = func_808CCB50; this->actionFunc = func_808CCB50;
} }
@ -365,8 +364,8 @@ void func_808CCB50(EnVm* this, PlayState* play) {
} }
void func_808CCBE4(EnVm* this, PlayState* play) { void func_808CCBE4(EnVm* this, PlayState* play) {
Animation_Change(&this->skelAnime, &object_vm_Anim_000068, -1.0f, Animation_GetLastFrame(&object_vm_Anim_000068), Animation_Change(&this->skelAnime, &gBeamosAnim, -1.0f, Animation_GetLastFrame(&gBeamosAnim), 0.0f, ANIMMODE_ONCE,
0.0f, ANIMMODE_ONCE, 0.0f); 0.0f);
Enemy_StartFinishingBlow(play, &this->actor); Enemy_StartFinishingBlow(play, &this->actor);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 33); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 33);
this->unk_214 = 33; this->unk_214 = 33;
@ -462,10 +461,10 @@ void EnVm_Update(Actor* thisx, PlayState* play) {
s32 EnVm_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { s32 EnVm_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
EnVm* this = THIS; EnVm* this = THIS;
if (limbIndex == OBJECT_VM_LIMB_02) { if (limbIndex == BEAMOS_LIMB_HEAD_ROOT) {
rot->x += this->unk_216; rot->x += this->unk_216;
rot->y += this->unk_218; rot->y += this->unk_218;
} else if ((limbIndex == OBJECT_VM_LIMB_0A) && (this->actionFunc == func_808CCCF0)) { } else if ((limbIndex == BEAMOS_LIMB_BODY) && (this->actionFunc == func_808CCCF0)) {
*dList = NULL; *dList = NULL;
} }
return false; return false;
@ -481,7 +480,7 @@ void EnVm_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
Collider_UpdateSpheres(limbIndex, &this->colliderJntSph); Collider_UpdateSpheres(limbIndex, &this->colliderJntSph);
if (limbIndex == OBJECT_VM_LIMB_02) { if (limbIndex == BEAMOS_LIMB_HEAD_ROOT) {
sp4C = NULL; sp4C = NULL;
Matrix_MultZero(&this->actor.focus.pos); Matrix_MultZero(&this->actor.focus.pos);
@ -549,7 +548,7 @@ void EnVm_Draw(Actor* thisx, PlayState* play) {
Matrix_Scale(this->unk_220, this->unk_220, this->unk_224 * 0.0015f, MTXMODE_APPLY); Matrix_Scale(this->unk_220, this->unk_220, this->unk_224 * 0.0015f, MTXMODE_APPLY);
gSPMatrix(&gfx[1], Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(&gfx[1], Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(&gfx[2], object_vm_DL_002728); gSPDisplayList(&gfx[2], gBeamosLaserDL);
POLY_OPA_DISP = &gfx[3]; POLY_OPA_DISP = &gfx[3];
} }