add effects.h

25 files changed, 63 insertions, 38 deletions

diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c
index afc9da4e..730f1aa7 100644
--- a/src/enemy/businessScrub.c
+++ b/src/enemy/businessScrub.c
@@ -6,6 +6,7 @@
 #include "random.h"
 #include "npc.h"
 #include "functions.h"
+#include "effects.h"
 
 extern void sub_0801D040(Entity*, u32);
 extern Entity* sub_08049DF4(u32);
@@ -60,7 +61,7 @@ void sub_08028934(Entity* this) {
         this->actionDelay = 0x28;
         this->flags &= ~0x80;
         sub_080290E0(this, 4);
-        pEVar1 = CreateFx(this, 3, 0);
+        pEVar1 = CreateFx(this, FX_BUSH, 0);
         if (pEVar1 != NULL) {
             pEVar1->height.HALF.HI -= 8;
         }
diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c
index 2bfc1fc4..ff59c26d 100644
--- a/src/enemy/doorMimic.c
+++ b/src/enemy/doorMimic.c
@@ -1,6 +1,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
+#include "effects.h"
 
 extern s16 sub_080001DA(u32, u32); // ?
 extern void sub_08049CF4();
@@ -37,7 +38,7 @@ void sub_08021FF4(Entity* this) {
 
 void sub_08022004(Entity* this) {
     SetTile((u16)this->field_0x7c.HALF.LO, (u16)this->field_0x7c.HALF.HI, this->collisionLayer);
-    CreateFx(this, 5, 0);
+    CreateFx(this, FX_POT_SHATTER, 0);
     sub_08049CF4(this);
     DeleteThisEntity();
 }
@@ -80,7 +81,7 @@ void sub_080220F0(Entity* this) {
         this->field_0x44 = 0;
         off = gUnk_080CB76C[this->type2];
         for (i = 0; i < 6; i++, off++) {
-            Entity* fx = CreateFx(this, 0x11, 0);
+            Entity* fx = CreateFx(this, FX_DASH, 0);
             if (fx) {
                 fx->x.HALF.HI += off->h;
                 fx->y.HALF.HI += off->v;
diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c
index 74135810..5195b542 100644
--- a/src/enemy/fallingBoulder.c
+++ b/src/enemy/fallingBoulder.c
@@ -1,6 +1,7 @@
 #include "enemy.h"
 #include "random.h"
 #include "functions.h"
+#include "effects.h"
 
 void sub_0802C4B0(Entity*);
 void sub_0802C62C(Entity*);
@@ -92,7 +93,7 @@ NONMATCH("asm/non_matching/fallingBoulder/sub_0802C334.inc", void sub_0802C334(E
                         u32 diff = 0;
                         s32 i;
                         for (i = 1; i > -1; i--) {
-                            Entity* ent = CreateFx(this, 0x15, 0);
+                            Entity* ent = CreateFx(this, FX_ROCK2, 0);
                             if (ent) {
                                 ent->x.HALF.HI += 12;
                                 ent->x.HALF.HI -= diff;
diff --git a/src/enemy/fireballGuy.c b/src/enemy/fireballGuy.c
index f7851aad..42916d3e 100644
--- a/src/enemy/fireballGuy.c
+++ b/src/enemy/fireballGuy.c
@@ -3,6 +3,7 @@
 #include "enemy.h"
 #include "random.h"
 #include "functions.h"
+#include "effects.h"
 
 typedef struct {
     s8 h, v;
@@ -88,7 +89,7 @@ void sub_08045454(Entity* this) {
         off++;
     }
 
-    ent = CreateFx(this, 2, 0);
+    ent = CreateFx(this, FX_DEATH, 0);
     if (ent)
         CopyPosition(this, ent);
 
diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c
index effceb3b..7aaa2153 100644
--- a/src/enemy/gyorgMale.c
+++ b/src/enemy/gyorgMale.c
@@ -6,6 +6,7 @@
 #include "fileScreen.h"
 #include "random.h"
 #include "functions.h"
+#include "effects.h"
 
 void (*const gUnk_080D1AFC[8])(Entity*);
 void (*const gUnk_080D1B1C[7])(Entity*);
@@ -935,7 +936,7 @@ void sub_08047BF0(Entity* this) {
     sub_08047E48(this);
     if (this->actionDelay == 0) {
         if ((this->field_0xf++ & 0xF) == 0) {
-            tmp = CreateFx(this, 0x51, 0);
+            tmp = CreateFx(this, FX_GIANT_EXPLOSION4, 0);
             if (tmp) {
                 u32 rand = Random();
                 tmp->x.HALF.HI += (rand & 0x1E) + 0xFFF1;
@@ -960,17 +961,17 @@ void sub_08047BF0(Entity* this) {
         if (this->actionDelay == 0x5A) {
             tmp = this->attachedEntity;
             tmp->spriteSettings.b.draw = 0;
-            CreateFx(tmp, 0x51, 0);
+            CreateFx(tmp, FX_GIANT_EXPLOSION4, 0);
         } else {
             if (this->actionDelay == 0x3C) {
                 tmp = this->attachedEntity->attachedEntity;
                 tmp->spriteSettings.b.draw = 0;
-                CreateFx(tmp, 0x51, 0);
+                CreateFx(tmp, FX_GIANT_EXPLOSION4, 0);
             } else {
                 if (this->actionDelay == 0x1E) {
                     tmp = this->attachedEntity->attachedEntity->attachedEntity;
                     tmp->spriteSettings.b.draw = 0;
-                    CreateFx(tmp, 0x51, 0);
+                    CreateFx(tmp, FX_GIANT_EXPLOSION4, 0);
                 }
             }
         }
diff --git a/src/enemy/hangingSeed.c b/src/enemy/hangingSeed.c
index fe6fe0fc..95593f7b 100644
--- a/src/enemy/hangingSeed.c
+++ b/src/enemy/hangingSeed.c
@@ -1,6 +1,7 @@
 #include "entity.h"
 #include "enemy.h"
 #include "functions.h"
+#include "effects.h"
 
 extern void (*const gHangingSeedFunctions[])(Entity*);
 extern void (*const gUnk_080CB588[])(Entity*);
@@ -15,7 +16,7 @@ void HangingSeed_OnTick(Entity* this) {
 
 void sub_080216FC(Entity* this) {
     if (this->bitfield & 0x80) {
-        CreateFx(this, 3, 0x80);
+        CreateFx(this, FX_BUSH, 0x80);
         DeleteThisEntity();
     }
 }
diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c
index 1ed5af8e..1b4f20c0 100644
--- a/src/enemy/keaton.c
+++ b/src/enemy/keaton.c
@@ -3,6 +3,7 @@
 #include "enemy.h"
 #include "random.h"
 #include "functions.h"
+#include "effects.h"
 
 extern Entity* gUnk_020000B0;
 
@@ -222,7 +223,7 @@ void sub_08032794(Entity* this) {
     Entity* target;
     s8* temp;
 
-    target = CreateFx(this, 0x11, 0x40);
+    target = CreateFx(this, FX_DASH, 0x40);
     if (target != NULL) {
         temp = &gUnk_080CE810[this->animationState * 2];
         PositionRelative(this, target, temp[0] << 0x10, temp[1] << 0x10);
diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c
index cbbab57f..b35d9540 100644
--- a/src/enemy/lakitu.c
+++ b/src/enemy/lakitu.c
@@ -5,6 +5,7 @@
 #include "coord.h"
 #include "random.h"
 #include "player.h"
+#include "effects.h"
 
 extern void (*const LakituActionFuncs[])(Entity*);
 
@@ -61,7 +62,7 @@ void sub_0803C784(Entity* this) {
         sub_0803CBAC(this);
     } else {
         if (this->damageType == 0x43) {
-            Entity* fx = CreateFx(this, 2, 0);
+            Entity* fx = CreateFx(this, FX_DEATH, 0);
 
             if (fx != NULL) {
                 u32 angle = (this->knockbackDirection ^ 0x10) << 3;
@@ -360,25 +361,25 @@ void sub_0803CC08(Entity* this) {
         return;
     }
 
-    fx = CreateFx(this, 2, 0);
+    fx = CreateFx(this, FX_DEATH, 0);
     if (fx != NULL) {
         fx->x.HALF.HI += 6;
         fx->y.HALF.HI += 6;
     }
 
-    fx = CreateFx(this, 2, 0);
+    fx = CreateFx(this, FX_DEATH, 0);
     if (fx != NULL) {
         fx->x.HALF.HI -= 6;
         fx->y.HALF.HI += 6;
     }
 
-    fx = CreateFx(this, 2, 0);
+    fx = CreateFx(this, FX_DEATH, 0);
     if (fx != NULL) {
         fx->x.HALF.HI += 6;
         fx->y.HALF.HI -= 6;
     }
 
-    fx = CreateFx(this, 2, 0);
+    fx = CreateFx(this, FX_DEATH, 0);
     if (fx != NULL) {
         fx->x.HALF.HI -= 6;
         fx->y.HALF.HI -= 6;
diff --git a/src/enemy/lakituCloud.c b/src/enemy/lakituCloud.c
index df0c0cca..b7301df7 100644
--- a/src/enemy/lakituCloud.c
+++ b/src/enemy/lakituCloud.c
@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "player.h"
 #include "functions.h"
+#include "effects.h"
 
 extern u32 GetNextFunction(Entity*);
 
@@ -126,7 +127,7 @@ void sub_0803CE14(Entity* this) {
 }
 
 void sub_0803CE3C(Entity* this) {
-    CreateFx(this, 2, 0);
+    CreateFx(this, FX_DEATH, 0);
 
     this->action = 2;
     this->actionDelay = 60;
diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c
index 7d1fa2ee..513848d9 100644
--- a/src/enemy/madderpillar.c
+++ b/src/enemy/madderpillar.c
@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "random.h"
 #include "functions.h"
+#include "effects.h"
 
 extern u8 gEntCount;
 extern Hitbox gUnk_080FD298;
@@ -163,7 +164,7 @@ void sub_08029B2C(Entity* this) {
     if (sub_0802A14C(this)) {
         if (this->field_0x86.HALF.LO) {
             if (--this->actionDelay == 0) {
-                CreateFx(this, 0x48, 0);
+                CreateFx(this, FX_GIANT_EXPLOSION3, 0);
                 DeleteEntity(this);
             }
         } else {
@@ -241,7 +242,7 @@ void sub_08029C6C(Entity* this) {
 
 void sub_08029C98(Entity* this) {
     if (sub_0802A14C(this)) {
-        CreateFx(this, 0x48, 0);
+        CreateFx(this, FX_GIANT_EXPLOSION3, 0);
         DeleteEntity(this);
     } else {
         gUnk_080CCDA8[this->action](this);
diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c
index be47d87f..a0f50903 100644
--- a/src/enemy/mazaalBracelet.c
+++ b/src/enemy/mazaalBracelet.c
@@ -4,6 +4,7 @@
 #include "random.h"
 #include "object.h"
 #include "functions.h"
+#include "effects.h"
 
 void sub_0803B538(Entity*);
 u32 sub_0803B4E4(Entity*);
@@ -962,7 +963,7 @@ void sub_0803B1B8(Entity* this) {
         this->field_0x7c.HALF.HI = 0x5dc;
         this->spriteSettings.b.draw = 0;
         this->damageType = 0x14;
-        temp = CreateFx(this, 0x51, 0);
+        temp = CreateFx(this, FX_GIANT_EXPLOSION4, 0);
         if (temp != (Entity*)0x0) {
             temp->x.HALF.HI += this->hitbox->offset_x;
             temp->y.HALF.HI += this->hitbox->offset_y;
diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c
index bfa45e69..04b80eff 100644
--- a/src/enemy/mazaalHead.c
+++ b/src/enemy/mazaalHead.c
@@ -6,6 +6,7 @@
 #include "random.h"
 #include "object.h"
 #include "functions.h"
+#include "effects.h"
 
 extern void UnloadOBJPalette(Entity*);
 
@@ -78,7 +79,7 @@ void (*const gUnk_080CECB4[])(Entity*) = {
 };
 const u8 gUnk_080CECEC[] = { 0xff, 0xfe, 0xff, 0x00, 0x01, 0x02, 0x01, 0x00 };
 const s8 gUnk_080CECF4[] = { -2, 0x01, -8, -4, -0x14, 0x08, 0x0e, -0x10, -6, 0x0c, 0x12, -2, 0x00, 0x00 };
-const u8 gUnk_080CED02[] = { 0x46, 0x46, 0x47, 0x48 };
+const u8 gUnk_080CED02[] = { FX_GIANT_EXPLOSION, FX_GIANT_EXPLOSION, FX_GIANT_EXPLOSION2, FX_GIANT_EXPLOSION3 };
 const u8 gUnk_080CED06[] = { 0xff, 0x00, 0x01, 0x00, 0x00, 0x00 };
 void (*const gUnk_080CED0C[])(Entity*) = {
     sub_08034578, sub_080344E0, sub_0803451C, sub_080344E0, sub_08034558, sub_080344E0, sub_0803451C, sub_080346A0,
diff --git a/src/enemy/mazaalMacro.c b/src/enemy/mazaalMacro.c
index 0e32a810..e9cf7191 100644
--- a/src/enemy/mazaalMacro.c
+++ b/src/enemy/mazaalMacro.c
@@ -5,6 +5,7 @@
 #include "script.h"
 #include "structures.h"
 #include "functions.h"
+#include "effects.h"
 
 extern void sub_0807B600(u32);
 
@@ -43,7 +44,7 @@ void (*const gUnk_080CEEB0[])(Entity*) = {
     sub_08034E30, sub_08034E68, sub_08034EC0, sub_08034ED8, sub_08034EE4, sub_08034F58,
 };
 
-const u8 gUnk_080CEEC8[] = { 0x46, 0x46, 0x47, 0x48 };
+const u8 gUnk_080CEEC8[] = { FX_GIANT_EXPLOSION, FX_GIANT_EXPLOSION, FX_GIANT_EXPLOSION2, FX_GIANT_EXPLOSION3 };
 const u8 gUnk_080CEECC[] = { 0x58, 0x68, 0x88, 0x68, 0xb8, 0x68, 0x58, 0xa8, 0x88, 0xa8, 0xb8, 0xa8 };
 const s16 gUnk_080CEED8[] = { -0x82, -0x81, -0x80, -0x7f, -0x7e, -0x42, -0x41, -0x40, -0x3f, -0x3e, -2,   -1,
                               1,     2,     0x3e,  0x3f,  0x40,  0x41,  0x42,  0x7e,  0x7f,  0x80,  0x81, 0x82 };
@@ -113,7 +114,7 @@ void sub_08034D4C(Entity* this) {
 
 void sub_08034DC8(Entity* this) {
     if (gScreenTransition.field_0x39 == 0) {
-        CreateFx(this, 0x51, 0);
+        CreateFx(this, FX_GIANT_EXPLOSION4, 0);
         sub_0807BA8C(COORD_TO_TILE(this), this->collisionLayer);
         DeleteThisEntity();
     }
diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c
index cb27ab6d..8f805aaf 100644
--- a/src/enemy/moldworm.c
+++ b/src/enemy/moldworm.c
@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "random.h"
 #include "functions.h"
+#include "effects.h"
 
 extern void sub_0800449C(Entity*, u32);
 extern bool32 sub_08023A38(u32);
@@ -177,7 +178,7 @@ void sub_08023330(Entity* this) {
         this->field_0x7c.BYTES.byte3 = 0;
         sub_08023A88(this, this->animationState);
         CopyPosition(this, this->attachedEntity);
-        CreateFx(this, 4, 0);
+        CreateFx(this, FX_ROCK, 0);
     }
 }
 
@@ -199,7 +200,7 @@ void sub_08023398(Entity* this) {
             this->damageType = 0x85;
             this->attachedEntity->actionDelay = 1;
             sub_08023A68(this);
-            CreateFx(this, 4, 0);
+            CreateFx(this, FX_ROCK, 0);
             return;
         }
         this->field_0x78.HWORD = 0x28;
diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c
index 69df19d6..b7139173 100644
--- a/src/enemy/puffstool.c
+++ b/src/enemy/puffstool.c
@@ -3,6 +3,7 @@
 #include "random.h"
 #include "object.h"
 #include "functions.h"
+#include "effects.h"
 
 extern u32 sub_080002E0(u32, u32);
 extern u32 sub_080002C8(u16, u8);
@@ -520,12 +521,12 @@ bool32 sub_08025AB8(u32 tile, u32 layer) {
 void sub_08025AE8(Entity* this) {
     Entity* ent;
 
-    ent = CreateFx(this, 0x22, 0);
+    ent = CreateFx(this, FX_BROWN_SMOKE, 0);
     if (ent) {
         ent->y.WORD--;
     }
 
-    ent = CreateFx(this, 0x23, 0);
+    ent = CreateFx(this, FX_BROWN_SMOKE_LARGE, 0);
     if (ent) {
         ent->y.WORD++;
     }
diff --git a/src/enemy/rockChuchu.c b/src/enemy/rockChuchu.c
index 9e3ad499..e4f2bf30 100644
--- a/src/enemy/rockChuchu.c
+++ b/src/enemy/rockChuchu.c
@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "random.h"
 #include "functions.h"
+#include "effects.h"
 
 extern void sub_0804A4E4(Entity*, Entity*);
 
@@ -40,7 +41,7 @@ void sub_08022254(Entity* this) {
                     break;
             case 0x16:
             case 0x1c:
-                CreateFx(this, 4, 0);
+                CreateFx(this, FX_ROCK, 0);
                 ent = CreateEnemy(CHUCHU, 1);
                 if (ent) {
                     ent->type2 = 1;
diff --git a/src/enemy/slime.c b/src/enemy/slime.c
index cd79f8f7..34f9cb55 100644
--- a/src/enemy/slime.c
+++ b/src/enemy/slime.c
@@ -4,6 +4,7 @@
 #include "room.h"
 #include "random.h"
 #include "functions.h"
+#include "effects.h"
 
 typedef struct {
     s8 h, v;
@@ -115,7 +116,7 @@ void sub_080450A8(Entity* this) {
         off++;
     }
 
-    ent = CreateFx(this, 2, 0);
+    ent = CreateFx(this, FX_DEATH, 0);
     if (ent)
         CopyPosition(this, ent);
 
diff --git a/src/enemy/spark.c b/src/enemy/spark.c
index e11228e6..71e913c5 100644
--- a/src/enemy/spark.c
+++ b/src/enemy/spark.c
@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "object.h"
 #include "functions.h"
+#include "effects.h"
 
 extern void (*const gUnk_080CD234[])(Entity*);
 extern void (*const gUnk_080CD24C[])(Entity*);
@@ -23,7 +24,7 @@ void sub_0802B2E0(Entity* this) {
             this->iframes = 0;
             this->spriteSettings.b.draw = 0;
             this->action = 2;
-            ent = CreateFx(this, 2, 0);
+            ent = CreateFx(this, FX_DEATH, 0);
             if (ent) {
                 this->attachedEntity = ent;
                 this->actionDelay = 14;
diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c
index a66fe5b3..34beba3a 100644
--- a/src/enemy/spearMoblin.c
+++ b/src/enemy/spearMoblin.c
@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "random.h"
 #include "functions.h"
+#include "effects.h"
 
 extern bool32 sub_0806FC80(Entity*, Entity*, u32);
 extern Entity* sub_08049DF4(u32);
@@ -224,7 +225,7 @@ void sub_08028528(Entity* this) {
 
             if ((this->actionDelay & 7) == 0) {
                 EnqueueSFX(0xf0);
-                CreateFx(this, 2, 0x40);
+                CreateFx(this, FX_DEATH, 0x40);
             }
 
             if (++this->field_0x7a.HALF.HI == 0x80) {
diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c
index e7e1570b..c4d7037b 100644
--- a/src/enemy/vaatiArm.c
+++ b/src/enemy/vaatiArm.c
@@ -6,6 +6,7 @@
 #include "random.h"
 #include "utils.h"
 #include "functions.h"
+#include "effects.h"
 
 extern void DoExitTransition(ScreenTransitionData*);
 
@@ -1064,7 +1065,7 @@ static inline void deleteThing(Entity* this, const u32 index) {
         if (index == 1) {
             this->spriteSettings.b.draw = 0;
         }
-        CreateFx(((VaatiArm_HeapStruct*)this->myHeap)->entities[index], 0x51, 0);
+        CreateFx(((VaatiArm_HeapStruct*)this->myHeap)->entities[index], FX_GIANT_EXPLOSION4, 0);
         ((VaatiArm_HeapStruct*)this->myHeap)->entities[index]->myHeap = NULL;
         DeleteEntity(((VaatiArm_HeapStruct*)this->myHeap)->entities[index]);
     }
@@ -1331,7 +1332,7 @@ void sub_08043D08(Entity* this) {
     entity->spriteSettings.b.draw = 0;
     InitializeAnimation(entity, 0x13);
     sub_0804AA1C(entity);
-    fx = CreateFx(entity, 0x51, 0);
+    fx = CreateFx(entity, FX_GIANT_EXPLOSION4, 0);
     if (fx != NULL) {
         fx->x.HALF.HI += gUnk_080D13E9[this->type2];
         fx->y.HALF.HI -= 6;
diff --git a/src/enemy/vaatiRebornEnemy.c b/src/enemy/vaatiRebornEnemy.c
index 9df23058..f96527e9 100644
--- a/src/enemy/vaatiRebornEnemy.c
+++ b/src/enemy/vaatiRebornEnemy.c
@@ -6,6 +6,7 @@
 #include "audio.h"
 #include "area.h"
 #include "functions.h"
+#include "effects.h"
 
 extern void sub_080AEFB4(Entity*);
 extern u8 gEntCount;
@@ -477,7 +478,7 @@ void VaatiRebornEnemyType0Action7(Entity* this) {
             SetRoomFlag(1);
         } else {
             if ((this->actionDelay & 7) == 0) {
-                fx = CreateFx(this, 2, 0);
+                fx = CreateFx(this, FX_DEATH, 0);
                 if (fx != NULL) {
                     tmp = Random() & 0x3f3f;
                     fx->x.HALF.HI = ((tmp & 0xff) - 0x20) + fx->x.HALF.HI;
diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c
index 9efa55e8..94d7935a 100644
--- a/src/enemy/vaatiTransfigured.c
+++ b/src/enemy/vaatiTransfigured.c
@@ -5,6 +5,7 @@
 #include "flags.h"
 #include "audio.h"
 #include "functions.h"
+#include "effects.h"
 
 void sub_080409B0(Entity*);
 void sub_080408EC(Entity*);
@@ -567,7 +568,7 @@ void VaatiTransfiguredType0Action7(Entity* this) {
     }
     this->field_0xf = (this->field_0xf + 1) & 7;
     if (this->field_0xf == 0) {
-        pEVar3 = CreateFx(this, 0x55, 0);
+        pEVar3 = CreateFx(this, FX_AURA_BASE, 0);
         if (pEVar3 != NULL) {
             uVar4 = Random() & 0x3f3f;
             pEVar3->x.HALF.HI += (uVar4 & 0xff) - 0x20;
diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c
index 6a4df2d7..9e319d8c 100644
--- a/src/enemy/vaatiWrath.c
+++ b/src/enemy/vaatiWrath.c
@@ -10,6 +10,7 @@
 #include "structures.h"
 #include "functions.h"
 #include "save.h"
+#include "effects.h"
 
 extern u8 gEntCount;
 
@@ -708,7 +709,7 @@ void sub_08041E78(Entity* this) {
     const s8* temp;
 
     if ((this->field_0xf & 0xf) == 0) {
-        fx = CreateFx(this, 0x51, 0);
+        fx = CreateFx(this, FX_GIANT_EXPLOSION4, 0);
         if (fx != NULL) {
             temp = &gUnk_080D0E90[this->field_0xf >> 3 & 0xe];
             fx->x.HALF.HI += *temp++;
diff --git a/src/enemy/vaatiWrathEye.c b/src/enemy/vaatiWrathEye.c
index 53434faa..2fd855f5 100644
--- a/src/enemy/vaatiWrathEye.c
+++ b/src/enemy/vaatiWrathEye.c
@@ -2,6 +2,7 @@
 #include "audio.h"
 #include "structures.h"
 #include "functions.h"
+#include "effects.h"
 
 void sub_080485D8(Entity*);
 void sub_080485FC(Entity*);
@@ -158,7 +159,7 @@ void VaatiWrathEyeAction7(Entity* this) {
         this->actionDelay = 0x3c;
         this->flags &= 0x7f;
         this->spriteSettings.b.draw = 0;
-        CreateFx(this, 0x1f, 0x40);
+        CreateFx(this, FX_REFLECT2, 0x40);
         this->parent->field_0x7a.HALF.HI |= 0x10 << this->type;
     } else {
         if (--this->actionDelay != 0) {
diff --git a/src/enemy/wisp.c b/src/enemy/wisp.c
index 247cf0a0..213665c3 100644
--- a/src/enemy/wisp.c
+++ b/src/enemy/wisp.c
@@ -6,6 +6,7 @@
 #include "random.h"
 #include "createObject.h"
 #include "functions.h"
+#include "effects.h"
 
 extern void (*const gUnk_080CEB74[])(Entity*);
 extern void (*const gUnk_080CEB8C[])(Entity*);
@@ -52,7 +53,7 @@ void sub_08033564(Entity* this) {
             this->flags &= 0x7f;
             this->iframes = 0;
             this->spriteSettings.b.draw = FALSE;
-            ent = CreateFx(this, 2, 0);
+            ent = CreateFx(this, FX_DEATH, 0);
             if (ent != NULL) {
                 this->attachedEntity = ent;
                 this->actionDelay = 0xe;