diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-11-06 00:33:07 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-11-06 00:33:07 +0100 |
| commit | a6d133e42dfec121b42028eb0d3a38fa4345d18d (patch) | |
| tree | ac7d0d5684c7b236bfbc996cf5a01a530f123e16 /data/scripts | |
| parent | 1a0f416bacbd8ceefa3197fcb71015ee721e43fb (diff) | |
| parent | 3592e47cd6167082e866b1a391781995df253c3b (diff) | |
Merge branch 'master' into asset-extraction
Diffstat (limited to 'data/scripts')
116 files changed, 633 insertions, 633 deletions
diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc index c6307a6f..c1bc824e 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 WaitUntilTextboxCloses _0807E930 0x0008 _0807E878 @@ -60,7 +60,7 @@ script_08008BD2: CallWithArg sub_0806BB1C, 0x00000001 Call sub_0806BB7C JumpIfNot script_08008C5C - TextboxNoOverlap 0x490c + MessageNoOverlap 0x490c WaitUntilTextboxCloses LoadRoomEntityList gUnk_080D6784 WaitForSomething 0x00000001 @@ -69,7 +69,7 @@ script_08008BD2: PlaySound SFX_SECRET _0807E930 0x0004 Call sub_0807F2D4 - TextboxNoOverlap 0x4913 + MessageNoOverlap 0x4913 WaitUntilTextboxCloses _0807E930 0x0008 Call sub_0807F2D4 @@ -91,7 +91,7 @@ SCRIPT_START script_08008C64 PlaySound SFX_STAIRS EndBlock WaitForSomething 0x00000002 - TextboxNoOverlap 0x490d + MessageNoOverlap 0x490d WaitUntilTextboxCloses DoPostScriptAction 0x0007 Call sub_08064D08 diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc index 1eed9434..1dd05221 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 WaitUntilTextboxCloses _0807E5F8 0x00000080 WaitForSomething2 0x00000100 diff --git a/data/scripts/script_08008FC0.inc b/data/scripts/script_08008FC0.inc index 3272e672..04ab3012 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 WaitUntilTextboxCloses _0807E5F8 0x00000020 Call sub_080791BC diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc index fd2ced57..ba22fe01 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 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1052, 0x000e + MessageFromTargetPos 0x1052, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EB44 0x0006 _0807E930 0x0005 - TextboxNoOverlapFollowPos 0x1054, 0x000e + MessageFromTargetPos 0x1054, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000100 @@ -51,25 +51,25 @@ SCRIPT_START script_08009080 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1056, 0x000e + MessageFromTargetPos 0x1056, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1057, 0x000e + MessageFromTargetPos 0x1057, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1058, 0x000e + MessageFromTargetPos 0x1058, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x105c, 0x000e + MessageFromTargetPos 0x105c, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000100 @@ -92,7 +92,7 @@ SCRIPT_START script_08009198 WaitForSomething2 0x00000001 _0807EB74 DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x105b, 0x0000 + MessageFromTargetPos 0x105b, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000002 @@ -104,7 +104,7 @@ SCRIPT_START script_08009198 DoPostScriptAction 0x0005 Wait 0x003c DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1051, 0x0000 + MessageFromTargetPos 0x1051, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000002 @@ -114,7 +114,7 @@ SCRIPT_START script_08009198 _0807EB74 _0807EB8C DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1055, 0x0000 + MessageFromTargetPos 0x1055, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000002 @@ -128,7 +128,7 @@ SCRIPT_START script_08009198 _0807EB74 DoPostScriptAction 0x0000 DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1059, 0x0000 + MessageFromTargetPos 0x1059, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000002 @@ -167,9 +167,9 @@ script_080092B2: script_080092BA: CheckEntityInteractType JumpIfNot script_080092BA - _0807E864 - _0807EB74 - TextboxNoOverlap 0x105e + _0807E864 + _0807EB74 + MessageNoOverlap 0x105e WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -192,11 +192,11 @@ SCRIPT_START script_080092F0 script_08009300: CheckEntityInteractType JumpIfNot script_08009300 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x1071 + _0807E864 + _0807EB74 + MessageNoOverlap 0x1071 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08009300 .2byte 0x0000 SCRIPT_START script_08009318 diff --git a/data/scripts/script_08009348.inc b/data/scripts/script_08009348.inc index 88e1cf86..17a843d6 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 WaitUntilTextboxCloses script_08009376: WaitUntilTextboxCloses diff --git a/data/scripts/script_0800939A.inc b/data/scripts/script_0800939A.inc index 214690f8..39e1d99d 100644 --- a/data/scripts/script_0800939A.inc +++ b/data/scripts/script_0800939A.inc @@ -17,14 +17,14 @@ SCRIPT_START script_0800939A JumpIf script_080093BC CheckInventory1 0x000e JumpIf script_080093BC - TextboxNoOverlap 0x1d02 + MessageNoOverlap 0x1d02 WaitUntilTextboxCloses Jump script_08009376 script_080093BC: CheckInventory1 0x000e JumpIfNot script_080093DA Call sub_0806D788 - TextboxNoOverlap 0x1d03 + MessageNoOverlap 0x1d03 WaitUntilTextboxCloses Call sub_0806D70C Jump script_08009376 @@ -46,12 +46,12 @@ script_080093DA: JumpIf script_080093EE SetIntVariable 0x00001d04 script_080093EE: - TextboxNoOverlapVar + MessageNoOverlapVar WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_08009376 Wait 0x001e - TextboxNoOverlap 0x1d08 + MessageNoOverlap 0x1d08 WaitUntilTextboxCloses LoadRoomEntityList gUnk_080F9C38 Wait 0x0078 @@ -77,19 +77,19 @@ script_080093EE: .endif .endif Call sub_0806D5D4 - _0807EB8C - TextboxNoOverlap 0x1d09 + _0807EB8C + MessageNoOverlap 0x1d09 WaitUntilTextboxCloses Wait 0x000a Jump script_08009376 script_0800943E: Call sub_0806D600 JumpIf script_08009452 - TextboxNoOverlap 0x1d0a + MessageNoOverlap 0x1d0a WaitUntilTextboxCloses JumpIfNot script_08009376 script_08009452: - TextboxNoOverlap 0x1d0b + MessageNoOverlap 0x1d0b WaitUntilTextboxCloses Call sub_0806D74C _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc index 05c10085..26dafb65 100644 --- a/data/scripts/script_08009464.inc +++ b/data/scripts/script_08009464.inc @@ -20,9 +20,9 @@ SCRIPT_START script_08009464 .endif Call sub_0806D620 Wait 0x003c - WaitPlayerAction8 - _0807EB8C - TextboxNoOverlap 0x1d0c + WaitPlayerAction8 + _0807EB8C + MessageNoOverlap 0x1d0c WaitUntilTextboxCloses Wait 0x000a Jump script_08009376 diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc index a8f53247..4b5abf8d 100644 --- a/data/scripts/script_080095F2.inc +++ b/data/scripts/script_080095F2.inc @@ -9,8 +9,8 @@ SCRIPT_START script_080095F2 JumpIfNot script_08009622 PlaySound SFX_109 _0807F088 0x003c - TextboxNoOverlapFollow 0x053c - WaitPlayerAction8 + MessageFromTarget 0x053c + WaitPlayerAction8 WaitUntilTextboxCloses _0807F078 0x003c, 0x0001 script_08009622: diff --git a/data/scripts/script_08009950.inc b/data/scripts/script_08009950.inc index 121de12d..18c18086 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 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000004 @@ -26,7 +26,7 @@ SCRIPT_START script_08009950 _0807EDD4 0x00b8, 0x005c _0807EB44 0x0006 DoPostScriptAction 0x0001 - TextboxNoOverlapFollow 0x1004 + MessageFromTarget 0x1004 WaitUntilTextboxCloses DoPostScriptAction 0x0000 Wait 0x001e diff --git a/data/scripts/script_080099DC.inc b/data/scripts/script_080099DC.inc index 42aaa4c8..9fec298d 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 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 DoPostScriptAction 0x0001 - TextboxNoOverlapFollow 0x1003 + MessageFromTarget 0x1003 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000008 diff --git a/data/scripts/script_08009B30.inc b/data/scripts/script_08009B30.inc index 4c85886e..93160763 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 WaitUntilTextboxCloses Wait 0x003c Call sub_0807529C diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc index 38809939..04b88f0d 100644 --- a/data/scripts/script_08009B78.inc +++ b/data/scripts/script_08009B78.inc @@ -18,15 +18,15 @@ SCRIPT_START script_08009B78 DoPostScriptAction 0x0000 Wait 0x000f DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1009, 0x0000 - _0807E8E4_1 + MessageFromTargetPos 0x1009, 0x0000 + _0807E8E4_1 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807EB8C DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x100b, 0x0000 + MessageFromTargetPos 0x100b, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000002 @@ -45,7 +45,7 @@ SCRIPT_START script_08009B78 WaitPlayerAction8 _0807E8E4_1 DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x100c, 0x0000 + MessageFromTargetPos 0x100c, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000004 @@ -54,10 +54,10 @@ script_08009C4C: script_08009C50: CheckEntityInteractType JumpIfNot script_08009C50 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x100e - _0807E878 + _0807E864 + _0807EB74 + MessageNoOverlap 0x100e + _0807E878 Jump script_08009C50 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc index da7e9e2a..d4f1e156 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 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000008 @@ -22,7 +22,7 @@ SCRIPT_START script_08009C68 DoPostScriptAction 0x0001 _0807EB8C _0807EB44 0x0002 - TextboxNoOverlapFollowPos 0x100d, 0x0000 + MessageFromTargetPos 0x100d, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807EDD4 0x0028, 0x0060 diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc index 356d68ef..48c49a06 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 WaitUntilTextboxCloses Wait 0x001e _0807F034 0x0065 @@ -62,11 +62,11 @@ script_08009FDC: Call sub_08060158 CheckEntityInteractType JumpIfNot script_08009FDC - EndBlock - _0807E864 - TextboxNoOverlap 0x1f0e + EndBlock + _0807E864 + MessageNoOverlap 0x1f0e WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_0800A002 _0807E878 Jump script_08009FDC @@ -76,8 +76,8 @@ script_0800A002: Call sub_08060318 WaitPlayerAction8 Wait 0x0008 - _0807EB8C - TextboxNoOverlapFollow 0x1f13 + _0807EB8C + MessageFromTarget 0x1f13 WaitUntilTextboxCloses SetLocalFlag 0x00b0 _0807E878 @@ -91,16 +91,16 @@ script_0800A024: _0807E864 CheckInventory1 0x0008 JumpIf script_0800A052 - TextboxNoOverlap 0x1f14 + MessageNoOverlap 0x1f14 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_0800A002 _0807E878 Jump script_0800A024 script_0800A052: - TextboxNoOverlap 0x1f11 + MessageNoOverlap 0x1f11 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_0800A064 _0807E878 Jump script_0800A024 @@ -110,9 +110,9 @@ script_0800A064: Call sub_08060318 WaitPlayerAction8 Wait 0x0008 - _0807EB8C - TextboxNoOverlapFollow 0x1f10 + _0807EB8C + MessageFromTarget 0x1f10 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800A024 .2byte 0x0000 diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc index e9e286cb..90b926db 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 WaitUntilTextboxCloses 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 WaitUntilTextboxCloses Wait 0x003c - TextboxNoOverlapFollowPos 0x165b, 0x000e + MessageFromTargetPos 0x165b, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000040 @@ -45,10 +45,10 @@ SCRIPT_START script_0800A1D8 WaitForSomething2 0x00000100 _0807E5F8 0x00000006 WaitForSomething2 0x000000c0 - TextboxNoOverlapFollowPos 0x165c, 0x000e + MessageFromTargetPos 0x165c, 0x000e WaitUntilTextboxCloses StopBgm - TextboxNoOverlapFollowPos 0x165d, 0x000e + MessageFromTargetPos 0x165d, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000006 WaitForSomething2 0x000000c0 diff --git a/data/scripts/script_0800AB08.inc b/data/scripts/script_0800AB08.inc index 6254f21c..32c0454d 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 WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x165e, 0x000e + MessageFromTargetPos 0x165e, 0x000e WaitUntilTextboxCloses CallWithArg CreateManager36, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0800AB6E.inc b/data/scripts/script_0800AB6E.inc index bb07dedb..da617bfc 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 WaitUntilTextboxCloses StartPlayerScript script_0800ACBC WaitForSomething2 0x00000001 - TextboxNoOverlapFollowPos 0x1660, 0x000e + MessageFromTargetPos 0x1660, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x1661, 0x000e + MessageFromTargetPos 0x1661, 0x000e WaitUntilTextboxCloses _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 WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x1663, 0x000e + MessageFromTargetPos 0x1663, 0x000e WaitUntilTextboxCloses 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 WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_0800B00C.inc b/data/scripts/script_0800B00C.inc index eadd3725..78d910d2 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 WaitUntilTextboxCloses DoPostScriptAction 0x0008 Call Windcrest_Unlock @@ -24,7 +24,7 @@ script_0800B024: SetGlobalFlag 0x0053 Jump script_0800B09C script_0800B064: - TextboxNoOverlap 0x3f32 + MessageNoOverlap 0x3f32 WaitUntilTextboxCloses DoPostScriptAction 0x0008 Call Windcrest_Unlock @@ -33,7 +33,7 @@ script_0800B064: WaitUntilTextboxCloses Jump script_0800B09C script_0800B082: - TextboxNoOverlap 0x3f32 + MessageNoOverlap 0x3f32 WaitUntilTextboxCloses DoPostScriptAction 0x0008 Call Windcrest_Unlock diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc index f19bc0d8..4eebd83c 100644 --- a/data/scripts/script_0800B41C.inc +++ b/data/scripts/script_0800B41C.inc @@ -17,9 +17,9 @@ SCRIPT_START script_0800B41C Wait 0x003c PlaySound SFX_TASK_COMPLETE _0807F088 0x0037 - WaitPlayerAction8 - _0807EB8C - TextboxNoOverlapFollow 0x200c + WaitPlayerAction8 + _0807EB8C + MessageFromTarget 0x200c WaitUntilTextboxCloses Wait 0x0014 _0807EDD4 0x0158, 0x0290 diff --git a/data/scripts/script_0800B4AC.inc b/data/scripts/script_0800B4AC.inc index a573d2be..d8d094a2 100644 --- a/data/scripts/script_0800B4AC.inc +++ b/data/scripts/script_0800B4AC.inc @@ -16,9 +16,9 @@ script_0800B4D4: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlapFollow 0x200b - EndBlock - _0807E878 + MessageFromTarget 0x200b + EndBlock + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_0800B4BC @@ -28,7 +28,7 @@ script_0800B4F0: _0807EDD4 0x0134, 0x0288 _0807EB44 0x0004 WaitForSomething2 0x00000008 - TextboxNoOverlapFollow 0x2016 + MessageFromTarget 0x2016 WaitUntilTextboxCloses _0807EDD4 0x0158, 0x0288 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800B5EC.inc b/data/scripts/script_0800B5EC.inc index 85a46bc9..b00d322d 100644 --- a/data/scripts/script_0800B5EC.inc +++ b/data/scripts/script_0800B5EC.inc @@ -7,11 +7,11 @@ SCRIPT_START script_0800B5EC script_0800B5FA: CheckEntityInteractType JumpIfNot script_0800B5FA - _0807E864 - _0807EB74 - TextboxNoOverlap 0x2009 + _0807E864 + _0807EB74 + MessageNoOverlap 0x2009 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 Jump script_0800B5FA SCRIPT_START script_0800B614 @@ -29,19 +29,19 @@ script_0800B618: WaitForSomething2 0x00000004 CheckLocalFlag 0x009e JumpIf script_0800B7A2 - TextboxNoOverlap 0x0583 + MessageNoOverlap 0x0583 WaitUntilTextboxCloses - _0807E3E8 + _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 WaitUntilTextboxCloses Jump script_0800B6A6 script_0800B68E: @@ -52,7 +52,7 @@ script_0800B698: WaitPlayerAction8 _0807EB8C Wait 0x001e - TextboxNoOverlap 0x057f + MessageNoOverlap 0x057f WaitUntilTextboxCloses script_0800B6A6: _0807E778 0x0004 diff --git a/data/scripts/script_0800B6C8.inc b/data/scripts/script_0800B6C8.inc index 5b6c780c..f0608d4b 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 WaitUntilTextboxCloses CallWithArg sub_0807F970, 0x0000057d JumpIf script_0800B6A6 @@ -41,7 +41,7 @@ script_0800B734: WaitForSomething2 0x00000004 CheckLocalFlag 0x00a0 JumpIf script_0800B7A2 - TextboxNoOverlap 0x0580 + MessageNoOverlap 0x0580 WaitUntilTextboxCloses CallWithArg sub_0807F970, 0x00000582 JumpIf script_0800B794 @@ -54,15 +54,15 @@ script_0800B794: _0807F034 0x0065 Jump script_0800B698 script_0800B7A2: - TextboxNoOverlap 0x0590 + MessageNoOverlap 0x0590 WaitUntilTextboxCloses _0807E778 0x0010 DoFade7 WaitFor_2 ModHealth 0x00a0 - DoFade6 - WaitFor_2 - TextboxNoOverlap 0x057f + DoFade6 + WaitFor_2 + MessageNoOverlap 0x057f WaitUntilTextboxCloses Jump script_0800B6A6 .2byte 0x0000 diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc index d0d40909..43faad8a 100644 --- a/data/scripts/script_0800B828.inc +++ b/data/scripts/script_0800B828.inc @@ -5,9 +5,9 @@ SCRIPT_START script_0800B828 DoPostScriptAction 0x000a EndBlock script_0800B836: - _0807E944 - _0807E864 - TextboxNoOverlapFollow 0x0a01 + _0807E944 + _0807E864 + MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -42,9 +42,9 @@ script_0800B87E: script_0800B89E: CheckEntityInteractType JumpIfNot script_0800B89E - _0807E864 - _0807EB74 - TextboxNoOverlapFollow 0x0a01 + _0807E864 + _0807EB74 + MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -91,9 +91,9 @@ SCRIPT_START script_0800B91C script_0800B934: CheckEntityInteractType JumpIfNot script_0800B934 - _0807E864 - _0807EB74 - TextboxNoOverlapFollow 0x3f19 + _0807E864 + _0807EB74 + MessageFromTarget 0x3f19 WaitUntilTextboxCloses SetLocalFlag 0x005f _0807E878 @@ -101,11 +101,11 @@ script_0800B934: script_0800B94E: CheckEntityInteractType JumpIfNot script_0800B94E - _0807E864 - _0807EB74 - TextboxNoOverlapFollow 0x3f1a + _0807E864 + _0807EB74 + MessageFromTarget 0x3f1a WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800B94E SCRIPT_START script_0800B964 BeginBlock diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc index 4a9b530a..79b4f784 100644 --- a/data/scripts/script_0800B9B4.inc +++ b/data/scripts/script_0800B9B4.inc @@ -48,9 +48,9 @@ script_0800BA46: JumpIfNot script_0800BA46 _0807E864 Call sub_0807DF28 - TextboxNoOverlapFollow 0x3301 + MessageFromTarget 0x3301 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_0800BA6C StopBgm Call sub_0806E964 @@ -77,7 +77,7 @@ script_0800BA8E: Wait 0x001e _0807EDD4 0x02f0, 0x0350 Wait 0x001e - TextboxNoOverlap 0x0e00 + MessageNoOverlap 0x0e00 WaitUntilTextboxCloses Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/script_0800BACC.inc b/data/scripts/script_0800BACC.inc index 4428bef5..5195fe1e 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 WaitUntilTextboxCloses Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/script_0800BB00.inc b/data/scripts/script_0800BB00.inc index dab3d9b6..31c1ae72 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 WaitUntilTextboxCloses Wait 0x003c DoPostScriptAction 0x000f diff --git a/data/scripts/script_0800BB30.inc b/data/scripts/script_0800BB30.inc index 2946a35c..5b5871ad 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 WaitUntilTextboxCloses Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/script_0800BB64.inc b/data/scripts/script_0800BB64.inc index 8068349d..2e582383 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 WaitUntilTextboxCloses Wait 0x000f _0807EDD4 0x0380, 0x00f8 diff --git a/data/scripts/script_0800BBA4.inc b/data/scripts/script_0800BBA4.inc index c0d48a78..76aa8ebe 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 WaitUntilTextboxCloses Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/script_0800BBDC.inc b/data/scripts/script_0800BBDC.inc index f8060b27..bed21d4e 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 WaitUntilTextboxCloses Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/script_0800BC08.inc b/data/scripts/script_0800BC08.inc index e51157f7..237767b7 100644 --- a/data/scripts/script_0800BC08.inc +++ b/data/scripts/script_0800BC08.inc @@ -9,9 +9,9 @@ script_0800BC18: JumpIfNot script_0800BC18 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e07 + MessageNoOverlap 0x0e07 WaitUntilTextboxCloses - BeginBlock + BeginBlock _0807EB44 0x0000 _0807E930 0x0004 EndBlock diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc index 0d216ad8..377ff8ef 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 WaitUntilTextboxCloses DoPostScriptAction 0x000f _0807E930 0x0008 @@ -25,7 +25,7 @@ script_0800BC62: Wait 0x003c DoPostScriptAction 0x000c Wait 0x003c - TextboxNoOverlap 0x0e09 + MessageNoOverlap 0x0e09 WaitUntilTextboxCloses Call sub_0807F158 CallWithArg sub_0807F4F8, 0x0000035c diff --git a/data/scripts/script_0800BCE8.inc b/data/scripts/script_0800BCE8.inc index 8edaaca1..f8c1841c 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 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c @@ -21,7 +21,7 @@ script_0800BD1C: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e0c + MessageNoOverlap 0x0e0c WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_0800BD78.inc b/data/scripts/script_0800BD78.inc index ceeeff37..814887f0 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 WaitUntilTextboxCloses _0807E5F8 0x00000004 WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800BE1C.inc b/data/scripts/script_0800BE1C.inc index 09cbd130..d5217ce9 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 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c @@ -40,7 +40,7 @@ script_0800BE8C: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e0f + MessageNoOverlap 0x0e0f WaitUntilTextboxCloses _0807E5F8 0x00000002 Call sub_08054F64 diff --git a/data/scripts/script_0800BECC.inc b/data/scripts/script_0800BECC.inc index 03a63f5f..e16b42dd 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 WaitUntilTextboxCloses _0807E5F8 0x0000000c WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc index 715ce851..5c982ab0 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 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c @@ -40,7 +40,7 @@ script_0800BFA8: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e12 + MessageNoOverlap 0x0e12 WaitUntilTextboxCloses _0807E5F8 0x00000002 Call sub_08054F64 diff --git a/data/scripts/script_0800C004.inc b/data/scripts/script_0800C004.inc index d58aaa8e..46d7e104 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 WaitUntilTextboxCloses _0807E5F8 0x0000001c WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800C0B0.inc b/data/scripts/script_0800C0B0.inc index 48e45c34..e02b5368 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 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c @@ -40,7 +40,7 @@ script_0800C120: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e15 + MessageNoOverlap 0x0e15 WaitUntilTextboxCloses _0807E5F8 0x00000002 Call sub_08054F64 diff --git a/data/scripts/script_0800C160.inc b/data/scripts/script_0800C160.inc index 53e9585e..3fa4ab2c 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 WaitUntilTextboxCloses _0807E5F8 0x0000003c WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc index 5e466c9e..0d78bf42 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 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c @@ -40,7 +40,7 @@ script_0800C248: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e18 + MessageNoOverlap 0x0e18 WaitUntilTextboxCloses _0807E5F8 0x00000002 Call sub_08054F64 diff --git a/data/scripts/script_0800C2A4.inc b/data/scripts/script_0800C2A4.inc index da2245f0..5c40fc25 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 WaitUntilTextboxCloses _0807E5F8 0x0000007c WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800C370.inc b/data/scripts/script_0800C370.inc index 181227ad..43489062 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 WaitUntilTextboxCloses _0807E5F8 0x00000006 WaitForSomething2 0x00000001 diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc index 4ab5a719..313ff8ec 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: WaitUntilTextboxCloses _0807E878 @@ -111,7 +111,7 @@ script_0800C684: CheckInventory1 0x005b JumpIf script_0800C6B6 DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f16 + MessageFromTarget 0x1f16 WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -123,7 +123,7 @@ script_0800C6B6: CheckLocalFlag 0x0081 JumpIf script_0800C6DC DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f1b + MessageFromTarget 0x1f1b WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -134,7 +134,7 @@ script_0800C6DC: CheckLocalFlag 0x0082 JumpIf script_0800C712 DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f17 + MessageFromTarget 0x1f17 WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -147,7 +147,7 @@ script_0800C6DC: SetLocalFlag 0x0082 script_0800C712: DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f18 + MessageFromTarget 0x1f18 WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -158,7 +158,7 @@ script_0800C730: CheckLocalFlag 0x0083 JumpIf script_0800C756 DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f19 + MessageFromTarget 0x1f19 WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -167,7 +167,7 @@ script_0800C730: Jump script_0800C652 script_0800C756: DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f1a + MessageFromTarget 0x1f1a WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -190,7 +190,7 @@ script_0800C780: CheckInventory1 0x005b JumpIf script_0800C7C0 _0807E930 0x0008 - TextboxNoOverlapFollow 0x2122 + MessageFromTarget 0x2122 WaitUntilTextboxCloses DoPostScriptAction 0x0000 Call sub_0807DF50 @@ -200,16 +200,16 @@ script_0800C7C0: _0807E930 0x0008 CheckLocalFlag 0x0081 JumpIf script_0800C80A - TextboxNoOverlapFollow 0x1130 + MessageFromTarget 0x1130 WaitUntilTextboxCloses _0807EB28 0x1131 WaitUntilTextboxCloses - _0807EB8C - TextboxNoOverlapFollow 0x1132 + _0807EB8C + MessageFromTarget 0x1132 WaitUntilTextboxCloses SetIntVariable 0x00000103 Call sub_0807F420 - TextboxNoOverlapFollow 0x1133 + MessageFromTarget 0x1133 WaitUntilTextboxCloses Wait 0x000a DoPostScriptAction 0x0000 @@ -218,7 +218,7 @@ script_0800C7C0: _0807E878 Jump script_0800C780 script_0800C80A: - TextboxNoOverlapFollow 0x1133 + MessageFromTarget 0x1133 WaitUntilTextboxCloses Wait 0x000a _0807E930 0x0000 @@ -229,7 +229,7 @@ script_0800C824: _0807E930 0x0008 CheckLocalFlag 0x0083 JumpIf script_0800C8AE - TextboxNoOverlapFollow 0x1135 + MessageFromTarget 0x1135 WaitUntilTextboxCloses SetEntitySpeed 0x0040 _0807EDD4 0x0038, 0x0044 @@ -239,9 +239,9 @@ script_0800C824: Wait 0x003c PlaySound SFX_SECRET Wait 0x003c - _0807EB74 - _0807EB8C - TextboxNoOverlapFollow 0x1136 + _0807EB74 + _0807EB8C + MessageFromTarget 0x1136 WaitUntilTextboxCloses _0807EB28 0x1137 WaitUntilTextboxCloses @@ -257,7 +257,7 @@ script_0800C87C: _0807EB74 SetIntVariable 0x00000008 Call sub_0807F3D8 - TextboxNoOverlapFollow 0x1136 + MessageFromTarget 0x1136 WaitUntilTextboxCloses Wait 0x000a DoPostScriptAction 0x0000 @@ -265,7 +265,7 @@ script_0800C87C: _0807E878 Jump script_0800C87C script_0800C8AE: - TextboxNoOverlapFollow 0x1136 + MessageFromTarget 0x1136 WaitUntilTextboxCloses Wait 0x000a DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800C91C.inc b/data/scripts/script_0800C91C.inc index 6319ed4e..05613e87 100644 --- a/data/scripts/script_0800C91C.inc +++ b/data/scripts/script_0800C91C.inc @@ -38,8 +38,8 @@ script_0800C928: Wait 0x003c _0807E5F8 0x00000200 WaitForSomething2 0x00000400 - _0807E8E4_0 - TextboxNoOverlapFollow 0x1126 + _0807E8E4_0 + MessageFromTarget 0x1126 Call sub_0807F40C WaitUntilTextboxCloses _0807E5F8 0x00000200 @@ -54,13 +54,13 @@ script_0800C928: WaitForSomething2 0x00040000 _0807E5F8 0x00008000 WaitForSomething2 0x00010000 - _0807E8E4_3 - TextboxNoOverlapFollow 0x1127 + _0807E8E4_3 + MessageFromTarget 0x1127 WaitUntilTextboxCloses _0807E5F8 0x00002000 WaitForSomething2 0x00004000 - _0807E8E4_1 - TextboxNoOverlapFollow 0x1128 + _0807E8E4_1 + MessageFromTarget 0x1128 WaitUntilTextboxCloses _0807E5F8 0x00000200 _0807E5F8 0x00000800 diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc index ee573cb5..69d3a300 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,16 +30,16 @@ script_0800CDC4: JumpIfNot script_0800CF2A SetGlobalFlag 0x003b ClearGlobalFlag 0x0054 - TextboxNoOverlap 0x2141 + MessageNoOverlap 0x2141 Jump script_0800CF40 script_0800CDEC: - TextboxNoOverlap 0x213e + MessageNoOverlap 0x213e WaitUntilTextboxCloses _0807E48C 0x0023 JumpIfNot script_0800CE14 - TextboxNoOverlap 0x214b + MessageNoOverlap 0x214b WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0023 @@ -48,9 +48,9 @@ script_0800CDEC: script_0800CE14: _0807E48C 0x0022 JumpIfNot script_0800CF40 - TextboxNoOverlap 0x214b + MessageNoOverlap 0x214b WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0022 @@ -59,7 +59,7 @@ script_0800CE32: _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 - TextboxNoOverlap 0x213f + MessageNoOverlap 0x213f Jump script_0800CF02 script_0800CE46: CheckGlobalFlag 0x003c @@ -70,16 +70,16 @@ script_0800CE46: JumpIfNot script_0800CF2A SetGlobalFlag 0x003c ClearGlobalFlag 0x0054 - TextboxNoOverlap 0x2145 + MessageNoOverlap 0x2145 Jump script_0800CF40 script_0800CE6E: - TextboxNoOverlap 0x2142 + MessageNoOverlap 0x2142 WaitUntilTextboxCloses _0807E48C 0x0027 JumpIfNot script_0800CF40 - TextboxNoOverlap 0x214c + MessageNoOverlap 0x214c WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0027 @@ -87,7 +87,7 @@ script_0800CE6E: _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 - TextboxNoOverlap 0x2143 + MessageNoOverlap 0x2143 Jump script_0800CF02 script_0800CEA6: CheckGlobalFlag 0x003d @@ -98,16 +98,16 @@ script_0800CEA6: JumpIfNot script_0800CF2A SetGlobalFlag 0x003d ClearGlobalFlag 0x0054 - TextboxNoOverlap 0x2149 + MessageNoOverlap 0x2149 Jump script_0800CF40 script_0800CECE: - TextboxNoOverlap 0x2146 + MessageNoOverlap 0x2146 WaitUntilTextboxCloses _0807E48C 0x0024 JumpIfNot script_0800CF40 - TextboxNoOverlap 0x214d + MessageNoOverlap 0x214d WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0024 @@ -115,7 +115,7 @@ script_0800CECE: _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 - TextboxNoOverlap 0x2147 + MessageNoOverlap 0x2147 script_0800CF02: WaitUntilTextboxCloses Call sub_0807DF50 @@ -132,13 +132,13 @@ script_0800CF20: _0807E864 Call sub_0807DF28 script_0800CF2A: - TextboxNoOverlap 0x2140 + MessageNoOverlap 0x2140 WaitUntilTextboxCloses Call sub_0807DF50 _0807E878 Jump script_0800CF0C script_0800CF3C: - TextboxNoOverlap 0x214a + MessageNoOverlap 0x214a script_0800CF40: WaitUntilTextboxCloses 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 WaitUntilTextboxCloses 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 WaitUntilTextboxCloses StartPlayerScript script_0800D1B4 WaitForSomething2 0x00000008 @@ -268,7 +268,7 @@ script_0800D108: PlaySound SFX_F8 _0807E5F8 0x00000010 SetLocalFlag 0x007e - TextboxNoOverlapFollowPos 0x123e, 0x0002 + MessageFromTargetPos 0x123e, 0x0002 WaitUntilTextboxCloses Wait 0x000f _0807E930 0x0009 @@ -277,7 +277,7 @@ script_0800D108: _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Wait 0x001e - TextboxNoOverlapFollowPos 0x123f, 0x0002 + MessageFromTargetPos 0x123f, 0x0002 WaitUntilTextboxCloses _0807E5F8 0x00000001 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_0800D1E0.inc b/data/scripts/script_0800D1E0.inc index 3d440035..5a9f4e39 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 WaitUntilTextboxCloses _0807E5F8 0x00000008 Call sub_080791BC diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc index 7023cd05..7187c45d 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 WaitUntilTextboxCloses Wait 0x000f _0807E878 diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc index aec2ac91..9b20129e 100644 --- a/data/scripts/script_0800D874.inc +++ b/data/scripts/script_0800D874.inc @@ -15,8 +15,8 @@ script_0800D88E: StartPlayerScript script_0800D92C WaitForSomething2 0x00000001 script_0800D8B0: - _0807E8E4_0 - TextboxNoOverlap 0x1324 + _0807E8E4_0 + MessageNoOverlap 0x1324 WaitUntilTextboxCloses CheckInventory1 0x0017 JumpIf script_0800D8D6 diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc index e816b0a3..8ca3a5dd 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 WaitUntilTextboxCloses _0807E5F8 0x00000004 WaitForSomething2 0x00000002 - TextboxNoOverlap 0x1702 + MessageNoOverlap 0x1702 WaitUntilTextboxCloses SetEntity0x20 0x00010000 _0807E5F8 0x00000004 diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/script_0800DA60.inc index f17b7f71..071becb7 100644 --- a/data/scripts/script_0800DA60.inc +++ b/data/scripts/script_0800DA60.inc @@ -16,13 +16,13 @@ script_0800DA64: Call sub_0807F5C0 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 - TextboxNoOverlapFollowPos 0x162d, 0x0002 + MessageFromTargetPos 0x162d, 0x0002 WaitUntilTextboxCloses _0807E5F8 0x00000001 Wait 0x001e - TextboxNoOverlapFollowPos 0x162e, 0x0002 + MessageFromTargetPos 0x162e, 0x0002 WaitUntilTextboxCloses - _0807E8E4_0 + _0807E8E4_0 CallWithArg sub_0807F75C, 0x00780138 _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/script_0800DB78.inc b/data/scripts/script_0800DB78.inc index 43d6fe01..95192f9d 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 WaitUntilTextboxCloses _0807EB28 0x1645 WaitUntilTextboxCloses diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc index dd3b992d..13de03c2 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 WaitUntilTextboxCloses PlayBgm BGM_VAATI_REBORN DoPostScriptAction 0x0019 diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc index fecc5ded..e9ffcfb9 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 WaitUntilTextboxCloses SetRoomFlag 0x0003 script_0800DFFE: @@ -19,7 +19,7 @@ script_0800E012: _0807E864 Call sub_0807DF28 SetLocalFlag 0x007b - TextboxNoOverlapFollowPos 0x1639, 0x000c + MessageFromTargetPos 0x1639, 0x000c WaitUntilTextboxCloses Wait 0x0096 PlaySound SFX_EVAPORATE diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc index ddb7ddc4..df275e25 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 WaitUntilTextboxCloses SetLocalFlag 0x0093 script_0800E12E: @@ -37,9 +37,9 @@ script_0800E12E: script_0800E138: CheckEntityInteractType JumpIfNot script_0800E138 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x2402 + _0807E864 + _0807EB74 + MessageNoOverlap 0x2402 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -75,7 +75,7 @@ script_0800E176: _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 Wait 0x000a - TextboxNoOverlap 0x2401 + MessageNoOverlap 0x2401 WaitUntilTextboxCloses SetLocalFlag 0x0094 script_0800E1D0: @@ -89,9 +89,9 @@ script_0800E1E0: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2401 + MessageNoOverlap 0x2401 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800E1E0 SCRIPT_START script_0800E200 BeginBlock @@ -167,10 +167,10 @@ script_0800E312: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - EndBlock - TextboxNoOverlap 0x2404 + EndBlock + MessageNoOverlap 0x2404 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800E2AE script_0800E32E: CheckEntityInteractType @@ -178,9 +178,9 @@ script_0800E32E: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2403 + MessageNoOverlap 0x2403 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800E32E .2byte 0x0000 SCRIPT_START script_0800E350 @@ -221,9 +221,9 @@ script_0800E3BE: script_0800E3C8: CheckEntityInteractType JumpIfNot script_0800E3C8 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x240c + _0807E864 + _0807EB74 + MessageNoOverlap 0x240c WaitUntilTextboxCloses Wait 0x000f _0807F034 0x0053 @@ -237,9 +237,9 @@ script_0800E3E8: script_0800E3EE: CheckEntityInteractType JumpIfNot script_0800E3EE - _0807E864 - _0807EB74 - TextboxNoOverlap 0x240d + _0807E864 + _0807EB74 + MessageNoOverlap 0x240d WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -253,9 +253,9 @@ SCRIPT_START script_0800E408 script_0800E41A: CheckEntityInteractType JumpIfNot script_0800E41A - _0807E864 - _0807EB74 - TextboxNoOverlap 0x2406 + _0807E864 + _0807EB74 + MessageNoOverlap 0x2406 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -273,9 +273,9 @@ script_0800E44C: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2405 + MessageNoOverlap 0x2405 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800E44C SCRIPT_START script_0800E46C BeginBlock @@ -290,9 +290,9 @@ script_0800E484: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2407 + MessageNoOverlap 0x2407 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800E484 @@ -327,10 +327,10 @@ script_0800E4B6: EndBlock Call sub_0807F3F8 Wait 0x003c - TextboxNoOverlapFollow 0x160c + MessageFromTarget 0x160c WaitUntilTextboxCloses Wait 0x001e - TextboxNoOverlapFollow 0x160d + MessageFromTarget 0x160d WaitUntilTextboxCloses Wait 0x001e _0807EB28 0x160e diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/script_0800E58C.inc index 19d33467..e2f26ffa 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 WaitUntilTextboxCloses Wait 0x003c Call sub_08053C84 diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc index 580680ca..6e3a7acd 100644 --- a/data/scripts/script_0800E6B0.inc +++ b/data/scripts/script_0800E6B0.inc @@ -136,8 +136,8 @@ script_0800E832: JumpIfNot script_0800E832 _0807E864 _0807EB44 0x0004 - BeginBlock - TextboxNoOverlapFollow 0x4501 + BeginBlock + MessageFromTarget 0x4501 CallWithArg sub_0807F854, 0x00010032 CallWithArg sub_0807F854, 0x000200c8 CallWithArg sub_0807F854, 0x00030190 @@ -146,8 +146,8 @@ script_0800E832: _0807EB38 JumpTable script_0800E910, script_0800E8D6, script_0800E8A4, script_0800E872 script_0800E872: - BeginBlock - TextboxNoOverlapFollow 0x4505 + BeginBlock + MessageFromTarget 0x4505 CallWithArg sub_0807F854, 0x00010190 EndBlock WaitUntilTextboxCloses @@ -155,7 +155,7 @@ script_0800E872: JumpIfNot script_0800E908 ModRupees 0xfe70 SetLocalFlag 0x0091 - TextboxNoOverlapFollow 0x4508 + MessageFromTarget 0x4508 WaitUntilTextboxCloses Call sub_0806C578 SCRIPT_END diff --git a/data/scripts/script_0800E8A4.inc b/data/scripts/script_0800E8A4.inc index bc07ceb0..bb0dd75f 100644 --- a/data/scripts/script_0800E8A4.inc +++ b/data/scripts/script_0800E8A4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800E8A4 - BeginBlock - TextboxNoOverlapFollow 0x4504 + BeginBlock + MessageFromTarget 0x4504 CallWithArg sub_0807F854, 0x000100c8 EndBlock WaitUntilTextboxCloses @@ -8,7 +8,7 @@ SCRIPT_START script_0800E8A4 JumpIfNot script_0800E908 ModRupees 0xff38 SetLocalFlag 0x0091 - TextboxNoOverlapFollow 0x4508 + MessageFromTarget 0x4508 WaitUntilTextboxCloses Call sub_0806C588 SCRIPT_END diff --git a/data/scripts/script_0800E8D6.inc b/data/scripts/script_0800E8D6.inc index 25644bd7..facf15c1 100644 --- a/data/scripts/script_0800E8D6.inc +++ b/data/scripts/script_0800E8D6.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800E8D6 - BeginBlock - TextboxNoOverlapFollow 0x4503 + BeginBlock + MessageFromTarget 0x4503 CallWithArg sub_0807F854, 0x00010032 EndBlock WaitUntilTextboxCloses @@ -8,7 +8,7 @@ SCRIPT_START script_0800E8D6 JumpIfNot script_0800E908 ModRupees 0xffce SetLocalFlag 0x0091 - TextboxNoOverlapFollow 0x4508 + MessageFromTarget 0x4508 WaitUntilTextboxCloses Call sub_0806C598 SCRIPT_END diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc index 432b04aa..be2a5614 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: WaitUntilTextboxCloses _0807E878 @@ -50,11 +50,11 @@ script_0800E974: StartPlayerScript script_0800E9F4 WaitForSomething2 0x00000001 DoPostScriptAction 0x000a - TextboxNoOverlapFollow 0x4a24 + MessageFromTarget 0x4a24 WaitUntilTextboxCloses _0807E930 0x000a Wait 0x0014 - TextboxNoOverlapFollow 0x4a25 + MessageFromTarget 0x4a25 WaitUntilTextboxCloses _0807E930 0x0000 StartPlayerScript script_0800EA1C @@ -62,7 +62,7 @@ script_0800E974: SetLocalFlag 0x0074 PlaySound SFX_SECRET Wait 0x00f0 - TextboxNoOverlapFollow 0x4a26 + MessageFromTarget 0x4a26 WaitUntilTextboxCloses SetLocalFlag 0x0075 script_0800E9E4: diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc index 6b898be2..ab672332 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 WaitUntilTextboxCloses _0807E5F8 0x00000010 - TextboxNoOverlapFollow 0x4c08 + MessageFromTarget 0x4c08 WaitUntilTextboxCloses _0807E5F8 0x00000020 - TextboxNoOverlapFollow 0x4c09 + MessageFromTarget 0x4c09 WaitUntilTextboxCloses SetIntVariable 0x00000503 Call sub_0807F420 @@ -290,7 +290,7 @@ script_0800EE12: WaitForSomething2 0x00000008 Jump script_0800ED98 script_0800EE3E: - TextboxNoOverlapFollow 0x4c16 + MessageFromTarget 0x4c16 WaitUntilTextboxCloses Call sub_0807DF50 _0807E878 @@ -316,13 +316,13 @@ script_0800EE76: JumpIf script_0800EEFE Wait 0x000a _0807E5F8 0x00000001 - TextboxNoOverlapFollow 0x4c07 + MessageFromTarget 0x4c07 WaitUntilTextboxCloses _0807E5F8 0x00000002 - TextboxNoOverlapFollow 0x4c08 + MessageFromTarget 0x4c08 WaitUntilTextboxCloses _0807E5F8 0x00000004 - TextboxNoOverlapFollow 0x4c09 + MessageFromTarget 0x4c09 WaitUntilTextboxCloses SetIntVariable 0x00000503 Call sub_0807F420 @@ -341,19 +341,19 @@ script_0800EED2: WaitForSomething2 0x00000040 Jump script_0800EE58 script_0800EEFE: - TextboxNoOverlapFollow 0x4c15 + MessageFromTarget 0x4c15 WaitUntilTextboxCloses Call sub_0807DF50 _0807E878 Jump script_0800EE58 - TextboxNoOverlapFollow 0x4c07 + MessageFromTarget 0x4c07 WaitUntilTextboxCloses _0807E5F8 0x00000012 Wait 0x000a - TextboxNoOverlapFollow 0x4c08 + MessageFromTarget 0x4c08 WaitUntilTextboxCloses _0807E5F8 0x00000024 - TextboxNoOverlapFollow 0x4c09 + MessageFromTarget 0x4c09 WaitUntilTextboxCloses _0807E5F8 0x00000048 Call sub_080791BC diff --git a/data/scripts/script_0800EF40.inc b/data/scripts/script_0800EF40.inc index 9e1b9df0..920a220f 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 WaitUntilTextboxCloses StartPlayerScript script_0800EF9C WaitForSomething2 0x00000001 @@ -19,7 +19,7 @@ script_0800EF50: Jump script_0800EF50 script_0800EF82: SetGlobalFlag 0x001f - TextboxNoOverlapFollow 0x4d02 + MessageFromTarget 0x4d02 WaitUntilTextboxCloses Wait 0x000f _0807E878 diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc index d0a58d81..d8d298e3 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 WaitUntilTextboxCloses WaitForSomething2 0x000003c0 - _0807E8E4_0 - TextboxNoOverlapFollowPos 0x1202, 0x000c + _0807E8E4_0 + MessageFromTargetPos 0x1202, 0x000c WaitUntilTextboxCloses _0807F034 0x0067 WaitPlayerAction8 _0807E8E4_0 _0807E5F8 0x00000002 WaitForSomething2 0x00000040 - TextboxNoOverlapFollowPos 0x1203, 0x000c + MessageFromTargetPos 0x1203, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00000002 Call sub_0807DF50 diff --git a/data/scripts/script_0800F184.inc b/data/scripts/script_0800F184.inc index 2b34fc02..ee317b85 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 WaitUntilTextboxCloses StartPlayerScript script_0800F33C WaitForSomething2 0x00000400 @@ -48,7 +48,7 @@ script_0800F22A: _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlapFollowPos 0x1206, 0x000c + MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_0800F354 WaitForSomething2 0x00000400 @@ -64,7 +64,7 @@ script_0800F26A: _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlapFollowPos 0x1206, 0x000c + MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_0800F36C WaitForSomething2 0x00000400 @@ -80,7 +80,7 @@ script_0800F2AA: _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlapFollowPos 0x1206, 0x000c + MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_0800F384 WaitForSomething2 0x00000400 @@ -97,9 +97,9 @@ script_0800F2EA: _0807E864 _0807EB74 _0807E930 0x0008 - TextboxNoOverlapFollowPos 0x1208, 0x000c + MessageFromTargetPos 0x1208, 0x000c WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800F1E6 script_0800F314: EndBlock diff --git a/data/scripts/script_0800F39C.inc b/data/scripts/script_0800F39C.inc index db4824e9..a03aa9fa 100644 --- a/data/scripts/script_0800F39C.inc +++ b/data/scripts/script_0800F39C.inc @@ -22,12 +22,12 @@ script_0800F3EA: BeginBlock CheckEntityInteractType JumpIfNot script_0800F402 - EndBlock - _0807E864 - _0807EB74 - TextboxNoOverlap 0x1237 + EndBlock + _0807E864 + _0807EB74 + MessageNoOverlap 0x1237 WaitUntilTextboxCloses - _0807E878 + _0807E878 script_0800F402: TestBit 0x00000004 JumpIfNot script_0800F3EA diff --git a/data/scripts/script_0800F430.inc b/data/scripts/script_0800F430.inc index b923116f..b601ce10 100644 --- a/data/scripts/script_0800F430.inc +++ b/data/scripts/script_0800F430.inc @@ -21,12 +21,12 @@ script_0800F478: BeginBlock CheckEntityInteractType JumpIfNot script_0800F490 - EndBlock - _0807E864 - _0807EB74 - TextboxNoOverlap 0x1238 + EndBlock + _0807E864 + _0807EB74 + MessageNoOverlap 0x1238 WaitUntilTextboxCloses - _0807E878 + _0807E878 script_0800F490: TestBit 0x00000008 JumpIfNot script_0800F478 diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/script_0800F4C4.inc index ee6359ed..41815127 100644 --- a/data/scripts/script_0800F4C4.inc +++ b/data/scripts/script_0800F4C4.inc @@ -21,12 +21,12 @@ script_0800F50C: BeginBlock CheckEntityInteractType JumpIfNot script_0800F524 - EndBlock - _0807E864 - _0807EB74 - TextboxNoOverlap 0x1239 + EndBlock + _0807E864 + _0807EB74 + MessageNoOverlap 0x1239 WaitUntilTextboxCloses - _0807E878 + _0807E878 script_0800F524: TestBit 0x00000010 JumpIfNot script_0800F50C diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc index bcefcea4..14b29ac3 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 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -135,10 +135,10 @@ script_0800F6A0: .endif .endif JumpIf script_0800F6C4 - TextboxNoOverlap 0x2512 + MessageNoOverlap 0x2512 Jump script_0800F6C8 script_0800F6C4: - TextboxNoOverlap 0x251f + MessageNoOverlap 0x251f script_0800F6C8: WaitUntilTextboxCloses Wait 0x000f diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc index 6a32dcb4..bf480cfd 100644 --- a/data/scripts/script_0800F724.inc +++ b/data/scripts/script_0800F724.inc @@ -54,7 +54,7 @@ SCRIPT_START script_0800F73C Call sub_0807F5C0 WaitForSomething2 0x00000001 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2501, 0x0000 + MessageFromTargetPos 0x2501, 0x0000 WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -70,7 +70,7 @@ SCRIPT_START script_0800F73C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2503, 0x000e + MessageFromTargetPos 0x2503, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -83,7 +83,7 @@ SCRIPT_START script_0800F73C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2504, 0x000e + MessageFromTargetPos 0x2504, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -96,7 +96,7 @@ SCRIPT_START script_0800F73C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2505, 0x000e + MessageFromTargetPos 0x2505, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -111,7 +111,7 @@ SCRIPT_START script_0800F73C _0807E8E4_0 Call sub_0807F3F8 Wait 0x003c - TextboxNoOverlapFollowPos 0x1021, 0x000e + MessageFromTargetPos 0x1021, 0x000e WaitUntilTextboxCloses StartPlayerScript script_0800FAE4 SetEntityPositionRelative 0x00f0, 0x0258 @@ -120,44 +120,44 @@ SCRIPT_START script_0800F73C Wait 0x001e Call sub_08063C2C WaitForSomething2 0x00000001 - TextboxNoOverlapFollowPos 0x1022, 0x000e + MessageFromTargetPos 0x1022, 0x000e WaitUntilTextboxCloses - _0807E8E4_0 + _0807E8E4_0 Call sub_08063C14 Call sub_08094CDC Wait 0x001e - TextboxNoOverlapFollowPos 0x1023, 0x000e + MessageFromTargetPos 0x1023, 0x000e WaitUntilTextboxCloses Call sub_08063C14 Call sub_08094DD8 Wait 0x001e - TextboxNoOverlapFollowPos 0x1024, 0x000e + MessageFromTargetPos 0x1024, 0x000e WaitUntilTextboxCloses Call sub_08063C14 Call sub_08094D34 Wait 0x001e - TextboxNoOverlapFollowPos 0x1025, 0x000e + MessageFromTargetPos 0x1025, 0x000e WaitUntilTextboxCloses Call sub_08063C5C - TextboxNoOverlapFollowPos 0x1026, 0x000e + MessageFromTargetPos 0x1026, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807E8E4_1 Call sub_08063C2C - TextboxNoOverlapFollowPos 0x1027, 0x0000 + MessageFromTargetPos 0x1027, 0x0000 WaitUntilTextboxCloses Call sub_08063C74 Wait 0x003c Call sub_08063C14 - _0807E8E4_0 - TextboxNoOverlapFollowPos 0x1028, 0x000e + _0807E8E4_0 + MessageFromTargetPos 0x1028, 0x000e WaitUntilTextboxCloses - _0807E8E4_1 - TextboxNoOverlapFollowPos 0x1029, 0x0000 + _0807E8E4_1 + MessageFromTargetPos 0x1029, 0x0000 WaitUntilTextboxCloses - _0807E8E4_0 - TextboxNoOverlapFollowPos 0x102a, 0x000e + _0807E8E4_0 + MessageFromTargetPos 0x102a, 0x000e WaitUntilTextboxCloses Call sub_08063C14 Call sub_08094D70 @@ -172,7 +172,7 @@ SCRIPT_START script_0800F73C _0807E8E4_1 Call sub_0807F3F8 Wait 0x003c - TextboxNoOverlapFollowPos 0x102b, 0x0000 + MessageFromTargetPos 0x102b, 0x0000 WaitUntilTextboxCloses _0807F034 0x000d WaitPlayerAction8 @@ -185,7 +185,7 @@ SCRIPT_START script_0800F73C Wait 0x00b7 SetIntVariable 0x00000000 Call sub_0807F5B0 - TextboxNoOverlapFollowPos 0x102c, 0x0000 + MessageFromTargetPos 0x102c, 0x0000 WaitUntilTextboxCloses CallWithArg sub_0807F29C, 0x00000000 Call sub_0806DC58 diff --git a/data/scripts/script_0800FD0C.inc b/data/scripts/script_0800FD0C.inc index 5744cc3b..c922a2fb 100644 --- a/data/scripts/script_0800FD0C.inc +++ b/data/scripts/script_0800FD0C.inc @@ -33,7 +33,7 @@ script_0800FD1A: JumpIf script_0800FD5C _0807E864 Call sub_0807F9A4 - TextboxNoOverlapFollowPos 0x2506, 0x0000 + MessageFromTargetPos 0x2506, 0x0000 WaitUntilTextboxCloses StartPlayerScript script_0800FD80 WaitForSomething2 0x00000008 @@ -45,7 +45,7 @@ script_0800FD50: script_0800FD5C: _0807E864 Call sub_0807F9A4 - TextboxNoOverlapFollowPos 0x106c, 0x0000 + MessageFromTargetPos 0x106c, 0x0000 WaitUntilTextboxCloses StartPlayerScript script_0800FD80 WaitForSomething2 0x00000008 diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc index 357aa9f2..4da89980 100644 --- a/data/scripts/script_0800FF74.inc +++ b/data/scripts/script_0800FF74.inc @@ -77,7 +77,7 @@ script_0800FFCC: CallWithArg sub_0807F3D8, 0x00000008 CheckInventory1 0x0048 JumpIf script_0800FFF8 - TextboxNoOverlap 0x3401 + MessageNoOverlap 0x3401 WaitUntilTextboxCloses Jump script_08010060 script_0800FFF8: @@ -95,11 +95,11 @@ script_0800FFF8: .endif .endif JumpIfNot script_0801000A - TextboxNoOverlap 0x340b + MessageNoOverlap 0x340b WaitUntilTextboxCloses Jump script_08010060 script_0801000A: - TextboxNoOverlap 0x3402 + MessageNoOverlap 0x3402 WaitUntilTextboxCloses Jump script_08010060 script_08010014: @@ -110,7 +110,7 @@ script_08010014: _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 PlaySound SFX_TASK_COMPLETE - TextboxNoOverlap 0x340a + MessageNoOverlap 0x340a WaitUntilTextboxCloses _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x0000000c @@ -149,7 +149,7 @@ script_08010090: _0807E864 _0807EB74 CallWithArg sub_080672B0, 0x00000004 - TextboxNoOverlapFollow 0x0a01 + MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f _0807E878 diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc index f895f3a3..5181354d 100644 --- a/data/scripts/script_080100C8.inc +++ b/data/scripts/script_080100C8.inc @@ -36,11 +36,11 @@ SCRIPT_START script_08010120 script_08010132: CheckEntityInteractType JumpIfNot script_08010132 - _0807E864 - _0807EB74 - TextboxNoOverlapFollow 0x4f22 + _0807E864 + _0807EB74 + MessageFromTarget 0x4f22 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08010132 SCRIPT_START script_08010148 BeginBlock @@ -55,9 +55,9 @@ script_0801015A: _0807EB74 CheckRoomFlag 0x0001 JumpIf script_0801019E - TextboxNoOverlapFollowPos 0x3001, 0x0000 + MessageFromTargetPos 0x3001, 0x0000 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_080101A6 Call sub_080A1608 WaitUntilTextboxCloses @@ -81,7 +81,7 @@ script_080101AC: Call sub_080A1270 _0807E864 Call sub_0807DF28 - TextboxNoOverlapFollowPos 0x3004, 0x0007 + MessageFromTargetPos 0x3004, 0x0007 WaitUntilTextboxCloses StopBgm _0807E778 0x0004 diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc index 6a90ab9b..6ca8b25e 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 WaitUntilTextboxCloses 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 WaitUntilTextboxCloses CallWithArg sub_0807F800, 0x00000000 - WaitPlayerAction8 + WaitPlayerAction8 WaitUntilTextboxCloses - 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: WaitUntilTextboxCloses Call sub_0807DF50 @@ -276,11 +276,11 @@ script_080105E0: script_08010602: CheckEntityInteractType JumpIfNot script_08010602 - _0807E864 - _0807EB74 - TextboxNoOverlapFollow 0x0a01 + _0807E864 + _0807EB74 + MessageFromTarget 0x0a01 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 Jump script_08010602 SCRIPT_START script_0801061C @@ -330,9 +330,9 @@ script_08010686: _0807EB74 HasRoomItemForSale Call sub_0807F77C - TextboxNoOverlapFollowTable 0x3c08, 0x3c09 + MessageFromTargetTable 0x3c08, 0x3c09 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 Jump script_08010686 .2byte 0x0000 @@ -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: WaitUntilTextboxCloses 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 WaitUntilTextboxCloses @@ -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: WaitUntilTextboxCloses Call sub_0807F83C diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc index f5bddf73..79bd4c24 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 WaitUntilTextboxCloses _0807E5F8 0x00000010 WaitForSomething2 0x00000020 - TextboxNoOverlapFollowPos 0x1037, 0x0002 + MessageFromTargetPos 0x1037, 0x0002 WaitUntilTextboxCloses _0807E5F8 0x00000010 WaitForSomething2 0x00000020 - TextboxNoOverlapFollowPos 0x1038, 0x000c + MessageFromTargetPos 0x1038, 0x000c WaitUntilTextboxCloses StopBgm _0807E778 0x0004 @@ -69,7 +69,7 @@ SCRIPT_START script_08010BEC _0807E8E4_1 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - TextboxNoOverlapFollowPos 0x1039, 0x000c + MessageFromTargetPos 0x1039, 0x000c WaitUntilTextboxCloses 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 WaitUntilTextboxCloses 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 WaitUntilTextboxCloses 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 WaitUntilTextboxCloses SetEntityPositionRelative 0x01f8, 0x0098 StopBgm diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/script_08010E5A.inc index 847b3bbd..62f2874d 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 WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x1046, 0x0000 + MessageFromTargetPos 0x1046, 0x0000 WaitUntilTextboxCloses CallWithArg CreateManager36, 0x00000002 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc index a86c6f81..64f3c058 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 WaitUntilTextboxCloses 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 WaitUntilTextboxCloses _0807E5F8 0x00000100 WaitForSomething2 0x00000200 - TextboxNoOverlapFollowPos 0x1049, 0x0000 + MessageFromTargetPos 0x1049, 0x0000 WaitUntilTextboxCloses SetEntityPositionRelative 0x01f8, 0x0098 Wait 0x0078 diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc index f7ef1688..18b0d47a 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: WaitUntilTextboxCloses Wait 0x000f @@ -87,9 +87,9 @@ script_08011A44: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlapFollow 0x1320 + MessageFromTarget 0x1320 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08011A44 SCRIPT_START script_08011A64 BeginBlock @@ -106,9 +106,9 @@ script_08011A7C: CallWithArg sub_0807F3D8, 0x00000000 CallWithArg sub_080644B4, 0x00000006 JumpIf script_08011AFA - TextboxNoOverlapFollow 0x1320 + MessageFromTarget 0x1320 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08011A7C .2byte 0x0000 BeginBlock @@ -123,9 +123,9 @@ script_08011AC4: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlapFollow 0x1322 + MessageFromTarget 0x1322 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08011AC4 SCRIPT_START script_08011AE4 @@ -135,7 +135,7 @@ SCRIPT_START script_08011AE4 Call sub_0807F9A4 Call sub_0807DF28 script_08011AFA: - TextboxNoOverlapFollowPos 0x1321, 0x0007 + MessageFromTargetPos 0x1321, 0x0007 WaitUntilTextboxCloses .ifdef JP SetLocalFlag 0x0011 diff --git a/data/scripts/script_08011B20.inc b/data/scripts/script_08011B20.inc index 07756dab..c679db6d 100644 --- a/data/scripts/script_08011B20.inc +++ b/data/scripts/script_08011B20.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08011B20 _0807E864 Call sub_0807DF28 - TextboxNoOverlapFollowPos 0x1320, 0x000c + MessageFromTargetPos 0x1320, 0x000c WaitUntilTextboxCloses - _0807E878 + _0807E878 Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011B40.inc b/data/scripts/script_08011B40.inc index 5a746fdb..3054956e 100644 --- a/data/scripts/script_08011B40.inc +++ b/data/scripts/script_08011B40.inc @@ -11,8 +11,8 @@ SCRIPT_START script_08011B40 _0807EB44 0x0006 DoPostScriptAction 0x0004 Wait 0x003c - _0807EB8C - TextboxNoOverlap 0x3d07 + _0807EB8C + MessageNoOverlap 0x3d07 WaitUntilTextboxCloses _0807EB44 0x0004 ClearGlobalFlag 0x0050 @@ -21,11 +21,11 @@ SCRIPT_START script_08011B40 script_08011B84: CheckEntityInteractType JumpIfNot script_08011B84 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x3d01 + _0807E864 + _0807EB74 + MessageNoOverlap 0x3d01 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_08011BA4 script_08011B9A: _0807E878 @@ -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 WaitUntilTextboxCloses CallWithArg sub_0806C2A0, 0x00000000 WaitFor_2 diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc index c283c9d0..519811d2 100644 --- a/data/scripts/script_08011C7C.inc +++ b/data/scripts/script_08011C7C.inc @@ -16,9 +16,9 @@ script_08011C9A: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4515 + MessageNoOverlap 0x4515 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011C9A @@ -35,9 +35,9 @@ script_08011CC2: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x3105 + MessageNoOverlap 0x3105 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_08011D0E _0807E878 _0807EB44 0x0004 @@ -50,7 +50,7 @@ script_08011D00: _0807EB74 DoPostScriptAction 0x0000 script_08011D0E: - TextboxNoOverlap 0x3108 + MessageNoOverlap 0x3108 WaitUntilTextboxCloses SetGlobalFlag 0x002b _0807E878 @@ -76,9 +76,9 @@ script_08011D46: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4513 + MessageNoOverlap 0x4513 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011D46 @@ -95,9 +95,9 @@ script_08011D6E: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x3103 + MessageNoOverlap 0x3103 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_08011DBA _0807E878 _0807EB44 0x0004 @@ -110,7 +110,7 @@ script_08011DAC: _0807EB74 DoPostScriptAction 0x0000 script_08011DBA: - TextboxNoOverlap 0x3106 + MessageNoOverlap 0x3106 WaitUntilTextboxCloses SetGlobalFlag 0x002c _0807E878 @@ -136,9 +136,9 @@ script_08011DF2: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4514 + MessageNoOverlap 0x4514 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011DF2 @@ -155,9 +155,9 @@ script_08011E1A: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x3104 + MessageNoOverlap 0x3104 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_08011E66 _0807E878 _0807EB44 0x0004 @@ -170,7 +170,7 @@ script_08011E58: _0807EB74 DoPostScriptAction 0x0000 script_08011E66: - TextboxNoOverlap 0x3107 + MessageNoOverlap 0x3107 WaitUntilTextboxCloses SetGlobalFlag 0x002d _0807E878 @@ -200,13 +200,13 @@ script_08011E96: DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011ECC - TextboxNoOverlap 0x4524 + MessageNoOverlap 0x4524 WaitUntilTextboxCloses Jump script_08011ED8 script_08011ECC: - TextboxNoOverlap 0x3111 + MessageNoOverlap 0x3111 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_08011EF4 script_08011ED8: _0807E878 @@ -220,7 +220,7 @@ script_08011EE6: _0807EB74 DoPostScriptAction 0x0000 script_08011EF4: - TextboxNoOverlap 0x3114 + MessageNoOverlap 0x3114 WaitUntilTextboxCloses SetGlobalFlag 0x002e _0807E878 @@ -249,13 +249,13 @@ script_08011F22: DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011F58 - TextboxNoOverlap 0x4522 + MessageNoOverlap 0x4522 WaitUntilTextboxCloses Jump script_08011F64 script_08011F58: - TextboxNoOverlap 0x310f + MessageNoOverlap 0x310f WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_08011F80 script_08011F64: _0807E878 @@ -269,7 +269,7 @@ script_08011F72: _0807EB74 DoPostScriptAction 0x0000 script_08011F80: - TextboxNoOverlap 0x3112 + MessageNoOverlap 0x3112 WaitUntilTextboxCloses SetGlobalFlag 0x002f _0807E878 @@ -298,13 +298,13 @@ script_08011FAE: DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011FE4 - TextboxNoOverlap 0x4523 + MessageNoOverlap 0x4523 WaitUntilTextboxCloses Jump script_08011FF0 script_08011FE4: - TextboxNoOverlap 0x3110 + MessageNoOverlap 0x3110 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_0801200C script_08011FF0: _0807E878 @@ -318,7 +318,7 @@ script_08011FFE: _0807EB74 DoPostScriptAction 0x0000 script_0801200C: - TextboxNoOverlap 0x3113 + MessageNoOverlap 0x3113 WaitUntilTextboxCloses SetGlobalFlag 0x0030 _0807E878 @@ -342,24 +342,24 @@ script_0801203A: DoPostScriptAction 0x0000 CheckLocalFlag 0x0094 JumpIf script_0801205E - TextboxNoOverlap 0x3122 + MessageNoOverlap 0x3122 WaitUntilTextboxCloses SetLocalFlag 0x0094 Jump script_0801209E script_0801205E: _0807E48C 0x0031 JumpIfNot script_08012070 - TextboxNoOverlap 0x3123 + MessageNoOverlap 0x3123 WaitUntilTextboxCloses Jump script_0801209E script_08012070: - TextboxNoOverlap 0x3124 + MessageNoOverlap 0x3124 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_0801209E _0807E48C 0x0020 JumpIfNot script_0801209A - TextboxNoOverlap 0x3125 + MessageNoOverlap 0x3125 WaitUntilTextboxCloses _0807F034 0x0031 WaitPlayerAction8 @@ -376,7 +376,7 @@ script_08012070: .endif Jump script_0801209E script_0801209A: - TextboxNoOverlap 0x3127 + MessageNoOverlap 0x3127 script_0801209E: WaitUntilTextboxCloses _0807E878 @@ -400,24 +400,24 @@ script_080120C6: DoPostScriptAction 0x0000 CheckLocalFlag 0x0095 JumpIf script_080120EA - TextboxNoOverlap 0x3116 + MessageNoOverlap 0x3116 WaitUntilTextboxCloses SetLocalFlag 0x0095 Jump script_0801212A script_080120EA: _0807E48C 0x002f JumpIfNot script_080120FC - TextboxNoOverlap 0x3117 + MessageNoOverlap 0x3117 WaitUntilTextboxCloses Jump script_0801212A script_080120FC: - TextboxNoOverlap 0x3118 + MessageNoOverlap 0x3118 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_0801212A _0807E48C 0x0020 JumpIfNot script_08012126 - TextboxNoOverlap 0x3119 + MessageNoOverlap 0x3119 WaitUntilTextboxCloses _0807F034 0x002f WaitPlayerAction8 @@ -434,7 +434,7 @@ script_080120FC: .endif Jump script_0801212A script_08012126: - TextboxNoOverlap 0x311b + MessageNoOverlap 0x311b script_0801212A: WaitUntilTextboxCloses _0807E878 @@ -458,24 +458,24 @@ script_08012152: DoPostScriptAction 0x0000 CheckLocalFlag 0x0096 JumpIf script_08012176 - TextboxNoOverlap 0x311c + MessageNoOverlap 0x311c WaitUntilTextboxCloses SetLocalFlag 0x0096 Jump script_080121B6 script_08012176: _0807E48C 0x0030 JumpIfNot script_08012188 - TextboxNoOverlap 0x311d + MessageNoOverlap 0x311d WaitUntilTextboxCloses Jump script_080121B6 script_08012188: - TextboxNoOverlap 0x311e + MessageNoOverlap 0x311e WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_080121B6 _0807E48C 0x0020 JumpIfNot script_080121B2 - TextboxNoOverlap 0x311f + MessageNoOverlap 0x311f WaitUntilTextboxCloses _0807F034 0x0030 WaitPlayerAction8 @@ -492,7 +492,7 @@ script_08012188: .endif Jump script_080121B6 script_080121B2: - TextboxNoOverlap 0x3121 + MessageNoOverlap 0x3121 script_080121B6: WaitUntilTextboxCloses _0807E878 @@ -514,9 +514,9 @@ script_080121DE: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4527 + MessageNoOverlap 0x4527 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_080121DE @@ -533,9 +533,9 @@ script_08012216: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4525 + MessageNoOverlap 0x4525 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08012216 @@ -552,9 +552,9 @@ script_0801224E: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4526 + MessageNoOverlap 0x4526 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_0801224E @@ -579,9 +579,9 @@ script_08012298: _0807EB74 _0807E864 Call sub_08061FD8 - TextboxNoOverlapFollow 0x2302 + MessageFromTarget 0x2302 WaitUntilTextboxCloses - _0807E878 + _0807E878 SetGlobalFlag 0x001e Jump script_08012284 script_080122BA: @@ -598,9 +598,9 @@ script_080122CE: _0807EB74 _0807E864 Call sub_08061FD8 - TextboxNoOverlapFollow 0x2303 + MessageFromTarget 0x2303 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_080122BA script_080122EC: EndBlock diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc index 233a6f09..326bc40e 100644 --- a/data/scripts/script_0801232C.inc +++ b/data/scripts/script_0801232C.inc @@ -7,9 +7,9 @@ SCRIPT_START script_0801232C script_08012338: CheckEntityInteractType JumpIfNot script_08012338 - _0807EB74 - _0807E864 - TextboxNoOverlapFollow 0x2304 + _0807EB74 + _0807E864 + MessageFromTarget 0x2304 WaitUntilTextboxCloses CheckLocalFlag 0x0042 JumpIf script_0801235A @@ -31,7 +31,7 @@ script_08012368: StopBgm BeginBlock _0807E778 0x0004 - _0807E788 0x00007fff + SetFadeMask 0x00007fff DoFade5 _0807E858 0x0080 EndBlock @@ -48,14 +48,14 @@ script_08012368: _0807E8E4_0 StartPlayerScript script_08012410 WaitForSomething2 0x00000001 - TextboxNoOverlap 0x1402 + MessageNoOverlap 0x1402 WaitUntilTextboxCloses StopBgm SetEntity0x20 0x00010000 Wait 0x003c BeginBlock _0807E778 0x0004 - _0807E788 0xffffffff + SetFadeMask 0xffffffff DoFade4 _0807E858 0x0080 EndBlock diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc index 01e3deba..0a87a50e 100644 --- a/data/scripts/script_08012430.inc +++ b/data/scripts/script_08012430.inc @@ -44,9 +44,9 @@ script_0801248A: Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_08012AB0 - TextboxNoOverlapFollowPos 0x1101, 0x0007 + MessageFromTargetPos 0x1101, 0x0007 WaitUntilTextboxCloses - CameraTargetPlayer + CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 @@ -77,7 +77,7 @@ script_0801248A: MoveEntityToPlayer Call sub_0807F844 CameraTargetPlayer - _0807E788 0xffffffff + SetFadeMask 0xffffffff _0807E778 0x0004 _0807E800 0x00000000 WaitFor_2 diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc index c28722a6..4470cf0e 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 WaitUntilTextboxCloses _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 - TextboxNoOverlapFollowPos 0x1103, 0x000c + MessageFromTargetPos 0x1103, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 _0807E5F8 0x00000008 @@ -25,29 +25,29 @@ SCRIPT_START script_080126FC WaitForSomething2 0x00000004 DoPostScriptAction 0x0011 _0807E930 0x001c - TextboxNoOverlapFollowPos 0x1105, 0x000c + MessageFromTargetPos 0x1105, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0022 Call sub_0807F3C8 - TextboxNoOverlapFollowPos 0x1106, 0x000c + MessageFromTargetPos 0x1106, 0x000c WaitUntilTextboxCloses _0807E930 0x001c Call sub_0806D96C - TextboxNoOverlapFollowPos 0x1107, 0x000c + MessageFromTargetPos 0x1107, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 - TextboxNoOverlapFollowPos 0x1108, 0x000c + MessageFromTargetPos 0x1108, 0x000c WaitUntilTextboxCloses _0807E930 0x001c Call sub_0806D96C - TextboxNoOverlapFollowPos 0x1109, 0x000c + MessageFromTargetPos 0x1109, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 DoPostScriptAction 0x000a @@ -64,7 +64,7 @@ script_080127F2: _0807E864 Call sub_0806D944 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x1114, 0x000c + MessageFromTargetPos 0x1114, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 _0807E878 @@ -82,13 +82,13 @@ script_08012824: WaitForSomething2 0x00000004 Call sub_0806D944 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110a, 0x000c + MessageFromTargetPos 0x110a, 0x000c WaitUntilTextboxCloses _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110b, 0x000c + MessageFromTargetPos 0x110b, 0x000c WaitUntilTextboxCloses _0807E930 0x001f _0807E5F8 0x00000008 @@ -96,19 +96,19 @@ script_08012824: DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110c, 0x000c + MessageFromTargetPos 0x110c, 0x000c WaitUntilTextboxCloses _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110d, 0x000c + MessageFromTargetPos 0x110d, 0x000c WaitUntilTextboxCloses _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110e, 0x000c + MessageFromTargetPos 0x110e, 0x000c WaitUntilTextboxCloses _0807E930 0x0018 SetEntitySpeed 0x0080 @@ -130,8 +130,8 @@ script_08012904: script_08012920: _0807E864 _0807E930 0x0010 - EndBlock - TextboxNoOverlapFollowPos 0x1115, 0x000c + EndBlock + MessageFromTargetPos 0x1115, 0x000c WaitUntilTextboxCloses _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 @@ -166,8 +166,8 @@ script_08012984: script_080129A0: _0807E864 _0807E930 0x0010 - EndBlock - TextboxNoOverlapFollowPos 0x1115, 0x000c + EndBlock + MessageFromTargetPos 0x1115, 0x000c WaitUntilTextboxCloses _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 @@ -203,8 +203,8 @@ script_08012A08: script_08012A24: _0807E864 _0807E930 0x0010 - EndBlock - TextboxNoOverlapFollowPos 0x1115, 0x000c + EndBlock + MessageFromTargetPos 0x1115, 0x000c WaitUntilTextboxCloses _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 e5013b16..c63f591e 100644 --- a/data/scripts/script_08012C68.inc +++ b/data/scripts/script_08012C68.inc @@ -8,9 +8,9 @@ SCRIPT_START script_08012C68 script_08012C7E: CheckEntityInteractType JumpIfNot script_08012C7E - _0807E864 - _0807E8E4_0 - TextboxNoOverlapFollow 0x111d + _0807E864 + _0807E8E4_0 + MessageFromTarget 0x111d WaitUntilTextboxCloses SetGlobalFlag 0x0022 _0807E878 diff --git a/data/scripts/script_08012F0C.inc b/data/scripts/script_08012F0C.inc index e56c81b9..17ccbb21 100644 --- a/data/scripts/script_08012F0C.inc +++ b/data/scripts/script_08012F0C.inc @@ -19,8 +19,8 @@ script_08012F48: script_08012F50: Call sub_0806A96C JumpIfNot script_08012F50 - _0807E864 - TextboxNoOverlap 0x4401 + _0807E864 + MessageNoOverlap 0x4401 WaitUntilTextboxCloses SetLocalFlag 0x0061 _0807E878 @@ -28,7 +28,7 @@ script_08012F50: script_08012F6C: Call sub_0806A96C JumpIfNot script_08012F6C - TextboxNoOverlap 0x4402 + MessageNoOverlap 0x4402 WaitUntilTextboxCloses _0807E908 0x0001 Jump script_08012F6C diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc index cdcaa6c1..fdd495d6 100644 --- a/data/scripts/script_08012F86.inc +++ b/data/scripts/script_08012F86.inc @@ -27,8 +27,8 @@ script_08012FD2: CheckInventory1 0x0038 JumpIf script_08013006 script_08012FFA: - _0807E944 - TextboxNoOverlap 0x4403 + _0807E944 + MessageNoOverlap 0x4403 WaitUntilTextboxCloses Jump script_08012FFA script_08013006: @@ -47,24 +47,24 @@ script_08013006: Wait 0x003c DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x4404 + MessageNoOverlap 0x4404 WaitUntilTextboxCloses Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x440e + MessageNoOverlap 0x440e WaitUntilTextboxCloses Wait 0x001e Call sub_0806A9E8 _0807E930 0x000f Wait 0x00f0 - TextboxNoOverlap 0x4405 + MessageNoOverlap 0x4405 WaitUntilTextboxCloses _0807E5F8 0x00000200 _0807F034 0x0015 - WaitPlayerAction8 - _0807EB8C - TextboxNoOverlap 0x4406 + WaitPlayerAction8 + _0807EB8C + MessageNoOverlap 0x4406 WaitUntilTextboxCloses _0807E908 0x0001 Call sub_0807DF50 @@ -72,13 +72,13 @@ script_08013006: script_0801308A: Call sub_0806A96C JumpIfNot script_0801308A - TextboxNoOverlap 0x4407 + MessageNoOverlap 0x4407 WaitUntilTextboxCloses _0807E908 0x0001 script_0801309E: Call sub_0806A96C JumpIfNot script_0801309E - TextboxNoOverlap 0x440d + MessageNoOverlap 0x440d WaitUntilTextboxCloses _0807E908 0x0001 Jump script_0801308A diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc index 48dbc388..c32c850d 100644 --- a/data/scripts/script_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -30,8 +30,8 @@ SCRIPT_START script_080131AC Call sub_080536B8 _0807E864 Call sub_0807DF28 - WaitFor_2 - TextboxNoOverlapFollowPos 0x1602, 0x000c + WaitFor_2 + MessageFromTargetPos 0x1602, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00000008 WaitForSomething2 0x00000010 @@ -45,11 +45,11 @@ SCRIPT_START script_080131AC StartPlayerScript script_08013378 _0807E5F8 0x00000020 WaitForSomething2 0x00000042 - TextboxNoOverlapFollowPos 0x1603, 0x000c + MessageFromTargetPos 0x1603, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00000020 WaitForSomething2 0x00000040 - _0807E788 0xffff7fff + SetFadeMask 0xffff7fff _0807E778 0x0004 DoFade5 WaitFor_2 @@ -58,9 +58,9 @@ SCRIPT_START script_080131AC Wait 0x003c CameraTargetPlayer Call sub_0807F5C0 - TextboxNoOverlapFollowPos 0x1604, 0x0007 + MessageFromTargetPos 0x1604, 0x0007 WaitUntilTextboxCloses - _0807E788 0xffffffff + SetFadeMask 0xffffffff _0807E778 0x0004 DoFade4 WaitFor_2 diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc index 80a2f6e3..2c83e70b 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 WaitUntilTextboxCloses _0807E5F8 0x00040000 CallWithArg CreateManager36, 0x00000001 diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc index 8873bf72..1f7bb597 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 WaitUntilTextboxCloses _0807E5F8 0x00040000 SetLocalFlag 0x007b diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc index e7336b42..2cbc2caf 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 WaitUntilTextboxCloses _0807E5F8 0x00040000 .ifndef EU diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc index 8858c63e..b0ec2caf 100644 --- a/data/scripts/script_08014248.inc +++ b/data/scripts/script_08014248.inc @@ -24,10 +24,10 @@ script_0801427C: script_08014298: CheckEntityInteractType JumpIfNot script_08014298 - _0807E864 - TextboxNoOverlapFollowPos 0x0647, 0x000c + _0807E864 + MessageFromTargetPos 0x0647, 0x000c WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08014298 .2byte 0x0000 .endif diff --git a/data/scripts/script_080142B0.inc b/data/scripts/script_080142B0.inc index 5d2587df..7a9188ad 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 WaitUntilTextboxCloses Wait 0x0014 _0807E930 0x0004 @@ -53,7 +53,7 @@ script_08014330: Wait 0x001e _0807E930 0x0001 Wait 0x001e - TextboxNoOverlap 0x2c13 + MessageNoOverlap 0x2c13 WaitUntilTextboxCloses Wait 0x0014 _0807E930 0x0004 diff --git a/data/scripts/script_08014384.inc b/data/scripts/script_08014384.inc index 86aa3647..ac5a30fe 100644 --- a/data/scripts/script_08014384.inc +++ b/data/scripts/script_08014384.inc @@ -11,7 +11,7 @@ SCRIPT_START script_08014384 WaitUntilTextboxCloses _0807EB8C Wait 0x001e - TextboxNoOverlapVar + MessageNoOverlapVar script_080143AC: WaitUntilTextboxCloses Wait 0x001e diff --git a/data/scripts/script_080143C0.inc b/data/scripts/script_080143C0.inc index 602f8a7d..dc3c8b0f 100644 --- a/data/scripts/script_080143C0.inc +++ b/data/scripts/script_080143C0.inc @@ -6,9 +6,9 @@ SCRIPT_START script_080143C0 _0807E930 0x0001 Call sub_080654EC Wait 0x003c - TextboxNoOverlap 0x2c16 + MessageNoOverlap 0x2c16 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_080143FA SetIntVariable 0x00000002 Call sub_08065528 @@ -16,21 +16,21 @@ SCRIPT_START script_080143C0 script_080143FA: Call sub_080654EC Wait 0x001e - TextboxNoOverlap 0x2c18 + MessageNoOverlap 0x2c18 WaitUntilTextboxCloses Wait 0x000a SetIntVariable 0x00000000 Call sub_08065528 _0807F034 0x0036 - WaitPlayerAction8 - TextboxNoOverlap 0x2c19 + WaitPlayerAction8 + MessageNoOverlap 0x2c19 WaitUntilTextboxCloses SetIntVariable 0x00000303 Call sub_0807F420 .ifndef EU Wait 0x001e - _0807EB8C - TextboxNoOverlap 0x2c22 + _0807EB8C + MessageNoOverlap 0x2c22 WaitUntilTextboxCloses .endif script_0801443E: diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc index 4905e22f..6888e5d0 100644 --- a/data/scripts/script_08014450.inc +++ b/data/scripts/script_08014450.inc @@ -12,23 +12,23 @@ script_08014462: _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 - TextboxNoOverlapFollow 0x4202 - TextboxNoOverlapFollow 0x4203 + MessageFromTarget 0x4202 + MessageFromTarget 0x4203 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_080144F0 DoPostScriptAction 0x0001 Wait 0x008c DoPostScriptAction 0x0000 HasRupees 0x000a JumpIf script_080144A2 - TextboxNoOverlapFollow 0x4204 + MessageFromTarget 0x4204 Jump script_080144FC script_080144A2: Call sub_0806E250 JumpIfNot script_080144B8 - TextboxNoOverlapFollow 0x420b - _0807EB38 + MessageFromTarget 0x420b + _0807EB38 JumpTable script_080144B8, script_080144C0 script_080144B8: ClearLocalFlag 0x0093 @@ -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 cb47bc67..0b0264e5 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 WaitUntilTextboxCloses .ifdef EU Wait 0x0018 diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc index a3189a6b..cd83bffc 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 WaitUntilTextboxCloses 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 @@ -111,9 +111,9 @@ script_0801472E_2: JumpIfNot script_0801463A CheckLocalFlag 0x005e JumpIf script_080146A0 - _0807E864 - _0807EB8C - TextboxNoOverlapFollowPos 0x432b, 0x000c + _0807E864 + _0807EB8C + MessageFromTargetPos 0x432b, 0x000c Jump script_080147CE script_08014672: .ifdef DEMO_JP @@ -144,7 +144,7 @@ script_080146A0: _0807E930 0x0002 CheckGlobalFlag 0x0059 JumpIfNot script_080146C6 - TextboxNoOverlapFollowPos 0x432f, 0x000c + MessageFromTargetPos 0x432f, 0x000c Jump script_080147CE script_080146C6: CheckRoomFlag 0x0004 @@ -161,7 +161,7 @@ script_080146C6: .endif script_080146F4: - TextboxNoOverlapFollowPos 0x431e, 0x000c + MessageFromTargetPos 0x431e, 0x000c Jump script_080147CE script_080146FE: .ifdef EU @@ -174,11 +174,11 @@ script_080146FE: script_0801474A: SetRoomFlag 0x000a .endif - TextboxNoOverlapFollowPos 0x4305, 0x000c + MessageFromTargetPos 0x4305, 0x000c WaitUntilTextboxCloses _0807E3BC 0x0001 JumpIfNot script_080147C4 - TextboxNoOverlapFollowPos 0x4306, 0x000c + MessageFromTargetPos 0x4306, 0x000c Jump script_0801473C script_08014720: .ifdef EU @@ -214,7 +214,7 @@ script_08014754: .else SetRoomFlag 0x0004 .endif - TextboxNoOverlapFollowPos 0x431e, 0x000c + MessageFromTargetPos 0x431e, 0x000c Jump script_080147CE script_08014770: .ifdef EU @@ -252,7 +252,7 @@ script_080147C4: .else SetRoomFlag 0x0009 .endif - TextboxNoOverlapFollowPos 0x4307, 0x000c + MessageFromTargetPos 0x4307, 0x000c script_080147CE: WaitUntilTextboxCloses .ifdef EU diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc index 765fa7f7..98d12714 100644 --- a/data/scripts/script_08014804.inc +++ b/data/scripts/script_08014804.inc @@ -9,8 +9,8 @@ SCRIPT_START script_08014804 Wait 0x0010 CheckLocalFlag 0x0093 JumpIf script_080148B6 - TextboxNoOverlapFollowPos 0x4215, 0x000c - _0807E878 + MessageFromTargetPos 0x4215, 0x000c + _0807E878 script_0801482E: TestBit 0x00000001 JumpIf script_08014862 @@ -22,8 +22,8 @@ script_0801482E: _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 - TextboxNoOverlapFollowPos 0x4215, 0x000c - _0807E878 + MessageFromTargetPos 0x4215, 0x000c + _0807E878 Jump script_0801482E script_08014862: _0807E930 0x0008 @@ -49,8 +49,8 @@ script_0801488E: Wait 0x0020 _0807E930 0x0002 script_080148B6: - TextboxNoOverlapFollowPos 0x4216, 0x000c - _0807E878 + MessageFromTargetPos 0x4216, 0x000c + _0807E878 Jump script_0801488E script_080148C2: _0807E930 0x0008 diff --git a/data/scripts/script_08014A80.inc b/data/scripts/script_08014A80.inc index 51c30deb..058d4364 100644 --- a/data/scripts/script_08014A80.inc +++ b/data/scripts/script_08014A80.inc @@ -7,17 +7,17 @@ SCRIPT_START script_08014A80 DoPostScriptAction 0x0004 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 - TextboxNoOverlap 0x2f0a + MessageNoOverlap 0x2f0a WaitUntilTextboxCloses _0807E5F8 0x00000002 script_08014AAC: _0807E30C JumpIfNot script_08014AAC - _0807E864 - _0807EB74 - TextboxNoOverlap 0x2f0a + _0807E864 + _0807EB74 + MessageNoOverlap 0x2f0a WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08014AAC .2byte 0x0000 SCRIPT_START script_08014AC4 @@ -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: WaitUntilTextboxCloses Wait 0x000f diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc index 575b8603..a53d3c1f 100644 --- a/data/scripts/script_08014B34.inc +++ b/data/scripts/script_08014B34.inc @@ -12,10 +12,10 @@ script_08014B48: JumpIf script_08014B70 CheckEntityInteractType JumpIfNot script_08014B48 - EndBlock - _0807E864 - _0807EB74 - TextboxNoOverlap 0x2f01 + EndBlock + _0807E864 + _0807EB74 + MessageNoOverlap 0x2f01 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -56,14 +56,14 @@ script_08014BF2: CheckLocalFlag 0x0065 JumpIf script_08014C1C SetLocalFlag 0x0065 - TextboxNoOverlap 0x2f07 + MessageNoOverlap 0x2f07 WaitUntilTextboxCloses SetIntVariable 0x00000064 _0807F034 0x003f WaitPlayerAction8 Jump script_08014C22 script_08014C1C: - TextboxNoOverlap 0x2f08 + MessageNoOverlap 0x2f08 WaitUntilTextboxCloses script_08014C22: Wait 0x000f @@ -90,13 +90,13 @@ script_08014C56: CheckLocalFlag 0x0066 JumpIf script_08014C7C SetLocalFlag 0x0066 - TextboxNoOverlap 0x2f0d + MessageNoOverlap 0x2f0d WaitUntilTextboxCloses _0807F034 0x000a WaitPlayerAction8 Jump script_08014C82 script_08014C7C: - TextboxNoOverlap 0x2f09 + MessageNoOverlap 0x2f09 WaitUntilTextboxCloses script_08014C82: Wait 0x000f diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc index a2c0f4df..c7c09148 100644 --- a/data/scripts/script_08014CDC.inc +++ b/data/scripts/script_08014CDC.inc @@ -10,8 +10,8 @@ SCRIPT_START script_08014CDC EndBlock WaitForSomething2 0x00000001 Call sub_08066E08 - _0807E864 - TextboxNoOverlapFollowPos 0x1010, 0x000c + _0807E864 + MessageFromTargetPos 0x1010, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00000002 script_08014D1E: @@ -23,7 +23,7 @@ script_08014D1E: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - TextboxNoOverlap 0x1012 + MessageNoOverlap 0x1012 WaitUntilTextboxCloses _0807EC64 0x0040 _0807EB44 0x0004 @@ -36,7 +36,7 @@ script_08014D60: JumpIf script_08014D60 _0807E864 Call sub_0807DF28 - TextboxNoOverlap 0x1013 + MessageNoOverlap 0x1013 WaitUntilTextboxCloses _0807EC64 0x0040 _0807EB44 0x0004 @@ -50,7 +50,7 @@ script_08014D96: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - TextboxNoOverlap 0x1014 + MessageNoOverlap 0x1014 WaitUntilTextboxCloses _0807EC64 0x0018 .ifdef JP diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc index 6cb1115d..a42da868 100644 --- a/data/scripts/script_08014E14.inc +++ b/data/scripts/script_08014E14.inc @@ -38,14 +38,14 @@ script_08014E64: _0807E48C 0x0020 JumpIfNot script_08014EB8 CallWithArg sub_0807F800, 0x00000022 - WaitPlayerAction8 - TextboxNoOverlap 0x0a04 + WaitPlayerAction8 + MessageNoOverlap 0x0a04 Jump script_08014EBC script_08014EB0: - TextboxNoOverlap 0x0a03 + MessageNoOverlap 0x0a03 Jump script_08014EBC script_08014EB8: - TextboxNoOverlap 0x0a02 + MessageNoOverlap 0x0a02 script_08014EBC: WaitUntilTextboxCloses Call sub_0807DF50 @@ -62,11 +62,11 @@ SCRIPT_START script_08014ECC script_08014EE0: CheckEntityInteractType JumpIfNot script_08014EE0 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x200d + _0807E864 + _0807EB74 + MessageNoOverlap 0x200d WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08014EE0 .2byte 0x0000 SCRIPT_START script_08014EF8 @@ -82,9 +82,9 @@ script_08014F0C: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x200e + MessageNoOverlap 0x200e WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 _0807E930 0x000a Jump script_08014F0C @@ -104,8 +104,8 @@ script_08014F4A: Call sub_0807DF28 _0807EB74 DoPostScriptAction 0x0000 - BeginBlock - TextboxNoOverlap 0x3b0b + BeginBlock + MessageNoOverlap 0x3b0b CallWithArg sub_0807F854, 0x00010064 EndBlock WaitUntilTextboxCloses @@ -117,14 +117,14 @@ script_08014F4A: JumpIfNot script_08014FA2 ModRupees 0xff9c _0807F034 0x0022 - WaitPlayerAction8 - TextboxNoOverlap 0x3b11 + WaitPlayerAction8 + MessageNoOverlap 0x3b11 Jump script_08014FA6 script_08014F9A: - TextboxNoOverlap 0x3b0e + MessageNoOverlap 0x3b0e Jump script_08014FA6 script_08014FA2: - TextboxNoOverlap 0x3b0f + MessageNoOverlap 0x3b0f script_08014FA6: WaitUntilTextboxCloses Call sub_0807DF50 @@ -148,7 +148,7 @@ script_08014FCC: CameraTargetEntity StartPlayerScript script_080152B4 WaitForSomething2 0x00000001 - TextboxNoOverlapFollowPos 0x1301, 0x0002 + MessageFromTargetPos 0x1301, 0x0002 WaitUntilTextboxCloses Call sub_0807F3F8 Wait 0x003c @@ -159,11 +159,11 @@ script_08014FCC: PlayBgm BGM_VAATI_THEME _0807EB28 0x1302 WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x1303, 0x0002 + MessageFromTargetPos 0x1303, 0x0002 WaitUntilTextboxCloses _0807EB28 0x1304 WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x1305, 0x0002 + MessageFromTargetPos 0x1305, 0x0002 WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_08015390.inc b/data/scripts/script_08015390.inc index 03702883..d7337b44 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 WaitUntilTextboxCloses _0807E930 0x0018 Call sub_0806D8A0 diff --git a/data/scripts/script_080153EC.inc b/data/scripts/script_080153EC.inc index f672715e..019ff352 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 WaitUntilTextboxCloses _0807E5F8 0x00008000 WaitForSomething2 0x00010000 _0807E5F8 0x00000880 WaitForSomething2 0x00001000 Wait 0x003c - TextboxNoOverlapFollowPos 0x130d, 0x0002 + MessageFromTargetPos 0x130d, 0x0002 WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x130e, 0x000c + MessageFromTargetPos 0x130e, 0x000c WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x130f, 0x0002 + MessageFromTargetPos 0x130f, 0x0002 WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x1310, 0x000c + MessageFromTargetPos 0x1310, 0x000c WaitUntilTextboxCloses CallWithArg CreateManager36, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0801548E.inc b/data/scripts/script_0801548E.inc index 8ab4bef6..d30b9978 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 WaitUntilTextboxCloses _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 WaitUntilTextboxCloses _0807E5F8 0x00000800 WaitForSomething2 0x00001000 diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc index 8a17a7ef..2cb7bc3c 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 WaitUntilTextboxCloses _0807E5F8 0x00000001 WaitForSomething2 0x00000002 @@ -54,12 +54,12 @@ script_08015888: CameraTargetEntity StartPlayerScript script_08015938 WaitForSomething2 0x00000010 - TextboxNoOverlapFollowPos 0x106a, 0x000c + MessageFromTargetPos 0x106a, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00000008 Wait 0x0078 - _0807E8E4_2 - TextboxNoOverlapFollowPos 0x1068, 0x0002 + _0807E8E4_2 + MessageFromTargetPos 0x1068, 0x0002 WaitUntilTextboxCloses _0807E5F8 0x00000001 WaitForSomething2 0x00000002 diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc index c61ace33..a8d05e76 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 WaitUntilTextboxCloses _0807EDD4 0x01f8, 0x0268 SetEntityPositionRelative 0x0248, 0x0218 @@ -56,8 +56,8 @@ script_08015A32: JumpIf script_08015A54 CheckEntityInteractType JumpIfNot script_08015A32 - EndBlock - TextboxNoOverlapFollowPos 0x1067, 0x0002 + EndBlock + MessageFromTargetPos 0x1067, 0x0002 WaitUntilTextboxCloses Jump script_08015A32 script_08015A54: diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc index 23671dbe..6c5d3065 100644 --- a/data/scripts/script_08015B34.inc +++ b/data/scripts/script_08015B34.inc @@ -21,7 +21,7 @@ SCRIPT_START script_08015B34 _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - TextboxNoOverlapFollowPos 0x2506, 0x0002 + MessageFromTargetPos 0x2506, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_08015B84 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/script_08015C7C.inc index d7226c5a..48ae9e24 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 WaitUntilTextboxCloses CallWithArg sub_0807F238, 0x000003c9 Call sub_0807F304 diff --git a/data/scripts/script_08015DF0.inc b/data/scripts/script_08015DF0.inc index 081b2b2c..9cc8db37 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 WaitUntilTextboxCloses _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - TextboxNoOverlap 0x131a + MessageNoOverlap 0x131a WaitUntilTextboxCloses _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - TextboxNoOverlap 0x131d + MessageNoOverlap 0x131d WaitUntilTextboxCloses _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - TextboxNoOverlap 0x131e + MessageNoOverlap 0x131e WaitUntilTextboxCloses _0807E5F8 0x00000008 WaitForSomething 0x00000400 diff --git a/data/scripts/script_08015E58.inc b/data/scripts/script_08015E58.inc index 85d5ccab..457d8fb6 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 WaitUntilTextboxCloses _0807E5F8 0x00000020 WaitForSomething2 0x00000010 diff --git a/data/scripts/script_08015F08.inc b/data/scripts/script_08015F08.inc index 6f079b51..2bedafbe 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 WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething 0x00000200 diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc index 4704883f..576ed2c3 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 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_08016132 BuyItem 0x0000, 0x0000 JumpIf script_0801610C - TextboxNoOverlapFollow 0x2d0b + MessageFromTarget 0x2d0b WaitUntilTextboxCloses Jump script_08016132 script_0801610C: WaitPlayerAction8 .ifndef EU - _0807EB8C - TextboxNoOverlapFollow 0x2d0d + _0807EB8C + MessageFromTarget 0x2d0d .else - TextboxNoOverlapFollow 0x2d08 + MessageFromTarget 0x2d08 .endif WaitUntilTextboxCloses Jump script_08016132 script_0801611A: CheckKinstoneFused 0x0014 JumpIfNot script_0801612C - TextboxNoOverlapFollow 0x2d09 + MessageFromTarget 0x2d09 WaitUntilTextboxCloses Jump script_08016132 script_0801612C: - TextboxNoOverlapFollow 0x2d01 + MessageFromTarget 0x2d01 WaitUntilTextboxCloses script_08016132: _0807E878 @@ -66,21 +66,21 @@ script_08016146: JumpIfNot script_08016146 _0807E864 GetInventoryValue 0x0025 - TextboxNoOverlapFollowTable 0x2d03, 0x2d02, 0x2d02, 0x2d02 - _0807E3E8 + 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 + WaitPlayerAction8 + 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 - _0807E3E8 + 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 + WaitPlayerAction8 WaitUntilTextboxCloses - _0807EB8C - TextboxNoOverlap 0x2d06 + _0807EB8C + MessageNoOverlap 0x2d06 .else - TextboxNoOverlapFollow 0x2d06 + MessageFromTarget 0x2d06 .endif script_080161E2: _0807E878 diff --git a/data/scripts/script_08016384.inc b/data/scripts/script_08016384.inc index 6b85d8b8..6f6aaa07 100644 --- a/data/scripts/script_08016384.inc +++ b/data/scripts/script_08016384.inc @@ -66,4 +66,4 @@ SCRIPT_START script_08016384 WaitFor_1 WaitFor_2 _0807E778 0x0004 - _0807E788 0x0000ffff + SetFadeMask 0x0000ffff diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc index b2e0d70c..57c2cda5 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 WaitUntilTextboxCloses - 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 394e7392..47de49ed 100644 --- a/data/scripts/script_080165D8.inc +++ b/data/scripts/script_080165D8.inc @@ -13,16 +13,16 @@ SCRIPT_START script_080165F8 script_080165FE: _0807E30C JumpIfNot script_080165FE - TextboxNoOverlapFollow 0x0601 + MessageFromTarget 0x0601 Jump script_080165FE SCRIPT_START script_0801660C BeginBlock _0807E9D4 EndBlock script_08016612: - _0807E944 - _0807E864 - TextboxNoOverlapFollow 0x0602 + _0807E944 + _0807E864 + MessageFromTarget 0x0602 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -239,7 +239,7 @@ script_0801693E: _0807E944 _0807E864 Wait 0x0018 - TextboxNoOverlapFollow 0x0a01 + MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -255,7 +255,7 @@ script_0801696A: _0807E944 _0807E864 Wait 0x0018 - TextboxNoOverlapFollow 0x0a01 + MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f _0807E878 |