diff options
author | Kurausukun <lord.uber1@gmail.com> | 2020-11-02 18:43:40 -0500 |
---|---|---|
committer | Kurausukun <lord.uber1@gmail.com> | 2020-11-02 18:43:40 -0500 |
commit | 6545745e5997f48e0c853b30b144a10244e7ba20 (patch) | |
tree | 5b0e10ea033a9501105983f1671a76ea39ef8ab0 /gflib/blit.c | |
parent | 8bf401c2272b7c4182f54cb1285f6067fb5247f9 (diff) | |
parent | 9794b077b501ca8c9e5e3f1b6cdd705ec2129d24 (diff) |
Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts
Diffstat (limited to 'gflib/blit.c')
-rw-r--r-- | gflib/blit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gflib/blit.c b/gflib/blit.c index 26a63fe9b..bdbb2e2fd 100644 --- a/gflib/blit.c +++ b/gflib/blit.c @@ -76,7 +76,7 @@ void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 hei s32 yEnd; s32 multiplierY; s32 loopX, loopY; - s32 toOrr1, toOrr2; + u8 toOrr1, toOrr2; xEnd = x + width; if (xEnd > surface->width) @@ -87,8 +87,8 @@ void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 hei yEnd = surface->height; multiplierY = (surface->width + (surface->width & 7)) >> 3; - toOrr1 = (u32)(fillValue << 0x1C) >> 0x18; - toOrr2 = (fillValue & 0xF); + toOrr1 = fillValue << 4; + toOrr2 = fillValue & 0xF; for (loopY = y; loopY < yEnd; loopY++) { |