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

5
src/CC/code_13C0.c
View File

@@ -3,6 +3,7 @@
#include "variables.h"
#include "CC.h"
#include <core1/viewport.h>
#include "core2/modelRender.h"
typedef struct{
@@ -149,7 +150,7 @@ void func_80387CC0(void){
if(getGameMode() == GAME_MODE_7_ATTRACT_DEMO)
return;
viewport_get_rotation_vec3f(sp1C);
viewport_getRotation_vec3f(sp1C);
tmp_v0 = globalTimer_getTimeMasked(0x7F);
if(tmp_v0 >= 0x40){
tmp_v0 = 0x7F - tmp_v0;
@@ -158,7 +159,7 @@ void func_80387CC0(void){
if(360.0f <= sp1C[2]){
sp1C[2] -= 360.0f;
}
viewport_set_rotation_vec3f(sp1C);
viewport_setRotation_vec3f(sp1C);
}

4
src/CC/code_1F70.c
View File

@@ -2,6 +2,7 @@
#include "functions.h"
#include "variables.h"
#include <core1/viewport.h>
#include "core2/modelRender.h"
extern BKCollisionTri *func_8028EF48(void);
@@ -18,7 +19,6 @@ extern int func_80340020(s32, f32[3], s32, f32, s32, BKVertexList *, f32[3], f32
extern void boneTransformList_getBoneScale(s32, s32, f32[3]);
extern void boneTransformList_setBoneScale(s32, s32, f32[3]);
extern void func_8033A9A8(s32, s32, f32[3]);
extern void viewport_get_position_vec3f(f32[3]);
extern void ml_vec3f_normalize(f32[3]);
extern void func_8033A45C(s32, s32);
extern void modelRender_setBoneTransformList(s32);
@@ -146,7 +146,7 @@ void CC_func_80388760(Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(D_80389FA0.unk21 == 0)
return;
viewport_get_position_vec3f(sp98);
viewport_getPosition_vec3f(sp98);
if(sp98[0] < -2600.0f || 11600.0f < sp98[0])
return;