Merge pull request #701 from Henny022p/cleanup/250302HEADmaster

Various code cleanup changes

1 files changed, 9 insertions, 5 deletions

diff --git a/src/object/unusedSkull.c b/src/object/unusedSkull.c
index 6bfb48a5..5198aeba 100644
--- a/src/object/unusedSkull.c
+++ b/src/object/unusedSkull.c
@@ -4,15 +4,19 @@
  *
  * @brief Unused Skull object
  */
-#include "functions.h"
 #include "hitbox.h"
 #include "object.h"
+#include "asm.h"
+#include "sound.h"
+#include "flags.h"
+#include "effects.h"
+#include "room.h"
 #include "tiles.h"
 
 typedef struct {
     /*0x00*/ Entity base;
     /*0x68*/ u8 unk_68[0x1e];
-    /*0x86*/ u16 unk_86;
+    /*0x86*/ u16 flag;
 } UnusedSkullEntity;
 
 void UnusedSkull_Init(UnusedSkullEntity*);
@@ -40,9 +44,9 @@ void UnusedSkull_Init(UnusedSkullEntity* this) {
     super->collisionMask = 2;
     super->hitbox = (Hitbox*)&gHitbox_4;
     SetTile(SPECIAL_TILE_80, COORD_TO_TILE(super), super->collisionLayer);
-    if (super->type == 1 || CheckFlags(this->unk_86)) {
+    if (super->type == 1 || CheckFlags(this->flag)) {
         super->action = 3;
-        SetFlag(this->unk_86);
+        SetFlag(this->flag);
         InitializeAnimation(super, 1);
     } else {
         InitializeAnimation(super, super->type);
@@ -62,7 +66,7 @@ void UnusedSkull_Action2(UnusedSkullEntity* this) {
     GetNextFrame(super);
     if ((super->frame & 1) != 0) {
         super->action = 3;
-        SetFlag(this->unk_86);
+        SetFlag(this->flag);
         EnqueueSFX(SFX_BUTTON_PRESS);
     }
 }