diff options
| author | mzxrules <mzxrules@gmail.com> | 2022-08-03 12:58:19 -0400 |
|---|---|---|
| committer | mzxrules <mzxrules@gmail.com> | 2022-08-03 12:58:19 -0400 |
| commit | e5c6aac0067bef05f00a28fa1c2ff0334cea5d06 (patch) | |
| tree | e3a5e64b187119d07153298ad9c27f56cbbe6f50 /src/code/PreRender.c | |
| parent | 723c82ce224372654e2e69d2edb071014a94298e (diff) | |
| parent | 4693978015a18165f96cbe57f8c4f7058c38c451 (diff) | |
Merge remote-tracking branch 'upstream/master' into z_map_
Diffstat (limited to 'src/code/PreRender.c')
| -rw-r--r-- | src/code/PreRender.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/code/PreRender.c b/src/code/PreRender.c index 0afb1df68..46fd8ee6b 100644 --- a/src/code/PreRender.c +++ b/src/code/PreRender.c @@ -191,8 +191,6 @@ void func_80170774(PreRender* this, Gfx** gfxp) { func_8016FF70(this, gfxp, this->zbufSave, this->zbuf); } -#ifdef NON_MATCHING -// just regalloc void func_80170798(PreRender* this, Gfx** gfxp) { Gfx* gfx; s32 y; @@ -235,6 +233,10 @@ void func_80170798(PreRender* this, Gfx** gfxp) { gDPLoadMultiTile(gfx++, this->cvgSave, 0x0160, rtile, G_IM_FMT_I, G_IM_SIZ_8b, this->width, this->height, uls, ult, lrs, lrt, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + //! FAKE + if (1) {} + // The two if (1) {}'s above can be removed with do {} while(0) around macros + if (1) {} if (1) {} gSPTextureRectangle(gfx++, uls << 2, ult << 2, (lrs + 1) << 2, (lrt + 1) << 2, G_TX_RENDERTILE, uls << 5, ult << 5, 1 << 10, 1 << 10); @@ -247,9 +249,6 @@ void func_80170798(PreRender* this, Gfx** gfxp) { *gfxp = gfx; } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/PreRender/func_80170798.s") -#endif void func_80170AE0(PreRender* this, Gfx** gfxp, s32 alpha) { func_8016FF90(this, gfxp, this->fbufSave, this->fbuf, 255, 255, 255, alpha); |