Clean up script files

43 files changed, 142 insertions, 142 deletions

diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc
index 8b59708e..d640ce56 100644
--- a/data/scripts/script_08008D8C.inc
+++ b/data/scripts/script_08008D8C.inc
@@ -62,7 +62,7 @@ script_08008E12:
 	WaitForSomething2 0x00000100
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000008
-	TextboxNoOverlapFollowPos 0x000e1053
+	TextboxNoOverlapFollowPos 0x1053, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000080
 	WaitForSomething2 0x00000100
diff --git a/data/scripts/script_08008FC0.inc b/data/scripts/script_08008FC0.inc
index ec4888e8..ec7f9ecf 100644
--- a/data/scripts/script_08008FC0.inc
+++ b/data/scripts/script_08008FC0.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_08008FC0
 	SoundReq 0x0109
 	CallWithArg sub_0807F238, 0x0000045f
 	Call sub_0807F304
-	TextboxNoOverlapFollowPos 0x000e0501
+	TextboxNoOverlapFollowPos 0x0501, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000020
 	Call sub_080791BC
diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc
index dec7d6b5..15e7cb66 100644
--- a/data/scripts/script_0800903C.inc
+++ b/data/scripts/script_0800903C.inc
@@ -28,20 +28,20 @@ SCRIPT_START script_0800903C
 	_0807EB44 0x0004
 	_0807ECC4 0x0008
 	_0807E930 0x0004
-	TextboxNoOverlapFollowPos 0x000e1050
+	TextboxNoOverlapFollowPos 0x1050, 0x000e
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000080
 	_0807E930 0x0004
-	TextboxNoOverlapFollowPos 0x000e1052
+	TextboxNoOverlapFollowPos 0x1052, 0x000e
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000080
 	_0807EB44 0x0006
 	_0807E930 0x0005
-	TextboxNoOverlapFollowPos 0x000e1054
+	TextboxNoOverlapFollowPos 0x1054, 0x000e
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000100
@@ -50,25 +50,25 @@ SCRIPT_START script_0800903C
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000080
 	_0807E930 0x0004
-	TextboxNoOverlapFollowPos 0x000e1056
+	TextboxNoOverlapFollowPos 0x1056, 0x000e
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000080
 	_0807E930 0x0004
-	TextboxNoOverlapFollowPos 0x000e1057
+	TextboxNoOverlapFollowPos 0x1057, 0x000e
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000080
 	_0807E930 0x0004
-	TextboxNoOverlapFollowPos 0x000e1058
+	TextboxNoOverlapFollowPos 0x1058, 0x000e
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000080
 	_0807E930 0x0004
-	TextboxNoOverlapFollowPos 0x000e105c
+	TextboxNoOverlapFollowPos 0x105c, 0x000e
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000100
@@ -90,7 +90,7 @@ script_0800917C:
 	WaitForSomething2 0x00000001
 	_0807EB74 
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x0000105b
+	TextboxNoOverlapFollowPos 0x105b, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000002
@@ -102,7 +102,7 @@ script_0800917C:
 	_0807EF80 0x0005
 	Wait 0x003c
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x00001051
+	TextboxNoOverlapFollowPos 0x1051, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000002
@@ -112,7 +112,7 @@ script_0800917C:
 	_0807EB74 
 	_0807EB8C 
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x00001055
+	TextboxNoOverlapFollowPos 0x1055, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000002
@@ -126,7 +126,7 @@ script_0800917C:
 	_0807EB74 
 	_0807EF80 0x0000
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x00001059
+	TextboxNoOverlapFollowPos 0x1059, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000002
diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc
index 9bd9569a..2f5b2061 100644
--- a/data/scripts/script_08009B78.inc
+++ b/data/scripts/script_08009B78.inc
@@ -18,7 +18,7 @@ SCRIPT_START script_08009B78
 	_0807EF80 0x0000
 	Wait 0x000f
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x00001009
+	TextboxNoOverlapFollowPos 0x1009, 0x0000
 	_0807E8E4_1 
 	_0807EA94 
 	_0807EF80 0x0000
@@ -26,7 +26,7 @@ SCRIPT_START script_08009B78
 	WaitForSomething2 0x00000008
 	_0807EB8C 
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x0000100b
+	TextboxNoOverlapFollowPos 0x100b, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000002
@@ -45,7 +45,7 @@ SCRIPT_START script_08009B78
 	WaitPlayerAction8 
 	_0807E8E4_1 
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x0000100c
+	TextboxNoOverlapFollowPos 0x100c, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000004
diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc
index fece2a6f..d81f699f 100644
--- a/data/scripts/script_08009C68.inc
+++ b/data/scripts/script_08009C68.inc
@@ -13,7 +13,7 @@ SCRIPT_START script_08009C68
 	_0807EB74 
 	_0807EB8C 
 	_0807EF80 0x0001
-	TextboxNoOverlapFollowPos 0x0000100a
+	TextboxNoOverlapFollowPos 0x100a, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807E5F8 0x00000008
@@ -22,7 +22,7 @@ SCRIPT_START script_08009C68
 	_0807EF80 0x0001
 	_0807EB8C 
 	_0807EB44 0x0002
-	TextboxNoOverlapFollowPos 0x0000100d
+	TextboxNoOverlapFollowPos 0x100d, 0x0000
 	_0807EA94 
 	_0807EF80 0x0000
 	_0807EDD4 0x0028, 0x0060
diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc
index 706d06c5..c6a52566 100644
--- a/data/scripts/script_08009F14.inc
+++ b/data/scripts/script_08009F14.inc
@@ -21,7 +21,7 @@ script_08009F36:
 	StartPlayerScript script_0800A088
 	WaitForSomething2 0x00000002
 	Call sub_0806014C
-	TextboxNoOverlapFollowPos 0x00001f01
+	TextboxNoOverlapFollowPos 0x1f01, 0x0000
 	_0807EA94 
 	Wait 0x001e
 	_0807F034 0x0065
diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc
index 5ee10dbb..1de72713 100644
--- a/data/scripts/script_0800A1D8.inc
+++ b/data/scripts/script_0800A1D8.inc
@@ -12,7 +12,7 @@ SCRIPT_START script_0800A1D8
 	WaitForSomething2 0x00000001
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000080
-	TextboxNoOverlapFollowPos 0x00001659
+	TextboxNoOverlapFollowPos 0x1659, 0x0000
 	_0807EA94 
 	Wait 0x003c
 	_0807E5F8 0x00000010
