Merge pull request #162 from octorock/variants

Add variants

41 files changed, 596 insertions, 13 deletions

diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc
index d7e5a9cc..7bce1e1b 100644
--- a/data/scripts/script_08008B5C.inc
+++ b/data/scripts/script_08008B5C.inc
@@ -39,11 +39,16 @@ SCRIPT_START script_08008BC0
 	_0807EB44 0x0004
 	DoPostScriptAction 0x000a
 	_0807E930 0x0000
+.ifdef EU
+	SetGlobalFlag 0x0061
+.endif
 	EndBlock 
 script_08008BD2:
 	_0807E944 
 	_0807E864 
+.ifndef EU
 	SetGlobalFlag 0x0061
+.endif
 	_0807E930 0x0004
 	Call sub_0807F2D4
 	_0807EA94 
diff --git a/data/scripts/script_0800939A.inc b/data/scripts/script_0800939A.inc
index 060c412b..31f82777 100644
--- a/data/scripts/script_0800939A.inc
+++ b/data/scripts/script_0800939A.inc
@@ -1,5 +1,13 @@
 SCRIPT_START script_0800939A
+.ifdef JP
+	CheckLocalFlag 0x00ac
+.else
+.ifdef EU
+	CheckLocalFlag 0x00ac
+.else
 	CheckLocalFlag 0x00ae
+.endif
+.endif
 	JumpIf script_0800943E
 	CheckInventory1 0x000d
 	JumpIf script_080093BC
@@ -18,7 +26,15 @@ script_080093BC:
 	Jump script_08009376
 script_080093DA:
 	SetIntVariable 0x00001d05
+.ifdef JP
+	CheckLocalFlag 0x00ab
+.else
+.ifdef EU
+	CheckLocalFlag 0x00ab
+.else
 	CheckLocalFlag 0x00ad
+.endif
+.endif
 	JumpIf script_080093EE
 	SetIntVariable 0x00001d04
 script_080093EE:
@@ -35,8 +51,18 @@ script_080093EE:
 	Wait 0x00b4
 	Call sub_0806D70C
 	Wait 0x0078
+.ifdef JP
+	SetLocalFlag 0x00ac
+	SetLocalFlag 0x00ab
+.else
+.ifdef EU
+	SetLocalFlag 0x00ac
+	SetLocalFlag 0x00ab
+.else
 	SetLocalFlag 0x00ae
 	SetLocalFlag 0x00ad
+.endif
+.endif
 	Call sub_0806D5D4
 	_0807EB8C 
 	TextboxNoOverlap 0x1d09
diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc
index 49342031..5f134afa 100644
--- a/data/scripts/script_08009464.inc
+++ b/data/scripts/script_08009464.inc
@@ -5,7 +5,15 @@ SCRIPT_START script_08009464
 	Wait 0x003c
 	Call sub_0806D70C
 	Wait 0x003c
+.ifdef JP
+	ClearLocalFlag 0x00ac
+.else
+.ifdef EU
+	ClearLocalFlag 0x00ac
+.else
 	ClearLocalFlag 0x00ae
+.endif
+.endif
 	Call sub_0806D620
 	Wait 0x003c
 	WaitPlayerAction8 
diff --git a/data/scripts/script_080098D4.inc b/data/scripts/script_080098D4.inc
index d87a79bd..1b17c7aa 100644
--- a/data/scripts/script_080098D4.inc
+++ b/data/scripts/script_080098D4.inc
@@ -7,9 +7,25 @@ script_080098D8:
 script_080098E0:
 	CheckInventory1 0x003c
 	JumpIfNot script_080098E0
-	CheckLocalFlag 0x005d
+.ifdef JP
+	CheckLocalFlag 0x5b
+.else
+.ifdef EU
+	CheckLocalFlag 0x5b
+.else
+	CheckLocalFlag 0x5d
+.endif
+.endif
 	JumpIf script_08009910
+.ifdef JP
+	SetLocalFlag 0x005b
+.else
+.ifdef EU
+	SetLocalFlag 0x005b
+.else
 	SetLocalFlag 0x005d
+.endif
+.endif
 	_0807E864 
 	Call sub_0807F9A4
 	Call sub_0807DF28
diff --git a/data/scripts/script_08009E88.inc b/data/scripts/script_08009E88.inc
index d21a9d8e..4368b582 100644
--- a/data/scripts/script_08009E88.inc
+++ b/data/scripts/script_08009E88.inc
@@ -2,7 +2,15 @@ SCRIPT_START script_08009E88
 	BeginBlock 
 	Call sub_0807DF28
 	_0807E864 
+.ifdef JP
+	SetLocalFlag 0x009e
+.else
+.ifdef EU
+	SetLocalFlag 0x009e
+.else
 	SetLocalFlag 0x009f
+.endif
+.endif
 	EndBlock 
 	Wait 0x003c
 	_0807E778 0x0004
diff --git a/data/scripts/script_0800A0FC.inc b/data/scripts/script_0800A0FC.inc
index 80b3c50f..baedeedc 100644
--- a/data/scripts/script_0800A0FC.inc
+++ b/data/scripts/script_0800A0FC.inc
@@ -7,7 +7,9 @@ script_0800A0FE:
 	_0807E864 
 	Call sub_0807DF28
 	StopBgm
+.ifndef EU
 	Call sub_0807FBFC
+.endif
 	SetEntityPositionRelative 0x00b0, 0x0058
 	Call sub_0807F844
 	_0807E8E4_3 
@@ -22,4 +24,6 @@ script_0800A0FE:
 	CallWithArg sub_0806DA1C, 0x00000006
 	DoPostScriptAction 0x0006
 SCRIPT_END
+.ifndef EU
 	.2byte 0x0000
