Merge branch 'mr-origin-69'
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
#include <ultra64.h>
|
||||
|
||||
#include <core2/file.h>
|
||||
|
||||
#include "functions.h"
|
||||
#include "variables.h"
|
||||
#include "core2/particle.h"
|
||||
|
||||
#include <core1/viewport.h>
|
||||
#include "core2/anim/sprite.h"
|
||||
#include <core2/file.h>
|
||||
#include "core2/particle.h"
|
||||
|
||||
/* .data */
|
||||
extern u8 D_80370250 = 0;
|
||||
@@ -22,7 +22,6 @@ u32 D_803835E0;
|
||||
/* public */
|
||||
void func_80335110(s32);
|
||||
void func_80335128(s32);
|
||||
void viewport_set_near_far(f32, f32);
|
||||
void func_80335140(enum map_e);
|
||||
void func_8033520C(s32);
|
||||
|
||||
@@ -34,8 +33,8 @@ void func_80334540(Gfx** gdl, Mtx **mptr, Vtx **vptr) {
|
||||
if (D_803835E0 == 0) {
|
||||
drawRectangle2D(gdl, 0, 0, framebuffer_width, framebuffer_height, 0, 0, 0);
|
||||
func_802BBD2C(&sp44, &sp40);
|
||||
viewport_set_near_far(sp44, sp40);
|
||||
func_8024C904(gdl, mptr);
|
||||
viewport_setNearAndFar(sp44, sp40);
|
||||
viewport_setRenderViewportAndPerspectiveMatrix(gdl, mptr);
|
||||
return;
|
||||
}
|
||||
if (func_80320708() == 0) {
|
||||
@@ -44,8 +43,8 @@ void func_80334540(Gfx** gdl, Mtx **mptr, Vtx **vptr) {
|
||||
spawnQueue_unlock();
|
||||
sky_draw(gdl, mptr, vptr);
|
||||
func_802BBD2C(&sp44, &sp40);
|
||||
viewport_set_near_far(sp44, sp40);
|
||||
func_8024C904(gdl, mptr);
|
||||
viewport_setNearAndFar(sp44, sp40);
|
||||
viewport_setRenderViewportAndPerspectiveMatrix(gdl, mptr);
|
||||
if (mapModel_has_xlu_bin() != 0) {
|
||||
mapModel_opa_draw(gdl, mptr, vptr);
|
||||
if (game_is_frozen() == 0) {
|
||||
|
Reference in New Issue
Block a user