diff options
| author | Tyler McGavran <tyler.taggerung@gmail.com> | 2022-01-09 22:02:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-09 20:02:34 -0700 |
| commit | dd05d49f5f854cbd98a2995efa02db6935923636 (patch) | |
| tree | 86edec090da89e89d346ba6a65dd91dbefe56623 /src/gbiMacro.c | |
| parent | bc99dedb8bc0d8a1f6fed20e36ed60a3ed70b01b (diff) | |
Update the GfxPool struct and match some functions (#134)
* Update the GfxPool struct and match some functions
Also reordered variables.h a bit
* Match 2 more functions
* Replace reaming ->buffer references with ->mtxPool
Update the mips_to_c output of a couple functions based on new GfxPool
definition
Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
Diffstat (limited to 'src/gbiMacro.c')
| -rw-r--r-- | src/gbiMacro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gbiMacro.c b/src/gbiMacro.c index 610cd8678..ca925951e 100644 --- a/src/gbiMacro.c +++ b/src/gbiMacro.c @@ -2,11 +2,11 @@ #include <macros.h> #include "types.h" #include "PR/gu.h" +#include "main.h" extern s16 D_800E43A8; extern Mtx D_0D008E98; extern Gfx* gDisplayListHead; -extern Mtx* gGfxPool; // rsp init void gfx_func_80040D00(void) { @@ -15,7 +15,7 @@ void gfx_func_80040D00(void) { gDPSetCombineMode(gDisplayListHead++, G_CC_SHADE, G_CC_SHADE); gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); - guOrtho((Mtx *) gGfxPool, 0.0f, 320.0f, 0.0f, 240.0f, -1.0f, 1.0f, 1.0f); + guOrtho(&gGfxPool->mtxPool[0], 0.0f, 320.0f, 0.0f, 240.0f, -1.0f, 1.0f, 1.0f); gDPHalf1(gDisplayListHead++, 0x0000FFFF); gSPMatrix(gDisplayListHead++, (u32) gGfxPool & 0x1FFFFFFF, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); gSPMatrix(gDisplayListHead++, (u32) &D_0D008E98 & 0x1FFFFFFF, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); |