Merge master into ObjEvent rename

This commit is contained in:
GriffinR
2019-11-27 12:51:10 -05:00
25 changed files with 631 additions and 590 deletions

View File

@@ -53,8 +53,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF
addobject 2
applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1
waitmovement 0
setvar VAR_0x8004, 5
special CallBattlePalaceFunction
palace_getopponentintro
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7