Merge branch 'mr-origin-69'
This commit is contained in:
@@ -3,8 +3,9 @@
|
||||
#include "variables.h"
|
||||
#include "zoombox.h"
|
||||
#include "ml/mtx.h"
|
||||
#include <core1/viewport.h>
|
||||
|
||||
|
||||
extern f32 func_8024DE1C(f32, f32, f32[3], f32[3]);
|
||||
void func_80252330(f32, f32, f32);
|
||||
extern f32 func_8033DDB8(void);
|
||||
extern void func_8024E60C(s32, void *);
|
||||
@@ -826,7 +827,7 @@ void func_803163A8(GcZoombox *this, Gfx **gfx, Mtx **mtx) {
|
||||
f32 sp38[3];
|
||||
f32 sp34;
|
||||
|
||||
sp34 = func_8024DE1C(this->unk170, this->unk172, sp50, sp5C);
|
||||
sp34 = viewport_transformCoordinate(this->unk170, this->unk172, sp50, sp5C);
|
||||
if (this->unk1A4_24) {
|
||||
sp5C[1] += 180.0f;
|
||||
sp5C[0] -= 2*sp5C[0];
|
||||
@@ -852,7 +853,7 @@ void func_803164B0(GcZoombox *this, Gfx **gfx, Mtx **mtx, s32 arg3, s32 arg4, BK
|
||||
func_803382FC(this->unk168 * arg6);
|
||||
func_803382E4(5);
|
||||
func_80335D30(gfx);
|
||||
func_8024C7B8(gfx, mtx);
|
||||
viewport_setRenderViewportAndOrthoMatrix(gfx, mtx);
|
||||
mlMtxIdent();
|
||||
if (this->unk1A4_24) {
|
||||
mlMtxRotYaw(180.0f);
|
||||
@@ -870,7 +871,7 @@ void func_803164B0(GcZoombox *this, Gfx **gfx, Mtx **mtx, s32 arg3, s32 arg4, BK
|
||||
modelRender_setDepthMode(MODEL_RENDER_DEPTH_NONE);
|
||||
func_80344090(arg5, this->unk186, gfx);
|
||||
func_8033687C(gfx);
|
||||
func_8024C904(gfx, mtx);
|
||||
viewport_setRenderViewportAndPerspectiveMatrix(gfx, mtx);
|
||||
}
|
||||
|
||||
void func_80316764(GcZoombox *this, s32 arg1) {
|
||||
|
Reference in New Issue
Block a user