+.endif
diff --git a/data/scripts/script_0800B0D0.inc b/data/scripts/script_0800B0D0.inc
index 9ad7992a..fa5ccadf 100644
--- a/data/scripts/script_0800B0D0.inc
+++ b/data/scripts/script_0800B0D0.inc
@@ -28,7 +28,9 @@ script_0800B134:
 	CallWithArg sub_0806BC94, 0x00000004
 	Call sub_0807F650
 	_0807E9F0 
+.ifndef EU
 	JumpIfNot script_0800B160
+.endif
 	Call sub_0806BCC0
 script_0800B160:
 	Call sub_0807DF50
diff --git a/data/scripts/script_0800B200.inc b/data/scripts/script_0800B200.inc
index 3dfffa93..ebd489df 100644
--- a/data/scripts/script_0800B200.inc
+++ b/data/scripts/script_0800B200.inc
@@ -1,7 +1,15 @@
 SCRIPT_START script_0800B200
 	BeginBlock 
 	_0807E5F8 0x00000000
+.ifdef JP
+	CheckLocalFlag 0x001e
+.else
+.ifdef EU
+	CheckLocalFlag 0x001e
+.else
 	CheckLocalFlag 0x001d
+.endif
+.endif
 	JumpIf script_0800B252
 	SetEntitySpeed 0x00c0
 	EndBlock 
@@ -18,7 +26,15 @@ script_0800B216:
 	CameraTargetPlayer 
 	Wait 0x0008
 	_0807E878 
+.ifdef JP
+	CheckLocalFlag 0x001e
+.else
+.ifdef EU
+	CheckLocalFlag 0x001e
+.else
 	CheckLocalFlag 0x001d
+.endif
+.endif
 	JumpIfNot script_0800B216
 script_0800B252:
 SCRIPT_END
diff --git a/data/scripts/script_0800B308.inc b/data/scripts/script_0800B308.inc
index 12365628..a283ba91 100644
--- a/data/scripts/script_0800B308.inc
+++ b/data/scripts/script_0800B308.inc
@@ -1,6 +1,14 @@
 SCRIPT_START script_0800B308
 	BeginBlock 
+.ifdef JP
+	CheckLocalFlag 0x001e
+.else
+.ifdef EU
+	CheckLocalFlag 0x001e
+.else
 	CheckLocalFlag 0x001d
+.endif
+.endif
 	JumpIf script_0800B39C
 	DoPostScriptAction 0x0001
 	SetEntitySpeed 0x0040
@@ -36,7 +44,15 @@ script_0800B350:
 	CheckKinstoneFused 0x0008
 	JumpIfNot script_0800B350
 	EndBlock 
+.ifdef JP
+	SetLocalFlag 0x001e
+.else
+.ifdef EU
+	SetLocalFlag 0x001e
+.else
 	SetLocalFlag 0x001d
+.endif
+.endif
 	PlaySound SFX_SECRET
 script_0800B39C:
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/script_0800D6D0.inc b/data/scripts/script_0800D6D0.inc
index 40d9c3a4..8150664a 100644
--- a/data/scripts/script_0800D6D0.inc
+++ b/data/scripts/script_0800D6D0.inc
@@ -1,11 +1,27 @@
 SCRIPT_START script_0800D6D0
 	BeginBlock 
+.ifdef JP
+	CheckLocalFlag 0x00f0
+.else
+.ifdef EU
+	CheckLocalFlag 0x00f0
+.else
 	CheckLocalFlag 0x00f3
+.endif
+.endif
 	JumpIf script_0800D6E8
 	DoPostScriptAction 0x0008
 	EndBlock 
 script_0800D6E0:
+.ifdef JP
+	CheckLocalFlag 0x00f0
+.else
+.ifdef EU
+	CheckLocalFlag 0x00f0
+.else
 	CheckLocalFlag 0x00f3
+.endif
+.endif
 	JumpIfNot script_0800D6E0
 script_0800D6E8:
 	DoPostScriptAction 0x0007
diff --git a/data/scripts/script_0800D6F0.inc b/data/scripts/script_0800D6F0.inc
index fb84a2c7..63cfa930 100644
--- a/data/scripts/script_0800D6F0.inc
+++ b/data/scripts/script_0800D6F0.inc
@@ -1,11 +1,27 @@
 SCRIPT_START script_0800D6F0
 	BeginBlock 
+.ifdef JP
+	CheckLocalFlag 0x00f2
+.else
+.ifdef EU
+	CheckLocalFlag 0x00f2
+.else
 	CheckLocalFlag 0x00f5
+.endif
+.endif
 	JumpIf script_0800D6E8
 	DoPostScriptAction 0x0008
 	EndBlock 
 script_0800D700:
+.ifdef JP
+	CheckLocalFlag 0x00f2
+.else
+.ifdef EU
+	CheckLocalFlag 0x00f2
+.else
 	CheckLocalFlag 0x00f5
+.endif
+.endif
 	JumpIfNot script_0800D700
 	DoPostScriptAction 0x0007
 SCRIPT_END
diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc
index abd2f9e7..b00339ee 100644
--- a/data/scripts/script_0800E0BC.inc
+++ b/data/scripts/script_0800E0BC.inc
@@ -294,6 +294,8 @@ script_0800E484:
 	_0807EA94 
 	_0807E878 
 	Jump script_0800E484
+
+
 SCRIPT_START script_0800E4A4
 	BeginBlock 
 	Call sub_0807F354
@@ -301,10 +303,25 @@ SCRIPT_START script_0800E4A4
 	CheckLocalFlag 0x007c
 	JumpIf script_0800E4FA
 script_0800E4B6:
+.ifdef JP
+	CheckPlayerInRegion 0x0088, 0x0100, 0x0820
+.else
+.ifdef EU
+	CheckPlayerInRegion 0x0088, 0x0100, 0x0820
+.else
 	CheckPlayerInRegion 0x0088, 0x00f8, 0x0820
+.endif
+.endif
 	JumpIfNot script_0800E4B6
 	BeginBlock 
