diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-03-05 23:42:17 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-03-06 14:53:33 +0100 |
| commit | 9441dac477d46218cc2e1879df1d1c2127189761 (patch) | |
| tree | b6c695db548b3cb035ad7bf4a5cdd72f0a9ef94d /data/scripts | |
| parent | c83c3e60d373b29efef0688f622d061c6cde6a1b (diff) | |
Split at externally referenced labels
Diffstat (limited to 'data/scripts')
140 files changed, 1205 insertions, 1463 deletions
diff --git a/data/scripts/ezlo_angry.inc b/data/scripts/ezlo_angry.inc deleted file mode 100644 index 01270dfa..00000000 --- a/data/scripts/ezlo_angry.inc +++ /dev/null @@ -1,231 +0,0 @@ -SCRIPT_START gUnk_080126FC -StartScript -SetEntityNonPlanarMovement 0x0040 -_0807EF80 0x0007 -StopScript -_0807E930 0x0020 -WaitForSomething2 0x00000004 -_0807E930 0x0022 -Call sub_0807F3C8 -TextboxNoOverlapFollowPos 0x1102, 0x000c -_0807EA94 -_0807E930 0x0020 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807E930 0x0021 -Call sub_0807F3C8 -TextboxNoOverlapFollowPos 0x1103,0x000c -_0807EA94 -_0807E930 0x0020 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807EF80 0x0004 -Wait 0x003c -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807EF80 0x0011 -_0807E930 0x001c -TextboxNoOverlapFollowPos 0x1105,0x000c -_0807EA94 -_0807E930 0x0020 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807E930 0x0022 -Call sub_0807F3C8 -TextboxNoOverlapFollowPos 0x1106,0x000c -_0807EA94 -_0807E930 0x001c -Call sub_0806D96C @ Ezlo Angry FX -TextboxNoOverlapFollowPos 0x1107,0x000c -_0807EA94 -_0807E930 0x0020 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807E930 0x0021 -Call sub_0807F3C8 @ Ezlo Angry FX -TextboxNoOverlapFollowPos 0x1108,0x000c -_0807EA94 -_0807E930 0x001c -Call sub_0806D96C @ Ezlo Angry FX -TextboxNoOverlapFollowPos 0x1109,0x000c -_0807EA94 -_0807E930 0x0020 -_0807EF80 0x000a -_0807E9D4 -_0807E5F8 0x00000008 -StopScript -StartScript -CheckRoomFlag 0x0000 -JumpIf 0x0028 -CheckEntityInteractType -JumpIfNot 0xfff0 -StopScript -_0807E864 -Call sub_0806D944 @ Ezlo look at player -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x1114,0x000c -_0807EA94 -_0807E930 0x0020 -_0807E878 -Jump 0xffd0 -_0807E864 -_0807E9DC -CallWithArg sub_0807F5B0,0x0000003c -Call sub_080791D0 -StopScript -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807EF80 0x000b -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -Call sub_0806D944 @ Ezlo look at player -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x110a,0x000c -_0807EA94 -_0807E930 0x001f -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x110b,0x000c -_0807EA94 -_0807E930 0x001f -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807EF80 0x0004 -Wait 0x003c -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x110c,0x000c -_0807EA94 -_0807E930 0x001f -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x110d,0x000c -_0807EA94 -_0807E930 0x001f -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x110e,0x000c -_0807EA94 -_0807E930 0x0018 -SetEntityNonPlanarMovement 0x0080 -Call sub_0806D908 -_0807EC1C 0x0010 -_0807EF80 0x000a -_0807E9D4 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -StopScript -StartScript -Call sub_0806D944 @ Ezlo look at player -CheckEntityInteractType -JumpIf 0x000e -CheckPlayerInRegion2 0x3030 -JumpIfNot 0x0020 -Jump 0xffe6 -_0807E864 -_0807E930 0x0010 -StopScript -TextboxNoOverlapFollowPos 0x1115,0x000c -_0807EA94 -_0807E930 0x0018 -_0807E878 -Jump 0xffcc -StopScript -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -_0807EB8C -Call sub_0806D944 @ Ezlo look at player -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x110f,0x000c -_0807E930 0x0018 -SetEntityNonPlanarMovement 0x0080 -Call sub_0806D908 -_0807EC1C 0x0050 -_0807EA94 -Call sub_0807DF50 -_0807E878 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -StopScript -StartScript -Call sub_0806D944 @ Ezlo look at player -CheckEntityInteractType -JumpIf 0x000e -CheckPlayerInRegion2 0x3030 -JumpIfNot 0x0020 -Jump 0xffe6 -_0807E864 -_0807E930 0x0010 -StopScript -TextboxNoOverlapFollowPos 0x1115,0x000c -_0807EA94 -_0807E930 0x0018 -_0807E878 -Jump 0xffcc -StopScript -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -_0807EB8C -Call sub_0806D944 @ Ezlo look at player -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x1110,0x000c -_0807E930 0x0018 -SetEntityNonPlanarMovement 0x0080 -Call sub_0806D908 -_0807EC1C 0x0050 -_0807E930 0x0018 -_0807EA94 -Call sub_0807DF50 -_0807E878 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -StopScript -StartScript -Call sub_0806D944 @ Ezlo look at player -CheckEntityInteractType -JumpIf 0x000e -CheckPlayerInRegion2 0x3030 -JumpIfNot 0x0020 -Jump 0xffe6 -_0807E864 -_0807E930 0x0010 -StopScript -TextboxNoOverlapFollowPos 0x1115,0x000c -_0807EA94 -_0807E930 0x0018 -_0807E878 -Jump 0xffcc -StopScript -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -SoundReq0x80100000 -_0807EF80 0x000b -_0807EB8C -Call sub_0806D944 @ Ezlo look at player -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x1111,0x000c -_0807E930 0x0018 -SetEntityNonPlanarMovement 0x0080 -Call sub_0806D8A0 -_0807EE30 -JumpIfNot 0xfffc -_0807E930 0x001f -_0807EA94 -StartPlayerScript 0x08012b18 -Call sub_0806D9A4 -_0807EF80 0x0008 -Wait 0x0078 -SoundReq2 0x000e -StartScript -_0807E8E4_2 -_0807EB28 0x1112 -StopScript -_0807EA94 -_0807E5F8 0x00000008 -_0807EF80 0x0006 -SCRIPT_END
\ No newline at end of file diff --git a/data/scripts/gUnk_08008B5C.inc b/data/scripts/gUnk_08008B5C.inc index 72bad7bf..d357d2c7 100644 --- a/data/scripts/gUnk_08008B5C.inc +++ b/data/scripts/gUnk_08008B5C.inc @@ -45,19 +45,19 @@ _0807EA94 Call 0x0806ba35 JumpIfNot 0x0066 _0807EA94 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xbb1d .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0807f2d5 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xbb1d .short 0x0806 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0806bb7d JumpIfNot 0x0048 TextboxNoOverlap 0x490c diff --git a/data/scripts/gUnk_08008D8C.inc b/data/scripts/gUnk_08008D8C.inc index 0cc0f291..2482561b 100644 --- a/data/scripts/gUnk_08008D8C.inc +++ b/data/scripts/gUnk_08008D8C.inc @@ -18,33 +18,33 @@ StartScript _0807E9D4 _0807EF80 0x000a _0807EB44 0x0004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x080643d9 _0807EA94 _0807E878 _0807EB44 0x0004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Jump 0xffd2 StartScript SetEntityPositionRelative 0x00780088 @@ -74,10 +74,10 @@ _0807E5F8 0x00000080 WaitForSomething2 0x00000100 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1053 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 diff --git a/data/scripts/gUnk_08008FC0.inc b/data/scripts/gUnk_08008FC0.inc index 48226d21..2b69830e 100644 --- a/data/scripts/gUnk_08008FC0.inc +++ b/data/scripts/gUnk_08008FC0.inc @@ -1,23 +1,23 @@ SCRIPT_START gUnk_08008FC0 _0807F078 0x0001, 0x0001 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf919 .short 0x0807 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters SoundReq 0x0109 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf239 .short 0x0807 .short 0x045f .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0807f305 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x0501 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000020 Call 0x080791bd diff --git a/data/scripts/gUnk_0800903C.inc b/data/scripts/gUnk_0800903C.inc index 09e886c8..e03d6144 100644 --- a/data/scripts/gUnk_0800903C.inc +++ b/data/scripts/gUnk_0800903C.inc @@ -28,29 +28,29 @@ WaitForSomething2 0x00000080 _0807EB44 0x0004 _0807ECC4 0x0008 _0807E930 0x0004 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1050 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1052 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EB44 0x0006 _0807E930 0x0005 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1054 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000100 @@ -59,37 +59,37 @@ _0807EB44 0x0004 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1056 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1057 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1058 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x105c .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000100 @@ -110,10 +110,10 @@ StopScript WaitForSomething2 0x00000001 _0807EB74 _0807EF80 0x0001 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x105b .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000002 @@ -125,10 +125,10 @@ WaitForSomething2 0x00000001 _0807EF80 0x0005 Wait 0x003c _0807EF80 0x0001 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1051 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000002 @@ -138,10 +138,10 @@ Wait 0x003c _0807EB74 _0807EB8C _0807EF80 0x0001 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1055 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000002 @@ -155,10 +155,10 @@ _0807EDD4 0x0098, 0x0078 _0807EB74 _0807EF80 0x0000 _0807EF80 0x0001 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1059 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000002 diff --git a/data/scripts/gUnk_08009B78.inc b/data/scripts/gUnk_08009B78.inc index 32e85c18..0a299c0c 100644 --- a/data/scripts/gUnk_08009B78.inc +++ b/data/scripts/gUnk_08009B78.inc @@ -18,10 +18,10 @@ _0807EB44 0x0006 _0807EF80 0x0000 Wait 0x000f _0807EF80 0x0001 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1009 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807E8E4_1 _0807EA94 _0807EF80 0x0000 @@ -29,10 +29,10 @@ _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807EB8C _0807EF80 0x0001 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x100b .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000002 @@ -51,10 +51,10 @@ _0807F034 0x0034 WaitPlayerAction8 _0807E8E4_1 _0807EF80 0x0001 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x100c .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000004 diff --git a/data/scripts/gUnk_08009C68.inc b/data/scripts/gUnk_08009C68.inc index 279008d7..d434771e 100644 --- a/data/scripts/gUnk_08009C68.inc +++ b/data/scripts/gUnk_08009C68.inc @@ -13,10 +13,10 @@ WaitForSomething2 0x00000004 _0807EB74 _0807EB8C _0807EF80 0x0001 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x100a .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000008 @@ -25,10 +25,10 @@ _0807EB8C _0807EF80 0x0001 _0807EB8C _0807EB44 0x0002 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x100d .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EF80 0x0000 _0807EDD4 0x0028, 0x0060 diff --git a/data/scripts/gUnk_08009F14.inc b/data/scripts/gUnk_08009F14.inc index 094db364..136cbddb 100644 --- a/data/scripts/gUnk_08009F14.inc +++ b/data/scripts/gUnk_08009F14.inc @@ -20,10 +20,10 @@ _0807EF80 0x000b StartPlayerScript 0x0800a088 WaitForSomething2 0x00000002 Call 0x0806014d -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1f01 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 Wait 0x001e _0807F034 0x0065 @@ -41,23 +41,23 @@ StopScript _0807E864 Call 0x080602bd _0807EA94 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf971 .short 0x0807 .short 0x1f03 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIf 0x0008 _0807E878 Jump 0xffd2 Wait 0x0008 SoundReq 0x0103 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x030d .short 0x0806 .short 0x0063 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x0008 _0807E878 Jump 0xffb6 diff --git a/data/scripts/gUnk_0800A0FC.inc b/data/scripts/gUnk_0800A0FC.inc index 18dbea9f..c0b0e2fe 100644 --- a/data/scripts/gUnk_0800A0FC.inc +++ b/data/scripts/gUnk_0800A0FC.inc @@ -10,30 +10,30 @@ Call 0x0807fbfd SetEntityPositionRelative 0x005800b0 Call 0x0807f845 _0807E8E4_3 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf75d .short 0x0807 .short 0x0060 .short 0x00d0 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x4ae9 .short 0x0809 .short 0xa160 .short 0x0800 -@ End of 4 parameters +@ End of parameters SoundReq 0x00f7 _0807E778 0x0002 DoFade6 StopScript WaitFor_2 WaitForSomething2 0x00000004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda1d .short 0x0806 .short 0x0006 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800A160.inc b/data/scripts/gUnk_0800A160.inc index de6872cf..c1eed80f 100644 --- a/data/scripts/gUnk_0800A160.inc +++ b/data/scripts/gUnk_0800A160.inc @@ -5,18 +5,18 @@ _0807EF80 0x0007 _0807EF80 0x000b _0807E930 0x0002 SetEntityPositionRelative 0x008000b0 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf98d .short 0x0807 .short 0x0000 .short 0xff80 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x60c5 .short 0x0809 .short 0xa1b4 .short 0x0800 -@ End of 4 parameters +@ End of parameters StopScript SoundReq 0x0142 _0807EF3C 0xff80, 0x0000 diff --git a/data/scripts/gUnk_0800A1B4.inc b/data/scripts/gUnk_0800A1B4.inc index 6600c6ee..94faff32 100644 --- a/data/scripts/gUnk_0800A1B4.inc +++ b/data/scripts/gUnk_0800A1B4.inc @@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800A1B4 StartScript _0807EF80 0x0007 _0807EF80 0x000b -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf995 .short 0x0807 .short 0xfff8 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript WaitForSomething 0x00000002 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800A1D8.inc b/data/scripts/gUnk_0800A1D8.inc index cc3d8c01..af9ee5cb 100644 --- a/data/scripts/gUnk_0800A1D8.inc +++ b/data/scripts/gUnk_0800A1D8.inc @@ -5,22 +5,22 @@ Call 0x0807df29 SetEntityPositionRelative 0x00800088 Call 0x0807f845 _0807E8E4_3 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf75d .short 0x0807 .short 0x0088 .short 0x00a8 -@ End of 4 parameters +@ End of parameters StopScript Wait 0x003c StartPlayerScript 0x0800a310 WaitForSomething2 0x00000001 _0807E5F8 0x00000004 WaitForSomething2 0x00000080 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1659 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 Wait 0x003c _0807E5F8 0x00000010 @@ -35,16 +35,16 @@ WaitForSomething2 0x00000040 _0807E5F8 0x00000004 Call 0x0807f3f9 WaitForSomething2 0x00000080 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x165a .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 Wait 0x003c -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x165b .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000040 @@ -59,16 +59,16 @@ _0807E5F8 0x00000008 WaitForSomething2 0x00000100 _0807E5F8 0x00000006 WaitForSomething2 0x000000c0 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x165c .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 SoundReq0x80100000 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x165d .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000006 WaitForSomething2 0x000000c0 @@ -78,11 +78,11 @@ _0807E5F8 0x00000008 WaitForSomething2 0x00000100 SoundReq2 0x0008 SoundReq 0x00f7 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda1d .short 0x0806 .short 0x0007 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A310.inc b/data/scripts/gUnk_0800A310.inc index 817b5248..9a66158a 100644 --- a/data/scripts/gUnk_0800A310.inc +++ b/data/scripts/gUnk_0800A310.inc @@ -16,12 +16,12 @@ _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 _0807EF80 0x000b _0807EB44 0x0004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript WaitForSomething2 0x00000002 _0807E930 0x000e @@ -42,12 +42,12 @@ _0807E930 0x000c Call 0x0807f2d5 _0807E5F8 0x00000040 WaitForSomething2 0x00000002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x60c5 .short 0x0809 .short 0xa680 .short 0x0800 -@ End of 4 parameters +@ End of parameters _0807E5F8 0x00000040 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800A3D8.inc b/data/scripts/gUnk_0800A3D8.inc index d40d23d2..baf3ae2c 100644 --- a/data/scripts/gUnk_0800A3D8.inc +++ b/data/scripts/gUnk_0800A3D8.inc @@ -28,12 +28,12 @@ WaitForSomething2 0x00000004 _0807EB44 0x0004 _0807EF80 0x0000 SoundReq 0x0142 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x60c5 .short 0x0809 .short 0xa638 .short 0x0800 -@ End of 4 parameters +@ End of parameters _0807E5F8 0x00000080 WaitForSomething2 0x00000004 SoundReq 0x0143 @@ -44,44 +44,44 @@ Call 0x08066e69 _0807E5F8 0x00000080 WaitForSomething2 0x00000004 SoundReq 0x0142 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x60c5 .short 0x0809 .short 0xa680 .short 0x0800 -@ End of 4 parameters +@ End of parameters Wait 0x0078 SoundReq 0x0153 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfadd .short 0x0807 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x000f SoundReq 0x0153 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfadd .short 0x0807 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x000f SoundReq 0x0153 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfadd .short 0x0807 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x003c SoundReq 0x0153 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfadd .short 0x0807 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters SoundReq 0x0143 _0807E5F8 0x00000080 WaitForSomething2 0x00000004 diff --git a/data/scripts/gUnk_0800A500.inc b/data/scripts/gUnk_0800A500.inc index dc6c9d71..9e32b976 100644 --- a/data/scripts/gUnk_0800A500.inc +++ b/data/scripts/gUnk_0800A500.inc @@ -9,12 +9,12 @@ StopScript WaitForSomething2 0x00000008 SoundReq 0x0142 _0807E610 0x00000800 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x60c5 .short 0x0809 .short 0xa65c .short 0x0800 -@ End of 4 parameters +@ End of parameters _0807E930 0x0002 Call 0x08094b0d _0807EDD4 0x0068, 0x0088 diff --git a/data/scripts/gUnk_0800A590.inc b/data/scripts/gUnk_0800A590.inc index 98c1b5c3..690fae45 100644 --- a/data/scripts/gUnk_0800A590.inc +++ b/data/scripts/gUnk_0800A590.inc @@ -6,30 +6,30 @@ _0807EF80 0x0008 _0807EB44 0x0000 Call 0x0807f715 MoveEntityToPlayer -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf98d .short 0x0807 .short 0x0000 .short 0xfff0 -@ End of 4 parameters +@ End of parameters StopScript _0807E930 0x0023 WaitForSomething2 0x00000010 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf6e9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x0007 SoundReq 0x0142 _0807E610 0x00000800 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x60c5 .short 0x0809 .short 0xa65c .short 0x0800 -@ End of 4 parameters +@ End of parameters Wait 0x003c _0807EDD4 0x0088, 0x0068 Wait 0x0078 diff --git a/data/scripts/gUnk_0800A638.inc b/data/scripts/gUnk_0800A638.inc index 534cd728..a4dfac37 100644 --- a/data/scripts/gUnk_0800A638.inc +++ b/data/scripts/gUnk_0800A638.inc @@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800A638 StartScript _0807EF80 0x0007 _0807EF80 0x000b -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf995 .short 0x0807 .short 0xfff8 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript WaitForSomething 0x00001000 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800A65C.inc b/data/scripts/gUnk_0800A65C.inc index c89dbee5..32196619 100644 --- a/data/scripts/gUnk_0800A65C.inc +++ b/data/scripts/gUnk_0800A65C.inc @@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800A65C StartScript _0807EF80 0x0007 _0807EF80 0x000b -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf995 .short 0x0807 .short 0xfff8 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript WaitForSomething 0x00000800 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800A680.inc b/data/scripts/gUnk_0800A680.inc index 10446b80..2fe25d6c 100644 --- a/data/scripts/gUnk_0800A680.inc +++ b/data/scripts/gUnk_0800A680.inc @@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800A680 StartScript _0807EF80 0x0007 _0807EF80 0x000b -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf995 .short 0x0807 .short 0xfff8 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript WaitForSomething 0x00000020 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800A6A4.inc b/data/scripts/gUnk_0800A6A4.inc index f897621c..c0e906e3 100644 --- a/data/scripts/gUnk_0800A6A4.inc +++ b/data/scripts/gUnk_0800A6A4.inc @@ -7,11 +7,11 @@ Call 0x0807f845 StopScript Wait 0x003c SoundReq 0x00f6 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda1d .short 0x0806 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A6D4.inc b/data/scripts/gUnk_0800A6D4.inc index f0ae3baf..55f88979 100644 --- a/data/scripts/gUnk_0800A6D4.inc +++ b/data/scripts/gUnk_0800A6D4.inc @@ -7,11 +7,11 @@ Call 0x0807f845 SoundReq 0x00f7 StopScript Wait 0x003c -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda1d .short 0x0806 .short 0x0009 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A704.inc b/data/scripts/gUnk_0800A704.inc index a4592ef8..82273794 100644 --- a/data/scripts/gUnk_0800A704.inc +++ b/data/scripts/gUnk_0800A704.inc @@ -7,11 +7,11 @@ Call 0x0807f845 StopScript Wait 0x003c SoundReq 0x00f6 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda1d .short 0x0806 .short 0x000a .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A734.inc b/data/scripts/gUnk_0800A734.inc index 88ff9225..533a2f6e 100644 --- a/data/scripts/gUnk_0800A734.inc +++ b/data/scripts/gUnk_0800A734.inc @@ -7,11 +7,11 @@ Call 0x0807f845 SoundReq 0x00f7 StopScript Wait 0x003c -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda1d .short 0x0806 .short 0x000b .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A764.inc b/data/scripts/gUnk_0800A764.inc index 1d6be66a..ce8979e6 100644 --- a/data/scripts/gUnk_0800A764.inc +++ b/data/scripts/gUnk_0800A764.inc @@ -26,11 +26,11 @@ _0807E5F8 0x00000010 Wait 0x0002 _0807E5F8 0x00000020 Wait 0x0078 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda1d .short 0x0806 .short 0x000c .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A7E4.inc b/data/scripts/gUnk_0800A7E4.inc index dad3a8c9..dc79100f 100644 --- a/data/scripts/gUnk_0800A7E4.inc +++ b/data/scripts/gUnk_0800A7E4.inc @@ -89,11 +89,11 @@ _0807E5F8 0x00000004 Wait 0x000a _0807E5F8 0x00000008 Wait 0x003c -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda1d .short 0x0806 .short 0x000d .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800A9F4.inc b/data/scripts/gUnk_0800A9F4.inc index 4f706377..aadc8530 100644 --- a/data/scripts/gUnk_0800A9F4.inc +++ b/data/scripts/gUnk_0800A9F4.inc @@ -14,11 +14,11 @@ _0807E5F8 0x00000004 Wait 0x001e _0807E5F8 0x00000008 Wait 0x003c -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda1d .short 0x0806 .short 0x000e .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800AAD8.inc b/data/scripts/gUnk_0800AAD8.inc index c2b67154..c58d8c55 100644 --- a/data/scripts/gUnk_0800AAD8.inc +++ b/data/scripts/gUnk_0800AAD8.inc @@ -7,11 +7,11 @@ Call 0x0807f845 StopScript Wait 0x003c SoundReq 0x00f6 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda1d .short 0x0806 .short 0x000f .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800AB08.inc b/data/scripts/gUnk_0800AB08.inc index 5e5a5ba4..e6998808 100644 --- a/data/scripts/gUnk_0800AB08.inc +++ b/data/scripts/gUnk_0800AB08.inc @@ -5,38 +5,38 @@ Call 0x0807df29 SetEntityPositionRelative 0x01480088 Call 0x0807f845 _0807E8E4_3 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf6e9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0xf75d .short 0x0807 .short 0x0088 .short 0x00a8 -@ End of 4 parameters +@ End of parameters SoundReq 0x00f7 StopScript Wait 0x0078 _0807F0B4 0x0001 SetEntityPositionRelative 0x00780088 Call 0x0807f5c1 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1664 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x165e .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xdded .short 0x0805 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_0800AB6E.inc b/data/scripts/gUnk_0800AB6E.inc index c38d26b2..10079c59 100644 --- a/data/scripts/gUnk_0800AB6E.inc +++ b/data/scripts/gUnk_0800AB6E.inc @@ -8,34 +8,34 @@ WaitForSomething2 0x00000080 SetEntityPosition 0x0000, 0xffe0 Call 0x0807f5c1 Wait 0x003c -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xde19 .short 0x0805 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807F0C8 0x0000, 0x0000 Wait 0x003c _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x165f .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 StartPlayerScript 0x0800acbc WaitForSomething2 0x00000001 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1660 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1661 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000008 _0807E5F8 0x00000002 @@ -46,15 +46,15 @@ WaitForSomething2 0x00000010 StartPlayerScript 0x0800ace0 WaitForSomething2 0x00000001 Wait 0x003c -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1662 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1663 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 SetEntityPosition 0x0000, 0xffe0 Call 0x0807f5c1 @@ -65,10 +65,10 @@ WaitForSomething2 0x00000004 StartPlayerScript 0x0800ad54 WaitForSomething2 0x00000001 Wait 0x003c -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1665 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 diff --git a/data/scripts/gUnk_0800ACBC.inc b/data/scripts/gUnk_0800ACBC.inc index 5ed4cc19..4ca8e27d 100644 --- a/data/scripts/gUnk_0800ACBC.inc +++ b/data/scripts/gUnk_0800ACBC.inc @@ -10,30 +10,30 @@ Call 0x080791bd .short 0x0000 StartScript Call 0x08094be1 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf239 .short 0x0807 .short 0x045b .short 0x0000 -@ End of 4 parameters +@ End of parameters SoundReq 0x0109 StopScript Call 0x0807f305 Wait 0x005a _0807E5F8 0x00000008 StartScript -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf6f9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0xf239 .short 0x0807 .short 0x08e4 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript Call 0x0807f305 _0807EB44 0x0004 @@ -60,48 +60,48 @@ SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 _0807EF80 0x000b _0807EB44 0x0004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript WaitForSomething2 0x00000002 _0807EF80 0x0004 Wait 0x001e _0807EB44 0x0002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x0006 _0807EB44 0x0000 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E5F8 0x00000004 WaitForSomething2 0x00000002 _0807EB44 0x0002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x0014 _0807EB44 0x0004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E5F8 0x00000004 WaitForSomething2 0x00000002 _0807E930 0x000c @@ -113,12 +113,12 @@ _0807E930 0x000f Call 0x0807f2d5 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x60c5 .short 0x0809 .short 0xaf18 .short 0x0800 -@ End of 4 parameters +@ End of parameters _0807E930 0x0012 Call 0x0807f2d5 Wait 0x001e diff --git a/data/scripts/gUnk_0800AF18.inc b/data/scripts/gUnk_0800AF18.inc index 5ba38181..5cec6ff5 100644 --- a/data/scripts/gUnk_0800AF18.inc +++ b/data/scripts/gUnk_0800AF18.inc @@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800AF18 StartScript _0807EF80 0x0007 _0807EF80 0x000b -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf995 .short 0x0807 .short 0xfff8 .short 0x0000 -@ End of 4 parameters +@ End of parameters SoundReq 0x0142 StopScript WaitForSomething 0x00000020 diff --git a/data/scripts/gUnk_0800B0D0.inc b/data/scripts/gUnk_0800B0D0.inc index 87034e69..36a64122 100644 --- a/data/scripts/gUnk_0800B0D0.inc +++ b/data/scripts/gUnk_0800B0D0.inc @@ -2,51 +2,51 @@ SCRIPT_START gUnk_0800B0D0 StartScript Call 0x0806bcd5 _0807EF80 0x000a -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xbc95 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript Call 0x0807f435 -_0807E078 +.short 0x1006 @ _0807E078 with 3 parameters .short 0xfff8 .short 0x0004 .short 0x0040 -@ End of 3 parameters +@ End of parameters _0807E864 Call 0x0807df29 Call 0x0807f2d5 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xbc95 .short 0x0806 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0806bce9 _0807EA94 Call 0x0807df51 _0807E878 Call 0x0806bcb9 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xbc95 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Jump 0xffb6 _0807E864 Call 0x0807df29 Call 0x0807f2d5 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xbc95 .short 0x0806 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0807f651 _0807E9F0 JumpIfNot 0x0008 @@ -54,12 +54,12 @@ Call 0x0806bcc1 Call 0x0807df51 _0807E878 Call 0x0806bcb9 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xbc95 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Jump 0xff6e StartScript Call 0x0807df29 diff --git a/data/scripts/gUnk_0800B3A4.inc b/data/scripts/gUnk_0800B3A4.inc index 79a61350..5a1ac270 100644 --- a/data/scripts/gUnk_0800B3A4.inc +++ b/data/scripts/gUnk_0800B3A4.inc @@ -22,41 +22,3 @@ Call 0x08065781 Call 0x08065781 Call 0x08065781 Jump 0xffaa - -.globl gUnk_0800B41C -gUnk_0800B41C: -StartScript -SetEntityNonPlanarMovement 0x00c0 -_0807E908 0x0001 -_0807EF80 0x000b -_0807E864 -Call 0x0807fbc5 -StopScript -Wait 0x000a -_0807EF80 0x0004 -_0807E5F8 0x00000008 -StartPlayerScript 0x0800b54c -_0807EDD4 0x0140, 0x0298 -_0807EB74 -WaitForSomething2 0x00000004 -_0807EB74 -Wait 0x003c -SoundReq 0x00cd -_0807F088 0x0037 -WaitPlayerAction8 -_0807EB8C -TextboxNoOverlapFollow 0x200c -_0807EA94 -Wait 0x0014 -_0807EDD4 0x0158, 0x0290 -Wait 0x000a -_0807EDD4 0x0158, 0x0288 -Wait 0x0014 -_0807E5F8 0x00000010 -_0807EDD4 0x0158, 0x0280 -Wait 0x000a -_0807EF80 0x0008 -_0807E5F8 0x00000010 -_0807E5F8 0x00000008 -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_0800B41C.inc b/data/scripts/gUnk_0800B41C.inc new file mode 100644 index 00000000..b128c6cc --- /dev/null +++ b/data/scripts/gUnk_0800B41C.inc @@ -0,0 +1,36 @@ +SCRIPT_START gUnk_0800B41C +StartScript +SetEntityNonPlanarMovement 0x00c0 +_0807E908 0x0001 +_0807EF80 0x000b +_0807E864 +Call 0x0807fbc5 +StopScript +Wait 0x000a +_0807EF80 0x0004 +_0807E5F8 0x00000008 +StartPlayerScript 0x0800b54c +_0807EDD4 0x0140, 0x0298 +_0807EB74 +WaitForSomething2 0x00000004 +_0807EB74 +Wait 0x003c +SoundReq 0x00cd +_0807F088 0x0037 +WaitPlayerAction8 +_0807EB8C +TextboxNoOverlapFollow 0x200c +_0807EA94 +Wait 0x0014 +_0807EDD4 0x0158, 0x0290 +Wait 0x000a +_0807EDD4 0x0158, 0x0288 +Wait 0x0014 +_0807E5F8 0x00000010 +_0807EDD4 0x0158, 0x0280 +Wait 0x000a +_0807EF80 0x0008 +_0807E5F8 0x00000010 +_0807E5F8 0x00000008 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800B5EC.inc b/data/scripts/gUnk_0800B5EC.inc index dcf2a704..a55c7fa5 100644 --- a/data/scripts/gUnk_0800B5EC.inc +++ b/data/scripts/gUnk_0800B5EC.inc @@ -32,19 +32,19 @@ _0807E3E8 JumpIfNot 0x002a Wait 0x000f TextboxNoOverlap 0x0584 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf971 .short 0x0807 .short 0x058b .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIf 0x001e -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x7425 .short 0x0808 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x00b4 Jump 0x0024 TextboxNoOverlap 0x057d diff --git a/data/scripts/gUnk_0800B6C8.inc b/data/scripts/gUnk_0800B6C8.inc index 0f76ab54..a0d11f43 100644 --- a/data/scripts/gUnk_0800B6C8.inc +++ b/data/scripts/gUnk_0800B6C8.inc @@ -16,12 +16,12 @@ CheckLocalFlag 0x009f JumpIf 0x0098 TextboxNoOverlap 0x057b _0807EA94 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf971 .short 0x0807 .short 0x057d .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIf 0xff88 _0807EA94 SetLocalFlag 0x009f @@ -44,19 +44,19 @@ CheckLocalFlag 0x00a0 JumpIf 0x0036 TextboxNoOverlap 0x0580 _0807EA94 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf971 .short 0x0807 .short 0x0582 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIf 0x0014 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x7425 .short 0x0808 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x00b4 Jump 0xff14 _0807EA94 @@ -78,25 +78,25 @@ Jump 0xfee6 StartScript SetEntityNonPlanarMovement 0x0100 StopScript -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf6b5 .short 0x0807 .short 0x0090 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIfNot 0x0024 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf465 .short 0x0807 .short 0x0078 .short 0x0000 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x0090 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E8E4_0 _0807EF80 0x0000 _0807E5F8 0x00000004 diff --git a/data/scripts/gUnk_0800B7FC.inc b/data/scripts/gUnk_0800B7FC.inc index 669aca86..0ca33ef1 100644 --- a/data/scripts/gUnk_0800B7FC.inc +++ b/data/scripts/gUnk_0800B7FC.inc @@ -1,16 +1,16 @@ SCRIPT_START gUnk_0800B7FC -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x0090 .short 0x0000 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0xf465 .short 0x0807 .short 0x0078 .short 0x0000 -@ End of 4 parameters +@ End of parameters Jump 0xffdc StartScript _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800B828.inc b/data/scripts/gUnk_0800B828.inc index 3d432666..eaedc01b 100644 --- a/data/scripts/gUnk_0800B828.inc +++ b/data/scripts/gUnk_0800B828.inc @@ -50,12 +50,12 @@ _0807E9D4 _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x4645 .short 0x0806 .short 0x464d .short 0x0806 -@ End of 4 parameters +@ End of parameters StopScript Wait 0x003c Call 0x080646a5 @@ -107,12 +107,12 @@ _0807EF80 0x0008 Call 0x0806daad JumpIf 0x0036 Call 0x0806dad1 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda05 .short 0x0806 .short 0x0005 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript _0807EA4C _0807E9F0 diff --git a/data/scripts/gUnk_0800B9B4.inc b/data/scripts/gUnk_0800B9B4.inc index 1f5db32c..89181547 100644 --- a/data/scripts/gUnk_0800B9B4.inc +++ b/data/scripts/gUnk_0800B9B4.inc @@ -6,11 +6,11 @@ _0807EF80 0x000a Call 0x080694b1 StopScript Call 0x0807f435 -_0807E078 +.short 0x1006 @ _0807E078 with 3 parameters .short 0xfff8 .short 0x0004 .short 0x001e -@ End of 3 parameters +@ End of parameters _0807E864 _0807EB74 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_0800BC50.inc b/data/scripts/gUnk_0800BC50.inc index c882f9fb..9a1cf0bc 100644 --- a/data/scripts/gUnk_0800BC50.inc +++ b/data/scripts/gUnk_0800BC50.inc @@ -20,24 +20,24 @@ _0807EB44 0x0000 _0807E930 0x0000 SetEntityNonPlanarMovement 0x0040 _0807EF80 0x000d -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x0378 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x003c _0807EF80 0x000c Wait 0x003c TextboxNoOverlap 0x0e09 _0807EA94 Call 0x0807f159 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x035c .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x001e SoundReq 0x0188 _0807EF80 0x0008 diff --git a/data/scripts/gUnk_0800BD78.inc b/data/scripts/gUnk_0800BD78.inc index 3f21250d..7457fad1 100644 --- a/data/scripts/gUnk_0800BD78.inc +++ b/data/scripts/gUnk_0800BD78.inc @@ -8,12 +8,12 @@ Call 0x0807f349 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x0270 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x001e TextboxNoOverlap 0x0e0b _0807EA94 @@ -26,19 +26,19 @@ _0807E5F8 0x00000004 _0807EF80 0x000f _0807E930 0x0008 Wait 0x00b4 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xbf39 .short 0x0804 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x00b4 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xbf39 .short 0x0804 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EB44 0x0004 _0807E930 0x0000 Wait 0x003c diff --git a/data/scripts/gUnk_0800BECC.inc b/data/scripts/gUnk_0800BECC.inc index 798e02bd..bb7dee5c 100644 --- a/data/scripts/gUnk_0800BECC.inc +++ b/data/scripts/gUnk_0800BECC.inc @@ -8,12 +8,12 @@ Call 0x0807f349 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x01b8 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x001e TextboxNoOverlap 0x0e0e _0807EA94 diff --git a/data/scripts/gUnk_0800C004.inc b/data/scripts/gUnk_0800C004.inc index 601bb052..98a48044 100644 --- a/data/scripts/gUnk_0800C004.inc +++ b/data/scripts/gUnk_0800C004.inc @@ -8,12 +8,12 @@ Call 0x0807f349 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x01b8 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x001e TextboxNoOverlap 0x0e11 _0807EA94 @@ -28,19 +28,19 @@ _0807E5F8 0x0000001c _0807EF80 0x000f _0807E930 0x0008 Wait 0x00b4 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xbf39 .short 0x0804 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x00b4 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xbf39 .short 0x0804 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EB44 0x0004 _0807E930 0x0000 Wait 0x003c diff --git a/data/scripts/gUnk_0800C160.inc b/data/scripts/gUnk_0800C160.inc index 00822a1e..8c949edf 100644 --- a/data/scripts/gUnk_0800C160.inc +++ b/data/scripts/gUnk_0800C160.inc @@ -8,12 +8,12 @@ Call 0x0807f349 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x0128 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x001e TextboxNoOverlap 0x0e14 _0807EA94 diff --git a/data/scripts/gUnk_0800C2A4.inc b/data/scripts/gUnk_0800C2A4.inc index a70e1354..d348c940 100644 --- a/data/scripts/gUnk_0800C2A4.inc +++ b/data/scripts/gUnk_0800C2A4.inc @@ -8,12 +8,12 @@ Call 0x0807f349 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x0128 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x001e TextboxNoOverlap 0x0e17 _0807EA94 @@ -28,19 +28,19 @@ _0807E5F8 0x0000007c _0807EF80 0x000f _0807E930 0x0008 Wait 0x00b4 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xbf39 .short 0x0804 .short 0x0002 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x00b4 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xbf39 .short 0x0804 .short 0x0005 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EB44 0x0004 _0807E930 0x0000 Wait 0x003c diff --git a/data/scripts/gUnk_0800C350.inc b/data/scripts/gUnk_0800C350.inc index 09f24bd4..d800529d 100644 --- a/data/scripts/gUnk_0800C350.inc +++ b/data/scripts/gUnk_0800C350.inc @@ -1,11 +1,11 @@ SCRIPT_START gUnk_0800C350 StartScript -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xd659 .short 0x0806 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters SetEntityNonPlanarMovement 0x0200 StopScript CheckRoomFlag 0x00ff diff --git a/data/scripts/gUnk_0800C3CC.inc b/data/scripts/gUnk_0800C3CC.inc index eed6a726..f0742594 100644 --- a/data/scripts/gUnk_0800C3CC.inc +++ b/data/scripts/gUnk_0800C3CC.inc @@ -4,20 +4,20 @@ Call 0x0806d661 SetEntityNonPlanarMovement 0x0080 StopScript WaitForSomething2 0x00000002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x0048 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0806d66d Wait 0x000f -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x0068 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0806d67d _0807F0C8 0x001e, 0x0000 SoundReq 0x010b diff --git a/data/scripts/gUnk_0800C410.inc b/data/scripts/gUnk_0800C410.inc index 765f1946..e3cb11f4 100644 --- a/data/scripts/gUnk_0800C410.inc +++ b/data/scripts/gUnk_0800C410.inc @@ -4,20 +4,20 @@ Call 0x0806d661 SetEntityNonPlanarMovement 0x0080 StopScript WaitForSomething2 0x00000004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x0048 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0806d66d Wait 0x000f -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x0068 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0806d67d _0807F0C8 0x001e, 0x0000 SoundReq 0x010b diff --git a/data/scripts/gUnk_0800CD7C.inc b/data/scripts/gUnk_0800CD7C.inc index 3c4413b3..b75b34d1 100644 --- a/data/scripts/gUnk_0800CD7C.inc +++ b/data/scripts/gUnk_0800CD7C.inc @@ -199,10 +199,10 @@ WaitForSomething2 0x00000008 _0807EB74 _0807E914 0x00000000 Call 0x0806c029 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x125c .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 StartPlayerScript 0x0800d1b4 WaitForSomething2 0x00000008 @@ -213,10 +213,10 @@ Wait 0x000f _0807E5F8 0x00000020 StartPlayerScript 0x0800d1e0 WaitForSomething2 0x00000008 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x125d .short 0x0002 -@ End of 2 parameters +@ End of parameters Jump 0x00e6 CheckLocalFlag 0x007e JumpIfNot 0x000a @@ -231,10 +231,10 @@ WaitForSomething2 0x00000004 _0807EB74 _0807E914 0x00000000 Call 0x0806c029 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x123d .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 StartPlayerScript 0x0800d1b4 WaitForSomething2 0x00000008 @@ -248,10 +248,10 @@ JumpIf 0xfffa SoundReq 0x00f8 _0807E5F8 0x00000010 SetLocalFlag 0x007e -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x123e .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 Wait 0x000f _0807E930 0x0009 @@ -260,10 +260,10 @@ WaitForSomething2 0x00000004 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Wait 0x001e -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x123f .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000004 diff --git a/data/scripts/gUnk_0800D1E0.inc b/data/scripts/gUnk_0800D1E0.inc index 7a917f09..db9279e7 100644 --- a/data/scripts/gUnk_0800D1E0.inc +++ b/data/scripts/gUnk_0800D1E0.inc @@ -1,18 +1,18 @@ SCRIPT_START gUnk_0800D1E0 _0807F078 0x0002, 0x0001 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf919 .short 0x0807 .short 0x0002 .short 0x0000 -@ End of 4 parameters +@ End of parameters SoundReq 0x0109 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf239 .short 0x0807 .short 0x01e2 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0807f305 TextboxNoOverlap 0x0502 _0807EA94 diff --git a/data/scripts/gUnk_0800D414.inc b/data/scripts/gUnk_0800D414.inc index 9bf015eb..4d240ac4 100644 --- a/data/scripts/gUnk_0800D414.inc +++ b/data/scripts/gUnk_0800D414.inc @@ -46,13 +46,13 @@ _0807EF80 0x0000 StopScript Call 0x08062699 Call 0x080626ad -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf0ed .short 0x0807 .short 0x0009 .short 0x0000 -@ End of 4 parameters -_0807E078 +@ End of parameters +.short 0x2806 @ _0807E078 with 9 parameters .short 0x0012 .short 0x001a .short 0x0022 @@ -62,7 +62,7 @@ _0807E078 .short 0x0042 .short 0x004a .short 0x0052 -@ End of 9 parameters +@ End of parameters _0807EE04 0x0038, 0x0068 Jump 0x004e _0807EE04 0x0078, 0x0068 @@ -104,18 +104,18 @@ _0807EF80 0x0000 StopScript Call 0x08062699 Call 0x080626ad -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf0ed .short 0x0807 .short 0x0004 .short 0x0000 -@ End of 4 parameters -_0807E078 +@ End of parameters +.short 0x1406 @ _0807E078 with 4 parameters .short 0x0008 .short 0x0010 .short 0x0018 .short 0x0020 -@ End of 4 parameters +@ End of parameters _0807EE04 0x0038, 0x0098 Jump 0x001c _0807EE04 0x0058, 0x0098 @@ -138,12 +138,12 @@ _0807EF80 0x0008 Call 0x0806daad JumpIf 0x008c Call 0x0806dad1 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda05 .short 0x0806 .short 0x0002 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript _0807EA4C _0807E9F0 diff --git a/data/scripts/gUnk_0800D76C.inc b/data/scripts/gUnk_0800D76C.inc index 6203909c..e0742a70 100644 --- a/data/scripts/gUnk_0800D76C.inc +++ b/data/scripts/gUnk_0800D76C.inc @@ -10,12 +10,12 @@ WaitForSomething2 0x00000008 _0807EF80 0x0004 Wait 0x003c SoundReq 0x0123 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf465 .short 0x0807 .short 0x01e0 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EDD4 0x01e0, 0x01d8 _0807EB44 0x0002 _0807EF80 0x0000 @@ -44,12 +44,12 @@ _0807EF80 0x000e Call 0x0806ca5d SetEntity0x20 0x00040000 SoundReq 0x00f5 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf8d1 .short 0x0807 .short 0xe000 .short 0xffff -@ End of 4 parameters +@ End of parameters Call 0x0807f8bd JumpIf 0xffee _0807E5F8 0x00000004 diff --git a/data/scripts/gUnk_0800DA60.inc b/data/scripts/gUnk_0800DA60.inc index 4796cf09..27438ec7 100644 --- a/data/scripts/gUnk_0800DA60.inc +++ b/data/scripts/gUnk_0800DA60.inc @@ -15,25 +15,25 @@ CameraTargetEntity Call 0x0807f5c1 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x162d .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000001 Wait 0x001e -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x162e .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E8E4_0 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf75d .short 0x0807 .short 0x0138 .short 0x0078 -@ End of 4 parameters +@ End of parameters _0807F0B4 0x0004 CameraTargetPlayer Call 0x0807f5c1 diff --git a/data/scripts/gUnk_0800DB78.inc b/data/scripts/gUnk_0800DB78.inc index e3ef98fb..16d39429 100644 --- a/data/scripts/gUnk_0800DB78.inc +++ b/data/scripts/gUnk_0800DB78.inc @@ -1,12 +1,12 @@ SCRIPT_START gUnk_0800DB78 StartScript StopScript -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf6b5 .short 0x0807 .short 0x00a0 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIf 0xfff4 _0807E864 Call 0x0807f9a5 @@ -37,10 +37,10 @@ WaitForSomething2 0x00000002 _0807E5F8 0x00000001 StartPlayerScript 0x0800de00 WaitForSomething2 0x00000006 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1643 .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EB28 0x1645 _0807EA94 @@ -48,10 +48,10 @@ Call 0x0807f3f9 _0807E5F8 0x00000001 SoundReq0x80100000 Call 0x08094f99 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xdded .short 0x0805 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_0800DC4C.inc b/data/scripts/gUnk_0800DC4C.inc index 0bcebd35..7af83bdf 100644 --- a/data/scripts/gUnk_0800DC4C.inc +++ b/data/scripts/gUnk_0800DC4C.inc @@ -11,20 +11,20 @@ CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xde19 .short 0x0805 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807F0C8 0x0000, 0x0000 SetLocalFlag 0x0079 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda1d .short 0x0806 .short 0x0002 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0807df51 _0807E878 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800DCAC.inc b/data/scripts/gUnk_0800DCAC.inc index 64b1df99..efac71a8 100644 --- a/data/scripts/gUnk_0800DCAC.inc +++ b/data/scripts/gUnk_0800DCAC.inc @@ -4,12 +4,12 @@ _0807EF80 0x000a Call 0x08066e39 StopScript WaitForSomething2 0x00000001 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf8e9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E5F8 0x00000002 CheckRoomFlag 0x0000 JumpIfNot 0xfffa diff --git a/data/scripts/gUnk_0800DDD0.inc b/data/scripts/gUnk_0800DDD0.inc index a87382da..927ff8b7 100644 --- a/data/scripts/gUnk_0800DDD0.inc +++ b/data/scripts/gUnk_0800DDD0.inc @@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800DDD0 StartScript SetEntityNonPlanarMovement 0x0100 StopScript -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x00a0 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EDD4 0x0078, 0x00a0 _0807EB44 0x0000 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_0800DE50.inc b/data/scripts/gUnk_0800DE50.inc index 3d9860e0..9ba2ce82 100644 --- a/data/scripts/gUnk_0800DE50.inc +++ b/data/scripts/gUnk_0800DE50.inc @@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800DE50 StopScript _0807EB44 0x0004 _0807EF80 0x0000 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf239 .short 0x0807 .short 0x03c5 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0807f305 _0807E5F8 0x00000004 Call 0x080791bd diff --git a/data/scripts/gUnk_0800DF24.inc b/data/scripts/gUnk_0800DF24.inc index 86f06c8d..1a3b4d98 100644 --- a/data/scripts/gUnk_0800DF24.inc +++ b/data/scripts/gUnk_0800DF24.inc @@ -19,10 +19,10 @@ Call 0x0807f5c1 Call 0x08066c95 Wait 0x00e9 _0807EF80 0x0007 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x162f .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 SoundReq2 0x002f _0807EF80 0x0019 diff --git a/data/scripts/gUnk_0800DFB4.inc b/data/scripts/gUnk_0800DFB4.inc index c1f2c298..547f691a 100644 --- a/data/scripts/gUnk_0800DFB4.inc +++ b/data/scripts/gUnk_0800DFB4.inc @@ -6,12 +6,12 @@ SoundReq0x80100000 _0807E864 Call 0x0807df29 SoundReq 0x00f6 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda1d .short 0x0806 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0807df51 _0807E878 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800DFE4.inc b/data/scripts/gUnk_0800DFE4.inc index 0c9cbd6c..0aa011b3 100644 --- a/data/scripts/gUnk_0800DFE4.inc +++ b/data/scripts/gUnk_0800DFE4.inc @@ -4,10 +4,10 @@ Call 0x0807df29 _0807E864 StopScript SoundReq0x80100000 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1632 .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 SetRoomFlag 0x0003 CheckRoomFlag 0x0000 @@ -20,19 +20,19 @@ JumpIfNot 0xfffa _0807E864 Call 0x0807df29 SetLocalFlag 0x007b -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1639 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 Wait 0x0096 SoundReq 0x00f6 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda1d .short 0x0806 .short 0x0005 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0807df51 _0807E878 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800E0BC.inc b/data/scripts/gUnk_0800E0BC.inc index aada138e..30634329 100644 --- a/data/scripts/gUnk_0800E0BC.inc +++ b/data/scripts/gUnk_0800E0BC.inc @@ -5,12 +5,12 @@ _0807EF80 0x000a CheckLocalFlag 0x0093 JumpIf 0x0062 _0807E930 0x0008 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf8e9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckRoomFlag 0x0000 JumpIfNot 0xfffa @@ -53,12 +53,12 @@ _0807EF80 0x000a CheckLocalFlag 0x0094 JumpIf 0x006c _0807E930 0x0010 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf8e9 .short 0x0807 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckRoomFlag 0x0001 JumpIfNot 0xfffa @@ -78,22 +78,22 @@ Wait 0x001e _0807EF80 0x0000 _0807EB8C _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x000a TextboxNoOverlap 0x2401 _0807EA94 SetLocalFlag 0x0094 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E9D4 _0807E878 StopScript @@ -101,12 +101,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters TextboxNoOverlap 0x2401 _0807EA94 _0807E878 @@ -120,23 +120,23 @@ JumpIfNot 0x001e _0807E9D4 SetEntityPositionRelative 0x01680070 _0807EB44 0x0002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript Jump 0x00fe CheckLocalFlag 0x0095 JumpIf 0x0062 _0807E930 0x0010 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf8e9 .short 0x0807 .short 0x0002 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckRoomFlag 0x0002 JumpIfNot 0xfffa @@ -156,20 +156,20 @@ Wait 0x001e _0807EF80 0x0000 _0807EB8C _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters SetLocalFlag 0x0095 _0807EF80 0x0000 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E9D4 _0807E878 StopScript @@ -187,38 +187,38 @@ _0807E9DC SetLocalFlag 0x0073 StopScript _0807EB44 0x0000 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EDD4 0x0088, 0x0168 _0807EB44 0x0006 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EDD4 0x0070, 0x0168 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E9D4 Jump 0x001e _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript TextboxNoOverlap 0x2404 _0807EA94 @@ -228,12 +228,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters TextboxNoOverlap 0x2403 _0807EA94 _0807E878 @@ -247,12 +247,12 @@ JumpIf 0x0088 CheckLocalFlag 0x0096 JumpIf 0x0056 _0807E930 0x000c -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf8e9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckRoomFlag 0x0000 JumpIfNot 0xfffa @@ -315,12 +315,12 @@ _0807E878 Jump 0xffe8 StartScript _0807EB44 0x0002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x000a _0807E9D4 StopScript @@ -328,24 +328,24 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters TextboxNoOverlap 0x2405 _0807EA94 _0807E878 Jump 0xffe2 StartScript _0807EB44 0x0004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x000a _0807E9D4 StopScript @@ -353,12 +353,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters TextboxNoOverlap 0x2407 _0807EA94 _0807E878 diff --git a/data/scripts/gUnk_0800E6B0.inc b/data/scripts/gUnk_0800E6B0.inc index 033b40e7..de8e1873 100644 --- a/data/scripts/gUnk_0800E6B0.inc +++ b/data/scripts/gUnk_0800E6B0.inc @@ -48,12 +48,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0806afe9 _0807EA94 _0807E878 @@ -86,12 +86,12 @@ _0807E878 Jump 0xffd0 _0807EF80 0x000f _0807EB44 0x0002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0806af71 _0807EE04 0x0188, 0x0058 StopScript @@ -129,41 +129,41 @@ _0807E864 _0807EB44 0x0004 StartScript TextboxNoOverlapFollow 0x4501 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf855 .short 0x0807 .short 0x0032 .short 0x0001 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0xf855 .short 0x0807 .short 0x00c8 .short 0x0002 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0xf855 .short 0x0807 .short 0x0190 .short 0x0003 -@ End of 4 parameters +@ End of parameters StopScript _0807EA94 _0807EB38 -_0807E078 +.short 0x1406 @ _0807E078 with 4 parameters .short 0x00a6 .short 0x006a .short 0x0036 .short 0x0002 -@ End of 4 parameters +@ End of parameters StartScript TextboxNoOverlapFollow 0x4505 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf855 .short 0x0807 .short 0x0190 .short 0x0001 -@ End of 4 parameters +@ End of parameters StopScript _0807EA94 HasRupees 0x0190 diff --git a/data/scripts/gUnk_0800E8A4.inc b/data/scripts/gUnk_0800E8A4.inc index b9d52ee1..84790e70 100644 --- a/data/scripts/gUnk_0800E8A4.inc +++ b/data/scripts/gUnk_0800E8A4.inc @@ -1,12 +1,12 @@ SCRIPT_START gUnk_0800E8A4 StartScript TextboxNoOverlapFollow 0x4504 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf855 .short 0x0807 .short 0x00c8 .short 0x0001 -@ End of 4 parameters +@ End of parameters StopScript _0807EA94 HasRupees 0x00c8 diff --git a/data/scripts/gUnk_0800E8D6.inc b/data/scripts/gUnk_0800E8D6.inc index 0a1f03a1..07bd962f 100644 --- a/data/scripts/gUnk_0800E8D6.inc +++ b/data/scripts/gUnk_0800E8D6.inc @@ -1,12 +1,12 @@ SCRIPT_START gUnk_0800E8D6 StartScript TextboxNoOverlapFollow 0x4503 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf855 .short 0x0807 .short 0x0032 .short 0x0001 -@ End of 4 parameters +@ End of parameters StopScript _0807EA94 HasRupees 0x0032 diff --git a/data/scripts/gUnk_0800EA54.inc b/data/scripts/gUnk_0800EA54.inc index f3bbc0c5..8ad06ddd 100644 --- a/data/scripts/gUnk_0800EA54.inc +++ b/data/scripts/gUnk_0800EA54.inc @@ -9,12 +9,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0807f2d5 _0807E930 0x0009 Call 0x0806ce81 @@ -36,12 +36,12 @@ JumpIfNot 0xfffc StartScript _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xc029 .short 0x0806 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript Call 0x0806c00d JumpIfNot 0xfff8 @@ -166,12 +166,12 @@ Jump 0xffe4 .short 0x0000 StartScript _0807E9D4 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x1fb9 .short 0x0806 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters SetEntityNonPlanarMovement 0x0040 _0807EF80 0x000a _0807EB44 0x0004 @@ -203,23 +203,23 @@ Call 0x080639d1 _0807EF80 0x000a StopScript StartScript -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x3851 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x3851 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x08063945 _0807EA94 JumpIfNot 0x0008 @@ -227,12 +227,12 @@ _0807F050 0x0070 WaitPlayerAction8 _0807E878 Call 0x08063875 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x3851 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Jump 0xffc6 StartScript Call 0x08064cc1 @@ -286,12 +286,12 @@ Jump 0xff88 StopScript WaitForSomething2 0x00000002 _0807EB44 0x0002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters WaitForSomething2 0x00000004 Call 0x0806aed9 WaitForSomething2 0x00000008 @@ -337,12 +337,12 @@ Jump 0xff88 StopScript WaitForSomething2 0x00000010 _0807EB44 0x0006 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters WaitForSomething2 0x00000020 Call 0x0806aed9 WaitForSomething2 0x00000040 diff --git a/data/scripts/gUnk_0800EFC0.inc b/data/scripts/gUnk_0800EFC0.inc index e9c5bd82..b476d6be 100644 --- a/data/scripts/gUnk_0800EFC0.inc +++ b/data/scripts/gUnk_0800EFC0.inc @@ -8,69 +8,69 @@ JumpIf 0x00b0 StopScript Jump 0x0026 _0807EB44 0x0006 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x0004 _0807EB44 0x0004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x0004 _0807EB44 0x0002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x0004 _0807EB44 0x0002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EDD4 0x0088, 0x0040 _0807EF80 0x000a _0807EB44 0x0002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x0004 _0807EB44 0x0004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x0004 _0807EB44 0x0006 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x0004 _0807EB44 0x0006 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EDD4 0x0068, 0x0040 _0807EF80 0x000a CheckLocalFlag 0x007b @@ -94,27 +94,27 @@ StartPlayerScript 0x0800f14c WaitForSomething2 0x00000001 _0807E5F8 0x0000001e WaitForSomething2 0x00000040 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1201 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 WaitForSomething2 0x000003c0 _0807E8E4_0 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1202 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807F034 0x0067 WaitPlayerAction8 _0807E8E4_0 _0807E5F8 0x00000002 WaitForSomething2 0x00000040 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1203 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000002 Call 0x0807df51 diff --git a/data/scripts/gUnk_0800F184.inc b/data/scripts/gUnk_0800F184.inc index 48f4ed28..d114d67c 100644 --- a/data/scripts/gUnk_0800F184.inc +++ b/data/scripts/gUnk_0800F184.inc @@ -22,12 +22,12 @@ _0807E5F8 0x00000040 WaitForSomething2 0x00000002 StopScript StartScript -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf681 .short 0x0807 .short 0x01c0 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIf 0x0034 StopScript _0807E864 @@ -36,21 +36,21 @@ _0807EB74 _0807E930 0x0008 _0807EF80 0x0004 Wait 0x003c -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1206 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 StartPlayerScript 0x0800f33c WaitForSomething2 0x00000400 _0807E878 Jump 0xffbe -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf681 .short 0x0807 .short 0x0230 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIfNot 0x0034 StopScript _0807E864 @@ -59,21 +59,21 @@ _0807EB74 _0807E930 0x0008 _0807EF80 0x0004 Wait 0x003c -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1206 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 StartPlayerScript 0x0800f354 WaitForSomething2 0x00000400 _0807E878 Jump 0xff7e -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf6b5 .short 0x0807 .short 0x0310 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIf 0x0034 StopScript _0807E864 @@ -82,21 +82,21 @@ _0807EB74 _0807E930 0x0008 _0807EF80 0x0004 Wait 0x003c -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1206 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 StartPlayerScript 0x0800f36c WaitForSomething2 0x00000400 _0807E878 Jump 0xff3e -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf6b5 .short 0x0807 .short 0x0340 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIfNot 0x0034 StopScript _0807E864 @@ -105,10 +105,10 @@ _0807EB74 _0807E930 0x0008 _0807EF80 0x0004 Wait 0x003c -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1206 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 StartPlayerScript 0x0800f384 WaitForSomething2 0x00000400 @@ -124,10 +124,10 @@ StopScript _0807E864 _0807EB74 _0807E930 0x0008 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1208 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E878 Jump 0xfed4 diff --git a/data/scripts/gUnk_0800F554.inc b/data/scripts/gUnk_0800F554.inc index bf854ed0..20dda5af 100644 --- a/data/scripts/gUnk_0800F554.inc +++ b/data/scripts/gUnk_0800F554.inc @@ -33,23 +33,23 @@ StartScript _0807EB44 0x0006 _0807E9D4 _0807EF80 0x000a -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x08064429 _0807EA94 _0807E878 @@ -66,12 +66,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters TextboxNoOverlap 0x2511 _0807EA94 Wait 0x000f @@ -120,12 +120,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters CheckLocalFlag 0x00cd JumpIf 0x000a TextboxNoOverlap 0x2512 @@ -134,12 +134,12 @@ TextboxNoOverlap 0x251f _0807EA94 Wait 0x000f _0807E878 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Jump 0xffc4 .short 0x0000 StartScript diff --git a/data/scripts/gUnk_0800F724.inc b/data/scripts/gUnk_0800F724.inc index 1ded33f7..cb0748e3 100644 --- a/data/scripts/gUnk_0800F724.inc +++ b/data/scripts/gUnk_0800F724.inc @@ -26,10 +26,10 @@ SetEntityPositionRelative 0x036800c8 Call 0x0807f5c1 WaitForSomething2 0x00000001 WaitForSomething2 0x00000004 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x2501 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -45,10 +45,10 @@ StartPlayerScript 0x0800fa78 WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x2503 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -61,10 +61,10 @@ StartPlayerScript 0x0800fa9c WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x2504 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -77,10 +77,10 @@ StartPlayerScript 0x0800fac0 WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x2505 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -95,10 +95,10 @@ Wait 0x001e _0807E8E4_0 Call 0x0807f3f9 Wait 0x003c -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1021 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 StartPlayerScript 0x0800fae4 SetEntityPositionRelative 0x025800f0 @@ -107,71 +107,71 @@ CameraTargetEntity Wait 0x001e Call 0x08063c2d WaitForSomething2 0x00000001 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1022 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E8E4_0 Call 0x08063c15 Call 0x08094cdd Wait 0x001e -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1023 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 Call 0x08063c15 Call 0x08094dd9 Wait 0x001e -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1024 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 Call 0x08063c15 Call 0x08094d35 Wait 0x001e -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1025 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 Call 0x08063c5d -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1026 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807E8E4_1 Call 0x08063c2d -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1027 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 Call 0x08063c75 Wait 0x003c Call 0x08063c15 _0807E8E4_0 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1028 .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E8E4_1 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1029 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E8E4_0 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x102a .short 0x000e -@ End of 2 parameters +@ End of parameters _0807EA94 Call 0x08063c15 Call 0x08094d71 @@ -186,43 +186,43 @@ Wait 0x001e _0807E8E4_1 Call 0x0807f3f9 Wait 0x003c -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x102b .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807F034 0x000d WaitPlayerAction8 Call 0x0806dc3d Call 0x080791bd -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf245 .short 0x0807 .short 0x000d .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E914 0x000000ff Call 0x0807f5b1 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf29d .short 0x0807 .short 0x49d6 .short 0x0800 -@ End of 4 parameters +@ End of parameters Wait 0x00b7 _0807E914 0x00000000 Call 0x0807f5b1 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x102c .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf29d .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0806dc59 _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/gUnk_0800FAE4.inc b/data/scripts/gUnk_0800FAE4.inc index adc95fc2..8075ddaa 100644 --- a/data/scripts/gUnk_0800FAE4.inc +++ b/data/scripts/gUnk_0800FAE4.inc @@ -3,24 +3,24 @@ StartScript SetEntityNonPlanarMovement 0x0100 StopScript Call 0x0807f585 -_0807E078 +.short 0x1406 @ _0807E078 with 4 parameters .short 0x0012 .short 0x001a .short 0x000e .short 0x0002 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x027c .short 0x0000 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0xf465 .short 0x0807 .short 0x00e8 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EDD4 0x00e8, 0x0270 _0807EB44 0x0000 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_0800FD0C.inc b/data/scripts/gUnk_0800FD0C.inc index fbf7f336..1522960f 100644 --- a/data/scripts/gUnk_0800FD0C.inc +++ b/data/scripts/gUnk_0800FD0C.inc @@ -8,10 +8,10 @@ CheckLocalFlag 0x00cd JumpIf 0x0030 _0807E864 Call 0x0807f9a5 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x2506 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 StartPlayerScript 0x0800fd80 WaitForSomething2 0x00000008 @@ -21,10 +21,10 @@ CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 JumpIfNot 0xfff6 _0807E864 Call 0x0807f9a5 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x106c .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 StartPlayerScript 0x0800fd80 WaitForSomething2 0x00000008 diff --git a/data/scripts/gUnk_0800FDA0.inc b/data/scripts/gUnk_0800FDA0.inc index 74256346..67e2c4fe 100644 --- a/data/scripts/gUnk_0800FDA0.inc +++ b/data/scripts/gUnk_0800FDA0.inc @@ -83,12 +83,12 @@ CheckInventory1 0x0012 JumpIf 0x004a _0807EB44 0x0006 _0807E9D4 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript StopScript StartScript @@ -99,12 +99,12 @@ JumpIfNot 0xffee StopScript _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x08064429 _0807EA94 Wait 0x000f diff --git a/data/scripts/gUnk_0800FF18.inc b/data/scripts/gUnk_0800FF18.inc index bf31cb48..e152daba 100644 --- a/data/scripts/gUnk_0800FF18.inc +++ b/data/scripts/gUnk_0800FF18.inc @@ -4,12 +4,12 @@ CheckInventory1 0x0012 JumpIf 0x004a _0807EB44 0x0006 _0807E9D4 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript StopScript StartScript @@ -20,12 +20,12 @@ JumpIfNot 0xffee StopScript _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x08064429 _0807EA94 Wait 0x000f diff --git a/data/scripts/gUnk_0800FF74.inc b/data/scripts/gUnk_0800FF74.inc index e990d07e..d1f5a7a9 100644 --- a/data/scripts/gUnk_0800FF74.inc +++ b/data/scripts/gUnk_0800FF74.inc @@ -2,12 +2,12 @@ SCRIPT_START gUnk_0800FF74 StartScript _0807EB44 0x0002 _0807E9D4 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x080644a5 ClearLocalFlag 0x00c7 StopScript @@ -31,12 +31,12 @@ StopScript SetLocalFlag 0x00c7 _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters CheckInventory1 0x0048 JumpIf 0x000c TextboxNoOverlap 0x3401 @@ -55,39 +55,39 @@ _0807E888 Call 0x0807f595 _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters SoundReq 0x00cd TextboxNoOverlap 0x340a _0807EA94 _0807EB44 0x0004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x000c .short 0x0000 -@ End of 4 parameters +@ End of parameters SetEntityNonPlanarMovement 0x0100 _0807EDD4 0x0018, 0x0108 _0807EB44 0x0002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters SetLocalFlag 0x00ce Call 0x080644a5 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf5b1 .short 0x0807 .short 0x000a .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E878 Jump 0xff1e .short 0x0000 @@ -95,34 +95,34 @@ StartScript _0807E9D4 _0807EF80 0x000a _0807EB44 0x0004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x72b1 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x72b1 .short 0x0806 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters TextboxNoOverlapFollow 0x0a01 _0807EA94 Wait 0x000f _0807E878 _0807EB44 0x0004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x72b1 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Jump 0xffd0 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_080100C8.inc b/data/scripts/gUnk_080100C8.inc index 186fda84..26079488 100644 --- a/data/scripts/gUnk_080100C8.inc +++ b/data/scripts/gUnk_080100C8.inc @@ -48,22 +48,22 @@ _0807E864 _0807EB74 CheckRoomFlag 0x0001 JumpIf 0x0034 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x3001 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E3E8 JumpIfNot 0x002e Call 0x080a1609 _0807EA94 _0807E878 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x1551 .short 0x080a .short 0x01ac .short 0x0801 -@ End of 4 parameters +@ End of parameters JumpIfNot 0xffca SoundReq2 0x0015 SetRoomFlag 0x0001 @@ -79,21 +79,21 @@ StopScript Call 0x080a1271 _0807E864 Call 0x0807df29 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x3004 .short 0x0007 -@ End of 2 parameters +@ End of parameters _0807EA94 SoundReq0x80100000 _0807E778 0x0004 DoFade5 WaitFor_2 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf75d .short 0x0807 .short 0x0378 .short 0x0340 -@ End of 4 parameters +@ End of parameters Call 0x080791bd Call 0x0807fb75 _0807E8E4_1 @@ -119,12 +119,12 @@ _0807EA94 Call 0x080a14a9 Call 0x0807df51 _0807E878 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf5b1 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters ClearRoomFlag 0x0001 Call 0x080a169d _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08010264.inc b/data/scripts/gUnk_08010264.inc index 60243475..cb9e58ba 100644 --- a/data/scripts/gUnk_08010264.inc +++ b/data/scripts/gUnk_08010264.inc @@ -58,13 +58,13 @@ StopScript StopScript Call 0x08062699 Call 0x080626ad -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf0ed .short 0x0807 .short 0x0009 .short 0x0000 -@ End of 4 parameters -_0807E078 +@ End of parameters +.short 0x2806 @ _0807E078 with 9 parameters .short 0x0012 .short 0x001a .short 0x0022 @@ -74,7 +74,7 @@ _0807E078 .short 0x0042 .short 0x004a .short 0x0052 -@ End of 9 parameters +@ End of parameters _0807EE04 0x0358, 0x0078 Jump 0x004e _0807EE04 0x0390, 0x0078 @@ -112,12 +112,12 @@ StartScript _0807E9D4 _0807EB44 0x0004 _0807EF80 0x000a -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript Wait 0x003c Call 0x0806407d @@ -127,12 +127,12 @@ StartScript _0807E9D4 _0807EB44 0x0004 _0807EF80 0x000a -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc @@ -164,22 +164,22 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x080636d9 _0807EA94 Wait 0x000f _0807E878 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Jump 0xffd2 StartScript _0807EB44 0x0004 @@ -192,22 +192,22 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x08063c91 _0807EA94 Wait 0x000f _0807E878 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Jump 0xffd2 StartScript _0807EB44 0x0004 @@ -220,19 +220,19 @@ JumpIfNot 0xfffc _0807E864 Call 0x0807df29 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters CheckRoomFlag 0x000e JumpIf 0x000c SetRoomFlag 0x000e TextboxNoOverlap 0x2b10 _0807EA94 Call 0x080634e5 -_0807E078 +.short 0x2006 @ _0807E078 with 7 parameters .short 0x000e .short 0x0020 .short 0x0036 @@ -240,7 +240,7 @@ _0807E078 .short 0x000e .short 0x0024 .short 0x002e -@ End of 7 parameters +@ End of parameters TextboxNoOverlap 0x2b0d Jump 0x0096 CheckGlobalFlag 0x003d @@ -253,21 +253,21 @@ CheckGlobalFlag 0x003b JumpIfNot 0x0072 Jump 0x0002 Call 0x080634ed -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf78d .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EA94 _0807E3E8 JumpIfNot 0x005a -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf7c5 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIfNot 0x0030 _0807E48C 0x0020 JumpIfNot 0x0030 @@ -275,12 +275,12 @@ Call 0x08063505 JumpIf 0x002e TextboxNoOverlap 0x2b07 _0807EA94 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf801 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters WaitPlayerAction8 _0807EA94 TextboxNoOverlap 0x2b0c @@ -350,12 +350,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -HasRoomItemForSale +.short 0x0411 @ HasRoomItemForSale with 0 parameters Call 0x0807f77d -_0807EAF0 +.short 0x0c5d @ _0807EAF0 with 2 parameters .short 0x3c08 .short 0x3c09 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E878 _0807EB44 0x0004 @@ -373,17 +373,17 @@ _0807E864 _0807EB74 Call 0x0807f2d5 _0807EF80 0x0000 -HasRoomItemForSale +.short 0x0411 @ HasRoomItemForSale with 0 parameters JumpIf 0x000a TextboxNoOverlap 0x3c07 Jump 0x0048 Call 0x08062eb9 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf78d .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EA94 _0807E3E8 JumpIfNot 0x0030 @@ -469,7 +469,7 @@ StopScript StartScript CheckPlayerInRegion2 0x3030 JumpIfNot 0xffe4 -HasRoomItemForSale +.short 0x0411 @ HasRoomItemForSale with 0 parameters JumpIf 0x004c CheckEntityInteractType JumpIfNot 0xffea diff --git a/data/scripts/gUnk_08010A98.inc b/data/scripts/gUnk_08010A98.inc index 57150ba0..d23275f4 100644 --- a/data/scripts/gUnk_08010A98.inc +++ b/data/scripts/gUnk_08010A98.inc @@ -1,12 +1,12 @@ SCRIPT_START gUnk_08010A98 StartScript _0807EB44 0x0004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x72b1 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x000a Call 0x08067315 StopScript @@ -14,22 +14,22 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x72b1 .short 0x0806 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x08067305 _0807EA94 _0807E878 _0807EB44 0x0004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x72b1 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Jump 0xffd2 StartScript CheckInventory1 0x0067 @@ -37,10 +37,10 @@ JumpIfNot 0x0076 _0807EB44 0x0004 _0807EF80 0x0000 SetEntityNonPlanarMovement 0x0180 -CallWithArg +.short 0x0c0c @ CallWithArg with 2 parameters .short 0xf349 .short 0x0807 -@ End of 2 parameters +@ End of parameters Call 0x0806075d StopScript _0807EA94 @@ -53,12 +53,12 @@ StopScript StartScript _0807E564 JumpIf 0x0010 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x08e5 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIf 0x000c _0807EE30 JumpIfNot 0xffe4 @@ -67,12 +67,12 @@ StopScript _0807EF80 0x0000 StopScript StartScript -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x08e5 .short 0x0806 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIf 0xfff0 StopScript Jump 0xffbc diff --git a/data/scripts/gUnk_08010BB4.inc b/data/scripts/gUnk_08010BB4.inc index ab37e3fa..9ecb46e8 100644 --- a/data/scripts/gUnk_08010BB4.inc +++ b/data/scripts/gUnk_08010BB4.inc @@ -22,24 +22,24 @@ Call 0x0807df29 StartPlayerScript 0x08011074 WaitForSomething2 0x00000400 _0807F078 0x0034, 0x0002 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1036 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1037 .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1038 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 SoundReq0x80100000 _0807E778 0x0004 @@ -76,10 +76,10 @@ WaitForSomething2 0x00055000 _0807E8E4_1 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1039 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 SoundReq2 0x0001 _0807E8E4_2 @@ -92,10 +92,10 @@ WaitForSomething2 0x00000080 Wait 0x012c _0807E5F8 0x00000004 WaitForSomething2 0x00000008 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x103a .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 SetEntityPositionRelative 0x01c001f8 _0807F0B4 0x0004 @@ -113,10 +113,10 @@ SoundReq0x80100000 SoundReq 0x009b _0807E5F8 0x00000100 WaitForSomething2 0x00000200 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1043 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 SoundReq2 0x000d _0807E5F8 0x00000100 @@ -127,20 +127,20 @@ SoundReq 0x01c7 SoundReq 0x00e5 _0807E5F8 0x00000100 _0807E5F8 0x00002800 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfb29 .short 0x0807 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters WaitForSomething2 0x00000200 WaitForSomething2 0x00005000 _0807E5F8 0x00028000 WaitForSomething2 0x00050000 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1044 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 SetEntityPositionRelative 0x009801f8 SoundReq0x80100000 @@ -150,29 +150,29 @@ _0807E5F8 0x00028000 _0807E5F8 0x00000100 WaitForSomething2 0x00000200 WaitForSomething2 0x00050000 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfb29 .short 0x0807 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters SoundReq 0x00e5 _0807E5F8 0x00028000 WaitForSomething2 0x00050000 SoundReq 0x0125 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfb29 .short 0x0807 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E5F8 0x08000000 _0807E5F8 0x00800000 WaitForSomething2 0x01000000 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xdded .short 0x0805 .short 0x0002 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_08010E5A.inc b/data/scripts/gUnk_08010E5A.inc index 0154c425..013366c0 100644 --- a/data/scripts/gUnk_08010E5A.inc +++ b/data/scripts/gUnk_08010E5A.inc @@ -1,28 +1,28 @@ SCRIPT_START gUnk_08010E5A Wait 0x001e SoundReq 0x0125 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfb29 .short 0x0807 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x003c SoundReq 0x0125 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfb29 .short 0x0807 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x0004 SoundReq 0x0125 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfb29 .short 0x0807 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x001e SoundReq 0x012c _0807E5F8 0x00800000 @@ -39,27 +39,27 @@ WaitForSomething2 0x00000020 _0807E778 0x0002 DoFade6 WaitFor_2 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xde19 .short 0x0805 .short 0x0002 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807F0C8 0x0000, 0x0000 Call 0x0806dc3d Call 0x080791bd -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf245 .short 0x0807 .short 0x000d .short 0x0000 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0xf29d .short 0x0807 .short 0x49f6 .short 0x0800 -@ End of 4 parameters +@ End of parameters _0807F0B4 0x0001 SetEntityPositionRelative 0x006801f8 _0807E5F8 0x00000004 @@ -70,32 +70,32 @@ WaitForSomething2 0x00000080 SoundReq 0x01c3 _0807E5F8 0x20000000 Wait 0x0078 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf29d .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0806dc59 _0807E5F8 0x40000000 _0807E5F8 0x00000010 _0807E5F8 0x00000100 WaitForSomething2 0x00000020 WaitForSomething2 0x00000200 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1045 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1046 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xdded .short 0x0805 .short 0x0002 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_08010F84.inc b/data/scripts/gUnk_08010F84.inc index 84c28023..56905c01 100644 --- a/data/scripts/gUnk_08010F84.inc +++ b/data/scripts/gUnk_08010F84.inc @@ -4,74 +4,74 @@ _0807E5F8 0x00000100 WaitForSomething2 0x00000200 StartPlayerScript 0x080110bc WaitForSomething2 0x00000400 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1047 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 Call 0x0806dc3d Call 0x080791bd -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf245 .short 0x0807 .short 0x000d .short 0x0000 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0xf29d .short 0x0807 .short 0x49f6 .short 0x0800 -@ End of 4 parameters +@ End of parameters Wait 0x001e _0807E5F8 0x00000100 WaitForSomething2 0x00000200 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf29d .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0806dc59 Wait 0x003c _0807E5F8 0x08000000 SoundReq 0x0125 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfb29 .short 0x0807 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x000f SoundReq 0x0125 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfb29 .short 0x0807 .short 0x0003 .short 0x0000 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0xde19 .short 0x0805 .short 0x0002 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807F0C8 0x0000, 0x0000 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 SoundReq0x80100000 Wait 0x003c -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x104a .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000100 WaitForSomething2 0x00000200 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1049 .short 0x0000 -@ End of 2 parameters +@ End of parameters _0807EA94 SetEntityPositionRelative 0x009801f8 Wait 0x0078 diff --git a/data/scripts/gUnk_080112C4.inc b/data/scripts/gUnk_080112C4.inc index 69153313..8fa630b7 100644 --- a/data/scripts/gUnk_080112C4.inc +++ b/data/scripts/gUnk_080112C4.inc @@ -15,12 +15,12 @@ Wait 0x003c _0807ECC4 0x0010 _0807E930 0x0002 Call 0x08064051 -_0807E078 +.short 0x1406 @ _0807E078 with 4 parameters .short 0x0008 .short 0x009e .short 0x0134 .short 0x01f8 -@ End of 4 parameters +@ End of parameters _0807E610 0x00000800 _0807E5F8 0x00001000 WaitForSomething2 0x00000800 diff --git a/data/scripts/gUnk_080116A8.inc b/data/scripts/gUnk_080116A8.inc index 88896410..e1a13f87 100644 --- a/data/scripts/gUnk_080116A8.inc +++ b/data/scripts/gUnk_080116A8.inc @@ -33,12 +33,12 @@ WaitForSomething2 0x00000100 _0807EB44 0x0000 _0807EF80 0x0014 SoundReq 0x0120 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5421 .short 0x0809 .short 0x1890 .short 0x0801 -@ End of 4 parameters +@ End of parameters Wait 0x00f0 _0807EF80 0x0016 SoundReq 0x01cb @@ -55,12 +55,12 @@ _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EF80 0x0014 SoundReq 0x01c4 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x545d .short 0x0809 .short 0x18d4 .short 0x0801 -@ End of 4 parameters +@ End of parameters _0807E5F8 0x00000200 WaitForSomething2 0x00000100 Wait 0x003c diff --git a/data/scripts/gUnk_0801194C.inc b/data/scripts/gUnk_0801194C.inc index eaf6c38a..5783e0aa 100644 --- a/data/scripts/gUnk_0801194C.inc +++ b/data/scripts/gUnk_0801194C.inc @@ -11,23 +11,23 @@ StartScript _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters CheckGlobalFlag 0x0015 JumpIf 0x000a TextboxNoOverlapFollow 0x103d @@ -41,12 +41,12 @@ StartScript _0807E9D4 _0807EB44 0x0004 _0807EF80 0x000a -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x000c .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript Wait 0x003c Call 0x0806407d @@ -64,23 +64,23 @@ StartScript _0807EB44 0x0006 _0807E9D4 _0807EF80 0x000a -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x08064429 _0807EA94 _0807E878 @@ -90,23 +90,23 @@ StartScript _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters TextboxNoOverlapFollow 0x1320 _0807EA94 _0807E878 @@ -115,29 +115,29 @@ StartScript _0807EB44 0x0002 _0807E9D4 _0807EF80 0x000a -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x44b5 .short 0x0806 .short 0x0006 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIf 0x005e TextboxNoOverlapFollow 0x1320 _0807EA94 @@ -148,23 +148,23 @@ StartScript _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters TextboxNoOverlapFollow 0x1322 _0807EA94 _0807E878 @@ -174,18 +174,18 @@ JumpIfNot 0xfffa _0807E864 Call 0x0807f9a5 Call 0x0807df29 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1321 .short 0x0007 -@ End of 2 parameters +@ End of parameters _0807EA94 SetLocalFlag 0x0010 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda1d .short 0x0806 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E878 Call 0x0807df51 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08011B20.inc b/data/scripts/gUnk_08011B20.inc index 49463dff..7de59bd6 100644 --- a/data/scripts/gUnk_08011B20.inc +++ b/data/scripts/gUnk_08011B20.inc @@ -1,10 +1,10 @@ SCRIPT_START gUnk_08011B20 _0807E864 Call 0x0807df29 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1320 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E878 Call 0x0807df51 diff --git a/data/scripts/gUnk_08011B40.inc b/data/scripts/gUnk_08011B40.inc index df282424..911947db 100644 --- a/data/scripts/gUnk_08011B40.inc +++ b/data/scripts/gUnk_08011B40.inc @@ -39,12 +39,12 @@ ModRupees 0xfff6 Wait 0x001e TextboxNoOverlap 0x3d06 _0807EA94 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xc2a1 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters WaitFor_2 Wait 0x003c Call 0x0806c225 @@ -52,12 +52,12 @@ Jump 0xffb8 StartScript _0807E888 StopScript -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xc2a1 .short 0x0806 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters WaitFor_2 Wait 0x003c _0807E878 @@ -79,12 +79,12 @@ JumpIfNot 0xfffa _0807E888 WaitPlayerAction8 Wait 0x001e -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xc2a1 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters WaitFor_2 Wait 0x003c Call 0x0806c281 diff --git a/data/scripts/gUnk_08011C50.inc b/data/scripts/gUnk_08011C50.inc index aacd2d70..d576008a 100644 --- a/data/scripts/gUnk_08011C50.inc +++ b/data/scripts/gUnk_08011C50.inc @@ -3,12 +3,12 @@ StartScript _0807E864 StopScript Wait 0x003c -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xc2a1 .short 0x0806 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters WaitFor_2 Wait 0x003c _0807EF80 0x0014 diff --git a/data/scripts/gUnk_0801232C.inc b/data/scripts/gUnk_0801232C.inc index cc9d6451..dbaf7cc8 100644 --- a/data/scripts/gUnk_0801232C.inc +++ b/data/scripts/gUnk_0801232C.inc @@ -29,9 +29,9 @@ StartScript _0807E778 0x0004 _0807E788 0x00007fff DoFade5 -_0807E858 +.short 0x0842 @ _0807E858 with 1 parameters .short 0x0080 -@ End of 1 parameters +@ End of parameters StopScript WaitFor_2 SoundReq2 0x002c @@ -55,9 +55,9 @@ StartScript _0807E778 0x0004 _0807E788 0xffffffff DoFade4 -_0807E858 +.short 0x0842 @ _0807E858 with 1 parameters .short 0x0080 -@ End of 1 parameters +@ End of parameters StopScript WaitFor_2 SoundReq2 0xffff diff --git a/data/scripts/gUnk_08012430.inc b/data/scripts/gUnk_08012430.inc index ff893ab3..a6b89ccb 100644 --- a/data/scripts/gUnk_08012430.inc +++ b/data/scripts/gUnk_08012430.inc @@ -32,18 +32,18 @@ _0807E864 Call 0x0807f9a5 Call 0x0807df29 StartPlayerScript 0x08012ab0 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1101 .short 0x0007 -@ End of 2 parameters +@ End of parameters _0807EA94 CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 -_0807E858 +.short 0x0842 @ _0807E858 with 1 parameters .short 0x0000 -@ End of 1 parameters +@ End of parameters Call 0x080791bd LoadRoomEntityList 0x080f4d70 Call 0x0805ebcd @@ -153,12 +153,12 @@ Wait 0x003c SoundReq2 0xffff Call 0x08054571 SetGlobalFlag 0x0014 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf6f9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0807df51 _0807E878 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_080126FC.inc b/data/scripts/gUnk_080126FC.inc index f6b88cad..18426285 100644 --- a/data/scripts/gUnk_080126FC.inc +++ b/data/scripts/gUnk_080126FC.inc @@ -7,20 +7,20 @@ _0807E930 0x0020 WaitForSomething2 0x00000004 _0807E930 0x0022 Call 0x0807f3c9 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1102 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 Call 0x0807f3c9 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1103 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 @@ -31,44 +31,44 @@ _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807EF80 0x0011 _0807E930 0x001c -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1105 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0022 Call 0x0807f3c9 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1106 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x001c Call 0x0806d96d -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1107 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 Call 0x0807f3c9 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1108 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x001c Call 0x0806d96d -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1109 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x0020 _0807EF80 0x000a @@ -84,22 +84,22 @@ StopScript _0807E864 Call 0x0806d945 _0807E930 0x0010 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1114 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x0020 _0807E878 Jump 0xffd0 _0807E864 _0807E9DC -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf5b1 .short 0x0807 .short 0x003c .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x080791d1 StopScript _0807E5F8 0x00000008 @@ -109,19 +109,19 @@ _0807E5F8 0x00000008 WaitForSomething2 0x00000004 Call 0x0806d945 _0807E930 0x0010 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x110a .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x110b .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 @@ -129,28 +129,28 @@ WaitForSomething2 0x00000004 _0807EF80 0x0004 Wait 0x003c _0807E930 0x0010 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x110c .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x110d .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x110e .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x0018 SetEntityNonPlanarMovement 0x0080 @@ -171,10 +171,10 @@ Jump 0xffe6 _0807E864 _0807E930 0x0010 StopScript -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1115 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x0018 _0807E878 @@ -186,10 +186,10 @@ Call 0x0807df29 _0807EB8C Call 0x0806d945 _0807E930 0x0010 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x110f .short 0x000c -@ End of 2 parameters +@ End of parameters _0807E930 0x0018 SetEntityNonPlanarMovement 0x0080 Call 0x0806d909 @@ -210,10 +210,10 @@ Jump 0xffe6 _0807E864 _0807E930 0x0010 StopScript -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1115 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x0018 _0807E878 @@ -225,10 +225,10 @@ Call 0x0807df29 _0807EB8C Call 0x0806d945 _0807E930 0x0010 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1110 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807E930 0x0018 SetEntityNonPlanarMovement 0x0080 Call 0x0806d909 @@ -250,10 +250,10 @@ Jump 0xffe6 _0807E864 _0807E930 0x0010 StopScript -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1115 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x0018 _0807E878 @@ -267,10 +267,10 @@ _0807EF80 0x000b _0807EB8C Call 0x0806d945 _0807E930 0x0010 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1111 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807E930 0x0018 SetEntityNonPlanarMovement 0x0080 Call 0x0806d8a1 diff --git a/data/scripts/gUnk_08012B24.inc b/data/scripts/gUnk_08012B24.inc index 22d05e05..e8ce1754 100644 --- a/data/scripts/gUnk_08012B24.inc +++ b/data/scripts/gUnk_08012B24.inc @@ -6,11 +6,11 @@ StopScript _0807EF80 0x0001 _0807ECC4 0x0008 _0807E5F8 0x00000002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfb65 .short 0x0807 .short 0xffe2 .short 0xffff -@ End of 4 parameters +@ End of parameters Call 0x080791bd SCRIPT_END diff --git a/data/scripts/gUnk_08012B50.inc b/data/scripts/gUnk_08012B50.inc index 29284519..66c706b1 100644 --- a/data/scripts/gUnk_08012B50.inc +++ b/data/scripts/gUnk_08012B50.inc @@ -6,11 +6,11 @@ StopScript _0807EF80 0x0001 _0807EC64 0x0008 _0807E5F8 0x00000002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfb65 .short 0x0807 .short 0xffe2 .short 0xffff -@ End of 4 parameters +@ End of parameters Call 0x080791bd SCRIPT_END diff --git a/data/scripts/gUnk_08012B7C.inc b/data/scripts/gUnk_08012B7C.inc index 7fe6c915..0ba5da08 100644 --- a/data/scripts/gUnk_08012B7C.inc +++ b/data/scripts/gUnk_08012B7C.inc @@ -6,11 +6,11 @@ StopScript _0807EF80 0x0001 _0807EC94 0x0008 _0807E5F8 0x00000002 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfb65 .short 0x0807 .short 0xffe2 .short 0xffff -@ End of 4 parameters +@ End of parameters Call 0x080791bd SCRIPT_END diff --git a/data/scripts/gUnk_08012E88.inc b/data/scripts/gUnk_08012E88.inc index c37dd7b9..85156a81 100644 --- a/data/scripts/gUnk_08012E88.inc +++ b/data/scripts/gUnk_08012E88.inc @@ -18,12 +18,12 @@ Jump 0xffe2 .short 0x0000 StartScript _0807EB44 0x0004 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x000a Call 0x0806b60d StopScript @@ -31,59 +31,20 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x000c .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0806b4f1 _0807EA94 Wait 0x000f _0807E878 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters Jump 0xffd2 - -.globl gUnk_08012F0C -gUnk_08012F0C: -StartScript -CallWithArg -.short 0xa93d -.short 0x0806 -.short 0x5678 -.short 0x1234 -@ End of 4 parameters -_0807EB44 0x0004 -_0807E930 0x0002 -CheckInventory1 0x0015 -JumpIf 0x0190 -CheckLocalFlag 0x0060 -JumpIf 0x00a4 -CheckGlobalFlag 0x001e -JumpIf 0x0050 -StopScript -CheckLocalFlag 0x0062 -JumpIfNot 0x0008 -Call 0x0806a9b1 -CheckLocalFlag 0x0061 -JumpIf 0x001e -Call 0x0806a96d -JumpIfNot 0xfff8 -_0807E864 -TextboxNoOverlap 0x4401 -_0807EA94 -SetLocalFlag 0x0061 -_0807E878 -_0807E908 0x0001 -Call 0x0806a96d -JumpIfNot 0xfff8 -TextboxNoOverlap 0x4402 -_0807EA94 -_0807E908 0x0001 -Jump 0xffea -SCRIPT_END diff --git a/data/scripts/gUnk_08012F0C.inc b/data/scripts/gUnk_08012F0C.inc new file mode 100644 index 00000000..32616911 --- /dev/null +++ b/data/scripts/gUnk_08012F0C.inc @@ -0,0 +1,37 @@ +SCRIPT_START gUnk_08012F0C +StartScript +.short 0x140c @ CallWithArg with 4 parameters +.short 0xa93d +.short 0x0806 +.short 0x5678 +.short 0x1234 +@ End of parameters +_0807EB44 0x0004 +_0807E930 0x0002 +CheckInventory1 0x0015 +JumpIf 0x0190 +CheckLocalFlag 0x0060 +JumpIf 0x00a4 +CheckGlobalFlag 0x001e +JumpIf 0x0050 +StopScript +CheckLocalFlag 0x0062 +JumpIfNot 0x0008 +Call 0x0806a9b1 +CheckLocalFlag 0x0061 +JumpIf 0x001e +Call 0x0806a96d +JumpIfNot 0xfff8 +_0807E864 +TextboxNoOverlap 0x4401 +_0807EA94 +SetLocalFlag 0x0061 +_0807E878 +_0807E908 0x0001 +Call 0x0806a96d +JumpIfNot 0xfff8 +TextboxNoOverlap 0x4402 +_0807EA94 +_0807E908 0x0001 +Jump 0xffea +SCRIPT_END diff --git a/data/scripts/gUnk_08012F86.inc b/data/scripts/gUnk_08012F86.inc index 3e55cd38..69c0228a 100644 --- a/data/scripts/gUnk_08012F86.inc +++ b/data/scripts/gUnk_08012F86.inc @@ -11,12 +11,12 @@ StopScript WaitForSomething2 0x00000004 _0807E908 0x0004 Call 0x0806a959 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf93d .short 0x0807 .short 0xf2f4 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0807df51 _0807E878 SetLocalFlag 0x0062 @@ -25,12 +25,12 @@ StartScript _0807E930 0x000d _0807E908 0x0005 SetLocalFlag 0x0062 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf93d .short 0x0807 .short 0xf2f4 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0806aa11 StopScript CheckInventory1 0x0038 diff --git a/data/scripts/gUnk_08013114.inc b/data/scripts/gUnk_08013114.inc index 2ef0bc28..a32bf669 100644 --- a/data/scripts/gUnk_08013114.inc +++ b/data/scripts/gUnk_08013114.inc @@ -15,26 +15,26 @@ _0807E864 StopScript _0807EB74 Call 0x0806aed9 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaa51 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EA94 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaa51 .short 0x0806 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EA94 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaa51 .short 0x0806 .short 0x0002 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EA94 JumpIf 0x0008 _0807E878 diff --git a/data/scripts/gUnk_0801319A.inc b/data/scripts/gUnk_0801319A.inc index 4d4408c9..428dcd96 100644 --- a/data/scripts/gUnk_0801319A.inc +++ b/data/scripts/gUnk_0801319A.inc @@ -30,10 +30,10 @@ Call 0x080536b9 _0807E864 Call 0x0807df29 WaitFor_2 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1602 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000008 WaitForSomething2 0x00000010 @@ -47,10 +47,10 @@ WaitForSomething2 0x00000040 StartPlayerScript 0x08013378 _0807E5F8 0x00000020 WaitForSomething2 0x00000042 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1603 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000020 WaitForSomething2 0x00000040 @@ -59,16 +59,16 @@ _0807E778 0x0004 DoFade5 WaitFor_2 SoundReq0x80100000 -_0807E858 +.short 0x0842 @ _0807E858 with 1 parameters .short 0x0000 -@ End of 1 parameters +@ End of parameters Wait 0x003c CameraTargetPlayer Call 0x0807f5c1 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1604 .short 0x0007 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E788 0xffffffff _0807E778 0x0004 diff --git a/data/scripts/gUnk_080133F8.inc b/data/scripts/gUnk_080133F8.inc index 8742209f..67514e31 100644 --- a/data/scripts/gUnk_080133F8.inc +++ b/data/scripts/gUnk_080133F8.inc @@ -15,12 +15,12 @@ WaitForSomething2 0x00000020 Wait 0x003c _0807EF80 0x0014 SoundReq 0x0120 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5421 .short 0x0809 .short 0x3494 .short 0x0801 -@ End of 4 parameters +@ End of parameters Wait 0x005a _0807EF80 0x0016 WaitForSomething2 0x00000080 diff --git a/data/scripts/gUnk_080134DC.inc b/data/scripts/gUnk_080134DC.inc index 25dfe899..f3eddbda 100644 --- a/data/scripts/gUnk_080134DC.inc +++ b/data/scripts/gUnk_080134DC.inc @@ -4,12 +4,12 @@ _0807EF80 0x0008 StopScript StartScript Call 0x0807f92d -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda05 .short 0x0806 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc @@ -17,93 +17,93 @@ _0807E864 Call 0x0807df29 StartPlayerScript 0x080136d8 WaitForSomething2 0x00000001 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5a1d .short 0x0809 .short 0x3f04 .short 0x0801 -@ End of 4 parameters +@ End of parameters SoundReq 0x01cd Wait 0x005a StartScript SoundReq 0x01ce -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d55 .short 0x0809 .short 0x3e04 .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d55 .short 0x0809 .short 0x3e28 .short 0x0801 -@ End of 4 parameters +@ End of parameters StopScript WaitForSomething2 0x18000000 StartScript SoundReq 0x01cf -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4054 .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4074 .short 0x0801 -@ End of 4 parameters +@ End of parameters StopScript Wait 0x001e StartScript SoundReq 0x01d0 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x40dc .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4118 .short 0x0801 -@ End of 4 parameters +@ End of parameters StopScript Wait 0x003c -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xdded .short 0x0805 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E5F8 0x00000200 WaitForSomething2 0x00002000 SoundReq 0x01d2 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x41dc .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4210 .short 0x0801 -@ End of 4 parameters +@ End of parameters _0807E5F8 0x00000400 WaitForSomething2 0x00004000 Wait 0x0078 _0807E5F8 0x00000060 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xde19 .short 0x0805 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x0078 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 @@ -125,16 +125,16 @@ _0807E778 0x0002 DoFade6 WaitFor_2 SoundReq 0x0109 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x0503 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00040000 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xdded .short 0x0805 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_08013650.inc b/data/scripts/gUnk_08013650.inc index 438bdfe6..15406890 100644 --- a/data/scripts/gUnk_08013650.inc +++ b/data/scripts/gUnk_08013650.inc @@ -7,12 +7,12 @@ CameraTargetEntity Wait 0x003c _0807E5F8 0x00000004 Wait 0x0078 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xde19 .short 0x0805 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807F0C8 0x0000, 0x0000 StartPlayerScript 0x080136b4 WaitForSomething2 0x00000002 diff --git a/data/scripts/gUnk_080136D8.inc b/data/scripts/gUnk_080136D8.inc index 15e0daab..f63d1a5c 100644 --- a/data/scripts/gUnk_080136D8.inc +++ b/data/scripts/gUnk_080136D8.inc @@ -3,24 +3,24 @@ StartScript SetEntityNonPlanarMovement 0x0100 StopScript Call 0x0807f585 -_0807E078 +.short 0x1406 @ _0807E078 with 4 parameters .short 0x0008 .short 0x0010 .short 0x0018 .short 0x000c -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0xf465 .short 0x0807 .short 0x00d0 .short 0x0000 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0xf4f9 .short 0x0807 .short 0x0124 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EDD4 0x00e8, 0x0124 _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_08013720.inc b/data/scripts/gUnk_08013720.inc index 7b8a7711..be03a571 100644 --- a/data/scripts/gUnk_08013720.inc +++ b/data/scripts/gUnk_08013720.inc @@ -4,12 +4,12 @@ _0807EF80 0x0008 StopScript StartScript Call 0x0807f92d -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda05 .short 0x0806 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc @@ -17,101 +17,101 @@ _0807E864 Call 0x0807df29 StartPlayerScript 0x080136d8 WaitForSomething2 0x00000001 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5a1d .short 0x0809 .short 0x3f34 .short 0x0801 -@ End of 4 parameters +@ End of parameters SoundReq 0x01cd Wait 0x005a StartScript SoundReq 0x01ce -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d55 .short 0x0809 .short 0x3e4c .short 0x0801 -@ End of 4 parameters +@ End of parameters StopScript WaitForSomething2 0x20000000 StartScript SoundReq 0x01cf -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4054 .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4074 .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4094 .short 0x0801 -@ End of 4 parameters +@ End of parameters StopScript Wait 0x001e StartScript SoundReq 0x01d0 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x40dc .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4118 .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4154 .short 0x0801 -@ End of 4 parameters +@ End of parameters StopScript Wait 0x003c -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xdded .short 0x0805 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E5F8 0x00000200 WaitForSomething2 0x00002000 SoundReq 0x01d2 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x41dc .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4210 .short 0x0801 -@ End of 4 parameters +@ End of parameters _0807E5F8 0x00000400 WaitForSomething2 0x00004000 _0807E5F8 0x00000800 WaitForSomething2 0x00008000 Wait 0x0078 _0807E5F8 0x00000060 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xde19 .short 0x0805 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x0078 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 @@ -133,10 +133,10 @@ _0807E778 0x0002 DoFade6 WaitFor_2 SoundReq 0x0109 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x0504 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00040000 SetLocalFlag 0x007b diff --git a/data/scripts/gUnk_080138B4.inc b/data/scripts/gUnk_080138B4.inc index 693239c0..bada7949 100644 --- a/data/scripts/gUnk_080138B4.inc +++ b/data/scripts/gUnk_080138B4.inc @@ -4,12 +4,12 @@ _0807EF80 0x0008 StopScript StartScript Call 0x0807f92d -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda05 .short 0x0806 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc @@ -17,101 +17,101 @@ _0807E864 Call 0x0807df29 StartPlayerScript 0x080136d8 WaitForSomething2 0x00000001 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5a1d .short 0x0809 .short 0x3f64 .short 0x0801 -@ End of 4 parameters +@ End of parameters SoundReq 0x01cd Wait 0x005a StartScript SoundReq 0x01ce -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d55 .short 0x0809 .short 0x3e70 .short 0x0801 -@ End of 4 parameters +@ End of parameters StopScript WaitForSomething2 0x40000000 StartScript SoundReq 0x01cf -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4054 .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4074 .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4094 .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x40b8 .short 0x0801 -@ End of 4 parameters +@ End of parameters StopScript Wait 0x001e StartScript SoundReq 0x01d0 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x40dc .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4118 .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4154 .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4198 .short 0x0801 -@ End of 4 parameters +@ End of parameters StopScript Wait 0x003c -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xdded .short 0x0805 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E5F8 0x00000200 WaitForSomething2 0x00002000 SoundReq 0x01d2 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x41dc .short 0x0801 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d8d .short 0x0809 .short 0x4210 .short 0x0801 -@ End of 4 parameters +@ End of parameters _0807E5F8 0x00000400 WaitForSomething2 0x00004000 _0807E5F8 0x00000800 @@ -120,12 +120,12 @@ _0807E5F8 0x00001000 WaitForSomething2 0x00010000 Wait 0x0078 _0807E5F8 0x00000060 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xde19 .short 0x0805 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x0078 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 @@ -148,42 +148,42 @@ _0807E778 0x0002 DoFade6 WaitFor_2 SoundReq 0x0109 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x0505 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00040000 _0807F0B4 0x0002 SetEntityPositionRelative 0x00d800e8 CameraTargetEntity Call 0x0806dc3d -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf245 .short 0x0807 .short 0x0001 .short 0x0001 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0xf29d .short 0x0807 .short 0x49fe .short 0x0800 -@ End of 4 parameters +@ End of parameters Wait 0x00c8 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf29d .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0806dc59 CheckRoomFlag 0x0004 JumpIfNot 0xfffa -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xdded .short 0x0805 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_08013AA6.inc b/data/scripts/gUnk_08013AA6.inc index acd46843..89fae614 100644 --- a/data/scripts/gUnk_08013AA6.inc +++ b/data/scripts/gUnk_08013AA6.inc @@ -3,12 +3,12 @@ Call 0x0807f3f9 Wait 0x003c _0807E5F8 0x00000008 Wait 0x0078 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xde19 .short 0x0805 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807F0C8 0x0000, 0x0000 Wait 0x003c _0807F0B4 0x0004 diff --git a/data/scripts/gUnk_08013B18.inc b/data/scripts/gUnk_08013B18.inc index 1c768732..bafcadf3 100644 --- a/data/scripts/gUnk_08013B18.inc +++ b/data/scripts/gUnk_08013B18.inc @@ -3,12 +3,12 @@ StartScript _0807EF80 0x0008 StopScript StartScript -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf6b5 .short 0x0807 .short 0x01c8 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIfNot 0xfff0 CheckInventory1 0x0006 JumpIfNot 0xffe8 @@ -27,12 +27,12 @@ _0807E878 Jump 0xffb2 .short 0x0000 SoundReq 0x01d3 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf239 .short 0x0807 .short 0x08bf .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x08096029 Wait 0x003c _0807E5F8 0x00020000 diff --git a/data/scripts/gUnk_08013BA8.inc b/data/scripts/gUnk_08013BA8.inc index 1435f7bf..65d13d26 100644 --- a/data/scripts/gUnk_08013BA8.inc +++ b/data/scripts/gUnk_08013BA8.inc @@ -1,17 +1,17 @@ SCRIPT_START gUnk_08013BA8 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5e7d .short 0x0809 .short 0x4248 .short 0x0801 -@ End of 4 parameters +@ End of parameters SoundReq 0x01d3 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf239 .short 0x0807 .short 0x08e3 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x08096029 Wait 0x0078 _0807E5F8 0x00020000 diff --git a/data/scripts/gUnk_08013BE8.inc b/data/scripts/gUnk_08013BE8.inc index df2384fd..6982628d 100644 --- a/data/scripts/gUnk_08013BE8.inc +++ b/data/scripts/gUnk_08013BE8.inc @@ -22,18 +22,18 @@ StartScript _0807EF80 0x0007 Call 0x0807f935 _0807EF80 0x000a -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x62f9 .short 0x0809 .short 0x0000 .short 0x0000 -@ End of 4 parameters -CallWithArg +@ End of parameters +.short 0x140c @ CallWithArg with 4 parameters .short 0xf8e9 .short 0x0807 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript StopScript StartScript diff --git a/data/scripts/gUnk_08013D04.inc b/data/scripts/gUnk_08013D04.inc index ec7cf676..23514d46 100644 --- a/data/scripts/gUnk_08013D04.inc +++ b/data/scripts/gUnk_08013D04.inc @@ -2,21 +2,21 @@ SCRIPT_START gUnk_08013D04 StartScript Call 0x0807f92d _0807EF80 0x0008 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda05 .short 0x0806 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d55 .short 0x0809 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters SoundReq 0x01cd _0807E5F8 0x08000000 Call 0x080791bd diff --git a/data/scripts/gUnk_08013D44.inc b/data/scripts/gUnk_08013D44.inc index b913f233..d6611b57 100644 --- a/data/scripts/gUnk_08013D44.inc +++ b/data/scripts/gUnk_08013D44.inc @@ -2,21 +2,21 @@ SCRIPT_START gUnk_08013D44 StartScript Call 0x0807f92d _0807EF80 0x0008 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda05 .short 0x0806 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d55 .short 0x0809 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters SoundReq 0x01cd _0807E5F8 0x10000000 Call 0x080791bd diff --git a/data/scripts/gUnk_08013D84.inc b/data/scripts/gUnk_08013D84.inc index 9a7a338c..b29efd5d 100644 --- a/data/scripts/gUnk_08013D84.inc +++ b/data/scripts/gUnk_08013D84.inc @@ -2,21 +2,21 @@ SCRIPT_START gUnk_08013D84 StartScript Call 0x0807f92d _0807EF80 0x0008 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda05 .short 0x0806 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d55 .short 0x0809 .short 0x0002 .short 0x0000 -@ End of 4 parameters +@ End of parameters SoundReq 0x01cd _0807E5F8 0x20000000 Call 0x080791bd diff --git a/data/scripts/gUnk_08013DC4.inc b/data/scripts/gUnk_08013DC4.inc index d0995ac5..2597652e 100644 --- a/data/scripts/gUnk_08013DC4.inc +++ b/data/scripts/gUnk_08013DC4.inc @@ -2,21 +2,21 @@ SCRIPT_START gUnk_08013DC4 StartScript Call 0x0807f92d _0807EF80 0x0008 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda05 .short 0x0806 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5d55 .short 0x0809 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters SoundReq 0x01cd _0807E5F8 0x40000000 Call 0x080791bd diff --git a/data/scripts/gUnk_08013FE8.inc b/data/scripts/gUnk_08013FE8.inc index 8dabc50f..be7ca6b1 100644 --- a/data/scripts/gUnk_08013FE8.inc +++ b/data/scripts/gUnk_08013FE8.inc @@ -10,12 +10,12 @@ CheckLocalFlag 0x007a JumpIfNot 0xffee CheckInventory1 0x0003 JumpIfNot 0xffe6 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf6b5 .short 0x0807 .short 0x00d0 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIfNot 0xffd8 StopScript Call 0x0807f9a5 diff --git a/data/scripts/gUnk_080141DC.inc b/data/scripts/gUnk_080141DC.inc index a7f170e8..a4a1d7a5 100644 --- a/data/scripts/gUnk_080141DC.inc +++ b/data/scripts/gUnk_080141DC.inc @@ -3,12 +3,12 @@ StartScript _0807EF80 0x0007 _0807E930 0x0014 Call 0x0807f715 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf995 .short 0x0807 .short 0xfffc .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript WaitForSomething 0x00000020 Wait 0x0078 diff --git a/data/scripts/gUnk_08014210.inc b/data/scripts/gUnk_08014210.inc index 1a10fe76..5a8afc07 100644 --- a/data/scripts/gUnk_08014210.inc +++ b/data/scripts/gUnk_08014210.inc @@ -4,12 +4,12 @@ _0807EF80 0x0007 _0807E930 0x0015 Call 0x0807f715 Call 0x0807f715 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf995 .short 0x0807 .short 0xfffc .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript WaitForSomething 0x00000020 Wait 0x0078 diff --git a/data/scripts/gUnk_08014248.inc b/data/scripts/gUnk_08014248.inc index 77458d3a..ed295289 100644 --- a/data/scripts/gUnk_08014248.inc +++ b/data/scripts/gUnk_08014248.inc @@ -2,19 +2,19 @@ SCRIPT_START gUnk_08014248 TestBit 0x00020000 JumpIf 0x0014 Wait 0x0008 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5ead .short 0x0809 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Jump 0xffe6 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x5ead .short 0x0809 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters Jump 0xfff4 .short 0x0000 StartScript @@ -24,83 +24,21 @@ CheckLocalFlag 0x0078 JumpIfNot 0xfffa StartScript Call 0x0807f935 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda05 .short 0x0806 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x0647 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E878 Jump 0xffec .short 0x0000 - -.globl gUnk_080142B0 -gUnk_080142B0: -StartScript -CheckLocalFlag 0x0054 -JumpIf 0x00ca -CheckLocalFlag 0x0053 -JumpIf 0x0070 -StopScript -StopScript -StartScript -_0807E564 -JumpIfNot 0xfff8 -CheckPlayerInRegion 0x0098, 0x0058, 0x1818 -JumpIfNot 0xffec -StopScript -_0807E864 -SetLocalFlag 0x0053 -Wait 0x0014 -_0807E908 0x0004 -Call 0x080654dd -Wait 0x001e -_0807E930 0x0001 -Wait 0x000a -_0807E930 0x0003 -Wait 0x000a -_0807E930 0x0001 -Wait 0x000a -_0807E930 0x0003 -Wait 0x000a -_0807E930 0x0002 -Wait 0x001e -TextboxNoOverlap 0x2c12 -_0807EA94 -Wait 0x0014 -_0807E930 0x0004 -_0807E878 -_0807E908 0x0001 -StopScript -StartScript -_0807E564 -JumpIf 0xfff8 -EntityHasHeight -JumpIf 0xfff2 -CheckPlayerInRegion 0x00c0, 0x0068, 0x1010 -JumpIfNot 0xffe6 -StopScript -_0807E864 -SetLocalFlag 0x0054 -Wait 0x005a -_0807E908 0x0004 -Call 0x080654ed -Wait 0x001e -_0807E930 0x0001 -Wait 0x001e -TextboxNoOverlap 0x2c13 -_0807EA94 -Wait 0x0014 -_0807E930 0x0004 -_0807E908 0x0001 -_0807E878 -SCRIPT_END diff --git a/data/scripts/gUnk_080142B0.inc b/data/scripts/gUnk_080142B0.inc new file mode 100644 index 00000000..80923c10 --- /dev/null +++ b/data/scripts/gUnk_080142B0.inc @@ -0,0 +1,60 @@ +SCRIPT_START gUnk_080142B0 +StartScript +CheckLocalFlag 0x0054 +JumpIf 0x00ca +CheckLocalFlag 0x0053 +JumpIf 0x0070 +StopScript +StopScript +StartScript +_0807E564 +JumpIfNot 0xfff8 +CheckPlayerInRegion 0x0098, 0x0058, 0x1818 +JumpIfNot 0xffec +StopScript +_0807E864 +SetLocalFlag 0x0053 +Wait 0x0014 +_0807E908 0x0004 +Call 0x080654dd +Wait 0x001e +_0807E930 0x0001 +Wait 0x000a +_0807E930 0x0003 +Wait 0x000a +_0807E930 0x0001 +Wait 0x000a +_0807E930 0x0003 +Wait 0x000a +_0807E930 0x0002 +Wait 0x001e +TextboxNoOverlap 0x2c12 +_0807EA94 +Wait 0x0014 +_0807E930 0x0004 +_0807E878 +_0807E908 0x0001 +StopScript +StartScript +_0807E564 +JumpIf 0xfff8 +EntityHasHeight +JumpIf 0xfff2 +CheckPlayerInRegion 0x00c0, 0x0068, 0x1010 +JumpIfNot 0xffe6 +StopScript +_0807E864 +SetLocalFlag 0x0054 +Wait 0x005a +_0807E908 0x0004 +Call 0x080654ed +Wait 0x001e +_0807E930 0x0001 +Wait 0x001e +TextboxNoOverlap 0x2c13 +_0807EA94 +Wait 0x0014 +_0807E930 0x0004 +_0807E908 0x0001 +_0807E878 +SCRIPT_END diff --git a/data/scripts/gUnk_08014450.inc b/data/scripts/gUnk_08014450.inc index 663eece6..5cba5540 100644 --- a/data/scripts/gUnk_08014450.inc +++ b/data/scripts/gUnk_08014450.inc @@ -27,10 +27,10 @@ Call 0x0806e251 JumpIfNot 0x000e TextboxNoOverlapFollow 0x420b _0807EB38 -_0807E078 +.short 0x0c06 @ _0807E078 with 2 parameters .short 0x0004 .short 0x000a -@ End of 2 parameters +@ End of parameters ClearLocalFlag 0x0093 Jump 0x000a SetLocalFlag 0x0093 diff --git a/data/scripts/gUnk_080145B0.inc b/data/scripts/gUnk_080145B0.inc index b155d174..7dfd951f 100644 --- a/data/scripts/gUnk_080145B0.inc +++ b/data/scripts/gUnk_080145B0.inc @@ -10,10 +10,10 @@ _0807E864 ClearRoomFlag 0x0005 Wait 0x000c _0807EB8C -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x432e .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E878 Jump 0xffe0 diff --git a/data/scripts/gUnk_080145E8.inc b/data/scripts/gUnk_080145E8.inc index ea393b3a..2ff86973 100644 --- a/data/scripts/gUnk_080145E8.inc +++ b/data/scripts/gUnk_080145E8.inc @@ -33,10 +33,10 @@ CheckLocalFlag 0x005e JumpIf 0x003e _0807E864 _0807EB8C -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x432b .short 0x000c -@ End of 2 parameters +@ End of parameters Jump 0x015e Call 0x08088659 JumpIfNot 0xffc0 @@ -57,10 +57,10 @@ Wait 0x0010 _0807E930 0x0002 CheckGlobalFlag 0x0059 JumpIfNot 0x000c -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x432f .short 0x000c -@ End of 2 parameters +@ End of parameters Jump 0x010a CheckRoomFlag 0x0004 JumpIf 0x0028 @@ -73,24 +73,24 @@ JumpIf 0x003c Call 0x08088575 SetRoomFlag 0x0009 Jump 0x004a -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x431e .short 0x000c -@ End of 2 parameters +@ End of parameters Jump 0x00d2 SetRoomFlag 0x0009 SetLocalFlag 0x005c -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x4305 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E3BC 0x0001 JumpIfNot 0x00b0 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x4306 .short 0x000c -@ End of 2 parameters +@ End of parameters Jump 0x001e SetRoomFlag 0x0009 Call 0x08088505 @@ -110,10 +110,10 @@ JumpIfNot 0xfffa ClearRoomFlag 0x0003 _0807EA94 SetRoomFlag 0x0004 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x431e .short 0x000c -@ End of 2 parameters +@ End of parameters Jump 0x0060 SetRoomFlag 0x0009 _0807EA94 @@ -137,10 +137,10 @@ Wait 0x008c _0807E930 0x0002 Jump 0xffc8 SetRoomFlag 0x0009 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x4307 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 Wait 0x0004 _0807E878 diff --git a/data/scripts/gUnk_08014804.inc b/data/scripts/gUnk_08014804.inc index a67cef9c..0f51cb04 100644 --- a/data/scripts/gUnk_08014804.inc +++ b/data/scripts/gUnk_08014804.inc @@ -9,10 +9,10 @@ Call 0x0807df39 Wait 0x0010 CheckLocalFlag 0x0093 JumpIf 0x0092 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x4215 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807E878 TestBit 0x00000001 JumpIf 0x002c @@ -24,10 +24,10 @@ _0807E864 _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x4215 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807E878 Jump 0xffce _0807E930 0x0008 @@ -50,10 +50,10 @@ _0807E864 _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x4216 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807E878 Jump 0xffce _0807E930 0x0008 diff --git a/data/scripts/gUnk_080149CC.inc b/data/scripts/gUnk_080149CC.inc index 9882bfe8..1f1d577a 100644 --- a/data/scripts/gUnk_080149CC.inc +++ b/data/scripts/gUnk_080149CC.inc @@ -53,57 +53,3 @@ Wait 0x000f _0807E878 Jump 0xffe6 .short 0x0000 - - .globl gUnk_08014A80 -gUnk_08014A80: -StartScript -_0807EF80 0x000a -StopScript -WaitForSomething2 0x00000001 -_0807EB74 -_0807EF80 0x0004 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -TextboxNoOverlap 0x2f0a -_0807EA94 -_0807E5F8 0x00000002 -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x2f0a -_0807EA94 -_0807E878 -Jump 0xffec -.short 0x0000 -StartScript -Call 0x0806c871 -_0807EF80 0x000a -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -StartPlayerScript 0x08014b10 -WaitForSomething2 0x00000001 -_0807EB74 -CheckLocalFlag 0x0064 -JumpIf 0x000e -SetLocalFlag 0x0064 -TextboxNoOverlap 0x2f0b -Jump 0x0006 -TextboxNoOverlap 0x2f0c -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffc6 -.short 0x0000 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x0078, 0x0040 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call 0x080791bd -SCRIPT_END diff --git a/data/scripts/gUnk_08014A80.inc b/data/scripts/gUnk_08014A80.inc new file mode 100644 index 00000000..0c7347cd --- /dev/null +++ b/data/scripts/gUnk_08014A80.inc @@ -0,0 +1,52 @@ +SCRIPT_START gUnk_08014A80 +StartScript +_0807EF80 0x000a +StopScript +WaitForSomething2 0x00000001 +_0807EB74 +_0807EF80 0x0004 +_0807E5F8 0x00000002 +WaitForSomething2 0x00000001 +TextboxNoOverlap 0x2f0a +_0807EA94 +_0807E5F8 0x00000002 +_0807E30C +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +TextboxNoOverlap 0x2f0a +_0807EA94 +_0807E878 +Jump 0xffec +.short 0x0000 +StartScript +Call 0x0806c871 +_0807EF80 0x000a +StopScript +_0807E30C +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +StartPlayerScript 0x08014b10 +WaitForSomething2 0x00000001 +_0807EB74 +CheckLocalFlag 0x0064 +JumpIf 0x000e +SetLocalFlag 0x0064 +TextboxNoOverlap 0x2f0b +Jump 0x0006 +TextboxNoOverlap 0x2f0c +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffc6 +.short 0x0000 +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807EDD4 0x0078, 0x0040 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call 0x080791bd +SCRIPT_END diff --git a/data/scripts/gUnk_08014CDC.inc b/data/scripts/gUnk_08014CDC.inc index 5c80a274..2ad6adef 100644 --- a/data/scripts/gUnk_08014CDC.inc +++ b/data/scripts/gUnk_08014CDC.inc @@ -11,10 +11,10 @@ StopScript WaitForSomething2 0x00000001 Call 0x08066e09 _0807E864 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1010 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000002 StopScript @@ -33,12 +33,12 @@ Call 0x08066e09 SetEntityPositionRelative 0x00c801f8 Call 0x0807df51 _0807E878 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf6b5 .short 0x0807 .short 0x00e8 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIf 0xfff4 _0807E864 Call 0x0807df29 diff --git a/data/scripts/gUnk_08014E14.inc b/data/scripts/gUnk_08014E14.inc index 9d45548d..31bf0b96 100644 --- a/data/scripts/gUnk_08014E14.inc +++ b/data/scripts/gUnk_08014E14.inc @@ -3,23 +3,23 @@ StartScript _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf3d9 .short 0x0807 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x08064429 _0807EA94 _0807E878 @@ -36,30 +36,30 @@ JumpIfNot 0xfffc _0807E864 Call 0x0807df29 _0807EB74 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf78d .short 0x0807 .short 0x0022 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EA94 _0807E3E8 JumpIfNot 0x0038 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf7c5 .short 0x0807 .short 0x0022 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIfNot 0x001e _0807E48C 0x0020 JumpIfNot 0x001e -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf801 .short 0x0807 .short 0x0022 .short 0x0000 -@ End of 4 parameters +@ End of parameters WaitPlayerAction8 TextboxNoOverlap 0x0a04 Jump 0x000e @@ -119,12 +119,12 @@ _0807EB74 _0807EF80 0x0000 StartScript TextboxNoOverlap 0x3b0b -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf855 .short 0x0807 .short 0x0064 .short 0x0001 -@ End of 4 parameters +@ End of parameters StopScript _0807EA94 _0807E3E8 @@ -161,10 +161,10 @@ _0807F0B4 0x0001 CameraTargetEntity StartPlayerScript 0x080152b4 WaitForSomething2 0x00000001 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1301 .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 Call 0x0807f3f9 Wait 0x003c @@ -175,17 +175,17 @@ WaitForSomething2 0x00000004 SoundReq2 0x000d _0807EB28 0x1302 _0807EA94 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1303 .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EB28 0x1304 _0807EA94 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1305 .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -270,12 +270,12 @@ WaitFor_2 Call 0x08053b3d StartScript _0807E864 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf6e9 .short 0x0807 .short 0x0008 .short 0x0000 -@ End of 4 parameters +@ End of parameters MoveEntityToPlayer _0807F0B4 0x0004 CameraTargetEntity diff --git a/data/scripts/gUnk_08015390.inc b/data/scripts/gUnk_08015390.inc index e571a989..ba244411 100644 --- a/data/scripts/gUnk_08015390.inc +++ b/data/scripts/gUnk_08015390.inc @@ -7,10 +7,10 @@ _0807E930 0x001f Call 0x0806d945 WaitForSomething2 0x00000008 _0807E930 0x0010 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1314 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E930 0x0018 Call 0x0806d8a1 diff --git a/data/scripts/gUnk_080153EC.inc b/data/scripts/gUnk_080153EC.inc index 4f4b462f..96de3275 100644 --- a/data/scripts/gUnk_080153EC.inc +++ b/data/scripts/gUnk_080153EC.inc @@ -17,40 +17,40 @@ _0807E5F8 0x00000880 WaitForSomething2 0x00001100 _0807F0B4 0x0004 SetEntityPositionRelative 0x00900078 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1330 .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00008000 WaitForSomething2 0x00010000 _0807E5F8 0x00000880 WaitForSomething2 0x00001000 Wait 0x003c -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x130d .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x130e .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x130f .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1310 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xdded .short 0x0805 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_0801548E.inc b/data/scripts/gUnk_0801548E.inc index eaf0e8c8..4a450ef5 100644 --- a/data/scripts/gUnk_0801548E.inc +++ b/data/scripts/gUnk_0801548E.inc @@ -2,34 +2,34 @@ SCRIPT_START gUnk_0801548E _0807E5F8 0x00000800 WaitForSomething2 0x00001000 SoundReq 0x0125 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfb29 .short 0x0807 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E5F8 0x00048000 WaitForSomething2 0x00090000 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1311 .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00008000 WaitForSomething2 0x00010000 _0807E5F8 0x00048000 WaitForSomething2 0x00010000 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xde19 .short 0x0805 .short 0x0001 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807F0C8 0x0000, 0x0000 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1312 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000800 WaitForSomething2 0x00001000 diff --git a/data/scripts/gUnk_0801550C.inc b/data/scripts/gUnk_0801550C.inc index a979e11d..33234b3a 100644 --- a/data/scripts/gUnk_0801550C.inc +++ b/data/scripts/gUnk_0801550C.inc @@ -5,64 +5,64 @@ _0807EF80 0x0007 _0807EB44 0x0000 Call 0x0807f339 StopScript -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters WaitForSomething2 0x00008000 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EDD4 0x0078, 0x00b8 _0807EB44 0x0000 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807E5F8 0x00010000 WaitForSomething2 0x00008000 _0807EF80 0x000d _0807EB44 0x0000 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0004 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EDD4 0x0078, 0x00c8 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 _0807EB44 0x0000 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xaf61 .short 0x0806 .short 0x0000 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x0010 Wait 0x0028 SoundReq 0x0125 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfb29 .short 0x0807 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x000a SoundReq 0x0125 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xfb29 .short 0x0807 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x000a _0807EF80 0x0010 _0807E5F8 0x00010000 diff --git a/data/scripts/gUnk_08015618.inc b/data/scripts/gUnk_08015618.inc index 87413bb9..7e6aa67d 100644 --- a/data/scripts/gUnk_08015618.inc +++ b/data/scripts/gUnk_08015618.inc @@ -5,23 +5,23 @@ SetEntityNonPlanarMovement 0x0040 Call 0x08094b81 StopScript WaitForSomething2 0x00000080 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xdded .short 0x0805 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x08094b0d _0807EDD4 0x0078, 0x0068 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EF3C 0xff80, 0x0000 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xde19 .short 0x0805 .short 0x0003 .short 0x0000 -@ End of 4 parameters +@ End of parameters Wait 0x003c _0807E5F8 0x00000100 WaitForSomething2 0x00000080 diff --git a/data/scripts/gUnk_08015684.inc b/data/scripts/gUnk_08015684.inc index 34160278..fb4991b6 100644 --- a/data/scripts/gUnk_08015684.inc +++ b/data/scripts/gUnk_08015684.inc @@ -29,12 +29,12 @@ _0807E5F8 0x00001000 WaitForSomething2 0x00000800 _0807EB44 0x0004 _0807EF80 0x0014 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x545d .short 0x0809 .short 0x5754 .short 0x0801 -@ End of 4 parameters +@ End of parameters SoundReq 0x01c4 Wait 0x0078 _0807EF80 0x0016 diff --git a/data/scripts/gUnk_080157AC.inc b/data/scripts/gUnk_080157AC.inc index 32553e70..bcc7ce8d 100644 --- a/data/scripts/gUnk_080157AC.inc +++ b/data/scripts/gUnk_080157AC.inc @@ -31,10 +31,10 @@ StartPlayerScript 0x08015918 WaitForSomething2 0x00000010 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1066 .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 @@ -54,18 +54,18 @@ SetEntityPositionRelative 0x02080248 CameraTargetEntity StartPlayerScript 0x08015938 WaitForSomething2 0x00000010 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x106a .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000008 Wait 0x0078 _0807E8E4_2 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1068 .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 diff --git a/data/scripts/gUnk_08015958.inc b/data/scripts/gUnk_08015958.inc index 9f32f67d..9e00d5cd 100644 --- a/data/scripts/gUnk_08015958.inc +++ b/data/scripts/gUnk_08015958.inc @@ -15,10 +15,10 @@ _0807EB74 _0807EDD4 0x01f8, 0x02f8 _0807EB44 0x0004 _0807EF80 0x0000 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1011 .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 _0807EDD4 0x01f8, 0x0268 SetEntityPositionRelative 0x02180248 @@ -59,10 +59,10 @@ JumpIf 0x0016 CheckEntityInteractType JumpIfNot 0xffee StopScript -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1067 .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 Jump 0xffe0 StopScript diff --git a/data/scripts/gUnk_08015B34.inc b/data/scripts/gUnk_08015B34.inc index 3516af39..a9cd4e7b 100644 --- a/data/scripts/gUnk_08015B34.inc +++ b/data/scripts/gUnk_08015B34.inc @@ -3,21 +3,21 @@ StopScript StartScript CheckLocalFlag 0x008b JumpIf 0x0040 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf6b5 .short 0x0807 .short 0x0318 .short 0x0000 -@ End of 4 parameters +@ End of parameters JumpIfNot 0xffe8 StopScript _0807E864 Call 0x0807f9a5 Call 0x0807df29 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x2506 .short 0x0002 -@ End of 2 parameters +@ End of parameters _0807EA94 StartPlayerScript 0x08015b84 WaitForSomething2 0x00000004 diff --git a/data/scripts/gUnk_08015C7C.inc b/data/scripts/gUnk_08015C7C.inc index 1eb7c52c..e7ccc037 100644 --- a/data/scripts/gUnk_08015C7C.inc +++ b/data/scripts/gUnk_08015C7C.inc @@ -6,24 +6,24 @@ _0807EF80 0x0001 _0807EDD4 0x0168, 0x0058 _0807EB44 0x0004 _0807EF80 0x0000 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf239 .short 0x0807 .short 0x03c5 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0807f305 -TextboxNoOverlapFollowPos +.short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1318 .short 0x000c -@ End of 2 parameters +@ End of parameters _0807EA94 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf239 .short 0x0807 .short 0x03c9 .short 0x0000 -@ End of 4 parameters +@ End of parameters Call 0x0807f305 _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/gUnk_08015FC0.inc b/data/scripts/gUnk_08015FC0.inc index e7c74049..51545509 100644 --- a/data/scripts/gUnk_08015FC0.inc +++ b/data/scripts/gUnk_08015FC0.inc @@ -4,12 +4,12 @@ Call 0x0806db85 CheckKinstoneFused 0x0009 JumpIf 0x005a _0807EA88 0x0009 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xda05 .short 0x0806 .short 0x0007 .short 0x0000 -@ End of 4 parameters +@ End of parameters _0807EF80 0x000a StopScript _0807EA4C diff --git a/data/scripts/gUnk_080160A8.inc b/data/scripts/gUnk_080160A8.inc index 2cfb616c..3133be5d 100644 --- a/data/scripts/gUnk_080160A8.inc +++ b/data/scripts/gUnk_080160A8.inc @@ -18,7 +18,7 @@ Jump 0xffd2 _0807E864 _0807EB74 StopScript -HasRoomItemForSale +.short 0x0411 @ HasRoomItemForSale with 0 parameters JumpIfNot 0x0030 TextboxNoOverlapFollow 0x2d07 _0807EA94 @@ -51,12 +51,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 GetInventoryValue 0x0025 -_0807EAF0 +.short 0x145d @ _0807EAF0 with 4 parameters .short 0x2d03 .short 0x2d02 .short 0x2d02 .short 0x2d02 -@ End of 4 parameters +@ End of parameters _0807E3E8 JumpIfNot 0x002a _0807E48C 0x0020 @@ -78,12 +78,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 GetInventoryValue 0x0024 -_0807EAF0 +.short 0x145d @ _0807EAF0 with 4 parameters .short 0x2d05 .short 0x2d04 .short 0x2d04 .short 0x2d04 -@ End of 4 parameters +@ End of parameters _0807E3E8 JumpIfNot 0x002e _0807E48C 0x0020 @@ -140,12 +140,12 @@ JumpIf 0x009a Call 0x08068f01 Call 0x08068f15 Call 0x08068bb5 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0xf245 .short 0x0807 .short 0x0001 .short 0x0001 -@ End of 4 parameters +@ End of parameters Call 0x08068b85 Call 0x0807f2a9 Call 0x08068bd1 diff --git a/data/scripts/gUnk_0801637C.inc b/data/scripts/gUnk_0801637C.inc index 5301fefc..7de920f0 100644 --- a/data/scripts/gUnk_0801637C.inc +++ b/data/scripts/gUnk_0801637C.inc @@ -8,26 +8,26 @@ StopScript Jump 0xfffa JumpIf 0xfff6 JumpIfNot 0xfff2 -_0807E078 +.short 0x0c06 @ _0807E078 with 2 parameters .short 0xffee .short 0xffec -@ End of 2 parameters +@ End of parameters JumpAbsolute 0x08016384 JumpAbsoluteIf 0x08016384 JumpAbsoluteIfNot 0x08016384 _0807E0E0 0x08016384, 0x08016384 Call 0x08016384 -CallWithArg +.short 0x140c @ CallWithArg with 4 parameters .short 0x6384 .short 0x0801 .short 0x5678 .short 0x1234 -@ End of 4 parameters +@ End of parameters LoadRoomEntityList 0x08016384 TestBit 0x00000001 CheckInventory1 0x0001 CheckInventory2 0x0001 -HasRoomItemForSale +.short 0x0411 @ HasRoomItemForSale with 0 parameters CheckLocalFlag 0x0067 CheckLocalFlagByOffset 0x0100, 0x006b CheckGlobalFlag 0x0013 diff --git a/data/scripts/gUnk_08016482.inc b/data/scripts/gUnk_08016482.inc index 7f1d0813..64bdb067 100644 --- a/data/scripts/gUnk_08016482.inc +++ b/data/scripts/gUnk_08016482.inc @@ -7,7 +7,7 @@ DoFade6 DoFade7 _0807E800 0x00000000 _0807E80C 0x00000000 -_0807E858 +.short 0x0442 @ _0807E858 with 0 parameters _0807E864 _0807E878 _0807E888 @@ -31,14 +31,14 @@ _0807EA88 0x0001 _0807EA94 TextboxNoOverlapFollow 0x0601 TextboxNoOverlap 0x0601 -TextboxNoOverlapFollowPos +.short 0x085c @ TextboxNoOverlapFollowPos with 1 parameters .short 0x0601 -@ End of 1 parameters -_0807EAF0 +@ End of parameters +.short 0x105d @ _0807EAF0 with 3 parameters .short 0x0601 .short 0x0602 .short 0x0603 -@ End of 3 parameters +@ End of parameters TextboxNoOverlapVar _0807EB28 0x0602 _0807EB38 diff --git a/data/scripts/npc4e_fusion.inc b/data/scripts/npc4e_fusion.inc deleted file mode 100644 index 6a21fd23..00000000 --- a/data/scripts/npc4e_fusion.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START gUnk_08016030 -StartScript -CheckKinstoneFused 0x0009 -JumpIf 0x002a -StopScript -WaitForSomething2 0x00000001 -_0807EF80 0x0010 -Wait 0x003c -SetEntityNonPlanarMovement 0x0020 -_0807ECF4 0x0080 -Wait 0x001e -_0807EF80 0x0010 -_0807E5F8 0x0000008 -.short 0xffff -.short 0x0c6a -.short 0xfff0 -.short 0x0000 -.short 0xffff -.short 0x0000
\ No newline at end of file |