From 7905624cb57645c48ae40c7eed064fe21117c16b Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sun, 10 Apr 2022 18:15:22 -0700
Subject: [PATCH] Fix fanfare spam in sm74

---
 src/game/ingame_menu.c            | 1 +
 src/game/mario_actions_cutscene.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c
index f7b01bf6..dfead183 100644
--- a/src/game/ingame_menu.c
+++ b/src/game/ingame_menu.c
@@ -2975,6 +2975,7 @@ void print_hud_course_complete_coins(s16 x, s16 y) {
 
 void play_star_fanfare_and_flash_hud(s32 arg, u8 starNum) {
     if (gHudDisplay.coins == gCourseCompleteCoins && (gCurrCourseStarFlags & starNum) == 0 && gHudFlash == 0) {
+        gCurrCourseStarFlags |= starNum; // SM74 was spamming fanfare without this line
         play_star_fanfare();
         gHudFlash = arg;
     }
diff --git a/src/game/mario_actions_cutscene.c b/src/game/mario_actions_cutscene.c
index 0cbbd27a..846bd574 100644
--- a/src/game/mario_actions_cutscene.c
+++ b/src/game/mario_actions_cutscene.c
@@ -242,6 +242,7 @@ s32 get_star_collection_dialog(struct MarioState *m) {
     s32 dialogID = 0;
 
     if (smlua_call_event_hooks_ret_int(HOOK_GET_STAR_COLLECTION_DIALOG, &dialogID)) {
+        m->prevNumStarsForDialog = m->numStars;
         return dialogID;
     }