-	_0807E864 
+	_0807E864
+.ifdef JP
+	Call sub_0805E544
+.else
+.ifdef EU
+	Call sub_0805E544
+.endif
+.endif
 	EndBlock 
 	Call sub_0807F3F8
 	Wait 0x003c
@@ -320,6 +337,13 @@ script_0800E4B6:
 	BeginBlock 
 	PlayBgm BGM_FIGHT_THEME2
 	SetLocalFlag 0x007c
+.ifdef JP
+	Call UnfreezeTime
+.else
+.ifdef EU
+	Call UnfreezeTime
+.endif
+.endif
 script_0800E4FA:
 	_0807E878 
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc
index 8668612d..bf828afc 100644
--- a/data/scripts/script_0800F554.inc
+++ b/data/scripts/script_0800F554.inc
@@ -105,6 +105,8 @@ script_0800F662:
 	DoPostScriptAction 0x0000
 	Jump script_0800F662
 	.2byte 0x0000
+
+
 SCRIPT_START script_0800F688
 	BeginBlock 
 	_0807EB44 0x0004
@@ -119,7 +121,15 @@ script_0800F6A0:
 	_0807E864 
 	_0807EB74 
 	CallWithArg sub_0807F3D8, 0x00000004
+.ifdef JP
+	CheckLocalFlag 0x00ca
+.else
+.ifdef EU
+	CheckLocalFlag 0x00ca
+.else
 	CheckLocalFlag 0x00cd
+.endif
+.endif
 	JumpIf script_0800F6C4
 	TextboxNoOverlap 0x2512
 	Jump script_0800F6C8
@@ -140,7 +150,15 @@ SCRIPT_START script_0800F6E0
 	Call sub_08062788
 	EndBlock 
 script_0800F6F4:
+.ifdef JP
+	CheckLocalFlag 0x00ca
+.else
+.ifdef EU
+	CheckLocalFlag 0x00ca
+.else
 	CheckLocalFlag 0x00cd
+.endif
+.endif
 	JumpIf script_0800F718
 	CheckEntityInteractType 
 	JumpIfNot script_0800F6F4
diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc
index 2d686bbc..bd45a2ff 100644
--- a/data/scripts/script_0800F724.inc
+++ b/data/scripts/script_0800F724.inc
@@ -3,12 +3,30 @@ SCRIPT_START script_0800F724
 	DoPostScriptAction 0x0008
 	EndBlock 
 script_0800F72C:
+.ifdef JP
+	CheckLocalFlag 0x00ca
+.else
+.ifdef EU
+	CheckLocalFlag 0x00ca
+.else
 	CheckLocalFlag 0x00cd
+.endif
+.endif
 	JumpIfNot script_0800F72C
 	DoPostScriptAction 0x0007
 	Jump script_0800F584
+
+
 SCRIPT_START script_0800F73C
+.ifdef JP
+	CheckLocalFlag 0x00ca
+.else
+.ifdef EU
+	CheckLocalFlag 0x00ca
+.else
 	CheckLocalFlag 0x00cd
+.endif
+.endif
 	JumpIf script_0800FA4C
 	_0807E864 
 	Call sub_0807DF28
@@ -168,7 +186,15 @@ SCRIPT_START script_0800F73C
 	Wait 0x000a
 	_0807E5F8 0x00000002
 	Call sub_08063C44
+.ifdef JP
+	SetLocalFlag 0x00ca
+.else
+.ifdef EU
+	SetLocalFlag 0x00ca
+.else
 	SetLocalFlag 0x00cd
+.endif
+.endif
 	Call sub_0807DF50
 	_0807E878 
 script_0800FA4C:
diff --git a/data/scripts/script_0800FD0C.inc b/data/scripts/script_0800FD0C.inc
index 0720943c..7b8bb425 100644
--- a/data/scripts/script_0800FD0C.inc
+++ b/data/scripts/script_0800FD0C.inc
@@ -1,11 +1,27 @@
 SCRIPT_START script_0800FD0C
+.ifdef JP
+	CheckLocalFlag 0x00ca
+.else
+.ifdef EU
+	CheckLocalFlag 0x00ca
+.else
 	CheckLocalFlag 0x00cd
+.endif
+.endif
 	JumpIf script_0800FD50
 	WaitForSomething2 0x00000010
 script_0800FD1A:
 	CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040
 	JumpIfNot script_0800FD1A
+.ifdef JP
+	CheckLocalFlag 0x00ca
+.else
+.ifdef EU
+	CheckLocalFlag 0x00ca
+.else
 	CheckLocalFlag 0x00cd
+.endif
+.endif
 	JumpIf script_0800FD5C
 	_0807E864 
 	Call sub_0807F9A4
diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc
index 2d79be0d..5f45e217 100644
--- a/data/scripts/script_0800FF74.inc
+++ b/data/scripts/script_0800FF74.inc
@@ -4,17 +4,39 @@ SCRIPT_START script_0800FF74
 	_0807E9D4 
 	CallWithArg sub_0807F3D8, 0x00000008
 	Call sub_080644A4
+.ifdef JP
+	ClearLocalFlag 0x00c4
+.else
+.ifndef EU
 	ClearLocalFlag 0x00c7
+.endif
+.endif
 	EndBlock 
 script_0800FF92:
 	EndBlock 
 	BeginBlock 
 	DoPostScriptAction 0x000a
+.ifdef JP
+	CheckLocalFlag 0x00cb
+.else
+.ifdef EU
+	CheckLocalFlag 0x00cb
+.else
 	CheckLocalFlag 0x00ce
+.endif
+.endif
 	JumpIf script_0800FFCC
 	DoPostScriptAction 0x000b
 	Call sub_08064198
+.ifdef JP
+	CheckLocalFlag 0x00c4
+.else
+.ifdef EU
+	CheckLocalFlag 0x00c4
+.else
 	CheckLocalFlag 0x00c7
