Merge remote-tracking branch 'upstream/master' into m

This commit is contained in:
theo3
2021-11-05 01:58:55 -07:00
440 changed files with 7319 additions and 11526 deletions
+9 -9
View File
@@ -1,27 +1,27 @@
SCRIPT_START script_08009348
BeginBlock
_0807E9D4
EndBlock
BeginBlock
_0807E9D4
EndBlock
script_0800934E:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_0800934E
_0807E864
_0807E864
Call sub_0807DF28
Call sub_0806D638
_0807F0B4 0x0001
CameraTargetEntity
CameraTargetEntity
CheckGlobalFlag 0x0055
JumpIf script_0800939A
MessageNoOverlap 0x1d01
_0807EA94
script_08009376:
_0807EA94
_0807EA94
Call sub_0806D640
_0807F0B4 0x0001
CameraTargetPlayer
CameraTargetPlayer
Wait 0x002d
_0807F0B4 0x0004
_0807E878
_0807E878
Call sub_0807DF50
Jump script_0800934E
SCRIPT_END