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

46
src/overlays/actors/ovl_En_Sw/z_en_sw.c
View file

@ -1,4 +1,5 @@
#include "z_en_sw.h"
#include "objects/object_st/object_st.h"
#define FLAGS 0x00000015
@ -49,27 +50,14 @@ static ColliderJntSphInit sJntSphInit = {
static CollisionCheckInfoInit2 D_80B0F074 = { 1, 2, 25, 25, MASS_IMMOVABLE };
static struct_80034EC0_Entry D_80B0F080[] = {
{ 0x06000304, 1.0f, 0.0f, -1.0f, 0x01, 0.0f },
{ 0x06000304, 1.0f, 0.0f, -1.0f, 0x01, -8.0f },
{ 0x060055A8, 1.0f, 0.0f, -1.0f, 0x01, -8.0f },
{ 0x06005B98, 1.0f, 0.0f, -1.0f, 0x01, -8.0f },
{ &object_st_Anim_000304, 1.0f, 0.0f, -1.0f, 0x01, 0.0f },
{ &object_st_Anim_000304, 1.0f, 0.0f, -1.0f, 0x01, -8.0f },
{ &object_st_Anim_0055A8, 1.0f, 0.0f, -1.0f, 0x01, -8.0f },
{ &object_st_Anim_005B98, 1.0f, 0.0f, -1.0f, 0x01, -8.0f },
};
char D_80B0F630[0x80]; // unused
extern SkeletonHeader D_06005298;
extern Gfx D_06004788[];
extern Gfx D_060046F0[];
extern Gfx D_06004658[];
extern Gfx D_060045C0[];
extern Gfx D_06004820[];
extern Gfx D_060048B8[];
extern Gfx D_06004950[];
extern Gfx D_060049E8[];
extern Gfx D_06003FB0[];
extern Gfx D_060043D8[];
extern AnimationHeader D_06000304;
void EnSw_CrossProduct(Vec3f* a, Vec3f* b, Vec3f* dst) {
dst->x = (a->y * b->z) - (a->z * b->y);
dst->y = (a->z * b->x) - (a->x * b->z);
@ -242,7 +230,7 @@ void EnSw_Init(Actor* thisx, GlobalContext* globalCtx) {
return;
}
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06005298, NULL, this->jointTable, this->morphTable, 30);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_st_Skel_005298, NULL, this->jointTable, this->morphTable, 30);
func_80034EC0(&this->skelAnime, D_80B0F080, 0);
ActorShape_Init(&thisx->shape, 0.0f, NULL, 0.0f);
Collider_InitJntSph(globalCtx, &this->collider);
@ -789,7 +777,7 @@ void func_80B0E314(EnSw* this, Vec3f arg1, f32 arg4) {
s32 func_80B0E430(EnSw* this, f32 arg1, s16 arg2, s32 arg3, GlobalContext* globalCtx) {
Camera* activeCam;
f32 lastFrame = Animation_GetLastFrame(&D_06000304);
f32 lastFrame = Animation_GetLastFrame(&object_st_Anim_000304);
if (DECR(this->unk_388) != 0) {
Math_SmoothStepToF(&this->skelAnime.playSpeed, 0.0f, 0.6f, 1000.0f, 0.01f);
@ -917,34 +905,34 @@ s32 EnSw_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
if (((this->actor.params & 0xE000) >> 0xD) != 0) {
switch (limbIndex) {
case 23:
*dList = D_06004788;
*dList = object_st_DL_004788;
break;
case 8:
*dList = D_060046F0;
*dList = object_st_DL_0046F0;
break;
case 14:
*dList = D_06004658;
*dList = object_st_DL_004658;
break;
case 11:
*dList = D_060045C0;
*dList = object_st_DL_0045C0;
break;
case 26:
*dList = D_06004820;
*dList = object_st_DL_004820;
break;
case 20:
*dList = D_060048B8;
*dList = object_st_DL_0048B8;
break;
case 17:
*dList = D_06004950;
*dList = object_st_DL_004950;
break;
case 29:
*dList = D_060049E8;
*dList = object_st_DL_0049E8;
break;
case 5:
*dList = D_06003FB0;
*dList = object_st_DL_003FB0;
break;
case 4:
*dList = D_060043D8;
*dList = object_st_DL_0043D8;
break;
}
}