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

Various code cleanup changes

1 files changed, 9 insertions, 4 deletions

diff --git a/src/projectile/spiderWeb.c b/src/projectile/spiderWeb.c
index 6a386f64..069e881b 100644
--- a/src/projectile/spiderWeb.c
+++ b/src/projectile/spiderWeb.c
@@ -6,9 +6,14 @@
  */
 #include "enemy.h"
 #include "entity.h"
-#include "functions.h"
 #include "hitbox.h"
 #include "object.h"
+#include "asm.h"
+#include "sound.h"
+#include "flags.h"
+#include "room.h"
+#include "physics.h"
+#include "player.h"
 #include "tiles.h"
 
 typedef struct {
@@ -16,7 +21,7 @@ typedef struct {
     /*0x68*/ u8 unused1[28];
     /*0x84*/ u8 unk_84;
     /*0x85*/ u8 unused2;
-    /*0x86*/ u16 unk_86;
+    /*0x86*/ u16 flag;
 } SpiderWebEntity;
 
 typedef struct {
@@ -134,7 +139,7 @@ void SpiderWeb_Init(SpiderWebEntity* this) {
         &gUnk_080FD42C,
         &gUnk_080FD434,
     };
-    if (CheckFlags(this->unk_86) != 0) {
+    if (CheckFlags(this->flag) != 0) {
         DeleteThisEntity();
     }
     super->action = 1;
@@ -251,7 +256,7 @@ void sub_080AAA68(Entity* this) {
 }
 
 void sub_080AAAA8(SpiderWebEntity* this) {
-    SetFlag(this->unk_86);
+    SetFlag(this->flag);
     RestorePrevTileEntity(TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer);
     DeleteThisEntity();
 }