From e0e17a3e577d14a712e7d21f870388df4b9bb0dc Mon Sep 17 00:00:00 2001 From: JordanLongstaff Date: Tue, 4 Aug 2026 00:55:58 -0400 Subject: [PATCH] Disable Note Retention during parades --- src/port/Enhancements/Retention/NoteRetention.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/port/Enhancements/Retention/NoteRetention.cpp b/src/port/Enhancements/Retention/NoteRetention.cpp index 5e716fcfa..894509562 100644 --- a/src/port/Enhancements/Retention/NoteRetention.cpp +++ b/src/port/Enhancements/Retention/NoteRetention.cpp @@ -139,6 +139,11 @@ int32_t countCollectedForLevel(int32_t levelId) { return total; } +bool isInParade() { + return volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) || + volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE); +} + } // namespace extern "C" void port_noteRetention_getSizeAndPtr(int32_t* size, uint8_t** addr) { @@ -386,7 +391,7 @@ void RegisterNoteRetention_Init() { } const int32_t level = sPendingSeedLevel; sPendingSeedLevel = -1; - if (!systemActive() || !applyEnabled()) { + if (!systemActive() || !applyEnabled() || isInParade()) { return; } item_adjustByDiffWithoutHud(ITEM_C_NOTE, countCollectedForLevel(level) - item_getCount(ITEM_C_NOTE));