Merge master into ObjEvent rename and prune accidental inclusions

This commit is contained in:
GriffinR
2020-01-08 05:43:06 -05:00
parent 68cdd7b1cb
commit ef67f2d33b
85 changed files with 4548 additions and 4729 deletions

View File

@@ -75,8 +75,8 @@ BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge:: @ 8258506
waitse
BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle:: @ 825853B
call BattleFrontier_BattleFactoryLobby_EventScript_23E8E0
compare VAR_RESULT, 1
call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle
message BattleFrontier_BattleFactoryLobby_Text_RecordLastMatch
waitmessage