+.endif
+.endif
 	JumpIfNot script_0800FFCC
 	Call sub_08064488
 	CheckPlayerInRegion2 0x4040
@@ -25,7 +47,15 @@ script_0800FFCC:
 	CheckEntityInteractType 
 	JumpIfNot script_0800FF92
 	EndBlock 
+.ifdef JP
+	SetLocalFlag 0x00c4
+.else
+.ifdef EU
+	SetLocalFlag 0x00c4
+.else
 	SetLocalFlag 0x00c7
+.endif
+.endif
 	_0807E864 
 	_0807EB74 
 	CallWithArg sub_0807F3D8, 0x00000008
@@ -35,7 +65,15 @@ script_0800FFCC:
 	_0807EA94 
 	Jump script_08010060
 script_0800FFF8:
+.ifdef JP
+	CheckLocalFlag 0x00cb
+.else
+.ifdef EU
+	CheckLocalFlag 0x00cb
+.else
 	CheckLocalFlag 0x00ce
+.endif
+.endif
 	JumpIfNot script_0801000A
 	TextboxNoOverlap 0x340b
 	_0807EA94 
@@ -60,7 +98,15 @@ script_08010014:
 	_0807EDD4 0x0018, 0x0108
 	_0807EB44 0x0002
 	CallWithArg sub_0807F3D8, 0x00000008
+.ifdef JP
+	SetLocalFlag 0x00cb
+.else
+.ifdef EU
+	SetLocalFlag 0x00cb
+.else
 	SetLocalFlag 0x00ce
+.endif
+.endif
 script_08010060:
 	Call sub_080644A4
 	CallWithArg sub_0807F5B0, 0x0000000a
diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc
index 7e020262..d0d023f8 100644
--- a/data/scripts/script_08010264.inc
+++ b/data/scripts/script_08010264.inc
@@ -501,7 +501,13 @@ script_08010860:
 	TextboxNoOverlap 0x2c21
 	Jump script_080108B2
 script_080108AA:
+.ifdef USA
 	SetLocalFlag 0x00fa
+.else
+.ifdef DEMO
+	SetLocalFlag 0x00fa
+.endif
+.endif
 	TextboxNoOverlap 0x2c20
 script_080108B2:
 	_0807EA94 
diff --git a/data/scripts/script_08010964.inc b/data/scripts/script_08010964.inc
index 72d28a10..908a6a23 100644
--- a/data/scripts/script_08010964.inc
+++ b/data/scripts/script_08010964.inc
@@ -14,10 +14,20 @@ script_08010994:
 	Call sub_0807DF50
 	_0807E878 
 	Jump script_08010964
+
+
 SCRIPT_START script_080109A0
 	BeginBlock 
 	EndBlock 
+.ifdef JP
+	CheckLocalFlag 0x00ce
+.else
+.ifdef EU
+	CheckLocalFlag 0x00ce
+.else
 	CheckLocalFlag 0x00d1
+.endif
+.endif
 	JumpIf script_080109EA
 	CheckPlayerInRegion2 0x0808
 	JumpIfNot script_080109A0
diff --git a/data/scripts/script_08011128.inc b/data/scripts/script_08011128.inc
index c8e34389..7e9e0db4 100644
--- a/data/scripts/script_08011128.inc
+++ b/data/scripts/script_08011128.inc
@@ -2,6 +2,15 @@ SCRIPT_START script_08011128
 	BeginBlock 
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
+.ifdef JP
+	_0807E9D4 
+	DoPostScriptAction 0x000a
+.else
+.ifdef EU
+	_0807E9D4 
+	DoPostScriptAction 0x000a
+.endif
+.endif
 	EndBlock 
 script_08011134:
 	CheckPlayerInRegion 0x01f8, 0x0048, 0x1040
@@ -35,3 +44,10 @@ script_08011134:
 	_0807E5F8 0x00000008
 	DoPostScriptAction 0x0006
 SCRIPT_END
+.ifdef JP
+	.2byte 0x0000
+.else
+.ifdef EU
+	.2byte 0x0000
+.endif
+.endif
diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc
index 3f7fee61..50b0e0d3 100644
--- a/data/scripts/script_0801194C.inc
+++ b/data/scripts/script_0801194C.inc
@@ -127,6 +127,7 @@ script_08011AC4:
 	_0807EA94 
 	_0807E878 
 	Jump script_08011AC4
+
 SCRIPT_START script_08011AE4
 	CheckRoomFlag 0x000f
 	JumpIfNot script_08011AE4
@@ -136,7 +137,15 @@ SCRIPT_START script_08011AE4
 script_08011AFA:
 	TextboxNoOverlapFollowPos 0x1321, 0x0007
 	_0807EA94 
+.ifdef JP
+	SetLocalFlag 0x0011
+.else
+.ifdef EU
+	SetLocalFlag 0x0011
+.else
 	SetLocalFlag 0x0010
+.endif
+.endif
 	CallWithArg sub_0806DA1C, 0x00000003
 	_0807E878 
 	Call sub_0807DF50
diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc
index 93e409c8..cbe9a609 100644
--- a/data/scripts/script_08011C7C.inc
+++ b/data/scripts/script_08011C7C.inc
@@ -325,6 +325,8 @@ script_0801200C:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0001
 	Jump script_08011FFE
+
+
 SCRIPT_START script_08012024
 	BeginBlock 
 	Call sub_08064828
@@ -360,8 +362,14 @@ script_08012070:
 	TextboxNoOverlap 0x3125
 	_0807EA94 
 	_0807F034 0x0031
-	WaitPlayerAction8 
+	WaitPlayerAction8
+.ifdef USA
+	Call sub_0807FC24
+.else
+.ifdef DEMO
 	Call sub_0807FC24
