Merge branch 'mr-origin-69'

2024-09-13 20:26:40 -05:00
parent d55a8d829d d36f6a807c
commit 425e05a58b
80 changed files with 806 additions and 660 deletions
--- a/src/GV/code_3BB0.c
+++ b/src/GV/code_3BB0.c
@@ -1,8 +1,7 @@
 #include <ultra64.h>
 #include "functions.h"
 #include "variables.h"
-
-extern int func_8024DB50(f32[3], f32);
+#include <core1/viewport.h>

 void GV_func_8038A084(Actor *this);

@@ -54,7 +53,7 @@ void GV_func_8038A084(Actor *this){
    }

    if(this->unkF4_8 == 6
-        && func_8024DB50(this->position, 50.0f)
+        && viewport_func_8024DB50(this->position, 50.0f)
        && !this->unk38_31
        && randf() < 0.2
    ){