mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 06:10:21 +00:00
Code Issues Projects Releases Wiki Activity

z_en_fd, z_en_fd_fire, and z_en_fw (#415)

Browse source 
* EnFd OK

* decompile En_Fd_Fire, document some of En_Fd

* fw wip

* match a few more of ovl_en_fw, properly organize data

* Ovl_En_Fw OK

* Documentation, formatting.

* change Color_RGBA8_n to Color_RGBA8

* PR updates

* fix errors with merge

* review

* dunno why jenkins failed

* review

Co-authored-by: fig <fig02srl@gmail.com>
This commit is contained in:
krimtonz 2020-12-04 13:35:28 -06:00 • committed by GitHub
parent 4beeedd116
commit e983d2b72b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
73 changed files with 1540 additions and 5451 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_En_St/z_en_st.c
View file

@ -741,7 +741,7 @@ void EnSt_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 14.0f);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06005298, NULL, this->limbDrawTable, this->transDrawTable, 30);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06005298, NULL, this->limbDrawTable, this->transitionDrawTable, 30);
func_80034EC0(&this->skelAnime, sAnimations, 0);
this->blureIdx = EnSt_CreateBlureEffect(globalCtx);
EnSt_InitColliders(this, globalCtx);

2
src/overlays/actors/ovl_En_St/z_en_st.h
View file

@ -44,7 +44,7 @@ typedef struct EnSt {
/* 0x040C */ f32 groundYOffset;
/* 0x0410 */ s16 swayAngle;
/* 0x0412 */ Vec3s limbDrawTable[30];
/* 0x04C6 */ Vec3s transDrawTable[30];
/* 0x04C6 */ Vec3s transitionDrawTable[30];
} EnSt; // size = 0x057C
extern const ActorInit En_St_InitVars;