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

data/scripts/script_08016482.inc

@@ -1,31 +1,31 @@
 SCRIPT_START script_08016482
-	_0807E79C 
+	_0807E79C
 	Nop2 0x0080
-	DoFade4 
-	DoFade5 
-	DoFade6 
-	DoFade7 
+	DoFade4
+	DoFade5
+	DoFade6
+	DoFade7
 	_0807E800 0x00000000
 	_0807E80C 0x00000000
-	_0807E858_0 
-	_0807E864 
-	_0807E878 
-	_0807E888 
+	_0807E858_0
+	_0807E864
+	_0807E878
+	_0807E888
 	SetPlayerAction 0x00005408
 	StartPlayerScript script_08016384
 	_0807E8D4 0x03a0
-	_0807E8E4_0 
-	_0807E8E4_1 
-	_0807E8E4_2 
-	_0807E8E4_3 
+	_0807E8E4_0
+	_0807E8E4_1
+	_0807E8E4_2
+	_0807E8E4_3
 	_0807E908 0x0004
 	SetIntVariable 0x00000000
-	_0807E924 
+	_0807E924
 	_0807E930 0x0000
-	_0807E944 
+	_0807E944
 	_0807E974 0x0600
-	_0807E9D4 
-	_0807E9DC 
+	_0807E9D4
+	_0807E9DC
 	_0807E9E4 0x0000
 	_0807EA88 0x0001
 	_0807EA94 
@@ -35,17 +35,17 @@ SCRIPT_START script_08016482
 	MessageFromTargetTable 0x0601, 0x0602, 0x0603
 	MessageNoOverlapVar 
 	_0807EB28 0x0602
-	_0807EB38 
+	_0807EB38
 	_0807EB44 0x0000
 	_0807EB4C 0x0000, 0x0000
-	_0807EB74 
-	_0807EB8C 
+	_0807EB74
+	_0807EB8C
 	SetEntityDirection 0x0000
 	SetEntityDirectionWithAnimationState 0x0000
 	SetEntitySpeed 0x0100
 	SetEntity0x20 0x00018000
 	SetEntityPositionRelative 0x0000, 0x0000
-	MoveEntityToPlayer 
+	MoveEntityToPlayer
 	Nop3
 	_0807EC1C 0x0010
 	_0807EC64 0x0020
@@ -55,8 +55,8 @@ SCRIPT_START script_08016482
 	_0807ED24 0x0000, 0x0000, 0x0000
 	_0807EDD4 0x0000, 0x0000
 	_0807EE04 0x0000, 0x0000
-	_0807EE30 
-	_0807EEB4 
+	_0807EE30
+	_0807EEB4
 	_0807EEF4 0xfff0, 0x0014
 	DoPostScriptAction 0x0000
 	DoPostScriptAction2 0x0001
@@ -72,8 +72,8 @@ SCRIPT_START script_08016482
 	GetInventoryValue 0x0001
 	_0807F078 0x0001, 0x0002
 	_0807F088 0x0001
-	CameraTargetEntity 
-	CameraTargetPlayer 
+	CameraTargetEntity
+	CameraTargetPlayer
 	_0807F0B4 0x0007
 	_0807F0C8 0x003c, 0x0003
 SCRIPT_END