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


@@ -282,7 +283,7 @@ static void __bsdronexform_setState(int next_state){
        case 5:// 802B02F4
            _player_getPosition(sp24);
            sp24[1] += 30.0f;
-            func_8024E3A8(sp24, 80.0f);
+            viewport_adjustPointDistance(sp24, 80.0f);
            func_802AFBB8(sp24);
            func_8029E3C0(0, 0.1f);
            break;