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,5 +1,5 @@
SCRIPT_START script_08009F14
BeginBlock
BeginBlock
_0807EB44 0x0004
Call sub_08060090
DoPostScriptAction 0x000a
@@ -7,15 +7,15 @@ SCRIPT_START script_08009F14
JumpIf script_08009FD2
CheckInventory1 0x0007
JumpIf script_08009F84
EndBlock
EndBlock
script_08009F36:
EndBlock
BeginBlock
EndBlock
BeginBlock
Call sub_08060158
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08009F36
EndBlock
_0807E864
EndBlock
_0807E864
Call sub_0807DF28
DoPostScriptAction 0x000b
StartPlayerScript script_0800A088
@@ -25,42 +25,42 @@ script_08009F36:
_0807EA94
Wait 0x001e
_0807F034 0x0065
WaitPlayerAction8
WaitPlayerAction8
DoPostScriptAction 0x000a
Call sub_0807DF50
_0807E878
_0807E878
script_08009F84:
EndBlock
EndBlock
script_08009F86:
EndBlock
BeginBlock
EndBlock
BeginBlock
Call sub_08060158
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08009F86
EndBlock
_0807E864
EndBlock
_0807E864
Call sub_080602BC
_0807EA94
_0807EA94
CallWithArg sub_0807F970, 0x00001f03
JumpIf script_08009FB6
_0807E878
_0807E878
Jump script_08009F86
script_08009FB6:
Wait 0x0008
PlaySound SFX_103
CallWithArg sub_0806030C, 0x00000063
Wait 0x0008
_0807E878
_0807E878
Jump script_08009F86
script_08009FD2:
EndBlock
EndBlock
CheckLocalFlag 0x00b0
JumpIf script_0800A024
script_08009FDC:
EndBlock
BeginBlock
EndBlock
BeginBlock
Call sub_08060158
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08009FDC
EndBlock
_0807E864
@@ -68,47 +68,47 @@ script_08009FDC:
_0807EA94
_0807E3E8
JumpIf script_0800A002
_0807E878
_0807E878
Jump script_08009FDC
script_0800A002:
Wait 0x0008
_0807F034 0x0008
Call sub_08060318
WaitPlayerAction8
WaitPlayerAction8
Wait 0x0008
_0807EB8C
MessageFromTarget 0x1f13
_0807EA94
SetLocalFlag 0x00b0
_0807E878
_0807E878
script_0800A024:
EndBlock
BeginBlock
EndBlock
BeginBlock
Call sub_08060158
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_0800A024
EndBlock
_0807E864
EndBlock
_0807E864
CheckInventory1 0x0008
JumpIf script_0800A052
MessageNoOverlap 0x1f14
_0807EA94
_0807E3E8
JumpIf script_0800A002
_0807E878
_0807E878
Jump script_0800A024
script_0800A052:
MessageNoOverlap 0x1f11
_0807EA94
_0807E3E8
JumpIf script_0800A064
_0807E878
_0807E878
Jump script_0800A024
script_0800A064:
Wait 0x0008
_0807F034 0x0007
Call sub_08060318
WaitPlayerAction8
WaitPlayerAction8
Wait 0x0008
_0807EB8C
MessageFromTarget 0x1f10