+.endif
+.endif
 	Jump script_0801209E
 script_0801209A:
 	TextboxNoOverlap 0x3127
@@ -371,7 +379,8 @@ script_0801209E:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0001
 	Jump script_0801203A
-	.2byte 0x0000
+	.align 2, 0
+
 SCRIPT_START script_080120B0
 	BeginBlock 
 	Call sub_08064928
@@ -407,8 +416,14 @@ script_080120FC:
 	TextboxNoOverlap 0x3119
 	_0807EA94 
 	_0807F034 0x002f
-	WaitPlayerAction8 
+	WaitPlayerAction8
+.ifdef USA
+	Call sub_0807FC24
+.else 
+.ifdef DEMO
 	Call sub_0807FC24
+.endif
+.endif
 	Jump script_0801212A
 script_08012126:
 	TextboxNoOverlap 0x311b
@@ -418,7 +433,8 @@ script_0801212A:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0001
 	Jump script_080120C6
-	.2byte 0x0000
+	.align 2, 0
+
 SCRIPT_START script_0801213C
 	BeginBlock 
 	Call sub_08064A28
@@ -455,7 +471,13 @@ script_08012188:
 	_0807EA94 
 	_0807F034 0x0030
 	WaitPlayerAction8 
+.ifdef USA
+	Call sub_0807FC24
+.else
+.ifdef DEMO
 	Call sub_0807FC24
+.endif
+.endif
 	Jump script_080121B6
 script_080121B2:
 	TextboxNoOverlap 0x3121
@@ -465,7 +487,8 @@ script_080121B6:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0001
 	Jump script_08012152
-	.2byte 0x0000
+	.align 2, 0
+
 SCRIPT_START script_080121C8
 	BeginBlock 
 	Call sub_08064828
@@ -584,4 +607,4 @@ script_080122EC:
 	_0807E878 
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.2byte 0x0000
+	.align 2, 0
diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc
index 28277936..c18f6787 100644
--- a/data/scripts/script_08012430.inc
+++ b/data/scripts/script_08012430.inc
@@ -18,12 +18,20 @@ script_08012440:
 	SetLocalFlag 0x00b3
 	_0807F034 0x0062
 	WaitPlayerAction8 
+.ifdef USA
 	SetLocalFlag 0x00d0
+.else
+.ifdef DEMO
+	SetLocalFlag 0x00d0
+.endif
+.endif
 script_08012474:
 	_0807E878 
 	_0807E930 0x0000
 	Jump script_08012440
-	.2byte 0x0000
+	.align 2, 0
+
+
 SCRIPT_START script_08012480
 	BeginBlock 
 	Call sub_08054564
diff --git a/data/scripts/script_08012C68.inc b/data/scripts/script_08012C68.inc
index 033fc43f..b8aa1e2a 100644
--- a/data/scripts/script_08012C68.inc
+++ b/data/scripts/script_08012C68.inc
@@ -15,6 +15,7 @@ script_08012C7E:
 	SetGlobalFlag 0x0022
 	_0807E878 
 	Jump script_08012C7E
+
 SCRIPT_START script_08012C98
 	CheckGlobalFlag 0x0014
 	JumpIfNot script_08012C98
@@ -30,7 +31,15 @@ script_08012CA0:
 	Call sub_0807DF28
 	_0807EB28 0x2202
 	_0807EA94 
+.ifdef JP
+	SetLocalFlag 0x003a
+.else
+.ifdef EU
+	SetLocalFlag 0x003a
+.else
 	SetLocalFlag 0x003b
+.endif
+.endif
 	Call sub_0807DF50
 	_0807E878 
 script_08012CD2:
diff --git a/data/scripts/script_08012CD8.inc b/data/scripts/script_08012CD8.inc
index 59f22008..900f0de5 100644
--- a/data/scripts/script_08012CD8.inc
+++ b/data/scripts/script_08012CD8.inc
@@ -12,7 +12,15 @@ SCRIPT_START script_08012CD8
 	EndBlock 
 	_0807EB28 0x2203
 	_0807EA94 
+.ifdef JP
+	SetLocalFlag 0x003d
+.else
+.ifdef EU
+	SetLocalFlag 0x003d
+.else
 	SetLocalFlag 0x003e
+.endif
+.endif
 	Call sub_0807DF50
 	_0807E878 
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/script_08012D70.inc b/data/scripts/script_08012D70.inc
index 1f0dfcfe..8b936911 100644
--- a/data/scripts/script_08012D70.inc
+++ b/data/scripts/script_08012D70.inc
@@ -8,7 +8,15 @@ SCRIPT_START script_08012D70
 	WaitForSomething2 0x00000001
 	_0807EB28 0x132d
 	_0807EA94 
+.ifdef JP
+	SetLocalFlag 0x0015
+.else
+.ifdef EU
+	SetLocalFlag 0x0015
+.else
 	SetLocalFlag 0x0014
+.endif
+.endif
 	Call sub_0807DF50
 	_0807E878 
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc
index 9a63f5c8..206ac542 100644
--- a/data/scripts/script_080138B4.inc
+++ b/data/scripts/script_080138B4.inc
@@ -77,9 +77,11 @@ script_080138D0:
 	TextboxNoOverlapFollowPos 0x0505, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00040000
+.ifndef EU
 	_0807F0B4 0x0002
 	SetEntityPositionRelative 0x00e8, 0x00d8
 	CameraTargetEntity 
+.endif
 	Call sub_0806DC3C
 	CallWithArg sub_0807F244, 0x00010001
 	CallWithArg sub_0807F29C, gUnk_080049FE
@@ -87,7 +89,9 @@ script_080138D0:
 	CallWithArg sub_0807F29C, 0x00000000
 	Call sub_0806DC58
 script_08013A8E:
+.ifndef EU
 	CheckRoomFlag 0x0004
 	JumpIfNot script_08013A8E
