diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-27 19:38:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 19:38:38 -0400 |
| commit | 724ffe14ee2be59a34dc6a397f6579cc0d820cff (patch) | |
| tree | e1d942857382f7eaeef84140d37ded4aa1b220d1 /gflib/bg.c | |
| parent | dc126e30169bd145d28c6d84e4bb466d96394d29 (diff) | |
| parent | bc0d0caec350d5ac66d5a1efd5056c72cf49c2d9 (diff) | |
Merge pull request #1028 from jiangzhengwenjz/misc
sync with pokefirered
Diffstat (limited to 'gflib/bg.c')
| -rw-r--r-- | gflib/bg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gflib/bg.c b/gflib/bg.c index ab4e8b60d..66dd81a25 100644 --- a/gflib/bg.c +++ b/gflib/bg.c @@ -1,3 +1,4 @@ +#include <limits.h> #include "global.h" #include "bg.h" #include "dma3.h" @@ -1178,20 +1179,19 @@ void CopyTileMapEntry(const u16 *src, u16 *dest, s32 palette1, s32 tileOffset, s { u16 var; - if (palette1 == 16) - goto CASE_16; switch (palette1) { - case 0 ... 16: + case 0 ... 15: var = ((*src + tileOffset) & 0xFFF) + ((palette1 + palette2) << 12); break; - CASE_16: + case 16: var = *dest; var &= 0xFC00; var += palette2 << 12; var |= (*src + tileOffset) & 0x3FF; break; default: + case 17 ... INT_MAX: var = *src + tileOffset + (palette2 << 12); break; } |