Merge branch 'master' into doc-dome

This commit is contained in:
GriffinR
2020-01-08 01:15:36 -05:00
committed by GitHub
164 changed files with 6060 additions and 5867 deletions

View File

@@ -459,7 +459,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerDraw:: @ 824C436
goto BattleFrontier_BattleDomeBattleRoom_EventScript_Draw
BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle:: @ 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