Document various fields

6 files changed, 12 insertions, 12 deletions

diff --git a/src/object/bakerOven.c b/src/object/bakerOven.c
index 754f029c..f1689675 100644
--- a/src/object/bakerOven.c
+++ b/src/object/bakerOven.c
@@ -58,12 +58,12 @@ void BakerOven_Action1(Entity* this) {
     if (this->type) {
         GetNextFrame(this);
         frames = &this->frame;
-        if (*frames & 1) {
-            *frames &= 0xfe;
+        if (this->frame & 1) {
+            this->frame &= ~1;
             this->y.HALF.HI++;
         }
 
-        if ((*frames & 0x80) && this->frameDuration == 1) {
+        if ((*frames & ANIM_DONE) && this->frameDuration == 1) {
             this->action = 2;
             this->spriteSettings.draw = 0;
         }
diff --git a/src/object/cutsceneMiscObject.c b/src/object/cutsceneMiscObject.c
index a38773fb..25a7107c 100644
--- a/src/object/cutsceneMiscObject.c
+++ b/src/object/cutsceneMiscObject.c
@@ -418,12 +418,12 @@ void sub_08094FA8(CutsceneMiscObjectEntity* this) {
                 super->action = 4;
 #ifndef EU
                 if (!CheckGlobalFlag(BIN_DOGFOOD)) {
-                    CreateItemEntity(0x1c, 0, 0);
+                    CreateItemEntity(ITEM_BOTTLE1, 0, 0);
                     SetGlobalFlag(BIN_DOGFOOD);
                     super->timer = 60;
                 }
 #else
-                CreateItemEntity(0x1c, 0, 0);
+                CreateItemEntity(ITEM_BOTTLE1, 0, 0);
 #endif
             }
             break;
@@ -459,7 +459,7 @@ void sub_08095088(CutsceneMiscObjectEntity* this) {
             break;
         case 2:
             if ((gMessage.doTextBox & 0x7F) == 0) {
-                CreateItemEntity(0x5b, 0, 0);
+                CreateItemEntity(ITEM_JABBERNUT, 0, 0);
                 DeleteThisEntity();
             }
             break;
diff --git a/src/object/heartContainer.c b/src/object/heartContainer.c
index f709259b..a0694601 100644
--- a/src/object/heartContainer.c
+++ b/src/object/heartContainer.c
@@ -68,7 +68,7 @@ static void HeartContainer_Action3(Entity* this) {
     sub_08080CB4(this);
     if (!(gPlayerState.flags & PL_MINISH) && IsCollidingPlayer(this)) {
         SetFlag(this->cutsceneBeh.HWORD);
-        CreateItemEntity(0x62, 0, 0);
+        CreateItemEntity(ITEM_HEART_CONTAINER, 0, 0);
         DeleteThisEntity();
     }
 }
diff --git a/src/object/lavaPlatform.c b/src/object/lavaPlatform.c
index e7ff7da6..016e0e7e 100644
--- a/src/object/lavaPlatform.c
+++ b/src/object/lavaPlatform.c
@@ -141,7 +141,7 @@ void LavaPlatform_Type1Action2(LavaPlatformEntity* this) {
             super->action = 3;
             super->flags &= ~ENT_COLLIDE;
             super->timer = 20;
-            gPlayerState.field_0x3f = 0xfd;
+            gPlayerState.spriteOffsetY = -3;
         }
     }
 }
@@ -149,7 +149,7 @@ void LavaPlatform_Type1Action2(LavaPlatformEntity* this) {
 /** Player is standing on the platform. */
 void LavaPlatform_Type1Action3(LavaPlatformEntity* this) {
     if (LavaPlatform_IsPlayerOnPlatform(this)) {
-        gPlayerState.field_0x3f = 0xfd;
+        gPlayerState.spriteOffsetY = -3;
     }
     if (--super->timer == 0) {
         super->action = 4;
@@ -219,7 +219,7 @@ void LavaPlatform_Type1Action6(LavaPlatformEntity* this) {
         if ((super->frame & ANIM_DONE) != 0) {
             sub_0809264C(this);
             if (tmp) {
-                gPlayerState.field_0x3f = 0xfd;
+                gPlayerState.spriteOffsetY = -3;
             }
         }
     }
diff --git a/src/object/object1F.c b/src/object/object1F.c
index c95b351d..bff26637 100644
--- a/src/object/object1F.c
+++ b/src/object/object1F.c
@@ -69,7 +69,7 @@ void Object1F_Action1(Object1FEntity* this) {
 
     if (this->unk6c) {
         this->unk6c--;
-        uVar1 = gPlayerState.field_0x3c[1];
+        uVar1 = gPlayerState.moleMittsState;
     } else {
         ProcessMovement2(super);
         uVar1 = GravityUpdate(super, Q_8_8(40.0));
diff --git a/src/object/whirlwind.c b/src/object/whirlwind.c
index 25c765d4..8dbd8959 100644
--- a/src/object/whirlwind.c
+++ b/src/object/whirlwind.c
@@ -61,7 +61,7 @@ void Whirlwind_Action1(Entity* this) {
     }
     if (this->spriteSettings.draw != 0) {
         GetNextFrame(this);
-        if ((((((gPlayerState.flags & PL_MINISH) == 0)) && (gPlayerState.field_0x3c[0] == 0)) &&
+        if ((((((gPlayerState.flags & PL_MINISH) == 0)) && (gPlayerState.field_0x3c == 0)) &&
              ((gPlayerEntity.action == 4 || ((gPlayerEntity.flags & ENT_COLLIDE) != 0)))) &&
             ((gPlayerEntity.action != 6 && (sub_0800419C(this, &gPlayerEntity, 0xc, 0xc) != 0)))) {
             if (((gPlayerState.flags & PL_PARACHUTE) == 0) && (gPlayerEntity.action != 4)) {