From 625f0077416c5fa919b4999fc4be9c715d031875 Mon Sep 17 00:00:00 2001 From: pkmnsnfrn Date: Tue, 28 Nov 2023 18:09:21 -0800 Subject: [PATCH 1/2] Moved Sky Battle error message outside of debug.inc https://github.com/rh-hideout/pokeemerald-expansion/issues/3615\#issue-2015546179 --- data/scripts/debug.inc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc index 573b60d457c2..722bef795efe 100644 --- a/data/scripts/debug.inc +++ b/data/scripts/debug.inc @@ -95,19 +95,6 @@ Debug_BoxFilledMessage:: Debug_BoxFilledMessage_Text: .string "Storage boxes filled!$" -Debug_FlagsAndVarNotSetBattleConfigMessage:: - lockall - message Debug_FlagsAndVarNotSetBattleConfigMessage_Text - waitmessage - waitbuttonpress - releaseall - end - -Debug_FlagsAndVarNotSetBattleConfigMessage_Text: - .string "Feature unavailable! Please define a\n" - .string "usable flag and a usable var in:\l" - .string "'include/config/battle.h'!$" - Debug_EventScript_Script_1:: end @@ -229,3 +216,16 @@ Debug_ExpansionVersion: .string "pokeemerald-expansion {STR_VAR_1}$" .endif +Debug_FlagsAndVarNotSetBattleConfigMessage:: + lockall + message Debug_FlagsAndVarNotSetBattleConfigMessage_Text + waitmessage + waitbuttonpress + releaseall + end + +Debug_FlagsAndVarNotSetBattleConfigMessage_Text: + .string "Feature unavailable! Please define a\n" + .string "usable flag and a usable var in:\l" + .string "'include/config/battle.h'!$" + From 8cb3bb11f9c11f25bfddef6b74e98dd3d9411260 Mon Sep 17 00:00:00 2001 From: psf <77138753+pkmnsnfrn@users.noreply.github.com> Date: Wed, 29 Nov 2023 08:09:36 -0800 Subject: [PATCH 2/2] Update data/scripts/debug.inc Made changes from Jasper's review https://github.com/rh-hideout/pokeemerald-expansion/pull/3617/files/625f0077416c5fa919b4999fc4be9c715d031875 Co-authored-by: Bassoonian --- data/scripts/debug.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc index 722bef795efe..4d14a2a2a65b 100644 --- a/data/scripts/debug.inc +++ b/data/scripts/debug.inc @@ -216,6 +216,7 @@ Debug_ExpansionVersion: .string "pokeemerald-expansion {STR_VAR_1}$" .endif + Debug_FlagsAndVarNotSetBattleConfigMessage:: lockall message Debug_FlagsAndVarNotSetBattleConfigMessage_Text