collapse TUs

7 files changed, 26 insertions, 28 deletions

diff --git a/include/position.h b/include/coord.h
index 87d5b128..b91c97b2 100644
--- a/include/position.h
+++ b/include/coord.h
@@ -4,6 +4,9 @@
 #include "global.h"
 #include "entity.h"
 
+s16 FixedMul(s16 r0, s16 r1);
+s16 FixedDiv(s16 r0, s16 r1);
+
 void CopyPosition(Entity*, Entity*);
 void PositionEntityOnTop(Entity*, Entity*);
 void PositionRelative(Entity*, Entity*, s32, s32);
@@ -12,4 +15,7 @@ void sub_0806FA90(Entity*, Entity*, s32, s32);
 void ResolveEntityOnTop(Entity*, Entity*);
 void sub_0806FAD8(Entity*, Entity*);
 
+const s16 gSineTable[64];
+const s16 gCosineTable[256];
+
 #endif
diff --git a/include/dma.h b/include/dma.h
deleted file mode 100644
index 168c870e..00000000
--- a/include/dma.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef DMA_H
-#define DMA_H
-
-void MemFill16(u32 value, void* dest, u32 size);
-void MemFill32(u32 value, void* dest, u32 size);
-void MemClear(void* dest, u32 size);
-void MemCopy(const void* src, void* dest, u32 size);
-
-#endif // DMA_H
diff --git a/include/functions.h b/include/functions.h
index 4711ec1e..049f3bd1 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -5,7 +5,7 @@
 #include "global.h"
 #include "entity.h"
 #include "manager.h"
-#include "position.h"
+#include "coord.h"
 #include "player.h"
 #include "room.h"
 #include "structures.h"
@@ -13,7 +13,6 @@
 // Identified - to be sorted into header files
 extern void SoundReq(u32);
 extern void ShowNPCDialogue(Entity*, Dialog*);
-extern u32 __modsi3(u32, u32);
 extern void DoFade(u32, u32);
 extern u32 CheckKinstoneFused(u32);
 extern void ForceEquipItem(u32, u8);
diff --git a/include/greatFairy.h b/include/greatFairy.h
index 6afb06dd..fd325b6c 100644
--- a/include/greatFairy.h
+++ b/include/greatFairy.h
@@ -24,7 +24,6 @@ extern u32 gUnk_0810C2E4;
 extern const s16 GreatFairy_RippleOffsets[10];
 extern u32 gUnk_02034350;
 extern u8 gUnk_0812079C[8];
-extern s16 gSineTable[];
 extern s8 gUnk_081207AC[];
 
 #endif
diff --git a/include/readKeyInput.h b/include/readKeyInput.h
deleted file mode 100644
index 7961c2b6..00000000
--- a/include/readKeyInput.h
+++ /dev/null
@@ -1,9 +0,0 @@
-typedef struct {
-    u16 heldKeys;
-    u16 newKeys;
-    u16 unk4;
-    u8 unk6;
-    u8 unk7;
-} Input;
-
-extern Input gInput;
diff --git a/include/trig.h b/include/trig.h
deleted file mode 100644
index 0e6e44a9..00000000
--- a/include/trig.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef TRIG_H
-#define TRIG_H
-
-extern const s16 gSineTable[];
-extern const s16 gCosineTable[];
-
-#endif
diff --git a/include/utils.h b/include/utils.h
new file mode 100644
index 00000000..1703c991
--- /dev/null
+++ b/include/utils.h
@@ -0,0 +1,19 @@
+typedef struct {
+    u16 heldKeys;
+    u16 newKeys;
+    u16 unk4;
+    u8 unk6;
+    u8 unk7;
+} Input;
+
+extern Input gInput;
+
+void MemFill16(u32 value, void* dest, u32 size);
+void MemFill32(u32 value, void* dest, u32 size);
+void MemClear(void* dest, u32 size);
+void MemCopy(const void* src, void* dest, u32 size);
+
+void ReadKeyInput(void);
+
+void LoadPalettes(const u8*, int, int);
+void LoadPaletteGroup(u32 group);