dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix CopyRectToBgTilemapBufferRect arguments

Browse Source
This commit is contained in:
Kurausukun
2021-04-09 01:25:01 -04:00
parent 4446da96fe
commit 31e117a1d3
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bg.c
+9 -9
View File
@@ -910,7 +910,7 @@ void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u
CopyRectToBgTilemapBufferRect(bg, src, 0, 0, rectWidth, rectHeight, destX, destY, rectWidth, rectHeight, palette, 0, 0); CopyRectToBgTilemapBufferRect(bg, src, 0, 0, rectWidth, rectHeight, destX, destY, rectWidth, rectHeight, palette, 0, 0);
} }
void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 unused, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, s16 palette1, s16 tileOffset) void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, s16 tileOffset, s16 palette2)
{ {
u16 screenWidth, screenHeight, screenSize; u16 screenWidth, screenHeight, screenSize;
u16 var; u16 var;
@@ -926,28 +926,28 @@ void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8
{ {
case 0: case 0:
srcPtr = src + ((srcY * srcWidth) + srcX) * 2; srcPtr = src + ((srcY * srcWidth) + srcX) * 2;
for (i = destX; i < (destX + rectWidth); i++) for (i = destY; i < (destY + rectHeight); i++)
{ {
for (j = srcHeight; j < (srcHeight + destY); j++) for (j = destX; j < (destX + rectWidth); j++)
{ {
u16 index = GetTileMapIndexFromCoords(j, i, screenSize, screenWidth, screenHeight); u16 index = GetTileMapIndexFromCoords(j, i, screenSize, screenWidth, screenHeight);
CopyTileMapEntry(srcPtr, sGpuBgConfigs2[bg].tilemap + (index * 2), rectHeight, palette1, tileOffset); CopyTileMapEntry(srcPtr, sGpuBgConfigs2[bg].tilemap + (index * 2), palette1, tileOffset, palette2);
srcPtr += 2; srcPtr += 2;
} }
srcPtr += (srcWidth - destY) * 2; srcPtr += (srcWidth - rectWidth) * 2;
} }
break; break;
case 1: case 1:
srcPtr = src + ((srcY * srcWidth) + srcX); srcPtr = src + ((srcY * srcWidth) + srcX);
var = GetBgMetricAffineMode(bg, 0x1); var = GetBgMetricAffineMode(bg, 0x1);
for (i = destX; i < (destX + rectWidth); i++) for (i = destY; i < (destY + rectHeight); i++)
{ {
for (j = srcHeight; j < (srcHeight + destY); j++) for (j = destX; j < (destX + rectWidth); j++)
{ {
*(u8*)(sGpuBgConfigs2[bg].tilemap + ((var * i) + j)) = *(u8*)(srcPtr) + palette1; *(u8*)(sGpuBgConfigs2[bg].tilemap + ((var * i) + j)) = *(u8*)(srcPtr) + tileOffset;
srcPtr++; srcPtr++;
} }
srcPtr += (srcWidth - destY); srcPtr += (srcWidth - rectWidth);
} }
break; break;
} }