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
+22 -22
View File
@@ -1,11 +1,11 @@
SCRIPT_START script_0801232C
BeginBlock
_0807EB74
_0807E9D4
BeginBlock
_0807EB74
_0807E9D4
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_08012338:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08012338
_0807EB74
_0807E864
@@ -15,37 +15,37 @@ script_08012338:
JumpIf script_0801235A
SetLocalFlag 0x0042
_0807F034 0x0057
WaitPlayerAction8
WaitPlayerAction8
script_0801235A:
_0807E878
_0807E878
Jump script_08012338
SCRIPT_START script_08012360
BeginBlock
BeginBlock
DoPostScriptAction 0x0008
EndBlock
EndBlock
script_08012368:
CheckLocalFlag 0x0004
JumpIfNot script_08012368
Call sub_0807DF28
_0807E864
_0807E864
StopBgm
BeginBlock
BeginBlock
_0807E778 0x0004
SetFadeMask 0x00007fff
DoFade5
DoFade5
_0807E858 0x0080
EndBlock
WaitFor_2
EndBlock
WaitFor_2
PlayBgm BGM_ELEMENTAL_SANCTUARY
_0807EB28 0x1401
_0807EA94
_0807EA94
_0807EB44 0x0004
DoPostScriptAction 0x0000
DoPostScriptAction 0x0007
PlaySound SFX_ELEMENT_FLOAT
SetEntity0x20 0xffff8000
Wait 0x003c
_0807E8E4_0
_0807E8E4_0
StartPlayerScript script_08012410
WaitForSomething2 0x00000001
MessageNoOverlap 0x1402
@@ -53,20 +53,20 @@ script_08012368:
StopBgm
SetEntity0x20 0x00010000
Wait 0x003c
BeginBlock
BeginBlock
_0807E778 0x0004
SetFadeMask 0xffffffff
DoFade4
DoFade4
_0807E858 0x0080
EndBlock
WaitFor_2
EndBlock
WaitFor_2
PlayBGM
_0807EB28 0x1403
_0807EA94
_0807EA94
SetIntVariable 0x00000203
Call sub_0807F420
Call sub_0807DF50
_0807E878
_0807E878
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000