summaryrefslogtreecommitdiff
path: root/arm9/lib/src/GX.c
diff options
context:
space:
mode:
authorCleverking2003 <30466983+Cleverking2003@users.noreply.github.com>2020-07-27 17:21:41 +0300
committerGitHub <noreply@github.com>2020-07-27 17:21:41 +0300
commit8e1946da03f96b5696d3f8f248a2b675ba80d594 (patch)
tree70d3aa714ecc4e221b11437672b3da8f36049d7e /arm9/lib/src/GX.c
parent4f8385ac24e8904662af24bbc0d81317c8ff1ea6 (diff)
parent777da6f2ee89661596d6e7c129e6d025c6f2841c (diff)
Merge pull request #244 from red031000/master
split arm7 NVRAM and some RTC
Diffstat (limited to 'arm9/lib/src/GX.c')
-rw-r--r--arm9/lib/src/GX.c4
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){