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

renamed Actor.unk16C_4 to Actor.volatile_initialized

Browse Source
This commit is contained in:
mariob92
2024-09-10 11:20:14 +02:00
parent b77274c9ea
commit 062344a1fb
192 changed files with 430 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/FP/ch/bearcub.c
View File

@@ -85,8 +85,8 @@ void func_8038A384(Actor *this){
enum asset_e sp38;
s32 sp34;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = FALSE;
switch(this->marker->id){
case MARKER_1FA_POLAR_BEAR_CUB_BLUE://L8038A404

4
src/FP/ch/boggy1.c
View File

@@ -108,8 +108,8 @@ void func_8038787C(ActorMarker *marker){
void func_8038794C(Actor *this){
int i;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
marker_setCollisionScripts(this->marker, NULL, func_80387754, NULL);
this->unk38_31 = 1;

6
src/FP/ch/boggy2.c
View File

@@ -64,7 +64,7 @@ Actor *func_80388740(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
func_8033A45C(1, 1);
func_8033A45C(3, 1);
this = actor_draw(marker, gfx, mtx, vtx);
if(this->unk16C_4 && marker->unk14_21){
if(this->volatile_initialized && marker->unk14_21){
if( this->state == 4
|| this->state == 5
|| this->state == 6
@@ -405,8 +405,8 @@ void func_803896FC(Actor *this){
sp54 = time_getDelta();
func_8024E55C(0, sp3C);
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->unk40_23 = FALSE;
this->marker->propPtr->unk8_3 = FALSE;
this->marker->unk2C_1 = TRUE;

4
src/FP/ch/boggy3.c
View File

@@ -44,8 +44,8 @@ int func_80390334(void){
void func_80390388(Actor *this){
actor_collisionOff(this);
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(jiggyscore_isSpawned(JIGGY_2E_FP_PRESENTS) || jiggyscore_isCollected(JIGGY_2E_FP_PRESENTS)){
levelSpecificFlags_set(0x11, TRUE);
levelSpecificFlags_set(0x12, TRUE);

8
src/FP/ch/cavewozza.c
View File

@@ -21,8 +21,8 @@ extern ActorInfo D_80392700 = { MARKER_20F_WOZZA_IN_CAVE, ACTOR_33F_WOZZA_IN_CAV
/* .code */
void func_80390630(Actor *this){
if(volatileFlag_get(VOLATILE_FLAG_C4_WOZZA_HIDE_IN_SNS_PARADE)){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = FALSE;
actor_collisionOff(this);
this->unk58_0 = FALSE;
@@ -30,8 +30,8 @@ void func_80390630(Actor *this){
return;
}
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = FALSE;
actor_collisionOn(this);
this->unk38_31 = jiggyscore_isCollected(JIGGY_32_FP_WOZZA) || levelSpecificFlags_get(0x26) ? 0 : 1;

4
src/FP/ch/present.c
View File

@@ -39,8 +39,8 @@ Actor *func_8038F0F0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
void func_8038F144(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(!jiggyscore_isCollected(JIGGY_2E_FP_PRESENTS)){
this->unk38_31 = TRUE;
this->marker->collidable = FALSE;

4
src/FP/ch/scarfsled.c
View File

@@ -131,8 +131,8 @@ void chScarfSled_update(Actor *this){
__chScarfSled_setState(this, 1);
}
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(jiggyscore_isCollected(JIGGY_2A_FP_BOGGY_1)){
marker_despawn(this->marker);
return;

4
src/FP/ch/snowmanbutton.c
View File

@@ -81,8 +81,8 @@ void FP_func_80386CF8(Actor *this){
this->pitch += (f32)(this->unkF4_8 - 1);
}
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(this->state == 3){
fp_snowmanButtonGame_decRemaining();
}

4
src/FP/ch/twinkly.c
View File

@@ -257,8 +257,8 @@ void func_8038C9A0(Actor *this){
}
other = marker_getActor(this->unk100);
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->unk18 = &FP_D_80392018;
this->unk38_31 = 0;
if(0.0f != other->velocity[0]){

4
src/FP/ch/twinklybox.c
View File

@@ -292,8 +292,8 @@ void func_8038D6C8(Actor *this){
this->marker->propPtr->unk8_3 = TRUE;
actor_collisionOn(this);
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setFreeMethod(this->marker, func_8038D3B0);
marker_setCollisionScripts(this->marker, NULL, func_8038D5C8, NULL);
this->unk38_31 = 0;

4
src/FP/ch/twinklymuncher.c
View File

@@ -102,8 +102,8 @@ void func_8038E094(Actor *this){
Actor *sp38;
f32 sp34 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, NULL, func_8038DEB8, NULL);
this->marker->propPtr->unk8_3 = TRUE;
animctrl_setAnimTimer(this->animctrl, 0.99999f);

8
src/FP/ch/wozza.c
View File

@@ -173,8 +173,8 @@ void FP_func_8038F7AC(Actor *this){
ActorLocal_Wozza * local = (ActorLocal_Wozza *)&this->local;
if(volatileFlag_get(VOLATILE_FLAG_C4_WOZZA_HIDE_IN_SNS_PARADE)){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = FALSE;
actor_collisionOff(this);
this->unk58_0 = FALSE;
@@ -183,8 +183,8 @@ void FP_func_8038F7AC(Actor *this){
return;
}
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = FALSE;
if(jiggyscore_isCollected(JIGGY_32_FP_WOZZA)){
func_8038F274();

4
src/FP/ch/xmastree.c
View File

@@ -87,8 +87,8 @@ void chXmasTree_update(Actor *this){
f32 sp2C = time_getDelta();
u8 tmp_a0;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
this->marker->collidable = FALSE;
marker_setFreeMethod(this->marker, __chXmasTree_free);

4
src/FP/ch/xmastreeeggtoll.c
View File

@@ -66,8 +66,8 @@ void func_80390E78(ActorMarker *this_marker, ActorMarker *other_marker){
}
void func_80390EB0(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
actor_collisionOn(this);
marker_setCollisionScripts(this->marker, func_80390E78, NULL, NULL);
}

4
src/FP/ch/xmastreeice.c
View File

@@ -86,8 +86,8 @@ void func_80390B70(Actor *this){
void func_80390BDC(Actor *this){
this->marker->propPtr->unk8_3 = TRUE;
actor_collisionOff(this);
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(jiggyscore_isCollected(JIGGY_2F_FP_XMAS_TREE)){
marker_despawn(this->marker);
}

4
src/FP/ch/xmastreestar.c
View File

@@ -63,8 +63,8 @@ void func_8038ECD8(Actor *this){
return;
}
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, NULL, func_8038EC34, NULL);
this->marker->propPtr->unk8_3 = TRUE;
player_getPosition(D_803935D0);

4
src/FP/ch/xmastreeswitch.c
View File

@@ -74,8 +74,8 @@ void func_8038E940(Actor *this){
return;
}//L8038E9B8
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
this->marker->collidable = FALSE;
marker_setCollisionScripts(this->marker, NULL, func_8038E7CC, NULL);

4
src/FP/code_19E0.c
View File

@@ -104,8 +104,8 @@ void func_8038811C(ActorMarker *this_marker, ActorMarker *other_marker){
}
void func_803881AC(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3)){
marker_despawn(this->marker);
return;

4
src/FP/code_1FF0.c
View File

@@ -44,8 +44,8 @@ void func_803884F4(ActorMarker *this_marker, ActorMarker *other_marker){
}
void func_80388584(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3)){
marker_despawn(this->marker);
return;

4
src/FP/code_A1C0.c
View File

@@ -13,8 +13,8 @@ ActorInfo D_803926C0 = { 0x20E, 0x33E, 0x49C,
/* .code */
void func_803905B0(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
actor_collisionOff(this);
}
this->marker->propPtr->unk8_3 = func_8038DD14(this) ? TRUE : FALSE;

12
src/FP/code_ABD0.c
View File

@@ -79,8 +79,8 @@ void func_80391040(Actor *this){
f32 sp34[3];
s32 a1;
s32 sp2C;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
actor_collisionOff(this);
this->marker->propPtr->unk8_3 = TRUE;
}
@@ -119,8 +119,8 @@ void func_80391040(Actor *this){
}
void func_80391180(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
actor_collisionOff(this);
}
@@ -133,8 +133,8 @@ void func_80391180(Actor *this){
void FP_func_80391254(Actor *this){
func_802D3D74(this);
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(this->marker->id == 0x221 || this->marker->id == 0x223){
this->pitch = 3.0f;
}