Merge branch 'mr-origin-66'

2024-09-08 21:40:47 -05:00
parent ee4e6c5fe9 9d2e6efbda
commit d876e71eba
10 changed files with 237 additions and 200 deletions
--- a/src/core2/code_9E370.c
+++ b/src/core2/code_9E370.c
@@ -1569,11 +1569,11 @@ bool func_803296D8(Actor *this, s32 dist){

 s32 func_8032970C(Actor *this){
    f32 sp24[3];
-    f32 sp18[3];
+    f32 plyr_pos[3];

    func_8028E964(sp24);
-    _player_getPosition(sp18);
-    sp24[1] = sp18[1];
+    _player_getPosition(plyr_pos);
+    sp24[1] = plyr_pos[1];
    return (s32) DIST_SQ_VEC3F(this->position, sp24);
 }