+.endif
 	CallWithArg sub_0805DDEC, 0x00000001
 	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_08013AA6.inc b/data/scripts/script_08013AA6.inc
index 484789c1..37961ee2 100644
--- a/data/scripts/script_08013AA6.inc
+++ b/data/scripts/script_08013AA6.inc
@@ -1,6 +1,12 @@
 SCRIPT_START script_08013AA6
 	Call sub_0807F3F8
 	Wait 0x003c
+.ifdef EU
+	_0807F0B4 0x0007
+	SetEntityPositionRelative 0x00e8, 0x00a8
+	CameraTargetEntity 
+	Wait 0x003c
+.endif
 	_0807E5F8 0x00000008
 	Wait 0x0078
 	CallWithArg sub_0805DE18, 0x00000001
diff --git a/data/scripts/script_08013BE8.inc b/data/scripts/script_08013BE8.inc
index ea87d86b..b6c87eec 100644
--- a/data/scripts/script_08013BE8.inc
+++ b/data/scripts/script_08013BE8.inc
@@ -25,7 +25,9 @@ script_08013C32:
 	Call sub_0807F934
 	DoPostScriptAction 0x000a
 	CallWithArg sub_080962F8, 0x00000000
+.ifndef EU
 	CallWithArg sub_0807F8E8, 0x00000004
+.endif
 	EndBlock 
 script_08013C58:
 	EndBlock 
@@ -55,4 +57,4 @@ script_08013C98:
 	DoPostScriptAction 0x0008
 	DoPostScriptAction 0x0006
 SCRIPT_END
-	.2byte 0x0000
+	.align 2, 0
diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc
index 56ab6d41..569bc7d0 100644
--- a/data/scripts/script_08014248.inc
+++ b/data/scripts/script_08014248.inc
@@ -7,7 +7,9 @@ SCRIPT_START script_08014248
 script_08014264:
 	CallWithArg sub_08095EAC, 0x00000001
 	Jump script_08014264
-	.2byte 0x0000
+	.align 2, 0
+
+.ifndef EU
 SCRIPT_START script_08014274
 	BeginBlock 
 	DoPostScriptAction 0x0008
@@ -28,3 +30,4 @@ script_08014298:
 	_0807E878 
 	Jump script_08014298
 	.2byte 0x0000
+.endif
diff --git a/data/scripts/script_080143C0.inc b/data/scripts/script_080143C0.inc
index 1f682585..652ee0ff 100644
--- a/data/scripts/script_080143C0.inc
+++ b/data/scripts/script_080143C0.inc
@@ -27,10 +27,12 @@ script_080143FA:
 	_0807EA94 
 	SetIntVariable 0x00000303
 	Call sub_0807F420
+.ifndef EU
 	Wait 0x001e
 	_0807EB8C 
 	TextboxNoOverlap 0x2c22
 	_0807EA94 
+.endif
 script_0801443E:
 	_0807E930 0x0004
 	_0807E908 0x0001
diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc
index ce1cc804..10fbfc52 100644
--- a/data/scripts/script_08014450.inc
+++ b/data/scripts/script_08014450.inc
@@ -35,7 +35,13 @@ script_080144B8:
 	Jump script_080144C8
 script_080144C0:
 	SetLocalFlag 0x0093
+.ifdef USA
 	SetLocalFlag 0x00d3
+.else
+.ifdef DEMO
+	SetLocalFlag 0x00d3
+.endif
+.endif
 script_080144C8:
 	ModRupees 0xfff6
 	TextboxNoOverlapFollow 0x420c
@@ -54,6 +60,13 @@ script_080144FC:
 	_0807E878 
 	CheckRoomFlag 0x0000
 	JumpIfNot script_08014462
+.ifdef USA
+	_0807E9DC 
+.else
+.ifdef DEMO
 	_0807E9DC 
+.endif
+.endif
 SCRIPT_END
-	.2byte 0x0000
+	.align 2, 0
+
diff --git a/data/scripts/script_080145B0.inc b/data/scripts/script_080145B0.inc
index 8cc995b4..1aa48d71 100644
--- a/data/scripts/script_080145B0.inc
+++ b/data/scripts/script_080145B0.inc
@@ -9,10 +9,19 @@ script_080145C2:
 	JumpIfNot script_080145C2
 	_0807E864 
 	ClearRoomFlag 0x0005
+.ifdef EU
+	Wait 0x0018
+	_0807E8E4_1 
+	_0807EB44 0x0006
+.else
 	Wait 0x000c
 	_0807EB8C 
+.endif
 	TextboxNoOverlapFollowPos 0x432e, 0x000c
 	_0807EA94 
+.ifdef EU
+	Wait 0x0018
+.endif
 	_0807E878 
 	Jump script_080145C2
 script_080145E4:
diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc
index 0e32d77a..0f68e289 100644
--- a/data/scripts/script_080145E8.inc
+++ b/data/scripts/script_080145E8.inc
@@ -5,6 +5,36 @@ SCRIPT_START script_080145E8
 	DoPostScriptAction 0x0000
 	EndBlock 
 script_080145F8:
+.ifdef EU
+	CheckPlayerInRegion 0x00a8, 0x0054, 0x080c
+	JumpIfNot script_080145F8
+	ComparePlayerAnimationState 0x0000
+	JumpIfNot script_080145F8
+	CheckRoomFlag 0x0009
+	JumpIf script_08014632
+	_0807E864 
+	Wait 0x0018
+	_0807E8E4_3 
+	_0807EB44 0x0002
+	TextboxNoOverlapFollowPos 0x432b, 0x000c
+	_0807EA94 
+	Wait 0x0018
+	_0807E878 
+	Jump script_080145F8
+script_08014632:
+	CheckRoomFlag 0x0000
+	JumpIfNot script_08014632
+	_0807E864 
+	Call sub_0807DF28
+script_08014642:
+	CheckRoomFlag 0x0009
+	JumpIf script_08014642
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	Call sub_0807DF50
+	_0807E878 
+	Jump script_080145F8
+.else
 	CheckRoomFlag 0x0000
 	JumpIfNot script_080145F8
 	_0807E864 
