definition streamlining

6 files changed, 14 insertions, 17 deletions

diff --git a/src/bitGetters.c b/src/bitGetters.c
index 305c0822..9eb5063c 100644
--- a/src/bitGetters.c
+++ b/src/bitGetters.c
@@ -1,29 +1,29 @@
 #include "global.h"
 
-extern u8 gUnk_02033A90;
+extern u8 gArea;
 
 u32 sub_08052654()
 {
-    return (gUnk_02033A90 >> 7) & 1;
+    return (gArea >> 7) & 1;
 }
 
-u32 sub_08052660()
+u32 CheckIsDungeon()
 {
-    return (gUnk_02033A90 >> 2) & 1;
+    return (gArea >> 2) & 1;
 }
 
 u32 sub_08052670()
 {
-    return (gUnk_02033A90 >> 4) & 1;
+    return (gArea >> 4) & 1;
 }
 
 u32 sub_08052680()
 {
-    return (gUnk_02033A90 >> 6) & 1;
+    return (gArea >> 6) & 1;
 }
 
 u32 sub_08052690()
 
 {
-    return (gUnk_02033A90 >> 3) & 1;
+    return (gArea >> 3) & 1;
 }
diff --git a/src/mainLoop.c b/src/mainLoop.c
index 858f5249..9230a2af 100644
--- a/src/mainLoop.c
+++ b/src/mainLoop.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "mainLoop.h"
+#include "main.h"
 
 #ifdef NON_MATCHING
 
diff --git a/src/modHealth.c b/src/modHealth.c
index 73d40f42..be51881c 100644
--- a/src/modHealth.c
+++ b/src/modHealth.c
@@ -1,9 +1,7 @@
 #include "global.h"
 #include "entity.h"
-#include "stats.h"
+#include "link.h"
 
-extern Stats gStats;
-extern Entity gLinkEntity;
 s32 ModHealth(s32 deltaHealth)
 
 {
diff --git a/src/modRupees.c b/src/modRupees.c
index e6691444..47f59412 100644
--- a/src/modRupees.c
+++ b/src/modRupees.c
@@ -1,7 +1,6 @@
 #include "global.h"
-#include "stats.h"
+#include "link.h"
 
-extern Stats gStats;
 extern u16 gWalletSizes[4];
 
 void ModRupees(s32 rupeeDelta)
diff --git a/src/sub_0804AA84.c b/src/sub_0804AA84.c
index 2667b5cd..8f45ee69 100644
--- a/src/sub_0804AA84.c
+++ b/src/sub_0804AA84.c
@@ -4,13 +4,13 @@
 
 /* extern void sub_0805E5A8();
 
-extern u8 gUnk_02033A90;
+extern u8 gArea;
 extern u8 gUnk_03001000;
 
 u32 sub_0804AA84(void)
 
 {
-	u8 * r3 = &gUnk_02033A90; 
+	u8 * r3 = &gArea; 
 	u8 * r2;
 	u8 r0 = *(u8 *)(r3 + 0x19);
 	u8 r1;
diff --git a/src/sub_08052620.c b/src/sub_08052620.c
index 7c3e1c04..c91c9267 100644
--- a/src/sub_08052620.c
+++ b/src/sub_08052620.c
@@ -1,8 +1,8 @@
 #include "global.h"
 
-extern u8 gUnk_02033A90;
+extern u8 gArea;
 
 bool32 sub_08052620(u32 r0)
 {
-    return gUnk_02033A90 == 0x81;
+    return gArea == 0x81;
 }