Merge branch 'mr-origin-72'

This commit is contained in:
Banjo Kazooie
2024-09-13 20:43:08 -05:00
14 changed files with 18 additions and 18 deletions

View File

@@ -27,7 +27,7 @@ void chBadShad_update(Actor *this){
s32 iVar1;
if(!this->initialized){
this->initialized = TRUE;
this->marker->collidable = 0;
this->marker->collidable = FALSE;
}
if(!this->despawn_flag && this->unk1C_x < (f32)(globalTimer_getTime() - 1) ){
//unlink