Merge branch 'mr-origin-86'

2024-10-08 01:58:19 -05:00
parent 06204d3b68 7f41a49ef8
commit 680cf7a950
34 changed files with 568 additions and 508 deletions
--- a/src/MM/ch/conga.c
+++ b/src/MM/ch/conga.c
@@ -221,7 +221,7 @@ void func_803876D0(Actor *this){
        this->initialized = TRUE;
        this->velocity_x = 0.0f;
        this->actor_specific_1_f = 0.0f;
-        node_prop = func_80304C38(0x150, this);
+        node_prop = nodeprop_findByActorIdAndActorPosition(0x150, this);
        ((ActorLocal_Conga *)&this->local)->unk1C = nodeprop_getRadius(node_prop);
        nodeprop_getPosition_s32(node_prop, &((ActorLocal_Conga *)&this->local)->unk10);
    }