@@ -27,10 +27,10 @@ SCRIPT_START script_0800A1D8
 	_0807E5F8 0x00000004
 	Call sub_0807F3F8
 	WaitForSomething2 0x00000080
-	TextboxNoOverlapFollowPos 0x000e165a
+	TextboxNoOverlapFollowPos 0x165a, 0x000e
 	_0807EA94 
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000e165b
+	TextboxNoOverlapFollowPos 0x165b, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000040
@@ -45,10 +45,10 @@ SCRIPT_START script_0800A1D8
 	WaitForSomething2 0x00000100
 	_0807E5F8 0x00000006
 	WaitForSomething2 0x000000c0
-	TextboxNoOverlapFollowPos 0x000e165c
+	TextboxNoOverlapFollowPos 0x165c, 0x000e
 	_0807EA94 
 	SoundReq0x80100000 
-	TextboxNoOverlapFollowPos 0x000e165d
+	TextboxNoOverlapFollowPos 0x165d, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000006
 	WaitForSomething2 0x000000c0
diff --git a/data/scripts/script_0800AB08.inc b/data/scripts/script_0800AB08.inc
index 0c012046..c019f528 100644
--- a/data/scripts/script_0800AB08.inc
+++ b/data/scripts/script_0800AB08.inc
@@ -13,9 +13,9 @@ SCRIPT_START script_0800AB08
 	_0807F0B4 0x0001
 	SetEntityPositionRelative 0x00780088
 	Call sub_0807F5C0
-	TextboxNoOverlapFollowPos 0x00001664
+	TextboxNoOverlapFollowPos 0x1664, 0x0000
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x000e165e
+	TextboxNoOverlapFollowPos 0x165e, 0x000e
 	_0807EA94 
 	CallWithArg sub_0805DDEC, 0x00000001
 	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_0800AB6E.inc b/data/scripts/script_0800AB6E.inc
index cbab020d..6f816d96 100644
--- a/data/scripts/script_0800AB6E.inc
+++ b/data/scripts/script_0800AB6E.inc
@@ -13,15 +13,15 @@ SCRIPT_START script_0800AB6E
 	Wait 0x003c
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
-	TextboxNoOverlapFollowPos 0x000e165f
+	TextboxNoOverlapFollowPos 0x165f, 0x000e
 	_0807EA94 
 	StartPlayerScript script_0800ACBC
 	WaitForSomething2 0x00000001
-	TextboxNoOverlapFollowPos 0x000e1660
+	TextboxNoOverlapFollowPos 0x1660, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
-	TextboxNoOverlapFollowPos 0x000e1661
+	TextboxNoOverlapFollowPos 0x1661, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000008
 	_0807E5F8 0x00000002
@@ -32,9 +32,9 @@ SCRIPT_START script_0800AB6E
 	StartPlayerScript script_0800ACE0
 	WaitForSomething2 0x00000001
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000e1662
+	TextboxNoOverlapFollowPos 0x1662, 0x000e
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x000e1663
+	TextboxNoOverlapFollowPos 0x1663, 0x000e
 	_0807EA94 
 	SetEntityPosition 0x0000, 0xffe0
 	Call sub_0807F5C0
@@ -45,7 +45,7 @@ SCRIPT_START script_0800AB6E
 	StartPlayerScript script_0800AD54
 	WaitForSomething2 0x00000001
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000e1665
+	TextboxNoOverlapFollowPos 0x1665, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc
index 9f05e3e9..b0222105 100644
--- a/data/scripts/script_0800CD7C.inc
+++ b/data/scripts/script_0800CD7C.inc
@@ -222,7 +222,7 @@ script_0800D032:
 	_0807EB74 
 	_0807E914 0x00000000
 	Call sub_0806C028
-	TextboxNoOverlapFollowPos 0x0002125c
+	TextboxNoOverlapFollowPos 0x125c, 0x0002
 	_0807EA94 
 	StartPlayerScript script_0800D1B4
 	WaitForSomething2 0x00000008
@@ -233,7 +233,7 @@ script_0800D032:
 	_0807E5F8 0x00000020
 	StartPlayerScript script_0800D1E0
 	WaitForSomething2 0x00000008
-	TextboxNoOverlapFollowPos 0x0002125d
+	TextboxNoOverlapFollowPos 0x125d, 0x0002
 	Jump script_0800D17C
 script_0800D098:
 	CheckLocalFlag 0x007e
@@ -250,7 +250,7 @@ script_0800D0A8:
 	_0807EB74 
 	_0807E914 0x00000000
 	Call sub_0806C028
-	TextboxNoOverlapFollowPos 0x0002123d
+	TextboxNoOverlapFollowPos 0x123d, 0x0002
 	_0807EA94 
 	StartPlayerScript script_0800D1B4
 	WaitForSomething2 0x00000008
@@ -265,7 +265,7 @@ script_0800D108:
 	SoundReq 0x00f8
 	_0807E5F8 0x00000010
 	SetLocalFlag 0x007e
-	TextboxNoOverlapFollowPos 0x0002123e
+	TextboxNoOverlapFollowPos 0x123e, 0x0002
 	_0807EA94 
 	Wait 0x000f
 	_0807E930 0x0009
@@ -274,7 +274,7 @@ script_0800D108:
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
 	Wait 0x001e
-	TextboxNoOverlapFollowPos 0x0002123f
+	TextboxNoOverlapFollowPos 0x123f, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000004
diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/script_0800DA60.inc
index 7fbe0073..d5314e56 100644
--- a/data/scripts/script_0800DA60.inc
+++ b/data/scripts/script_0800DA60.inc
@@ -16,11 +16,11 @@ script_0800DA64:
 	Call sub_0807F5C0
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000002
-	TextboxNoOverlapFollowPos 0x0002162d
+	TextboxNoOverlapFollowPos 0x162d, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00000001
 	Wait 0x001e
-	TextboxNoOverlapFollowPos 0x0002162e
+	TextboxNoOverlapFollowPos 0x162e, 0x0002
 	_0807EA94 
 	_0807E8E4_0 
 	CallWithArg sub_0807F75C, 0x00780138
