mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 17:00:19 +00:00
Code Issues Projects Releases Wiki Activity

Symbol cleanup (#897)

Browse source 
* symbol cleanup

* run formatter

* run formatter

* remove duplicate z_demo_ik symbols

* run formatter
This commit is contained in:
Dragorn421 2021-08-22 17:52:02 +02:00 • committed by GitHub
parent 743f42f651
commit 5e071a014d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
130 changed files with 1210 additions and 2940 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/overlays/actors/ovl_En_Bb/z_en_bb.c
View file

@ -6,6 +6,7 @@
#include "z_en_bb.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_Bb/object_Bb.h"
#define FLAGS 0x01000015
@ -91,10 +92,6 @@ void EnBb_Green(EnBb* this, GlobalContext* globalCtx);
void EnBb_Stunned(EnBb* this, GlobalContext* globalCtx);
extern AnimationHeader D_06000184;
extern AnimationHeader D_06000444;
extern SkeletonHeader D_06001A30;
static DamageTable sDamageTableBlueGreen = {
/* Deku nut */ DMG_ENTRY(0, 0xF),
/* Deku stick */ DMG_ENTRY(2, 0x0),
@ -316,7 +313,8 @@ void EnBb_Init(Actor* thisx, GlobalContext* globalCtx) {
EnBb* this = THIS;
Actor_ProcessInitChain(thisx, sInitChain);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06001A30, &D_06000444, this->jointTable, this->morphTable, 16);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_Bb_Skel_001A30, &object_Bb_Anim_000444, this->jointTable,
this->morphTable, 16);
this->unk_254 = 0;
thisx->colChkInfo.health = 4;
Collider_InitJntSph(globalCtx, &this->collider);
@ -533,7 +531,7 @@ void EnBb_Damage(EnBb* this, GlobalContext* globalCtx) {
}
void EnBb_SetupBlue(EnBb* this) {
Animation_PlayLoop(&this->skelAnime, &D_06000444);
Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000444);
this->actor.speedXZ = (Rand_ZeroOne() * 0.5f) + 0.5f;
this->timer = (Rand_ZeroOne() * 20.0f) + 40.0f;
this->unk_264 = (Rand_ZeroOne() * 30.0f) + 180.0f;
@ -578,14 +576,14 @@ void EnBb_Blue(EnBb* this, GlobalContext* globalCtx) {
if (this->charge && (this->targetActor == NULL)) {
this->vMoveAngleY = this->actor.world.rot.y;
if (this->actor.xzDistToPlayer < 200.0f) {
Animation_PlayLoop(&this->skelAnime, &D_06000184);
Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000184);
this->vMoveAngleY = this->actor.yawTowardsPlayer;
}
this->maxSpeed = (Rand_ZeroOne() * 1.5f) + 6.0f;
this->timer = (Rand_ZeroOne() * 5.0f) + 20.0f;
this->actionState = BBBLUE_NORMAL;
} else {
Animation_PlayLoop(&this->skelAnime, &D_06000444);
Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000444);
this->maxSpeed = (Rand_ZeroOne() * 1.5f) + 1.0f;
this->timer = (Rand_ZeroOne() * 20.0f) + 40.0f;
this->vMoveAngleY = Math_SinF(this->bobPhase) * 65535.0f;
@ -593,7 +591,7 @@ void EnBb_Blue(EnBb* this, GlobalContext* globalCtx) {
}
if ((this->actor.xzDistToPlayer < 150.0f) && (this->actionState != BBBLUE_NORMAL)) {
if (!this->charge) {
Animation_PlayLoop(&this->skelAnime, &D_06000184);
Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000184);
this->maxSpeed = (Rand_ZeroOne() * 1.5f) + 6.0f;
this->timer = (Rand_ZeroOne() * 5.0f) + 20.0f;
this->vMoveAngleY = this->actor.yawTowardsPlayer;
@ -671,7 +669,7 @@ void EnBb_Blue(EnBb* this, GlobalContext* globalCtx) {
}
void EnBb_SetupDown(EnBb* this) {
Animation_PlayLoop(&this->skelAnime, &D_06000444);
Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000444);
this->action = BB_DOWN;
this->timer = 200;
this->actor.colorFilterTimer = 0;
@ -749,7 +747,7 @@ void EnBb_Down(EnBb* this, GlobalContext* globalCtx) {
}
void EnBb_SetupRed(GlobalContext* globalCtx, EnBb* this) {
Animation_PlayLoop(&this->skelAnime, &D_06000184);
Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000184);
if (this->action == BB_DOWN) {
this->actor.speedXZ = 5.0f;
this->actor.gravity = -1.0f;
@ -876,7 +874,7 @@ void EnBb_SetWaypoint(EnBb* this, GlobalContext* globalCtx) {
}
void EnBb_SetupWhite(GlobalContext* globalCtx, EnBb* this) {
Animation_PlayLoop(&this->skelAnime, &D_06000444);
Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000444);
this->actor.speedXZ = 0.0f;
this->actor.world.pos.y += 60.0f;
this->flameScaleX = 100.0f;
@ -907,11 +905,11 @@ void EnBb_White(EnBb* this, GlobalContext* globalCtx) {
if (this->timer == 0) {
EnBb_SetWaypoint(this, globalCtx);
EnBb_FaceWaypoint(this);
Animation_PlayLoop(&this->skelAnime, &D_06000184);
Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000184);
this->timer = Rand_ZeroOne() * 30.0f + 40.0f;
} else {
if (this->moveMode != BBMOVE_NORMAL) {
Animation_PlayLoop(&this->skelAnime, &D_06000444);
Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000444);
}
this->actor.world.rot.y += 0x1F40;
}
@ -944,7 +942,7 @@ void EnBb_White(EnBb* this, GlobalContext* globalCtx) {
void EnBb_InitGreen(EnBb* this, GlobalContext* globalCtx) {
Vec3f bobOffset = { 0.0f, 0.0f, 0.0f };
Animation_PlayLoop(&this->skelAnime, &D_06000444);
Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000444);
this->moveMode = BBMOVE_NOCLIP;
this->actionState = BBGREEN_FLAME_ON;
this->bobPhase = Rand_ZeroOne();
@ -967,7 +965,7 @@ void EnBb_InitGreen(EnBb* this, GlobalContext* globalCtx) {
}
void EnBb_SetupGreen(EnBb* this) {
Animation_PlayLoop(&this->skelAnime, &D_06000444);
Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000444);
this->moveMode = BBMOVE_NOCLIP;
this->actionState = BBGREEN_FLAME_ON;
this->targetActor = NULL;