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
+15 -15
View File
@@ -1,19 +1,19 @@
SCRIPT_START script_080142B0
BeginBlock
BeginBlock
CheckLocalFlag 0x0054
JumpIf script_08014382
CheckLocalFlag 0x0053
JumpIf script_08014330
EndBlock
EndBlock
script_080142C4:
EndBlock
BeginBlock
_0807E564
EndBlock
BeginBlock
_0807E564
JumpIfNot script_080142C4
CheckPlayerInRegion 0x0098, 0x0058, 0x1818
JumpIfNot script_080142C4
EndBlock
_0807E864
EndBlock
_0807E864
SetLocalFlag 0x0053
Wait 0x0014
_0807E908 0x0004
@@ -33,19 +33,19 @@ script_080142C4:
_0807EA94
Wait 0x0014
_0807E930 0x0004
_0807E878
_0807E878
_0807E908 0x0001
script_08014330:
EndBlock
BeginBlock
_0807E564
EndBlock
BeginBlock
_0807E564
JumpIf script_08014330
EntityHasHeight
EntityHasHeight
JumpIf script_08014330
CheckPlayerInRegion 0x00c0, 0x0068, 0x1010
JumpIfNot script_08014330
EndBlock
_0807E864
EndBlock
_0807E864
SetLocalFlag 0x0054
Wait 0x005a
_0807E908 0x0004
@@ -58,6 +58,6 @@ script_08014330:
Wait 0x0014
_0807E930 0x0004
_0807E908 0x0001
_0807E878
_0807E878
script_08014382:
SCRIPT_END