core2/code_94A20.c progress

This commit is contained in:
Banjo Kazooie
2022-08-19 13:49:30 -05:00
parent 51f66770d9
commit 07ca1d783d
56 changed files with 219 additions and 130 deletions

View File

@@ -64,7 +64,7 @@ void func_8038D47C(Actor *this){
if(!this->unk16C_4){
mapSpecificFlags_set(0x10, 0);
this->unk16C_4 = TRUE;
if(func_803203FC(0xC1) && func_8031B4F4() == -3){
if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -3){
timedFunc_set_1(1.5f, (TFQM1)func_8038D450, reinterpret_cast(s32, this->marker));
}
}//L8038D5EC
@@ -121,7 +121,7 @@ void func_8038D47C(Actor *this){
FUNC_8030E624(SFX_D6_UGH, 0.8f, 32750);
}
if(actor_animationIsAt(this, 0.94f)){
if(!func_803203FC(0xC1)){
if(!func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
mapSpecificFlags_set(0x10, 1);
}
}

View File

@@ -118,7 +118,7 @@ void func_8038DBDC(Actor *this){
func_8038DB4C(0);
this->unk1C[0] = 0.0f;
}//L8038DC90
if(func_8038E178() != (s32)this->unk1C[0] || func_803203FC(0xC1)){
if(func_8038E178() != (s32)this->unk1C[0] || func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
if(15.0f <= this->unk60){
func_80328B8C(this, 2, 0.01f, 1);
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_ONCE);