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
+14 -14
View File
@@ -1,47 +1,47 @@
SCRIPT_START script_0800C91C
BeginBlock
BeginBlock
_0807EB44 0x0004
SetEntitySpeed 0x0300
EndBlock
EndBlock
script_0800C928:
CheckPlayerInRegion 0x0208, 0x0360, 0x2040
JumpIfNot script_0800C928
_0807E864
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
StartPlayerScript script_0800CA8C
WaitForSomething2 0x00000002
Wait 0x003c
_0807EB28 0x1125
_0807EA94
_0807EA94
_0807E5F8 0x00000800
_0807E8E4_3
_0807E8E4_3
Wait 0x003c
_0807E5F8 0x00000200
_0807E8E4_0
_0807E8E4_0
Wait 0x001e
_0807E5F8 0x00002000
_0807E8E4_1
_0807E8E4_1
Wait 0x0014
_0807E5F8 0x00020000
_0807E8E4_1
_0807E8E4_1
Wait 0x000a
_0807E5F8 0x00008000
_0807E8E4_3
_0807E8E4_3
Wait 0x001e
WaitForSomething2 0x00000400
WaitForSomething2 0x00001000
WaitForSomething2 0x00004000
WaitForSomething2 0x00010000
WaitForSomething2 0x00040000
_0807E8E4_0
_0807E8E4_0
Wait 0x003c
_0807E5F8 0x00000200
WaitForSomething2 0x00000400
_0807E8E4_0
MessageFromTarget 0x1126
Call sub_0807F40C
_0807EA94
_0807EA94
_0807E5F8 0x00000200
_0807E5F8 0x00000800
_0807E5F8 0x00002000
@@ -72,11 +72,11 @@ script_0800C928:
WaitForSomething2 0x00004000
WaitForSomething2 0x00010000
WaitForSomething2 0x00040000
_0807E8E4_0
_0807E8E4_0
_0807EB28 0x1129
_0807EA94
_0807EA94
SetLocalFlag 0x008d
Call sub_0807DF50
_0807E878
_0807E878
DoPostScriptAction 0x0006
SCRIPT_END