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

16
src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
View file

@ -5,6 +5,7 @@
*/
#include "z_en_ma3.h"
#include "objects/object_ma2/object_ma2.h"
#define FLAGS 0x00000039
@ -65,11 +66,6 @@ static struct_D_80AA1678 D_80AA3848[] = {
{ 0x06009EE0, 1.0f, ANIMMODE_LOOP, -10.0f },
};
extern u32 D_06005420;
extern FlexSkeletonHeader D_06008D90;
extern AnimationHeader D_060093BC;
extern AnimationHeader D_06009EE0;
u16 func_80AA2AA0(GlobalContext* globalCtx, Actor* thisx) {
Player* player = PLAYER;
s16* timer1ValuePtr; // weirdness with this necessary to match
@ -181,7 +177,7 @@ void func_80AA2E54(EnMa3* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
s16 phi_a3;
if ((this->unk_1E0.unk_00 == 0) && (this->skelAnime.animation == &D_06009EE0)) {
if ((this->unk_1E0.unk_00 == 0) && (this->skelAnime.animation == &object_ma2_Anim_009EE0)) {
phi_a3 = 1;
} else {
phi_a3 = 0;
@ -206,7 +202,7 @@ s32 func_80AA2EC8(EnMa3* this, GlobalContext* globalCtx) {
}
s32 func_80AA2F28(EnMa3* this) {
if (this->skelAnime.animation != &D_06009EE0) {
if (this->skelAnime.animation != &object_ma2_Anim_009EE0) {
return 0;
}
if (this->unk_1E0.unk_00 != 0) {
@ -242,7 +238,7 @@ void EnMa3_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06008D90, NULL, NULL, NULL, 0);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma2_Skel_008D90, NULL, NULL, NULL, 0);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(22), &sColChkInfoInit);
@ -338,8 +334,8 @@ void EnMa3_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
if (limbIndex == 18) {
Matrix_MultVec3f(&vec, &this->actor.focus.pos);
}
if ((limbIndex == 14) && (this->skelAnime.animation == &D_060093BC)) {
gSPDisplayList(POLY_OPA_DISP++, &D_06005420);
if ((limbIndex == 14) && (this->skelAnime.animation == &object_ma2_Anim_0093BC)) {
gSPDisplayList(POLY_OPA_DISP++, &object_ma2_DL_005420);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ma3.c", 950);