diff --git a/data/scripts/script_0800DB78.inc b/data/scripts/script_0800DB78.inc
index cede39e2..73eb3d1e 100644
--- a/data/scripts/script_0800DB78.inc
+++ b/data/scripts/script_0800DB78.inc
@@ -34,7 +34,7 @@ script_0800DBCA:
 	_0807E5F8 0x00000001
 	StartPlayerScript script_0800DE00
 	WaitForSomething2 0x00000006
-	TextboxNoOverlapFollowPos 0x00021643
+	TextboxNoOverlapFollowPos 0x1643, 0x0002
 	_0807EA94 
 	_0807EB28 0x1645
 	_0807EA94 
diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc
index 4e8fa449..8d67bf90 100644
--- a/data/scripts/script_0800DF24.inc
+++ b/data/scripts/script_0800DF24.inc
@@ -19,7 +19,7 @@ SCRIPT_START script_0800DF24
 	Call sub_08066C94
 	Wait 0x00e9
 	_0807EF80 0x0007
-	TextboxNoOverlapFollowPos 0x0002162f
+	TextboxNoOverlapFollowPos 0x162f, 0x0002
 	_0807EA94 
 	SoundReq2 0x002f
 	_0807EF80 0x0019
diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc
index 8a0ba9e4..7ecaa728 100644
--- a/data/scripts/script_0800DFE4.inc
+++ b/data/scripts/script_0800DFE4.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_0800DFE4
 	_0807E864 
 	StopScript 
 	SoundReq0x80100000 
-	TextboxNoOverlapFollowPos 0x00021632
+	TextboxNoOverlapFollowPos 0x1632, 0x0002
 	_0807EA94 
 	SetRoomFlag 0x0003
 script_0800DFFE:
@@ -19,7 +19,7 @@ script_0800E012:
 	_0807E864 
 	Call sub_0807DF28
 	SetLocalFlag 0x007b
-	TextboxNoOverlapFollowPos 0x000c1639
+	TextboxNoOverlapFollowPos 0x1639, 0x000c
 	_0807EA94 
 	Wait 0x0096
 	SoundReq 0x00f6
diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc
index d6e86144..e387487b 100644
--- a/data/scripts/script_0800EFC0.inc
+++ b/data/scripts/script_0800EFC0.inc
@@ -58,18 +58,18 @@ script_0800F09A:
 	WaitForSomething2 0x00000001
 	_0807E5F8 0x0000001e
 	WaitForSomething2 0x00000040
-	TextboxNoOverlapFollowPos 0x000c1201
+	TextboxNoOverlapFollowPos 0x1201, 0x000c
 	_0807EA94 
 	WaitForSomething2 0x000003c0
 	_0807E8E4_0 
-	TextboxNoOverlapFollowPos 0x000c1202
+	TextboxNoOverlapFollowPos 0x1202, 0x000c
 	_0807EA94 
 	_0807F034 0x0067
 	WaitPlayerAction8 
 	_0807E8E4_0 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000040
-	TextboxNoOverlapFollowPos 0x000c1203
+	TextboxNoOverlapFollowPos 0x1203, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00000002
 	Call sub_0807DF50
diff --git a/data/scripts/script_0800F184.inc b/data/scripts/script_0800F184.inc
index 0970d0a9..c1d99864 100644
--- a/data/scripts/script_0800F184.inc
+++ b/data/scripts/script_0800F184.inc
@@ -32,7 +32,7 @@ script_0800F1E6:
 	_0807E930 0x0008
 	_0807EF80 0x0004
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000c1206
+	TextboxNoOverlapFollowPos 0x1206, 0x000c
 	_0807EA94 
 	StartPlayerScript script_0800F33C
 	WaitForSomething2 0x00000400
@@ -48,7 +48,7 @@ script_0800F22A:
 	_0807E930 0x0008
 	_0807EF80 0x0004
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000c1206
+	TextboxNoOverlapFollowPos 0x1206, 0x000c
 	_0807EA94 
 	StartPlayerScript script_0800F354
 	WaitForSomething2 0x00000400
@@ -64,7 +64,7 @@ script_0800F26A:
 	_0807E930 0x0008
 	_0807EF80 0x0004
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000c1206
+	TextboxNoOverlapFollowPos 0x1206, 0x000c
 	_0807EA94 
 	StartPlayerScript script_0800F36C
 	WaitForSomething2 0x00000400
@@ -80,7 +80,7 @@ script_0800F2AA:
 	_0807E930 0x0008
 	_0807EF80 0x0004
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000c1206
+	TextboxNoOverlapFollowPos 0x1206, 0x000c
 	_0807EA94 
 	StartPlayerScript script_0800F384
 	WaitForSomething2 0x00000400
@@ -97,7 +97,7 @@ script_0800F2EA:
 	_0807E864 
 	_0807EB74 
 	_0807E930 0x0008
-	TextboxNoOverlapFollowPos 0x000c1208
+	TextboxNoOverlapFollowPos 0x1208, 0x000c
 	_0807EA94 
 	_0807E878 
 	Jump script_0800F1E6
diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc
index 2420d650..bcf3f800 100644
--- a/data/scripts/script_0800F724.inc
+++ b/data/scripts/script_0800F724.inc
@@ -27,7 +27,7 @@ script_0800F72C:
 	Call sub_0807F5C0
 	WaitForSomething2 0x00000001
 	WaitForSomething2 0x00000004
-	TextboxNoOverlapFollowPos 0x00002501
+	TextboxNoOverlapFollowPos 0x2501, 0x0000
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
@@ -43,7 +43,7 @@ script_0800F72C:
 	WaitForSomething2 0x00000001
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
-	TextboxNoOverlapFollowPos 0x000e2503
+	TextboxNoOverlapFollowPos 0x2503, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
@@ -56,7 +56,7 @@ script_0800F72C:
 	WaitForSomething2 0x00000001
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
-	TextboxNoOverlapFollowPos 0x000e2504
+	TextboxNoOverlapFollowPos 0x2504, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
@@ -69,7 +69,7 @@ script_0800F72C:
 	WaitForSomething2 0x00000001
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
-	TextboxNoOverlapFollowPos 0x000e2505
+	TextboxNoOverlapFollowPos 0x2505, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
@@ -84,7 +84,7 @@ script_0800F72C:
 	_0807E8E4_0 
 	Call sub_0807F3F8
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x000e1021
+	TextboxNoOverlapFollowPos 0x1021, 0x000e
 	_0807EA94 
 	StartPlayerScript script_0800FAE4
 	SetEntityPositionRelative 0x025800f0
