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

data/scripts/script_08014E14.inc

@@ -1,37 +1,37 @@
 SCRIPT_START script_08014E14
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0004
-	_0807E9D4 
+	_0807E9D4
 	DoPostScriptAction 0x000a
 	CallWithArg sub_0807F3D8, 0x00000000
-	EndBlock 
+	EndBlock
 script_08014E2C:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_08014E2C
-	_0807E864 
-	_0807EB74 
+	_0807E864
+	_0807EB74
 	CallWithArg sub_0807F3D8, 0x00000000
 	Call sub_08064428
-	_0807EA94 
-	_0807E878 
+	_0807EA94
+	_0807E878
 	Jump script_08014E2C
 	.2byte 0x0000
 SCRIPT_START script_08014E50
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
-	EndBlock 
+	EndBlock
 script_08014E64:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_08014E64
-	_0807E864 
+	_0807E864
 	Call sub_0807DF28
-	_0807EB74 
+	_0807EB74
 	CallWithArg sub_0807F78C, 0x00000022
-	_0807EA94 
-	_0807E3E8 
+	_0807EA94
+	_0807E3E8
 	JumpIfNot script_08014EBC
 	CallWithArg sub_0807F7C4, 0x00000022
 	JumpIfNot script_08014EB0
@@ -47,20 +47,20 @@ script_08014EB0:
 script_08014EB8:
 	MessageNoOverlap 0x0a02
 script_08014EBC:
-	_0807EA94 
+	_0807EA94
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	Jump script_08014E64
 	.2byte 0x0000
 SCRIPT_START script_08014ECC
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
-	EndBlock 
+	EndBlock
 script_08014EE0:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_08014EE0
 	_0807E864 
 	_0807EB74 
@@ -70,17 +70,17 @@ script_08014EE0:
 	Jump script_08014EE0
 	.2byte 0x0000
 SCRIPT_START script_08014EF8
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
 	_0807EB44 0x0004
 	_0807E930 0x000a
-	EndBlock 
+	EndBlock
 script_08014F0C:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_08014F0C
-	_0807E864 
-	_0807EB74 
+	_0807E864
+	_0807EB74
 	DoPostScriptAction 0x0000
 	MessageNoOverlap 0x200e
 	_0807EA94 
@@ -90,26 +90,26 @@ script_08014F0C:
 	Jump script_08014F0C
 	.2byte 0x0000
 SCRIPT_START script_08014F30
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
 	_0807EB44 0x0004
 	_0807E930 0x000e
-	EndBlock 
+	EndBlock
 	Call sub_08065914
 script_08014F4A:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_08014F4A
-	_0807E864 
+	_0807E864
 	Call sub_0807DF28
-	_0807EB74 
+	_0807EB74
 	DoPostScriptAction 0x0000
 	BeginBlock 
 	MessageNoOverlap 0x3b0b
 	CallWithArg sub_0807F854, 0x00010064
-	EndBlock 
-	_0807EA94 
-	_0807E3E8 
+	EndBlock
+	_0807EA94
+	_0807E3E8
 	JumpIfNot script_08014FA6
 	HasRupees 0x0064
 	JumpIfNot script_08014F9A
@@ -126,26 +126,26 @@ script_08014F9A:
 script_08014FA2:
 	MessageNoOverlap 0x3b0f
 script_08014FA6:
-	_0807EA94 
+	_0807EA94
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	_0807EB44 0x0004
 	_0807E930 0x000e
 	Jump script_08014F4A
 SCRIPT_START script_08014FBC
-	BeginBlock 
+	BeginBlock
 	SetEntityPositionRelative 0x01f8, 0x00e0
 	Call sub_08054564
-	EndBlock 
+	EndBlock
 script_08014FCC:
 	CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040
 	JumpIfNot script_08014FCC
-	_0807E864 
+	_0807E864
 	Call sub_0807F9A4
 	Call sub_0807DF28
 	StopBgm
 	_0807F0B4 0x0001
-	CameraTargetEntity 
+	CameraTargetEntity
 	StartPlayerScript script_080152B4
 	WaitForSomething2 0x00000001
 	MessageFromTargetPos 0x1301, 0x0002
@@ -168,10 +168,10 @@ script_08014FCC:
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
 	_0807EB28 0x1306
-	_0807EA94 
+	_0807EA94
 	StopBgm
 	StartPlayerScript script_080152DC
-	CameraTargetEntity 
+	CameraTargetEntity
 	_0807F0B4 0x0003
 	SetEntityPositionRelative 0x01f8, 0x0148
 	WaitForSomething2 0x00000001
@@ -204,11 +204,11 @@ script_08014FCC:
 	LoadRoomEntityList gUnk_080F7FC0
 	PlayBgm BGM_FIGHT_THEME
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 script_08015104:
 	CheckRoomFlag 0x0000
 	JumpIfNot script_08015104
-	_0807E864 
+	_0807E864
 	Call sub_0807F9A4
 	Call sub_0807DF28
 	StopBgm
@@ -238,51 +238,55 @@ script_08015104:
 	Wait 0x003c
 	PlaySound SFX_SECRET
 	_0807F0B4 0x0004
-	CameraTargetPlayer 
+	CameraTargetPlayer
 .ifdef JP
 	SetLocalFlag 0x008a
 .else
 .ifdef EU
 	SetLocalFlag 0x008a
+.else
+.ifdef DEMO_JP
+	SetLocalFlag 0x008a @ TODO deduplicate
 .else
 	SetLocalFlag 0x008c
 .endif
+.endif
 .endif
 	_0807EB28 0x130c
-	_0807EA94 
-	CameraTargetPlayer 
+	_0807EA94
+	CameraTargetPlayer
 	_0807E778 0x0004
 	_0807E80C 0x00000000
-	WaitFor_2 
+	WaitFor_2
 	Call sub_08053B3C
-	BeginBlock 
-	_0807E864 
+	BeginBlock
+	_0807E864
 	CallWithArg sub_0807F6E8, 0x00000008
-	MoveEntityToPlayer 
+	MoveEntityToPlayer
 	_0807F0B4 0x0004
-	CameraTargetEntity 
+	CameraTargetEntity
 	_0807E778 0x0100
-	DoFade4 
+	DoFade4
 	_0807E80C 0x00000000
-	EndBlock 
+	EndBlock
 	StartPlayerScript script_08015360
 	WaitForSomething2 0x00000001
 	LoadRoomEntityList gUnk_080F7CB0
 	_0807E778 0x0004
 	_0807E800 0x00000000
-	WaitFor_2 
+	WaitFor_2
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000010
-	BeginBlock 
-	_0807E8E4_2 
+	BeginBlock
+	_0807E8E4_2
 	_0807EB28 0x1315
-	EndBlock 
-	_0807EA94 
+	EndBlock
+	_0807EA94
 	_0807F0B4 0x0004
-	CameraTargetPlayer 
+	CameraTargetPlayer
 	Call sub_08054570
 	PlayBGM
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	DoPostScriptAction 0x0006
 SCRIPT_END