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

Various code cleanup changes

1 files changed, 6 insertions, 5 deletions

diff --git a/src/object/treeHidingPortal.c b/src/object/treeHidingPortal.c
index 283d64be..da087e26 100644
--- a/src/object/treeHidingPortal.c
+++ b/src/object/treeHidingPortal.c
@@ -7,17 +7,18 @@
 #include "effects.h"
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
 #include "object.h"
+#include "asm.h"
 #include "player.h"
 #include "room.h"
 #include "sound.h"
 #include "tiles.h"
+#include "kinstone.h"
 
 typedef struct {
     /*0x00*/ Entity base;
     /*0x68*/ u8 unused1[30];
-    /*0x86*/ u16 unk_86;
+    /*0x86*/ u16 flag;
 } TreeHidingPortalEntity;
 
 extern const s16 gUnk_080B4468[];
@@ -42,7 +43,7 @@ void TreeHidingPortal(TreeHidingPortalEntity* this) {
 }
 
 void TreeHidingPortal_Init(TreeHidingPortalEntity* this) {
-    if (CheckFlags(this->unk_86)) {
+    if (CheckFlags(this->flag)) {
         sub_0809E96C(this);
         DeleteThisEntity();
     }
@@ -56,7 +57,7 @@ void TreeHidingPortal_Action1(TreeHidingPortalEntity* this) {
     if (sub_0800419C(super, &gPlayerEntity.base, 0x30, 0x30)) {
         if (CheckGlobalFlag(EZERO_1ST)) {
             if (((gRoomTransition.frameCount & 3) == 0)) {
-                CreateSparkle(super);
+                CreateSparkleFx(super);
             }
         }
     }
@@ -79,7 +80,7 @@ void TreeHidingPortal_Action2(TreeHidingPortalEntity* this) {
 
 void TreeHidingPortal_Action3(TreeHidingPortalEntity* this) {
     if (--super->timer == 0) {
-        SetFlag(this->unk_86);
+        SetFlag(this->flag);
         SetPlayerControl(0);
         SoundReq(SFX_SECRET_BIG);
         DeleteThisEntity();