@@ -93,44 +93,44 @@ script_0800F72C:
 	Wait 0x001e
 	Call sub_08063C2C
 	WaitForSomething2 0x00000001
-	TextboxNoOverlapFollowPos 0x000e1022
+	TextboxNoOverlapFollowPos 0x1022, 0x000e
 	_0807EA94 
 	_0807E8E4_0 
 	Call sub_08063C14
 	Call sub_08094CDC
 	Wait 0x001e
-	TextboxNoOverlapFollowPos 0x000e1023
+	TextboxNoOverlapFollowPos 0x1023, 0x000e
 	_0807EA94 
 	Call sub_08063C14
 	Call sub_08094DD8
 	Wait 0x001e
-	TextboxNoOverlapFollowPos 0x000e1024
+	TextboxNoOverlapFollowPos 0x1024, 0x000e
 	_0807EA94 
 	Call sub_08063C14
 	Call sub_08094D34
 	Wait 0x001e
-	TextboxNoOverlapFollowPos 0x000e1025
+	TextboxNoOverlapFollowPos 0x1025, 0x000e
 	_0807EA94 
 	Call sub_08063C5C
-	TextboxNoOverlapFollowPos 0x000e1026
+	TextboxNoOverlapFollowPos 0x1026, 0x000e
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
 	_0807E8E4_1 
 	Call sub_08063C2C
-	TextboxNoOverlapFollowPos 0x00001027
+	TextboxNoOverlapFollowPos 0x1027, 0x0000
 	_0807EA94 
 	Call sub_08063C74
 	Wait 0x003c
 	Call sub_08063C14
 	_0807E8E4_0 
-	TextboxNoOverlapFollowPos 0x000e1028
+	TextboxNoOverlapFollowPos 0x1028, 0x000e
 	_0807EA94 
 	_0807E8E4_1 
-	TextboxNoOverlapFollowPos 0x00001029
+	TextboxNoOverlapFollowPos 0x1029, 0x0000
 	_0807EA94 
 	_0807E8E4_0 
-	TextboxNoOverlapFollowPos 0x000e102a
+	TextboxNoOverlapFollowPos 0x102a, 0x000e
 	_0807EA94 
 	Call sub_08063C14
 	Call sub_08094D70
@@ -145,7 +145,7 @@ script_0800F72C:
 	_0807E8E4_1 
 	Call sub_0807F3F8
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x0000102b
+	TextboxNoOverlapFollowPos 0x102b, 0x0000
 	_0807EA94 
 	_0807F034 0x000d
 	WaitPlayerAction8 
@@ -158,7 +158,7 @@ script_0800F72C:
 	Wait 0x00b7
 	_0807E914 0x00000000
 	Call sub_0807F5B0
-	TextboxNoOverlapFollowPos 0x0000102c
+	TextboxNoOverlapFollowPos 0x102c, 0x0000
 	_0807EA94 
 	CallWithArg sub_0807F29C, 0x00000000
 	Call sub_0806DC58
diff --git a/data/scripts/script_0800FD0C.inc b/data/scripts/script_0800FD0C.inc
index e3f8b423..cdb8328b 100644
--- a/data/scripts/script_0800FD0C.inc
+++ b/data/scripts/script_0800FD0C.inc
@@ -9,7 +9,7 @@ script_0800FD1A:
 	JumpIf script_0800FD5C
 	_0807E864 
 	Call sub_0807F9A4
-	TextboxNoOverlapFollowPos 0x00002506
+	TextboxNoOverlapFollowPos 0x2506, 0x0000
 	_0807EA94 
 	StartPlayerScript script_0800FD80
 	WaitForSomething2 0x00000008
@@ -21,7 +21,7 @@ script_0800FD50:
 script_0800FD5C:
 	_0807E864 
 	Call sub_0807F9A4
-	TextboxNoOverlapFollowPos 0x0000106c
+	TextboxNoOverlapFollowPos 0x106c, 0x0000
 	_0807EA94 
 	StartPlayerScript script_0800FD80
 	WaitForSomething2 0x00000008
diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc
index 462aa194..809f6ca7 100644
--- a/data/scripts/script_080100C8.inc
+++ b/data/scripts/script_080100C8.inc
@@ -52,7 +52,7 @@ script_0801015A:
 	_0807EB74 
 	CheckRoomFlag 0x0001
 	JumpIf script_0801019E
-	TextboxNoOverlapFollowPos 0x00003001
+	TextboxNoOverlapFollowPos 0x3001, 0x0000
 	_0807EA94 
 	_0807E3E8 
 	JumpIfNot script_080101A6
@@ -77,7 +77,7 @@ script_080101A6:
 	Call sub_080A1270
 	_0807E864 
 	Call sub_0807DF28
-	TextboxNoOverlapFollowPos 0x00073004
+	TextboxNoOverlapFollowPos 0x3004, 0x0007
 	_0807EA94 
 	SoundReq0x80100000 
 	_0807E778 0x0004
diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc
index 58da62e2..fdf4640c 100644
--- a/data/scripts/script_08010BB4.inc
+++ b/data/scripts/script_08010BB4.inc
@@ -23,15 +23,15 @@ script_08010BCA:
 	StartPlayerScript script_08011074
 	WaitForSomething2 0x00000400
 	_0807F078 0x0034, 0x0002
-	TextboxNoOverlapFollowPos 0x000c1036
+	TextboxNoOverlapFollowPos 0x1036, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00000010
 	WaitForSomething2 0x00000020
-	TextboxNoOverlapFollowPos 0x00021037
+	TextboxNoOverlapFollowPos 0x1037, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00000010
 	WaitForSomething2 0x00000020
-	TextboxNoOverlapFollowPos 0x000c1038
+	TextboxNoOverlapFollowPos 0x1038, 0x000c
 	_0807EA94 
 	SoundReq0x80100000 
 	_0807E778 0x0004
