Merge branch 'mr-origin-86'

This commit is contained in:
banjo.decomp
2024-10-08 01:58:19 -05:00
34 changed files with 568 additions and 508 deletions

View File

@@ -409,7 +409,7 @@ void chsmmole_Update(Actor * this){
this->initialized = TRUE;
marker_setFreeMethod(this->marker, func_80389984);
if(this->unkF4_8 == 1 || this->unkF4_8 == 8){//L80389A30
sp40 = func_80304C38(0x349, this);
sp40 = nodeprop_findByActorIdAndActorPosition(0x349, this);
if(!sp40){
this->unk1C_x = this->position_x;
this->unk1C_y = this->position_y;

View File

@@ -28,7 +28,7 @@ void func_8038A8F8(Actor *this){
NodeProp *other;
if(!this->volatile_initialized){
other = func_80304C38(0x3be, this);
other = nodeprop_findByActorIdAndActorPosition(0x3be, this);
if(!other){
this->unk1C_x = this->position_x;
this->unk1C_y = this->position_y;