X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgba%2Fmain.c;h=478b8f64cd05c69249dc03e8ed544a62ed4d2cb0;hb=09ff9fd9a87d495d8c2d55203af89d0f651b5d3a;hp=6e5dbc02e2b9111cdf3b902d14d101f8cec61ec9;hpb=a54b2023cc634befc0771cd5104173d811668039;p=gbajam22

diff --git a/src/gba/main.c b/src/gba/main.c
index 6e5dbc0..478b8f6 100644
--- a/src/gba/main.c
+++ b/src/gba/main.c
@@ -4,6 +4,10 @@
 #include "debug.h"
 #include "game.h"
 #include "maxmod.h"
+#include "input.h"
+#include "timer.h"
+#include "xgl.h"
+#include "scoredb.h"
 
 static void vblank(void);
 
@@ -32,14 +36,20 @@ int main(void)
 	REG_DISPSTAT |= DISPSTAT_IEN_VBLANK;
 	unmask(INTR_VBLANK);
 
+	load_scores();
+	gba_colors = scores[10].score & 1;
+
+	xgl_init();
+
 	if(init_screens() == -1) {
 		panic(get_pc(), "failed to initialize screens");
 	}
 
 	if(change_screen(find_screen("game")) == -1) {
-		panic(get_pc(), "failed to find game screen");
+		panic(get_pc(), "failed to find starting screen");
 	}
 
+	reset_msec_timer();
 	intr_enable();
 
 	for(;;) {
@@ -51,10 +61,9 @@ int main(void)
 ARM_IWRAM
 static void vblank(void)
 {
-#ifdef VBLBAR
 	vblperf_count++;
-#endif
 
+	keyb_vblank();
 	curscr->vblank();
 
 #ifndef NOSOUND