Oh hey Curly was causing an address error in MazeM and Almond

andwn · Mar 22, 2018 · fc7917a · fc7917a
1 parent 9a7fbb5
commit fc7917a
Show file tree

Hide file tree

Showing 26 changed files with 459 additions and 1,812 deletions.
diff --git a/Makefile b/Makefile
@@ -56,7 +56,6 @@ Z80S  = $(wildcard src/xgm/*.s80)
 CS    = $(wildcard src/*.c)
 CS   += $(wildcard src/ai/*.c)
 CS   += $(wildcard src/db/*.c)
-CS   += $(wildcard src/xgm/*.c)
 SS    = $(wildcard src/*.s)
 SS   += $(wildcard src/xgm/*.s)
 OBJS  = $(RESS:.res=.o)

diff --git a/inc/common.h b/inc/common.h
@@ -1,4 +1,24 @@
-#include <stdint.h>
+#define FALSE   0
+#define TRUE    1
+#define NULL    0
+
+typedef signed char		int8_t;
+typedef signed short	int16_t;
+typedef signed long		int32_t;
+
+typedef unsigned char	uint8_t;
+typedef unsigned short	uint16_t;
+typedef unsigned long	uint32_t;
+
+// SGDK Compatibility
+
+typedef int8_t s8;
+typedef int16_t s16;
+typedef int32_t s32;
+
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
 
 //#define PROFILE_BG
 #ifdef PROFILE_BG
@@ -12,7 +32,7 @@
 
 #define MUSIC_TICK() ({ \
 	if(vblank) { \
-		XGM_doVBlankProcess(); \
+		xgm_vblank(); \
 		vblank = 0; \
 	} \
 })

diff --git a/inc/psg.h b/inc/psg.h
diff --git a/inc/smp_null.h b/inc/smp_null.h
diff --git a/inc/stdint.h b/inc/stdint.h
diff --git a/inc/tab_vol.h b/inc/tab_vol.h