diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-11-04 20:56:03 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-11-04 20:56:03 -0700 |
| commit | 9cfbb3a27a4c8be6adad1ab060db777b30d52ec2 (patch) | |
| tree | f76a10c993a59a7775eea09f23b441746d9ceeb1 /data/scripts | |
| parent | 9ef31544e24c8b0a43b0d712eb77e9210d2641d3 (diff) | |
entity changes, textbox changes
Diffstat (limited to 'data/scripts')
115 files changed, 452 insertions, 452 deletions
diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc index 7bce1e1b..5378e632 100644 --- a/data/scripts/script_08008B5C.inc +++ b/data/scripts/script_08008B5C.inc @@ -28,7 +28,7 @@ script_08008BA2: _0807E864 _0807E930 0x0004 Call sub_0807F2D4 - TextboxNoOverlapFollow 0x4912 + MessageFromTarget 0x4912 _0807EA94 _0807E930 0x0008 _0807E878 @@ -60,7 +60,7 @@ script_08008BD2: CallWithArg sub_0806BB1C, 0x00000001 Call sub_0806BB7C JumpIfNot script_08008C5C - TextboxNoOverlap 0x490c + MessageNoOverlap 0x490c _0807EA94 LoadRoomEntityList gUnk_080D6784 WaitForSomething 0x00000001 @@ -69,7 +69,7 @@ script_08008BD2: PlaySound SFX_SECRET _0807E930 0x0004 Call sub_0807F2D4 - TextboxNoOverlap 0x4913 + MessageNoOverlap 0x4913 _0807EA94 _0807E930 0x0008 Call sub_0807F2D4 @@ -91,7 +91,7 @@ SCRIPT_START script_08008C64 PlaySound SFX_STAIRS EndBlock WaitForSomething 0x00000002 - TextboxNoOverlap 0x490d + MessageNoOverlap 0x490d _0807EA94 DoPostScriptAction 0x0007 Call sub_08064D08 diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc index e92f7fbb..d853908a 100644 --- a/data/scripts/script_08008D8C.inc +++ b/data/scripts/script_08008D8C.inc @@ -64,7 +64,7 @@ script_08008E12: WaitForSomething2 0x00000100 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - TextboxNoOverlapFollowPos 0x1053, 0x000e + MessageFromTargetPos 0x1053, 0x000e _0807EA94 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 diff --git a/data/scripts/script_08008FC0.inc b/data/scripts/script_08008FC0.inc index 664aabe5..e09554bb 100644 --- a/data/scripts/script_08008FC0.inc +++ b/data/scripts/script_08008FC0.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08008FC0 PlaySound SFX_109 CallWithArg sub_0807F238, 0x0000045f Call sub_0807F304 - TextboxNoOverlapFollowPos 0x0501, 0x000e + MessageFromTargetPos 0x0501, 0x000e _0807EA94 _0807E5F8 0x00000020 Call sub_080791BC diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc index e78894a2..143e21d7 100644 --- a/data/scripts/script_0800903C.inc +++ b/data/scripts/script_0800903C.inc @@ -29,20 +29,20 @@ SCRIPT_START script_08009080 _0807EB44 0x0004 _0807ECC4 0x0008 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1050, 0x000e + MessageFromTargetPos 0x1050, 0x000e _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1052, 0x000e + MessageFromTargetPos 0x1052, 0x000e _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EB44 0x0006 _0807E930 0x0005 - TextboxNoOverlapFollowPos 0x1054, 0x000e + MessageFromTargetPos 0x1054, 0x000e _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 @@ -51,25 +51,25 @@ SCRIPT_START script_08009080 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1056, 0x000e + MessageFromTargetPos 0x1056, 0x000e _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1057, 0x000e + MessageFromTargetPos 0x1057, 0x000e _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1058, 0x000e + MessageFromTargetPos 0x1058, 0x000e _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x105c, 0x000e + MessageFromTargetPos 0x105c, 0x000e _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 @@ -92,7 +92,7 @@ SCRIPT_START script_08009198 WaitForSomething2 0x00000001 _0807EB74 DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x105b, 0x0000 + MessageFromTargetPos 0x105b, 0x0000 _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 @@ -104,7 +104,7 @@ SCRIPT_START script_08009198 DoPostScriptAction 0x0005 Wait 0x003c DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1051, 0x0000 + MessageFromTargetPos 0x1051, 0x0000 _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 @@ -114,7 +114,7 @@ SCRIPT_START script_08009198 _0807EB74 _0807EB8C DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1055, 0x0000 + MessageFromTargetPos 0x1055, 0x0000 _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 @@ -128,7 +128,7 @@ SCRIPT_START script_08009198 _0807EB74 DoPostScriptAction 0x0000 DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1059, 0x0000 + MessageFromTargetPos 0x1059, 0x0000 _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 @@ -169,7 +169,7 @@ script_080092BA: JumpIfNot script_080092BA _0807E864 _0807EB74 - TextboxNoOverlap 0x105e + MessageNoOverlap 0x105e _0807EA94 Wait 0x000f _0807E878 @@ -194,7 +194,7 @@ script_08009300: JumpIfNot script_08009300 _0807E864 _0807EB74 - TextboxNoOverlap 0x1071 + MessageNoOverlap 0x1071 _0807EA94 _0807E878 Jump script_08009300 diff --git a/data/scripts/script_08009348.inc b/data/scripts/script_08009348.inc index 9cddae5f..c040ba8f 100644 --- a/data/scripts/script_08009348.inc +++ b/data/scripts/script_08009348.inc @@ -12,7 +12,7 @@ script_0800934E: CameraTargetEntity CheckGlobalFlag 0x0055 JumpIf script_0800939A - TextboxNoOverlap 0x1d01 + MessageNoOverlap 0x1d01 _0807EA94 script_08009376: _0807EA94 diff --git a/data/scripts/script_0800939A.inc b/data/scripts/script_0800939A.inc index 31f82777..66e30047 100644 --- a/data/scripts/script_0800939A.inc +++ b/data/scripts/script_0800939A.inc @@ -13,14 +13,14 @@ SCRIPT_START script_0800939A JumpIf script_080093BC CheckInventory1 0x000e JumpIf script_080093BC - TextboxNoOverlap 0x1d02 + MessageNoOverlap 0x1d02 _0807EA94 Jump script_08009376 script_080093BC: CheckInventory1 0x000e JumpIfNot script_080093DA Call sub_0806D788 - TextboxNoOverlap 0x1d03 + MessageNoOverlap 0x1d03 _0807EA94 Call sub_0806D70C Jump script_08009376 @@ -38,12 +38,12 @@ script_080093DA: JumpIf script_080093EE SetIntVariable 0x00001d04 script_080093EE: - TextboxNoOverlapVar + MessageNoOverlapVar _0807EA94 _0807E3E8 JumpIfNot script_08009376 Wait 0x001e - TextboxNoOverlap 0x1d08 + MessageNoOverlap 0x1d08 _0807EA94 LoadRoomEntityList gUnk_080F9C38 Wait 0x0078 @@ -65,18 +65,18 @@ script_080093EE: .endif Call sub_0806D5D4 _0807EB8C - TextboxNoOverlap 0x1d09 + MessageNoOverlap 0x1d09 _0807EA94 Wait 0x000a Jump script_08009376 script_0800943E: Call sub_0806D600 JumpIf script_08009452 - TextboxNoOverlap 0x1d0a + MessageNoOverlap 0x1d0a _0807EA94 JumpIfNot script_08009376 script_08009452: - TextboxNoOverlap 0x1d0b + MessageNoOverlap 0x1d0b _0807EA94 Call sub_0806D74C _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc index 5f134afa..0c2e42ac 100644 --- a/data/scripts/script_08009464.inc +++ b/data/scripts/script_08009464.inc @@ -18,7 +18,7 @@ SCRIPT_START script_08009464 Wait 0x003c WaitPlayerAction8 _0807EB8C - TextboxNoOverlap 0x1d0c + MessageNoOverlap 0x1d0c _0807EA94 Wait 0x000a Jump script_08009376 diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc index bee0fd26..bf90c424 100644 --- a/data/scripts/script_080095F2.inc +++ b/data/scripts/script_080095F2.inc @@ -9,7 +9,7 @@ SCRIPT_START script_080095F2 JumpIfNot script_08009622 PlaySound SFX_109 _0807F088 0x003c - TextboxNoOverlapFollow 0x053c + MessageFromTarget 0x053c WaitPlayerAction8 _0807EA94 _0807F078 0x003c, 0x0001 diff --git a/data/scripts/script_08009950.inc b/data/scripts/script_08009950.inc index 9a01e6c3..807a525b 100644 --- a/data/scripts/script_08009950.inc +++ b/data/scripts/script_08009950.inc @@ -16,7 +16,7 @@ SCRIPT_START script_08009950 Wait 0x001e _0807E930 0x000b Wait 0x001e - TextboxNoOverlapFollow 0x1002 + MessageFromTarget 0x1002 _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000004 @@ -26,7 +26,7 @@ SCRIPT_START script_08009950 _0807EDD4 0x00b8, 0x005c _0807EB44 0x0006 DoPostScriptAction 0x0001 - TextboxNoOverlapFollow 0x1004 + MessageFromTarget 0x1004 _0807EA94 DoPostScriptAction 0x0000 Wait 0x001e diff --git a/data/scripts/script_080099DC.inc b/data/scripts/script_080099DC.inc index 5d6dcffb..42986bcd 100644 --- a/data/scripts/script_080099DC.inc +++ b/data/scripts/script_080099DC.inc @@ -9,13 +9,13 @@ SCRIPT_START script_080099DC DoPostScriptAction 0x0007 _0807EDD4 0x0068, 0x0060 Wait 0x000f - TextboxNoOverlapFollow 0x1001 + MessageFromTarget 0x1001 _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 DoPostScriptAction 0x0001 - TextboxNoOverlapFollow 0x1003 + MessageFromTarget 0x1003 _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000008 diff --git a/data/scripts/script_08009B30.inc b/data/scripts/script_08009B30.inc index bacab8e4..9016acb9 100644 --- a/data/scripts/script_08009B30.inc +++ b/data/scripts/script_08009B30.inc @@ -6,7 +6,7 @@ SCRIPT_START script_08009B30 EndBlock WaitFor_2 Wait 0x001e - TextboxNoOverlapFollow 0x1005 + MessageFromTarget 0x1005 _0807EA94 Wait 0x003c Call sub_0807529C diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc index 8fd0b8b8..1546b648 100644 --- a/data/scripts/script_08009B78.inc +++ b/data/scripts/script_08009B78.inc @@ -18,7 +18,7 @@ SCRIPT_START script_08009B78 DoPostScriptAction 0x0000 Wait 0x000f DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1009, 0x0000 + MessageFromTargetPos 0x1009, 0x0000 _0807E8E4_1 _0807EA94 DoPostScriptAction 0x0000 @@ -26,7 +26,7 @@ SCRIPT_START script_08009B78 WaitForSomething2 0x00000008 _0807EB8C DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x100b, 0x0000 + MessageFromTargetPos 0x100b, 0x0000 _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 @@ -45,7 +45,7 @@ SCRIPT_START script_08009B78 WaitPlayerAction8 _0807E8E4_1 DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x100c, 0x0000 + MessageFromTargetPos 0x100c, 0x0000 _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000004 @@ -56,7 +56,7 @@ script_08009C50: JumpIfNot script_08009C50 _0807E864 _0807EB74 - TextboxNoOverlap 0x100e + MessageNoOverlap 0x100e _0807E878 Jump script_08009C50 SCRIPT_END diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc index c9162bc6..aca89d2b 100644 --- a/data/scripts/script_08009C68.inc +++ b/data/scripts/script_08009C68.inc @@ -13,7 +13,7 @@ SCRIPT_START script_08009C68 _0807EB74 _0807EB8C DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x100a, 0x0000 + MessageFromTargetPos 0x100a, 0x0000 _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000008 @@ -22,7 +22,7 @@ SCRIPT_START script_08009C68 DoPostScriptAction 0x0001 _0807EB8C _0807EB44 0x0002 - TextboxNoOverlapFollowPos 0x100d, 0x0000 + MessageFromTargetPos 0x100d, 0x0000 _0807EA94 DoPostScriptAction 0x0000 _0807EDD4 0x0028, 0x0060 diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc index ac5dfd38..1d076ed6 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 0x1f01, 0x0000 + MessageFromTargetPos 0x1f01, 0x0000 _0807EA94 Wait 0x001e _0807F034 0x0065 @@ -64,7 +64,7 @@ script_08009FDC: JumpIfNot script_08009FDC EndBlock _0807E864 - TextboxNoOverlap 0x1f0e + MessageNoOverlap 0x1f0e _0807EA94 _0807E3E8 JumpIf script_0800A002 @@ -77,7 +77,7 @@ script_0800A002: WaitPlayerAction8 Wait 0x0008 _0807EB8C - TextboxNoOverlapFollow 0x1f13 + MessageFromTarget 0x1f13 _0807EA94 SetLocalFlag 0x00b0 _0807E878 @@ -91,14 +91,14 @@ script_0800A024: _0807E864 CheckInventory1 0x0008 JumpIf script_0800A052 - TextboxNoOverlap 0x1f14 + MessageNoOverlap 0x1f14 _0807EA94 _0807E3E8 JumpIf script_0800A002 _0807E878 Jump script_0800A024 script_0800A052: - TextboxNoOverlap 0x1f11 + MessageNoOverlap 0x1f11 _0807EA94 _0807E3E8 JumpIf script_0800A064 @@ -111,7 +111,7 @@ script_0800A064: WaitPlayerAction8 Wait 0x0008 _0807EB8C - TextboxNoOverlapFollow 0x1f10 + MessageFromTarget 0x1f10 _0807EA94 _0807E878 Jump script_0800A024 diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc index 2aaed6d4..ca3bc57f 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 0x1659, 0x0000 + MessageFromTargetPos 0x1659, 0x0000 _0807EA94 Wait 0x003c _0807E5F8 0x00000010 @@ -27,10 +27,10 @@ SCRIPT_START script_0800A1D8 _0807E5F8 0x00000004 Call sub_0807F3F8 WaitForSomething2 0x00000080 - TextboxNoOverlapFollowPos 0x165a, 0x000e + MessageFromTargetPos 0x165a, 0x000e _0807EA94 Wait 0x003c - TextboxNoOverlapFollowPos 0x165b, 0x000e + MessageFromTargetPos 0x165b, 0x000e _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000040 @@ -45,10 +45,10 @@ SCRIPT_START script_0800A1D8 WaitForSomething2 0x00000100 _0807E5F8 0x00000006 WaitForSomething2 0x000000c0 - TextboxNoOverlapFollowPos 0x165c, 0x000e + MessageFromTargetPos 0x165c, 0x000e _0807EA94 StopBgm - TextboxNoOverlapFollowPos 0x165d, 0x000e + MessageFromTargetPos 0x165d, 0x000e _0807EA94 _0807E5F8 0x00000006 WaitForSomething2 0x000000c0 diff --git a/data/scripts/script_0800AB08.inc b/data/scripts/script_0800AB08.inc index 3e39cd33..7787847e 100644 --- a/data/scripts/script_0800AB08.inc +++ b/data/scripts/script_0800AB08.inc @@ -13,9 +13,9 @@ SCRIPT_START script_0800AB08 _0807F0B4 0x0001 SetEntityPositionRelative 0x0088, 0x0078 Call sub_0807F5C0 - TextboxNoOverlapFollowPos 0x1664, 0x0000 + MessageFromTargetPos 0x1664, 0x0000 _0807EA94 - TextboxNoOverlapFollowPos 0x165e, 0x000e + MessageFromTargetPos 0x165e, 0x000e _0807EA94 CallWithArg CreateManager36, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0800AB6E.inc b/data/scripts/script_0800AB6E.inc index 93ddef40..b7a50cd6 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 0x165f, 0x000e + MessageFromTargetPos 0x165f, 0x000e _0807EA94 StartPlayerScript script_0800ACBC WaitForSomething2 0x00000001 - TextboxNoOverlapFollowPos 0x1660, 0x000e + MessageFromTargetPos 0x1660, 0x000e _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x1661, 0x000e + MessageFromTargetPos 0x1661, 0x000e _0807EA94 _0807E5F8 0x00000008 _0807E5F8 0x00000002 @@ -32,9 +32,9 @@ SCRIPT_START script_0800AB6E StartPlayerScript script_0800ACE0 WaitForSomething2 0x00000001 Wait 0x003c - TextboxNoOverlapFollowPos 0x1662, 0x000e + MessageFromTargetPos 0x1662, 0x000e _0807EA94 - TextboxNoOverlapFollowPos 0x1663, 0x000e + MessageFromTargetPos 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 0x1665, 0x000e + MessageFromTargetPos 0x1665, 0x000e _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_0800B00C.inc b/data/scripts/script_0800B00C.inc index 0d1b013e..a3c09920 100644 --- a/data/scripts/script_0800B00C.inc +++ b/data/scripts/script_0800B00C.inc @@ -14,7 +14,7 @@ script_0800B024: JumpIf script_0800B082 CheckGlobalFlag 0x0053 JumpIf script_0800B064 - TextboxNoOverlap 0x3f32 + MessageNoOverlap 0x3f32 _0807EA94 DoPostScriptAction 0x0008 Call Windcrest_Unlock @@ -24,7 +24,7 @@ script_0800B024: SetGlobalFlag 0x0053 Jump script_0800B09C script_0800B064: - TextboxNoOverlap 0x3f32 + MessageNoOverlap 0x3f32 _0807EA94 DoPostScriptAction 0x0008 Call Windcrest_Unlock @@ -33,7 +33,7 @@ script_0800B064: _0807EA94 Jump script_0800B09C script_0800B082: - TextboxNoOverlap 0x3f32 + MessageNoOverlap 0x3f32 _0807EA94 DoPostScriptAction 0x0008 Call Windcrest_Unlock diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc index f5e2d2ba..75c62c36 100644 --- a/data/scripts/script_0800B41C.inc +++ b/data/scripts/script_0800B41C.inc @@ -19,7 +19,7 @@ SCRIPT_START script_0800B41C _0807F088 0x0037 WaitPlayerAction8 _0807EB8C - TextboxNoOverlapFollow 0x200c + MessageFromTarget 0x200c _0807EA94 Wait 0x0014 _0807EDD4 0x0158, 0x0290 diff --git a/data/scripts/script_0800B4AC.inc b/data/scripts/script_0800B4AC.inc index 26fc3d9a..2764728a 100644 --- a/data/scripts/script_0800B4AC.inc +++ b/data/scripts/script_0800B4AC.inc @@ -16,7 +16,7 @@ script_0800B4D4: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlapFollow 0x200b + MessageFromTarget 0x200b EndBlock _0807E878 _0807EB44 0x0004 @@ -28,7 +28,7 @@ script_0800B4F0: _0807EDD4 0x0134, 0x0288 _0807EB44 0x0004 WaitForSomething2 0x00000008 - TextboxNoOverlapFollow 0x2016 + MessageFromTarget 0x2016 _0807EA94 _0807EDD4 0x0158, 0x0288 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800B5EC.inc b/data/scripts/script_0800B5EC.inc index d4e33835..2aa13337 100644 --- a/data/scripts/script_0800B5EC.inc +++ b/data/scripts/script_0800B5EC.inc @@ -9,7 +9,7 @@ script_0800B5FA: JumpIfNot script_0800B5FA _0807E864 _0807EB74 - TextboxNoOverlap 0x2009 + MessageNoOverlap 0x2009 _0807EA94 _0807E878 _0807EB44 0x0004 @@ -29,19 +29,19 @@ script_0800B618: WaitForSomething2 0x00000004 CheckLocalFlag 0x009e JumpIf script_0800B7A2 - TextboxNoOverlap 0x0583 + MessageNoOverlap 0x0583 _0807EA94 _0807E3E8 JumpIfNot script_0800B684 Wait 0x000f - TextboxNoOverlap 0x0584 + MessageNoOverlap 0x0584 CallWithArg sub_0807F970, 0x0000058b JumpIf script_0800B68E CallWithArg sub_08087424, 0x00000000 Wait 0x00b4 Jump script_0800B6A6 script_0800B684: - TextboxNoOverlap 0x057d + MessageNoOverlap 0x057d _0807EA94 Jump script_0800B6A6 script_0800B68E: @@ -52,7 +52,7 @@ script_0800B698: WaitPlayerAction8 _0807EB8C Wait 0x001e - TextboxNoOverlap 0x057f + MessageNoOverlap 0x057f _0807EA94 script_0800B6A6: _0807E778 0x0004 diff --git a/data/scripts/script_0800B6C8.inc b/data/scripts/script_0800B6C8.inc index 4ff26db2..1a0d4833 100644 --- a/data/scripts/script_0800B6C8.inc +++ b/data/scripts/script_0800B6C8.inc @@ -16,7 +16,7 @@ script_0800B6D4: WaitForSomething2 0x00000004 CheckLocalFlag 0x009f JumpIf script_0800B7A2 - TextboxNoOverlap 0x057b + MessageNoOverlap 0x057b _0807EA94 CallWithArg sub_0807F970, 0x0000057d JumpIf script_0800B6A6 @@ -41,7 +41,7 @@ script_0800B734: WaitForSomething2 0x00000004 CheckLocalFlag 0x00a0 JumpIf script_0800B7A2 - TextboxNoOverlap 0x0580 + MessageNoOverlap 0x0580 _0807EA94 CallWithArg sub_0807F970, 0x00000582 JumpIf script_0800B794 @@ -54,7 +54,7 @@ script_0800B794: _0807F034 0x0065 Jump script_0800B698 script_0800B7A2: - TextboxNoOverlap 0x0590 + MessageNoOverlap 0x0590 _0807EA94 _0807E778 0x0010 DoFade7 @@ -62,7 +62,7 @@ script_0800B7A2: ModHealth 0x00a0 DoFade6 WaitFor_2 - TextboxNoOverlap 0x057f + MessageNoOverlap 0x057f _0807EA94 Jump script_0800B6A6 .2byte 0x0000 diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc index db081eea..602e4281 100644 --- a/data/scripts/script_0800B828.inc +++ b/data/scripts/script_0800B828.inc @@ -7,7 +7,7 @@ SCRIPT_START script_0800B828 script_0800B836: _0807E944 _0807E864 - TextboxNoOverlapFollow 0x0a01 + MessageFromTarget 0x0a01 _0807EA94 Wait 0x000f _0807E878 @@ -44,7 +44,7 @@ script_0800B89E: JumpIfNot script_0800B89E _0807E864 _0807EB74 - TextboxNoOverlapFollow 0x0a01 + MessageFromTarget 0x0a01 _0807EA94 Wait 0x000f _0807E878 @@ -93,7 +93,7 @@ script_0800B934: JumpIfNot script_0800B934 _0807E864 _0807EB74 - TextboxNoOverlapFollow 0x3f19 + MessageFromTarget 0x3f19 _0807EA94 SetLocalFlag 0x005f _0807E878 @@ -103,7 +103,7 @@ script_0800B94E: JumpIfNot script_0800B94E _0807E864 _0807EB74 - TextboxNoOverlapFollow 0x3f1a + MessageFromTarget 0x3f1a _0807EA94 _0807E878 Jump script_0800B94E diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc index 91f99499..d2a821c7 100644 --- a/data/scripts/script_0800B9B4.inc +++ b/data/scripts/script_0800B9B4.inc @@ -48,7 +48,7 @@ script_0800BA46: JumpIfNot script_0800BA46 _0807E864 Call sub_0807DF28 - TextboxNoOverlapFollow 0x3301 + MessageFromTarget 0x3301 _0807EA94 _0807E3E8 JumpIfNot script_0800BA6C @@ -77,7 +77,7 @@ script_0800BA8E: Wait 0x001e _0807EDD4 0x02f0, 0x0350 Wait 0x001e - TextboxNoOverlap 0x0e00 + MessageNoOverlap 0x0e00 _0807EA94 Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/script_0800BACC.inc b/data/scripts/script_0800BACC.inc index df7c4e03..d6afe042 100644 --- a/data/scripts/script_0800BACC.inc +++ b/data/scripts/script_0800BACC.inc @@ -9,7 +9,7 @@ script_0800BADE: JumpIfNot script_0800BADE DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e01 + MessageNoOverlap 0x0e01 _0807EA94 Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/script_0800BB00.inc b/data/scripts/script_0800BB00.inc index 3f992005..cb33b0e3 100644 --- a/data/scripts/script_0800BB00.inc +++ b/data/scripts/script_0800BB00.inc @@ -6,7 +6,7 @@ script_0800BB04: JumpIfNot script_0800BB04 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e02 + MessageNoOverlap 0x0e02 _0807EA94 Wait 0x003c DoPostScriptAction 0x000f diff --git a/data/scripts/script_0800BB30.inc b/data/scripts/script_0800BB30.inc index 072d935e..a5784cc2 100644 --- a/data/scripts/script_0800BB30.inc +++ b/data/scripts/script_0800BB30.inc @@ -9,7 +9,7 @@ script_0800BB42: JumpIfNot script_0800BB42 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e05 + MessageNoOverlap 0x0e05 _0807EA94 Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/script_0800BB64.inc b/data/scripts/script_0800BB64.inc index 8bc8cba9..396ac1ea 100644 --- a/data/scripts/script_0800BB64.inc +++ b/data/scripts/script_0800BB64.inc @@ -10,7 +10,7 @@ script_0800BB7A: JumpIfNot script_0800BB7A _0807EDD4 0x03a0, 0x00f8 Wait 0x001e - TextboxNoOverlap 0x0e06 + MessageNoOverlap 0x0e06 _0807EA94 Wait 0x000f _0807EDD4 0x0380, 0x00f8 diff --git a/data/scripts/script_0800BBA4.inc b/data/scripts/script_0800BBA4.inc index 58a0884d..4c67b04a 100644 --- a/data/scripts/script_0800BBA4.inc +++ b/data/scripts/script_0800BBA4.inc @@ -10,7 +10,7 @@ script_0800BBBA: JumpIfNot script_0800BBBA DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e04 + MessageNoOverlap 0x0e04 _0807EA94 Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/script_0800BBDC.inc b/data/scripts/script_0800BBDC.inc index a9b2b676..255f1665 100644 --- a/data/scripts/script_0800BBDC.inc +++ b/data/scripts/script_0800BBDC.inc @@ -7,7 +7,7 @@ script_0800BBE4: JumpIfNot script_0800BBE4 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e03 + MessageNoOverlap 0x0e03 _0807EA94 Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/script_0800BC08.inc b/data/scripts/script_0800BC08.inc index 52f34b61..74b7fc3d 100644 --- a/data/scripts/script_0800BC08.inc +++ b/data/scripts/script_0800BC08.inc @@ -9,7 +9,7 @@ script_0800BC18: JumpIfNot script_0800BC18 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e07 + MessageNoOverlap 0x0e07 _0807EA94 BeginBlock _0807EB44 0x0000 diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc index 9e7d93e1..d087ca52 100644 --- a/data/scripts/script_0800BC50.inc +++ b/data/scripts/script_0800BC50.inc @@ -11,7 +11,7 @@ script_0800BC62: Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e08 + MessageNoOverlap 0x0e08 _0807EA94 DoPostScriptAction 0x000f _0807E930 0x0008 @@ -25,7 +25,7 @@ script_0800BC62: Wait 0x003c DoPostScriptAction 0x000c Wait 0x003c - TextboxNoOverlap 0x0e09 + MessageNoOverlap 0x0e09 _0807EA94 Call sub_0807F158 CallWithArg sub_0807F4F8, 0x0000035c diff --git a/data/scripts/script_0800BCE8.inc b/data/scripts/script_0800BCE8.inc index 1d4a66b4..56486bf0 100644 --- a/data/scripts/script_0800BCE8.inc +++ b/data/scripts/script_0800BCE8.inc @@ -8,7 +8,7 @@ SCRIPT_START script_0800BCE8 Wait 0x00f0 _0807E930 0x0000 Wait 0x003c - TextboxNoOverlap 0x0e0a + MessageNoOverlap 0x0e0a _0807EA94 _0807E930 0x0008 Wait 0x003c @@ -21,7 +21,7 @@ script_0800BD1C: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e0c + MessageNoOverlap 0x0e0c _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_0800BD78.inc b/data/scripts/script_0800BD78.inc index 3b4f628f..4fffe979 100644 --- a/data/scripts/script_0800BD78.inc +++ b/data/scripts/script_0800BD78.inc @@ -10,7 +10,7 @@ SCRIPT_START script_0800BD78 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000270 Wait 0x001e - TextboxNoOverlap 0x0e0b + MessageNoOverlap 0x0e0b _0807EA94 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800BE1C.inc b/data/scripts/script_0800BE1C.inc index 5fed6585..89654d0c 100644 --- a/data/scripts/script_0800BE1C.inc +++ b/data/scripts/script_0800BE1C.inc @@ -9,7 +9,7 @@ SCRIPT_START script_0800BE1C _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c - TextboxNoOverlap 0x0e0d + MessageNoOverlap 0x0e0d _0807EA94 _0807E930 0x0008 Wait 0x003c @@ -40,7 +40,7 @@ script_0800BE8C: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e0f + MessageNoOverlap 0x0e0f _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 diff --git a/data/scripts/script_0800BECC.inc b/data/scripts/script_0800BECC.inc index a57fbd89..5d17a790 100644 --- a/data/scripts/script_0800BECC.inc +++ b/data/scripts/script_0800BECC.inc @@ -10,7 +10,7 @@ SCRIPT_START script_0800BECC DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e - TextboxNoOverlap 0x0e0e + MessageNoOverlap 0x0e0e _0807EA94 _0807E5F8 0x0000000c WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc index be10cfed..05d3a9f9 100644 --- a/data/scripts/script_0800BF38.inc +++ b/data/scripts/script_0800BF38.inc @@ -9,7 +9,7 @@ SCRIPT_START script_0800BF38 _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c - TextboxNoOverlap 0x0e10 + MessageNoOverlap 0x0e10 _0807EA94 _0807E930 0x0008 Wait 0x003c @@ -40,7 +40,7 @@ script_0800BFA8: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e12 + MessageNoOverlap 0x0e12 _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 diff --git a/data/scripts/script_0800C004.inc b/data/scripts/script_0800C004.inc index da82fbf0..dc84fff8 100644 --- a/data/scripts/script_0800C004.inc +++ b/data/scripts/script_0800C004.inc @@ -10,7 +10,7 @@ SCRIPT_START script_0800C004 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e - TextboxNoOverlap 0x0e11 + MessageNoOverlap 0x0e11 _0807EA94 _0807E5F8 0x0000001c WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800C0B0.inc b/data/scripts/script_0800C0B0.inc index 784fa358..64e29d11 100644 --- a/data/scripts/script_0800C0B0.inc +++ b/data/scripts/script_0800C0B0.inc @@ -9,7 +9,7 @@ SCRIPT_START script_0800C0B0 _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c - TextboxNoOverlap 0x0e13 + MessageNoOverlap 0x0e13 _0807EA94 _0807E930 0x0008 Wait 0x003c @@ -40,7 +40,7 @@ script_0800C120: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e15 + MessageNoOverlap 0x0e15 _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 diff --git a/data/scripts/script_0800C160.inc b/data/scripts/script_0800C160.inc index 3df5f2f1..90d19ec2 100644 --- a/data/scripts/script_0800C160.inc +++ b/data/scripts/script_0800C160.inc @@ -10,7 +10,7 @@ SCRIPT_START script_0800C160 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e - TextboxNoOverlap 0x0e14 + MessageNoOverlap 0x0e14 _0807EA94 _0807E5F8 0x0000003c WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc index be502e1f..583bcfff 100644 --- a/data/scripts/script_0800C1D8.inc +++ b/data/scripts/script_0800C1D8.inc @@ -9,7 +9,7 @@ SCRIPT_START script_0800C1D8 _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c - TextboxNoOverlap 0x0e16 + MessageNoOverlap 0x0e16 _0807EA94 _0807E930 0x0008 Wait 0x003c @@ -40,7 +40,7 @@ script_0800C248: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e18 + MessageNoOverlap 0x0e18 _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 diff --git a/data/scripts/script_0800C2A4.inc b/data/scripts/script_0800C2A4.inc index 02d68b9c..d07d743d 100644 --- a/data/scripts/script_0800C2A4.inc +++ b/data/scripts/script_0800C2A4.inc @@ -10,7 +10,7 @@ SCRIPT_START script_0800C2A4 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e - TextboxNoOverlap 0x0e17 + MessageNoOverlap 0x0e17 _0807EA94 _0807E5F8 0x0000007c WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800C370.inc b/data/scripts/script_0800C370.inc index a19ec82a..da292797 100644 --- a/data/scripts/script_0800C370.inc +++ b/data/scripts/script_0800C370.inc @@ -6,7 +6,7 @@ SCRIPT_START script_0800C370 _0807EEF4 0xfff8, 0x0000 _0807F0C8 0x0000, 0x0000 Wait 0x001e - TextboxNoOverlap 0x1d00 + MessageNoOverlap 0x1d00 _0807EA94 _0807E5F8 0x00000006 WaitForSomething2 0x00000001 diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc index 4c598340..60f96806 100644 --- a/data/scripts/script_0800C550.inc +++ b/data/scripts/script_0800C550.inc @@ -37,7 +37,7 @@ script_0800C5A6: Call sub_08060208 Jump script_0800C5C0 script_0800C5BC: - TextboxNoOverlap 0x4710 + MessageNoOverlap 0x4710 script_0800C5C0: _0807EA94 _0807E878 @@ -111,7 +111,7 @@ script_0800C684: CheckInventory1 0x005b JumpIf script_0800C6B6 DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f16 + MessageFromTarget 0x1f16 _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a @@ -123,7 +123,7 @@ script_0800C6B6: CheckLocalFlag 0x0081 JumpIf script_0800C6DC DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f1b + MessageFromTarget 0x1f1b _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a @@ -134,7 +134,7 @@ script_0800C6DC: CheckLocalFlag 0x0082 JumpIf script_0800C712 DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f17 + MessageFromTarget 0x1f17 _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a @@ -147,7 +147,7 @@ script_0800C6DC: SetLocalFlag 0x0082 script_0800C712: DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f18 + MessageFromTarget 0x1f18 _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a @@ -158,7 +158,7 @@ script_0800C730: CheckLocalFlag 0x0083 JumpIf script_0800C756 DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f19 + MessageFromTarget 0x1f19 _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a @@ -167,7 +167,7 @@ script_0800C730: Jump script_0800C652 script_0800C756: DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f1a + MessageFromTarget 0x1f1a _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a @@ -190,7 +190,7 @@ script_0800C780: CheckInventory1 0x005b JumpIf script_0800C7C0 _0807E930 0x0008 - TextboxNoOverlapFollow 0x2122 + MessageFromTarget 0x2122 _0807EA94 DoPostScriptAction 0x0000 Call sub_0807DF50 @@ -200,16 +200,16 @@ script_0800C7C0: _0807E930 0x0008 CheckLocalFlag 0x0081 JumpIf script_0800C80A - TextboxNoOverlapFollow 0x1130 + MessageFromTarget 0x1130 _0807EA94 _0807EB28 0x1131 _0807EA94 _0807EB8C - TextboxNoOverlapFollow 0x1132 + MessageFromTarget 0x1132 _0807EA94 SetIntVariable 0x00000103 Call sub_0807F420 - TextboxNoOverlapFollow 0x1133 + MessageFromTarget 0x1133 _0807EA94 Wait 0x000a DoPostScriptAction 0x0000 @@ -218,7 +218,7 @@ script_0800C7C0: _0807E878 Jump script_0800C780 script_0800C80A: - TextboxNoOverlapFollow 0x1133 + MessageFromTarget 0x1133 _0807EA94 Wait 0x000a _0807E930 0x0000 @@ -229,7 +229,7 @@ script_0800C824: _0807E930 0x0008 CheckLocalFlag 0x0083 JumpIf script_0800C8AE - TextboxNoOverlapFollow 0x1135 + MessageFromTarget 0x1135 _0807EA94 SetEntitySpeed 0x0040 _0807EDD4 0x0038, 0x0044 @@ -241,7 +241,7 @@ script_0800C824: Wait 0x003c _0807EB74 _0807EB8C - TextboxNoOverlapFollow 0x1136 + MessageFromTarget 0x1136 _0807EA94 _0807EB28 0x1137 _0807EA94 @@ -257,7 +257,7 @@ script_0800C87C: _0807EB74 SetIntVariable 0x00000008 Call sub_0807F3D8 - TextboxNoOverlapFollow 0x1136 + MessageFromTarget 0x1136 _0807EA94 Wait 0x000a DoPostScriptAction 0x0000 @@ -265,7 +265,7 @@ script_0800C87C: _0807E878 Jump script_0800C87C script_0800C8AE: - TextboxNoOverlapFollow 0x1136 + MessageFromTarget 0x1136 _0807EA94 Wait 0x000a DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800C91C.inc b/data/scripts/script_0800C91C.inc index 3c5d833e..a4893feb 100644 --- a/data/scripts/script_0800C91C.inc +++ b/data/scripts/script_0800C91C.inc @@ -39,7 +39,7 @@ script_0800C928: _0807E5F8 0x00000200 WaitForSomething2 0x00000400 _0807E8E4_0 - TextboxNoOverlapFollow 0x1126 + MessageFromTarget 0x1126 Call sub_0807F40C _0807EA94 _0807E5F8 0x00000200 @@ -55,12 +55,12 @@ script_0800C928: _0807E5F8 0x00008000 WaitForSomething2 0x00010000 _0807E8E4_3 - TextboxNoOverlapFollow 0x1127 + MessageFromTarget 0x1127 _0807EA94 _0807E5F8 0x00002000 WaitForSomething2 0x00004000 _0807E8E4_1 - TextboxNoOverlapFollow 0x1128 + MessageFromTarget 0x1128 _0807EA94 _0807E5F8 0x00000200 _0807E5F8 0x00000800 diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc index 7fb12f17..2cdbd343 100644 --- a/data/scripts/script_0800CD7C.inc +++ b/data/scripts/script_0800CD7C.inc @@ -19,7 +19,7 @@ script_0800CDA6: CheckLocalFlag 0x009d JumpIf script_0800CDC4 SetLocalFlag 0x009d - TextboxNoOverlap 0x213d + MessageNoOverlap 0x213d Jump script_0800CF40 script_0800CDC4: CheckGlobalFlag 0x003b @@ -30,14 +30,14 @@ script_0800CDC4: JumpIfNot script_0800CF2A SetGlobalFlag 0x003b ClearGlobalFlag 0x0054 - TextboxNoOverlap 0x2141 + MessageNoOverlap 0x2141 Jump script_0800CF40 script_0800CDEC: - TextboxNoOverlap 0x213e + MessageNoOverlap 0x213e _0807EA94 _0807E48C 0x0023 JumpIfNot script_0800CE14 - TextboxNoOverlap 0x214b + MessageNoOverlap 0x214b _0807EA94 _0807E3E8 JumpIfNot script_0800CF40 @@ -48,7 +48,7 @@ script_0800CDEC: script_0800CE14: _0807E48C 0x0022 JumpIfNot script_0800CF40 - TextboxNoOverlap 0x214b + MessageNoOverlap 0x214b _0807EA94 _0807E3E8 JumpIfNot script_0800CF40 @@ -59,7 +59,7 @@ script_0800CE32: _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 - TextboxNoOverlap 0x213f + MessageNoOverlap 0x213f Jump script_0800CF02 script_0800CE46: CheckGlobalFlag 0x003c @@ -70,14 +70,14 @@ script_0800CE46: JumpIfNot script_0800CF2A SetGlobalFlag 0x003c ClearGlobalFlag 0x0054 - TextboxNoOverlap 0x2145 + MessageNoOverlap 0x2145 Jump script_0800CF40 script_0800CE6E: - TextboxNoOverlap 0x2142 + MessageNoOverlap 0x2142 _0807EA94 _0807E48C 0x0027 JumpIfNot script_0800CF40 - TextboxNoOverlap 0x214c + MessageNoOverlap 0x214c _0807EA94 _0807E3E8 JumpIfNot script_0800CF40 @@ -87,7 +87,7 @@ script_0800CE6E: _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 - TextboxNoOverlap 0x2143 + MessageNoOverlap 0x2143 Jump script_0800CF02 script_0800CEA6: CheckGlobalFlag 0x003d @@ -98,14 +98,14 @@ script_0800CEA6: JumpIfNot script_0800CF2A SetGlobalFlag 0x003d ClearGlobalFlag 0x0054 - TextboxNoOverlap 0x2149 + MessageNoOverlap 0x2149 Jump script_0800CF40 script_0800CECE: - TextboxNoOverlap 0x2146 + MessageNoOverlap 0x2146 _0807EA94 _0807E48C 0x0024 JumpIfNot script_0800CF40 - TextboxNoOverlap 0x214d + MessageNoOverlap 0x214d _0807EA94 _0807E3E8 JumpIfNot script_0800CF40 @@ -115,7 +115,7 @@ script_0800CECE: _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 - TextboxNoOverlap 0x2147 + MessageNoOverlap 0x2147 script_0800CF02: _0807EA94 Call sub_0807DF50 @@ -132,13 +132,13 @@ script_0800CF20: _0807E864 Call sub_0807DF28 script_0800CF2A: - TextboxNoOverlap 0x2140 + MessageNoOverlap 0x2140 _0807EA94 Call sub_0807DF50 _0807E878 Jump script_0800CF0C script_0800CF3C: - TextboxNoOverlap 0x214a + MessageNoOverlap 0x214a script_0800CF40: _0807EA94 Call sub_0807DF50 @@ -215,7 +215,7 @@ script_0800CFFA: _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 - TextboxNoOverlap 0x1219 + MessageNoOverlap 0x1219 Jump script_0800D17C script_0800D032: CheckInventory1 0x0041 @@ -225,7 +225,7 @@ script_0800D032: _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 - TextboxNoOverlapFollowPos 0x125c, 0x0002 + MessageFromTargetPos 0x125c, 0x0002 _0807EA94 StartPlayerScript script_0800D1B4 WaitForSomething2 0x00000008 @@ -236,12 +236,12 @@ script_0800D032: _0807E5F8 0x00000020 StartPlayerScript script_0800D1E0 WaitForSomething2 0x00000008 - TextboxNoOverlapFollowPos 0x125d, 0x0002 + MessageFromTargetPos 0x125d, 0x0002 Jump script_0800D17C script_0800D098: CheckLocalFlag 0x007e JumpIfNot script_0800D0A8 - TextboxNoOverlapFollow 0x123e + MessageFromTarget 0x123e Jump script_0800D17C script_0800D0A8: StartPlayerScript script_0800D190 @@ -253,7 +253,7 @@ script_0800D0A8: _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 - TextboxNoOverlapFollowPos 0x123d, 0x0002 + MessageFromTargetPos 0x123d, 0x0002 _0807EA94 StartPlayerScript script_0800D1B4 WaitForSomething2 0x00000008 @@ -268,7 +268,7 @@ script_0800D108: PlaySound SFX_F8 _0807E5F8 0x00000010 SetLocalFlag 0x007e - TextboxNoOverlapFollowPos 0x123e, 0x0002 + MessageFromTargetPos 0x123e, 0x0002 _0807EA94 Wait 0x000f _0807E930 0x0009 @@ -277,7 +277,7 @@ script_0800D108: _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Wait 0x001e - TextboxNoOverlapFollowPos 0x123f, 0x0002 + MessageFromTargetPos 0x123f, 0x0002 _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_0800D1E0.inc b/data/scripts/script_0800D1E0.inc index 6a4350fa..15b082e9 100644 --- a/data/scripts/script_0800D1E0.inc +++ b/data/scripts/script_0800D1E0.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800D1E0 PlaySound SFX_109 CallWithArg sub_0807F238, 0x000001e2 Call sub_0807F304 - TextboxNoOverlap 0x0502 + MessageNoOverlap 0x0502 _0807EA94 _0807E5F8 0x00000008 Call sub_080791BC diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc index e9a10577..7a99b401 100644 --- a/data/scripts/script_0800D278.inc +++ b/data/scripts/script_0800D278.inc @@ -62,7 +62,7 @@ script_0800D31E: _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 - TextboxNoOverlapFollow 0x1219 + MessageFromTarget 0x1219 _0807EA94 Wait 0x000f _0807E878 diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc index d1d1d3ed..4c47ac07 100644 --- a/data/scripts/script_0800D874.inc +++ b/data/scripts/script_0800D874.inc @@ -16,7 +16,7 @@ script_0800D88E: WaitForSomething2 0x00000001 script_0800D8B0: _0807E8E4_0 - TextboxNoOverlap 0x1324 + MessageNoOverlap 0x1324 _0807EA94 CheckInventory1 0x0017 JumpIf script_0800D8D6 diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc index a86c3da9..f98cd972 100644 --- a/data/scripts/script_0800D954.inc +++ b/data/scripts/script_0800D954.inc @@ -17,11 +17,11 @@ script_0800D962: DoPostScriptAction 0x0007 PlaySound SFX_ELEMENT_FLOAT SetEntity0x20 0xffff8000 - TextboxNoOverlap 0x1701 + MessageNoOverlap 0x1701 _0807EA94 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 - TextboxNoOverlap 0x1702 + MessageNoOverlap 0x1702 _0807EA94 SetEntity0x20 0x00010000 _0807E5F8 0x00000004 diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/script_0800DA60.inc index 7b451f6c..bfb4af16 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 0x162d, 0x0002 + MessageFromTargetPos 0x162d, 0x0002 _0807EA94 _0807E5F8 0x00000001 Wait 0x001e - TextboxNoOverlapFollowPos 0x162e, 0x0002 + MessageFromTargetPos 0x162e, 0x0002 _0807EA94 _0807E8E4_0 CallWithArg sub_0807F75C, 0x00780138 diff --git a/data/scripts/script_0800DB78.inc b/data/scripts/script_0800DB78.inc index 03052307..c35c65dc 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 0x1643, 0x0002 + MessageFromTargetPos 0x1643, 0x0002 _0807EA94 _0807EB28 0x1645 _0807EA94 diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc index 5711733f..8e114e77 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 DoPostScriptAction 0x0007 - TextboxNoOverlapFollowPos 0x162f, 0x0002 + MessageFromTargetPos 0x162f, 0x0002 _0807EA94 PlayBgm BGM_VAATI_REBORN DoPostScriptAction 0x0019 diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc index 46080434..15056000 100644 --- a/data/scripts/script_0800DFE4.inc +++ b/data/scripts/script_0800DFE4.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800DFE4 _0807E864 EndBlock StopBgm - TextboxNoOverlapFollowPos 0x1632, 0x0002 + MessageFromTargetPos 0x1632, 0x0002 _0807EA94 SetRoomFlag 0x0003 script_0800DFFE: @@ -19,7 +19,7 @@ script_0800E012: _0807E864 Call sub_0807DF28 SetLocalFlag 0x007b - TextboxNoOverlapFollowPos 0x1639, 0x000c + MessageFromTargetPos 0x1639, 0x000c _0807EA94 Wait 0x0096 PlaySound SFX_EVAPORATE diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc index b00339ee..9e5a553f 100644 --- a/data/scripts/script_0800E0BC.inc +++ b/data/scripts/script_0800E0BC.inc @@ -27,7 +27,7 @@ script_0800E0DE: _0807EB8C _0807EB74 Wait 0x000a - TextboxNoOverlap 0x2402 + MessageNoOverlap 0x2402 _0807EA94 SetLocalFlag 0x0093 script_0800E12E: @@ -39,7 +39,7 @@ script_0800E138: JumpIfNot script_0800E138 _0807E864 _0807EB74 - TextboxNoOverlap 0x2402 + MessageNoOverlap 0x2402 _0807EA94 Wait 0x000f _0807E878 @@ -75,7 +75,7 @@ script_0800E176: _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 Wait 0x000a - TextboxNoOverlap 0x2401 + MessageNoOverlap 0x2401 _0807EA94 SetLocalFlag 0x0094 script_0800E1D0: @@ -89,7 +89,7 @@ script_0800E1E0: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2401 + MessageNoOverlap 0x2401 _0807EA94 _0807E878 Jump script_0800E1E0 @@ -168,7 +168,7 @@ script_0800E312: _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 EndBlock - TextboxNoOverlap 0x2404 + MessageNoOverlap 0x2404 _0807EA94 _0807E878 Jump script_0800E2AE @@ -178,7 +178,7 @@ script_0800E32E: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2403 + MessageNoOverlap 0x2403 _0807EA94 _0807E878 Jump script_0800E32E @@ -223,7 +223,7 @@ script_0800E3C8: JumpIfNot script_0800E3C8 _0807E864 _0807EB74 - TextboxNoOverlap 0x240c + MessageNoOverlap 0x240c _0807EA94 Wait 0x000f _0807F034 0x0053 @@ -239,7 +239,7 @@ script_0800E3EE: JumpIfNot script_0800E3EE _0807E864 _0807EB74 - TextboxNoOverlap 0x240d + MessageNoOverlap 0x240d _0807EA94 Wait 0x000f _0807E878 @@ -255,7 +255,7 @@ script_0800E41A: JumpIfNot script_0800E41A _0807E864 _0807EB74 - TextboxNoOverlap 0x2406 + MessageNoOverlap 0x2406 _0807EA94 Wait 0x000f _0807E878 @@ -273,7 +273,7 @@ script_0800E44C: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2405 + MessageNoOverlap 0x2405 _0807EA94 _0807E878 Jump script_0800E44C @@ -290,7 +290,7 @@ script_0800E484: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2407 + MessageNoOverlap 0x2407 _0807EA94 _0807E878 Jump script_0800E484 @@ -325,10 +325,10 @@ script_0800E4B6: EndBlock Call sub_0807F3F8 Wait 0x003c - TextboxNoOverlapFollow 0x160c + MessageFromTarget 0x160c _0807EA94 Wait 0x001e - TextboxNoOverlapFollow 0x160d + MessageFromTarget 0x160d _0807EA94 Wait 0x001e _0807EB28 0x160e diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/script_0800E58C.inc index f32c3d6e..77f8324a 100644 --- a/data/scripts/script_0800E58C.inc +++ b/data/scripts/script_0800E58C.inc @@ -9,7 +9,7 @@ SCRIPT_START script_0800E58C Wait 0x003c PlaySound SFX_9B Wait 0x001e - TextboxNoOverlap 0x1625 + MessageNoOverlap 0x1625 _0807EA94 Wait 0x003c Call sub_08053C84 diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc index c345a277..585fef2f 100644 --- a/data/scripts/script_0800E6B0.inc +++ b/data/scripts/script_0800E6B0.inc @@ -137,7 +137,7 @@ script_0800E832: _0807E864 _0807EB44 0x0004 BeginBlock - TextboxNoOverlapFollow 0x4501 + MessageFromTarget 0x4501 CallWithArg sub_0807F854, 0x00010032 CallWithArg sub_0807F854, 0x000200c8 CallWithArg sub_0807F854, 0x00030190 @@ -147,7 +147,7 @@ script_0800E832: JumpTable script_0800E910, script_0800E8D6, script_0800E8A4, script_0800E872 script_0800E872: BeginBlock - TextboxNoOverlapFollow 0x4505 + MessageFromTarget 0x4505 CallWithArg sub_0807F854, 0x00010190 EndBlock _0807EA94 @@ -155,7 +155,7 @@ script_0800E872: JumpIfNot script_0800E908 ModRupees 0xfe70 SetLocalFlag 0x0091 - TextboxNoOverlapFollow 0x4508 + MessageFromTarget 0x4508 _0807EA94 Call sub_0806C578 SCRIPT_END diff --git a/data/scripts/script_0800E8A4.inc b/data/scripts/script_0800E8A4.inc index c357c472..5a632850 100644 --- a/data/scripts/script_0800E8A4.inc +++ b/data/scripts/script_0800E8A4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800E8A4 BeginBlock - TextboxNoOverlapFollow 0x4504 + MessageFromTarget 0x4504 CallWithArg sub_0807F854, 0x000100c8 EndBlock _0807EA94 @@ -8,7 +8,7 @@ SCRIPT_START script_0800E8A4 JumpIfNot script_0800E908 ModRupees 0xff38 SetLocalFlag 0x0091 - TextboxNoOverlapFollow 0x4508 + MessageFromTarget 0x4508 _0807EA94 Call sub_0806C588 SCRIPT_END diff --git a/data/scripts/script_0800E8D6.inc b/data/scripts/script_0800E8D6.inc index a288f654..4dc0a75b 100644 --- a/data/scripts/script_0800E8D6.inc +++ b/data/scripts/script_0800E8D6.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800E8D6 BeginBlock - TextboxNoOverlapFollow 0x4503 + MessageFromTarget 0x4503 CallWithArg sub_0807F854, 0x00010032 EndBlock _0807EA94 @@ -8,7 +8,7 @@ SCRIPT_START script_0800E8D6 JumpIfNot script_0800E908 ModRupees 0xffce SetLocalFlag 0x0091 - TextboxNoOverlapFollow 0x4508 + MessageFromTarget 0x4508 _0807EA94 Call sub_0806C598 SCRIPT_END diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc index 90180d0e..314462db 100644 --- a/data/scripts/script_0800E908.inc +++ b/data/scripts/script_0800E908.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800E908 - TextboxNoOverlapFollow 0x4507 + MessageFromTarget 0x4507 Jump script_0800E914 script_0800E910: - TextboxNoOverlapFollow 0x4509 + MessageFromTarget 0x4509 script_0800E914: _0807EA94 _0807E878 @@ -50,11 +50,11 @@ script_0800E974: StartPlayerScript script_0800E9F4 WaitForSomething2 0x00000001 DoPostScriptAction 0x000a - TextboxNoOverlapFollow 0x4a24 + MessageFromTarget 0x4a24 _0807EA94 _0807E930 0x000a Wait 0x0014 - TextboxNoOverlapFollow 0x4a25 + MessageFromTarget 0x4a25 _0807EA94 _0807E930 0x0000 StartPlayerScript script_0800EA1C @@ -62,7 +62,7 @@ script_0800E974: SetLocalFlag 0x0074 PlaySound SFX_SECRET Wait 0x00f0 - TextboxNoOverlapFollow 0x4a26 + MessageFromTarget 0x4a26 _0807EA94 SetLocalFlag 0x0075 script_0800E9E4: diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc index e114b2e9..fc623ce3 100644 --- a/data/scripts/script_0800EA54.inc +++ b/data/scripts/script_0800EA54.inc @@ -265,13 +265,13 @@ script_0800EDB6: JumpIf script_0800EE3E Wait 0x000a _0807E5F8 0x00000001 - TextboxNoOverlapFollow 0x4c07 + MessageFromTarget 0x4c07 _0807EA94 _0807E5F8 0x00000010 - TextboxNoOverlapFollow 0x4c08 + MessageFromTarget 0x4c08 _0807EA94 _0807E5F8 0x00000020 - TextboxNoOverlapFollow 0x4c09 + MessageFromTarget 0x4c09 _0807EA94 SetIntVariable 0x00000503 Call sub_0807F420 @@ -290,7 +290,7 @@ script_0800EE12: WaitForSomething2 0x00000008 Jump script_0800ED98 script_0800EE3E: - TextboxNoOverlapFollow 0x4c16 + MessageFromTarget 0x4c16 _0807EA94 Call sub_0807DF50 _0807E878 @@ -316,13 +316,13 @@ script_0800EE76: JumpIf script_0800EEFE Wait 0x000a _0807E5F8 0x00000001 - TextboxNoOverlapFollow 0x4c07 + MessageFromTarget 0x4c07 _0807EA94 _0807E5F8 0x00000002 - TextboxNoOverlapFollow 0x4c08 + MessageFromTarget 0x4c08 _0807EA94 _0807E5F8 0x00000004 - TextboxNoOverlapFollow 0x4c09 + MessageFromTarget 0x4c09 _0807EA94 SetIntVariable 0x00000503 Call sub_0807F420 @@ -341,19 +341,19 @@ script_0800EED2: WaitForSomething2 0x00000040 Jump script_0800EE58 script_0800EEFE: - TextboxNoOverlapFollow 0x4c15 + MessageFromTarget 0x4c15 _0807EA94 Call sub_0807DF50 _0807E878 Jump script_0800EE58 - TextboxNoOverlapFollow 0x4c07 + MessageFromTarget 0x4c07 _0807EA94 _0807E5F8 0x00000012 Wait 0x000a - TextboxNoOverlapFollow 0x4c08 + MessageFromTarget 0x4c08 _0807EA94 _0807E5F8 0x00000024 - TextboxNoOverlapFollow 0x4c09 + MessageFromTarget 0x4c09 _0807EA94 _0807E5F8 0x00000048 Call sub_080791BC diff --git a/data/scripts/script_0800EF40.inc b/data/scripts/script_0800EF40.inc index 74e61575..3e4818ac 100644 --- a/data/scripts/script_0800EF40.inc +++ b/data/scripts/script_0800EF40.inc @@ -10,7 +10,7 @@ script_0800EF50: _0807E864 CheckLocalFlagByOffset 0x0200, 0x006d JumpIf script_0800EF82 - TextboxNoOverlapFollow 0x4d01 + MessageFromTarget 0x4d01 _0807EA94 StartPlayerScript script_0800EF9C WaitForSomething2 0x00000001 @@ -19,7 +19,7 @@ script_0800EF50: Jump script_0800EF50 script_0800EF82: SetGlobalFlag 0x001f - TextboxNoOverlapFollow 0x4d02 + MessageFromTarget 0x4d02 _0807EA94 Wait 0x000f _0807E878 diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc index cf88816f..405abdfe 100644 --- a/data/scripts/script_0800EFC0.inc +++ b/data/scripts/script_0800EFC0.inc @@ -59,18 +59,18 @@ script_0800F09A: WaitForSomething2 0x00000001 _0807E5F8 0x0000001e WaitForSomething2 0x00000040 - TextboxNoOverlapFollowPos 0x1201, 0x000c + MessageFromTargetPos 0x1201, 0x000c _0807EA94 WaitForSomething2 0x000003c0 _0807E8E4_0 - TextboxNoOverlapFollowPos 0x1202, 0x000c + MessageFromTargetPos 0x1202, 0x000c _0807EA94 _0807F034 0x0067 WaitPlayerAction8 _0807E8E4_0 _0807E5F8 0x00000002 WaitForSomething2 0x00000040 - TextboxNoOverlapFollowPos 0x1203, 0x000c + MessageFromTargetPos 0x1203, 0x000c _0807EA94 _0807E5F8 0x00000002 Call sub_0807DF50 diff --git a/data/scripts/script_0800F184.inc b/data/scripts/script_0800F184.inc index b9ef9e66..0088b802 100644 --- a/data/scripts/script_0800F184.inc +++ b/data/scripts/script_0800F184.inc @@ -32,7 +32,7 @@ script_0800F1E6: _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlapFollowPos 0x1206, 0x000c + MessageFromTargetPos 0x1206, 0x000c _0807EA94 StartPlayerScript script_0800F33C WaitForSomething2 0x00000400 @@ -48,7 +48,7 @@ script_0800F22A: _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlapFollowPos 0x1206, 0x000c + MessageFromTargetPos 0x1206, 0x000c _0807EA94 StartPlayerScript script_0800F354 WaitForSomething2 0x00000400 @@ -64,7 +64,7 @@ script_0800F26A: _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlapFollowPos 0x1206, 0x000c + MessageFromTargetPos 0x1206, 0x000c _0807EA94 StartPlayerScript script_0800F36C WaitForSomething2 0x00000400 @@ -80,7 +80,7 @@ script_0800F2AA: _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlapFollowPos 0x1206, 0x000c + MessageFromTargetPos 0x1206, 0x000c _0807EA94 StartPlayerScript script_0800F384 WaitForSomething2 0x00000400 @@ -97,7 +97,7 @@ script_0800F2EA: _0807E864 _0807EB74 _0807E930 0x0008 - TextboxNoOverlapFollowPos 0x1208, 0x000c + MessageFromTargetPos 0x1208, 0x000c _0807EA94 _0807E878 Jump script_0800F1E6 diff --git a/data/scripts/script_0800F39C.inc b/data/scripts/script_0800F39C.inc index d492c9ee..cc811603 100644 --- a/data/scripts/script_0800F39C.inc +++ b/data/scripts/script_0800F39C.inc @@ -25,7 +25,7 @@ script_0800F3EA: EndBlock _0807E864 _0807EB74 - TextboxNoOverlap 0x1237 + MessageNoOverlap 0x1237 _0807EA94 _0807E878 script_0800F402: diff --git a/data/scripts/script_0800F430.inc b/data/scripts/script_0800F430.inc index 3f822589..8c38742f 100644 --- a/data/scripts/script_0800F430.inc +++ b/data/scripts/script_0800F430.inc @@ -24,7 +24,7 @@ script_0800F478: EndBlock _0807E864 _0807EB74 - TextboxNoOverlap 0x1238 + MessageNoOverlap 0x1238 _0807EA94 _0807E878 script_0800F490: diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/script_0800F4C4.inc index 958ffa77..5e620310 100644 --- a/data/scripts/script_0800F4C4.inc +++ b/data/scripts/script_0800F4C4.inc @@ -24,7 +24,7 @@ script_0800F50C: EndBlock _0807E864 _0807EB74 - TextboxNoOverlap 0x1239 + MessageNoOverlap 0x1239 _0807EA94 _0807E878 script_0800F524: diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc index bf828afc..eeccd99e 100644 --- a/data/scripts/script_0800F554.inc +++ b/data/scripts/script_0800F554.inc @@ -64,7 +64,7 @@ script_0800F604: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 - TextboxNoOverlap 0x2511 + MessageNoOverlap 0x2511 _0807EA94 Wait 0x000f _0807E878 @@ -131,10 +131,10 @@ script_0800F6A0: .endif .endif JumpIf script_0800F6C4 - TextboxNoOverlap 0x2512 + MessageNoOverlap 0x2512 Jump script_0800F6C8 script_0800F6C4: - TextboxNoOverlap 0x251f + MessageNoOverlap 0x251f script_0800F6C8: _0807EA94 Wait 0x000f diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc index bd45a2ff..6b5ddced 100644 --- a/data/scripts/script_0800F724.inc +++ b/data/scripts/script_0800F724.inc @@ -46,7 +46,7 @@ SCRIPT_START script_0800F73C Call sub_0807F5C0 WaitForSomething2 0x00000001 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2501, 0x0000 + MessageFromTargetPos 0x2501, 0x0000 _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -62,7 +62,7 @@ SCRIPT_START script_0800F73C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2503, 0x000e + MessageFromTargetPos 0x2503, 0x000e _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -75,7 +75,7 @@ SCRIPT_START script_0800F73C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2504, 0x000e + MessageFromTargetPos 0x2504, 0x000e _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -88,7 +88,7 @@ SCRIPT_START script_0800F73C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2505, 0x000e + MessageFromTargetPos 0x2505, 0x000e _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -103,7 +103,7 @@ SCRIPT_START script_0800F73C _0807E8E4_0 Call sub_0807F3F8 Wait 0x003c - TextboxNoOverlapFollowPos 0x1021, 0x000e + MessageFromTargetPos 0x1021, 0x000e _0807EA94 StartPlayerScript script_0800FAE4 SetEntityPositionRelative 0x00f0, 0x0258 @@ -112,44 +112,44 @@ SCRIPT_START script_0800F73C Wait 0x001e Call sub_08063C2C WaitForSomething2 0x00000001 - TextboxNoOverlapFollowPos 0x1022, 0x000e + MessageFromTargetPos 0x1022, 0x000e _0807EA94 _0807E8E4_0 Call sub_08063C14 Call sub_08094CDC Wait 0x001e - TextboxNoOverlapFollowPos 0x1023, 0x000e + MessageFromTargetPos 0x1023, 0x000e _0807EA94 Call sub_08063C14 Call sub_08094DD8 Wait 0x001e - TextboxNoOverlapFollowPos 0x1024, 0x000e + MessageFromTargetPos 0x1024, 0x000e _0807EA94 Call sub_08063C14 Call sub_08094D34 Wait 0x001e - TextboxNoOverlapFollowPos 0x1025, 0x000e + MessageFromTargetPos 0x1025, 0x000e _0807EA94 Call sub_08063C5C - TextboxNoOverlapFollowPos 0x1026, 0x000e + MessageFromTargetPos 0x1026, 0x000e _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807E8E4_1 Call sub_08063C2C - TextboxNoOverlapFollowPos 0x1027, 0x0000 + MessageFromTargetPos 0x1027, 0x0000 _0807EA94 Call sub_08063C74 Wait 0x003c Call sub_08063C14 _0807E8E4_0 - TextboxNoOverlapFollowPos 0x1028, 0x000e + MessageFromTargetPos 0x1028, 0x000e _0807EA94 _0807E8E4_1 - TextboxNoOverlapFollowPos 0x1029, 0x0000 + MessageFromTargetPos 0x1029, 0x0000 _0807EA94 _0807E8E4_0 - TextboxNoOverlapFollowPos 0x102a, 0x000e + MessageFromTargetPos 0x102a, 0x000e _0807EA94 Call sub_08063C14 Call sub_08094D70 @@ -164,7 +164,7 @@ SCRIPT_START script_0800F73C _0807E8E4_1 Call sub_0807F3F8 Wait 0x003c - TextboxNoOverlapFollowPos 0x102b, 0x0000 + MessageFromTargetPos 0x102b, 0x0000 _0807EA94 _0807F034 0x000d WaitPlayerAction8 @@ -177,7 +177,7 @@ SCRIPT_START script_0800F73C Wait 0x00b7 SetIntVariable 0x00000000 Call sub_0807F5B0 - TextboxNoOverlapFollowPos 0x102c, 0x0000 + MessageFromTargetPos 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 7b8bb425..96592be7 100644 --- a/data/scripts/script_0800FD0C.inc +++ b/data/scripts/script_0800FD0C.inc @@ -25,7 +25,7 @@ script_0800FD1A: JumpIf script_0800FD5C _0807E864 Call sub_0807F9A4 - TextboxNoOverlapFollowPos 0x2506, 0x0000 + MessageFromTargetPos 0x2506, 0x0000 _0807EA94 StartPlayerScript script_0800FD80 WaitForSomething2 0x00000008 @@ -37,7 +37,7 @@ script_0800FD50: script_0800FD5C: _0807E864 Call sub_0807F9A4 - TextboxNoOverlapFollowPos 0x106c, 0x0000 + MessageFromTargetPos 0x106c, 0x0000 _0807EA94 StartPlayerScript script_0800FD80 WaitForSomething2 0x00000008 diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc index 5f45e217..6b5780a2 100644 --- a/data/scripts/script_0800FF74.inc +++ b/data/scripts/script_0800FF74.inc @@ -61,7 +61,7 @@ script_0800FFCC: CallWithArg sub_0807F3D8, 0x00000008 CheckInventory1 0x0048 JumpIf script_0800FFF8 - TextboxNoOverlap 0x3401 + MessageNoOverlap 0x3401 _0807EA94 Jump script_08010060 script_0800FFF8: @@ -75,11 +75,11 @@ script_0800FFF8: .endif .endif JumpIfNot script_0801000A - TextboxNoOverlap 0x340b + MessageNoOverlap 0x340b _0807EA94 Jump script_08010060 script_0801000A: - TextboxNoOverlap 0x3402 + MessageNoOverlap 0x3402 _0807EA94 Jump script_08010060 script_08010014: @@ -90,7 +90,7 @@ script_08010014: _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 PlaySound SFX_TASK_COMPLETE - TextboxNoOverlap 0x340a + MessageNoOverlap 0x340a _0807EA94 _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x0000000c @@ -125,7 +125,7 @@ script_08010090: _0807E864 _0807EB74 CallWithArg sub_080672B0, 0x00000004 - TextboxNoOverlapFollow 0x0a01 + MessageFromTarget 0x0a01 _0807EA94 Wait 0x000f _0807E878 diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc index 562efdf5..5ef23c13 100644 --- a/data/scripts/script_080100C8.inc +++ b/data/scripts/script_080100C8.inc @@ -38,7 +38,7 @@ script_08010132: JumpIfNot script_08010132 _0807E864 _0807EB74 - TextboxNoOverlapFollow 0x4f22 + MessageFromTarget 0x4f22 _0807EA94 _0807E878 Jump script_08010132 @@ -55,7 +55,7 @@ script_0801015A: _0807EB74 CheckRoomFlag 0x0001 JumpIf script_0801019E - TextboxNoOverlapFollowPos 0x3001, 0x0000 + MessageFromTargetPos 0x3001, 0x0000 _0807EA94 _0807E3E8 JumpIfNot script_080101A6 @@ -81,7 +81,7 @@ script_080101AC: Call sub_080A1270 _0807E864 Call sub_0807DF28 - TextboxNoOverlapFollowPos 0x3004, 0x0007 + MessageFromTargetPos 0x3004, 0x0007 _0807EA94 StopBgm _0807E778 0x0004 diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc index d0d023f8..ac3d52b3 100644 --- a/data/scripts/script_08010264.inc +++ b/data/scripts/script_08010264.inc @@ -211,13 +211,13 @@ script_08010502: CheckRoomFlag 0x000e JumpIf script_0801052E SetRoomFlag 0x000e - TextboxNoOverlap 0x2b10 + MessageNoOverlap 0x2b10 _0807EA94 script_0801052E: Call sub_080634E4 JumpTable script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570 script_08010544: - TextboxNoOverlap 0x2b0d + MessageNoOverlap 0x2b0d Jump script_080105E0 script_0801054C: CheckGlobalFlag 0x003d @@ -243,24 +243,24 @@ script_08010570: JumpIfNot script_080105CC Call sub_08063504 JumpIf script_080105D4 - TextboxNoOverlap 0x2b07 + MessageNoOverlap 0x2b07 _0807EA94 CallWithArg sub_0807F800, 0x00000000 WaitPlayerAction8 _0807EA94 - TextboxNoOverlap 0x2b0c + MessageNoOverlap 0x2b0c Jump script_080105E0 script_080105C4: - TextboxNoOverlap 0x2b09 + MessageNoOverlap 0x2b09 Jump script_080105E0 script_080105CC: - TextboxNoOverlap 0x2b0a + MessageNoOverlap 0x2b0a Jump script_080105E0 script_080105D4: - TextboxNoOverlap 0x2b0b + MessageNoOverlap 0x2b0b Jump script_080105E0 script_080105DC: - TextboxNoOverlap 0x2b0e + MessageNoOverlap 0x2b0e script_080105E0: _0807EA94 Call sub_0807DF50 @@ -278,7 +278,7 @@ script_08010602: JumpIfNot script_08010602 _0807E864 _0807EB74 - TextboxNoOverlapFollow 0x0a01 + MessageFromTarget 0x0a01 _0807EA94 _0807E878 _0807EB44 0x0004 @@ -330,7 +330,7 @@ script_08010686: _0807EB74 HasRoomItemForSale Call sub_0807F77C - TextboxNoOverlapFollowTable 0x3c08, 0x3c09 + MessageFromTargetTable 0x3c08, 0x3c09 _0807EA94 _0807E878 _0807EB44 0x0004 @@ -352,7 +352,7 @@ script_080106BE: DoPostScriptAction 0x0000 HasRoomItemForSale JumpIf script_080106E0 - TextboxNoOverlap 0x3c07 + MessageNoOverlap 0x3c07 Jump script_08010726 script_080106E0: Call sub_08062EB8 @@ -363,14 +363,14 @@ script_080106E0: _0807EA94 BuyItem 0x0000, 0x0000 JumpIf script_0801070C - TextboxNoOverlap 0x3c04 + MessageNoOverlap 0x3c04 Jump script_08010726 script_0801070C: WaitPlayerAction8 ModHealth 0x0008 Call sub_08062EDC JumpIf script_08010724 - TextboxNoOverlap 0x3c06 + MessageNoOverlap 0x3c06 Jump script_08010726 script_08010724: WaitPlayerAction8 @@ -401,12 +401,12 @@ script_08010746: JumpIfNot script_08010786 HasRupees 0x00c8 JumpIf script_08010778 - TextboxNoOverlap 0x4008 + MessageNoOverlap 0x4008 Jump script_08010786 script_08010778: ModRupees 0xff38 Call sub_08062E14 - TextboxNoOverlap 0x4007 + MessageNoOverlap 0x4007 script_08010786: EndBlock _0807EA94 @@ -470,13 +470,13 @@ script_08010804: JumpIfNot script_08010858 CheckGlobalFlag 0x0041 JumpIfNot script_08010850 - TextboxNoOverlap 0x3f39 + MessageNoOverlap 0x3f39 Jump script_080108BA script_08010850: - TextboxNoOverlap 0x2c1b + MessageNoOverlap 0x2c1b Jump script_080108BA script_08010858: - TextboxNoOverlap 0x2c1a + MessageNoOverlap 0x2c1a Jump script_080108BA script_08010860: EndBlock @@ -498,7 +498,7 @@ script_08010860: JumpIfNot script_080108AA CheckGlobalFlag 0x0044 JumpIfNot script_080108AA - TextboxNoOverlap 0x2c21 + MessageNoOverlap 0x2c21 Jump script_080108B2 script_080108AA: .ifdef USA @@ -508,7 +508,7 @@ script_080108AA: SetLocalFlag 0x00fa .endif .endif - TextboxNoOverlap 0x2c20 + MessageNoOverlap 0x2c20 script_080108B2: _0807EA94 Call sub_0807F83C diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc index 6e912cff..f8b16d18 100644 --- a/data/scripts/script_08010BB4.inc +++ b/data/scripts/script_08010BB4.inc @@ -24,15 +24,15 @@ SCRIPT_START script_08010BEC StartPlayerScript script_08011074 WaitForSomething2 0x00000400 _0807F078 0x0034, 0x0002 - TextboxNoOverlapFollowPos 0x1036, 0x000c + MessageFromTargetPos 0x1036, 0x000c _0807EA94 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 - TextboxNoOverlapFollowPos 0x1037, 0x0002 + MessageFromTargetPos 0x1037, 0x0002 _0807EA94 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 - TextboxNoOverlapFollowPos 0x1038, 0x000c + MessageFromTargetPos 0x1038, 0x000c _0807EA94 StopBgm _0807E778 0x0004 @@ -69,7 +69,7 @@ SCRIPT_START script_08010BEC _0807E8E4_1 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - TextboxNoOverlapFollowPos 0x1039, 0x000c + MessageFromTargetPos 0x1039, 0x000c _0807EA94 PlayBgm BGM_CASTLE_TOURNAMENT _0807E8E4_2 @@ -82,7 +82,7 @@ SCRIPT_START script_08010BEC Wait 0x012c _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - TextboxNoOverlapFollowPos 0x103a, 0x000c + MessageFromTargetPos 0x103a, 0x000c _0807EA94 SetEntityPositionRelative 0x01f8, 0x01c0 _0807F0B4 0x0004 @@ -100,7 +100,7 @@ SCRIPT_START script_08010BEC PlaySound SFX_9B _0807E5F8 0x00000100 WaitForSomething2 0x00000200 - TextboxNoOverlapFollowPos 0x1043, 0x0000 + MessageFromTargetPos 0x1043, 0x0000 _0807EA94 PlayBgm BGM_VAATI_THEME _0807E5F8 0x00000100 @@ -116,7 +116,7 @@ SCRIPT_START script_08010BEC WaitForSomething2 0x00005000 _0807E5F8 0x00028000 WaitForSomething2 0x00050000 - TextboxNoOverlapFollowPos 0x1044, 0x0000 + MessageFromTargetPos 0x1044, 0x0000 _0807EA94 SetEntityPositionRelative 0x01f8, 0x0098 StopBgm diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/script_08010E5A.inc index 2ebf3a9e..1483b778 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 0x1045, 0x000c + MessageFromTargetPos 0x1045, 0x000c _0807EA94 - TextboxNoOverlapFollowPos 0x1046, 0x0000 + MessageFromTargetPos 0x1046, 0x0000 _0807EA94 CallWithArg CreateManager36, 0x00000002 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc index 54feb621..d0bd4361 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 0x1047, 0x0000 + MessageFromTargetPos 0x1047, 0x0000 _0807EA94 Call sub_0806DC3C Call sub_080791BC @@ -28,11 +28,11 @@ SCRIPT_START script_08010F84 WaitForSomething2 0x00000020 StopBgm Wait 0x003c - TextboxNoOverlapFollowPos 0x104a, 0x0000 + MessageFromTargetPos 0x104a, 0x0000 _0807EA94 _0807E5F8 0x00000100 WaitForSomething2 0x00000200 - TextboxNoOverlapFollowPos 0x1049, 0x0000 + MessageFromTargetPos 0x1049, 0x0000 _0807EA94 SetEntityPositionRelative 0x01f8, 0x0098 Wait 0x0078 diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc index 50b0e0d3..1dcbb85e 100644 --- a/data/scripts/script_0801194C.inc +++ b/data/scripts/script_0801194C.inc @@ -24,10 +24,10 @@ script_0801197C: CallWithArg sub_0807F3D8, 0x00000000 CheckGlobalFlag 0x0015 JumpIf script_080119A0 - TextboxNoOverlapFollow 0x103d + MessageFromTarget 0x103d Jump script_080119A4 script_080119A0: - TextboxNoOverlapFollow 0x103f + MessageFromTarget 0x103f script_080119A4: _0807EA94 Wait 0x000f @@ -87,7 +87,7 @@ script_08011A44: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlapFollow 0x1320 + MessageFromTarget 0x1320 _0807EA94 _0807E878 Jump script_08011A44 @@ -106,7 +106,7 @@ script_08011A7C: CallWithArg sub_0807F3D8, 0x00000000 CallWithArg sub_080644B4, 0x00000006 JumpIf script_08011AFA - TextboxNoOverlapFollow 0x1320 + MessageFromTarget 0x1320 _0807EA94 _0807E878 Jump script_08011A7C @@ -123,7 +123,7 @@ script_08011AC4: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlapFollow 0x1322 + MessageFromTarget 0x1322 _0807EA94 _0807E878 Jump script_08011AC4 @@ -135,7 +135,7 @@ SCRIPT_START script_08011AE4 Call sub_0807F9A4 Call sub_0807DF28 script_08011AFA: - TextboxNoOverlapFollowPos 0x1321, 0x0007 + MessageFromTargetPos 0x1321, 0x0007 _0807EA94 .ifdef JP SetLocalFlag 0x0011 diff --git a/data/scripts/script_08011B20.inc b/data/scripts/script_08011B20.inc index 0e870c50..ad3edc18 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 0x1320, 0x000c + MessageFromTargetPos 0x1320, 0x000c _0807EA94 _0807E878 Call sub_0807DF50 diff --git a/data/scripts/script_08011B40.inc b/data/scripts/script_08011B40.inc index 4d7d15d8..29d22d33 100644 --- a/data/scripts/script_08011B40.inc +++ b/data/scripts/script_08011B40.inc @@ -12,7 +12,7 @@ SCRIPT_START script_08011B40 DoPostScriptAction 0x0004 Wait 0x003c _0807EB8C - TextboxNoOverlap 0x3d07 + MessageNoOverlap 0x3d07 _0807EA94 _0807EB44 0x0004 ClearGlobalFlag 0x0050 @@ -23,7 +23,7 @@ script_08011B84: JumpIfNot script_08011B84 _0807E864 _0807EB74 - TextboxNoOverlap 0x3d01 + MessageNoOverlap 0x3d01 _0807EA94 _0807E3E8 JumpIf script_08011BA4 @@ -36,12 +36,12 @@ script_08011BA4: JumpIf script_08011BBC DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x3d05 + MessageNoOverlap 0x3d05 Jump script_08011B9A script_08011BBC: ModRupees 0xfff6 Wait 0x001e - TextboxNoOverlap 0x3d06 + MessageNoOverlap 0x3d06 _0807EA94 CallWithArg sub_0806C2A0, 0x00000000 WaitFor_2 diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc index cbe9a609..6062d70a 100644 --- a/data/scripts/script_08011C7C.inc +++ b/data/scripts/script_08011C7C.inc @@ -16,7 +16,7 @@ script_08011C9A: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4515 + MessageNoOverlap 0x4515 _0807EA94 _0807E878 _0807EB44 0x0004 @@ -35,7 +35,7 @@ script_08011CC2: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x3105 + MessageNoOverlap 0x3105 _0807EA94 _0807E3E8 JumpIf script_08011D0E @@ -50,7 +50,7 @@ script_08011D00: _0807EB74 DoPostScriptAction 0x0000 script_08011D0E: - TextboxNoOverlap 0x3108 + MessageNoOverlap 0x3108 _0807EA94 SetGlobalFlag 0x002b _0807E878 @@ -76,7 +76,7 @@ script_08011D46: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4513 + MessageNoOverlap 0x4513 _0807EA94 _0807E878 _0807EB44 0x0004 @@ -95,7 +95,7 @@ script_08011D6E: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x3103 + MessageNoOverlap 0x3103 _0807EA94 _0807E3E8 JumpIf script_08011DBA @@ -110,7 +110,7 @@ script_08011DAC: _0807EB74 DoPostScriptAction 0x0000 script_08011DBA: - TextboxNoOverlap 0x3106 + MessageNoOverlap 0x3106 _0807EA94 SetGlobalFlag 0x002c _0807E878 @@ -136,7 +136,7 @@ script_08011DF2: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4514 + MessageNoOverlap 0x4514 _0807EA94 _0807E878 _0807EB44 0x0004 @@ -155,7 +155,7 @@ script_08011E1A: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x3104 + MessageNoOverlap 0x3104 _0807EA94 _0807E3E8 JumpIf script_08011E66 @@ -170,7 +170,7 @@ script_08011E58: _0807EB74 DoPostScriptAction 0x0000 script_08011E66: - TextboxNoOverlap 0x3107 + MessageNoOverlap 0x3107 _0807EA94 SetGlobalFlag 0x002d _0807E878 @@ -200,11 +200,11 @@ script_08011E96: DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011ECC - TextboxNoOverlap 0x4524 + MessageNoOverlap 0x4524 _0807EA94 Jump script_08011ED8 script_08011ECC: - TextboxNoOverlap 0x3111 + MessageNoOverlap 0x3111 _0807EA94 _0807E3E8 JumpIf script_08011EF4 @@ -220,7 +220,7 @@ script_08011EE6: _0807EB74 DoPostScriptAction 0x0000 script_08011EF4: - TextboxNoOverlap 0x3114 + MessageNoOverlap 0x3114 _0807EA94 SetGlobalFlag 0x002e _0807E878 @@ -249,11 +249,11 @@ script_08011F22: DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011F58 - TextboxNoOverlap 0x4522 + MessageNoOverlap 0x4522 _0807EA94 Jump script_08011F64 script_08011F58: - TextboxNoOverlap 0x310f + MessageNoOverlap 0x310f _0807EA94 _0807E3E8 JumpIf script_08011F80 @@ -269,7 +269,7 @@ script_08011F72: _0807EB74 DoPostScriptAction 0x0000 script_08011F80: - TextboxNoOverlap 0x3112 + MessageNoOverlap 0x3112 _0807EA94 SetGlobalFlag 0x002f _0807E878 @@ -298,11 +298,11 @@ script_08011FAE: DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011FE4 - TextboxNoOverlap 0x4523 + MessageNoOverlap 0x4523 _0807EA94 Jump script_08011FF0 script_08011FE4: - TextboxNoOverlap 0x3110 + MessageNoOverlap 0x3110 _0807EA94 _0807E3E8 JumpIf script_0801200C @@ -318,7 +318,7 @@ script_08011FFE: _0807EB74 DoPostScriptAction 0x0000 script_0801200C: - TextboxNoOverlap 0x3113 + MessageNoOverlap 0x3113 _0807EA94 SetGlobalFlag 0x0030 _0807E878 @@ -342,24 +342,24 @@ script_0801203A: DoPostScriptAction 0x0000 CheckLocalFlag 0x0094 JumpIf script_0801205E - TextboxNoOverlap 0x3122 + MessageNoOverlap 0x3122 _0807EA94 SetLocalFlag 0x0094 Jump script_0801209E script_0801205E: _0807E48C 0x0031 JumpIfNot script_08012070 - TextboxNoOverlap 0x3123 + MessageNoOverlap 0x3123 _0807EA94 Jump script_0801209E script_08012070: - TextboxNoOverlap 0x3124 + MessageNoOverlap 0x3124 _0807EA94 _0807E3E8 JumpIfNot script_0801209E _0807E48C 0x0020 JumpIfNot script_0801209A - TextboxNoOverlap 0x3125 + MessageNoOverlap 0x3125 _0807EA94 _0807F034 0x0031 WaitPlayerAction8 @@ -372,7 +372,7 @@ script_08012070: .endif Jump script_0801209E script_0801209A: - TextboxNoOverlap 0x3127 + MessageNoOverlap 0x3127 script_0801209E: _0807EA94 _0807E878 @@ -396,24 +396,24 @@ script_080120C6: DoPostScriptAction 0x0000 CheckLocalFlag 0x0095 JumpIf script_080120EA - TextboxNoOverlap 0x3116 + MessageNoOverlap 0x3116 _0807EA94 SetLocalFlag 0x0095 Jump script_0801212A script_080120EA: _0807E48C 0x002f JumpIfNot script_080120FC - TextboxNoOverlap 0x3117 + MessageNoOverlap 0x3117 _0807EA94 Jump script_0801212A script_080120FC: - TextboxNoOverlap 0x3118 + MessageNoOverlap 0x3118 _0807EA94 _0807E3E8 JumpIfNot script_0801212A _0807E48C 0x0020 JumpIfNot script_08012126 - TextboxNoOverlap 0x3119 + MessageNoOverlap 0x3119 _0807EA94 _0807F034 0x002f WaitPlayerAction8 @@ -426,7 +426,7 @@ script_080120FC: .endif Jump script_0801212A script_08012126: - TextboxNoOverlap 0x311b + MessageNoOverlap 0x311b script_0801212A: _0807EA94 _0807E878 @@ -450,24 +450,24 @@ script_08012152: DoPostScriptAction 0x0000 CheckLocalFlag 0x0096 JumpIf script_08012176 - TextboxNoOverlap 0x311c + MessageNoOverlap 0x311c _0807EA94 SetLocalFlag 0x0096 Jump script_080121B6 script_08012176: _0807E48C 0x0030 JumpIfNot script_08012188 - TextboxNoOverlap 0x311d + MessageNoOverlap 0x311d _0807EA94 Jump script_080121B6 script_08012188: - TextboxNoOverlap 0x311e + MessageNoOverlap 0x311e _0807EA94 _0807E3E8 JumpIfNot script_080121B6 _0807E48C 0x0020 JumpIfNot script_080121B2 - TextboxNoOverlap 0x311f + MessageNoOverlap 0x311f _0807EA94 _0807F034 0x0030 WaitPlayerAction8 @@ -480,7 +480,7 @@ script_08012188: .endif Jump script_080121B6 script_080121B2: - TextboxNoOverlap 0x3121 + MessageNoOverlap 0x3121 script_080121B6: _0807EA94 _0807E878 @@ -502,7 +502,7 @@ script_080121DE: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4527 + MessageNoOverlap 0x4527 _0807EA94 _0807E878 _0807EB44 0x0004 @@ -521,7 +521,7 @@ script_08012216: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4525 + MessageNoOverlap 0x4525 _0807EA94 _0807E878 _0807EB44 0x0004 @@ -540,7 +540,7 @@ script_0801224E: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4526 + MessageNoOverlap 0x4526 _0807EA94 _0807E878 _0807EB44 0x0004 @@ -567,7 +567,7 @@ script_08012298: _0807EB74 _0807E864 Call sub_08061FD8 - TextboxNoOverlapFollow 0x2302 + MessageFromTarget 0x2302 _0807EA94 _0807E878 SetGlobalFlag 0x001e @@ -586,7 +586,7 @@ script_080122CE: _0807EB74 _0807E864 Call sub_08061FD8 - TextboxNoOverlapFollow 0x2303 + MessageFromTarget 0x2303 _0807EA94 _0807E878 Jump script_080122BA diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc index 543e73ed..014f493f 100644 --- a/data/scripts/script_0801232C.inc +++ b/data/scripts/script_0801232C.inc @@ -9,7 +9,7 @@ script_08012338: JumpIfNot script_08012338 _0807EB74 _0807E864 - TextboxNoOverlapFollow 0x2304 + MessageFromTarget 0x2304 _0807EA94 CheckLocalFlag 0x0042 JumpIf script_0801235A @@ -48,7 +48,7 @@ script_08012368: _0807E8E4_0 StartPlayerScript script_08012410 WaitForSomething2 0x00000001 - TextboxNoOverlap 0x1402 + MessageNoOverlap 0x1402 _0807EA94 StopBgm SetEntity0x20 0x00010000 diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc index fbc1bae5..110ca1f7 100644 --- a/data/scripts/script_08012430.inc +++ b/data/scripts/script_08012430.inc @@ -44,7 +44,7 @@ script_0801248A: Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_08012AB0 - TextboxNoOverlapFollowPos 0x1101, 0x0007 + MessageFromTargetPos 0x1101, 0x0007 _0807EA94 CameraTargetPlayer _0807E778 0x0004 diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc index 123e7ed8..d1952fac 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 0x1102, 0x000c + MessageFromTargetPos 0x1102, 0x000c _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 - TextboxNoOverlapFollowPos 0x1103, 0x000c + MessageFromTargetPos 0x1103, 0x000c _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 @@ -25,29 +25,29 @@ SCRIPT_START script_080126FC WaitForSomething2 0x00000004 DoPostScriptAction 0x0011 _0807E930 0x001c - TextboxNoOverlapFollowPos 0x1105, 0x000c + MessageFromTargetPos 0x1105, 0x000c _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0022 Call sub_0807F3C8 - TextboxNoOverlapFollowPos 0x1106, 0x000c + MessageFromTargetPos 0x1106, 0x000c _0807EA94 _0807E930 0x001c Call sub_0806D96C - TextboxNoOverlapFollowPos 0x1107, 0x000c + MessageFromTargetPos 0x1107, 0x000c _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 - TextboxNoOverlapFollowPos 0x1108, 0x000c + MessageFromTargetPos 0x1108, 0x000c _0807EA94 _0807E930 0x001c Call sub_0806D96C - TextboxNoOverlapFollowPos 0x1109, 0x000c + MessageFromTargetPos 0x1109, 0x000c _0807EA94 _0807E930 0x0020 DoPostScriptAction 0x000a @@ -64,7 +64,7 @@ script_080127F2: _0807E864 Call sub_0806D944 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x1114, 0x000c + MessageFromTargetPos 0x1114, 0x000c _0807EA94 _0807E930 0x0020 _0807E878 @@ -82,13 +82,13 @@ script_08012824: WaitForSomething2 0x00000004 Call sub_0806D944 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110a, 0x000c + MessageFromTargetPos 0x110a, 0x000c _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110b, 0x000c + MessageFromTargetPos 0x110b, 0x000c _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 @@ -96,19 +96,19 @@ script_08012824: DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110c, 0x000c + MessageFromTargetPos 0x110c, 0x000c _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110d, 0x000c + MessageFromTargetPos 0x110d, 0x000c _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110e, 0x000c + MessageFromTargetPos 0x110e, 0x000c _0807EA94 _0807E930 0x0018 SetEntitySpeed 0x0080 @@ -131,7 +131,7 @@ script_08012920: _0807E864 _0807E930 0x0010 EndBlock - TextboxNoOverlapFollowPos 0x1115, 0x000c + MessageFromTargetPos 0x1115, 0x000c _0807EA94 _0807E930 0x0018 _0807E878 @@ -144,7 +144,7 @@ script_0801293A: _0807EB8C Call sub_0806D944 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110f, 0x000c + MessageFromTargetPos 0x110f, 0x000c _0807E930 0x0018 SetEntitySpeed 0x0080 Call sub_0806D908 @@ -167,7 +167,7 @@ script_080129A0: _0807E864 _0807E930 0x0010 EndBlock - TextboxNoOverlapFollowPos 0x1115, 0x000c + MessageFromTargetPos 0x1115, 0x000c _0807EA94 _0807E930 0x0018 _0807E878 @@ -180,7 +180,7 @@ script_080129BA: _0807EB8C Call sub_0806D944 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x1110, 0x000c + MessageFromTargetPos 0x1110, 0x000c _0807E930 0x0018 SetEntitySpeed 0x0080 Call sub_0806D908 @@ -204,7 +204,7 @@ script_08012A24: _0807E864 _0807E930 0x0010 EndBlock - TextboxNoOverlapFollowPos 0x1115, 0x000c + MessageFromTargetPos 0x1115, 0x000c _0807EA94 _0807E930 0x0018 _0807E878 @@ -219,7 +219,7 @@ script_08012A3E: _0807EB8C Call sub_0806D944 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x1111, 0x000c + MessageFromTargetPos 0x1111, 0x000c _0807E930 0x0018 SetEntitySpeed 0x0080 Call sub_0806D8A0 diff --git a/data/scripts/script_08012C68.inc b/data/scripts/script_08012C68.inc index b8aa1e2a..39b15371 100644 --- a/data/scripts/script_08012C68.inc +++ b/data/scripts/script_08012C68.inc @@ -10,7 +10,7 @@ script_08012C7E: JumpIfNot script_08012C7E _0807E864 _0807E8E4_0 - TextboxNoOverlapFollow 0x111d + MessageFromTarget 0x111d _0807EA94 SetGlobalFlag 0x0022 _0807E878 diff --git a/data/scripts/script_08012F0C.inc b/data/scripts/script_08012F0C.inc index 1b76edf7..c25380c0 100644 --- a/data/scripts/script_08012F0C.inc +++ b/data/scripts/script_08012F0C.inc @@ -20,7 +20,7 @@ script_08012F50: Call sub_0806A96C JumpIfNot script_08012F50 _0807E864 - TextboxNoOverlap 0x4401 + MessageNoOverlap 0x4401 _0807EA94 SetLocalFlag 0x0061 _0807E878 @@ -28,7 +28,7 @@ script_08012F50: script_08012F6C: Call sub_0806A96C JumpIfNot script_08012F6C - TextboxNoOverlap 0x4402 + MessageNoOverlap 0x4402 _0807EA94 _0807E908 0x0001 Jump script_08012F6C diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc index 69c5f405..d14a41cc 100644 --- a/data/scripts/script_08012F86.inc +++ b/data/scripts/script_08012F86.inc @@ -28,7 +28,7 @@ script_08012FD2: JumpIf script_08013006 script_08012FFA: _0807E944 - TextboxNoOverlap 0x4403 + MessageNoOverlap 0x4403 _0807EA94 Jump script_08012FFA script_08013006: @@ -47,24 +47,24 @@ script_08013006: Wait 0x003c DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x4404 + MessageNoOverlap 0x4404 _0807EA94 Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x440e + MessageNoOverlap 0x440e _0807EA94 Wait 0x001e Call sub_0806A9E8 _0807E930 0x000f Wait 0x00f0 - TextboxNoOverlap 0x4405 + MessageNoOverlap 0x4405 _0807EA94 _0807E5F8 0x00000200 _0807F034 0x0015 WaitPlayerAction8 _0807EB8C - TextboxNoOverlap 0x4406 + MessageNoOverlap 0x4406 _0807EA94 _0807E908 0x0001 Call sub_0807DF50 @@ -72,13 +72,13 @@ script_08013006: script_0801308A: Call sub_0806A96C JumpIfNot script_0801308A - TextboxNoOverlap 0x4407 + MessageNoOverlap 0x4407 _0807EA94 _0807E908 0x0001 script_0801309E: Call sub_0806A96C JumpIfNot script_0801309E - TextboxNoOverlap 0x440d + MessageNoOverlap 0x440d _0807EA94 _0807E908 0x0001 Jump script_0801308A diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc index d3bac5c5..a1a3ec09 100644 --- a/data/scripts/script_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -31,7 +31,7 @@ SCRIPT_START script_080131AC _0807E864 Call sub_0807DF28 WaitFor_2 - TextboxNoOverlapFollowPos 0x1602, 0x000c + MessageFromTargetPos 0x1602, 0x000c _0807EA94 _0807E5F8 0x00000008 WaitForSomething2 0x00000010 @@ -45,7 +45,7 @@ SCRIPT_START script_080131AC StartPlayerScript script_08013378 _0807E5F8 0x00000020 WaitForSomething2 0x00000042 - TextboxNoOverlapFollowPos 0x1603, 0x000c + MessageFromTargetPos 0x1603, 0x000c _0807EA94 _0807E5F8 0x00000020 WaitForSomething2 0x00000040 @@ -58,7 +58,7 @@ SCRIPT_START script_080131AC Wait 0x003c CameraTargetPlayer Call sub_0807F5C0 - TextboxNoOverlapFollowPos 0x1604, 0x0007 + MessageFromTargetPos 0x1604, 0x0007 _0807EA94 SetFadeMask 0xffffffff _0807E778 0x0004 diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc index bdf9d90e..dfc15135 100644 --- a/data/scripts/script_080134DC.inc +++ b/data/scripts/script_080134DC.inc @@ -66,7 +66,7 @@ script_080134F8: DoFade6 WaitFor_2 PlaySound SFX_109 - TextboxNoOverlapFollowPos 0x0503, 0x000c + MessageFromTargetPos 0x0503, 0x000c _0807EA94 _0807E5F8 0x00040000 CallWithArg CreateManager36, 0x00000001 diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc index d669a6ce..bfc8c938 100644 --- a/data/scripts/script_08013720.inc +++ b/data/scripts/script_08013720.inc @@ -69,7 +69,7 @@ script_0801373C: DoFade6 WaitFor_2 PlaySound SFX_109 - TextboxNoOverlapFollowPos 0x0504, 0x000c + MessageFromTargetPos 0x0504, 0x000c _0807EA94 _0807E5F8 0x00040000 SetLocalFlag 0x007b diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc index c2401d1d..d7e542da 100644 --- a/data/scripts/script_080138B4.inc +++ b/data/scripts/script_080138B4.inc @@ -74,7 +74,7 @@ script_080138D0: DoFade6 WaitFor_2 PlaySound SFX_109 - TextboxNoOverlapFollowPos 0x0505, 0x000c + MessageFromTargetPos 0x0505, 0x000c _0807EA94 _0807E5F8 0x00040000 .ifndef EU diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc index 569bc7d0..b8838306 100644 --- a/data/scripts/script_08014248.inc +++ b/data/scripts/script_08014248.inc @@ -25,7 +25,7 @@ script_08014298: CheckEntityInteractType JumpIfNot script_08014298 _0807E864 - TextboxNoOverlapFollowPos 0x0647, 0x000c + MessageFromTargetPos 0x0647, 0x000c _0807EA94 _0807E878 Jump script_08014298 diff --git a/data/scripts/script_080142B0.inc b/data/scripts/script_080142B0.inc index 44a7709f..6fbf9c70 100644 --- a/data/scripts/script_080142B0.inc +++ b/data/scripts/script_080142B0.inc @@ -29,7 +29,7 @@ script_080142C4: Wait 0x000a _0807E930 0x0002 Wait 0x001e - TextboxNoOverlap 0x2c12 + MessageNoOverlap 0x2c12 _0807EA94 Wait 0x0014 _0807E930 0x0004 @@ -53,7 +53,7 @@ script_08014330: Wait 0x001e _0807E930 0x0001 Wait 0x001e - TextboxNoOverlap 0x2c13 + MessageNoOverlap 0x2c13 _0807EA94 Wait 0x0014 _0807E930 0x0004 diff --git a/data/scripts/script_08014384.inc b/data/scripts/script_08014384.inc index 7689da1c..dae8da90 100644 --- a/data/scripts/script_08014384.inc +++ b/data/scripts/script_08014384.inc @@ -11,7 +11,7 @@ SCRIPT_START script_08014384 _0807EA94 _0807EB8C Wait 0x001e - TextboxNoOverlapVar + MessageNoOverlapVar script_080143AC: _0807EA94 Wait 0x001e diff --git a/data/scripts/script_080143C0.inc b/data/scripts/script_080143C0.inc index 652ee0ff..60dca24d 100644 --- a/data/scripts/script_080143C0.inc +++ b/data/scripts/script_080143C0.inc @@ -6,7 +6,7 @@ SCRIPT_START script_080143C0 _0807E930 0x0001 Call sub_080654EC Wait 0x003c - TextboxNoOverlap 0x2c16 + MessageNoOverlap 0x2c16 _0807EA94 _0807E3E8 JumpIf script_080143FA @@ -16,21 +16,21 @@ SCRIPT_START script_080143C0 script_080143FA: Call sub_080654EC Wait 0x001e - TextboxNoOverlap 0x2c18 + MessageNoOverlap 0x2c18 _0807EA94 Wait 0x000a SetIntVariable 0x00000000 Call sub_08065528 _0807F034 0x0036 WaitPlayerAction8 - TextboxNoOverlap 0x2c19 + MessageNoOverlap 0x2c19 _0807EA94 SetIntVariable 0x00000303 Call sub_0807F420 .ifndef EU Wait 0x001e _0807EB8C - TextboxNoOverlap 0x2c22 + MessageNoOverlap 0x2c22 _0807EA94 .endif script_0801443E: diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc index 10fbfc52..6afadfa1 100644 --- a/data/scripts/script_08014450.inc +++ b/data/scripts/script_08014450.inc @@ -12,8 +12,8 @@ script_08014462: _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 - TextboxNoOverlapFollow 0x4202 - TextboxNoOverlapFollow 0x4203 + MessageFromTarget 0x4202 + MessageFromTarget 0x4203 _0807EA94 _0807E3E8 JumpIfNot script_080144F0 @@ -22,12 +22,12 @@ script_08014462: DoPostScriptAction 0x0000 HasRupees 0x000a JumpIf script_080144A2 - TextboxNoOverlapFollow 0x4204 + MessageFromTarget 0x4204 Jump script_080144FC script_080144A2: Call sub_0806E250 JumpIfNot script_080144B8 - TextboxNoOverlapFollow 0x420b + MessageFromTarget 0x420b _0807EB38 JumpTable script_080144B8, script_080144C0 script_080144B8: @@ -44,7 +44,7 @@ script_080144C0: .endif script_080144C8: ModRupees 0xfff6 - TextboxNoOverlapFollow 0x420c + MessageFromTarget 0x420c PlaySound SFX_10C Wait 0x0018 SetRoomFlag 0x0000 diff --git a/data/scripts/script_080145B0.inc b/data/scripts/script_080145B0.inc index 1aa48d71..4aa7eda2 100644 --- a/data/scripts/script_080145B0.inc +++ b/data/scripts/script_080145B0.inc @@ -17,7 +17,7 @@ script_080145C2: Wait 0x000c _0807EB8C .endif - TextboxNoOverlapFollowPos 0x432e, 0x000c + MessageFromTargetPos 0x432e, 0x000c _0807EA94 .ifdef EU Wait 0x0018 diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc index 0f68e289..bdf84c80 100644 --- a/data/scripts/script_080145E8.inc +++ b/data/scripts/script_080145E8.inc @@ -16,7 +16,7 @@ script_080145F8: Wait 0x0018 _0807E8E4_3 _0807EB44 0x0002 - TextboxNoOverlapFollowPos 0x432b, 0x000c + MessageFromTargetPos 0x432b, 0x000c _0807EA94 Wait 0x0018 _0807E878 @@ -102,7 +102,7 @@ script_080146E2: SetRoomFlag 0x000a Jump script_0801473C script_0801472E_2: - TextboxNoOverlapFollowPos 0x432f, 0x000c + MessageFromTargetPos 0x432f, 0x000c Jump script_080147CE @ TODO script_08014816 .else CheckRoomFlag 0x0004 @@ -113,7 +113,7 @@ script_0801472E_2: JumpIf script_080146A0 _0807E864 _0807EB8C - TextboxNoOverlapFollowPos 0x432b, 0x000c + MessageFromTargetPos 0x432b, 0x000c Jump script_080147CE script_08014672: .ifdef JP @@ -140,7 +140,7 @@ script_080146A0: _0807E930 0x0002 CheckGlobalFlag 0x0059 JumpIfNot script_080146C6 - TextboxNoOverlapFollowPos 0x432f, 0x000c + MessageFromTargetPos 0x432f, 0x000c Jump script_080147CE script_080146C6: CheckRoomFlag 0x0004 @@ -157,7 +157,7 @@ script_080146C6: .endif script_080146F4: - TextboxNoOverlapFollowPos 0x431e, 0x000c + MessageFromTargetPos 0x431e, 0x000c Jump script_080147CE script_080146FE: .ifdef EU @@ -170,11 +170,11 @@ script_080146FE: script_0801474A: SetRoomFlag 0x000a .endif - TextboxNoOverlapFollowPos 0x4305, 0x000c + MessageFromTargetPos 0x4305, 0x000c _0807EA94 _0807E3BC 0x0001 JumpIfNot script_080147C4 - TextboxNoOverlapFollowPos 0x4306, 0x000c + MessageFromTargetPos 0x4306, 0x000c Jump script_0801473C script_08014720: .ifdef EU @@ -210,7 +210,7 @@ script_08014754: .else SetRoomFlag 0x0004 .endif - TextboxNoOverlapFollowPos 0x431e, 0x000c + MessageFromTargetPos 0x431e, 0x000c Jump script_080147CE script_08014770: .ifdef EU @@ -248,7 +248,7 @@ script_080147C4: .else SetRoomFlag 0x0009 .endif - TextboxNoOverlapFollowPos 0x4307, 0x000c + MessageFromTargetPos 0x4307, 0x000c script_080147CE: _0807EA94 .ifdef EU diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc index b5f500dd..3935155d 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 0x4215, 0x000c + MessageFromTargetPos 0x4215, 0x000c _0807E878 script_0801482E: TestBit 0x00000001 @@ -22,7 +22,7 @@ script_0801482E: _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 - TextboxNoOverlapFollowPos 0x4215, 0x000c + MessageFromTargetPos 0x4215, 0x000c _0807E878 Jump script_0801482E script_08014862: @@ -49,7 +49,7 @@ script_0801488E: Wait 0x0020 _0807E930 0x0002 script_080148B6: - TextboxNoOverlapFollowPos 0x4216, 0x000c + MessageFromTargetPos 0x4216, 0x000c _0807E878 Jump script_0801488E script_080148C2: diff --git a/data/scripts/script_08014A80.inc b/data/scripts/script_08014A80.inc index 753bfa0b..4202b530 100644 --- a/data/scripts/script_08014A80.inc +++ b/data/scripts/script_08014A80.inc @@ -7,7 +7,7 @@ SCRIPT_START script_08014A80 DoPostScriptAction 0x0004 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 - TextboxNoOverlap 0x2f0a + MessageNoOverlap 0x2f0a _0807EA94 _0807E5F8 0x00000002 script_08014AAC: @@ -15,7 +15,7 @@ script_08014AAC: JumpIfNot script_08014AAC _0807E864 _0807EB74 - TextboxNoOverlap 0x2f0a + MessageNoOverlap 0x2f0a _0807EA94 _0807E878 Jump script_08014AAC @@ -36,10 +36,10 @@ script_08014AD2: CheckLocalFlag 0x0064 JumpIf script_08014AFE SetLocalFlag 0x0064 - TextboxNoOverlap 0x2f0b + MessageNoOverlap 0x2f0b Jump script_08014B02 script_08014AFE: - TextboxNoOverlap 0x2f0c + MessageNoOverlap 0x2f0c script_08014B02: _0807EA94 Wait 0x000f diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc index 31ec68fd..eb6efc4f 100644 --- a/data/scripts/script_08014B34.inc +++ b/data/scripts/script_08014B34.inc @@ -15,7 +15,7 @@ script_08014B48: EndBlock _0807E864 _0807EB74 - TextboxNoOverlap 0x2f01 + MessageNoOverlap 0x2f01 _0807EA94 Wait 0x000f _0807E878 @@ -56,14 +56,14 @@ script_08014BF2: CheckLocalFlag 0x0065 JumpIf script_08014C1C SetLocalFlag 0x0065 - TextboxNoOverlap 0x2f07 + MessageNoOverlap 0x2f07 _0807EA94 SetIntVariable 0x00000064 _0807F034 0x003f WaitPlayerAction8 Jump script_08014C22 script_08014C1C: - TextboxNoOverlap 0x2f08 + MessageNoOverlap 0x2f08 _0807EA94 script_08014C22: Wait 0x000f @@ -90,13 +90,13 @@ script_08014C56: CheckLocalFlag 0x0066 JumpIf script_08014C7C SetLocalFlag 0x0066 - TextboxNoOverlap 0x2f0d + MessageNoOverlap 0x2f0d _0807EA94 _0807F034 0x000a WaitPlayerAction8 Jump script_08014C82 script_08014C7C: - TextboxNoOverlap 0x2f09 + MessageNoOverlap 0x2f09 _0807EA94 script_08014C82: Wait 0x000f diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc index 4b0d2f45..4a490042 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 0x1010, 0x000c + MessageFromTargetPos 0x1010, 0x000c _0807EA94 _0807E5F8 0x00000002 script_08014D1E: @@ -23,7 +23,7 @@ script_08014D1E: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - TextboxNoOverlap 0x1012 + MessageNoOverlap 0x1012 _0807EA94 _0807EC64 0x0040 _0807EB44 0x0004 @@ -36,7 +36,7 @@ script_08014D60: JumpIf script_08014D60 _0807E864 Call sub_0807DF28 - TextboxNoOverlap 0x1013 + MessageNoOverlap 0x1013 _0807EA94 _0807EC64 0x0040 _0807EB44 0x0004 @@ -50,7 +50,7 @@ script_08014D96: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - TextboxNoOverlap 0x1014 + MessageNoOverlap 0x1014 _0807EA94 _0807EC64 0x0018 .ifdef JP diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc index 1b70d789..9a637147 100644 --- a/data/scripts/script_08014E14.inc +++ b/data/scripts/script_08014E14.inc @@ -39,13 +39,13 @@ script_08014E64: JumpIfNot script_08014EB8 CallWithArg sub_0807F800, 0x00000022 WaitPlayerAction8 - TextboxNoOverlap 0x0a04 + MessageNoOverlap 0x0a04 Jump script_08014EBC script_08014EB0: - TextboxNoOverlap 0x0a03 + MessageNoOverlap 0x0a03 Jump script_08014EBC script_08014EB8: - TextboxNoOverlap 0x0a02 + MessageNoOverlap 0x0a02 script_08014EBC: _0807EA94 Call sub_0807DF50 @@ -64,7 +64,7 @@ script_08014EE0: JumpIfNot script_08014EE0 _0807E864 _0807EB74 - TextboxNoOverlap 0x200d + MessageNoOverlap 0x200d _0807EA94 _0807E878 Jump script_08014EE0 @@ -82,7 +82,7 @@ script_08014F0C: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x200e + MessageNoOverlap 0x200e _0807EA94 _0807E878 _0807EB44 0x0004 @@ -105,7 +105,7 @@ script_08014F4A: _0807EB74 DoPostScriptAction 0x0000 BeginBlock - TextboxNoOverlap 0x3b0b + MessageNoOverlap 0x3b0b CallWithArg sub_0807F854, 0x00010064 EndBlock _0807EA94 @@ -118,13 +118,13 @@ script_08014F4A: ModRupees 0xff9c _0807F034 0x0022 WaitPlayerAction8 - TextboxNoOverlap 0x3b11 + MessageNoOverlap 0x3b11 Jump script_08014FA6 script_08014F9A: - TextboxNoOverlap 0x3b0e + MessageNoOverlap 0x3b0e Jump script_08014FA6 script_08014FA2: - TextboxNoOverlap 0x3b0f + MessageNoOverlap 0x3b0f script_08014FA6: _0807EA94 Call sub_0807DF50 @@ -148,7 +148,7 @@ script_08014FCC: CameraTargetEntity StartPlayerScript script_080152B4 WaitForSomething2 0x00000001 - TextboxNoOverlapFollowPos 0x1301, 0x0002 + MessageFromTargetPos 0x1301, 0x0002 _0807EA94 Call sub_0807F3F8 Wait 0x003c @@ -159,11 +159,11 @@ script_08014FCC: PlayBgm BGM_VAATI_THEME _0807EB28 0x1302 _0807EA94 - TextboxNoOverlapFollowPos 0x1303, 0x0002 + MessageFromTargetPos 0x1303, 0x0002 _0807EA94 _0807EB28 0x1304 _0807EA94 - TextboxNoOverlapFollowPos 0x1305, 0x0002 + MessageFromTargetPos 0x1305, 0x0002 _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_08015390.inc b/data/scripts/script_08015390.inc index 6f8a7d4f..d921db1c 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 0x1314, 0x000c + MessageFromTargetPos 0x1314, 0x000c _0807EA94 _0807E930 0x0018 Call sub_0806D8A0 diff --git a/data/scripts/script_080153EC.inc b/data/scripts/script_080153EC.inc index e44e0e7a..418d7250 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 0x0078, 0x0090 - TextboxNoOverlapFollowPos 0x1330, 0x0002 + MessageFromTargetPos 0x1330, 0x0002 _0807EA94 _0807E5F8 0x00008000 WaitForSomething2 0x00010000 _0807E5F8 0x00000880 WaitForSomething2 0x00001000 Wait 0x003c - TextboxNoOverlapFollowPos 0x130d, 0x0002 + MessageFromTargetPos 0x130d, 0x0002 _0807EA94 - TextboxNoOverlapFollowPos 0x130e, 0x000c + MessageFromTargetPos 0x130e, 0x000c _0807EA94 - TextboxNoOverlapFollowPos 0x130f, 0x0002 + MessageFromTargetPos 0x130f, 0x0002 _0807EA94 - TextboxNoOverlapFollowPos 0x1310, 0x000c + MessageFromTargetPos 0x1310, 0x000c _0807EA94 CallWithArg CreateManager36, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0801548E.inc b/data/scripts/script_0801548E.inc index 28d145b7..aba5d017 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 0x1311, 0x0002 + MessageFromTargetPos 0x1311, 0x0002 _0807EA94 _0807E5F8 0x00008000 WaitForSomething2 0x00010000 @@ -13,7 +13,7 @@ SCRIPT_START script_0801548E WaitForSomething2 0x00010000 CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 - TextboxNoOverlapFollowPos 0x1312, 0x000c + MessageFromTargetPos 0x1312, 0x000c _0807EA94 _0807E5F8 0x00000800 WaitForSomething2 0x00001000 diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc index 57f353dc..7fe63941 100644 --- a/data/scripts/script_080157AC.inc +++ b/data/scripts/script_080157AC.inc @@ -32,7 +32,7 @@ script_080157DA: WaitForSomething2 0x00000010 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 - TextboxNoOverlapFollowPos 0x1066, 0x0002 + MessageFromTargetPos 0x1066, 0x0002 _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 @@ -54,12 +54,12 @@ script_08015888: CameraTargetEntity StartPlayerScript script_08015938 WaitForSomething2 0x00000010 - TextboxNoOverlapFollowPos 0x106a, 0x000c + MessageFromTargetPos 0x106a, 0x000c _0807EA94 _0807E5F8 0x00000008 Wait 0x0078 _0807E8E4_2 - TextboxNoOverlapFollowPos 0x1068, 0x0002 + MessageFromTargetPos 0x1068, 0x0002 _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc index 4af73e8a..8756e3e5 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 DoPostScriptAction 0x0000 - TextboxNoOverlapFollowPos 0x1011, 0x0002 + MessageFromTargetPos 0x1011, 0x0002 _0807EA94 _0807EDD4 0x01f8, 0x0268 SetEntityPositionRelative 0x0248, 0x0218 @@ -57,7 +57,7 @@ script_08015A32: CheckEntityInteractType JumpIfNot script_08015A32 EndBlock - TextboxNoOverlapFollowPos 0x1067, 0x0002 + MessageFromTargetPos 0x1067, 0x0002 _0807EA94 Jump script_08015A32 script_08015A54: diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc index 9df5e5af..bfbfb95d 100644 --- a/data/scripts/script_08015B34.inc +++ b/data/scripts/script_08015B34.inc @@ -17,7 +17,7 @@ SCRIPT_START script_08015B34 _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - TextboxNoOverlapFollowPos 0x2506, 0x0002 + MessageFromTargetPos 0x2506, 0x0002 _0807EA94 StartPlayerScript script_08015B84 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/script_08015C7C.inc index 966109fa..79f1bc44 100644 --- a/data/scripts/script_08015C7C.inc +++ b/data/scripts/script_08015C7C.inc @@ -8,7 +8,7 @@ SCRIPT_START script_08015C7C DoPostScriptAction 0x0000 CallWithArg sub_0807F238, 0x000003c5 Call sub_0807F304 - TextboxNoOverlapFollowPos 0x1318, 0x000c + MessageFromTargetPos 0x1318, 0x000c _0807EA94 CallWithArg sub_0807F238, 0x000003c9 Call sub_0807F304 diff --git a/data/scripts/script_08015DF0.inc b/data/scripts/script_08015DF0.inc index 660f818c..0f5a1434 100644 --- a/data/scripts/script_08015DF0.inc +++ b/data/scripts/script_08015DF0.inc @@ -6,19 +6,19 @@ SCRIPT_START script_08015DF0 WaitForSomething2 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x1319 + MessageNoOverlap 0x1319 _0807EA94 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - TextboxNoOverlap 0x131a + MessageNoOverlap 0x131a _0807EA94 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - TextboxNoOverlap 0x131d + MessageNoOverlap 0x131d _0807EA94 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - TextboxNoOverlap 0x131e + MessageNoOverlap 0x131e _0807EA94 _0807E5F8 0x00000008 WaitForSomething 0x00000400 diff --git a/data/scripts/script_08015E58.inc b/data/scripts/script_08015E58.inc index 1f4a3001..c91747e8 100644 --- a/data/scripts/script_08015E58.inc +++ b/data/scripts/script_08015E58.inc @@ -32,7 +32,7 @@ SCRIPT_START script_08015E58 WaitForSomething2 0x00000010 DoPostScriptAction 0x0014 Wait 0x001e - TextboxNoOverlap 0x131b + MessageNoOverlap 0x131b _0807EA94 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 diff --git a/data/scripts/script_08015F08.inc b/data/scripts/script_08015F08.inc index 29fc1626..7592fe99 100644 --- a/data/scripts/script_08015F08.inc +++ b/data/scripts/script_08015F08.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08015F08 DoPostScriptAction 0x0000 EndBlock WaitForSomething2 0x00000001 - TextboxNoOverlap 0x131c + MessageNoOverlap 0x131c _0807EA94 _0807E5F8 0x00000002 WaitForSomething 0x00000200 diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc index 9239fd38..6dac41e0 100644 --- a/data/scripts/script_080160A8.inc +++ b/data/scripts/script_080160A8.inc @@ -23,33 +23,33 @@ script_080160E0: EndBlock HasRoomItemForSale JumpIfNot script_0801611A - TextboxNoOverlapFollow 0x2d07 + MessageFromTarget 0x2d07 _0807EA94 _0807E3E8 JumpIfNot script_08016132 BuyItem 0x0000, 0x0000 JumpIf script_0801610C - TextboxNoOverlapFollow 0x2d0b + MessageFromTarget 0x2d0b _0807EA94 Jump script_08016132 script_0801610C: WaitPlayerAction8 .ifndef EU _0807EB8C - TextboxNoOverlapFollow 0x2d0d + MessageFromTarget 0x2d0d .else - TextboxNoOverlapFollow 0x2d08 + MessageFromTarget 0x2d08 .endif _0807EA94 Jump script_08016132 script_0801611A: CheckKinstoneFused 0x0014 JumpIfNot script_0801612C - TextboxNoOverlapFollow 0x2d09 + MessageFromTarget 0x2d09 _0807EA94 Jump script_08016132 script_0801612C: - TextboxNoOverlapFollow 0x2d01 + MessageFromTarget 0x2d01 _0807EA94 script_08016132: _0807E878 @@ -66,21 +66,21 @@ script_08016146: JumpIfNot script_08016146 _0807E864 GetInventoryValue 0x0025 - TextboxNoOverlapFollowTable 0x2d03, 0x2d02, 0x2d02, 0x2d02 + MessageFromTargetTable 0x2d03, 0x2d02, 0x2d02, 0x2d02 _0807E3E8 JumpIfNot script_0801618A _0807E48C 0x0020 JumpIf script_08016172 - TextboxNoOverlapFollow 0x2d0c + MessageFromTarget 0x2d0c Jump script_0801618A script_08016172: BuyItem 0x0025, 0x0000 JumpIf script_08016184 - TextboxNoOverlapFollow 0x2d0b + MessageFromTarget 0x2d0b Jump script_0801618A script_08016184: WaitPlayerAction8 - TextboxNoOverlapFollow 0x2d06 + MessageFromTarget 0x2d06 script_0801618A: _0807E878 Jump script_08016146 @@ -95,26 +95,26 @@ script_0801619A: JumpIfNot script_0801619A _0807E864 GetInventoryValue 0x0024 - TextboxNoOverlapFollowTable 0x2d05, 0x2d04, 0x2d04, 0x2d04 + MessageFromTargetTable 0x2d05, 0x2d04, 0x2d04, 0x2d04 _0807E3E8 JumpIfNot script_080161E2 _0807E48C 0x0020 JumpIf script_080161C6 - TextboxNoOverlapFollow 0x2d0c + MessageFromTarget 0x2d0c Jump script_080161E2 script_080161C6: BuyItem 0x0024, 0x0000 JumpIf script_080161D8 - TextboxNoOverlapFollow 0x2d0b + MessageFromTarget 0x2d0b Jump script_080161E2 script_080161D8: .ifndef EU WaitPlayerAction8 _0807EA94 _0807EB8C - TextboxNoOverlap 0x2d06 + MessageNoOverlap 0x2d06 .else - TextboxNoOverlapFollow 0x2d06 + MessageFromTarget 0x2d06 .endif script_080161E2: _0807E878 diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc index 9ca8e7f6..f41cea24 100644 --- a/data/scripts/script_08016482.inc +++ b/data/scripts/script_08016482.inc @@ -29,11 +29,11 @@ SCRIPT_START script_08016482 _0807E9E4 0x0000 _0807EA88 0x0001 _0807EA94 - TextboxNoOverlapFollow 0x0601 - TextboxNoOverlap 0x0601 - TextboxNoOverlapFollowPos_1 0x0601 - TextboxNoOverlapFollowTable 0x0601, 0x0602, 0x0603 - TextboxNoOverlapVar + MessageFromTarget 0x0601 + MessageNoOverlap 0x0601 + MessageFromTargetPos_1 0x0601 + MessageFromTargetTable 0x0601, 0x0602, 0x0603 + MessageNoOverlapVar _0807EB28 0x0602 _0807EB38 _0807EB44 0x0000 diff --git a/data/scripts/script_080165D8.inc b/data/scripts/script_080165D8.inc index ac2b01c1..a14d5af9 100644 --- a/data/scripts/script_080165D8.inc +++ b/data/scripts/script_080165D8.inc @@ -13,7 +13,7 @@ SCRIPT_START script_080165F8 script_080165FE: _0807E30C JumpIfNot script_080165FE - TextboxNoOverlapFollow 0x0601 + MessageFromTarget 0x0601 Jump script_080165FE SCRIPT_START script_0801660C BeginBlock @@ -22,7 +22,7 @@ SCRIPT_START script_0801660C script_08016612: _0807E944 _0807E864 - TextboxNoOverlapFollow 0x0602 + MessageFromTarget 0x0602 _0807EA94 Wait 0x000f _0807E878 @@ -239,7 +239,7 @@ script_0801693E: _0807E944 _0807E864 Wait 0x0018 - TextboxNoOverlapFollow 0x0a01 + MessageFromTarget 0x0a01 _0807EA94 Wait 0x000f _0807E878 @@ -255,7 +255,7 @@ script_0801696A: _0807E944 _0807E864 Wait 0x0018 - TextboxNoOverlapFollow 0x0a01 + MessageFromTarget 0x0a01 _0807EA94 Wait 0x000f _0807E878 |