diff --git a/include/PR/gbi.h b/include/PR/gbi.h index 48b50acd1..f7b249af8 100644 --- a/include/PR/gbi.h +++ b/include/PR/gbi.h @@ -3879,7 +3879,7 @@ _DW({ \ #define gDPLoadTextureBlock_4b(pkt, timg, fmt, width, height, \ pal, cms, cmt, masks, maskt, shifts, shiftt) \ -{ \ +_DW({ \ gDPSetTextureImage(pkt, fmt, G_IM_SIZ_16b, 1, timg); \ gDPSetTile(pkt, fmt, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, \ cmt, maskt, shiftt, cms, masks, shifts); \ @@ -3894,7 +3894,7 @@ _DW({ \ gDPSetTileSize(pkt, G_TX_RENDERTILE, 0, 0, \ ((width)-1) << G_TEXTURE_IMAGE_FRAC, \ ((height)-1) << G_TEXTURE_IMAGE_FRAC); \ -} +}) /* Load fix rww 27jun95 */ /* The S at the end means odd lines are already word Swapped */ diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index d673ed714..f48e3f63e 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -6156,13 +6156,12 @@ void Interface_Draw(GlobalContext* globalCtx) { gSPTextureRectangle(OVERLAY_DISP++, YREG(40) * 4, YREG(41) * 4, (YREG(40) + 0x20) * 4, (YREG(41) + 0x10) * 4, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); - if (1) {} - gDPLoadTextureBlock_4b(OVERLAY_DISP++, gPictoBoxFocusTextTex, G_IM_FMT_I, 32, 8, 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); gSPTextureRectangle(OVERLAY_DISP++, YREG(42) * 4, YREG(43) * 4, (YREG(42) + 0x20) * 4, (YREG(43) + 0x8) * 4, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); + if (1) {} } if (D_801BF884 >= 2) {