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

35
src/overlays/actors/ovl_En_Tr/z_en_tr.c
View file

@ -5,6 +5,7 @@
*/
#include "z_en_tr.h"
#include "objects/object_tr/object_tr.h"
#define FLAGS 0x00000010
@ -81,14 +82,6 @@ static void* sEyeTextures[] = {
0x060098D8, // Closed
};
extern AnimationHeader D_060013CC; // Looking over right shoulder
extern AnimationHeader D_06001CDC; // Standing, broom in left hand
extern AnimationHeader D_060035CC; // Looking over left shoulder
extern AnimationHeader D_06003FC8; // Standing, broom over right shoulder
extern AnimationHeader D_060049C8; // Floating on broom
extern FlexSkeletonHeader D_0600C530;
extern FlexSkeletonHeader D_06011688;
void EnTr_SetupAction(EnTr* this, EnTrActionFunc actionFunc) {
this->actionFunc = actionFunc;
}
@ -104,18 +97,18 @@ void EnTr_Init(Actor* thisx, GlobalContext* globalCtx) {
switch (this->actor.params) {
case TR_KOUME:
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06011688, &D_06003FC8, this->jointTable,
this->morphTable, 27);
Animation_PlayOnce(&this->skelAnime, &D_06003FC8);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_tr_Skel_011688, &object_tr_Anim_003FC8,
this->jointTable, this->morphTable, 27);
Animation_PlayOnce(&this->skelAnime, &object_tr_Anim_003FC8);
this->animation = NULL;
EnTr_SetupAction(this, EnTr_ChooseAction1);
this->actionIndex = 3;
break;
case TR_KOTAKE:
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600C530, &D_06001CDC, this->jointTable,
this->morphTable, 27);
Animation_PlayOnce(&this->skelAnime, &D_06001CDC);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_tr_Skel_00C530, &object_tr_Anim_001CDC,
this->jointTable, this->morphTable, 27);
Animation_PlayOnce(&this->skelAnime, &object_tr_Anim_001CDC);
this->animation = NULL;
EnTr_SetupAction(this, EnTr_ChooseAction1);
this->actionIndex = 2;
@ -310,7 +303,7 @@ void EnTr_WaitToReappear(EnTr* this, GlobalContext* globalCtx) {
this->timer = 34;
EnTr_SetStartPosRot(this, globalCtx, this->actionIndex);
EnTr_SetupAction(this, EnTr_Reappear);
Animation_PlayLoop(&this->skelAnime, &D_060049C8);
Animation_PlayLoop(&this->skelAnime, &object_tr_Anim_0049C8);
this->animation = NULL;
Actor_SetScale(&this->actor, 0.003f);
}
@ -359,7 +352,7 @@ void EnTr_ChooseAction1(EnTr* this, GlobalContext* globalCtx) {
case 3:
EnTr_SetStartPosRot(this, globalCtx, this->actionIndex);
EnTr_SetupAction(this, EnTr_ChooseAction2);
Animation_PlayLoop(&this->skelAnime, &D_060049C8);
Animation_PlayLoop(&this->skelAnime, &object_tr_Anim_0049C8);
this->animation = NULL;
break;
@ -370,7 +363,7 @@ void EnTr_ChooseAction1(EnTr* this, GlobalContext* globalCtx) {
case 7:
EnTr_SetupAction(this, EnTr_FlyKidnapCutscene);
Animation_PlayLoop(&this->skelAnime, &D_060049C8);
Animation_PlayLoop(&this->skelAnime, &object_tr_Anim_0049C8);
this->animation = NULL;
this->timer =
((this->actor.params != TR_KOUME) ? ((u8)frames * 0x400) + 0x8000 : (u8)frames * 0x400);
@ -389,17 +382,17 @@ void EnTr_Update(Actor* thisx, GlobalContext* globalCtx) {
if (SkelAnime_Update(&this->skelAnime) != 0) {
if (this->animation != NULL) {
if ((this->animation == &D_060035CC) || (this->animation == &D_060013CC)) {
if ((this->animation == &object_tr_Anim_0035CC) || (this->animation == &object_tr_Anim_0013CC)) {
if (this->actor.params != TR_KOUME) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_LAUGH2);
} else {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_LAUGH);
}
Animation_PlayLoop(&this->skelAnime, this->animation);
} else if (this->animation == &D_060049C8) {
} else if (this->animation == &object_tr_Anim_0049C8) {
EnTr_SetupAction(this, EnTr_ChooseAction2);
Animation_Change(&this->skelAnime, &D_060049C8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060049C8),
ANIMMODE_LOOP, -5.0f);
Animation_Change(&this->skelAnime, &object_tr_Anim_0049C8, 1.0f, 0.0f,
Animation_GetLastFrame(&object_tr_Anim_0049C8), ANIMMODE_LOOP, -5.0f);
} else {
Animation_PlayLoop(&this->skelAnime, this->animation);
}