From ecf70d365cbb1c21b5650ce52266db8591b300ea Mon Sep 17 00:00:00 2001 From: Damon Murdoch Date: Mon, 15 Apr 2024 07:31:39 +1000 Subject: [PATCH] [Rebase of #4286] Reordered Debug_EventScript_InflictStatus1 (#4372) * Update debug.inc Created new merge as per discussion in discord, previous pull request https://github.com/rh-hideout/pokeemerald-expansion/pull/4286 * Added new file 'config.inc' as per feedback Added new file 'config.inc' as per feedback * Restore order * fixed, my bad --------- Co-authored-by: Eduardo Quezada --- data/event_scripts.s | 1 + data/scripts/config.inc | 12 ++++++++++++ data/scripts/debug.inc | 17 ++--------------- 3 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 data/scripts/config.inc diff --git a/data/event_scripts.s b/data/event_scripts.s index 0524ec684a..3bab068983 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -579,6 +579,7 @@ gStdScripts_End:: .include "data/scripts/new_game.inc" .include "data/scripts/hall_of_fame.inc" + .include "data/scripts/config.inc" .include "data/scripts/debug.inc" EventScript_WhiteOut:: diff --git a/data/scripts/config.inc b/data/scripts/config.inc new file mode 100644 index 0000000000..dc80b1824a --- /dev/null +++ b/data/scripts/config.inc @@ -0,0 +1,12 @@ +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'!$" diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc index 3dcb7f7896..09ae1404c4 100644 --- a/data/scripts/debug.inc +++ b/data/scripts/debug.inc @@ -281,21 +281,6 @@ DebugText_BerryWeedsDisabled: .string "OW_BERRY_WEEDS is disabled.\n" .string "Unable to force weeds onto berry trees.$" -.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'!$" - Debug_EventScript_InflictStatus1:: lockall getpartysize @@ -445,3 +430,5 @@ Debug_EventScript_InflictStatus1_Text_Freeze: Debug_EventScript_InflictStatus1_Text_Frostbite: .string "Frostbite$" + +.endif