Merge branch 'mr-origin-70'

This commit is contained in:
Banjo Kazooie
2024-09-13 20:37:54 -05:00
192 changed files with 430 additions and 430 deletions

View File

@@ -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);

View File

@@ -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;