Merge branch 'mr-origin-69'

This commit is contained in:
Banjo Kazooie
2024-09-13 20:26:40 -05:00
80 changed files with 806 additions and 660 deletions

View File

@@ -1,6 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include <core1/viewport.h>
extern f32 func_8028EF88(void);
void func_802D8730(Actor *this);
@@ -38,7 +39,7 @@ void func_802D8730(Actor *this) {
if(sp38 < this->position_y)
return;
func_8024E3A8(this->position, 40.0f);
viewport_adjustPointDistance(this->position, 40.0f);
this->position_y = sp38;
this->velocity_y -= sp3C;
if (this->velocity_y < 0.0f) {