atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Rebase of #4286] Reordered Debug_EventScript_InflictStatus1 (#4372)

Browse source 
* 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 <eduardo602002@gmail.com>
This commit is contained in:
Damon Murdoch 2024-04-15 07:31:39 +10:00 committed by GitHub
parent fd87a79b27
commit ecf70d365c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/event_scripts.s
View file

@ -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::

12
data/scripts/config.inc Normal file
View file

@ -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'!$"

17
data/scripts/debug.inc
View file

@ -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