@@ -68,7 +68,7 @@ script_08010BCA:
 	_0807E8E4_1 
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000008
-	TextboxNoOverlapFollowPos 0x000c1039
+	TextboxNoOverlapFollowPos 0x1039, 0x000c
 	_0807EA94 
 	SoundReq2 0x0001
 	_0807E8E4_2 
@@ -81,7 +81,7 @@ script_08010BCA:
 	Wait 0x012c
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000008
-	TextboxNoOverlapFollowPos 0x000c103a
+	TextboxNoOverlapFollowPos 0x103a, 0x000c
 	_0807EA94 
 	SetEntityPositionRelative 0x01c001f8
 	_0807F0B4 0x0004
@@ -99,7 +99,7 @@ script_08010BCA:
 	SoundReq 0x009b
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000200
-	TextboxNoOverlapFollowPos 0x00001043
+	TextboxNoOverlapFollowPos 0x1043, 0x0000
 	_0807EA94 
 	SoundReq2 0x000d
 	_0807E5F8 0x00000100
@@ -115,7 +115,7 @@ script_08010BCA:
 	WaitForSomething2 0x00005000
 	_0807E5F8 0x00028000
 	WaitForSomething2 0x00050000
-	TextboxNoOverlapFollowPos 0x00001044
+	TextboxNoOverlapFollowPos 0x1044, 0x0000
 	_0807EA94 
 	SetEntityPositionRelative 0x009801f8
 	SoundReq0x80100000 
diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/script_08010E5A.inc
index 46021b6a..ced5503b 100644
--- a/data/scripts/script_08010E5A.inc
+++ b/data/scripts/script_08010E5A.inc
@@ -47,9 +47,9 @@ SCRIPT_START script_08010E5A
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000020
 	WaitForSomething2 0x00000200
-	TextboxNoOverlapFollowPos 0x000c1045
+	TextboxNoOverlapFollowPos 0x1045, 0x000c
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x00001046
+	TextboxNoOverlapFollowPos 0x1046, 0x0000
 	_0807EA94 
 	CallWithArg sub_0805DDEC, 0x00000002
 	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc
index bb24aa9d..59a442f0 100644
--- a/data/scripts/script_08010F84.inc
+++ b/data/scripts/script_08010F84.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_08010F84
 	WaitForSomething2 0x00000200
 	StartPlayerScript script_080110BC
 	WaitForSomething2 0x00000400
-	TextboxNoOverlapFollowPos 0x00001047
+	TextboxNoOverlapFollowPos 0x1047, 0x0000
 	_0807EA94 
 	Call sub_0806DC3C
 	Call sub_080791BC
@@ -28,11 +28,11 @@ SCRIPT_START script_08010F84
 	WaitForSomething2 0x00000020
 	SoundReq0x80100000 
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x0000104a
+	TextboxNoOverlapFollowPos 0x104a, 0x0000
 	_0807EA94 
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000200
-	TextboxNoOverlapFollowPos 0x00001049
+	TextboxNoOverlapFollowPos 0x1049, 0x0000
 	_0807EA94 
 	SetEntityPositionRelative 0x009801f8
 	Wait 0x0078
diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc
index 29618db8..d452f8c9 100644
--- a/data/scripts/script_0801194C.inc
+++ b/data/scripts/script_0801194C.inc
@@ -126,7 +126,7 @@ script_08011AE4:
 	Call sub_0807F9A4
 	Call sub_0807DF28
 script_08011AFA:
-	TextboxNoOverlapFollowPos 0x00071321
+	TextboxNoOverlapFollowPos 0x1321, 0x0007
 	_0807EA94 
 	SetLocalFlag 0x0010
 	CallWithArg sub_0806DA1C, 0x00000003
diff --git a/data/scripts/script_08011B20.inc b/data/scripts/script_08011B20.inc
index c568336a..1712c9e9 100644
--- a/data/scripts/script_08011B20.inc
+++ b/data/scripts/script_08011B20.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08011B20
 	_0807E864 
 	Call sub_0807DF28
-	TextboxNoOverlapFollowPos 0x000c1320
+	TextboxNoOverlapFollowPos 0x1320, 0x000c
 	_0807EA94 
 	_0807E878 
 	Call sub_0807DF50
diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc
index ed7b71f5..fc868d72 100644
--- a/data/scripts/script_08012430.inc
+++ b/data/scripts/script_08012430.inc
@@ -35,7 +35,7 @@ script_0801248A:
 	Call sub_0807F9A4
 	Call sub_0807DF28
 	StartPlayerScript script_08012AB0
-	TextboxNoOverlapFollowPos 0x00071101
+	TextboxNoOverlapFollowPos 0x1101, 0x0007
 	_0807EA94 
 	CameraTargetPlayer 
 	_0807E778 0x0004
diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc
index c700ebed..58b2de20 100644
--- a/data/scripts/script_080126FC.inc
+++ b/data/scripts/script_080126FC.inc
@@ -7,14 +7,14 @@ SCRIPT_START script_080126FC
 	WaitForSomething2 0x00000004
 	_0807E930 0x0022
 	Call sub_0807F3C8
-	TextboxNoOverlapFollowPos 0x000c1102
+	TextboxNoOverlapFollowPos 0x1102, 0x000c
 	_0807EA94 
 	_0807E930 0x0020
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 	_0807E930 0x0021
 	Call sub_0807F3C8
-	TextboxNoOverlapFollowPos 0x000c1103
+	TextboxNoOverlapFollowPos 0x1103, 0x000c
 	_0807EA94 
 	_0807E930 0x0020
 	_0807E5F8 0x00000008
@@ -25,29 +25,29 @@ SCRIPT_START script_080126FC
 	WaitForSomething2 0x00000004
 	_0807EF80 0x0011
 	_0807E930 0x001c
-	TextboxNoOverlapFollowPos 0x000c1105
+	TextboxNoOverlapFollowPos 0x1105, 0x000c
 	_0807EA94 
 	_0807E930 0x0020
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 	_0807E930 0x0022
 	Call sub_0807F3C8
-	TextboxNoOverlapFollowPos 0x000c1106
+	TextboxNoOverlapFollowPos 0x1106, 0x000c
 	_0807EA94 
 	_0807E930 0x001c
 	Call sub_0806D96C
