1 files changed, 43 insertions, 4 deletions
diff --git a/nitro/types.h b/nitro/types.h
index af6d9c6b..327dd01a 100644
--- a/nitro/types.h
+++ b/nitro/types.h
@@ -1,9 +1,48 @@
 #ifndef POKEDIAMOND_NITRO_TYPES_H
 #define POKEDIAMOND_NITRO_TYPES_H
 
-typedef long u64;
-typedef int u32;
-typedef short u16;
-typedef char u8;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef unsigned char u8;
+typedef unsigned short int u16;
+typedef unsigned long u32;
+
+typedef signed char s8;
+typedef signed short int s16;
+typedef signed long s32;
+
+typedef unsigned long long int u64;
+typedef signed long long int s64;
+
+typedef volatile u8 vu8;
+typedef volatile u16 vu16;
+typedef volatile u32 vu32;
+typedef volatile u64 vu64;
+
+typedef volatile s8 vs8;
+typedef volatile s16 vs16;
+typedef volatile s32 vs32;
+typedef volatile s64 vs64;
+
+typedef float f32;
+typedef volatile f32 vf32;
+
+typedef int BOOL;
+#define TRUE 1
+#define FALSE 0
+
+#ifndef NULL
+#ifdef  __cplusplus
+#define NULL 0
+#else  // __cplusplus
+#define NULL ((void *)0)
+#endif // __cplusplus
+#endif
+
+#ifdef __cplusplus
+};
+#endif
 
 #endif //POKEDIAMOND_NITRO_TYPES_H