mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-11 01:10:33 +00:00
Bg_Haka_Gate (#557)
* Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * match * sfx fix * should be good to go * comments and such * Matrix macros escape me * format * fix bubble * remove comments Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: fig <fig02srl@gmail.com>
This commit is contained in:
parent
22758f06d7
commit
c71b8183ae
27 changed files with 366 additions and 1214 deletions
|
@ -212,8 +212,7 @@ void EnBb_Init(Actor* thisx, GlobalContext* globalCtx) {
|
|||
EnBb* this = THIS;
|
||||
|
||||
Actor_ProcessInitChain(thisx, sInitChain);
|
||||
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06001A30, &D_06000444, this->limbDrawTbl, this->transitionDrawTbl,
|
||||
16);
|
||||
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06001A30, &D_06000444, this->jointTable, this->morphTable, 16);
|
||||
this->unk_254 = 0;
|
||||
thisx->colChkInfo.health = 4;
|
||||
Collider_InitJntSph(globalCtx, &this->collider);
|
||||
|
@ -829,8 +828,7 @@ void EnBb_White(EnBb* this, GlobalContext* globalCtx) {
|
|||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_BUBLE_LAUGH);
|
||||
}
|
||||
|
||||
if ((this->maxSpeed != 0.0f) &&
|
||||
(((s32)this->skelAnime.curFrame == 0) || ((s32)this->skelAnime.curFrame == 5))) {
|
||||
if ((this->maxSpeed != 0.0f) && (((s32)this->skelAnime.curFrame == 0) || ((s32)this->skelAnime.curFrame == 5))) {
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_BUBLE_MOUTH);
|
||||
} else if (((s32)this->skelAnime.curFrame == 2) || ((s32)this->skelAnime.curFrame == 7)) {
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_BUBLE_WING);
|
||||
|
|
|
@ -11,8 +11,8 @@ typedef void (*EnBbActionFunc)(struct EnBb*, GlobalContext*);
|
|||
typedef struct EnBb {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ SkelAnime skelAnime;
|
||||
/* 0x0190 */ Vec3s limbDrawTbl[16];
|
||||
/* 0x01F0 */ Vec3s transitionDrawTbl[16];
|
||||
/* 0x0190 */ Vec3s jointTable[16];
|
||||
/* 0x01F0 */ Vec3s morphTable[16];
|
||||
/* 0x0250 */ s32 action;
|
||||
/* 0x0254 */ s32 unk_254; // unused
|
||||
/* 0x0258 */ EnBbActionFunc actionFunc;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue