diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-03-06 13:38:10 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-03-06 14:53:33 +0100 |
| commit | 09087886c67b7722935dfd17e5df39adfdff496e (patch) | |
| tree | d11d2a5b22f2f47608ce416f34f65191a9a34a4b /data/scripts | |
| parent | 7730ea20976178708762b7c882d0bae303c550ca (diff) | |
Generate variants of macros for functions with variable parameter count
Diffstat (limited to 'data/scripts')
137 files changed, 514 insertions, 2415 deletions
diff --git a/data/scripts/gUnk_08008B5C.inc b/data/scripts/gUnk_08008B5C.inc index e03faf0b..7ababbc6 100644 --- a/data/scripts/gUnk_08008B5C.inc +++ b/data/scripts/gUnk_08008B5C.inc @@ -45,17 +45,9 @@ _0807EA94 Call sub_0806BA34 JumpIfNot 0x0066 _0807EA94 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806BB1C -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806BB1C, 0x00000000 Call sub_0807F2D4 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806BB1C -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806BB1C, 0x00000001 Call sub_0806BB7C JumpIfNot 0x0048 TextboxNoOverlap 0x490c diff --git a/data/scripts/gUnk_08008D8C.inc b/data/scripts/gUnk_08008D8C.inc index cd4ffd46..105f3c07 100644 --- a/data/scripts/gUnk_08008D8C.inc +++ b/data/scripts/gUnk_08008D8C.inc @@ -18,30 +18,18 @@ StartScript _0807E9D4 _0807EF80 0x000a _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 Call sub_080643D8 _0807EA94 _0807E878 _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 Jump 0xffd2 StartScript SetEntityPositionRelative 0x00780088 @@ -71,10 +59,7 @@ _0807E5F8 0x00000080 WaitForSomething2 0x00000100 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1053 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1053 _0807EA94 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 diff --git a/data/scripts/gUnk_08008FC0.inc b/data/scripts/gUnk_08008FC0.inc index 37470012..4fe5a130 100644 --- a/data/scripts/gUnk_08008FC0.inc +++ b/data/scripts/gUnk_08008FC0.inc @@ -1,21 +1,10 @@ SCRIPT_START gUnk_08008FC0 _0807F078 0x0001, 0x0001 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F918 -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F918, 0x00000001 SoundReq 0x0109 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F238 -.short 0x045f -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F238, 0x0000045f Call sub_0807F304 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x0501 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e0501 _0807EA94 _0807E5F8 0x00000020 Call sub_080791BC diff --git a/data/scripts/gUnk_0800903C.inc b/data/scripts/gUnk_0800903C.inc index f737d7bd..a1a124ed 100644 --- a/data/scripts/gUnk_0800903C.inc +++ b/data/scripts/gUnk_0800903C.inc @@ -28,29 +28,20 @@ WaitForSomething2 0x00000080 _0807EB44 0x0004 _0807ECC4 0x0008 _0807E930 0x0004 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1050 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1050 _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1052 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1052 _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EB44 0x0006 _0807E930 0x0005 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1054 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1054 _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000100 @@ -59,37 +50,25 @@ _0807EB44 0x0004 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1056 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1056 _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1057 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1057 _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1058 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1058 _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x105c -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e105c _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000100 @@ -110,10 +89,7 @@ StopScript WaitForSomething2 0x00000001 _0807EB74 _0807EF80 0x0001 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x105b -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x0000105b _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000002 @@ -125,10 +101,7 @@ WaitForSomething2 0x00000001 _0807EF80 0x0005 Wait 0x003c _0807EF80 0x0001 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1051 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00001051 _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000002 @@ -138,10 +111,7 @@ Wait 0x003c _0807EB74 _0807EB8C _0807EF80 0x0001 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1055 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00001055 _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000002 @@ -155,10 +125,7 @@ _0807EDD4 0x0098, 0x0078 _0807EB74 _0807EF80 0x0000 _0807EF80 0x0001 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1059 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00001059 _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000002 diff --git a/data/scripts/gUnk_08009B78.inc b/data/scripts/gUnk_08009B78.inc index ed556529..7ba8eafb 100644 --- a/data/scripts/gUnk_08009B78.inc +++ b/data/scripts/gUnk_08009B78.inc @@ -18,10 +18,7 @@ _0807EB44 0x0006 _0807EF80 0x0000 Wait 0x000f _0807EF80 0x0001 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1009 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00001009 _0807E8E4_1 _0807EA94 _0807EF80 0x0000 @@ -29,10 +26,7 @@ _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807EB8C _0807EF80 0x0001 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x100b -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x0000100b _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000002 @@ -51,10 +45,7 @@ _0807F034 0x0034 WaitPlayerAction8 _0807E8E4_1 _0807EF80 0x0001 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x100c -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x0000100c _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000004 diff --git a/data/scripts/gUnk_08009C68.inc b/data/scripts/gUnk_08009C68.inc index 21105efe..6d6a4d03 100644 --- a/data/scripts/gUnk_08009C68.inc +++ b/data/scripts/gUnk_08009C68.inc @@ -13,10 +13,7 @@ WaitForSomething2 0x00000004 _0807EB74 _0807EB8C _0807EF80 0x0001 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x100a -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x0000100a _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000008 @@ -25,10 +22,7 @@ _0807EB8C _0807EF80 0x0001 _0807EB8C _0807EB44 0x0002 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x100d -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x0000100d _0807EA94 _0807EF80 0x0000 _0807EDD4 0x0028, 0x0060 diff --git a/data/scripts/gUnk_08009F14.inc b/data/scripts/gUnk_08009F14.inc index 4e9dd50f..8294c40a 100644 --- a/data/scripts/gUnk_08009F14.inc +++ b/data/scripts/gUnk_08009F14.inc @@ -20,10 +20,7 @@ _0807EF80 0x000b StartPlayerScript gUnk_0800A088 WaitForSomething2 0x00000002 Call sub_0806014C -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1f01 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00001f01 _0807EA94 Wait 0x001e _0807F034 0x0065 @@ -41,21 +38,13 @@ StopScript _0807E864 Call sub_080602BC _0807EA94 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F970 -.short 0x1f03 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F970, 0x00001f03 JumpIf 0x0008 _0807E878 Jump 0xffd2 Wait 0x0008 SoundReq 0x0103 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806030C -.short 0x0063 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806030C, 0x00000063 Wait 0x0008 _0807E878 Jump 0xffb6 diff --git a/data/scripts/gUnk_0800A0FC.inc b/data/scripts/gUnk_0800A0FC.inc index a2d56bd5..26f1620d 100644 --- a/data/scripts/gUnk_0800A0FC.inc +++ b/data/scripts/gUnk_0800A0FC.inc @@ -10,27 +10,15 @@ Call sub_0807FBFC SetEntityPositionRelative 0x005800b0 Call sub_0807F844 _0807E8E4_3 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F75C -.short 0x0060 -.short 0x00d0 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08094AE8 -.short 0xa160 -.short 0x0800 -@ End of parameters +CallWithArg sub_0807F75C, 0x00d00060 +CallWithArg sub_08094AE8, 0x0800a160 SoundReq 0x00f7 _0807E778 0x0002 DoFade6 StopScript WaitFor_2 WaitForSomething2 0x00000004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA1C -.short 0x0006 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA1C, 0x00000006 _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800A160.inc b/data/scripts/gUnk_0800A160.inc index 19b41f0c..8fb680cc 100644 --- a/data/scripts/gUnk_0800A160.inc +++ b/data/scripts/gUnk_0800A160.inc @@ -5,16 +5,8 @@ _0807EF80 0x0007 _0807EF80 0x000b _0807E930 0x0002 SetEntityPositionRelative 0x008000b0 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F98C -.short 0x0000 -.short 0xff80 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080960C4 -.short 0xa1b4 -.short 0x0800 -@ End of parameters +CallWithArg sub_0807F98C, 0xff800000 +CallWithArg sub_080960C4, 0x0800a1b4 StopScript SoundReq 0x0142 _0807EF3C 0xff80, 0x0000 diff --git a/data/scripts/gUnk_0800A1B4.inc b/data/scripts/gUnk_0800A1B4.inc index 27ffbaf3..6c66905f 100644 --- a/data/scripts/gUnk_0800A1B4.inc +++ b/data/scripts/gUnk_0800A1B4.inc @@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800A1B4 StartScript _0807EF80 0x0007 _0807EF80 0x000b -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F994 -.short 0xfff8 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F994, 0x0000fff8 StopScript WaitForSomething 0x00000002 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800A1D8.inc b/data/scripts/gUnk_0800A1D8.inc index 0b42df91..59fefcec 100644 --- a/data/scripts/gUnk_0800A1D8.inc +++ b/data/scripts/gUnk_0800A1D8.inc @@ -5,21 +5,14 @@ Call sub_0807DF28 SetEntityPositionRelative 0x00800088 Call sub_0807F844 _0807E8E4_3 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F75C -.short 0x0088 -.short 0x00a8 -@ End of parameters +CallWithArg sub_0807F75C, 0x00a80088 StopScript Wait 0x003c StartPlayerScript gUnk_0800A310 WaitForSomething2 0x00000001 _0807E5F8 0x00000004 WaitForSomething2 0x00000080 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1659 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00001659 _0807EA94 Wait 0x003c _0807E5F8 0x00000010 @@ -34,16 +27,10 @@ WaitForSomething2 0x00000040 _0807E5F8 0x00000004 Call sub_0807F3F8 WaitForSomething2 0x00000080 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x165a -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e165a _0807EA94 Wait 0x003c -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x165b -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e165b _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000040 @@ -58,16 +45,10 @@ _0807E5F8 0x00000008 WaitForSomething2 0x00000100 _0807E5F8 0x00000006 WaitForSomething2 0x000000c0 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x165c -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e165c _0807EA94 SoundReq0x80100000 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x165d -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e165d _0807EA94 _0807E5F8 0x00000006 WaitForSomething2 0x000000c0 @@ -77,10 +58,6 @@ _0807E5F8 0x00000008 WaitForSomething2 0x00000100 SoundReq2 0x0008 SoundReq 0x00f7 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA1C -.short 0x0007 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA1C, 0x00000007 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A310.inc b/data/scripts/gUnk_0800A310.inc index 7e9b2c7b..a5c7dbc1 100644 --- a/data/scripts/gUnk_0800A310.inc +++ b/data/scripts/gUnk_0800A310.inc @@ -16,11 +16,7 @@ _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 _0807EF80 0x000b _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 StopScript WaitForSomething2 0x00000002 _0807E930 0x000e @@ -41,11 +37,7 @@ _0807E930 0x000c Call sub_0807F2D4 _0807E5F8 0x00000040 WaitForSomething2 0x00000002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080960C4 -.short 0xa680 -.short 0x0800 -@ End of parameters +CallWithArg sub_080960C4, 0x0800a680 _0807E5F8 0x00000040 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800A3D8.inc b/data/scripts/gUnk_0800A3D8.inc index e072c052..ac087eda 100644 --- a/data/scripts/gUnk_0800A3D8.inc +++ b/data/scripts/gUnk_0800A3D8.inc @@ -28,11 +28,7 @@ WaitForSomething2 0x00000004 _0807EB44 0x0004 _0807EF80 0x0000 SoundReq 0x0142 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080960C4 -.short 0xa638 -.short 0x0800 -@ End of parameters +CallWithArg sub_080960C4, 0x0800a638 _0807E5F8 0x00000080 WaitForSomething2 0x00000004 SoundReq 0x0143 @@ -43,39 +39,19 @@ Call sub_08066E68 _0807E5F8 0x00000080 WaitForSomething2 0x00000004 SoundReq 0x0142 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080960C4 -.short 0xa680 -.short 0x0800 -@ End of parameters +CallWithArg sub_080960C4, 0x0800a680 Wait 0x0078 SoundReq 0x0153 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FADC -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807FADC, 0x00000003 Wait 0x000f SoundReq 0x0153 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FADC -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807FADC, 0x00000003 Wait 0x000f SoundReq 0x0153 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FADC -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807FADC, 0x00000003 Wait 0x003c SoundReq 0x0153 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FADC -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807FADC, 0x00000001 SoundReq 0x0143 _0807E5F8 0x00000080 WaitForSomething2 0x00000004 diff --git a/data/scripts/gUnk_0800A500.inc b/data/scripts/gUnk_0800A500.inc index 9686116d..0379d003 100644 --- a/data/scripts/gUnk_0800A500.inc +++ b/data/scripts/gUnk_0800A500.inc @@ -9,11 +9,7 @@ StopScript WaitForSomething2 0x00000008 SoundReq 0x0142 _0807E610 0x00000800 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080960C4 -.short 0xa65c -.short 0x0800 -@ End of parameters +CallWithArg sub_080960C4, 0x0800a65c _0807E930 0x0002 Call sub_08094B0C _0807EDD4 0x0068, 0x0088 diff --git a/data/scripts/gUnk_0800A590.inc b/data/scripts/gUnk_0800A590.inc index 5d776d2c..f301574d 100644 --- a/data/scripts/gUnk_0800A590.inc +++ b/data/scripts/gUnk_0800A590.inc @@ -6,27 +6,15 @@ _0807EF80 0x0008 _0807EB44 0x0000 Call sub_0807F714 MoveEntityToPlayer -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F98C -.short 0x0000 -.short 0xfff0 -@ End of parameters +CallWithArg sub_0807F98C, 0xfff00000 StopScript _0807E930 0x0023 WaitForSomething2 0x00000010 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F6E8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F6E8, 0x00000008 _0807EF80 0x0007 SoundReq 0x0142 _0807E610 0x00000800 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080960C4 -.short 0xa65c -.short 0x0800 -@ End of parameters +CallWithArg sub_080960C4, 0x0800a65c Wait 0x003c _0807EDD4 0x0088, 0x0068 Wait 0x0078 diff --git a/data/scripts/gUnk_0800A638.inc b/data/scripts/gUnk_0800A638.inc index 294caac8..66fb4804 100644 --- a/data/scripts/gUnk_0800A638.inc +++ b/data/scripts/gUnk_0800A638.inc @@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800A638 StartScript _0807EF80 0x0007 _0807EF80 0x000b -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F994 -.short 0xfff8 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F994, 0x0000fff8 StopScript WaitForSomething 0x00001000 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800A65C.inc b/data/scripts/gUnk_0800A65C.inc index 02a16290..3dca04c0 100644 --- a/data/scripts/gUnk_0800A65C.inc +++ b/data/scripts/gUnk_0800A65C.inc @@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800A65C StartScript _0807EF80 0x0007 _0807EF80 0x000b -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F994 -.short 0xfff8 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F994, 0x0000fff8 StopScript WaitForSomething 0x00000800 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800A680.inc b/data/scripts/gUnk_0800A680.inc index 7a713f81..b065e201 100644 --- a/data/scripts/gUnk_0800A680.inc +++ b/data/scripts/gUnk_0800A680.inc @@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800A680 StartScript _0807EF80 0x0007 _0807EF80 0x000b -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F994 -.short 0xfff8 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F994, 0x0000fff8 StopScript WaitForSomething 0x00000020 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800A6A4.inc b/data/scripts/gUnk_0800A6A4.inc index d8145bbb..f661c904 100644 --- a/data/scripts/gUnk_0800A6A4.inc +++ b/data/scripts/gUnk_0800A6A4.inc @@ -7,10 +7,6 @@ Call sub_0807F844 StopScript Wait 0x003c SoundReq 0x00f6 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA1C -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA1C, 0x00000008 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A6D4.inc b/data/scripts/gUnk_0800A6D4.inc index 0af66470..5e8f1277 100644 --- a/data/scripts/gUnk_0800A6D4.inc +++ b/data/scripts/gUnk_0800A6D4.inc @@ -7,10 +7,6 @@ Call sub_0807F844 SoundReq 0x00f7 StopScript Wait 0x003c -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA1C -.short 0x0009 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA1C, 0x00000009 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A704.inc b/data/scripts/gUnk_0800A704.inc index dbc2a17f..7fe91929 100644 --- a/data/scripts/gUnk_0800A704.inc +++ b/data/scripts/gUnk_0800A704.inc @@ -7,10 +7,6 @@ Call sub_0807F844 StopScript Wait 0x003c SoundReq 0x00f6 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA1C -.short 0x000a -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA1C, 0x0000000a _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A734.inc b/data/scripts/gUnk_0800A734.inc index 2dc687dc..c54c8c81 100644 --- a/data/scripts/gUnk_0800A734.inc +++ b/data/scripts/gUnk_0800A734.inc @@ -7,10 +7,6 @@ Call sub_0807F844 SoundReq 0x00f7 StopScript Wait 0x003c -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA1C -.short 0x000b -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA1C, 0x0000000b _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A764.inc b/data/scripts/gUnk_0800A764.inc index 78017245..8a63af09 100644 --- a/data/scripts/gUnk_0800A764.inc +++ b/data/scripts/gUnk_0800A764.inc @@ -26,10 +26,6 @@ _0807E5F8 0x00000010 Wait 0x0002 _0807E5F8 0x00000020 Wait 0x0078 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA1C -.short 0x000c -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA1C, 0x0000000c _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A7E4.inc b/data/scripts/gUnk_0800A7E4.inc index 0cae1367..d9419cb4 100644 --- a/data/scripts/gUnk_0800A7E4.inc +++ b/data/scripts/gUnk_0800A7E4.inc @@ -89,10 +89,6 @@ _0807E5F8 0x00000004 Wait 0x000a _0807E5F8 0x00000008 Wait 0x003c -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA1C -.short 0x000d -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA1C, 0x0000000d _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A9F4.inc b/data/scripts/gUnk_0800A9F4.inc index bfd53ef2..c400bba7 100644 --- a/data/scripts/gUnk_0800A9F4.inc +++ b/data/scripts/gUnk_0800A9F4.inc @@ -14,10 +14,6 @@ _0807E5F8 0x00000004 Wait 0x001e _0807E5F8 0x00000008 Wait 0x003c -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA1C -.short 0x000e -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA1C, 0x0000000e _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800AAD8.inc b/data/scripts/gUnk_0800AAD8.inc index 980237ff..38f1dd36 100644 --- a/data/scripts/gUnk_0800AAD8.inc +++ b/data/scripts/gUnk_0800AAD8.inc @@ -7,10 +7,6 @@ Call sub_0807F844 StopScript Wait 0x003c SoundReq 0x00f6 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA1C -.short 0x000f -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA1C, 0x0000000f _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800AB08.inc b/data/scripts/gUnk_0800AB08.inc index 93104427..22ec174f 100644 --- a/data/scripts/gUnk_0800AB08.inc +++ b/data/scripts/gUnk_0800AB08.inc @@ -5,35 +5,17 @@ Call sub_0807DF28 SetEntityPositionRelative 0x01480088 Call sub_0807F844 _0807E8E4_3 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F6E8 -.short 0x0008 -.short 0x0000 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F75C -.short 0x0088 -.short 0x00a8 -@ End of parameters +CallWithArg sub_0807F6E8, 0x00000008 +CallWithArg sub_0807F75C, 0x00a80088 SoundReq 0x00f7 StopScript Wait 0x0078 _0807F0B4 0x0001 SetEntityPositionRelative 0x00780088 Call sub_0807F5C0 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1664 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00001664 _0807EA94 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x165e -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e165e _0807EA94 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DDEC -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DDEC, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_0800AB6E.inc b/data/scripts/gUnk_0800AB6E.inc index 06350a3c..3374e09b 100644 --- a/data/scripts/gUnk_0800AB6E.inc +++ b/data/scripts/gUnk_0800AB6E.inc @@ -8,33 +8,20 @@ WaitForSomething2 0x00000080 SetEntityPosition 0x0000, 0xffe0 Call sub_0807F5C0 Wait 0x003c -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DE18 -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DE18, 0x00000001 _0807F0C8 0x0000, 0x0000 Wait 0x003c _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x165f -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e165f _0807EA94 StartPlayerScript gUnk_0800ACBC WaitForSomething2 0x00000001 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1660 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1660 _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1661 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1661 _0807EA94 _0807E5F8 0x00000008 _0807E5F8 0x00000002 @@ -45,15 +32,9 @@ WaitForSomething2 0x00000010 StartPlayerScript gUnk_0800ACE0 WaitForSomething2 0x00000001 Wait 0x003c -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1662 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1662 _0807EA94 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1663 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1663 _0807EA94 SetEntityPosition 0x0000, 0xffe0 Call sub_0807F5C0 @@ -64,10 +45,7 @@ WaitForSomething2 0x00000004 StartPlayerScript gUnk_0800AD54 WaitForSomething2 0x00000001 Wait 0x003c -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1665 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1665 _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 diff --git a/data/scripts/gUnk_0800ACE0.inc b/data/scripts/gUnk_0800ACE0.inc index aa4cf249..2035165c 100644 --- a/data/scripts/gUnk_0800ACE0.inc +++ b/data/scripts/gUnk_0800ACE0.inc @@ -1,27 +1,15 @@ SCRIPT_START gUnk_0800ACE0 StartScript Call sub_08094BE0 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F238 -.short 0x045b -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F238, 0x0000045b SoundReq 0x0109 StopScript Call sub_0807F304 Wait 0x005a _0807E5F8 0x00000008 StartScript -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F6F8 -.short 0x0008 -.short 0x0000 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F238 -.short 0x08e4 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F6F8, 0x00000008 +CallWithArg sub_0807F238, 0x000008e4 StopScript Call sub_0807F304 _0807EB44 0x0004 diff --git a/data/scripts/gUnk_0800AD54.inc b/data/scripts/gUnk_0800AD54.inc index 8d2c716f..129ae24b 100644 --- a/data/scripts/gUnk_0800AD54.inc +++ b/data/scripts/gUnk_0800AD54.inc @@ -12,43 +12,23 @@ SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 _0807EF80 0x000b _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0004 Wait 0x001e _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 Wait 0x0006 _0807EB44 0x0000 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 Wait 0x0014 _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 _0807E930 0x000c @@ -60,11 +40,7 @@ _0807E930 0x000f Call sub_0807F2D4 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080960C4 -.short 0xaf18 -.short 0x0800 -@ End of parameters +CallWithArg sub_080960C4, 0x0800af18 _0807E930 0x0012 Call sub_0807F2D4 Wait 0x001e diff --git a/data/scripts/gUnk_0800AF18.inc b/data/scripts/gUnk_0800AF18.inc index 26076509..a786d6d5 100644 --- a/data/scripts/gUnk_0800AF18.inc +++ b/data/scripts/gUnk_0800AF18.inc @@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800AF18 StartScript _0807EF80 0x0007 _0807EF80 0x000b -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F994 -.short 0xfff8 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F994, 0x0000fff8 SoundReq 0x0142 StopScript WaitForSomething 0x00000020 diff --git a/data/scripts/gUnk_0800B0D0.inc b/data/scripts/gUnk_0800B0D0.inc index 420cbfab..ec5f10f9 100644 --- a/data/scripts/gUnk_0800B0D0.inc +++ b/data/scripts/gUnk_0800B0D0.inc @@ -2,47 +2,27 @@ SCRIPT_START gUnk_0800B0D0 StartScript Call sub_0806BCD4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806BC94 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806BC94, 0x00000000 StopScript Call sub_0807F434 -.short 0x1006 @ _0807E078 with 3 parameters -.short 0xfff8 -.short 0x0004 -.short 0x0040 -@ End of parameters +_0807E078_sss 0xfff8, 0x0004, 0x0040 _0807E864 Call sub_0807DF28 Call sub_0807F2D4 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806BC94 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806BC94, 0x00000004 Call sub_0806BCE8 _0807EA94 Call sub_0807DF50 _0807E878 Call sub_0806BCB8 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806BC94 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806BC94, 0x00000000 Jump 0xffb6 _0807E864 Call sub_0807DF28 Call sub_0807F2D4 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806BC94 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806BC94, 0x00000004 Call sub_0807F650 _0807E9F0 JumpIfNot 0x0008 @@ -50,11 +30,7 @@ Call sub_0806BCC0 Call sub_0807DF50 _0807E878 Call sub_0806BCB8 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806BC94 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806BC94, 0x00000000 Jump 0xff6e StartScript Call sub_0807DF28 diff --git a/data/scripts/gUnk_0800B5EC.inc b/data/scripts/gUnk_0800B5EC.inc index bab1c892..9c5c030b 100644 --- a/data/scripts/gUnk_0800B5EC.inc +++ b/data/scripts/gUnk_0800B5EC.inc @@ -32,17 +32,9 @@ _0807E3E8 JumpIfNot 0x002a Wait 0x000f TextboxNoOverlap 0x0584 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F970 -.short 0x058b -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F970, 0x0000058b JumpIf 0x001e -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08087424 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_08087424, 0x00000000 Wait 0x00b4 Jump 0x0024 TextboxNoOverlap 0x057d diff --git a/data/scripts/gUnk_0800B6C8.inc b/data/scripts/gUnk_0800B6C8.inc index ea78f758..e097eff5 100644 --- a/data/scripts/gUnk_0800B6C8.inc +++ b/data/scripts/gUnk_0800B6C8.inc @@ -16,11 +16,7 @@ CheckLocalFlag 0x009f JumpIf 0x0098 TextboxNoOverlap 0x057b _0807EA94 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F970 -.short 0x057d -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F970, 0x0000057d JumpIf 0xff88 _0807EA94 SetLocalFlag 0x009f @@ -43,17 +39,9 @@ CheckLocalFlag 0x00a0 JumpIf 0x0036 TextboxNoOverlap 0x0580 _0807EA94 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F970 -.short 0x0582 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F970, 0x00000582 JumpIf 0x0014 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08087424 -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_08087424, 0x00000001 Wait 0x00b4 Jump 0xff14 _0807EA94 diff --git a/data/scripts/gUnk_0800B7C4.inc b/data/scripts/gUnk_0800B7C4.inc index c269e3ac..265c2296 100644 --- a/data/scripts/gUnk_0800B7C4.inc +++ b/data/scripts/gUnk_0800B7C4.inc @@ -2,22 +2,10 @@ SCRIPT_START gUnk_0800B7C4 StartScript SetEntityNonPlanarMovement 0x0100 StopScript -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F6B4 -.short 0x0090 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F6B4, 0x00000090 JumpIfNot 0x0024 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F464 -.short 0x0078 -.short 0x0000 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x0090 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F464, 0x00000078 +CallWithArg sub_0807F4F8, 0x00000090 _0807E8E4_0 _0807EF80 0x0000 _0807E5F8 0x00000004 diff --git a/data/scripts/gUnk_0800B7FC.inc b/data/scripts/gUnk_0800B7FC.inc index d69ca1c8..ead30119 100644 --- a/data/scripts/gUnk_0800B7FC.inc +++ b/data/scripts/gUnk_0800B7FC.inc @@ -1,14 +1,6 @@ SCRIPT_START gUnk_0800B7FC -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x0090 -.short 0x0000 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F464 -.short 0x0078 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F4F8, 0x00000090 +CallWithArg sub_0807F464, 0x00000078 Jump 0xffdc StartScript _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800B828.inc b/data/scripts/gUnk_0800B828.inc index b0ef791a..3ef1e795 100644 --- a/data/scripts/gUnk_0800B828.inc +++ b/data/scripts/gUnk_0800B828.inc @@ -50,11 +50,7 @@ _0807E9D4 _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08064644 -.short 0x464d -.short 0x0806 -@ End of parameters +CallWithArg sub_08064644, 0x0806464d StopScript Wait 0x003c Call sub_080646A4 @@ -106,11 +102,7 @@ _0807EF80 0x0008 Call sub_0806DAAC JumpIf 0x0036 Call sub_0806DAD0 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA04 -.short 0x0005 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA04, 0x00000005 StopScript _0807EA4C _0807E9F0 diff --git a/data/scripts/gUnk_0800B9B4.inc b/data/scripts/gUnk_0800B9B4.inc index 7bfd46d4..524e72eb 100644 --- a/data/scripts/gUnk_0800B9B4.inc +++ b/data/scripts/gUnk_0800B9B4.inc @@ -6,11 +6,7 @@ _0807EF80 0x000a Call sub_080694B0 StopScript Call sub_0807F434 -.short 0x1006 @ _0807E078 with 3 parameters -.short 0xfff8 -.short 0x0004 -.short 0x001e -@ End of parameters +_0807E078_sss 0xfff8, 0x0004, 0x001e _0807E864 _0807EB74 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_0800BC50.inc b/data/scripts/gUnk_0800BC50.inc index 8933436d..cc87ed6a 100644 --- a/data/scripts/gUnk_0800BC50.inc +++ b/data/scripts/gUnk_0800BC50.inc @@ -20,22 +20,14 @@ _0807EB44 0x0000 _0807E930 0x0000 SetEntityNonPlanarMovement 0x0040 _0807EF80 0x000d -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x0378 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F4F8, 0x00000378 Wait 0x003c _0807EF80 0x000c Wait 0x003c TextboxNoOverlap 0x0e09 _0807EA94 Call sub_0807F158 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x035c -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F4F8, 0x0000035c Wait 0x001e SoundReq 0x0188 _0807EF80 0x0008 diff --git a/data/scripts/gUnk_0800BD78.inc b/data/scripts/gUnk_0800BD78.inc index 3ebe8a0b..f9512a8b 100644 --- a/data/scripts/gUnk_0800BD78.inc +++ b/data/scripts/gUnk_0800BD78.inc @@ -8,11 +8,7 @@ Call sub_0807F348 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x0270 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F4F8, 0x00000270 Wait 0x001e TextboxNoOverlap 0x0e0b _0807EA94 @@ -25,17 +21,9 @@ _0807E5F8 0x00000004 _0807EF80 0x000f _0807E930 0x0008 Wait 0x00b4 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0804BF38 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0804BF38, 0x00000000 Wait 0x00b4 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0804BF38 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0804BF38, 0x00000003 _0807EB44 0x0004 _0807E930 0x0000 Wait 0x003c diff --git a/data/scripts/gUnk_0800BECC.inc b/data/scripts/gUnk_0800BECC.inc index f7307d09..5653d2f6 100644 --- a/data/scripts/gUnk_0800BECC.inc +++ b/data/scripts/gUnk_0800BECC.inc @@ -8,11 +8,7 @@ Call sub_0807F348 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x01b8 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e TextboxNoOverlap 0x0e0e _0807EA94 diff --git a/data/scripts/gUnk_0800C004.inc b/data/scripts/gUnk_0800C004.inc index bc5147ef..01cad189 100644 --- a/data/scripts/gUnk_0800C004.inc +++ b/data/scripts/gUnk_0800C004.inc @@ -8,11 +8,7 @@ Call sub_0807F348 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x01b8 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e TextboxNoOverlap 0x0e11 _0807EA94 @@ -27,17 +23,9 @@ _0807E5F8 0x0000001c _0807EF80 0x000f _0807E930 0x0008 Wait 0x00b4 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0804BF38 -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0804BF38, 0x00000001 Wait 0x00b4 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0804BF38 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0804BF38, 0x00000004 _0807EB44 0x0004 _0807E930 0x0000 Wait 0x003c diff --git a/data/scripts/gUnk_0800C160.inc b/data/scripts/gUnk_0800C160.inc index e11522d2..640e28e1 100644 --- a/data/scripts/gUnk_0800C160.inc +++ b/data/scripts/gUnk_0800C160.inc @@ -8,11 +8,7 @@ Call sub_0807F348 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x0128 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e TextboxNoOverlap 0x0e14 _0807EA94 diff --git a/data/scripts/gUnk_0800C2A4.inc b/data/scripts/gUnk_0800C2A4.inc index 00f48da9..633ecb99 100644 --- a/data/scripts/gUnk_0800C2A4.inc +++ b/data/scripts/gUnk_0800C2A4.inc @@ -8,11 +8,7 @@ Call sub_0807F348 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x0128 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e TextboxNoOverlap 0x0e17 _0807EA94 @@ -27,17 +23,9 @@ _0807E5F8 0x0000007c _0807EF80 0x000f _0807E930 0x0008 Wait 0x00b4 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0804BF38 -.short 0x0002 -.short 0x0000 -@ End of parameters +CallWithArg sub_0804BF38, 0x00000002 Wait 0x00b4 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0804BF38 -.short 0x0005 -.short 0x0000 -@ End of parameters +CallWithArg sub_0804BF38, 0x00000005 _0807EB44 0x0004 _0807E930 0x0000 Wait 0x003c diff --git a/data/scripts/gUnk_0800C350.inc b/data/scripts/gUnk_0800C350.inc index fc04abde..ca845fcd 100644 --- a/data/scripts/gUnk_0800C350.inc +++ b/data/scripts/gUnk_0800C350.inc @@ -1,10 +1,6 @@ SCRIPT_START gUnk_0800C350 StartScript -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806D658 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806D658, 0x00000003 SetEntityNonPlanarMovement 0x0200 StopScript CheckRoomFlag 0x00ff diff --git a/data/scripts/gUnk_0800C3CC.inc b/data/scripts/gUnk_0800C3CC.inc index d14faf5a..8a08c0f2 100644 --- a/data/scripts/gUnk_0800C3CC.inc +++ b/data/scripts/gUnk_0800C3CC.inc @@ -4,18 +4,10 @@ Call sub_0806D660 SetEntityNonPlanarMovement 0x0080 StopScript WaitForSomething2 0x00000002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x0048 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F4F8, 0x00000048 Call sub_0806D66C Wait 0x000f -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x0068 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F4F8, 0x00000068 Call sub_0806D67C _0807F0C8 0x001e, 0x0000 SoundReq 0x010b diff --git a/data/scripts/gUnk_0800C410.inc b/data/scripts/gUnk_0800C410.inc index b6169174..f3ddc136 100644 --- a/data/scripts/gUnk_0800C410.inc +++ b/data/scripts/gUnk_0800C410.inc @@ -4,18 +4,10 @@ Call sub_0806D660 SetEntityNonPlanarMovement 0x0080 StopScript WaitForSomething2 0x00000004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x0048 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F4F8, 0x00000048 Call sub_0806D66C Wait 0x000f -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x0068 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F4F8, 0x00000068 Call sub_0806D67C _0807F0C8 0x001e, 0x0000 SoundReq 0x010b diff --git a/data/scripts/gUnk_0800CD7C.inc b/data/scripts/gUnk_0800CD7C.inc index 7cf413c8..dab50fde 100644 --- a/data/scripts/gUnk_0800CD7C.inc +++ b/data/scripts/gUnk_0800CD7C.inc @@ -199,10 +199,7 @@ WaitForSomething2 0x00000008 _0807EB74 _0807E914 0x00000000 Call sub_0806C028 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x125c -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x0002125c _0807EA94 StartPlayerScript gUnk_0800D1B4 WaitForSomething2 0x00000008 @@ -213,10 +210,7 @@ Wait 0x000f _0807E5F8 0x00000020 StartPlayerScript gUnk_0800D1E0 WaitForSomething2 0x00000008 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x125d -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x0002125d Jump 0x00e6 CheckLocalFlag 0x007e JumpIfNot 0x000a @@ -231,10 +225,7 @@ WaitForSomething2 0x00000004 _0807EB74 _0807E914 0x00000000 Call sub_0806C028 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x123d -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x0002123d _0807EA94 StartPlayerScript gUnk_0800D1B4 WaitForSomething2 0x00000008 @@ -248,10 +239,7 @@ JumpIf 0xfffa SoundReq 0x00f8 _0807E5F8 0x00000010 SetLocalFlag 0x007e -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x123e -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x0002123e _0807EA94 Wait 0x000f _0807E930 0x0009 @@ -260,10 +248,7 @@ WaitForSomething2 0x00000004 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Wait 0x001e -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x123f -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x0002123f _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000004 diff --git a/data/scripts/gUnk_0800D1E0.inc b/data/scripts/gUnk_0800D1E0.inc index 31122968..e254626a 100644 --- a/data/scripts/gUnk_0800D1E0.inc +++ b/data/scripts/gUnk_0800D1E0.inc @@ -1,16 +1,8 @@ SCRIPT_START gUnk_0800D1E0 _0807F078 0x0002, 0x0001 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F918 -.short 0x0002 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F918, 0x00000002 SoundReq 0x0109 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F238 -.short 0x01e2 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F238, 0x000001e2 Call sub_0807F304 TextboxNoOverlap 0x0502 _0807EA94 diff --git a/data/scripts/gUnk_0800D414.inc b/data/scripts/gUnk_0800D414.inc index 51a6d2cd..d6588c40 100644 --- a/data/scripts/gUnk_0800D414.inc +++ b/data/scripts/gUnk_0800D414.inc @@ -46,22 +46,8 @@ _0807EF80 0x0000 StopScript Call sub_08062698 Call sub_080626AC -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F0EC -.short 0x0009 -.short 0x0000 -@ End of parameters -.short 0x2806 @ _0807E078 with 9 parameters -.short 0x0012 -.short 0x001a -.short 0x0022 -.short 0x002a -.short 0x0032 -.short 0x003a -.short 0x0042 -.short 0x004a -.short 0x0052 -@ End of parameters +CallWithArg sub_0807F0EC, 0x00000009 +_0807E078_sssssssss 0x0012, 0x001a, 0x0022, 0x002a, 0x0032, 0x003a, 0x0042, 0x004a, 0x0052 _0807EE04 0x0038, 0x0068 Jump 0x004e _0807EE04 0x0078, 0x0068 @@ -103,17 +89,8 @@ _0807EF80 0x0000 StopScript Call sub_08062698 Call sub_080626AC -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F0EC -.short 0x0004 -.short 0x0000 -@ End of parameters -.short 0x1406 @ _0807E078 with 4 parameters -.short 0x0008 -.short 0x0010 -.short 0x0018 -.short 0x0020 -@ End of parameters +CallWithArg sub_0807F0EC, 0x00000004 +_0807E078_ssss 0x0008, 0x0010, 0x0018, 0x0020 _0807EE04 0x0038, 0x0098 Jump 0x001c _0807EE04 0x0058, 0x0098 @@ -136,11 +113,7 @@ _0807EF80 0x0008 Call sub_0806DAAC JumpIf 0x008c Call sub_0806DAD0 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA04 -.short 0x0002 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA04, 0x00000002 StopScript _0807EA4C _0807E9F0 diff --git a/data/scripts/gUnk_0800D76C.inc b/data/scripts/gUnk_0800D76C.inc index 95c12242..23fb2160 100644 --- a/data/scripts/gUnk_0800D76C.inc +++ b/data/scripts/gUnk_0800D76C.inc @@ -10,11 +10,7 @@ WaitForSomething2 0x00000008 _0807EF80 0x0004 Wait 0x003c SoundReq 0x0123 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F464 -.short 0x01e0 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F464, 0x000001e0 _0807EDD4 0x01e0, 0x01d8 _0807EB44 0x0002 _0807EF80 0x0000 @@ -43,11 +39,7 @@ _0807EF80 0x000e Call sub_0806CA5C SetEntity0x20 0x00040000 SoundReq 0x00f5 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F8D0 -.short 0xe000 -.short 0xffff -@ End of parameters +CallWithArg sub_0807F8D0, 0xffffe000 Call sub_0807F8BC JumpIf 0xffee _0807E5F8 0x00000004 diff --git a/data/scripts/gUnk_0800DA60.inc b/data/scripts/gUnk_0800DA60.inc index 48644d2a..9f531b1d 100644 --- a/data/scripts/gUnk_0800DA60.inc +++ b/data/scripts/gUnk_0800DA60.inc @@ -15,24 +15,14 @@ CameraTargetEntity Call sub_0807F5C0 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x162d -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x0002162d _0807EA94 _0807E5F8 0x00000001 Wait 0x001e -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x162e -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x0002162e _0807EA94 _0807E8E4_0 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F75C -.short 0x0138 -.short 0x0078 -@ End of parameters +CallWithArg sub_0807F75C, 0x00780138 _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807F5C0 diff --git a/data/scripts/gUnk_0800DB78.inc b/data/scripts/gUnk_0800DB78.inc index 92bd0e55..58bdf86f 100644 --- a/data/scripts/gUnk_0800DB78.inc +++ b/data/scripts/gUnk_0800DB78.inc @@ -1,11 +1,7 @@ SCRIPT_START gUnk_0800DB78 StartScript StopScript -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F6B4 -.short 0x00a0 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F6B4, 0x000000a0 JumpIf 0xfff4 _0807E864 Call sub_0807F9A4 @@ -36,10 +32,7 @@ WaitForSomething2 0x00000002 _0807E5F8 0x00000001 StartPlayerScript gUnk_0800DE00 WaitForSomething2 0x00000006 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1643 -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x00021643 _0807EA94 _0807EB28 0x1645 _0807EA94 @@ -47,9 +40,5 @@ Call sub_0807F3F8 _0807E5F8 0x00000001 SoundReq0x80100000 Call sub_08094F98 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DDEC -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DDEC, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_0800DC4C.inc b/data/scripts/gUnk_0800DC4C.inc index ab340180..4b03e8d4 100644 --- a/data/scripts/gUnk_0800DC4C.inc +++ b/data/scripts/gUnk_0800DC4C.inc @@ -11,18 +11,10 @@ CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DE18 -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DE18, 0x00000001 _0807F0C8 0x0000, 0x0000 SetLocalFlag 0x0079 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA1C -.short 0x0002 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA1C, 0x00000002 Call sub_0807DF50 _0807E878 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800DCAC.inc b/data/scripts/gUnk_0800DCAC.inc index 9acf6f22..9d75a955 100644 --- a/data/scripts/gUnk_0800DCAC.inc +++ b/data/scripts/gUnk_0800DCAC.inc @@ -4,11 +4,7 @@ _0807EF80 0x000a Call sub_08066E38 StopScript WaitForSomething2 0x00000001 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F8E8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F8E8, 0x00000000 _0807E5F8 0x00000002 CheckRoomFlag 0x0000 JumpIfNot 0xfffa diff --git a/data/scripts/gUnk_0800DDD0.inc b/data/scripts/gUnk_0800DDD0.inc index 873bbe81..77bff632 100644 --- a/data/scripts/gUnk_0800DDD0.inc +++ b/data/scripts/gUnk_0800DDD0.inc @@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800DDD0 StartScript SetEntityNonPlanarMovement 0x0100 StopScript -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x00a0 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F4F8, 0x000000a0 _0807EDD4 0x0078, 0x00a0 _0807EB44 0x0000 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_0800DE50.inc b/data/scripts/gUnk_0800DE50.inc index 522b2fab..e53145c8 100644 --- a/data/scripts/gUnk_0800DE50.inc +++ b/data/scripts/gUnk_0800DE50.inc @@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800DE50 StopScript _0807EB44 0x0004 _0807EF80 0x0000 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F238 -.short 0x03c5 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F238, 0x000003c5 Call sub_0807F304 _0807E5F8 0x00000004 Call sub_080791BC diff --git a/data/scripts/gUnk_0800DF24.inc b/data/scripts/gUnk_0800DF24.inc index 5edcc2dd..133bb63f 100644 --- a/data/scripts/gUnk_0800DF24.inc +++ b/data/scripts/gUnk_0800DF24.inc @@ -19,10 +19,7 @@ Call sub_0807F5C0 Call sub_08066C94 Wait 0x00e9 _0807EF80 0x0007 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x162f -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x0002162f _0807EA94 SoundReq2 0x002f _0807EF80 0x0019 diff --git a/data/scripts/gUnk_0800DFB4.inc b/data/scripts/gUnk_0800DFB4.inc index 26809abf..df19f791 100644 --- a/data/scripts/gUnk_0800DFB4.inc +++ b/data/scripts/gUnk_0800DFB4.inc @@ -6,11 +6,7 @@ SoundReq0x80100000 _0807E864 Call sub_0807DF28 SoundReq 0x00f6 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA1C -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA1C, 0x00000004 Call sub_0807DF50 _0807E878 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800DFE4.inc b/data/scripts/gUnk_0800DFE4.inc index 4c7c69b0..d0363b58 100644 --- a/data/scripts/gUnk_0800DFE4.inc +++ b/data/scripts/gUnk_0800DFE4.inc @@ -4,10 +4,7 @@ Call sub_0807DF28 _0807E864 StopScript SoundReq0x80100000 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1632 -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x00021632 _0807EA94 SetRoomFlag 0x0003 CheckRoomFlag 0x0000 @@ -20,18 +17,11 @@ JumpIfNot 0xfffa _0807E864 Call sub_0807DF28 SetLocalFlag 0x007b -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1639 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1639 _0807EA94 Wait 0x0096 SoundReq 0x00f6 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA1C -.short 0x0005 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA1C, 0x00000005 Call sub_0807DF50 _0807E878 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800E0BC.inc b/data/scripts/gUnk_0800E0BC.inc index b50cfa04..b28961b6 100644 --- a/data/scripts/gUnk_0800E0BC.inc +++ b/data/scripts/gUnk_0800E0BC.inc @@ -5,11 +5,7 @@ _0807EF80 0x000a CheckLocalFlag 0x0093 JumpIf 0x0062 _0807E930 0x0008 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F8E8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F8E8, 0x00000000 StopScript CheckRoomFlag 0x0000 JumpIfNot 0xfffa @@ -52,11 +48,7 @@ _0807EF80 0x000a CheckLocalFlag 0x0094 JumpIf 0x006c _0807E930 0x0010 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F8E8 -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F8E8, 0x00000001 StopScript CheckRoomFlag 0x0001 JumpIfNot 0xfffa @@ -76,20 +68,12 @@ Wait 0x001e _0807EF80 0x0000 _0807EB8C _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 Wait 0x000a TextboxNoOverlap 0x2401 _0807EA94 SetLocalFlag 0x0094 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 _0807E878 StopScript @@ -97,11 +81,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 TextboxNoOverlap 0x2401 _0807EA94 _0807E878 @@ -115,21 +95,13 @@ JumpIfNot 0x001e _0807E9D4 SetEntityPositionRelative 0x01680070 _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 StopScript Jump 0x00fe CheckLocalFlag 0x0095 JumpIf 0x0062 _0807E930 0x0010 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F8E8 -.short 0x0002 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F8E8, 0x00000002 StopScript CheckRoomFlag 0x0002 JumpIfNot 0xfffa @@ -149,18 +121,10 @@ Wait 0x001e _0807EF80 0x0000 _0807EB8C _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 SetLocalFlag 0x0095 _0807EF80 0x0000 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 _0807E878 StopScript @@ -178,34 +142,18 @@ _0807E9DC SetLocalFlag 0x0073 StopScript _0807EB44 0x0000 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000004 _0807EDD4 0x0088, 0x0168 _0807EB44 0x0006 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000004 _0807EDD4 0x0070, 0x0168 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 Jump 0x001e _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 StopScript TextboxNoOverlap 0x2404 _0807EA94 @@ -215,11 +163,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 TextboxNoOverlap 0x2403 _0807EA94 _0807E878 @@ -233,11 +177,7 @@ JumpIf 0x0088 CheckLocalFlag 0x0096 JumpIf 0x0056 _0807E930 0x000c -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F8E8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F8E8, 0x00000000 StopScript CheckRoomFlag 0x0000 JumpIfNot 0xfffa @@ -300,11 +240,7 @@ _0807E878 Jump 0xffe8 StartScript _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 _0807EF80 0x000a _0807E9D4 StopScript @@ -312,22 +248,14 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 TextboxNoOverlap 0x2405 _0807EA94 _0807E878 Jump 0xffe2 StartScript _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 _0807EF80 0x000a _0807E9D4 StopScript @@ -335,11 +263,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 TextboxNoOverlap 0x2407 _0807EA94 _0807E878 diff --git a/data/scripts/gUnk_0800E6B0.inc b/data/scripts/gUnk_0800E6B0.inc index 9029d166..c8156250 100644 --- a/data/scripts/gUnk_0800E6B0.inc +++ b/data/scripts/gUnk_0800E6B0.inc @@ -48,11 +48,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000000 Call sub_0806AFE8 _0807EA94 _0807E878 @@ -85,11 +81,7 @@ _0807E878 Jump 0xffd0 _0807EF80 0x000f _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000004 Call sub_0806AF70 _0807EE04 0x0188, 0x0058 StopScript @@ -127,37 +119,16 @@ _0807E864 _0807EB44 0x0004 StartScript TextboxNoOverlapFollow 0x4501 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F854 -.short 0x0032 -.short 0x0001 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F854 -.short 0x00c8 -.short 0x0002 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F854 -.short 0x0190 -.short 0x0003 -@ End of parameters +CallWithArg sub_0807F854, 0x00010032 +CallWithArg sub_0807F854, 0x000200c8 +CallWithArg sub_0807F854, 0x00030190 StopScript _0807EA94 _0807EB38 -.short 0x1406 @ _0807E078 with 4 parameters -.short 0x00a6 -.short 0x006a -.short 0x0036 -.short 0x0002 -@ End of parameters +_0807E078_ssss 0x00a6, 0x006a, 0x0036, 0x0002 StartScript TextboxNoOverlapFollow 0x4505 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F854 -.short 0x0190 -.short 0x0001 -@ End of parameters +CallWithArg sub_0807F854, 0x00010190 StopScript _0807EA94 HasRupees 0x0190 diff --git a/data/scripts/gUnk_0800E8A4.inc b/data/scripts/gUnk_0800E8A4.inc index 0e3e62d8..d78226ec 100644 --- a/data/scripts/gUnk_0800E8A4.inc +++ b/data/scripts/gUnk_0800E8A4.inc @@ -1,11 +1,7 @@ SCRIPT_START gUnk_0800E8A4 StartScript TextboxNoOverlapFollow 0x4504 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F854 -.short 0x00c8 -.short 0x0001 -@ End of parameters +CallWithArg sub_0807F854, 0x000100c8 StopScript _0807EA94 HasRupees 0x00c8 diff --git a/data/scripts/gUnk_0800E8D6.inc b/data/scripts/gUnk_0800E8D6.inc index 40eb094e..1861c260 100644 --- a/data/scripts/gUnk_0800E8D6.inc +++ b/data/scripts/gUnk_0800E8D6.inc @@ -1,11 +1,7 @@ SCRIPT_START gUnk_0800E8D6 StartScript TextboxNoOverlapFollow 0x4503 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F854 -.short 0x0032 -.short 0x0001 -@ End of parameters +CallWithArg sub_0807F854, 0x00010032 StopScript _0807EA94 HasRupees 0x0032 diff --git a/data/scripts/gUnk_0800EA54.inc b/data/scripts/gUnk_0800EA54.inc index 0a6bc3a1..4abce151 100644 --- a/data/scripts/gUnk_0800EA54.inc +++ b/data/scripts/gUnk_0800EA54.inc @@ -9,11 +9,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000004 Call sub_0807F2D4 _0807E930 0x0009 Call sub_0806CE80 @@ -35,11 +31,7 @@ JumpIfNot 0xfffc StartScript _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806C028 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806C028, 0x00000004 StopScript Call sub_0806C00C JumpIfNot 0xfff8 @@ -164,11 +156,7 @@ Jump 0xffe4 .short 0x0000 StartScript _0807E9D4 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08061FB8 -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_08061FB8, 0x00000001 SetEntityNonPlanarMovement 0x0040 _0807EF80 0x000a _0807EB44 0x0004 @@ -200,21 +188,13 @@ Call sub_080639D0 _0807EF80 0x000a StopScript StartScript -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08063850 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_08063850, 0x00000000 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08063850 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_08063850, 0x00000000 Call sub_08063944 _0807EA94 JumpIfNot 0x0008 @@ -222,11 +202,7 @@ _0807F050 0x0070 WaitPlayerAction8 _0807E878 Call sub_08063874 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08063850 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_08063850, 0x00000000 Jump 0xffc6 StartScript Call sub_08064CC0 @@ -280,11 +256,7 @@ Jump 0xff88 StopScript WaitForSomething2 0x00000002 _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000008 WaitForSomething2 0x00000004 Call sub_0806AED8 WaitForSomething2 0x00000008 @@ -330,11 +302,7 @@ Jump 0xff88 StopScript WaitForSomething2 0x00000010 _0807EB44 0x0006 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000008 WaitForSomething2 0x00000020 Call sub_0806AED8 WaitForSomething2 0x00000040 diff --git a/data/scripts/gUnk_0800EFC0.inc b/data/scripts/gUnk_0800EFC0.inc index 91729462..4dbd2466 100644 --- a/data/scripts/gUnk_0800EFC0.inc +++ b/data/scripts/gUnk_0800EFC0.inc @@ -8,61 +8,29 @@ JumpIf 0x00b0 StopScript Jump 0x0026 _0807EB44 0x0006 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0088, 0x0040 _0807EF80 0x000a _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 _0807EB44 0x0006 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000008 Wait 0x0004 _0807EB44 0x0006 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0068, 0x0040 _0807EF80 0x000a CheckLocalFlag 0x007b @@ -86,27 +54,18 @@ StartPlayerScript gUnk_0800F14C WaitForSomething2 0x00000001 _0807E5F8 0x0000001e WaitForSomething2 0x00000040 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1201 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1201 _0807EA94 WaitForSomething2 0x000003c0 _0807E8E4_0 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1202 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1202 _0807EA94 _0807F034 0x0067 WaitPlayerAction8 _0807E8E4_0 _0807E5F8 0x00000002 WaitForSomething2 0x00000040 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1203 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1203 _0807EA94 _0807E5F8 0x00000002 Call sub_0807DF50 diff --git a/data/scripts/gUnk_0800F184.inc b/data/scripts/gUnk_0800F184.inc index 43da522f..f60a8a51 100644 --- a/data/scripts/gUnk_0800F184.inc +++ b/data/scripts/gUnk_0800F184.inc @@ -22,11 +22,7 @@ _0807E5F8 0x00000040 WaitForSomething2 0x00000002 StopScript StartScript -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F680 -.short 0x01c0 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F680, 0x000001c0 JumpIf 0x0034 StopScript _0807E864 @@ -35,20 +31,13 @@ _0807EB74 _0807E930 0x0008 _0807EF80 0x0004 Wait 0x003c -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1206 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1206 _0807EA94 StartPlayerScript gUnk_0800F33C WaitForSomething2 0x00000400 _0807E878 Jump 0xffbe -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F680 -.short 0x0230 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F680, 0x00000230 JumpIfNot 0x0034 StopScript _0807E864 @@ -57,20 +46,13 @@ _0807EB74 _0807E930 0x0008 _0807EF80 0x0004 Wait 0x003c -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1206 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1206 _0807EA94 StartPlayerScript gUnk_0800F354 WaitForSomething2 0x00000400 _0807E878 Jump 0xff7e -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F6B4 -.short 0x0310 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F6B4, 0x00000310 JumpIf 0x0034 StopScript _0807E864 @@ -79,20 +61,13 @@ _0807EB74 _0807E930 0x0008 _0807EF80 0x0004 Wait 0x003c -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1206 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1206 _0807EA94 StartPlayerScript gUnk_0800F36C WaitForSomething2 0x00000400 _0807E878 Jump 0xff3e -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F6B4 -.short 0x0340 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F6B4, 0x00000340 JumpIfNot 0x0034 StopScript _0807E864 @@ -101,10 +76,7 @@ _0807EB74 _0807E930 0x0008 _0807EF80 0x0004 Wait 0x003c -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1206 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1206 _0807EA94 StartPlayerScript gUnk_0800F384 WaitForSomething2 0x00000400 @@ -120,10 +92,7 @@ StopScript _0807E864 _0807EB74 _0807E930 0x0008 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1208 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1208 _0807EA94 _0807E878 Jump 0xfed4 diff --git a/data/scripts/gUnk_0800F554.inc b/data/scripts/gUnk_0800F554.inc index 8498a957..d256298a 100644 --- a/data/scripts/gUnk_0800F554.inc +++ b/data/scripts/gUnk_0800F554.inc @@ -33,21 +33,13 @@ StartScript _0807EB44 0x0006 _0807E9D4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000008 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000008 Call sub_08064428 _0807EA94 _0807E878 @@ -64,11 +56,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000008 TextboxNoOverlap 0x2511 _0807EA94 Wait 0x000f @@ -117,11 +105,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000004 CheckLocalFlag 0x00cd JumpIf 0x000a TextboxNoOverlap 0x2512 @@ -130,11 +114,7 @@ TextboxNoOverlap 0x251f _0807EA94 Wait 0x000f _0807E878 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 Jump 0xffc4 .short 0x0000 StartScript diff --git a/data/scripts/gUnk_0800F724.inc b/data/scripts/gUnk_0800F724.inc index 20e3c8ad..311f46f9 100644 --- a/data/scripts/gUnk_0800F724.inc +++ b/data/scripts/gUnk_0800F724.inc @@ -26,10 +26,7 @@ SetEntityPositionRelative 0x036800c8 Call sub_0807F5C0 WaitForSomething2 0x00000001 WaitForSomething2 0x00000004 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x2501 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00002501 _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -45,10 +42,7 @@ StartPlayerScript gUnk_0800FA78 WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x2503 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e2503 _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -61,10 +55,7 @@ StartPlayerScript gUnk_0800FA9C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x2504 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e2504 _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -77,10 +68,7 @@ StartPlayerScript gUnk_0800FAC0 WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x2505 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e2505 _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -95,10 +83,7 @@ Wait 0x001e _0807E8E4_0 Call sub_0807F3F8 Wait 0x003c -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1021 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1021 _0807EA94 StartPlayerScript gUnk_0800FAE4 SetEntityPositionRelative 0x025800f0 @@ -107,71 +92,44 @@ CameraTargetEntity Wait 0x001e Call sub_08063C2C WaitForSomething2 0x00000001 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1022 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1022 _0807EA94 _0807E8E4_0 Call sub_08063C14 Call sub_08094CDC Wait 0x001e -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1023 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1023 _0807EA94 Call sub_08063C14 Call sub_08094DD8 Wait 0x001e -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1024 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1024 _0807EA94 Call sub_08063C14 Call sub_08094D34 Wait 0x001e -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1025 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1025 _0807EA94 Call sub_08063C5C -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1026 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1026 _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807E8E4_1 Call sub_08063C2C -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1027 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00001027 _0807EA94 Call sub_08063C74 Wait 0x003c Call sub_08063C14 _0807E8E4_0 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1028 -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e1028 _0807EA94 _0807E8E4_1 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1029 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00001029 _0807EA94 _0807E8E4_0 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x102a -.short 0x000e -@ End of parameters +TextboxNoOverlapFollowPos 0x000e102a _0807EA94 Call sub_08063C14 Call sub_08094D70 @@ -186,40 +144,22 @@ Wait 0x001e _0807E8E4_1 Call sub_0807F3F8 Wait 0x003c -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x102b -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x0000102b _0807EA94 _0807F034 0x000d WaitPlayerAction8 Call sub_0806DC3C Call sub_080791BC -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F244 -.short 0x000d -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F244, 0x0000000d _0807E914 0x000000ff Call sub_0807F5B0 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F29C -.short 0x49d6 -.short 0x0800 -@ End of parameters +CallWithArg sub_0807F29C, 0x080049d6 Wait 0x00b7 _0807E914 0x00000000 Call sub_0807F5B0 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x102c -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x0000102c _0807EA94 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F29C -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F29C, 0x00000000 Call sub_0806DC58 _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/gUnk_0800FAE4.inc b/data/scripts/gUnk_0800FAE4.inc index ccbf8ef7..d0d38459 100644 --- a/data/scripts/gUnk_0800FAE4.inc +++ b/data/scripts/gUnk_0800FAE4.inc @@ -3,22 +3,9 @@ StartScript SetEntityNonPlanarMovement 0x0100 StopScript Call sub_0807F584 -.short 0x1406 @ _0807E078 with 4 parameters -.short 0x0012 -.short 0x001a -.short 0x000e -.short 0x0002 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x027c -.short 0x0000 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F464 -.short 0x00e8 -.short 0x0000 -@ End of parameters +_0807E078_ssss 0x0012, 0x001a, 0x000e, 0x0002 +CallWithArg sub_0807F4F8, 0x0000027c +CallWithArg sub_0807F464, 0x000000e8 _0807EDD4 0x00e8, 0x0270 _0807EB44 0x0000 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_0800FD0C.inc b/data/scripts/gUnk_0800FD0C.inc index 7e869814..76ba4b49 100644 --- a/data/scripts/gUnk_0800FD0C.inc +++ b/data/scripts/gUnk_0800FD0C.inc @@ -8,10 +8,7 @@ CheckLocalFlag 0x00cd JumpIf 0x0030 _0807E864 Call sub_0807F9A4 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x2506 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00002506 _0807EA94 StartPlayerScript gUnk_0800FD80 WaitForSomething2 0x00000008 @@ -21,10 +18,7 @@ CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 JumpIfNot 0xfff6 _0807E864 Call sub_0807F9A4 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x106c -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x0000106c _0807EA94 StartPlayerScript gUnk_0800FD80 WaitForSomething2 0x00000008 diff --git a/data/scripts/gUnk_0800FDA0.inc b/data/scripts/gUnk_0800FDA0.inc index e8d9db8e..e4a5332f 100644 --- a/data/scripts/gUnk_0800FDA0.inc +++ b/data/scripts/gUnk_0800FDA0.inc @@ -83,11 +83,7 @@ CheckInventory1 0x0012 JumpIf 0x004a _0807EB44 0x0006 _0807E9D4 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000008 StopScript StopScript StartScript @@ -98,11 +94,7 @@ JumpIfNot 0xffee StopScript _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000008 Call sub_08064428 _0807EA94 Wait 0x000f diff --git a/data/scripts/gUnk_0800FF18.inc b/data/scripts/gUnk_0800FF18.inc index f84775de..f7700c6c 100644 --- a/data/scripts/gUnk_0800FF18.inc +++ b/data/scripts/gUnk_0800FF18.inc @@ -4,11 +4,7 @@ CheckInventory1 0x0012 JumpIf 0x004a _0807EB44 0x0006 _0807E9D4 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000008 StopScript StopScript StartScript @@ -19,11 +15,7 @@ JumpIfNot 0xffee StopScript _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000008 Call sub_08064428 _0807EA94 Wait 0x000f diff --git a/data/scripts/gUnk_0800FF74.inc b/data/scripts/gUnk_0800FF74.inc index e258b17d..e1cff739 100644 --- a/data/scripts/gUnk_0800FF74.inc +++ b/data/scripts/gUnk_0800FF74.inc @@ -2,11 +2,7 @@ SCRIPT_START gUnk_0800FF74 StartScript _0807EB44 0x0002 _0807E9D4 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000008 Call sub_080644A4 ClearLocalFlag 0x00c7 StopScript @@ -30,11 +26,7 @@ StopScript SetLocalFlag 0x00c7 _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000008 CheckInventory1 0x0048 JumpIf 0x000c TextboxNoOverlap 0x3401 @@ -53,35 +45,19 @@ _0807E888 Call sub_0807F594 _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000008 SoundReq 0x00cd TextboxNoOverlap 0x340a _0807EA94 _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x000c -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x0000000c SetEntityNonPlanarMovement 0x0100 _0807EDD4 0x0018, 0x0108 _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000008 SetLocalFlag 0x00ce Call sub_080644A4 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F5B0 -.short 0x000a -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F5B0, 0x0000000a _0807E878 Jump 0xff1e .short 0x0000 @@ -89,31 +65,19 @@ StartScript _0807E9D4 _0807EF80 0x000a _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080672B0 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_080672B0, 0x00000000 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080672B0 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_080672B0, 0x00000004 TextboxNoOverlapFollow 0x0a01 _0807EA94 Wait 0x000f _0807E878 _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080672B0 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_080672B0, 0x00000000 Jump 0xffd0 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_080100C8.inc b/data/scripts/gUnk_080100C8.inc index 340ed779..ac5aba5f 100644 --- a/data/scripts/gUnk_080100C8.inc +++ b/data/scripts/gUnk_080100C8.inc @@ -48,21 +48,14 @@ _0807E864 _0807EB74 CheckRoomFlag 0x0001 JumpIf 0x0034 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x3001 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00003001 _0807EA94 _0807E3E8 JumpIfNot 0x002e Call sub_080A1608 _0807EA94 _0807E878 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080A1550 -.short 0x01ac -.short 0x0801 -@ End of parameters +CallWithArg sub_080A1550, 0x080101ac JumpIfNot 0xffca SoundReq2 0x0015 SetRoomFlag 0x0001 @@ -78,20 +71,13 @@ StopScript Call sub_080A1270 _0807E864 Call sub_0807DF28 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x3004 -.short 0x0007 -@ End of parameters +TextboxNoOverlapFollowPos 0x00073004 _0807EA94 SoundReq0x80100000 _0807E778 0x0004 DoFade5 WaitFor_2 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F75C -.short 0x0378 -.short 0x0340 -@ End of parameters +CallWithArg sub_0807F75C, 0x03400378 Call sub_080791BC Call sub_0807FB74 _0807E8E4_1 @@ -117,11 +103,7 @@ _0807EA94 Call sub_080A14A8 Call sub_0807DF50 _0807E878 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F5B0 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F5B0, 0x00000000 ClearRoomFlag 0x0001 Call sub_080A169C _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08010264.inc b/data/scripts/gUnk_08010264.inc index dfdd0f66..fdcfa114 100644 --- a/data/scripts/gUnk_08010264.inc +++ b/data/scripts/gUnk_08010264.inc @@ -58,22 +58,8 @@ StopScript StopScript Call sub_08062698 Call sub_080626AC -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F0EC -.short 0x0009 -.short 0x0000 -@ End of parameters -.short 0x2806 @ _0807E078 with 9 parameters -.short 0x0012 -.short 0x001a -.short 0x0022 -.short 0x002a -.short 0x0032 -.short 0x003a -.short 0x0042 -.short 0x004a -.short 0x0052 -@ End of parameters +CallWithArg sub_0807F0EC, 0x00000009 +_0807E078_sssssssss 0x0012, 0x001a, 0x0022, 0x002a, 0x0032, 0x003a, 0x0042, 0x004a, 0x0052 _0807EE04 0x0358, 0x0078 Jump 0x004e _0807EE04 0x0390, 0x0078 @@ -111,11 +97,7 @@ StartScript _0807E9D4 _0807EB44 0x0004 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000004 StopScript Wait 0x003c Call sub_0806407C @@ -125,11 +107,7 @@ StartScript _0807E9D4 _0807EB44 0x0004 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 StopScript CheckEntityInteractType JumpIfNot 0xfffc @@ -161,20 +139,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000004 Call sub_080636D8 _0807EA94 Wait 0x000f _0807E878 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 Jump 0xffd2 StartScript _0807EB44 0x0004 @@ -187,20 +157,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000004 Call sub_08063C90 _0807EA94 Wait 0x000f _0807E878 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 Jump 0xffd2 StartScript _0807EB44 0x0004 @@ -213,26 +175,14 @@ JumpIfNot 0xfffc _0807E864 Call sub_0807DF28 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000008 CheckRoomFlag 0x000e JumpIf 0x000c SetRoomFlag 0x000e TextboxNoOverlap 0x2b10 _0807EA94 Call sub_080634E4 -.short 0x2006 @ _0807E078 with 7 parameters -.short 0x000e -.short 0x0020 -.short 0x0036 -.short 0x0034 -.short 0x000e -.short 0x0024 -.short 0x002e -@ End of parameters +_0807E078_sssssss 0x000e, 0x0020, 0x0036, 0x0034, 0x000e, 0x0024, 0x002e TextboxNoOverlap 0x2b0d Jump 0x0096 CheckGlobalFlag 0x003d @@ -245,19 +195,11 @@ CheckGlobalFlag 0x003b JumpIfNot 0x0072 Jump 0x0002 Call sub_080634EC -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F78C -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F78C, 0x00000000 _0807EA94 _0807E3E8 JumpIfNot 0x005a -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F7C4 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F7C4, 0x00000000 JumpIfNot 0x0030 _0807E48C 0x0020 JumpIfNot 0x0030 @@ -265,11 +207,7 @@ Call sub_08063504 JumpIf 0x002e TextboxNoOverlap 0x2b07 _0807EA94 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F800 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F800, 0x00000000 WaitPlayerAction8 _0807EA94 TextboxNoOverlap 0x2b0c @@ -339,12 +277,9 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x0411 @ HasRoomItemForSale with 0 parameters +HasRoomItemForSale Call sub_0807F77C -.short 0x0c5d @ _0807EAF0 with 2 parameters -.short 0x3c08 -.short 0x3c09 -@ End of parameters +_0807EAF0 0x3c08, 0x3c09 _0807EA94 _0807E878 _0807EB44 0x0004 @@ -362,16 +297,12 @@ _0807E864 _0807EB74 Call sub_0807F2D4 _0807EF80 0x0000 -.short 0x0411 @ HasRoomItemForSale with 0 parameters +HasRoomItemForSale JumpIf 0x000a TextboxNoOverlap 0x3c07 Jump 0x0048 Call sub_08062EB8 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F78C -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F78C, 0x00000000 _0807EA94 _0807E3E8 JumpIfNot 0x0030 @@ -457,7 +388,7 @@ StopScript StartScript CheckPlayerInRegion2 0x3030 JumpIfNot 0xffe4 -.short 0x0411 @ HasRoomItemForSale with 0 parameters +HasRoomItemForSale JumpIf 0x004c CheckEntityInteractType JumpIfNot 0xffea diff --git a/data/scripts/gUnk_08010A98.inc b/data/scripts/gUnk_08010A98.inc index 60379c95..00775f4e 100644 --- a/data/scripts/gUnk_08010A98.inc +++ b/data/scripts/gUnk_08010A98.inc @@ -1,11 +1,7 @@ SCRIPT_START gUnk_08010A98 StartScript _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080672B0 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_080672B0, 0x00000000 _0807EF80 0x000a Call sub_08067314 StopScript @@ -13,20 +9,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080672B0 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_080672B0, 0x00000004 Call sub_08067304 _0807EA94 _0807E878 _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080672B0 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_080672B0, 0x00000000 Jump 0xffd2 StartScript CheckInventory1 0x0067 @@ -34,8 +22,7 @@ JumpIfNot 0x0076 _0807EB44 0x0004 _0807EF80 0x0000 SetEntityNonPlanarMovement 0x0180 -.short 0x0c0c @ CallWithArg with 0 parameters -.word sub_0807F348 +CallWithArg_p sub_0807F348 Call sub_0806075C StopScript _0807EA94 @@ -48,11 +35,7 @@ StopScript StartScript _0807E564 JumpIf 0x0010 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080608E4 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_080608E4, 0x00000000 JumpIf 0x000c _0807EE30 JumpIfNot 0xffe4 @@ -61,11 +44,7 @@ StopScript _0807EF80 0x0000 StopScript StartScript -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080608E4 -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_080608E4, 0x00000001 JumpIf 0xfff0 StopScript Jump 0xffbc diff --git a/data/scripts/gUnk_08010BB4.inc b/data/scripts/gUnk_08010BB4.inc index 9132cb25..c0fb63d9 100644 --- a/data/scripts/gUnk_08010BB4.inc +++ b/data/scripts/gUnk_08010BB4.inc @@ -22,24 +22,15 @@ Call sub_0807DF28 StartPlayerScript gUnk_08011074 WaitForSomething2 0x00000400 _0807F078 0x0034, 0x0002 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1036 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1036 _0807EA94 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1037 -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x00021037 _0807EA94 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1038 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1038 _0807EA94 SoundReq0x80100000 _0807E778 0x0004 @@ -76,10 +67,7 @@ WaitForSomething2 0x00055000 _0807E8E4_1 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1039 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1039 _0807EA94 SoundReq2 0x0001 _0807E8E4_2 @@ -92,10 +80,7 @@ WaitForSomething2 0x00000080 Wait 0x012c _0807E5F8 0x00000004 WaitForSomething2 0x00000008 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x103a -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c103a _0807EA94 SetEntityPositionRelative 0x01c001f8 _0807F0B4 0x0004 @@ -113,10 +98,7 @@ SoundReq0x80100000 SoundReq 0x009b _0807E5F8 0x00000100 WaitForSomething2 0x00000200 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1043 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00001043 _0807EA94 SoundReq2 0x000d _0807E5F8 0x00000100 @@ -127,19 +109,12 @@ SoundReq 0x01c7 SoundReq 0x00e5 _0807E5F8 0x00000100 _0807E5F8 0x00002800 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FB28 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807FB28, 0x00000003 WaitForSomething2 0x00000200 WaitForSomething2 0x00005000 _0807E5F8 0x00028000 WaitForSomething2 0x00050000 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1044 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00001044 _0807EA94 SetEntityPositionRelative 0x009801f8 SoundReq0x80100000 @@ -149,26 +124,14 @@ _0807E5F8 0x00028000 _0807E5F8 0x00000100 WaitForSomething2 0x00000200 WaitForSomething2 0x00050000 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FB28 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807FB28, 0x00000003 SoundReq 0x00e5 _0807E5F8 0x00028000 WaitForSomething2 0x00050000 SoundReq 0x0125 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FB28 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807FB28, 0x00000003 _0807E5F8 0x08000000 _0807E5F8 0x00800000 WaitForSomething2 0x01000000 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DDEC -.short 0x0002 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DDEC, 0x00000002 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_08010E5A.inc b/data/scripts/gUnk_08010E5A.inc index 091372b0..49c34af6 100644 --- a/data/scripts/gUnk_08010E5A.inc +++ b/data/scripts/gUnk_08010E5A.inc @@ -1,25 +1,13 @@ SCRIPT_START gUnk_08010E5A Wait 0x001e SoundReq 0x0125 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FB28 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807FB28, 0x00000003 Wait 0x003c SoundReq 0x0125 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FB28 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807FB28, 0x00000003 Wait 0x0004 SoundReq 0x0125 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FB28 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807FB28, 0x00000003 Wait 0x001e SoundReq 0x012c _0807E5F8 0x00800000 @@ -36,24 +24,12 @@ WaitForSomething2 0x00000020 _0807E778 0x0002 DoFade6 WaitFor_2 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DE18 -.short 0x0002 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DE18, 0x00000002 _0807F0C8 0x0000, 0x0000 Call sub_0806DC3C Call sub_080791BC -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F244 -.short 0x000d -.short 0x0000 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F29C -.short 0x49f6 -.short 0x0800 -@ End of parameters +CallWithArg sub_0807F244, 0x0000000d +CallWithArg sub_0807F29C, 0x080049f6 _0807F0B4 0x0001 SetEntityPositionRelative 0x006801f8 _0807E5F8 0x00000004 @@ -64,30 +40,16 @@ WaitForSomething2 0x00000080 SoundReq 0x01c3 _0807E5F8 0x20000000 Wait 0x0078 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F29C -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F29C, 0x00000000 Call sub_0806DC58 _0807E5F8 0x40000000 _0807E5F8 0x00000010 _0807E5F8 0x00000100 WaitForSomething2 0x00000020 WaitForSomething2 0x00000200 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1045 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1045 _0807EA94 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1046 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00001046 _0807EA94 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DDEC -.short 0x0002 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DDEC, 0x00000002 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_08010F84.inc b/data/scripts/gUnk_08010F84.inc index a9b0d8c3..83aaab92 100644 --- a/data/scripts/gUnk_08010F84.inc +++ b/data/scripts/gUnk_08010F84.inc @@ -4,68 +4,35 @@ _0807E5F8 0x00000100 WaitForSomething2 0x00000200 StartPlayerScript gUnk_080110BC WaitForSomething2 0x00000400 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1047 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00001047 _0807EA94 Call sub_0806DC3C Call sub_080791BC -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F244 -.short 0x000d -.short 0x0000 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F29C -.short 0x49f6 -.short 0x0800 -@ End of parameters +CallWithArg sub_0807F244, 0x0000000d +CallWithArg sub_0807F29C, 0x080049f6 Wait 0x001e _0807E5F8 0x00000100 WaitForSomething2 0x00000200 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F29C -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F29C, 0x00000000 Call sub_0806DC58 Wait 0x003c _0807E5F8 0x08000000 SoundReq 0x0125 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FB28 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807FB28, 0x00000003 Wait 0x000f SoundReq 0x0125 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FB28 -.short 0x0003 -.short 0x0000 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DE18 -.short 0x0002 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807FB28, 0x00000003 +CallWithArg sub_0805DE18, 0x00000002 _0807F0C8 0x0000, 0x0000 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 SoundReq0x80100000 Wait 0x003c -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x104a -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x0000104a _0807EA94 _0807E5F8 0x00000100 WaitForSomething2 0x00000200 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1049 -.short 0x0000 -@ End of parameters +TextboxNoOverlapFollowPos 0x00001049 _0807EA94 SetEntityPositionRelative 0x009801f8 Wait 0x0078 diff --git a/data/scripts/gUnk_080112C4.inc b/data/scripts/gUnk_080112C4.inc index cba7271c..6f7084ff 100644 --- a/data/scripts/gUnk_080112C4.inc +++ b/data/scripts/gUnk_080112C4.inc @@ -15,12 +15,7 @@ Wait 0x003c _0807ECC4 0x0010 _0807E930 0x0002 Call sub_08064050 -.short 0x1406 @ _0807E078 with 4 parameters -.short 0x0008 -.short 0x009e -.short 0x0134 -.short 0x01f8 -@ End of parameters +_0807E078_ssss 0x0008, 0x009e, 0x0134, 0x01f8 _0807E610 0x00000800 _0807E5F8 0x00001000 WaitForSomething2 0x00000800 diff --git a/data/scripts/gUnk_080116A8.inc b/data/scripts/gUnk_080116A8.inc index 91e4eaa3..0b7419aa 100644 --- a/data/scripts/gUnk_080116A8.inc +++ b/data/scripts/gUnk_080116A8.inc @@ -33,11 +33,7 @@ WaitForSomething2 0x00000100 _0807EB44 0x0000 _0807EF80 0x0014 SoundReq 0x0120 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095420 -.short 0x1890 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095420, 0x08011890 Wait 0x00f0 _0807EF80 0x0016 SoundReq 0x01cb @@ -54,11 +50,7 @@ _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EF80 0x0014 SoundReq 0x01c4 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0809545C -.short 0x18d4 -.short 0x0801 -@ End of parameters +CallWithArg sub_0809545C, 0x080118d4 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 Wait 0x003c diff --git a/data/scripts/gUnk_0801194C.inc b/data/scripts/gUnk_0801194C.inc index 725a60b7..40a6ed1f 100644 --- a/data/scripts/gUnk_0801194C.inc +++ b/data/scripts/gUnk_0801194C.inc @@ -11,21 +11,13 @@ StartScript _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 CheckGlobalFlag 0x0015 JumpIf 0x000a TextboxNoOverlapFollow 0x103d @@ -39,11 +31,7 @@ StartScript _0807E9D4 _0807EB44 0x0004 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x000c -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x0000000c StopScript Wait 0x003c Call sub_0806407C @@ -61,21 +49,13 @@ StartScript _0807EB44 0x0006 _0807E9D4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 Call sub_08064428 _0807EA94 _0807E878 @@ -85,21 +65,13 @@ StartScript _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 TextboxNoOverlapFollow 0x1320 _0807EA94 _0807E878 @@ -108,26 +80,14 @@ StartScript _0807EB44 0x0002 _0807E9D4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080644B4 -.short 0x0006 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 +CallWithArg sub_080644B4, 0x00000006 JumpIf 0x005e TextboxNoOverlapFollow 0x1320 _0807EA94 @@ -138,21 +98,13 @@ StartScript _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 TextboxNoOverlapFollow 0x1322 _0807EA94 _0807E878 @@ -162,17 +114,10 @@ JumpIfNot 0xfffa _0807E864 Call sub_0807F9A4 Call sub_0807DF28 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1321 -.short 0x0007 -@ End of parameters +TextboxNoOverlapFollowPos 0x00071321 _0807EA94 SetLocalFlag 0x0010 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA1C -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA1C, 0x00000003 _0807E878 Call sub_0807DF50 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08011B20.inc b/data/scripts/gUnk_08011B20.inc index 35081eb2..b202d00e 100644 --- a/data/scripts/gUnk_08011B20.inc +++ b/data/scripts/gUnk_08011B20.inc @@ -1,10 +1,7 @@ SCRIPT_START gUnk_08011B20 _0807E864 Call sub_0807DF28 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1320 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1320 _0807EA94 _0807E878 Call sub_0807DF50 diff --git a/data/scripts/gUnk_08011B40.inc b/data/scripts/gUnk_08011B40.inc index 6ad1ab68..c3171095 100644 --- a/data/scripts/gUnk_08011B40.inc +++ b/data/scripts/gUnk_08011B40.inc @@ -39,11 +39,7 @@ ModRupees 0xfff6 Wait 0x001e TextboxNoOverlap 0x3d06 _0807EA94 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806C2A0 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806C2A0, 0x00000000 WaitFor_2 Wait 0x003c Call sub_0806C224 @@ -51,11 +47,7 @@ Jump 0xffb8 StartScript _0807E888 StopScript -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806C2A0 -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806C2A0, 0x00000001 WaitFor_2 Wait 0x003c _0807E878 @@ -77,11 +69,7 @@ JumpIfNot 0xfffa _0807E888 WaitPlayerAction8 Wait 0x001e -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806C2A0 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806C2A0, 0x00000000 WaitFor_2 Wait 0x003c Call sub_0806C280 diff --git a/data/scripts/gUnk_08011C50.inc b/data/scripts/gUnk_08011C50.inc index 7edf3874..3ef468d6 100644 --- a/data/scripts/gUnk_08011C50.inc +++ b/data/scripts/gUnk_08011C50.inc @@ -3,11 +3,7 @@ StartScript _0807E864 StopScript Wait 0x003c -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806C2A0 -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806C2A0, 0x00000001 WaitFor_2 Wait 0x003c _0807EF80 0x0014 diff --git a/data/scripts/gUnk_0801232C.inc b/data/scripts/gUnk_0801232C.inc index 2a3be8da..98468103 100644 --- a/data/scripts/gUnk_0801232C.inc +++ b/data/scripts/gUnk_0801232C.inc @@ -29,9 +29,7 @@ StartScript _0807E778 0x0004 _0807E788 0x00007fff DoFade5 -.short 0x0842 @ _0807E858 with 1 parameters -.short 0x0080 -@ End of parameters +_0807E858 0x0080 StopScript WaitFor_2 SoundReq2 0x002c @@ -55,9 +53,7 @@ StartScript _0807E778 0x0004 _0807E788 0xffffffff DoFade4 -.short 0x0842 @ _0807E858 with 1 parameters -.short 0x0080 -@ End of parameters +_0807E858 0x0080 StopScript WaitFor_2 SoundReq2 0xffff diff --git a/data/scripts/gUnk_08012430.inc b/data/scripts/gUnk_08012430.inc index 5b134e84..ddb03a27 100644 --- a/data/scripts/gUnk_08012430.inc +++ b/data/scripts/gUnk_08012430.inc @@ -32,18 +32,13 @@ _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript gUnk_08012AB0 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1101 -.short 0x0007 -@ End of parameters +TextboxNoOverlapFollowPos 0x00071101 _0807EA94 CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 -.short 0x0842 @ _0807E858 with 1 parameters -.short 0x0000 -@ End of parameters +_0807E858 0x0000 Call sub_080791BC LoadRoomEntityList gUnk_080F4D70 Call DeleteAllEnemies @@ -153,11 +148,7 @@ Wait 0x003c SoundReq2 0xffff Call sub_08054570 SetGlobalFlag 0x0014 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F6F8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F6F8, 0x00000008 Call sub_0807DF50 _0807E878 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_080126FC.inc b/data/scripts/gUnk_080126FC.inc index c78d88d0..0cd25565 100644 --- a/data/scripts/gUnk_080126FC.inc +++ b/data/scripts/gUnk_080126FC.inc @@ -7,20 +7,14 @@ _0807E930 0x0020 WaitForSomething2 0x00000004 _0807E930 0x0022 Call sub_0807F3C8 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1102 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1102 _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1103 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1103 _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 @@ -31,44 +25,29 @@ _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807EF80 0x0011 _0807E930 0x001c -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1105 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1105 _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0022 Call sub_0807F3C8 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1106 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1106 _0807EA94 _0807E930 0x001c Call sub_0806D96C -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1107 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1107 _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1108 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1108 _0807EA94 _0807E930 0x001c Call sub_0806D96C -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1109 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1109 _0807EA94 _0807E930 0x0020 _0807EF80 0x000a @@ -84,21 +63,14 @@ StopScript _0807E864 Call sub_0806D944 _0807E930 0x0010 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1114 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1114 _0807EA94 _0807E930 0x0020 _0807E878 Jump 0xffd0 _0807E864 _0807E9DC -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F5B0 -.short 0x003c -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F5B0, 0x0000003c Call sub_080791D0 StopScript _0807E5F8 0x00000008 @@ -108,19 +80,13 @@ _0807E5F8 0x00000008 WaitForSomething2 0x00000004 Call sub_0806D944 _0807E930 0x0010 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x110a -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c110a _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x110b -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c110b _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 @@ -128,28 +94,19 @@ WaitForSomething2 0x00000004 _0807EF80 0x0004 Wait 0x003c _0807E930 0x0010 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x110c -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c110c _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x110d -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c110d _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x110e -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c110e _0807EA94 _0807E930 0x0018 SetEntityNonPlanarMovement 0x0080 @@ -170,10 +127,7 @@ Jump 0xffe6 _0807E864 _0807E930 0x0010 StopScript -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1115 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1115 _0807EA94 _0807E930 0x0018 _0807E878 @@ -185,10 +139,7 @@ Call sub_0807DF28 _0807EB8C Call sub_0806D944 _0807E930 0x0010 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x110f -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c110f _0807E930 0x0018 SetEntityNonPlanarMovement 0x0080 Call sub_0806D908 @@ -209,10 +160,7 @@ Jump 0xffe6 _0807E864 _0807E930 0x0010 StopScript -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1115 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1115 _0807EA94 _0807E930 0x0018 _0807E878 @@ -224,10 +172,7 @@ Call sub_0807DF28 _0807EB8C Call sub_0806D944 _0807E930 0x0010 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1110 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1110 _0807E930 0x0018 SetEntityNonPlanarMovement 0x0080 Call sub_0806D908 @@ -249,10 +194,7 @@ Jump 0xffe6 _0807E864 _0807E930 0x0010 StopScript -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1115 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1115 _0807EA94 _0807E930 0x0018 _0807E878 @@ -266,10 +208,7 @@ _0807EF80 0x000b _0807EB8C Call sub_0806D944 _0807E930 0x0010 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1111 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1111 _0807E930 0x0018 SetEntityNonPlanarMovement 0x0080 Call sub_0806D8A0 diff --git a/data/scripts/gUnk_08012B24.inc b/data/scripts/gUnk_08012B24.inc index 8e8f794d..2288d819 100644 --- a/data/scripts/gUnk_08012B24.inc +++ b/data/scripts/gUnk_08012B24.inc @@ -6,10 +6,6 @@ StopScript _0807EF80 0x0001 _0807ECC4 0x0008 _0807E5F8 0x00000002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FB64 -.short 0xffe2 -.short 0xffff -@ End of parameters +CallWithArg sub_0807FB64, 0xffffffe2 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08012B50.inc b/data/scripts/gUnk_08012B50.inc index ff9ca34e..9f72bb79 100644 --- a/data/scripts/gUnk_08012B50.inc +++ b/data/scripts/gUnk_08012B50.inc @@ -6,10 +6,6 @@ StopScript _0807EF80 0x0001 _0807EC64 0x0008 _0807E5F8 0x00000002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FB64 -.short 0xffe2 -.short 0xffff -@ End of parameters +CallWithArg sub_0807FB64, 0xffffffe2 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08012B7C.inc b/data/scripts/gUnk_08012B7C.inc index 9083222f..7a39ce95 100644 --- a/data/scripts/gUnk_08012B7C.inc +++ b/data/scripts/gUnk_08012B7C.inc @@ -6,10 +6,6 @@ StopScript _0807EF80 0x0001 _0807EC94 0x0008 _0807E5F8 0x00000002 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FB64 -.short 0xffe2 -.short 0xffff -@ End of parameters +CallWithArg sub_0807FB64, 0xffffffe2 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08012E88.inc b/data/scripts/gUnk_08012E88.inc index 09b786f6..f58b1f06 100644 --- a/data/scripts/gUnk_08012E88.inc +++ b/data/scripts/gUnk_08012E88.inc @@ -18,11 +18,7 @@ Jump 0xffe2 .short 0x0000 StartScript _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000008 _0807EF80 0x000a Call sub_0806B60C StopScript @@ -30,18 +26,10 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x000c -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x0000000c Call sub_0806B4F0 _0807EA94 Wait 0x000f _0807E878 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000008 Jump 0xffd2 diff --git a/data/scripts/gUnk_08012F0C.inc b/data/scripts/gUnk_08012F0C.inc index 3ec14ff9..8b37b976 100644 --- a/data/scripts/gUnk_08012F0C.inc +++ b/data/scripts/gUnk_08012F0C.inc @@ -1,10 +1,6 @@ SCRIPT_START gUnk_08012F0C StartScript -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806A93C -.short 0x5678 -.short 0x1234 -@ End of parameters +CallWithArg sub_0806A93C, 0x12345678 _0807EB44 0x0004 _0807E930 0x0002 CheckInventory1 0x0015 diff --git a/data/scripts/gUnk_08012F86.inc b/data/scripts/gUnk_08012F86.inc index d546118e..bfac0bf0 100644 --- a/data/scripts/gUnk_08012F86.inc +++ b/data/scripts/gUnk_08012F86.inc @@ -11,11 +11,7 @@ StopScript WaitForSomething2 0x00000004 _0807E908 0x0004 Call sub_0806A958 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F93C -.short 0xf2f4 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F93C, 0x0000f2f4 Call sub_0807DF50 _0807E878 SetLocalFlag 0x0062 @@ -24,11 +20,7 @@ StartScript _0807E930 0x000d _0807E908 0x0005 SetLocalFlag 0x0062 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F93C -.short 0xf2f4 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F93C, 0x0000f2f4 Call sub_0806AA10 StopScript CheckInventory1 0x0038 diff --git a/data/scripts/gUnk_08013114.inc b/data/scripts/gUnk_08013114.inc index 0dba30ec..e1ddddb9 100644 --- a/data/scripts/gUnk_08013114.inc +++ b/data/scripts/gUnk_08013114.inc @@ -15,23 +15,11 @@ _0807E864 StopScript _0807EB74 Call sub_0806AED8 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AA50 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AA50, 0x00000000 _0807EA94 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AA50 -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AA50, 0x00000001 _0807EA94 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AA50 -.short 0x0002 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AA50, 0x00000002 _0807EA94 JumpIf 0x0008 _0807E878 diff --git a/data/scripts/gUnk_0801319A.inc b/data/scripts/gUnk_0801319A.inc index 6112595c..befc408e 100644 --- a/data/scripts/gUnk_0801319A.inc +++ b/data/scripts/gUnk_0801319A.inc @@ -30,10 +30,7 @@ Call sub_080536B8 _0807E864 Call sub_0807DF28 WaitFor_2 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1602 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1602 _0807EA94 _0807E5F8 0x00000008 WaitForSomething2 0x00000010 @@ -47,10 +44,7 @@ WaitForSomething2 0x00000040 StartPlayerScript gUnk_08013378 _0807E5F8 0x00000020 WaitForSomething2 0x00000042 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1603 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1603 _0807EA94 _0807E5F8 0x00000020 WaitForSomething2 0x00000040 @@ -59,16 +53,11 @@ _0807E778 0x0004 DoFade5 WaitFor_2 SoundReq0x80100000 -.short 0x0842 @ _0807E858 with 1 parameters -.short 0x0000 -@ End of parameters +_0807E858 0x0000 Wait 0x003c CameraTargetPlayer Call sub_0807F5C0 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1604 -.short 0x0007 -@ End of parameters +TextboxNoOverlapFollowPos 0x00071604 _0807EA94 _0807E788 0xffffffff _0807E778 0x0004 diff --git a/data/scripts/gUnk_080133F8.inc b/data/scripts/gUnk_080133F8.inc index 5aef14e5..b6dc0fa5 100644 --- a/data/scripts/gUnk_080133F8.inc +++ b/data/scripts/gUnk_080133F8.inc @@ -15,11 +15,7 @@ WaitForSomething2 0x00000020 Wait 0x003c _0807EF80 0x0014 SoundReq 0x0120 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095420 -.short 0x3494 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095420, 0x08013494 Wait 0x005a _0807EF80 0x0016 WaitForSomething2 0x00000080 diff --git a/data/scripts/gUnk_080134DC.inc b/data/scripts/gUnk_080134DC.inc index 96dd691d..41aaa6db 100644 --- a/data/scripts/gUnk_080134DC.inc +++ b/data/scripts/gUnk_080134DC.inc @@ -4,11 +4,7 @@ _0807EF80 0x0008 StopScript StartScript Call sub_0807F92C -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA04 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA04, 0x00000003 StopScript CheckEntityInteractType JumpIfNot 0xfffc @@ -16,82 +12,38 @@ _0807E864 Call sub_0807DF28 StartPlayerScript gUnk_080136D8 WaitForSomething2 0x00000001 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095A1C -.short 0x3f04 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095A1C, 0x08013f04 SoundReq 0x01cd Wait 0x005a StartScript SoundReq 0x01ce -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D54 -.short 0x3e04 -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D54 -.short 0x3e28 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095D54, 0x08013e04 +CallWithArg sub_08095D54, 0x08013e28 StopScript WaitForSomething2 0x18000000 StartScript SoundReq 0x01cf -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4054 -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4074 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095D8C, 0x08014054 +CallWithArg sub_08095D8C, 0x08014074 StopScript Wait 0x001e StartScript SoundReq 0x01d0 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x40dc -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4118 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095D8C, 0x080140dc +CallWithArg sub_08095D8C, 0x08014118 StopScript Wait 0x003c -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DDEC -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DDEC, 0x00000000 _0807E5F8 0x00000200 WaitForSomething2 0x00002000 SoundReq 0x01d2 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x41dc -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4210 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095D8C, 0x080141dc +CallWithArg sub_08095D8C, 0x08014210 _0807E5F8 0x00000400 WaitForSomething2 0x00004000 Wait 0x0078 _0807E5F8 0x00000060 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DE18 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DE18, 0x00000000 Wait 0x0078 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 @@ -113,15 +65,8 @@ _0807E778 0x0002 DoFade6 WaitFor_2 SoundReq 0x0109 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x0503 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c0503 _0807EA94 _0807E5F8 0x00040000 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DDEC -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DDEC, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_08013650.inc b/data/scripts/gUnk_08013650.inc index df963b06..6f8fb40d 100644 --- a/data/scripts/gUnk_08013650.inc +++ b/data/scripts/gUnk_08013650.inc @@ -7,11 +7,7 @@ CameraTargetEntity Wait 0x003c _0807E5F8 0x00000004 Wait 0x0078 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DE18 -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DE18, 0x00000001 _0807F0C8 0x0000, 0x0000 StartPlayerScript gUnk_080136B4 WaitForSomething2 0x00000002 diff --git a/data/scripts/gUnk_080136D8.inc b/data/scripts/gUnk_080136D8.inc index bee3975f..8a73634a 100644 --- a/data/scripts/gUnk_080136D8.inc +++ b/data/scripts/gUnk_080136D8.inc @@ -3,22 +3,9 @@ StartScript SetEntityNonPlanarMovement 0x0100 StopScript Call sub_0807F584 -.short 0x1406 @ _0807E078 with 4 parameters -.short 0x0008 -.short 0x0010 -.short 0x0018 -.short 0x000c -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F464 -.short 0x00d0 -.short 0x0000 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F4F8 -.short 0x0124 -.short 0x0000 -@ End of parameters +_0807E078_ssss 0x0008, 0x0010, 0x0018, 0x000c +CallWithArg sub_0807F464, 0x000000d0 +CallWithArg sub_0807F4F8, 0x00000124 _0807EDD4 0x00e8, 0x0124 _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_08013720.inc b/data/scripts/gUnk_08013720.inc index 735a3f1e..4437f1c7 100644 --- a/data/scripts/gUnk_08013720.inc +++ b/data/scripts/gUnk_08013720.inc @@ -4,11 +4,7 @@ _0807EF80 0x0008 StopScript StartScript Call sub_0807F92C -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA04 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA04, 0x00000003 StopScript CheckEntityInteractType JumpIfNot 0xfffc @@ -16,89 +12,41 @@ _0807E864 Call sub_0807DF28 StartPlayerScript gUnk_080136D8 WaitForSomething2 0x00000001 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095A1C -.short 0x3f34 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095A1C, 0x08013f34 SoundReq 0x01cd Wait 0x005a StartScript SoundReq 0x01ce -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D54 -.short 0x3e4c -.short 0x0801 -@ End of parameters +CallWithArg sub_08095D54, 0x08013e4c StopScript WaitForSomething2 0x20000000 StartScript SoundReq 0x01cf -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4054 -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4074 -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4094 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095D8C, 0x08014054 +CallWithArg sub_08095D8C, 0x08014074 +CallWithArg sub_08095D8C, 0x08014094 StopScript Wait 0x001e StartScript SoundReq 0x01d0 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x40dc -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4118 -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4154 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095D8C, 0x080140dc +CallWithArg sub_08095D8C, 0x08014118 +CallWithArg sub_08095D8C, 0x08014154 StopScript Wait 0x003c -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DDEC -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DDEC, 0x00000000 _0807E5F8 0x00000200 WaitForSomething2 0x00002000 SoundReq 0x01d2 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x41dc -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4210 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095D8C, 0x080141dc +CallWithArg sub_08095D8C, 0x08014210 _0807E5F8 0x00000400 WaitForSomething2 0x00004000 _0807E5F8 0x00000800 WaitForSomething2 0x00008000 Wait 0x0078 _0807E5F8 0x00000060 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DE18 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DE18, 0x00000000 Wait 0x0078 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 @@ -120,10 +68,7 @@ _0807E778 0x0002 DoFade6 WaitFor_2 SoundReq 0x0109 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x0504 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c0504 _0807EA94 _0807E5F8 0x00040000 SetLocalFlag 0x007b diff --git a/data/scripts/gUnk_080138B4.inc b/data/scripts/gUnk_080138B4.inc index 89f2d143..4dadb7dd 100644 --- a/data/scripts/gUnk_080138B4.inc +++ b/data/scripts/gUnk_080138B4.inc @@ -4,11 +4,7 @@ _0807EF80 0x0008 StopScript StartScript Call sub_0807F92C -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA04 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA04, 0x00000003 StopScript CheckEntityInteractType JumpIfNot 0xfffc @@ -16,88 +12,36 @@ _0807E864 Call sub_0807DF28 StartPlayerScript gUnk_080136D8 WaitForSomething2 0x00000001 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095A1C -.short 0x3f64 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095A1C, 0x08013f64 SoundReq 0x01cd Wait 0x005a StartScript SoundReq 0x01ce -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D54 -.short 0x3e70 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095D54, 0x08013e70 StopScript WaitForSomething2 0x40000000 StartScript SoundReq 0x01cf -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4054 -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4074 -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4094 -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x40b8 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095D8C, 0x08014054 +CallWithArg sub_08095D8C, 0x08014074 +CallWithArg sub_08095D8C, 0x08014094 +CallWithArg sub_08095D8C, 0x080140b8 StopScript Wait 0x001e StartScript SoundReq 0x01d0 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x40dc -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4118 -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4154 -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4198 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095D8C, 0x080140dc +CallWithArg sub_08095D8C, 0x08014118 +CallWithArg sub_08095D8C, 0x08014154 +CallWithArg sub_08095D8C, 0x08014198 StopScript Wait 0x003c -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DDEC -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DDEC, 0x00000000 _0807E5F8 0x00000200 WaitForSomething2 0x00002000 SoundReq 0x01d2 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x41dc -.short 0x0801 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D8C -.short 0x4210 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095D8C, 0x080141dc +CallWithArg sub_08095D8C, 0x08014210 _0807E5F8 0x00000400 WaitForSomething2 0x00004000 _0807E5F8 0x00000800 @@ -106,11 +50,7 @@ _0807E5F8 0x00001000 WaitForSomething2 0x00010000 Wait 0x0078 _0807E5F8 0x00000060 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DE18 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DE18, 0x00000000 Wait 0x0078 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 @@ -133,38 +73,19 @@ _0807E778 0x0002 DoFade6 WaitFor_2 SoundReq 0x0109 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x0505 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c0505 _0807EA94 _0807E5F8 0x00040000 _0807F0B4 0x0002 SetEntityPositionRelative 0x00d800e8 CameraTargetEntity Call sub_0806DC3C -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F244 -.short 0x0001 -.short 0x0001 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F29C -.short 0x49fe -.short 0x0800 -@ End of parameters +CallWithArg sub_0807F244, 0x00010001 +CallWithArg sub_0807F29C, 0x080049fe Wait 0x00c8 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F29C -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F29C, 0x00000000 Call sub_0806DC58 CheckRoomFlag 0x0004 JumpIfNot 0xfffa -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DDEC -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DDEC, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_08013AA6.inc b/data/scripts/gUnk_08013AA6.inc index d41b1fa9..476a3965 100644 --- a/data/scripts/gUnk_08013AA6.inc +++ b/data/scripts/gUnk_08013AA6.inc @@ -3,11 +3,7 @@ Call sub_0807F3F8 Wait 0x003c _0807E5F8 0x00000008 Wait 0x0078 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DE18 -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DE18, 0x00000001 _0807F0C8 0x0000, 0x0000 Wait 0x003c _0807F0B4 0x0004 diff --git a/data/scripts/gUnk_08013B18.inc b/data/scripts/gUnk_08013B18.inc index 944ceeee..32780a24 100644 --- a/data/scripts/gUnk_08013B18.inc +++ b/data/scripts/gUnk_08013B18.inc @@ -3,11 +3,7 @@ StartScript _0807EF80 0x0008 StopScript StartScript -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F6B4 -.short 0x01c8 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F6B4, 0x000001c8 JumpIfNot 0xfff0 CheckInventory1 0x0006 JumpIfNot 0xffe8 diff --git a/data/scripts/gUnk_08013B70.inc b/data/scripts/gUnk_08013B70.inc index dd55bd47..8f2b17b3 100644 --- a/data/scripts/gUnk_08013B70.inc +++ b/data/scripts/gUnk_08013B70.inc @@ -1,10 +1,6 @@ SCRIPT_START gUnk_08013B70 SoundReq 0x01d3 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F238 -.short 0x08bf -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F238, 0x000008bf Call sub_08096028 Wait 0x003c _0807E5F8 0x00020000 diff --git a/data/scripts/gUnk_08013BA8.inc b/data/scripts/gUnk_08013BA8.inc index b47e2a60..a2337d5a 100644 --- a/data/scripts/gUnk_08013BA8.inc +++ b/data/scripts/gUnk_08013BA8.inc @@ -1,15 +1,7 @@ SCRIPT_START gUnk_08013BA8 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095E7C -.short 0x4248 -.short 0x0801 -@ End of parameters +CallWithArg sub_08095E7C, 0x08014248 SoundReq 0x01d3 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F238 -.short 0x08e3 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F238, 0x000008e3 Call sub_08096028 Wait 0x0078 _0807E5F8 0x00020000 diff --git a/data/scripts/gUnk_08013BE8.inc b/data/scripts/gUnk_08013BE8.inc index 9cf01e62..34d54f72 100644 --- a/data/scripts/gUnk_08013BE8.inc +++ b/data/scripts/gUnk_08013BE8.inc @@ -22,16 +22,8 @@ StartScript _0807EF80 0x0007 Call sub_0807F934 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 2 parameters -.word sub_080962F8 -.short 0x0000 -.short 0x0000 -@ End of parameters -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F8E8 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_080962F8, 0x00000000 +CallWithArg sub_0807F8E8, 0x00000004 StopScript StopScript StartScript diff --git a/data/scripts/gUnk_08013D04.inc b/data/scripts/gUnk_08013D04.inc index 13d55e1d..7c2d6ade 100644 --- a/data/scripts/gUnk_08013D04.inc +++ b/data/scripts/gUnk_08013D04.inc @@ -2,19 +2,11 @@ SCRIPT_START gUnk_08013D04 StartScript Call sub_0807F92C _0807EF80 0x0008 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA04 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA04, 0x00000004 StopScript CheckEntityInteractType JumpIfNot 0xfffc -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D54 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_08095D54, 0x00000000 SoundReq 0x01cd _0807E5F8 0x08000000 Call sub_080791BC diff --git a/data/scripts/gUnk_08013D44.inc b/data/scripts/gUnk_08013D44.inc index d8f002c5..1783ada4 100644 --- a/data/scripts/gUnk_08013D44.inc +++ b/data/scripts/gUnk_08013D44.inc @@ -2,19 +2,11 @@ SCRIPT_START gUnk_08013D44 StartScript Call sub_0807F92C _0807EF80 0x0008 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA04 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA04, 0x00000004 StopScript CheckEntityInteractType JumpIfNot 0xfffc -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D54 -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_08095D54, 0x00000001 SoundReq 0x01cd _0807E5F8 0x10000000 Call sub_080791BC diff --git a/data/scripts/gUnk_08013D84.inc b/data/scripts/gUnk_08013D84.inc index 73d9938d..cedc11ce 100644 --- a/data/scripts/gUnk_08013D84.inc +++ b/data/scripts/gUnk_08013D84.inc @@ -2,19 +2,11 @@ SCRIPT_START gUnk_08013D84 StartScript Call sub_0807F92C _0807EF80 0x0008 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA04 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA04, 0x00000004 StopScript CheckEntityInteractType JumpIfNot 0xfffc -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D54 -.short 0x0002 -.short 0x0000 -@ End of parameters +CallWithArg sub_08095D54, 0x00000002 SoundReq 0x01cd _0807E5F8 0x20000000 Call sub_080791BC diff --git a/data/scripts/gUnk_08013DC4.inc b/data/scripts/gUnk_08013DC4.inc index 3385a818..ddae770a 100644 --- a/data/scripts/gUnk_08013DC4.inc +++ b/data/scripts/gUnk_08013DC4.inc @@ -2,19 +2,11 @@ SCRIPT_START gUnk_08013DC4 StartScript Call sub_0807F92C _0807EF80 0x0008 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA04 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA04, 0x00000004 StopScript CheckEntityInteractType JumpIfNot 0xfffc -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095D54 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_08095D54, 0x00000003 SoundReq 0x01cd _0807E5F8 0x40000000 Call sub_080791BC diff --git a/data/scripts/gUnk_08013FE8.inc b/data/scripts/gUnk_08013FE8.inc index 86297bb7..6611152b 100644 --- a/data/scripts/gUnk_08013FE8.inc +++ b/data/scripts/gUnk_08013FE8.inc @@ -10,11 +10,7 @@ CheckLocalFlag 0x007a JumpIfNot 0xffee CheckInventory1 0x0003 JumpIfNot 0xffe6 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F6B4 -.short 0x00d0 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F6B4, 0x000000d0 JumpIfNot 0xffd8 StopScript Call sub_0807F9A4 diff --git a/data/scripts/gUnk_080141DC.inc b/data/scripts/gUnk_080141DC.inc index 6474c661..cc06dc39 100644 --- a/data/scripts/gUnk_080141DC.inc +++ b/data/scripts/gUnk_080141DC.inc @@ -3,11 +3,7 @@ StartScript _0807EF80 0x0007 _0807E930 0x0014 Call sub_0807F714 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F994 -.short 0xfffc -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F994, 0x0000fffc StopScript WaitForSomething 0x00000020 Wait 0x0078 diff --git a/data/scripts/gUnk_08014210.inc b/data/scripts/gUnk_08014210.inc index a8253a5c..1ed61b20 100644 --- a/data/scripts/gUnk_08014210.inc +++ b/data/scripts/gUnk_08014210.inc @@ -4,11 +4,7 @@ _0807EF80 0x0007 _0807E930 0x0015 Call sub_0807F714 Call sub_0807F714 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F994 -.short 0xfffc -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F994, 0x0000fffc StopScript WaitForSomething 0x00000020 Wait 0x0078 diff --git a/data/scripts/gUnk_08014248.inc b/data/scripts/gUnk_08014248.inc index dcbddfda..8e75f5d1 100644 --- a/data/scripts/gUnk_08014248.inc +++ b/data/scripts/gUnk_08014248.inc @@ -2,17 +2,9 @@ SCRIPT_START gUnk_08014248 TestBit 0x00020000 JumpIf 0x0014 Wait 0x0008 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095EAC -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_08095EAC, 0x00000000 Jump 0xffe6 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_08095EAC -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_08095EAC, 0x00000001 Jump 0xfff4 .short 0x0000 StartScript @@ -22,19 +14,12 @@ CheckLocalFlag 0x0078 JumpIfNot 0xfffa StartScript Call sub_0807F934 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA04 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA04, 0x00000008 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x0647 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c0647 _0807EA94 _0807E878 Jump 0xffec diff --git a/data/scripts/gUnk_08014450.inc b/data/scripts/gUnk_08014450.inc index 026708be..a19df24a 100644 --- a/data/scripts/gUnk_08014450.inc +++ b/data/scripts/gUnk_08014450.inc @@ -27,10 +27,7 @@ Call sub_0806E250 JumpIfNot 0x000e TextboxNoOverlapFollow 0x420b _0807EB38 -.short 0x0c06 @ _0807E078 with 2 parameters -.short 0x0004 -.short 0x000a -@ End of parameters +_0807E078 0x0004, 0x000a ClearLocalFlag 0x0093 Jump 0x000a SetLocalFlag 0x0093 diff --git a/data/scripts/gUnk_080145B0.inc b/data/scripts/gUnk_080145B0.inc index 7dfd951f..9cd637f6 100644 --- a/data/scripts/gUnk_080145B0.inc +++ b/data/scripts/gUnk_080145B0.inc @@ -10,10 +10,7 @@ _0807E864 ClearRoomFlag 0x0005 Wait 0x000c _0807EB8C -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x432e -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c432e _0807EA94 _0807E878 Jump 0xffe0 diff --git a/data/scripts/gUnk_080145E8.inc b/data/scripts/gUnk_080145E8.inc index 295e90ef..355e87e5 100644 --- a/data/scripts/gUnk_080145E8.inc +++ b/data/scripts/gUnk_080145E8.inc @@ -33,10 +33,7 @@ CheckLocalFlag 0x005e JumpIf 0x003e _0807E864 _0807EB8C -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x432b -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c432b Jump 0x015e Call sub_08088658 JumpIfNot 0xffc0 @@ -57,10 +54,7 @@ Wait 0x0010 _0807E930 0x0002 CheckGlobalFlag 0x0059 JumpIfNot 0x000c -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x432f -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c432f Jump 0x010a CheckRoomFlag 0x0004 JumpIf 0x0028 @@ -73,24 +67,15 @@ JumpIf 0x003c Call sub_08088574 SetRoomFlag 0x0009 Jump 0x004a -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x431e -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c431e Jump 0x00d2 SetRoomFlag 0x0009 SetLocalFlag 0x005c -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x4305 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c4305 _0807EA94 _0807E3BC 0x0001 JumpIfNot 0x00b0 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x4306 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c4306 Jump 0x001e SetRoomFlag 0x0009 Call sub_08088504 @@ -110,10 +95,7 @@ JumpIfNot 0xfffa ClearRoomFlag 0x0003 _0807EA94 SetRoomFlag 0x0004 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x431e -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c431e Jump 0x0060 SetRoomFlag 0x0009 _0807EA94 @@ -137,10 +119,7 @@ Wait 0x008c _0807E930 0x0002 Jump 0xffc8 SetRoomFlag 0x0009 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x4307 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c4307 _0807EA94 Wait 0x0004 _0807E878 diff --git a/data/scripts/gUnk_08014804.inc b/data/scripts/gUnk_08014804.inc index 599d21f1..bece2dfd 100644 --- a/data/scripts/gUnk_08014804.inc +++ b/data/scripts/gUnk_08014804.inc @@ -9,10 +9,7 @@ Call sub_0807DF38 Wait 0x0010 CheckLocalFlag 0x0093 JumpIf 0x0092 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x4215 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c4215 _0807E878 TestBit 0x00000001 JumpIf 0x002c @@ -24,10 +21,7 @@ _0807E864 _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x4215 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c4215 _0807E878 Jump 0xffce _0807E930 0x0008 @@ -50,10 +44,7 @@ _0807E864 _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x4216 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c4216 _0807E878 Jump 0xffce _0807E930 0x0008 diff --git a/data/scripts/gUnk_08014CDC.inc b/data/scripts/gUnk_08014CDC.inc index 93bb4a62..d16b16fa 100644 --- a/data/scripts/gUnk_08014CDC.inc +++ b/data/scripts/gUnk_08014CDC.inc @@ -11,10 +11,7 @@ StopScript WaitForSomething2 0x00000001 Call sub_08066E08 _0807E864 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1010 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1010 _0807EA94 _0807E5F8 0x00000002 StopScript @@ -33,11 +30,7 @@ Call sub_08066E08 SetEntityPositionRelative 0x00c801f8 Call sub_0807DF50 _0807E878 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F6B4 -.short 0x00e8 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F6B4, 0x000000e8 JumpIf 0xfff4 _0807E864 Call sub_0807DF28 diff --git a/data/scripts/gUnk_08014E14.inc b/data/scripts/gUnk_08014E14.inc index 42e337d5..abe606e1 100644 --- a/data/scripts/gUnk_08014E14.inc +++ b/data/scripts/gUnk_08014E14.inc @@ -3,21 +3,13 @@ StartScript _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F3D8 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F3D8, 0x00000000 Call sub_08064428 _0807EA94 _0807E878 @@ -34,27 +26,15 @@ JumpIfNot 0xfffc _0807E864 Call sub_0807DF28 _0807EB74 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F78C -.short 0x0022 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F78C, 0x00000022 _0807EA94 _0807E3E8 JumpIfNot 0x0038 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F7C4 -.short 0x0022 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F7C4, 0x00000022 JumpIfNot 0x001e _0807E48C 0x0020 JumpIfNot 0x001e -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F800 -.short 0x0022 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F800, 0x00000022 WaitPlayerAction8 TextboxNoOverlap 0x0a04 Jump 0x000e @@ -114,11 +94,7 @@ _0807EB74 _0807EF80 0x0000 StartScript TextboxNoOverlap 0x3b0b -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F854 -.short 0x0064 -.short 0x0001 -@ End of parameters +CallWithArg sub_0807F854, 0x00010064 StopScript _0807EA94 _0807E3E8 @@ -155,10 +131,7 @@ _0807F0B4 0x0001 CameraTargetEntity StartPlayerScript gUnk_080152B4 WaitForSomething2 0x00000001 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1301 -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x00021301 _0807EA94 Call sub_0807F3F8 Wait 0x003c @@ -169,17 +142,11 @@ WaitForSomething2 0x00000004 SoundReq2 0x000d _0807EB28 0x1302 _0807EA94 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1303 -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x00021303 _0807EA94 _0807EB28 0x1304 _0807EA94 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1305 -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x00021305 _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -264,11 +231,7 @@ WaitFor_2 Call sub_08053B3C StartScript _0807E864 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F6E8 -.short 0x0008 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F6E8, 0x00000008 MoveEntityToPlayer _0807F0B4 0x0004 CameraTargetEntity diff --git a/data/scripts/gUnk_08015390.inc b/data/scripts/gUnk_08015390.inc index b54d6af8..ec27aae4 100644 --- a/data/scripts/gUnk_08015390.inc +++ b/data/scripts/gUnk_08015390.inc @@ -7,10 +7,7 @@ _0807E930 0x001f Call sub_0806D944 WaitForSomething2 0x00000008 _0807E930 0x0010 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1314 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1314 _0807EA94 _0807E930 0x0018 Call sub_0806D8A0 diff --git a/data/scripts/gUnk_080153EC.inc b/data/scripts/gUnk_080153EC.inc index 8b455b9f..d3c28c86 100644 --- a/data/scripts/gUnk_080153EC.inc +++ b/data/scripts/gUnk_080153EC.inc @@ -17,39 +17,20 @@ _0807E5F8 0x00000880 WaitForSomething2 0x00001100 _0807F0B4 0x0004 SetEntityPositionRelative 0x00900078 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1330 -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x00021330 _0807EA94 _0807E5F8 0x00008000 WaitForSomething2 0x00010000 _0807E5F8 0x00000880 WaitForSomething2 0x00001000 Wait 0x003c -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x130d -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x0002130d _0807EA94 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x130e -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c130e _0807EA94 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x130f -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x0002130f _0807EA94 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1310 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1310 _0807EA94 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DDEC -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DDEC, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_0801548E.inc b/data/scripts/gUnk_0801548E.inc index cad8956d..fc9f8372 100644 --- a/data/scripts/gUnk_0801548E.inc +++ b/data/scripts/gUnk_0801548E.inc @@ -2,32 +2,18 @@ SCRIPT_START gUnk_0801548E _0807E5F8 0x00000800 WaitForSomething2 0x00001000 SoundReq 0x0125 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FB28 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807FB28, 0x00000003 _0807E5F8 0x00048000 WaitForSomething2 0x00090000 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1311 -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x00021311 _0807EA94 _0807E5F8 0x00008000 WaitForSomething2 0x00010000 _0807E5F8 0x00048000 WaitForSomething2 0x00010000 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DE18 -.short 0x0001 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DE18, 0x00000001 _0807F0C8 0x0000, 0x0000 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1312 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1312 _0807EA94 _0807E5F8 0x00000800 WaitForSomething2 0x00001000 diff --git a/data/scripts/gUnk_0801550C.inc b/data/scripts/gUnk_0801550C.inc index 035ab2e5..f2635e78 100644 --- a/data/scripts/gUnk_0801550C.inc +++ b/data/scripts/gUnk_0801550C.inc @@ -5,57 +5,29 @@ _0807EF80 0x0007 _0807EB44 0x0000 Call sub_0807F338 StopScript -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000000 WaitForSomething2 0x00008000 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0078, 0x00b8 _0807EB44 0x0000 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000000 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 _0807EF80 0x000d _0807EB44 0x0000 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0004 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0078, 0x00c8 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 _0807EB44 0x0000 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806AF60 -.short 0x0000 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806AF60, 0x00000000 _0807EF80 0x0010 Wait 0x0028 SoundReq 0x0125 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FB28 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807FB28, 0x00000003 Wait 0x000a SoundReq 0x0125 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807FB28 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807FB28, 0x00000003 Wait 0x000a _0807EF80 0x0010 _0807E5F8 0x00010000 diff --git a/data/scripts/gUnk_08015618.inc b/data/scripts/gUnk_08015618.inc index 873a6fb5..fa0553ff 100644 --- a/data/scripts/gUnk_08015618.inc +++ b/data/scripts/gUnk_08015618.inc @@ -5,21 +5,13 @@ SetEntityNonPlanarMovement 0x0040 Call sub_08094B80 StopScript WaitForSomething2 0x00000080 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DDEC -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DDEC, 0x00000003 Call sub_08094B0C _0807EDD4 0x0078, 0x0068 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EF3C 0xff80, 0x0000 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0805DE18 -.short 0x0003 -.short 0x0000 -@ End of parameters +CallWithArg sub_0805DE18, 0x00000003 Wait 0x003c _0807E5F8 0x00000100 WaitForSomething2 0x00000080 diff --git a/data/scripts/gUnk_08015684.inc b/data/scripts/gUnk_08015684.inc index e2ce398e..13a7042e 100644 --- a/data/scripts/gUnk_08015684.inc +++ b/data/scripts/gUnk_08015684.inc @@ -29,11 +29,7 @@ _0807E5F8 0x00001000 WaitForSomething2 0x00000800 _0807EB44 0x0004 _0807EF80 0x0014 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0809545C -.short 0x5754 -.short 0x0801 -@ End of parameters +CallWithArg sub_0809545C, 0x08015754 SoundReq 0x01c4 Wait 0x0078 _0807EF80 0x0016 diff --git a/data/scripts/gUnk_080157AC.inc b/data/scripts/gUnk_080157AC.inc index e0b5bc89..aaa816ed 100644 --- a/data/scripts/gUnk_080157AC.inc +++ b/data/scripts/gUnk_080157AC.inc @@ -31,10 +31,7 @@ StartPlayerScript gUnk_08015918 WaitForSomething2 0x00000010 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1066 -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x00021066 _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 @@ -54,18 +51,12 @@ SetEntityPositionRelative 0x02080248 CameraTargetEntity StartPlayerScript gUnk_08015938 WaitForSomething2 0x00000010 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x106a -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c106a _0807EA94 _0807E5F8 0x00000008 Wait 0x0078 _0807E8E4_2 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1068 -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x00021068 _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 diff --git a/data/scripts/gUnk_08015958.inc b/data/scripts/gUnk_08015958.inc index 3e1dd800..a8c6eebf 100644 --- a/data/scripts/gUnk_08015958.inc +++ b/data/scripts/gUnk_08015958.inc @@ -15,10 +15,7 @@ _0807EB74 _0807EDD4 0x01f8, 0x02f8 _0807EB44 0x0004 _0807EF80 0x0000 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1011 -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x00021011 _0807EA94 _0807EDD4 0x01f8, 0x0268 SetEntityPositionRelative 0x02180248 @@ -59,10 +56,7 @@ JumpIf 0x0016 CheckEntityInteractType JumpIfNot 0xffee StopScript -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1067 -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x00021067 _0807EA94 Jump 0xffe0 StopScript diff --git a/data/scripts/gUnk_08015B34.inc b/data/scripts/gUnk_08015B34.inc index 2f23520e..26bd551f 100644 --- a/data/scripts/gUnk_08015B34.inc +++ b/data/scripts/gUnk_08015B34.inc @@ -3,20 +3,13 @@ StopScript StartScript CheckLocalFlag 0x008b JumpIf 0x0040 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F6B4 -.short 0x0318 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F6B4, 0x00000318 JumpIfNot 0xffe8 StopScript _0807E864 Call sub_0807F9A4 Call sub_0807DF28 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x2506 -.short 0x0002 -@ End of parameters +TextboxNoOverlapFollowPos 0x00022506 _0807EA94 StartPlayerScript gUnk_08015B84 WaitForSomething2 0x00000004 diff --git a/data/scripts/gUnk_08015C7C.inc b/data/scripts/gUnk_08015C7C.inc index e7faab73..6c311115 100644 --- a/data/scripts/gUnk_08015C7C.inc +++ b/data/scripts/gUnk_08015C7C.inc @@ -6,22 +6,11 @@ _0807EF80 0x0001 _0807EDD4 0x0168, 0x0058 _0807EB44 0x0004 _0807EF80 0x0000 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F238 -.short 0x03c5 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F238, 0x000003c5 Call sub_0807F304 -.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters -.short 0x1318 -.short 0x000c -@ End of parameters +TextboxNoOverlapFollowPos 0x000c1318 _0807EA94 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F238 -.short 0x03c9 -.short 0x0000 -@ End of parameters +CallWithArg sub_0807F238, 0x000003c9 Call sub_0807F304 _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_08015FC0.inc b/data/scripts/gUnk_08015FC0.inc index 533149ba..53484fd1 100644 --- a/data/scripts/gUnk_08015FC0.inc +++ b/data/scripts/gUnk_08015FC0.inc @@ -4,11 +4,7 @@ Call sub_0806DB84 CheckKinstoneFused 0x0009 JumpIf 0x005a _0807EA88 0x0009 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0806DA04 -.short 0x0007 -.short 0x0000 -@ End of parameters +CallWithArg sub_0806DA04, 0x00000007 _0807EF80 0x000a StopScript _0807EA4C diff --git a/data/scripts/gUnk_080160A8.inc b/data/scripts/gUnk_080160A8.inc index 2a83a1ac..3595816a 100644 --- a/data/scripts/gUnk_080160A8.inc +++ b/data/scripts/gUnk_080160A8.inc @@ -18,7 +18,7 @@ Jump 0xffd2 _0807E864 _0807EB74 StopScript -.short 0x0411 @ HasRoomItemForSale with 0 parameters +HasRoomItemForSale JumpIfNot 0x0030 TextboxNoOverlapFollow 0x2d07 _0807EA94 @@ -51,12 +51,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 GetInventoryValue 0x0025 -.short 0x145d @ _0807EAF0 with 4 parameters -.short 0x2d03 -.short 0x2d02 -.short 0x2d02 -.short 0x2d02 -@ End of parameters +_0807EAF0_ssss 0x2d03, 0x2d02, 0x2d02, 0x2d02 _0807E3E8 JumpIfNot 0x002a _0807E48C 0x0020 @@ -78,12 +73,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 GetInventoryValue 0x0024 -.short 0x145d @ _0807EAF0 with 4 parameters -.short 0x2d05 -.short 0x2d04 -.short 0x2d04 -.short 0x2d04 -@ End of parameters +_0807EAF0_ssss 0x2d05, 0x2d04, 0x2d04, 0x2d04 _0807E3E8 JumpIfNot 0x002e _0807E48C 0x0020 @@ -140,11 +130,7 @@ JumpIf 0x009a Call sub_08068F00 Call sub_08068F14 Call sub_08068BB4 -.short 0x140c @ CallWithArg with 2 parameters -.word sub_0807F244 -.short 0x0001 -.short 0x0001 -@ End of parameters +CallWithArg sub_0807F244, 0x00010001 Call sub_08068B84 Call sub_0807F2A8 Call sub_08068BD0 diff --git a/data/scripts/gUnk_0801637C.inc b/data/scripts/gUnk_0801637C.inc index 7802a910..72529ceb 100644 --- a/data/scripts/gUnk_0801637C.inc +++ b/data/scripts/gUnk_0801637C.inc @@ -1,8 +1,4 @@ SCRIPT_START gUnk_0801637C -@ this seems to be assembly for -@ push { lr } -@ bl CreateDust -@ pop { pc } .short 0xb500 .short 0xf08c .short 0xfb1d diff --git a/data/scripts/gUnk_08016384.inc b/data/scripts/gUnk_08016384.inc index 542c57f6..d1cfa60c 100644 --- a/data/scripts/gUnk_08016384.inc +++ b/data/scripts/gUnk_08016384.inc @@ -4,25 +4,18 @@ StopScript Jump 0xfffa JumpIf 0xfff6 JumpIfNot 0xfff2 -.short 0x0c06 @ _0807E078 with 2 parameters -.short 0xffee -.short 0xffec -@ End of parameters +_0807E078 0xffee, 0xffec JumpAbsolute gUnk_08016384 JumpAbsoluteIf gUnk_08016384 JumpAbsoluteIfNot gUnk_08016384 _0807E0E0 gUnk_08016384, gUnk_08016384 Call 0x08016384 -.short 0x140c @ CallWithArg with 2 parameters -.word 0x08016384 -.short 0x5678 -.short 0x1234 -@ End of parameters +CallWithArg 0x08016384, 0x12345678 LoadRoomEntityList gUnk_08016384 TestBit 0x00000001 CheckInventory1 0x0001 CheckInventory2 0x0001 -.short 0x0411 @ HasRoomItemForSale with 0 parameters +HasRoomItemForSale CheckLocalFlag 0x0067 CheckLocalFlagByOffset 0x0100, 0x006b CheckGlobalFlag 0x0013 diff --git a/data/scripts/gUnk_08016482.inc b/data/scripts/gUnk_08016482.inc index 355c4d59..98339999 100644 --- a/data/scripts/gUnk_08016482.inc +++ b/data/scripts/gUnk_08016482.inc @@ -7,7 +7,7 @@ DoFade6 DoFade7 _0807E800 0x00000000 _0807E80C 0x00000000 -.short 0x0442 @ _0807E858 with 0 parameters +_0807E858_ _0807E864 _0807E878 _0807E888 @@ -31,14 +31,8 @@ _0807EA88 0x0001 _0807EA94 TextboxNoOverlapFollow 0x0601 TextboxNoOverlap 0x0601 -.short 0x085c @ TextboxNoOverlapFollowPos with 1 parameters -.short 0x0601 -@ End of parameters -.short 0x105d @ _0807EAF0 with 3 parameters -.short 0x0601 -.short 0x0602 -.short 0x0603 -@ End of parameters +TextboxNoOverlapFollowPos_s 0x0601 +_0807EAF0_sss 0x0601, 0x0602, 0x0603 TextboxNoOverlapVar _0807EB28 0x0602 _0807EB38 |