tunnel

[gbajam21] / src / main.c

diff --git a/src/main.c b/src/main.c
index 03930b1..e358302 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2,6 +2,7 @@
 #include "gbaregs.h"
 #include "intr.h"
 #include "debug.h"
+#include "game.h"
 
 #include "AAS.h"
 #include "data.h"
@@ -13,34 +14,22 @@
 
 int main(void)
 {
-       int i, j;
-       uint16_t *vptr;
-
        emuprint("\nStarting GBAJAM21\n-----------------\n");
 
        intr_init();
 
+#ifndef NOSOUND
        interrupt(INTR_TIMER1, AAS_Timer1InterruptHandler);
        AAS_SetConfig(AAS_CONFIG_MIX_24KHZ, AAS_CONFIG_CHANS_8, AAS_CONFIG_SPATIAL_STEREO, AAS_CONFIG_DYNAMIC_ON);
        unmask(INTR_TIMER1);
        intr_enable();
 
-
-       REG_DISPCNT = 3 | DISPCNT_BG2;
-
-       vptr = (uint16_t*)VRAM_START_ADDR;
-       for(i=0; i<160; i++) {
-               for(j=0; j<240; j++) {
-                       int xor = i ^ j;
-                       int r = xor >> 2;
-                       int g = xor >> 1;
-                       int b = xor;
-
-                       *vptr++ = RGB15(r, g, b);
-               }
-       }
-
        AAS_MOD_Play(AAS_DATA_MOD_popcorn);
+#else
+       intr_enable();
+#endif
+
+       gamescr();
 
        for(;;);
        return 0;