diff --git a/src/object/lilypadLarge.c b/src/object/lilypadLarge.c
index 3466ce9c..9a7fe9d4 100644
--- a/src/object/lilypadLarge.c
+++ b/src/object/lilypadLarge.c
@@ -228,7 +228,7 @@ void sub_08085D10(LilypadLargeEntity* this) {
 }
 
 void sub_08085D28(LilypadLargeEntity* this) {
-    if (((gPlayerState.framestate != 0x13) && ((gPlayerState.flags & 2) != 0)) &&
+    if (((gPlayerState.framestate != PL_STATE_TALKEZLO) && ((gPlayerState.flags & 2) != 0)) &&
         (sub_080002B4(super, 0, 0x18) == 0x11)) {
         super->action = 2;
         super->subAction = 0;
@@ -240,7 +240,7 @@ NONMATCH("asm/non_matching/lilypadLarge/sub_08085D60.inc", void sub_08085D60(Lil
     u32 r4; // horizontal direction?
     u32 r6; // vertical direction?
     if ((gPlayerState.flags & 2) != 0) {
-        if (gPlayerState.framestate != 0x12) {
+        if (gPlayerState.framestate != PL_STATE_DIE) {
             if (gPlayerState.jump_status == 0) {
                 if ((super->direction & 7) == 0) { // North or South
                     r4 = super->direction;
diff --git a/src/object/pullableLever.c b/src/object/pullableLever.c
index 28109862..56acc72d 100644
--- a/src/object/pullableLever.c
+++ b/src/object/pullableLever.c
@@ -124,7 +124,7 @@ void PullableLever_HandleSubAction0(PullableLeverEntity* this) {
         super->field_0xf = 2;
     }
     if (player->animationState >> 1 == super->type2) {
-        if (gPlayerState.framestate == 0x1a) {
+        if (gPlayerState.framestate == PL_STATE_PULL) {
             if (gPlayerState.heldObject & 2) {
                 if (gPlayerEntity.frame & 2) {
                     sub_0809153C(this);
diff --git a/src/respawnPlayer.c b/src/respawnPlayer.c
index 24d23b65..4a201c4e 100644
--- a/src/respawnPlayer.c
+++ b/src/respawnPlayer.c
@@ -31,7 +31,7 @@ void ResetPlayer() {
         case 2:
         case 3:
         case 4: {
-            gPlayerState.framestate = 0;
+            gPlayerState.framestate = PL_STATE_IDLE;
             break;
         }
     }