From 3728986b15b9167c35e1ba1cc37e30a6845ab2e8 Mon Sep 17 00:00:00 2001
From: R Ferreira <prayerie@prayerie.pt>
Date: Sun, 8 Mar 2026 01:52:54 +0000
Subject: [PATCH] Make rename button state more clear, allow TW when song
 playing

---
 arm9/source/main.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/arm9/source/main.cpp b/arm9/source/main.cpp
index 372ca5c..a6320d4 100644
--- a/arm9/source/main.cpp
+++ b/arm9/source/main.cpp
@@ -244,8 +244,8 @@ GUI *gui;
 // </Main Screen>
 
 // <Things that suddenly pop up>
-	Typewriter *tw;
-	MessageBox *mb;
+	Typewriter *tw = NULL;
+	MessageBox *mb = NULL;
 // </Things that suddenly pop up>
 
 u16 *b1n, *b1d;
@@ -631,7 +631,8 @@ void handleSampleChange(const u16 newsample)
 	buttonsmpnormalize->set_enabled(smp != NULL);
 	cbsnapto0xing->set_enabled(smp != NULL);
 	buttonsmpdraw->set_enabled(smp != NULL);
-
+	buttonrenameinst->set_enabled(inst != NULL);
+	buttonrenamesample->set_enabled(smp != NULL);
 	lbsamples->select(newsample);
 
 	if(smp == NULL)
@@ -1167,6 +1168,7 @@ void deleteTypewriter(void)
 	gui->unregisterOverlayWidget();
 	typewriter_active = false;
 	delete tw;
+	tw = NULL;
 	redrawSubScreen();
 }
 
@@ -1499,6 +1501,9 @@ void handlePotPosChangeFromSong(u16 newpotpos)
 
 	// Update other GUI Elements
 	updateGuiToNewPattern(song->getPotEntry(state->potpos));
+
+	if (tw)
+		tw->pleaseDraw();
 }
 
 #ifdef MIDI
@@ -2452,9 +2457,7 @@ void handleTypewriterSongnameOk(void)
 
 void showTypewriterForSongRename(void)
 {
-	if(!state->playing || state->pause) {
-		showTypewriter("song name", song->getName(), handleTypewriterSongnameOk, clearTypewriterText, deleteTypewriter);
-	}
+	showTypewriter("song name", song->getName(), handleTypewriterSongnameOk, clearTypewriterText, deleteTypewriter);
 }
 
 void handleTypewriterSampleOk(void)