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

data/scripts/script_080157AC.inc

@@ -1,17 +1,17 @@
 SCRIPT_START script_080157AC
 	CheckPlayerInRegion 0x01f8, 0x0310, 0x2020
 	JumpIfNot script_080157AC
-	_0807E864 
+	_0807E864
 	Call sub_0807F9A4
 	Call sub_0807DF28
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000002
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 script_080157DA:
 	CheckPlayerInRegion 0x0250, 0x0230, 0x3040
 	JumpIfNot script_080157DA
-	_0807E864 
+	_0807E864
 	Call sub_0807F9A4
 	Call sub_0807DF28
 	Call sub_0807F3F8
@@ -21,7 +21,7 @@ script_080157DA:
 	StartPlayerScript script_080158F8
 	_0807F0B4 0x0001
 	SetEntityPositionRelative 0x0248, 0x0218
-	CameraTargetEntity 
+	CameraTargetEntity
 	Call sub_0807F5C0
 	WaitForSomething2 0x00000010
 	_0807E5F8 0x00000008
@@ -37,21 +37,21 @@ script_080157DA:
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000002
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	Call sub_08066F94
 	_0807E5F8 0x00000008
 script_08015880:
 	CheckRoomFlag 0x0000
 	JumpIfNot script_08015880
 script_08015888:
-	_0807EA94 
+	_0807EA94
 	ComparePlayerAction 0x001c
 	JumpIf script_08015888
-	_0807E864 
+	_0807E864
 	Call sub_0807DF28
 	_0807F0B4 0x0002
 	SetEntityPositionRelative 0x0248, 0x0208
-	CameraTargetEntity 
+	CameraTargetEntity
 	StartPlayerScript script_08015938
 	WaitForSomething2 0x00000010
 	MessageFromTargetPos 0x106a, 0x000c
@@ -68,14 +68,18 @@ script_08015888:
 .else
 .ifdef EU
 	SetLocalFlag 0x0089
+.else
+.ifdef DEMO_JP
+	SetLocalFlag 0x0089 @ TODO deduplicate
 .else
 	SetLocalFlag 0x008b
 .endif
+.endif
 .endif
 	Call sub_08066FB8
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	_0807F0B4 0x0004
-	CameraTargetPlayer 
+	CameraTargetPlayer
 	DoPostScriptAction 0x0006
 SCRIPT_END