X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmain.c;h=9b3b0e8a7e1a0bdd291c56335efaeb368eed4b2b;hb=622fc6ef720a41a066e1bfcbdc6e003609da2da7;hp=f629a13122247fd716dc9cc55ce86bdffac6b06c;hpb=9e57d947e341a9e2ccfe3726d1f894ad021ff46f;p=gbajam21

diff --git a/src/main.c b/src/main.c
index f629a13..9b3b0e8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3,14 +3,10 @@
 #include "intr.h"
 #include "debug.h"
 #include "game.h"
-
-#include "AAS.h"
 #include "data.h"
+#include "maxmod.h"
 
-#define RGB15(r, g, b) \
-	(((uint16_t)(r) & 0x1f) | \
-	 (((uint16_t)(g) & 0x1f) << 5) | \
-	 (((uint16_t)(b) & 0x1f) << 10))
+static void vblank(void);
 
 int main(void)
 {
@@ -19,18 +15,28 @@ int main(void)
 	REG_WAITCNT = WAITCNT_PREFETCH | WAITCNT_ROM_2_1;
 
 #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();
-
-	AAS_MOD_Play(AAS_DATA_MOD_popcorn);
-#else
-	intr_enable();
+	mmInitDefault(sound_data, 8);
+	mmStart(MOD_POPCORN, MM_PLAY_LOOP);
 #endif
 
+	intr_disable();
+	interrupt(INTR_VBLANK, vblank);
+	REG_DISPSTAT |= DISPSTAT_IEN_VBLANK;
+	unmask(INTR_VBLANK);
+
+	intr_enable();
 	gamescr();
 
 	for(;;);
 	return 0;
 }
+
+static void vblank(void)
+{
+	vblperf_count++;
+
+#ifndef NOSOUND
+	mmVBlank();
+	mmFrame();
+#endif
+}