mirror of
https://github.com/pret/pokeemerald.git
synced 2026-08-11 03:36:40 -05:00
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -247,3 +234,17 @@ DebugText_BerryWeedsDisabled:
|
||||
.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'!$"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user