Merge branch 'lonkaars:dev' into dev

1 files changed, 4 insertions, 16 deletions

diff --git a/src/main.c b/src/main.c
index f4de225..191d5d9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 
-#include "main.h"
-#include "ppu/ppu.h"
 #include "demo.h"
+#include "input.h"
+#include "main.h"
 
 bool g_hh_run = true;
 
@@ -15,19 +15,7 @@ int main() {
 
 void hh_ppu_vblank_interrupt() {
 	static unsigned long frame = 0;
-	frame++;
-
+	hh_input_read();
 	hh_demo_loop(frame);
-}
-
-void hh_setup() {
-	hh_ppu_init();
-
-	hh_demo_setup();
-}
-
-void hh_exit() {
-	g_hh_run = false;
-
-	hh_ppu_deinit();
+	frame++;
 }