Merge pull request #1448 from Kurausukun/dumb

[LEAK-INFORMED] Fix Fakematch in DrawWallpaper
This commit is contained in:
GriffinR 2021-05-25 04:41:15 -04:00 committed by GitHub
commit 2b062e89c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5437,15 +5437,16 @@ static bool32 WaitForWallpaperGfxLoad(void)
static void DrawWallpaper(const void *tilemap, s8 direction, u8 offset)
{
s16 var = (offset * 2) + 3;
s16 var = offset * 256;
s16 var2 = (offset * 2) + 3;
s16 x = ((sStorage->bg2_X / 8 + 10) + (direction * 24)) & 0x3F;
CopyRectToBgTilemapBufferRect(2, tilemap, 0, 0, 0x14, 0x12, x, 2, 0x14, 0x12, 0x11, offset << 8, var);
CopyRectToBgTilemapBufferRect(2, tilemap, 0, 0, 0x14, 0x12, x, 2, 0x14, 0x12, 0x11, var, var2);
if (direction == 0)
return;
if (direction > 0)
x *= 1, x += 0x14; // x * 1 is needed to match, but can be safely removed as it makes no functional difference
x += 0x14;
else
x -= 4;