mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-10 04:53:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

EnNeoReeba OK and documented, object_rb mostly doc'd (#750)

Browse Source 
* match some functions

* finish decompiling

* mostly document except some dmgeffs

* Document object_rb

* update functions.txt, damagetable

* remove number comments

* suggestions

* format and fix enum names

* comment object_rb.xml
This commit is contained in:
LtPeriwinkle
2022-03-29 11:12:35 -07:00
committed by GitHub
parent 941f3e6949
commit afec1c56a6
5 changed files with 768 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c
+679 -76
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_neo_reeba.h"
#include "objects/object_rb/object_rb.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_4 | ACTOR_FLAG_200)
@@ -15,7 +16,26 @@ void EnNeoReeba_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnNeoReeba_Update(Actor* thisx, GlobalContext* globalCtx);
void EnNeoReeba_Draw(Actor* thisx, GlobalContext* globalCtx);
#if 0
void EnNeoReeba_SetupWaitUnderground(EnNeoReeba* this);
void EnNeoReeba_WaitUnderground(EnNeoReeba* this, GlobalContext* globalCtx);
void EnNeoReeba_ChooseAction(EnNeoReeba* this, GlobalContext* globalCtx);
void EnNeoReeba_SetupSink(EnNeoReeba* this);
void EnNeoReeba_Sink(EnNeoReeba* this, GlobalContext* globalCtx);
void EnNeoReeba_SetupRise(EnNeoReeba* this);
void EnNeoReeba_RiseOutOfGround(EnNeoReeba* this, GlobalContext* globalCtx);
void EnNeoReeba_SetupMove(EnNeoReeba* this);
void EnNeoReeba_Move(EnNeoReeba* this, GlobalContext* globalCtx);
void EnNeoReeba_SetupReturnHome(EnNeoReeba* this);
void EnNeoReeba_ReturnHome(EnNeoReeba* this, GlobalContext* globalCtx);
void EnNeoReeba_Bounce(EnNeoReeba* this, GlobalContext* globalCtx);
void EnNeoReeba_Stunned(EnNeoReeba* this, GlobalContext* globalCtx);
void EnNeoReeba_Frozen(EnNeoReeba* this, GlobalContext* globalCtx);
void EnNeoReeba_SetupDamageAnim(EnNeoReeba* this);
void EnNeoReeba_DamageAnim(EnNeoReeba* this, GlobalContext* globalCtx);
void EnNeoReeba_SetupDeathEffects(EnNeoReeba* this);
void EnNeoReeba_PlayDeathEffects(EnNeoReeba* this, GlobalContext* globalCtx);
void EnNeoReeba_SpawnIce(EnNeoReeba* this, GlobalContext* globalCtx);
const ActorInit En_Neo_Reeba_InitVars = {
ACTOR_EN_NEO_REEBA,
ACTORCAT_ENEMY,
@@ -28,118 +48,701 @@ const ActorInit En_Neo_Reeba_InitVars = {
(ActorFunc)EnNeoReeba_Draw,
};
// static DamageTable sDamageTable = {
static DamageTable D_80B7E500 = {
/* Deku Nut */ DMG_ENTRY(0, 0x0),
/* Deku Stick */ DMG_ENTRY(1, 0xE),
/* Horse trample */ DMG_ENTRY(1, 0xF),
/* Explosives */ DMG_ENTRY(1, 0xF),
/* Zora boomerang */ DMG_ENTRY(1, 0xE),
/* Normal arrow */ DMG_ENTRY(1, 0xE),
/* UNK_DMG_0x06 */ DMG_ENTRY(1, 0xF),
/* Hookshot */ DMG_ENTRY(0, 0xC),
/* Goron punch */ DMG_ENTRY(1, 0xF),
/* Sword */ DMG_ENTRY(1, 0xF),
/* Goron pound */ DMG_ENTRY(1, 0xF),
/* Fire arrow */ DMG_ENTRY(2, 0x2),
/* Ice arrow */ DMG_ENTRY(2, 0x3),
/* Light arrow */ DMG_ENTRY(2, 0x4),
/* Goron spikes */ DMG_ENTRY(1, 0xF),
/* Deku spin */ DMG_ENTRY(0, 0x1),
/* Deku bubble */ DMG_ENTRY(1, 0xE),
/* Deku launch */ DMG_ENTRY(2, 0xF),
/* UNK_DMG_0x12 */ DMG_ENTRY(0, 0x0),
/* Zora barrier */ DMG_ENTRY(0, 0xD),
/* Normal shield */ DMG_ENTRY(0, 0x0),
/* Light ray */ DMG_ENTRY(0, 0x0),
/* Thrown object */ DMG_ENTRY(1, 0xF),
/* Zora punch */ DMG_ENTRY(1, 0xF),
/* Spin attack */ DMG_ENTRY(1, 0xF),
/* Sword beam */ DMG_ENTRY(0, 0x0),
/* Normal Roll */ DMG_ENTRY(0, 0x0),
/* UNK_DMG_0x1B */ DMG_ENTRY(0, 0x0),
/* UNK_DMG_0x1C */ DMG_ENTRY(0, 0x0),
/* Unblockable */ DMG_ENTRY(0, 0x0),
/* UNK_DMG_0x1E */ DMG_ENTRY(0, 0x0),
/* Powder Keg */ DMG_ENTRY(1, 0xF),
typedef enum {
/* 0x0 */ EN_NEO_REEBA_DMGEFF_IMMUNE, // No effect on the leever
/* 0x1 */ EN_NEO_REEBA_DMGEFF_STUN, // Turns blue, frozen in place
/* 0x2 */ EN_NEO_REEBA_DMGEFF_FIRE,
/* 0x3 */ EN_NEO_REEBA_DMGEFF_FREEZE, // Ice effects, frozen in place
/* 0x4 */ EN_NEO_REEBA_DMGEFF_LIGHT,
/* 0xC */ EN_NEO_REEBA_DMGEFF_HOOKSHOT = 0xC, // No damage, used only for hookshot
/* 0xD */ EN_NEO_REEBA_DMGEFF_ELECTRIC_STUN, // Electric effects, frozen in place
/* 0xE */ EN_NEO_REEBA_DMGEFF_NONE, // Normal hit
/* 0xF */ EN_NEO_REEBA_DMGEFF_SHATTER, // Normal hit that can break ice if leever is frozen
} EnNeoReebaDamageEffect;
static DamageTable sDamageTable = {
/* Deku Nut */ DMG_ENTRY(0, EN_NEO_REEBA_DMGEFF_IMMUNE),
/* Deku Stick */ DMG_ENTRY(1, EN_NEO_REEBA_DMGEFF_NONE),
/* Horse trample */ DMG_ENTRY(1, EN_NEO_REEBA_DMGEFF_SHATTER),
/* Explosives */ DMG_ENTRY(1, EN_NEO_REEBA_DMGEFF_SHATTER),
/* Zora boomerang */ DMG_ENTRY(1, EN_NEO_REEBA_DMGEFF_NONE),
/* Normal arrow */ DMG_ENTRY(1, EN_NEO_REEBA_DMGEFF_NONE),
/* UNK_DMG_0x06 */ DMG_ENTRY(1, EN_NEO_REEBA_DMGEFF_SHATTER),
/* Hookshot */ DMG_ENTRY(0, EN_NEO_REEBA_DMGEFF_HOOKSHOT),
/* Goron punch */ DMG_ENTRY(1, EN_NEO_REEBA_DMGEFF_SHATTER),
/* Sword */ DMG_ENTRY(1, EN_NEO_REEBA_DMGEFF_SHATTER),
/* Goron pound */ DMG_ENTRY(1, EN_NEO_REEBA_DMGEFF_SHATTER),
/* Fire arrow */ DMG_ENTRY(2, EN_NEO_REEBA_DMGEFF_FIRE),
/* Ice arrow */ DMG_ENTRY(2, EN_NEO_REEBA_DMGEFF_FREEZE),
/* Light arrow */ DMG_ENTRY(2, EN_NEO_REEBA_DMGEFF_LIGHT),
/* Goron spikes */ DMG_ENTRY(1, EN_NEO_REEBA_DMGEFF_SHATTER),
/* Deku spin */ DMG_ENTRY(0, EN_NEO_REEBA_DMGEFF_STUN),
/* Deku bubble */ DMG_ENTRY(1, EN_NEO_REEBA_DMGEFF_NONE),
/* Deku launch */ DMG_ENTRY(2, EN_NEO_REEBA_DMGEFF_SHATTER),
/* UNK_DMG_0x12 */ DMG_ENTRY(0, EN_NEO_REEBA_DMGEFF_IMMUNE),
/* Zora barrier */ DMG_ENTRY(0, EN_NEO_REEBA_DMGEFF_ELECTRIC_STUN),
/* Normal shield */ DMG_ENTRY(0, EN_NEO_REEBA_DMGEFF_IMMUNE),
/* Light ray */ DMG_ENTRY(0, EN_NEO_REEBA_DMGEFF_IMMUNE),
/* Thrown object */ DMG_ENTRY(1, EN_NEO_REEBA_DMGEFF_SHATTER),
/* Zora punch */ DMG_ENTRY(1, EN_NEO_REEBA_DMGEFF_SHATTER),
/* Spin attack */ DMG_ENTRY(1, EN_NEO_REEBA_DMGEFF_SHATTER),
/* Sword beam */ DMG_ENTRY(0, EN_NEO_REEBA_DMGEFF_IMMUNE),
/* Normal Roll */ DMG_ENTRY(0, EN_NEO_REEBA_DMGEFF_IMMUNE),
/* UNK_DMG_0x1B */ DMG_ENTRY(0, EN_NEO_REEBA_DMGEFF_IMMUNE),
/* UNK_DMG_0x1C */ DMG_ENTRY(0, EN_NEO_REEBA_DMGEFF_IMMUNE),
/* Unblockable */ DMG_ENTRY(0, EN_NEO_REEBA_DMGEFF_IMMUNE),
/* UNK_DMG_0x1E */ DMG_ENTRY(0, EN_NEO_REEBA_DMGEFF_IMMUNE),
/* Powder Keg */ DMG_ENTRY(1, EN_NEO_REEBA_DMGEFF_SHATTER),
};
// static ColliderCylinderInit sCylinderInit = {
static ColliderCylinderInit D_80B7E520 = {
{ COLTYPE_HIT5, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, },
{ ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x08, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON | BUMP_HOOKABLE, OCELEM_ON, },
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_HIT5,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
OC2_TYPE_1,
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
{ 0xF7CFFFFF, 0x08, 0x04 },
{ 0xF7CFFFFF, 0x00, 0x00 },
TOUCH_ON | TOUCH_SFX_NORMAL,
BUMP_ON | BUMP_HOOKABLE,
OCELEM_ON,
},
{ 18, 30, 0, { 0, 0, 0 } },
};
#endif
void EnNeoReeba_Init(Actor* thisx, GlobalContext* globalCtx) {
EnNeoReeba* this = THIS;
extern DamageTable D_80B7E500;
extern ColliderCylinderInit D_80B7E520;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 0.0f);
SkelAnime_Init(globalCtx, &this->skelAnime, &gLeeverSkel, &gLeeverSpinAnim, this->jointTable, this->morphTable,
LEEVER_LIMB_MAX);
extern UNK_TYPE D_060001E4;
if (!EN_NEO_REEBA_IS_LARGE(&this->actor)) {
Actor_SetScale(&this->actor, 0.04f);
this->actor.colChkInfo.mass = 90;
this->actor.colChkInfo.health = 1;
} else {
Actor_SetScale(&this->actor, 0.05f);
this->actor.colChkInfo.mass = 180;
this->actor.colChkInfo.health = 3;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/EnNeoReeba_Init.s")
this->actor.colChkInfo.damageTable = &sDamageTable;
this->actor.targetMode = 2;
this->actor.hintId = 0x47;
this->actor.gravity = -0.5f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/EnNeoReeba_Destroy.s")
this->targetPos = gZeroVec3f;
this->velToTarget = gZeroVec3f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7CA34.s")
this->rotationAngle = 0;
this->sfxTimer = 0;
this->stunTimer = 0;
this->actionTimer = 0;
this->sinkRiseRate = 0.0f;
this->rotationSpeed = 0.0f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7CA70.s")
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7CB3C.s")
EnNeoReeba_SetupWaitUnderground(this);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7CB88.s")
void EnNeoReeba_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnNeoReeba* this = THIS;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7CCE0.s")
Collider_DestroyCylinder(globalCtx, &this->collider);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7CD28.s")
void EnNeoReeba_SetupWaitUnderground(EnNeoReeba* this) {
this->actor.flags &= ~ACTOR_FLAG_1;
this->actor.draw = NULL;
this->actionTimer = 10;
this->actionFunc = EnNeoReeba_WaitUnderground;
this->actor.shape.yOffset = -2000.0f;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7CE34.s")
void EnNeoReeba_WaitUnderground(EnNeoReeba* this, GlobalContext* globalCtx) {
s32 pad;
Player* player = GET_PLAYER(globalCtx);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7CE94.s")
if ((Actor_XZDistanceToPoint(&player->actor, &this->actor.home.pos) < 200.0f) &&
(Player_GetMask(globalCtx) != PLAYER_MASK_STONE) && (fabsf(this->actor.playerHeightRel) < 100.0f)) {
EnNeoReeba_SetupRise(this);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7CFA0.s")
if (this->actionTimer == 0) {
this->actor.world.pos = this->actor.home.pos;
this->actionTimer = -1;
} else {
this->actionTimer--;
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7CFFC.s")
void EnNeoReeba_SetupChooseAction(EnNeoReeba* this) {
this->actor.shape.yOffset = 0.0f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7D130.s")
if (this->actionFunc == EnNeoReeba_Move) {
this->actionTimer = 20;
} else {
this->actionTimer = 10;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7D150.s")
this->actionFunc = EnNeoReeba_ChooseAction;
this->skelAnime.playSpeed = 1.0f;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7D254.s")
void EnNeoReeba_ChooseAction(EnNeoReeba* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
f32 distToPlayer = Actor_XZDistanceToPoint(&player->actor, &this->actor.home.pos);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7D2E4.s")
if ((distToPlayer > 200.0f) || (fabsf(this->actor.playerHeightRel) > 100.0f)) {
EnNeoReeba_SetupSink(this);
} else {
if (this->actionTimer == 0) {
if ((distToPlayer < 140.0f) && (fabsf(this->actor.playerHeightRel) < 100.0f)) {
this->targetPos = player->actor.world.pos;
this->targetPos.x += 10.0f * player->actor.speedXZ * Math_SinS(player->actor.world.rot.y);
this->targetPos.z += 10.0f * player->actor.speedXZ * Math_CosS(player->actor.world.rot.y);
EnNeoReeba_SetupMove(this);
} else {
EnNeoReeba_SetupReturnHome(this);
}
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7D360.s")
if (this->actionTimer != 0) {
this->actionTimer--;
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7D398.s")
void EnNeoReeba_SetupSink(EnNeoReeba* this) {
this->sinkRiseRate = 0.0f;
this->skelAnime.playSpeed = 2.0f;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_AKINDONUTS_HIDE);
this->actionFunc = EnNeoReeba_Sink;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7D3EC.s")
void EnNeoReeba_Sink(EnNeoReeba* this, GlobalContext* globalCtx) {
if (Math_SmoothStepToF(&this->actor.shape.yOffset, -2000.0f, 0.5f, this->sinkRiseRate, 10.0f) == 0.0f) {
EnNeoReeba_SetupWaitUnderground(this);
} else if (globalCtx->gameplayFrames % 4 == 0) {
Actor_SpawnFloorDustRing(globalCtx, &this->actor, &this->actor.world.pos, this->actor.shape.shadowScale, 1,
8.0f, 500, 10, 1);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7D47C.s")
if (this->sinkRiseRate < 300.0f) {
this->sinkRiseRate += 20.0f;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7D4FC.s")
Math_ApproachF(&this->actor.shape.shadowScale, 0.0f, 1.0f, 1.0f);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7D5A4.s")
void EnNeoReeba_SetupRise(EnNeoReeba* this) {
this->actor.draw = EnNeoReeba_Draw;
this->sinkRiseRate = 300.0f;
this->skelAnime.playSpeed = 2.0f;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKID_APPEAR);
this->actor.flags |= ACTOR_FLAG_1;
this->actionFunc = EnNeoReeba_RiseOutOfGround;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7D6D0.s")
void EnNeoReeba_RiseOutOfGround(EnNeoReeba* this, GlobalContext* globalCtx) {
if (Math_SmoothStepToF(&this->actor.shape.yOffset, 0.0f, 0.5f, this->sinkRiseRate, 10.0f) == 0.0f) {
EnNeoReeba_SetupChooseAction(this);
} else if (globalCtx->gameplayFrames % 4 == 0) {
Actor_SpawnFloorDustRing(globalCtx, &this->actor, &this->actor.world.pos, this->actor.shape.shadowScale, 1,
8.0f, 500, 10, 1);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7D788.s")
if (this->sinkRiseRate > 20.0f) {
this->sinkRiseRate -= 10.0f;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7D9B8.s")
Math_ApproachF(&this->actor.shape.shadowScale, 12.0f, 1.0f, 1.0f);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7DC80.s")
void EnNeoReeba_SetupMove(EnNeoReeba* this) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIVA_MOVE);
this->sfxTimer = 10;
this->actionTimer = 60;
this->actionFunc = EnNeoReeba_Move;
this->skelAnime.playSpeed = 2.0f;
this->actor.speedXZ = 14.0f;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7DD7C.s")
void EnNeoReeba_Move(EnNeoReeba* this, GlobalContext* globalCtx) {
f32 remainingDist = Math_Vec3f_StepToXZ(&this->actor.world.pos, &this->targetPos, this->actor.speedXZ);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7DF34.s")
Actor_SpawnFloorDustRing(globalCtx, &this->actor, &this->actor.world.pos, this->actor.shape.shadowScale, 1, 4.0f,
0xFA, 0xA, 1);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7E0BC.s")
if (remainingDist < 2.0f) {
EnNeoReeba_SetupChooseAction(this);
} else if (remainingDist < 40.0f && this->actor.speedXZ > 3.0f) {
this->actor.speedXZ -= 2.0f;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7E260.s")
if (this->sfxTimer == 0) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIVA_MOVE);
this->sfxTimer = 10;
} else {
this->sfxTimer--;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/EnNeoReeba_Update.s")
if (this->actionTimer == 0) {
EnNeoReeba_SetupChooseAction(this);
} else {
this->actionTimer--;
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/func_80B7E378.s")
void EnNeoReeba_SetupReturnHome(EnNeoReeba* this) {
this->actionFunc = EnNeoReeba_ReturnHome;
this->actor.speedXZ = 6.0f;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Neo_Reeba/EnNeoReeba_Draw.s")
void EnNeoReeba_ReturnHome(EnNeoReeba* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
s32 pad;
f32 remainingDist = Math_Vec3f_StepToXZ(&this->actor.world.pos, &this->actor.home.pos, this->actor.speedXZ);
if (remainingDist < 2.0f) {
EnNeoReeba_SetupChooseAction(this);
} else if (remainingDist < 40.0f && this->actor.speedXZ > 3.0f) {
this->actor.speedXZ -= 1.0f;
}
if (Actor_XZDistanceToPoint(&player->actor, &this->actor.home.pos) > 200.0f ||
fabsf(this->actor.playerHeightRel) > 100.0f) {
EnNeoReeba_SetupSink(this);
}
}
void EnNeoReeba_SetupBounce(EnNeoReeba* this) {
this->actionTimer = 60;
this->targetPos = this->actor.world.pos;
this->targetPos.x -= 20.0f * Math_SinS(this->actor.yawTowardsPlayer);
this->targetPos.z -= 20.0f * Math_CosS(this->actor.yawTowardsPlayer);
this->actionFunc = EnNeoReeba_Bounce;
}
void EnNeoReeba_Bounce(EnNeoReeba* this, GlobalContext* globalCtx) {
if (Math_Vec3f_StepToXZ(&this->actor.world.pos, &this->targetPos, this->actor.speedXZ) < 2.0f) {
EnNeoReeba_SetupChooseAction(this);
}
if (this->actionTimer == 0) {
EnNeoReeba_SetupChooseAction(this);
} else {
this->actionTimer--;
}
}
void EnNeoReeba_SetupStun(EnNeoReeba* this) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE);
this->actionFunc = EnNeoReeba_Stunned;
}
void EnNeoReeba_Stunned(EnNeoReeba* this, GlobalContext* globalCtx) {
if (this->stunTimer > 0) {
this->stunTimer--;
} else {
this->drawEffectAlpha = 0.0f;
this->drawEffectScale = 0.0f;
}
if (this->actor.colorFilterTimer == 0) {
this->stunTimer = 0;
EnNeoReeba_SetupChooseAction(this);
}
}
void EnNeoReeba_SetupFrozen(EnNeoReeba* this) {
this->drawEffectType = ACTOR_DRAW_DMGEFF_FROZEN_SFX;
this->drawEffectScale = 0.5f;
this->drawEffectAlpha = 1.0f;
if (EN_NEO_REEBA_IS_LARGE(&this->actor)) {
this->drawEffectScale *= 1.5f;
}
if (this->actor.colChkInfo.health != 0) {
this->stunTimer = 80;
} else {
this->stunTimer = 12;
}
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_COMMON_FREEZE);
this->actionFunc = EnNeoReeba_Frozen;
}
void EnNeoReeba_Frozen(EnNeoReeba* this, GlobalContext* globalCtx) {
if (this->stunTimer == 0) {
this->stunTimer = 0;
this->drawEffectScale = 0.0f;
this->drawEffectAlpha = 0.0f;
if (this->actor.colChkInfo.health != 0) {
EnNeoReeba_SetupDamageAnim(this);
} else {
EnNeoReeba_SetupDeathEffects(this);
}
} else if (this->stunTimer == 1) {
this->stunTimer--;
EnNeoReeba_SpawnIce(this, globalCtx);
} else {
this->stunTimer--;
}
}
void EnNeoReeba_SetupDamageAnim(EnNeoReeba* this) {
this->actionTimer = 10;
this->skelAnime.playSpeed = 1.0f;
this->velToTarget.x = Math_SinS(this->actor.yawTowardsPlayer) * -12.0f;
this->velToTarget.z = Math_CosS(this->actor.yawTowardsPlayer) * -12.0f;
this->rotationSpeed = 4551.0f;
Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 25);
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIVA_DAMAGE);
this->actionFunc = EnNeoReeba_DamageAnim;
}
static f32 sDamageAnimXZScales[] = { 0.04, 0.04, 0.039, 0.042, 0.045, 0.043, 0.04, 0.035, 0.03, 0.033, 0.04 };
static f32 sDamageAnimYScales[] = { 0.04f, 0.04f, 0.041f, 0.038f, 0.035f, 0.037f, 0.04f, 0.045f, 0.05f, 0.047f, 0.04f };
void EnNeoReeba_DamageAnim(EnNeoReeba* this, GlobalContext* globalCtx) {
if (this->actionTimer == 0) {
this->rotationSpeed = 0.0f;
EnNeoReeba_SetupChooseAction(this);
} else {
this->rotationAngle -= 0x1F40;
Math_SmoothStepToF(&this->rotationSpeed, 0.0f, 0.5f, 182.0f, 18.0f);
this->actor.scale.x = this->actor.scale.z = sDamageAnimXZScales[this->actionTimer];
this->actor.scale.y = sDamageAnimYScales[this->actionTimer];
if (EN_NEO_REEBA_IS_LARGE(&this->actor)) {
this->actor.scale.x *= 1.5f;
this->actor.scale.y *= 1.5f;
this->actor.scale.z *= 1.5f;
}
Actor_SpawnFloorDustRing(globalCtx, &this->actor, &this->actor.world.pos, this->actor.shape.shadowScale, 1,
4.0f, 250, 10, 1);
this->actionTimer--;
}
}
void EnNeoReeba_SetupDeathEffects(EnNeoReeba* this) {
this->actionTimer = 10;
this->velToTarget.x = Math_SinS(this->actor.yawTowardsPlayer) * -12.0f;
this->velToTarget.z = Math_CosS(this->actor.yawTowardsPlayer) * -12.0f;
this->rotationSpeed = 3640.0f;
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 25);
this->actor.flags |= ACTOR_FLAG_8000000;
this->actor.flags &= ~ACTOR_FLAG_1;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIVA_DEAD);
this->actionFunc = EnNeoReeba_PlayDeathEffects;
}
void EnNeoReeba_PlayDeathEffects(EnNeoReeba* this, GlobalContext* globalCtx) {
static Vec3f sDeadDbVel = { 0.0f, 0.0f, 0.0f };
static Vec3f sDeadDbAccel = { 0.0f, 4.0f, 0.0f };
if (this->actionTimer == 0) {
Math_ApproachZeroF(&this->actor.scale.x, 0.1f, 0.01f);
Math_ApproachZeroF(&this->actor.scale.y, 0.1f, 0.01f);
Math_ApproachZeroF(&this->actor.scale.z, 0.1f, 0.01f);
Math_ApproachZeroF(&this->drawEffectAlpha, 0.1f, 0.1f);
Math_ApproachZeroF(&this->drawEffectScale, 0.1f, 0.1f);
if (this->actor.scale.x < 0.01f) {
func_800B3030(globalCtx, &this->actor.world.pos, &sDeadDbAccel, &sDeadDbVel, 120, 0, 0);
Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.world.pos, 0x60);
Actor_MarkForDeath(&this->actor);
}
} else {
if (this->actionTimer <= 10) {
this->rotationAngle -= 0x1388;
this->actor.scale.x = this->actor.scale.z = sDamageAnimXZScales[this->actionTimer];
this->actor.scale.y = sDamageAnimYScales[this->actionTimer];
if (EN_NEO_REEBA_IS_LARGE(&this->actor)) {
this->actor.scale.x *= 1.5f;
this->actor.scale.y *= 1.5f;
this->actor.scale.z *= 1.5f;
}
}
if (this->drawEffectType == ACTOR_DRAW_DMGEFF_FIRE) {
f32 target = 1.2f;
if (EN_NEO_REEBA_IS_LARGE(&this->actor)) {
target *= 1.5f;
}
Math_SmoothStepToF(&this->drawEffectScale, target, 0.5f, 0.3f, 0.0f);
} else {
f32 target = 1.6f;
if (EN_NEO_REEBA_IS_LARGE(&this->actor)) {
target *= 1.5f;
}
Math_SmoothStepToF(&this->drawEffectScale, target, 0.5f, 0.3f, 0.0f);
}
this->actionTimer--;
}
}
void EnNeoReeba_HandleHit(EnNeoReeba* this, GlobalContext* globalCtx) {
Actor_SetFocus(&this->actor, 20.0f);
if (this->collider.base.acFlags & AC_HIT) {
this->collider.base.acFlags &= ~AC_HIT;
if (this->actionFunc == EnNeoReeba_Frozen) {
switch (this->actor.colChkInfo.damageEffect) {
case EN_NEO_REEBA_DMGEFF_STUN:
case EN_NEO_REEBA_DMGEFF_FREEZE:
case EN_NEO_REEBA_DMGEFF_LIGHT:
case EN_NEO_REEBA_DMGEFF_ELECTRIC_STUN:
case EN_NEO_REEBA_DMGEFF_NONE:
return;
default:
if (this->stunTimer >= 2) {
EnNeoReeba_SpawnIce(this, globalCtx);
}
this->stunTimer = 0;
}
}
Actor_ApplyDamage(&this->actor);
switch (this->actor.colChkInfo.damageEffect) {
case EN_NEO_REEBA_DMGEFF_FREEZE:
EnNeoReeba_SetupFrozen(this);
break;
case EN_NEO_REEBA_DMGEFF_FIRE:
case EN_NEO_REEBA_DMGEFF_LIGHT:
if (this->actor.colChkInfo.damageEffect == EN_NEO_REEBA_DMGEFF_FIRE) {
this->drawEffectType = ACTOR_DRAW_DMGEFF_FIRE;
this->stunTimer = 80;
} else {
this->drawEffectType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS;
this->stunTimer = 40;
}
this->drawEffectAlpha = 1.0f;
this->drawEffectScale = 0.0f;
/* fallthrough */
case EN_NEO_REEBA_DMGEFF_NONE:
case EN_NEO_REEBA_DMGEFF_SHATTER:
if ((this->actor.colChkInfo.damageEffect == EN_NEO_REEBA_DMGEFF_SHATTER) ||
(this->actor.colChkInfo.damageEffect == EN_NEO_REEBA_DMGEFF_NONE)) {
this->stunTimer = 0;
}
if (this->actor.colChkInfo.health > 0) {
EnNeoReeba_SetupDamageAnim(this);
} else {
Enemy_StartFinishingBlow(globalCtx, &this->actor);
EnNeoReeba_SetupDeathEffects(this);
}
break;
case EN_NEO_REEBA_DMGEFF_ELECTRIC_STUN:
this->drawEffectType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_SMALL;
this->stunTimer = 40;
this->drawEffectAlpha = 1.0f;
this->drawEffectScale = 2.0f;
Actor_SetColorFilter(&this->actor, 0, 0x78, 0, 40);
EnNeoReeba_SetupStun(this);
break;
case EN_NEO_REEBA_DMGEFF_STUN:
Actor_SetColorFilter(&this->actor, 0, 0x78, 0, 40);
EnNeoReeba_SetupStun(this);
break;
}
} else {
if (((this->collider.base.ocFlags2 & OC2_HIT_PLAYER) || (this->collider.base.atFlags & AT_BOUNCED)) &&
(this->actionFunc == EnNeoReeba_Move)) {
EnNeoReeba_SetupBounce(this);
}
}
if ((this->actionFunc != EnNeoReeba_WaitUnderground) && (this->actionFunc != EnNeoReeba_Sink) &&
(this->actionFunc != EnNeoReeba_RiseOutOfGround) && (this->actionFunc != EnNeoReeba_DamageAnim) &&
(this->actionFunc != EnNeoReeba_PlayDeathEffects)) {
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
if (this->actionFunc != EnNeoReeba_Stunned) {
CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
}
}
}
void EnNeoReeba_UpdatePosition(EnNeoReeba* this, GlobalContext* globalCtx) {
if ((this->actionFunc != EnNeoReeba_WaitUnderground) && (this->actionFunc != EnNeoReeba_Sink) &&
(this->actionFunc != EnNeoReeba_RiseOutOfGround)) {
this->actor.velocity.y += this->actor.gravity;
this->actor.world.pos.y += this->actor.velocity.y;
this->actor.world.pos.x += this->actor.colChkInfo.displacement.x;
this->actor.world.pos.z += this->actor.colChkInfo.displacement.z;
this->actor.world.pos.x += this->velToTarget.x;
this->actor.world.pos.z += this->velToTarget.z;
Math_ApproachZeroF(&this->velToTarget.x, 1.0f, 2.0f);
Math_ApproachZeroF(&this->velToTarget.z, 1.0f, 2.0f);
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 10.0f, 40.0f, 40.0f, 5);
}
}
void EnNeoReeba_DrawFrozenEffects(EnNeoReeba* this, GlobalContext* globalCtx) {
s32 i;
f32 limbPosScale = 10.0f;
f32 phi_f2 = 20.0f;
f32 drawEffectScale = 0.8f;
if (EN_NEO_REEBA_IS_LARGE(&this->actor)) {
limbPosScale *= 1.5f;
phi_f2 *= 1.5f;
drawEffectScale *= 1.5f;
}
for (i = 0; i < ARRAY_COUNT(this->limbPos) - 1; i++) {
this->limbPos[i] = this->actor.world.pos;
this->limbPos[i].x += limbPosScale * Math_SinS(BINANG_ADD(this->actor.shape.rot.y, i * 0x5555));
this->limbPos[i].z += limbPosScale * Math_CosS(BINANG_ADD(this->actor.shape.rot.y, i * 0x5555));
this->limbPos[i].y += 5.0f;
}
this->limbPos[ARRAY_COUNT(this->limbPos) - 1] = this->actor.world.pos;
this->limbPos[ARRAY_COUNT(this->limbPos) - 1].y += phi_f2;
this->drawEffectScale = drawEffectScale;
Actor_DrawDamageEffects(globalCtx, &this->actor, this->limbPos, ARRAY_COUNT(this->limbPos), drawEffectScale, 0.5f,
this->drawEffectAlpha, this->drawEffectType);
}
void EnNeoReeba_DrawEffects(EnNeoReeba* this, GlobalContext* globalCtx) {
s32 i;
f32 scale = 15.0f;
if (EN_NEO_REEBA_IS_LARGE(&this->actor)) {
scale *= 1.5f;
}
if ((this->drawEffectType == ACTOR_DRAW_DMGEFF_FIRE) || (this->drawEffectType == ACTOR_DRAW_DMGEFF_LIGHT_ORBS) ||
(this->drawEffectType == ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_SMALL)) {
for (i = 0; i < ARRAY_COUNT(this->limbPos) - 1; i++) {
this->limbPos[i] = this->actor.world.pos;
this->limbPos[i].x += scale * Math_SinS(BINANG_ADD(this->actor.shape.rot.y, i * 0x5555));
this->limbPos[i].z += scale * Math_CosS(BINANG_ADD(this->actor.shape.rot.y, i * 0x5555));
this->limbPos[i].y += -20.0f;
}
this->limbPos[ARRAY_COUNT(this->limbPos) - 1] = this->actor.world.pos;
Actor_DrawDamageEffects(globalCtx, NULL, this->limbPos, ARRAY_COUNT(this->limbPos), this->drawEffectScale, 0.5f,
this->drawEffectAlpha, this->drawEffectType);
}
}
void EnNeoReeba_SpawnIce(EnNeoReeba* this, GlobalContext* globalCtx) {
static Color_RGBA8 sIcePrimColor = { 170, 255, 255, 255 };
static Color_RGBA8 sIceEnvColor = { 200, 200, 255, 255 };
static Vec3f sIceAccel = { 0.0f, -1.0f, 0.0f };
Vec3f iceVel;
f32 xVel;
f32 zVel;
s32 i;
s16 yaw;
s32 j;
SoundSource_PlaySfxAtFixedWorldPos(globalCtx, &this->actor.world.pos, 30, NA_SE_EV_ICE_BROKEN);
for (i = 0; i < ARRAY_COUNT(this->limbPos); i++) {
yaw = Math_Vec3f_Yaw(&this->actor.world.pos, &this->limbPos[i]);
xVel = Math_SinS(yaw) * 3.0f;
zVel = Math_CosS(yaw) * 3.0f;
for (j = 0; j < 4; j++) {
iceVel.x = (Rand_Centered() * 3.0f) + xVel;
iceVel.z = (Rand_Centered() * 3.0f) + zVel;
iceVel.y = (Rand_ZeroOne() * 6.0f) + 4.0f;
EffectSsEnIce_Spawn(globalCtx, &this->limbPos[i], 0.7f, &iceVel, &sIceAccel, &sIcePrimColor, &sIceEnvColor,
30);
}
}
}
void EnNeoReeba_SinkIfStoneMask(EnNeoReeba* this, GlobalContext* globalCtx) {
if ((this->actionFunc == EnNeoReeba_ChooseAction) || (this->actionFunc == EnNeoReeba_Move) ||
(this->actionFunc == EnNeoReeba_ReturnHome)) {
if (Player_GetMask(globalCtx) == PLAYER_MASK_STONE) {
EnNeoReeba_SetupSink(this);
}
}
}
void EnNeoReeba_Update(Actor* thisx, GlobalContext* globalCtx) {
EnNeoReeba* this = THIS;
if (EN_NEO_REEBA_IS_LARGE(&this->actor)) {
this->collider.dim.radius = 27;
this->collider.dim.height = 45;
}
this->actionFunc(this, globalCtx);
if ((this->actionFunc != EnNeoReeba_WaitUnderground) && (this->actionFunc != EnNeoReeba_Stunned) &&
(this->actionFunc != EnNeoReeba_Frozen)) {
SkelAnime_Update(&this->skelAnime);
}
EnNeoReeba_HandleHit(this, globalCtx);
EnNeoReeba_UpdatePosition(this, globalCtx);
EnNeoReeba_SinkIfStoneMask(this, globalCtx);
}
s32 EnNeoReeba_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
Actor* thisx) {
EnNeoReeba* this = THIS;
if ((limbIndex == OBJECT_RB_LIMB_03) && (this->rotationSpeed != 0.0f)) {
rot->y += (s16)(this->rotationSpeed * Math_SinS(this->rotationAngle));
rot->z += (s16)(this->rotationSpeed * Math_CosS(this->rotationAngle));
}
return false;
}
void EnNeoReeba_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnNeoReeba* this = THIS;
func_8012C28C(globalCtx->state.gfxCtx);
OPEN_DISPS(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0x01, 255, 255, 255, 255);
SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnNeoReeba_OverrideLimbDraw,
NULL, &this->actor);
CLOSE_DISPS(globalCtx->state.gfxCtx);
if (this->stunTimer > 0) {
if (this->drawEffectType == ACTOR_DRAW_DMGEFF_FROZEN_SFX) {
EnNeoReeba_DrawFrozenEffects(this, globalCtx);
} else {
EnNeoReeba_DrawEffects(this, globalCtx);
}
}
}
src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h
+21 -4
View File
@@ -2,16 +2,33 @@
#define Z_EN_NEO_REEBA_H
#include "global.h"
#include "objects/object_rb/object_rb.h"
#define EN_NEO_REEBA_IS_LARGE(thisx) ((thisx)->params & 0x8000)
struct EnNeoReeba;
typedef void (*EnNeoReebaActionFunc)(struct EnNeoReeba*, GlobalContext*);
typedef struct EnNeoReeba {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x168];
/* 0x02AC */ EnNeoReebaActionFunc actionFunc;
/* 0x02B0 */ char unk_2B0[0x64];
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ ColliderCylinder collider;
/* 0x1D4 */ Vec3s jointTable[LEEVER_LIMB_MAX];
/* 0x240 */ Vec3s morphTable[LEEVER_LIMB_MAX];
/* 0x2AC */ EnNeoReebaActionFunc actionFunc;
/* 0x2B0 */ Vec3f targetPos;
/* 0x2BC */ Vec3f velToTarget;
/* 0x2C8 */ Vec3f limbPos[4];
/* 0x2F8 */ f32 sinkRiseRate;
/* 0x2FC */ f32 rotationSpeed;
/* 0x300 */ f32 drawEffectAlpha;
/* 0x304 */ f32 drawEffectScale;
/* 0x308 */ s16 rotationAngle;
/* 0x30A */ s16 actionTimer;
/* 0x30C */ s16 sfxTimer;
/* 0x30E */ s16 stunTimer;
/* 0x310 */ u8 drawEffectType;
} EnNeoReeba; // size = 0x314
extern const ActorInit En_Neo_Reeba_InitVars;