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
+8 -8
View File
@@ -2,7 +2,7 @@ SCRIPT_START script_0800AB6E
Call sub_0808D2CC
_0807E5F8 0x00000002
WaitForSomething2 0x00000004
_0807E8E4_0
_0807E8E4_0
_0807E5F8 0x00000040
WaitForSomething2 0x00000080
SetEntityPosition 0x0000, 0xffe0
@@ -53,17 +53,17 @@ SCRIPT_START script_0800AB6E
Call sub_0808D280
Wait 0x0078
_0807E778 0x0004
DoFade5
WaitFor_2
DoFade5
WaitFor_2
Call sub_0807FB94
MoveEntityToPlayer
MoveEntityToPlayer
Call sub_0807F844
_0807F0B4 0x0004
CameraTargetPlayer
CameraTargetPlayer
_0807E5F8 0x80000000
DoFade4
WaitFor_2
DoFade4
WaitFor_2
Call sub_0807DF50
_0807E878
_0807E878
DoPostScriptAction 0x0006
SCRIPT_END