core2/code_94A20.c progress
This commit is contained in:
@@ -109,7 +109,7 @@ void func_8038A384(Actor *this){
|
||||
}//L8038A4A0
|
||||
|
||||
if( jiggyscore_isCollected(JIGGY_2E_FP_PRESENTS)
|
||||
|| func_803203FC(0xC1)
|
||||
|| func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)
|
||||
){
|
||||
func_80328B8C(this, 2, randf2(0.0f, 0.9f), 1);
|
||||
}
|
||||
|
@@ -259,7 +259,7 @@ void func_8038C8F0(ActorMarker *marker){
|
||||
|
||||
void func_8038C94C(ActorMarker *caller, enum asset_e text_id, s32 arg2){
|
||||
Actor *this = marker_getActor(caller);
|
||||
if(!func_803203FC(0xC1)){
|
||||
if(!func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
|
||||
func_80328A84(this, 6);
|
||||
func_802C3C88(func_8038C8F0, this->marker);
|
||||
}
|
||||
|
@@ -315,14 +315,14 @@ void func_8038D6C8(Actor *this){
|
||||
this->velocity[1] = 0.0f;
|
||||
this->unk1C[0] = -1.0f;
|
||||
func_8028F8F8(7, FALSE);
|
||||
if(func_803203FC(0xC1) && func_8031B4F4() == -1){
|
||||
if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -1){
|
||||
func_80328B8C(this, 3, 0.001f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
this->velocity[0] = 1.0f;
|
||||
}
|
||||
}//L8038D844
|
||||
|
||||
if(func_803203FC(0xc1)){
|
||||
if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
|
||||
this->velocity[0] = 1.0f;
|
||||
}
|
||||
|
||||
|
@@ -112,7 +112,7 @@ void func_8038E094(Actor *this){
|
||||
func_8038DDC8(this);
|
||||
}
|
||||
if(this->unkF4_8 == 2){
|
||||
if(func_803203FC(UNKFLAGS1_C1) && func_8031B4F4() == -2){
|
||||
if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -2){
|
||||
func_8038DDC8(this);
|
||||
}
|
||||
else{
|
||||
|
@@ -214,7 +214,7 @@ void func_8038F7AC(Actor *this){
|
||||
break;
|
||||
}
|
||||
|
||||
if(func_80329530(this, 1000) && !func_803203FC(0x1f)){
|
||||
if(func_80329530(this, 1000) && !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){
|
||||
func_8038F454(this);
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user