Skip to content

Disable Note Retention during parades #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JeodC merged 1 commit into from
Aug 5, 2026
+6 −1
Merged

Disable Note Retention during parades #396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/port/Enhancements/Retention/NoteRetention.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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));
Expand Down
Loading