diff options
| -rw-r--r-- | include/pso/TObject.h | 2 | ||||
| -rw-r--r-- | include/types.h | 30 |
2 files changed, 1 insertions, 31 deletions
diff --git a/include/pso/TObject.h b/include/pso/TObject.h index b5f7dee..8532d5a 100644 --- a/include/pso/TObject.h +++ b/include/pso/TObject.h @@ -2,7 +2,7 @@ #define TOBJECT_H #include "pso/macros.h" -#include "types.h" +#include <global_types.h> OBJECT_NAME(TObject) diff --git a/include/types.h b/include/types.h deleted file mode 100644 index c48ec3c..0000000 --- a/include/types.h +++ /dev/null @@ -1,30 +0,0 @@ -// This file was taken from the Metroid Prime decompilation project. -// https://github.com/PrimeDecomp/prime/blob/main/include/types.h -#ifndef _TYPES -#define _TYPES - -#ifdef __cplusplus -#include "static_assert.hpp" - -extern "C" { -#endif - -#include "dolphin/types.h" - -// Dolphin u32 is unsigned long -typedef unsigned int uint; -typedef unsigned short ushort; -typedef unsigned char uchar; - -// Pointer to unknown, to be determined at a later date. -typedef void* unkptr; - -#define SBig(x) x - -#define ARRAY_SIZE(arr) static_cast< int >(sizeof(arr) / sizeof(arr[0])) - -#ifdef __cplusplus -} -#endif - -#endif // _TYPES |