From b76cd375d2536bb3e0d4ea807c1137f9c6ccda37 Mon Sep 17 00:00:00 2001
From: mrb0nk500 <b0nk@b0nk.xyz>
Date: Wed, 1 Feb 2023 18:50:52 -0400
Subject: types: Rename `types.h` to `global_types.h`

---
 include/pso/TObject.h |  2 +-
 include/types.h       | 30 ------------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 include/types.h

(limited to 'include')

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
-- 
cgit v1.2.3-13-gbd6f