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

9
src/overlays/actors/ovl_En_Dha/z_en_dha.c
View file

@ -6,6 +6,7 @@
#include "z_en_dha.h"
#include "overlays/actors/ovl_En_Dh/z_en_dh.h"
#include "objects/object_dh/object_dh.h"
#define FLAGS 0x00000015
@ -148,9 +149,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_STOP),
};
extern FlexSkeletonHeader D_06000BD8;
extern AnimationHeader D_060015B0;
void EnDha_SetupAction(EnDha* this, EnDhaActionFunc actionFunc) {
this->actionFunc = actionFunc;
}
@ -160,7 +158,8 @@ void EnDha_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->actor, sInitChain);
this->actor.colChkInfo.damageTable = &sDamageTable;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06000BD8, &D_060015B0, this->jointTable, this->morphTable, 4);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dh_Skel_000BD8, &object_dh_Anim_0015B0, this->jointTable,
this->morphTable, 4);
ActorShape_Init(&this->actor.shape, 0, ActorShadow_DrawFeet, 90.0f);
this->actor.focus.pos = this->actor.world.pos;
this->actor.focus.pos.y += 50.0f;
@ -182,7 +181,7 @@ void EnDha_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void EnDha_SetupWait(EnDha* this) {
Animation_PlayLoop(&this->skelAnime, &D_060015B0);
Animation_PlayLoop(&this->skelAnime, &object_dh_Anim_0015B0);
this->unk_1C0 = 0;
this->actionTimer = ((Rand_ZeroOne() * 10.0f) + 5.0f);
this->actor.speedXZ = 0.0f;