diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index ca47ec345a..6ac8c91375 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -2272,9 +2272,8 @@ bool32 CheckMsgCondition(const struct MsgCondition *cond, struct Pokemon *mon, u
         return (multi == cond->data.bytes[0] || multi == cond->data.bytes[1]);
     case MSG_COND_MUSIC:
         return (cond->data.raw == GetCurrentMapMusic());
-    // Added on `lighting` branch
-    // case MSG_COND_TIME_OF_DAY:
-    //     break;
+    case MSG_COND_TIME_OF_DAY:
+        return (cond->data.raw == gTimeOfDay);
     case MSG_COND_NEAR_MB:
         multi = FindMetatileBehaviorWithinRange(
                     obj->currentCoords.x, obj->currentCoords.y, 
diff --git a/src/follower_helper.c b/src/follower_helper.c
index 55557092da..1eb990b2e9 100644
--- a/src/follower_helper.c
+++ b/src/follower_helper.c
@@ -287,17 +287,15 @@ const struct FollowerMsgInfoExtended gFollowerConditionalMessages[COND_MSG_COUNT
     {
     .text = (u8*)sDayTexts,
     .textSpread = 1,
-    .wt = {.timeOfDay = TIME_OF_DAY_DAY},
-    .wtFlags = 3, // time
     .emotion = FOLLOWER_EMOTION_MUSIC,
+    .conditions = {MATCH_TIME_OF_DAY(TIME_OF_DAY_DAY)},
     },
     [COND_MSG_NIGHT] =
     {
     .text = (u8*)sNightTexts,
     .textSpread = 1,
-    .wt = {.timeOfDay = TIME_OF_DAY_NIGHT},
-    .wtFlags = 3, // time
     .emotion = FOLLOWER_EMOTION_MUSIC,
+    .conditions = {MATCH_TIME_OF_DAY(TIME_OF_DAY_NIGHT)},
     },
 };