mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-06 06:10:21 +00:00
Symbol cleanup (#897)
* symbol cleanup * run formatter * run formatter * remove duplicate z_demo_ik symbols * run formatter
This commit is contained in:
Dragorn421
GitHub
parent
743f42f651
commit
5e071a014d
130 changed files with 1210 additions and 2940 deletions
|
|
@ -8,6 +8,7 @@
|
|||
#include "overlays/actors/ovl_En_Encount1/z_en_encount1.h"
|
||||
#include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h"
|
||||
#include "vt.h"
|
||||
#include "objects/object_tite/object_tite.h"
|
||||
|
||||
#define FLAGS 0x00000015
|
||||
|
||||
|
|
@ -75,21 +76,6 @@ void EnTite_FallApart(EnTite* this, GlobalContext* globalCtx);
|
|||
void EnTite_FlipOnBack(EnTite* this, GlobalContext* globalCtx);
|
||||
void EnTite_FlipUpright(EnTite* this, GlobalContext* globalCtx);
|
||||
|
||||
extern SkeletonHeader D_06003A20;
|
||||
extern AnimationHeader D_060012E4; // Idle (14 frames)
|
||||
extern AnimationHeader D_06000A14; // Turning (8 frames)
|
||||
extern AnimationHeader D_0600083C; // Lunge (6 frames)
|
||||
extern AnimationHeader D_06000C70; // Jump / travelling to player (11 frames)
|
||||
|
||||
// blue tektite textures
|
||||
extern u32 D_06001300;
|
||||
extern u32 D_06001700;
|
||||
extern u32 D_06001900;
|
||||
// red tektite textures
|
||||
extern u32 D_06001B00;
|
||||
extern u32 D_06001F00;
|
||||
extern u32 D_06002100;
|
||||
|
||||
const ActorInit En_Tite_InitVars = {
|
||||
ACTOR_EN_TITE,
|
||||
ACTORCAT_ENEMY,
|
||||
|
|
@ -172,7 +158,7 @@ static InitChainEntry sInitChain[] = {
|
|||
};
|
||||
|
||||
static AnimationHeader* D_80B1B634[] = {
|
||||
0x0600083C, 0x060004F8, 0x0600069C, NULL, NULL, NULL,
|
||||
&object_tite_Anim_00083C, &object_tite_Anim_0004F8, &object_tite_Anim_00069C, NULL, NULL, NULL,
|
||||
};
|
||||
|
||||
// Some kind of offset for the position of each tektite foot
|
||||
|
|
@ -195,7 +181,8 @@ void EnTite_Init(Actor* thisx, GlobalContext* globalCtx) {
|
|||
Actor_ProcessInitChain(thisx, sInitChain);
|
||||
thisx->targetMode = 3;
|
||||
Actor_SetScale(thisx, 0.01f);
|
||||
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06003A20, &D_060012E4, this->jointTable, this->morphTable, 25);
|
||||
SkelAnime_Init(globalCtx, &this->skelAnime, &object_tite_Skel_003A20, &object_tite_Anim_0012E4, this->jointTable,
|
||||
this->morphTable, 25);
|
||||
ActorShape_Init(&thisx->shape, -200.0f, ActorShadow_DrawCircle, 70.0f);
|
||||
this->flipState = TEKTITE_INITIAL;
|
||||
thisx->colChkInfo.damageTable = sDamageTable;
|
||||
|
|
@ -234,7 +221,7 @@ void EnTite_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
void EnTite_SetupIdle(EnTite* this) {
|
||||
Animation_MorphToLoop(&this->skelAnime, &D_060012E4, 4.0f);
|
||||
Animation_MorphToLoop(&this->skelAnime, &object_tite_Anim_0012E4, 4.0f);
|
||||
this->action = TEKTITE_IDLE;
|
||||
this->vIdleTimer = Rand_S16Offset(15, 30);
|
||||
this->actor.speedXZ = 0.0f;
|
||||
|
|
@ -266,8 +253,7 @@ void EnTite_Idle(EnTite* this, GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
void EnTite_SetupAttack(EnTite* this) {
|
||||
|
||||
Animation_PlayOnce(&this->skelAnime, &D_0600083C);
|
||||
Animation_PlayOnce(&this->skelAnime, &object_tite_Anim_00083C);
|
||||
this->action = TEKTITE_ATTACK;
|
||||
this->vAttackState = TEKTITE_BEGIN_LUNGE;
|
||||
this->vQueuedJumps = Rand_S16Offset(1, 3);
|
||||
|
|
@ -384,7 +370,7 @@ void EnTite_Attack(EnTite* this, GlobalContext* globalCtx) {
|
|||
} else {
|
||||
Player* player = PLAYER;
|
||||
this->collider.base.atFlags &= ~AT_HIT;
|
||||
Animation_MorphToLoop(&this->skelAnime, &D_060012E4, 4.0f);
|
||||
Animation_MorphToLoop(&this->skelAnime, &object_tite_Anim_0012E4, 4.0f);
|
||||
this->actor.speedXZ = -6.0f;
|
||||
this->actor.world.rot.y = this->actor.yawTowardsPlayer;
|
||||
if (&player->actor == this->collider.base.at) {
|
||||
|
|
@ -436,7 +422,7 @@ void EnTite_Attack(EnTite* this, GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
void EnTite_SetupTurnTowardPlayer(EnTite* this) {
|
||||
Animation_PlayLoop(&this->skelAnime, &D_06000A14);
|
||||
Animation_PlayLoop(&this->skelAnime, &object_tite_Anim_000A14);
|
||||
this->action = TEKTITE_TURN_TOWARD_PLAYER;
|
||||
if ((this->actor.bgCheckFlags & 3) || ((this->actor.params == TEKTITE_BLUE) && (this->actor.bgCheckFlags & 0x20))) {
|
||||
if (this->actor.velocity.y <= 0.0f) {
|
||||
|
|
@ -503,7 +489,7 @@ void EnTite_TurnTowardPlayer(EnTite* this, GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
void EnTite_SetupMoveTowardPlayer(EnTite* this) {
|
||||
Animation_PlayLoop(&this->skelAnime, &D_06000C70);
|
||||
Animation_PlayLoop(&this->skelAnime, &object_tite_Anim_000C70);
|
||||
this->action = TEKTITE_MOVE_TOWARD_PLAYER;
|
||||
this->actor.velocity.y = 10.0f;
|
||||
this->actor.gravity = -1.0f;
|
||||
|
|
@ -619,7 +605,7 @@ void EnTite_MoveTowardPlayer(EnTite* this, GlobalContext* globalCtx) {
|
|||
|
||||
void EnTite_SetupRecoil(EnTite* this) {
|
||||
this->action = TEKTITE_RECOIL;
|
||||
Animation_MorphToLoop(&this->skelAnime, &D_060012E4, 4.0f);
|
||||
Animation_MorphToLoop(&this->skelAnime, &object_tite_Anim_0012E4, 4.0f);
|
||||
this->actor.speedXZ = -6.0f;
|
||||
this->actor.world.rot.y = this->actor.yawTowardsPlayer;
|
||||
this->actor.gravity = -1.0f;
|
||||
|
|
@ -683,8 +669,8 @@ void EnTite_Recoil(EnTite* this, GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
void EnTite_SetupStunned(EnTite* this) {
|
||||
Animation_Change(&this->skelAnime, &D_060012E4, 0.0f, 0.0f, (f32)Animation_GetLastFrame(&D_060012E4), ANIMMODE_LOOP,
|
||||
4.0f);
|
||||
Animation_Change(&this->skelAnime, &object_tite_Anim_0012E4, 0.0f, 0.0f,
|
||||
(f32)Animation_GetLastFrame(&object_tite_Anim_0012E4), ANIMMODE_LOOP, 4.0f);
|
||||
this->action = TEKTITE_STUNNED;
|
||||
this->actor.speedXZ = -6.0f;
|
||||
this->actor.world.rot.y = this->actor.yawTowardsPlayer;
|
||||
|
|
@ -788,7 +774,7 @@ void EnTite_FallApart(EnTite* this, GlobalContext* globalCtx) {
|
|||
|
||||
void EnTite_SetupFlipOnBack(EnTite* this) {
|
||||
|
||||
Animation_PlayLoopSetSpeed(&this->skelAnime, &D_06000A14, 1.5f);
|
||||
Animation_PlayLoopSetSpeed(&this->skelAnime, &object_tite_Anim_000A14, 1.5f);
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_TEKU_REVERSE);
|
||||
this->flipState = TEKTITE_FLIPPED;
|
||||
this->vOnBackTimer = 500;
|
||||
|
|
@ -999,13 +985,13 @@ void EnTite_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
|||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
Collider_UpdateSpheres(0, &this->collider);
|
||||
if (this->actor.params == TEKTITE_BLUE) {
|
||||
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&D_06001300));
|
||||
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&D_06001700));
|
||||
gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(&D_06001900));
|
||||
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001300));
|
||||
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001700));
|
||||
gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001900));
|
||||
} else {
|
||||
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&D_06001B00));
|
||||
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&D_06001F00));
|
||||
gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(&D_06002100));
|
||||
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001B00));
|
||||
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001F00));
|
||||
gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(object_tite_Tex_002100));
|
||||
}
|
||||
SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, EnTite_PostLimbDraw,
|
||||
thisx);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue