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
+33 -33
View File
@@ -1,32 +1,32 @@
SCRIPT_START script_0800D278
BeginBlock
_0807E9D4
BeginBlock
_0807E9D4
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_0800D282:
CheckInventory1 0x0041
JumpIf script_0800D292
CheckLocalFlag 0x007e
JumpIf script_0800D2EA
script_0800D292:
BeginBlock
BeginBlock
TestBit 0x00000001
JumpIf script_0800D2C6
CheckEntityInteractType
CheckEntityInteractType
JumpIf script_0800D2B0
Call sub_0806811C
EndBlock
EndBlock
Jump script_0800D282
script_0800D2B0:
EndBlock
_0807E864
EndBlock
_0807E864
Call sub_08068190
_0807EA94
_0807EA94
Wait 0x000f
_0807E878
_0807E878
Jump script_0800D282
script_0800D2C6:
EndBlock
EndBlock
_0807E5F8 0x00000004
WaitForSomething2 0x00000002
_0807E5F8 0x00000004
@@ -36,54 +36,54 @@ script_0800D2C6:
script_0800D2EA:
_0807E930 0x000b
script_0800D2EE:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_0800D2EE
_0807E864
_0807E864
Call sub_08068190
_0807EA94
_0807EA94
Wait 0x000f
_0807E878
_0807E878
Jump script_0800D2EE
SCRIPT_START script_0800D308
BeginBlock
BeginBlock
Call sub_08068884
DoPostScriptAction 0x000a
_0807EB44 0x0004
_0807E930 0x0000
EndBlock
EndBlock
script_0800D31E:
EndBlock
BeginBlock
EndBlock
BeginBlock
Call sub_08068910
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_0800D31E
EndBlock
_0807E864
_0807EB74
EndBlock
_0807E864
_0807EB74
SetIntVariable 0x00000000
Call sub_0806C028
MessageFromTarget 0x1219
_0807EA94
Wait 0x000f
_0807E878
_0807E878
Jump script_0800D31E
SCRIPT_START script_0800D350
BeginBlock
BeginBlock
Call sub_08068104
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_0800D35E:
BeginBlock
CheckEntityInteractType
BeginBlock
CheckEntityInteractType
JumpIf script_0800D372
Call sub_0806811C
EndBlock
EndBlock
Jump script_0800D35E
script_0800D372:
EndBlock
_0807E864
EndBlock
_0807E864
Call sub_08068190
_0807EA94
_0807EA94
Wait 0x000f
CheckLocalFlag 0x007f
JumpIf script_0800D3E4
@@ -108,6 +108,6 @@ script_0800D3B2:
DoPostScriptAction 0x000a
SetLocalFlag 0x007f
script_0800D3E4:
_0807E878
_0807E878
Jump script_0800D35E
.2byte 0x0000