Fix merge

This commit is contained in:
engineer124
2022-06-20 22:53:22 +10:00
parent e4904450de
commit 2af30485fd
+2 -2
View File
@@ -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 */