[Rebase of rh-hideout#4286] Reordered Debug_EventScript_InflictStatus1 (

rh-hideout#4372) * Update debug.inc Created new merge as per discussion in discord, previous pull request rh-hideout#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 <[email protected]>
ravepossum · Apr 14, 2024 · ecf70d3 · ecf70d3
1 parent fd87a79
commit ecf70d3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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