diff options
| author | Eblo <7004497+Eblo@users.noreply.github.com> | 2025-10-26 11:34:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-26 11:34:37 -0400 |
| commit | 40849f082f6e7fcec997d07d05b45fd6f91e0f23 (patch) | |
| tree | e37b6712c5b7a726c0b58a2ae509ced3b0efd9e4 | |
| parent | fb5064a0607b80b3b7ab28336d80485a71f92e05 (diff) | |
Fix errant merge conflict resolution (#1306)
| -rw-r--r-- | mm/src/code/z_eventmgr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/src/code/z_eventmgr.c b/mm/src/code/z_eventmgr.c index b8dc22bae..7161c37e7 100644 --- a/mm/src/code/z_eventmgr.c +++ b/mm/src/code/z_eventmgr.c @@ -322,7 +322,7 @@ void CutsceneManager_Queue(s16 csId) { if (!GameInteractor_Should(VB_QUEUE_CUTSCENE, true, &csId)) { return; } - if (csId >= CS_ID_NONE) { + if (csId > CS_ID_NONE) { sWaitingCutsceneList[csId >> 3] |= 1 << (csId & 7); } } |