Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR authored and GitHub committed 2020-01-12 22:42:43 -05:00
commit 655910a16f
127 files changed
+15606 -21934

No files matched your search

+1 -1
View File
@@ -525,7 +525,7 @@ CableClub_EventScript_RecordCorner:: @ 82771DB
goto_if_eq CableClub_EventScript_AbortLink
message gText_PleaseWaitForLink
waitmessage
special sub_80B2E74
special TryRecordMixLinkup
waitstate
special sub_80B2EA8
waitstate