-	TextboxNoOverlapFollowPos 0x000c1107
+	TextboxNoOverlapFollowPos 0x1107, 0x000c
 	_0807EA94 
 	_0807E930 0x0020
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 	_0807E930 0x0021
 	Call sub_0807F3C8
-	TextboxNoOverlapFollowPos 0x000c1108
+	TextboxNoOverlapFollowPos 0x1108, 0x000c
 	_0807EA94 
 	_0807E930 0x001c
 	Call sub_0806D96C
-	TextboxNoOverlapFollowPos 0x000c1109
+	TextboxNoOverlapFollowPos 0x1109, 0x000c
 	_0807EA94 
 	_0807E930 0x0020
 	_0807EF80 0x000a
@@ -64,7 +64,7 @@ script_080127F2:
 	_0807E864 
 	Call sub_0806D944
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c1114
+	TextboxNoOverlapFollowPos 0x1114, 0x000c
 	_0807EA94 
 	_0807E930 0x0020
 	_0807E878 
@@ -82,13 +82,13 @@ script_08012824:
 	WaitForSomething2 0x00000004
 	Call sub_0806D944
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c110a
+	TextboxNoOverlapFollowPos 0x110a, 0x000c
 	_0807EA94 
 	_0807E930 0x001f
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c110b
+	TextboxNoOverlapFollowPos 0x110b, 0x000c
 	_0807EA94 
 	_0807E930 0x001f
 	_0807E5F8 0x00000008
@@ -96,19 +96,19 @@ script_08012824:
 	_0807EF80 0x0004
 	Wait 0x003c
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c110c
+	TextboxNoOverlapFollowPos 0x110c, 0x000c
 	_0807EA94 
 	_0807E930 0x001f
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c110d
+	TextboxNoOverlapFollowPos 0x110d, 0x000c
 	_0807EA94 
 	_0807E930 0x001f
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c110e
+	TextboxNoOverlapFollowPos 0x110e, 0x000c
 	_0807EA94 
 	_0807E930 0x0018
 	SetEntityNonPlanarMovement 0x0080
@@ -131,7 +131,7 @@ script_08012920:
 	_0807E864 
 	_0807E930 0x0010
 	StopScript 
-	TextboxNoOverlapFollowPos 0x000c1115
+	TextboxNoOverlapFollowPos 0x1115, 0x000c
 	_0807EA94 
 	_0807E930 0x0018
 	_0807E878 
@@ -144,7 +144,7 @@ script_0801293A:
 	_0807EB8C 
 	Call sub_0806D944
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c110f
+	TextboxNoOverlapFollowPos 0x110f, 0x000c
 	_0807E930 0x0018
 	SetEntityNonPlanarMovement 0x0080
 	Call sub_0806D908
@@ -167,7 +167,7 @@ script_080129A0:
 	_0807E864 
 	_0807E930 0x0010
 	StopScript 
-	TextboxNoOverlapFollowPos 0x000c1115
+	TextboxNoOverlapFollowPos 0x1115, 0x000c
 	_0807EA94 
 	_0807E930 0x0018
 	_0807E878 
@@ -180,7 +180,7 @@ script_080129BA:
 	_0807EB8C 
 	Call sub_0806D944
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c1110
+	TextboxNoOverlapFollowPos 0x1110, 0x000c
 	_0807E930 0x0018
 	SetEntityNonPlanarMovement 0x0080
 	Call sub_0806D908
@@ -204,7 +204,7 @@ script_08012A24:
 	_0807E864 
 	_0807E930 0x0010
 	StopScript 
-	TextboxNoOverlapFollowPos 0x000c1115
+	TextboxNoOverlapFollowPos 0x1115, 0x000c
 	_0807EA94 
 	_0807E930 0x0018
 	_0807E878 
@@ -219,7 +219,7 @@ script_08012A3E:
 	_0807EB8C 
 	Call sub_0806D944
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c1111
+	TextboxNoOverlapFollowPos 0x1111, 0x000c
 	_0807E930 0x0018
 	SetEntityNonPlanarMovement 0x0080
 	Call sub_0806D8A0
diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc
index a73ca71a..6e61a26f 100644
--- a/data/scripts/script_0801319A.inc
+++ b/data/scripts/script_0801319A.inc
@@ -32,7 +32,7 @@ script_080131AC:
 	_0807E864 
 	Call sub_0807DF28
 	WaitFor_2 
-	TextboxNoOverlapFollowPos 0x000c1602
+	TextboxNoOverlapFollowPos 0x1602, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000010
@@ -46,7 +46,7 @@ script_080131AC:
 	StartPlayerScript script_08013378
 	_0807E5F8 0x00000020
 	WaitForSomething2 0x00000042
-	TextboxNoOverlapFollowPos 0x000c1603
+	TextboxNoOverlapFollowPos 0x1603, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00000020
 	WaitForSomething2 0x00000040
@@ -59,7 +59,7 @@ script_080131AC:
 	Wait 0x003c
 	CameraTargetPlayer 
 	Call sub_0807F5C0
-	TextboxNoOverlapFollowPos 0x00071604
+	TextboxNoOverlapFollowPos 0x1604, 0x0007
 	_0807EA94 
 	_0807E788 0xffffffff
 	_0807E778 0x0004
diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc
index 08d464a2..1a121f7a 100644
--- a/data/scripts/script_080134DC.inc
+++ b/data/scripts/script_080134DC.inc
@@ -66,7 +66,7 @@ script_080134F8:
 	DoFade6 
 	WaitFor_2 
 	SoundReq 0x0109
-	TextboxNoOverlapFollowPos 0x000c0503
+	TextboxNoOverlapFollowPos 0x0503, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00040000
 	CallWithArg sub_0805DDEC, 0x00000001
diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc
index bda54165..cf3426f9 100644
--- a/data/scripts/script_08013720.inc
+++ b/data/scripts/script_08013720.inc
@@ -69,7 +69,7 @@ script_0801373C:
 	DoFade6 
 	WaitFor_2 
 	SoundReq 0x0109
-	TextboxNoOverlapFollowPos 0x000c0504
+	TextboxNoOverlapFollowPos 0x0504, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00040000
 	SetLocalFlag 0x007b
diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc
index 101916b3..065e960e 100644
--- a/data/scripts/script_080138B4.inc
+++ b/data/scripts/script_080138B4.inc
@@ -74,7 +74,7 @@ script_080138D0:
 	DoFade6 
 	WaitFor_2 
 	SoundReq 0x0109
