From 3f2d5c3e25644aec0ddffa38f77c9ea985aea5f7 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Tue, 7 Jan 2020 22:08:10 +0000
Subject: [PATCH] More-accurate Stage.cpp variable arrangement

---
 src/Stage.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Stage.cpp b/src/Stage.cpp
index 69046217..42733d0c 100644
--- a/src/Stage.cpp
+++ b/src/Stage.cpp
@@ -27,6 +27,9 @@
 #endif
 
 int gStageNo;
+MusicID gMusicNo;
+unsigned int gOldPos;
+MusicID gOldNo;
 
 // Note: Pixel made numerous capitalisation errors when making this table.
 // This isn't a problem for Windows, because of its case-insensitive filesystem.
@@ -130,9 +133,9 @@ const STAGE_TABLE gTMT[95] = {
 
 BOOL TransferStage(int no, int w, int x, int y)
 {
-	BOOL bError;
-	char path_dir[20];
 	char path[MAX_PATH];
+	char path_dir[20];
+	BOOL bError;
 
 	// Move character
 	SetMyCharPosition(x * 0x10 * 0x200, y * 0x10 * 0x200);
@@ -248,10 +251,6 @@ const char *gMusicTable[42] = {
 	"WHITE"
 };
 
-MusicID gMusicNo;
-unsigned int gOldPos;
-MusicID gOldNo;
-
 void ChangeMusic(MusicID no)
 {
 	if (no != MUS_SILENCE && no == gMusicNo)