Introduce OPEN_DISPS/CLOSE_DISPS macros (#360)

1 files changed, 16 insertions, 17 deletions

diff --git a/src/code/z_moji.c b/src/code/z_moji.c
index d7366ceb9..16649a22d 100644
--- a/src/code/z_moji.c
+++ b/src/code/z_moji.c
@@ -37,48 +37,47 @@ void func_8007B934(s32 arg0, s32 arg1) {
 }
 
 void func_8007B9A4(GraphicsContext* gfxCtx, u8 arg1) {
-    Gfx* dispRefs[7];
+    s32 pad[2];
 
-    Graph_OpenDisps(dispRefs, gfxCtx, "../z_moji.c", 86);
+    OPEN_DISPS(gfxCtx, "../z_moji.c", 86);
 
     if ((u32)gLetterTLUT & 0xF) {
         osSyncPrintf("moji_tlut --> %X\n", gLetterTLUT);
     }
 
     if (D_8015FFC0 != (arg1 & 3)) {
-        gDPLoadTLUT(gfxCtx->polyOpa.p++, 16, 256, &gLetterTLUT[arg1 & 3]);
+        gDPLoadTLUT(oGfxCtx->polyOpa.p++, 16, 256, &gLetterTLUT[arg1 & 3]);
         D_8015FFC0 = arg1 & 3;
     }
 
-    gSPTextureRectangle(gfxCtx->polyOpa.p++, D_80120120 << 2, D_80120124 << 2, (D_80120120 + 8) << 2,
+    gSPTextureRectangle(oGfxCtx->polyOpa.p++, D_80120120 << 2, D_80120124 << 2, (D_80120120 + 8) << 2,
                         (D_80120124 + 8) << 2, G_TX_RENDERTILE, (u16)(arg1 & 4) * 64, (u16)(arg1 >> 3) * 256, 1024,
                         1024);
 
-    Graph_CloseDisps(dispRefs, gfxCtx, "../z_moji.c", 123);
+    CLOSE_DISPS(gfxCtx, "../z_moji.c", 123);
 }
 
 void func_8007BBA8(GraphicsContext* gfxCtx, u8* arg1) {
     s32 i;
-    Gfx* dispRefs[5];
 
-    Graph_OpenDisps(dispRefs, gfxCtx, "../z_moji.c", 137);
+    OPEN_DISPS(gfxCtx, "../z_moji.c", 137);
 
     if ((u32)gFontFF & 0xF) {
         osSyncPrintf("font_ff --> %X\n", gFontFF);
     }
 
-    gDPPipeSync(gfxCtx->polyOpa.p++);
-    gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, sFontColorRed, sFontColorGreen, sFontColorBlue, sFontColorAlpha);
+    gDPPipeSync(oGfxCtx->polyOpa.p++);
+    gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, sFontColorRed, sFontColorGreen, sFontColorBlue, sFontColorAlpha);
 
-    gDPSetTextureImage(gfxCtx->polyOpa.p++, G_IM_FMT_CI, G_IM_SIZ_16b, 1, (s32)gFontFF);
-    gDPSetTile(gfxCtx->polyOpa.p++, G_IM_FMT_CI, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
+    gDPSetTextureImage(oGfxCtx->polyOpa.p++, G_IM_FMT_CI, G_IM_SIZ_16b, 1, (s32)gFontFF);
+    gDPSetTile(oGfxCtx->polyOpa.p++, G_IM_FMT_CI, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
                G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
-    gDPLoadSync(gfxCtx->polyOpa.p++);
-    gDPLoadBlock(gfxCtx->polyOpa.p++, G_TX_LOADTILE, 0, 0, 511, 2048);
-    gDPPipeSync(gfxCtx->polyOpa.p++);
-    gDPSetTile(gfxCtx->polyOpa.p++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
+    gDPLoadSync(oGfxCtx->polyOpa.p++);
+    gDPLoadBlock(oGfxCtx->polyOpa.p++, G_TX_LOADTILE, 0, 0, 511, 2048);
+    gDPPipeSync(oGfxCtx->polyOpa.p++);
+    gDPSetTile(oGfxCtx->polyOpa.p++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
                G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
-    gDPSetTileSize(gfxCtx->polyOpa.p++, G_TX_RENDERTILE, 0, 0, 60, 508);
+    gDPSetTileSize(oGfxCtx->polyOpa.p++, G_TX_RENDERTILE, 0, 0, 60, 508);
 
     D_8015FFC0 = -1;
 
@@ -108,5 +107,5 @@ void func_8007BBA8(GraphicsContext* gfxCtx, u8* arg1) {
         }
     }
 
-    Graph_CloseDisps(dispRefs, gfxCtx, "../z_moji.c", 181);
+    CLOSE_DISPS(gfxCtx, "../z_moji.c", 181);
 }