-	TextboxNoOverlapFollowPos 0x000c0505
+	TextboxNoOverlapFollowPos 0x0505, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00040000
 	_0807F0B4 0x0002
diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc
index ab60a23f..8fee8151 100644
--- a/data/scripts/script_08014248.inc
+++ b/data/scripts/script_08014248.inc
@@ -23,7 +23,7 @@ script_08014298:
 	CheckEntityInteractType 
 	JumpIfNot script_08014298
 	_0807E864 
-	TextboxNoOverlapFollowPos 0x000c0647
+	TextboxNoOverlapFollowPos 0x0647, 0x000c
 	_0807EA94 
 	_0807E878 
 	Jump script_08014298
diff --git a/data/scripts/script_080145B0.inc b/data/scripts/script_080145B0.inc
index 3344387e..e15261ce 100644
--- a/data/scripts/script_080145B0.inc
+++ b/data/scripts/script_080145B0.inc
@@ -11,7 +11,7 @@ script_080145C2:
 	ClearRoomFlag 0x0005
 	Wait 0x000c
 	_0807EB8C 
-	TextboxNoOverlapFollowPos 0x000c432e
+	TextboxNoOverlapFollowPos 0x432e, 0x000c
 	_0807EA94 
 	_0807E878 
 	Jump script_080145C2
diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc
index 0cab3269..86add4f9 100644
--- a/data/scripts/script_080145E8.inc
+++ b/data/scripts/script_080145E8.inc
@@ -36,7 +36,7 @@ script_0801463A:
 	JumpIf script_080146A0
 	_0807E864 
 	_0807EB8C 
-	TextboxNoOverlapFollowPos 0x000c432b
+	TextboxNoOverlapFollowPos 0x432b, 0x000c
 	Jump script_080147CE
 script_08014672:
 	Call sub_08088658
@@ -59,7 +59,7 @@ script_080146A0:
 	_0807E930 0x0002
 	CheckGlobalFlag 0x0059
 	JumpIfNot script_080146C6
-	TextboxNoOverlapFollowPos 0x000c432f
+	TextboxNoOverlapFollowPos 0x432f, 0x000c
 	Jump script_080147CE
 script_080146C6:
 	CheckRoomFlag 0x0004
@@ -74,16 +74,16 @@ script_080146C6:
 	SetRoomFlag 0x0009
 	Jump script_0801473C
 script_080146F4:
-	TextboxNoOverlapFollowPos 0x000c431e
+	TextboxNoOverlapFollowPos 0x431e, 0x000c
 	Jump script_080147CE
 script_080146FE:
 	SetRoomFlag 0x0009
 	SetLocalFlag 0x005c
-	TextboxNoOverlapFollowPos 0x000c4305
+	TextboxNoOverlapFollowPos 0x4305, 0x000c
 	_0807EA94 
 	_0807E3BC 0x0001
 	JumpIfNot script_080147C4
-	TextboxNoOverlapFollowPos 0x000c4306
+	TextboxNoOverlapFollowPos 0x4306, 0x000c
 	Jump script_0801473C
 script_08014720:
 	SetRoomFlag 0x0009
@@ -107,7 +107,7 @@ script_08014754:
 	ClearRoomFlag 0x0003
 	_0807EA94 
 	SetRoomFlag 0x0004
-	TextboxNoOverlapFollowPos 0x000c431e
+	TextboxNoOverlapFollowPos 0x431e, 0x000c
 	Jump script_080147CE
 script_08014770:
 	SetRoomFlag 0x0009
@@ -137,7 +137,7 @@ script_080147B4:
 	Jump script_0801478A
 script_080147C4:
 	SetRoomFlag 0x0009
-	TextboxNoOverlapFollowPos 0x000c4307
+	TextboxNoOverlapFollowPos 0x4307, 0x000c
 script_080147CE:
 	_0807EA94 
 	Wait 0x0004
diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc
index 605bc6cf..47613e6e 100644
--- a/data/scripts/script_08014804.inc
+++ b/data/scripts/script_08014804.inc
@@ -9,7 +9,7 @@ SCRIPT_START script_08014804
 	Wait 0x0010
 	CheckLocalFlag 0x0093
 	JumpIf script_080148B6
-	TextboxNoOverlapFollowPos 0x000c4215
+	TextboxNoOverlapFollowPos 0x4215, 0x000c
 	_0807E878 
 script_0801482E:
 	TestBit 0x00000001
@@ -22,7 +22,7 @@ script_0801482E:
 	_0807E930 0x0008
 	Wait 0x0020
 	_0807E930 0x0002
-	TextboxNoOverlapFollowPos 0x000c4215
+	TextboxNoOverlapFollowPos 0x4215, 0x000c
 	_0807E878 
 	Jump script_0801482E
 script_08014862:
@@ -49,7 +49,7 @@ script_0801488E:
 	Wait 0x0020
 	_0807E930 0x0002
 script_080148B6:
-	TextboxNoOverlapFollowPos 0x000c4216
+	TextboxNoOverlapFollowPos 0x4216, 0x000c
 	_0807E878 
 	Jump script_0801488E
 script_080148C2:
diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc
index 41a3ab83..e077f2ee 100644
--- a/data/scripts/script_08014CDC.inc
+++ b/data/scripts/script_08014CDC.inc
@@ -11,7 +11,7 @@ SCRIPT_START script_08014CDC
 	WaitForSomething2 0x00000001
 	Call sub_08066E08
 	_0807E864 
-	TextboxNoOverlapFollowPos 0x000c1010
+	TextboxNoOverlapFollowPos 0x1010, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00000002
 script_08014D1E:
diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc
index 798e9cc8..f306f83d 100644
--- a/data/scripts/script_08014E14.inc
+++ b/data/scripts/script_08014E14.inc
@@ -143,7 +143,7 @@ script_08014FCC:
 	CameraTargetEntity 
 	StartPlayerScript script_080152B4
 	WaitForSomething2 0x00000001
-	TextboxNoOverlapFollowPos 0x00021301
+	TextboxNoOverlapFollowPos 0x1301, 0x0002
 	_0807EA94 
 	Call sub_0807F3F8
 	Wait 0x003c
