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/core2/ch/beehive.c
View File

@@ -39,11 +39,11 @@ void chBeehive_die(ActorMarker *this, ActorMarker *other){
}
void chBeehive_update(Actor *this){
if(!this->unk16C_4){
if(!this->volatile_initialized){
marker_setCollisionScripts(this->marker, NULL, NULL, chBeehive_die);
this->marker->propPtr->unk8_3 = 1;
this->unk44_31 = func_8030D90C();
this->unk16C_4 = 1;
this->volatile_initialized = TRUE;
this->unk38_0 = volatileFlag_get(VOLATILE_FLAG_1)| volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE);
}//L802CE960
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK){

4
src/core2/ch/bottlesbonus.c
View File

@@ -453,8 +453,8 @@ void chBottlesBonus_update(Actor *this) {
local = (ActorLocal_core2_560F0 *) &this->local;
sp50 = func_8033DDB8();
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
actor_collisionOff(this);
this->unk60 = 0.0f;
D_8037DEB4 = D_8037DEB0 = 0;

4
src/core2/ch/clankerwhipcrack.c
View File

@@ -29,8 +29,8 @@ void func_803567EC(Actor *this){
f32 sp44;
f32 sp40;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->roll = this->yaw;
this->yaw = 0.0f;
func_80356770(this, 1);

4
src/core2/ch/clucker.c
View File

@@ -134,8 +134,8 @@ void func_8035765C(Actor *this){
f32 sp40;
sp50 = time_getDelta();
if( !this->unk16C_4){
this->unk16C_4 = TRUE;
if( !this->volatile_initialized){
this->volatile_initialized = TRUE;
this->unk16C_0 = TRUE;
if(this->state != 6){
marker_setCollisionScripts(this->marker, NULL, func_80357564, func_8035758C);

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

@@ -31,8 +31,8 @@ void func_802CD898(Actor *this){
}
void func_802CD8C0(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->unk2C_1 = 1;
this->marker->collidable = 0;
*(s32*)this->unkBC = 0; //TODO Make struct

4
src/core2/ch/code_CFA60.c
View File

@@ -89,8 +89,8 @@ void func_80356CCC(Actor *this){
f32 sp40;
sp50 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->unk16C_0 = 1;
marker_setCollisionScripts(this->marker, NULL, func_80356BF4, func_80356C24);
func_803569F0(this, (this->state < 5)? 1 : 6);

4
src/core2/ch/crab.c
View File

@@ -235,12 +235,12 @@ void chCrab_update(Actor *this) {
sp34 = globalTimer_getTime();
sp30 = time_getDelta();
is_mutant_snippet = this->modelCacheIndex == ACTOR_F5_MUTIE_SNIPPET;
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
marker_setCollisionScripts(this->marker, __chCrab_touch, __chCrab_ow, __chCrab_die);
func_803300C0(this->marker, &__chCrab_802CB76C);
this->unk124_0 = this->unk138_31 = FALSE;
this->unk138_24 = FALSE;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
animctrl_setTransitionDuration(this->animctrl, 0.25f);
if (map_get() == MAP_A_TTC_SANDCASTLE) {
if (!jiggyscore_isCollected(JIGGY_10_TTC_SANDCASTLE)) {

4
src/core2/ch/drips.c
View File

@@ -69,8 +69,8 @@ int __chdrips_playerWithinDist(Actor *this, s32 arg1){
void chdrips_update(Actor *this){
ParticleEmitter *pCtrl;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
actor_collisionOff(this);
this->unk60 = this->yaw/360.0;
}

4
src/core2/ch/firefx.c
View File

@@ -59,8 +59,8 @@ void __chfirefx_hiss(ActorMarker *marker,ActorMarker *other_marker){
}
void chfirefx_update(Actor *this){
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);
marker_setCollisionScripts(this->marker, __chfirefx_hiss, NULL, NULL);

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

@@ -202,8 +202,8 @@ void func_8035B900(Actor *this){
ActorLocal_Core2_D4050 *local = (ActorLocal_Core2_D4050 *)&this->local;
s32 sp30 = globalTimer_getTime();
f32 sp2C = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, NULL, func_8035B3B4, func_8035B1CC);
this->marker->propPtr->unk8_3 = FALSE;
actor_collisionOn(this);
@@ -300,8 +300,8 @@ int func_8035BC5C(Actor *this, s32 target, s32 delta){
}
void func_8035BD48(Actor *this){
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);
marker_setCollisionScripts(this->marker, NULL, func_8035B3B4, func_8035B2C4);

4
src/core2/ch/gravestone.c
View File

@@ -187,8 +187,8 @@ void func_8035F138(Actor *this) {
}
switch(this->state){
case 1: //L8035F20C
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, func_8035F0E8, func_8035F048, func_8035EF9C);
local->unk0 = 1;
this->unk1C[0] = this->position[0];

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

@@ -268,8 +268,8 @@ void chicecube_update(Actor *this){
return;
func_802D729C(this, 3.4 * this->scale);
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, __chicecube_ow, NULL, __chicecube_die);
this->marker->propPtr->unk8_3 = FALSE;
actor_collisionOff(this);

4
src/core2/ch/mole.c
View File

@@ -331,8 +331,8 @@ void chmole_update(Actor *this){
if(this->unkF4_8 < 8 || this->unkF4_8 >= 0x13)
return;
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setFreeMethod(this->marker, func_802D9C90);
if(this->initialized){
other = actorArray_findClosestActorFromActorId(this->position, ACTOR_12C_MOLEHILL, -1, &sp4C);

6
src/core2/ch/molehill.c
View File

@@ -41,7 +41,7 @@ ParticleScaleAndLifetimeRanges D_80367E44 = {
Actor *func_802DA560(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *actor = marker_getActor(marker);
ActorLocal_MoleHill * local = (ActorLocal_MoleHill *) &actor->local;
if(actor->unk16C_4){
if(actor->volatile_initialized){
actor = actor_draw(marker, gfx, mtx, vtx);
func_8034A174(actor->marker->unk44, 5, actor->velocity);
func_8034A174(actor->marker->unk44, 6, actor->unk1C);
@@ -70,9 +70,9 @@ void func_802DA740(Actor *this){
this->marker->propPtr->unk8_3 = TRUE;
this->marker->collidable = FALSE;
if(!this->unk16C_4){
if(!this->volatile_initialized){
local->unk0 = 0;
this->unk16C_4 = 1;
this->volatile_initialized = TRUE;
}
switch(this->state){
case 1:

4
src/core2/ch/snowman.c
View File

@@ -210,8 +210,8 @@ void chSnowman_update(Actor *this){
dt = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = 0;
actor_collisionOn(this);
marker_setCollisionScripts(this->marker, NULL, NULL, __chSnowman_deathCallback);

4
src/core2/ch/soundsource.c
View File

@@ -78,8 +78,8 @@ void func_802D07A8(Actor *this){
void func_802D07C8(Actor *this){
f32 sp2C[3];
f32 sp28;
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = func_802D07A8;
func_802D05A0(this, 1);
}

4
src/core2/ch/termite.c
View File

@@ -151,12 +151,12 @@ void chTermite_update(Actor *this) {
static s32 D_80372F4C = 0;
sp34 = globalTimer_getTime();
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
marker_setCollisionScripts(this->marker, NULL, __chTermite_ow, __chTermite_die);
this->unk124_0 = this->unk138_31 = FALSE;
this->unk138_24 = FALSE;
this->unk16C_0 = TRUE;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
}
if( map_get() == MAP_C_MM_TICKERS_TOWER
&& !mapSpecificFlags_get(0)

4
src/core2/ch/whipcrack.c
View File

@@ -97,8 +97,8 @@ void chwhipcrack_update(Actor *this){
f32 sp44;
f32 sp40;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->roll = this->yaw;
this->yaw = 0.0f;
marker_setCollisionScripts(this->marker, NULL, NULL, __chwhipcrack_die);