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

[LEAK-INFORMED] fix sub_812E768 fakematching

Browse Source
This commit is contained in:
Kurausukun
2021-03-23 02:05:15 -04:00
parent 3e9ccb4b77
commit 0f1acd595e
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/menu2.c
+19 -21
View File
@@ -507,8 +507,8 @@ static void sub_812E768(const struct Bitmap *src, struct Bitmap *dst, u16 srcX,
{ {
s32 loopSrcY, loopDstY, loopSrcX, loopDstX, xEnd, yEnd, multiplierSrcY, multiplierDstY; s32 loopSrcY, loopDstY, loopSrcX, loopDstX, xEnd, yEnd, multiplierSrcY, multiplierDstY;
u16 toOrr; u16 toOrr;
const u8 *pixelsSrc; u8 *pixelsSrc;
u16 *pixelsDst; u8 *pixelsDst;
if (dst->width - dstX < width) if (dst->width - dstX < width)
xEnd = dst->width - dstX + srcX; xEnd = dst->width - dstX + srcX;
@@ -525,51 +525,49 @@ static void sub_812E768(const struct Bitmap *src, struct Bitmap *dst, u16 srcX,
{ {
for (loopSrcX = srcX, loopDstX = dstX; loopSrcX < xEnd; loopSrcX++, loopDstX++) for (loopSrcX = srcX, loopDstX = dstX; loopSrcX < xEnd; loopSrcX++, loopDstX++)
{ {
#ifndef NONMATCHING pixelsSrc = (u8 *)(src->pixels + ((loopSrcX >> 1) & 3) + ((loopSrcX >> 3) << 5) + (((loopSrcY >> 3) * multiplierSrcY) << 5) + ((u32)(loopSrcY << 0x1d) >> 0x1B));
asm("":::"r4"); pixelsDst = (u8 *)(dst->pixels + ((loopDstX >> 1) & 3) + ((loopDstX >> 3) << 5) + ((( loopDstY >> 3) * multiplierDstY) << 5) + ((u32)( loopDstY << 0x1d) >> 0x1B));
#endif
pixelsSrc = src->pixels + ((loopSrcX >> 1) & 3) + ((loopSrcX >> 3) << 5) + (((loopSrcY >> 3) * multiplierSrcY) << 5) + ((u32)(loopSrcY << 0x1d) >> 0x1B);
pixelsDst = (u16 *)(dst->pixels + ((loopDstX >> 1) & 3) + ((loopDstX >> 3) << 5) + ((( loopDstY >> 3) * multiplierDstY) << 5) + ((u32)( loopDstY << 0x1d) >> 0x1B));
if ((uintptr_t)pixelsDst & 0x1) if ((u32)pixelsDst & 0x1)
{ {
pixelsDst = (void *)pixelsDst - 1; pixelsDst--;
if (loopDstX & 0x1) if (loopDstX & 0x1)
{ {
toOrr = *pixelsDst & 0x0fff; toOrr = *(vu16 *)pixelsDst & 0x0fff;
if (loopSrcX & 0x1) if (loopSrcX & 0x1)
*pixelsDst = toOrr | ((*pixelsSrc & 0xf0) << 8); toOrr |= ((*pixelsSrc & 0xf0) << 8);
else else
*pixelsDst = toOrr | ((*pixelsSrc & 0x0f) << 12); toOrr |= ((*pixelsSrc & 0x0f) << 12);
} }
else else
{ {
toOrr = *pixelsDst & 0xf0ff; toOrr = *(vu16 *)pixelsDst & 0xf0ff;
if (loopSrcX & 0x1) if (loopSrcX & 0x1)
*pixelsDst = toOrr | ((*pixelsSrc & 0xf0) << 4); toOrr |= ((*pixelsSrc & 0xf0) << 4);
else else
*pixelsDst = toOrr | ((*pixelsSrc & 0x0f) << 8); toOrr |= ((*pixelsSrc & 0x0f) << 8);
} }
} }
else else
{ {
if (loopDstX & 1) if (loopDstX & 1)
{ {
toOrr = *pixelsDst & 0xff0f; toOrr = *(vu16 *)pixelsDst & 0xff0f;
if (loopSrcX & 1) if (loopSrcX & 1)
*pixelsDst = toOrr | ((*pixelsSrc & 0xf0) << 0); toOrr |= ((*pixelsSrc & 0xf0) << 0);
else else
*pixelsDst = toOrr | ((*pixelsSrc & 0x0f) << 4); toOrr |= ((*pixelsSrc & 0x0f) << 4);
} }
else else
{ {
toOrr = *pixelsDst & 0xfff0; toOrr = *(vu16 *)pixelsDst & 0xfff0;
if (loopSrcX & 1) if (loopSrcX & 1)
*pixelsDst = toOrr | ((*pixelsSrc & 0xf0) >> 4); toOrr |= ((*pixelsSrc & 0xf0) >> 4);
else else
*pixelsDst = toOrr | ((*pixelsSrc & 0x0f) >> 0); toOrr |= ((*pixelsSrc & 0x0f) >> 0);
} }
} }
*(vu16 *)pixelsDst = toOrr;
} }
} }
} }