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

6
src/overlays/actors/ovl_En_Mu/z_en_mu.c
View file

@ -5,6 +5,7 @@
*/
#include "z_en_mu.h"
#include "objects/object_mu/object_mu.h"
#define FLAGS 0x00000009
@ -18,9 +19,6 @@ void EnMu_Draw(Actor* thisx, GlobalContext* globalCtx);
void EnMu_Pose(EnMu* this, GlobalContext* globalCtx);
s16 EnMu_CheckDialogState(GlobalContext* globalCtx, Actor* thisx);
extern AnimationHeader D_060003F4;
extern FlexSkeletonHeader D_06004F70;
static ColliderCylinderInit D_80AB0BD0 = {
{
COLTYPE_NONE,
@ -135,7 +133,7 @@ void EnMu_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 160.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004F70, &D_060003F4, NULL, NULL, 0);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_mu_Skel_004F70, &object_mu_Anim_0003F4, NULL, NULL, 0);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &D_80AB0BD0);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &D_80AB0BFC);