Merge branch 'master' into doc-inc

This commit is contained in:
GriffinR authored and GitHub committed 2019-10-07 17:37:04 -04:00
commit d8f5e73bb7
44 files changed
+313 -320

No files matched your search

@@ -190,9 +190,9 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
waitmessage
waitbuttonpress
closemessage
compare VAR_FACING, 1
compare VAR_FACING, DIR_SOUTH
call_if_ne BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4
compare VAR_FACING, 1
compare VAR_FACING, DIR_SOUTH
call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF
removeobject VAR_LAST_TALKED
setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER