From b29fb14f6b066975480fee87fe68fdfddf05c157 Mon Sep 17 00:00:00 2001
From: Treeki <treeki@gmail.com>
Date: Thu, 13 Jun 2013 23:55:49 +0200
Subject: do not pause, ever (only in message boxes, music houses, and palace
 dudes)

---
 include/game.h    | 12 ++++++++++++
 kamek_pal.x       |  2 ++
 makeNewerKP       |  6 +++---
 src/bonusRoom.cpp |  1 +
 src/msgbox.cpp    |  5 +++++
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/include/game.h b/include/game.h
index 9e9d860..c0477b7 100755
--- a/include/game.h
+++ b/include/game.h
@@ -4147,5 +4147,17 @@ extern void *_8042A788;
 extern "C" void sub_8019C390(void *, int);
 extern "C" bool SpawnEffect(const char*, int, Vec*, S16Vec*, Vec*);
 
+class StageC4 {
+	public:
+		static StageC4 *instance;
+
+		virtual ~StageC4();
+
+		// Not gonna bother with listing methods here
+		int stageNum, selection, playerNum;
+		u32 _10, _14;
+		u8 flags, _19, _1A, willDisplay, _1C, _1D;
+};
+
 #endif
 
diff --git a/kamek_pal.x b/kamek_pal.x
index 49d6c41..11b7bf1 100644
--- a/kamek_pal.x
+++ b/kamek_pal.x
@@ -1,4 +1,6 @@
 SECTIONS {
+	instance__7StageC4 = 0x8042A2B8;
+
 	GetResNodeNumEntries__Q34nw4r3g3d6ResMdlCFv = 0x8023B4A0;
 	MEMAllocFromAllocator = 0x801D5680;
 	__vt__Q34nw4r3g3d9AnmObjChr = 0x8034E9D0;
diff --git a/makeNewerKP b/makeNewerKP
index 47c1cf9..ea3a3f4 100755
--- a/makeNewerKP
+++ b/makeNewerKP
@@ -9,9 +9,9 @@ else
 fi
 
 copy_files() {
-	cp NewerASM/n_$1_loader.bin ~/Games/Newer/ISO/files/NewerRes/System$2.bin
-	cp NewerASM/n_$1_dlcode.bin ~/Games/Newer/ISO/files/NewerRes/DLCode$2.bin
-	cp NewerASM/n_$1_dlrelocs.bin ~/Games/Newer/ISO/files/NewerRes/DLRelocs$2.bin
+	cp NewerASM/n_$1_loader.bin ~/Games/Newer/NewerFinal2/files/NewerRes/System$2.bin
+	cp NewerASM/n_$1_dlcode.bin ~/Games/Newer/NewerFinal2/files/NewerRes/DLCode$2.bin
+	cp NewerASM/n_$1_dlrelocs.bin ~/Games/Newer/NewerFinal2/files/NewerRes/DLRelocs$2.bin
 }
 
 copy_files pal EU_1
diff --git a/src/bonusRoom.cpp b/src/bonusRoom.cpp
index ab06d31..7d391a2 100644
--- a/src/bonusRoom.cpp
+++ b/src/bonusRoom.cpp
@@ -516,6 +516,7 @@ dSingAlong *dSingAlong::build() {
 // Events
 int dSingAlong::onCreate() {
 	NoMichaelBuble = true;
+	StageC4::instance->_1D = 1; // enable no-pause
 
 	// Load in the settings
 	this->song = this->settings & 0xF;
diff --git a/src/msgbox.cpp b/src/msgbox.cpp
index 47ec554..829fcb3 100644
--- a/src/msgbox.cpp
+++ b/src/msgbox.cpp
@@ -76,6 +76,8 @@ int dMsgBoxManager_c::onDelete() {
 	instance = 0;
 
 	MessageBoxIsShowing = false;
+	if (canCancel && StageC4::instance)
+		StageC4::instance->_1D = 0; // disable no-pause
 	msgDataLoader.unload();
 
 	return layout.free();
@@ -142,6 +144,7 @@ CREATE_STATE(dMsgBoxManager_c, BoxAppearWait);
 void dMsgBoxManager_c::beginState_BoxAppearWait() {
 	visible = true;
 	MessageBoxIsShowing = true;
+	StageC4::instance->_1D = 1; // enable no-pause
 	layout.enableNonLoopAnim(ANIM_BOX_APPEAR);
 
 	nw4r::snd::SoundHandle handle;
@@ -201,6 +204,8 @@ void dMsgBoxManager_c::executeState_BoxDisappearWait() {
 void dMsgBoxManager_c::endState_BoxDisappearWait() {
 	visible = false;
 	MessageBoxIsShowing = false;
+	if (canCancel && StageC4::instance)
+		StageC4::instance->_1D = 0; // disable no-pause
 }
 
 
-- 
cgit v1.2.3