cleanup structures.h

12 files changed, 9 insertions, 12 deletions

diff --git a/src/manager/diggingCaveEntranceManager.c b/src/manager/diggingCaveEntranceManager.c
index d7b37a73..18e7a74c 100644
--- a/src/manager/diggingCaveEntranceManager.c
+++ b/src/manager/diggingCaveEntranceManager.c
@@ -12,7 +12,6 @@
 #include "scroll.h"
 #include "tiles.h"
 #ifndef  EU
-#include "structures.h"
 #endif
 
 void DiggingCaveEntranceManager_Main(DiggingCaveEntranceManager*);
diff --git a/src/manager/enterRoomTextboxManager.c b/src/manager/enterRoomTextboxManager.c
index f456714c..e9c7d5a4 100644
--- a/src/manager/enterRoomTextboxManager.c
+++ b/src/manager/enterRoomTextboxManager.c
@@ -11,7 +11,7 @@
 #include "game.h"
 #include "message.h"
 #include "screen.h"
-#include "structures.h"
+#include "vram.h"
 
 const u16 gUnk_08108DE8[] = { 0,     0x70b, 0x70c, 0x70d, 0x70e, 0x70f, 0x710, 0x711, 0x712, 0x713, 0x714,
                               0x715, 0x716, 0x717, 0x718, 0x719, 0x71a, 0x71b, 0x71c, 0x71d, 0x71e, 0x71f,
diff --git a/src/manager/holeManager.c b/src/manager/holeManager.c
index ced8e4b9..cc3a3191 100644
--- a/src/manager/holeManager.c
+++ b/src/manager/holeManager.c
@@ -15,7 +15,7 @@
 #include "game.h"
 #include "manager/lightManager.h"
 #include "assets/gfx_offsets.h"
-#include "structures.h"
+#include "gfx.h"
 
 typedef enum {
     HOLE_TRANSITION_ABSOLUTE,
diff --git a/src/manager/horizontalMinishPathBackgroundManager.c b/src/manager/horizontalMinishPathBackgroundManager.c
index 7af97dde..6c0a96fd 100644
--- a/src/manager/horizontalMinishPathBackgroundManager.c
+++ b/src/manager/horizontalMinishPathBackgroundManager.c
@@ -8,7 +8,7 @@
 #include "common.h"
 #include "screen.h"
 #include "game.h"
-#include "structures.h"
+#include "vram.h"
 #include "room.h"
 
 void sub_08057F20(HorizontalMinishPathBackgroundManager*);
diff --git a/src/manager/lightRayManager.c b/src/manager/lightRayManager.c
index 93e21ddd..1a75f63b 100644
--- a/src/manager/lightRayManager.c
+++ b/src/manager/lightRayManager.c
@@ -12,7 +12,6 @@
 #include "main.h"
 #include "screen.h"
 #include "game.h"
-#include "structures.h"
 #include "player.h"
 #include "physics.h"
 
diff --git a/src/manager/minishRaftersBackgroundManager.c b/src/manager/minishRaftersBackgroundManager.c
index 183000af..da5680e3 100644
--- a/src/manager/minishRaftersBackgroundManager.c
+++ b/src/manager/minishRaftersBackgroundManager.c
@@ -8,7 +8,7 @@
 #include "common.h"
 #include "room.h"
 #include "game.h"
-#include "structures.h"
+#include "vram.h"
 
 void MinishRaftersBackgroundManager_OnEnterRoom(MinishRaftersBackgroundManager*);
 void sub_08058210(MinishRaftersBackgroundManager*);
diff --git a/src/manager/minishVillageTileSetManager.c b/src/manager/minishVillageTileSetManager.c
index 81c93ae8..7799ba83 100644
--- a/src/manager/minishVillageTileSetManager.c
+++ b/src/manager/minishVillageTileSetManager.c
@@ -10,7 +10,8 @@
 #include "main.h"
 #include "game.h"
 #include "assets/gfx_offsets.h"
-#include "structures.h"
+#include "pauseMenu.h"
+#include "gfx.h"
 
 void MinishVillageTileSetManager_OnEnterRoom(void*);
 bool32 MinishVillageTileSetManager_UpdateRoomGfxGroup(MinishVillageTileSetManager*);
diff --git a/src/manager/rollingBarrelManager.c b/src/manager/rollingBarrelManager.c
index f8209f6e..cf42b5e7 100644
--- a/src/manager/rollingBarrelManager.c
+++ b/src/manager/rollingBarrelManager.c
@@ -261,7 +261,7 @@ void RollingBarrelManager_OnEnterRoom(void) {
     u32 tmp2;
     LoadPaletteGroup(0x28);
     MemCopy(gPaletteBuffer + 3 * 16, gPaletteBuffer + 21 * 16, 16 * 2);
-    gUsedPalettes |= 1 << 21;
+    USE_PALETTE(21);
     LoadGfxGroup(0x16);
     tmp = gScreen.lcd.displayControl;
     tmp2 = 0;
diff --git a/src/manager/secretManager.c b/src/manager/secretManager.c
index f0ec19e2..69739493 100644
--- a/src/manager/secretManager.c
+++ b/src/manager/secretManager.c
@@ -10,7 +10,6 @@
 #include "entity.h"
 #include "flags.h"
 #include "sound.h"
-#include "structures.h"
 
 void SecretManager_Type0_Action2(SecretManager*);
 void SecretManager_Type0(SecretManager*);
diff --git a/src/manager/templeOfDropletsManager.c b/src/manager/templeOfDropletsManager.c
index 1c9987a5..94b247d0 100644
--- a/src/manager/templeOfDropletsManager.c
+++ b/src/manager/templeOfDropletsManager.c
@@ -14,7 +14,8 @@
 #include "screen.h"
 #include "sound.h"
 #include "game.h"
-#include "structures.h"
+#include "vram.h"
+#include "pauseMenu.h"
 
 static const u16 gUnk_081085B8[] = { 0x1008, 0x1007, 0x1006, 0x1005, 0x1006, 0x1007, 0x1008, 0x1009,
                                      0x1008, 0x1007, 0x1006, 0x1005, 0x1006, 0x1007, 0x1008, 0x1009 };
diff --git a/src/manager/vaati3InsideArmManager.c b/src/manager/vaati3InsideArmManager.c
index 43402c28..2f89d2ce 100644
--- a/src/manager/vaati3InsideArmManager.c
+++ b/src/manager/vaati3InsideArmManager.c
@@ -7,7 +7,6 @@
 #include "manager/vaati3InsideArmManager.h"
 #include "screenTransitions.h"
 #include "sound.h"
-#include "structures.h"
 
 void sub_0805DBF0(Vaati3InsideArmManager*);
 void Vaati3InsideArmManager_Init(Vaati3InsideArmManager*);
diff --git a/src/manager/weatherChangeManager.c b/src/manager/weatherChangeManager.c
index d5da1664..53156fef 100644
--- a/src/manager/weatherChangeManager.c
+++ b/src/manager/weatherChangeManager.c
@@ -15,7 +15,6 @@
 #include "game.h"
 #include "manager/staticBackgroundManager.h"
 #include "player.h"
-#include "structures.h"
 
 void WeatherChangeManager_OnEnterRoom(WeatherChangeManager*);
 void sub_08059608(WeatherChangeManager*);