diff options
| author | Lucas Shaw <49287729+shawlucas@users.noreply.github.com> | 2020-05-27 00:48:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 03:48:07 -0400 |
| commit | 02fc5287cc07854012acd4eb2064c9fc97c73c04 (patch) | |
| tree | 78d5832877904138850c9798bc5290aa88b18c11 /src/code | |
| parent | c68d752813309b60dc35569bc9668b4d3a81e86a (diff) | |
code_80106550 / llcvt.c and code_80104450 / ortho.c OK (#163)
* llcvt.c OK, added script from mm decomp to set mips3
* ortho.c OK
* added entries to functions.h
* named guNormalize.s
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_demo.c | 2 | ||||
| -rw-r--r-- | src/code/z_fbdemo_triforce.c | 2 | ||||
| -rw-r--r-- | src/code/z_view.c | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 3bec7c80a..36b47ee59 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -2063,4 +2063,4 @@ void Cutscene_SetSegment(GlobalContext* globalCtx, u32 segment) { } else { globalCtx->csCtx.segment = (void*)segment; } -}
\ No newline at end of file +} diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c index 0583c1aa4..4c2d0a475 100644 --- a/src/code/z_fbdemo_triforce.c +++ b/src/code/z_fbdemo_triforce.c @@ -32,7 +32,7 @@ void TransitionTriforce_Start(TransitionTriforce* this) { TransitionTriforce* TransitionTriforce_Init(TransitionTriforce* this) { bzero(this, sizeof(*this)); - func_801045A4(&this->projection, -160.0f, 160.0f, -120.0f, 120.0f, -1000.0f, 1000.0f, 1.0f); + guOrtho(&this->projection, -160.0f, 160.0f, -120.0f, 120.0f, -1000.0f, 1000.0f, 1.0f); this->transPos = 1.0f; this->state = 2; this->step = 0.015f; diff --git a/src/code/z_view.c b/src/code/z_view.c index 00f4e92bd..99878191b 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -400,8 +400,8 @@ s32 func_800AB0A8(View* view) { LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 744); view->projectionPtr = projection; - func_801045A4(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f, - (f32)gScreenHeight * 0.5f, view->zNear, view->zFar, view->scale); + guOrtho(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f, + (f32)gScreenHeight * 0.5f, view->zNear, view->zFar, view->scale); view->projection = *projection; @@ -438,8 +438,8 @@ s32 func_800AB2C4(View* view) { LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 791); view->projectionPtr = projection; - func_801045A4(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f, - (f32)gScreenHeight * 0.5f, view->zNear, view->zFar, view->scale); + guOrtho(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f, + (f32)gScreenHeight * 0.5f, view->zNear, view->zFar, view->scale); view->projection = *projection; @@ -551,8 +551,8 @@ s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) { LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 921); view->projectionPtr = projection; - func_801045A4(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f, - (f32)gScreenHeight * 0.5f, view->zNear, view->zFar, view->scale); + guOrtho(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f, + (f32)gScreenHeight * 0.5f, view->zNear, view->zFar, view->scale); view->projection = *projection; |