diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-02 11:44:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 11:44:50 -0400 |
| commit | 8c86b656d2fa97fc5eb113e9807d49f48c715f8b (patch) | |
| tree | 01e14b4dec7ef184ca50b9f0815a662590520045 /src/pokedex.c | |
| parent | 32693e94d844cb401aed91d066b9f5ad1eb440a7 (diff) | |
| parent | 1bd678656c735bbeb603ccb80367c7a85f820f61 (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/pokedex.c')
| -rw-r--r-- | src/pokedex.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/pokedex.c b/src/pokedex.c index ad02efc1e..8d7ecb896 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -3487,10 +3487,10 @@ static void sub_8090584(u8 a, u16 b) u32 r0 = b * 0x800 + (r7 + j) * 2; u8 *ptr; - ptr = VRAM; - *(u16 *)(ptr + r0) = *(u16 *)(ptr + r0) & 0xFFF | r6; - ptr = VRAM + 0x40; - *(u16 *)(ptr + r0) = *(u16 *)(ptr + r0) & 0xFFF | r6; + ptr = (void *)VRAM; + *(u16 *)(ptr + r0) = (*(u16 *)(ptr + r0) & 0xFFF) | r6; + ptr = (void *)VRAM + 0x40; + *(u16 *)(ptr + r0) = (*(u16 *)(ptr + r0) & 0xFFF) | r6; } } r6 = 0x4000; @@ -3499,10 +3499,10 @@ static void sub_8090584(u8 a, u16 b) u32 r0 = b * 0x800 + j * 2; u8 *ptr; - ptr = VRAM + 0x32; - *(u16 *)(ptr + r0) = *(u16 *)(ptr + r0) & 0xFFF | r6; - ptr = VRAM + 0x72; - *(u16 *)(ptr + r0) = *(u16 *)(ptr + r0) & 0xFFF | r6; + ptr = (void *)VRAM + 0x32; + *(u16 *)(ptr + r0) = (*(u16 *)(ptr + r0) & 0xFFF) | r6; + ptr = (void *)VRAM + 0x72; + *(u16 *)(ptr + r0) = (*(u16 *)(ptr + r0) & 0xFFF) | r6; } } #else @@ -3633,9 +3633,9 @@ static void sub_8090644(u8 a, u16 b) u16 (*vramData)[0x400]; vramData = (u16 (*)[])VRAM; - vramData[b][r8 + j] = vramData[b][r8 + j] & 0xFFF | r5; + vramData[b][r8 + j] = (vramData[b][r8 + j] & 0xFFF) | r5; vramData = (u16 (*)[])(VRAM + 0x40); - vramData[b][r8 + j] = vramData[b][r8 + j] & 0xFFF | r5; + vramData[b][r8 + j] = (vramData[b][r8 + j] & 0xFFF) | r5; } } @@ -3644,9 +3644,9 @@ static void sub_8090644(u8 a, u16 b) u16 (*vramData)[0x400]; vramData = (u16 (*)[])(VRAM + 0x32); - vramData[b][j] = vramData[b][j] & 0xFFF | 0x4000; + vramData[b][j] = (vramData[b][j] & 0xFFF) | 0x4000; vramData = (u16 (*)[])(VRAM + 0x72); - vramData[b][j] = vramData[b][j] & 0xFFF | 0x4000; + vramData[b][j] = (vramData[b][j] & 0xFFF) | 0x4000; } } #else |