Merge remote-tracking branch 'upstream/master' into m

data/scripts/script_08013720.inc

@@ -1,39 +1,39 @@
 SCRIPT_START script_08013720
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x0008
-	EndBlock 
-	BeginBlock 
+	EndBlock
+	BeginBlock
 	Call sub_0807F92C
 	CallWithArg sub_0806DA04, 0x00000003
-	EndBlock 
+	EndBlock
 script_0801373C:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_0801373C
-	_0807E864 
+	_0807E864
 	Call sub_0807DF28
 	StartPlayerScript script_080136D8
 	WaitForSomething2 0x00000001
 	CallWithArg sub_08095A1C, script_08013F34
 	PlaySound SFX_ELEMENT_PLACE
 	Wait 0x005a
-	BeginBlock 
+	BeginBlock
 	PlaySound SFX_ELEMENT_FLOAT
 	CallWithArg sub_08095D54, script_08013E4C
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x20000000
-	BeginBlock 
+	BeginBlock
 	PlaySound SFX_ELEMENT_CHARGE
 	CallWithArg sub_08095D8C, script_08014054
 	CallWithArg sub_08095D8C, script_08014074
 	CallWithArg sub_08095D8C, script_08014094
-	EndBlock 
+	EndBlock
 	Wait 0x001e
-	BeginBlock 
+	BeginBlock
 	PlaySound SFX_1D0
 	CallWithArg sub_08095D8C, script_080140DC
 	CallWithArg sub_08095D8C, script_08014118
 	CallWithArg sub_08095D8C, script_08014154
-	EndBlock 
+	EndBlock
 	Wait 0x003c
 	CallWithArg CreateManager36, 0x00000000
 	_0807E5F8 0x00000200
@@ -60,14 +60,14 @@ script_0801373C:
 	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 0x0504, 0x000c
 	_0807EA94 
@@ -75,7 +75,7 @@ script_0801373C:
 	SetLocalFlag 0x007b
 	Call sub_08053250
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000