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

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