From fb45b66903b2c7449a4673a331c2117a94ce02cb Mon Sep 17 00:00:00 2001
From: Josh Bodner <30329717+jbodner09@users.noreply.github.com>
Date: Tue, 14 Nov 2023 14:08:45 -0800
Subject: Fix magic being zeroed out when using fast file select (#3389)

* Move to frame counter init to a place that fast file select also touches

* Undo removing old fix

* Reset on gameover
---
 soh/src/code/z_play.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'soh/src/code')

diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index 841de8f13..59a5d0619 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -33,6 +33,7 @@ u64 D_801614D0[0xA00];
 #endif
 
 PlayState* gPlayState;
+s16 firstInit = 0;
 
 s16 gEnPartnerId;
 
@@ -490,6 +491,12 @@ void Play_Init(GameState* thisx) {
         }
     }
 
+    // Properly initialize the frame counter so it doesn't use garbage data
+    if (!firstInit) {
+        play->gameplayFrames = 0;
+        firstInit = 1;
+    }
+
     // Invalid entrance, so immediately exit the game to opening title
     if (gSaveContext.entranceIndex == -1) {
         gSaveContext.entranceIndex = 0;
-- 
cgit v1.2.3