mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 14:50:15 +00:00
Code Issues Projects Releases Wiki Activity

Format all src C files

Browse source
This commit is contained in:
Roman971 2020-03-22 22:19:43 +01:00
parent 251aea64ab
commit 8cfe7cce9f
652 changed files with 12488 additions and 19093 deletions
Download patch file Download diff file Expand all files Collapse all files

93
src/overlays/actors/ovl_En_Bird/z_en_bird.c
View file

@ -2,33 +2,32 @@
* File: z_en_bird.c
* Overlay: ovl_En_Bird
* Description: The projectile fired by deku scrubs and octaroks.
*/
*/
#include <ultra64.h>
#include <global.h>
typedef struct
{
/* 0x0000 */ Actor actor;
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ ActorFunc updateFunc;
/* 0x0194 */ u32 unk_194;
/* 0x0198 */ s32 unk_198;
/* 0x019C */ s16 unk_19C;
/* 0x019E */ char unk_19E[0x2];
/* 0x01A0 */ f32 unk_1A0;
/* 0x01A4 */ f32 unk_1A4;
/* 0x01A8 */ f32 unk_1A8;
/* 0x01AC */ f32 unk_1AC;
/* 0x01B0 */ f32 unk_1B0;
/* 0x01B4 */ f32 unk_1B4;
/* 0x01B8 */ f32 unk_1B8;
/* 0x01BC */ f32 unk_1BC;
/* 0x01C0 */ s16 unk_1C0;
/* 0x01C2 */ char unk_1C2[0x1A];
/* 0x0194 */ u32 unk_194;
/* 0x0198 */ s32 unk_198;
/* 0x019C */ s16 unk_19C;
/* 0x019E */ char unk_19E[0x2];
/* 0x01A0 */ f32 unk_1A0;
/* 0x01A4 */ f32 unk_1A4;
/* 0x01A8 */ f32 unk_1A8;
/* 0x01AC */ f32 unk_1AC;
/* 0x01B0 */ f32 unk_1B0;
/* 0x01B4 */ f32 unk_1B4;
/* 0x01B8 */ f32 unk_1B8;
/* 0x01BC */ f32 unk_1BC;
/* 0x01C0 */ s16 unk_1C0;
/* 0x01C2 */ char unk_1C2[0x1A];
} EnBird; // size = 0x01C4
#define ROOM 0x00
#define ROOM 0x00
#define FLAGS 0x00000000
void EnBird_Init(EnBird* this, GlobalContext* globalCtx);
@ -41,8 +40,7 @@ void EnBird_SetNewUpdate(EnBird* this, ActorFunc updateFunc);
void func_809C1D60(EnBird* this, GlobalContext* globalCtx);
void func_809C1CAC(EnBird* this, s16 params);
const ActorInit En_Bird_InitVars =
{
const ActorInit En_Bird_InitVars = {
ACTOR_EN_BIRD,
ACTORTYPE_PROP,
ROOM,
@ -55,21 +53,18 @@ const ActorInit En_Bird_InitVars =
(ActorFunc)EnBird_Draw,
};
static InitChainEntry initChain[] =
{
ICHAIN_F32(unk_4C, 5600, ICHAIN_STOP)
static InitChainEntry initChain[] = {
ICHAIN_F32(unk_4C, 5600, ICHAIN_STOP),
};
extern u32 D_0600006C;
extern u32 D_06002190;
void EnBird_SetNewUpdate(EnBird* this, ActorFunc newUpdateFunc)
{
void EnBird_SetNewUpdate(EnBird* this, ActorFunc newUpdateFunc) {
this->updateFunc = newUpdateFunc;
}
void EnBird_Init(EnBird* this, GlobalContext* globalCtx)
{
void EnBird_Init(EnBird* this, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->actor, initChain);
Actor_SetScale(&this->actor, 0.01);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06002190, &D_0600006C, 0, 0, 0);
@ -88,16 +83,13 @@ void EnBird_Init(EnBird* this, GlobalContext* globalCtx)
func_809C1CAC(this, this->actor.params);
}
void EnBird_Destroy(EnBird* this, GlobalContext* globalCtx)
{
void EnBird_Destroy(EnBird* this, GlobalContext* globalCtx) {
}
#ifdef NON_MATCHING
// D_0600006C address is reused when it shouldn't be
// also minor ordering differences
void func_809C1CAC(EnBird* this, s16 params)
{
void func_809C1CAC(EnBird* this, s16 params) {
f32 frameCount = SkelAnime_GetFrameCount(&D_0600006C);
f32 playbackSpeed = this->unk_19C ? 0.0f : 1.0f;
this->unk_198 = Math_Rand_S16Offset(5, 0x23);
@ -108,46 +100,38 @@ void func_809C1CAC(EnBird* this, s16 params)
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bird/func_809C1CAC.s")
#endif
void func_809C1D60(EnBird* this, GlobalContext* globalCtx)
{
void func_809C1D60(EnBird* this, GlobalContext* globalCtx) {
f32 fVar2 = sinf(this->unk_1B4);
this->actor.shape.unk_08 = this->actor.shape.unk_08 + fVar2 * this->unk_1A0;
Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.1f, 0.5f, 0.0f);
if (this->unk_19C != 0)
{
if (this->unk_19C != 0) {
this->skelAnime.animPlaybackSpeed = this->actor.speedXZ + this->actor.speedXZ;
}
SkelAnime_FrameUpdateMatrix(&this->skelAnime);
this->unk_198 -= 1;
if (this->unk_198 <= 0)
{
if (this->unk_198 <= 0) {
func_809C1E00(this, this->actor.params);
}
}
void func_809C1E00(EnBird* this, s16 params)
{
void func_809C1E00(EnBird* this, s16 params) {
this->unk_198 = Math_Rand_S16Offset(0x14, 0x2D);
EnBird_SetNewUpdate(this, (ActorFunc)func_809C1E40);
}
void func_809C1E40(EnBird* this, GlobalContext* globalCtx)
{
void func_809C1E40(EnBird* this, GlobalContext* globalCtx) {
f32 fVar4 = sinf(this->unk_1B4);
this->actor.shape.unk_08 += fVar4 * this->unk_1A0;
Math_SmoothScaleMaxMinF(&this->actor.speedXZ, this->unk_1A8, 0.1f, this->unk_1AC, 0.0f);
if (this->unk_1B0 < Math_Vec3f_DistXZ(&this->actor.posRot.pos, &this->actor.initPosRot.pos) || this->unk_198 < 4)
{
func_80077B58(&this->actor.posRot.rot.y, Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot.pos), this->unk_1C0);
}
else
{
if (this->unk_1B0 < Math_Vec3f_DistXZ(&this->actor.posRot.pos, &this->actor.initPosRot.pos) || this->unk_198 < 4) {
func_80077B58(&this->actor.posRot.rot.y, Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot.pos),
this->unk_1C0);
} else {
fVar4 = sinf(this->unk_1B4);
this->actor.posRot.rot.y += (s16)(fVar4 * this->unk_1A4);
}
@ -155,19 +139,16 @@ void func_809C1E40(EnBird* this, GlobalContext* globalCtx)
this->actor.shape.rot.y = this->actor.posRot.rot.y;
SkelAnime_FrameUpdateMatrix(&this->skelAnime);
this->unk_198 -= 1;
if (this->unk_198 < 0)
{
if (this->unk_198 < 0) {
func_809C1CAC(this, this->actor.params);
}
}
void EnBird_Update(EnBird* this, GlobalContext* globalCtx)
{
void EnBird_Update(EnBird* this, GlobalContext* globalCtx) {
this->unk_1B4 += this->unk_1B8;
this->updateFunc(this, globalCtx);
}
void EnBird_Draw(EnBird* this, GlobalContext* globalCtx)
{
void EnBird_Draw(EnBird* this, GlobalContext* globalCtx) {
SkelAnime_Draw(globalCtx, this->skelAnime.limbIndex, this->skelAnime.actorDrawTbl, 0, NULL, NULL);
}