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
+12 -12
View File
@@ -1,9 +1,9 @@
SCRIPT_START script_08014A80
BeginBlock
BeginBlock
DoPostScriptAction 0x000a
EndBlock
EndBlock
WaitForSomething2 0x00000001
_0807EB74
_0807EB74
DoPostScriptAction 0x0004
_0807E5F8 0x00000002
WaitForSomething2 0x00000001
@@ -11,7 +11,7 @@ SCRIPT_START script_08014A80
_0807EA94
_0807E5F8 0x00000002
script_08014AAC:
_0807E30C
_0807E30C
JumpIfNot script_08014AAC
_0807E864
_0807EB74
@@ -21,18 +21,18 @@ script_08014AAC:
Jump script_08014AAC
.2byte 0x0000
SCRIPT_START script_08014AC4
BeginBlock
BeginBlock
Call sub_0806C870
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_08014AD2:
_0807E30C
_0807E30C
JumpIfNot script_08014AD2
_0807E864
_0807EB74
_0807E864
_0807EB74
StartPlayerScript script_08014B10
WaitForSomething2 0x00000001
_0807EB74
_0807EB74
CheckLocalFlag 0x0064
JumpIf script_08014AFE
SetLocalFlag 0x0064
@@ -41,8 +41,8 @@ script_08014AD2:
script_08014AFE:
MessageNoOverlap 0x2f0c
script_08014B02:
_0807EA94
_0807EA94
Wait 0x000f
_0807E878
_0807E878
Jump script_08014AD2
.2byte 0x0000