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
+17 -17
View File
@@ -1,41 +1,41 @@
SCRIPT_START script_080138B4
BeginBlock
BeginBlock
DoPostScriptAction 0x0008
EndBlock
BeginBlock
EndBlock
BeginBlock
Call sub_0807F92C
CallWithArg sub_0806DA04, 0x00000003
EndBlock
EndBlock
script_080138D0:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_080138D0
_0807E864
_0807E864
Call sub_0807DF28
StartPlayerScript script_080136D8
WaitForSomething2 0x00000001
CallWithArg sub_08095A1C, script_08013F64
PlaySound SFX_ELEMENT_PLACE
Wait 0x005a
BeginBlock
BeginBlock
PlaySound SFX_ELEMENT_FLOAT
CallWithArg sub_08095D54, script_08013E70
EndBlock
EndBlock
WaitForSomething2 0x40000000
BeginBlock
BeginBlock
PlaySound SFX_ELEMENT_CHARGE
CallWithArg sub_08095D8C, script_08014054
CallWithArg sub_08095D8C, script_08014074
CallWithArg sub_08095D8C, script_08014094
CallWithArg sub_08095D8C, script_080140B8
EndBlock
EndBlock
Wait 0x001e
BeginBlock
BeginBlock
PlaySound SFX_1D0
CallWithArg sub_08095D8C, script_080140DC
CallWithArg sub_08095D8C, script_08014118
CallWithArg sub_08095D8C, script_08014154
CallWithArg sub_08095D8C, script_08014198
EndBlock
EndBlock
Wait 0x003c
CallWithArg CreateManager36, 0x00000000
_0807E5F8 0x00000200
@@ -65,14 +65,14 @@ script_080138D0:
Call sub_0807F304
Wait 0x003c
_0807E778 0x0004
DoFade7
DoFade7
PlaySound SFX_EVAPORATE
WaitFor_2
WaitFor_2
Wait 0x003c
_0807E5F8 0x00000010
_0807E778 0x0002
DoFade6
WaitFor_2
DoFade6
WaitFor_2
PlaySound SFX_109
MessageFromTargetPos 0x0505, 0x000c
_0807EA94
@@ -80,7 +80,7 @@ script_080138D0:
.ifndef EU
_0807F0B4 0x0002
SetEntityPositionRelative 0x00e8, 0x00d8
CameraTargetEntity
CameraTargetEntity
.endif
Call sub_0806DC3C
CallWithArg sub_0807F244, 0x00010001