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

Merge branch 'mr-origin-70'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-13 20:37:54 -05:00
parent 50e1368ae1 062344a1fb
commit 351f4e9fea
192 changed files with 430 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/prop.h
View File

@@ -284,7 +284,7 @@ typedef struct actor_s{
s8 pad167[0x1];
s32 unk168; //saved marker->unk58
u32 unk16C_31:27; //saved s1->marker->unk5C
u32 unk16C_4:1; // initialization related?
u32 volatile_initialized:1; // the difference between this flag and initialized is that it is reset in actors_appendToSavestate
u32 unk16C_3:1;
u32 unk16C_2:1;
u32 unk16C_1:1;

4
src/BGS/ch/code_2270.c
View File

@@ -280,8 +280,8 @@ void func_80389080(Actor *this){
unqPtr = (ActorLocal_BGS_2270 *)&this->local;
sp3C = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = func_80388FC0;
marker_setCollisionScripts(this->marker, func_80388E44, NULL, NULL);

4
src/BGS/ch/croctus.c
View File

@@ -109,12 +109,12 @@ void func_80387E68(ActorMarker *caller, enum asset_e text_id, s32 arg2){
void func_80387FD4(Actor *this){
int j;
if(!this->unk16C_4){
if(!this->volatile_initialized){
if(jiggyscore_isCollected(JIGGY_22_CROCTUS)){
marker_despawn(this->marker);
return;
}
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
if(bgs_D_803907B8[this->unkF4_8 - 1] == 0){
bgs_D_803907B8[this->unkF4_8 - 1] = this->marker;
for(j = this->unkF4_8; j < 6; j++){

4
src/BGS/ch/flibbit.c
View File

@@ -323,8 +323,8 @@ void chflibbit_update(Actor *this){
f32 sp58;
f32 sp4C[3];
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, BGS_func_80386E30, func_80386E70, func_80386EB0);
local->unk1C[0] = randf2(-2.0f, -1.0f);
local->unk1C[1] = randf2(-2.0f, -1.0f);

4
src/BGS/ch/frogminigame.c
View File

@@ -132,8 +132,8 @@ void chfrogminigame_update(Actor *this){
ActorLocal_BGS_6730 *local;
local = &this->bgs_6730;
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
local->unk0 = 0;
local->unk4 = 0;
local->unk8 = 0;

4
src/BGS/ch/mrvile.c
View File

@@ -337,8 +337,8 @@ void chvile_update(Actor *this) {
f32 random_position[3];
local = (ActorLocal_MrVile *)&this->local;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = chvile_free;
local->unk0 = 0;
local->unk4 = assetcache_get(0x3F6);

4
src/BGS/ch/tanktup.c
View File

@@ -114,9 +114,9 @@ void func_8038F6A4(Actor *this)
this->is_first_encounter = FALSE;
this->initialized = TRUE;
}
if (!this->unk16C_4)
if (!this->volatile_initialized)
{
this->unk16C_4 = 1;
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = 1;
actor_collisionOff(this);
this->scale = 1.0f;

4
src/BGS/ch/yellowflibbit.c
View File

@@ -348,8 +348,8 @@ void BGS_func_8038E034(Actor *this) {
f32 sp48[3];
sp9C = time_getDelta();
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, &func_8038DD9C, &func_8038DDDC, &func_8038DE1C);
local->unk2 = 0U;
local->unk20[0] = randf2(-2.0f, -1.0f);

4
src/BGS/ch/yumblie.c
View File

@@ -148,8 +148,8 @@ void chyumblie_update(Actor *this){
s0 = (ActorLocal_Yumblie *)&this->local;
sp4C = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
s0->unk0 = 0.0f;
s0->unk4 = 0;
s0->game_marker = NULL;

4
src/BGS/code_3030.c
View File

@@ -71,8 +71,8 @@ void func_80389668(Actor *this) {
Actor *tiptup;
local = (ActorLocal_BGS_3030 *)&this->local;
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_803895D0, NULL);
local->unk0 = 1;

4
src/BGS/code_3420.c
View File

@@ -624,8 +624,8 @@ void chvilegame_update(Actor *this) {
sp50 = time_getDelta();
local = (ActorLocal_BGS_3420 *)&this->local;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = &chvilegame_free;
local->game_pieces = vector_new(sizeof(struct vilegame_piece), 0x20);
local->grumblie_model_bin = assetcache_get(0x3F7);

4
src/CC/ch/sawblade.c
View File

@@ -134,8 +134,8 @@ void chSawblade_update(Actor *this){
f32 tmp_f2;
f32 sp34 = time_getDelta();
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, func_80389520, NULL, CC_func_8038954C);

4
src/CC/ch/tooth.c
View File

@@ -59,8 +59,8 @@ extern void chTooth_update(Actor * this){
ActorLocal_CC_1120 * local = (ActorLocal_CC_1120 *) &this->local;
f32 sp24[3];
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker->propPtr->unk8_3 = 1;
local->unk0 = &D_80389B50[(this->modelCacheIndex == ACTOR_101_CLANKER_TOKEN_TOOTH) ? 0 : 1];
this->position[0] = local->unk0->position[0];

4
src/CC/code_0.c
View File

@@ -52,8 +52,8 @@ void func_803864D4(Actor *this){
f32 sp2C;
f32 sin_result;
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker->propPtr->unk8_3 = 1;
CC_func_803863F0(this, 1);
}//L80386530

4
src/CC/code_3400.c
View File

@@ -71,8 +71,8 @@ void func_80389900(Actor * this){
ActorLocal_CC_3400 *local = (ActorLocal_CC_3400 *) &this->local;
f32 sp20 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = 1;
local->unk0 = &D_80389E40[this->modelCacheIndex - 0x28C];
local->unk8 = 0;

4
src/CC/code_530.c
View File

@@ -91,8 +91,8 @@ void func_80386B28(Actor *this){
f32 tick = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, NULL, func_80386AD0, NULL);
local->unk0 = func_8030D90C();
local->unk1 = 0;

4
src/CC/code_BF0.c
View File

@@ -74,8 +74,8 @@ void func_803870F8(Actor *this){
f32 sp3C[3];
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker->propPtr->unk8_3 = 1;
this->pitch = 0.0f;
this->yaw = 0.0f;

2
src/CCW/ch/grublinhood.c
View File

@@ -176,7 +176,7 @@ void chgrublinhood_update(Actor *this) {
local = (ActorLocal_CCW_8050 *)&this->local;
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
__chgrublinhood_initialize(this);
local->season = __get_current_season(this);
}

4
src/CCW/code_0.c
View File

@@ -25,8 +25,8 @@ void func_80386468(ActorMarker* marker, ActorMarker *arg1) {
}
void func_803864B8(Actor *this){
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, NULL, func_80386468);
CCW_func_803863F0(this, 1);

4
src/CCW/code_14B0.c
View File

@@ -69,8 +69,8 @@ void CCW_func_80387A40(Actor *this) {
local = (ActorLocal_CCW_14B0 *)&this->local;
sp68 = time_getDelta();
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = CCW_func_80387A20;
local->unk4 = &D_8038EC00[0];
while((local->unk4->unk0 != 0) && (map_get() != local->unk4->unk0)) {

4
src/CCW/code_160.c
View File

@@ -129,8 +129,8 @@ void func_8038687C(Actor *this) {
sp88 = time_getDelta();
local = (ActorLocal_CCW_160 *)&this->local;
if(!this->unk16C_4) {
this->unk16C_4 = TRUE;
if(!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
local->unk0 = 1;
local->unk4 = 0;

4
src/CCW/code_1B20.c
View File

@@ -141,8 +141,8 @@ void func_80388478(Actor *this) {
ActorLocal_CCW_1B20 *local;
local = (ActorLocal_CCW_1B20 *)&this->local;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
func_803300C0(this->marker, func_80388260);
marker_setCollisionScripts(this->marker, NULL, CCW_func_80388278, func_803882A4);
actor_collisionOn(this);

4
src/CCW/code_21A0.c
View File

@@ -22,8 +22,8 @@ void func_80388590(Actor *this, s32 next_state){
}
void func_803885F8(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(fileProgressFlag_get(FILEPROG_E5_CCW_FLOWER_AUTUMN)){
func_80388590(this, 1);
}

4
src/CCW/code_2270.c
View File

@@ -133,8 +133,8 @@ void chGobiCCW_update(Actor *this) {
f32 sp40;
local = (ActorLocal_chGobiCCW*)&this->local;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
this->marker->actorFreeFunc = chGobiCCW_free;
this->is_first_encounter = FALSE;

8
src/CCW/code_2B00.c
View File

@@ -84,7 +84,7 @@ void func_80388FD4(Actor *this) {
this->unk10_12 = func_80388EF0(this);
this->initialized = TRUE;
}
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
if (fileProgressFlag_get(this->unk10_12 + FILEPROG_8B_CCW_SPRING_OPEN)) {
actor_playAnimationOnce(this);
subaddie_set_state_with_direction(this, 4, 0.999f, 1);
@@ -93,7 +93,7 @@ void func_80388FD4(Actor *this) {
marker_setCollisionScripts(this->marker, 0, &func_80388F50, 0);
}
this->unk38_0 = FALSE;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
}
if( (this->state == 4)
&& this->unk38_0
@@ -135,13 +135,13 @@ void func_80389268(Actor *this) {
actor_collisionOff(this);
this->initialized = TRUE;
}
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
this->unk1C[0] = this->position[0];
this->unk1C[1] = this->position[1];
this->unk1C[2] = this->position[2];
this->unk1C[1] += 250.0f;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
if (fileProgressFlag_get(this->unk10_12 + FILEPROG_8B_CCW_SPRING_OPEN)) {
subaddie_set_state(this, 3);
}

4
src/CCW/code_3050.c
View File

@@ -49,8 +49,8 @@ void func_803895F4(Actor *this) {
f32 sp2C;
f32 sp28;
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, NULL, &func_8038950C);
func_80389440(this, 1);

4
src/CCW/code_3310.c
View File

@@ -211,8 +211,8 @@ void CCW_func_80389BFC(Actor *this) {
local = (ActorLocal_CCW_3310 *)&this->local;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
this->is_first_encounter = FALSE;
this->position[0] = -4900.0f;

4
src/CCW/code_3DA0.c
View File

@@ -88,8 +88,8 @@ void chcaterpillar_update(Actor *this){
sp8C = func_8028E86C() == this->marker;
sp84 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
local->unk0[0] = this->position[0];
local->unk0[1] = this->position[1];
local->unk0[2] = this->position[2];

4
src/CCW/code_4530.c
View File

@@ -76,8 +76,8 @@ void func_8038AA8C(Actor *this) {
f32 sp44;
f32 sp40;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
mapSpecificFlags_set(5, FALSE);
if( (!fileProgressFlag_get(FILEPROG_E8_AUTMN_EYRIE_FED) || jiggyscore_isSpawned(JIGGY_49_CCW_EYRIE))
&& !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)

4
src/CCW/code_4960.c
View File

@@ -64,8 +64,8 @@ void func_8038AEBC(Actor *this) {
f32 sp30;
f32 sp2C;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
func_8038AD50(this, 1);
return;
}

4
src/CCW/code_4D00.c
View File

@@ -59,8 +59,8 @@ void func_8038B19C(Actor *this) {
local = (ActorLocal_CCW_4D00 *)&this->local;
tick = time_getDelta();
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->is_first_encounter = FALSE;
func_8038B0F0(this, 1);
}

4
src/CCW/code_50D0.c
View File

@@ -85,8 +85,8 @@ void func_8038B814(Actor *this, s32 next_state) {
}
void func_8038B87C(Actor *this) {
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->is_first_encounter = FALSE;
func_8038B814(this, 1);
}

4
src/CCW/code_5540.c
View File

@@ -115,8 +115,8 @@ void chnabnut_update(Actor *this) {
f32 sp24;
local = (ActorLocal_CCW_5540 *)&this->local;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
D_8038F350[0] = this->position[0];
D_8038F350[1] = this->position[1];
D_8038F350[2] = this->position[2];

4
src/CCW/code_5BF0.c
View File

@@ -90,9 +90,9 @@ Actor *func_8038C380(ActorMarker* marker, Gfx** gfx, Mtx** mtx, Vtx** vtx) {
void func_8038C41C(Actor *this) {
f32 sp2C[3];
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
this->marker->propPtr->unk8_3 = TRUE;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
this->is_first_encounter = FALSE;
return;
}

4
src/CCW/code_61E0.c
View File

@@ -61,8 +61,8 @@ void func_8038C7A8(Actor *this) {
local = (ActorLocal_CCW_61E0 *)&this->local;
sp44 = time_getDelta();
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
return;
}

4
src/CCW/code_6620.c
View File

@@ -88,9 +88,9 @@ void func_8038CC4C(Actor *this) {
f32 sp38[3];
local = (ActorLocal_CCW_6620 *)&this->local;
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
this->marker->propPtr->unk8_3 = TRUE;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
this->is_first_encounter = FALSE;
local->unk0 = &D_8038F490[0];
while(local->unk0->map_id != 0 && map_get() != local->unk0->map_id){

4
src/CCW/code_6AC0.c
View File

@@ -79,9 +79,9 @@ void func_8038CFB4(Actor *this) {
f32 sp6C;
f32 sp60[3];
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
this->marker->propPtr->unk8_3 = TRUE;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
this->is_first_encounter = FALSE;
func_8038CEB0(this, 1);
if (jiggyscore_isCollected(JIGGY_4B_CCW_GNAWTY) != 0) {

4
src/CCW/code_6EC0.c
View File

@@ -50,9 +50,9 @@ void func_8038D368(Actor *this) {
f32 plyr_pos[3];
local = (ActorLocal_CCW_6EC0 *)&this->local;
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
this->marker->propPtr->unk8_3 = TRUE;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
this->is_first_encounter = FALSE;
local->unk0 = D_8038F600;
while (local->unk0->map != 0 && map_get() != local->unk0->map) {

4
src/CCW/code_7120.c
View File

@@ -102,9 +102,9 @@ void func_8038D85C(Actor *this) {
f32 tick;
tick = time_getDelta();
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
this->marker->propPtr->unk8_3 = TRUE;
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, 0, &func_8038D81C, 0);
func_8038D6D8(this, 1);
if (jiggyscore_isCollected(JIGGY_4B_CCW_GNAWTY) != 0) {

4
src/CCW/code_7570.c
View File

@@ -24,8 +24,8 @@ void func_8038D9E0(Actor *this) {
f32 sp20;
ActorMarker *temp_v0;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->depth_mode = 2;
this->marker->unk40_22 = TRUE;
func_8038D960(this, 1);

4
src/CCW/code_7BF0.c
View File

@@ -59,8 +59,8 @@ void func_8038E0C8(Actor *this) {
if(!subaddie_playerIsWithinSphere(this, 3000)) return;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
func_8028746C(this->animctrl, func_8038E060);
func_8028748C(this->animctrl, (s32) this->marker);
this->marker->propPtr->unk8_3 = TRUE;

4
src/CCW/code_950.c
View File

@@ -110,8 +110,8 @@ void chwasp_update(Actor *this) {
sp68 = time_getDelta();
local = (ActorLocal_CCW_950 *)&this->local;
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = func_8038717C;
local->unk0 = func_8030D90C();
local->unk4 = 0;

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

@@ -132,8 +132,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

@@ -65,8 +65,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;
}

4
src/GV/ch/ancientone.c
View File

@@ -111,8 +111,8 @@ void chAncientOne_update(Actor *this){
f32 sp34;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(jiggyscore_isSpawned(JIGGY_46_GV_ANCIENT_ONES)){
marker_despawn(this->marker);
return;

4
src/GV/ch/buriedpyramid.c
View File

@@ -56,8 +56,8 @@ void chBuriedPyramid_update(Actor *this){
f32 max;
f32 min;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
local->raised_state = fileProgressFlag_getN(FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2);
this->position_x = 67.0f;

4
src/GV/ch/gobi1.c
View File

@@ -113,8 +113,8 @@ void chGobi1_update(Actor *this){
f32 sp48[3];
tick = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, func_803873B0, NULL, NULL);
marker->actorFreeFunc = func_8038736C;
marker->propPtr->unk8_3 = TRUE;

4
src/GV/ch/gobi2.c
View File

@@ -170,8 +170,8 @@ void chGobi2_update(Actor *this){
sp34 = this->marker;
sp2C = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, __chGobi2_ow, NULL, NULL);
sp34->actorFreeFunc = __chGobi2_80387EFC;
local->unk4 = skeletalAnim_new();

4
src/GV/ch/gobi3.c
View File

@@ -115,8 +115,8 @@ void chGobi3_ow(ActorMarker *this_marker, ActorMarker *other_marker){
}
void chGobi3_update(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, chGobi3_ow, NULL, NULL);
this->unk1C[0] = 0.0f;
this->unk1C[1] = 0.0f;

4
src/GV/ch/gobirock.c
View File

@@ -97,8 +97,8 @@ void chGobiRock_update(Actor *this){
Actor *sp28;
f32 sp24 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
sp34->actorFreeFunc = chGobiRock_free;
sp34->propPtr->unk8_3 = TRUE;
marker_setCollisionScripts(this->marker, NULL, NULL, __chGobiRock_destroy);

4
src/GV/ch/gobirope.c
View File

@@ -37,8 +37,8 @@ void chGobiRope_setState(Actor *this, s32 next_state){
void chGobiRope_update(Actor *this){
Actor *sp2C;
f32 sp28;
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);
sp2C = actorArray_findClosestActorFromActorId(this->position, ACTOR_12E_GOBI_1, -1, &sp28);

4
src/GV/ch/mazectrl.c
View File

@@ -150,8 +150,8 @@ void chMazeCtrl_update(Actor *this){
ActorLocal_GVMazeCtrl *local = (ActorLocal_GVMazeCtrl *)&this->local;
sp34 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = __chMazeCtrl_8038F5E4;
if(this->state == 2){
comusic_8025AB44(COMUSIC_26_GV_SANDYBUTT_DANGER, 30000, 30000);

4
src/GV/ch/toots.c
View File

@@ -38,8 +38,8 @@ void func_80386464(Actor *this){
}
void chtoots_update(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
D_80391A30 = 0;
D_80391A34 = 0;
}

4
src/GV/ch/trunker.c
View File

@@ -56,8 +56,8 @@ Actor *chTrucker_draw(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx)
void chTrucker_update(Actor *this){
ActorMarker *marker = this->marker;
s32 sp28 = 0;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker->propPtr->unk8_3 = TRUE;
actor_collisionOff(this);
mapSpecificFlags_set(0xC, FALSE);

4
src/GV/code_3630.c
View File

@@ -46,11 +46,11 @@ void func_80389ABC(Actor *this){
}
void func_80389B1C(Actor *this){
if(!this->unk16C_4){
if(!this->volatile_initialized){
this->lifetime_value = (f32) func_8038E184();
this->is_first_encounter = jiggyscore_isCollected(JIGGY_43_GV_HISTUP) || mapSpecificFlags_get(0);
this->unk138_23 = jiggyscore_isCollected(JIGGY_43_GV_HISTUP) || mapSpecificFlags_get(2);
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
}
if(!this->initialized){

4
src/GV/code_3BB0.c
View File

@@ -45,8 +45,8 @@ void func_80389FA0(f32 position[3]){
}
void GV_func_8038A084(Actor *this){
if(this->unkF4_8 == 6 && !this->unk16C_4){
this->unk16C_4 = TRUE;
if(this->unkF4_8 == 6 && !this->volatile_initialized){
this->volatile_initialized = TRUE;
if( jiggyscore_isCollected(JIGGY_42_GV_WATER_PYRAMID) && this->yaw == 1.0f){
this->unk38_31 = TRUE;
}

4
src/GV/code_3D90.c
View File

@@ -67,8 +67,8 @@ void func_8038A314(Actor *this){}
void func_8038A31C(Actor *this){
Actor *sp24;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
actor_collisionOff(this);
__spawnQueue_add_1((GenFunction_1)func_8038A2C0, reinterpret_cast(s32, this->marker));
this->velocity[0] = 0.0f;

4
src/GV/code_43B0.c
View File

@@ -80,8 +80,8 @@ void GV_func_8038A9C0(Actor *this){
this->velocity_y = 0.0f;
}
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);
__spawnQueue_add_1((GenFunction_1)func_8038A8CC, (s32)this->marker);

4
src/GV/code_4740.c
View File

@@ -155,8 +155,8 @@ void func_8038B124(Actor *this){
this->velocity_z = this->position_z;
}
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(this->state == 0xa)
marker_despawn(this->marker);

4
src/GV/code_5570.c
View File

@@ -169,8 +169,8 @@ void GV_func_8038BEA0(Actor *this){
func_80333270(JIGGY_3E_GV_GRABBA, this->position, func_8038BB6C, this->marker);
}//L8038BF24
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(this->unk44_31 == 0){
this->unk44_31 = func_8030D90C();
sfxsource_setSfxId(this->unk44_31, SFX_3EC_CCW_DOOR_OPENING);

4
src/GV/code_61E0.c
View File

@@ -47,8 +47,8 @@ void GV_func_8038C658(Actor *this){
this->position_y += 4.0f;
}
if(!this->unk16C_4 && this->initialized){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized && this->initialized){
this->volatile_initialized = TRUE;
subaddie_set_state_with_direction(this, this->state, 0.01f, 1);
}
sp24 = GV_func_8038C5BC();

4
src/GV/code_6370.c
View File

@@ -157,9 +157,9 @@ void func_8038CC98(Actor *this){
f32 sp54;
f32 sp48[3];
if(!this->unk16C_4){
if(!this->volatile_initialized){
sp7C = fileProgressFlag_getN(FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2);
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
this->marker->actorFreeFunc = func_8038C880;
local->unk8 = &D_803911F0[this->modelCacheIndex - 0x285];
local->unk10 = 0;

4
src/GV/code_6F80.c
View File

@@ -24,8 +24,8 @@ int func_8038D388(void){
}
void func_8038D3AC(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, func_8038D370, NULL, NULL);
D_80391AA0 = 0;
if(fileProgressFlag_getN(FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, 2) == 3){

4
src/GV/code_7060.c
View File

@@ -61,9 +61,9 @@ void func_8038D47C(Actor *this){
this->initialized = TRUE;
}//L8038D590
if(!this->unk16C_4){
if(!this->volatile_initialized){
mapSpecificFlags_set(0x10, 0);
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
if(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -3){
timedFunc_set_1(1.5f, (GenFunction_1)func_8038D450, reinterpret_cast(s32, this->marker));
}

8
src/GV/code_7FF0.c
View File

@@ -189,8 +189,8 @@ void func_8038E4DC(Actor *this){
this->initialized = TRUE;
this->unk1C[0] = this->unk48;
}
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(exit_get() == 3){
if(0.65 < this->unk48 && this->unk48 < 0.95){
func_80343E20(0x6a, 0x7ff8, 0.32842f, 0x34);
@@ -289,8 +289,8 @@ void func_8038E97C(Actor *this){
this->position_y += -300.0f;
}
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(exit_get() == 7){
this->position_z += 117.0;
this->position_y += 130.0;

2
src/MM/ch/grublin.c
View File

@@ -76,7 +76,7 @@ void func_80388A04(Actor *this){
}
void func_80388A80(Actor *this) {
if (!this->unk16C_4){
if (!this->volatile_initialized){
func_80388A04(this);
}
func_802DB5A0(this);

4
src/MM/ch/jujuhitbox.c
View File

@@ -124,8 +124,8 @@ void func_80388E20(Actor *this){
this->is_first_encounter = FALSE;
jujuCtlPtr->unk18 = 0.5f;
}
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
__spawnQueue_add_2((GenFunction_2)func_80388DFC,this->marker, jujuCtlPtr->unk4);
func_80388D14(this);
}else{

4
src/MM/ch/orangepad.c
View File

@@ -107,9 +107,9 @@ void func_80386768(Actor * this){
this->initialized = TRUE;
}//L803867B0
if(!this->unk16C_4){
if(!this->volatile_initialized){
this->unk100 = actorArray_findClosestActorFromActorId(this->position, 8,-1, &min_distance)->marker;
this->unk16C_4 = 1;
this->volatile_initialized = TRUE;
}//L803867E0
if(this->unk100){

4
src/MMM/ch/loggo.c
View File

@@ -62,8 +62,8 @@ void chLoggo_update(Actor *this){
s32 sp34;
sp44 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = TRUE;
actor_collisionOn(this);
marker_setCollisionScripts(this->marker, __chLoggo_collide, NULL, NULL);

4
src/MMM/ch/motzhand.c
View File

@@ -126,8 +126,8 @@ void chmotzhand_update(Actor *this){
sp48 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(jiggyscore_isSpawned(JIGGY_60_MMM_MOTZHAND)){
marker_despawn(this->marker);
return;

4
src/MMM/ch/napper.c
View File

@@ -108,8 +108,8 @@ void chnapper_update(Actor *this){
sp68 = time_getDelta();
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->scale = 0.5f;
marker_setCollisionScripts(this->marker, func_80386ACC, NULL, NULL);
local->unk10 = TRUE;

4
src/MMM/code_16B0.c
View File

@@ -180,8 +180,8 @@ void func_80388028(Actor *this){
f32 sp44;
f32 sp40;
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->unk16C_0 = TRUE;
marker_setCollisionScripts(this->marker, NULL, MMM_func_80387CF4, func_80387D1C);
__spawnQueue_add_1((GenFunction_1)func_80387D48, reinterpret_cast(s32, this->marker));

8
src/MMM/code_2040.c
View File

@@ -288,7 +288,7 @@ void func_80388BDC(Actor *this) {
func_802D3D74(this);
mapSpecificFlags_set(1, ((this->yaw > 260.0f) && (this->yaw < 330.0f)) ? TRUE : FALSE);
if (!this->unk16C_4) {
if (!this->volatile_initialized) {
if (this->yaw != 0.0f) {
this->lifetime_value = 0.5f;
subaddie_set_state(this, 7);
@@ -298,7 +298,7 @@ void func_80388BDC(Actor *this) {
this->unk38_31 = 0;
this->lifetime_value = 0.0f;
}
this->unk16C_4 = TRUE;
this->volatile_initialized = TRUE;
}
switch (this->state) {
@@ -370,8 +370,8 @@ void func_80388FE4(Actor *this) {
void func_80389004(Actor *this){
func_802D3CE8(this);
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(levelSpecificFlags_get(0x2e))
marker_despawn(this->marker);
}

4
src/MMM/code_2F60.c
View File

@@ -62,8 +62,8 @@ Actor *func_80389350(ActorMarker* marker, Gfx** graphics, Mtx** matrix, Vtx** ve
}
void func_803893A4(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);
this->unk38_31 = 2;

4
src/RBB/ch/anchor.c
View File

@@ -24,8 +24,8 @@ void RBB_func_8038BEA0(Actor *this, s32 arg1){
}
void func_8038BF28(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->position_x = -5100.0f;
this->position_y = -2600.0f;
this->position_z = 1460.0f;

4
src/RBB/ch/anchorctrl.c
View File

@@ -51,8 +51,8 @@ void __chAnchorCtrl_setState(Actor *this, s32 new_state){
}
void chAnchorCtrl_update(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
if(levelSpecificFlags_getSet(0x30, FALSE))
__chAnchorCtrl_setState(this, 2);
else

4
src/RBB/ch/anchorswitch.c
View File

@@ -35,8 +35,8 @@ void __chAnchorSwitch_press(ActorMarker *marker, s32 arg1){
}
void chAnchorSwitch_update(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->propPtr->unk8_3 = 1;
marker_setCollisionScripts(this->marker, NULL, __chAnchorSwitch_press, NULL);
if(jiggyscore_isSpawned(JIGGY_53_RBB_SNORKEL))

4
src/RBB/ch/axle.c
View File

@@ -98,10 +98,10 @@ void func_803890BC(Actor *this){
ActorLocal_RBB_2A70 *local = (ActorLocal_RBB_2A70 *)&this->local;
f32 sp38 = time_getDelta();
f32 sp2C[3];
if(!this->unk16C_4){
if(!this->volatile_initialized){
actor_collisionOff(this);
this->marker->propPtr->unk8_3 = 1;
this->unk16C_4 = 1;
this->volatile_initialized = TRUE;
local->unk0 = func_80388E60(this);
this->position[0] = local->unk0->unk4[0];
this->position[1] = local->unk0->unk4[1];

4
src/RBB/ch/bellbuoy.c
View File

@@ -42,9 +42,9 @@ void func_8038DF6C(Actor* this){
Actor* other;
int i;
if(!this->unk16C_4){
if(!this->volatile_initialized){
this->marker->propPtr->unk8_3 = 1;
this->unk16C_4 = 1;
this->volatile_initialized = TRUE;
local->unk0 = randf2(80.0f, 100.0f);
local->unk4 = NULL;
local->unk20 = 0;

4
src/RBB/ch/boombox.c
View File

@@ -327,9 +327,9 @@ void func_8038F618(Actor *this){
f32 pad0;
if(!this->unk16C_4){
if(!this->volatile_initialized){
this->marker->propPtr->unk8_3 = 0;
this->unk16C_4 = 1;
this->volatile_initialized = TRUE;
local->unk8[0] = this->position_x;
local->unk8[1] = this->position_y;
local->unk8[2] = this->position_z;

4
src/RBB/ch/bossboombox.c
View File

@@ -502,8 +502,8 @@ void func_8038D8BC(Actor *this){
f32 pad;
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
local->unk0 = &D_80390B70[this->marker->id - 0x1A1];
local->unk4 = 0;
local->unk20 = 0;

Some files were not shown because too many files have changed in this diff Show More