Document various fields and functions

4 files changed, 9 insertions, 8 deletions

diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c
index 115a2e08..d86f012c 100644
--- a/src/enemy/chuchuBoss.c
+++ b/src/enemy/chuchuBoss.c
@@ -539,7 +539,7 @@ void sub_08026110(ChuchuBossEntity* this) {
 void sub_0802626C(ChuchuBossEntity* this) {
     gPauseMenuOptions.disabled = 1;
     gUnk_080CC20C[this->unk_84->unk_03](this);
-    if (gPlayerEntity.action != 23 && gPlayerEntity.action != 15) {
+    if (gPlayerEntity.action != PLAYER_ROOMTRANSITION && gPlayerEntity.action != PLAYER_ROOM_EXIT) {
         sub_08078B48();
     }
 }
@@ -565,7 +565,7 @@ void sub_080262A8(ChuchuBossEntity* this) {
 }
 
 void sub_08026328(ChuchuBossEntity* this) {
-    if (gPlayerEntity.action != 23) {
+    if (gPlayerEntity.action != PLAYER_ROOMTRANSITION) {
         this->unk_7d = 0x78;
         this->unk_84->unk_03++;
         sub_08078AC0(10, 0, 0);
@@ -575,7 +575,7 @@ void sub_08026328(ChuchuBossEntity* this) {
 void sub_08026358(ChuchuBossEntity* this) {
     u32 bVar1;
 
-    if (gPlayerEntity.action != 15) {
+    if (gPlayerEntity.action != PLAYER_ROOM_EXIT) {
         bVar1 = --this->unk_7d;
         if (bVar1 == 0) {
             this->unk_7c = 0;
diff --git a/src/enemy/enemy50.c b/src/enemy/enemy50.c
index 3a3968c3..8704cc41 100644
--- a/src/enemy/enemy50.c
+++ b/src/enemy/enemy50.c
@@ -98,7 +98,7 @@ void sub_08040B9C(Enemy50Entity* this) {
     if (super->confusedTime != 0) {
         super->animationState = super->knockbackDirection >> 4;
         InitializeAnimation(super, super->animationState + 7);
-        Create0x68FX(super, 0x1c);
+        Create0x68FX(super, FX_STARS);
     }
     if (super->health != this->unk_7a) {
         if (super->type == 0) {
diff --git a/src/enemy/stalfos.c b/src/enemy/stalfos.c
index 848f0d38..c966d468 100644
--- a/src/enemy/stalfos.c
+++ b/src/enemy/stalfos.c
@@ -109,7 +109,7 @@ NONMATCH("asm/non_matching/stalfos/sub_0803933C.inc", void sub_0803933C(StalfosE
         super->flags2 &= 0xfb;
     }
     if (super->confusedTime != 0) {
-        Create0x68FX(super, 0x1c);
+        Create0x68FX(super, FX_STARS);
     }
     EnemyFunctionHandlerAfterCollision(super, Stalfos_Functions);
 }
diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c
index 3f91afd9..22df2068 100644
--- a/src/enemy/vaatiWrath.c
+++ b/src/enemy/vaatiWrath.c
@@ -1002,8 +1002,9 @@ void VaatiWrathType0PreAction(Entity* this) {
             gSave.timers[3]--;
         } else {
             temp = gPlayerState.framestate_last;
-            if (temp < 2) {
-                if (temp >= 0) {
+            switch (temp) {
+                case PL_STATE_IDLE:
+                case PL_STATE_WALK:
                     if (gPlayerState.item == NULL) {
                         if (gPlayerEntity.field_0x7a.HWORD == 0) {
                             if ((gPlayerEntity.z.HALF.HI & 0x8000U) == 0 || (gPlayerState.field_0xa != 0)) {
@@ -1012,7 +1013,7 @@ void VaatiWrathType0PreAction(Entity* this) {
                             }
                         }
                     }
-                }
+                    break;
             }
         }
     }