diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h
index 582e85997..1056044f8 100644
--- a/include/d/actor/d_a_player_main.h
+++ b/include/d/actor/d_a_player_main.h
@@ -1727,6 +1727,7 @@ public:
     J3DAnmTextureSRTKey* getLightArrowBtk() { return mpLightArrowBtk; }
     
     bool checkUpperAnime(u16 i_idx) const { return m_anm_heap_upper[UPPER_MOVE2_e].mIdx == i_idx; }
+    bool checkNoUpperAnime() const { return m_anm_heap_upper[UPPER_MOVE2_e].mIdx == 0xFFFF; }
     
     bool checkGrabAnime() const { return checkGrabAnimeLight() || checkGrabAnimeHeavy(); };
     bool checkGrabAnimeLight() const { return checkUpperAnime(LKANM_BCK_GRABWAIT); };
@@ -1834,7 +1835,6 @@ public:
     void checkFaceTypeNot() const {}
     void checkIsland() const {}
     void checkMirrorShieldEquip() const {}
-    void checkNoUpperAnime() const {}
     void checkPowerGloveEquip() const {}
     void checkRopeThrowAnime() const {}
     void checkShieldEquip() const {}
diff --git a/src/d/actor/d_a_player_boomerang.inc b/src/d/actor/d_a_player_boomerang.inc
index 6bc5d0fcc..d15609cb8 100644
--- a/src/d/actor/d_a_player_boomerang.inc
+++ b/src/d/actor/d_a_player_boomerang.inc
@@ -52,7 +52,7 @@ int daPy_lk_c::returnBoomerang() {
     dComIfGp_clearPlayerStatus0(0, daPyStts0_BOOMERANG_WAIT_e);
 
     if (mEquipItem == daPyItem_NONE_e && !checkNoControll() && !dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 &&
-        (checkUpperAnime(-1) || checkPlayerGuard() || checkDashDamageAnime() ||
+        (checkNoUpperAnime() || checkPlayerGuard() || checkDashDamageAnime() ||
          checkBoomerangAnime()) &&
         (!checkModeFlg(
              ModeFlg_WHIDE | ModeFlg_ROPE | ModeFlg_IN_SHIP | ModeFlg_CLIMB | ModeFlg_SWIM | ModeFlg_00080000 |
@@ -122,7 +122,7 @@ BOOL daPy_lk_c::checkNextBoomerangMode() {
 int daPy_lk_c::changeBoomerangCatchProc() {
     if (checkNoResetFlg0(daPyFlg0_UNK20)) {
         if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 && checkModeFlg(ModeFlg_00020000) &&
-            (checkUpperAnime(-1) || checkBoomerangThrowAnime()))
+            (checkNoUpperAnime() || checkBoomerangThrowAnime()))
         {
             setActAnimeUpper(
                 LKANM_BCK_BOOMCATCH,
diff --git a/src/d/actor/d_a_player_climb.inc b/src/d/actor/d_a_player_climb.inc
index 7227b38e7..f45466075 100644
--- a/src/d/actor/d_a_player_climb.inc
+++ b/src/d/actor/d_a_player_climb.inc
@@ -249,7 +249,7 @@ BOOL daPy_lk_c::procClimbUpStart() {
     }
 
     if (mProcVar0.m3570 == 0) {
-        if (checkUpperAnime(-1)) {
+        if (checkNoUpperAnime()) {
             procLadderUpStart_init_sub();
         }
     } else {
diff --git a/src/d/actor/d_a_player_dproc.inc b/src/d/actor/d_a_player_dproc.inc
index d829a120b..03d4d1b48 100644
--- a/src/d/actor/d_a_player_dproc.inc
+++ b/src/d/actor/d_a_player_dproc.inc
@@ -586,7 +586,7 @@ BOOL daPy_lk_c::dProcGetItem() {
         }
     }
     if (mProcVar0.m3570 != 0) {
-        if (checkUpperAnime(-1)) {
+        if (checkNoUpperAnime()) {
             setSingleMoveAnime(ANM_ITEMGET, 1.0f, 0.0f, -1, 3.0f);
             mProcVar0.m3570 = 0;
             onModeFlg(ModeFlg_00000400);
@@ -643,7 +643,7 @@ BOOL daPy_lk_c::dProcUnequip_init() {
 
 /* 8012ED30-8012ED74       .text dProcUnequip__9daPy_lk_cFv */
 BOOL daPy_lk_c::dProcUnequip() {
-    if (checkUpperAnime(-1)) {
+    if (checkNoUpperAnime()) {
         dComIfGp_evmng_cutEnd(mStaffIdx);
     }
     return true;
diff --git a/src/d/actor/d_a_player_grab.inc b/src/d/actor/d_a_player_grab.inc
index b13967295..ccb9a2f98 100644
--- a/src/d/actor/d_a_player_grab.inc
+++ b/src/d/actor/d_a_player_grab.inc
@@ -393,7 +393,7 @@ BOOL daPy_lk_c::procGrabReady() {
             } else {
                 checkNextMode(0);
             }
-        } else if ((mProcVar0.m3570 == 0) && (checkUpperAnime(-1))) {
+        } else if ((mProcVar0.m3570 == 0) && (checkNoUpperAnime())) {
             setSingleMoveAnime(
                 ANM_GRABP,
                 daPy_HIO_grab_c0::m.field_0x20,
diff --git a/src/d/actor/d_a_player_ladder.inc b/src/d/actor/d_a_player_ladder.inc
index 78b9d3edd..7877e13b8 100644
--- a/src/d/actor/d_a_player_ladder.inc
+++ b/src/d/actor/d_a_player_ladder.inc
@@ -138,7 +138,7 @@ BOOL daPy_lk_c::procLadderUpStart() {
     }
 
     if (mProcVar0.m3570 == 0) {
-        if (checkUpperAnime(-1)) {
+        if (checkNoUpperAnime()) {
             procLadderUpStart_init_sub();
         }
     } else {
@@ -253,7 +253,7 @@ BOOL daPy_lk_c::procLadderDownStart() {
     }
 
     if (mProcVar0.m3570 == 0) {
-        if (checkUpperAnime(-1)) {
+        if (checkNoUpperAnime()) {
             procLadderDownStart_init_sub();
         }
     } else {
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index 9ac76a042..8fa546f38 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -2730,7 +2730,7 @@ void daPy_lk_c::setOldRootQuaternion(s16, s16, s16) {
 
 /* 80111E54-80111EFC       .text checkRestHPAnime__9daPy_lk_cFv */
 BOOL daPy_lk_c::checkRestHPAnime() {
-    if ((((!checkPlayerGuard()) && (checkUpperAnime(-1))) &&
+    if ((((!checkPlayerGuard()) && (checkNoUpperAnime())) &&
          (mpAttnActorLockOn == NULL)) &&
         ((((mDemo.getDemoType() == 0 && (!checkModeFlg(ModeFlg_IN_SHIP))) &&
            (dComIfGs_getLife() <= daPy_HIO_move_c0::m.field_0xE)) ||
@@ -3918,7 +3918,7 @@ BOOL daPy_lk_c::procBackJumpLand_init() {
     }
     if ((((mEquipItem == daPyItem_SWORD_e) || (mEquipItem == daPyItem_BOKO_e)) &&
          (daPy_dmEcallBack_c::m_type != 1)) &&
-        (checkUpperAnime(-1)))
+        (checkNoUpperAnime()))
     {
         mProcVar0.m3570 = 1;
     } else {
diff --git a/src/d/actor/d_a_player_pushpull.inc b/src/d/actor/d_a_player_pushpull.inc
index 2f8353243..a1e69a486 100644
--- a/src/d/actor/d_a_player_pushpull.inc
+++ b/src/d/actor/d_a_player_pushpull.inc
@@ -80,7 +80,7 @@ BOOL daPy_lk_c::procPushPullWait() {
     dComIfGp_setRStatus(0x11);
     setFrontWallType();
     if (m34D6 != 0) {
-        if (checkUpperAnime(-1)) {
+        if (checkNoUpperAnime()) {
             setSingleMoveAnime(
                 ANM_WAITPUSHPULL, daPy_HIO_pushpull_c0::m.field_0x0, 0.0f, -1, daPy_HIO_pushpull_c0::m.field_0x4
             );
@@ -92,7 +92,7 @@ BOOL daPy_lk_c::procPushPullWait() {
             current.angle.y = shape_angle.y;
             f32 dVar2 = cLib_addCalc(&current.pos.x, m370C.x, 0.5f, 10.0f, 1.0f);
             dVar2 += cLib_addCalc(&current.pos.z, m370C.z, 0.5f, 10.0f, 1.0f);
-            if (((!sVar1) && (dVar2 < 5.0f)) && (checkUpperAnime(-1))) {
+            if (((!sVar1) && (dVar2 < 5.0f)) && (checkNoUpperAnime())) {
                 current.pos.x = m370C.x;
                 current.pos.z = m370C.z;
                 mProcVar0.m3570 = 0;
diff --git a/src/d/actor/d_a_player_whide.inc b/src/d/actor/d_a_player_whide.inc
index 88bc41071..de0b48a53 100644
--- a/src/d/actor/d_a_player_whide.inc
+++ b/src/d/actor/d_a_player_whide.inc
@@ -302,7 +302,7 @@ BOOL daPy_lk_c::procWHideReady() {
         return true;
     }
     if (mProcVar0.m3570 == 0) {
-        if (checkUpperAnime(-1)) {
+        if (checkNoUpperAnime()) {
             setSingleMoveAnime(ANM_WALL, 0.0f, daPy_HIO_wall_c0::m.field_0x24, -1, daPy_HIO_wall_c0::m.field_0x34);
             mProcVar0.m3570 = 1;
         }