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

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