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
+30 -30
View File
@@ -1,16 +1,16 @@
SCRIPT_START script_08014B34
BeginBlock
BeginBlock
DoPostScriptAction 0x000a
_0807E930 0x0000
EndBlock
EndBlock
CheckLocalFlag 0x0063
JumpIf script_08014BE8
script_08014B48:
EndBlock
BeginBlock
EndBlock
BeginBlock
CheckRoomFlag 0x0000
JumpIf script_08014B70
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08014B48
EndBlock
_0807E864
@@ -18,11 +18,11 @@ script_08014B48:
MessageNoOverlap 0x2f01
_0807EA94
Wait 0x000f
_0807E878
_0807E878
Jump script_08014B48
script_08014B70:
EndBlock
_0807E864
EndBlock
_0807E864
Call sub_0807DF28
_0807E5F8 0x00000001
DoPostScriptAction 0x0004
@@ -45,14 +45,14 @@ script_08014B70:
_0807E5F8 0x00000001
WaitForSomething2 0x00000002
Call sub_0807DF50
_0807E878
_0807E878
script_08014BE8:
_0807E930 0x0010
Call sub_0806CD4C
script_08014BF2:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08014BF2
_0807E864
_0807E864
CheckLocalFlag 0x0065
JumpIf script_08014C1C
SetLocalFlag 0x0065
@@ -60,27 +60,27 @@ script_08014BF2:
_0807EA94
SetIntVariable 0x00000064
_0807F034 0x003f
WaitPlayerAction8
WaitPlayerAction8
Jump script_08014C22
script_08014C1C:
MessageNoOverlap 0x2f08
_0807EA94
script_08014C22:
Wait 0x000f
_0807E878
_0807E878
Jump script_08014BF2
SCRIPT_START script_08014C2C
BeginBlock
BeginBlock
Call sub_0806CD58
DoPostScriptAction 0x000a
_0807EB44 0x0004
_0807E930 0x0006
EndBlock
EndBlock
script_08014C42:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08014C42
_0807E864
_0807EB74
_0807E864
_0807EB74
script_08014C4C:
Call sub_0806CCD0
JumpIfNot script_08014C4C
@@ -93,38 +93,38 @@ script_08014C56:
MessageNoOverlap 0x2f0d
_0807EA94
_0807F034 0x000a
WaitPlayerAction8
WaitPlayerAction8
Jump script_08014C82
script_08014C7C:
MessageNoOverlap 0x2f09
_0807EA94
script_08014C82:
Wait 0x000f
_0807E878
_0807E878
_0807EB44 0x0004
_0807E930 0x0006
Jump script_08014C42
SCRIPT_START script_08014C94
BeginBlock
BeginBlock
CheckGlobalFlag 0x0024
JumpIf script_08014CD4
Call sub_0806C870
DoPostScriptAction 0x000a
DoPostScriptAction 0x0000
EndBlock
EndBlock
script_08014CAE:
EndBlock
BeginBlock
EndBlock
BeginBlock
CheckGlobalFlag 0x0024
JumpIf script_08014CD4
_0807E30C
_0807E30C
JumpIfNot script_08014CAE
EndBlock
_0807E864
_0807EB74
EndBlock
_0807E864
_0807EB74
Call sub_0806C90C
_0807EA94
_0807E878
_0807EA94
_0807E878
Jump script_08014CAE
script_08014CD4:
DoPostScriptAction 0x0006