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
+24 -24
View File
@@ -1,60 +1,60 @@
SCRIPT_START script_08008B5C
BeginBlock
_0807E9D4
BeginBlock
_0807E9D4
_0807EB44 0x0004
_0807E930 0x0000
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_08008B6E:
_0807E944
_0807E864
_0807E944
_0807E864
_0807E930 0x0004
Call sub_0807F2D4
Call sub_0806BBB0
_0807EA94
_0807EA94
_0807E930 0x0008
_0807E878
_0807E878
Jump script_08008B6E
.2byte 0x0000
SCRIPT_START script_08008B90
BeginBlock
_0807E9D4
BeginBlock
_0807E9D4
_0807EB44 0x0004
DoPostScriptAction 0x000a
_0807E930 0x0000
EndBlock
EndBlock
script_08008BA2:
_0807E944
_0807E864
_0807E944
_0807E864
_0807E930 0x0004
Call sub_0807F2D4
MessageFromTarget 0x4912
_0807EA94
_0807E930 0x0008
_0807E878
_0807E878
Jump script_08008BA2
SCRIPT_START script_08008BC0
BeginBlock
_0807E9D4
BeginBlock
_0807E9D4
_0807EB44 0x0004
DoPostScriptAction 0x000a
_0807E930 0x0000
.ifdef EU
SetGlobalFlag 0x0061
.endif
EndBlock
EndBlock
script_08008BD2:
_0807E944
_0807E864
_0807E944
_0807E864
.ifndef EU
SetGlobalFlag 0x0061
.endif
_0807E930 0x0004
Call sub_0807F2D4
_0807EA94
_0807EA94
Call sub_0806BA34
JumpIfNot script_08008C54
_0807EA94
_0807EA94
CallWithArg sub_0806BB1C, 0x00000000
Call sub_0807F2D4
CallWithArg sub_0806BB1C, 0x00000001
@@ -78,18 +78,18 @@ script_08008C54:
_0807E930 0x0008
Wait 0x000f
script_08008C5C:
_0807EA94
_0807E878
_0807EA94
_0807E878
Jump script_08008BD2
SCRIPT_START script_08008C64
BeginBlock
BeginBlock
SetEntityPositionRelative 0x0068, 0x0018
DoPostScriptAction 0x000f
_0807EB44 0x0004
_0807E930 0x0004
SetEntitySpeed 0x0300
PlaySound SFX_STAIRS
EndBlock
EndBlock
WaitForSomething 0x00000002
MessageNoOverlap 0x490d
_0807EA94