@@ -17,6 +47,9 @@ script_08014608:
 	Call sub_0807DF50
 	_0807E878 
 	Jump script_080145F8
+.endif
+	.align 2, 0
+
 SCRIPT_START script_08014628
 	BeginBlock 
 	_0807E9D4 
@@ -26,9 +59,52 @@ SCRIPT_START script_08014628
 	EndBlock 
 script_0801463A:
 	_0807E30C 
+.ifdef EU
+	JumpIf script_080146E2
+.else
 	JumpIf script_080146A0
+.endif
 	TestBit 0x00000004
 	JumpIf script_0801477A
+.ifdef EU
+	CheckPlayerInRegion 0x0078, 0x0078, 0x0810
+	JumpIfNot script_0801463A
+	CheckRoomFlag 0x0009
+	JumpIfNot script_0801463A
+	_0807E864 
+	_0807EB28 0x431f
+	_0807EA94 
+script_0801469A:
+	StartPlayerScript script_080147DC
+	Wait 0x0010
+	_0807E5F8 0x00000002
+	WaitForSomething2 0x00000001
+	_0807E878 
+	Jump script_0801463A
+script_080146E2:
+	_0807E864 
+	_0807E930 0x0008
+	Wait 0x0020
+	_0807E930 0x0002
+	CheckGlobalFlag 0x0059
+	JumpIf script_0801472E_2
+	CheckRoomFlag 0x0009
+	JumpIf script_080146F4
+	CheckLocalFlag 0x005c
+	JumpIfNot script_080146FE
+	CheckLocalFlag 0x005e
+	JumpIfNot script_0801474A
+	CheckRoomFlag 0x0006
+	JumpIf script_0801472E
+	CheckLocalFlag 0x005f
+	JumpIf script_08014720
+	Call sub_08088574
+	SetRoomFlag 0x000a
+	Jump script_0801473C
+script_0801472E_2:
+	TextboxNoOverlapFollowPos 0x432f, 0x000c
+	Jump script_080147CE @ TODO script_08014816
+.else
 	CheckRoomFlag 0x0004
 	JumpIf script_08014672
 	Call sub_0808861C
@@ -40,7 +116,11 @@ script_0801463A:
 	TextboxNoOverlapFollowPos 0x432b, 0x000c
 	Jump script_080147CE
 script_08014672:
+.ifdef JP
+	CheckPlayerInRegion 0x0078, 0x0078, 0x0810
+.else
 	Call sub_08088658
+.endif
 	JumpIfNot script_0801463A
 	_0807E864 
 	_0807EB28 0x431f
@@ -74,12 +154,22 @@ script_080146C6:
 	Call sub_08088574
 	SetRoomFlag 0x0009
 	Jump script_0801473C
+.endif
+
 script_080146F4:
 	TextboxNoOverlapFollowPos 0x431e, 0x000c
 	Jump script_080147CE
 script_080146FE:
+.ifdef EU
+	SetRoomFlag 0x000A
+.else
 	SetRoomFlag 0x0009
+.endif
 	SetLocalFlag 0x005c
+.ifdef EU
+script_0801474A:
+	SetRoomFlag 0x000a
+.endif
 	TextboxNoOverlapFollowPos 0x4305, 0x000c
 	_0807EA94 
 	_0807E3BC 0x0001
@@ -87,11 +177,19 @@ script_080146FE:
 	TextboxNoOverlapFollowPos 0x4306, 0x000c
 	Jump script_0801473C
 script_08014720:
+.ifdef EU
+	SetRoomFlag 0x000A
+.else
 	SetRoomFlag 0x0009
+.endif
 	Call sub_08088504
 	Jump script_0801473C
 script_0801472E:
+.ifdef EU
+	SetRoomFlag 0x000A
+.else
 	SetRoomFlag 0x0009
+.endif
 	ClearRoomFlag 0x0006
 	Call sub_08088544
 script_0801473C:
@@ -107,11 +205,19 @@ script_08014754:
 	JumpIfNot script_08014754
 	ClearRoomFlag 0x0003
 	_0807EA94 
+.ifdef EU
+	SetRoomFlag 0x0009
+.else
 	SetRoomFlag 0x0004
+.endif
 	TextboxNoOverlapFollowPos 0x431e, 0x000c
 	Jump script_080147CE
 script_08014770:
+.ifdef EU
+	SetRoomFlag 0x000A
+.else
 	SetRoomFlag 0x0009
+.endif
 	_0807EA94 
 	Jump script_080147CE
 script_0801477A:
@@ -137,11 +243,19 @@ script_080147B4:
 	_0807E930 0x0002
 	Jump script_0801478A
 script_080147C4:
+.ifdef EU
+	SetRoomFlag 0x000A
+.else
 	SetRoomFlag 0x0009
+.endif
 	TextboxNoOverlapFollowPos 0x4307, 0x000c
 script_080147CE:
 	_0807EA94 
+.ifdef EU
+	Wait 0x000F
+.else
 	Wait 0x0004
+.endif
 	_0807E878 
 	Jump script_0801463A
-	.2byte 0x0000
+	.align 2, 0
diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc
index 4cb6b657..4b0d2f45 100644
--- a/data/scripts/script_08014CDC.inc
+++ b/data/scripts/script_08014CDC.inc
@@ -53,7 +53,15 @@ script_08014D96:
 	TextboxNoOverlap 0x1014
 	_0807EA94 
 	_0807EC64 0x0018
+.ifdef JP
+	SetLocalFlag 0x006b
+.else
+.ifdef EU
+	SetLocalFlag 0x006b
+.else
 	SetLocalFlag 0x006d
