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
+42 -42
View File
@@ -7,38 +7,38 @@ SCRIPT_START script_080165D8
JumpAbsolute script_080165D8
.2byte 0x0000
SCRIPT_START script_080165F8
BeginBlock
_0807E9D4
EndBlock
BeginBlock
_0807E9D4
EndBlock
script_080165FE:
_0807E30C
_0807E30C
JumpIfNot script_080165FE
MessageFromTarget 0x0601
Jump script_080165FE
SCRIPT_START script_0801660C
BeginBlock
_0807E9D4
EndBlock
BeginBlock
_0807E9D4
EndBlock
script_08016612:
_0807E944
_0807E864
MessageFromTarget 0x0602
_0807EA94
Wait 0x000f
_0807E878
_0807E878
Jump script_08016612
.2byte 0x0000
SCRIPT_START script_08016628
BeginBlock
_0807E9D4
EndBlock
BeginBlock
_0807E9D4
EndBlock
script_0801662E:
_0807E944
_0807E864
_0807E944
_0807E864
_0807EB28 0x0603
_0807EA94
_0807EA94
Wait 0x000f
_0807E878
_0807E878
Jump script_0801662E
.2byte 0x0000
SCRIPT_START script_08016644
@@ -121,7 +121,7 @@ script_08016700:
_0807EB44 0x0004
Wait 0x003c
Jump script_08016700
SCRIPT_START script_08016798
SCRIPT_START script_08016798
SetEntitySpeed 0x0100
script_0801679C:
WaitForSomething 0x00000002
@@ -200,64 +200,64 @@ script_08016848:
_0807EB44 0x0004
Jump script_08016848
SCRIPT_START script_080168E0
BeginBlock
_0807E9D4
EndBlock
BeginBlock
_0807E9D4
EndBlock
script_080168E6:
_0807E944
_0807E864
_0807E944
_0807E864
Wait 0x000f
_0807E878
_0807E878
Jump script_080168E6
SCRIPT_START script_080168F4
BeginBlock
BeginBlock
Call sub_08064EA4
_0807EB44 0x0004
DoPostScriptAction 0x0000
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_0801690A:
_0807E30C
_0807E30C
JumpIfNot script_0801690A
_0807E864
_0807EB74
_0807E864
_0807EB74
Call sub_08064F28
_0807EA94
_0807EA94
JumpIfNot script_08016926
_0807F034 0x003d
WaitPlayerAction8
WaitPlayerAction8
script_08016926:
_0807E878
_0807E878
SetGlobalFlag 0x005c
Jump script_0801690A
BeginBlock
_0807E9D4
BeginBlock
_0807E9D4
_0807EB44 0x0000
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_0801693E:
_0807E944
_0807E864
_0807E944
_0807E864
Wait 0x0018
MessageFromTarget 0x0a01
_0807EA94
Wait 0x000f
_0807E878
_0807E878
Jump script_0801693E
.2byte 0x0000
BeginBlock
_0807E9D4
BeginBlock
_0807E9D4
_0807EB44 0x0000
DoPostScriptAction 0x000a
_0807E930 0x0000
EndBlock
EndBlock
script_0801696A:
_0807E944
_0807E864
_0807E944
_0807E864
Wait 0x0018
MessageFromTarget 0x0a01
_0807EA94
Wait 0x000f
_0807E878
_0807E878
Jump script_0801696A
.2byte 0x0000