From 8b7d88cac2945906379cd1f8d3ef0089804dd87f Mon Sep 17 00:00:00 2001
From: Luis Scheurenbrand <Luisscheurenbrand@gmail.com>
Date: Sat, 26 Dec 2020 02:22:25 +0100
Subject: [PATCH 1/2] fix includes

---
 include/createEnemy.h |  2 ++
 include/greatFairy.h  |  2 ++
 include/item.h        | 64 +++++++++++++++++++++----------------------
 include/textbox.h     |  2 +-
 4 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/include/createEnemy.h b/include/createEnemy.h
index aac5fece..2763da03 100644
--- a/include/createEnemy.h
+++ b/include/createEnemy.h
@@ -1 +1,3 @@
+#include "entity.h"
+
 Entity* CreateEnemy(u8, u8);
diff --git a/include/greatFairy.h b/include/greatFairy.h
index c8289adc..417f272d 100644
--- a/include/greatFairy.h
+++ b/include/greatFairy.h
@@ -1,6 +1,8 @@
 #ifndef GREATFAIRY_H
 #define GREATFAIRY_H
 
+#include "screen.h"
+
 extern u32 __modsi3(u32, u32);
 extern void InitializeAnimation(Entity*, u32);
 extern void GreatFairy_InitializeAnimation(Entity*);
diff --git a/include/item.h b/include/item.h
index 8dcb3fcb..e0dc4bbb 100644
--- a/include/item.h
+++ b/include/item.h
@@ -5,38 +5,38 @@
 #include "entity.h"
 #include "player.h"
 
-void extern DebugItem(ItemBehavior*, u32);
-void extern Sword(ItemBehavior*, u32);
-void extern Sword(ItemBehavior*, u32);
-void extern Sword(ItemBehavior*, u32);
-void extern Sword(ItemBehavior*, u32);
-void extern Sword(ItemBehavior*, u32);
-void extern Sword(ItemBehavior*, u32);
-void extern Bomb(ItemBehavior*, u32);
-void extern Bomb(ItemBehavior*, u32);
-void extern Bow(ItemBehavior*, u32);
-void extern Bow(ItemBehavior*, u32);
-void extern sub_08075D14(ItemBehavior*, u32);
-void extern sub_08075D14(ItemBehavior*, u32);
-void extern Shield(ItemBehavior*, u32);
-void extern Shield(ItemBehavior*, u32);
-void extern Lantern(ItemBehavior*, u32);
-void extern Lantern(ItemBehavior*, u32);
-void extern GustJar(ItemBehavior*, u32);
-void extern PacciCane(ItemBehavior*, u32);
-void extern MoleMitts(ItemBehavior*, u32);
-void extern RocsCape(ItemBehavior*, u32);
-void extern sub_08076800(ItemBehavior*, u32);
-void extern DebugItem(ItemBehavior*, u32);
-void Ocarina(ItemBehavior*, u32);
-void extern DebugItem(ItemBehavior*, u32);
-void extern DebugItem(ItemBehavior*, u32);
-void extern DebugItem(ItemBehavior*, u32);
-void extern TryPickupObject(ItemBehavior*, u32);
-void extern JarEmpty(ItemBehavior*, u32);
-void extern JarEmpty(ItemBehavior*, u32);
-void extern JarEmpty(ItemBehavior*, u32);
-void extern JarEmpty(ItemBehavior*, u32);
+extern void DebugItem(ItemBehavior*, u32);
+extern void Sword(ItemBehavior*, u32);
+extern void Sword(ItemBehavior*, u32);
+extern void Sword(ItemBehavior*, u32);
+extern void Sword(ItemBehavior*, u32);
+extern void Sword(ItemBehavior*, u32);
+extern void Sword(ItemBehavior*, u32);
+extern void Bomb(ItemBehavior*, u32);
+extern void Bomb(ItemBehavior*, u32);
+extern void Bow(ItemBehavior*, u32);
+extern void Bow(ItemBehavior*, u32);
+extern void sub_08075D14(ItemBehavior*, u32);
+extern void sub_08075D14(ItemBehavior*, u32);
+extern void Shield(ItemBehavior*, u32);
+extern void Shield(ItemBehavior*, u32);
+extern void Lantern(ItemBehavior*, u32);
+extern void Lantern(ItemBehavior*, u32);
+extern void GustJar(ItemBehavior*, u32);
+extern void PacciCane(ItemBehavior*, u32);
+extern void MoleMitts(ItemBehavior*, u32);
+extern void RocsCape(ItemBehavior*, u32);
+extern void sub_08076800(ItemBehavior*, u32);
+extern void DebugItem(ItemBehavior*, u32);
+extern void Ocarina(ItemBehavior*, u32);
+extern void DebugItem(ItemBehavior*, u32);
+extern void DebugItem(ItemBehavior*, u32);
+extern void DebugItem(ItemBehavior*, u32);
+extern void TryPickupObject(ItemBehavior*, u32);
+extern void JarEmpty(ItemBehavior*, u32);
+extern void JarEmpty(ItemBehavior*, u32);
+extern void JarEmpty(ItemBehavior*, u32);
+extern void JarEmpty(ItemBehavior*, u32);
 
 /* On hold until naming conflicts are resolved */
 /*
diff --git a/include/textbox.h b/include/textbox.h
index 12417252..fcfe0de3 100644
--- a/include/textbox.h
+++ b/include/textbox.h
@@ -23,5 +23,5 @@ extern TextBox gTextBox;
 
 void TextboxNoOverlap(u32 index, Entity* ent);
 
-void extern TextboxNoOverlapFollow(u32 index);
+extern void TextboxNoOverlapFollow(u32 index);
 #endif

From 1fedd92141050b165d7d79b00f1b61d681346d35 Mon Sep 17 00:00:00 2001
From: Luis Scheurenbrand <Luisscheurenbrand@gmail.com>
Date: Sat, 26 Dec 2020 02:27:11 +0100
Subject: [PATCH 2/2] include guard for createEnemy

---
 include/createEnemy.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/createEnemy.h b/include/createEnemy.h
index 2763da03..584632ca 100644
--- a/include/createEnemy.h
+++ b/include/createEnemy.h
@@ -1,3 +1,8 @@
+#ifndef GUARD_CREATEENEMY_H
+#define GUARD_CREATEENEMY_H
+
 #include "entity.h"
 
 Entity* CreateEnemy(u8, u8);
+
+#endif // GUARD_CREATEENEMY_H