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/core2/code_59780.c
+++ b/src/core2/code_59780.c
@@ -1,6 +1,7 @@
 #include <ultra64.h>
 #include "functions.h"
 #include "variables.h"
+#include <core1/viewport.h>

 extern void func_802C71F0(Actor *);
 extern void actor_postdrawMethod(ActorMarker *);
@@ -145,6 +146,6 @@ void func_802E08F0(Actor *this) {
    if (actor_animationIsAt(this, 0.99f) != 0) {
        marker_despawn(this->marker);
    }
-    viewport_get_rotation_vec3f(sp24);
+    viewport_getRotation_vec3f(sp24);
    this->yaw = sp24[1];
 }