mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
Fix merge
This commit is contained in:
+2
-2
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user