+.endif
+.endif
 	Call sub_0807DF50
 	_0807E878 
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc
index 1acf6e0c..1b70d789 100644
--- a/data/scripts/script_08014E14.inc
+++ b/data/scripts/script_08014E14.inc
@@ -239,7 +239,15 @@ script_08015104:
 	PlaySound SFX_SECRET
 	_0807F0B4 0x0004
 	CameraTargetPlayer 
+.ifdef JP
+	SetLocalFlag 0x008a
+.else
+.ifdef EU
+	SetLocalFlag 0x008a
+.else
 	SetLocalFlag 0x008c
+.endif
+.endif
 	_0807EB28 0x130c
 	_0807EA94 
 	CameraTargetPlayer 
diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc
index b4482406..57f353dc 100644
--- a/data/scripts/script_080157AC.inc
+++ b/data/scripts/script_080157AC.inc
@@ -63,7 +63,15 @@ script_08015888:
 	_0807EA94 
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000002
+.ifdef JP
+	SetLocalFlag 0x0089
+.else
+.ifdef EU
+	SetLocalFlag 0x0089
+.else
 	SetLocalFlag 0x008b
+.endif
+.endif
 	Call sub_08066FB8
 	Call sub_0807DF50
 	_0807E878 
diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc
index 3b383a11..9df5e5af 100644
--- a/data/scripts/script_08015B34.inc
+++ b/data/scripts/script_08015B34.inc
@@ -1,7 +1,15 @@
 SCRIPT_START script_08015B34
 	EndBlock 
 	BeginBlock 
+.ifdef JP
+	CheckLocalFlag 0x0089
+.else
+.ifdef EU
+	CheckLocalFlag 0x0089
+.else
 	CheckLocalFlag 0x008b
+.endif
+.endif
 	JumpIf script_08015B7E
 	CallWithArg sub_0807F6B4, 0x00000318
 	JumpIfNot script_08015B34
diff --git a/data/scripts/script_08015BA8.inc b/data/scripts/script_08015BA8.inc
index 0798902d..433c22e4 100644
--- a/data/scripts/script_08015BA8.inc
+++ b/data/scripts/script_08015BA8.inc
@@ -1,6 +1,14 @@
 SCRIPT_START script_08015BA8
 	BeginBlock 
+.ifdef JP
+	SetLocalFlag 0x008c
+.else
+.ifdef EU
+	SetLocalFlag 0x008c
+.else
 	SetLocalFlag 0x008e
+.endif
+.endif
 	_0807E864 
 	MoveEntityToPlayer 
 	CameraTargetEntity 
diff --git a/data/scripts/script_08015BE8.inc b/data/scripts/script_08015BE8.inc
index 091c95fc..d066f2e8 100644
--- a/data/scripts/script_08015BE8.inc
+++ b/data/scripts/script_08015BE8.inc
@@ -31,7 +31,15 @@ script_08015BF0:
 	PlayBGM
 	_0807EB28 0x131f
 	_0807EA94 
+.ifdef JP
+	SetLocalFlag 0x009b
+.else
+.ifdef EU
+	SetLocalFlag 0x009b
+.else
 	SetLocalFlag 0x009c
+.endif
+.endif
 	Call sub_0807FBCC
 	Call sub_0807DF50
 	_0807E878 
diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc
index 91d91fa6..9239fd38 100644
--- a/data/scripts/script_080160A8.inc
+++ b/data/scripts/script_080160A8.inc
@@ -34,8 +34,12 @@ script_080160E0:
 	Jump script_08016132
 script_0801610C:
 	WaitPlayerAction8 
+.ifndef EU
 	_0807EB8C 
 	TextboxNoOverlapFollow 0x2d0d
+.else
+	TextboxNoOverlapFollow 0x2d08
+.endif
 	_0807EA94 
 	Jump script_08016132
 script_0801611A:
@@ -51,6 +55,8 @@ script_08016132:
 	_0807E878 
 	_0807EB44 0x0004
 	Jump script_080160B0
+	.align 2, 0
+
 SCRIPT_START script_0801613C
 	BeginBlock 
 	Call sub_080787B4
@@ -78,6 +84,8 @@ script_08016184:
 script_0801618A:
 	_0807E878 
 	Jump script_08016146
+	.align 2, 0
+
 SCRIPT_START script_08016190
 	BeginBlock 
 	Call sub_080787B4
@@ -100,13 +108,19 @@ script_080161C6:
 	TextboxNoOverlapFollow 0x2d0b
 	Jump script_080161E2
 script_080161D8:
+.ifndef EU
 	WaitPlayerAction8 
 	_0807EA94 
 	_0807EB8C 
 	TextboxNoOverlap 0x2d06
+.else
+	TextboxNoOverlapFollow 0x2d06
+.endif
 script_080161E2:
 	_0807E878 
 	Jump script_0801619A
+	.align 2, 0
+
 SCRIPT_START script_080161E8
 	BeginBlock 
 	Call sub_0807F348
diff --git a/data/scripts/script_08016384.inc b/data/scripts/script_08016384.inc
index f1d84660..7887a419 100644
--- a/data/scripts/script_08016384.inc
+++ b/data/scripts/script_08016384.inc
@@ -17,7 +17,15 @@ SCRIPT_START script_08016384
 	CheckInventory2 0x0001
 	HasRoomItemForSale 
 	CheckLocalFlag 0x0067
+.ifdef JP
+	CheckLocalFlagByOffset 0x0100, 0x0069
+.else
+.ifdef EU
+	CheckLocalFlagByOffset 0x0100, 0x0069
+.else
 	CheckLocalFlagByOffset 0x0100, 0x006b
+.endif
+.endif
 	CheckGlobalFlag 0x0013
 	CheckRoomFlag 0x0000
 	CheckPlayerInRegion 0x0000, 0x0000, 0x0000