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
+59 -59
View File
@@ -1,37 +1,37 @@
SCRIPT_START script_0800C550
BeginBlock
BeginBlock
Call sub_08060090
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_0800C55E:
BeginBlock
CheckEntityInteractType
BeginBlock
CheckEntityInteractType
JumpIf script_0800C572
Call sub_08060158
EndBlock
EndBlock
Jump script_0800C55E
script_0800C572:
EndBlock
_0807E864
EndBlock
_0807E864
Call sub_08060208
_0807EA94
_0807E878
_0807EA94
_0807E878
Jump script_0800C55E
SCRIPT_START script_0800C584
BeginBlock
BeginBlock
Call sub_08060090
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_0800C592:
BeginBlock
CheckEntityInteractType
BeginBlock
CheckEntityInteractType
JumpIf script_0800C5A6
Call sub_08060158
EndBlock
EndBlock
Jump script_0800C592
script_0800C5A6:
EndBlock
_0807E864
EndBlock
_0807E864
CheckInventory1 0x0067
JumpIfNot script_0800C5BC
Call sub_08060208
@@ -39,51 +39,51 @@ script_0800C5A6:
script_0800C5BC:
MessageNoOverlap 0x4710
script_0800C5C0:
_0807EA94
_0807E878
_0807EA94
_0807E878
Jump script_0800C592
SCRIPT_START script_0800C5C8
BeginBlock
BeginBlock
Call sub_08060090
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_0800C5D6:
BeginBlock
CheckEntityInteractType
BeginBlock
CheckEntityInteractType
JumpIf script_0800C5EA
Call sub_08060158
EndBlock
EndBlock
Jump script_0800C5D6
script_0800C5EA:
EndBlock
_0807E864
EndBlock
_0807E864
Call sub_08060270
_0807EA94
_0807E878
_0807EA94
_0807E878
Jump script_0800C5D6
SCRIPT_START script_0800C5FC
BeginBlock
BeginBlock
script_0800C5FE:
Call sub_08060090
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_0800C60A:
BeginBlock
CheckEntityInteractType
BeginBlock
CheckEntityInteractType
JumpIf script_0800C61E
Call sub_08060158
EndBlock
EndBlock
Jump script_0800C60A
script_0800C61E:
EndBlock
_0807E864
EndBlock
_0807E864
Call sub_0806021C
_0807EA94
_0807EA94
Wait 0x000f
_0807E878
_0807E878
Jump script_0800C60A
SCRIPT_START script_0800C634
BeginBlock
BeginBlock
DoPostScriptAction 0x000a
SetEntitySpeed 0x0080
_0807EB44 0x0004
@@ -91,10 +91,10 @@ SCRIPT_START script_0800C634
JumpIfNot script_0800C650
SetEntityPosition 0x0010, 0x0000
script_0800C650:
EndBlock
EndBlock
script_0800C652:
_0807E944
_0807E864
_0807E944
_0807E864
Call sub_0807DF28
CheckLocalFlag 0x0082
JumpIf script_0800C684
@@ -117,7 +117,7 @@ script_0800C684:
Wait 0x000a
SetLocalFlag 0x0080
Call sub_0807DF50
_0807E878
_0807E878
Jump script_0800C652
script_0800C6B6:
CheckLocalFlag 0x0081
@@ -128,7 +128,7 @@ script_0800C6B6:
DoPostScriptAction 0x0015
Wait 0x000a
Call sub_0807DF50
_0807E878
_0807E878
Jump script_0800C652
script_0800C6DC:
CheckLocalFlag 0x0082
@@ -152,7 +152,7 @@ script_0800C712:
DoPostScriptAction 0x0015
Wait 0x000a
Call sub_0807DF50
_0807E878
_0807E878
Jump script_0800C652
script_0800C730:
CheckLocalFlag 0x0083
@@ -163,7 +163,7 @@ script_0800C730:
DoPostScriptAction 0x0015
Wait 0x000a
Call sub_0807DF50
_0807E878
_0807E878
Jump script_0800C652
script_0800C756:
DoPostScriptAction 0x0002
@@ -172,16 +172,16 @@ script_0800C756:
DoPostScriptAction 0x0015
Wait 0x000a
Call sub_0807DF50
_0807E878
_0807E878
Jump script_0800C652
SCRIPT_START script_0800C774
BeginBlock
BeginBlock
DoPostScriptAction 0x000a
_0807EB44 0x0004
EndBlock
EndBlock
script_0800C780:
_0807E944
_0807E864
_0807E944
_0807E864
Call sub_0807DF28
StartPlayerScript script_0800C8F0
WaitForSomething2 0x00000001
@@ -194,7 +194,7 @@ script_0800C780:
_0807EA94
DoPostScriptAction 0x0000
Call sub_0807DF50
_0807E878
_0807E878
Jump script_0800C780
script_0800C7C0:
_0807E930 0x0008
@@ -215,7 +215,7 @@ script_0800C7C0:
DoPostScriptAction 0x0000
SetLocalFlag 0x0081
Call sub_0807DF50
_0807E878
_0807E878
Jump script_0800C780
script_0800C80A:
MessageFromTarget 0x1133
@@ -223,7 +223,7 @@ script_0800C80A:
Wait 0x000a
_0807E930 0x0000
Call sub_0807DF50
_0807E878
_0807E878
Jump script_0800C780
script_0800C824:
_0807E930 0x0008
@@ -244,17 +244,17 @@ script_0800C824:
MessageFromTarget 0x1136
_0807EA94
_0807EB28 0x1137
_0807EA94
_0807EA94
Wait 0x000a
_0807EB44 0x0004
DoPostScriptAction 0x0000
Call sub_0807DF50
_0807E878
_0807E878
script_0800C87C:
_0807E944
_0807E864
_0807E944
_0807E864
Call sub_0807DF28
_0807EB74
_0807EB74
SetIntVariable 0x00000008
Call sub_0807F3D8
MessageFromTarget 0x1136
@@ -262,7 +262,7 @@ script_0800C87C:
Wait 0x000a
DoPostScriptAction 0x0000
Call sub_0807DF50
_0807E878
_0807E878
Jump script_0800C87C
script_0800C8AE:
MessageFromTarget 0x1136
@@ -270,5 +270,5 @@ script_0800C8AE:
Wait 0x000a
DoPostScriptAction 0x0000
Call sub_0807DF50
_0807E878
_0807E878
Jump script_0800C780