Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR
2019-12-18 13:16:38 -05:00
committed by GitHub
82 changed files with 3472 additions and 6562 deletions
@@ -126,7 +126,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle:: @ 8227AE2
SootopolisCity_MysteryEventsHouse_1F_EventScript_ChooseParty:: @ 8227AEF
msgbox SootopolisCity_MysteryEventsHouse_1F_Text_KeepItTo3On3, MSGBOX_DEFAULT
fadescreen 1
fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle
waitstate
return