From 062344a1fb6a390b9caa72e5dd9c043a8701e806 Mon Sep 17 00:00:00 2001 From: mariob92 <21146795-mariob92@users.noreply.gitlab.com> Date: Tue, 10 Sep 2024 11:20:14 +0200 Subject: [PATCH] renamed Actor.unk16C_4 to Actor.volatile_initialized --- include/prop.h | 2 +- src/BGS/ch/code_2270.c | 4 +-- src/BGS/ch/croctus.c | 4 +-- src/BGS/ch/flibbit.c | 4 +-- src/BGS/ch/frogminigame.c | 4 +-- src/BGS/ch/mrvile.c | 4 +-- src/BGS/ch/tanktup.c | 4 +-- src/BGS/ch/yellowflibbit.c | 4 +-- src/BGS/ch/yumblie.c | 4 +-- src/BGS/code_3030.c | 4 +-- src/BGS/code_3420.c | 4 +-- src/CC/ch/sawblade.c | 4 +-- src/CC/ch/tooth.c | 4 +-- src/CC/code_0.c | 4 +-- src/CC/code_3400.c | 4 +-- src/CC/code_530.c | 4 +-- src/CC/code_BF0.c | 4 +-- src/CCW/ch/grublinhood.c | 2 +- src/CCW/code_0.c | 4 +-- src/CCW/code_14B0.c | 4 +-- src/CCW/code_160.c | 4 +-- src/CCW/code_1B20.c | 4 +-- src/CCW/code_21A0.c | 4 +-- src/CCW/code_2270.c | 4 +-- src/CCW/code_2B00.c | 8 ++--- src/CCW/code_3050.c | 4 +-- src/CCW/code_3310.c | 4 +-- src/CCW/code_3DA0.c | 4 +-- src/CCW/code_4530.c | 4 +-- src/CCW/code_4960.c | 4 +-- src/CCW/code_4D00.c | 4 +-- src/CCW/code_50D0.c | 4 +-- src/CCW/code_5540.c | 4 +-- src/CCW/code_5BF0.c | 4 +-- src/CCW/code_61E0.c | 4 +-- src/CCW/code_6620.c | 4 +-- src/CCW/code_6AC0.c | 4 +-- src/CCW/code_6EC0.c | 4 +-- src/CCW/code_7120.c | 4 +-- src/CCW/code_7570.c | 4 +-- src/CCW/code_7BF0.c | 4 +-- src/CCW/code_950.c | 4 +-- src/FP/ch/bearcub.c | 4 +-- src/FP/ch/boggy1.c | 4 +-- src/FP/ch/boggy2.c | 6 ++-- src/FP/ch/boggy3.c | 4 +-- src/FP/ch/cavewozza.c | 8 ++--- src/FP/ch/present.c | 4 +-- src/FP/ch/scarfsled.c | 4 +-- src/FP/ch/snowmanbutton.c | 4 +-- src/FP/ch/twinkly.c | 4 +-- src/FP/ch/twinklybox.c | 4 +-- src/FP/ch/twinklymuncher.c | 4 +-- src/FP/ch/wozza.c | 8 ++--- src/FP/ch/xmastree.c | 4 +-- src/FP/ch/xmastreeeggtoll.c | 4 +-- src/FP/ch/xmastreeice.c | 4 +-- src/FP/ch/xmastreestar.c | 4 +-- src/FP/ch/xmastreeswitch.c | 4 +-- src/FP/code_19E0.c | 4 +-- src/FP/code_1FF0.c | 4 +-- src/FP/code_A1C0.c | 4 +-- src/FP/code_ABD0.c | 12 +++---- src/GV/ch/ancientone.c | 4 +-- src/GV/ch/buriedpyramid.c | 4 +-- src/GV/ch/gobi1.c | 4 +-- src/GV/ch/gobi2.c | 4 +-- src/GV/ch/gobi3.c | 4 +-- src/GV/ch/gobirock.c | 4 +-- src/GV/ch/gobirope.c | 4 +-- src/GV/ch/mazectrl.c | 4 +-- src/GV/ch/toots.c | 4 +-- src/GV/ch/trunker.c | 4 +-- src/GV/code_3630.c | 4 +-- src/GV/code_3BB0.c | 4 +-- src/GV/code_3D90.c | 4 +-- src/GV/code_43B0.c | 4 +-- src/GV/code_4740.c | 4 +-- src/GV/code_5570.c | 4 +-- src/GV/code_61E0.c | 4 +-- src/GV/code_6370.c | 4 +-- src/GV/code_6F80.c | 4 +-- src/GV/code_7060.c | 4 +-- src/GV/code_7FF0.c | 8 ++--- src/MM/ch/grublin.c | 2 +- src/MM/ch/jujuhitbox.c | 4 +-- src/MM/ch/orangepad.c | 4 +-- src/MMM/ch/loggo.c | 4 +-- src/MMM/ch/motzhand.c | 4 +-- src/MMM/ch/napper.c | 4 +-- src/MMM/code_16B0.c | 4 +-- src/MMM/code_2040.c | 8 ++--- src/MMM/code_2F60.c | 4 +-- src/RBB/ch/anchor.c | 4 +-- src/RBB/ch/anchorctrl.c | 4 +-- src/RBB/ch/anchorswitch.c | 4 +-- src/RBB/ch/axle.c | 4 +-- src/RBB/ch/bellbuoy.c | 4 +-- src/RBB/ch/boombox.c | 4 +-- src/RBB/ch/bossboombox.c | 4 +-- src/RBB/ch/bossboomboxctrl.c | 4 +-- src/RBB/ch/cog.c | 4 +-- src/RBB/ch/dolphin.c | 4 +-- src/RBB/ch/eggtoll1.c | 4 +-- src/RBB/ch/enginefan.c | 4 +-- src/RBB/ch/enginefanswitch.c | 4 +-- src/RBB/ch/engineparts.c | 4 +-- src/RBB/ch/grimlet.c | 4 +-- src/RBB/ch/propellor.c | 4 +-- src/RBB/ch/propellorswitch.c | 4 +-- src/RBB/ch/rarewareflag.c | 4 +-- src/RBB/ch/rowboat.c | 4 +-- src/RBB/ch/whistle.c | 4 +-- src/RBB/ch/whistlectrl.c | 4 +-- src/RBB/ch/whistleswitch.c | 4 +-- src/RBB/code_1570.c | 4 +-- src/RBB/code_9670.c | 4 +-- src/RBB/code_9840.c | 4 +-- src/RBB/code_CA0.c | 4 +-- src/SM/code_2990.c | 4 +-- src/SM/code_44D0.c | 4 +-- src/SM/code_5B0.c | 8 ++--- src/SM/code_BF0.c | 4 +-- src/TTC/ch/blubber.c | 4 +-- src/TTC/ch/clam.c | 4 +-- src/TTC/ch/leaky.c | 4 +-- src/TTC/ch/lockup.c | 4 +-- src/TTC/ch/nipper.c | 4 +-- src/TTC/code_26D0.c | 8 ++--- src/core2/ch/beehive.c | 4 +-- src/core2/ch/bottlesbonus.c | 4 +-- src/core2/ch/clankerwhipcrack.c | 4 +-- src/core2/ch/clucker.c | 4 +-- src/core2/ch/code_468E0.c | 4 +-- src/core2/ch/code_CFA60.c | 4 +-- src/core2/ch/crab.c | 4 +-- src/core2/ch/drips.c | 4 +-- src/core2/ch/firefx.c | 4 +-- src/core2/ch/ghost.c | 8 ++--- src/core2/ch/gravestone.c | 4 +-- src/core2/ch/icecube.c | 4 +-- src/core2/ch/mole.c | 4 +-- src/core2/ch/molehill.c | 6 ++-- src/core2/ch/snowman.c | 4 +-- src/core2/ch/soundsource.c | 4 +-- src/core2/ch/termite.c | 4 +-- src/core2/ch/whipcrack.c | 4 +-- src/core2/code_42CB0.c | 4 +-- src/core2/code_43250.c | 4 +-- src/core2/code_43A40.c | 4 +-- src/core2/code_45310.c | 4 +-- src/core2/code_47BD0.c | 6 ++-- src/core2/code_4A6F0.c | 4 +-- src/core2/code_4BD70.c | 4 +-- src/core2/code_4C020.c | 4 +-- src/core2/code_509D0.c | 4 +-- src/core2/code_53C10.c | 4 +-- src/core2/code_54D50.c | 4 +-- src/core2/code_55180.c | 4 +-- src/core2/code_59780.c | 4 +-- src/core2/code_935F0.c | 4 +-- src/core2/code_9E370.c | 8 ++--- src/core2/code_D0CA0.c | 4 +-- src/core2/code_D2180.c | 4 +-- src/core2/code_D5D10.c | 2 +- src/core2/code_D5FD0.c | 2 +- src/core2/code_D6180.c | 2 +- src/core2/code_DA3A0.c | 4 +-- src/core2/code_DA760.c | 4 +-- src/core2/code_DB010.c | 4 +-- src/core2/code_DC4B0.c | 4 +-- src/cutscenes/code_6730.c | 4 +-- src/cutscenes/code_69F0.c | 4 +-- src/cutscenes/code_6C90.c | 4 +-- src/fight/chbossjinjo.c | 8 ++--- src/fight/chbossjinjobase.c | 4 +-- src/fight/chfinalboss.c | 4 +-- src/fight/chgreenblast.c | 4 +-- src/fight/chjinjonator.c | 4 +-- src/fight/chjinjonatorbase.c | 4 +-- src/fight/chspellbarrier.c | 4 +-- src/fight/chspellfireball.c | 4 +-- src/fight/chstonejinjo.c | 4 +-- src/lair/ch/brentilda.c | 4 +-- src/lair/ch/cauldron.c | 4 +-- src/lair/code_0.c | 56 ++++++++++++++++----------------- src/lair/code_86F0.c | 4 +-- src/lair/code_A4A0.c | 2 +- src/lair/code_A810.c | 4 +-- src/lair/code_AD70.c | 4 +-- src/lair/code_C1C0.c | 4 +-- src/lair/code_C6C0.c | 4 +-- 192 files changed, 430 insertions(+), 430 deletions(-) diff --git a/include/prop.h b/include/prop.h index 6f4ddde7..7de71299 100644 --- a/include/prop.h +++ b/include/prop.h @@ -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; diff --git a/src/BGS/ch/code_2270.c b/src/BGS/ch/code_2270.c index ffefe90c..7037dabf 100644 --- a/src/BGS/ch/code_2270.c +++ b/src/BGS/ch/code_2270.c @@ -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); diff --git a/src/BGS/ch/croctus.c b/src/BGS/ch/croctus.c index 0bffffd5..73bf03b6 100644 --- a/src/BGS/ch/croctus.c +++ b/src/BGS/ch/croctus.c @@ -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++){ diff --git a/src/BGS/ch/flibbit.c b/src/BGS/ch/flibbit.c index 5b900306..99103149 100644 --- a/src/BGS/ch/flibbit.c +++ b/src/BGS/ch/flibbit.c @@ -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); diff --git a/src/BGS/ch/frogminigame.c b/src/BGS/ch/frogminigame.c index 410cc4fe..432ff6a1 100644 --- a/src/BGS/ch/frogminigame.c +++ b/src/BGS/ch/frogminigame.c @@ -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; diff --git a/src/BGS/ch/mrvile.c b/src/BGS/ch/mrvile.c index bb1d3839..46f24515 100644 --- a/src/BGS/ch/mrvile.c +++ b/src/BGS/ch/mrvile.c @@ -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); diff --git a/src/BGS/ch/tanktup.c b/src/BGS/ch/tanktup.c index 005ea00c..c7c70f0f 100644 --- a/src/BGS/ch/tanktup.c +++ b/src/BGS/ch/tanktup.c @@ -114,9 +114,9 @@ void func_8038F6A4(Actor *this) this->unk138_24 = 0; this->initialized = 1; } - 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; diff --git a/src/BGS/ch/yellowflibbit.c b/src/BGS/ch/yellowflibbit.c index c4955360..1cbbe82f 100644 --- a/src/BGS/ch/yellowflibbit.c +++ b/src/BGS/ch/yellowflibbit.c @@ -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); diff --git a/src/BGS/ch/yumblie.c b/src/BGS/ch/yumblie.c index 65dfdbd6..4bceaa3e 100644 --- a/src/BGS/ch/yumblie.c +++ b/src/BGS/ch/yumblie.c @@ -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; diff --git a/src/BGS/code_3030.c b/src/BGS/code_3030.c index af914f3d..436c6884 100644 --- a/src/BGS/code_3030.c +++ b/src/BGS/code_3030.c @@ -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; diff --git a/src/BGS/code_3420.c b/src/BGS/code_3420.c index bd013d52..7da9da10 100644 --- a/src/BGS/code_3420.c +++ b/src/BGS/code_3420.c @@ -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); diff --git a/src/CC/ch/sawblade.c b/src/CC/ch/sawblade.c index 99d46a5e..ae42fb2f 100644 --- a/src/CC/ch/sawblade.c +++ b/src/CC/ch/sawblade.c @@ -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); diff --git a/src/CC/ch/tooth.c b/src/CC/ch/tooth.c index 91d2148a..27539db5 100644 --- a/src/CC/ch/tooth.c +++ b/src/CC/ch/tooth.c @@ -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]; diff --git a/src/CC/code_0.c b/src/CC/code_0.c index 2f7f7574..c26d6c89 100644 --- a/src/CC/code_0.c +++ b/src/CC/code_0.c @@ -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 diff --git a/src/CC/code_3400.c b/src/CC/code_3400.c index aa036f03..5df97f60 100644 --- a/src/CC/code_3400.c +++ b/src/CC/code_3400.c @@ -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; diff --git a/src/CC/code_530.c b/src/CC/code_530.c index ac4b4d81..861bfac3 100644 --- a/src/CC/code_530.c +++ b/src/CC/code_530.c @@ -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; diff --git a/src/CC/code_BF0.c b/src/CC/code_BF0.c index 3012c9d6..f823bd46 100644 --- a/src/CC/code_BF0.c +++ b/src/CC/code_BF0.c @@ -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; diff --git a/src/CCW/ch/grublinhood.c b/src/CCW/ch/grublinhood.c index be909653..44854588 100644 --- a/src/CCW/ch/grublinhood.c +++ b/src/CCW/ch/grublinhood.c @@ -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); } diff --git a/src/CCW/code_0.c b/src/CCW/code_0.c index 6f31cdaa..4080093a 100644 --- a/src/CCW/code_0.c +++ b/src/CCW/code_0.c @@ -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); diff --git a/src/CCW/code_14B0.c b/src/CCW/code_14B0.c index bd1fa345..e0b6b204 100644 --- a/src/CCW/code_14B0.c +++ b/src/CCW/code_14B0.c @@ -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)) { diff --git a/src/CCW/code_160.c b/src/CCW/code_160.c index 0f99a84f..92787e50 100644 --- a/src/CCW/code_160.c +++ b/src/CCW/code_160.c @@ -126,8 +126,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; diff --git a/src/CCW/code_1B20.c b/src/CCW/code_1B20.c index 0e2eb0dd..afeb3639 100644 --- a/src/CCW/code_1B20.c +++ b/src/CCW/code_1B20.c @@ -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); diff --git a/src/CCW/code_21A0.c b/src/CCW/code_21A0.c index 5aa10b97..e9409905 100644 --- a/src/CCW/code_21A0.c +++ b/src/CCW/code_21A0.c @@ -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); } diff --git a/src/CCW/code_2270.c b/src/CCW/code_2270.c index 44ec5ab0..04b5ff42 100644 --- a/src/CCW/code_2270.c +++ b/src/CCW/code_2270.c @@ -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->unk138_24 = FALSE; diff --git a/src/CCW/code_2B00.c b/src/CCW/code_2B00.c index 8221dc28..76e142d5 100644 --- a/src/CCW/code_2B00.c +++ b/src/CCW/code_2B00.c @@ -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); } diff --git a/src/CCW/code_3050.c b/src/CCW/code_3050.c index ea928bba..87d96456 100644 --- a/src/CCW/code_3050.c +++ b/src/CCW/code_3050.c @@ -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); diff --git a/src/CCW/code_3310.c b/src/CCW/code_3310.c index 1a3e9c0d..2c3df547 100644 --- a/src/CCW/code_3310.c +++ b/src/CCW/code_3310.c @@ -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->unk138_24 = FALSE; this->position[0] = -4900.0f; diff --git a/src/CCW/code_3DA0.c b/src/CCW/code_3DA0.c index 239f6643..d21dc77c 100644 --- a/src/CCW/code_3DA0.c +++ b/src/CCW/code_3DA0.c @@ -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]; diff --git a/src/CCW/code_4530.c b/src/CCW/code_4530.c index 994ad025..c31a6686 100644 --- a/src/CCW/code_4530.c +++ b/src/CCW/code_4530.c @@ -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) diff --git a/src/CCW/code_4960.c b/src/CCW/code_4960.c index be2d5c08..43e6328a 100644 --- a/src/CCW/code_4960.c +++ b/src/CCW/code_4960.c @@ -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; } diff --git a/src/CCW/code_4D00.c b/src/CCW/code_4D00.c index df4a2bcf..632c3c88 100644 --- a/src/CCW/code_4D00.c +++ b/src/CCW/code_4D00.c @@ -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->unk138_24 = FALSE; func_8038B0F0(this, 1); } diff --git a/src/CCW/code_50D0.c b/src/CCW/code_50D0.c index 393ae58e..69f95620 100644 --- a/src/CCW/code_50D0.c +++ b/src/CCW/code_50D0.c @@ -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->unk138_24 = FALSE; func_8038B814(this, 1); } diff --git a/src/CCW/code_5540.c b/src/CCW/code_5540.c index 2f6611cc..a6321a1c 100644 --- a/src/CCW/code_5540.c +++ b/src/CCW/code_5540.c @@ -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]; diff --git a/src/CCW/code_5BF0.c b/src/CCW/code_5BF0.c index 95c58509..b911bdfe 100644 --- a/src/CCW/code_5BF0.c +++ b/src/CCW/code_5BF0.c @@ -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->unk138_24 = FALSE; return; } diff --git a/src/CCW/code_61E0.c b/src/CCW/code_61E0.c index a84e9a2e..22ec335f 100644 --- a/src/CCW/code_61E0.c +++ b/src/CCW/code_61E0.c @@ -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; } diff --git a/src/CCW/code_6620.c b/src/CCW/code_6620.c index 2dcffcc6..6a7964ce 100644 --- a/src/CCW/code_6620.c +++ b/src/CCW/code_6620.c @@ -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->unk138_24 = FALSE; local->unk0 = &D_8038F490[0]; while(local->unk0->map_id != 0 && map_get() != local->unk0->map_id){ diff --git a/src/CCW/code_6AC0.c b/src/CCW/code_6AC0.c index 4a10d4d4..853886ea 100644 --- a/src/CCW/code_6AC0.c +++ b/src/CCW/code_6AC0.c @@ -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->unk138_24 = FALSE; func_8038CEB0(this, 1); if (jiggyscore_isCollected(JIGGY_4B_CCW_GNAWTY) != 0) { diff --git a/src/CCW/code_6EC0.c b/src/CCW/code_6EC0.c index 20de4630..30709c30 100644 --- a/src/CCW/code_6EC0.c +++ b/src/CCW/code_6EC0.c @@ -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->unk138_24 = FALSE; local->unk0 = D_8038F600; while (local->unk0->map != 0 && map_get() != local->unk0->map) { diff --git a/src/CCW/code_7120.c b/src/CCW/code_7120.c index 51e994ac..806cfbdf 100644 --- a/src/CCW/code_7120.c +++ b/src/CCW/code_7120.c @@ -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) { diff --git a/src/CCW/code_7570.c b/src/CCW/code_7570.c index 25ce5991..78d52b66 100644 --- a/src/CCW/code_7570.c +++ b/src/CCW/code_7570.c @@ -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); diff --git a/src/CCW/code_7BF0.c b/src/CCW/code_7BF0.c index 7557066e..70d3a9c8 100644 --- a/src/CCW/code_7BF0.c +++ b/src/CCW/code_7BF0.c @@ -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; diff --git a/src/CCW/code_950.c b/src/CCW/code_950.c index d63e8953..c9780463 100644 --- a/src/CCW/code_950.c +++ b/src/CCW/code_950.c @@ -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; diff --git a/src/FP/ch/bearcub.c b/src/FP/ch/bearcub.c index 702bf4db..8ab52e9c 100644 --- a/src/FP/ch/bearcub.c +++ b/src/FP/ch/bearcub.c @@ -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 diff --git a/src/FP/ch/boggy1.c b/src/FP/ch/boggy1.c index 4ce57932..3290553f 100644 --- a/src/FP/ch/boggy1.c +++ b/src/FP/ch/boggy1.c @@ -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; diff --git a/src/FP/ch/boggy2.c b/src/FP/ch/boggy2.c index c67f740d..85204a5d 100644 --- a/src/FP/ch/boggy2.c +++ b/src/FP/ch/boggy2.c @@ -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; diff --git a/src/FP/ch/boggy3.c b/src/FP/ch/boggy3.c index 3f2e516c..55820769 100644 --- a/src/FP/ch/boggy3.c +++ b/src/FP/ch/boggy3.c @@ -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); diff --git a/src/FP/ch/cavewozza.c b/src/FP/ch/cavewozza.c index 12b433dd..02cd2f09 100644 --- a/src/FP/ch/cavewozza.c +++ b/src/FP/ch/cavewozza.c @@ -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; diff --git a/src/FP/ch/present.c b/src/FP/ch/present.c index 0f3a283c..6e8946ec 100644 --- a/src/FP/ch/present.c +++ b/src/FP/ch/present.c @@ -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; diff --git a/src/FP/ch/scarfsled.c b/src/FP/ch/scarfsled.c index 5be4d707..eaab9702 100644 --- a/src/FP/ch/scarfsled.c +++ b/src/FP/ch/scarfsled.c @@ -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; diff --git a/src/FP/ch/snowmanbutton.c b/src/FP/ch/snowmanbutton.c index b5c2b884..633f7a9f 100644 --- a/src/FP/ch/snowmanbutton.c +++ b/src/FP/ch/snowmanbutton.c @@ -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(); } diff --git a/src/FP/ch/twinkly.c b/src/FP/ch/twinkly.c index 64ce2a07..72351b65 100644 --- a/src/FP/ch/twinkly.c +++ b/src/FP/ch/twinkly.c @@ -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]){ diff --git a/src/FP/ch/twinklybox.c b/src/FP/ch/twinklybox.c index d8de5ab2..116e59cd 100644 --- a/src/FP/ch/twinklybox.c +++ b/src/FP/ch/twinklybox.c @@ -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; diff --git a/src/FP/ch/twinklymuncher.c b/src/FP/ch/twinklymuncher.c index a5bc0925..f4c2fb90 100644 --- a/src/FP/ch/twinklymuncher.c +++ b/src/FP/ch/twinklymuncher.c @@ -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); diff --git a/src/FP/ch/wozza.c b/src/FP/ch/wozza.c index 95c5a094..d2e43f3d 100644 --- a/src/FP/ch/wozza.c +++ b/src/FP/ch/wozza.c @@ -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(); diff --git a/src/FP/ch/xmastree.c b/src/FP/ch/xmastree.c index 6220f350..0c0c80cc 100644 --- a/src/FP/ch/xmastree.c +++ b/src/FP/ch/xmastree.c @@ -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); diff --git a/src/FP/ch/xmastreeeggtoll.c b/src/FP/ch/xmastreeeggtoll.c index 1ce1a850..9af4d189 100644 --- a/src/FP/ch/xmastreeeggtoll.c +++ b/src/FP/ch/xmastreeeggtoll.c @@ -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); } diff --git a/src/FP/ch/xmastreeice.c b/src/FP/ch/xmastreeice.c index 90a474ad..62c5553d 100644 --- a/src/FP/ch/xmastreeice.c +++ b/src/FP/ch/xmastreeice.c @@ -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); } diff --git a/src/FP/ch/xmastreestar.c b/src/FP/ch/xmastreestar.c index 082abdde..23f101b6 100644 --- a/src/FP/ch/xmastreestar.c +++ b/src/FP/ch/xmastreestar.c @@ -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); diff --git a/src/FP/ch/xmastreeswitch.c b/src/FP/ch/xmastreeswitch.c index f3ae72b5..c373a805 100644 --- a/src/FP/ch/xmastreeswitch.c +++ b/src/FP/ch/xmastreeswitch.c @@ -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); diff --git a/src/FP/code_19E0.c b/src/FP/code_19E0.c index 247b7f90..d503fe42 100644 --- a/src/FP/code_19E0.c +++ b/src/FP/code_19E0.c @@ -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; diff --git a/src/FP/code_1FF0.c b/src/FP/code_1FF0.c index 6b54d15a..d3dab825 100644 --- a/src/FP/code_1FF0.c +++ b/src/FP/code_1FF0.c @@ -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; diff --git a/src/FP/code_A1C0.c b/src/FP/code_A1C0.c index 487195d0..88b58803 100644 --- a/src/FP/code_A1C0.c +++ b/src/FP/code_A1C0.c @@ -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; diff --git a/src/FP/code_ABD0.c b/src/FP/code_ABD0.c index 1892bd39..1dfee22f 100644 --- a/src/FP/code_ABD0.c +++ b/src/FP/code_ABD0.c @@ -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; } diff --git a/src/GV/ch/ancientone.c b/src/GV/ch/ancientone.c index d564ac2f..0a3e291f 100644 --- a/src/GV/ch/ancientone.c +++ b/src/GV/ch/ancientone.c @@ -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; diff --git a/src/GV/ch/buriedpyramid.c b/src/GV/ch/buriedpyramid.c index 704fa498..be10b0c3 100644 --- a/src/GV/ch/buriedpyramid.c +++ b/src/GV/ch/buriedpyramid.c @@ -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; diff --git a/src/GV/ch/gobi1.c b/src/GV/ch/gobi1.c index 3ec32a72..29e8c1fe 100644 --- a/src/GV/ch/gobi1.c +++ b/src/GV/ch/gobi1.c @@ -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; diff --git a/src/GV/ch/gobi2.c b/src/GV/ch/gobi2.c index b818b789..179683ce 100644 --- a/src/GV/ch/gobi2.c +++ b/src/GV/ch/gobi2.c @@ -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(); diff --git a/src/GV/ch/gobi3.c b/src/GV/ch/gobi3.c index 6ac343dd..f3c55bb0 100644 --- a/src/GV/ch/gobi3.c +++ b/src/GV/ch/gobi3.c @@ -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; diff --git a/src/GV/ch/gobirock.c b/src/GV/ch/gobirock.c index cdc4d298..4d16f707 100644 --- a/src/GV/ch/gobirock.c +++ b/src/GV/ch/gobirock.c @@ -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); diff --git a/src/GV/ch/gobirope.c b/src/GV/ch/gobirope.c index 40c8af23..39863ddd 100644 --- a/src/GV/ch/gobirope.c +++ b/src/GV/ch/gobirope.c @@ -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); diff --git a/src/GV/ch/mazectrl.c b/src/GV/ch/mazectrl.c index b8a7f3b3..b4c46a36 100644 --- a/src/GV/ch/mazectrl.c +++ b/src/GV/ch/mazectrl.c @@ -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); diff --git a/src/GV/ch/toots.c b/src/GV/ch/toots.c index 3b0e96e6..2153439b 100644 --- a/src/GV/ch/toots.c +++ b/src/GV/ch/toots.c @@ -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; } diff --git a/src/GV/ch/trunker.c b/src/GV/ch/trunker.c index 2d2be41d..06762d67 100644 --- a/src/GV/ch/trunker.c +++ b/src/GV/ch/trunker.c @@ -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); diff --git a/src/GV/code_3630.c b/src/GV/code_3630.c index dd69a89a..6f124041 100644 --- a/src/GV/code_3630.c +++ b/src/GV/code_3630.c @@ -46,11 +46,11 @@ void func_80389ABC(Actor *this){ } void func_80389B1C(Actor *this){ - if(!this->unk16C_4){ + if(!this->volatile_initialized){ this->unk60 = (f32) func_8038E184(); this->unk138_24 = 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){ diff --git a/src/GV/code_3BB0.c b/src/GV/code_3BB0.c index 3f319c31..d7b34c58 100644 --- a/src/GV/code_3BB0.c +++ b/src/GV/code_3BB0.c @@ -46,8 +46,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; } diff --git a/src/GV/code_3D90.c b/src/GV/code_3D90.c index 8028262d..a750b1ff 100644 --- a/src/GV/code_3D90.c +++ b/src/GV/code_3D90.c @@ -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; diff --git a/src/GV/code_43B0.c b/src/GV/code_43B0.c index efcaa2bc..c88b616e 100644 --- a/src/GV/code_43B0.c +++ b/src/GV/code_43B0.c @@ -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); diff --git a/src/GV/code_4740.c b/src/GV/code_4740.c index 6f90f7b1..590dae70 100644 --- a/src/GV/code_4740.c +++ b/src/GV/code_4740.c @@ -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); diff --git a/src/GV/code_5570.c b/src/GV/code_5570.c index 9b271158..65e9d7de 100644 --- a/src/GV/code_5570.c +++ b/src/GV/code_5570.c @@ -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); diff --git a/src/GV/code_61E0.c b/src/GV/code_61E0.c index 09a409b0..6e83aa3c 100644 --- a/src/GV/code_61E0.c +++ b/src/GV/code_61E0.c @@ -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(); diff --git a/src/GV/code_6370.c b/src/GV/code_6370.c index 78996cca..de91efd6 100644 --- a/src/GV/code_6370.c +++ b/src/GV/code_6370.c @@ -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; diff --git a/src/GV/code_6F80.c b/src/GV/code_6F80.c index dcd054f3..cd4d1641 100644 --- a/src/GV/code_6F80.c +++ b/src/GV/code_6F80.c @@ -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){ diff --git a/src/GV/code_7060.c b/src/GV/code_7060.c index d9c407d0..9fb05f67 100644 --- a/src/GV/code_7060.c +++ b/src/GV/code_7060.c @@ -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)); } diff --git a/src/GV/code_7FF0.c b/src/GV/code_7FF0.c index 223ee199..db2ef2fc 100644 --- a/src/GV/code_7FF0.c +++ b/src/GV/code_7FF0.c @@ -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; diff --git a/src/MM/ch/grublin.c b/src/MM/ch/grublin.c index 21e74875..4cd2ea35 100644 --- a/src/MM/ch/grublin.c +++ b/src/MM/ch/grublin.c @@ -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); diff --git a/src/MM/ch/jujuhitbox.c b/src/MM/ch/jujuhitbox.c index 0a55b44a..b8dcbbcc 100644 --- a/src/MM/ch/jujuhitbox.c +++ b/src/MM/ch/jujuhitbox.c @@ -124,8 +124,8 @@ void func_80388E20(Actor *this){ this->unk138_24 = 0; 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{ diff --git a/src/MM/ch/orangepad.c b/src/MM/ch/orangepad.c index e3e0a585..33727cf8 100644 --- a/src/MM/ch/orangepad.c +++ b/src/MM/ch/orangepad.c @@ -107,9 +107,9 @@ void func_80386768(Actor * this){ this->initialized = 1; }//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){ diff --git a/src/MMM/ch/loggo.c b/src/MMM/ch/loggo.c index 1cf3e026..3f36a380 100644 --- a/src/MMM/ch/loggo.c +++ b/src/MMM/ch/loggo.c @@ -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); diff --git a/src/MMM/ch/motzhand.c b/src/MMM/ch/motzhand.c index 05e74cf9..a79e8e13 100644 --- a/src/MMM/ch/motzhand.c +++ b/src/MMM/ch/motzhand.c @@ -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; diff --git a/src/MMM/ch/napper.c b/src/MMM/ch/napper.c index 32d7a320..8b97cc41 100644 --- a/src/MMM/ch/napper.c +++ b/src/MMM/ch/napper.c @@ -107,8 +107,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; diff --git a/src/MMM/code_16B0.c b/src/MMM/code_16B0.c index a84f0467..5b1371ef 100644 --- a/src/MMM/code_16B0.c +++ b/src/MMM/code_16B0.c @@ -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)); diff --git a/src/MMM/code_2040.c b/src/MMM/code_2040.c index 88179ae9..005907ad 100644 --- a/src/MMM/code_2040.c +++ b/src/MMM/code_2040.c @@ -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->unk60 = 0.5f; subaddie_set_state(this, 7); @@ -298,7 +298,7 @@ void func_80388BDC(Actor *this) { this->unk38_31 = 0; this->unk60 = 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); } diff --git a/src/MMM/code_2F60.c b/src/MMM/code_2F60.c index 0c4abb65..8b6d82d4 100644 --- a/src/MMM/code_2F60.c +++ b/src/MMM/code_2F60.c @@ -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; diff --git a/src/RBB/ch/anchor.c b/src/RBB/ch/anchor.c index 367b7b50..ea6144c9 100644 --- a/src/RBB/ch/anchor.c +++ b/src/RBB/ch/anchor.c @@ -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; diff --git a/src/RBB/ch/anchorctrl.c b/src/RBB/ch/anchorctrl.c index c5f87d46..935a2bec 100644 --- a/src/RBB/ch/anchorctrl.c +++ b/src/RBB/ch/anchorctrl.c @@ -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 diff --git a/src/RBB/ch/anchorswitch.c b/src/RBB/ch/anchorswitch.c index 45455765..1ff37622 100644 --- a/src/RBB/ch/anchorswitch.c +++ b/src/RBB/ch/anchorswitch.c @@ -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)) diff --git a/src/RBB/ch/axle.c b/src/RBB/ch/axle.c index 55c5a9a0..e4627898 100644 --- a/src/RBB/ch/axle.c +++ b/src/RBB/ch/axle.c @@ -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]; diff --git a/src/RBB/ch/bellbuoy.c b/src/RBB/ch/bellbuoy.c index 6f1a96fd..981e54c4 100644 --- a/src/RBB/ch/bellbuoy.c +++ b/src/RBB/ch/bellbuoy.c @@ -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; diff --git a/src/RBB/ch/boombox.c b/src/RBB/ch/boombox.c index d658660a..1c5ec1ab 100644 --- a/src/RBB/ch/boombox.c +++ b/src/RBB/ch/boombox.c @@ -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; diff --git a/src/RBB/ch/bossboombox.c b/src/RBB/ch/bossboombox.c index d36b9e48..e78a8538 100644 --- a/src/RBB/ch/bossboombox.c +++ b/src/RBB/ch/bossboombox.c @@ -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; diff --git a/src/RBB/ch/bossboomboxctrl.c b/src/RBB/ch/bossboomboxctrl.c index edf52905..9704ad48 100644 --- a/src/RBB/ch/bossboomboxctrl.c +++ b/src/RBB/ch/bossboomboxctrl.c @@ -18,9 +18,9 @@ void __chBossBoomBoxCtrl_setState(Actor *this, s32 new_state){ } void chBossBoomBoxCtrl_update(Actor *this){ - if(!this->unk16C_4){ + if(!this->volatile_initialized){ - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; if(jiggyscore_isSpawned(JIGGY_56_RBB_BOSS_BOOM_BOX) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ marker_despawn(this->marker); }else{ diff --git a/src/RBB/ch/cog.c b/src/RBB/ch/cog.c index 374b74a8..783a4069 100644 --- a/src/RBB/ch/cog.c +++ b/src/RBB/ch/cog.c @@ -45,11 +45,11 @@ void func_80388BE8(Actor *actor){ void func_80388C20(Actor *this){ ActorLocal_RBB_27E0 *local = (ActorLocal_RBB_27E0 *)&this->local; f32 sp28 = time_getDelta(); - if(!this->unk16C_4){ + if(!this->volatile_initialized){ actor_collisionOff(this); this->marker->propPtr->unk8_3 = 1; this->marker->actorFreeFunc = func_80388BE8; - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; if(this->modelCacheIndex == 0x17B){ local->sfxsource_index = func_8030D90C(); sfxsource_set_fade_distances(local->sfxsource_index, 1000.0f, 2000.0f); diff --git a/src/RBB/ch/dolphin.c b/src/RBB/ch/dolphin.c index 9f0c806a..fa3506e9 100644 --- a/src/RBB/ch/dolphin.c +++ b/src/RBB/ch/dolphin.c @@ -63,8 +63,8 @@ void func_8038B900(Actor *this){ } }////L8038BBFC - 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; diff --git a/src/RBB/ch/eggtoll1.c b/src/RBB/ch/eggtoll1.c index d61d35b9..0f09443f 100644 --- a/src/RBB/ch/eggtoll1.c +++ b/src/RBB/ch/eggtoll1.c @@ -145,8 +145,8 @@ void func_8038685C(ActorMarker *marker){ void func_803868F0(Actor *this){ ActorLocal_RBB_0 *local = (ActorLocal_RBB_0 *) &this->local; - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; if(this->state == 0){ local->unk0 = 0; local->unk4 = 0; diff --git a/src/RBB/ch/enginefan.c b/src/RBB/ch/enginefan.c index c0a62a32..d5179a03 100644 --- a/src/RBB/ch/enginefan.c +++ b/src/RBB/ch/enginefan.c @@ -128,9 +128,9 @@ void func_8038944C(Actor *this){ tick = time_getDelta(); - if(!this->unk16C_4){ + if(!this->volatile_initialized){ this->marker->propPtr->unk8_3 = 1; - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; local->unkC = func_80389280(this); if(this->state == 0){ ml_vec3f_copy(&this->position, &local->unkC->unk4); diff --git a/src/RBB/ch/enginefanswitch.c b/src/RBB/ch/enginefanswitch.c index a08d5d57..8465a596 100644 --- a/src/RBB/ch/enginefanswitch.c +++ b/src/RBB/ch/enginefanswitch.c @@ -37,9 +37,9 @@ void __chEngineFanSwitch_pressCallback(ActorMarker *marker, s32 arg1){ } void chEngineFanSwitch_update(Actor *this){ - if(!this->unk16C_4){ //initialize + if(!this->volatile_initialized){ //initialize this->marker->propPtr->unk8_3 = 1; - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; mapSpecificFlags_set(0, 0); marker_setCollisionScripts(this->marker, NULL, __chEngineFanSwitch_pressCallback, NULL); if(this->state == 0){ diff --git a/src/RBB/ch/engineparts.c b/src/RBB/ch/engineparts.c index 8c0d90cd..64128dae 100644 --- a/src/RBB/ch/engineparts.c +++ b/src/RBB/ch/engineparts.c @@ -110,9 +110,9 @@ void func_8038A724(Actor *this){ f32 sp1C = time_getDelta(); - if(!this->unk16C_4){ + if(!this->volatile_initialized){ this->marker->propPtr->unk8_3 = 1; - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; actor_collisionOff(this); local->unk0 = 0; local->unk0 = (this->modelCacheIndex == 0x17E) ? 1: local->unk0; diff --git a/src/RBB/ch/grimlet.c b/src/RBB/ch/grimlet.c index 1be543b8..9479c654 100644 --- a/src/RBB/ch/grimlet.c +++ b/src/RBB/ch/grimlet.c @@ -94,8 +94,8 @@ void func_80388620(Actor *this){ f32 sp48; f32 tmp_f2; - 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, RBB_func_80388430, NULL, NULL); local->unk4 = 0; diff --git a/src/RBB/ch/propellor.c b/src/RBB/ch/propellor.c index 7454494b..68c70d41 100644 --- a/src/RBB/ch/propellor.c +++ b/src/RBB/ch/propellor.c @@ -68,8 +68,8 @@ void chPropellor_update(Actor *this){ f32 tmp; f32 sp34 = time_getDelta(); - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; this->marker->propPtr->unk8_3 = 1; this->pitch = randf2(0.0f, 300.0f); func_803300C0(this->marker, func_80389B44); diff --git a/src/RBB/ch/propellorswitch.c b/src/RBB/ch/propellorswitch.c index 7960d8b7..085aed5b 100644 --- a/src/RBB/ch/propellorswitch.c +++ b/src/RBB/ch/propellorswitch.c @@ -94,10 +94,10 @@ void chPropellorSwitch_free(Actor *actor){ void chPropellorSwitch_update(Actor *this){ ActorLocal_RBB_3CB0 *local = (ActorLocal_RBB_3CB0 *)&this->local; - if(!this->unk16C_4){ + if(!this->volatile_initialized){ this->marker->propPtr->unk8_3 = 1; this->marker->actorFreeFunc = chPropellorSwitch_free; - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; local->unk0 = &D_80390720[((this->unk78_13 == 2) ? 0:1)]; if(local->unk0->unk6 == 0) local->unk4 = NULL; diff --git a/src/RBB/ch/rarewareflag.c b/src/RBB/ch/rarewareflag.c index b7827bad..8736c9d3 100644 --- a/src/RBB/ch/rarewareflag.c +++ b/src/RBB/ch/rarewareflag.c @@ -11,9 +11,9 @@ ActorInfo D_80390B40 = { }; void func_8038C300(Actor *this){ - if(!this->unk16C_4){ + if(!this->volatile_initialized){ this->marker->propPtr->unk8_3 = 1; - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; skeletalAnim_set(this->unk148, 0x140, 0.0f, 1.0f); } } diff --git a/src/RBB/ch/rowboat.c b/src/RBB/ch/rowboat.c index 1a48207e..b76f8785 100644 --- a/src/RBB/ch/rowboat.c +++ b/src/RBB/ch/rowboat.c @@ -36,9 +36,9 @@ void func_8038E3D8(Actor *this){ f32 sp50[3]; f32 sp44[3]; - 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->unk28 = 0.0f; local->unk2C = 0.5f; diff --git a/src/RBB/ch/whistle.c b/src/RBB/ch/whistle.c index 90e7d196..5344746c 100644 --- a/src/RBB/ch/whistle.c +++ b/src/RBB/ch/whistle.c @@ -121,9 +121,9 @@ Actor *func_8038B230(ActorMarker *marker, Gfx** gdl, Mtx** mptr, s32 arg3){ void func_8038B340(Actor * this){ ActorLocal_RBB_4C70 *local = (ActorLocal_RBB_4C70 *)&this->local; - if(!this->unk16C_4){ + if(!this->volatile_initialized){ this->marker->propPtr->unk8_3 = 1; - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; local->unk0 = func_8038B060(this); local->unk4[2] = 0.0f; diff --git a/src/RBB/ch/whistlectrl.c b/src/RBB/ch/whistlectrl.c index 81d5a1a8..4a5a7476 100644 --- a/src/RBB/ch/whistlectrl.c +++ b/src/RBB/ch/whistlectrl.c @@ -75,8 +75,8 @@ s32 chWhistleCtrl_newEvent(Actor *this, s32 whistle_id, Actor *other){ void chWhistleCtrl_update(Actor *this){ ActorLocal_RBB_5060 *local = (ActorLocal_RBB_5060 *)&this->local; - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; local->unk2 = 1; local->unk4 = "312111"; if(jiggyscore_isSpawned(JIGGY_54_RBB_WHISTLE)) diff --git a/src/RBB/ch/whistleswitch.c b/src/RBB/ch/whistleswitch.c index b3c2d8da..79ce0afd 100644 --- a/src/RBB/ch/whistleswitch.c +++ b/src/RBB/ch/whistleswitch.c @@ -129,8 +129,8 @@ void func_8038AEB8(Actor *this){ f32 sp20 = time_getDelta(); s32 tmp; - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; this->marker->propPtr->unk8_3 = 1; this->marker->actorFreeFunc = func_8038AD7C; marker_setCollisionScripts(this->marker, NULL, func_8038AD3C, NULL); diff --git a/src/RBB/code_1570.c b/src/RBB/code_1570.c index b8fad6cb..0c6283f6 100644 --- a/src/RBB/code_1570.c +++ b/src/RBB/code_1570.c @@ -221,8 +221,8 @@ void func_803882B4(ActorMarker *marker, s32 arg1){ } void RBB_func_803882F4(Actor *this){ - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; if(levelSpecificFlags_get(0x2d)){ func_80387AC0(); RBB_func_80387960(0.0f); diff --git a/src/RBB/code_9670.c b/src/RBB/code_9670.c index c9398c1f..98df7990 100644 --- a/src/RBB/code_9670.c +++ b/src/RBB/code_9670.c @@ -44,8 +44,8 @@ void func_8038FB6C(void){ } void RBB_func_8038FB84(Actor *this){ - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; D_803912B0 = 0; func_8038FA9C(this, 1); } diff --git a/src/RBB/code_9840.c b/src/RBB/code_9840.c index c1950d0d..f36e8f8c 100644 --- a/src/RBB/code_9840.c +++ b/src/RBB/code_9840.c @@ -35,8 +35,8 @@ void func_8038FC48(Actor *this){ f32 tmp_f2; s32 tmp_a1; - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; actor_collisionOff(this); local->unk4 = RBB_D_80390E30 + (this->marker->id - 0x1d2); local->unk8 = NULL; diff --git a/src/RBB/code_CA0.c b/src/RBB/code_CA0.c index c71a744e..f985dc58 100644 --- a/src/RBB/code_CA0.c +++ b/src/RBB/code_CA0.c @@ -198,8 +198,8 @@ void func_80387890(Actor *this){ } void func_803878B0(Actor *this){ - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; this->marker->actorFreeFunc = func_80387890; marker_setCollisionScripts(this->marker, 0, func_80387850, 0); func_8032AA58(this, 1.1f); diff --git a/src/SM/code_2990.c b/src/SM/code_2990.c index 352b315a..66d198ba 100644 --- a/src/SM/code_2990.c +++ b/src/SM/code_2990.c @@ -437,9 +437,9 @@ void chsmmole_Update(Actor * this){ } }//L80389B20 - if(!this->unk16C_4){ + if(!this->volatile_initialized){ __spawnQueue_add_1((GenFunction_1)chsmmole_spawnMolehill, reinterpret_cast(s32, this->marker)); - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; }//L80389B4C if(this->unk138_23){ diff --git a/src/SM/code_44D0.c b/src/SM/code_44D0.c index ef98f0d5..0cb02104 100644 --- a/src/SM/code_44D0.c +++ b/src/SM/code_44D0.c @@ -27,7 +27,7 @@ void func_8038A8F8(Actor *this){ f32 sp2C; NodeProp *other; - if(!this->unk16C_4){ + if(!this->volatile_initialized){ other = func_80304C38(0x3be, this); if(!other){ this->unk1C_x = this->position_x; @@ -37,7 +37,7 @@ void func_8038A8F8(Actor *this){ nodeprop_getPosition(other, this->unk1C); } actor_collisionOff(this); - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; }//L8038A968 player_getPosition(this->velocity); sp2C = ml_distance_vec3f(this->velocity, this->position); diff --git a/src/SM/code_5B0.c b/src/SM/code_5B0.c index 13aecdef..d569057f 100644 --- a/src/SM/code_5B0.c +++ b/src/SM/code_5B0.c @@ -51,7 +51,7 @@ void func_803869A0(Actor *this, f32 arg1, f32 arg2) { } void SM_func_80386A00(Actor *this) { - if (this->unk16C_4 <= 0) { + if (this->volatile_initialized <= 0) { if (fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY) == 0) { marker_despawn(this->marker); return; @@ -59,7 +59,7 @@ void SM_func_80386A00(Actor *this) { actor_collisionOff(this); if(0); this->marker->propPtr->unk8_3 = 1; - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; } func_803869A0(this, 0.20f, 1.00f); func_803869A0(this, 0.27f, 1.05f); @@ -129,12 +129,12 @@ void func_80386EB4(ActorMarker *marker, ActorMarker *other_marker) { void SM_func_80386EF4(Actor *this) { u32 temp_t3; Actor *other; - if ((this->unk16C_4) <= 0) { + if ((this->volatile_initialized) <= 0) { this->marker->propPtr->unk8_3 = 1; marker_setCollisionScripts(this->marker, 0, 0, func_80386EB4); this->unk38_31 = 0; this->unk138_31 = 1; - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; } if ((this->state) == 1) { temp_t3 = this->unk38_31++ ^ 2; diff --git a/src/SM/code_BF0.c b/src/SM/code_BF0.c index 1e0dd9ab..a8117b20 100644 --- a/src/SM/code_BF0.c +++ b/src/SM/code_BF0.c @@ -14,10 +14,10 @@ ActorInfo D_8038ABF0 = { /* .code */ void SM_func_80386FE0(Actor *this){ - if(!this->unk16C_4){ + if(!this->volatile_initialized){ this->unk10_12 = 0; this->unk38_31 = this->unk10_12; - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; actor_collisionOff(this); } diff --git a/src/TTC/ch/blubber.c b/src/TTC/ch/blubber.c index e2829a75..e7e0550e 100644 --- a/src/TTC/ch/blubber.c +++ b/src/TTC/ch/blubber.c @@ -138,11 +138,11 @@ void func_803878CC(Actor * this){ if(!mapSpecificFlags_get(1) && !func_80329530(this, 2500)) return; - if(!this->unk16C_4){ + if(!this->volatile_initialized){ if(this->state == 3){ subaddie_set_state_with_direction(this, 2, 0.0f, 1); } - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; }//L80387970 if(func_80329530(this, 250) && !func_80329530(this, 80) diff --git a/src/TTC/ch/clam.c b/src/TTC/ch/clam.c index 3f9b864f..dba898a3 100644 --- a/src/TTC/ch/clam.c +++ b/src/TTC/ch/clam.c @@ -271,8 +271,8 @@ void chClam_update(Actor *this){ animctrl_setDuration(this->animctrl, 2.0f); } - if(!this->unk16C_4){ - this->unk16C_4 = TRUE; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; marker_setCollisionScripts(this->marker, NULL, __chClam_attackOther, __chClam_takeDamage); } diff --git a/src/TTC/ch/leaky.c b/src/TTC/ch/leaky.c index e11ff76f..c5217a03 100644 --- a/src/TTC/ch/leaky.c +++ b/src/TTC/ch/leaky.c @@ -36,8 +36,8 @@ void chLeaky_update(Actor *this) { void *temp_v0_2; func_8028E668(this->position, 100.0f, -20.0f, 100.0f); - if (!this->unk16C_4) { - this->unk16C_4 = TRUE; + if (!this->volatile_initialized) { + this->volatile_initialized = TRUE; this->marker->propPtr->unk8_3 = FALSE; if (levelSpecificFlags_get(5) != 0) { levelSpecificFlags_set(5, FALSE); diff --git a/src/TTC/ch/lockup.c b/src/TTC/ch/lockup.c index 47136a49..0b572aa7 100644 --- a/src/TTC/ch/lockup.c +++ b/src/TTC/ch/lockup.c @@ -86,8 +86,8 @@ void func_80389600(Actor *this){ this->unk138_24 = 1; }//L803896AC - if(!this->unk16C_4){ - this->unk16C_4 = TRUE; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; } switch(this->state){ diff --git a/src/TTC/ch/nipper.c b/src/TTC/ch/nipper.c index bdb6e020..7f7f8321 100644 --- a/src/TTC/ch/nipper.c +++ b/src/TTC/ch/nipper.c @@ -194,8 +194,8 @@ void func_80388434(Actor *this){ player_getPosition(sp38); sp44 = func_80309D58(sp38, 1); - if(!this->unk16C_4){ - this->unk16C_4 = TRUE; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; this->velocity_x = sp44; func_8032BC18(this); } diff --git a/src/TTC/code_26D0.c b/src/TTC/code_26D0.c index ddf3bcd5..9f8ab9ba 100644 --- a/src/TTC/code_26D0.c +++ b/src/TTC/code_26D0.c @@ -135,9 +135,9 @@ void func_80388D04(s32 arg0){ void func_80388D34(Actor *this){ TTC_func_80388C78(this); - if(!this->unk16C_4){ + if(!this->volatile_initialized){ __spawnQueue_add_1((GenFunction_1)func_80388D04, (s32)this->marker); - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; } } @@ -152,8 +152,8 @@ void func_80388D8C(Actor *this){ this->yaw = 199.0f; } - if(!this->unk16C_4){ - this->unk16C_4 = TRUE; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; if(sns_get_item_state(SNS_ITEM_EGG_PINK, TRUE)){ this->position_y = 700.0f; } diff --git a/src/core2/ch/beehive.c b/src/core2/ch/beehive.c index 61c76e41..74a80315 100644 --- a/src/core2/ch/beehive.c +++ b/src/core2/ch/beehive.c @@ -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){ diff --git a/src/core2/ch/bottlesbonus.c b/src/core2/ch/bottlesbonus.c index 335cd15a..7a3dc37c 100644 --- a/src/core2/ch/bottlesbonus.c +++ b/src/core2/ch/bottlesbonus.c @@ -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; diff --git a/src/core2/ch/clankerwhipcrack.c b/src/core2/ch/clankerwhipcrack.c index d410e7ef..910107a3 100644 --- a/src/core2/ch/clankerwhipcrack.c +++ b/src/core2/ch/clankerwhipcrack.c @@ -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); diff --git a/src/core2/ch/clucker.c b/src/core2/ch/clucker.c index 6cebd886..cb9f727d 100644 --- a/src/core2/ch/clucker.c +++ b/src/core2/ch/clucker.c @@ -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); diff --git a/src/core2/ch/code_468E0.c b/src/core2/ch/code_468E0.c index 8f5a7fed..dc3abca0 100644 --- a/src/core2/ch/code_468E0.c +++ b/src/core2/ch/code_468E0.c @@ -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 diff --git a/src/core2/ch/code_CFA60.c b/src/core2/ch/code_CFA60.c index 19a48d39..b102d835 100644 --- a/src/core2/ch/code_CFA60.c +++ b/src/core2/ch/code_CFA60.c @@ -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); diff --git a/src/core2/ch/crab.c b/src/core2/ch/crab.c index 81f6b17b..934c66c1 100644 --- a/src/core2/ch/crab.c +++ b/src/core2/ch/crab.c @@ -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)) { diff --git a/src/core2/ch/drips.c b/src/core2/ch/drips.c index c432aac2..6e944414 100644 --- a/src/core2/ch/drips.c +++ b/src/core2/ch/drips.c @@ -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; } diff --git a/src/core2/ch/firefx.c b/src/core2/ch/firefx.c index fd3cfbcb..12f34da9 100644 --- a/src/core2/ch/firefx.c +++ b/src/core2/ch/firefx.c @@ -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); diff --git a/src/core2/ch/ghost.c b/src/core2/ch/ghost.c index 18e7f02c..722711b4 100644 --- a/src/core2/ch/ghost.c +++ b/src/core2/ch/ghost.c @@ -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); diff --git a/src/core2/ch/gravestone.c b/src/core2/ch/gravestone.c index 42bbb2fb..12e648ae 100644 --- a/src/core2/ch/gravestone.c +++ b/src/core2/ch/gravestone.c @@ -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]; diff --git a/src/core2/ch/icecube.c b/src/core2/ch/icecube.c index ce17a4f7..85062849 100644 --- a/src/core2/ch/icecube.c +++ b/src/core2/ch/icecube.c @@ -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); diff --git a/src/core2/ch/mole.c b/src/core2/ch/mole.c index 1446d240..446ed47b 100644 --- a/src/core2/ch/mole.c +++ b/src/core2/ch/mole.c @@ -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); diff --git a/src/core2/ch/molehill.c b/src/core2/ch/molehill.c index b89bfeb1..92da0f72 100644 --- a/src/core2/ch/molehill.c +++ b/src/core2/ch/molehill.c @@ -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: diff --git a/src/core2/ch/snowman.c b/src/core2/ch/snowman.c index f178012e..50e179ec 100644 --- a/src/core2/ch/snowman.c +++ b/src/core2/ch/snowman.c @@ -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); diff --git a/src/core2/ch/soundsource.c b/src/core2/ch/soundsource.c index 6be92dee..c18dc324 100644 --- a/src/core2/ch/soundsource.c +++ b/src/core2/ch/soundsource.c @@ -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); } diff --git a/src/core2/ch/termite.c b/src/core2/ch/termite.c index 3476e1e4..58340bd5 100644 --- a/src/core2/ch/termite.c +++ b/src/core2/ch/termite.c @@ -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) diff --git a/src/core2/ch/whipcrack.c b/src/core2/ch/whipcrack.c index bed46ae7..88eb8c91 100644 --- a/src/core2/ch/whipcrack.c +++ b/src/core2/ch/whipcrack.c @@ -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); diff --git a/src/core2/code_42CB0.c b/src/core2/code_42CB0.c index 5aff03d2..645597d6 100644 --- a/src/core2/code_42CB0.c +++ b/src/core2/code_42CB0.c @@ -113,8 +113,8 @@ void chHoneycomb_update(Actor *this){ } }//L802C9F9C - if(!this->unk16C_4){ - this->unk16C_4 = TRUE; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; if( this->marker->id == MARKER_55_HONEYCOMB && !this->unk44_2 ){ diff --git a/src/core2/code_43250.c b/src/core2/code_43250.c index dd958937..2674bfe8 100644 --- a/src/core2/code_43250.c +++ b/src/core2/code_43250.c @@ -153,8 +153,8 @@ void func_802CA1E0(Actor *this){ f32 tmp_f4; s32 phi_a2; - if(!this->unk16C_4){ - this->unk16C_4 = TRUE; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; tmp_v1 = (s32)this->yaw; this->unk154 = D_80366E64[tmp_v1].unk0; reinterpret_cast(s32, this->unkBC[4]) = D_80366E64[tmp_v1].unk4; diff --git a/src/core2/code_43A40.c b/src/core2/code_43A40.c index cf628790..eaf0b64d 100644 --- a/src/core2/code_43A40.c +++ b/src/core2/code_43A40.c @@ -91,8 +91,8 @@ void chFightFlightPad_emitSparklesAtPosition(f32 position[3]){ } void chFightFlightPad_update(Actor *this){ - if(!this->unk16C_4){ - this->unk16C_4 = TRUE; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; chFightFlightPad_emitSparklesAtPosition(this->position); FUNC_8030E8B4(SFX_113_PAD_APPEARS, 1.0f, 32000, this->position, 5000, 12000); } diff --git a/src/core2/code_45310.c b/src/core2/code_45310.c index 035e941b..3836f1a0 100644 --- a/src/core2/code_45310.c +++ b/src/core2/code_45310.c @@ -302,8 +302,8 @@ void func_802CCC5C(Actor *this) { spBC = 0; spB8 = time_getDelta(); local = (ActorLocal_Core2_45310 * )&this->local; - if (!this->unk16C_4) { - this->unk16C_4 = TRUE; + if (!this->volatile_initialized) { + this->volatile_initialized = TRUE; this->marker->actorFreeFunc = func_802CCBC8; local->unk38 = 0; local->unk39 = 0; diff --git a/src/core2/code_47BD0.c b/src/core2/code_47BD0.c index 70dddc93..cf6d860f 100644 --- a/src/core2/code_47BD0.c +++ b/src/core2/code_47BD0.c @@ -54,7 +54,7 @@ void func_802CEB60(Actor *this){ ActorLocal_core2_47BD0 *local; local = (ActorLocal_core2_47BD0 *)&this->local; - if(this->unk16C_4){ + if(this->volatile_initialized){ if(local->unk8 != NULL){ local->unk8 = (Struct_core2_47BD0_0 *)defrag(local->unk8); } @@ -354,8 +354,8 @@ void chBeeSwarm_update(Actor *this) { local->unk18 = next_position[1]; } } - if (!this->unk16C_4) { - this->unk16C_4 = TRUE; + if (!this->volatile_initialized) { + this->volatile_initialized = TRUE; marker_setFreeMethod(this->marker, chBeeSwarm_802CEBA8); actor_collisionOff(this); local->unk20 = assetcache_get(ASSET_3BF_MODEL_PLAYER_SHADOW); diff --git a/src/core2/code_4A6F0.c b/src/core2/code_4A6F0.c index f668bae9..4e8c4788 100644 --- a/src/core2/code_4A6F0.c +++ b/src/core2/code_4A6F0.c @@ -239,7 +239,7 @@ void chMumbo_update(Actor *this) { } } - if(!this->unk16C_4){ + if(!this->volatile_initialized){ this->unk38_31 = 0; if( player_getTransformation() == TRANSFORM_1_BANJO && !fileProgressFlag_get(__bkProgId_from_transformationId(D_8037DDF0)) @@ -250,7 +250,7 @@ void chMumbo_update(Actor *this) { this->unk38_0 = (item_getCount(ITEM_1C_MUMBO_TOKEN) >= this->unk38_31); this->unk10_12 = 0; this->unk138_24 = 0; - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; } func_80256E24(sp4C, 0.0f, this->yaw, 0.0f, 0.0f, 10.0f); diff --git a/src/core2/code_4BD70.c b/src/core2/code_4BD70.c index 1dd11e4c..a003a1dc 100644 --- a/src/core2/code_4BD70.c +++ b/src/core2/code_4BD70.c @@ -12,13 +12,13 @@ ActorInfo D_8036759C = { MARKER_1E9_MUMBO_COST_SIGN, ACTOR_369_20_MUMBO_TOKEN_SI ActorInfo D_803675C0 = { MARKER_1E9_MUMBO_COST_SIGN, ACTOR_36C_25_MUMBO_TOKEN_SIGN, ASSET_305_MODEL_25_MUMBO_TOKEN_SIGN, 0x0, 0x0, chMumboSign_update, func_80326224, actor_draw, 0, 0, 0.0f, 0}; void chMumboSign_update(Actor *this) { - if (!this->unk16C_4) { + if (!this->volatile_initialized) { if( fileProgressFlag_get(this->modelCacheIndex - ACTOR_368_5_MUMBO_TOKEN_SIGN + FILEPROG_90_PAID_TERMITE_COST) || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) ) { marker_despawn(this->marker); } - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; } if (fileProgressFlag_get(this->modelCacheIndex - ACTOR_368_5_MUMBO_TOKEN_SIGN + FILEPROG_90_PAID_TERMITE_COST)) { func_80326310(this); diff --git a/src/core2/code_4C020.c b/src/core2/code_4C020.c index 899f9f31..c5588870 100644 --- a/src/core2/code_4C020.c +++ b/src/core2/code_4C020.c @@ -373,9 +373,9 @@ void func_802D3DA4(Actor *this) { return; } - if (!this->unk16C_4) { + if (!this->volatile_initialized) { - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; this->marker->propPtr->unk8_3 = TRUE; this->unk38_31 = 0; } diff --git a/src/core2/code_509D0.c b/src/core2/code_509D0.c index 82a3bcf4..74ae77f1 100644 --- a/src/core2/code_509D0.c +++ b/src/core2/code_509D0.c @@ -314,8 +314,8 @@ void chLevelCollectible_update(Actor *this){ s32 marker_id; if(this->despawn_flag) return; - if(!this->unk16C_4){ - this->unk16C_4 = TRUE; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; if( this->marker->id == MARKER_1FD_BLUE_PRESENT_COLLECTIBLE || this->marker->id == MARKER_1FE_GREEN_PRESENT_COLLECTIBLE || this->marker->id == MARKER_1FF_RED_PRESENT_COLLECTIBLE diff --git a/src/core2/code_53C10.c b/src/core2/code_53C10.c index eae84936..bd4b366b 100644 --- a/src/core2/code_53C10.c +++ b/src/core2/code_53C10.c @@ -240,13 +240,13 @@ void func_802DB5A0(Actor *this) { f32 phi_f14; local = (ActorLocal_core2_53C10 *)&this->local; - if (!this->unk16C_4) { + if (!this->volatile_initialized) { marker_setCollisionScripts(this->marker, &func_802DB440, local->unk30, local->unk34); this->marker->propPtr->unk8_3 = FALSE; this->unk60 = 0.0f; this->unk124_0 = this->unk138_31 = FALSE; local->unk38 = 0; - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; if (volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) { subaddie_set_state(this, 2U); return; diff --git a/src/core2/code_54D50.c b/src/core2/code_54D50.c index aa1a197d..65b11302 100644 --- a/src/core2/code_54D50.c +++ b/src/core2/code_54D50.c @@ -89,11 +89,11 @@ void func_802DC018(Actor *this){ ActorLocal_Core2_53C10 *local = (ActorLocal_Core2_53C10 *) &this->local; f32 tmp_f0; - if(!this->unk16C_4){ + if(!this->volatile_initialized){ actor_collisionOff(this); local->unk0 = partEmitMgr_newEmitter(16); func_802DBE9C(this, local->unk0); - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; } if(func_802DBF94(this, 600) && randf() < 0.2){ tmp_f0 = randf2(0.01f, 0.06f); diff --git a/src/core2/code_55180.c b/src/core2/code_55180.c index eeaac631..931db911 100644 --- a/src/core2/code_55180.c +++ b/src/core2/code_55180.c @@ -52,8 +52,8 @@ void func_802DC208(Actor *this) { f32 sp2C[3]; enum asset_e phi_a1; - 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; } diff --git a/src/core2/code_59780.c b/src/core2/code_59780.c index 0bf2ce2d..11d0266e 100644 --- a/src/core2/code_59780.c +++ b/src/core2/code_59780.c @@ -115,8 +115,8 @@ void func_802E07E0(Actor *this) { break; } - if(!this->unk16C_4) { - this->unk16C_4 = TRUE; + if(!this->volatile_initialized) { + this->volatile_initialized = TRUE; if (sp24) { func_802C7318(this); } diff --git a/src/core2/code_935F0.c b/src/core2/code_935F0.c index 768a6044..704b609e 100644 --- a/src/core2/code_935F0.c +++ b/src/core2/code_935F0.c @@ -150,8 +150,8 @@ void __chMinigame_free(Actor *this){ } void chMinigame_update(Actor *this){ - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; this->unk10_12 = __chminigame_getCurrentMapId(); actor_collisionOff(this); if(!volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ diff --git a/src/core2/code_9E370.c b/src/core2/code_9E370.c index 36e015a2..96588e48 100644 --- a/src/core2/code_9E370.c +++ b/src/core2/code_9E370.c @@ -834,7 +834,7 @@ Actor *actor_new(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags){ suLastBaddie->unk44_1 = 0; suLastBaddie->unk44_0 = 0; suLastBaddie->initialized = FALSE; - suLastBaddie->unk16C_4 = 0; + suLastBaddie->volatile_initialized = FALSE; suLastBaddie->unk60 = 0.0f; suLastBaddie->unk10_0 = 0; suLastBaddie->unk104 = NULL; @@ -1735,7 +1735,7 @@ void *actors_appendToSavestate(void * begin, u32 end){ s0->unk14C[0] =s0->unk14C[1] = NULL; // s0->unk14C = NULL; s0->unk148 = NULL; - s0->unk16C_4 = 0; + s0->volatile_initialized = FALSE; s0->unk44_31 = 0; s0->unk104 = NULL; s0->unk100 = NULL; @@ -2328,10 +2328,10 @@ void func_8032BB88(Actor *this, s32 arg1, s32 arg2){ } bool func_8032BBE8(Actor *this){ - if(this->unk16C_4){ + if(this->volatile_initialized){ return TRUE; } - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; return FALSE; } diff --git a/src/core2/code_D0CA0.c b/src/core2/code_D0CA0.c index 39cc0110..42280426 100644 --- a/src/core2/code_D0CA0.c +++ b/src/core2/code_D0CA0.c @@ -290,8 +290,8 @@ void func_80358684(Actor *this) { local = (ActorLocal_core2_D0CA0 *)&this->local; next_state = 0; sp88 = time_getDelta(); - if (!this->unk16C_4) { - this->unk16C_4 = TRUE; + if (!this->volatile_initialized) { + this->volatile_initialized = TRUE; this->marker->actorFreeFunc = func_80358490; local->unk38 = 0; local->unk39 = 0; diff --git a/src/core2/code_D2180.c b/src/core2/code_D2180.c index 5c7c52a9..3998d7c9 100644 --- a/src/core2/code_D2180.c +++ b/src/core2/code_D2180.c @@ -104,8 +104,8 @@ void func_803591E8(Actor *this, s32 next_state){ void func_8035933C(Actor *this){ ActorLocal_core2_D2180 * local = (ActorLocal_core2_D2180 *) &this->local; - if(!this->unk16C_4){ - this->unk16C_4 = TRUE; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; local->unk0 = D_80372940 + (this->modelCacheIndex - 0x2AE); func_803591E8(this, 1); } diff --git a/src/core2/code_D5D10.c b/src/core2/code_D5D10.c index 40547034..30e3c753 100644 --- a/src/core2/code_D5D10.c +++ b/src/core2/code_D5D10.c @@ -107,7 +107,7 @@ static void _chskeleton_init(Actor *this) { } void chskeleton_update(Actor *this){ - if(!this->unk16C_4){ + if(!this->volatile_initialized){ _chskeleton_init(this); } func_802DB5A0(this); diff --git a/src/core2/code_D5FD0.c b/src/core2/code_D5FD0.c index 780e7c87..bdb2aa86 100644 --- a/src/core2/code_D5FD0.c +++ b/src/core2/code_D5FD0.c @@ -88,7 +88,7 @@ void func_8035CFC4(Actor *this) { } void func_8035D058(Actor *this) { - if (!this->unk16C_4) { + if (!this->volatile_initialized) { func_8035CFC4(this); } func_802DB5A0(this); diff --git a/src/core2/code_D6180.c b/src/core2/code_D6180.c index d2e0b036..61614678 100644 --- a/src/core2/code_D6180.c +++ b/src/core2/code_D6180.c @@ -111,7 +111,7 @@ void func_8035D2FC(Actor *this) { } void func_8035D3D8(Actor *this) { - if (!this->unk16C_4) { + if (!this->volatile_initialized) { func_8035D2FC(this); } func_802DB5A0(this); diff --git a/src/core2/code_DA3A0.c b/src/core2/code_DA3A0.c index 521f2546..5d25002a 100644 --- a/src/core2/code_DA3A0.c +++ b/src/core2/code_DA3A0.c @@ -82,9 +82,9 @@ void func_8036158C(Actor *this){ sp30 = time_getDelta(); - if(!this->unk16C_4){ + if(!this->volatile_initialized){ this->marker->propPtr->unk8_3 = TRUE; - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; local->unk0 = &D_80373130[this->modelCacheIndex - 0x289]; if(*local->unk0){ this->roll = this->yaw; diff --git a/src/core2/code_DA760.c b/src/core2/code_DA760.c index cf941faa..097f165b 100644 --- a/src/core2/code_DA760.c +++ b/src/core2/code_DA760.c @@ -41,9 +41,9 @@ void func_80361828(Actor *this){ void func_80361870(Actor *this){ s32 text_id; s32 sp28; - if(!this->unk16C_4){ + if(!this->volatile_initialized){ marker_setFreeMethod(this->marker, func_80361828); - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; } if(!this->unk138_24 && func_80329530(this, 400) && !func_80329530(this, 50)){ diff --git a/src/core2/code_DB010.c b/src/core2/code_DB010.c index 18d2ce2c..8409ac84 100644 --- a/src/core2/code_DB010.c +++ b/src/core2/code_DB010.c @@ -532,8 +532,8 @@ void func_80362E94(Actor *this){ } break; default: //L8036316C - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; this->unk60 = this->scale*10.0; } diff --git a/src/core2/code_DC4B0.c b/src/core2/code_DC4B0.c index 745bf3d4..96004b15 100644 --- a/src/core2/code_DC4B0.c +++ b/src/core2/code_DC4B0.c @@ -29,7 +29,7 @@ void func_803634BC(void){ } void func_80363500(Actor *this){ - if(!this->unk16C_4){ + if(!this->volatile_initialized){ if(!chmole_learnedAllSpiralMountainAbilities()){ func_803634BC(); } @@ -37,7 +37,7 @@ void func_80363500(Actor *this){ func_80363440(); marker_despawn(this->marker); } - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; }//L8036355C if(chmole_learnedAllSpiralMountainAbilities()){ diff --git a/src/cutscenes/code_6730.c b/src/cutscenes/code_6730.c index 39b3c925..41591c2d 100644 --- a/src/cutscenes/code_6730.c +++ b/src/cutscenes/code_6730.c @@ -72,8 +72,8 @@ void func_8038CCA8(Actor *this){ f32 sp24 = time_getDelta(); ActorLocal_cutscenes_6730 *local = (ActorLocal_cutscenes_6730 *)&this->local; - if(!this->unk16C_4){ - this->unk16C_4 = TRUE; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; animctrl_setSmoothTransition(this->animctrl, 0); this->unk60 = this->yaw/4; local->unk0 = partEmitMgr_newEmitter(0xA0); diff --git a/src/cutscenes/code_69F0.c b/src/cutscenes/code_69F0.c index c26a37a1..9eb9995a 100644 --- a/src/cutscenes/code_69F0.c +++ b/src/cutscenes/code_69F0.c @@ -78,8 +78,8 @@ extern void func_8038CF50(Actor *this){ f32 sp40[3]; int i; - if(!this->unk16C_4){ - this->unk16C_4 = TRUE; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; local->unk0 = partEmitMgr_newEmitter(6); local->unk4 = partEmitMgr_newEmitter(6); diff --git a/src/cutscenes/code_6C90.c b/src/cutscenes/code_6C90.c index a81fa45d..4100d050 100644 --- a/src/cutscenes/code_6C90.c +++ b/src/cutscenes/code_6C90.c @@ -73,8 +73,8 @@ void func_8038D218(Actor *this){ f32 sp24 = time_getDelta(); ActorLocal_cutscenes_6C90 *local = (ActorLocal_cutscenes_6C90 *)&this->local; - if(!this->unk16C_4){ - this->unk16C_4 = TRUE; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; animctrl_setSmoothTransition(this->animctrl, 0); this->unk60 = this->yaw/4; local->unk0 = partEmitMgr_newEmitter(0x100); diff --git a/src/fight/chbossjinjo.c b/src/fight/chbossjinjo.c index 9ee82135..47079727 100644 --- a/src/fight/chbossjinjo.c +++ b/src/fight/chbossjinjo.c @@ -196,8 +196,8 @@ void chBossJinjo_update(Actor *this){ s16 sp42; s16 sp40; - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; func_80324CFC(0.0f, SFX_JINJO_STATUE_POWERUP, 32000); func_80324D2C(this->unk60 + 2.26, SFX_JINJO_STATUE_POWERUP); }//L8038C8A4 @@ -350,8 +350,8 @@ void func_8038CED8(f32 arg0[3], enum asset_e model_id, f32 arg2, f32 arg3){ void chBossJinjo_func_8038D014(Actor *this){ s32 temp_a1; - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; this->marker->propPtr->unk8_3 = 0; actor_collisionOff(this); this->alpha_124_19 = 0x7d; diff --git a/src/fight/chbossjinjobase.c b/src/fight/chbossjinjobase.c index ded84712..015e77d1 100644 --- a/src/fight/chbossjinjobase.c +++ b/src/fight/chbossjinjobase.c @@ -108,8 +108,8 @@ void chBossJinjoBase_update(Actor *this) { this->unkF4_29 = 0; marker_loadModelBin(this->marker); - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; marker_setCollisionScripts(this->marker, NULL, chBossJinjoBase_getHitByEgg, NULL); marker_setFreeMethod(this->marker, fight_func_8038D510); this->marker->propPtr->unk8_3 = 1; diff --git a/src/fight/chfinalboss.c b/src/fight/chfinalboss.c index fef65890..8fd26455 100644 --- a/src/fight/chfinalboss.c +++ b/src/fight/chfinalboss.c @@ -2172,8 +2172,8 @@ void chfinalboss_update(Actor *this){ f32 sp40[3]; f32 sp34[3]; - if(!this->unk16C_4){ - this->unk16C_4 = TRUE; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; func_803300C0(this->marker, func_8038B834); marker_setCollisionScripts(this->marker, func_8038BB8C, func_8038B9AC, NULL); this->marker->propPtr->unk8_3 = 0; diff --git a/src/fight/chgreenblast.c b/src/fight/chgreenblast.c index 468a57a8..b9acb254 100644 --- a/src/fight/chgreenblast.c +++ b/src/fight/chgreenblast.c @@ -100,8 +100,8 @@ void chGreenBlast_update(Actor *this){ f32 delta_time = time_getDelta(); f32 target_position[3]; - if (!this->unk16C_4) { - this->unk16C_4 = 1; + if (!this->volatile_initialized) { + this->volatile_initialized = TRUE; marker_setCollisionScripts(this->marker, NULL, NULL, chGreenBlast_collisionDie); this->marker->propPtr->unk8_3 = 0; actor_collisionOn(this); diff --git a/src/fight/chjinjonator.c b/src/fight/chjinjonator.c index eaf721fc..d4f781fb 100644 --- a/src/fight/chjinjonator.c +++ b/src/fight/chjinjonator.c @@ -159,8 +159,8 @@ void chjinjonator_update(Actor *this){ sp58 = time_getDelta(); sp54 = animctrl_getDuration(this->animctrl); - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; local->unk18 = 0.40000000000000013 / (this->unk60 + 3.3); local->unk14 = 0.7f; func_8025A6EC(JINGLE_MENACING_GRUNTILDA_B, 20000); diff --git a/src/fight/chjinjonatorbase.c b/src/fight/chjinjonatorbase.c index 64e7113f..94fc3dcd 100644 --- a/src/fight/chjinjonatorbase.c +++ b/src/fight/chjinjonatorbase.c @@ -118,8 +118,8 @@ void chjinjonatorbase_update(Actor *this){ marker_loadModelBin(this->marker); - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; marker_setCollisionScripts(this->marker, NULL, func_8038E120, NULL); this->marker->propPtr->unk8_3 = 1; actor_collisionOn(this); diff --git a/src/fight/chspellbarrier.c b/src/fight/chspellbarrier.c index 8777a948..25b9aaf6 100644 --- a/src/fight/chspellbarrier.c +++ b/src/fight/chspellbarrier.c @@ -68,8 +68,8 @@ void chspellbarrier_update(Actor *this){ f32 sp38 = time_getDelta(); ActorMarker *jinjo_marker; - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; marker_setCollisionScripts(this->marker, NULL, func_8038E780, NULL); marker_setFreeMethod(this->marker, func_8038E7EC); this->marker->propPtr->unk8_3 = 0; diff --git a/src/fight/chspellfireball.c b/src/fight/chspellfireball.c index b2f879c8..2431eaf8 100644 --- a/src/fight/chspellfireball.c +++ b/src/fight/chspellfireball.c @@ -276,8 +276,8 @@ void func_8038F620(Actor *this){ ActorLocal_fight_87A0 * local = (ActorLocal_fight_87A0 *)&this->local; f32 sp40 = time_getDelta(); - if(!this->unk16C_4){ - this->unk16C_4 = 1; + if(!this->volatile_initialized){ + this->volatile_initialized = TRUE; marker_setCollisionScripts(this->marker, NULL, NULL, func_8038F3B4); this->marker->propPtr->unk8_3 = 0; actor_collisionOn(this); diff --git a/src/fight/chstonejinjo.c b/src/fight/chstonejinjo.c index 00211318..70482b3d 100644 --- a/src/fight/chstonejinjo.c +++ b/src/fight/chstonejinjo.c @@ -40,8 +40,8 @@ void chstonejinjo_spawnJinjo(ActorMarker *marker) { } void chstonejinjo_update(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); if (this->unkF4_8 == BOSSJINJO_JINJONATOR) { diff --git a/src/lair/ch/brentilda.c b/src/lair/ch/brentilda.c index c9a4be87..4dc94083 100644 --- a/src/lair/ch/brentilda.c +++ b/src/lair/ch/brentilda.c @@ -112,9 +112,9 @@ void chBrentilda_update(Actor *this) { this->initialized = TRUE; } - if (!this->unk16C_4) { + if (!this->volatile_initialized) { local->unk0 = this->unkF4_8*3 + 0x1080; - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; } func_8028E668(this->position, 280.0f, -40.0f, 160.0f); diff --git a/src/lair/ch/cauldron.c b/src/lair/ch/cauldron.c index 6eb18d47..6d031ab6 100644 --- a/src/lair/ch/cauldron.c +++ b/src/lair/ch/cauldron.c @@ -221,9 +221,9 @@ void chWarpCauldron_update(Actor *this) { f32 sp34; lair_func_8038A864(this); - if (!this->unk16C_4) { + if (!this->volatile_initialized) { sp50 = FALSE; - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; this->marker->propPtr->unk8_3 = TRUE; this->unk1C[1] = 0.0f; this->velocity[0] = this->yaw; diff --git a/src/lair/code_0.c b/src/lair/code_0.c index 082285ff..1c9394fc 100644 --- a/src/lair/code_0.c +++ b/src/lair/code_0.c @@ -358,8 +358,8 @@ void func_803867A8(Actor *this) { this->velocity[0] = 0.0f; return; } - if (!this->unk16C_4) { - this->unk16C_4 = TRUE; + if (!this->volatile_initialized) { + this->volatile_initialized = TRUE; this->unk158[0] = func_803866D8(0); this->unk158[1] = func_803866D8(1); if (volatileFlag_get(VOLATILE_FLAG_86_SANDCASTLE_SHOCKSPRING_JUMP_UNLOCKED)) { @@ -461,8 +461,8 @@ void func_80386D78(Actor *this) { return; } - if (!this->unk16C_4) { - this->unk16C_4 = TRUE; + if (!this->volatile_initialized) { + this->volatile_initialized = TRUE; if (volatileFlag_get(VOLATILE_FLAG_8A_SANDCASTLE_FLIGHT_UNLOCKED)) { ability_unlock(ABILITY_9_FLIGHT); mapSpecificFlags_set(0, TRUE); @@ -527,8 +527,8 @@ void func_803870DC(Actor *this) { phi_v1 = fileProgressFlag_get(D_80393454[this->unkF4_8 - 1]) || (D_80393468[this->unkF4_8 - 1] != 0 && volatileFlag_get(D_80393468[this->unkF4_8 - 1])); - if (!this->unk16C_4) { - this->unk16C_4 = TRUE; + if (!this->volatile_initialized) { + this->volatile_initialized = TRUE; if (phi_v1) { this->alpha_124_19 = 0xFF; } else { @@ -602,7 +602,7 @@ void func_803875F0(Actor * this) { func_802D3D74(this); - if (!this->unk16C_4) + if (!this->volatile_initialized) { if (fileProgressFlag_get(FILEPROG_1E_LAIR_GRATE_TO_BGS_PUZZLE_OPEN)) { @@ -615,7 +615,7 @@ void func_803875F0(Actor * this) this->unk1C_y = this->position_y; func_802BAFE4(0x2A); fileProgressFlag_set(FILEPROG_1E_LAIR_GRATE_TO_BGS_PUZZLE_OPEN, TRUE); - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; this->unk38_31 = 0x0C; } } @@ -657,8 +657,8 @@ void func_80387730(Actor *this) { f32 sp60[3]; func_802D3D74(this); - if (!this->unk16C_4) { - this->unk16C_4 = TRUE; + if (!this->volatile_initialized) { + this->volatile_initialized = TRUE; this->alpha_124_19 = 0xFF; this->unk1C[1] = 0.0f; this->unk1C[2] = 3.5f; @@ -860,11 +860,11 @@ void func_80387F78(Actor *this, u32 flag) void func_803880BC(Actor *this) { - if (!this->unk16C_4) + if (!this->volatile_initialized) { func_802D3CE8(this); - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; this->unk1C[1] = this->position_y; this->position_y -= 51.f; @@ -932,11 +932,11 @@ void lair_func_80388278(Actor *this) void func_803882B0(Actor *this) { - if (!this->unk16C_4) + if (!this->volatile_initialized) { func_802D3D74(this); - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; if (fileProgressFlag_get(FILEPROG_48_FP_WITCH_SWITCH_ADVENT_DOOR_OPEN)) this->pitch = 90.f; @@ -1077,8 +1077,8 @@ void func_80388524(Actor *this) { } this->initialized = TRUE; } - if (!this->unk16C_4) { - this->unk16C_4 = TRUE; + if (!this->volatile_initialized) { + this->volatile_initialized = TRUE; switch(this->modelCacheIndex){ case ACTOR_2E5_DOOR_OF_GRUNTY: //L80388880 if (fileProgressFlag_get(FILEPROG_E2_DOOR_OF_GRUNTY_OPEN) && (this->state == 0x19)) { @@ -1310,7 +1310,7 @@ void func_80388FC8(Actor *this) if (this->unk60) return; - if (!this->unk16C_4) + if (!this->volatile_initialized) { if (fileProgressFlag_get(this->modelCacheIndex == 0x215 ? FILEPROG_1F_CC_LOBBY_PIPE_1_RAISED : FILEPROG_20_CC_LOBBY_PIPE_2_RAISED)) { @@ -1328,7 +1328,7 @@ void func_80388FC8(Actor *this) fileProgressFlag_set(this->modelCacheIndex == 0x215 ? FILEPROG_1F_CC_LOBBY_PIPE_1_RAISED : FILEPROG_20_CC_LOBBY_PIPE_2_RAISED, TRUE); - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; this->unk38_31 = 12; } } @@ -1387,7 +1387,7 @@ void lair_func_80389204(Actor *this) if (this->unk60) return; - if (!this->unk16C_4) + if (!this->volatile_initialized) { if (fileProgressFlag_get(FILEPROG_21_CC_LOBBY_PIPE_3_RAISED)) { @@ -1400,7 +1400,7 @@ void lair_func_80389204(Actor *this) func_802BAFE4(0x2C); fileProgressFlag_set(FILEPROG_21_CC_LOBBY_PIPE_3_RAISED, TRUE); - this->unk16C_4 = 1; + this->volatile_initialized = TRUE; this->unk38_31 = 12; } } @@ -1434,9 +1434,9 @@ void func_803893B8(Actor *this) { func_802D3D74(this); - if (!this->unk16C_4) + if (!this->volatile_initialized) { - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; if (jiggyscore_isCollected(JIGGY_37_LAIR_BGS_WITCH_SWITCH)) { @@ -1470,9 +1470,9 @@ void lair_func_803894B0(Actor *this) void func_802EE2E8(Actor *, s32, s32, s32, f32, f32, f32); func_802D3D74(this); - if (!this->unk16C_4) + if (!this->volatile_initialized) { - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; this->unk1C[0] = 0; if (fileProgressFlag_get(FILEPROG_A1_STATUE_HAT_OPEN)) @@ -1597,12 +1597,12 @@ void func_80389898(Actor *this) void func_80389934(Actor *this) { - if (!this->unk16C_4) + if (!this->volatile_initialized) { func_802D3CE8(this); actor_collisionOff(this); - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; if (fileProgressFlag_get(FILEPROG_A2_GV_LOBBY_COFFIN_OPEN)) subaddie_set_state_with_direction(this, 0x18, 0.999f, 1); @@ -1723,11 +1723,11 @@ f32 func_80389AAC(Actor *this, f32 a1) void func_80389D08(Actor *this) { - if (!this->unk16C_4) + if (!this->volatile_initialized) { func_802D3CE8(this); - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; this->unk60 = 0; if (fileProgressFlag_get(0xA5)) diff --git a/src/lair/code_86F0.c b/src/lair/code_86F0.c index ad7b2e89..7788a63f 100644 --- a/src/lair/code_86F0.c +++ b/src/lair/code_86F0.c @@ -415,7 +415,7 @@ void lair_func_8038F924(Actor *this) { this->initialized = TRUE; } - if (!this->unk16C_4) { + if (!this->volatile_initialized) { // temp_v0 = &D_803947F8[this->unkF4_8 - 1]; sp64 = fileProgressFlag_getN(D_803947F8[this->unkF4_8 - 1].progress_flag, D_803947F8[this->unkF4_8 - 1].size_bits); local->unk0 = 0; @@ -429,7 +429,7 @@ void lair_func_8038F924(Actor *this) { lair_func_8038F800(this); marker_setCollisionScripts(this->marker, func_8038EC94, NULL, NULL); this->marker->propPtr->unk8_3 = TRUE; - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; if (this->unkF4_8 == 9) { this->unk1C[0] = 8.0f; if (!fileProgressFlag_get(FILEPROG_53_CCW_PUZZLE_PODIUM_SWITCH_PRESSED)) { diff --git a/src/lair/code_A4A0.c b/src/lair/code_A4A0.c index 23fd075b..6c2ec792 100644 --- a/src/lair/code_A4A0.c +++ b/src/lair/code_A4A0.c @@ -83,7 +83,7 @@ void func_80390AE8(Actor *this) { ActorLocal_lair_A4A0 *local; local = (ActorLocal_lair_A4A0 *)&this->local; - if (!this->unk16C_4) { + if (!this->volatile_initialized) { local->unkC_27 = (this->modelCacheIndex == 0x367) ? 2 : (this->modelCacheIndex == 0x3bf) ? 1 : 0; diff --git a/src/lair/code_A810.c b/src/lair/code_A810.c index 7c347965..5f558d25 100644 --- a/src/lair/code_A810.c +++ b/src/lair/code_A810.c @@ -121,11 +121,11 @@ void func_80390E28(Actor *this) { } this->initialized = TRUE; } - if (!this->unk16C_4) { + if (!this->volatile_initialized) { if (sp38 != 0) { mapSpecificFlags_setN(0, 0, 2); } - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; return; } diff --git a/src/lair/code_AD70.c b/src/lair/code_AD70.c index 7d801c5a..b32be88a 100644 --- a/src/lair/code_AD70.c +++ b/src/lair/code_AD70.c @@ -227,14 +227,14 @@ void func_80391B04(Actor *this) { local = (ActorLocal_lair_AD70 *)&this->local; sp44 = time_getDelta(); - if (!this->unk16C_4) { + if (!this->volatile_initialized) { local->unk10 = func_8038E800(); func_8038EA68(local->unk10, D_80394BC8); func_8038EA10(local->unk10, D_80394BC0); this->unk58_2 = FALSE; func_80391810(this, 1); marker_setFreeMethod(this->marker, func_80391AE4); - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; } func_8038E9A4(local->unk10, this->position); diff --git a/src/lair/code_C1C0.c b/src/lair/code_C1C0.c index d2666612..2672330c 100644 --- a/src/lair/code_C1C0.c +++ b/src/lair/code_C1C0.c @@ -91,13 +91,13 @@ void func_80392700(Actor *this) { void func_80392918(Actor *this) { - if (!this->unk16C_4) { + if (!this->volatile_initialized) { if (fileProgressFlag_get(FILEPROG_F4_ENTER_FF_CUTSCENE) && (func_8028E4A4() == 2)) { mapSpecificFlags_set(4, 1); } this->unk4C = 400.0f; this->marker->unk2C_2 = FALSE; - this->unk16C_4 = TRUE; + this->volatile_initialized = TRUE; if (fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)) { marker_despawn(this->marker); } diff --git a/src/lair/code_C6C0.c b/src/lair/code_C6C0.c index 4c2d7221..afa1ab1e 100644 --- a/src/lair/code_C6C0.c +++ b/src/lair/code_C6C0.c @@ -29,8 +29,8 @@ void func_80392B6C(Actor *this) { NodeProp* phi_a0; s32 sp28; - if (!this->unk16C_4) { - this->unk16C_4 = TRUE; + if (!this->volatile_initialized) { + this->volatile_initialized = TRUE; if (fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)) { marker_despawn(this->marker); return;