mirror of https://github.com/zeldaret/mm.git
En_am OK (#501)
* en_am ok * clean up * applying feedback and some docs, need finish still * this should fix things * fixing things * fixing things and running format * post actor_fixer * adding object header and fixing comments * formatting and adding enum for limbs * addressing pr, naming things, cleanup * fixing enum in header * doing some docs and fixing format
This commit is contained in:
Parker Burnett
GitHub
parent
40d1bc00fe
commit
0f7f5de084
|
|
@ -1,8 +1,8 @@
|
|||
<Root>
|
||||
<File Name="object_am" Segment="6">
|
||||
<Collision Name="object_am_Colheader_000118" Offset="0x118" />
|
||||
<Animation Name="object_am_Anim_000238" Offset="0x238" />
|
||||
<Animation Name="object_am_Anim_00033C" Offset="0x33C" />
|
||||
<Animation Name="gArmosHopAnim" Offset="0x238" />
|
||||
<Animation Name="gArmosPushedBackAnim" Offset="0x33C" />
|
||||
<DList Name="object_am_DL_0005D0" Offset="0x5D0" />
|
||||
<DList Name="object_am_DL_0007A8" Offset="0x7A8" />
|
||||
<DList Name="object_am_DL_0016C8" Offset="0x16C8" />
|
||||
|
|
@ -21,21 +21,21 @@
|
|||
<Texture Name="object_am_Tex_004C38" OutName="tex_004C38" Format="rgba16" Width="32" Height="32" Offset="0x4C38" />
|
||||
<Texture Name="object_am_Tex_005438" OutName="tex_005438" Format="i4" Width="16" Height="8" Offset="0x5438" />
|
||||
<Texture Name="object_am_Tex_005478" OutName="tex_005478" Format="rgba16" Width="16" Height="32" Offset="0x5478" />
|
||||
<Limb Name="object_am_Standardlimb_005878" Type="Standard" Offset="0x5878" />
|
||||
<Limb Name="object_am_Standardlimb_005884" Type="Standard" Offset="0x5884" />
|
||||
<Limb Name="object_am_Standardlimb_005890" Type="Standard" Offset="0x5890" />
|
||||
<Limb Name="object_am_Standardlimb_00589C" Type="Standard" Offset="0x589C" />
|
||||
<Limb Name="object_am_Standardlimb_0058A8" Type="Standard" Offset="0x58A8" />
|
||||
<Limb Name="object_am_Standardlimb_0058B4" Type="Standard" Offset="0x58B4" />
|
||||
<Limb Name="object_am_Standardlimb_0058C0" Type="Standard" Offset="0x58C0" />
|
||||
<Limb Name="object_am_Standardlimb_0058CC" Type="Standard" Offset="0x58CC" />
|
||||
<Limb Name="object_am_Standardlimb_0058D8" Type="Standard" Offset="0x58D8" />
|
||||
<Limb Name="object_am_Standardlimb_0058E4" Type="Standard" Offset="0x58E4" />
|
||||
<Limb Name="object_am_Standardlimb_0058F0" Type="Standard" Offset="0x58F0" />
|
||||
<Limb Name="object_am_Standardlimb_0058FC" Type="Standard" Offset="0x58FC" />
|
||||
<Limb Name="object_am_Standardlimb_005908" Type="Standard" Offset="0x5908" />
|
||||
<Skeleton Name="object_am_Skel_005948" Type="Normal" LimbType="Standard" Offset="0x5948" />
|
||||
<Animation Name="object_am_Anim_005B3C" Offset="0x5B3C" />
|
||||
<Limb Name="object_am_Standardlimb_005878" Type="Standard" EnumName="OBJECT_AM_LIMB_01" Offset="0x5878" />
|
||||
<Limb Name="object_am_Standardlimb_005884" Type="Standard" EnumName="OBJECT_AM_LIMB_02" Offset="0x5884" />
|
||||
<Limb Name="object_am_Standardlimb_005890" Type="Standard" EnumName="OBJECT_AM_LIMB_BODY" Offset="0x5890" />
|
||||
<Limb Name="object_am_Standardlimb_00589C" Type="Standard" EnumName="OBJECT_AM_LIMB_04" Offset="0x589C" />
|
||||
<Limb Name="object_am_Standardlimb_0058A8" Type="Standard" EnumName="OBJECT_AM_LIMB_05" Offset="0x58A8" />
|
||||
<Limb Name="object_am_Standardlimb_0058B4" Type="Standard" EnumName="OBJECT_AM_LIMB_SHIELD" Offset="0x58B4" />
|
||||
<Limb Name="object_am_Standardlimb_0058C0" Type="Standard" EnumName="OBJECT_AM_LIMB_07" Offset="0x58C0" />
|
||||
<Limb Name="object_am_Standardlimb_0058CC" Type="Standard" EnumName="OBJECT_AM_LIMB_08" Offset="0x58CC" />
|
||||
<Limb Name="object_am_Standardlimb_0058D8" Type="Standard" EnumName="OBJECT_AM_LIMB_SWORD" Offset="0x58D8" />
|
||||
<Limb Name="object_am_Standardlimb_0058E4" Type="Standard" EnumName="OBJECT_AM_LIMB_0A" Offset="0x58E4" />
|
||||
<Limb Name="object_am_Standardlimb_0058F0" Type="Standard" EnumName="OBJECT_AM_LIMB_0B" Offset="0x58F0" />
|
||||
<Limb Name="object_am_Standardlimb_0058FC" Type="Standard" EnumName="OBJECT_AM_LIMB_BASE" Offset="0x58FC" />
|
||||
<Limb Name="object_am_Standardlimb_005908" Type="Standard" EnumName="OBJECT_AM_LIMB_0D" Offset="0x5908" />
|
||||
<Skeleton Name="object_am_Skel_005948" Type="Normal" LimbType="Standard" LimbNone="OBJECT_AM_LIMB_NONE" LimbMax="OBJECT_AM_LIMB_MAX" EnumName="object_am_Limbs" Offset="0x5948" />
|
||||
<Animation Name="gArmosTakeDamageAnim" Offset="0x5B3C" />
|
||||
<Collision Name="object_am_Colheader_005CF8" Offset="0x5CF8" />
|
||||
</File>
|
||||
</Root>
|
||||
|
|
|
|||
3
spec
3
spec
|
|
@ -1004,8 +1004,7 @@ beginseg
|
|||
name "ovl_En_Am"
|
||||
compress
|
||||
include "build/src/overlays/actors/ovl_En_Am/z_en_am.o"
|
||||
include "build/data/ovl_En_Am/ovl_En_Am.data.o"
|
||||
include "build/data/ovl_En_Am/ovl_En_Am.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_En_Am/ovl_En_Am_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
|
|
|||
|
|
@ -5,8 +5,10 @@
|
|||
*/
|
||||
|
||||
#include "z_en_am.h"
|
||||
#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
|
||||
#include "overlays/actors/ovl_En_Bombf/z_en_bombf.h"
|
||||
|
||||
#define FLAGS 0x00000405
|
||||
#define FLAGS (ACTOR_FLAG_400 | ACTOR_FLAG_4 | ACTOR_FLAG_1)
|
||||
|
||||
#define THIS ((EnAm*)thisx)
|
||||
|
||||
|
|
@ -15,18 +17,26 @@ void EnAm_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void EnAm_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnAm_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
void func_808B0040(EnAm* this, GlobalContext* globalCtx);
|
||||
void func_808B0124(EnAm* this, GlobalContext* globalCtx);
|
||||
void func_808AFF9C(EnAm* this);
|
||||
void EnAm_RemoveEnemyTexture(EnAm* this, GlobalContext* globalCtx);
|
||||
void EnAm_WakeUp(EnAm* this);
|
||||
void EnAm_ApplyEnemyTexture(EnAm* this, GlobalContext* globalCtx);
|
||||
void func_808B0358(EnAm* this);
|
||||
void func_808B03C0(EnAm* this, GlobalContext* globalCtx);
|
||||
void func_808B0460(EnAm* this);
|
||||
void func_808B04A8(EnAm* this, GlobalContext* globalCtx);
|
||||
void func_808B0508(EnAm* this, GlobalContext* globalCtx);
|
||||
void func_808B057C(EnAm* this);
|
||||
void func_808B05C8(EnAm* this, GlobalContext* globalCtx);
|
||||
void func_808B0640(EnAm* this);
|
||||
void func_808B066C(EnAm* this, GlobalContext* globalCtx);
|
||||
void EnAm_TakeDamage(EnAm* this, GlobalContext* globalCtx);
|
||||
void func_808B07A8(EnAm* this, GlobalContext* globalCtx);
|
||||
void func_808B0820(EnAm* this);
|
||||
void func_808B0894(EnAm* this, GlobalContext* globalCtx);
|
||||
void func_808B0B4C(EnAm* this, GlobalContext* globalCtx);
|
||||
void EnAm_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor);
|
||||
|
||||
#if 0
|
||||
const ActorInit En_Am_InitVars = {
|
||||
ACTOR_EN_AM,
|
||||
ACTORCAT_ENEMY,
|
||||
|
|
@ -39,22 +49,47 @@ const ActorInit En_Am_InitVars = {
|
|||
(ActorFunc)EnAm_Draw,
|
||||
};
|
||||
|
||||
// static ColliderCylinderInit sCylinderInit = {
|
||||
static ColliderCylinderInit D_808B1070 = {
|
||||
{ COLTYPE_HIT5, AT_NONE | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, },
|
||||
{ ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x00, 0x08 }, { 0x81C2C788, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON | BUMP_HOOKABLE, OCELEM_ON, },
|
||||
static ColliderCylinderInit sEnemyCylinderInit = {
|
||||
{
|
||||
COLTYPE_HIT5,
|
||||
AT_NONE | AT_TYPE_ENEMY,
|
||||
AC_ON | AC_TYPE_PLAYER,
|
||||
OC1_ON | OC1_TYPE_ALL,
|
||||
OC2_TYPE_1,
|
||||
COLSHAPE_CYLINDER,
|
||||
},
|
||||
{
|
||||
ELEMTYPE_UNK0,
|
||||
{ 0xF7CFFFFF, 0x00, 0x08 },
|
||||
{ 0x81C2C788, 0x00, 0x00 },
|
||||
TOUCH_ON | TOUCH_SFX_NORMAL,
|
||||
BUMP_ON | BUMP_HOOKABLE,
|
||||
OCELEM_ON,
|
||||
},
|
||||
{ 23, 98, 0, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
// static ColliderCylinderInit sCylinderInit = {
|
||||
static ColliderCylinderInit D_808B109C = {
|
||||
{ COLTYPE_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, OC2_NONE, COLSHAPE_CYLINDER, },
|
||||
{ ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x760D3877, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
|
||||
static ColliderCylinderInit sCylinderInit = {
|
||||
{
|
||||
COLTYPE_METAL,
|
||||
AT_NONE,
|
||||
AC_ON | AC_HARD | AC_TYPE_PLAYER,
|
||||
OC1_NONE,
|
||||
OC2_NONE,
|
||||
COLSHAPE_CYLINDER,
|
||||
},
|
||||
{
|
||||
ELEMTYPE_UNK0,
|
||||
{ 0x00000000, 0x00, 0x00 },
|
||||
{ 0x760D3877, 0x00, 0x00 },
|
||||
TOUCH_NONE | TOUCH_SFX_NORMAL,
|
||||
BUMP_ON,
|
||||
OCELEM_NONE,
|
||||
},
|
||||
{ 23, 98, 0, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
// static DamageTable sDamageTable = {
|
||||
static DamageTable D_808B10C8 = {
|
||||
static DamageTable sDamageTable = {
|
||||
/* Deku Nut */ DMG_ENTRY(0, 0xF),
|
||||
/* Deku Stick */ DMG_ENTRY(0, 0xF),
|
||||
/* Horse trample */ DMG_ENTRY(0, 0xF),
|
||||
|
|
@ -89,81 +124,448 @@ static DamageTable D_808B10C8 = {
|
|||
/* Powder Keg */ DMG_ENTRY(1, 0xF),
|
||||
};
|
||||
|
||||
// sColChkInfoInit
|
||||
static CollisionCheckInfoInit D_808B10E8 = { 1, 23, 98, MASS_HEAVY };
|
||||
static CollisionCheckInfoInit sColChkInfoInit = { 1, 23, 98, MASS_HEAVY };
|
||||
|
||||
// static InitChainEntry sInitChain[] = {
|
||||
static InitChainEntry D_808B10F0[] = {
|
||||
static InitChainEntry sInitChain[] = {
|
||||
ICHAIN_VEC3F_DIV1000(scale, 14, ICHAIN_CONTINUE),
|
||||
ICHAIN_S8(hintId, 19, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32_DIV1000(gravity, -4000, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(targetArrowOffset, 2000, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
#endif
|
||||
static Vec3f sVelocity = { 0.0f, -1.5f, 0.0f };
|
||||
|
||||
extern ColliderCylinderInit D_808B1070;
|
||||
extern ColliderCylinderInit D_808B109C;
|
||||
extern DamageTable D_808B10C8;
|
||||
extern CollisionCheckInfoInit D_808B10E8;
|
||||
extern InitChainEntry D_808B10F0[];
|
||||
static Vec3f sAccel = { 0.0f, -(1.0f / 5.0f), 0.0f };
|
||||
|
||||
extern UNK_TYPE D_06000238;
|
||||
extern UNK_TYPE D_0600033C;
|
||||
extern UNK_TYPE D_06005B3C;
|
||||
static Color_RGBA8 D_808B1118 = { 100, 100, 100, 0 };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/EnAm_Init.s")
|
||||
static Color_RGBA8 D_808B111C = { 40, 40, 40, 0 };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/EnAm_Destroy.s")
|
||||
static Color_RGBA8 D_808B1120 = { 150, 150, 150, 255 };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808AFE38.s")
|
||||
static Color_RGBA8 D_808B1124 = { 100, 100, 100, 150 };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808AFF9C.s")
|
||||
static Vec3f D_808B1128[] = {
|
||||
{ 4700.0f, -500.0f, 1800.0f }, { 4700.0f, -500.0f, -1800.0f }, { 2000.0f, -1500.0f, 0.0f },
|
||||
{ 2000.0f, 0.0f, -1500.0f }, { 2000.0f, 0.0f, 1500.0f },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B0040.s")
|
||||
static Vec3f D_808B1164[] = {
|
||||
{ 0.0f, -3000.0f, 0.0f },
|
||||
{ 700.0f, -800.0f, 0.0f },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B00D8.s")
|
||||
static Vec3f D_808B117C[] = {
|
||||
{ 800.0f, 1000.0f, -1000.0f },
|
||||
{ 800.0f, 1000.0f, 1000.0f },
|
||||
{ 800.0f, -1000.0f, 1000.0f },
|
||||
{ 800.0f, -1000.0f, -1000.0f },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B0124.s")
|
||||
void EnAm_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnAm* this = THIS;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B0208.s")
|
||||
Actor_ProcessInitChain(&this->actor, sInitChain);
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 300.0f / 7.0f);
|
||||
SkelAnime_Init(globalCtx, &this->skelAnime, &object_am_Skel_005948, &gArmosPushedBackAnim, this->jointTable,
|
||||
this->morphTable, OBJECT_AM_LIMB_MAX);
|
||||
Collider_InitAndSetCylinder(globalCtx, &this->enemyCollider, &this->actor, &sEnemyCylinderInit);
|
||||
Collider_InitAndSetCylinder(globalCtx, &this->interactCollider, &this->actor, &sCylinderInit);
|
||||
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
|
||||
this->actor.home.pos.x -= 9.0f * Math_SinS(this->actor.shape.rot.y);
|
||||
this->actor.home.pos.z -= 9.0f * Math_CosS(this->actor.shape.rot.y);
|
||||
this->actor.world.pos.x = this->actor.home.pos.x;
|
||||
this->actor.world.pos.z = this->actor.home.pos.z;
|
||||
func_808AFF9C(this);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B0358.s")
|
||||
void EnAm_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnAm* this = THIS;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B03C0.s")
|
||||
Collider_DestroyCylinder(globalCtx, &this->enemyCollider);
|
||||
Collider_DestroyCylinder(globalCtx, &this->interactCollider);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B0460.s")
|
||||
void EnAm_SpawnEffects(EnAm* this, GlobalContext* globalCtx) {
|
||||
s32 i;
|
||||
Vec3f effectPos;
|
||||
s32 pad;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B04A8.s")
|
||||
// Dust Clouds that spawn from the hop
|
||||
for (i = 4; i > 0; i--) {
|
||||
effectPos.x = randPlusMinusPoint5Scaled(65.0f) + this->actor.world.pos.x;
|
||||
effectPos.y = randPlusMinusPoint5Scaled(10.0f) + (this->actor.world.pos.y + 40.0f);
|
||||
effectPos.z = randPlusMinusPoint5Scaled(65.0f) + this->actor.world.pos.z;
|
||||
EffectSsKiraKira_SpawnSmall(globalCtx, &effectPos, &sVelocity, &sAccel, &D_808B1118, &D_808B111C);
|
||||
}
|
||||
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AMOS_WALK);
|
||||
Actor_SpawnFloorDustRing(globalCtx, &this->actor, &this->actor.world.pos, 4.0f, 3, 8.0f, 300, 15, 0);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B04E4.s")
|
||||
void func_808AFF9C(EnAm* this) {
|
||||
f32 lastFrame = Animation_GetLastFrame(&gArmosPushedBackAnim);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B0508.s")
|
||||
Animation_Change(&this->skelAnime, &gArmosPushedBackAnim, 0.0f, lastFrame, lastFrame, 0, 0.0f);
|
||||
this->enemyCollider.info.bumper.dmgFlags = 0x80000088;
|
||||
this->interactCollider.info.bumper.dmgFlags = 0x77CFFF77;
|
||||
if (this->actor.colChkInfo.health != 0) {
|
||||
this->enemyCollider.base.atFlags &= ~AT_ON;
|
||||
}
|
||||
Math_Vec3f_Copy(&this->actor.world.pos, &this->actor.home.pos);
|
||||
this->actionFunc = EnAm_RemoveEnemyTexture;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B057C.s")
|
||||
void EnAm_RemoveEnemyTexture(EnAm* this, GlobalContext* globalCtx) {
|
||||
if (((this->enemyCollider.base.ocFlags1 & OC1_HIT) && (this->enemyCollider.base.ocFlags2 & OC2_HIT_PLAYER)) ||
|
||||
(this->interactCollider.base.acFlags & AC_HIT)) {
|
||||
if (this->textureBlend == 0) {
|
||||
EnAm_WakeUp(this);
|
||||
}
|
||||
} else if (this->textureBlend > 10) {
|
||||
this->textureBlend -= 10;
|
||||
} else {
|
||||
this->textureBlend = 0;
|
||||
this->actor.flags &= ~ACTOR_FLAG_1;
|
||||
this->unkFlag = 0;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B05C8.s")
|
||||
void EnAm_WakeUp(EnAm* this) {
|
||||
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AMOS_WAVE);
|
||||
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AMOS_VOICE);
|
||||
this->returnHomeTimer = 300;
|
||||
this->actionFunc = EnAm_ApplyEnemyTexture;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B0640.s")
|
||||
void EnAm_ApplyEnemyTexture(EnAm* this, GlobalContext* globalCtx) {
|
||||
s32 tempTextureBlend;
|
||||
f32 cos;
|
||||
u8 pad;
|
||||
f32 rand;
|
||||
f32 sin;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B066C.s")
|
||||
if (this->textureBlend + 20 >= 255) {
|
||||
this->textureBlend = 255;
|
||||
this->actor.flags |= ACTOR_FLAG_1;
|
||||
this->enemyCollider.info.bumper.dmgFlags = 0x81C2C788;
|
||||
this->interactCollider.info.bumper.dmgFlags = 0x760D3877;
|
||||
this->enemyCollider.base.atFlags |= AT_ON;
|
||||
this->actor.shape.yOffset = 0.0f;
|
||||
func_808B0358(this);
|
||||
} else {
|
||||
tempTextureBlend = this->textureBlend + 20;
|
||||
rand = randPlusMinusPoint5Scaled(10.0f);
|
||||
cos = Math_CosS(this->actor.shape.rot.y) * rand;
|
||||
sin = Math_SinS(this->actor.shape.rot.y) * rand;
|
||||
this->actor.world.pos.x = this->actor.home.pos.x + cos;
|
||||
this->actor.world.pos.z = this->actor.home.pos.z + sin;
|
||||
this->textureBlend = tempTextureBlend;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B06D0.s")
|
||||
void func_808B0208(EnAm* this, GlobalContext* globalCtx) {
|
||||
// If the armos is against a wall, rotate and turn away from it
|
||||
if ((this->actor.speedXZ > 0.0f) && (this->actor.bgCheckFlags & 8)) {
|
||||
this->actor.world.rot.y = (this->actor.wallYaw * 2) - this->actor.world.rot.y;
|
||||
this->actor.world.pos.x += this->actor.speedXZ * Math_SinS(this->actor.world.rot.y);
|
||||
this->actor.world.pos.z += this->actor.speedXZ * Math_CosS(this->actor.world.rot.y);
|
||||
}
|
||||
SkelAnime_Update(&this->skelAnime);
|
||||
if (Animation_OnFrame(&this->skelAnime, 8.0f) != 0) {
|
||||
this->actor.speedXZ = this->speed;
|
||||
this->actor.velocity.y = 12.0f;
|
||||
} else if (this->skelAnime.curFrame > 11.0f) {
|
||||
if (!(this->actor.bgCheckFlags & 1)) {
|
||||
this->skelAnime.curFrame = 11.0f;
|
||||
} else {
|
||||
Math_ScaledStepToS(&this->actor.world.rot.y, this->armosYaw, 0x1F40);
|
||||
this->actor.speedXZ = 0.0f;
|
||||
if (this->actor.bgCheckFlags & 2) {
|
||||
EnAm_SpawnEffects(this, globalCtx);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (this->actionFunc != func_808B0894) {
|
||||
this->actor.shape.rot.y = this->actor.world.rot.y;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B07A8.s")
|
||||
void func_808B0358(EnAm* this) {
|
||||
Animation_PlayLoopSetSpeed(&this->skelAnime, &gArmosHopAnim, 4.0f);
|
||||
this->explodeTimer = 3;
|
||||
this->actor.speedXZ = 0.0f;
|
||||
this->actor.world.rot.y = this->actor.shape.rot.y;
|
||||
this->speed = 6.0f;
|
||||
this->actionFunc = func_808B03C0;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B0820.s")
|
||||
void func_808B03C0(EnAm* this, GlobalContext* globalCtx) {
|
||||
this->armosYaw = this->actor.yawTowardsPlayer;
|
||||
func_808B0208(this, globalCtx);
|
||||
if (this->actor.bgCheckFlags & 2) {
|
||||
this->explodeTimer--;
|
||||
}
|
||||
if (this->explodeTimer == 0) {
|
||||
func_808B0640(this);
|
||||
} else if ((this->returnHomeTimer == 0) || Actor_XZDistanceToPoint(&this->actor, &this->actor.home.pos) > 240.0f) {
|
||||
func_808B0460(this);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B0894.s")
|
||||
void func_808B0460(EnAm* this) {
|
||||
this->actor.world.rot.y = this->actor.shape.rot.y;
|
||||
this->speed = 0.0f;
|
||||
this->armosYaw = Actor_YawToPoint(&this->actor, &this->actor.home.pos);
|
||||
this->actionFunc = func_808B04A8;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B0AD0.s")
|
||||
void func_808B04A8(EnAm* this, GlobalContext* globalCtx) {
|
||||
func_808B0208(this, globalCtx);
|
||||
if (this->armosYaw == this->actor.world.rot.y) {
|
||||
func_808B057C(this);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B0B4C.s")
|
||||
void func_808B04E4(EnAm* this) {
|
||||
this->speed = 0.0f;
|
||||
this->armosYaw = this->actor.home.rot.y;
|
||||
this->actionFunc = func_808B0508;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B0B9C.s")
|
||||
void func_808B0508(EnAm* this, GlobalContext* globalCtx) {
|
||||
func_808B0208(this, globalCtx);
|
||||
if (!(this->actor.bgCheckFlags & 1)) {
|
||||
Math_StepToF(&this->actor.world.pos.x, this->actor.home.pos.x, 2.0f);
|
||||
Math_StepToF(&this->actor.world.pos.z, this->actor.home.pos.z, 2.0f);
|
||||
}
|
||||
if (this->actor.home.rot.y == this->actor.world.rot.y) {
|
||||
func_808AFF9C(this);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/EnAm_Update.s")
|
||||
void func_808B057C(EnAm* this) {
|
||||
this->speed = 6.0f;
|
||||
this->armosYaw = Actor_YawToPoint(&this->actor, &this->actor.home.pos);
|
||||
this->explodeTimer = 1;
|
||||
this->actionFunc = func_808B05C8;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/func_808B0EA4.s")
|
||||
void func_808B05C8(EnAm* this, GlobalContext* globalCtx) {
|
||||
this->armosYaw = Actor_YawToPoint(&this->actor, &this->actor.home.pos);
|
||||
func_808B0208(this, globalCtx);
|
||||
if (Actor_XZDistanceToPoint(&this->actor, &this->actor.home.pos) < 8.0f) {
|
||||
func_808B04E4(this);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Am/EnAm_Draw.s")
|
||||
void func_808B0640(EnAm* this) {
|
||||
this->explodeTimer = 40;
|
||||
this->actor.world.rot.y = this->actor.shape.rot.y;
|
||||
this->speed = 0.0f;
|
||||
this->actionFunc = func_808B066C;
|
||||
}
|
||||
|
||||
void func_808B066C(EnAm* this, GlobalContext* globalCtx) {
|
||||
if (this->explodeTimer != 0) {
|
||||
this->explodeTimer--;
|
||||
} else {
|
||||
this->armosYaw = this->actor.yawTowardsPlayer;
|
||||
func_808B0208(this, globalCtx);
|
||||
if (this->armosYaw == this->actor.shape.rot.y) {
|
||||
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AMOS_VOICE);
|
||||
func_808B0358(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EnAm_TakeDamage(EnAm* this, GlobalContext* globalCtx) {
|
||||
Animation_Change(&this->skelAnime, &gArmosTakeDamageAnim, 1.0f, 4.0f,
|
||||
Animation_GetLastFrame(&gArmosTakeDamageAnim) - 6, 2, 0.0f);
|
||||
func_800BE504(&this->actor, &this->enemyCollider);
|
||||
this->actor.speedXZ = 6.0f;
|
||||
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, Animation_GetLastFrame(&gArmosTakeDamageAnim) - 10);
|
||||
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_DAMAGE);
|
||||
this->enemyCollider.base.acFlags &= ~AC_ON;
|
||||
this->textureBlend = 255;
|
||||
this->actionFunc = func_808B07A8;
|
||||
}
|
||||
|
||||
void func_808B07A8(EnAm* this, GlobalContext* globalCtx) {
|
||||
Math_StepToF(&this->actor.speedXZ, 0.0f, 0.5f);
|
||||
if (SkelAnime_Update(&this->skelAnime)) {
|
||||
if (this->actor.colChkInfo.health == 0) {
|
||||
func_808B0820(this);
|
||||
} else {
|
||||
this->enemyCollider.base.acFlags |= AC_ON;
|
||||
func_808B0358(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void func_808B0820(EnAm* this) {
|
||||
Animation_PlayLoopSetSpeed(&this->skelAnime, &gArmosHopAnim, 4.0f);
|
||||
this->explodeTimer = 64;
|
||||
this->actor.world.rot.y = this->actor.shape.rot.y;
|
||||
this->actor.flags |= ACTOR_FLAG_10;
|
||||
this->actor.speedXZ = 0.0f;
|
||||
this->speed = 6.0f;
|
||||
this->actionFunc = func_808B0894;
|
||||
}
|
||||
|
||||
void func_808B0894(EnAm* this, GlobalContext* globalCtx) {
|
||||
s32 i;
|
||||
Vec3f dustPos;
|
||||
s32 pad;
|
||||
|
||||
this->explodeTimer--;
|
||||
this->armosYaw = this->actor.yawTowardsPlayer;
|
||||
func_808B0208(this, globalCtx);
|
||||
if (this->explodeTimer == 1) {
|
||||
EnBom* bomb = (EnBom*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOM, this->actor.world.pos.x,
|
||||
this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 2, 0);
|
||||
if (bomb != NULL) {
|
||||
bomb->timer = 0;
|
||||
}
|
||||
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_EYEGOLE_DEAD);
|
||||
Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.world.pos, 0xB0);
|
||||
|
||||
for (i = 0; i < 8; i++) {
|
||||
dustPos.x = (Math_SinS(0) * 7.0f) + this->actor.world.pos.x;
|
||||
dustPos.y = (randPlusMinusPoint5Scaled(10.0f) * 6.0f) + (this->actor.world.pos.y + 40.0f);
|
||||
dustPos.z = (Math_CosS(0) * 7.0f) + this->actor.world.pos.z;
|
||||
|
||||
func_800B0EB0(globalCtx, &dustPos, &gZeroVec3f, &gZeroVec3f, &D_808B1120, &D_808B1124, 200, 45, 12);
|
||||
}
|
||||
} else if (this->explodeTimer == 0) {
|
||||
Actor_MarkForDeath(&this->actor);
|
||||
return;
|
||||
} else if (!(this->explodeTimer & 3)) {
|
||||
Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 4);
|
||||
}
|
||||
if (this->actor.world.rot.z < 0x1F40) {
|
||||
this->actor.world.rot.z += 0x320;
|
||||
}
|
||||
this->actor.shape.rot.y += this->actor.world.rot.z;
|
||||
}
|
||||
|
||||
void func_808B0AD0(EnAm* this, GlobalContext* globalCtx) {
|
||||
Animation_Change(&this->skelAnime, &gArmosPushedBackAnim, 1.0f, 0.0f, 8.0f, 2, 0.0f);
|
||||
this->actor.world.rot.y = this->actor.yawTowardsPlayer;
|
||||
this->actor.speedXZ = -6.0f;
|
||||
this->actionFunc = func_808B0B4C;
|
||||
}
|
||||
|
||||
void func_808B0B4C(EnAm* this, GlobalContext* globalCtx) {
|
||||
Math_StepToF(&this->actor.speedXZ, 0.0f, 0.5f);
|
||||
if (SkelAnime_Update(&this->skelAnime)) {
|
||||
func_808B0358(this);
|
||||
}
|
||||
}
|
||||
|
||||
s32 EnAm_UpdateDamage(EnAm* this, GlobalContext* globalCtx) {
|
||||
if (this->enemyCollider.base.acFlags & AC_HIT) {
|
||||
this->enemyCollider.base.acFlags &= ~AC_HIT;
|
||||
Actor_SetDropFlag(&this->actor, &this->enemyCollider.info);
|
||||
if (!Actor_ApplyDamage(&this->actor)) {
|
||||
Enemy_StartFinishingBlow(globalCtx, &this->actor);
|
||||
}
|
||||
if (this->actor.colChkInfo.damageEffect == 0xD) {
|
||||
return true;
|
||||
}
|
||||
if (this->actor.colChkInfo.health != 0) {
|
||||
this->enemyCollider.base.atFlags &= ~AT_ON;
|
||||
}
|
||||
this->enemyCollider.base.atFlags &= ~AT_HIT;
|
||||
if (this->actor.colChkInfo.damageEffect == 0x4) {
|
||||
this->effectScale = 0.7f;
|
||||
this->effectAlpha = 4.0f;
|
||||
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_CLEAR_TAG, this->enemyCollider.info.bumper.hitPos.x,
|
||||
this->enemyCollider.info.bumper.hitPos.y, this->enemyCollider.info.bumper.hitPos.z, 0, 0, 0,
|
||||
CLEAR_TAG_LARGE_LIGHT_RAYS);
|
||||
}
|
||||
EnAm_TakeDamage(this, globalCtx);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void EnAm_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnAm* this = THIS;
|
||||
s32 pad;
|
||||
|
||||
if (EnAm_UpdateDamage(this, globalCtx) == false) {
|
||||
if (this->enemyCollider.base.atFlags & AT_BOUNCED) {
|
||||
this->enemyCollider.base.atFlags &= ~(AT_BOUNCED | AT_HIT);
|
||||
if (this->actor.colChkInfo.health == 0) {
|
||||
this->actor.world.rot.y = this->actor.yawTowardsPlayer + 0x8000;
|
||||
} else {
|
||||
func_808B0AD0(this, globalCtx);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (this->returnHomeTimer != 0) {
|
||||
this->returnHomeTimer--;
|
||||
}
|
||||
this->actionFunc(this, globalCtx);
|
||||
Actor_MoveWithGravity(&this->actor);
|
||||
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 30.0f, 30.0f, 100.0f, 0x1D);
|
||||
Actor_SetFocus(&this->actor, 64.0f);
|
||||
Collider_UpdateCylinder(&this->actor, &this->enemyCollider);
|
||||
Collider_UpdateCylinder(&this->actor, &this->interactCollider);
|
||||
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->enemyCollider.base);
|
||||
if (this->enemyCollider.base.acFlags & AC_ON) {
|
||||
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->enemyCollider.base);
|
||||
}
|
||||
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->interactCollider.base);
|
||||
if (this->enemyCollider.base.atFlags & AC_ON) {
|
||||
this->actor.flags |= ACTOR_FLAG_1000000;
|
||||
CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->enemyCollider.base);
|
||||
}
|
||||
Math_StepToF(&this->effectAlpha, 0.0f, 0.05f);
|
||||
this->effectScale = (this->effectAlpha + 1.0f) * 0.35f;
|
||||
this->effectScale = (this->effectScale > 0.7f) ? 0.7f : this->effectScale;
|
||||
}
|
||||
|
||||
void EnAm_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
|
||||
s32 i;
|
||||
s32 phi_s3;
|
||||
Vec3f* phi_s1;
|
||||
Vec3f* phi_s2;
|
||||
EnAm* this = THIS;
|
||||
|
||||
phi_s2 = 0;
|
||||
phi_s1 = 0;
|
||||
if (limbIndex == 4) {
|
||||
phi_s2 = &this->limbPos[0];
|
||||
phi_s1 = D_808B1128;
|
||||
phi_s3 = 5;
|
||||
} else if (limbIndex == 13) {
|
||||
phi_s2 = &this->limbPos[9];
|
||||
phi_s1 = D_808B117C;
|
||||
phi_s3 = 4;
|
||||
} else if ((limbIndex == 7) || (limbIndex == 10)) {
|
||||
phi_s2 = (limbIndex == 7) ? &this->limbPos[5] : &this->limbPos[7];
|
||||
phi_s1 = D_808B1164;
|
||||
phi_s3 = 2;
|
||||
} else {
|
||||
phi_s3 = 0;
|
||||
}
|
||||
for (i = 0; i < phi_s3; i++, phi_s2++, phi_s1++) {
|
||||
Matrix_MultiplyVector3fByState(phi_s1, phi_s2);
|
||||
}
|
||||
}
|
||||
|
||||
void EnAm_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
Gfx* gfx;
|
||||
EnAm* this = THIS;
|
||||
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx);
|
||||
gfx = POLY_OPA_DISP;
|
||||
gSPDisplayList(&gfx[0], &sSetupDL[6 * 25]);
|
||||
gDPSetEnvColor(&gfx[1], 0, 0, 0, this->textureBlend);
|
||||
POLY_OPA_DISP = &gfx[2];
|
||||
SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, EnAm_PostLimbDraw,
|
||||
&this->actor);
|
||||
func_800BE680(globalCtx, &this->actor, this->limbPos, 13, this->effectScale, 0.0f, this->effectAlpha, 20);
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#define Z_EN_AM_H
|
||||
|
||||
#include "global.h"
|
||||
#include "objects/object_am/object_am.h"
|
||||
|
||||
struct EnAm;
|
||||
|
||||
|
|
@ -9,9 +10,21 @@ typedef void (*EnAmActionFunc)(struct EnAm*, GlobalContext*);
|
|||
|
||||
typedef struct EnAm {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x0144 */ char unk_144[0xEC];
|
||||
/* 0x0144 */ SkelAnime skelAnime;
|
||||
/* 0x0188 */ Vec3s jointTable[OBJECT_AM_LIMB_MAX];
|
||||
/* 0x01DC */ Vec3s morphTable[OBJECT_AM_LIMB_MAX];
|
||||
/* 0x0230 */ EnAmActionFunc actionFunc;
|
||||
/* 0x0234 */ char unk_234[0x14C];
|
||||
/* 0x0234 */ u8 textureBlend; // 0 = statue textures; 255 = enemy textures
|
||||
/* 0x0236 */ s16 explodeTimer; // timer counting down till armos explodes
|
||||
/* 0x0238 */ s16 returnHomeTimer; // Timer that counts down till an armos will return to its spawn position
|
||||
/* 0x023A */ s16 unkFlag;
|
||||
/* 0x023C */ s16 armosYaw; // Yaw of Armos
|
||||
/* 0x0240 */ f32 speed; // Hopping speed of Armos
|
||||
/* 0x0244 */ f32 effectAlpha;
|
||||
/* 0x0248 */ f32 effectScale;
|
||||
/* 0x024C */ Vec3f limbPos[13];
|
||||
/* 0x02E8 */ ColliderCylinder enemyCollider; // Collider for when Armos is Hostile
|
||||
/* 0x0334 */ ColliderCylinder interactCollider; // Collider for when an interactable Armos is docile
|
||||
} EnAm; // size = 0x380
|
||||
|
||||
extern const ActorInit En_Am_InitVars;
|
||||
|
|
|
|||
|
|
@ -5873,11 +5873,11 @@
|
|||
0x808AF8F8:("EnBombf_Draw",),
|
||||
0x808AFCD0:("EnAm_Init",),
|
||||
0x808AFDF8:("EnAm_Destroy",),
|
||||
0x808AFE38:("func_808AFE38",),
|
||||
0x808AFE38:("EnAm_SpawnEffects",),
|
||||
0x808AFF9C:("func_808AFF9C",),
|
||||
0x808B0040:("func_808B0040",),
|
||||
0x808B00D8:("func_808B00D8",),
|
||||
0x808B0124:("func_808B0124",),
|
||||
0x808B0040:("EnAm_RemoveEnemyTexture",),
|
||||
0x808B00D8:("EnAm_WakeUp",),
|
||||
0x808B0124:("EnAm_ApplyEnemyTexture",),
|
||||
0x808B0208:("func_808B0208",),
|
||||
0x808B0358:("func_808B0358",),
|
||||
0x808B03C0:("func_808B03C0",),
|
||||
|
|
@ -5889,15 +5889,15 @@
|
|||
0x808B05C8:("func_808B05C8",),
|
||||
0x808B0640:("func_808B0640",),
|
||||
0x808B066C:("func_808B066C",),
|
||||
0x808B06D0:("func_808B06D0",),
|
||||
0x808B06D0:("EnAm_TakeDamage",),
|
||||
0x808B07A8:("func_808B07A8",),
|
||||
0x808B0820:("func_808B0820",),
|
||||
0x808B0894:("func_808B0894",),
|
||||
0x808B0AD0:("func_808B0AD0",),
|
||||
0x808B0B4C:("func_808B0B4C",),
|
||||
0x808B0B9C:("func_808B0B9C",),
|
||||
0x808B0B9C:("EnAm_UpdateDamage",),
|
||||
0x808B0CC8:("EnAm_Update",),
|
||||
0x808B0EA4:("func_808B0EA4",),
|
||||
0x808B0EA4:("EnAm_PostLimbDraw",),
|
||||
0x808B0F98:("EnAm_Draw",),
|
||||
0x808B1330:("EnDekubaba_Init",),
|
||||
0x808B1504:("EnDekubaba_Destroy",),
|
||||
|
|
|
|||
|
|
@ -1162,13 +1162,6 @@ D_06009E70 = 0x06009E70;
|
|||
|
||||
D_0600A0D8 = 0x0600A0D8;
|
||||
|
||||
// ovl_En_Am
|
||||
|
||||
D_06000238 = 0x06000238;
|
||||
D_0600033C = 0x0600033C;
|
||||
D_06005948 = 0x06005948;
|
||||
D_06005B3C = 0x06005B3C;
|
||||
|
||||
// ovl_En_An
|
||||
|
||||
D_06000308 = 0x06000308;
|
||||
|
|
|
|||
Loading…
Reference in New Issue