kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

core2/code_94A20.c progress

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core2/ch/beehive.c
View File

@@ -40,7 +40,7 @@ void func_802CE8D4(Actor *this){
this->marker->propPtr->unk8_3 = 1;
this->unk44_31 = func_8030D90C();
this->unk16C_4 = 1;
this->unk38_0 = func_803203FC(1)| func_803203FC(0x1F);
this->unk38_0 = func_803203FC(1)| func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE);
}//L802CE960
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK){
if(func_8038BFA0()){

2
src/core2/ch/bigbutt.c
View File

@@ -44,7 +44,7 @@ void func_802C5E80(Actor *this){
}
void func_802C5EB8(Actor *this){
if(func_803203FC(0xC1))
if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE))
return;
if(this->unk38_31){

2
src/core2/ch/code_468E0.c
View File

@@ -36,7 +36,7 @@ void func_802CD8C0(Actor *this){
this->marker->unk2C_1 = 1;
this->marker->collidable = 0;
*(s32*)this->unkBC = 0; //TODO Make struct
if(func_803203FC(1) || func_803203FC(0x1F)){
if(func_803203FC(1) || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){
marker_despawn(this->marker);
return;
}

2
src/core2/ch/ghost.c
View File

@@ -174,7 +174,7 @@ void func_8035B6CC(Actor *this){
void func_8035B75C(Actor *this){
func_80328B8C(this, 3, 0.01f, 1);
actor_loopAnimation(this);
this->unk28 = func_803203FC(0xC1) ? 0.0 : 12.0;
this->unk28 = func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0.0 : 12.0;
func_8030E878(0x3F4, randf2(1.0f, 1.2f), 32000, this->position, this->scale*400.0f, this->scale*1800.0f);
}

2
src/core2/ch/icecube.c
View File

@@ -301,7 +301,7 @@ void chicecube_update(Actor *this){
case 1: // L8035AC9C
animctrl_setAnimTimer(this->animctrl, 0.0f);
if( func_80359DF4(this, 900)
|| (this->unkF4_8 == 2 && func_803203FC(0xC1))
|| (this->unkF4_8 == 2 && func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE))
){
func_80328B8C(this, 2, 0.0001f, 1);
actor_playAnimationOnce(this);

2
src/core2/ch/jinjo.c
View File

@@ -115,7 +115,7 @@ void func_802CDD78(Actor * this){
local->unk8 = (this->position_y < func_80309B24(this->position));
this->marker->unkC = func_802CDBA8;
func_803300D8(this->marker, func_802CDD3C);
if(func_803203FC(0xc1)){
if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
marker_despawn(this->marker);
}
}//L802CDE24

2
src/core2/ch/trainers.c
View File

@@ -61,7 +61,7 @@ void chtrainers_update(Actor *this){
ml_vec3f_copy(this->unk1C, this->position);
this->velocity[0] = this->yaw;
this->velocity[1] = 0.0f;
this->unk10_12 = !func_803203FC(0x1f) && !func_803203FC(0x1);
this->unk10_12 = !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE) && !func_803203FC(0x1);
func_80328A84(this, 0);
}

2
src/core2/ch/wadingboots.c
View File

@@ -32,7 +32,7 @@ void chwadingboots_update(Actor *this){
if(!this->initialized){
this->initialized = TRUE;
this->velocity[0] = this->yaw;
this->unk10_12 = !func_803203FC(0x1f) && !func_803203FC(0x1);
this->unk10_12 = !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE) && !func_803203FC(0x1);
func_80328A84(this, 0);
}