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
+11 -11
View File
@@ -1,14 +1,14 @@
SCRIPT_START script_0800D874
BeginBlock
BeginBlock
Call sub_0807F934
DoPostScriptAction 0x0008
SetIntVariable 0x00000001
Call sub_0806DA04
EndBlock
EndBlock
script_0800D88E:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_0800D88E
_0807E864
_0807E864
Call sub_0807DF28
CheckLocalFlag 0x0045
JumpIf script_0800D8B0
@@ -28,27 +28,27 @@ script_0800D8CE:
JumpIfNot script_0800D8CE
script_0800D8D6:
Call sub_0807DF50
_0807E878
_0807E878
Jump script_0800D88E
.2byte 0x0000
SCRIPT_START script_0800D8E4
BeginBlock
BeginBlock
DoPostScriptAction 0x0008
CheckInventory1 0x0017
JumpIf script_0800D924
EndBlock
EndBlock
script_0800D8F4:
CheckInventory1 0x0017
JumpIfNot script_0800D8F4
Call sub_0807DF28
_0807E864
WaitPlayerAction8
_0807E864
WaitPlayerAction8
_0807EB28 0x1325
_0807EA94
_0807EA94
PlaySound SFX_113
SetIntVariable 0x00000000
Call sub_0806DA1C
_0807E878
_0807E878
Call sub_0807DF50
script_0800D924:
DoPostScriptAction 0x0006