From 2af30485fd81fdf78ea3d58af9fa4667f18a7f79 Mon Sep 17 00:00:00 2001
From: engineer124 <engineer124engineer124@gmail.com>
Date: Mon, 20 Jun 2022 22:53:22 +1000
Subject: [PATCH] Fix merge

---
 include/PR/gbi.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/PR/gbi.h b/include/PR/gbi.h
index f7b249af8..48b50acd1 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 */