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
+28 -28
View File
@@ -1,9 +1,9 @@
SCRIPT_START script_0800F184
BeginBlock
BeginBlock
SetEntitySpeed 0x0080
DoPostScriptAction 0x0008
DoPostScriptAction 0x000a
EndBlock
EndBlock
Call sub_0807F348
_0807EB44 0x0002
WaitForSomething2 0x00000002
@@ -13,7 +13,7 @@ SCRIPT_START script_0800F184
_0807EDD4 0x01f8, 0x0328
_0807EB44 0x0004
_0807E930 0x0008
_0807E8E4_0
_0807E8E4_0
_0807E5F8 0x00000040
WaitForSomething2 0x00000002
Call sub_0806E440
@@ -21,14 +21,14 @@ SCRIPT_START script_0800F184
_0807E5F8 0x00000040
WaitForSomething2 0x00000002
script_0800F1E6:
EndBlock
BeginBlock
EndBlock
BeginBlock
CallWithArg sub_0807F680, 0x000001c0
JumpIf script_0800F22A
EndBlock
_0807E864
EndBlock
_0807E864
Call sub_0807F9A4
_0807EB74
_0807EB74
_0807E930 0x0008
DoPostScriptAction 0x0004
Wait 0x003c
@@ -36,15 +36,15 @@ script_0800F1E6:
_0807EA94
StartPlayerScript script_0800F33C
WaitForSomething2 0x00000400
_0807E878
_0807E878
Jump script_0800F1E6
script_0800F22A:
CallWithArg sub_0807F680, 0x00000230
JumpIfNot script_0800F26A
EndBlock
_0807E864
EndBlock
_0807E864
Call sub_0807F9A4
_0807EB74
_0807EB74
_0807E930 0x0008
DoPostScriptAction 0x0004
Wait 0x003c
@@ -52,15 +52,15 @@ script_0800F22A:
_0807EA94
StartPlayerScript script_0800F354
WaitForSomething2 0x00000400
_0807E878
_0807E878
Jump script_0800F1E6
script_0800F26A:
CallWithArg sub_0807F6B4, 0x00000310
JumpIf script_0800F2AA
EndBlock
_0807E864
EndBlock
_0807E864
Call sub_0807F9A4
_0807EB74
_0807EB74
_0807E930 0x0008
DoPostScriptAction 0x0004
Wait 0x003c
@@ -68,15 +68,15 @@ script_0800F26A:
_0807EA94
StartPlayerScript script_0800F36C
WaitForSomething2 0x00000400
_0807E878
_0807E878
Jump script_0800F1E6
script_0800F2AA:
CallWithArg sub_0807F6B4, 0x00000340
JumpIfNot script_0800F2EA
EndBlock
_0807E864
EndBlock
_0807E864
Call sub_0807F9A4
_0807EB74
_0807EB74
_0807E930 0x0008
DoPostScriptAction 0x0004
Wait 0x003c
@@ -84,25 +84,25 @@ script_0800F2AA:
_0807EA94
StartPlayerScript script_0800F384
WaitForSomething2 0x00000400
_0807E878
_0807E878
Jump script_0800F1E6
script_0800F2EA:
EndBlock
BeginBlock
EndBlock
BeginBlock
CheckKinstoneFused 0x0032
JumpIf script_0800F314
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_0800F2EA
EndBlock
_0807E864
_0807EB74
EndBlock
_0807E864
_0807EB74
_0807E930 0x0008
MessageFromTargetPos 0x1208, 0x000c
_0807EA94
_0807E878
Jump script_0800F1E6
script_0800F314:
EndBlock
EndBlock
_0807E5F8 0x00000040
WaitForSomething2 0x00000002
SetEntitySpeed 0x0100