Merge master into ObjEvent rename and prune accidental inclusions

This commit is contained in:
GriffinR committed 2020-01-08 05:43:06 -05:00
1 parent 68cdd7b1cb
commit ef67f2d33b
85 files changed
+4548 -4729

No files matched your search

@@ -465,7 +465,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C436:: @ 824C436
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7
BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
frontier_set FRONTIER_DATA_6, 0
frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
special HealPlayerParty
setvar VAR_0x8004, SPECIAL_BATTLE_DOME
setvar VAR_0x8005, 0