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

data/scripts/script_08012F86.inc

@@ -1,29 +1,29 @@
 SCRIPT_START script_08012F86
-	BeginBlock 
+	BeginBlock
 	CheckLocalFlag 0x0060
 	JumpIf script_08012FD2
-	_0807E864 
+	_0807E864
 	Call sub_0807DF28
 	StartPlayerScript script_080130E4
 	SetLocalFlag 0x0060
 	ClearLocalFlag 0x0061
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000004
 	_0807E908 0x0004
 	Call sub_0806A958
 	CallWithArg sub_0807F93C, 0x0000f2f4
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	SetLocalFlag 0x0062
 	Jump script_08012FFA
 script_08012FD2:
-	BeginBlock 
+	BeginBlock
 	_0807E930 0x000d
 	_0807E908 0x0005
 	SetLocalFlag 0x0062
 	CallWithArg sub_0807F93C, 0x0000f2f4
 	Call sub_0806AA10
-	EndBlock 
+	EndBlock
 	CheckInventory1 0x0038
 	JumpIf script_08013006
 script_08012FFA:
@@ -32,16 +32,16 @@ script_08012FFA:
 	_0807EA94 
 	Jump script_08012FFA
 script_08013006:
-	_0807E944 
-	BeginBlock 
-	_0807E864 
+	_0807E944
+	BeginBlock
+	_0807E864
 	Call sub_0807DF28
-	EndBlock 
+	EndBlock
 	PlaySound SFX_TASK_COMPLETE
 	_0807F088 0x0038
-	WaitPlayerAction8 
+	WaitPlayerAction8
 	Wait 0x001e
-	_0807E8E4_0 
+	_0807E8E4_0
 	Call sub_0806AB9C
 	_0807E930 0x000b
 	Wait 0x003c
@@ -68,7 +68,7 @@ script_08013006:
 	_0807EA94 
 	_0807E908 0x0001
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 script_0801308A:
 	Call sub_0806A96C
 	JumpIfNot script_0801308A
@@ -87,13 +87,13 @@ script_080130B6:
 	JumpIfNot script_080130C4
 	Call sub_0806A9B0
 script_080130C4:
-	EndBlock 
+	EndBlock
 script_080130C6:
 	Call sub_0806A96C
 	JumpIfNot script_080130C6
-	_0807E864 
+	_0807E864
 	Call sub_0806AA18
-	_0807EA94 
-	_0807E878 
+	_0807EA94
+	_0807E878
 	_0807E908 0x0001
 	Jump script_080130C6