kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'mr-origin-69'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-13 20:26:40 -05:00
parent d55a8d829d d36f6a807c
commit 425e05a58b
80 changed files with 806 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/MMM/ch/napper.c
View File

@@ -1,6 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include <core1/viewport.h>
typedef struct{
ActorMarker *jiggy_marker;
@@ -99,7 +100,7 @@ void chnapper_update(Actor *this){
ActorLocal_Napper *local = (ActorLocal_Napper *)&this->local;
f32 sp68;
Actor *jiggy;
f32 sp58[3];
f32 viewport[3];
f32 sp4C[3];
s32 pad;
f32 player_position[3];
@@ -153,10 +154,10 @@ void chnapper_update(Actor *this){
}//L80386DF4
if(this->state != 4){
viewport_get_position_vec3f(sp58);
sp4C[0] = this->position_x - sp58[0];
sp4C[1] = this->position_y - sp58[1];
sp4C[2] = this->position_z - sp58[2];
viewport_getPosition_vec3f(viewport);
sp4C[0] = this->position_x - viewport[0];
sp4C[1] = this->position_y - viewport[1];
sp4C[2] = this->position_z - viewport[2];
ml_vec3f_set_length(sp4C, 5.0f);
jiggy = marker_getActor(local->jiggy_marker);
jiggy->position_x = sp4C[0] + this->position_x;

5
src/MMM/code_47D0.c
View File

@@ -1,6 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include <core1/viewport.h>
extern void sfxsource_setSampleRate(u8, s32);
extern f32 func_80258640(f32[3], f32[3]);
@@ -128,7 +129,7 @@ void func_8038AF90(Struct_MMM_47D0_0 *arg0, Struct68s *arg1, f32 arg2) {
func_8028F66C(BS_INTR_D_SURF);
}
if (sp3C && ((sp40[0] != 0.0f) || (sp40[1] != 0.0f))) {
viewport_get_rotation_vec3f(sp70);
viewport_getRotation_vec3f(sp70);
sp64[0] = sp40[0];
sp64[1] = 0.0f;
sp64[2] = -sp40[1];
@@ -147,7 +148,7 @@ void func_8038AF90(Struct_MMM_47D0_0 *arg0, Struct68s *arg1, f32 arg2) {
func_80351B28(arg1, sp54);
func_8035179C(arg1, sp54);
if (arg0->unk0 != NULL) {
viewport_get_position_vec3f(sp7C);
viewport_getPosition_vec3f(sp7C);
sp64[0] = sp54[0] - sp7C[0];
sp64[2] = sp54[2] - sp7C[2];
sp64[1] = 0.0f;