summaryrefslogtreecommitdiff
path: root/arm9/lib/src/GX.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-06-06 10:17:48 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-06-06 10:17:48 -0400
commit287997378d2531af6c610721f2be2424ca4cbfa3 (patch)
treea52d852aeac6ea91103dc5b4ce9dad2fee375bc6 /arm9/lib/src/GX.c
parent3e3328342369ac8143a442c5b85ad56ce587b195 (diff)
parentcae6ef601c8d2892c078eb77327e4552f3c8bf64 (diff)
Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib/src/GX.c')
-rw-r--r--arm9/lib/src/GX.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arm9/lib/src/GX.c b/arm9/lib/src/GX.c
index 6b2f7790..d103bed5 100644
--- a/arm9/lib/src/GX.c
+++ b/arm9/lib/src/GX.c
@@ -1,6 +1,5 @@
#include "global.h"
-#include "main.h"
-#include "GX.h"
+#include "gx.h"
u32 GXi_DmaId = 3;
vu16 GXi_VRamLockId = 0;