From 57828f6d851f99737735640d0646496a12372aa7 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Wed, 10 Dec 2014 03:13:38 -0800
Subject: [PATCH] 3DS: Get input working

---
 src/platform/3ds/main.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/platform/3ds/main.c b/src/platform/3ds/main.c
index d06c4eaa3..0ef65c3be 100644
--- a/src/platform/3ds/main.c
+++ b/src/platform/3ds/main.c
@@ -42,9 +42,6 @@ int main() {
 	renderer.outputBuffer = videoBuffer;
 	renderer.outputBufferStride = VIDEO_HORIZONTAL_PIXELS;
 
-	gba->keySource = &activeKeys;
-	gba->sync = 0;
-
 	FS_archive sdmcArchive = (FS_archive) {
 		ARCH_SDMC,
 		(FS_path) { PATH_EMPTY, 1, (u8*)"" },
@@ -60,6 +57,9 @@ int main() {
 	ARMSetComponents(cpu, &gba->d, 0, 0);
 	ARMInit(cpu);
 
+	gba->keySource = &activeKeys;
+	gba->sync = 0;
+
 	GBAVideoAssociateRenderer(&gba->video, &renderer.d);
 
 	GBALoadROM(gba, rom, save, 0);
@@ -77,6 +77,7 @@ int main() {
 				gfxSwapBuffersGpu();
 				gspWaitForVBlank();
 				hidScanInput();
+				activeKeys = hidKeysHeld() & 0x3FF;
 			}
 		}
 		inVblank = GBARegisterDISPSTATGetInVblank(gba->video.dispstat);