mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-08 15:30:14 +00:00
Some cleanup and docs for z_skelanime (#601)
* docs and enums * bgcheck merge Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
petrie911
GitHub
parent
7a171488d2
commit
115c152b03
65 changed files with 701 additions and 423 deletions
|
|
@ -206,7 +206,7 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx) {
|
|||
func_80B13AA0(this, func_80B16608, func_80B16938);
|
||||
Animation_Change(&this->skelAnime, &D_0600C48C, 1.0f,
|
||||
Animation_GetLastFrame(&D_0600C48C) - 1.0f,
|
||||
Animation_GetLastFrame(&D_0600C48C), 2, 0.0f);
|
||||
Animation_GetLastFrame(&D_0600C48C), ANIMMODE_ONCE, 0.0f);
|
||||
gSaveContext.eventInf[0] &= ~0x400;
|
||||
} else {
|
||||
func_80B13AA0(this, func_80B16504, func_80B16854);
|
||||
|
|
@ -554,7 +554,8 @@ void func_80B14EDC(EnTa* this, GlobalContext* globalCtx) {
|
|||
void func_80B14F20(EnTa* this, EnTaActionFunc arg1) {
|
||||
func_80B13AA0(this, arg1, func_80B16854);
|
||||
this->unk_2B4 = 2;
|
||||
Animation_Change(&this->skelAnime, &D_060017E8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060017E8), 2, -5.0f);
|
||||
Animation_Change(&this->skelAnime, &D_060017E8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060017E8), ANIMMODE_ONCE,
|
||||
-5.0f);
|
||||
this->unk_2E2 = 0;
|
||||
this->unk_2E4 = &D_060017E8;
|
||||
}
|
||||
|
|
@ -563,7 +564,8 @@ void func_80B14FAC(EnTa* this, EnTaActionFunc arg1) {
|
|||
this->unk_2B4 = 1;
|
||||
func_80B13AA0(this, arg1, func_80B16938);
|
||||
this->unk_2E0 &= ~0x10;
|
||||
Animation_Change(&this->skelAnime, &D_0600C48C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600C48C), 2, -5.0f);
|
||||
Animation_Change(&this->skelAnime, &D_0600C48C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600C48C), ANIMMODE_ONCE,
|
||||
-5.0f);
|
||||
}
|
||||
|
||||
void func_80B15034(EnTa* this, GlobalContext* globalCtx) {
|
||||
|
|
@ -596,7 +598,7 @@ void func_80B15100(EnTa* this, GlobalContext* globalCtx) {
|
|||
s32 unk_2CA;
|
||||
|
||||
Animation_Change(&this->skelAnime, &D_0600C48C, 1.0f, Animation_GetLastFrame(&D_0600C48C) - 1.0f,
|
||||
Animation_GetLastFrame(&D_0600C48C), 2, 10.0f);
|
||||
Animation_GetLastFrame(&D_0600C48C), ANIMMODE_ONCE, 10.0f);
|
||||
this->unk_2E0 &= ~0x10;
|
||||
func_80106CCC(globalCtx);
|
||||
unk_2CA = this->unk_2CA;
|
||||
|
|
@ -643,10 +645,10 @@ s32 func_80B152D0(EnTa* this, GlobalContext* globalCtx) {
|
|||
void func_80B15308(EnTa* this) {
|
||||
if (this->unk_2E0 & 0x10) {
|
||||
if (this->unk_2E0 & 0x100) {
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 17.0f, 22.0f, 2, 0.0f);
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 17.0f, 22.0f, ANIMMODE_ONCE, 0.0f);
|
||||
this->unk_2E0 &= ~0x100;
|
||||
} else {
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, -1.0f, 21.0f, 16.0f, 2, 3.0f);
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, -1.0f, 21.0f, 16.0f, ANIMMODE_ONCE, 3.0f);
|
||||
this->unk_2E0 |= 0x100;
|
||||
}
|
||||
this->unk_2E0 &= ~0x10;
|
||||
|
|
@ -699,7 +701,7 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
|
|||
this->unk_2C4[i]--;
|
||||
} else {
|
||||
this->unk_2CA = i;
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, 2, -10.0f);
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
|
||||
this->unk_2E0 &= ~0x10;
|
||||
|
||||
switch (func_80B152D0(this, globalCtx)) {
|
||||
|
|
@ -708,7 +710,7 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
|
|||
func_8002DF54(globalCtx, &this->actor, 1);
|
||||
func_8010B680(globalCtx, 0x2084, &this->actor);
|
||||
this->unk_25C = func_80B15424;
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, 2, -10.0f);
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
|
||||
this->unk_2E0 &= ~0x10;
|
||||
this->unk_2E0 &= ~0x100;
|
||||
gSaveContext.eventInf[0] |= 0x100;
|
||||
|
|
@ -751,7 +753,7 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
|
|||
func_80B14E28(this, globalCtx);
|
||||
gSaveContext.eventInf[0] &= ~0x100;
|
||||
this->unk_2E0 |= 0x80;
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, 2, -10.0f);
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
|
||||
this->unk_2E0 &= ~0x10;
|
||||
this->unk_2E0 &= ~0x100;
|
||||
}
|
||||
|
|
@ -795,7 +797,7 @@ void func_80B1585C(EnTa* this, GlobalContext* globalCtx) {
|
|||
func_80B13AA0(this, func_80B154FC, func_80B16938);
|
||||
this->unk_2E0 &= ~0x10;
|
||||
Animation_Change(&this->skelAnime, &D_0600C48C, 1.0f, Animation_GetLastFrame(&D_0600C48C) - 1.0f,
|
||||
Animation_GetLastFrame(&D_0600C48C), 2, 10.0f);
|
||||
Animation_GetLastFrame(&D_0600C48C), ANIMMODE_ONCE, 10.0f);
|
||||
func_8002DF54(globalCtx, &this->actor, 7);
|
||||
}
|
||||
}
|
||||
|
|
@ -804,7 +806,8 @@ void func_80B15AD4(EnTa* this, GlobalContext* globalCtx) {
|
|||
if (this->unk_2CC == 0 && this->unk_2E0 & 0x20) {
|
||||
func_80B13AA0(this, func_80B1585C, func_80B16938);
|
||||
this->unk_2E0 &= ~0x10;
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 1.0f, Animation_GetLastFrame(&D_0600BF38), 2, 0.0f);
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 1.0f, Animation_GetLastFrame(&D_0600BF38), ANIMMODE_ONCE,
|
||||
0.0f);
|
||||
this->unk_2CC = 50;
|
||||
func_80088B34(0x1E);
|
||||
func_800F5ACC(0x6C);
|
||||
|
|
@ -824,7 +827,7 @@ void func_80B15BF8(EnTa* this, GlobalContext* globalCtx) {
|
|||
if (this->unk_2E0 & 0x10) {
|
||||
func_80B13AA0(this, func_80B15AD4, func_80B16938);
|
||||
this->unk_2E0 &= ~0x10;
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 0.0f, 1.0f, 2, 0.0f);
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 0.0f, 1.0f, ANIMMODE_ONCE, 0.0f);
|
||||
this->unk_2CC = 5;
|
||||
}
|
||||
if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) {
|
||||
|
|
@ -837,7 +840,7 @@ void func_80B15CC8(EnTa* this, GlobalContext* globalCtx) {
|
|||
if (this->unk_2E0 & 0x10) {
|
||||
func_80B13AA0(this, func_80B15BF8, func_80B16938);
|
||||
this->unk_2E0 &= ~0x10;
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, -1.0f, 29.0f, 0.0f, 2, 10.0f);
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, -1.0f, 29.0f, 0.0f, ANIMMODE_ONCE, 10.0f);
|
||||
}
|
||||
if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) {
|
||||
this->unk_2E0 |= 0x20;
|
||||
|
|
@ -848,7 +851,7 @@ void func_80B15CC8(EnTa* this, GlobalContext* globalCtx) {
|
|||
void func_80B15D90(EnTa* this, GlobalContext* globalCtx) {
|
||||
func_80B13AA0(this, func_80B15CC8, func_80B16938);
|
||||
this->unk_2E0 &= ~0x10;
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, 2, -10.0f);
|
||||
Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
|
||||
func_8010B720(globalCtx, 0x2080);
|
||||
this->unk_2E0 &= ~0x20;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue