mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +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

34
src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
View file

@ -6,6 +6,7 @@
#include "z_en_dodojr.h"
#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
#include "objects/object_dodojr/object_dodojr.h"
#define FLAGS 0x00000005
@ -32,13 +33,6 @@ void func_809F7B3C(EnDodojr* this, GlobalContext* globalCtx);
void func_809F7C48(EnDodojr* this, GlobalContext* globalCtx);
void func_809F768C(EnDodojr* this, GlobalContext* globalCtx);
extern AnimationHeader D_060004A0;
extern AnimationHeader D_060005F0;
extern AnimationHeader D_06000724;
extern AnimationHeader D_06000860;
extern AnimationHeader D_060009D4;
extern SkeletonHeader D_060020E0;
const ActorInit En_Dodojr_InitVars = {
ACTOR_EN_DODOJR,
ACTORCAT_ENEMY,
@ -77,7 +71,8 @@ void EnDodojr_Init(Actor* thisx, GlobalContext* globalCtx) {
EnDodojr* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 18.0f);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_060020E0, &D_060009D4, this->jointTable, this->morphTable, 15);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_dodojr_Skel_0020E0, &object_dodojr_Anim_0009D4,
this->jointTable, this->morphTable, 15);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(4), &sColChkInit);
@ -168,18 +163,18 @@ s32 func_809F68B0(EnDodojr* this, GlobalContext* globalCtx) {
}
void func_809F6994(EnDodojr* this) {
f32 lastFrame = Animation_GetLastFrame(&D_06000860);
f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_000860);
Animation_Change(&this->skelAnime, &D_06000860, 1.8f, 0.0f, lastFrame, ANIMMODE_LOOP_INTERP, -10.0f);
Animation_Change(&this->skelAnime, &object_dodojr_Anim_000860, 1.8f, 0.0f, lastFrame, ANIMMODE_LOOP_INTERP, -10.0f);
this->actor.velocity.y = 0.0f;
this->actor.speedXZ = 2.6f;
this->actor.gravity = -0.8f;
}
void func_809F6A20(EnDodojr* this) {
f32 lastFrame = Animation_GetLastFrame(&D_060004A0);
f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_0004A0);
Animation_Change(&this->skelAnime, &D_060004A0, 1.0f, 0.0f, lastFrame, ANIMMODE_ONCE, -10.0f);
Animation_Change(&this->skelAnime, &object_dodojr_Anim_0004A0, 1.0f, 0.0f, lastFrame, ANIMMODE_ONCE, -10.0f);
this->actor.speedXZ = 0.0f;
this->actor.velocity.x = 0.0f;
this->actor.velocity.z = 0.0f;
@ -192,17 +187,17 @@ void func_809F6A20(EnDodojr* this) {
}
void func_809F6AC4(EnDodojr* this) {
f32 lastFrame = Animation_GetLastFrame(&D_060005F0);
f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_0005F0);
Animation_Change(&this->skelAnime, &D_060005F0, 1.0f, 0.0f, lastFrame, ANIMMODE_LOOP, 0.0f);
Animation_Change(&this->skelAnime, &object_dodojr_Anim_0005F0, 1.0f, 0.0f, lastFrame, ANIMMODE_LOOP, 0.0f);
this->actor.velocity.y = 0.0f;
this->actor.gravity = -0.8f;
}
void func_809F6B38(EnDodojr* this) {
f32 lastFrame = Animation_GetLastFrame(&D_06000724);
f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_000724);
Animation_Change(&this->skelAnime, &D_06000724, 1.0f, 0.0f, lastFrame, ANIMMODE_LOOP, -10.0f);
Animation_Change(&this->skelAnime, &object_dodojr_Anim_000724, 1.0f, 0.0f, lastFrame, ANIMMODE_LOOP, -10.0f);
this->actor.gravity = -0.8f;
this->unk_1FC = 3;
this->actor.velocity.y = 10.0f;
@ -219,7 +214,7 @@ void func_809F6BBC(EnDodojr* this) {
}
void func_809F6C24(EnDodojr* this) {
Animation_Change(&this->skelAnime, &D_06000724, 1.0f, 8.0f, 12.0f, ANIMMODE_ONCE, 0.0f);
Animation_Change(&this->skelAnime, &object_dodojr_Anim_000724, 1.0f, 8.0f, 12.0f, ANIMMODE_ONCE, 0.0f);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_EAT);
this->actor.speedXZ = 0.0f;
this->actor.velocity.x = 0.0f;
@ -395,7 +390,7 @@ void func_809F72A4(EnDodojr* this, GlobalContext* globalCtx) {
}
void func_809F73AC(EnDodojr* this, GlobalContext* globalCtx) {
f32 lastFrame = Animation_GetLastFrame(&D_06000860);
f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_000860);
Player* player = PLAYER;
f32 dist;
@ -403,7 +398,8 @@ void func_809F73AC(EnDodojr* this, GlobalContext* globalCtx) {
dist = this->actor.world.pos.y - player->actor.world.pos.y;
if (!(dist >= 40.0f)) {
Animation_Change(&this->skelAnime, &D_06000860, 1.8f, 0.0f, lastFrame, ANIMMODE_LOOP_INTERP, -10.0f);
Animation_Change(&this->skelAnime, &object_dodojr_Anim_000860, 1.8f, 0.0f, lastFrame, ANIMMODE_LOOP_INTERP,
-10.0f);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_UP);
this->actor.world.pos.y -= 60.0f;
this->actor.flags |= 1;