mirror of https://github.com/zeldaret/mm.git
ovl_En_Death and ovl_En_Minideath (#1645)
* En_Death new build system edition * Fix merge * Matched * Fix merge * Some names * Suggested changes * Further suggested changes * Add value comments to MinideathAction
This commit is contained in:
parent
2c680efa91
commit
384115d2a0
|
@ -1,17 +1,17 @@
|
|||
<Root>
|
||||
<File Name="object_death" Segment="6">
|
||||
<Animation Name="object_death_Anim_000E64" Offset="0xE64" /> <!-- Original name is "d13_atack" -->
|
||||
<Animation Name="object_death_Anim_0015B4" Offset="0x15B4" /> <!-- Original name is "d13_callenemy" -->
|
||||
<Animation Name="object_death_Anim_001834" Offset="0x1834" /> <!-- Original name is "d13_callingenemy" -->
|
||||
<Animation Name="object_death_Anim_001F80" Offset="0x1F80" /> <!-- Original name is "d13_damage" -->
|
||||
<Animation Name="object_death_Anim_002DE8" Offset="0x2DE8" /> <!-- Original name is "d13_deadhit" -->
|
||||
<Animation Name="object_death_Anim_00352C" Offset="0x352C" /> <!-- Original name is "d13_deadwait" -->
|
||||
<Animation Name="object_death_Anim_003CAC" Offset="0x3CAC" /> <!-- Original name is "d13_fly" -->
|
||||
<Animation Name="gGomessScytheSwingAnim" Offset="0xE64" /> <!-- Original name is "d13_atack" -->
|
||||
<Animation Name="gGomessBatSwarmStartAnim" Offset="0x15B4" /> <!-- Original name is "d13_callenemy" -->
|
||||
<Animation Name="gGomessBatSwarmAnim" Offset="0x1834" /> <!-- Original name is "d13_callingenemy" -->
|
||||
<Animation Name="gGomessDamagedAnim" Offset="0x1F80" /> <!-- Original name is "d13_damage" -->
|
||||
<Animation Name="gGomessBeginDeathAnim" Offset="0x2DE8" /> <!-- Original name is "d13_deadhit" -->
|
||||
<Animation Name="gGomessDeathAnim" Offset="0x352C" /> <!-- Original name is "d13_deadwait" -->
|
||||
<Animation Name="gGomessFloatAnim" Offset="0x3CAC" /> <!-- Original name is "d13_fly" -->
|
||||
<DList Name="object_death_DL_006B80" Offset="0x6B80" />
|
||||
<DList Name="object_death_DL_006D18" Offset="0x6D18" />
|
||||
<DList Name="object_death_DL_006E08" Offset="0x6E08" />
|
||||
<DList Name="object_death_DL_006F88" Offset="0x6F88" /> <!-- Original name is "d13_kama_model" ("sickle") -->
|
||||
<DList Name="object_death_DL_0073D0" Offset="0x73D0" /> <!-- Original name is "d13_kamahaA_model" -->
|
||||
<DList Name="gGomessScytheHandleDL" Offset="0x6F88" /> <!-- Original name is "d13_kama_model" ("sickle") -->
|
||||
<DList Name="gGomessScytheBladeDL" Offset="0x73D0" /> <!-- Original name is "d13_kamahaA_model" -->
|
||||
<DList Name="object_death_DL_0074B8" Offset="0x74B8" />
|
||||
<DList Name="object_death_DL_007560" Offset="0x7560" />
|
||||
<DList Name="object_death_DL_007638" Offset="0x7638" />
|
||||
|
@ -39,47 +39,47 @@
|
|||
<Texture Name="object_death_Tex_0095C8" OutName="tex_0095C8" Format="rgba16" Width="16" Height="16" Offset="0x95C8" />
|
||||
<Texture Name="object_death_Tex_0097C8" OutName="tex_0097C8" Format="rgba16" Width="4" Height="8" Offset="0x97C8" />
|
||||
<Texture Name="object_death_Tex_009808" OutName="tex_009808" Format="i4" Width="16" Height="16" Offset="0x9808" />
|
||||
<DList Name="object_death_DL_009988" Offset="0x9988" />
|
||||
<Texture Name="object_death_Tex_009AA0" OutName="tex_009AA0" Format="i4" Width="16" Height="16" Offset="0x9AA0" />
|
||||
<DList Name="object_death_DL_009BA0" Offset="0x9BA0" /> <!-- Original name is "d13_cover_model" -->
|
||||
<Texture Name="object_death_Tex_009C40" OutName="tex_009C40" Format="rgba16" Width="16" Height="16" Offset="0x9C40" />
|
||||
<DList Name="object_death_DL_009F10" Offset="0x9F10" />
|
||||
<DList Name="object_death_DL_009F88" Offset="0x9F88" />
|
||||
<DList Name="object_death_DL_00A088" Offset="0xA088" />
|
||||
<DList Name="object_death_DL_00A188" Offset="0xA188" />
|
||||
<DList Name="object_death_DL_00A288" Offset="0xA288" />
|
||||
<DList Name="object_death_DL_00A388" Offset="0xA388" />
|
||||
<DList Name="object_death_DL_00A488" Offset="0xA488" />
|
||||
<DList Name="object_death_DL_00A588" Offset="0xA588" />
|
||||
<DList Name="object_death_DL_00A688" Offset="0xA688" />
|
||||
<DList Name="object_death_DL_00A788" Offset="0xA788" />
|
||||
<Texture Name="object_death_Tex_00A7B8" OutName="tex_00A7B8" Format="rgba16" Width="32" Height="16" Offset="0xA7B8" />
|
||||
<Limb Name="object_death_Standardlimb_00ABB8" Type="Standard" EnumName="OBJECT_DEATH_LIMB_01" Offset="0xABB8" />
|
||||
<Limb Name="object_death_Standardlimb_00ABC4" Type="Standard" EnumName="OBJECT_DEATH_LIMB_02" Offset="0xABC4" />
|
||||
<Limb Name="object_death_Standardlimb_00ABD0" Type="Standard" EnumName="OBJECT_DEATH_LIMB_03" Offset="0xABD0" />
|
||||
<Limb Name="object_death_Standardlimb_00ABDC" Type="Standard" EnumName="OBJECT_DEATH_LIMB_04" Offset="0xABDC" />
|
||||
<Limb Name="object_death_Standardlimb_00ABE8" Type="Standard" EnumName="OBJECT_DEATH_LIMB_05" Offset="0xABE8" />
|
||||
<Limb Name="object_death_Standardlimb_00ABF4" Type="Standard" EnumName="OBJECT_DEATH_LIMB_06" Offset="0xABF4" />
|
||||
<Limb Name="object_death_Standardlimb_00AC00" Type="Standard" EnumName="OBJECT_DEATH_LIMB_07" Offset="0xAC00" />
|
||||
<Limb Name="object_death_Standardlimb_00AC0C" Type="Standard" EnumName="OBJECT_DEATH_LIMB_08" Offset="0xAC0C" />
|
||||
<Limb Name="object_death_Standardlimb_00AC18" Type="Standard" EnumName="OBJECT_DEATH_LIMB_09" Offset="0xAC18" />
|
||||
<Limb Name="object_death_Standardlimb_00AC24" Type="Standard" EnumName="OBJECT_DEATH_LIMB_0A" Offset="0xAC24" />
|
||||
<Limb Name="object_death_Standardlimb_00AC30" Type="Standard" EnumName="OBJECT_DEATH_LIMB_0B" Offset="0xAC30" />
|
||||
<Limb Name="object_death_Standardlimb_00AC3C" Type="Standard" EnumName="OBJECT_DEATH_LIMB_0C" Offset="0xAC3C" />
|
||||
<Limb Name="object_death_Standardlimb_00AC48" Type="Standard" EnumName="OBJECT_DEATH_LIMB_0D" Offset="0xAC48" />
|
||||
<Limb Name="object_death_Standardlimb_00AC54" Type="Standard" EnumName="OBJECT_DEATH_LIMB_0E" Offset="0xAC54" />
|
||||
<Limb Name="object_death_Standardlimb_00AC60" Type="Standard" EnumName="OBJECT_DEATH_LIMB_0F" Offset="0xAC60" />
|
||||
<Limb Name="object_death_Standardlimb_00AC6C" Type="Standard" EnumName="OBJECT_DEATH_LIMB_10" Offset="0xAC6C" />
|
||||
<Limb Name="object_death_Standardlimb_00AC78" Type="Standard" EnumName="OBJECT_DEATH_LIMB_11" Offset="0xAC78" />
|
||||
<Limb Name="object_death_Standardlimb_00AC84" Type="Standard" EnumName="OBJECT_DEATH_LIMB_12" Offset="0xAC84" />
|
||||
<Limb Name="object_death_Standardlimb_00AC90" Type="Standard" EnumName="OBJECT_DEATH_LIMB_13" Offset="0xAC90" />
|
||||
<Limb Name="object_death_Standardlimb_00AC9C" Type="Standard" EnumName="OBJECT_DEATH_LIMB_14" Offset="0xAC9C" />
|
||||
<Limb Name="object_death_Standardlimb_00ACA8" Type="Standard" EnumName="OBJECT_DEATH_LIMB_15" Offset="0xACA8" />
|
||||
<Skeleton Name="object_death_Skel_00AD08" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DEATH_LIMB_NONE" LimbMax="OBJECT_DEATH_LIMB_MAX" EnumName="ObjectDeathLimb" Offset="0xAD08" />
|
||||
<Animation Name="object_death_Anim_00B284" Offset="0xB284" /> <!-- Original name is "d13_gahaha" -->
|
||||
<Animation Name="object_death_Anim_00B508" Offset="0xB508" /> <!-- Original name is "d13_guard" -->
|
||||
<Animation Name="object_death_Anim_00CB2C" Offset="0xCB2C" /> <!-- Original name is "d13_jakin" -->
|
||||
<TextureAnimation Name="object_death_Matanimheader_00CB84" Offset="0xCB84" />
|
||||
<TextureAnimation Name="object_death_Matanimheader_00CBC0" Offset="0xCBC0" />
|
||||
<DList Name="gGomessCoreDL" Offset="0x9988" />
|
||||
<Texture Name="gGomessCoreTex" OutName="gomess_core" Format="i4" Width="16" Height="16" Offset="0x9AA0" />
|
||||
<DList Name="gGomessBatsGuardingCoreDL" Offset="0x9BA0" /> <!-- Original name is "d13_cover_model" -->
|
||||
<Texture Name="gGomessBatsGuardingCoreTex" OutName="gomess_bats_guarding_core" Format="rgba16" Width="16" Height="16" Offset="0x9C40" />
|
||||
<DList Name="gGomessBatMaterialDL" Offset="0x9F10" />
|
||||
<DList Name="gGomessBatFrame1DL" Offset="0x9F88" />
|
||||
<DList Name="gGomessBatFrame2DL" Offset="0xA088" />
|
||||
<DList Name="gGomessBatFrame3DL" Offset="0xA188" />
|
||||
<DList Name="gGomessBatFrame4DL" Offset="0xA288" />
|
||||
<DList Name="gGomessBatFrame5DL" Offset="0xA388" />
|
||||
<DList Name="gGomessBatFrame6DL" Offset="0xA488" />
|
||||
<DList Name="gGomessBatFrame7DL" Offset="0xA588" />
|
||||
<DList Name="gGomessBatFrame8DL" Offset="0xA688" />
|
||||
<DList Name="gGomessBatFrame9DL" Offset="0xA788" />
|
||||
<Texture Name="gGomessBatTex" OutName="gomess_bat" Format="rgba16" Width="32" Height="16" Offset="0xA7B8" />
|
||||
<Limb Name="object_death_Standardlimb_00ABB8" Type="Standard" EnumName="GOMESS_LIMB_1" Offset="0xABB8" />
|
||||
<Limb Name="object_death_Standardlimb_00ABC4" Type="Standard" EnumName="GOMESS_LIMB_CORE_POS" Offset="0xABC4" />
|
||||
<Limb Name="object_death_Standardlimb_00ABD0" Type="Standard" EnumName="GOMESS_LIMB_LOWER_BODY" Offset="0xABD0" />
|
||||
<Limb Name="object_death_Standardlimb_00ABDC" Type="Standard" EnumName="GOMESS_LIMB_TORSO" Offset="0xABDC" />
|
||||
<Limb Name="object_death_Standardlimb_00ABE8" Type="Standard" EnumName="GOMESS_LIMB_COLLAR" Offset="0xABE8" />
|
||||
<Limb Name="object_death_Standardlimb_00ABF4" Type="Standard" EnumName="GOMESS_LIMB_HEAD_LOWER" Offset="0xABF4" />
|
||||
<Limb Name="object_death_Standardlimb_00AC00" Type="Standard" EnumName="GOMESS_LIMB_HEAD_UPPER" Offset="0xAC00" />
|
||||
<Limb Name="object_death_Standardlimb_00AC0C" Type="Standard" EnumName="GOMESS_LIMB_8" Offset="0xAC0C" />
|
||||
<Limb Name="object_death_Standardlimb_00AC18" Type="Standard" EnumName="GOMESS_LIMB_9" Offset="0xAC18" />
|
||||
<Limb Name="object_death_Standardlimb_00AC24" Type="Standard" EnumName="GOMESS_LIMB_10" Offset="0xAC24" />
|
||||
<Limb Name="object_death_Standardlimb_00AC30" Type="Standard" EnumName="GOMESS_LIMB_11" Offset="0xAC30" />
|
||||
<Limb Name="object_death_Standardlimb_00AC3C" Type="Standard" EnumName="GOMESS_LIMB_CLOAK_UPPER" Offset="0xAC3C" />
|
||||
<Limb Name="object_death_Standardlimb_00AC48" Type="Standard" EnumName="GOMESS_LIMB_CLOAK_LOWER" Offset="0xAC48" />
|
||||
<Limb Name="object_death_Standardlimb_00AC54" Type="Standard" EnumName="GOMESS_LIMB_UPPER_ARM_LEFT" Offset="0xAC54" />
|
||||
<Limb Name="object_death_Standardlimb_00AC60" Type="Standard" EnumName="GOMESS_LIMB_FOREARM_LEFT" Offset="0xAC60" />
|
||||
<Limb Name="object_death_Standardlimb_00AC6C" Type="Standard" EnumName="GOMESS_LIMB_HAND_LEFT" Offset="0xAC6C" />
|
||||
<Limb Name="object_death_Standardlimb_00AC78" Type="Standard" EnumName="GOMESS_LIMB_UPPER_ARM_RIGHT" Offset="0xAC78" />
|
||||
<Limb Name="object_death_Standardlimb_00AC84" Type="Standard" EnumName="GOMESS_LIMB_FOREARM_RIGHT" Offset="0xAC84" />
|
||||
<Limb Name="object_death_Standardlimb_00AC90" Type="Standard" EnumName="GOMESS_LIMB_HAND_RIGHT" Offset="0xAC90" />
|
||||
<Limb Name="object_death_Standardlimb_00AC9C" Type="Standard" EnumName="GOMESS_LIMB_SCYTHE_HANDLE" Offset="0xAC9C" />
|
||||
<Limb Name="object_death_Standardlimb_00ACA8" Type="Standard" EnumName="GOMESS_LIMB_SCYTHE_BLADE" Offset="0xACA8" />
|
||||
<Skeleton Name="gGomessSkel" Type="Flex" LimbType="Standard" LimbNone="GOMESS_LIMB_NONE" LimbMax="GOMESS_LIMB_MAX" EnumName="GomessSkelLimb" Offset="0xAD08" />
|
||||
<Animation Name="object_death_Anim_00B284" Offset="0xB284" /> <!-- Original name is "d13_gahaha" --> <!-- Intro anim 1 -->
|
||||
<Animation Name="gGomessScytheSpinAnim" Offset="0xB508" /> <!-- Original name is "d13_guard" -->
|
||||
<Animation Name="object_death_Anim_00CB2C" Offset="0xCB2C" /> <!-- Original name is "d13_jakin" --> <!-- Intro anim 2 -->
|
||||
<TextureAnimation Name="gGomessCoreMatAnim" Offset="0xCB84" />
|
||||
<TextureAnimation Name="gGomessBodyMatAnim" Offset="0xCBC0" />
|
||||
</File>
|
||||
</Root>
|
||||
|
|
|
@ -242,27 +242,6 @@ D_06004894 = 0x06004894;
|
|||
D_060086BC = 0x060086BC;
|
||||
D_0600C3E0 = 0x0600C3E0;
|
||||
|
||||
// ovl_En_Death
|
||||
|
||||
D_06000E64 = 0x06000E64;
|
||||
D_060015B4 = 0x060015B4;
|
||||
D_06001834 = 0x06001834;
|
||||
D_06001F80 = 0x06001F80;
|
||||
D_06002DE8 = 0x06002DE8;
|
||||
D_0600352C = 0x0600352C;
|
||||
D_06003CAC = 0x06003CAC;
|
||||
D_06006F88 = 0x06006F88;
|
||||
D_060073D0 = 0x060073D0;
|
||||
D_06009988 = 0x06009988;
|
||||
D_06009BA0 = 0x06009BA0;
|
||||
D_06009F10 = 0x06009F10;
|
||||
D_0600AD08 = 0x0600AD08;
|
||||
D_0600B284 = 0x0600B284;
|
||||
D_0600B508 = 0x0600B508;
|
||||
D_0600CB2C = 0x0600CB2C;
|
||||
D_0600CB84 = 0x0600CB84;
|
||||
D_0600CBC0 = 0x0600CBC0;
|
||||
|
||||
// ovl_En_Knight
|
||||
|
||||
D_060005A8 = 0x060005A8;
|
||||
|
|
7
spec
7
spec
|
@ -1046,17 +1046,14 @@ beginseg
|
|||
name "ovl_En_Death"
|
||||
compress
|
||||
include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Death/z_en_death.o"
|
||||
include "$(BUILD_DIR)/data/ovl_En_Death/ovl_En_Death.data.o"
|
||||
include "$(BUILD_DIR)/data/ovl_En_Death/ovl_En_Death.reloc.o"
|
||||
include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Death/ovl_En_Death_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
name "ovl_En_Minideath"
|
||||
compress
|
||||
include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Minideath/z_en_minideath.o"
|
||||
include "$(BUILD_DIR)/data/ovl_En_Minideath/ovl_En_Minideath.data.o"
|
||||
include "$(BUILD_DIR)/data/ovl_En_Minideath/ovl_En_Minideath.bss.o"
|
||||
include "$(BUILD_DIR)/data/ovl_En_Minideath/ovl_En_Minideath.reloc.o"
|
||||
include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Minideath/ovl_En_Minideath_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -2,6 +2,8 @@
|
|||
#define Z_EN_DEATH_H
|
||||
|
||||
#include "global.h"
|
||||
#include "overlays/actors/ovl_En_Minideath/z_en_minideath.h"
|
||||
#include "objects/object_death/object_death.h"
|
||||
|
||||
struct EnDeath;
|
||||
|
||||
|
@ -9,9 +11,53 @@ typedef void (*EnDeathActionFunc)(struct EnDeath*, PlayState*);
|
|||
|
||||
typedef struct EnDeath {
|
||||
/* 0x000 */ Actor actor;
|
||||
/* 0x144 */ char unk_144[0x44];
|
||||
/* 0x144 */ SkelAnime skelAnime;
|
||||
/* 0x188 */ EnDeathActionFunc actionFunc;
|
||||
/* 0x18C */ char unk_18C[0x7AC];
|
||||
/* 0x18C */ u8 unk_18C;
|
||||
/* 0x18D */ u8 coreGuarded;
|
||||
/* 0x18E */ u8 holdsScythe;
|
||||
/* 0x18F */ u8 dmgEffect;
|
||||
/* 0x190 */ s8 numScytheAfterImages;
|
||||
/* 0x191 */ u8 matAnimStep; // animated material color step?
|
||||
/* 0x192 */ u8 inEarlyIntro;
|
||||
/* 0x193 */ u8 noDrawLimbs[GOMESS_LIMB_MAX];
|
||||
/* 0x1A9 */ u8 flameAlphas[56];
|
||||
/* 0x1E2 */ Vec3s jointTable[GOMESS_LIMB_MAX];
|
||||
/* 0x266 */ Vec3s morphTable[GOMESS_LIMB_MAX];
|
||||
/* 0x2EA */ s16 floatTimer;
|
||||
/* 0x2EC */ s16 weaponColliderLastUpdateTime;
|
||||
/* 0x2EE */ s16 actionTimer;
|
||||
/* 0x2F0 */ UNK_TYPE2 unk_2F0;
|
||||
/* 0x2F2 */ s16 cloakUpperRotationModifier;
|
||||
/* 0x2F4 */ s16 cloakLowerRotationModifier;
|
||||
/* 0x2F6 */ s16 coreRotation;
|
||||
/* 0x2F8 */ s16 explosiveDamageTimer;
|
||||
/* 0x2FA */ s16 camId;
|
||||
/* 0x2FC */ s16 lightArrowDamageTimer;
|
||||
/* 0x300 */ s32 effectIndex;
|
||||
/* 0x304 */ f32 scytheScale;
|
||||
/* 0x308 */ f32 coreVelocity;
|
||||
/* 0x30C */ f32 camEyeSpeed;
|
||||
/* 0x310 */ f32 camAtSpeed;
|
||||
/* 0x314 */ f32 dmgEffectScale;
|
||||
/* 0x318 */ f32 dmgEffectSteamScale;
|
||||
/* 0x31C */ f32 dmgEffectAlpha;
|
||||
/* 0x320 */ Vec3f corePos;
|
||||
/* 0x32C */ Vec3f scytheWorldPos;
|
||||
/* 0x338 */ Vec3f scytheScreenPos;
|
||||
/* 0x344 */ Vec3f camEyeTarget;
|
||||
/* 0x350 */ Vec3f camAtTarget;
|
||||
/* 0x35C */ Vec3f bodyPartsPos[14];
|
||||
/* 0x404 */ Vec3f sparklePositions[56];
|
||||
/* 0x6A4 */ MtxF scytheMtxF;
|
||||
/* 0x6E4 */ EnMinideath* miniDeaths[20];
|
||||
/* 0x734 */ AnimatedMaterial* bodyMatAnim;
|
||||
/* 0x738 */ AnimatedMaterial* coreMatAnim;
|
||||
/* 0x73C */ ColliderCylinder bodyCollider;
|
||||
/* 0x788 */ ColliderQuad weaponCollider;
|
||||
/* 0x808 */ ColliderSphere coreCollider;
|
||||
/* 0x860 */ ColliderTris weaponSpinningCollider;
|
||||
/* 0x880 */ ColliderTrisElement weaponSpinningColliderElements[2];
|
||||
} EnDeath; // size = 0x938
|
||||
|
||||
#endif // Z_EN_DEATH_H
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -7,10 +7,47 @@ struct EnMinideath;
|
|||
|
||||
typedef void (*EnMinideathActionFunc)(struct EnMinideath*, PlayState*);
|
||||
|
||||
#define MINIDEATH_NUM_EFFECTS 3
|
||||
|
||||
// "animation" length
|
||||
#define MINIDEATH_ANIM_LENGTH 9
|
||||
|
||||
typedef enum {
|
||||
/* 0 */ MINIDEATH_ACTION_CONTINUE, // continue with current action until it is changed
|
||||
/* 1 */ MINIDEATH_ACTION_SCATTER, // scatter after light arrows?
|
||||
/* 2 */ MINIDEATH_ACTION_RETURN, // gomess damaged
|
||||
/* 3 */ MINIDEATH_ACTION_START_SWARM,
|
||||
/* 4 */ MINIDEATH_ACTION_SWARM, // chase player?
|
||||
/* 5 */ MINIDEATH_ACTION_DEATH_2, // death cs part 3
|
||||
/* 6 */ MINIDEATH_ACTION_DEATH_1, // death cs part 1
|
||||
/* 7 */ MINIDEATH_ACTION_INTRO_1, // intro cs part 2
|
||||
/* 8 */ MINIDEATH_ACTION_INTRO_2, // intro cs part 5 (1)
|
||||
/* 9 */ MINIDEATH_ACTION_INTRO_3 // intro cs part 5 (2)
|
||||
} MinideathAction;
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ u8 animFrame;
|
||||
/* 0x01 */ u8 state;
|
||||
/* 0x04 */ Vec3f pos;
|
||||
/* 0x10 */ Vec3f vel;
|
||||
/* 0x1C */ Vec3s angle;
|
||||
/* 0x22 */ s16 timer;
|
||||
} MiniDeathEffect; // size = 0x24
|
||||
|
||||
typedef struct EnMinideath {
|
||||
/* 0x000 */ Actor actor;
|
||||
/* 0x144 */ EnMinideathActionFunc actionFunc;
|
||||
/* 0x148 */ char unk_148[0x164];
|
||||
/* 0x148 */ u8 number;
|
||||
/* 0x149 */ u8 crowdState;
|
||||
/* 0x14A */ s16 timer;
|
||||
/* 0x14C */ s16 spawnShapeYaw;
|
||||
/* 0x14E */ s16 attackTimer;
|
||||
/* 0x150 */ Vec3s moveDirection;
|
||||
/* 0x158 */ f32 initialHeightDiffFromParent;
|
||||
/* 0x15C */ Actor* targetActor;
|
||||
/* 0x160 */ MiniDeathEffect effects[MINIDEATH_NUM_EFFECTS];
|
||||
/* 0x1CC */ ColliderJntSph collider;
|
||||
/* 0x1EC */ ColliderJntSphElement colliderElements[MINIDEATH_NUM_EFFECTS];
|
||||
} EnMinideath; // size = 0x2AC
|
||||
|
||||
#endif // Z_EN_MINIDEATH_H
|
||||
|
|
|
@ -6188,10 +6188,10 @@
|
|||
0x808C7888:("func_808C7888",),
|
||||
0x808C7A30:("func_808C7A30",),
|
||||
0x808C7AAC:("func_808C7AAC",),
|
||||
0x808C7AEC:("func_808C7AEC",),
|
||||
0x808C7B88:("func_808C7B88",),
|
||||
0x808C7C04:("func_808C7C04",),
|
||||
0x808C7C88:("func_808C7C88",),
|
||||
0x808C7AEC:("EnDeath_SetupStartBatSwarm",),
|
||||
0x808C7B88:("EnDeath_StartBatSwarm",),
|
||||
0x808C7C04:("EnDeath_SetupBatSwarm",),
|
||||
0x808C7C88:("EnDeath_BatSwarm",),
|
||||
0x808C7CFC:("func_808C7CFC",),
|
||||
0x808C7D34:("func_808C7D34",),
|
||||
0x808C7DB8:("func_808C7DB8",),
|
||||
|
@ -6209,38 +6209,38 @@
|
|||
0x808C96C8:("EnDeath_Draw",),
|
||||
0x808CA0B0:("EnMinideath_Init",),
|
||||
0x808CA23C:("EnMinideath_Destroy",),
|
||||
0x808CA268:("func_808CA268",),
|
||||
0x808CA308:("func_808CA308",),
|
||||
0x808CA34C:("func_808CA34C",),
|
||||
0x808CA458:("func_808CA458",),
|
||||
0x808CA7D4:("func_808CA7D4",),
|
||||
0x808CA860:("func_808CA860",),
|
||||
0x808CA8E0:("func_808CA8E0",),
|
||||
0x808CA8F4:("func_808CA8F4",),
|
||||
0x808CAAC8:("func_808CAAC8",),
|
||||
0x808CAAEC:("func_808CAAEC",),
|
||||
0x808CAB90:("func_808CAB90",),
|
||||
0x808CABB0:("func_808CABB0",),
|
||||
0x808CAC54:("func_808CAC54",),
|
||||
0x808CACD8:("func_808CACD8",),
|
||||
0x808CAE00:("func_808CAE00",),
|
||||
0x808CAE18:("func_808CAE18",),
|
||||
0x808CAF08:("func_808CAF08",),
|
||||
0x808CAF68:("func_808CAF68",),
|
||||
0x808CB07C:("func_808CB07C",),
|
||||
0x808CB094:("func_808CB094",),
|
||||
0x808CB0C8:("func_808CB0C8",),
|
||||
0x808CB22C:("func_808CB22C",),
|
||||
0x808CB418:("func_808CB418",),
|
||||
0x808CB454:("func_808CB454",),
|
||||
0x808CB524:("func_808CB524",),
|
||||
0x808CB59C:("func_808CB59C",),
|
||||
0x808CB6A8:("func_808CB6A8",),
|
||||
0x808CB6D4:("func_808CB6D4",),
|
||||
0x808CB7B8:("func_808CB7B8",),
|
||||
0x808CB7CC:("func_808CB7CC",),
|
||||
0x808CB810:("func_808CB810",),
|
||||
0x808CB8F4:("func_808CB8F4",),
|
||||
0x808CA268:("EnMinideath_DropCollectible",),
|
||||
0x808CA308:("EnMinideath_UpdateCrowdState",),
|
||||
0x808CA34C:("EnMinideath_RandomizeEffects",),
|
||||
0x808CA458:("EnMinideath_UpdateEffects",),
|
||||
0x808CA7D4:("EnMinideath_SetupPreBattle",),
|
||||
0x808CA860:("EnMinideath_PreBattle",),
|
||||
0x808CA8E0:("EnMinideath_SetupIntro1",),
|
||||
0x808CA8F4:("EnMinideath_Intro1",),
|
||||
0x808CAAC8:("EnMinideath_SetupIntro2",),
|
||||
0x808CAAEC:("EnMinideath_Intro2",),
|
||||
0x808CAB90:("EnMinideath_SetupCrowdParent",),
|
||||
0x808CABB0:("EnMinideath_CrowdParent",),
|
||||
0x808CAC54:("EnMinideath_SetupScatter",),
|
||||
0x808CACD8:("EnMinideath_Scatter",),
|
||||
0x808CAE00:("EnMinideath_SetupReturn",),
|
||||
0x808CAE18:("EnMinideath_Return",),
|
||||
0x808CAF08:("EnMinideath_SetupIntro3",),
|
||||
0x808CAF68:("EnMinideath_Intro3",),
|
||||
0x808CB07C:("EnMinideath_SetupStartSwarm",),
|
||||
0x808CB094:("EnMinideath_StartSwarm",),
|
||||
0x808CB0C8:("EnMinideath_SetupSwarmFollower",),
|
||||
0x808CB22C:("EnMinideath_SwarmFollower",),
|
||||
0x808CB418:("EnMinideath_SetupSwarmLeader",),
|
||||
0x808CB454:("EnMinideath_SwarmLeader",),
|
||||
0x808CB524:("EnMinideath_SetupDeath1",),
|
||||
0x808CB59C:("EnMinideath_Death1",),
|
||||
0x808CB6A8:("EnMinideath_SetupDie",),
|
||||
0x808CB6D4:("EnMinideath_Die",),
|
||||
0x808CB7B8:("EnMinideath_SetupDead",),
|
||||
0x808CB7CC:("EnMinideath_Dead",),
|
||||
0x808CB810:("EnMinideath_SetNextAction",),
|
||||
0x808CB8F4:("EnMinideath_UpdateDamage",),
|
||||
0x808CBB18:("EnMinideath_Update",),
|
||||
0x808CC260:("EnVm_Init",),
|
||||
0x808CC3E0:("EnVm_Destroy",),
|
||||
|
|
Loading…
Reference in New Issue