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

Various code cleanup changes

1 files changed, 7 insertions, 4 deletions

diff --git a/src/object/flame.c b/src/object/flame.c
index 5b1b48a7..4fce1e8d 100644
--- a/src/object/flame.c
+++ b/src/object/flame.c
@@ -6,13 +6,16 @@
  */
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
+#include "physics.h"
 #include "sound.h"
+#include "asm.h"
+#include "room.h"
+#include "player.h"
 
 typedef struct {
     /*0x00*/ Entity base;
     /*0x68*/ u8 unused1[30];
-    /*0x86*/ u16 unk_86;
+    /*0x86*/ u16 flag;
 } FlameEntity;
 
 extern void sub_0807AB44(Entity*, s32, s32);
@@ -43,7 +46,7 @@ void Flame_Init(FlameEntity* this) {
             CopyPosition(super->parent, super);
             break;
         case 4:
-            if (!CheckFlags(this->unk_86)) {
+            if (!CheckFlags(this->flag)) {
                 super->spriteSettings.draw = FALSE;
                 super->subAction = 1;
                 return;
@@ -85,7 +88,7 @@ void Flame_Action1(FlameEntity* this) {
             CopyPosition(super->parent, super);
             break;
         case 4:
-            val = CheckFlags(this->unk_86);
+            val = CheckFlags(this->flag);
             if (super->subAction == 0) {
                 if (val)
                     return;