mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-02 01:52:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

[cc0 oot] Biri (#2794)

Browse Source 
* [cc0 oot] Biri

* name biri anims (by usage, Z64Utils cant preview them)

* fixup bari/biri mixup

* EnBili cleanup

* biri cleanup

* biri: merge var ini with decl
This commit is contained in:
Dragorn421
2026-08-31 18:03:49 +02:00
committed by GitHub
parent aceaa1325d
commit 1e2bd9e46a
5 changed files with 297 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_bl.xml
+19 -28
View File
@@ -1,42 +1,33 @@
<Root>
<File Name="object_bl" Segment="6">
<!-- Biri Animations -->
<Animation Name="gBiriDischargeLightningAnim" Offset="0x24"/>
<Animation Name="gBiriClimbAnim" Offset="0x64"/>
<Animation Name="gBiriDefaultAnim" Offset="0xA4"/><!-- Used in various states, not just as an idle -->
<!-- Vertices -->
<Animation Name="gBiriElectrifyAnim" Offset="0x24"/>
<Animation Name="gBiriAscendAwayAnim" Offset="0x64"/>
<Animation Name="gBiriMainAnim" Offset="0xA4"/>
<Array Name="gBiriTentaclesVtx" Count="4" Offset="0xC0">
<Vtx/>
</Array>
<Array Name="gBiriInnerHoodVtx" Count="14" Offset="0x100">
<Array Name="gBiriCoreVtx" Count="14" Offset="0x100">
<Vtx/>
</Array>
<Array Name="gBiriOuterHoodVtx" Count="29" Offset="0x1E0">
<Array Name="gBiriHoodVtx" Count="29" Offset="0x1E0">
<Vtx/>
</Array>
<!-- Biri DLists -->
<DList Name="gBiriTentaclesDL" Offset="0x3B0"/>
<DList Name="gBiriInnerHoodDL" Offset="0x448"/>
<DList Name="gBiriOuterHoodDL" Offset="0x530"/>
<!-- Biri Textures -->
<Texture Name="gBiriOuterHoodTex" Format="ia16" Width="16" Height="64" Offset="0x608"/>
<Texture Name="gBiriTentacles0Tex" Format="ia8" Width="48" Height="48" Offset="0xE08"/>
<Texture Name="gBiriTentacles1Tex" Format="ia8" Width="48" Height="48" Offset="0x1708"/>
<Texture Name="gBiriTentacles2Tex" Format="ia8" Width="48" Height="48" Offset="0x2008"/>
<Texture Name="gBiriTentacles3Tex" Format="ia8" Width="48" Height="48" Offset="0x2908"/>
<Texture Name="gBiriTentacles4Tex" Format="ia8" Width="48" Height="48" Offset="0x3208"/>
<Texture Name="gBiriTentacles5Tex" Format="ia8" Width="48" Height="48" Offset="0x3B08"/>
<Texture Name="gBiriTentacles6Tex" Format="ia8" Width="48" Height="48" Offset="0x4408"/>
<Texture Name="gBiriTentacles7Tex" Format="ia8" Width="48" Height="48" Offset="0x4D08"/>
<Texture Name="gBiriInnerHoodTex" Format="ia16" Width="16" Height="16" Offset="0x5608"/>
<!-- Biri Limbs and Skeleton -->
<DList Name="gBiriCoreDL" Offset="0x448"/>
<DList Name="gBiriHoodDL" Offset="0x530"/>
<Texture Name="gBiriHoodTex" Format="ia16" Width="16" Height="64" Offset="0x608"/>
<Texture Name="gBiriTentacle0Tex" Format="ia8" Width="48" Height="48" Offset="0xE08"/>
<Texture Name="gBiriTentacle1Tex" Format="ia8" Width="48" Height="48" Offset="0x1708"/>
<Texture Name="gBiriTentacle2Tex" Format="ia8" Width="48" Height="48" Offset="0x2008"/>
<Texture Name="gBiriTentacle3Tex" Format="ia8" Width="48" Height="48" Offset="0x2908"/>
<Texture Name="gBiriTentacle4Tex" Format="ia8" Width="48" Height="48" Offset="0x3208"/>
<Texture Name="gBiriTentacle5Tex" Format="ia8" Width="48" Height="48" Offset="0x3B08"/>
<Texture Name="gBiriTentacle6Tex" Format="ia8" Width="48" Height="48" Offset="0x4408"/>
<Texture Name="gBiriTentacle7Tex" Format="ia8" Width="48" Height="48" Offset="0x4D08"/>
<Texture Name="gBiriCoreTex" Format="ia16" Width="16" Height="16" Offset="0x5608"/>
<Limb Name="gBiriRootLimb" LimbType="Standard" EnumName="BIRI_LIMB_ROOT" Offset="0x5808"/>
<Limb Name="gBiriInnerHoodLimb" LimbType="Standard" EnumName="BIRI_LIMB_INNER_HOOD" Offset="0x5814"/>
<Limb Name="gBiriOuterHoodLimb" LimbType="Standard" EnumName="BIRI_LIMB_OUTER_HOOD" Offset="0x5820"/>
<Limb Name="gBiriCoreLimb" LimbType="Standard" EnumName="BIRI_LIMB_CORE" Offset="0x5814"/>
<Limb Name="gBiriHoodLimb" LimbType="Standard" EnumName="BIRI_LIMB_HOOD" Offset="0x5820"/>
<Limb Name="gBiriTentaclesLimb" LimbType="Standard" EnumName="BIRI_LIMB_TENTACLES" Offset="0x582C"/>
<Skeleton Name="gBiriSkel" Type="Normal" LimbType="Standard" LimbNone="BIRI_LIMB_NONE" LimbMax="BIRI_LIMB_MAX" EnumName="BiriLimb" Offset="0x5848"/>
</File>
assets/xml/overlays/ovl_En_Bili.xml
+2 -3
View File
@@ -1,7 +1,6 @@
<Root>
<File Name="ovl_En_Bili">
<DList Name="D_809C16F0" Offset="0x0"/>
<DList Name="D_809C1700" Offset="0x10"/>
<DList Name="sBiriCoreInvertTexCombinerDL" Offset="0x0"/>
<DList Name="sBiriCoreNormalCombinerDL" Offset="0x10"/>
</File>
</Root>
src/overlays/actors/ovl_En_Bili/z_en_bili.c
+259 -345
View File
@@ -1,12 +1,7 @@
/*
* File: z_en_bili.c
* Overlay: ovl_En_Bili
* Description: Biri (small jellyfish-like enemy)
*/
#include "z_en_bili.h"
#include "libc64/qrand.h"
#include "array_count.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "ichain.h"
@@ -30,16 +25,16 @@ void EnBili_Destroy(Actor* thisx, PlayState* play);
void EnBili_Update(Actor* thisx, PlayState* play2);
void EnBili_Draw(Actor* thisx, PlayState* play);
void EnBili_SetupFloatIdle(EnBili* this);
void EnBili_SetupSpawnedFlyApart(EnBili* this);
void EnBili_FloatIdle(EnBili* this, PlayState* play);
void EnBili_SpawnedFlyApart(EnBili* this, PlayState* play);
void EnBili_DischargeLightning(EnBili* this, PlayState* play);
void EnBili_Climb(EnBili* this, PlayState* play);
void EnBili_SetupIdle(EnBili* this);
void EnBili_SetupSpawnedByBari(EnBili* this);
void EnBili_Idle(EnBili* this, PlayState* play);
void EnBili_SpawnedByBari(EnBili* this, PlayState* play);
void EnBili_Electrify(EnBili* this, PlayState* play);
void EnBili_AscendAway(EnBili* this, PlayState* play);
void EnBili_ApproachPlayer(EnBili* this, PlayState* play);
void EnBili_SetNewHomeHeight(EnBili* this, PlayState* play);
void EnBili_Recoil(EnBili* this, PlayState* play);
void EnBili_Burnt(EnBili* this, PlayState* play);
void EnBili_FleePlayer(EnBili* this, PlayState* play);
void EnBili_SlingshotKnockback(EnBili* this, PlayState* play);
void EnBili_Damaged(EnBili* this, PlayState* play);
void EnBili_Die(EnBili* this, PlayState* play);
void EnBili_Stunned(EnBili* this, PlayState* play);
void EnBili_Frozen(EnBili* this, PlayState* play);
@@ -78,50 +73,49 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 1, 9, 28, -20, 30 };
typedef enum BiriDamageReaction {
/* 0x0 */ BIRI_DMG_REACT_NONE,
/* 0x1 */ BIRI_DMG_REACT_DEKUNUT,
/* 0x2 */ BIRI_DMG_REACT_FIRE,
/* 0x3 */ BIRI_DMG_REACT_ICE,
/* 0xE */ BIRI_DMG_REACT_SLINGSHOT = 0xE,
/* 0xF */ BIRI_DMG_REACT_SWORD
} BiriDamageReaction;
typedef enum EnBiliDamageReaction {
EN_BILI_DMG_REACT_NONE,
EN_BILI_DMG_REACT_STUN,
EN_BILI_DMG_REACT_FIRE,
EN_BILI_DMG_REACT_ICE,
EN_BILI_DMG_REACT_SLINGSHOT = 0xE,
EN_BILI_DMG_REACT_SWORD_SLASH
} EnBiliDamageReaction;
static DamageTable sDamageTable = {
/* Deku nut */ DMG_ENTRY(0, BIRI_DMG_REACT_DEKUNUT),
/* Deku stick */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
/* Slingshot */ DMG_ENTRY(0, BIRI_DMG_REACT_SLINGSHOT),
/* Explosive */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
/* Boomerang */ DMG_ENTRY(1, BIRI_DMG_REACT_NONE),
/* Normal arrow */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
/* Hammer swing */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
/* Hookshot */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
/* Kokiri sword */ DMG_ENTRY(1, BIRI_DMG_REACT_SWORD),
/* Master sword */ DMG_ENTRY(2, BIRI_DMG_REACT_SWORD),
/* Giant's Knife */ DMG_ENTRY(4, BIRI_DMG_REACT_SWORD),
/* Fire arrow */ DMG_ENTRY(4, BIRI_DMG_REACT_FIRE),
/* Ice arrow */ DMG_ENTRY(4, BIRI_DMG_REACT_ICE),
/* Light arrow */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
/* Unk arrow 1 */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
/* Unk arrow 2 */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
/* Unk arrow 3 */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
/* Fire magic */ DMG_ENTRY(4, BIRI_DMG_REACT_FIRE),
/* Ice magic */ DMG_ENTRY(4, BIRI_DMG_REACT_ICE),
/* Light magic */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE),
/* Shield */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE),
/* Mirror Ray */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE),
/* Kokiri spin */ DMG_ENTRY(1, BIRI_DMG_REACT_NONE),
/* Giant spin */ DMG_ENTRY(4, BIRI_DMG_REACT_NONE),
/* Master spin */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
/* Kokiri jump */ DMG_ENTRY(2, BIRI_DMG_REACT_NONE),
/* Giant jump */ DMG_ENTRY(8, BIRI_DMG_REACT_NONE),
/* Master jump */ DMG_ENTRY(4, BIRI_DMG_REACT_NONE),
/* Unknown 1 */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE),
/* Unblockable */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE),
/* Hammer jump */ DMG_ENTRY(4, BIRI_DMG_REACT_NONE),
/* Unknown 2 */ DMG_ENTRY(0, BIRI_DMG_REACT_NONE),
/* Deku nut */ DMG_ENTRY(0, EN_BILI_DMG_REACT_STUN),
/* Deku stick */ DMG_ENTRY(2, EN_BILI_DMG_REACT_NONE),
/* Slingshot */ DMG_ENTRY(0, EN_BILI_DMG_REACT_SLINGSHOT),
/* Explosive */ DMG_ENTRY(2, EN_BILI_DMG_REACT_NONE),
/* Boomerang */ DMG_ENTRY(1, EN_BILI_DMG_REACT_NONE),
/* Normal arrow */ DMG_ENTRY(2, EN_BILI_DMG_REACT_NONE),
/* Hammer swing */ DMG_ENTRY(2, EN_BILI_DMG_REACT_NONE),
/* Hookshot */ DMG_ENTRY(2, EN_BILI_DMG_REACT_NONE),
/* Kokiri sword */ DMG_ENTRY(1, EN_BILI_DMG_REACT_SWORD_SLASH),
/* Master sword */ DMG_ENTRY(2, EN_BILI_DMG_REACT_SWORD_SLASH),
/* Giant's Knife */ DMG_ENTRY(4, EN_BILI_DMG_REACT_SWORD_SLASH),
/* Fire arrow */ DMG_ENTRY(4, EN_BILI_DMG_REACT_FIRE),
/* Ice arrow */ DMG_ENTRY(4, EN_BILI_DMG_REACT_ICE),
/* Light arrow */ DMG_ENTRY(2, EN_BILI_DMG_REACT_NONE),
/* Unk arrow 1 */ DMG_ENTRY(2, EN_BILI_DMG_REACT_NONE),
/* Unk arrow 2 */ DMG_ENTRY(2, EN_BILI_DMG_REACT_NONE),
/* Unk arrow 3 */ DMG_ENTRY(2, EN_BILI_DMG_REACT_NONE),
/* Fire magic */ DMG_ENTRY(4, EN_BILI_DMG_REACT_FIRE),
/* Ice magic */ DMG_ENTRY(4, EN_BILI_DMG_REACT_ICE),
/* Light magic */ DMG_ENTRY(0, EN_BILI_DMG_REACT_NONE),
/* Shield */ DMG_ENTRY(0, EN_BILI_DMG_REACT_NONE),
/* Mirror Ray */ DMG_ENTRY(0, EN_BILI_DMG_REACT_NONE),
/* Kokiri spin */ DMG_ENTRY(1, EN_BILI_DMG_REACT_NONE),
/* Giant spin */ DMG_ENTRY(4, EN_BILI_DMG_REACT_NONE),
/* Master spin */ DMG_ENTRY(2, EN_BILI_DMG_REACT_NONE),
/* Kokiri jump */ DMG_ENTRY(2, EN_BILI_DMG_REACT_NONE),
/* Giant jump */ DMG_ENTRY(8, EN_BILI_DMG_REACT_NONE),
/* Master jump */ DMG_ENTRY(4, EN_BILI_DMG_REACT_NONE),
/* Unknown 1 */ DMG_ENTRY(0, EN_BILI_DMG_REACT_NONE),
/* Unblockable */ DMG_ENTRY(0, EN_BILI_DMG_REACT_NONE),
/* Hammer jump */ DMG_ENTRY(4, EN_BILI_DMG_REACT_NONE),
/* Unknown 2 */ DMG_ENTRY(0, EN_BILI_DMG_REACT_NONE),
};
static InitChainEntry sInitChain[] = {
ICHAIN_S8(naviEnemyId, NAVI_ENEMY_BIRI, ICHAIN_CONTINUE),
ICHAIN_F32(lockOnArrowOffset, 2000, ICHAIN_STOP),
@@ -133,17 +127,16 @@ void EnBili_Init(Actor* thisx, PlayState* play) {
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 17.0f);
this->actor.shape.shadowAlpha = 155;
SkelAnime_Init(play, &this->skelAnime, &gBiriSkel, &gBiriDefaultAnim, this->jointTable, this->morphTable,
SkelAnime_Init(play, &this->skelAnime, &gBiriSkel, &gBiriMainAnim, this->jointTable, this->morphTable,
BIRI_LIMB_MAX);
Collider_InitCylinder(play, &this->collider);
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
this->playFlySfx = false;
if (this->actor.params == EN_BILI_TYPE_NORMAL) {
EnBili_SetupFloatIdle(this);
EnBili_SetupIdle(this);
} else {
EnBili_SetupSpawnedFlyApart(this);
EnBili_SetupSpawnedByBari(this);
}
}
@@ -153,9 +146,7 @@ void EnBili_Destroy(Actor* thisx, PlayState* play) {
Collider_DestroyCylinder(play, &this->collider);
}
// Setup Action Functions
void EnBili_SetupFloatIdle(EnBili* this) {
void EnBili_SetupIdle(EnBili* this) {
this->actor.speed = 0.7f;
this->collider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_ELECTRIC;
this->timer = 32;
@@ -164,37 +155,31 @@ void EnBili_SetupFloatIdle(EnBili* this) {
this->actor.velocity.y = 0.0f;
this->collider.base.atFlags |= AT_ON;
this->collider.base.acFlags |= AC_ON;
this->actionFunc = EnBili_FloatIdle;
this->actionFunc = EnBili_Idle;
}
/**
* Separates the Biri spawned by a dying EnVali.
*/
void EnBili_SetupSpawnedFlyApart(EnBili* this) {
Animation_PlayLoop(&this->skelAnime, &gBiriDefaultAnim);
void EnBili_SetupSpawnedByBari(EnBili* this) {
Animation_PlayLoop(&this->skelAnime, &gBiriMainAnim);
this->timer = 25;
this->actor.velocity.y = 6.0f;
this->actor.gravity = -0.3f;
this->collider.base.atFlags &= ~AT_ON;
this->actionFunc = EnBili_SpawnedFlyApart;
this->actor.speed = 3.0f;
this->collider.base.atFlags &= ~AT_ON;
this->actionFunc = EnBili_SpawnedByBari;
}
/**
* Used for both touching player/player's shield and being hit with sword. What to do next is determined by params.
*/
void EnBili_SetupDischargeLightning(EnBili* this) {
Animation_PlayLoop(&this->skelAnime, &gBiriDischargeLightningAnim);
void EnBili_SetupElectrify(EnBili* this) {
Animation_PlayLoop(&this->skelAnime, &gBiriElectrifyAnim);
this->timer = 10;
this->actionFunc = EnBili_DischargeLightning;
this->actionFunc = EnBili_Electrify;
this->actor.speed = 0.0f;
this->actor.velocity.y = -1.0f;
}
void EnBili_SetupClimb(EnBili* this) {
Animation_PlayOnce(&this->skelAnime, &gBiriClimbAnim);
void EnBili_SetupAscendAway(EnBili* this) {
Animation_PlayOnce(&this->skelAnime, &gBiriAscendAwayAnim);
this->collider.base.atFlags &= ~AT_ON;
this->actionFunc = EnBili_Climb;
this->actionFunc = EnBili_AscendAway;
this->actor.speed = 0.0f;
this->actor.velocity.y = 0.0f;
}
@@ -204,41 +189,36 @@ void EnBili_SetupApproachPlayer(EnBili* this) {
this->actionFunc = EnBili_ApproachPlayer;
}
void EnBili_SetupSetNewHomeHeight(EnBili* this) {
Animation_PlayLoop(&this->skelAnime, &gBiriDefaultAnim);
void EnBili_SetupFleePlayer(EnBili* this) {
Animation_PlayLoop(&this->skelAnime, &gBiriMainAnim);
this->timer = 96;
this->actor.speed = 0.9f;
this->collider.base.atFlags |= AT_ON;
this->actionFunc = EnBili_SetNewHomeHeight;
this->actor.home.pos.y = this->actor.world.pos.y;
this->collider.base.atFlags |= AT_ON;
this->actionFunc = EnBili_FleePlayer;
}
void EnBili_SetupRecoil(EnBili* this) {
if (this->skelAnime.animation != &gBiriDefaultAnim) {
Animation_PlayLoop(&this->skelAnime, &gBiriDefaultAnim);
void EnBili_SetupSlingshotKnockback(EnBili* this) {
if (this->skelAnime.animation != &gBiriMainAnim) {
Animation_PlayLoop(&this->skelAnime, &gBiriMainAnim);
}
this->actor.world.rot.y = Actor_WorldYawTowardPoint(&this->actor, &this->collider.base.ac->prevPos) + 0x8000;
this->actor.world.rot.x = Actor_WorldPitchTowardPoint(&this->actor, &this->collider.base.ac->prevPos);
this->actionFunc = EnBili_Recoil;
this->actionFunc = EnBili_SlingshotKnockback;
this->actor.speed = 5.0f;
}
/**
* Used for both fire damage and generic damage
*/
void EnBili_SetupBurnt(EnBili* this) {
if (this->actionFunc == EnBili_Climb) {
Animation_PlayLoop(&this->skelAnime, &gBiriDefaultAnim);
void EnBili_SetupDamaged(EnBili* this) {
if (this->actionFunc == EnBili_AscendAway) {
Animation_PlayLoop(&this->skelAnime, &gBiriMainAnim);
}
this->timer = 20;
this->collider.base.atFlags &= ~AT_ON;
this->collider.base.acFlags &= ~AC_ON;
this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED;
this->actor.speed = 0.0f;
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 200, COLORFILTER_BUFFLAG_XLU, 20);
this->actionFunc = EnBili_Burnt;
this->actionFunc = EnBili_Damaged;
}
void EnBili_SetupDie(EnBili* this) {
@@ -248,9 +228,6 @@ void EnBili_SetupDie(EnBili* this) {
this->actor.speed = 0.0f;
}
/**
* Falls to ground
*/
void EnBili_SetupStunned(EnBili* this) {
this->timer = 80;
this->collider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_NONE;
@@ -264,25 +241,20 @@ void EnBili_SetupStunned(EnBili* this) {
void EnBili_SetupFrozen(EnBili* this, PlayState* play) {
s32 i;
Vec3f effectPos;
Vec3f effPos;
if (!(this->actor.flags & ACTOR_FLAG_ATTACHED_TO_ARROW)) {
this->actor.gravity = -1.0f;
}
this->actor.velocity.y = 0.0f;
effectPos.y = this->actor.world.pos.y - 15.0f;
effPos.y = this->actor.world.pos.y - 15.0f;
for (i = 0; i < 8; i++) {
effectPos.x = this->actor.world.pos.x + ((i & 1) ? 7.0f : -7.0f);
effectPos.y += 2.5f;
effectPos.z = this->actor.world.pos.z + ((i & 4) ? 7.0f : -7.0f);
EffectSsEnIce_SpawnFlyingVec3f(play, &this->actor, &effectPos, 150, 150, 150, 250, 235, 245, 255,
effPos.x = ((i & 1) ? 7.0f : -7.0f) + this->actor.world.pos.x;
effPos.y += 2.5f;
effPos.z = ((i & 4) ? 7.0f : -7.0f) + this->actor.world.pos.z;
EffectSsEnIce_SpawnFlyingVec3f(play, &this->actor, &effPos, 150, 150, 150, 250, 235, 245, 255,
(Rand_ZeroOne() * 0.2f) + 0.7f);
}
this->actor.speed = 0.0f;
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 150, COLORFILTER_BUFFLAG_XLU, 10);
this->collider.base.atFlags &= ~AT_ON;
@@ -291,193 +263,171 @@ void EnBili_SetupFrozen(EnBili* this, PlayState* play) {
this->actionFunc = EnBili_Frozen;
}
// Miscellaneous
void EnBili_UpdateTentaclesTexIndex(EnBili* this) {
s16 n;
s16 animCurFrame = this->skelAnime.curFrame;
/**
* Changes the texture displayed on the oral arms limb using the current frame.
*/
void EnBili_UpdateTentaclesIndex(EnBili* this) {
s16 curFrame = this->skelAnime.curFrame;
s16 temp; // Not strictly necessary, but avoids a few s16 casts
if (this->actionFunc == EnBili_DischargeLightning) {
temp = 3 - curFrame;
this->tentaclesTexIndex = (ABS(temp) + 5) % 8;
} else if (this->actionFunc == EnBili_Climb) {
if (curFrame <= 9) {
temp = curFrame >> 1;
this->tentaclesTexIndex = CLAMP_MAX(temp, 3);
} else if (curFrame <= 18) {
temp = 17 - curFrame;
this->tentaclesTexIndex = CLAMP_MIN(temp, 0) >> 1;
} else if (curFrame <= 36) {
this->tentaclesTexIndex = ((36 - curFrame) / 3) + 2;
if (this->actionFunc == EnBili_Electrify) {
n = 3 - animCurFrame;
this->tentaclesTexIndex = (ABS(n) + 5) % 8;
} else if (this->actionFunc == EnBili_AscendAway) {
n = animCurFrame >> 1;
if (animCurFrame < 10) {
if (n >= 4) {
this->tentaclesTexIndex = 3;
} else {
this->tentaclesTexIndex = n;
}
} else if (animCurFrame < 19) {
n = 17 - animCurFrame;
this->tentaclesTexIndex = CLAMP_MIN(n, 0) >> 1;
} else if (animCurFrame < 37) {
this->tentaclesTexIndex = ((36 - animCurFrame) / 3) + 2;
} else {
this->tentaclesTexIndex = (40 - curFrame) >> 1;
this->tentaclesTexIndex = (40 - animCurFrame) >> 1;
}
} else {
this->tentaclesTexIndex = curFrame >> 1;
this->tentaclesTexIndex = animCurFrame >> 1;
}
}
/**
* Tracks Player height, with oscillation, and moves away from walls
*/
void EnBili_UpdateFloating(EnBili* this) {
f32 playerHeight = this->actor.world.pos.y + this->actor.yDistToPlayer;
f32 heightOffset = ((this->actionFunc == EnBili_SetNewHomeHeight) ? 100.0f : 40.0f);
f32 baseHeight = CLAMP_MIN(this->actor.floorHeight, playerHeight);
void EnBili_UpdateMovement(EnBili* this) {
f32 playerY = this->actor.world.pos.y + this->actor.yDistToPlayer;
f32 floorY;
f32 targetY;
f32 targetYOffset;
Math_StepToF(&this->actor.home.pos.y, baseHeight + heightOffset, 1.0f);
this->actor.world.pos.y = this->actor.home.pos.y + (sinf(this->timer * (M_PI / 16)) * 3.0f);
// Turn around if touching wall
if (this->actionFunc == EnBili_FleePlayer) {
targetYOffset = 100.0f;
} else {
targetYOffset = 40.0f;
}
floorY = this->actor.floorHeight;
targetY = MAX(playerY, floorY);
Math_StepToF(&this->actor.home.pos.y, targetY + targetYOffset, 1.0f);
this->actor.world.pos.y = (sinf(this->timer * 0.19634955f) * 3.0f) + this->actor.home.pos.y;
if (this->actor.bgCheckFlags & BGCHECKFLAG_WALL) {
this->actor.world.rot.y = this->actor.wallYaw;
}
}
// Action functions
void EnBili_FloatIdle(EnBili* this, PlayState* play) {
void EnBili_Idle(EnBili* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (this->timer != 0) {
this->timer--;
}
if (!(this->timer % 4)) {
this->actor.world.rot.y += Rand_CenteredFloat(1820.0f);
}
EnBili_UpdateFloating(this);
EnBili_UpdateMovement(this);
if (this->timer == 0) {
this->timer = 32;
}
if ((this->actor.xzDistToPlayer < 160.0f) && (fabsf(this->actor.yDistToPlayer) < 45.0f)) {
EnBili_SetupApproachPlayer(this);
}
}
void EnBili_SpawnedFlyApart(EnBili* this, PlayState* play) {
void EnBili_SpawnedByBari(EnBili* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (this->timer != 0) {
this->timer--;
}
if (this->timer == 0) {
EnBili_SetupFloatIdle(this);
EnBili_SetupIdle(this);
}
}
void EnBili_DischargeLightning(EnBili* this, PlayState* play) {
static Color_RGBA8 primColor = { 255, 255, 255, 255 };
static Color_RGBA8 envColor = { 200, 255, 255, 255 };
void EnBili_Electrify(EnBili* this, PlayState* play) {
static Color_RGBA8 sEffEnvColor = { 255, 255, 255, 255 };
static Color_RGBA8 sEffPrimColor = { 200, 255, 255, 255 };
s16 effYaw;
Vec3f effPos;
s32 i;
Vec3f effectPos;
s16 effectYaw;
for (i = 0; i < 4; i++) {
if (!((this->timer + (i << 1)) % 4)) {
effectYaw = (s16)Rand_CenteredFloat(12288.0f) + (i * 0x4000) + 0x2000;
effectPos.x = Rand_CenteredFloat(5.0f) + this->actor.world.pos.x;
effectPos.y = (Rand_ZeroOne() * 5.0f) + this->actor.world.pos.y + 2.5f;
effectPos.z = Rand_CenteredFloat(5.0f) + this->actor.world.pos.z;
EffectSsLightning_Spawn(play, &effectPos, &primColor, &envColor, 15, effectYaw, 6, 2);
effYaw = (s16)Rand_CenteredFloat(12288.0f) + (i * 0x4000) + 0x2000;
effPos.x = Rand_CenteredFloat(5.0f) + this->actor.world.pos.x;
effPos.y = (Rand_ZeroOne() * 5.0f) + this->actor.world.pos.y + 2.5f;
effPos.z = Rand_CenteredFloat(5.0f) + this->actor.world.pos.z;
EffectSsLightning_Spawn(play, &effPos, &sEffEnvColor, &sEffPrimColor, 15, effYaw, 6, 2);
}
}
SkelAnime_Update(&this->skelAnime);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_BIRI_SPARK - SFX_FLAG);
if (this->timer != 0) {
this->timer--;
}
this->actor.velocity.y *= -1.0f;
if ((this->timer == 0) && Animation_OnFrame(&this->skelAnime, 0.0f)) {
if (this->actor.params == EN_BILI_TYPE_DYING) {
if (this->actor.params == EN_BILI_TYPE_DIE_AFTER_ELECTRIFY) {
EnBili_SetupDie(this);
} else {
EnBili_SetupClimb(this);
EnBili_SetupAscendAway(this);
}
}
}
void EnBili_Climb(EnBili* this, PlayState* play) {
void EnBili_AscendAway(EnBili* this, PlayState* play) {
s32 animFinished = SkelAnime_Update(&this->skelAnime);
f32 curFrame = this->skelAnime.curFrame;
f32 animCurFrame = this->skelAnime.curFrame;
if (Animation_OnFrame(&this->skelAnime, 9.0f)) {
Actor_PlaySfx(&this->actor, NA_SE_EN_BIRI_JUMP);
}
if (curFrame > 9.0f) {
if (animCurFrame > 9.0f) {
Math_ApproachF(&this->actor.world.pos.y, this->actor.world.pos.y + this->actor.yDistToPlayer + 100.0f, 0.5f,
5.0f);
}
if (animFinished) {
EnBili_SetupSetNewHomeHeight(this);
EnBili_SetupFleePlayer(this);
}
}
void EnBili_ApproachPlayer(EnBili* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
Math_ApproachS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 2, 1820);
Math_ApproachS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 2, 0x71C);
if (this->timer != 0) {
this->timer--;
}
EnBili_UpdateFloating(this);
EnBili_UpdateMovement(this);
if (this->timer == 0) {
this->timer = 32;
}
if (this->actor.xzDistToPlayer > 200.0f) {
EnBili_SetupFloatIdle(this);
EnBili_SetupIdle(this);
}
}
void EnBili_SetNewHomeHeight(EnBili* this, PlayState* play) {
void EnBili_FleePlayer(EnBili* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (this->timer != 0) {
this->timer--;
}
Math_ScaledStepToS(&this->actor.world.rot.y, (s16)(this->actor.yawTowardsPlayer + 0x8000), 910);
EnBili_UpdateFloating(this);
Math_ScaledStepToS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer + 0x8000, 0x38E);
EnBili_UpdateMovement(this);
if (this->timer == 0) {
EnBili_SetupFloatIdle(this);
EnBili_SetupIdle(this);
}
}
void EnBili_Recoil(EnBili* this, PlayState* play) {
void EnBili_SlingshotKnockback(EnBili* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (Math_StepToF(&this->actor.speed, 0.0f, 0.3f)) {
this->actor.world.rot.y += 0x8000;
EnBili_SetupFloatIdle(this);
EnBili_SetupIdle(this);
}
}
void EnBili_Burnt(EnBili* this, PlayState* play) {
void EnBili_Damaged(EnBili* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (this->actor.flags & ACTOR_FLAG_ATTACHED_TO_ARROW) {
this->actor.colorFilterTimer = 20;
} else {
if (this->timer != 0) {
this->timer--;
}
if (this->timer == 0) {
EnBili_SetupDie(this);
}
@@ -485,46 +435,40 @@ void EnBili_Burnt(EnBili* this, PlayState* play) {
}
void EnBili_Die(EnBili* this, PlayState* play) {
static Vec3f effectVelocity = { 0.0f, 0.0f, 0.0f };
static Vec3f effectAccel = { 0.0f, 0.0f, 0.0f };
s16 effectScale;
Vec3f effectPos;
static Vec3f sEffVel = { 0.0f, 0.0f, 0.0f };
static Vec3f sEffAccel = { 0.0f, 0.0f, 0.0f };
s16 effScale;
Vec3f effPos;
s32 i;
if (this->actor.draw != NULL) {
if (this->actor.flags & ACTOR_FLAG_ATTACHED_TO_ARROW) {
if (!(this->actor.flags & ACTOR_FLAG_ATTACHED_TO_ARROW)) {
this->actor.draw = NULL;
Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos,
COLLECTIBLE_DROP_RANDOM_PARAMS(COLLECTIBLE_DROP_TABLE_5, false));
} else {
return;
}
this->actor.draw = NULL;
Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos,
COLLECTIBLE_DROP_RANDOM_PARAMS(COLLECTIBLE_DROP_TABLE_5, false));
}
if (this->timer != 0) {
this->timer--;
}
if (this->timer != 0) {
for (i = 0; i < 2; i++) {
effectPos.x = ((Rand_ZeroOne() * 10.0f) + this->actor.world.pos.x) - 5.0f;
effectPos.y = ((Rand_ZeroOne() * 5.0f) + this->actor.world.pos.y) - 2.5f;
effectPos.z = ((Rand_ZeroOne() * 10.0f) + this->actor.world.pos.z) - 5.0f;
effectVelocity.y = Rand_ZeroOne() + 1.0f;
effectScale = Rand_S16Offset(40, 40);
effPos.x = (Rand_ZeroOne() * 10.0f) + this->actor.world.pos.x - 5.0f;
effPos.y = (Rand_ZeroOne() * 5.0f) + this->actor.world.pos.y - 2.5f;
effPos.z = (Rand_ZeroOne() * 10.0f) + this->actor.world.pos.z - 5.0f;
sEffVel.y = Rand_ZeroOne() + 1.0f;
effScale = Rand_S16Offset(40, 40);
if (Rand_ZeroOne() < 0.7f) {
EffectSsDtBubble_SpawnColorProfile(play, &effectPos, &effectVelocity, &effectAccel, effectScale, 25, 2,
1);
EffectSsDtBubble_SpawnColorProfile(play, &effPos, &sEffVel, &sEffAccel, effScale, 25, 2, 1);
} else {
EffectSsDtBubble_SpawnColorProfile(play, &effectPos, &effectVelocity, &effectAccel, effectScale, 25, 0,
1);
EffectSsDtBubble_SpawnColorProfile(play, &effPos, &sEffVel, &sEffAccel, effScale, 25, 0, 1);
}
}
} else {
Actor_Kill(&this->actor);
}
if (this->timer == 14) {
SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 40, NA_SE_EN_BIRI_BUBLE);
}
@@ -534,13 +478,11 @@ void EnBili_Stunned(EnBili* this, PlayState* play) {
if (this->timer != 0) {
this->timer--;
}
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) {
Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_M_GND);
}
if (this->timer == 0) {
EnBili_SetupFloatIdle(this);
EnBili_SetupIdle(this);
}
}
@@ -548,17 +490,14 @@ void EnBili_Frozen(EnBili* this, PlayState* play) {
if (this->timer != 0) {
this->timer--;
}
if (!(this->actor.flags & ACTOR_FLAG_ATTACHED_TO_ARROW)) {
this->actor.gravity = -1.0f;
}
#if OOT_VERSION < NTSC_1_1
if ((this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) || (this->actor.floorHeight == BGCHECK_Y_MIN))
if ((this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) || (this->actor.floorHeight == BGCHECK_Y_MIN)) {
#else
if ((this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) || (this->actor.floorHeight == BGCHECK_Y_MIN))
if ((this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) || (this->actor.floorHeight == BGCHECK_Y_MIN)) {
#endif
{
this->actor.colorFilterTimer = 0;
EnBili_SetupDie(this);
} else {
@@ -566,48 +505,40 @@ void EnBili_Frozen(EnBili* this, PlayState* play) {
}
}
void EnBili_UpdateDamage(EnBili* this, PlayState* play) {
u8 damageReaction;
void EnBili_CheckCollide(EnBili* this, PlayState* play) {
if ((this->actor.colChkInfo.health != 0) && (this->collider.base.acFlags & AC_HIT)) {
this->collider.base.acFlags &= ~AC_HIT;
Actor_SetDropFlag(&this->actor, &this->collider.elem, true);
if ((this->actor.colChkInfo.damageReaction != 0) || (this->actor.colChkInfo.damage != 0)) {
if ((this->actor.colChkInfo.damageReaction != EN_BILI_DMG_REACT_NONE) || (this->actor.colChkInfo.damage != 0)) {
if (Actor_ApplyDamage(&this->actor) == 0) {
Actor_PlaySfx(&this->actor, NA_SE_EN_BIRI_DEAD);
Enemy_StartFinishingBlow(play, &this->actor);
this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
}
damageReaction = this->actor.colChkInfo.damageReaction;
if (damageReaction == BIRI_DMG_REACT_DEKUNUT) {
if (this->actor.colChkInfo.damageReaction == EN_BILI_DMG_REACT_STUN) {
if (this->actionFunc != EnBili_Stunned) {
EnBili_SetupStunned(this);
}
} else if (damageReaction == BIRI_DMG_REACT_SWORD) {
} else if (this->actor.colChkInfo.damageReaction == EN_BILI_DMG_REACT_SWORD_SLASH) {
if (this->actionFunc != EnBili_Stunned) {
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 200, COLORFILTER_BUFFLAG_XLU, 10);
if (this->actor.colChkInfo.health == 0) {
this->actor.params = EN_BILI_TYPE_DYING;
this->actor.params = EN_BILI_TYPE_DIE_AFTER_ELECTRIFY;
}
EnBili_SetupDischargeLightning(this);
EnBili_SetupElectrify(this);
} else {
EnBili_SetupBurnt(this);
EnBili_SetupDamaged(this);
}
} else if (damageReaction == BIRI_DMG_REACT_FIRE) {
EnBili_SetupBurnt(this);
} else if (this->actor.colChkInfo.damageReaction == EN_BILI_DMG_REACT_FIRE) {
EnBili_SetupDamaged(this);
this->timer = 2;
} else if (damageReaction == BIRI_DMG_REACT_ICE) {
} else if (this->actor.colChkInfo.damageReaction == EN_BILI_DMG_REACT_ICE) {
EnBili_SetupFrozen(this, play);
} else if (damageReaction == BIRI_DMG_REACT_SLINGSHOT) {
EnBili_SetupRecoil(this);
} else if (this->actor.colChkInfo.damageReaction == EN_BILI_DMG_REACT_SLINGSHOT) {
EnBili_SetupSlingshotKnockback(this);
} else {
EnBili_SetupBurnt(this);
EnBili_SetupDamaged(this);
}
if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_ARROW) {
this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED;
}
@@ -616,158 +547,145 @@ void EnBili_UpdateDamage(EnBili* this, PlayState* play) {
}
void EnBili_Update(Actor* thisx, PlayState* play2) {
PlayState* play = play2;
EnBili* this = (EnBili*)thisx;
PlayState* play = play2;
if (this->collider.base.atFlags & AT_HIT) {
this->collider.base.atFlags &= ~AT_HIT;
EnBili_SetupDischargeLightning(this);
EnBili_SetupElectrify(this);
}
EnBili_UpdateDamage(this, play);
EnBili_CheckCollide(this, play);
this->actionFunc(this, play);
if (this->actionFunc != EnBili_Die) {
EnBili_UpdateTentaclesIndex(this);
if (Animation_OnFrame(&this->skelAnime, 9.0f)) {
if ((this->actionFunc == EnBili_FloatIdle) || (this->actionFunc == EnBili_SetNewHomeHeight) ||
(this->actionFunc == EnBili_ApproachPlayer) || (this->actionFunc == EnBili_Recoil)) {
if (this->playFlySfx) {
Actor_PlaySfx(&this->actor, NA_SE_EN_BIRI_FLY);
this->playFlySfx = false;
} else {
this->playFlySfx = true;
}
EnBili_UpdateTentaclesTexIndex(this);
if (Animation_OnFrame(&this->skelAnime, 9.0f) &&
((this->actionFunc == EnBili_Idle) || (this->actionFunc == EnBili_FleePlayer) ||
(this->actionFunc == EnBili_ApproachPlayer) || (this->actionFunc == EnBili_SlingshotKnockback))) {
if (this->playFlySfx) {
Actor_PlaySfx(&this->actor, NA_SE_EN_BIRI_FLY);
this->playFlySfx = false;
} else {
this->playFlySfx = true;
}
}
if (this->actionFunc == EnBili_Recoil) {
if (this->actionFunc == EnBili_SlingshotKnockback) {
Actor_MoveXYZ(&this->actor);
} else {
Actor_MoveXZGravity(&this->actor);
}
Actor_UpdateBgCheckInfo(play, &this->actor, 5.0f, this->collider.dim.radius, this->collider.dim.height,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_2);
Collider_UpdateCylinder(&this->actor, &this->collider);
if (this->collider.base.atFlags & AT_ON) {
CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base);
}
if (this->collider.base.acFlags & AC_ON) {
CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base);
}
CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);
Actor_SetFocus(&this->actor, 0.0f);
}
}
// Draw and associated functions
void EnBili_GetHoodLimbScale(EnBili* this, f32 frame, Vec3f* scale) {
f32 f;
void EnBili_PulseLimb3(EnBili* this, f32 frame, Vec3f* arg2) {
f32 cos;
f32 sin;
if (this->actionFunc == EnBili_DischargeLightning) {
arg2->y = 1.0f - (sinf((M_PI * 0.16667f) * frame) * 0.26f);
} else if (this->actionFunc == EnBili_Climb) {
if (this->actionFunc == EnBili_Electrify) {
scale->y = 1.0f - (sinf((M_PI * 0.16667f) * frame) * 0.26f);
} else if (this->actionFunc == EnBili_AscendAway) {
if (frame <= 8.0f) {
arg2->y = (cosf((M_PI * 0.125f) * frame) * 0.15f) + 0.85f;
scale->y = (cosf((M_PI / 8) * frame) * 0.15f) + 0.85f;
} else if (frame <= 18.0f) {
cos = cosf((frame - 8.0f) * (M_PI * 0.1f));
arg2->y = 1.0f - (0.3f * cos);
arg2->x = (0.2f * cos) + 0.8f;
f = cosf((frame - 8.0f) * (M_PI / 10));
scale->y = 1.0f - (0.3f * f);
scale->x = (0.2f * f) + 0.8f;
} else {
cos = cosf((frame - 18.0f) * (M_PI * 0.0227f));
arg2->y = (0.31f * cos) + 1.0f;
arg2->x = 1.0f - (0.4f * cos);
f = cosf((frame - 18.0f) * (M_PI * 0.0227f));
scale->y = (0.31f * f) + 1.0f;
scale->x = 1.0f - (0.4f * f);
}
arg2->z = arg2->x;
scale->z = scale->x;
} else if (this->actionFunc == EnBili_Stunned) {
sin = sinf((M_PI * 0.1f) * this->timer) * 0.08f;
arg2->x -= sin;
arg2->y += sin;
arg2->z -= sin;
f = sinf(this->timer * (M_PI / 10)) * 0.08f;
scale->x -= f;
scale->y += f;
scale->z -= f;
} else {
arg2->y = (cosf((M_PI * 0.125f) * frame) * 0.13f) + 0.87f;
scale->y = (cosf((M_PI / 8) * frame) * 0.13f) + 0.87f;
}
}
void EnBili_PulseLimb2(EnBili* this, f32 frame, Vec3f* arg2) {
f32 cos;
f32 sin;
void EnBili_GetCoreLimbScale(EnBili* this, f32 frame, Vec3f* scale) {
f32 f;
if (this->actionFunc == EnBili_DischargeLightning) {
arg2->y = (sinf((M_PI * 0.16667f) * frame) * 0.2f) + 1.0f;
} else if (this->actionFunc == EnBili_Climb) {
if (this->actionFunc == EnBili_Electrify) {
scale->y = (sinf((M_PI * 0.16667f) * frame) * 0.2f) + 1.0f;
} else if (this->actionFunc == EnBili_AscendAway) {
if (frame <= 8.0f) {
arg2->x = 1.125f - (cosf((M_PI * 0.125f) * frame) * 0.125f);
scale->x = 1.125f - (cosf((M_PI / 8) * frame) * 0.125f);
} else if (frame <= 18.0f) {
cos = cosf((frame - 8.0f) * (M_PI * 0.1f));
arg2->x = (0.275f * cos) + 0.975f;
arg2->y = 1.25f - (0.25f * cos);
f = cosf((frame - 8.0f) * (M_PI / 10));
scale->x = (0.275f * f) + 0.975f;
scale->y = 1.25f - (0.25f * f);
} else {
cos = cosf((frame - 18.0f) * (M_PI * 0.0227f));
arg2->x = 1.0f - (0.3f * cos);
arg2->y = (0.48f * cos) + 1.0f;
f = cosf((frame - 18.0f) * (M_PI * 0.0227f));
scale->x = 1.0f - (0.3f * f);
scale->y = (0.48f * f) + 1.0f;
}
arg2->z = arg2->x;
scale->z = scale->x;
} else if (this->actionFunc == EnBili_Stunned) {
sin = sinf((M_PI * 0.1f) * this->timer) * 0.08f;
arg2->x += sin;
arg2->y -= sin;
arg2->z += sin;
f = sinf(this->timer * (M_PI / 10)) * 0.08f;
scale->x += f;
scale->y -= f;
scale->z += f;
} else {
arg2->y = 1.1f - (cosf((M_PI * 0.125f) * frame) * 0.1f);
scale->y = 1.1f - (cosf((M_PI / 8) * frame) * 0.1f);
}
}
void EnBili_PulseLimb4(EnBili* this, f32 frame, Vec3f* arg2) {
f32 cos;
void EnBili_GetTentaclesLimbScale(EnBili* this, f32 frame, Vec3f* scale) {
f32 f;
if (this->actionFunc == EnBili_Climb) {
if (this->actionFunc == EnBili_AscendAway) {
if (frame <= 8.0f) {
cos = cosf((M_PI * 0.125f) * frame);
arg2->x = 1.125f - (0.125f * cos);
arg2->y = (0.3f * cos) + 0.7f;
f = cosf((M_PI / 8) * frame);
scale->x = 1.125f - (0.125f * f);
scale->y = (0.3f * f) + 0.7f;
} else if (frame <= 18.0f) {
cos = cosf((frame - 8.0f) * (M_PI * 0.1f));
arg2->x = (0.325f * cos) + 0.925f;
arg2->y = 0.95f - (0.55f * cos);
f = cosf((frame - 8.0f) * (M_PI / 10));
scale->x = (0.325f * f) + 0.925f;
scale->y = 0.95f - (0.55f * f);
} else {
cos = cosf((frame - 18.0f) * (M_PI * 0.0227f));
arg2->x = 1.0f - (0.4f * cos);
arg2->y = (0.52f * cos) + 1.0f;
f = cosf((frame - 18.0f) * (M_PI * 0.0227f));
scale->x = 1.0f - (0.4f * f);
scale->y = (0.52f * f) + 1.0f;
}
arg2->z = arg2->x;
scale->z = scale->x;
}
}
s32 EnBili_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
Gfx** gfx) {
EnBili* this = (EnBili*)thisx;
Vec3f limbScale = { 1.0f, 1.0f, 1.0f };
f32 curFrame = this->skelAnime.curFrame;
Vec3f scale = { 1.0f, 1.0f, 1.0f };
f32 animCurFrame = this->skelAnime.curFrame;
if (limbIndex == BIRI_LIMB_OUTER_HOOD) {
EnBili_PulseLimb3(this, curFrame, &limbScale);
} else if (limbIndex == BIRI_LIMB_INNER_HOOD) {
EnBili_PulseLimb2(this, curFrame, &limbScale);
if (limbIndex == BIRI_LIMB_HOOD) {
EnBili_GetHoodLimbScale(this, animCurFrame, &scale);
} else if (limbIndex == BIRI_LIMB_CORE) {
EnBili_GetCoreLimbScale(this, animCurFrame, &scale);
} else if (limbIndex == BIRI_LIMB_TENTACLES) {
EnBili_PulseLimb4(this, curFrame, &limbScale);
rot->y = (Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) - this->actor.shape.rot.y) + 0x8000;
EnBili_GetTentaclesLimbScale(this, animCurFrame, &scale);
rot->y = Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) - this->actor.shape.rot.y + 0x8000;
}
Matrix_Scale(limbScale.x, limbScale.y, limbScale.z, MTXMODE_APPLY);
Matrix_Scale(scale.x, scale.y, scale.z, MTXMODE_APPLY);
return false;
}
static void* sTentaclesTextures[] = {
gBiriTentacles0Tex, gBiriTentacles1Tex, gBiriTentacles2Tex, gBiriTentacles3Tex,
gBiriTentacles4Tex, gBiriTentacles5Tex, gBiriTentacles6Tex, gBiriTentacles7Tex,
static void* sTentaclesTextures[8] = {
gBiriTentacle0Tex, gBiriTentacle1Tex, gBiriTentacle2Tex, gBiriTentacle3Tex,
gBiriTentacle4Tex, gBiriTentacle5Tex, gBiriTentacle6Tex, gBiriTentacle7Tex,
};
#include "assets/overlays/ovl_En_Bili/ovl_En_Bili.c"
void EnBili_Draw(Actor* thisx, PlayState* play) {
@@ -775,17 +693,13 @@ void EnBili_Draw(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx, "../z_en_bili.c", 1521);
Gfx_SetupDL_25Xlu(play->state.gfxCtx);
this->tentaclesTexIndex = CLAMP_MAX(this->tentaclesTexIndex, 7);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTentaclesTextures[this->tentaclesTexIndex]));
if ((this->actionFunc == EnBili_DischargeLightning) && ((this->timer & 1) != 0)) {
gSPSegment(POLY_XLU_DISP++, 0x09, D_809C16F0);
this->tentaclesTexIndex = CLAMP_MAX(this->tentaclesTexIndex, ARRAY_COUNT(sTentaclesTextures) - 1);
gSPSegment(POLY_XLU_DISP++, 8, SEGMENTED_TO_VIRTUAL(sTentaclesTextures[this->tentaclesTexIndex]));
if ((this->actionFunc == EnBili_Electrify) && (this->timer & 1)) {
gSPSegment(POLY_XLU_DISP++, 9, sBiriCoreInvertTexCombinerDL);
} else {
gSPSegment(POLY_XLU_DISP++, 0x09, D_809C1700);
gSPSegment(POLY_XLU_DISP++, 9, sBiriCoreNormalCombinerDL);
}
POLY_XLU_DISP = SkelAnime_Draw(play, this->skelAnime.skeleton, this->skelAnime.jointTable, EnBili_OverrideLimbDraw,
NULL, this, POLY_XLU_DISP);
CLOSE_DISPS(play->state.gfxCtx, "../z_en_bili.c", 1552);
src/overlays/actors/ovl_En_Bili/z_en_bili.h
+16 -16
View File
@@ -6,26 +6,26 @@
#include "assets/objects/object_bl/object_bl.h"
typedef enum EnBiliType {
EN_BILI_TYPE_NORMAL = -1,
EN_BILI_TYPE_SPAWNED_BY_BARI,
EN_BILI_TYPE_DIE_AFTER_ELECTRIFY // internal
} EnBiliType;
struct EnBili;
typedef void (*EnBiliActionFunc)(struct EnBili*, struct PlayState*);
typedef struct EnBili {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ EnBiliActionFunc actionFunc;
/* 0x0194 */ u8 tentaclesTexIndex;
/* 0x0195 */ u8 playFlySfx;
/* 0x0196 */ s16 timer;
/* 0x0198 */ Vec3s jointTable[BIRI_LIMB_MAX];
/* 0x01B6 */ Vec3s morphTable[BIRI_LIMB_MAX];
/* 0x01D4 */ ColliderCylinder collider;
} EnBili; // size = 0x0220
typedef enum EnBiliType {
/* -1 */ EN_BILI_TYPE_NORMAL = -1,
/* 0 */ EN_BILI_TYPE_VALI_SPAWNED,
/* 1 */ EN_BILI_TYPE_DYING
} EnBiliType;
/* 0x000 */ Actor actor;
/* 0x14C */ SkelAnime skelAnime;
/* 0x190 */ EnBiliActionFunc actionFunc;
/* 0x194 */ u8 tentaclesTexIndex;
/* 0x195 */ u8 playFlySfx;
/* 0x196 */ s16 timer;
/* 0x198 */ Vec3s jointTable[BIRI_LIMB_MAX];
/* 0x1B6 */ Vec3s morphTable[BIRI_LIMB_MAX];
/* 0x1D4 */ ColliderCylinder collider;
} EnBili; // size = 0x220
#endif
src/overlays/actors/ovl_En_Vali/z_en_vali.c
+1 -1
View File
@@ -246,7 +246,7 @@ void EnVali_SetupDie(EnVali* this, PlayState* play) {
for (i = 0; i < 3; i++) {
Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BILI, this->actor.world.pos.x, this->actor.world.pos.y,
this->actor.world.pos.z, 0, this->actor.world.rot.y, 0, 0);
this->actor.world.pos.z, 0, this->actor.world.rot.y, 0, EN_BILI_TYPE_SPAWNED_BY_BARI);
this->actor.world.rot.y += 0x5555;
}
Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos,