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
+6 -6
View File
@@ -1,12 +1,12 @@
SCRIPT_START script_0800D954
BeginBlock
BeginBlock
DoPostScriptAction 0x0008
Call sub_0807F180
EndBlock
EndBlock
script_0800D962:
CheckPlayerInRegion 0x0118, 0x0038, 0x3050
JumpIfNot script_0800D962
_0807E864
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
StartPlayerScript script_0800DA00
@@ -27,16 +27,16 @@ script_0800D962:
_0807E5F8 0x00000004
WaitForSomething2 0x00000002
_0807F050 0x006d
WaitPlayerAction8
WaitPlayerAction8
_0807EB28 0x1703
_0807EA94
_0807EA94
Wait 0x003c
SetLocalFlag 0x0032
PlaySound SFX_113
SetIntVariable 0x00000001
Call sub_0806DA1C
Call sub_0807DF50
_0807E878
_0807E878
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000