@@ -154,11 +154,11 @@ script_08014FCC:
 	SoundReq2 0x000d
 	_0807EB28 0x1302
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x00021303
+	TextboxNoOverlapFollowPos 0x1303, 0x0002
 	_0807EA94 
 	_0807EB28 0x1304
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x00021305
+	TextboxNoOverlapFollowPos 0x1305, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
diff --git a/data/scripts/script_08015390.inc b/data/scripts/script_08015390.inc
index 7c9c4b3a..d9d9aa3f 100644
--- a/data/scripts/script_08015390.inc
+++ b/data/scripts/script_08015390.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_08015390
 	Call sub_0806D944
 	WaitForSomething2 0x00000008
 	_0807E930 0x0010
-	TextboxNoOverlapFollowPos 0x000c1314
+	TextboxNoOverlapFollowPos 0x1314, 0x000c
 	_0807EA94 
 	_0807E930 0x0018
 	Call sub_0806D8A0
diff --git a/data/scripts/script_080153EC.inc b/data/scripts/script_080153EC.inc
index 56daf055..32586f5c 100644
--- a/data/scripts/script_080153EC.inc
+++ b/data/scripts/script_080153EC.inc
@@ -17,20 +17,20 @@ SCRIPT_START script_080153EC
 	WaitForSomething2 0x00001100
 	_0807F0B4 0x0004
 	SetEntityPositionRelative 0x00900078
-	TextboxNoOverlapFollowPos 0x00021330
+	TextboxNoOverlapFollowPos 0x1330, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00008000
 	WaitForSomething2 0x00010000
 	_0807E5F8 0x00000880
 	WaitForSomething2 0x00001000
 	Wait 0x003c
-	TextboxNoOverlapFollowPos 0x0002130d
+	TextboxNoOverlapFollowPos 0x130d, 0x0002
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x000c130e
+	TextboxNoOverlapFollowPos 0x130e, 0x000c
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x0002130f
+	TextboxNoOverlapFollowPos 0x130f, 0x0002
 	_0807EA94 
-	TextboxNoOverlapFollowPos 0x000c1310
+	TextboxNoOverlapFollowPos 0x1310, 0x000c
 	_0807EA94 
 	CallWithArg sub_0805DDEC, 0x00000001
 	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/script_0801548E.inc b/data/scripts/script_0801548E.inc
index 69938c3a..b43f09ea 100644
--- a/data/scripts/script_0801548E.inc
+++ b/data/scripts/script_0801548E.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_0801548E
 	CallWithArg sub_0807FB28, 0x00000003
 	_0807E5F8 0x00048000
 	WaitForSomething2 0x00090000
-	TextboxNoOverlapFollowPos 0x00021311
+	TextboxNoOverlapFollowPos 0x1311, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00008000
 	WaitForSomething2 0x00010000
@@ -13,7 +13,7 @@ SCRIPT_START script_0801548E
 	WaitForSomething2 0x00010000
 	CallWithArg sub_0805DE18, 0x00000001
 	_0807F0C8 0x0000, 0x0000
-	TextboxNoOverlapFollowPos 0x000c1312
+	TextboxNoOverlapFollowPos 0x1312, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00000800
 	WaitForSomething2 0x00001000
diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc
index a98e09f7..52110428 100644
--- a/data/scripts/script_080157AC.inc
+++ b/data/scripts/script_080157AC.inc
@@ -33,7 +33,7 @@ script_080157DA:
 	WaitForSomething2 0x00000010
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000002
-	TextboxNoOverlapFollowPos 0x00021066
+	TextboxNoOverlapFollowPos 0x1066, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000002
@@ -55,12 +55,12 @@ script_08015888:
 	CameraTargetEntity 
 	StartPlayerScript script_08015938
 	WaitForSomething2 0x00000010
-	TextboxNoOverlapFollowPos 0x000c106a
+	TextboxNoOverlapFollowPos 0x106a, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00000008
 	Wait 0x0078
 	_0807E8E4_2 
-	TextboxNoOverlapFollowPos 0x00021068
+	TextboxNoOverlapFollowPos 0x1068, 0x0002
 	_0807EA94 
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000002
diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc
index 72b34caf..908c7e24 100644
--- a/data/scripts/script_08015958.inc
+++ b/data/scripts/script_08015958.inc
@@ -15,7 +15,7 @@ SCRIPT_START script_08015958
 	_0807EDD4 0x01f8, 0x02f8
 	_0807EB44 0x0004
 	_0807EF80 0x0000
-	TextboxNoOverlapFollowPos 0x00021011
+	TextboxNoOverlapFollowPos 0x1011, 0x0002
 	_0807EA94 
 	_0807EDD4 0x01f8, 0x0268
 	SetEntityPositionRelative 0x02180248
@@ -57,7 +57,7 @@ script_08015A32:
 	CheckEntityInteractType 
 	JumpIfNot script_08015A32
 	StopScript 
-	TextboxNoOverlapFollowPos 0x00021067
+	TextboxNoOverlapFollowPos 0x1067, 0x0002
 	_0807EA94 
 	Jump script_08015A32
 script_08015A54:
diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc
index b23d4cc9..c81f01b7 100644
--- a/data/scripts/script_08015B34.inc
+++ b/data/scripts/script_08015B34.inc
@@ -10,7 +10,7 @@ script_08015B34:
 	_0807E864 
 	Call sub_0807F9A4
 	Call sub_0807DF28
-	TextboxNoOverlapFollowPos 0x00022506
+	TextboxNoOverlapFollowPos 0x2506, 0x0002
 	_0807EA94 
 	StartPlayerScript script_08015B84
 	WaitForSomething2 0x00000004
diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/script_08015C7C.inc
index d2e59189..b7b116b1 100644
--- a/data/scripts/script_08015C7C.inc
+++ b/data/scripts/script_08015C7C.inc
@@ -8,7 +8,7 @@ SCRIPT_START script_08015C7C
 	_0807EF80 0x0000
 	CallWithArg sub_0807F238, 0x000003c5
 	Call sub_0807F304
-	TextboxNoOverlapFollowPos 0x000c1318
+	TextboxNoOverlapFollowPos 0x1318, 0x000c
 	_0807EA94 
 	CallWithArg sub_0807F238, 0x000003c9
 	Call sub_0807F304