Merge branch 'mr-origin-69'
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
#include <ultra64.h>
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
#include <core1/viewport.h>
|
||||
#include "core2/ba/physics.h"
|
||||
|
||||
extern void func_8028FDC8(f32);
|
||||
@@ -34,9 +35,9 @@ int func_802A3350(void){
|
||||
}
|
||||
|
||||
void func_802A339C(f32 arg0[3], f32 arg1[3], f32 arg2){
|
||||
func_8024C5A8(arg0);
|
||||
viewport_getLookVector(arg0);
|
||||
ml_vec3f_scale(arg0, arg2);
|
||||
viewport_get_rotation_vec3f(arg1);
|
||||
viewport_getRotation_vec3f(arg1);
|
||||
}
|
||||
|
||||
void func_802A33D8(void){
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user