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/FP/ch/xmastreeeggtoll.c
View File

@@ -1,8 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
extern s32 func_8024DB50(f32[3], f32);
#include <core1/viewport.h>
void func_80390EB0(Actor *this);
@@ -72,7 +71,7 @@ void func_80390EB0(Actor *this){
marker_setCollisionScripts(this->marker, func_80390E78, NULL, NULL);
}
if(func_8024DB50(this->position, 150.0f) || func_80329530(this, 1200))
if(viewport_func_8024DB50(this->position, 150.0f) || func_80329530(this, 1200))
{
if( !(globalTimer_getTime() & 3) && randf() < 0.2){
func_80390C70(this->position);