diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-07-27 10:22:09 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-07-27 10:22:09 -0400 |
| commit | 8a3102ca979fe327001be6fa00a42fea0120ce6c (patch) | |
| tree | f7602dfa72569e996ac5fe77ff1ff6a1c4f7e61c /arm9/lib/src/GX.c | |
| parent | 3bf0b69ed022f38ed9d325b07d03888f57a69e3e (diff) | |
| parent | 8e1946da03f96b5696d3f8f248a2b675ba80d594 (diff) | |
Merge branch 'master' of github.com:pret/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib/src/GX.c')
| -rw-r--r-- | arm9/lib/src/GX.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/lib/src/GX.c b/arm9/lib/src/GX.c index d103bed5..69ad8718 100644 --- a/arm9/lib/src/GX.c +++ b/arm9/lib/src/GX.c @@ -83,7 +83,7 @@ ARM_FUNC void GX_DispOn(){ sIsDispOn = 0x1; if (sDispMode) { - reg_GX_DISPCNT = reg_GX_DISPCNT & ~0x30000 | (sDispMode << 0x10); + reg_GX_DISPCNT = (reg_GX_DISPCNT & ~0x30000) | (sDispMode << 0x10); } else { @@ -102,7 +102,7 @@ ARM_FUNC void GX_SetGraphicsMode(u32 mode1, u32 mode2, u32 mode3){ } ARM_FUNC void GXS_SetGraphicsMode(u32 mode){ - reg_GXS_DB_DISPCNT = reg_GXS_DB_DISPCNT & ~0x7 | mode; + reg_GXS_DB_DISPCNT = (reg_GXS_DB_DISPCNT & ~0x7) | mode; } ARM_FUNC void GXx_SetMasterBrightness_(vu16 *dst, s32 brightness){ |