mirror of https://github.com/zeldaret/mm.git
EnGrasshopper (Dragonflies) OK and documented, object_grasshopper documented (#1043)
* EnGrasshopper (Dragonflies) OK and documented, object_grasshopper documented * Type macro * Limb enum for sJntSphElementsInit * Respond to hensldm's review * Use TATL_HINT_ID enum * Respond to reviews * Increase size of shadowBodyPartsPos to 24 * Change 14 to a define
This commit is contained in:
Tom Overton
GitHub
parent
f0311e6ca4
commit
aa54982318
|
|
@ -1,67 +1,79 @@
|
|||
<Root>
|
||||
<!-- Assets for Dragonflies. -->
|
||||
<File Name="object_grasshopper" Segment="6">
|
||||
<Animation Name="object_grasshopper_Anim_00066C" Offset="0x66C" />
|
||||
<Animation Name="object_grasshopper_Anim_0008D4" Offset="0x8D4" />
|
||||
<Animation Name="object_grasshopper_Anim_0009E0" Offset="0x9E0" />
|
||||
<Animation Name="object_grasshopper_Anim_000F9C" Offset="0xF9C" />
|
||||
<Texture Name="object_grasshopper_Tex_000FB0" OutName="tex_000FB0" Format="rgba16" Width="8" Height="8" Offset="0xFB0" />
|
||||
<Texture Name="object_grasshopper_Tex_001030" OutName="tex_001030" Format="rgba16" Width="16" Height="32" Offset="0x1030" />
|
||||
<Texture Name="object_grasshopper_Tex_001430" OutName="tex_001430" Format="rgba16" Width="16" Height="16" Offset="0x1430" />
|
||||
<Texture Name="object_grasshopper_Tex_001630" OutName="tex_001630" Format="rgba16" Width="8" Height="8" Offset="0x1630" />
|
||||
<Texture Name="object_grasshopper_Tex_0016B0" OutName="tex_0016B0" Format="rgba16" Width="32" Height="8" Offset="0x16B0" />
|
||||
<Texture Name="object_grasshopper_Tex_0018B0" OutName="tex_0018B0" Format="rgba16" Width="16" Height="8" Offset="0x18B0" />
|
||||
<Texture Name="object_grasshopper_Tex_0019B0" OutName="tex_0019B0" Format="rgba16" Width="8" Height="8" Offset="0x19B0" />
|
||||
<Texture Name="object_grasshopper_Tex_001A30" OutName="tex_001A30" Format="rgba16" Width="8" Height="8" Offset="0x1A30" />
|
||||
<Texture Name="object_grasshopper_Tex_001AB0" OutName="tex_001AB0" Format="rgba16" Width="16" Height="16" Offset="0x1AB0" />
|
||||
<DList Name="object_grasshopper_DL_002BE0" Offset="0x2BE0" />
|
||||
<DList Name="object_grasshopper_DL_002C70" Offset="0x2C70" />
|
||||
<DList Name="object_grasshopper_DL_002D00" Offset="0x2D00" />
|
||||
<DList Name="object_grasshopper_DL_002D90" Offset="0x2D90" />
|
||||
<DList Name="object_grasshopper_DL_002E28" Offset="0x2E28" />
|
||||
<DList Name="object_grasshopper_DL_002EC0" Offset="0x2EC0" />
|
||||
<DList Name="object_grasshopper_DL_002F50" Offset="0x2F50" />
|
||||
<DList Name="object_grasshopper_DL_002FE0" Offset="0x2FE0" />
|
||||
<DList Name="object_grasshopper_DL_003078" Offset="0x3078" />
|
||||
<DList Name="object_grasshopper_DL_003110" Offset="0x3110" />
|
||||
<DList Name="object_grasshopper_DL_0031A8" Offset="0x31A8" />
|
||||
<DList Name="object_grasshopper_DL_003240" Offset="0x3240" />
|
||||
<DList Name="object_grasshopper_DL_0032E8" Offset="0x32E8" />
|
||||
<DList Name="object_grasshopper_DL_0033E0" Offset="0x33E0" />
|
||||
<DList Name="object_grasshopper_DL_003520" Offset="0x3520" />
|
||||
<DList Name="object_grasshopper_DL_003660" Offset="0x3660" />
|
||||
<DList Name="object_grasshopper_DL_003798" Offset="0x3798" />
|
||||
<DList Name="object_grasshopper_DL_003900" Offset="0x3900" />
|
||||
<DList Name="object_grasshopper_DL_0039E0" Offset="0x39E0" />
|
||||
<DList Name="object_grasshopper_DL_003BE0" Offset="0x3BE0" />
|
||||
<DList Name="object_grasshopper_DL_003C70" Offset="0x3C70" />
|
||||
<DList Name="object_grasshopper_DL_003D00" Offset="0x3D00" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003D90" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_01" Offset="0x3D90" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003D9C" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_02" Offset="0x3D9C" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003DA8" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_03" Offset="0x3DA8" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003DB4" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_04" Offset="0x3DB4" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003DC0" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_05" Offset="0x3DC0" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003DCC" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_06" Offset="0x3DCC" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003DD8" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_07" Offset="0x3DD8" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003DE4" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_08" Offset="0x3DE4" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003DF0" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_09" Offset="0x3DF0" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003DFC" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_0A" Offset="0x3DFC" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003E08" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_0B" Offset="0x3E08" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003E14" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_0C" Offset="0x3E14" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003E20" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_0D" Offset="0x3E20" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003E2C" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_0E" Offset="0x3E2C" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003E38" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_0F" Offset="0x3E38" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003E44" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_10" Offset="0x3E44" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003E50" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_11" Offset="0x3E50" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003E5C" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_12" Offset="0x3E5C" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003E68" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_13" Offset="0x3E68" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003E74" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_14" Offset="0x3E74" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003E80" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_15" Offset="0x3E80" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003E8C" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_16" Offset="0x3E8C" />
|
||||
<Limb Name="object_grasshopper_Standardlimb_003E98" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_17" Offset="0x3E98" />
|
||||
<Skeleton Name="object_grasshopper_Skel_003F00" Type="Normal" LimbType="Standard" LimbNone="OBJECT_GRASSHOPPER_LIMB_NONE" LimbMax="OBJECT_GRASSHOPPER_LIMB_MAX" EnumName="ObjectGrasshopperLimb" Offset="0x3F00" />
|
||||
<Animation Name="object_grasshopper_Anim_0042F0" Offset="0x42F0" />
|
||||
<Animation Name="object_grasshopper_Anim_0047AC" Offset="0x47AC" />
|
||||
<Animation Name="object_grasshopper_Anim_004BC8" Offset="0x4BC8" />
|
||||
<Animation Name="object_grasshopper_Anim_00524C" Offset="0x524C" />
|
||||
<!-- Dragonfly Animations -->
|
||||
<Animation Name="gDragonflyAttackAnim" Offset="0x66C" /> <!-- Original name is "kdz_attack" -->
|
||||
<Animation Name="gDragonflyDeadAnim" Offset="0x8D4" /> <!-- Original name is "kdz_dead_hit" -->
|
||||
<Animation Name="gDragonflyFallAnim" Offset="0x9E0" /> <!-- Original name is "kdz_down" -->
|
||||
<Animation Name="gDragonflyFlyAnim" Offset="0xF9C" /> <!-- Original name is "kdz_fly" -->
|
||||
|
||||
<!-- Dragonfly Textures -->
|
||||
<Texture Name="gDragonflyMouthAndTailSegmentUndersideTex" OutName="dragonfly_mouth_and_tail_segment_underside" Format="rgba16" Width="8" Height="8" Offset="0xFB0" />
|
||||
<Texture Name="gDragonflyTailBackTex" OutName="dragonfly_tail_back" Format="rgba16" Width="16" Height="32" Offset="0x1030" />
|
||||
<Texture Name="gDragonflyThoraxBackAndLegsTex" OutName="dragonfly_thorax_back_and_legs" Format="rgba16" Width="16" Height="16" Offset="0x1430" />
|
||||
<Texture Name="gDragonflyStripeTex" OutName="dragonfly_stripe" Format="rgba16" Width="8" Height="8" Offset="0x1630" />
|
||||
<Texture Name="gDragonflyHeadAndTailTipTex" OutName="dragonfly_head_and_tail_tip" Format="rgba16" Width="32" Height="8" Offset="0x16B0" />
|
||||
<Texture Name="gDragonflyThoraxSidesTex" OutName="dragonfly_thorax_sides" Format="rgba16" Width="16" Height="8" Offset="0x18B0" />
|
||||
<Texture Name="gDragonflyWingTex" OutName="dragonfly_wing" Format="rgba16" Width="8" Height="8" Offset="0x19B0" />
|
||||
<Texture Name="gDragonflyEyeTex" OutName="dragonfly_eye" Format="rgba16" Width="8" Height="8" Offset="0x1A30" />
|
||||
<Texture Name="gDragonflyFaceTex" OutName="dragonfly_face" Format="rgba16" Width="16" Height="16" Offset="0x1AB0" />
|
||||
|
||||
<!-- Dragonfly Limb DisplayLists -->
|
||||
<DList Name="gDragonflyBackRightFootDL" Offset="0x2BE0" />
|
||||
<DList Name="gDragonflyBackLeftLowerLegDL" Offset="0x2C70" />
|
||||
<DList Name="gDragonflyBackRightLowerLegDL" Offset="0x2D00" />
|
||||
<DList Name="gDragonflyFrontLeftUpperLegDL" Offset="0x2D90" />
|
||||
<DList Name="gDragonflyFrontRightUpperLegDL" Offset="0x2E28" />
|
||||
<DList Name="gDragonflyFrontLeftLowerLegDL" Offset="0x2EC0" />
|
||||
<DList Name="gDragonflyFrontRightLowerLegDL" Offset="0x2F50" />
|
||||
<DList Name="gDragonflyLeftWingDL" Offset="0x2FE0" />
|
||||
<DList Name="gDragonflyRightWingDL" Offset="0x3078" />
|
||||
<DList Name="gDragonflyBackRightUpperLegDL" Offset="0x3110" />
|
||||
<DList Name="gDragonflyBackLeftUpperLegDL" Offset="0x31A8" />
|
||||
<DList Name="gDragonflyTailTipDL" Offset="0x3240" />
|
||||
<DList Name="gDragonflyTailSegment4DL" Offset="0x32E8" />
|
||||
<DList Name="gDragonflyTailSegment3DL" Offset="0x33E0" />
|
||||
<DList Name="gDragonflyTailSegment2DL" Offset="0x3520" />
|
||||
<DList Name="gDragonflyTailSegment1DL" Offset="0x3660" />
|
||||
<DList Name="gDragonflyThoraxDL" Offset="0x3798" />
|
||||
<DList Name="gDragonflyJawDL" Offset="0x3900" />
|
||||
<DList Name="gDragonflyHeadDL" Offset="0x39E0" />
|
||||
<DList Name="gDragonflyBackLeftFootDL" Offset="0x3BE0" />
|
||||
<DList Name="gDragonflyFrontLeftFootDL" Offset="0x3C70" />
|
||||
<DList Name="gDragonflyFrontRightFootDL" Offset="0x3D00" />
|
||||
|
||||
<!-- Dragonfly Limbs -->
|
||||
<Limb Name="gDragonflyRootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_ROOT" Offset="0x3D90" />
|
||||
<Limb Name="gDragonflyTailSegment1Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_1" Offset="0x3D9C" />
|
||||
<Limb Name="gDragonflyTailSegment2Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_2" Offset="0x3DA8" />
|
||||
<Limb Name="gDragonflyTailSegment3Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_3" Offset="0x3DB4" />
|
||||
<Limb Name="gDragonflyTailSegment4Limb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_SEGMENT_4" Offset="0x3DC0" />
|
||||
<Limb Name="gDragonflyTailTipLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_TAIL_TIP" Offset="0x3DCC" />
|
||||
<Limb Name="gDragonflyThoraxLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_THORAX" Offset="0x3DD8" />
|
||||
<Limb Name="gDragonflyLeftWingLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_LEFT_WING" Offset="0x3DE4" />
|
||||
<Limb Name="gDragonflyRightWingLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_RIGHT_WING" Offset="0x3DF0" />
|
||||
<Limb Name="gDragonflyBackLeftUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_LEFT_UPPER_LEG" Offset="0x3DFC" />
|
||||
<Limb Name="gDragonflyBackLeftLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_LEFT_LOWER_LEG" Offset="0x3E08" />
|
||||
<Limb Name="gDragonflyBackLeftFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_LEFT_FOOT" Offset="0x3E14" />
|
||||
<Limb Name="gDragonflyBackRightUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_RIGHT_UPPER_LEG" Offset="0x3E20" />
|
||||
<Limb Name="gDragonflyBackRightLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_RIGHT_LOWER_LEG" Offset="0x3E2C" />
|
||||
<Limb Name="gDragonflyBackRightFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_BACK_RIGHT_FOOT" Offset="0x3E38" />
|
||||
<Limb Name="gDragonflyFrontLeftUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x3E44" />
|
||||
<Limb Name="gDragonflyFrontLeftLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x3E50" />
|
||||
<Limb Name="gDragonflyFrontLeftFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_LEFT_FOOT" Offset="0x3E5C" />
|
||||
<Limb Name="gDragonflyFrontRightUpperLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x3E68" />
|
||||
<Limb Name="gDragonflyFrontRightLowerLegLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x3E74" />
|
||||
<Limb Name="gDragonflyFrontRightFootLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_FRONT_RIGHT_FOOT" Offset="0x3E80" />
|
||||
<Limb Name="gDragonflyHeadLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_HEAD" Offset="0x3E8C" />
|
||||
<Limb Name="gDragonflyJawLimb" Type="Standard" EnumName="DRAGONFLY_LIMB_JAW" Offset="0x3E98" />
|
||||
|
||||
<!-- Dragonfly Skeleton -->
|
||||
<Skeleton Name="gDragonflySkel" Type="Normal" LimbType="Standard" LimbNone="DRAGONFLY_LIMB_NONE" LimbMax="DRAGONFLY_LIMB_MAX" EnumName="DragonflyLimb" Offset="0x3F00" />
|
||||
|
||||
<!-- Dragonfly Animations -->
|
||||
<Animation Name="gDragonflyRaiseTailAnim" Offset="0x42F0" /> <!-- Original name is "kdz_hight" -->
|
||||
<Animation Name="gDragonflyDamageAnim" Offset="0x47AC" /> <!-- Original name is "kdz_hit" -->
|
||||
<Animation Name="gDragonflyLowerTailAnim" Offset="0x4BC8" /> <!-- Original name is "kdz_low" -->
|
||||
<Animation Name="gDragonflyHoverAnim" Offset="0x524C" /> <!-- Original name is "kdz_wait" -->
|
||||
</File>
|
||||
</Root>
|
||||
|
|
|
|||
3
spec
3
spec
|
|
@ -2173,8 +2173,7 @@ beginseg
|
|||
name "ovl_En_Grasshopper"
|
||||
compress
|
||||
include "build/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.o"
|
||||
include "build/data/ovl_En_Grasshopper/ovl_En_Grasshopper.data.o"
|
||||
include "build/data/ovl_En_Grasshopper/ovl_En_Grasshopper.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_En_Grasshopper/ovl_En_Grasshopper_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -2,16 +2,77 @@
|
|||
#define Z_EN_GRASSHOPPER_H
|
||||
|
||||
#include "global.h"
|
||||
#include "objects/object_grasshopper/object_grasshopper.h"
|
||||
|
||||
#define EN_GRASSHOPPER_GET_TYPE(thisx) ((thisx)->params)
|
||||
|
||||
struct EnGrasshopper;
|
||||
|
||||
typedef void (*EnGrasshopperActionFunc)(struct EnGrasshopper*, PlayState*);
|
||||
|
||||
typedef enum EnGrasshopperType {
|
||||
/* -1 */ EN_GRASSHOPPER_TYPE_UNUSED_NORMAL = -1, // Acts exactly like EN_GRASSHOPPER_TYPE_NORMAL
|
||||
/* 0 */ EN_GRASSHOPPER_TYPE_NORMAL,
|
||||
/* 1 */ EN_GRASSHOPPER_TYPE_GROWS_WHEN_SPAWNED, // Spawned by EnEncount1
|
||||
/* 2 */ EN_GRASSHOPPER_TYPE_WOODFALL_TEMPLE_FINAL_ROOM,
|
||||
/* 3 */ EN_GRASSHOPPER_TYPE_WOODFALL,
|
||||
} EnGrasshopperType;
|
||||
|
||||
typedef struct EnGrasshopperEffect {
|
||||
/* 0x00 */ u8 isEnabled;
|
||||
/* 0x04 */ Vec3f pos;
|
||||
/* 0x10 */ Vec3f velocity;
|
||||
/* 0x1C */ f32 yaw;
|
||||
/* 0x20 */ Vec3f scale;
|
||||
/* 0x2C */ s16 timer;
|
||||
/* 0x2E */ s16 lightningIndex;
|
||||
} EnGrasshopperEffect; // size = 0x30
|
||||
|
||||
#define EN_GRASSHOPPER_EFFECT_COUNT 100
|
||||
|
||||
typedef struct EnGrasshopper {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x0144 */ char unk_144[0x164];
|
||||
/* 0x0144 */ SkelAnime skelAnime;
|
||||
/* 0x0188 */ Vec3s jointTable[DRAGONFLY_LIMB_MAX];
|
||||
/* 0x0218 */ Vec3s morphTable[DRAGONFLY_LIMB_MAX];
|
||||
/* 0x02A8 */ EnGrasshopperActionFunc actionFunc;
|
||||
/* 0x02AC */ char unk_2AC[0x15C4];
|
||||
/* 0x02AC */ u8 decision;
|
||||
/* 0x02AD */ u8 shouldTurn;
|
||||
/* 0x02AE */ UNK_TYPE1 unk_2AE[2];
|
||||
/* 0x02B0 */ s16 timer;
|
||||
/* 0x02B2 */ s16 waitTimer;
|
||||
/* 0x02B4 */ s16 postBankTimer;
|
||||
/* 0x02B6 */ s16 drawDmgEffTimer;
|
||||
/* 0x02B8 */ s16 drawDmgEffType;
|
||||
/* 0x02BC */ f32 drawDmgEffScale;
|
||||
/* 0x02C0 */ f32 drawDmgEffFrozenSteamScale;
|
||||
/* 0x02C4 */ Vec3f bodyPartsPos[12];
|
||||
/* 0x0354 */ s16 bodyPartsPosIndex;
|
||||
/* 0x0356 */ s16 splashCount;
|
||||
/* 0x0358 */ s16 action;
|
||||
/* 0x035A */ s16 index; // Has a minor effect on speed for some reason.
|
||||
/* 0x035C */ s16 bankState;
|
||||
/* 0x035E */ s16 type;
|
||||
/* 0x0360 */ f32 dragonflyScale;
|
||||
/* 0x0364 */ f32 rotationalVelocity;
|
||||
/* 0x0368 */ f32 endFrame;
|
||||
/* 0x036C */ f32 approachSpeed;
|
||||
/* 0x0370 */ f32 baseFlyHeight;
|
||||
/* 0x0374 */ f32 targetPosY;
|
||||
/* 0x0376 */ Vec3s targetRot;
|
||||
/* 0x0380 */ Vec3f flyingHomePos;
|
||||
/* 0x038C */ s16 bobPhase;
|
||||
/* 0x038E */ UNK_TYPE1 unk_38E[0x26];
|
||||
/* 0x03B4 */ Vec3f targetApproachPos;
|
||||
/* 0x03C0 */ Vec3f tailTipPos;
|
||||
/* 0x03CC */ Vec3f effectBasePos;
|
||||
/* 0x03D8 */ Vec3f shadowBodyPartsPos[DRAGONFLY_LIMB_MAX];
|
||||
/* 0x04F8 */ f32 waterSurface;
|
||||
/* 0x04FC */ Vec3f damagedVelocity;
|
||||
/* 0x0508 */ Vec3s targetBankRot;
|
||||
/* 0x0510 */ ColliderJntSph collider;
|
||||
/* 0x0530 */ ColliderJntSphElement colliderElements[2];
|
||||
/* 0x0570 */ EnGrasshopperEffect effects[EN_GRASSHOPPER_EFFECT_COUNT];
|
||||
} EnGrasshopper; // size = 0x1870
|
||||
|
||||
extern const ActorInit En_Grasshopper_InitVars;
|
||||
|
|
|
|||
|
|
@ -1539,10 +1539,10 @@ void EnPp_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
|
|||
(limbIndex == HIPLOOP_LIMB_CENTER_WING_BASE) || (limbIndex == HIPLOOP_LIMB_CENTER_WING_MIDDLE) ||
|
||||
(limbIndex == HIPLOOP_LIMB_BACK_LEFT_LOWER_LEG) || (limbIndex == HIPLOOP_LIMB_RIGHT_EYE) ||
|
||||
(limbIndex == HIPLOOP_LIMB_LEFT_EYE)) {
|
||||
Matrix_MultZero(&this->bodyPartsPos[this->bodyPartsPosCount]);
|
||||
this->bodyPartsPosCount++;
|
||||
if (this->bodyPartsPosCount >= ARRAY_COUNT(this->bodyPartsPos)) {
|
||||
this->bodyPartsPosCount = 0;
|
||||
Matrix_MultZero(&this->bodyPartsPos[this->bodyPartsPosIndex]);
|
||||
this->bodyPartsPosIndex++;
|
||||
if (this->bodyPartsPosIndex >= ARRAY_COUNT(this->bodyPartsPos)) {
|
||||
this->bodyPartsPosIndex = 0;
|
||||
}
|
||||
|
||||
if ((this->action == EN_PP_ACTION_SPAWN_BODY_PARTS) && (this->deadBodyPartsSpawnedCount < 6) &&
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ typedef struct EnPp {
|
|||
/* 0x400 */ f32 attackRange;
|
||||
/* 0x404 */ s32 hasBeenDamaged;
|
||||
/* 0x408 */ Vec3f bodyPartsPos[11];
|
||||
/* 0x48C */ s16 bodyPartsPosCount;
|
||||
/* 0x48C */ s16 bodyPartsPosIndex;
|
||||
/* 0x490 */ f32 maskAccelY;
|
||||
/* 0x494 */ ColliderJntSph maskCollider;
|
||||
/* 0x4B4 */ ColliderJntSphElement maskColliderElements[1];
|
||||
|
|
|
|||
|
|
@ -8751,36 +8751,36 @@
|
|||
0x809A610C:("ObjBoyo_Draw",),
|
||||
0x809A6280:("EnGrasshopper_Init",),
|
||||
0x809A64E0:("EnGrasshopper_Destroy",),
|
||||
0x809A6524:("func_809A6524",),
|
||||
0x809A65D8:("func_809A65D8",),
|
||||
0x809A6628:("func_809A6628",),
|
||||
0x809A6668:("func_809A6668",),
|
||||
0x809A6754:("func_809A6754",),
|
||||
0x809A67A4:("func_809A67A4",),
|
||||
0x809A6B6C:("func_809A6B6C",),
|
||||
0x809A6E18:("func_809A6E18",),
|
||||
0x809A6E74:("func_809A6E74",),
|
||||
0x809A6F8C:("func_809A6F8C",),
|
||||
0x809A700C:("func_809A700C",),
|
||||
0x809A7134:("func_809A7134",),
|
||||
0x809A71CC:("func_809A71CC",),
|
||||
0x809A7494:("func_809A7494",),
|
||||
0x809A753C:("func_809A753C",),
|
||||
0x809A7844:("func_809A7844",),
|
||||
0x809A78EC:("func_809A78EC",),
|
||||
0x809A797C:("func_809A797C",),
|
||||
0x809A7A8C:("func_809A7A8C",),
|
||||
0x809A7AE4:("func_809A7AE4",),
|
||||
0x809A7BBC:("func_809A7BBC",),
|
||||
0x809A7C98:("func_809A7C98",),
|
||||
0x809A7CE0:("func_809A7CE0",),
|
||||
0x809A8044:("func_809A8044",),
|
||||
0x809A6524:("EnGrasshopper_ChangeAnim",),
|
||||
0x809A65D8:("EnGrasshopper_RaiseTail",),
|
||||
0x809A6628:("EnGrasshopper_LowerTail",),
|
||||
0x809A6668:("EnGrasshopper_DecideAction",),
|
||||
0x809A6754:("EnGrasshopper_SetupFly",),
|
||||
0x809A67A4:("EnGrasshopper_Fly",),
|
||||
0x809A6B6C:("EnGrasshopper_RoamInCircles",),
|
||||
0x809A6E18:("EnGrasshopper_SetupBank",),
|
||||
0x809A6E74:("EnGrasshopper_Turn",),
|
||||
0x809A6F8C:("EnGrasshopper_SetupBounced",),
|
||||
0x809A700C:("EnGrasshopper_Bounced",),
|
||||
0x809A7134:("EnGrasshopper_SetupApproachPlayer",),
|
||||
0x809A71CC:("EnGrasshopper_ApproachPlayer",),
|
||||
0x809A7494:("EnGrasshopper_SetupAttack",),
|
||||
0x809A753C:("EnGrasshopper_Attack",),
|
||||
0x809A7844:("EnGrasshopper_SetupWaitAfterAttack",),
|
||||
0x809A78EC:("EnGrasshopper_WaitAfterAttack",),
|
||||
0x809A797C:("EnGrasshopper_SetupDamaged",),
|
||||
0x809A7A8C:("EnGrasshopper_Damaged",),
|
||||
0x809A7AE4:("EnGrasshopper_SetupDead",),
|
||||
0x809A7BBC:("EnGrasshopper_Dead",),
|
||||
0x809A7C98:("EnGrasshopper_SetupFall",),
|
||||
0x809A7CE0:("EnGrasshopper_Fall",),
|
||||
0x809A8044:("EnGrasshopper_UpdateDamage",),
|
||||
0x809A8224:("EnGrasshopper_Update",),
|
||||
0x809A847C:("func_809A847C",),
|
||||
0x809A847C:("EnGrasshopper_PostLimbDraw",),
|
||||
0x809A8640:("EnGrasshopper_Draw",),
|
||||
0x809A8870:("func_809A8870",),
|
||||
0x809A8924:("func_809A8924",),
|
||||
0x809A8A64:("func_809A8A64",),
|
||||
0x809A8870:("EnGrasshopper_InitializeEffect",),
|
||||
0x809A8924:("EnGrasshopper_UpdateEffects",),
|
||||
0x809A8A64:("EnGrasshopper_DrawEffects",),
|
||||
0x809A9110:("func_809A9110",),
|
||||
0x809A91FC:("func_809A91FC",),
|
||||
0x809A92D0:("func_809A92D0",),
|
||||
|
|
|
|||
|
|
@ -9525,20 +9525,20 @@
|
|||
0x809A61E0:("D_809A61E0","f32","",0x4),
|
||||
0x809A61E4:("D_809A61E4","f32","",0x4),
|
||||
0x809A61E8:("D_809A61E8","f32","",0x4),
|
||||
0x809A8C80:("D_809A8C80","UNK_TYPE4","",0x4),
|
||||
0x809A8C94:("D_809A8C94","UNK_TYPE1","",0x1),
|
||||
0x809A8CAC:("D_809A8CAC","UNK_TYPE1","",0x1),
|
||||
0x809A8CC4:("D_809A8CC4","UNK_TYPE1","",0x1),
|
||||
0x809A8CDC:("D_809A8CDC","UNK_TYPE1","",0x1),
|
||||
0x809A8C80:("sOccupiedIndices","UNK_TYPE4","",0x4),
|
||||
0x809A8C94:("sLimbIndexToShadowBodyPartsIndex","UNK_TYPE1","",0x1),
|
||||
0x809A8CAC:("sParentBodyParts","UNK_TYPE1","",0x1),
|
||||
0x809A8CC4:("sShadowSizes","UNK_TYPE1","",0x1),
|
||||
0x809A8CDC:("sDamageTable","UNK_TYPE1","",0x1),
|
||||
0x809A8CFC:("En_Grasshopper_InitVars","UNK_TYPE1","",0x1),
|
||||
0x809A8D1C:("D_809A8D1C","UNK_TYPE1","",0x1),
|
||||
0x809A8D64:("D_809A8D64","UNK_TYPE1","",0x1),
|
||||
0x809A8D74:("D_809A8D74","UNK_TYPE1","",0x1),
|
||||
0x809A8D94:("D_809A8D94","UNK_TYPE1","",0x1),
|
||||
0x809A8D9C:("D_809A8D9C","UNK_TYPE4","",0x4),
|
||||
0x809A8E08:("D_809A8E08","UNK_TYPE4","",0x4),
|
||||
0x809A8E14:("D_809A8E14","UNK_TYPE4","",0x4),
|
||||
0x809A8E20:("D_809A8E20","UNK_TYPE1","",0x1),
|
||||
0x809A8D1C:("sJntSphElementsInit","UNK_TYPE1","",0x1),
|
||||
0x809A8D64:("sJntSphInit","UNK_TYPE1","",0x1),
|
||||
0x809A8D74:("sAnimations","UNK_TYPE1","",0x1),
|
||||
0x809A8D94:("sAnimationModes","UNK_TYPE1","",0x1),
|
||||
0x809A8D9C:("sFireVelocityAndAccel","UNK_TYPE4","",0x4),
|
||||
0x809A8E08:("sEffectOffsetFromTailTop","UNK_TYPE4","",0x4),
|
||||
0x809A8E14:("sZeroVec3f","UNK_TYPE4","",0x4),
|
||||
0x809A8E20:("sLightningTextures","UNK_TYPE1","",0x1),
|
||||
0x809A8E40:("D_809A8E40","f32","",0x4),
|
||||
0x809A8E44:("D_809A8E44","f32","",0x4),
|
||||
0x809A8E48:("D_809A8E48","f32","",0x4),
|
||||
|
|
|
|||
|
|
@ -1069,11 +1069,6 @@ D_0600A344 = 0x0600A344;
|
|||
D_06001EFC = 0x06001EFC;
|
||||
D_0600A808 = 0x0600A808;
|
||||
|
||||
// ovl_En_Grasshopper
|
||||
|
||||
D_06000F9C = 0x06000F9C;
|
||||
D_06003F00 = 0x06003F00;
|
||||
|
||||
// ovl_En_Hgo
|
||||
|
||||
D_0600B644 = 0x0600B644;
|
||||
|
|
|
|||
Loading…
Reference in New Issue