diff options
Diffstat (limited to 'data/scripts')
115 files changed, 995 insertions, 995 deletions
diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc index 2009cc62..d2ac2ac4 100644 --- a/data/scripts/script_08008B5C.inc +++ b/data/scripts/script_08008B5C.inc @@ -28,8 +28,8 @@ script_08008BA2: _0807E864 _0807E930 0x0004 Call sub_0807F2D4 - TextboxNoOverlapFollow 0x4912 - _0807EA94 + MessageFromTarget 0x4912 + _0807EA94 _0807E930 0x0008 _0807E878 Jump script_08008BA2 @@ -60,8 +60,8 @@ script_08008BD2: CallWithArg sub_0806BB1C, 0x00000001 Call sub_0806BB7C JumpIfNot script_08008C5C - TextboxNoOverlap 0x490c - _0807EA94 + MessageNoOverlap 0x490c + _0807EA94 LoadRoomEntityList gUnk_080D6784 WaitForSomething 0x00000001 WaitForSomething 0x00000004 @@ -69,8 +69,8 @@ script_08008BD2: PlaySound SFX_SECRET _0807E930 0x0004 Call sub_0807F2D4 - TextboxNoOverlap 0x4913 - _0807EA94 + MessageNoOverlap 0x4913 + _0807EA94 _0807E930 0x0008 Call sub_0807F2D4 Jump script_08008C5C @@ -91,8 +91,8 @@ SCRIPT_START script_08008C64 PlaySound SFX_STAIRS EndBlock WaitForSomething 0x00000002 - TextboxNoOverlap 0x490d - _0807EA94 + MessageNoOverlap 0x490d + _0807EA94 DoPostScriptAction 0x0007 Call sub_08064D08 _0807EDD4 0x0068, 0x0078 diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc index 777a0a63..bec68bb0 100644 --- a/data/scripts/script_08008D8C.inc +++ b/data/scripts/script_08008D8C.inc @@ -64,8 +64,8 @@ script_08008E12: WaitForSomething2 0x00000100 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - TextboxNoOverlapFollowPos 0x1053, 0x000e - _0807EA94 + MessageFromTargetPos 0x1053, 0x000e + _0807EA94 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 _0807E5F8 0x00000080 diff --git a/data/scripts/script_08008FC0.inc b/data/scripts/script_08008FC0.inc index 85717dac..e09554bb 100644 --- a/data/scripts/script_08008FC0.inc +++ b/data/scripts/script_08008FC0.inc @@ -4,8 +4,8 @@ SCRIPT_START script_08008FC0 PlaySound SFX_109 CallWithArg sub_0807F238, 0x0000045f Call sub_0807F304 - TextboxNoOverlapFollowPos 0x0501, 0x000e - _0807EA94 + MessageFromTargetPos 0x0501, 0x000e + _0807EA94 _0807E5F8 0x00000020 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc index 06a5ef94..46262f67 100644 --- a/data/scripts/script_0800903C.inc +++ b/data/scripts/script_0800903C.inc @@ -29,21 +29,21 @@ SCRIPT_START script_08009080 _0807EB44 0x0004 _0807ECC4 0x0008 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1050, 0x000e - _0807EA94 + MessageFromTargetPos 0x1050, 0x000e + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1052, 0x000e - _0807EA94 + MessageFromTargetPos 0x1052, 0x000e + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EB44 0x0006 _0807E930 0x0005 - TextboxNoOverlapFollowPos 0x1054, 0x000e - _0807EA94 + MessageFromTargetPos 0x1054, 0x000e + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 @@ -51,26 +51,26 @@ SCRIPT_START script_08009080 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1056, 0x000e - _0807EA94 + MessageFromTargetPos 0x1056, 0x000e + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1057, 0x000e - _0807EA94 + MessageFromTargetPos 0x1057, 0x000e + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1058, 0x000e - _0807EA94 + MessageFromTargetPos 0x1058, 0x000e + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x105c, 0x000e - _0807EA94 + MessageFromTargetPos 0x105c, 0x000e + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 script_0800917C: @@ -92,8 +92,8 @@ SCRIPT_START script_08009198 WaitForSomething2 0x00000001 _0807EB74 DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x105b, 0x0000 - _0807EA94 + MessageFromTargetPos 0x105b, 0x0000 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 @@ -104,8 +104,8 @@ SCRIPT_START script_08009198 DoPostScriptAction 0x0005 Wait 0x003c DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1051, 0x0000 - _0807EA94 + MessageFromTargetPos 0x1051, 0x0000 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 @@ -114,8 +114,8 @@ SCRIPT_START script_08009198 _0807EB74 _0807EB8C DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1055, 0x0000 - _0807EA94 + MessageFromTargetPos 0x1055, 0x0000 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 @@ -128,8 +128,8 @@ SCRIPT_START script_08009198 _0807EB74 DoPostScriptAction 0x0000 DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1059, 0x0000 - _0807EA94 + MessageFromTargetPos 0x1059, 0x0000 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 BeginBlock @@ -167,10 +167,10 @@ script_080092B2: script_080092BA: CheckEntityInteractType JumpIfNot script_080092BA - _0807E864 - _0807EB74 - TextboxNoOverlap 0x105e - _0807EA94 + _0807E864 + _0807EB74 + MessageNoOverlap 0x105e + _0807EA94 Wait 0x000f _0807E878 Jump script_080092BA @@ -192,11 +192,11 @@ SCRIPT_START script_080092F0 script_08009300: CheckEntityInteractType JumpIfNot script_08009300 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x1071 - _0807EA94 - _0807E878 + _0807E864 + _0807EB74 + MessageNoOverlap 0x1071 + _0807EA94 + _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 0ac133ef..8138e6c5 100644 --- a/data/scripts/script_08009348.inc +++ b/data/scripts/script_08009348.inc @@ -12,8 +12,8 @@ script_0800934E: CameraTargetEntity CheckGlobalFlag 0x0055 JumpIf script_0800939A - TextboxNoOverlap 0x1d01 - _0807EA94 + MessageNoOverlap 0x1d01 + _0807EA94 script_08009376: _0807EA94 Call sub_0806D640 diff --git a/data/scripts/script_0800939A.inc b/data/scripts/script_0800939A.inc index 2b5a9bbc..cd222161 100644 --- a/data/scripts/script_0800939A.inc +++ b/data/scripts/script_0800939A.inc @@ -17,15 +17,15 @@ SCRIPT_START script_0800939A JumpIf script_080093BC CheckInventory1 0x000e JumpIf script_080093BC - TextboxNoOverlap 0x1d02 - _0807EA94 + MessageNoOverlap 0x1d02 + _0807EA94 Jump script_08009376 script_080093BC: CheckInventory1 0x000e JumpIfNot script_080093DA Call sub_0806D788 - TextboxNoOverlap 0x1d03 - _0807EA94 + MessageNoOverlap 0x1d03 + _0807EA94 Call sub_0806D70C Jump script_08009376 script_080093DA: @@ -46,13 +46,13 @@ script_080093DA: JumpIf script_080093EE SetIntVariable 0x00001d04 script_080093EE: - TextboxNoOverlapVar - _0807EA94 - _0807E3E8 + MessageNoOverlapVar + _0807EA94 + _0807E3E8 JumpIfNot script_08009376 Wait 0x001e - TextboxNoOverlap 0x1d08 - _0807EA94 + MessageNoOverlap 0x1d08 + _0807EA94 LoadRoomEntityList gUnk_080F9C38 Wait 0x0078 Call sub_0806D6D0 @@ -77,19 +77,19 @@ script_080093EE: .endif .endif Call sub_0806D5D4 - _0807EB8C - TextboxNoOverlap 0x1d09 - _0807EA94 + _0807EB8C + MessageNoOverlap 0x1d09 + _0807EA94 Wait 0x000a Jump script_08009376 script_0800943E: Call sub_0806D600 JumpIf script_08009452 - TextboxNoOverlap 0x1d0a - _0807EA94 + MessageNoOverlap 0x1d0a + _0807EA94 JumpIfNot script_08009376 script_08009452: - TextboxNoOverlap 0x1d0b - _0807EA94 + MessageNoOverlap 0x1d0b + _0807EA94 Call sub_0806D74C _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc index 83fbcbbb..f85d454f 100644 --- a/data/scripts/script_08009464.inc +++ b/data/scripts/script_08009464.inc @@ -20,10 +20,10 @@ SCRIPT_START script_08009464 .endif Call sub_0806D620 Wait 0x003c - WaitPlayerAction8 - _0807EB8C - TextboxNoOverlap 0x1d0c - _0807EA94 + WaitPlayerAction8 + _0807EB8C + MessageNoOverlap 0x1d0c + _0807EA94 Wait 0x000a Jump script_08009376 .2byte 0x0000 diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc index ee702274..cda95152 100644 --- a/data/scripts/script_080095F2.inc +++ b/data/scripts/script_080095F2.inc @@ -9,9 +9,9 @@ SCRIPT_START script_080095F2 JumpIfNot script_08009622 PlaySound SFX_109 _0807F088 0x003c - TextboxNoOverlapFollow 0x053c - WaitPlayerAction8 - _0807EA94 + MessageFromTarget 0x053c + WaitPlayerAction8 + _0807EA94 _0807F078 0x003c, 0x0001 script_08009622: _0807E878 diff --git a/data/scripts/script_08009950.inc b/data/scripts/script_08009950.inc index bffaaa59..8fcf8511 100644 --- a/data/scripts/script_08009950.inc +++ b/data/scripts/script_08009950.inc @@ -16,8 +16,8 @@ SCRIPT_START script_08009950 Wait 0x001e _0807E930 0x000b Wait 0x001e - TextboxNoOverlapFollow 0x1002 - _0807EA94 + MessageFromTarget 0x1002 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 @@ -26,8 +26,8 @@ SCRIPT_START script_08009950 _0807EDD4 0x00b8, 0x005c _0807EB44 0x0006 DoPostScriptAction 0x0001 - TextboxNoOverlapFollow 0x1004 - _0807EA94 + MessageFromTarget 0x1004 + _0807EA94 DoPostScriptAction 0x0000 Wait 0x001e _0807E778 0x0002 diff --git a/data/scripts/script_080099DC.inc b/data/scripts/script_080099DC.inc index e55f9999..9c526d16 100644 --- a/data/scripts/script_080099DC.inc +++ b/data/scripts/script_080099DC.inc @@ -9,14 +9,14 @@ SCRIPT_START script_080099DC DoPostScriptAction 0x0007 _0807EDD4 0x0068, 0x0060 Wait 0x000f - TextboxNoOverlapFollow 0x1001 - _0807EA94 + MessageFromTarget 0x1001 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 DoPostScriptAction 0x0001 - TextboxNoOverlapFollow 0x1003 - _0807EA94 + MessageFromTarget 0x1003 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000008 SCRIPT_END diff --git a/data/scripts/script_08009B30.inc b/data/scripts/script_08009B30.inc index cfca6b8a..7217bf9b 100644 --- a/data/scripts/script_08009B30.inc +++ b/data/scripts/script_08009B30.inc @@ -6,8 +6,8 @@ SCRIPT_START script_08009B30 EndBlock WaitFor_2 Wait 0x001e - TextboxNoOverlapFollow 0x1005 - _0807EA94 + MessageFromTarget 0x1005 + _0807EA94 Wait 0x003c Call sub_0807529C Wait 0x003c diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc index 718c99d0..8bc7cabe 100644 --- a/data/scripts/script_08009B78.inc +++ b/data/scripts/script_08009B78.inc @@ -18,16 +18,16 @@ SCRIPT_START script_08009B78 DoPostScriptAction 0x0000 Wait 0x000f DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1009, 0x0000 - _0807E8E4_1 - _0807EA94 + MessageFromTargetPos 0x1009, 0x0000 + _0807E8E4_1 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807EB8C DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x100b, 0x0000 - _0807EA94 + MessageFromTargetPos 0x100b, 0x0000 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000008 @@ -45,8 +45,8 @@ SCRIPT_START script_08009B78 WaitPlayerAction8 _0807E8E4_1 DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x100c, 0x0000 - _0807EA94 + MessageFromTargetPos 0x100c, 0x0000 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000004 script_08009C4C: @@ -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 0737d769..2b81699f 100644 --- a/data/scripts/script_08009C68.inc +++ b/data/scripts/script_08009C68.inc @@ -13,8 +13,8 @@ SCRIPT_START script_08009C68 _0807EB74 _0807EB8C DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x100a, 0x0000 - _0807EA94 + MessageFromTargetPos 0x100a, 0x0000 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 @@ -22,8 +22,8 @@ SCRIPT_START script_08009C68 DoPostScriptAction 0x0001 _0807EB8C _0807EB44 0x0002 - TextboxNoOverlapFollowPos 0x100d, 0x0000 - _0807EA94 + MessageFromTargetPos 0x100d, 0x0000 + _0807EA94 DoPostScriptAction 0x0000 _0807EDD4 0x0028, 0x0060 _0807EDD4 0x0000, 0x0060 diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc index 84295d14..98e1691e 100644 --- a/data/scripts/script_08009F14.inc +++ b/data/scripts/script_08009F14.inc @@ -21,8 +21,8 @@ script_08009F36: StartPlayerScript script_0800A088 WaitForSomething2 0x00000002 Call sub_0806014C - TextboxNoOverlapFollowPos 0x1f01, 0x0000 - _0807EA94 + MessageFromTargetPos 0x1f01, 0x0000 + _0807EA94 Wait 0x001e _0807F034 0x0065 WaitPlayerAction8 @@ -62,11 +62,11 @@ script_08009FDC: Call sub_08060158 CheckEntityInteractType JumpIfNot script_08009FDC - EndBlock - _0807E864 - TextboxNoOverlap 0x1f0e - _0807EA94 - _0807E3E8 + EndBlock + _0807E864 + MessageNoOverlap 0x1f0e + _0807EA94 + _0807E3E8 JumpIf script_0800A002 _0807E878 Jump script_08009FDC @@ -76,9 +76,9 @@ script_0800A002: Call sub_08060318 WaitPlayerAction8 Wait 0x0008 - _0807EB8C - TextboxNoOverlapFollow 0x1f13 - _0807EA94 + _0807EB8C + MessageFromTarget 0x1f13 + _0807EA94 SetLocalFlag 0x00b0 _0807E878 script_0800A024: @@ -91,16 +91,16 @@ script_0800A024: _0807E864 CheckInventory1 0x0008 JumpIf script_0800A052 - TextboxNoOverlap 0x1f14 - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x1f14 + _0807EA94 + _0807E3E8 JumpIf script_0800A002 _0807E878 Jump script_0800A024 script_0800A052: - TextboxNoOverlap 0x1f11 - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x1f11 + _0807EA94 + _0807E3E8 JumpIf script_0800A064 _0807E878 Jump script_0800A024 @@ -110,9 +110,9 @@ script_0800A064: Call sub_08060318 WaitPlayerAction8 Wait 0x0008 - _0807EB8C - TextboxNoOverlapFollow 0x1f10 - _0807EA94 - _0807E878 + _0807EB8C + MessageFromTarget 0x1f10 + _0807EA94 + _0807E878 Jump script_0800A024 .2byte 0x0000 diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc index 27f9114e..ee3b8650 100644 --- a/data/scripts/script_0800A1D8.inc +++ b/data/scripts/script_0800A1D8.inc @@ -12,8 +12,8 @@ SCRIPT_START script_0800A1D8 WaitForSomething2 0x00000001 _0807E5F8 0x00000004 WaitForSomething2 0x00000080 - TextboxNoOverlapFollowPos 0x1659, 0x0000 - _0807EA94 + MessageFromTargetPos 0x1659, 0x0000 + _0807EA94 Wait 0x003c _0807E5F8 0x00000010 WaitForSomething2 0x00000200 @@ -27,11 +27,11 @@ SCRIPT_START script_0800A1D8 _0807E5F8 0x00000004 Call sub_0807F3F8 WaitForSomething2 0x00000080 - TextboxNoOverlapFollowPos 0x165a, 0x000e - _0807EA94 + MessageFromTargetPos 0x165a, 0x000e + _0807EA94 Wait 0x003c - TextboxNoOverlapFollowPos 0x165b, 0x000e - _0807EA94 + MessageFromTargetPos 0x165b, 0x000e + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000040 _0807E5F8 0x00000008 @@ -45,11 +45,11 @@ SCRIPT_START script_0800A1D8 WaitForSomething2 0x00000100 _0807E5F8 0x00000006 WaitForSomething2 0x000000c0 - TextboxNoOverlapFollowPos 0x165c, 0x000e - _0807EA94 + MessageFromTargetPos 0x165c, 0x000e + _0807EA94 StopBgm - TextboxNoOverlapFollowPos 0x165d, 0x000e - _0807EA94 + MessageFromTargetPos 0x165d, 0x000e + _0807EA94 _0807E5F8 0x00000006 WaitForSomething2 0x000000c0 _0807E5F8 0x00000006 diff --git a/data/scripts/script_0800AB08.inc b/data/scripts/script_0800AB08.inc index 284bd514..98fa305e 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 - _0807EA94 - TextboxNoOverlapFollowPos 0x165e, 0x000e - _0807EA94 + MessageFromTargetPos 0x1664, 0x0000 + _0807EA94 + MessageFromTargetPos 0x165e, 0x000e + _0807EA94 CallWithArg CreateManager36, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0800AB6E.inc b/data/scripts/script_0800AB6E.inc index a0623913..80fa03e7 100644 --- a/data/scripts/script_0800AB6E.inc +++ b/data/scripts/script_0800AB6E.inc @@ -13,16 +13,16 @@ SCRIPT_START script_0800AB6E Wait 0x003c _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x165f, 0x000e - _0807EA94 + MessageFromTargetPos 0x165f, 0x000e + _0807EA94 StartPlayerScript script_0800ACBC WaitForSomething2 0x00000001 - TextboxNoOverlapFollowPos 0x1660, 0x000e - _0807EA94 + MessageFromTargetPos 0x1660, 0x000e + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x1661, 0x000e - _0807EA94 + MessageFromTargetPos 0x1661, 0x000e + _0807EA94 _0807E5F8 0x00000008 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -32,10 +32,10 @@ SCRIPT_START script_0800AB6E StartPlayerScript script_0800ACE0 WaitForSomething2 0x00000001 Wait 0x003c - TextboxNoOverlapFollowPos 0x1662, 0x000e - _0807EA94 - TextboxNoOverlapFollowPos 0x1663, 0x000e - _0807EA94 + MessageFromTargetPos 0x1662, 0x000e + _0807EA94 + MessageFromTargetPos 0x1663, 0x000e + _0807EA94 SetEntityPosition 0x0000, 0xffe0 Call sub_0807F5C0 _0807E5F8 0x00000002 @@ -45,8 +45,8 @@ SCRIPT_START script_0800AB6E StartPlayerScript script_0800AD54 WaitForSomething2 0x00000001 Wait 0x003c - TextboxNoOverlapFollowPos 0x1665, 0x000e - _0807EA94 + MessageFromTargetPos 0x1665, 0x000e + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Wait 0x0078 diff --git a/data/scripts/script_0800B00C.inc b/data/scripts/script_0800B00C.inc index 1f0482f5..58c12fe8 100644 --- a/data/scripts/script_0800B00C.inc +++ b/data/scripts/script_0800B00C.inc @@ -14,8 +14,8 @@ script_0800B024: JumpIf script_0800B082 CheckGlobalFlag 0x0053 JumpIf script_0800B064 - TextboxNoOverlap 0x3f32 - _0807EA94 + MessageNoOverlap 0x3f32 + _0807EA94 DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c @@ -24,8 +24,8 @@ script_0800B024: SetGlobalFlag 0x0053 Jump script_0800B09C script_0800B064: - TextboxNoOverlap 0x3f32 - _0807EA94 + MessageNoOverlap 0x3f32 + _0807EA94 DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c @@ -33,8 +33,8 @@ script_0800B064: _0807EA94 Jump script_0800B09C script_0800B082: - TextboxNoOverlap 0x3f32 - _0807EA94 + MessageNoOverlap 0x3f32 + _0807EA94 DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc index abcdb975..e17cead1 100644 --- a/data/scripts/script_0800B41C.inc +++ b/data/scripts/script_0800B41C.inc @@ -17,10 +17,10 @@ SCRIPT_START script_0800B41C Wait 0x003c PlaySound SFX_TASK_COMPLETE _0807F088 0x0037 - WaitPlayerAction8 - _0807EB8C - TextboxNoOverlapFollow 0x200c - _0807EA94 + WaitPlayerAction8 + _0807EB8C + MessageFromTarget 0x200c + _0807EA94 Wait 0x0014 _0807EDD4 0x0158, 0x0290 Wait 0x000a diff --git a/data/scripts/script_0800B4AC.inc b/data/scripts/script_0800B4AC.inc index d4eca1cb..29239a02 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,8 +28,8 @@ script_0800B4F0: _0807EDD4 0x0134, 0x0288 _0807EB44 0x0004 WaitForSomething2 0x00000008 - TextboxNoOverlapFollow 0x2016 - _0807EA94 + MessageFromTarget 0x2016 + _0807EA94 _0807EDD4 0x0158, 0x0288 DoPostScriptAction 0x0000 _0807EB44 0x0000 diff --git a/data/scripts/script_0800B5EC.inc b/data/scripts/script_0800B5EC.inc index 9bc039db..6c55593b 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 - _0807EA94 - _0807E878 + _0807E864 + _0807EB74 + MessageNoOverlap 0x2009 + _0807EA94 + _0807E878 _0807EB44 0x0004 Jump script_0800B5FA SCRIPT_START script_0800B614 @@ -29,20 +29,20 @@ script_0800B618: WaitForSomething2 0x00000004 CheckLocalFlag 0x009e JumpIf script_0800B7A2 - TextboxNoOverlap 0x0583 - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x0583 + _0807EA94 + _0807E3E8 JumpIfNot script_0800B684 Wait 0x000f - TextboxNoOverlap 0x0584 + MessageNoOverlap 0x0584 CallWithArg sub_0807F970, 0x0000058b JumpIf script_0800B68E CallWithArg sub_08087424, 0x00000000 Wait 0x00b4 Jump script_0800B6A6 script_0800B684: - TextboxNoOverlap 0x057d - _0807EA94 + MessageNoOverlap 0x057d + _0807EA94 Jump script_0800B6A6 script_0800B68E: _0807EA94 @@ -52,8 +52,8 @@ script_0800B698: WaitPlayerAction8 _0807EB8C Wait 0x001e - TextboxNoOverlap 0x057f - _0807EA94 + MessageNoOverlap 0x057f + _0807EA94 script_0800B6A6: _0807E778 0x0004 DoFade7 diff --git a/data/scripts/script_0800B6C8.inc b/data/scripts/script_0800B6C8.inc index aa5ffd6e..c2e0c56c 100644 --- a/data/scripts/script_0800B6C8.inc +++ b/data/scripts/script_0800B6C8.inc @@ -16,8 +16,8 @@ script_0800B6D4: WaitForSomething2 0x00000004 CheckLocalFlag 0x009f JumpIf script_0800B7A2 - TextboxNoOverlap 0x057b - _0807EA94 + MessageNoOverlap 0x057b + _0807EA94 CallWithArg sub_0807F970, 0x0000057d JumpIf script_0800B6A6 _0807EA94 @@ -41,8 +41,8 @@ script_0800B734: WaitForSomething2 0x00000004 CheckLocalFlag 0x00a0 JumpIf script_0800B7A2 - TextboxNoOverlap 0x0580 - _0807EA94 + MessageNoOverlap 0x0580 + _0807EA94 CallWithArg sub_0807F970, 0x00000582 JumpIf script_0800B794 CallWithArg sub_08087424, 0x00000001 @@ -54,15 +54,15 @@ script_0800B794: _0807F034 0x0065 Jump script_0800B698 script_0800B7A2: - TextboxNoOverlap 0x0590 - _0807EA94 + MessageNoOverlap 0x0590 + _0807EA94 _0807E778 0x0010 DoFade7 WaitFor_2 ModHealth 0x00a0 - DoFade6 - WaitFor_2 - TextboxNoOverlap 0x057f - _0807EA94 + DoFade6 + WaitFor_2 + MessageNoOverlap 0x057f + _0807EA94 Jump script_0800B6A6 .2byte 0x0000 diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc index 37f795e2..5c17fb53 100644 --- a/data/scripts/script_0800B828.inc +++ b/data/scripts/script_0800B828.inc @@ -5,10 +5,10 @@ SCRIPT_START script_0800B828 DoPostScriptAction 0x000a EndBlock script_0800B836: - _0807E944 - _0807E864 - TextboxNoOverlapFollow 0x0a01 - _0807EA94 + _0807E944 + _0807E864 + MessageFromTarget 0x0a01 + _0807EA94 Wait 0x000f _0807E878 Jump script_0800B836 @@ -42,10 +42,10 @@ script_0800B87E: script_0800B89E: CheckEntityInteractType JumpIfNot script_0800B89E - _0807E864 - _0807EB74 - TextboxNoOverlapFollow 0x0a01 - _0807EA94 + _0807E864 + _0807EB74 + MessageFromTarget 0x0a01 + _0807EA94 Wait 0x000f _0807E878 Jump script_0800B89E @@ -91,21 +91,21 @@ SCRIPT_START script_0800B91C script_0800B934: CheckEntityInteractType JumpIfNot script_0800B934 - _0807E864 - _0807EB74 - TextboxNoOverlapFollow 0x3f19 - _0807EA94 + _0807E864 + _0807EB74 + MessageFromTarget 0x3f19 + _0807EA94 SetLocalFlag 0x005f _0807E878 Jump script_0800B934 script_0800B94E: CheckEntityInteractType JumpIfNot script_0800B94E - _0807E864 - _0807EB74 - TextboxNoOverlapFollow 0x3f1a - _0807EA94 - _0807E878 + _0807E864 + _0807EB74 + MessageFromTarget 0x3f1a + _0807EA94 + _0807E878 Jump script_0800B94E SCRIPT_START script_0800B964 BeginBlock diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc index 36547a00..9448c48a 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 - _0807EA94 - _0807E3E8 + MessageFromTarget 0x3301 + _0807EA94 + _0807E3E8 JumpIfNot script_0800BA6C StopBgm Call sub_0806E964 @@ -77,8 +77,8 @@ script_0800BA8E: Wait 0x001e _0807EDD4 0x02f0, 0x0350 Wait 0x001e - TextboxNoOverlap 0x0e00 - _0807EA94 + MessageNoOverlap 0x0e00 + _0807EA94 Wait 0x0078 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BACC.inc b/data/scripts/script_0800BACC.inc index a7536962..3eb79b27 100644 --- a/data/scripts/script_0800BACC.inc +++ b/data/scripts/script_0800BACC.inc @@ -9,8 +9,8 @@ script_0800BADE: JumpIfNot script_0800BADE DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e01 - _0807EA94 + MessageNoOverlap 0x0e01 + _0807EA94 Wait 0x0078 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BB00.inc b/data/scripts/script_0800BB00.inc index 57f1ebc3..a35881e1 100644 --- a/data/scripts/script_0800BB00.inc +++ b/data/scripts/script_0800BB00.inc @@ -6,8 +6,8 @@ script_0800BB04: JumpIfNot script_0800BB04 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e02 - _0807EA94 + MessageNoOverlap 0x0e02 + _0807EA94 Wait 0x003c DoPostScriptAction 0x000f Wait 0x00b4 diff --git a/data/scripts/script_0800BB30.inc b/data/scripts/script_0800BB30.inc index f45cc966..1e96d74a 100644 --- a/data/scripts/script_0800BB30.inc +++ b/data/scripts/script_0800BB30.inc @@ -9,8 +9,8 @@ script_0800BB42: JumpIfNot script_0800BB42 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e05 - _0807EA94 + MessageNoOverlap 0x0e05 + _0807EA94 Wait 0x0078 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BB64.inc b/data/scripts/script_0800BB64.inc index e0e57a4a..ba26abd0 100644 --- a/data/scripts/script_0800BB64.inc +++ b/data/scripts/script_0800BB64.inc @@ -10,8 +10,8 @@ script_0800BB7A: JumpIfNot script_0800BB7A _0807EDD4 0x03a0, 0x00f8 Wait 0x001e - TextboxNoOverlap 0x0e06 - _0807EA94 + MessageNoOverlap 0x0e06 + _0807EA94 Wait 0x000f _0807EDD4 0x0380, 0x00f8 Call sub_08054968 diff --git a/data/scripts/script_0800BBA4.inc b/data/scripts/script_0800BBA4.inc index 2a6f3f19..27d24a2e 100644 --- a/data/scripts/script_0800BBA4.inc +++ b/data/scripts/script_0800BBA4.inc @@ -10,8 +10,8 @@ script_0800BBBA: JumpIfNot script_0800BBBA DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e04 - _0807EA94 + MessageNoOverlap 0x0e04 + _0807EA94 Wait 0x0078 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BBDC.inc b/data/scripts/script_0800BBDC.inc index 40e3f7a9..12c615e9 100644 --- a/data/scripts/script_0800BBDC.inc +++ b/data/scripts/script_0800BBDC.inc @@ -7,8 +7,8 @@ script_0800BBE4: JumpIfNot script_0800BBE4 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e03 - _0807EA94 + MessageNoOverlap 0x0e03 + _0807EA94 Wait 0x0078 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BC08.inc b/data/scripts/script_0800BC08.inc index 165bc66e..8da602bf 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 - _0807EA94 - BeginBlock + MessageNoOverlap 0x0e07 + _0807EA94 + BeginBlock _0807EB44 0x0000 _0807E930 0x0004 EndBlock diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc index 1d947843..b5c20051 100644 --- a/data/scripts/script_0800BC50.inc +++ b/data/scripts/script_0800BC50.inc @@ -11,8 +11,8 @@ script_0800BC62: Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e08 - _0807EA94 + MessageNoOverlap 0x0e08 + _0807EA94 DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00f0 @@ -25,8 +25,8 @@ script_0800BC62: Wait 0x003c DoPostScriptAction 0x000c Wait 0x003c - TextboxNoOverlap 0x0e09 - _0807EA94 + MessageNoOverlap 0x0e09 + _0807EA94 Call sub_0807F158 CallWithArg sub_0807F4F8, 0x0000035c Wait 0x001e diff --git a/data/scripts/script_0800BCE8.inc b/data/scripts/script_0800BCE8.inc index 363c0f86..f27d63b6 100644 --- a/data/scripts/script_0800BCE8.inc +++ b/data/scripts/script_0800BCE8.inc @@ -8,8 +8,8 @@ SCRIPT_START script_0800BCE8 Wait 0x00f0 _0807E930 0x0000 Wait 0x003c - TextboxNoOverlap 0x0e0a - _0807EA94 + MessageNoOverlap 0x0e0a + _0807EA94 _0807E930 0x0008 Wait 0x003c _0807E5F8 0x00000001 @@ -21,8 +21,8 @@ script_0800BD1C: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e0c - _0807EA94 + MessageNoOverlap 0x0e0c + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 DoPostScriptAction 0x000f diff --git a/data/scripts/script_0800BD78.inc b/data/scripts/script_0800BD78.inc index 95cf6780..023678b8 100644 --- a/data/scripts/script_0800BD78.inc +++ b/data/scripts/script_0800BD78.inc @@ -10,8 +10,8 @@ SCRIPT_START script_0800BD78 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000270 Wait 0x001e - TextboxNoOverlap 0x0e0b - _0807EA94 + MessageNoOverlap 0x0e0b + _0807EA94 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800BE1C.inc b/data/scripts/script_0800BE1C.inc index db96e9f7..7bc53d08 100644 --- a/data/scripts/script_0800BE1C.inc +++ b/data/scripts/script_0800BE1C.inc @@ -9,8 +9,8 @@ SCRIPT_START script_0800BE1C _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c - TextboxNoOverlap 0x0e0d - _0807EA94 + MessageNoOverlap 0x0e0d + _0807EA94 _0807E930 0x0008 Wait 0x003c Jump script_0800BE88 @@ -40,8 +40,8 @@ script_0800BE8C: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e0f - _0807EA94 + MessageNoOverlap 0x0e0f + _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f diff --git a/data/scripts/script_0800BECC.inc b/data/scripts/script_0800BECC.inc index a43f732a..98969897 100644 --- a/data/scripts/script_0800BECC.inc +++ b/data/scripts/script_0800BECC.inc @@ -10,8 +10,8 @@ SCRIPT_START script_0800BECC DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e - TextboxNoOverlap 0x0e0e - _0807EA94 + MessageNoOverlap 0x0e0e + _0807EA94 _0807E5F8 0x0000000c WaitForSomething2 0x00000002 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc index 3bae9d7c..fdf7faef 100644 --- a/data/scripts/script_0800BF38.inc +++ b/data/scripts/script_0800BF38.inc @@ -9,8 +9,8 @@ SCRIPT_START script_0800BF38 _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c - TextboxNoOverlap 0x0e10 - _0807EA94 + MessageNoOverlap 0x0e10 + _0807EA94 _0807E930 0x0008 Wait 0x003c Jump script_0800BFA4 @@ -40,8 +40,8 @@ script_0800BFA8: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e12 - _0807EA94 + MessageNoOverlap 0x0e12 + _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f diff --git a/data/scripts/script_0800C004.inc b/data/scripts/script_0800C004.inc index 80cf2923..1a581e15 100644 --- a/data/scripts/script_0800C004.inc +++ b/data/scripts/script_0800C004.inc @@ -10,8 +10,8 @@ SCRIPT_START script_0800C004 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e - TextboxNoOverlap 0x0e11 - _0807EA94 + MessageNoOverlap 0x0e11 + _0807EA94 _0807E5F8 0x0000001c WaitForSomething2 0x00000002 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800C0B0.inc b/data/scripts/script_0800C0B0.inc index 162aff86..69b49329 100644 --- a/data/scripts/script_0800C0B0.inc +++ b/data/scripts/script_0800C0B0.inc @@ -9,8 +9,8 @@ SCRIPT_START script_0800C0B0 _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c - TextboxNoOverlap 0x0e13 - _0807EA94 + MessageNoOverlap 0x0e13 + _0807EA94 _0807E930 0x0008 Wait 0x003c Jump script_0800C11C @@ -40,8 +40,8 @@ script_0800C120: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e15 - _0807EA94 + MessageNoOverlap 0x0e15 + _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f diff --git a/data/scripts/script_0800C160.inc b/data/scripts/script_0800C160.inc index 686aed8f..de972fbe 100644 --- a/data/scripts/script_0800C160.inc +++ b/data/scripts/script_0800C160.inc @@ -10,8 +10,8 @@ SCRIPT_START script_0800C160 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e - TextboxNoOverlap 0x0e14 - _0807EA94 + MessageNoOverlap 0x0e14 + _0807EA94 _0807E5F8 0x0000003c WaitForSomething2 0x00000002 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc index 59e04df4..d8987f9a 100644 --- a/data/scripts/script_0800C1D8.inc +++ b/data/scripts/script_0800C1D8.inc @@ -9,8 +9,8 @@ SCRIPT_START script_0800C1D8 _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c - TextboxNoOverlap 0x0e16 - _0807EA94 + MessageNoOverlap 0x0e16 + _0807EA94 _0807E930 0x0008 Wait 0x003c Jump script_0800C244 @@ -40,8 +40,8 @@ script_0800C248: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e18 - _0807EA94 + MessageNoOverlap 0x0e18 + _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f diff --git a/data/scripts/script_0800C2A4.inc b/data/scripts/script_0800C2A4.inc index 3816afe8..01484265 100644 --- a/data/scripts/script_0800C2A4.inc +++ b/data/scripts/script_0800C2A4.inc @@ -10,8 +10,8 @@ SCRIPT_START script_0800C2A4 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e - TextboxNoOverlap 0x0e17 - _0807EA94 + MessageNoOverlap 0x0e17 + _0807EA94 _0807E5F8 0x0000007c WaitForSomething2 0x00000002 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800C370.inc b/data/scripts/script_0800C370.inc index 6bd48e6e..da292797 100644 --- a/data/scripts/script_0800C370.inc +++ b/data/scripts/script_0800C370.inc @@ -6,8 +6,8 @@ SCRIPT_START script_0800C370 _0807EEF4 0xfff8, 0x0000 _0807F0C8 0x0000, 0x0000 Wait 0x001e - TextboxNoOverlap 0x1d00 - _0807EA94 + MessageNoOverlap 0x1d00 + _0807EA94 _0807E5F8 0x00000006 WaitForSomething2 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc index 05e0d753..880ad576 100644 --- a/data/scripts/script_0800C550.inc +++ b/data/scripts/script_0800C550.inc @@ -37,7 +37,7 @@ script_0800C5A6: Call sub_08060208 Jump script_0800C5C0 script_0800C5BC: - TextboxNoOverlap 0x4710 + MessageNoOverlap 0x4710 script_0800C5C0: _0807EA94 _0807E878 @@ -111,8 +111,8 @@ script_0800C684: CheckInventory1 0x005b JumpIf script_0800C6B6 DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f16 - _0807EA94 + MessageFromTarget 0x1f16 + _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a SetLocalFlag 0x0080 @@ -123,8 +123,8 @@ script_0800C6B6: CheckLocalFlag 0x0081 JumpIf script_0800C6DC DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f1b - _0807EA94 + MessageFromTarget 0x1f1b + _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 @@ -134,8 +134,8 @@ script_0800C6DC: CheckLocalFlag 0x0082 JumpIf script_0800C712 DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f17 - _0807EA94 + MessageFromTarget 0x1f17 + _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a _0807EB44 0x0002 @@ -147,8 +147,8 @@ script_0800C6DC: SetLocalFlag 0x0082 script_0800C712: DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f18 - _0807EA94 + MessageFromTarget 0x1f18 + _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 @@ -158,8 +158,8 @@ script_0800C730: CheckLocalFlag 0x0083 JumpIf script_0800C756 DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f19 - _0807EA94 + MessageFromTarget 0x1f19 + _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 @@ -167,8 +167,8 @@ script_0800C730: Jump script_0800C652 script_0800C756: DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f1a - _0807EA94 + MessageFromTarget 0x1f1a + _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 @@ -190,8 +190,8 @@ script_0800C780: CheckInventory1 0x005b JumpIf script_0800C7C0 _0807E930 0x0008 - TextboxNoOverlapFollow 0x2122 - _0807EA94 + MessageFromTarget 0x2122 + _0807EA94 DoPostScriptAction 0x0000 Call sub_0807DF50 _0807E878 @@ -200,17 +200,17 @@ script_0800C7C0: _0807E930 0x0008 CheckLocalFlag 0x0081 JumpIf script_0800C80A - TextboxNoOverlapFollow 0x1130 - _0807EA94 + MessageFromTarget 0x1130 + _0807EA94 _0807EB28 0x1131 - _0807EA94 - _0807EB8C - TextboxNoOverlapFollow 0x1132 - _0807EA94 + _0807EA94 + _0807EB8C + MessageFromTarget 0x1132 + _0807EA94 SetIntVariable 0x00000103 Call sub_0807F420 - TextboxNoOverlapFollow 0x1133 - _0807EA94 + MessageFromTarget 0x1133 + _0807EA94 Wait 0x000a DoPostScriptAction 0x0000 SetLocalFlag 0x0081 @@ -218,8 +218,8 @@ script_0800C7C0: _0807E878 Jump script_0800C780 script_0800C80A: - TextboxNoOverlapFollow 0x1133 - _0807EA94 + MessageFromTarget 0x1133 + _0807EA94 Wait 0x000a _0807E930 0x0000 Call sub_0807DF50 @@ -229,8 +229,8 @@ script_0800C824: _0807E930 0x0008 CheckLocalFlag 0x0083 JumpIf script_0800C8AE - TextboxNoOverlapFollow 0x1135 - _0807EA94 + MessageFromTarget 0x1135 + _0807EA94 SetEntitySpeed 0x0040 _0807EDD4 0x0038, 0x0044 DoPostScriptAction 0x0000 @@ -239,10 +239,10 @@ script_0800C824: Wait 0x003c PlaySound SFX_SECRET Wait 0x003c - _0807EB74 - _0807EB8C - TextboxNoOverlapFollow 0x1136 - _0807EA94 + _0807EB74 + _0807EB8C + MessageFromTarget 0x1136 + _0807EA94 _0807EB28 0x1137 _0807EA94 Wait 0x000a @@ -257,16 +257,16 @@ script_0800C87C: _0807EB74 SetIntVariable 0x00000008 Call sub_0807F3D8 - TextboxNoOverlapFollow 0x1136 - _0807EA94 + MessageFromTarget 0x1136 + _0807EA94 Wait 0x000a DoPostScriptAction 0x0000 Call sub_0807DF50 _0807E878 Jump script_0800C87C script_0800C8AE: - TextboxNoOverlapFollow 0x1136 - _0807EA94 + MessageFromTarget 0x1136 + _0807EA94 Wait 0x000a DoPostScriptAction 0x0000 Call sub_0807DF50 diff --git a/data/scripts/script_0800C91C.inc b/data/scripts/script_0800C91C.inc index 54ab0f85..65d16b14 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 _0807EA94 _0807E5F8 0x00000200 @@ -54,14 +54,14 @@ script_0800C928: WaitForSomething2 0x00040000 _0807E5F8 0x00008000 WaitForSomething2 0x00010000 - _0807E8E4_3 - TextboxNoOverlapFollow 0x1127 - _0807EA94 + _0807E8E4_3 + MessageFromTarget 0x1127 + _0807EA94 _0807E5F8 0x00002000 WaitForSomething2 0x00004000 - _0807E8E4_1 - TextboxNoOverlapFollow 0x1128 - _0807EA94 + _0807E8E4_1 + MessageFromTarget 0x1128 + _0807EA94 _0807E5F8 0x00000200 _0807E5F8 0x00000800 _0807E5F8 0x00002000 diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc index b5e9bc5c..c2a19374 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 - _0807EA94 + MessageNoOverlap 0x213e + _0807EA94 _0807E48C 0x0023 JumpIfNot script_0800CE14 - TextboxNoOverlap 0x214b - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x214b + _0807EA94 + _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 - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x214b + _0807EA94 + _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 - _0807EA94 + MessageNoOverlap 0x2142 + _0807EA94 _0807E48C 0x0027 JumpIfNot script_0800CF40 - TextboxNoOverlap 0x214c - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x214c + _0807EA94 + _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 - _0807EA94 + MessageNoOverlap 0x2146 + _0807EA94 _0807E48C 0x0024 JumpIfNot script_0800CF40 - TextboxNoOverlap 0x214d - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x214d + _0807EA94 + _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: _0807EA94 Call sub_0807DF50 @@ -132,13 +132,13 @@ script_0800CF20: _0807E864 Call sub_0807DF28 script_0800CF2A: - TextboxNoOverlap 0x2140 - _0807EA94 + MessageNoOverlap 0x2140 + _0807EA94 Call sub_0807DF50 _0807E878 Jump script_0800CF0C script_0800CF3C: - TextboxNoOverlap 0x214a + MessageNoOverlap 0x214a script_0800CF40: _0807EA94 Call sub_0807DF50 @@ -215,7 +215,7 @@ script_0800CFFA: _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 - TextboxNoOverlap 0x1219 + MessageNoOverlap 0x1219 Jump script_0800D17C script_0800D032: CheckInventory1 0x0041 @@ -225,8 +225,8 @@ script_0800D032: _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 - TextboxNoOverlapFollowPos 0x125c, 0x0002 - _0807EA94 + MessageFromTargetPos 0x125c, 0x0002 + _0807EA94 StartPlayerScript script_0800D1B4 WaitForSomething2 0x00000008 _0807EB44 0x0002 @@ -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,8 +253,8 @@ script_0800D0A8: _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 - TextboxNoOverlapFollowPos 0x123d, 0x0002 - _0807EA94 + MessageFromTargetPos 0x123d, 0x0002 + _0807EA94 StartPlayerScript script_0800D1B4 WaitForSomething2 0x00000008 _0807EB44 0x0002 @@ -268,8 +268,8 @@ script_0800D108: PlaySound SFX_F8 _0807E5F8 0x00000010 SetLocalFlag 0x007e - TextboxNoOverlapFollowPos 0x123e, 0x0002 - _0807EA94 + MessageFromTargetPos 0x123e, 0x0002 + _0807EA94 Wait 0x000f _0807E930 0x0009 _0807E5F8 0x00000002 @@ -277,8 +277,8 @@ script_0800D108: _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Wait 0x001e - TextboxNoOverlapFollowPos 0x123f, 0x0002 - _0807EA94 + MessageFromTargetPos 0x123f, 0x0002 + _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000004 _0807E5F8 0x00000001 diff --git a/data/scripts/script_0800D1E0.inc b/data/scripts/script_0800D1E0.inc index f923cce1..15b082e9 100644 --- a/data/scripts/script_0800D1E0.inc +++ b/data/scripts/script_0800D1E0.inc @@ -4,8 +4,8 @@ SCRIPT_START script_0800D1E0 PlaySound SFX_109 CallWithArg sub_0807F238, 0x000001e2 Call sub_0807F304 - TextboxNoOverlap 0x0502 - _0807EA94 + MessageNoOverlap 0x0502 + _0807EA94 _0807E5F8 0x00000008 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc index 35f525df..774708b7 100644 --- a/data/scripts/script_0800D278.inc +++ b/data/scripts/script_0800D278.inc @@ -62,8 +62,8 @@ script_0800D31E: _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 - TextboxNoOverlapFollow 0x1219 - _0807EA94 + MessageFromTarget 0x1219 + _0807EA94 Wait 0x000f _0807E878 Jump script_0800D31E diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc index 7f0ee12a..56f230fa 100644 --- a/data/scripts/script_0800D874.inc +++ b/data/scripts/script_0800D874.inc @@ -15,9 +15,9 @@ script_0800D88E: StartPlayerScript script_0800D92C WaitForSomething2 0x00000001 script_0800D8B0: - _0807E8E4_0 - TextboxNoOverlap 0x1324 - _0807EA94 + _0807E8E4_0 + MessageNoOverlap 0x1324 + _0807EA94 CheckInventory1 0x0017 JumpIf script_0800D8D6 CheckLocalFlag 0x0045 diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc index 0fa534e2..662df63e 100644 --- a/data/scripts/script_0800D954.inc +++ b/data/scripts/script_0800D954.inc @@ -17,12 +17,12 @@ script_0800D962: DoPostScriptAction 0x0007 PlaySound SFX_ELEMENT_FLOAT SetEntity0x20 0xffff8000 - TextboxNoOverlap 0x1701 - _0807EA94 + MessageNoOverlap 0x1701 + _0807EA94 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 - TextboxNoOverlap 0x1702 - _0807EA94 + MessageNoOverlap 0x1702 + _0807EA94 SetEntity0x20 0x00010000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/script_0800DA60.inc index 60e36513..6069f4b8 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 - _0807EA94 + MessageFromTargetPos 0x162d, 0x0002 + _0807EA94 _0807E5F8 0x00000001 Wait 0x001e - TextboxNoOverlapFollowPos 0x162e, 0x0002 - _0807EA94 - _0807E8E4_0 + MessageFromTargetPos 0x162e, 0x0002 + _0807EA94 + _0807E8E4_0 CallWithArg sub_0807F75C, 0x00780138 _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/script_0800DB78.inc b/data/scripts/script_0800DB78.inc index ed07cc92..090c75e6 100644 --- a/data/scripts/script_0800DB78.inc +++ b/data/scripts/script_0800DB78.inc @@ -34,8 +34,8 @@ script_0800DBCA: _0807E5F8 0x00000001 StartPlayerScript script_0800DE00 WaitForSomething2 0x00000006 - TextboxNoOverlapFollowPos 0x1643, 0x0002 - _0807EA94 + MessageFromTargetPos 0x1643, 0x0002 + _0807EA94 _0807EB28 0x1645 _0807EA94 Call sub_0807F3F8 diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc index ab64048a..1afd3357 100644 --- a/data/scripts/script_0800DF24.inc +++ b/data/scripts/script_0800DF24.inc @@ -19,8 +19,8 @@ SCRIPT_START script_0800DF24 Call sub_08066C94 Wait 0x00e9 DoPostScriptAction 0x0007 - TextboxNoOverlapFollowPos 0x162f, 0x0002 - _0807EA94 + MessageFromTargetPos 0x162f, 0x0002 + _0807EA94 PlayBgm BGM_VAATI_REBORN DoPostScriptAction 0x0019 PlaySound SFX_198 diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc index 9ab37ed5..1b159705 100644 --- a/data/scripts/script_0800DFE4.inc +++ b/data/scripts/script_0800DFE4.inc @@ -4,8 +4,8 @@ SCRIPT_START script_0800DFE4 _0807E864 EndBlock StopBgm - TextboxNoOverlapFollowPos 0x1632, 0x0002 - _0807EA94 + MessageFromTargetPos 0x1632, 0x0002 + _0807EA94 SetRoomFlag 0x0003 script_0800DFFE: CheckRoomFlag 0x0000 @@ -19,8 +19,8 @@ script_0800E012: _0807E864 Call sub_0807DF28 SetLocalFlag 0x007b - TextboxNoOverlapFollowPos 0x1639, 0x000c - _0807EA94 + MessageFromTargetPos 0x1639, 0x000c + _0807EA94 Wait 0x0096 PlaySound SFX_EVAPORATE CallWithArg sub_0806DA1C, 0x00000005 diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc index c1432caf..5451a2f8 100644 --- a/data/scripts/script_0800E0BC.inc +++ b/data/scripts/script_0800E0BC.inc @@ -27,8 +27,8 @@ script_0800E0DE: _0807EB8C _0807EB74 Wait 0x000a - TextboxNoOverlap 0x2402 - _0807EA94 + MessageNoOverlap 0x2402 + _0807EA94 SetLocalFlag 0x0093 script_0800E12E: Call sub_080668F0 @@ -37,10 +37,10 @@ script_0800E12E: script_0800E138: CheckEntityInteractType JumpIfNot script_0800E138 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x2402 - _0807EA94 + _0807E864 + _0807EB74 + MessageNoOverlap 0x2402 + _0807EA94 Wait 0x000f _0807E878 Jump script_0800E138 @@ -75,8 +75,8 @@ script_0800E176: _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 Wait 0x000a - TextboxNoOverlap 0x2401 - _0807EA94 + MessageNoOverlap 0x2401 + _0807EA94 SetLocalFlag 0x0094 script_0800E1D0: CallWithArg sub_0807F3D8, 0x00000000 @@ -89,9 +89,9 @@ script_0800E1E0: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2401 - _0807EA94 - _0807E878 + MessageNoOverlap 0x2401 + _0807EA94 + _0807E878 Jump script_0800E1E0 SCRIPT_START script_0800E200 BeginBlock @@ -167,10 +167,10 @@ script_0800E312: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - EndBlock - TextboxNoOverlap 0x2404 - _0807EA94 - _0807E878 + EndBlock + MessageNoOverlap 0x2404 + _0807EA94 + _0807E878 Jump script_0800E2AE script_0800E32E: CheckEntityInteractType @@ -178,9 +178,9 @@ script_0800E32E: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2403 - _0807EA94 - _0807E878 + MessageNoOverlap 0x2403 + _0807EA94 + _0807E878 Jump script_0800E32E .2byte 0x0000 SCRIPT_START script_0800E350 @@ -221,10 +221,10 @@ script_0800E3BE: script_0800E3C8: CheckEntityInteractType JumpIfNot script_0800E3C8 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x240c - _0807EA94 + _0807E864 + _0807EB74 + MessageNoOverlap 0x240c + _0807EA94 Wait 0x000f _0807F034 0x0053 WaitPlayerAction8 @@ -237,10 +237,10 @@ script_0800E3E8: script_0800E3EE: CheckEntityInteractType JumpIfNot script_0800E3EE - _0807E864 - _0807EB74 - TextboxNoOverlap 0x240d - _0807EA94 + _0807E864 + _0807EB74 + MessageNoOverlap 0x240d + _0807EA94 Wait 0x000f _0807E878 Jump script_0800E3EE @@ -253,10 +253,10 @@ SCRIPT_START script_0800E408 script_0800E41A: CheckEntityInteractType JumpIfNot script_0800E41A - _0807E864 - _0807EB74 - TextboxNoOverlap 0x2406 - _0807EA94 + _0807E864 + _0807EB74 + MessageNoOverlap 0x2406 + _0807EA94 Wait 0x000f _0807E878 Jump script_0800E41A @@ -273,9 +273,9 @@ script_0800E44C: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2405 - _0807EA94 - _0807E878 + MessageNoOverlap 0x2405 + _0807EA94 + _0807E878 Jump script_0800E44C SCRIPT_START script_0800E46C BeginBlock @@ -290,9 +290,9 @@ script_0800E484: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2407 - _0807EA94 - _0807E878 + MessageNoOverlap 0x2407 + _0807EA94 + _0807E878 Jump script_0800E484 @@ -327,11 +327,11 @@ script_0800E4B6: EndBlock Call sub_0807F3F8 Wait 0x003c - TextboxNoOverlapFollow 0x160c - _0807EA94 + MessageFromTarget 0x160c + _0807EA94 Wait 0x001e - TextboxNoOverlapFollow 0x160d - _0807EA94 + MessageFromTarget 0x160d + _0807EA94 Wait 0x001e _0807EB28 0x160e Wait 0x003c diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/script_0800E58C.inc index f01aa39a..1a6df15e 100644 --- a/data/scripts/script_0800E58C.inc +++ b/data/scripts/script_0800E58C.inc @@ -9,8 +9,8 @@ SCRIPT_START script_0800E58C Wait 0x003c PlaySound SFX_9B Wait 0x001e - TextboxNoOverlap 0x1625 - _0807EA94 + MessageNoOverlap 0x1625 + _0807EA94 Wait 0x003c Call sub_08053C84 SCRIPT_END diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc index 83cdc0f8..1828fe16 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 _0807EA94 @@ -155,7 +155,7 @@ script_0800E872: JumpIfNot script_0800E908 ModRupees 0xfe70 SetLocalFlag 0x0091 - TextboxNoOverlapFollow 0x4508 - _0807EA94 + MessageFromTarget 0x4508 + _0807EA94 Call sub_0806C578 SCRIPT_END diff --git a/data/scripts/script_0800E8A4.inc b/data/scripts/script_0800E8A4.inc index 5cffcef6..f9465a10 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 _0807EA94 @@ -8,7 +8,7 @@ SCRIPT_START script_0800E8A4 JumpIfNot script_0800E908 ModRupees 0xff38 SetLocalFlag 0x0091 - TextboxNoOverlapFollow 0x4508 - _0807EA94 + MessageFromTarget 0x4508 + _0807EA94 Call sub_0806C588 SCRIPT_END diff --git a/data/scripts/script_0800E8D6.inc b/data/scripts/script_0800E8D6.inc index cfa1d8ff..f5a7cd6c 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 _0807EA94 @@ -8,7 +8,7 @@ SCRIPT_START script_0800E8D6 JumpIfNot script_0800E908 ModRupees 0xffce SetLocalFlag 0x0091 - TextboxNoOverlapFollow 0x4508 - _0807EA94 + MessageFromTarget 0x4508 + _0807EA94 Call sub_0806C598 SCRIPT_END diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc index d0f8d043..24c3c825 100644 --- a/data/scripts/script_0800E908.inc +++ b/data/scripts/script_0800E908.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800E908 - TextboxNoOverlapFollow 0x4507 + MessageFromTarget 0x4507 Jump script_0800E914 script_0800E910: - TextboxNoOverlapFollow 0x4509 + MessageFromTarget 0x4509 script_0800E914: _0807EA94 _0807E878 @@ -50,20 +50,20 @@ script_0800E974: StartPlayerScript script_0800E9F4 WaitForSomething2 0x00000001 DoPostScriptAction 0x000a - TextboxNoOverlapFollow 0x4a24 - _0807EA94 + MessageFromTarget 0x4a24 + _0807EA94 _0807E930 0x000a Wait 0x0014 - TextboxNoOverlapFollow 0x4a25 - _0807EA94 + MessageFromTarget 0x4a25 + _0807EA94 _0807E930 0x0000 StartPlayerScript script_0800EA1C WaitForSomething2 0x00000001 SetLocalFlag 0x0074 PlaySound SFX_SECRET Wait 0x00f0 - TextboxNoOverlapFollow 0x4a26 - _0807EA94 + MessageFromTarget 0x4a26 + _0807EA94 SetLocalFlag 0x0075 script_0800E9E4: _0807EA94 diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc index 74afaf9f..12b58b6c 100644 --- a/data/scripts/script_0800EA54.inc +++ b/data/scripts/script_0800EA54.inc @@ -265,14 +265,14 @@ script_0800EDB6: JumpIf script_0800EE3E Wait 0x000a _0807E5F8 0x00000001 - TextboxNoOverlapFollow 0x4c07 - _0807EA94 + MessageFromTarget 0x4c07 + _0807EA94 _0807E5F8 0x00000010 - TextboxNoOverlapFollow 0x4c08 - _0807EA94 + MessageFromTarget 0x4c08 + _0807EA94 _0807E5F8 0x00000020 - TextboxNoOverlapFollow 0x4c09 - _0807EA94 + MessageFromTarget 0x4c09 + _0807EA94 SetIntVariable 0x00000503 Call sub_0807F420 _0807E5F8 0x00000040 @@ -290,8 +290,8 @@ script_0800EE12: WaitForSomething2 0x00000008 Jump script_0800ED98 script_0800EE3E: - TextboxNoOverlapFollow 0x4c16 - _0807EA94 + MessageFromTarget 0x4c16 + _0807EA94 Call sub_0807DF50 _0807E878 Jump script_0800ED98 @@ -316,14 +316,14 @@ script_0800EE76: JumpIf script_0800EEFE Wait 0x000a _0807E5F8 0x00000001 - TextboxNoOverlapFollow 0x4c07 - _0807EA94 + MessageFromTarget 0x4c07 + _0807EA94 _0807E5F8 0x00000002 - TextboxNoOverlapFollow 0x4c08 - _0807EA94 + MessageFromTarget 0x4c08 + _0807EA94 _0807E5F8 0x00000004 - TextboxNoOverlapFollow 0x4c09 - _0807EA94 + MessageFromTarget 0x4c09 + _0807EA94 SetIntVariable 0x00000503 Call sub_0807F420 _0807E5F8 0x00000008 @@ -341,20 +341,20 @@ script_0800EED2: WaitForSomething2 0x00000040 Jump script_0800EE58 script_0800EEFE: - TextboxNoOverlapFollow 0x4c15 - _0807EA94 + MessageFromTarget 0x4c15 + _0807EA94 Call sub_0807DF50 _0807E878 Jump script_0800EE58 - TextboxNoOverlapFollow 0x4c07 - _0807EA94 + MessageFromTarget 0x4c07 + _0807EA94 _0807E5F8 0x00000012 Wait 0x000a - TextboxNoOverlapFollow 0x4c08 - _0807EA94 + MessageFromTarget 0x4c08 + _0807EA94 _0807E5F8 0x00000024 - TextboxNoOverlapFollow 0x4c09 - _0807EA94 + MessageFromTarget 0x4c09 + _0807EA94 _0807E5F8 0x00000048 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800EF40.inc b/data/scripts/script_0800EF40.inc index e897f7e2..037fbfc6 100644 --- a/data/scripts/script_0800EF40.inc +++ b/data/scripts/script_0800EF40.inc @@ -10,8 +10,8 @@ script_0800EF50: _0807E864 CheckLocalFlagByOffset 0x0200, 0x006d JumpIf script_0800EF82 - TextboxNoOverlapFollow 0x4d01 - _0807EA94 + MessageFromTarget 0x4d01 + _0807EA94 StartPlayerScript script_0800EF9C WaitForSomething2 0x00000001 Wait 0x000f @@ -19,8 +19,8 @@ script_0800EF50: Jump script_0800EF50 script_0800EF82: SetGlobalFlag 0x001f - TextboxNoOverlapFollow 0x4d02 - _0807EA94 + MessageFromTarget 0x4d02 + _0807EA94 Wait 0x000f _0807E878 script_0800EF92: diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc index 76060064..77fdfb49 100644 --- a/data/scripts/script_0800EFC0.inc +++ b/data/scripts/script_0800EFC0.inc @@ -59,19 +59,19 @@ script_0800F09A: WaitForSomething2 0x00000001 _0807E5F8 0x0000001e WaitForSomething2 0x00000040 - TextboxNoOverlapFollowPos 0x1201, 0x000c - _0807EA94 + MessageFromTargetPos 0x1201, 0x000c + _0807EA94 WaitForSomething2 0x000003c0 - _0807E8E4_0 - TextboxNoOverlapFollowPos 0x1202, 0x000c - _0807EA94 + _0807E8E4_0 + MessageFromTargetPos 0x1202, 0x000c + _0807EA94 _0807F034 0x0067 WaitPlayerAction8 _0807E8E4_0 _0807E5F8 0x00000002 WaitForSomething2 0x00000040 - TextboxNoOverlapFollowPos 0x1203, 0x000c - _0807EA94 + MessageFromTargetPos 0x1203, 0x000c + _0807EA94 _0807E5F8 0x00000002 Call sub_0807DF50 _0807E878 diff --git a/data/scripts/script_0800F184.inc b/data/scripts/script_0800F184.inc index fc4cbc3f..36ca4f79 100644 --- a/data/scripts/script_0800F184.inc +++ b/data/scripts/script_0800F184.inc @@ -32,8 +32,8 @@ script_0800F1E6: _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlapFollowPos 0x1206, 0x000c - _0807EA94 + MessageFromTargetPos 0x1206, 0x000c + _0807EA94 StartPlayerScript script_0800F33C WaitForSomething2 0x00000400 _0807E878 @@ -48,8 +48,8 @@ script_0800F22A: _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlapFollowPos 0x1206, 0x000c - _0807EA94 + MessageFromTargetPos 0x1206, 0x000c + _0807EA94 StartPlayerScript script_0800F354 WaitForSomething2 0x00000400 _0807E878 @@ -64,8 +64,8 @@ script_0800F26A: _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlapFollowPos 0x1206, 0x000c - _0807EA94 + MessageFromTargetPos 0x1206, 0x000c + _0807EA94 StartPlayerScript script_0800F36C WaitForSomething2 0x00000400 _0807E878 @@ -80,8 +80,8 @@ script_0800F2AA: _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlapFollowPos 0x1206, 0x000c - _0807EA94 + MessageFromTargetPos 0x1206, 0x000c + _0807EA94 StartPlayerScript script_0800F384 WaitForSomething2 0x00000400 _0807E878 @@ -97,9 +97,9 @@ script_0800F2EA: _0807E864 _0807EB74 _0807E930 0x0008 - TextboxNoOverlapFollowPos 0x1208, 0x000c - _0807EA94 - _0807E878 + MessageFromTargetPos 0x1208, 0x000c + _0807EA94 + _0807E878 Jump script_0800F1E6 script_0800F314: EndBlock diff --git a/data/scripts/script_0800F39C.inc b/data/scripts/script_0800F39C.inc index e5f3f939..dda4ca39 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 - _0807EA94 - _0807E878 + EndBlock + _0807E864 + _0807EB74 + MessageNoOverlap 0x1237 + _0807EA94 + _0807E878 script_0800F402: TestBit 0x00000004 JumpIfNot script_0800F3EA diff --git a/data/scripts/script_0800F430.inc b/data/scripts/script_0800F430.inc index d66d02c1..acf631a4 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 - _0807EA94 - _0807E878 + EndBlock + _0807E864 + _0807EB74 + MessageNoOverlap 0x1238 + _0807EA94 + _0807E878 script_0800F490: TestBit 0x00000008 JumpIfNot script_0800F478 diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/script_0800F4C4.inc index edbecc19..99b156af 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 - _0807EA94 - _0807E878 + EndBlock + _0807E864 + _0807EB74 + MessageNoOverlap 0x1239 + _0807EA94 + _0807E878 script_0800F524: TestBit 0x00000010 JumpIfNot script_0800F50C diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc index 521ca3b4..0bd91b70 100644 --- a/data/scripts/script_0800F554.inc +++ b/data/scripts/script_0800F554.inc @@ -64,8 +64,8 @@ script_0800F604: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 - TextboxNoOverlap 0x2511 - _0807EA94 + MessageNoOverlap 0x2511 + _0807EA94 Wait 0x000f _0807E878 Jump script_0800F604 @@ -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: _0807EA94 Wait 0x000f diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc index 501b6814..8ea80527 100644 --- a/data/scripts/script_0800F724.inc +++ b/data/scripts/script_0800F724.inc @@ -54,8 +54,8 @@ SCRIPT_START script_0800F73C Call sub_0807F5C0 WaitForSomething2 0x00000001 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2501, 0x0000 - _0807EA94 + MessageFromTargetPos 0x2501, 0x0000 + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807F0B4 0x0004 @@ -70,8 +70,8 @@ SCRIPT_START script_0800F73C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2503, 0x000e - _0807EA94 + MessageFromTargetPos 0x2503, 0x000e + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Call sub_0807DF50 @@ -83,8 +83,8 @@ SCRIPT_START script_0800F73C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2504, 0x000e - _0807EA94 + MessageFromTargetPos 0x2504, 0x000e + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Call sub_0807DF50 @@ -96,8 +96,8 @@ SCRIPT_START script_0800F73C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2505, 0x000e - _0807EA94 + MessageFromTargetPos 0x2505, 0x000e + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Call sub_0807DF50 @@ -111,8 +111,8 @@ SCRIPT_START script_0800F73C _0807E8E4_0 Call sub_0807F3F8 Wait 0x003c - TextboxNoOverlapFollowPos 0x1021, 0x000e - _0807EA94 + MessageFromTargetPos 0x1021, 0x000e + _0807EA94 StartPlayerScript script_0800FAE4 SetEntityPositionRelative 0x00f0, 0x0258 _0807F0B4 0x0001 @@ -120,45 +120,45 @@ SCRIPT_START script_0800F73C Wait 0x001e Call sub_08063C2C WaitForSomething2 0x00000001 - TextboxNoOverlapFollowPos 0x1022, 0x000e - _0807EA94 - _0807E8E4_0 + MessageFromTargetPos 0x1022, 0x000e + _0807EA94 + _0807E8E4_0 Call sub_08063C14 Call sub_08094CDC Wait 0x001e - TextboxNoOverlapFollowPos 0x1023, 0x000e - _0807EA94 + MessageFromTargetPos 0x1023, 0x000e + _0807EA94 Call sub_08063C14 Call sub_08094DD8 Wait 0x001e - TextboxNoOverlapFollowPos 0x1024, 0x000e - _0807EA94 + MessageFromTargetPos 0x1024, 0x000e + _0807EA94 Call sub_08063C14 Call sub_08094D34 Wait 0x001e - TextboxNoOverlapFollowPos 0x1025, 0x000e - _0807EA94 + MessageFromTargetPos 0x1025, 0x000e + _0807EA94 Call sub_08063C5C - TextboxNoOverlapFollowPos 0x1026, 0x000e - _0807EA94 + MessageFromTargetPos 0x1026, 0x000e + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807E8E4_1 Call sub_08063C2C - TextboxNoOverlapFollowPos 0x1027, 0x0000 - _0807EA94 + MessageFromTargetPos 0x1027, 0x0000 + _0807EA94 Call sub_08063C74 Wait 0x003c Call sub_08063C14 - _0807E8E4_0 - TextboxNoOverlapFollowPos 0x1028, 0x000e - _0807EA94 - _0807E8E4_1 - TextboxNoOverlapFollowPos 0x1029, 0x0000 - _0807EA94 - _0807E8E4_0 - TextboxNoOverlapFollowPos 0x102a, 0x000e - _0807EA94 + _0807E8E4_0 + MessageFromTargetPos 0x1028, 0x000e + _0807EA94 + _0807E8E4_1 + MessageFromTargetPos 0x1029, 0x0000 + _0807EA94 + _0807E8E4_0 + MessageFromTargetPos 0x102a, 0x000e + _0807EA94 Call sub_08063C14 Call sub_08094D70 PlaySound SFX_103 @@ -172,8 +172,8 @@ SCRIPT_START script_0800F73C _0807E8E4_1 Call sub_0807F3F8 Wait 0x003c - TextboxNoOverlapFollowPos 0x102b, 0x0000 - _0807EA94 + MessageFromTargetPos 0x102b, 0x0000 + _0807EA94 _0807F034 0x000d WaitPlayerAction8 Call sub_0806DC3C @@ -185,8 +185,8 @@ SCRIPT_START script_0800F73C Wait 0x00b7 SetIntVariable 0x00000000 Call sub_0807F5B0 - TextboxNoOverlapFollowPos 0x102c, 0x0000 - _0807EA94 + MessageFromTargetPos 0x102c, 0x0000 + _0807EA94 CallWithArg sub_0807F29C, 0x00000000 Call sub_0806DC58 _0807F0B4 0x0004 diff --git a/data/scripts/script_0800FD0C.inc b/data/scripts/script_0800FD0C.inc index 3ecbe8f3..c424f576 100644 --- a/data/scripts/script_0800FD0C.inc +++ b/data/scripts/script_0800FD0C.inc @@ -33,8 +33,8 @@ script_0800FD1A: JumpIf script_0800FD5C _0807E864 Call sub_0807F9A4 - TextboxNoOverlapFollowPos 0x2506, 0x0000 - _0807EA94 + MessageFromTargetPos 0x2506, 0x0000 + _0807EA94 StartPlayerScript script_0800FD80 WaitForSomething2 0x00000008 _0807E878 @@ -45,8 +45,8 @@ script_0800FD50: script_0800FD5C: _0807E864 Call sub_0807F9A4 - TextboxNoOverlapFollowPos 0x106c, 0x0000 - _0807EA94 + MessageFromTargetPos 0x106c, 0x0000 + _0807EA94 StartPlayerScript script_0800FD80 WaitForSomething2 0x00000008 _0807E878 diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc index 4d54243d..0d3ac1a2 100644 --- a/data/scripts/script_0800FF74.inc +++ b/data/scripts/script_0800FF74.inc @@ -77,8 +77,8 @@ script_0800FFCC: CallWithArg sub_0807F3D8, 0x00000008 CheckInventory1 0x0048 JumpIf script_0800FFF8 - TextboxNoOverlap 0x3401 - _0807EA94 + MessageNoOverlap 0x3401 + _0807EA94 Jump script_08010060 script_0800FFF8: .ifdef JP @@ -95,12 +95,12 @@ script_0800FFF8: .endif .endif JumpIfNot script_0801000A - TextboxNoOverlap 0x340b - _0807EA94 + MessageNoOverlap 0x340b + _0807EA94 Jump script_08010060 script_0801000A: - TextboxNoOverlap 0x3402 - _0807EA94 + MessageNoOverlap 0x3402 + _0807EA94 Jump script_08010060 script_08010014: EndBlock @@ -110,8 +110,8 @@ script_08010014: _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 PlaySound SFX_TASK_COMPLETE - TextboxNoOverlap 0x340a - _0807EA94 + MessageNoOverlap 0x340a + _0807EA94 _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x0000000c SetEntitySpeed 0x0100 @@ -149,8 +149,8 @@ script_08010090: _0807E864 _0807EB74 CallWithArg sub_080672B0, 0x00000004 - TextboxNoOverlapFollow 0x0a01 - _0807EA94 + MessageFromTarget 0x0a01 + _0807EA94 Wait 0x000f _0807E878 _0807EB44 0x0004 diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc index eae8c627..629171b7 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 - _0807EA94 - _0807E878 + _0807E864 + _0807EB74 + MessageFromTarget 0x4f22 + _0807EA94 + _0807E878 Jump script_08010132 SCRIPT_START script_08010148 BeginBlock @@ -55,9 +55,9 @@ script_0801015A: _0807EB74 CheckRoomFlag 0x0001 JumpIf script_0801019E - TextboxNoOverlapFollowPos 0x3001, 0x0000 - _0807EA94 - _0807E3E8 + MessageFromTargetPos 0x3001, 0x0000 + _0807EA94 + _0807E3E8 JumpIfNot script_080101A6 Call sub_080A1608 _0807EA94 @@ -81,8 +81,8 @@ script_080101AC: Call sub_080A1270 _0807E864 Call sub_0807DF28 - TextboxNoOverlapFollowPos 0x3004, 0x0007 - _0807EA94 + MessageFromTargetPos 0x3004, 0x0007 + _0807EA94 StopBgm _0807E778 0x0004 DoFade5 diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc index a86eb227..9ebf8099 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 - _0807EA94 + MessageNoOverlap 0x2b10 + _0807EA94 script_0801052E: Call sub_080634E4 JumpTable script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570 script_08010544: - TextboxNoOverlap 0x2b0d + MessageNoOverlap 0x2b0d Jump script_080105E0 script_0801054C: CheckGlobalFlag 0x003d @@ -243,24 +243,24 @@ script_08010570: JumpIfNot script_080105CC Call sub_08063504 JumpIf script_080105D4 - TextboxNoOverlap 0x2b07 - _0807EA94 + MessageNoOverlap 0x2b07 + _0807EA94 CallWithArg sub_0807F800, 0x00000000 - WaitPlayerAction8 - _0807EA94 - TextboxNoOverlap 0x2b0c + WaitPlayerAction8 + _0807EA94 + MessageNoOverlap 0x2b0c Jump script_080105E0 script_080105C4: - TextboxNoOverlap 0x2b09 + MessageNoOverlap 0x2b09 Jump script_080105E0 script_080105CC: - TextboxNoOverlap 0x2b0a + MessageNoOverlap 0x2b0a Jump script_080105E0 script_080105D4: - TextboxNoOverlap 0x2b0b + MessageNoOverlap 0x2b0b Jump script_080105E0 script_080105DC: - TextboxNoOverlap 0x2b0e + MessageNoOverlap 0x2b0e script_080105E0: _0807EA94 Call sub_0807DF50 @@ -276,11 +276,11 @@ script_080105E0: script_08010602: CheckEntityInteractType JumpIfNot script_08010602 - _0807E864 - _0807EB74 - TextboxNoOverlapFollow 0x0a01 - _0807EA94 - _0807E878 + _0807E864 + _0807EB74 + MessageFromTarget 0x0a01 + _0807EA94 + _0807E878 _0807EB44 0x0004 Jump script_08010602 SCRIPT_START script_0801061C @@ -330,9 +330,9 @@ script_08010686: _0807EB74 HasRoomItemForSale Call sub_0807F77C - TextboxNoOverlapFollowTable 0x3c08, 0x3c09 - _0807EA94 - _0807E878 + MessageFromTargetTable 0x3c08, 0x3c09 + _0807EA94 + _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: _0807EA94 BuyItem 0x0000, 0x0000 JumpIf script_0801070C - TextboxNoOverlap 0x3c04 + MessageNoOverlap 0x3c04 Jump script_08010726 script_0801070C: WaitPlayerAction8 ModHealth 0x0008 Call sub_08062EDC JumpIf script_08010724 - TextboxNoOverlap 0x3c06 + MessageNoOverlap 0x3c06 Jump script_08010726 script_08010724: WaitPlayerAction8 @@ -401,12 +401,12 @@ script_08010746: JumpIfNot script_08010786 HasRupees 0x00c8 JumpIf script_08010778 - TextboxNoOverlap 0x4008 + MessageNoOverlap 0x4008 Jump script_08010786 script_08010778: ModRupees 0xff38 Call sub_08062E14 - TextboxNoOverlap 0x4007 + MessageNoOverlap 0x4007 script_08010786: EndBlock _0807EA94 @@ -470,13 +470,13 @@ script_08010804: JumpIfNot script_08010858 CheckGlobalFlag 0x0041 JumpIfNot script_08010850 - TextboxNoOverlap 0x3f39 + MessageNoOverlap 0x3f39 Jump script_080108BA script_08010850: - TextboxNoOverlap 0x2c1b + MessageNoOverlap 0x2c1b Jump script_080108BA script_08010858: - TextboxNoOverlap 0x2c1a + MessageNoOverlap 0x2c1a Jump script_080108BA script_08010860: EndBlock @@ -498,7 +498,7 @@ script_08010860: JumpIfNot script_080108AA CheckGlobalFlag 0x0044 JumpIfNot script_080108AA - TextboxNoOverlap 0x2c21 + MessageNoOverlap 0x2c21 Jump script_080108B2 script_080108AA: .ifdef USA @@ -508,7 +508,7 @@ script_080108AA: SetLocalFlag 0x00fa .endif .endif - TextboxNoOverlap 0x2c20 + MessageNoOverlap 0x2c20 script_080108B2: _0807EA94 Call sub_0807F83C diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc index 8535ddbb..a3e0af1a 100644 --- a/data/scripts/script_08010BB4.inc +++ b/data/scripts/script_08010BB4.inc @@ -24,16 +24,16 @@ SCRIPT_START script_08010BEC StartPlayerScript script_08011074 WaitForSomething2 0x00000400 _0807F078 0x0034, 0x0002 - TextboxNoOverlapFollowPos 0x1036, 0x000c - _0807EA94 + MessageFromTargetPos 0x1036, 0x000c + _0807EA94 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 - TextboxNoOverlapFollowPos 0x1037, 0x0002 - _0807EA94 + MessageFromTargetPos 0x1037, 0x0002 + _0807EA94 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 - TextboxNoOverlapFollowPos 0x1038, 0x000c - _0807EA94 + MessageFromTargetPos 0x1038, 0x000c + _0807EA94 StopBgm _0807E778 0x0004 DoFade5 @@ -69,8 +69,8 @@ SCRIPT_START script_08010BEC _0807E8E4_1 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - TextboxNoOverlapFollowPos 0x1039, 0x000c - _0807EA94 + MessageFromTargetPos 0x1039, 0x000c + _0807EA94 PlayBgm BGM_CASTLE_TOURNAMENT _0807E8E4_2 _0807E5F8 0x00000004 @@ -82,8 +82,8 @@ SCRIPT_START script_08010BEC Wait 0x012c _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - TextboxNoOverlapFollowPos 0x103a, 0x000c - _0807EA94 + MessageFromTargetPos 0x103a, 0x000c + _0807EA94 SetEntityPositionRelative 0x01f8, 0x01c0 _0807F0B4 0x0004 Wait 0x0078 @@ -100,8 +100,8 @@ SCRIPT_START script_08010BEC PlaySound SFX_9B _0807E5F8 0x00000100 WaitForSomething2 0x00000200 - TextboxNoOverlapFollowPos 0x1043, 0x0000 - _0807EA94 + MessageFromTargetPos 0x1043, 0x0000 + _0807EA94 PlayBgm BGM_VAATI_THEME _0807E5F8 0x00000100 WaitForSomething2 0x00000200 @@ -116,8 +116,8 @@ SCRIPT_START script_08010BEC WaitForSomething2 0x00005000 _0807E5F8 0x00028000 WaitForSomething2 0x00050000 - TextboxNoOverlapFollowPos 0x1044, 0x0000 - _0807EA94 + MessageFromTargetPos 0x1044, 0x0000 + _0807EA94 SetEntityPositionRelative 0x01f8, 0x0098 StopBgm Wait 0x003c diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/script_08010E5A.inc index 20cde3ce..9c65b510 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 - _0807EA94 - TextboxNoOverlapFollowPos 0x1046, 0x0000 - _0807EA94 + MessageFromTargetPos 0x1045, 0x000c + _0807EA94 + MessageFromTargetPos 0x1046, 0x0000 + _0807EA94 CallWithArg CreateManager36, 0x00000002 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc index e9d967cd..d0bd4361 100644 --- a/data/scripts/script_08010F84.inc +++ b/data/scripts/script_08010F84.inc @@ -4,8 +4,8 @@ SCRIPT_START script_08010F84 WaitForSomething2 0x00000200 StartPlayerScript script_080110BC WaitForSomething2 0x00000400 - TextboxNoOverlapFollowPos 0x1047, 0x0000 - _0807EA94 + MessageFromTargetPos 0x1047, 0x0000 + _0807EA94 Call sub_0806DC3C Call sub_080791BC CallWithArg sub_0807F244, 0x0000000d @@ -28,12 +28,12 @@ SCRIPT_START script_08010F84 WaitForSomething2 0x00000020 StopBgm Wait 0x003c - TextboxNoOverlapFollowPos 0x104a, 0x0000 - _0807EA94 + MessageFromTargetPos 0x104a, 0x0000 + _0807EA94 _0807E5F8 0x00000100 WaitForSomething2 0x00000200 - TextboxNoOverlapFollowPos 0x1049, 0x0000 - _0807EA94 + MessageFromTargetPos 0x1049, 0x0000 + _0807EA94 SetEntityPositionRelative 0x01f8, 0x0098 Wait 0x0078 _0807E5F8 0x00000100 diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc index 295f3d62..d88825af 100644 --- a/data/scripts/script_0801194C.inc +++ b/data/scripts/script_0801194C.inc @@ -24,10 +24,10 @@ script_0801197C: CallWithArg sub_0807F3D8, 0x00000000 CheckGlobalFlag 0x0015 JumpIf script_080119A0 - TextboxNoOverlapFollow 0x103d + MessageFromTarget 0x103d Jump script_080119A4 script_080119A0: - TextboxNoOverlapFollow 0x103f + MessageFromTarget 0x103f script_080119A4: _0807EA94 Wait 0x000f @@ -87,9 +87,9 @@ script_08011A44: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlapFollow 0x1320 - _0807EA94 - _0807E878 + MessageFromTarget 0x1320 + _0807EA94 + _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 - _0807EA94 - _0807E878 + MessageFromTarget 0x1320 + _0807EA94 + _0807E878 Jump script_08011A7C .2byte 0x0000 BeginBlock @@ -123,9 +123,9 @@ script_08011AC4: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlapFollow 0x1322 - _0807EA94 - _0807E878 + MessageFromTarget 0x1322 + _0807EA94 + _0807E878 Jump script_08011AC4 SCRIPT_START script_08011AE4 @@ -135,8 +135,8 @@ SCRIPT_START script_08011AE4 Call sub_0807F9A4 Call sub_0807DF28 script_08011AFA: - TextboxNoOverlapFollowPos 0x1321, 0x0007 - _0807EA94 + MessageFromTargetPos 0x1321, 0x0007 + _0807EA94 .ifdef JP SetLocalFlag 0x0011 .else diff --git a/data/scripts/script_08011B20.inc b/data/scripts/script_08011B20.inc index e81b6e16..958cb9f1 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 - _0807EA94 - _0807E878 + MessageFromTargetPos 0x1320, 0x000c + _0807EA94 + _0807E878 Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011B40.inc b/data/scripts/script_08011B40.inc index fecdf231..e17bd540 100644 --- a/data/scripts/script_08011B40.inc +++ b/data/scripts/script_08011B40.inc @@ -11,9 +11,9 @@ SCRIPT_START script_08011B40 _0807EB44 0x0006 DoPostScriptAction 0x0004 Wait 0x003c - _0807EB8C - TextboxNoOverlap 0x3d07 - _0807EA94 + _0807EB8C + MessageNoOverlap 0x3d07 + _0807EA94 _0807EB44 0x0004 ClearGlobalFlag 0x0050 Call sub_0807DF50 @@ -21,11 +21,11 @@ SCRIPT_START script_08011B40 script_08011B84: CheckEntityInteractType JumpIfNot script_08011B84 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x3d01 - _0807EA94 - _0807E3E8 + _0807E864 + _0807EB74 + MessageNoOverlap 0x3d01 + _0807EA94 + _0807E3E8 JumpIf script_08011BA4 script_08011B9A: _0807E878 @@ -36,13 +36,13 @@ script_08011BA4: JumpIf script_08011BBC DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x3d05 + MessageNoOverlap 0x3d05 Jump script_08011B9A script_08011BBC: ModRupees 0xfff6 Wait 0x001e - TextboxNoOverlap 0x3d06 - _0807EA94 + MessageNoOverlap 0x3d06 + _0807EA94 CallWithArg sub_0806C2A0, 0x00000000 WaitFor_2 Wait 0x003c diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc index 2a833792..0cf1a0d0 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 - _0807EA94 - _0807E878 + MessageNoOverlap 0x4515 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011C9A @@ -35,9 +35,9 @@ script_08011CC2: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x3105 - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x3105 + _0807EA94 + _0807E3E8 JumpIf script_08011D0E _0807E878 _0807EB44 0x0004 @@ -50,8 +50,8 @@ script_08011D00: _0807EB74 DoPostScriptAction 0x0000 script_08011D0E: - TextboxNoOverlap 0x3108 - _0807EA94 + MessageNoOverlap 0x3108 + _0807EA94 SetGlobalFlag 0x002b _0807E878 _0807EB44 0x0004 @@ -76,9 +76,9 @@ script_08011D46: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4513 - _0807EA94 - _0807E878 + MessageNoOverlap 0x4513 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011D46 @@ -95,9 +95,9 @@ script_08011D6E: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x3103 - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x3103 + _0807EA94 + _0807E3E8 JumpIf script_08011DBA _0807E878 _0807EB44 0x0004 @@ -110,8 +110,8 @@ script_08011DAC: _0807EB74 DoPostScriptAction 0x0000 script_08011DBA: - TextboxNoOverlap 0x3106 - _0807EA94 + MessageNoOverlap 0x3106 + _0807EA94 SetGlobalFlag 0x002c _0807E878 _0807EB44 0x0004 @@ -136,9 +136,9 @@ script_08011DF2: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4514 - _0807EA94 - _0807E878 + MessageNoOverlap 0x4514 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011DF2 @@ -155,9 +155,9 @@ script_08011E1A: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x3104 - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x3104 + _0807EA94 + _0807E3E8 JumpIf script_08011E66 _0807E878 _0807EB44 0x0004 @@ -170,8 +170,8 @@ script_08011E58: _0807EB74 DoPostScriptAction 0x0000 script_08011E66: - TextboxNoOverlap 0x3107 - _0807EA94 + MessageNoOverlap 0x3107 + _0807EA94 SetGlobalFlag 0x002d _0807E878 _0807EB44 0x0004 @@ -200,13 +200,13 @@ script_08011E96: DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011ECC - TextboxNoOverlap 0x4524 - _0807EA94 + MessageNoOverlap 0x4524 + _0807EA94 Jump script_08011ED8 script_08011ECC: - TextboxNoOverlap 0x3111 - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x3111 + _0807EA94 + _0807E3E8 JumpIf script_08011EF4 script_08011ED8: _0807E878 @@ -220,8 +220,8 @@ script_08011EE6: _0807EB74 DoPostScriptAction 0x0000 script_08011EF4: - TextboxNoOverlap 0x3114 - _0807EA94 + MessageNoOverlap 0x3114 + _0807EA94 SetGlobalFlag 0x002e _0807E878 _0807EB44 0x0004 @@ -249,13 +249,13 @@ script_08011F22: DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011F58 - TextboxNoOverlap 0x4522 - _0807EA94 + MessageNoOverlap 0x4522 + _0807EA94 Jump script_08011F64 script_08011F58: - TextboxNoOverlap 0x310f - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x310f + _0807EA94 + _0807E3E8 JumpIf script_08011F80 script_08011F64: _0807E878 @@ -269,8 +269,8 @@ script_08011F72: _0807EB74 DoPostScriptAction 0x0000 script_08011F80: - TextboxNoOverlap 0x3112 - _0807EA94 + MessageNoOverlap 0x3112 + _0807EA94 SetGlobalFlag 0x002f _0807E878 _0807EB44 0x0004 @@ -298,13 +298,13 @@ script_08011FAE: DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011FE4 - TextboxNoOverlap 0x4523 - _0807EA94 + MessageNoOverlap 0x4523 + _0807EA94 Jump script_08011FF0 script_08011FE4: - TextboxNoOverlap 0x3110 - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x3110 + _0807EA94 + _0807E3E8 JumpIf script_0801200C script_08011FF0: _0807E878 @@ -318,8 +318,8 @@ script_08011FFE: _0807EB74 DoPostScriptAction 0x0000 script_0801200C: - TextboxNoOverlap 0x3113 - _0807EA94 + MessageNoOverlap 0x3113 + _0807EA94 SetGlobalFlag 0x0030 _0807E878 _0807EB44 0x0004 @@ -342,25 +342,25 @@ script_0801203A: DoPostScriptAction 0x0000 CheckLocalFlag 0x0094 JumpIf script_0801205E - TextboxNoOverlap 0x3122 - _0807EA94 + MessageNoOverlap 0x3122 + _0807EA94 SetLocalFlag 0x0094 Jump script_0801209E script_0801205E: _0807E48C 0x0031 JumpIfNot script_08012070 - TextboxNoOverlap 0x3123 - _0807EA94 + MessageNoOverlap 0x3123 + _0807EA94 Jump script_0801209E script_08012070: - TextboxNoOverlap 0x3124 - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x3124 + _0807EA94 + _0807E3E8 JumpIfNot script_0801209E _0807E48C 0x0020 JumpIfNot script_0801209A - TextboxNoOverlap 0x3125 - _0807EA94 + MessageNoOverlap 0x3125 + _0807EA94 _0807F034 0x0031 WaitPlayerAction8 .ifdef USA @@ -376,7 +376,7 @@ script_08012070: .endif Jump script_0801209E script_0801209A: - TextboxNoOverlap 0x3127 + MessageNoOverlap 0x3127 script_0801209E: _0807EA94 _0807E878 @@ -400,25 +400,25 @@ script_080120C6: DoPostScriptAction 0x0000 CheckLocalFlag 0x0095 JumpIf script_080120EA - TextboxNoOverlap 0x3116 - _0807EA94 + MessageNoOverlap 0x3116 + _0807EA94 SetLocalFlag 0x0095 Jump script_0801212A script_080120EA: _0807E48C 0x002f JumpIfNot script_080120FC - TextboxNoOverlap 0x3117 - _0807EA94 + MessageNoOverlap 0x3117 + _0807EA94 Jump script_0801212A script_080120FC: - TextboxNoOverlap 0x3118 - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x3118 + _0807EA94 + _0807E3E8 JumpIfNot script_0801212A _0807E48C 0x0020 JumpIfNot script_08012126 - TextboxNoOverlap 0x3119 - _0807EA94 + MessageNoOverlap 0x3119 + _0807EA94 _0807F034 0x002f WaitPlayerAction8 .ifdef USA @@ -434,7 +434,7 @@ script_080120FC: .endif Jump script_0801212A script_08012126: - TextboxNoOverlap 0x311b + MessageNoOverlap 0x311b script_0801212A: _0807EA94 _0807E878 @@ -458,25 +458,25 @@ script_08012152: DoPostScriptAction 0x0000 CheckLocalFlag 0x0096 JumpIf script_08012176 - TextboxNoOverlap 0x311c - _0807EA94 + MessageNoOverlap 0x311c + _0807EA94 SetLocalFlag 0x0096 Jump script_080121B6 script_08012176: _0807E48C 0x0030 JumpIfNot script_08012188 - TextboxNoOverlap 0x311d - _0807EA94 + MessageNoOverlap 0x311d + _0807EA94 Jump script_080121B6 script_08012188: - TextboxNoOverlap 0x311e - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x311e + _0807EA94 + _0807E3E8 JumpIfNot script_080121B6 _0807E48C 0x0020 JumpIfNot script_080121B2 - TextboxNoOverlap 0x311f - _0807EA94 + MessageNoOverlap 0x311f + _0807EA94 _0807F034 0x0030 WaitPlayerAction8 .ifdef USA @@ -492,7 +492,7 @@ script_08012188: .endif Jump script_080121B6 script_080121B2: - TextboxNoOverlap 0x3121 + MessageNoOverlap 0x3121 script_080121B6: _0807EA94 _0807E878 @@ -514,9 +514,9 @@ script_080121DE: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4527 - _0807EA94 - _0807E878 + MessageNoOverlap 0x4527 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_080121DE @@ -533,9 +533,9 @@ script_08012216: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4525 - _0807EA94 - _0807E878 + MessageNoOverlap 0x4525 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08012216 @@ -552,9 +552,9 @@ script_0801224E: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4526 - _0807EA94 - _0807E878 + MessageNoOverlap 0x4526 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_0801224E @@ -579,9 +579,9 @@ script_08012298: _0807EB74 _0807E864 Call sub_08061FD8 - TextboxNoOverlapFollow 0x2302 - _0807EA94 - _0807E878 + MessageFromTarget 0x2302 + _0807EA94 + _0807E878 SetGlobalFlag 0x001e Jump script_08012284 script_080122BA: @@ -598,9 +598,9 @@ script_080122CE: _0807EB74 _0807E864 Call sub_08061FD8 - TextboxNoOverlapFollow 0x2303 - _0807EA94 - _0807E878 + MessageFromTarget 0x2303 + _0807EA94 + _0807E878 Jump script_080122BA script_080122EC: EndBlock diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc index 313b7c64..2f81b0e5 100644 --- a/data/scripts/script_0801232C.inc +++ b/data/scripts/script_0801232C.inc @@ -7,10 +7,10 @@ SCRIPT_START script_0801232C script_08012338: CheckEntityInteractType JumpIfNot script_08012338 - _0807EB74 - _0807E864 - TextboxNoOverlapFollow 0x2304 - _0807EA94 + _0807EB74 + _0807E864 + MessageFromTarget 0x2304 + _0807EA94 CheckLocalFlag 0x0042 JumpIf script_0801235A SetLocalFlag 0x0042 @@ -48,8 +48,8 @@ script_08012368: _0807E8E4_0 StartPlayerScript script_08012410 WaitForSomething2 0x00000001 - TextboxNoOverlap 0x1402 - _0807EA94 + MessageNoOverlap 0x1402 + _0807EA94 StopBgm SetEntity0x20 0x00010000 Wait 0x003c diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc index 675ecb48..f6af7e93 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 - _0807EA94 - CameraTargetPlayer + MessageFromTargetPos 0x1101, 0x0007 + _0807EA94 + CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc index 2fa50394..5deb674a 100644 --- a/data/scripts/script_080126FC.inc +++ b/data/scripts/script_080126FC.inc @@ -7,15 +7,15 @@ SCRIPT_START script_080126FC WaitForSomething2 0x00000004 _0807E930 0x0022 Call sub_0807F3C8 - TextboxNoOverlapFollowPos 0x1102, 0x000c - _0807EA94 + MessageFromTargetPos 0x1102, 0x000c + _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 - TextboxNoOverlapFollowPos 0x1103, 0x000c - _0807EA94 + MessageFromTargetPos 0x1103, 0x000c + _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 @@ -25,30 +25,30 @@ SCRIPT_START script_080126FC WaitForSomething2 0x00000004 DoPostScriptAction 0x0011 _0807E930 0x001c - TextboxNoOverlapFollowPos 0x1105, 0x000c - _0807EA94 + MessageFromTargetPos 0x1105, 0x000c + _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0022 Call sub_0807F3C8 - TextboxNoOverlapFollowPos 0x1106, 0x000c - _0807EA94 + MessageFromTargetPos 0x1106, 0x000c + _0807EA94 _0807E930 0x001c Call sub_0806D96C - TextboxNoOverlapFollowPos 0x1107, 0x000c - _0807EA94 + MessageFromTargetPos 0x1107, 0x000c + _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 - TextboxNoOverlapFollowPos 0x1108, 0x000c - _0807EA94 + MessageFromTargetPos 0x1108, 0x000c + _0807EA94 _0807E930 0x001c Call sub_0806D96C - TextboxNoOverlapFollowPos 0x1109, 0x000c - _0807EA94 + MessageFromTargetPos 0x1109, 0x000c + _0807EA94 _0807E930 0x0020 DoPostScriptAction 0x000a _0807E9D4 @@ -64,8 +64,8 @@ script_080127F2: _0807E864 Call sub_0806D944 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x1114, 0x000c - _0807EA94 + MessageFromTargetPos 0x1114, 0x000c + _0807EA94 _0807E930 0x0020 _0807E878 Jump script_080127F2 @@ -82,34 +82,34 @@ script_08012824: WaitForSomething2 0x00000004 Call sub_0806D944 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110a, 0x000c - _0807EA94 + MessageFromTargetPos 0x110a, 0x000c + _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110b, 0x000c - _0807EA94 + MessageFromTargetPos 0x110b, 0x000c + _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110c, 0x000c - _0807EA94 + MessageFromTargetPos 0x110c, 0x000c + _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110d, 0x000c - _0807EA94 + MessageFromTargetPos 0x110d, 0x000c + _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110e, 0x000c - _0807EA94 + MessageFromTargetPos 0x110e, 0x000c + _0807EA94 _0807E930 0x0018 SetEntitySpeed 0x0080 Call sub_0806D908 @@ -130,9 +130,9 @@ script_08012904: script_08012920: _0807E864 _0807E930 0x0010 - EndBlock - TextboxNoOverlapFollowPos 0x1115, 0x000c - _0807EA94 + EndBlock + MessageFromTargetPos 0x1115, 0x000c + _0807EA94 _0807E930 0x0018 _0807E878 Jump script_08012904 @@ -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,9 +166,9 @@ script_08012984: script_080129A0: _0807E864 _0807E930 0x0010 - EndBlock - TextboxNoOverlapFollowPos 0x1115, 0x000c - _0807EA94 + EndBlock + MessageFromTargetPos 0x1115, 0x000c + _0807EA94 _0807E930 0x0018 _0807E878 Jump script_08012984 @@ -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,9 +203,9 @@ script_08012A08: script_08012A24: _0807E864 _0807E930 0x0010 - EndBlock - TextboxNoOverlapFollowPos 0x1115, 0x000c - _0807EA94 + EndBlock + MessageFromTargetPos 0x1115, 0x000c + _0807EA94 _0807E930 0x0018 _0807E878 Jump script_08012A08 @@ -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 6f60275d..22678ad8 100644 --- a/data/scripts/script_08012C68.inc +++ b/data/scripts/script_08012C68.inc @@ -8,10 +8,10 @@ SCRIPT_START script_08012C68 script_08012C7E: CheckEntityInteractType JumpIfNot script_08012C7E - _0807E864 - _0807E8E4_0 - TextboxNoOverlapFollow 0x111d - _0807EA94 + _0807E864 + _0807E8E4_0 + MessageFromTarget 0x111d + _0807EA94 SetGlobalFlag 0x0022 _0807E878 Jump script_08012C7E diff --git a/data/scripts/script_08012F0C.inc b/data/scripts/script_08012F0C.inc index 8174dc07..405d2900 100644 --- a/data/scripts/script_08012F0C.inc +++ b/data/scripts/script_08012F0C.inc @@ -19,17 +19,17 @@ script_08012F48: script_08012F50: Call sub_0806A96C JumpIfNot script_08012F50 - _0807E864 - TextboxNoOverlap 0x4401 - _0807EA94 + _0807E864 + MessageNoOverlap 0x4401 + _0807EA94 SetLocalFlag 0x0061 _0807E878 _0807E908 0x0001 script_08012F6C: Call sub_0806A96C JumpIfNot script_08012F6C - TextboxNoOverlap 0x4402 - _0807EA94 + MessageNoOverlap 0x4402 + _0807EA94 _0807E908 0x0001 Jump script_08012F6C SCRIPT_END diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc index 24041dde..ec2ff144 100644 --- a/data/scripts/script_08012F86.inc +++ b/data/scripts/script_08012F86.inc @@ -27,9 +27,9 @@ script_08012FD2: CheckInventory1 0x0038 JumpIf script_08013006 script_08012FFA: - _0807E944 - TextboxNoOverlap 0x4403 - _0807EA94 + _0807E944 + MessageNoOverlap 0x4403 + _0807EA94 Jump script_08012FFA script_08013006: _0807E944 @@ -47,39 +47,39 @@ script_08013006: Wait 0x003c DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x4404 - _0807EA94 + MessageNoOverlap 0x4404 + _0807EA94 Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x440e - _0807EA94 + MessageNoOverlap 0x440e + _0807EA94 Wait 0x001e Call sub_0806A9E8 _0807E930 0x000f Wait 0x00f0 - TextboxNoOverlap 0x4405 - _0807EA94 + MessageNoOverlap 0x4405 + _0807EA94 _0807E5F8 0x00000200 _0807F034 0x0015 - WaitPlayerAction8 - _0807EB8C - TextboxNoOverlap 0x4406 - _0807EA94 + WaitPlayerAction8 + _0807EB8C + MessageNoOverlap 0x4406 + _0807EA94 _0807E908 0x0001 Call sub_0807DF50 _0807E878 script_0801308A: Call sub_0806A96C JumpIfNot script_0801308A - TextboxNoOverlap 0x4407 - _0807EA94 + MessageNoOverlap 0x4407 + _0807EA94 _0807E908 0x0001 script_0801309E: Call sub_0806A96C JumpIfNot script_0801309E - TextboxNoOverlap 0x440d - _0807EA94 + MessageNoOverlap 0x440d + _0807EA94 _0807E908 0x0001 Jump script_0801308A script_080130B6: diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc index f7e6a70f..d3b10195 100644 --- a/data/scripts/script_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -30,9 +30,9 @@ SCRIPT_START script_080131AC Call sub_080536B8 _0807E864 Call sub_0807DF28 - WaitFor_2 - TextboxNoOverlapFollowPos 0x1602, 0x000c - _0807EA94 + WaitFor_2 + MessageFromTargetPos 0x1602, 0x000c + _0807EA94 _0807E5F8 0x00000008 WaitForSomething2 0x00000010 _0807E5F8 0x00000020 @@ -45,8 +45,8 @@ SCRIPT_START script_080131AC StartPlayerScript script_08013378 _0807E5F8 0x00000020 WaitForSomething2 0x00000042 - TextboxNoOverlapFollowPos 0x1603, 0x000c - _0807EA94 + MessageFromTargetPos 0x1603, 0x000c + _0807EA94 _0807E5F8 0x00000020 WaitForSomething2 0x00000040 SetFadeMask 0xffff7fff @@ -58,8 +58,8 @@ SCRIPT_START script_080131AC Wait 0x003c CameraTargetPlayer Call sub_0807F5C0 - TextboxNoOverlapFollowPos 0x1604, 0x0007 - _0807EA94 + MessageFromTargetPos 0x1604, 0x0007 + _0807EA94 SetFadeMask 0xffffffff _0807E778 0x0004 DoFade4 diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc index 63bf844d..a355d9e0 100644 --- a/data/scripts/script_080134DC.inc +++ b/data/scripts/script_080134DC.inc @@ -66,8 +66,8 @@ script_080134F8: DoFade6 WaitFor_2 PlaySound SFX_109 - TextboxNoOverlapFollowPos 0x0503, 0x000c - _0807EA94 + MessageFromTargetPos 0x0503, 0x000c + _0807EA94 _0807E5F8 0x00040000 CallWithArg CreateManager36, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc index e8018f05..b7321df8 100644 --- a/data/scripts/script_08013720.inc +++ b/data/scripts/script_08013720.inc @@ -69,8 +69,8 @@ script_0801373C: DoFade6 WaitFor_2 PlaySound SFX_109 - TextboxNoOverlapFollowPos 0x0504, 0x000c - _0807EA94 + MessageFromTargetPos 0x0504, 0x000c + _0807EA94 _0807E5F8 0x00040000 SetLocalFlag 0x007b Call sub_08053250 diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc index 93b64077..e2cce8fe 100644 --- a/data/scripts/script_080138B4.inc +++ b/data/scripts/script_080138B4.inc @@ -74,8 +74,8 @@ script_080138D0: DoFade6 WaitFor_2 PlaySound SFX_109 - TextboxNoOverlapFollowPos 0x0505, 0x000c - _0807EA94 + MessageFromTargetPos 0x0505, 0x000c + _0807EA94 _0807E5F8 0x00040000 .ifndef EU _0807F0B4 0x0002 diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc index 1108937b..9801bd81 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 - _0807EA94 - _0807E878 + _0807E864 + MessageFromTargetPos 0x0647, 0x000c + _0807EA94 + _0807E878 Jump script_08014298 .2byte 0x0000 .endif diff --git a/data/scripts/script_080142B0.inc b/data/scripts/script_080142B0.inc index 1a69e91f..aa5eac36 100644 --- a/data/scripts/script_080142B0.inc +++ b/data/scripts/script_080142B0.inc @@ -29,8 +29,8 @@ script_080142C4: Wait 0x000a _0807E930 0x0002 Wait 0x001e - TextboxNoOverlap 0x2c12 - _0807EA94 + MessageNoOverlap 0x2c12 + _0807EA94 Wait 0x0014 _0807E930 0x0004 _0807E878 @@ -53,8 +53,8 @@ script_08014330: Wait 0x001e _0807E930 0x0001 Wait 0x001e - TextboxNoOverlap 0x2c13 - _0807EA94 + MessageNoOverlap 0x2c13 + _0807EA94 Wait 0x0014 _0807E930 0x0004 _0807E908 0x0001 diff --git a/data/scripts/script_08014384.inc b/data/scripts/script_08014384.inc index ea9f4c78..7503513a 100644 --- a/data/scripts/script_08014384.inc +++ b/data/scripts/script_08014384.inc @@ -11,7 +11,7 @@ SCRIPT_START script_08014384 _0807EA94 _0807EB8C Wait 0x001e - TextboxNoOverlapVar + MessageNoOverlapVar script_080143AC: _0807EA94 Wait 0x001e diff --git a/data/scripts/script_080143C0.inc b/data/scripts/script_080143C0.inc index b95fc900..a908f1fe 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 - _0807EA94 - _0807E3E8 + MessageNoOverlap 0x2c16 + _0807EA94 + _0807E3E8 JumpIf script_080143FA SetIntVariable 0x00000002 Call sub_08065528 @@ -16,22 +16,22 @@ SCRIPT_START script_080143C0 script_080143FA: Call sub_080654EC Wait 0x001e - TextboxNoOverlap 0x2c18 - _0807EA94 + MessageNoOverlap 0x2c18 + _0807EA94 Wait 0x000a SetIntVariable 0x00000000 Call sub_08065528 _0807F034 0x0036 - WaitPlayerAction8 - TextboxNoOverlap 0x2c19 - _0807EA94 + WaitPlayerAction8 + MessageNoOverlap 0x2c19 + _0807EA94 SetIntVariable 0x00000303 Call sub_0807F420 .ifndef EU Wait 0x001e - _0807EB8C - TextboxNoOverlap 0x2c22 - _0807EA94 + _0807EB8C + MessageNoOverlap 0x2c22 + _0807EA94 .endif script_0801443E: _0807E930 0x0004 diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc index d9c80760..f6f2473f 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 - _0807EA94 - _0807E3E8 + MessageFromTarget 0x4202 + MessageFromTarget 0x4203 + _0807EA94 + _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 e5890fd0..266ab97d 100644 --- a/data/scripts/script_080145B0.inc +++ b/data/scripts/script_080145B0.inc @@ -17,8 +17,8 @@ script_080145C2: Wait 0x000c _0807EB8C .endif - TextboxNoOverlapFollowPos 0x432e, 0x000c - _0807EA94 + MessageFromTargetPos 0x432e, 0x000c + _0807EA94 .ifdef EU Wait 0x0018 .endif diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc index 5a62b9cc..edd2babc 100644 --- a/data/scripts/script_080145E8.inc +++ b/data/scripts/script_080145E8.inc @@ -16,8 +16,8 @@ script_080145F8: Wait 0x0018 _0807E8E4_3 _0807EB44 0x0002 - TextboxNoOverlapFollowPos 0x432b, 0x000c - _0807EA94 + MessageFromTargetPos 0x432b, 0x000c + _0807EA94 Wait 0x0018 _0807E878 Jump script_080145F8 @@ -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 - _0807EA94 + MessageFromTargetPos 0x4305, 0x000c + _0807EA94 _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: _0807EA94 .ifdef EU diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc index 82f48f9d..6ab2315f 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 dd674139..458e2c90 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 - _0807EA94 + MessageNoOverlap 0x2f0a + _0807EA94 _0807E5F8 0x00000002 script_08014AAC: _0807E30C JumpIfNot script_08014AAC - _0807E864 - _0807EB74 - TextboxNoOverlap 0x2f0a - _0807EA94 - _0807E878 + _0807E864 + _0807EB74 + MessageNoOverlap 0x2f0a + _0807EA94 + _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: _0807EA94 Wait 0x000f diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc index 0d97b17f..d62ae07d 100644 --- a/data/scripts/script_08014B34.inc +++ b/data/scripts/script_08014B34.inc @@ -12,11 +12,11 @@ script_08014B48: JumpIf script_08014B70 CheckEntityInteractType JumpIfNot script_08014B48 - EndBlock - _0807E864 - _0807EB74 - TextboxNoOverlap 0x2f01 - _0807EA94 + EndBlock + _0807E864 + _0807EB74 + MessageNoOverlap 0x2f01 + _0807EA94 Wait 0x000f _0807E878 Jump script_08014B48 @@ -56,15 +56,15 @@ script_08014BF2: CheckLocalFlag 0x0065 JumpIf script_08014C1C SetLocalFlag 0x0065 - TextboxNoOverlap 0x2f07 - _0807EA94 + MessageNoOverlap 0x2f07 + _0807EA94 SetIntVariable 0x00000064 _0807F034 0x003f WaitPlayerAction8 Jump script_08014C22 script_08014C1C: - TextboxNoOverlap 0x2f08 - _0807EA94 + MessageNoOverlap 0x2f08 + _0807EA94 script_08014C22: Wait 0x000f _0807E878 @@ -90,14 +90,14 @@ script_08014C56: CheckLocalFlag 0x0066 JumpIf script_08014C7C SetLocalFlag 0x0066 - TextboxNoOverlap 0x2f0d - _0807EA94 + MessageNoOverlap 0x2f0d + _0807EA94 _0807F034 0x000a WaitPlayerAction8 Jump script_08014C82 script_08014C7C: - TextboxNoOverlap 0x2f09 - _0807EA94 + MessageNoOverlap 0x2f09 + _0807EA94 script_08014C82: Wait 0x000f _0807E878 diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc index 7eea160e..71fa1f1f 100644 --- a/data/scripts/script_08014CDC.inc +++ b/data/scripts/script_08014CDC.inc @@ -10,9 +10,9 @@ SCRIPT_START script_08014CDC EndBlock WaitForSomething2 0x00000001 Call sub_08066E08 - _0807E864 - TextboxNoOverlapFollowPos 0x1010, 0x000c - _0807EA94 + _0807E864 + MessageFromTargetPos 0x1010, 0x000c + _0807EA94 _0807E5F8 0x00000002 script_08014D1E: EndBlock @@ -23,8 +23,8 @@ script_08014D1E: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - TextboxNoOverlap 0x1012 - _0807EA94 + MessageNoOverlap 0x1012 + _0807EA94 _0807EC64 0x0040 _0807EB44 0x0004 Call sub_08066E08 @@ -36,8 +36,8 @@ script_08014D60: JumpIf script_08014D60 _0807E864 Call sub_0807DF28 - TextboxNoOverlap 0x1013 - _0807EA94 + MessageNoOverlap 0x1013 + _0807EA94 _0807EC64 0x0040 _0807EB44 0x0004 DoPostScriptAction 0x0000 @@ -50,8 +50,8 @@ script_08014D96: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - TextboxNoOverlap 0x1014 - _0807EA94 + MessageNoOverlap 0x1014 + _0807EA94 _0807EC64 0x0018 .ifdef JP SetLocalFlag 0x006b diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc index 6db6e5f8..2de18b8c 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: _0807EA94 Call sub_0807DF50 @@ -62,11 +62,11 @@ SCRIPT_START script_08014ECC script_08014EE0: CheckEntityInteractType JumpIfNot script_08014EE0 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x200d - _0807EA94 - _0807E878 + _0807E864 + _0807EB74 + MessageNoOverlap 0x200d + _0807EA94 + _0807E878 Jump script_08014EE0 .2byte 0x0000 SCRIPT_START script_08014EF8 @@ -82,9 +82,9 @@ script_08014F0C: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x200e - _0807EA94 - _0807E878 + MessageNoOverlap 0x200e + _0807EA94 + _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 _0807EA94 @@ -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: _0807EA94 Call sub_0807DF50 @@ -148,8 +148,8 @@ script_08014FCC: CameraTargetEntity StartPlayerScript script_080152B4 WaitForSomething2 0x00000001 - TextboxNoOverlapFollowPos 0x1301, 0x0002 - _0807EA94 + MessageFromTargetPos 0x1301, 0x0002 + _0807EA94 Call sub_0807F3F8 Wait 0x003c _0807E5F8 0x00000002 @@ -158,13 +158,13 @@ script_08014FCC: WaitForSomething2 0x00000004 PlayBgm BGM_VAATI_THEME _0807EB28 0x1302 - _0807EA94 - TextboxNoOverlapFollowPos 0x1303, 0x0002 - _0807EA94 + _0807EA94 + MessageFromTargetPos 0x1303, 0x0002 + _0807EA94 _0807EB28 0x1304 - _0807EA94 - TextboxNoOverlapFollowPos 0x1305, 0x0002 - _0807EA94 + _0807EA94 + MessageFromTargetPos 0x1305, 0x0002 + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807EB28 0x1306 diff --git a/data/scripts/script_08015390.inc b/data/scripts/script_08015390.inc index bfa9a257..953164f8 100644 --- a/data/scripts/script_08015390.inc +++ b/data/scripts/script_08015390.inc @@ -7,8 +7,8 @@ SCRIPT_START script_08015390 Call sub_0806D944 WaitForSomething2 0x00000008 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x1314, 0x000c - _0807EA94 + MessageFromTargetPos 0x1314, 0x000c + _0807EA94 _0807E930 0x0018 Call sub_0806D8A0 script_080153C2: diff --git a/data/scripts/script_080153EC.inc b/data/scripts/script_080153EC.inc index 5d469635..5fc90ba9 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 - _0807EA94 + MessageFromTargetPos 0x1330, 0x0002 + _0807EA94 _0807E5F8 0x00008000 WaitForSomething2 0x00010000 _0807E5F8 0x00000880 WaitForSomething2 0x00001000 Wait 0x003c - TextboxNoOverlapFollowPos 0x130d, 0x0002 - _0807EA94 - TextboxNoOverlapFollowPos 0x130e, 0x000c - _0807EA94 - TextboxNoOverlapFollowPos 0x130f, 0x0002 - _0807EA94 - TextboxNoOverlapFollowPos 0x1310, 0x000c - _0807EA94 + MessageFromTargetPos 0x130d, 0x0002 + _0807EA94 + MessageFromTargetPos 0x130e, 0x000c + _0807EA94 + MessageFromTargetPos 0x130f, 0x0002 + _0807EA94 + MessageFromTargetPos 0x1310, 0x000c + _0807EA94 CallWithArg CreateManager36, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0801548E.inc b/data/scripts/script_0801548E.inc index 70537368..7ca27f15 100644 --- a/data/scripts/script_0801548E.inc +++ b/data/scripts/script_0801548E.inc @@ -5,16 +5,16 @@ SCRIPT_START script_0801548E CallWithArg sub_0807FB28, 0x00000003 _0807E5F8 0x00048000 WaitForSomething2 0x00090000 - TextboxNoOverlapFollowPos 0x1311, 0x0002 - _0807EA94 + MessageFromTargetPos 0x1311, 0x0002 + _0807EA94 _0807E5F8 0x00008000 WaitForSomething2 0x00010000 _0807E5F8 0x00048000 WaitForSomething2 0x00010000 CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 - TextboxNoOverlapFollowPos 0x1312, 0x000c - _0807EA94 + MessageFromTargetPos 0x1312, 0x000c + _0807EA94 _0807E5F8 0x00000800 WaitForSomething2 0x00001000 StopBgm diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc index 209a89aa..e218446c 100644 --- a/data/scripts/script_080157AC.inc +++ b/data/scripts/script_080157AC.inc @@ -32,8 +32,8 @@ script_080157DA: WaitForSomething2 0x00000010 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 - TextboxNoOverlapFollowPos 0x1066, 0x0002 - _0807EA94 + MessageFromTargetPos 0x1066, 0x0002 + _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 Call sub_0807DF50 @@ -54,13 +54,13 @@ script_08015888: CameraTargetEntity StartPlayerScript script_08015938 WaitForSomething2 0x00000010 - TextboxNoOverlapFollowPos 0x106a, 0x000c - _0807EA94 + MessageFromTargetPos 0x106a, 0x000c + _0807EA94 _0807E5F8 0x00000008 Wait 0x0078 - _0807E8E4_2 - TextboxNoOverlapFollowPos 0x1068, 0x0002 - _0807EA94 + _0807E8E4_2 + MessageFromTargetPos 0x1068, 0x0002 + _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 .ifdef JP diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc index 9b2ce9e8..4992ef17 100644 --- a/data/scripts/script_08015958.inc +++ b/data/scripts/script_08015958.inc @@ -15,8 +15,8 @@ SCRIPT_START script_08015958 _0807EDD4 0x01f8, 0x02f8 _0807EB44 0x0004 DoPostScriptAction 0x0000 - TextboxNoOverlapFollowPos 0x1011, 0x0002 - _0807EA94 + MessageFromTargetPos 0x1011, 0x0002 + _0807EA94 _0807EDD4 0x01f8, 0x0268 SetEntityPositionRelative 0x0248, 0x0218 _0807EB44 0x0006 @@ -56,9 +56,9 @@ script_08015A32: JumpIf script_08015A54 CheckEntityInteractType JumpIfNot script_08015A32 - EndBlock - TextboxNoOverlapFollowPos 0x1067, 0x0002 - _0807EA94 + EndBlock + MessageFromTargetPos 0x1067, 0x0002 + _0807EA94 Jump script_08015A32 script_08015A54: EndBlock diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc index a6e0cc20..9bbdebc1 100644 --- a/data/scripts/script_08015B34.inc +++ b/data/scripts/script_08015B34.inc @@ -21,8 +21,8 @@ SCRIPT_START script_08015B34 _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - TextboxNoOverlapFollowPos 0x2506, 0x0002 - _0807EA94 + MessageFromTargetPos 0x2506, 0x0002 + _0807EA94 StartPlayerScript script_08015B84 WaitForSomething2 0x00000004 Call sub_0807DF50 diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/script_08015C7C.inc index b977512b..82dfed5b 100644 --- a/data/scripts/script_08015C7C.inc +++ b/data/scripts/script_08015C7C.inc @@ -8,8 +8,8 @@ SCRIPT_START script_08015C7C DoPostScriptAction 0x0000 CallWithArg sub_0807F238, 0x000003c5 Call sub_0807F304 - TextboxNoOverlapFollowPos 0x1318, 0x000c - _0807EA94 + MessageFromTargetPos 0x1318, 0x000c + _0807EA94 CallWithArg sub_0807F238, 0x000003c9 Call sub_0807F304 _0807EB44 0x0004 diff --git a/data/scripts/script_08015DF0.inc b/data/scripts/script_08015DF0.inc index 6ab45a4f..530298f8 100644 --- a/data/scripts/script_08015DF0.inc +++ b/data/scripts/script_08015DF0.inc @@ -6,20 +6,20 @@ SCRIPT_START script_08015DF0 WaitForSomething2 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x1319 - _0807EA94 + MessageNoOverlap 0x1319 + _0807EA94 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - TextboxNoOverlap 0x131a - _0807EA94 + MessageNoOverlap 0x131a + _0807EA94 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - TextboxNoOverlap 0x131d - _0807EA94 + MessageNoOverlap 0x131d + _0807EA94 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - TextboxNoOverlap 0x131e - _0807EA94 + MessageNoOverlap 0x131e + _0807EA94 _0807E5F8 0x00000008 WaitForSomething 0x00000400 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08015E58.inc b/data/scripts/script_08015E58.inc index bd9fd02f..9b010505 100644 --- a/data/scripts/script_08015E58.inc +++ b/data/scripts/script_08015E58.inc @@ -32,8 +32,8 @@ SCRIPT_START script_08015E58 WaitForSomething2 0x00000010 DoPostScriptAction 0x0014 Wait 0x001e - TextboxNoOverlap 0x131b - _0807EA94 + MessageNoOverlap 0x131b + _0807EA94 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08015F08.inc b/data/scripts/script_08015F08.inc index 1ecc9b4d..587e9899 100644 --- a/data/scripts/script_08015F08.inc +++ b/data/scripts/script_08015F08.inc @@ -4,8 +4,8 @@ SCRIPT_START script_08015F08 DoPostScriptAction 0x0000 EndBlock WaitForSomething2 0x00000001 - TextboxNoOverlap 0x131c - _0807EA94 + MessageNoOverlap 0x131c + _0807EA94 _0807E5F8 0x00000002 WaitForSomething 0x00000200 DoPostScriptAction 0x0005 diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc index 0d780e49..9910c142 100644 --- a/data/scripts/script_080160A8.inc +++ b/data/scripts/script_080160A8.inc @@ -23,34 +23,34 @@ script_080160E0: EndBlock HasRoomItemForSale JumpIfNot script_0801611A - TextboxNoOverlapFollow 0x2d07 - _0807EA94 - _0807E3E8 + MessageFromTarget 0x2d07 + _0807EA94 + _0807E3E8 JumpIfNot script_08016132 BuyItem 0x0000, 0x0000 JumpIf script_0801610C - TextboxNoOverlapFollow 0x2d0b - _0807EA94 + MessageFromTarget 0x2d0b + _0807EA94 Jump script_08016132 script_0801610C: WaitPlayerAction8 .ifndef EU - _0807EB8C - TextboxNoOverlapFollow 0x2d0d + _0807EB8C + MessageFromTarget 0x2d0d .else - TextboxNoOverlapFollow 0x2d08 + MessageFromTarget 0x2d08 .endif _0807EA94 Jump script_08016132 script_0801611A: CheckKinstoneFused 0x0014 JumpIfNot script_0801612C - TextboxNoOverlapFollow 0x2d09 - _0807EA94 + MessageFromTarget 0x2d09 + _0807EA94 Jump script_08016132 script_0801612C: - TextboxNoOverlapFollow 0x2d01 - _0807EA94 + MessageFromTarget 0x2d01 + _0807EA94 script_08016132: _0807E878 _0807EB44 0x0004 @@ -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 - _0807EA94 - _0807EB8C - TextboxNoOverlap 0x2d06 + WaitPlayerAction8 + _0807EA94 + _0807EB8C + MessageNoOverlap 0x2d06 .else - TextboxNoOverlapFollow 0x2d06 + MessageFromTarget 0x2d06 .endif script_080161E2: _0807E878 diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc index a62ea33f..a20d7522 100644 --- a/data/scripts/script_08016482.inc +++ b/data/scripts/script_08016482.inc @@ -28,12 +28,12 @@ SCRIPT_START script_08016482 _0807E9DC _0807E9E4 0x0000 _0807EA88 0x0001 - _0807EA94 - TextboxNoOverlapFollow 0x0601 - TextboxNoOverlap 0x0601 - TextboxNoOverlapFollowPos_1 0x0601 - TextboxNoOverlapFollowTable 0x0601, 0x0602, 0x0603 - TextboxNoOverlapVar + _0807EA94 + 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 d0e3de77..42d14295 100644 --- a/data/scripts/script_080165D8.inc +++ b/data/scripts/script_080165D8.inc @@ -13,17 +13,17 @@ 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 - _0807EA94 + _0807E944 + _0807E864 + MessageFromTarget 0x0602 + _0807EA94 Wait 0x000f _0807E878 Jump script_08016612 @@ -239,8 +239,8 @@ script_0801693E: _0807E944 _0807E864 Wait 0x0018 - TextboxNoOverlapFollow 0x0a01 - _0807EA94 + MessageFromTarget 0x0a01 + _0807EA94 Wait 0x000f _0807E878 Jump script_0801693E @@ -255,8 +255,8 @@ script_0801696A: _0807E944 _0807E864 Wait 0x0018 - TextboxNoOverlapFollow 0x0a01 - _0807EA94 + MessageFromTarget 0x0a01 + _0807EA94 Wait 0x000f _0807E878 Jump script_0801696A |