mirror of
https://github.com/zeldaret/oot.git
synced 2024-12-27 07:07:09 +00:00
Document En_Rd (#1179)
* Port a ton of stuff from MM * Damage effect enum * Enum for type * Enum for action * Limb enum * Match MM styling as much as possible * Divide object into sections * Document values in EnRdDamageEffect * Respond to Dragorn's review * Apply Dragorn's suggestion for the union * Respond to Dragorn's second review * Move all actions away from -ing * Fix typos * Respond to Fig and Roman's reviews * Fix build error, whoops * Bring back // fallthrough
This commit is contained in:
Tom Overton
GitHub
parent
80186ec1ab
commit
74bed3ec9b
4 changed files with 606 additions and 481 deletions
|
|
@ -1,106 +1,124 @@
|
||||||
<Root>
|
<Root>
|
||||||
|
<!-- Assets for Gibdos and Redeads -->
|
||||||
<File Name="object_rd" Segment="6">
|
<File Name="object_rd" Segment="6">
|
||||||
<Texture Name="object_rd_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="64" Height="32" Offset="0x0"/>
|
<!-- Gibdo Textures -->
|
||||||
<Texture Name="object_rd_Tex_001000" OutName="tex_00001000" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
|
<Texture Name="gGibdoWrappingTex" OutName="gibdo_wrapping" Format="rgba16" Width="64" Height="32" Offset="0x0"/>
|
||||||
<DList Name="object_rd_DL_002C60" Offset="0x2C60"/>
|
<Texture Name="gGibdoEyeTex" OutName="gibdo_eye" Format="rgba16" Width="32" Height="16" Offset="0x1000"/>
|
||||||
<DList Name="object_rd_DL_002D40" Offset="0x2D40"/>
|
|
||||||
<DList Name="object_rd_DL_002EB0" Offset="0x2EB0"/>
|
<!-- Gibdo Limb DisplayLists -->
|
||||||
<DList Name="object_rd_DL_003018" Offset="0x3018"/>
|
<DList Name="gGibdoPelvisDL" Offset="0x2C60"/>
|
||||||
<DList Name="object_rd_DL_003120" Offset="0x3120"/>
|
<DList Name="gGibdoHeadDL" Offset="0x2D40"/>
|
||||||
<DList Name="object_rd_DL_003220" Offset="0x3220"/>
|
<DList Name="gGibdoTorsoDL" Offset="0x2EB0"/>
|
||||||
<DList Name="object_rd_DL_003320" Offset="0x3320"/>
|
<DList Name="gGibdoRightUpperArmDL" Offset="0x3018"/>
|
||||||
<DList Name="object_rd_DL_003428" Offset="0x3428"/>
|
<DList Name="gGibdoRightForearmDL" Offset="0x3120"/>
|
||||||
<DList Name="object_rd_DL_003528" Offset="0x3528"/>
|
<DList Name="gGibdoRightHandDL" Offset="0x3220"/>
|
||||||
<DList Name="object_rd_DL_003628" Offset="0x3628"/>
|
<DList Name="gGibdoLeftUpperArmDL" Offset="0x3320"/>
|
||||||
<DList Name="object_rd_DL_003738" Offset="0x3738"/>
|
<DList Name="gGibdoLeftForearmDL" Offset="0x3428"/>
|
||||||
<DList Name="object_rd_DL_003830" Offset="0x3830"/>
|
<DList Name="gGibdoLeftHandDL" Offset="0x3528"/>
|
||||||
<DList Name="object_rd_DL_003948" Offset="0x3948"/>
|
<DList Name="gGibdoRightThighDL" Offset="0x3628"/>
|
||||||
<DList Name="object_rd_DL_003A58" Offset="0x3A58"/>
|
<DList Name="gGibdoRightShinDL" Offset="0x3738"/>
|
||||||
<DList Name="object_rd_DL_003B50" Offset="0x3B50"/>
|
<DList Name="gGibdoRightFootDL" Offset="0x3830"/>
|
||||||
<Limb Name="object_rd_Limb_003C48" LimbType="Standard" Offset="0x3C48"/>
|
<DList Name="gGibdoLeftThighDL" Offset="0x3948"/>
|
||||||
<Limb Name="object_rd_Limb_003C54" LimbType="Standard" Offset="0x3C54"/>
|
<DList Name="gGibdoLeftShinDL" Offset="0x3A58"/>
|
||||||
<Limb Name="object_rd_Limb_003C60" LimbType="Standard" Offset="0x3C60"/>
|
<DList Name="gGibdoLeftFootDL" Offset="0x3B50"/>
|
||||||
<Limb Name="object_rd_Limb_003C6C" LimbType="Standard" Offset="0x3C6C"/>
|
|
||||||
<Limb Name="object_rd_Limb_003C78" LimbType="Standard" Offset="0x3C78"/>
|
<!-- Gidbo Limbs -->
|
||||||
<Limb Name="object_rd_Limb_003C84" LimbType="Standard" Offset="0x3C84"/>
|
<Limb Name="gGibdoRootLimb" LimbType="Standard" Offset="0x3C48"/>
|
||||||
<Limb Name="object_rd_Limb_003C90" LimbType="Standard" Offset="0x3C90"/>
|
<Limb Name="gGibdoLeftLegRootLimb" LimbType="Standard" Offset="0x3C54"/>
|
||||||
<Limb Name="object_rd_Limb_003C9C" LimbType="Standard" Offset="0x3C9C"/>
|
<Limb Name="gGibdoLeftThighLimb" LimbType="Standard" Offset="0x3C60"/>
|
||||||
<Limb Name="object_rd_Limb_003CA8" LimbType="Standard" Offset="0x3CA8"/>
|
<Limb Name="gGibdoLeftShinLimb" LimbType="Standard" Offset="0x3C6C"/>
|
||||||
<Limb Name="object_rd_Limb_003CB4" LimbType="Standard" Offset="0x3CB4"/>
|
<Limb Name="gGibdoLeftFootRootLimb" LimbType="Standard" Offset="0x3C78"/>
|
||||||
<Limb Name="object_rd_Limb_003CC0" LimbType="Standard" Offset="0x3CC0"/>
|
<Limb Name="gGibdoLeftFootLimb" LimbType="Standard" Offset="0x3C84"/>
|
||||||
<Limb Name="object_rd_Limb_003CCC" LimbType="Standard" Offset="0x3CCC"/>
|
<Limb Name="gGibdoRightLegRootLimb" LimbType="Standard" Offset="0x3C90"/>
|
||||||
<Limb Name="object_rd_Limb_003CD8" LimbType="Standard" Offset="0x3CD8"/>
|
<Limb Name="gGibdoRightThighLimb" LimbType="Standard" Offset="0x3C9C"/>
|
||||||
<Limb Name="object_rd_Limb_003CE4" LimbType="Standard" Offset="0x3CE4"/>
|
<Limb Name="gGibdoRightShinLimb" LimbType="Standard" Offset="0x3CA8"/>
|
||||||
<Limb Name="object_rd_Limb_003CF0" LimbType="Standard" Offset="0x3CF0"/>
|
<Limb Name="gGibdoRightFootRootLimb" LimbType="Standard" Offset="0x3CB4"/>
|
||||||
<Limb Name="object_rd_Limb_003CFC" LimbType="Standard" Offset="0x3CFC"/>
|
<Limb Name="gGibdoRightFootLimb" LimbType="Standard" Offset="0x3CC0"/>
|
||||||
<Limb Name="object_rd_Limb_003D08" LimbType="Standard" Offset="0x3D08"/>
|
<Limb Name="gGibdoUpperBodyRootLimb" LimbType="Standard" Offset="0x3CCC"/>
|
||||||
<Limb Name="object_rd_Limb_003D14" LimbType="Standard" Offset="0x3D14"/>
|
<Limb Name="gGibdoTorsoRootLimb" LimbType="Standard" Offset="0x3CD8"/>
|
||||||
<Limb Name="object_rd_Limb_003D20" LimbType="Standard" Offset="0x3D20"/>
|
<Limb Name="gGibdoTorsoLimb" LimbType="Standard" Offset="0x3CE4"/>
|
||||||
<Limb Name="object_rd_Limb_003D2C" LimbType="Standard" Offset="0x3D2C"/>
|
<Limb Name="gGibdoLeftArmRootLimb" LimbType="Standard" Offset="0x3CF0"/>
|
||||||
<Limb Name="object_rd_Limb_003D38" LimbType="Standard" Offset="0x3D38"/>
|
<Limb Name="gGibdoLeftUpperArmLimb" LimbType="Standard" Offset="0x3CFC"/>
|
||||||
<Limb Name="object_rd_Limb_003D44" LimbType="Standard" Offset="0x3D44"/>
|
<Limb Name="gGibdoLeftForearmLimb" LimbType="Standard" Offset="0x3D08"/>
|
||||||
<Limb Name="object_rd_Limb_003D50" LimbType="Standard" Offset="0x3D50"/>
|
<Limb Name="gGibdoLeftHandLimb" LimbType="Standard" Offset="0x3D14"/>
|
||||||
<Limb Name="object_rd_Limb_003D5C" LimbType="Standard" Offset="0x3D5C"/>
|
<Limb Name="gGibdoRightArmRootLimb" LimbType="Standard" Offset="0x3D20"/>
|
||||||
<Limb Name="object_rd_Limb_003D68" LimbType="Standard" Offset="0x3D68"/>
|
<Limb Name="gGibdoRightUpperArmLimb" LimbType="Standard" Offset="0x3D2C"/>
|
||||||
<Skeleton Name="object_rd_Skel_003DD8" Type="Flex" LimbType="Standard" Offset="0x3DD8"/>
|
<Limb Name="gGibdoRightForearmLimb" LimbType="Standard" Offset="0x3D38"/>
|
||||||
<Animation Name="object_rd_Anim_004268" Offset="0x4268"/>
|
<Limb Name="gGibdoRightHandLimb" LimbType="Standard" Offset="0x3D44"/>
|
||||||
<Animation Name="object_rd_Anim_0046F8" Offset="0x46F8"/>
|
<Limb Name="gGibdoHeadRootLimb" LimbType="Standard" Offset="0x3D50"/>
|
||||||
<Animation Name="object_rd_Anim_004ADC" Offset="0x4ADC"/>
|
<Limb Name="gGibdoHeadLimb" LimbType="Standard" Offset="0x3D5C"/>
|
||||||
<Animation Name="object_rd_Anim_004F94" Offset="0x4F94"/>
|
<Limb Name="gGibdoPelvisLimb" LimbType="Standard" Offset="0x3D68"/>
|
||||||
<Animation Name="object_rd_Anim_0057AC" Offset="0x57AC"/>
|
|
||||||
<Animation Name="object_rd_Anim_005D98" Offset="0x5D98"/>
|
<!-- Gibdo Skeleton -->
|
||||||
<Animation Name="object_rd_Anim_006E88" Offset="0x6E88"/>
|
<Skeleton Name="gGibdoSkel" Type="Flex" LimbType="Standard" Offset="0x3DD8"/>
|
||||||
<Animation Name="object_rd_Anim_0074F0" Offset="0x74F0"/>
|
|
||||||
<Animation Name="object_rd_Anim_008040" Offset="0x8040"/>
|
<Animation Name="gGibdoRedeadGrabAttackAnim" Offset="0x4268"/> <!-- Original name is "re_dead_attack" -->
|
||||||
<Animation Name="object_rd_Anim_0087D0" Offset="0x87D0"/>
|
<Animation Name="gGibdoRedeadGrabEndAnim" Offset="0x46F8"/> <!-- Original name is "re_dead_attack_end" -->
|
||||||
<Texture Name="object_rd_Tex_0087E0" OutName="tex_000087E0" Format="rgba16" Width="32" Height="64" Offset="0x87E0"/>
|
<Animation Name="gGibdoRedeadGrabStartAnim" Offset="0x4ADC"/> <!-- Original name is "re_dead_attack_start" -->
|
||||||
<Texture Name="object_rd_Tex_0097E0" OutName="tex_000097E0" Format="rgba16" Width="32" Height="64" Offset="0x97E0"/>
|
<Animation Name="gGibdoRedeadLookBackAnim" Offset="0x4F94"/> <!-- Original name is "re_dead_back_turn" -->
|
||||||
<Texture Name="object_rd_Tex_00A7E0" OutName="tex_0000A7E0" Format="rgba16" Width="16" Height="32" Offset="0xA7E0"/>
|
<Animation Name="gGibdoRedeadWipingTearsAnim" Offset="0x57AC"/> <!-- Original name is "re_dead_cry" -->
|
||||||
<Texture Name="object_rd_Tex_00ABE0" OutName="tex_0000ABE0" Format="rgba16" Width="16" Height="32" Offset="0xABE0"/>
|
<Animation Name="gGibdoRedeadSobbingAnim" Offset="0x5D98"/> <!-- Original name is "re_dead_cryB" -->
|
||||||
<Texture Name="object_rd_Tex_00AFE0" OutName="tex_0000AFE0" Format="i8" Width="32" Height="32" Offset="0xAFE0"/>
|
<Animation Name="gGibdoRedeadDeathAnim" Offset="0x6E88"/> <!-- Original name is "re_dead_down" -->
|
||||||
<Texture Name="object_rd_Tex_00B3E0" OutName="tex_0000B3E0" Format="rgba16" Width="32" Height="64" Offset="0xB3E0"/>
|
<Animation Name="gGibdoRedeadDamageAnim" Offset="0x74F0"/> <!-- Original name is "re_dead_hit" -->
|
||||||
<Texture Name="object_rd_Tex_00C3E0" OutName="tex_0000C3E0" Format="rgba16" Width="32" Height="16" Offset="0xC3E0"/>
|
<Animation Name="gGibdoRedeadStandUpAnim" Offset="0x8040"/> <!-- Original name is "re_dead_standing" -->
|
||||||
<DList Name="object_rd_DL_00D6A0" Offset="0xD6A0"/>
|
<Animation Name="gGibdoRedeadIdleAnim" Offset="0x87D0"/> <!-- Original name is "re_dead_wait" -->
|
||||||
<DList Name="object_rd_DL_00D7C8" Offset="0xD7C8"/>
|
|
||||||
<DList Name="object_rd_DL_00DAC0" Offset="0xDAC0"/>
|
<!-- Redead Textures -->
|
||||||
<DList Name="object_rd_DL_00DBA0" Offset="0xDBA0"/>
|
<Texture Name="gRedeadBackTex" OutName="redead_back" Format="rgba16" Width="32" Height="64" Offset="0x87E0"/>
|
||||||
<DList Name="object_rd_DL_00DC60" Offset="0xDC60"/>
|
<Texture Name="gRedeadTorsoTex" OutName="redead_torso" Format="rgba16" Width="32" Height="64" Offset="0x97E0"/>
|
||||||
<DList Name="object_rd_DL_00DD30" Offset="0xDD30"/>
|
<Texture Name="gRedeadFingersAndToesTex" OutName="redead_fingers_and_toes" Format="rgba16" Width="16" Height="32" Offset="0xA7E0"/>
|
||||||
<DList Name="object_rd_DL_00DE08" Offset="0xDE08"/>
|
<Texture Name="gRedeadMuscleTex" OutName="redead_muscle" Format="rgba16" Width="16" Height="32" Offset="0xABE0"/>
|
||||||
<DList Name="object_rd_DL_00DED8" Offset="0xDED8"/>
|
<Texture Name="gRedeadMaskTex" OutName="redead_mask" Format="i8" Width="32" Height="32" Offset="0xAFE0"/>
|
||||||
<DList Name="object_rd_DL_00DFA8" Offset="0xDFA8"/>
|
<Texture Name="gRedeadFaceTex" OutName="redead_face" Format="rgba16" Width="32" Height="64" Offset="0xB3E0"/>
|
||||||
<DList Name="object_rd_DL_00E0E8" Offset="0xE0E8"/>
|
<Texture Name="gRedeadHipsTex" OutName="redead_hips" Format="rgba16" Width="32" Height="16" Offset="0xC3E0"/>
|
||||||
<DList Name="object_rd_DL_00E1C8" Offset="0xE1C8"/>
|
|
||||||
<DList Name="object_rd_DL_00E290" Offset="0xE290"/>
|
<!-- Redead Limb DisplayLists -->
|
||||||
<DList Name="object_rd_DL_00E358" Offset="0xE358"/>
|
<DList Name="gRedeadPelvisDL" Offset="0xD6A0"/>
|
||||||
<DList Name="object_rd_DL_00E438" Offset="0xE438"/>
|
<DList Name="gRedeadTorsoDL" Offset="0xD7C8"/>
|
||||||
<DList Name="object_rd_DL_00E500" Offset="0xE500"/>
|
<DList Name="gRedeadLeftUpperArmDL" Offset="0xDAC0"/>
|
||||||
<Limb Name="object_rd_Limb_00E5E8" LimbType="Standard" Offset="0xE5E8"/>
|
<DList Name="gRedeadLeftForearmDL" Offset="0xDBA0"/>
|
||||||
<Limb Name="object_rd_Limb_00E5F4" LimbType="Standard" Offset="0xE5F4"/>
|
<DList Name="gRedeadLeftHandDL" Offset="0xDC60"/>
|
||||||
<Limb Name="object_rd_Limb_00E600" LimbType="Standard" Offset="0xE600"/>
|
<DList Name="gRedeadRightUpperArmDL" Offset="0xDD30"/>
|
||||||
<Limb Name="object_rd_Limb_00E60C" LimbType="Standard" Offset="0xE60C"/>
|
<DList Name="gRedeadRightForearmDL" Offset="0xDE08"/>
|
||||||
<Limb Name="object_rd_Limb_00E618" LimbType="Standard" Offset="0xE618"/>
|
<DList Name="gRedeadRightHandDL" Offset="0xDED8"/>
|
||||||
<Limb Name="object_rd_Limb_00E624" LimbType="Standard" Offset="0xE624"/>
|
<DList Name="gRedeadHeadDL" Offset="0xDFA8"/>
|
||||||
<Limb Name="object_rd_Limb_00E630" LimbType="Standard" Offset="0xE630"/>
|
<DList Name="gRedeadLeftThighDL" Offset="0xE0E8"/>
|
||||||
<Limb Name="object_rd_Limb_00E63C" LimbType="Standard" Offset="0xE63C"/>
|
<DList Name="gRedeadLeftShinDL" Offset="0xE1C8"/>
|
||||||
<Limb Name="object_rd_Limb_00E648" LimbType="Standard" Offset="0xE648"/>
|
<DList Name="gRedeadLeftFootDL" Offset="0xE290"/>
|
||||||
<Limb Name="object_rd_Limb_00E654" LimbType="Standard" Offset="0xE654"/>
|
<DList Name="gRedeadRightThighDL" Offset="0xE358"/>
|
||||||
<Limb Name="object_rd_Limb_00E660" LimbType="Standard" Offset="0xE660"/>
|
<DList Name="gRedeadRightShinDL" Offset="0xE438"/>
|
||||||
<Limb Name="object_rd_Limb_00E66C" LimbType="Standard" Offset="0xE66C"/>
|
<DList Name="gRedeadRightFootDL" Offset="0xE500"/>
|
||||||
<Limb Name="object_rd_Limb_00E678" LimbType="Standard" Offset="0xE678"/>
|
|
||||||
<Limb Name="object_rd_Limb_00E684" LimbType="Standard" Offset="0xE684"/>
|
<!-- Redead Limbs -->
|
||||||
<Limb Name="object_rd_Limb_00E690" LimbType="Standard" Offset="0xE690"/>
|
<Limb Name="gRedeadRootLimb" LimbType="Standard" Offset="0xE5E8"/>
|
||||||
<Limb Name="object_rd_Limb_00E69C" LimbType="Standard" Offset="0xE69C"/>
|
<Limb Name="gRedeadLeftLegRootLimb" LimbType="Standard" Offset="0xE5F4"/>
|
||||||
<Limb Name="object_rd_Limb_00E6A8" LimbType="Standard" Offset="0xE6A8"/>
|
<Limb Name="gRedeadLeftThighLimb" LimbType="Standard" Offset="0xE600"/>
|
||||||
<Limb Name="object_rd_Limb_00E6B4" LimbType="Standard" Offset="0xE6B4"/>
|
<Limb Name="gRedeadLeftShinLimb" LimbType="Standard" Offset="0xE60C"/>
|
||||||
<Limb Name="object_rd_Limb_00E6C0" LimbType="Standard" Offset="0xE6C0"/>
|
<Limb Name="gRedeadLeftFootRootLimb" LimbType="Standard" Offset="0xE618"/>
|
||||||
<Limb Name="object_rd_Limb_00E6CC" LimbType="Standard" Offset="0xE6CC"/>
|
<Limb Name="gRedeadLeftFootLimb" LimbType="Standard" Offset="0xE624"/>
|
||||||
<Limb Name="object_rd_Limb_00E6D8" LimbType="Standard" Offset="0xE6D8"/>
|
<Limb Name="gRedeadRightLegRootLimb" LimbType="Standard" Offset="0xE630"/>
|
||||||
<Limb Name="object_rd_Limb_00E6E4" LimbType="Standard" Offset="0xE6E4"/>
|
<Limb Name="gRedeadRightThighLimb" LimbType="Standard" Offset="0xE63C"/>
|
||||||
<Limb Name="object_rd_Limb_00E6F0" LimbType="Standard" Offset="0xE6F0"/>
|
<Limb Name="gRedeadRightShinLimb" LimbType="Standard" Offset="0xE648"/>
|
||||||
<Limb Name="object_rd_Limb_00E6FC" LimbType="Standard" Offset="0xE6FC"/>
|
<Limb Name="gRedeadRightFootRootLimb" LimbType="Standard" Offset="0xE654"/>
|
||||||
<Limb Name="object_rd_Limb_00E708" LimbType="Standard" Offset="0xE708"/>
|
<Limb Name="gRedeadRightFootLimb" LimbType="Standard" Offset="0xE660"/>
|
||||||
<Skeleton Name="object_rd_Skel_00E778" Type="Flex" LimbType="Standard" Offset="0xE778"/>
|
<Limb Name="gRedeadUpperBodyRootLimb" LimbType="Standard" Offset="0xE66C"/>
|
||||||
<Animation Name="object_rd_Anim_00EFDC" Offset="0xEFDC"/>
|
<Limb Name="gRedeadTorsoRootLimb" LimbType="Standard" Offset="0xE678"/>
|
||||||
|
<Limb Name="gRedeadTorsoLimb" LimbType="Standard" Offset="0xE684"/>
|
||||||
|
<Limb Name="gRedeadLeftArmRootLimb" LimbType="Standard" Offset="0xE690"/>
|
||||||
|
<Limb Name="gRedeadLeftUpperArmLimb" LimbType="Standard" Offset="0xE69C"/>
|
||||||
|
<Limb Name="gRedeadLeftForearmLimb" LimbType="Standard" Offset="0xE6A8"/>
|
||||||
|
<Limb Name="gRedeadLeftHandLimb" LimbType="Standard" Offset="0xE6B4"/>
|
||||||
|
<Limb Name="gRedeadRightArmRootLimb" LimbType="Standard" Offset="0xE6C0"/>
|
||||||
|
<Limb Name="gRedeadRightUpperArmLimb" LimbType="Standard" Offset="0xE6CC"/>
|
||||||
|
<Limb Name="gRedeadRightForearmLimb" LimbType="Standard" Offset="0xE6D8"/>
|
||||||
|
<Limb Name="gRedeadRightHandLimb" LimbType="Standard" Offset="0xE6E4"/>
|
||||||
|
<Limb Name="gRedeadHeadRootLimb" LimbType="Standard" Offset="0xE6F0"/>
|
||||||
|
<Limb Name="gRedeadHeadLimb" LimbType="Standard" Offset="0xE6FC"/>
|
||||||
|
<Limb Name="gRedeadPelvisLimb" LimbType="Standard" Offset="0xE708"/>
|
||||||
|
|
||||||
|
<!-- Redead Skeleton -->
|
||||||
|
<Skeleton Name="gRedeadSkel" Type="Flex" LimbType="Standard" Offset="0xE778"/>
|
||||||
|
|
||||||
|
<Animation Name="gGibdoRedeadWalkAnim" Offset="0xEFDC"/> <!-- Original name is "re_dead_walk" -->
|
||||||
</File>
|
</File>
|
||||||
</Root>
|
</Root>
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
#include "z_bg_haka_huta.h"
|
#include "z_bg_haka_huta.h"
|
||||||
#include "objects/object_hakach_objects/object_hakach_objects.h"
|
#include "objects/object_hakach_objects/object_hakach_objects.h"
|
||||||
|
#include "overlays/actors/ovl_En_Rd/z_en_rd.h"
|
||||||
|
|
||||||
#define FLAGS ACTOR_FLAG_4
|
#define FLAGS ACTOR_FLAG_4
|
||||||
|
|
||||||
|
|
@ -132,7 +133,7 @@ void BgHakaHuta_SpawnEnemies(BgHakaHuta* this, GlobalContext* globalCtx) {
|
||||||
this->dyna.actor.home.pos.y - 40.0f,
|
this->dyna.actor.home.pos.y - 40.0f,
|
||||||
(this->dyna.actor.home.pos.z - (-25.0f) * (Math_SinS(this->dyna.actor.shape.rot.y)) +
|
(this->dyna.actor.home.pos.z - (-25.0f) * (Math_SinS(this->dyna.actor.shape.rot.y)) +
|
||||||
Math_CosS(this->dyna.actor.shape.rot.y) * 100.0f),
|
Math_CosS(this->dyna.actor.shape.rot.y) * 100.0f),
|
||||||
0, this->dyna.actor.shape.rot.y, 0, 0xFD);
|
0, this->dyna.actor.shape.rot.y, 0, (u8)REDEAD_TYPE_GIBDO_RISING_OUT_OF_COFFIN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -8,29 +8,71 @@ struct EnRd;
|
||||||
|
|
||||||
typedef void (*EnRdActionFunc)(struct EnRd*, GlobalContext*);
|
typedef void (*EnRdActionFunc)(struct EnRd*, GlobalContext*);
|
||||||
|
|
||||||
|
#define REDEAD_GET_FLAGS(thisx) (((thisx)->params & 0xFF00) >> 8)
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
/* 0 */ REDEAD_GIBDO_LIMB_NONE,
|
||||||
|
/* 1 */ REDEAD_GIBDO_LIMB_ROOT,
|
||||||
|
/* 2 */ REDEAD_GIBDO_LIMB_LEFT_LEG_ROOT,
|
||||||
|
/* 3 */ REDEAD_GIBDO_LIMB_LEFT_THIGH,
|
||||||
|
/* 4 */ REDEAD_GIBDO_LIMB_LEFT_SHIN,
|
||||||
|
/* 5 */ REDEAD_GIBDO_LIMB_LEFT_FOOT_ROOT,
|
||||||
|
/* 6 */ REDEAD_GIBDO_LIMB_LEFT_FOOT,
|
||||||
|
/* 7 */ REDEAD_GIBDO_LIMB_RIGHT_LEG_ROOT,
|
||||||
|
/* 8 */ REDEAD_GIBDO_LIMB_RIGHT_THIGH,
|
||||||
|
/* 9 */ REDEAD_GIBDO_LIMB_RIGHT_SHIN,
|
||||||
|
/* 10 */ REDEAD_GIBDO_LIMB_RIGHT_FOOT_ROOT,
|
||||||
|
/* 11 */ REDEAD_GIBDO_LIMB_RIGHT_FOOT,
|
||||||
|
/* 12 */ REDEAD_GIBDO_LIMB_UPPER_BODY_ROOT,
|
||||||
|
/* 13 */ REDEAD_GIBDO_LIMB_TORSO_ROOT,
|
||||||
|
/* 14 */ REDEAD_GIBDO_LIMB_TORSO,
|
||||||
|
/* 15 */ REDEAD_GIBDO_LIMB_LEFT_ARM_ROOT,
|
||||||
|
/* 16 */ REDEAD_GIBDO_LIMB_LEFT_UPPER_ARM,
|
||||||
|
/* 17 */ REDEAD_GIBDO_LIMB_LEFT_FOREARM,
|
||||||
|
/* 18 */ REDEAD_GIBDO_LIMB_LEFT_HAND,
|
||||||
|
/* 19 */ REDEAD_GIBDO_LIMB_RIGHT_ARM_ROOT,
|
||||||
|
/* 20 */ REDEAD_GIBDO_LIMB_RIGHT_UPPER_ARM,
|
||||||
|
/* 21 */ REDEAD_GIBDO_LIMB_RIGHT_FOREARM,
|
||||||
|
/* 22 */ REDEAD_GIBDO_LIMB_RIGHT_HAND,
|
||||||
|
/* 23 */ REDEAD_GIBDO_LIMB_HEAD_ROOT,
|
||||||
|
/* 24 */ REDEAD_GIBDO_LIMB_HEAD,
|
||||||
|
/* 25 */ REDEAD_GIBDO_LIMB_PELVIS,
|
||||||
|
/* 26 */ REDEAD_GIBDO_LIMB_MAX
|
||||||
|
} RedeadGibdoLimb;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
/* -3 */ REDEAD_TYPE_GIBDO_RISING_OUT_OF_COFFIN = -3,
|
||||||
|
/* -2 */ REDEAD_TYPE_GIBDO,
|
||||||
|
/* -1 */ REDEAD_TYPE_DOES_NOT_MOURN,
|
||||||
|
/* 0 */ REDEAD_TYPE_DOES_NOT_MOURN_IF_WALKING,
|
||||||
|
/* 1 */ REDEAD_TYPE_REGULAR,
|
||||||
|
/* 2 */ REDEAD_TYPE_CRYING,
|
||||||
|
/* 3 */ REDEAD_TYPE_INVISIBLE
|
||||||
|
} EnRdType;
|
||||||
|
|
||||||
typedef struct EnRd {
|
typedef struct EnRd {
|
||||||
/* 0x0000 */ Actor actor;
|
/* 0x0000 */ Actor actor;
|
||||||
/* 0x014C */ Vec3s firePos[10];
|
/* 0x014C */ Vec3s firePos[10];
|
||||||
/* 0x0188 */ SkelAnime skelAnime;
|
/* 0x0188 */ SkelAnime skelAnime;
|
||||||
/* 0x01CC */ Vec3s jointTable[26];
|
/* 0x01CC */ Vec3s jointTable[REDEAD_GIBDO_LIMB_MAX];
|
||||||
/* 0x0268 */ Vec3s morphTable[26];
|
/* 0x0268 */ Vec3s morphTable[REDEAD_GIBDO_LIMB_MAX];
|
||||||
/* 0x0304 */ u8 unk_304;
|
/* 0x0304 */ u8 grabState;
|
||||||
/* 0x0305 */ u8 unk_305;
|
/* 0x0305 */ u8 isMourning;
|
||||||
/* 0x0306 */ u8 unk_306;
|
/* 0x0306 */ u8 playerStunWaitTimer; // Cannot stun the player if this is non-zero
|
||||||
/* 0x0307 */ u8 unk_307;
|
/* 0x0307 */ u8 grabWaitTimer; // Cannot grab the player if this is non-zero
|
||||||
/* 0x0308 */ EnRdActionFunc actionFunc;
|
/* 0x0308 */ EnRdActionFunc actionFunc;
|
||||||
/* 0x030C */ s16 unk_30C;
|
/* 0x030C */ s16 timer;
|
||||||
/* 0x030E */ s16 unk_30E;
|
/* 0x030E */ s16 headYRotation;
|
||||||
/* 0x0310 */ s16 unk_310;
|
/* 0x0310 */ s16 upperBodyYRotation;
|
||||||
/* 0x0312 */ s16 unk_312;
|
/* 0x0312 */ s16 rdFlags;
|
||||||
/* 0x0314 */ s16 unk_314;
|
/* 0x0314 */ s16 alpha;
|
||||||
/* 0x0316 */ s16 unk_316;
|
/* 0x0316 */ s16 sunsSongStunTimer;
|
||||||
/* 0x0318 */ u8 unk_318;
|
/* 0x0318 */ u8 stunnedBySunsSong;
|
||||||
/* 0x0319 */ u8 unk_319;
|
/* 0x0319 */ u8 grabDamageTimer;
|
||||||
/* 0x031A */ u8 unk_31A;
|
/* 0x031A */ u8 fireTimer;
|
||||||
/* 0x031B */ u8 unk_31B;
|
/* 0x031B */ u8 action;
|
||||||
/* 0x031C */ u8 unk_31C;
|
/* 0x031C */ u8 damageEffect;
|
||||||
/* 0x031D */ u8 unk_31D;
|
/* 0x031D */ u8 unk_31D; // related to player->unk_845
|
||||||
/* 0x0320 */ ColliderCylinder collider;
|
/* 0x0320 */ ColliderCylinder collider;
|
||||||
} EnRd; // size = 0x036C
|
} EnRd; // size = 0x036C
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue