diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-03-06 00:24:24 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-03-06 14:53:33 +0100 |
| commit | b65f5e1bd0910580d9748b7ba7badf3a21189565 (patch) | |
| tree | a02028caccf21970340b287022e2f348a0b62741 /data/scripts | |
| parent | 9441dac477d46218cc2e1879df1d1c2127189761 (diff) | |
Reference pointers directly
Diffstat (limited to 'data/scripts')
355 files changed, 2709 insertions, 3034 deletions
diff --git a/data/scripts/gUnk_08008B5C.inc b/data/scripts/gUnk_08008B5C.inc index d357d2c7..256d6033 100644 --- a/data/scripts/gUnk_08008B5C.inc +++ b/data/scripts/gUnk_08008B5C.inc @@ -8,8 +8,8 @@ StopScript _0807E944 _0807E864 _0807E930 0x0004 -Call 0x0807f2d5 -Call 0x0806bbb1 +Call sub_0807F2D4 +Call sub_0806BBB0 _0807EA94 _0807E930 0x0008 _0807E878 @@ -24,7 +24,7 @@ StopScript _0807E944 _0807E864 _0807E930 0x0004 -Call 0x0807f2d5 +Call sub_0807F2D4 TextboxNoOverlapFollow 0x4912 _0807EA94 _0807E930 0x0008 @@ -40,25 +40,23 @@ _0807E944 _0807E864 SetGlobalFlag 0x0061 _0807E930 0x0004 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EA94 -Call 0x0806ba35 +Call sub_0806BA34 JumpIfNot 0x0066 _0807EA94 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xbb1d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806BB1C .short 0x0000 .short 0x0000 @ End of parameters -Call 0x0807f2d5 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xbb1d -.short 0x0806 +Call sub_0807F2D4 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806BB1C .short 0x0001 .short 0x0000 @ End of parameters -Call 0x0806bb7d +Call sub_0806BB7C JumpIfNot 0x0048 TextboxNoOverlap 0x490c _0807EA94 @@ -68,11 +66,11 @@ WaitForSomething 0x00000004 Wait 0x000f SoundReq 0x0072 _0807E930 0x0004 -Call 0x0807f2d5 +Call sub_0807F2D4 TextboxNoOverlap 0x4913 _0807EA94 _0807E930 0x0008 -Call 0x0807f2d5 +Call sub_0807F2D4 Jump 0x000a _0807E930 0x0008 Wait 0x000f @@ -91,15 +89,15 @@ WaitForSomething 0x00000002 TextboxNoOverlap 0x490d _0807EA94 _0807EF80 0x0007 -Call 0x08064d09 +Call sub_08064D08 _0807EDD4 0x0068, 0x0078 -Call 0x08064d11 +Call sub_08064D10 Wait 0x000f _0807EB44 0x0002 Wait 0x000f -Call 0x08064d09 +Call sub_08064D08 _0807EDD4 0x0098, 0x0078 -Call 0x08064d11 +Call sub_08064D10 Wait 0x000f _0807EB44 0x0004 SoundReq 0x007f @@ -118,15 +116,15 @@ SoundReq 0x007f Wait 0x000f _0807EB44 0x0006 Wait 0x001e -Call 0x08064d09 +Call sub_08064D08 _0807EDD4 0x0068, 0x0078 -Call 0x08064d11 +Call sub_08064D10 Wait 0x000f _0807EB44 0x0000 Wait 0x000f -Call 0x08064d09 +Call sub_08064D08 _0807EDD4 0x0068, 0x0018 -Call 0x08064d11 +Call sub_08064D10 SoundReq 0x0121 _0807E5F8 0x00000001 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08008D8C.inc b/data/scripts/gUnk_08008D8C.inc index 2482561b..cd4ffd46 100644 --- a/data/scripts/gUnk_08008D8C.inc +++ b/data/scripts/gUnk_08008D8C.inc @@ -1,15 +1,15 @@ SCRIPT_START gUnk_08008D8C StartScript -Call 0x08061fd9 -Call 0x08061e71 +Call sub_08061FD8 +Call sub_08061E70 _0807EF80 0x000a StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x08061fd9 -Call 0x08062049 +Call sub_08061FD8 +Call sub_08062048 _0807EA94 _0807E878 Jump 0xffe4 @@ -18,9 +18,8 @@ StartScript _0807E9D4 _0807EF80 0x000a _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -29,19 +28,17 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters -Call 0x080643d9 +Call sub_080643D8 _0807EA94 _0807E878 _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -52,13 +49,13 @@ StopScript CheckPlayerInRegion 0x00d8, 0x0098, 0x4020 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 _0807F0B4 0x0001 CameraTargetEntity WaitForPlayerAction0x17 Wait 0x003c -StartPlayerScript 0x08008f74 +StartPlayerScript gUnk_08008F74 WaitForSomething2 0x00000020 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 @@ -95,7 +92,7 @@ _0807E5F8 0x00000001 WaitForSomething2 0x00000002 _0807F034 0x0035 WaitPlayerAction8 -StartPlayerScript 0x08008fc0 +StartPlayerScript gUnk_08008FC0 WaitForSomething2 0x00000020 _0807E8E4_0 _0807E5F8 0x00000080 @@ -110,15 +107,15 @@ WaitForSomething2 0x00000002 _0807F034 0x0047 WaitPlayerAction8 _0807E914 0x00000003 -Call 0x0807f421 +Call sub_0807F420 _0807E8E4_0 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 _0807F0B4 0x0004 CameraTargetPlayer SetGlobalFlag 0x0015 -Call 0x0806dcc1 -Call 0x0807df51 +Call sub_0806DCC0 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08008F74.inc b/data/scripts/gUnk_08008F74.inc index 6f668430..7fe1aeee 100644 --- a/data/scripts/gUnk_08008F74.inc +++ b/data/scripts/gUnk_08008F74.inc @@ -14,6 +14,6 @@ _0807EB44 0x0000 _0807EF80 0x0000 Wait 0x000f _0807E5F8 0x00000020 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08008FC0.inc b/data/scripts/gUnk_08008FC0.inc index 2b69830e..37470012 100644 --- a/data/scripts/gUnk_08008FC0.inc +++ b/data/scripts/gUnk_08008FC0.inc @@ -1,25 +1,23 @@ SCRIPT_START gUnk_08008FC0 _0807F078 0x0001, 0x0001 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf919 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F918 .short 0x0001 .short 0x0000 @ End of parameters SoundReq 0x0109 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf239 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F238 .short 0x045f .short 0x0000 @ End of parameters -Call 0x0807f305 +Call sub_0807F304 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x0501 .short 0x000e @ End of parameters _0807EA94 _0807E5F8 0x00000020 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800903C.inc b/data/scripts/gUnk_0800903C.inc index e03d6144..f737d7bd 100644 --- a/data/scripts/gUnk_0800903C.inc +++ b/data/scripts/gUnk_0800903C.inc @@ -17,7 +17,7 @@ _0807EF80 0x000a Jump 0x0202 .short 0x0000 StartScript -Call 0x0807f349 +Call sub_0807F348 SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0004 _0807EF80 0x0000 @@ -97,13 +97,13 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x0806673d +Call sub_0806673C _0807EA94 Wait 0x000f _0807E878 Jump 0xffe6 StartScript -Call 0x0807f349 +Call sub_0807F348 _0807EB44 0x0006 _0807EF80 0x0000 StopScript @@ -170,14 +170,14 @@ Jump 0x0042 StartScript _0807EB44 0x0004 _0807EF80 0x0000 -Call 0x080668f1 +Call sub_080668F0 _0807EF80 0x000a StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x08066905 +Call sub_08066904 _0807EA94 Wait 0x000f _0807E878 @@ -201,14 +201,14 @@ Jump 0xffe8 StartScript _0807EB44 0x0004 _0807EF80 0x0000 -Call 0x0806672d +Call sub_0806672C _0807EF80 0x000a StopScript Jump 0xfe90 .short 0x0000 StartScript _0807EF80 0x000a -Call 0x08066e39 +Call sub_08066E38 _0807E9D4 StopScript CheckEntityInteractType diff --git a/data/scripts/gUnk_08009320.inc b/data/scripts/gUnk_08009320.inc index 090040a3..381ac07b 100644 --- a/data/scripts/gUnk_08009320.inc +++ b/data/scripts/gUnk_08009320.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08009320 StartScript -Call 0x0806d651 +Call sub_0806D650 SetEntityNonPlanarMovement 0x0010 StopScript _0807EEF4 0xfff8, 0x0000 diff --git a/data/scripts/gUnk_08009348.inc b/data/scripts/gUnk_08009348.inc index 9ef9c57c..cf893fae 100644 --- a/data/scripts/gUnk_08009348.inc +++ b/data/scripts/gUnk_08009348.inc @@ -5,8 +5,8 @@ StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call 0x0807df29 -Call 0x0806d639 +Call sub_0807DF28 +Call sub_0806D638 _0807F0B4 0x0001 CameraTargetEntity CheckGlobalFlag 0x0055 @@ -14,12 +14,12 @@ JumpIf 0x002c TextboxNoOverlap 0x1d01 _0807EA94 _0807EA94 -Call 0x0806d641 +Call sub_0806D640 _0807F0B4 0x0001 CameraTargetPlayer Wait 0x002d _0807F0B4 0x0004 _0807E878 -Call 0x0807df51 +Call sub_0807DF50 Jump 0xffb8 SCRIPT_END diff --git a/data/scripts/gUnk_0800939A.inc b/data/scripts/gUnk_0800939A.inc index 2ba22ab9..ac7a4ad8 100644 --- a/data/scripts/gUnk_0800939A.inc +++ b/data/scripts/gUnk_0800939A.inc @@ -10,10 +10,10 @@ _0807EA94 Jump 0xffbc CheckInventory1 0x000e JumpIfNot 0x0018 -Call 0x0806d789 +Call sub_0806D788 TextboxNoOverlap 0x1d03 _0807EA94 -Call 0x0806d70d +Call sub_0806D70C Jump 0xff9e _0807E914 0x00001d05 CheckLocalFlag 0x00ad @@ -28,24 +28,24 @@ TextboxNoOverlap 0x1d08 _0807EA94 LoadRoomEntityList 0x080f9c38 Wait 0x0078 -Call 0x0806d6d1 +Call sub_0806D6D0 Wait 0x00b4 -Call 0x0806d70d +Call sub_0806D70C Wait 0x0078 SetLocalFlag 0x00ae SetLocalFlag 0x00ad -Call 0x0806d5d5 +Call sub_0806D5D4 _0807EB8C TextboxNoOverlap 0x1d09 _0807EA94 Wait 0x000a Jump 0xff3a -Call 0x0806d601 +Call sub_0806D600 JumpIf 0x000c TextboxNoOverlap 0x1d0a _0807EA94 JumpIfNot 0xff26 TextboxNoOverlap 0x1d0b _0807EA94 -Call 0x0806d74d +Call sub_0806D74C _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_08009464.inc b/data/scripts/gUnk_08009464.inc index b3819468..bf533b64 100644 --- a/data/scripts/gUnk_08009464.inc +++ b/data/scripts/gUnk_08009464.inc @@ -3,10 +3,10 @@ Wait 0x003c _0807F0C8 0x0000, 0x0000 LoadRoomEntityList 0x080f9c58 Wait 0x003c -Call 0x0806d70d +Call sub_0806D70C Wait 0x003c ClearLocalFlag 0x00ae -Call 0x0806d621 +Call sub_0806D620 Wait 0x003c WaitPlayerAction8 _0807EB8C @@ -16,7 +16,7 @@ Wait 0x000a Jump 0xfed6 .short 0x0000 StartScript -Call 0x0806d7c5 +Call sub_0806D7C4 SetEntityNonPlanarMovement 0x0080 StopScript Wait 0x003c diff --git a/data/scripts/gUnk_080094CC.inc b/data/scripts/gUnk_080094CC.inc index c5645f6e..9cd6240f 100644 --- a/data/scripts/gUnk_080094CC.inc +++ b/data/scripts/gUnk_080094CC.inc @@ -1,11 +1,11 @@ SCRIPT_START gUnk_080094CC StartScript -Call 0x0806d805 +Call sub_0806D804 SetEntityNonPlanarMovement 0x0180 StopScript Wait 0x003c SetEntity0x20 0x00018000 -Call 0x0806d859 +Call sub_0806D858 _0807EE30 JumpIfNot 0xfffc Wait 0x001e diff --git a/data/scripts/gUnk_080094FC.inc b/data/scripts/gUnk_080094FC.inc index 74183f6a..75784bd1 100644 --- a/data/scripts/gUnk_080094FC.inc +++ b/data/scripts/gUnk_080094FC.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_080094FC StartScript -Call 0x08067101 +Call sub_08067100 _0807EF80 0x000a _0807EB44 0x0004 _0807EF80 0x0000 @@ -10,7 +10,7 @@ JumpIfNot 0xfffc _0807E864 _0807EF80 0x0001 _0807EB74 -Call 0x080670b5 +Call sub_080670B4 _0807EA94 _0807E878 _0807EB44 0x0004 @@ -18,7 +18,7 @@ _0807EF80 0x0000 Jump 0xffde .short 0x0000 StartScript -Call 0x08067101 +Call sub_08067100 _0807EF80 0x000a _0807EB44 0x0004 _0807EF80 0x0000 @@ -28,7 +28,7 @@ JumpIfNot 0xfffc _0807E864 _0807EF80 0x0001 _0807EB74 -Call 0x080670e5 +Call sub_080670E4 _0807EA94 _0807E878 _0807EB44 0x0004 @@ -36,33 +36,33 @@ _0807EF80 0x0000 Jump 0xffde .short 0x0000 StartScript -Call 0x08067315 +Call sub_08067314 _0807EF80 0x000a _0807EB44 0x0004 _0807E914 0x00000000 -Call 0x080672b1 +Call sub_080672B0 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 _0807E914 0x00000004 -Call 0x080672b1 -Call 0x080672c9 +Call sub_080672B0 +Call sub_080672C8 _0807EA94 Wait 0x000f _0807E878 _0807EB44 0x0004 _0807E914 0x00000000 -Call 0x080672b1 +Call sub_080672B0 Jump 0xffca .short 0x0000 StartScript -Call 0x0806be3d +Call sub_0806BE3C _0807EF80 0x000a _0807EF80 0x0007 StopScript -Call 0x0806bf45 +Call sub_0806BF44 JumpIf 0x000c _0807EF80 0x000b _0807EF80 0x0006 diff --git a/data/scripts/gUnk_080095F2.inc b/data/scripts/gUnk_080095F2.inc index 8caf6bad..c7fb01e5 100644 --- a/data/scripts/gUnk_080095F2.inc +++ b/data/scripts/gUnk_080095F2.inc @@ -4,7 +4,7 @@ JumpIfNot 0xffe8 _0807E864 _0807EB74 _0807EF80 0x0001 -Call 0x0806be85 +Call sub_0806BE84 _0807EA94 JumpIfNot 0x0018 SoundReq 0x0109 @@ -25,10 +25,10 @@ StartScript CheckGlobalFlag 0x0020 JumpIfNot 0xfff6 StopScript -Call 0x0806bf45 +Call sub_0806BF44 JumpIf 0xfff8 StopScript -Call 0x0806be3d +Call sub_0806BE3C _0807EF80 0x000a _0807EF80 0x0007 CheckEntityInteractType @@ -36,13 +36,13 @@ JumpIfNot 0xfffc _0807E864 _0807EB74 _0807EF80 0x0001 -Call 0x0806bec9 +Call sub_0806BEC8 _0807EA94 JumpIfNot 0x0016 SoundReq 0x0111 SoundReq 0x0072 _0807F078 0x003c, 0x0002 -Call 0x0806befd +Call sub_0806BEFC _0807E878 _0807EF80 0x0000 Jump 0xffca @@ -55,9 +55,9 @@ StopScript CheckPlayerInRegion 0x0188, 0x01c0, 0x1020 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -StartPlayerScript 0x08009704 +Call sub_0807F9A4 +Call sub_0807DF28 +StartPlayerScript gUnk_08009704 WaitForSomething2 0x00000001 SoundReq 0x0111 _0807EF80 0x0008 @@ -67,7 +67,7 @@ SoundReq 0x0111 _0807EF80 0x0007 CheckGlobalFlag 0x0020 JumpIfNot 0xfffa -Call 0x0807df51 +Call sub_0807DF50 _0807E878 -Call 0x0808692d +Call sub_0808692C SCRIPT_END diff --git a/data/scripts/gUnk_08009704.inc b/data/scripts/gUnk_08009704.inc index 715fd5d9..f2dbe820 100644 --- a/data/scripts/gUnk_08009704.inc +++ b/data/scripts/gUnk_08009704.inc @@ -11,5 +11,5 @@ _0807E5F8 0x00000001 _0807EF80 0x000d SetEntityNonPlanarMovement 0x0100 _0807ECC4 0x0010 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08009740.inc b/data/scripts/gUnk_08009740.inc index 7f7aed61..5f523eef 100644 --- a/data/scripts/gUnk_08009740.inc +++ b/data/scripts/gUnk_08009740.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08009740 StartScript -Call 0x08065d01 +Call sub_08065D00 _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a @@ -11,23 +11,23 @@ JumpIfNot 0xfffc _0807E864 _0807EB74 _0807EF80 0x0000 -Call 0x08065f65 +Call sub_08065F64 _0807EA94 _0807E878 Jump 0xffe6 .short 0x0000 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 SoundReq 0x01f3 -Call 0x0807f40d +Call sub_0807F40C _0807E8E4_1 Wait 0x000a _0807E8E4_3 Wait 0x0032 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -StartPlayerScript 0x0800987c +StartPlayerScript gUnk_0800987C WaitForSomething2 0x00000040 _0807E5F8 0x00000008 WaitForSomething2 0x00000010 @@ -39,7 +39,7 @@ _0807E8E4_3 Wait 0x001e _0807EB28 0x2809 _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_080097F0.inc b/data/scripts/gUnk_080097F0.inc index bff642f6..a6bab11d 100644 --- a/data/scripts/gUnk_080097F0.inc +++ b/data/scripts/gUnk_080097F0.inc @@ -3,18 +3,18 @@ StartScript _0807E930 0x0003 _0807EF80 0x0007 SetEntityNonPlanarMovement 0x0300 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitForSomething2 0x00000002 SoundReq 0x0123 -Call 0x0807f1a1 +Call sub_0807F1A0 StopScript StartScript _0807EE30 JumpIfNot 0xfff8 StopScript _0807E5F8 0x00000004 -Call 0x0807fbd5 +Call sub_0807FBD4 SoundReq 0x01f3 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08009838.inc b/data/scripts/gUnk_08009838.inc index 0d88acaf..3c5ae921 100644 --- a/data/scripts/gUnk_08009838.inc +++ b/data/scripts/gUnk_08009838.inc @@ -3,13 +3,13 @@ StartScript _0807E930 0x0003 _0807EF80 0x0007 SetEntityNonPlanarMovement 0x0300 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitForSomething2 0x00000008 -Call 0x0809e0a1 -Call 0x0809e0d5 +Call sub_0809E0A0 +Call sub_0809E0D4 SoundReq 0x01f3 -Call 0x0807fbd5 +Call sub_0807FBD4 SoundReq 0x01f3 _0807E5F8 0x00000010 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800987C.inc b/data/scripts/gUnk_0800987C.inc index dac50ce8..85662f4e 100644 --- a/data/scripts/gUnk_0800987C.inc +++ b/data/scripts/gUnk_0800987C.inc @@ -2,19 +2,19 @@ SCRIPT_START gUnk_0800987C SoundReq 0x007a _0807EB44 0x0004 SoundReq 0x0086 -Call 0x0807f36d +Call sub_0807F36C SetEntityNonPlanarMovement 0x0400 _0807ECF4 0x0004 -Call 0x0807f1e9 +Call sub_0807F1E8 Wait 0x001e _0807E5F8 0x00000040 WaitForSomething2 0x00000020 SoundReq 0x007c _0807EB44 0x0004 -Call 0x0807f211 +Call sub_0807F210 _0807EF3C 0x0200, 0x0020 _0807EF80 0x0000 _0807E5F8 0x00000040 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_080098D4.inc b/data/scripts/gUnk_080098D4.inc index 49891782..ef2ea423 100644 --- a/data/scripts/gUnk_080098D4.inc +++ b/data/scripts/gUnk_080098D4.inc @@ -9,11 +9,11 @@ CheckLocalFlag 0x005d JumpIf 0x0022 SetLocalFlag 0x005d _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 _0807EB28 0x280a _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08009918.inc b/data/scripts/gUnk_08009918.inc index ad958eb6..e029d341 100644 --- a/data/scripts/gUnk_08009918.inc +++ b/data/scripts/gUnk_08009918.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08009918 StartScript -Call 0x0807df29 +Call sub_0807DF28 _0807E864 _0807E5F8 0x00000000 StopScript @@ -9,7 +9,7 @@ Wait 0x0078 _0807E5F8 0x00000004 WaitForSomething2 0x00000001 SetGlobalFlag 0x001c -Call 0x0807df51 +Call sub_0807DF50 _0807E878 -Call 0x0807921d +Call sub_0807921C SCRIPT_END diff --git a/data/scripts/gUnk_08009950.inc b/data/scripts/gUnk_08009950.inc index d7c33754..c4f64c1e 100644 --- a/data/scripts/gUnk_08009950.inc +++ b/data/scripts/gUnk_08009950.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08009950 StartScript -Call 0x0807f349 +Call sub_0807F348 SetEntityNonPlanarMovement 0x0040 _0807EB44 0x0004 _0807E930 0x000c @@ -33,5 +33,5 @@ Wait 0x001e _0807E778 0x0002 DoFade5 WaitFor_2 -Call 0x08053635 +Call sub_08053634 SCRIPT_END diff --git a/data/scripts/gUnk_080099DC.inc b/data/scripts/gUnk_080099DC.inc index 5b644539..d8d125c3 100644 --- a/data/scripts/gUnk_080099DC.inc +++ b/data/scripts/gUnk_080099DC.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_080099DC StartScript -Call 0x0807f349 +Call sub_0807F348 SetEntityNonPlanarMovement 0x00c0 _0807EB44 0x0002 _0807EF80 0x0008 diff --git a/data/scripts/gUnk_08009A34.inc b/data/scripts/gUnk_08009A34.inc index 1b075e04..a75ff516 100644 --- a/data/scripts/gUnk_08009A34.inc +++ b/data/scripts/gUnk_08009A34.inc @@ -1,8 +1,8 @@ SCRIPT_START gUnk_08009A34 Wait 0x003c -Call 0x08066259 +Call sub_08066258 Wait 0x001e -Call 0x08066259 +Call sub_08066258 Wait 0x005a Jump 0xffea SetEntityPositionRelative 0x01780240 @@ -15,6 +15,6 @@ DoFade4 WaitFor_2 Wait 0x0078 _0807E5F8 0x00000004 -Call 0x08053649 +Call sub_08053648 _0807EDD4 0x0240, 0x0228 SCRIPT_END diff --git a/data/scripts/gUnk_08009AF8.inc b/data/scripts/gUnk_08009AF8.inc index d2cdd178..ebcae1d4 100644 --- a/data/scripts/gUnk_08009AF8.inc +++ b/data/scripts/gUnk_08009AF8.inc @@ -11,6 +11,6 @@ Wait 0x005a _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 -Call 0x0805367d +Call sub_0805367C SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08009B30.inc b/data/scripts/gUnk_08009B30.inc index e24ce455..4edd60e8 100644 --- a/data/scripts/gUnk_08009B30.inc +++ b/data/scripts/gUnk_08009B30.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08009B30 StartScript -Call 0x0807df29 +Call sub_0807DF28 _0807E864 SetLocalFlag 0x0046 StopScript @@ -9,12 +9,12 @@ Wait 0x001e TextboxNoOverlapFollow 0x1005 _0807EA94 Wait 0x003c -Call 0x0807529d +Call sub_0807529C Wait 0x003c _0807EF80 0x0014 Wait 0x001e -Call 0x08053251 +Call sub_08053250 _0807E878 -Call 0x0807df51 -Call 0x080791d1 +Call sub_0807DF50 +Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/gUnk_08009B78.inc b/data/scripts/gUnk_08009B78.inc index 0a299c0c..ed556529 100644 --- a/data/scripts/gUnk_08009B78.inc +++ b/data/scripts/gUnk_08009B78.inc @@ -3,15 +3,15 @@ StartScript _0807EB44 0x0006 SetEntityNonPlanarMovement 0x0080 _0807E9D4 -Call 0x0807f349 +Call sub_0807F348 StopScript CheckGlobalFlag 0x0013 JumpIf 0x00ba _0807E888 Wait 0x000a _0807E864 -StartPlayerScript 0x08009cfc -Call 0x0807df29 +StartPlayerScript gUnk_08009CFC +Call sub_0807DF28 WaitForSomething2 0x00000008 _0807EDD4 0x0080, 0x005c _0807EB44 0x0006 @@ -46,7 +46,7 @@ _0807EF80 0x000c _0807EF80 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000008 -Call 0x08053251 +Call sub_08053250 _0807F034 0x0034 WaitPlayerAction8 _0807E8E4_1 diff --git a/data/scripts/gUnk_08009C68.inc b/data/scripts/gUnk_08009C68.inc index d434771e..21105efe 100644 --- a/data/scripts/gUnk_08009C68.inc +++ b/data/scripts/gUnk_08009C68.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_08009C68 StartScript _0807EB44 0x0002 SetEntityNonPlanarMovement 0x0100 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitForSomething2 0x00000004 _0807EF80 0x0004 @@ -33,12 +33,12 @@ _0807EA94 _0807EF80 0x0000 _0807EDD4 0x0028, 0x0060 _0807EDD4 0x0000, 0x0060 -Call 0x080536a9 +Call sub_080536A8 Wait 0x001e StartScript SetGlobalFlag 0x0013 -Call 0x0807df51 -Call 0x080791d1 +Call sub_0807DF50 +Call sub_080791D0 _0807E878 StopScript SCRIPT_END diff --git a/data/scripts/gUnk_08009D6C.inc b/data/scripts/gUnk_08009D6C.inc index 9ef086b9..df0e7120 100644 --- a/data/scripts/gUnk_08009D6C.inc +++ b/data/scripts/gUnk_08009D6C.inc @@ -6,13 +6,13 @@ StopScript _0807EDD4 0x0078, 0x0060 _0807EDD4 0x0078, 0x007c Wait 0x001e -Call 0x0805368d +Call sub_0805368C Wait 0x0008 _0807EDD4 0x0078, 0x0098 _0807EF80 0x0008 _0807E778 0x0010 DoFade5 WaitFor_2 -Call 0x08053635 +Call sub_08053634 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08009DB0.inc b/data/scripts/gUnk_08009DB0.inc index 939e5d75..cf4d21a6 100644 --- a/data/scripts/gUnk_08009DB0.inc +++ b/data/scripts/gUnk_08009DB0.inc @@ -1,15 +1,15 @@ SCRIPT_START gUnk_08009DB0 StartScript -Call 0x0807f349 -Call 0x08066289 -Call 0x08066275 +Call sub_0807F348 +Call sub_08066288 +Call sub_08066274 _0807EF80 0x000a _0807E930 0x000c _0807E908 0x0003 StopScript _0807E944 _0807E908 0x0002 -Call 0x0806622d +Call sub_0806622C _0807EA94 _0807E908 0x0003 _0807E930 0x000c @@ -19,16 +19,16 @@ StopScript CheckPlayerInRegion 0x00a0, 0x0038, 0x1830 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 +Call sub_0807F9A4 Wait 0x0008 _0807EB28 0x3207 _0807E3E8 JumpIfNot 0x003e -Call 0x0807df29 +Call sub_0807DF28 _0807E778 0x0002 DoFade5 WaitFor_2 -Call 0x0804e865 +Call sub_0804E864 Wait 0x001e _0807E5F8 0x00000002 WaitForSomething2 0x00000001 @@ -36,6 +36,6 @@ _0807EB28 0x3209 Wait 0x000f _0807EA94 _0807E878 -Call 0x0807df51 +Call sub_0807DF50 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08009E58.inc b/data/scripts/gUnk_08009E58.inc index 630c3001..40af0a02 100644 --- a/data/scripts/gUnk_08009E58.inc +++ b/data/scripts/gUnk_08009E58.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08009E58 StartScript -Call 0x0807df29 +Call sub_0807DF28 StopScript WaitForSomething2 0x00000002 _0807E778 0x0002 diff --git a/data/scripts/gUnk_08009E88.inc b/data/scripts/gUnk_08009E88.inc index 4e439873..f7d12c39 100644 --- a/data/scripts/gUnk_08009E88.inc +++ b/data/scripts/gUnk_08009E88.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08009E88 StartScript -Call 0x0807df29 +Call sub_0807DF28 _0807E864 SetLocalFlag 0x009f StopScript @@ -8,12 +8,12 @@ Wait 0x003c _0807E778 0x0004 DoFade4 WaitFor_2 -Call 0x0807f0d9 +Call sub_0807F0D8 JumpIfNot 0xfff8 _0807EF80 0x0014 Wait 0x000a -Call 0x08053251 +Call sub_08053250 _0807E878 -Call 0x0807df51 -Call 0x080791d1 +Call sub_0807DF50 +Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/gUnk_08009F14.inc b/data/scripts/gUnk_08009F14.inc index 136cbddb..4e9dd50f 100644 --- a/data/scripts/gUnk_08009F14.inc +++ b/data/scripts/gUnk_08009F14.inc @@ -1,7 +1,7 @@ SCRIPT_START gUnk_08009F14 StartScript _0807EB44 0x0004 -Call 0x08060091 +Call sub_08060090 _0807EF80 0x000a CheckKinstoneFused 0x001c JumpIf 0x00a8 @@ -10,16 +10,16 @@ JumpIf 0x0052 StopScript StopScript StartScript -Call 0x08060159 +Call sub_08060158 CheckEntityInteractType JumpIfNot 0xfff2 StopScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 _0807EF80 0x000b -StartPlayerScript 0x0800a088 +StartPlayerScript gUnk_0800A088 WaitForSomething2 0x00000002 -Call 0x0806014d +Call sub_0806014C .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1f01 .short 0x0000 @@ -29,21 +29,20 @@ Wait 0x001e _0807F034 0x0065 WaitPlayerAction8 _0807EF80 0x000a -Call 0x0807df51 +Call sub_0807DF50 _0807E878 StopScript StopScript StartScript -Call 0x08060159 +Call sub_08060158 CheckEntityInteractType JumpIfNot 0xfff2 StopScript _0807E864 -Call 0x080602bd +Call sub_080602BC _0807EA94 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf971 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F970 .short 0x1f03 .short 0x0000 @ End of parameters @@ -52,9 +51,8 @@ _0807E878 Jump 0xffd2 Wait 0x0008 SoundReq 0x0103 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x030d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806030C .short 0x0063 .short 0x0000 @ End of parameters @@ -66,7 +64,7 @@ CheckLocalFlag 0x00b0 JumpIf 0x004a StopScript StartScript -Call 0x08060159 +Call sub_08060158 CheckEntityInteractType JumpIfNot 0xfff2 StopScript @@ -79,7 +77,7 @@ _0807E878 Jump 0xffdc Wait 0x0008 _0807F034 0x0008 -Call 0x08060319 +Call sub_08060318 WaitPlayerAction8 Wait 0x0008 _0807EB8C @@ -89,7 +87,7 @@ SetLocalFlag 0x00b0 _0807E878 StopScript StartScript -Call 0x08060159 +Call sub_08060158 CheckEntityInteractType JumpIfNot 0xfff2 StopScript @@ -110,7 +108,7 @@ _0807E878 Jump 0xffc2 Wait 0x0008 _0807F034 0x0007 -Call 0x08060319 +Call sub_08060318 WaitPlayerAction8 Wait 0x0008 _0807EB8C @@ -119,14 +117,3 @@ _0807EA94 _0807E878 Jump 0xffa0 .short 0x0000 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807ECC4 0x0010 -_0807EDD4 0x0078, 0x0060 -_0807EB44 0x0000 -Wait 0x000f -_0807EF80 0x0000 -_0807E5F8 0x00000002 -Call 0x080791bd -SCRIPT_END diff --git a/data/scripts/gUnk_0800A088.inc b/data/scripts/gUnk_0800A088.inc new file mode 100644 index 00000000..e62b573e --- /dev/null +++ b/data/scripts/gUnk_0800A088.inc @@ -0,0 +1,12 @@ +SCRIPT_START gUnk_0800A088 +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807ECC4 0x0010 +_0807EDD4 0x0078, 0x0060 +_0807EB44 0x0000 +Wait 0x000f +_0807EF80 0x0000 +_0807E5F8 0x00000002 +Call sub_080791BC +SCRIPT_END diff --git a/data/scripts/gUnk_0800A0B4.inc b/data/scripts/gUnk_0800A0B4.inc index f32de8ae..92f45a45 100644 --- a/data/scripts/gUnk_0800A0B4.inc +++ b/data/scripts/gUnk_0800A0B4.inc @@ -2,11 +2,11 @@ SCRIPT_START gUnk_0800A0B4 StartScript SetEntityNonPlanarMovement 0x0140 _0807E864 -Call 0x0807df29 +Call sub_0807DF28 StopScript Wait 0x0078 SoundReq2 0x0018 -Call 0x080a0465 +Call sub_080A0464 _0807EE30 JumpIfNot 0xfffc _0807E8E4_0 diff --git a/data/scripts/gUnk_0800A0FC.inc b/data/scripts/gUnk_0800A0FC.inc index c0b0e2fe..a2d56bd5 100644 --- a/data/scripts/gUnk_0800A0FC.inc +++ b/data/scripts/gUnk_0800A0FC.inc @@ -4,21 +4,19 @@ CheckGlobalFlag 0x0051 JumpIfNot 0xfffa StartScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 SoundReq0x80100000 -Call 0x0807fbfd +Call sub_0807FBFC SetEntityPositionRelative 0x005800b0 -Call 0x0807f845 +Call sub_0807F844 _0807E8E4_3 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf75d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F75C .short 0x0060 .short 0x00d0 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x4ae9 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08094AE8 .short 0xa160 .short 0x0800 @ End of parameters @@ -28,9 +26,8 @@ DoFade6 StopScript WaitFor_2 WaitForSomething2 0x00000004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda1d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA1C .short 0x0006 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800A160.inc b/data/scripts/gUnk_0800A160.inc index c1eed80f..19b41f0c 100644 --- a/data/scripts/gUnk_0800A160.inc +++ b/data/scripts/gUnk_0800A160.inc @@ -5,15 +5,13 @@ _0807EF80 0x0007 _0807EF80 0x000b _0807E930 0x0002 SetEntityPositionRelative 0x008000b0 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf98d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F98C .short 0x0000 .short 0xff80 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x60c5 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080960C4 .short 0xa1b4 .short 0x0800 @ End of parameters diff --git a/data/scripts/gUnk_0800A1B4.inc b/data/scripts/gUnk_0800A1B4.inc index 94faff32..27ffbaf3 100644 --- a/data/scripts/gUnk_0800A1B4.inc +++ b/data/scripts/gUnk_0800A1B4.inc @@ -2,9 +2,8 @@ SCRIPT_START gUnk_0800A1B4 StartScript _0807EF80 0x0007 _0807EF80 0x000b -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf995 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F994 .short 0xfff8 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800A1D8.inc b/data/scripts/gUnk_0800A1D8.inc index af9ee5cb..0b42df91 100644 --- a/data/scripts/gUnk_0800A1D8.inc +++ b/data/scripts/gUnk_0800A1D8.inc @@ -1,19 +1,18 @@ SCRIPT_START gUnk_0800A1D8 StartScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 SetEntityPositionRelative 0x00800088 -Call 0x0807f845 +Call sub_0807F844 _0807E8E4_3 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf75d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F75C .short 0x0088 .short 0x00a8 @ End of parameters StopScript Wait 0x003c -StartPlayerScript 0x0800a310 +StartPlayerScript gUnk_0800A310 WaitForSomething2 0x00000001 _0807E5F8 0x00000004 WaitForSomething2 0x00000080 @@ -33,7 +32,7 @@ WaitForSomething2 0x00000200 _0807E5F8 0x00000002 WaitForSomething2 0x00000040 _0807E5F8 0x00000004 -Call 0x0807f3f9 +Call sub_0807F3F8 WaitForSomething2 0x00000080 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x165a @@ -78,9 +77,8 @@ _0807E5F8 0x00000008 WaitForSomething2 0x00000100 SoundReq2 0x0008 SoundReq 0x00f7 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda1d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA1C .short 0x0007 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800A310.inc b/data/scripts/gUnk_0800A310.inc index 9a66158a..7e9b2c7b 100644 --- a/data/scripts/gUnk_0800A310.inc +++ b/data/scripts/gUnk_0800A310.inc @@ -9,16 +9,15 @@ Wait 0x000a _0807EB44 0x0006 Wait 0x000a _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC .short 0x0000 StartScript _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 _0807EF80 0x000b _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -26,25 +25,24 @@ StopScript WaitForSomething2 0x00000002 _0807E930 0x000e _0807EF80 0x0007 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EF80 0x0004 _0807E5F8 0x00000040 WaitForSomething2 0x00000002 _0807E930 0x000c -Call 0x0807f2d5 +Call sub_0807F2D4 _0807E5F8 0x00000040 WaitForSomething2 0x00000002 _0807E930 0x000f -Call 0x0807f2d5 +Call sub_0807F2D4 _0807E5F8 0x00000040 WaitForSomething2 0x00000002 _0807E930 0x000c -Call 0x0807f2d5 +Call sub_0807F2D4 _0807E5F8 0x00000040 WaitForSomething2 0x00000002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x60c5 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080960C4 .short 0xa680 .short 0x0800 @ End of parameters diff --git a/data/scripts/gUnk_0800A3D8.inc b/data/scripts/gUnk_0800A3D8.inc index baf3ae2c..e072c052 100644 --- a/data/scripts/gUnk_0800A3D8.inc +++ b/data/scripts/gUnk_0800A3D8.inc @@ -9,7 +9,7 @@ StopScript WaitForSomething2 0x00000004 StartScript _0807EF80 0x0004 -Call 0x0807f3f9 +Call sub_0807F3F8 StopScript Wait 0x003c _0807EC94 0x0010 @@ -28,9 +28,8 @@ WaitForSomething2 0x00000004 _0807EB44 0x0004 _0807EF80 0x0000 SoundReq 0x0142 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x60c5 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080960C4 .short 0xa638 .short 0x0800 @ End of parameters @@ -40,45 +39,40 @@ SoundReq 0x0143 _0807E5F8 0x00001000 _0807E5F8 0x00000080 WaitForSomething2 0x00000004 -Call 0x08066e69 +Call sub_08066E68 _0807E5F8 0x00000080 WaitForSomething2 0x00000004 SoundReq 0x0142 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x60c5 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080960C4 .short 0xa680 .short 0x0800 @ End of parameters Wait 0x0078 SoundReq 0x0153 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfadd -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FADC .short 0x0003 .short 0x0000 @ End of parameters Wait 0x000f SoundReq 0x0153 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfadd -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FADC .short 0x0003 .short 0x0000 @ End of parameters Wait 0x000f SoundReq 0x0153 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfadd -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FADC .short 0x0003 .short 0x0000 @ End of parameters Wait 0x003c SoundReq 0x0153 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfadd -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FADC .short 0x0001 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800A500.inc b/data/scripts/gUnk_0800A500.inc index 9e32b976..9686116d 100644 --- a/data/scripts/gUnk_0800A500.inc +++ b/data/scripts/gUnk_0800A500.inc @@ -4,31 +4,30 @@ SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 _0807EF80 0x000b _0807E930 0x0005 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitForSomething2 0x00000008 SoundReq 0x0142 _0807E610 0x00000800 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x60c5 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080960C4 .short 0xa65c .short 0x0800 @ End of parameters _0807E930 0x0002 -Call 0x08094b0d +Call sub_08094B0C _0807EDD4 0x0068, 0x0088 -Call 0x08094b81 +Call sub_08094B80 _0807E5F8 0x00000100 WaitForSomething2 0x00000008 -Call 0x08094b3d +Call sub_08094B3C _0807E930 0x0004 _0807E5F8 0x00000800 SoundReq 0x0143 _0807E5F8 0x00000100 WaitForSomething2 0x00000008 _0807EF80 0x0008 -Call 0x080961b1 +Call sub_080961B0 SoundReq 0x00fa Wait 0x003c _0807E5F8 0x00000100 diff --git a/data/scripts/gUnk_0800A590.inc b/data/scripts/gUnk_0800A590.inc index 690fae45..5d776d2c 100644 --- a/data/scripts/gUnk_0800A590.inc +++ b/data/scripts/gUnk_0800A590.inc @@ -4,29 +4,26 @@ SetEntityNonPlanarMovement 0x0080 SetEntity0x20 0x00000000 _0807EF80 0x0008 _0807EB44 0x0000 -Call 0x0807f715 +Call sub_0807F714 MoveEntityToPlayer -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf98d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F98C .short 0x0000 .short 0xfff0 @ End of parameters StopScript _0807E930 0x0023 WaitForSomething2 0x00000010 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf6e9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F6E8 .short 0x0008 .short 0x0000 @ End of parameters _0807EF80 0x0007 SoundReq 0x0142 _0807E610 0x00000800 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x60c5 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080960C4 .short 0xa65c .short 0x0800 @ End of parameters diff --git a/data/scripts/gUnk_0800A638.inc b/data/scripts/gUnk_0800A638.inc index a4dfac37..294caac8 100644 --- a/data/scripts/gUnk_0800A638.inc +++ b/data/scripts/gUnk_0800A638.inc @@ -2,9 +2,8 @@ SCRIPT_START gUnk_0800A638 StartScript _0807EF80 0x0007 _0807EF80 0x000b -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf995 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F994 .short 0xfff8 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800A65C.inc b/data/scripts/gUnk_0800A65C.inc index 32196619..02a16290 100644 --- a/data/scripts/gUnk_0800A65C.inc +++ b/data/scripts/gUnk_0800A65C.inc @@ -2,9 +2,8 @@ SCRIPT_START gUnk_0800A65C StartScript _0807EF80 0x0007 _0807EF80 0x000b -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf995 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F994 .short 0xfff8 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800A680.inc b/data/scripts/gUnk_0800A680.inc index 2fe25d6c..7a713f81 100644 --- a/data/scripts/gUnk_0800A680.inc +++ b/data/scripts/gUnk_0800A680.inc @@ -2,9 +2,8 @@ SCRIPT_START gUnk_0800A680 StartScript _0807EF80 0x0007 _0807EF80 0x000b -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf995 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F994 .short 0xfff8 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800A6A4.inc b/data/scripts/gUnk_0800A6A4.inc index c0e906e3..d8145bbb 100644 --- a/data/scripts/gUnk_0800A6A4.inc +++ b/data/scripts/gUnk_0800A6A4.inc @@ -1,15 +1,14 @@ SCRIPT_START gUnk_0800A6A4 StartScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 SetEntityPositionRelative 0x00680088 -Call 0x0807f845 +Call sub_0807F844 StopScript Wait 0x003c SoundReq 0x00f6 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda1d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA1C .short 0x0008 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800A6D4.inc b/data/scripts/gUnk_0800A6D4.inc index 55f88979..0af66470 100644 --- a/data/scripts/gUnk_0800A6D4.inc +++ b/data/scripts/gUnk_0800A6D4.inc @@ -1,15 +1,14 @@ SCRIPT_START gUnk_0800A6D4 StartScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 SetEntityPositionRelative 0x00700088 -Call 0x0807f845 +Call sub_0807F844 SoundReq 0x00f7 StopScript Wait 0x003c -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda1d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA1C .short 0x0009 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800A704.inc b/data/scripts/gUnk_0800A704.inc index 82273794..dbc2a17f 100644 --- a/data/scripts/gUnk_0800A704.inc +++ b/data/scripts/gUnk_0800A704.inc @@ -1,15 +1,14 @@ SCRIPT_START gUnk_0800A704 StartScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 SetEntityPositionRelative 0x01c80198 -Call 0x0807f845 +Call sub_0807F844 StopScript Wait 0x003c SoundReq 0x00f6 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda1d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA1C .short 0x000a .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800A734.inc b/data/scripts/gUnk_0800A734.inc index 533a2f6e..2dc687dc 100644 --- a/data/scripts/gUnk_0800A734.inc +++ b/data/scripts/gUnk_0800A734.inc @@ -1,15 +1,14 @@ SCRIPT_START gUnk_0800A734 StartScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 SetEntityPositionRelative 0x01c800d8 -Call 0x0807f845 +Call sub_0807F844 SoundReq 0x00f7 StopScript Wait 0x003c -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda1d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA1C .short 0x000b .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800A764.inc b/data/scripts/gUnk_0800A764.inc index ce8979e6..78017245 100644 --- a/data/scripts/gUnk_0800A764.inc +++ b/data/scripts/gUnk_0800A764.inc @@ -1,9 +1,9 @@ SCRIPT_START gUnk_0800A764 StartScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 SetEntityPositionRelative 0x01b800f8 -Call 0x0807f845 +Call sub_0807F844 StopScript Wait 0x003c SoundReq 0x00f6 @@ -26,9 +26,8 @@ _0807E5F8 0x00000010 Wait 0x0002 _0807E5F8 0x00000020 Wait 0x0078 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda1d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA1C .short 0x000c .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800A7E4.inc b/data/scripts/gUnk_0800A7E4.inc index dc79100f..0cae1367 100644 --- a/data/scripts/gUnk_0800A7E4.inc +++ b/data/scripts/gUnk_0800A7E4.inc @@ -76,9 +76,9 @@ Wait 0x000f Jump 0xffee StartScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 SetEntityPositionRelative 0x01780378 -Call 0x0807f845 +Call sub_0807F844 StopScript Wait 0x003c _0807E5F8 0x00000001 @@ -89,9 +89,8 @@ _0807E5F8 0x00000004 Wait 0x000a _0807E5F8 0x00000008 Wait 0x003c -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda1d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA1C .short 0x000d .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800A964.inc b/data/scripts/gUnk_0800A964.inc index 75cd370b..558fb639 100644 --- a/data/scripts/gUnk_0800A964.inc +++ b/data/scripts/gUnk_0800A964.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0001 StopScript WaitForSomething2 0x00000001 -Call 0x080a29bd +Call CreateDust _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800A988.inc b/data/scripts/gUnk_0800A988.inc index 7deff2ff..9773d029 100644 --- a/data/scripts/gUnk_0800A988.inc +++ b/data/scripts/gUnk_0800A988.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0002 StopScript WaitForSomething2 0x00000002 -Call 0x080a29bd +Call CreateDust _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800A9AC.inc b/data/scripts/gUnk_0800A9AC.inc index aef80139..75aafcd7 100644 --- a/data/scripts/gUnk_0800A9AC.inc +++ b/data/scripts/gUnk_0800A9AC.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0000 StopScript WaitForSomething2 0x00000004 -Call 0x080a29bd +Call CreateDust _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800A9D0.inc b/data/scripts/gUnk_0800A9D0.inc index cae4d653..d70c742c 100644 --- a/data/scripts/gUnk_0800A9D0.inc +++ b/data/scripts/gUnk_0800A9D0.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0003 StopScript WaitForSomething2 0x00000008 -Call 0x080a29bd +Call CreateDust _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800A9F4.inc b/data/scripts/gUnk_0800A9F4.inc index aadc8530..bfd53ef2 100644 --- a/data/scripts/gUnk_0800A9F4.inc +++ b/data/scripts/gUnk_0800A9F4.inc @@ -1,9 +1,9 @@ SCRIPT_START gUnk_0800A9F4 StartScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 SetEntityPositionRelative 0x00580128 -Call 0x0807f845 +Call sub_0807F844 StopScript Wait 0x003c _0807E5F8 0x00000001 @@ -14,9 +14,8 @@ _0807E5F8 0x00000004 Wait 0x001e _0807E5F8 0x00000008 Wait 0x003c -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda1d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA1C .short 0x000e .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800AA48.inc b/data/scripts/gUnk_0800AA48.inc index 75b9c451..c4e7fb14 100644 --- a/data/scripts/gUnk_0800AA48.inc +++ b/data/scripts/gUnk_0800AA48.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0000 StopScript WaitForSomething2 0x00000001 -Call 0x080a29bd +Call CreateDust _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800AA6C.inc b/data/scripts/gUnk_0800AA6C.inc index 3e64b994..d9166bb5 100644 --- a/data/scripts/gUnk_0800AA6C.inc +++ b/data/scripts/gUnk_0800AA6C.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0000 StopScript WaitForSomething2 0x00000002 -Call 0x080a29bd +Call CreateDust _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800AA90.inc b/data/scripts/gUnk_0800AA90.inc index afce2365..3f08f7c6 100644 --- a/data/scripts/gUnk_0800AA90.inc +++ b/data/scripts/gUnk_0800AA90.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0000 StopScript WaitForSomething2 0x00000004 -Call 0x080a29bd +Call CreateDust _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800AAB4.inc b/data/scripts/gUnk_0800AAB4.inc index b2169922..5af49a63 100644 --- a/data/scripts/gUnk_0800AAB4.inc +++ b/data/scripts/gUnk_0800AAB4.inc @@ -5,7 +5,7 @@ _0807EF80 0x0007 _0807E930 0x0000 StopScript WaitForSomething2 0x00000008 -Call 0x080a29bd +Call CreateDust _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800AAD8.inc b/data/scripts/gUnk_0800AAD8.inc index c58d8c55..980237ff 100644 --- a/data/scripts/gUnk_0800AAD8.inc +++ b/data/scripts/gUnk_0800AAD8.inc @@ -1,15 +1,14 @@ SCRIPT_START gUnk_0800AAD8 StartScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 SetEntityPositionRelative 0x01480088 -Call 0x0807f845 +Call sub_0807F844 StopScript Wait 0x003c SoundReq 0x00f6 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda1d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA1C .short 0x000f .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800AB08.inc b/data/scripts/gUnk_0800AB08.inc index e6998808..93104427 100644 --- a/data/scripts/gUnk_0800AB08.inc +++ b/data/scripts/gUnk_0800AB08.inc @@ -1,19 +1,17 @@ SCRIPT_START gUnk_0800AB08 StartScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 SetEntityPositionRelative 0x01480088 -Call 0x0807f845 +Call sub_0807F844 _0807E8E4_3 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf6e9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F6E8 .short 0x0008 .short 0x0000 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf75d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F75C .short 0x0088 .short 0x00a8 @ End of parameters @@ -22,7 +20,7 @@ StopScript Wait 0x0078 _0807F0B4 0x0001 SetEntityPositionRelative 0x00780088 -Call 0x0807f5c1 +Call sub_0807F5C0 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1664 .short 0x0000 @@ -33,9 +31,8 @@ _0807EA94 .short 0x000e @ End of parameters _0807EA94 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xdded -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DDEC .short 0x0001 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800AB6E.inc b/data/scripts/gUnk_0800AB6E.inc index 10079c59..06350a3c 100644 --- a/data/scripts/gUnk_0800AB6E.inc +++ b/data/scripts/gUnk_0800AB6E.inc @@ -1,16 +1,15 @@ SCRIPT_START gUnk_0800AB6E -Call 0x0808d2cd +Call sub_0808D2CC _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807E8E4_0 _0807E5F8 0x00000040 WaitForSomething2 0x00000080 SetEntityPosition 0x0000, 0xffe0 -Call 0x0807f5c1 +Call sub_0807F5C0 Wait 0x003c -.short 0x140c @ CallWithArg with 4 parameters -.short 0xde19 -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DE18 .short 0x0001 .short 0x0000 @ End of parameters @@ -23,7 +22,7 @@ WaitForSomething2 0x00000004 .short 0x000e @ End of parameters _0807EA94 -StartPlayerScript 0x0800acbc +StartPlayerScript gUnk_0800ACBC WaitForSomething2 0x00000001 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1660 @@ -41,9 +40,9 @@ _0807E5F8 0x00000008 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 SetEntityPosition 0x0000, 0x0020 -Call 0x0807f5c1 +Call sub_0807F5C0 WaitForSomething2 0x00000010 -StartPlayerScript 0x0800ace0 +StartPlayerScript gUnk_0800ACE0 WaitForSomething2 0x00000001 Wait 0x003c .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters @@ -57,12 +56,12 @@ _0807EA94 @ End of parameters _0807EA94 SetEntityPosition 0x0000, 0xffe0 -Call 0x0807f5c1 +Call sub_0807F5C0 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -StartPlayerScript 0x0800ad54 +StartPlayerScript gUnk_0800AD54 WaitForSomething2 0x00000001 Wait 0x003c .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters @@ -73,20 +72,20 @@ _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Wait 0x0078 -Call 0x0808d281 +Call sub_0808D280 Wait 0x0078 _0807E778 0x0004 DoFade5 WaitFor_2 -Call 0x0807fb95 +Call sub_0807FB94 MoveEntityToPlayer -Call 0x0807f845 +Call sub_0807F844 _0807F0B4 0x0004 CameraTargetPlayer _0807E5F8 0x80000000 DoFade4 WaitFor_2 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800ACBC.inc b/data/scripts/gUnk_0800ACBC.inc index 4ca8e27d..07f8d2d2 100644 --- a/data/scripts/gUnk_0800ACBC.inc +++ b/data/scripts/gUnk_0800ACBC.inc @@ -6,138 +6,5 @@ _0807EDD4 0x0088, 0x0080 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC .short 0x0000 -StartScript -Call 0x08094be1 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf239 -.short 0x0807 -.short 0x045b -.short 0x0000 -@ End of parameters -SoundReq 0x0109 -StopScript -Call 0x0807f305 -Wait 0x005a -_0807E5F8 0x00000008 -StartScript -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf6f9 -.short 0x0807 -.short 0x0008 -.short 0x0000 -@ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf239 -.short 0x0807 -.short 0x08e4 -.short 0x0000 -@ End of parameters -StopScript -Call 0x0807f305 -_0807EB44 0x0004 -_0807EF80 0x0000 -Wait 0x003c -_0807EB44 0x0002 -_0807EF80 0x0000 -Wait 0x0004 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call 0x080791bd -.short 0x0000 -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -_0807EC64 0x0020 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call 0x080791bd -StartScript -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x0007 -_0807EF80 0x000b -_0807EB44 0x0004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 -.short 0x0000 -.short 0x0000 -@ End of parameters -StopScript -WaitForSomething2 0x00000002 -_0807EF80 0x0004 -Wait 0x001e -_0807EB44 0x0002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 -.short 0x0000 -.short 0x0000 -@ End of parameters -Wait 0x0006 -_0807EB44 0x0000 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 -.short 0x0000 -.short 0x0000 -@ End of parameters -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807EB44 0x0002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 -.short 0x0000 -.short 0x0000 -@ End of parameters -Wait 0x0014 -_0807EB44 0x0004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 -.short 0x0000 -.short 0x0000 -@ End of parameters -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807E930 0x000c -Call 0x0807f2d5 -Call 0x08094b95 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807E930 0x000f -Call 0x0807f2d5 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x60c5 -.short 0x0809 -.short 0xaf18 -.short 0x0800 -@ End of parameters -_0807E930 0x0012 -Call 0x0807f2d5 -Wait 0x001e -_0807E5F8 0x00000020 -SoundReq0x80100000 -Call 0x080a29bd -Call 0x0806305d -Call 0x080630a5 -_0807EF3C 0x0000, 0x0020 -Wait 0x001e -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0080 -_0807EEF4 0x0000, 0xfff0 -Wait 0x003c -_0807EEF4 0x0000, 0xfff0 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807EDD4 0x0088, 0x0040 -_0807E5F8 0x00000004 -_0807EF80 0x0006 -SCRIPT_END diff --git a/data/scripts/gUnk_0800ACE0.inc b/data/scripts/gUnk_0800ACE0.inc new file mode 100644 index 00000000..aa4cf249 --- /dev/null +++ b/data/scripts/gUnk_0800ACE0.inc @@ -0,0 +1,37 @@ +SCRIPT_START gUnk_0800ACE0 +StartScript +Call sub_08094BE0 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F238 +.short 0x045b +.short 0x0000 +@ End of parameters +SoundReq 0x0109 +StopScript +Call sub_0807F304 +Wait 0x005a +_0807E5F8 0x00000008 +StartScript +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F6F8 +.short 0x0008 +.short 0x0000 +@ End of parameters +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F238 +.short 0x08e4 +.short 0x0000 +@ End of parameters +StopScript +Call sub_0807F304 +_0807EB44 0x0004 +_0807EF80 0x0000 +Wait 0x003c +_0807EB44 0x0002 +_0807EF80 0x0000 +Wait 0x0004 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call sub_080791BC +.short 0x0000 diff --git a/data/scripts/gUnk_0800AD54.inc b/data/scripts/gUnk_0800AD54.inc new file mode 100644 index 00000000..8d2c716f --- /dev/null +++ b/data/scripts/gUnk_0800AD54.inc @@ -0,0 +1,89 @@ +SCRIPT_START gUnk_0800AD54 +StartScript +SetEntityNonPlanarMovement 0x0080 +StopScript +_0807EC64 0x0020 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call sub_080791BC +StartScript +SetEntityNonPlanarMovement 0x0080 +_0807EF80 0x0007 +_0807EF80 0x000b +_0807EB44 0x0004 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 +.short 0x0000 +.short 0x0000 +@ End of parameters +StopScript +WaitForSomething2 0x00000002 +_0807EF80 0x0004 +Wait 0x001e +_0807EB44 0x0002 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 +.short 0x0000 +.short 0x0000 +@ End of parameters +Wait 0x0006 +_0807EB44 0x0000 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 +.short 0x0000 +.short 0x0000 +@ End of parameters +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +_0807EB44 0x0002 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 +.short 0x0000 +.short 0x0000 +@ End of parameters +Wait 0x0014 +_0807EB44 0x0004 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 +.short 0x0000 +.short 0x0000 +@ End of parameters +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +_0807E930 0x000c +Call sub_0807F2D4 +Call sub_08094B94 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +_0807E930 0x000f +Call sub_0807F2D4 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080960C4 +.short 0xaf18 +.short 0x0800 +@ End of parameters +_0807E930 0x0012 +Call sub_0807F2D4 +Wait 0x001e +_0807E5F8 0x00000020 +SoundReq0x80100000 +Call CreateDust +Call sub_0806305C +Call sub_080630A4 +_0807EF3C 0x0000, 0x0020 +Wait 0x001e +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +SetEntityNonPlanarMovement 0x0080 +_0807EEF4 0x0000, 0xfff0 +Wait 0x003c +_0807EEF4 0x0000, 0xfff0 +_0807E5F8 0x00000004 +WaitForSomething2 0x00000002 +_0807EDD4 0x0088, 0x0040 +_0807E5F8 0x00000004 +_0807EF80 0x0006 +SCRIPT_END diff --git a/data/scripts/gUnk_0800AEDC.inc b/data/scripts/gUnk_0800AEDC.inc index 16a64ac9..d8650582 100644 --- a/data/scripts/gUnk_0800AEDC.inc +++ b/data/scripts/gUnk_0800AEDC.inc @@ -6,7 +6,7 @@ _0807EF80 0x000b _0807E930 0x0000 StopScript WaitForSomething2 0x00000008 -Call 0x08094b81 +Call sub_08094B80 _0807EF3C 0x0000, 0x0001 _0807E5F8 0x00000010 WaitForSomething2 0x00000008 diff --git a/data/scripts/gUnk_0800AF18.inc b/data/scripts/gUnk_0800AF18.inc index 5cec6ff5..26076509 100644 --- a/data/scripts/gUnk_0800AF18.inc +++ b/data/scripts/gUnk_0800AF18.inc @@ -2,9 +2,8 @@ SCRIPT_START gUnk_0800AF18 StartScript _0807EF80 0x0007 _0807EF80 0x000b -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf995 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F994 .short 0xfff8 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800AF44.inc b/data/scripts/gUnk_0800AF44.inc index da215c73..ebfa32bc 100644 --- a/data/scripts/gUnk_0800AF44.inc +++ b/data/scripts/gUnk_0800AF44.inc @@ -1,10 +1,10 @@ SCRIPT_START gUnk_0800AF44 _0807E864 -Call 0x0807df29 +Call sub_0807DF28 _0807EB28 0x1c01 _0807EA94 SetLocalFlagByOffset 0x0100, 0x0001 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800AF68.inc b/data/scripts/gUnk_0800AF68.inc index 4209d0f2..6739a6fa 100644 --- a/data/scripts/gUnk_0800AF68.inc +++ b/data/scripts/gUnk_0800AF68.inc @@ -1,10 +1,10 @@ SCRIPT_START gUnk_0800AF68 _0807E864 -Call 0x0807df29 +Call sub_0807DF28 _0807EB28 0x1c02 _0807EA94 SetLocalFlagByOffset 0x0100, 0x0002 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800AF8C.inc b/data/scripts/gUnk_0800AF8C.inc index b1d27fee..9704c881 100644 --- a/data/scripts/gUnk_0800AF8C.inc +++ b/data/scripts/gUnk_0800AF8C.inc @@ -1,10 +1,10 @@ SCRIPT_START gUnk_0800AF8C _0807E864 -Call 0x0807df29 +Call sub_0807DF28 _0807EB28 0x1c03 _0807EA94 SetLocalFlagByOffset 0x0100, 0x0003 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800AFB0.inc b/data/scripts/gUnk_0800AFB0.inc index 6b836bfc..123fb79d 100644 --- a/data/scripts/gUnk_0800AFB0.inc +++ b/data/scripts/gUnk_0800AFB0.inc @@ -2,15 +2,15 @@ SCRIPT_START gUnk_0800AFB0 _0807E864 StopScript StartScript -Call 0x0807fbb5 +Call sub_0807FBB4 ComparePlayerAction 0x0001 JumpIfNot 0xfff0 StopScript -Call 0x0807df29 +Call sub_0807DF28 _0807EB28 0x1c04 _0807EA94 SetLocalFlagByOffset 0x0100, 0x0004 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800AFE8.inc b/data/scripts/gUnk_0800AFE8.inc index ec04570c..c150d8e0 100644 --- a/data/scripts/gUnk_0800AFE8.inc +++ b/data/scripts/gUnk_0800AFE8.inc @@ -1,10 +1,10 @@ SCRIPT_START gUnk_0800AFE8 _0807E864 -Call 0x0807df29 +Call sub_0807DF28 _0807EB28 0x1c05 _0807EA94 SetLocalFlagByOffset 0x0100, 0x0005 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800B00C.inc b/data/scripts/gUnk_0800B00C.inc index a752472c..8bc5453a 100644 --- a/data/scripts/gUnk_0800B00C.inc +++ b/data/scripts/gUnk_0800B00C.inc @@ -1,14 +1,14 @@ SCRIPT_START gUnk_0800B00C StartScript -Call 0x0807f935 -Call 0x080a2125 +Call sub_0807F934 +Call sub_080A2124 _0807EF80 0x000a _0807EF80 0x0007 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call 0x0807df29 +Call sub_0807DF28 CheckGlobalFlag 0x0052 JumpIf 0x004a CheckGlobalFlag 0x0053 @@ -16,7 +16,7 @@ JumpIf 0x0024 TextboxNoOverlap 0x3f32 _0807EA94 _0807EF80 0x0008 -Call 0x080a2139 +Call Windcrest_Unlock Wait 0x003c _0807EB28 0x0b5c _0807EA94 @@ -25,7 +25,7 @@ Jump 0x003a TextboxNoOverlap 0x3f32 _0807EA94 _0807EF80 0x0008 -Call 0x080a2139 +Call Windcrest_Unlock Wait 0x003c _0807EB28 0x0b5d _0807EA94 @@ -33,11 +33,11 @@ Jump 0x001c TextboxNoOverlap 0x3f32 _0807EA94 _0807EF80 0x0008 -Call 0x080a2139 +Call Windcrest_Unlock Wait 0x003c _0807EB28 0x0b5e _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800B0AC.inc b/data/scripts/gUnk_0800B0AC.inc index 6048d180..e1547c6c 100644 --- a/data/scripts/gUnk_0800B0AC.inc +++ b/data/scripts/gUnk_0800B0AC.inc @@ -1,11 +1,11 @@ SCRIPT_START gUnk_0800B0AC StopScript _0807E864 -Call 0x0807fa41 -Call 0x0807df29 +Call sub_0807FA40 +Call sub_0807DF28 _0807EB28 0x0b5f _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800B0D0.inc b/data/scripts/gUnk_0800B0D0.inc index 36a64122..420cbfab 100644 --- a/data/scripts/gUnk_0800B0D0.inc +++ b/data/scripts/gUnk_0800B0D0.inc @@ -1,73 +1,68 @@ SCRIPT_START gUnk_0800B0D0 StartScript -Call 0x0806bcd5 +Call sub_0806BCD4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 4 parameters -.short 0xbc95 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806BC94 .short 0x0000 .short 0x0000 @ End of parameters StopScript -Call 0x0807f435 +Call sub_0807F434 .short 0x1006 @ _0807E078 with 3 parameters .short 0xfff8 .short 0x0004 .short 0x0040 @ End of parameters _0807E864 -Call 0x0807df29 -Call 0x0807f2d5 +Call sub_0807DF28 +Call sub_0807F2D4 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xbc95 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806BC94 .short 0x0004 .short 0x0000 @ End of parameters -Call 0x0806bce9 +Call sub_0806BCE8 _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 -Call 0x0806bcb9 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xbc95 -.short 0x0806 +Call sub_0806BCB8 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806BC94 .short 0x0000 .short 0x0000 @ End of parameters Jump 0xffb6 _0807E864 -Call 0x0807df29 -Call 0x0807f2d5 +Call sub_0807DF28 +Call sub_0807F2D4 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xbc95 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806BC94 .short 0x0004 .short 0x0000 @ End of parameters -Call 0x0807f651 +Call sub_0807F650 _0807E9F0 JumpIfNot 0x0008 -Call 0x0806bcc1 -Call 0x0807df51 +Call sub_0806BCC0 +Call sub_0807DF50 _0807E878 -Call 0x0806bcb9 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xbc95 -.short 0x0806 +Call sub_0806BCB8 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806BC94 .short 0x0000 .short 0x0000 @ End of parameters Jump 0xff6e StartScript -Call 0x0807df29 +Call sub_0807DF28 SetLocalFlag 0x0039 _0807E864 StopScript WaitForPlayerAction0x17 -StartPlayerScript 0x0800b1c0 +StartPlayerScript gUnk_0800B1C0 Wait 0x0018 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 @@ -76,6 +71,6 @@ Wait 0x0010 SoundReq2 0x002d _0807EB28 0x2701 _0807E878 -Call 0x0807df51 +Call sub_0807DF50 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800B1C0.inc b/data/scripts/gUnk_0800B1C0.inc index 7a1a152e..e5ef8a57 100644 --- a/data/scripts/gUnk_0800B1C0.inc +++ b/data/scripts/gUnk_0800B1C0.inc @@ -12,5 +12,5 @@ Wait 0x002c LoadRoomEntityList 0x080da260 Wait 0x001e _0807E5F8 0x00000001 -Call 0x0807921d +Call sub_0807921C SCRIPT_END diff --git a/data/scripts/gUnk_0800B200.inc b/data/scripts/gUnk_0800B200.inc index 66d9a626..8d16d2c1 100644 --- a/data/scripts/gUnk_0800B200.inc +++ b/data/scripts/gUnk_0800B200.inc @@ -6,13 +6,13 @@ JumpIf 0x0044 SetEntityNonPlanarMovement 0x00c0 StopScript WaitForSomething2 0x00000001 -Call 0x0807df29 +Call sub_0807DF28 MoveEntityToPlayer CameraTargetEntity _0807EDD4 0x0068, 0x0380 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 -Call 0x0807df51 +Call sub_0807DF50 Wait 0x000c CameraTargetPlayer Wait 0x0008 diff --git a/data/scripts/gUnk_0800B254.inc b/data/scripts/gUnk_0800B254.inc index f6f8fe08..1289c7c0 100644 --- a/data/scripts/gUnk_0800B254.inc +++ b/data/scripts/gUnk_0800B254.inc @@ -10,7 +10,7 @@ _0807E9F0 _0807E864 CheckKinstoneFused 0x0006 JumpIf 0x006e -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffe8 .short 0x0000 @@ -25,7 +25,7 @@ _0807E9F0 _0807E864 CheckKinstoneFused 0x0007 JumpIf 0x003e -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffe8 .short 0x0000 @@ -40,14 +40,14 @@ _0807E9F0 _0807E864 CheckKinstoneFused 0x0008 JumpIf 0x000e -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffe8 _0807EF80 0x0013 _0807EB44 0x0004 _0807E9DC -Call 0x080676e1 -Call 0x08067535 +Call sub_080676E0 +Call sub_08067534 _0807EF80 0x0012 _0807E5F8 0x00000001 StopScript diff --git a/data/scripts/gUnk_0800B308.inc b/data/scripts/gUnk_0800B308.inc index 382aa451..f458ccdd 100644 --- a/data/scripts/gUnk_0800B308.inc +++ b/data/scripts/gUnk_0800B308.inc @@ -7,21 +7,21 @@ SetEntityNonPlanarMovement 0x0040 SetEntityDirection 0x0010 CheckKinstoneFused 0x0006 JumpIfNot 0x0008 -Call 0x080676d9 +Call sub_080676D8 CheckKinstoneFused 0x0007 JumpIfNot 0x0008 -Call 0x080676d9 +Call sub_080676D8 CheckKinstoneFused 0x0008 JumpIfNot 0x0008 -Call 0x080676d9 +Call sub_080676D8 StopScript -Call 0x0806757d +Call sub_0806757C StopScript WaitForSomething2 0x00000002 SoundReq 0x00fd -Call 0x080676d9 -Call 0x0806757d -Call 0x080675d5 +Call sub_080676D8 +Call sub_0806757C +Call sub_080675D4 Wait 0x0014 StartScript _0807E5F8 0x00000001 diff --git a/data/scripts/gUnk_0800B3A4.inc b/data/scripts/gUnk_0800B3A4.inc index 5a1ac270..41d353f6 100644 --- a/data/scripts/gUnk_0800B3A4.inc +++ b/data/scripts/gUnk_0800B3A4.inc @@ -1,24 +1,24 @@ SCRIPT_START gUnk_0800B3A4 StartScript _0807EF80 0x000a -Call 0x0807f159 +Call sub_0807F158 SetEntityNonPlanarMovement 0x0120 _0807EB44 0x0004 _0807E908 0x0002 _0807E914 0x0000200a StopScript _0807EDD4 0x0158, 0x0290 -Call 0x08065781 -Call 0x08065781 -Call 0x08065781 -Call 0x08065781 -Call 0x08065781 -Call 0x08065781 +Call sub_08065780 +Call sub_08065780 +Call sub_08065780 +Call sub_08065780 +Call sub_08065780 +Call sub_08065780 _0807EDD4 0x0128, 0x0290 -Call 0x08065781 -Call 0x08065781 -Call 0x08065781 -Call 0x08065781 -Call 0x08065781 -Call 0x08065781 +Call sub_08065780 +Call sub_08065780 +Call sub_08065780 +Call sub_08065780 +Call sub_08065780 +Call sub_08065780 Jump 0xffaa diff --git a/data/scripts/gUnk_0800B41C.inc b/data/scripts/gUnk_0800B41C.inc index b128c6cc..19baa293 100644 --- a/data/scripts/gUnk_0800B41C.inc +++ b/data/scripts/gUnk_0800B41C.inc @@ -4,12 +4,12 @@ SetEntityNonPlanarMovement 0x00c0 _0807E908 0x0001 _0807EF80 0x000b _0807E864 -Call 0x0807fbc5 +Call sub_0807FBC4 StopScript Wait 0x000a _0807EF80 0x0004 _0807E5F8 0x00000008 -StartPlayerScript 0x0800b54c +StartPlayerScript gUnk_0800B54C _0807EDD4 0x0140, 0x0298 _0807EB74 WaitForSomething2 0x00000004 diff --git a/data/scripts/gUnk_0800B4AC.inc b/data/scripts/gUnk_0800B4AC.inc index 8fac7d8b..cf57eb4f 100644 --- a/data/scripts/gUnk_0800B4AC.inc +++ b/data/scripts/gUnk_0800B4AC.inc @@ -36,8 +36,8 @@ _0807EF80 0x0008 Wait 0x001e _0807E5F8 0x00000010 SetGlobalFlag 0x001d -Call 0x0807921d +Call sub_0807921C _0807E878 -Call 0x0807fbcd +Call sub_0807FBCC _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800B574.inc b/data/scripts/gUnk_0800B574.inc index c07603ba..c63c2a13 100644 --- a/data/scripts/gUnk_0800B574.inc +++ b/data/scripts/gUnk_0800B574.inc @@ -16,5 +16,5 @@ SoundReq 0x0111 WaitForSomething2 0x00000010 _0807EF80 0x0007 SoundReq 0x0111 -Call 0x0808692d +Call sub_0808692C SCRIPT_END diff --git a/data/scripts/gUnk_0800B5C4.inc b/data/scripts/gUnk_0800B5C4.inc index 18eb145d..e834cb3c 100644 --- a/data/scripts/gUnk_0800B5C4.inc +++ b/data/scripts/gUnk_0800B5C4.inc @@ -7,6 +7,6 @@ Wait 0x001e SoundReq 0x00d1 _0807EDD4 0x008a, 0x005a Wait 0x000a -Call 0x08069ee9 +Call sub_08069EE8 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800B5EC.inc b/data/scripts/gUnk_0800B5EC.inc index a55c7fa5..bab1c892 100644 --- a/data/scripts/gUnk_0800B5EC.inc +++ b/data/scripts/gUnk_0800B5EC.inc @@ -17,10 +17,10 @@ StartScript StopScript CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 JumpIfNot 0xfff6 -Call 0x08079185 +Call sub_08079184 _0807E864 -Call 0x0807f9a5 -StartPlayerScript 0x0800b7c4 +Call sub_0807F9A4 +StartPlayerScript gUnk_0800B7C4 WaitForSomething2 0x00000004 SetRoomFlag 0x0000 WaitForSomething2 0x00000004 @@ -32,16 +32,14 @@ _0807E3E8 JumpIfNot 0x002a Wait 0x000f TextboxNoOverlap 0x0584 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf971 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F970 .short 0x058b .short 0x0000 @ End of parameters JumpIf 0x001e -.short 0x140c @ CallWithArg with 4 parameters -.short 0x7425 -.short 0x0808 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08087424 .short 0x0000 .short 0x0000 @ End of parameters @@ -61,11 +59,11 @@ _0807EA94 _0807E778 0x0004 DoFade7 WaitFor_2 -Call 0x080873fd +Call sub_080873FC DoFade6 WaitFor_2 CameraTargetPlayer Wait 0x001e -Call 0x0807df51 +Call sub_0807DF50 _0807E878 SCRIPT_END diff --git a/data/scripts/gUnk_0800B6C8.inc b/data/scripts/gUnk_0800B6C8.inc index a0d11f43..ea78f758 100644 --- a/data/scripts/gUnk_0800B6C8.inc +++ b/data/scripts/gUnk_0800B6C8.inc @@ -5,10 +5,10 @@ HasRupees 0x0001 JumpIfNot 0xfffa CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 JumpIfNot 0xfff6 -Call 0x08079185 +Call sub_08079184 _0807E864 -Call 0x0807f9a5 -StartPlayerScript 0x0800b7c4 +Call sub_0807F9A4 +StartPlayerScript gUnk_0800B7C4 WaitForSomething2 0x00000004 SetRoomFlag 0x0000 WaitForSomething2 0x00000004 @@ -16,9 +16,8 @@ CheckLocalFlag 0x009f JumpIf 0x0098 TextboxNoOverlap 0x057b _0807EA94 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf971 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F970 .short 0x057d .short 0x0000 @ End of parameters @@ -30,13 +29,13 @@ Jump 0xff6c .short 0x0000 StartScript StopScript -Call 0x0808747d +Call sub_0808747C JumpIfNot 0xfff8 -Call 0x08079185 +Call sub_08079184 _0807E864 Wait 0x000a -Call 0x0807f9a5 -StartPlayerScript 0x0800b7c4 +Call sub_0807F9A4 +StartPlayerScript gUnk_0800B7C4 WaitForSomething2 0x00000004 SetRoomFlag 0x0000 WaitForSomething2 0x00000004 @@ -44,16 +43,14 @@ CheckLocalFlag 0x00a0 JumpIf 0x0036 TextboxNoOverlap 0x0580 _0807EA94 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf971 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F970 .short 0x0582 .short 0x0000 @ End of parameters JumpIf 0x0014 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x7425 -.short 0x0808 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08087424 .short 0x0001 .short 0x0000 @ End of parameters @@ -75,29 +72,3 @@ TextboxNoOverlap 0x057f _0807EA94 Jump 0xfee6 .short 0x0000 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf6b5 -.short 0x0807 -.short 0x0090 -.short 0x0000 -@ End of parameters -JumpIfNot 0x0024 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf465 -.short 0x0807 -.short 0x0078 -.short 0x0000 -@ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 -.short 0x0090 -.short 0x0000 -@ End of parameters -_0807E8E4_0 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -SCRIPT_END diff --git a/data/scripts/gUnk_0800B7C4.inc b/data/scripts/gUnk_0800B7C4.inc new file mode 100644 index 00000000..c269e3ac --- /dev/null +++ b/data/scripts/gUnk_0800B7C4.inc @@ -0,0 +1,24 @@ +SCRIPT_START gUnk_0800B7C4 +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F6B4 +.short 0x0090 +.short 0x0000 +@ End of parameters +JumpIfNot 0x0024 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F464 +.short 0x0078 +.short 0x0000 +@ End of parameters +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 +.short 0x0090 +.short 0x0000 +@ End of parameters +_0807E8E4_0 +_0807EF80 0x0000 +_0807E5F8 0x00000004 +SCRIPT_END diff --git a/data/scripts/gUnk_0800B7FC.inc b/data/scripts/gUnk_0800B7FC.inc index 0ca33ef1..d69ca1c8 100644 --- a/data/scripts/gUnk_0800B7FC.inc +++ b/data/scripts/gUnk_0800B7FC.inc @@ -1,13 +1,11 @@ SCRIPT_START gUnk_0800B7FC -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 .short 0x0090 .short 0x0000 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf465 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F464 .short 0x0078 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800B828.inc b/data/scripts/gUnk_0800B828.inc index eaedc01b..b0ef791a 100644 --- a/data/scripts/gUnk_0800B828.inc +++ b/data/scripts/gUnk_0800B828.inc @@ -19,7 +19,7 @@ _0807EF80 0x0000 _0807EF80 0x000a StopScript Wait 0x003c -Call 0x080646a5 +Call sub_080646A4 Jump 0xfff4 StartScript _0807E9D4 @@ -28,7 +28,7 @@ _0807E930 0x0000 _0807EF80 0x000a StopScript Wait 0x003c -Call 0x0806407d +Call sub_0806407C Jump 0xfff4 StartScript _0807E9D4 @@ -50,29 +50,28 @@ _0807E9D4 _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 4 parameters -.short 0x4645 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08064644 .short 0x464d .short 0x0806 @ End of parameters StopScript Wait 0x003c -Call 0x080646a5 +Call sub_080646A4 Jump 0xfff4 .short 0x0000 StartScript -Call 0x08061e71 +Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0004 -Call 0x08061fd9 +Call sub_08061FD8 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x08061fd9 -Call 0x08062049 +Call sub_08061FD8 +Call sub_08062048 _0807EA94 _0807E878 Jump 0xffe4 @@ -104,12 +103,11 @@ Jump 0xffec StartScript _0807EF80 0x000b _0807EF80 0x0008 -Call 0x0806daad +Call sub_0806DAAC JumpIf 0x0036 -Call 0x0806dad1 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda05 -.short 0x0806 +Call sub_0806DAD0 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA04 .short 0x0005 .short 0x0000 @ End of parameters @@ -117,11 +115,11 @@ StopScript _0807EA4C _0807E9F0 JumpIf 0x000e -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffee -Call 0x0806f189 -Call 0x0807df51 +Call sub_0806F188 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800B9B4.inc b/data/scripts/gUnk_0800B9B4.inc index 89181547..7bfd46d4 100644 --- a/data/scripts/gUnk_0800B9B4.inc +++ b/data/scripts/gUnk_0800B9B4.inc @@ -1,11 +1,11 @@ SCRIPT_START gUnk_0800B9B4 StartScript _0807E9D4 -Call 0x080694ed +Call sub_080694EC _0807EF80 0x000a -Call 0x080694b1 +Call sub_080694B0 StopScript -Call 0x0807f435 +Call sub_0807F434 .short 0x1006 @ _0807E078 with 3 parameters .short 0xfff8 .short 0x0004 @@ -14,53 +14,53 @@ Call 0x0807f435 _0807E864 _0807EB74 _0807EF80 0x0000 -Call 0x080694d9 +Call sub_080694D8 _0807EA94 -Call 0x080694ed +Call sub_080694EC _0807E878 Jump 0xffd8 _0807E864 _0807EB74 _0807EF80 0x0000 -Call 0x0807f651 +Call sub_0807F650 _0807E9F0 _0807E864 -Call 0x0806948d +Call sub_0806948C JumpIf 0x0016 _0807EA94 -Call 0x080694ed -Call 0x0807df51 +Call sub_080694EC +Call sub_0807DF50 _0807E878 Jump 0xffa8 _0807EA94 _0807E9DC _0807E9D4 -Call 0x080694ed -Call 0x0807df51 +Call sub_080694EC +Call sub_0807DF50 _0807E878 Jump 0xff90 StartScript -Call 0x0807f935 +Call sub_0807F934 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call 0x0807df29 +Call sub_0807DF28 TextboxNoOverlapFollow 0x3301 _0807EA94 _0807E3E8 JumpIfNot 0x000e SoundReq0x80100000 -Call 0x0806e965 +Call sub_0806E964 SoundReq2 0xffff -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffd0 StartScript _0807EB44 0x0004 _0807EF80 0x0000 SetEntityNonPlanarMovement 0x0040 -Call 0x0807f349 +Call sub_0807F348 StopScript CheckRoomFlag 0x00ff JumpIfNot 0xfffa @@ -75,5 +75,5 @@ Wait 0x001e TextboxNoOverlap 0x0e00 _0807EA94 Wait 0x0078 -Call 0x08054969 +Call sub_08054968 SCRIPT_END diff --git a/data/scripts/gUnk_0800BACC.inc b/data/scripts/gUnk_0800BACC.inc index 5142d095..6272a549 100644 --- a/data/scripts/gUnk_0800BACC.inc +++ b/data/scripts/gUnk_0800BACC.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BACC StartScript _0807EB44 0x0004 _0807EF80 0x0000 -Call 0x0807f349 +Call sub_0807F348 StopScript CheckRoomFlag 0x00ff JumpIfNot 0xfffa @@ -11,5 +11,5 @@ Wait 0x003c TextboxNoOverlap 0x0e01 _0807EA94 Wait 0x0078 -Call 0x08054969 +Call sub_08054968 SCRIPT_END diff --git a/data/scripts/gUnk_0800BB00.inc b/data/scripts/gUnk_0800BB00.inc index b273117b..46718d40 100644 --- a/data/scripts/gUnk_0800BB00.inc +++ b/data/scripts/gUnk_0800BB00.inc @@ -10,6 +10,6 @@ _0807EA94 Wait 0x003c _0807EF80 0x000f Wait 0x00b4 -Call 0x08054969 +Call sub_08054968 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800BB30.inc b/data/scripts/gUnk_0800BB30.inc index e10efaf7..75b33cd3 100644 --- a/data/scripts/gUnk_0800BB30.inc +++ b/data/scripts/gUnk_0800BB30.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BB30 StartScript _0807EB44 0x0004 _0807EF80 0x0000 -Call 0x0807f349 +Call sub_0807F348 StopScript CheckRoomFlag 0x00ff JumpIfNot 0xfffa @@ -11,5 +11,5 @@ Wait 0x003c TextboxNoOverlap 0x0e05 _0807EA94 Wait 0x0078 -Call 0x08054969 +Call sub_08054968 SCRIPT_END diff --git a/data/scripts/gUnk_0800BB64.inc b/data/scripts/gUnk_0800BB64.inc index 4ce57307..68c8f716 100644 --- a/data/scripts/gUnk_0800BB64.inc +++ b/data/scripts/gUnk_0800BB64.inc @@ -3,7 +3,7 @@ StartScript _0807EB44 0x0006 _0807EF80 0x0000 SetEntityNonPlanarMovement 0x0040 -Call 0x0807f349 +Call sub_0807F348 StopScript CheckRoomFlag 0x00ff JumpIfNot 0xfffa @@ -13,5 +13,5 @@ TextboxNoOverlap 0x0e06 _0807EA94 Wait 0x000f _0807EDD4 0x0380, 0x00f8 -Call 0x08054969 +Call sub_08054968 SCRIPT_END diff --git a/data/scripts/gUnk_0800BBA4.inc b/data/scripts/gUnk_0800BBA4.inc index e76223a7..b8dbcbc1 100644 --- a/data/scripts/gUnk_0800BBA4.inc +++ b/data/scripts/gUnk_0800BBA4.inc @@ -3,7 +3,7 @@ StartScript _0807EF80 0x0007 _0807EB44 0x0004 _0807EF80 0x0000 -Call 0x0807f349 +Call sub_0807F348 StopScript CheckRoomFlag 0x00ff JumpIfNot 0xfffa @@ -12,5 +12,5 @@ Wait 0x003c TextboxNoOverlap 0x0e04 _0807EA94 Wait 0x0078 -Call 0x08054969 +Call sub_08054968 SCRIPT_END diff --git a/data/scripts/gUnk_0800BBDC.inc b/data/scripts/gUnk_0800BBDC.inc index df713c93..1ddfba44 100644 --- a/data/scripts/gUnk_0800BBDC.inc +++ b/data/scripts/gUnk_0800BBDC.inc @@ -9,6 +9,6 @@ Wait 0x003c TextboxNoOverlap 0x0e03 _0807EA94 Wait 0x0078 -Call 0x08054969 +Call sub_08054968 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800BC08.inc b/data/scripts/gUnk_0800BC08.inc index eae03d7c..dd0f2045 100644 --- a/data/scripts/gUnk_0800BC08.inc +++ b/data/scripts/gUnk_0800BC08.inc @@ -15,7 +15,7 @@ _0807EB44 0x0000 _0807E930 0x0004 StopScript Wait 0x003c -Call 0x08065ccd +Call sub_08065CCC Wait 0x0078 -Call 0x08054969 +Call sub_08054968 SCRIPT_END diff --git a/data/scripts/gUnk_0800BC50.inc b/data/scripts/gUnk_0800BC50.inc index 9a1cf0bc..8933436d 100644 --- a/data/scripts/gUnk_0800BC50.inc +++ b/data/scripts/gUnk_0800BC50.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BC50 StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call 0x08054eb9 +Call sub_08054EB8 StopScript CheckRoomFlag 0x00ff JumpIfNot 0xfffa @@ -15,14 +15,13 @@ _0807EA94 _0807EF80 0x000f _0807E930 0x0008 Wait 0x00f0 -Call 0x08054efd +Call sub_08054EFC _0807EB44 0x0000 _0807E930 0x0000 SetEntityNonPlanarMovement 0x0040 _0807EF80 0x000d -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 .short 0x0378 .short 0x0000 @ End of parameters @@ -31,10 +30,9 @@ _0807EF80 0x000c Wait 0x003c TextboxNoOverlap 0x0e09 _0807EA94 -Call 0x0807f159 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 +Call sub_0807F158 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 .short 0x035c .short 0x0000 @ End of parameters @@ -42,6 +40,6 @@ Wait 0x001e SoundReq 0x0188 _0807EF80 0x0008 Wait 0x0078 -Call 0x08054969 +Call sub_08054968 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800BCE8.inc b/data/scripts/gUnk_0800BCE8.inc index ae6fa3dc..a195d56b 100644 --- a/data/scripts/gUnk_0800BCE8.inc +++ b/data/scripts/gUnk_0800BCE8.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BCE8 StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitFor_2 Wait 0x00f0 diff --git a/data/scripts/gUnk_0800BD78.inc b/data/scripts/gUnk_0800BD78.inc index 7457fad1..3ebe8a0b 100644 --- a/data/scripts/gUnk_0800BD78.inc +++ b/data/scripts/gUnk_0800BD78.inc @@ -4,13 +4,12 @@ _0807EB44 0x0000 _0807E930 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 .short 0x0270 .short 0x0000 @ End of parameters @@ -26,16 +25,14 @@ _0807E5F8 0x00000004 _0807EF80 0x000f _0807E930 0x0008 Wait 0x00b4 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xbf39 -.short 0x0804 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0804BF38 .short 0x0000 .short 0x0000 @ End of parameters Wait 0x00b4 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xbf39 -.short 0x0804 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0804BF38 .short 0x0003 .short 0x0000 @ End of parameters @@ -46,5 +43,5 @@ _0807EB44 0x0006 _0807E5F8 0x00000004 SetEntityNonPlanarMovement 0x0080 _0807EEF4 0x0000, 0xffe0 -Call 0x08054969 +Call sub_08054968 SCRIPT_END diff --git a/data/scripts/gUnk_0800BE1C.inc b/data/scripts/gUnk_0800BE1C.inc index b69f18e9..155950cb 100644 --- a/data/scripts/gUnk_0800BE1C.inc +++ b/data/scripts/gUnk_0800BE1C.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BE1C StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitFor_2 Wait 0x00f0 @@ -18,7 +18,7 @@ Jump 0x0038 StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitFor_2 Wait 0x00f0 @@ -33,14 +33,14 @@ _0807EB44 0x0004 CheckRoomFlag 0x00ff JumpIfNot 0xfffa _0807E5F8 0x00000002 -Call 0x08054f65 +Call sub_08054F64 _0807E930 0x0000 _0807EF80 0x0004 Wait 0x003c TextboxNoOverlap 0x0e0f _0807EA94 _0807E5F8 0x00000002 -Call 0x08054f65 +Call sub_08054F64 _0807EF80 0x000f _0807E930 0x0008 Wait 0x00f0 diff --git a/data/scripts/gUnk_0800BECC.inc b/data/scripts/gUnk_0800BECC.inc index bb7dee5c..f7307d09 100644 --- a/data/scripts/gUnk_0800BECC.inc +++ b/data/scripts/gUnk_0800BECC.inc @@ -4,13 +4,12 @@ _0807EB44 0x0000 _0807E930 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 .short 0x01b8 .short 0x0000 @ End of parameters @@ -26,5 +25,5 @@ _0807E5F8 0x0000000c _0807EF80 0x000f _0807E930 0x0008 Wait 0x00f0 -Call 0x08054969 +Call sub_08054968 SCRIPT_END diff --git a/data/scripts/gUnk_0800BF38.inc b/data/scripts/gUnk_0800BF38.inc index 1d1fb1b8..dcb3c012 100644 --- a/data/scripts/gUnk_0800BF38.inc +++ b/data/scripts/gUnk_0800BF38.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800BF38 StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitFor_2 Wait 0x00f0 @@ -18,7 +18,7 @@ Jump 0x0038 StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitFor_2 Wait 0x00f0 @@ -33,21 +33,21 @@ _0807EB44 0x0004 CheckRoomFlag 0x00ff JumpIfNot 0xfffa _0807E5F8 0x00000002 -Call 0x08054f65 +Call sub_08054F64 _0807E930 0x0000 _0807EF80 0x0004 Wait 0x003c TextboxNoOverlap 0x0e12 _0807EA94 _0807E5F8 0x00000002 -Call 0x08054f65 +Call sub_08054F64 _0807EF80 0x000f _0807E930 0x0008 Wait 0x0168 _0807EB44 0x0004 _0807E930 0x0000 Wait 0x003c -Call 0x08054f65 +Call sub_08054F64 SetEntityNonPlanarMovement 0x0080 _0807EEF4 0x0000, 0xffe0 SCRIPT_END diff --git a/data/scripts/gUnk_0800C004.inc b/data/scripts/gUnk_0800C004.inc index 98a48044..bc5147ef 100644 --- a/data/scripts/gUnk_0800C004.inc +++ b/data/scripts/gUnk_0800C004.inc @@ -4,13 +4,12 @@ _0807EB44 0x0000 _0807E930 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 .short 0x01b8 .short 0x0000 @ End of parameters @@ -28,16 +27,14 @@ _0807E5F8 0x0000001c _0807EF80 0x000f _0807E930 0x0008 Wait 0x00b4 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xbf39 -.short 0x0804 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0804BF38 .short 0x0001 .short 0x0000 @ End of parameters Wait 0x00b4 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xbf39 -.short 0x0804 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0804BF38 .short 0x0004 .short 0x0000 @ End of parameters @@ -47,5 +44,5 @@ Wait 0x003c _0807E5F8 0x0000001c SetEntityNonPlanarMovement 0x0080 _0807EEF4 0x0000, 0xffe0 -Call 0x08054969 +Call sub_08054968 SCRIPT_END diff --git a/data/scripts/gUnk_0800C0B0.inc b/data/scripts/gUnk_0800C0B0.inc index c76513b8..166e24ee 100644 --- a/data/scripts/gUnk_0800C0B0.inc +++ b/data/scripts/gUnk_0800C0B0.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800C0B0 StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitFor_2 Wait 0x00f0 @@ -18,7 +18,7 @@ Jump 0x0038 StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitFor_2 Wait 0x00f0 @@ -33,14 +33,14 @@ _0807EB44 0x0004 CheckRoomFlag 0x00ff JumpIfNot 0xfffa _0807E5F8 0x00000002 -Call 0x08054f65 +Call sub_08054F64 _0807E930 0x0000 _0807EF80 0x0004 Wait 0x003c TextboxNoOverlap 0x0e15 _0807EA94 _0807E5F8 0x00000002 -Call 0x08054f65 +Call sub_08054F64 _0807EF80 0x000f _0807E930 0x0008 Wait 0x00f0 diff --git a/data/scripts/gUnk_0800C160.inc b/data/scripts/gUnk_0800C160.inc index 8c949edf..e11522d2 100644 --- a/data/scripts/gUnk_0800C160.inc +++ b/data/scripts/gUnk_0800C160.inc @@ -4,13 +4,12 @@ _0807EB44 0x0000 _0807E930 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 .short 0x0128 .short 0x0000 @ End of parameters @@ -28,5 +27,5 @@ _0807E5F8 0x0000003c _0807EF80 0x000f _0807E930 0x0008 Wait 0x00f0 -Call 0x08054969 +Call sub_08054968 SCRIPT_END diff --git a/data/scripts/gUnk_0800C1D8.inc b/data/scripts/gUnk_0800C1D8.inc index 42c3c426..3cfce57e 100644 --- a/data/scripts/gUnk_0800C1D8.inc +++ b/data/scripts/gUnk_0800C1D8.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800C1D8 StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitFor_2 Wait 0x00f0 @@ -18,7 +18,7 @@ Jump 0x0038 StartScript _0807EB44 0x0004 _0807E930 0x0008 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitFor_2 Wait 0x00f0 @@ -33,21 +33,21 @@ _0807EB44 0x0004 CheckRoomFlag 0x00ff JumpIfNot 0xfffa _0807E5F8 0x00000002 -Call 0x08054f65 +Call sub_08054F64 _0807E930 0x0000 _0807EF80 0x0004 Wait 0x003c TextboxNoOverlap 0x0e18 _0807EA94 _0807E5F8 0x00000002 -Call 0x08054f65 +Call sub_08054F64 _0807EF80 0x000f _0807E930 0x0008 Wait 0x0168 _0807EB44 0x0004 _0807E930 0x0000 Wait 0x003c -Call 0x08054f65 +Call sub_08054F64 SetEntityNonPlanarMovement 0x0080 _0807EEF4 0x0000, 0xffe0 SCRIPT_END diff --git a/data/scripts/gUnk_0800C2A4.inc b/data/scripts/gUnk_0800C2A4.inc index d348c940..00f48da9 100644 --- a/data/scripts/gUnk_0800C2A4.inc +++ b/data/scripts/gUnk_0800C2A4.inc @@ -4,13 +4,12 @@ _0807EB44 0x0000 _0807E930 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 -Call 0x0807f349 +Call sub_0807F348 StopScript WaitForSomething2 0x00000002 _0807EF80 0x0007 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 .short 0x0128 .short 0x0000 @ End of parameters @@ -28,16 +27,14 @@ _0807E5F8 0x0000007c _0807EF80 0x000f _0807E930 0x0008 Wait 0x00b4 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xbf39 -.short 0x0804 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0804BF38 .short 0x0002 .short 0x0000 @ End of parameters Wait 0x00b4 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xbf39 -.short 0x0804 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0804BF38 .short 0x0005 .short 0x0000 @ End of parameters @@ -47,5 +44,5 @@ Wait 0x003c _0807E5F8 0x0000007c SetEntityNonPlanarMovement 0x0080 _0807EEF4 0x0000, 0xffe0 -Call 0x08054969 +Call sub_08054968 SCRIPT_END diff --git a/data/scripts/gUnk_0800C350.inc b/data/scripts/gUnk_0800C350.inc index d800529d..fc04abde 100644 --- a/data/scripts/gUnk_0800C350.inc +++ b/data/scripts/gUnk_0800C350.inc @@ -1,8 +1,7 @@ SCRIPT_START gUnk_0800C350 StartScript -.short 0x140c @ CallWithArg with 4 parameters -.short 0xd659 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806D658 .short 0x0003 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800C3B0.inc b/data/scripts/gUnk_0800C3B0.inc index 1f3baa88..cbcad8ca 100644 --- a/data/scripts/gUnk_0800C3B0.inc +++ b/data/scripts/gUnk_0800C3B0.inc @@ -3,5 +3,5 @@ SetEntityNonPlanarMovement 0x0080 _0807EEF4 0x0000, 0xff30 _0807F0C8 0x0000, 0x0000 Wait 0x00b4 -Call 0x08054969 +Call sub_08054968 SCRIPT_END diff --git a/data/scripts/gUnk_0800C3CC.inc b/data/scripts/gUnk_0800C3CC.inc index f0742594..d14faf5a 100644 --- a/data/scripts/gUnk_0800C3CC.inc +++ b/data/scripts/gUnk_0800C3CC.inc @@ -1,24 +1,22 @@ SCRIPT_START gUnk_0800C3CC StartScript -Call 0x0806d661 +Call sub_0806D660 SetEntityNonPlanarMovement 0x0080 StopScript WaitForSomething2 0x00000002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 .short 0x0048 .short 0x0000 @ End of parameters -Call 0x0806d66d +Call sub_0806D66C Wait 0x000f -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 .short 0x0068 .short 0x0000 @ End of parameters -Call 0x0806d67d +Call sub_0806D67C _0807F0C8 0x001e, 0x0000 SoundReq 0x010b SCRIPT_END diff --git a/data/scripts/gUnk_0800C410.inc b/data/scripts/gUnk_0800C410.inc index e3cb11f4..b6169174 100644 --- a/data/scripts/gUnk_0800C410.inc +++ b/data/scripts/gUnk_0800C410.inc @@ -1,24 +1,22 @@ SCRIPT_START gUnk_0800C410 StartScript -Call 0x0806d661 +Call sub_0806D660 SetEntityNonPlanarMovement 0x0080 StopScript WaitForSomething2 0x00000004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 .short 0x0048 .short 0x0000 @ End of parameters -Call 0x0806d66d +Call sub_0806D66C Wait 0x000f -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 .short 0x0068 .short 0x0000 @ End of parameters -Call 0x0806d67d +Call sub_0806D67C _0807F0C8 0x001e, 0x0000 SoundReq 0x010b _0807E5F8 0x00000001 diff --git a/data/scripts/gUnk_0800C45C.inc b/data/scripts/gUnk_0800C45C.inc index c8521d8a..64c371f7 100644 --- a/data/scripts/gUnk_0800C45C.inc +++ b/data/scripts/gUnk_0800C45C.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_0800C45C StartScript SetEntityNonPlanarMovement 0x0180 _0807E930 0x0004 -Call 0x080a0b29 +Call sub_080A0B28 StopScript Wait 0x000a _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800C550.inc b/data/scripts/gUnk_0800C550.inc index ccbc8d09..0c7ed41f 100644 --- a/data/scripts/gUnk_0800C550.inc +++ b/data/scripts/gUnk_0800C550.inc @@ -1,69 +1,69 @@ SCRIPT_START gUnk_0800C550 StartScript -Call 0x08060091 +Call sub_08060090 _0807EF80 0x000a StopScript StartScript CheckEntityInteractType JumpIf 0x000e -Call 0x08060159 +Call sub_08060158 StopScript Jump 0xffee StopScript _0807E864 -Call 0x08060209 +Call sub_08060208 _0807EA94 _0807E878 Jump 0xffdc StartScript -Call 0x08060091 +Call sub_08060090 _0807EF80 0x000a StopScript StartScript CheckEntityInteractType JumpIf 0x000e -Call 0x08060159 +Call sub_08060158 StopScript Jump 0xffee StopScript _0807E864 CheckInventory1 0x0067 JumpIfNot 0x000c -Call 0x08060209 +Call sub_08060208 Jump 0x0006 TextboxNoOverlap 0x4710 _0807EA94 _0807E878 Jump 0xffcc StartScript -Call 0x08060091 +Call sub_08060090 _0807EF80 0x000a StopScript StartScript CheckEntityInteractType JumpIf 0x000e -Call 0x08060159 +Call sub_08060158 StopScript Jump 0xffee StopScript _0807E864 -Call 0x08060271 +Call sub_08060270 _0807EA94 _0807E878 Jump 0xffdc StartScript -Call 0x08060091 +Call sub_08060090 _0807EF80 0x000a StopScript StartScript CheckEntityInteractType JumpIf 0x000e -Call 0x08060159 +Call sub_08060158 StopScript Jump 0xffee StopScript _0807E864 -Call 0x0806021d +Call sub_0806021C _0807EA94 Wait 0x000f _0807E878 @@ -78,13 +78,13 @@ SetEntityPosition 0x0010, 0x0000 StopScript _0807E944 _0807E864 -Call 0x0807df29 +Call sub_0807DF28 CheckLocalFlag 0x0082 JumpIf 0x0022 CheckPlayerInRegion 0x00e8, 0x0028, 0x1810 JumpIfNot 0x0006 _0807EF80 0x000b -StartPlayerScript 0x0800c8c8 +StartPlayerScript gUnk_0800C8C8 WaitForSomething2 0x00000001 _0807EF80 0x000a CheckInventory1 0x0040 @@ -97,7 +97,7 @@ _0807EA94 _0807EF80 0x0015 Wait 0x000a SetLocalFlag 0x0080 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xff9e CheckLocalFlag 0x0081 @@ -107,7 +107,7 @@ TextboxNoOverlapFollow 0x1f1b _0807EA94 _0807EF80 0x0015 Wait 0x000a -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xff78 CheckLocalFlag 0x0082 @@ -129,7 +129,7 @@ TextboxNoOverlapFollow 0x1f18 _0807EA94 _0807EF80 0x0015 Wait 0x000a -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xff24 CheckLocalFlag 0x0083 @@ -139,7 +139,7 @@ TextboxNoOverlapFollow 0x1f19 _0807EA94 _0807EF80 0x0015 Wait 0x000a -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xfefe _0807EF80 0x0002 @@ -147,7 +147,7 @@ TextboxNoOverlapFollow 0x1f1a _0807EA94 _0807EF80 0x0015 Wait 0x000a -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xfee0 StartScript @@ -156,8 +156,8 @@ _0807EB44 0x0004 StopScript _0807E944 _0807E864 -Call 0x0807df29 -StartPlayerScript 0x0800c8f0 +Call sub_0807DF28 +StartPlayerScript gUnk_0800C8F0 WaitForSomething2 0x00000001 CheckInventory1 0x0040 JumpIf 0x0088 @@ -167,7 +167,7 @@ _0807E930 0x0008 TextboxNoOverlapFollow 0x2122 _0807EA94 _0807EF80 0x0000 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffc2 _0807E930 0x0008 @@ -181,20 +181,20 @@ _0807EB8C TextboxNoOverlapFollow 0x1132 _0807EA94 _0807E914 0x00000103 -Call 0x0807f421 +Call sub_0807F420 TextboxNoOverlapFollow 0x1133 _0807EA94 Wait 0x000a _0807EF80 0x0000 SetLocalFlag 0x0081 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xff78 TextboxNoOverlapFollow 0x1133 _0807EA94 Wait 0x000a _0807E930 0x0000 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xff5e _0807E930 0x0008 @@ -219,35 +219,25 @@ _0807EA94 Wait 0x000a _0807EB44 0x0004 _0807EF80 0x0000 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807E944 _0807E864 -Call 0x0807df29 +Call sub_0807DF28 _0807EB74 _0807E914 0x00000008 -Call 0x0807f3d9 +Call sub_0807F3D8 TextboxNoOverlapFollow 0x1136 _0807EA94 Wait 0x000a _0807EF80 0x0000 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffd0 TextboxNoOverlapFollow 0x1136 _0807EA94 Wait 0x000a _0807EF80 0x0000 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xfeba -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x00e8, 0x0068 -_0807EB44 0x0000 -Wait 0x000f -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call 0x080791bd -SCRIPT_END diff --git a/data/scripts/gUnk_0800C8C8.inc b/data/scripts/gUnk_0800C8C8.inc new file mode 100644 index 00000000..5b5a47c8 --- /dev/null +++ b/data/scripts/gUnk_0800C8C8.inc @@ -0,0 +1,11 @@ +SCRIPT_START gUnk_0800C8C8 +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807EDD4 0x00e8, 0x0068 +_0807EB44 0x0000 +Wait 0x000f +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call sub_080791BC +SCRIPT_END diff --git a/data/scripts/gUnk_0800C8F0.inc b/data/scripts/gUnk_0800C8F0.inc index 2627062e..fb281a40 100644 --- a/data/scripts/gUnk_0800C8F0.inc +++ b/data/scripts/gUnk_0800C8F0.inc @@ -8,5 +8,5 @@ _0807EB44 0x0000 Wait 0x000f _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0800C91C.inc b/data/scripts/gUnk_0800C91C.inc index d4379853..ad9c1ae8 100644 --- a/data/scripts/gUnk_0800C91C.inc +++ b/data/scripts/gUnk_0800C91C.inc @@ -6,9 +6,9 @@ StopScript CheckPlayerInRegion 0x0208, 0x0360, 0x2040 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -StartPlayerScript 0x0800ca8c +Call sub_0807F9A4 +Call sub_0807DF28 +StartPlayerScript gUnk_0800CA8C WaitForSomething2 0x00000002 Wait 0x003c _0807EB28 0x1125 @@ -39,7 +39,7 @@ _0807E5F8 0x00000200 WaitForSomething2 0x00000400 _0807E8E4_0 TextboxNoOverlapFollow 0x1126 -Call 0x0807f40d +Call sub_0807F40C _0807EA94 _0807E5F8 0x00000200 _0807E5F8 0x00000800 @@ -75,7 +75,7 @@ _0807E8E4_0 _0807EB28 0x1129 _0807EA94 SetLocalFlag 0x008d -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800CA8C.inc b/data/scripts/gUnk_0800CA8C.inc index 70295047..6f440b32 100644 --- a/data/scripts/gUnk_0800CA8C.inc +++ b/data/scripts/gUnk_0800CA8C.inc @@ -8,6 +8,6 @@ SetEntityNonPlanarMovement 0x0080 _0807EDD4 0x0208, 0x0340 _0807EF80 0x0000 _0807E5F8 0x00000002 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800CABC.inc b/data/scripts/gUnk_0800CABC.inc index 168b926f..9892c304 100644 --- a/data/scripts/gUnk_0800CABC.inc +++ b/data/scripts/gUnk_0800CABC.inc @@ -4,7 +4,7 @@ _0807EF80 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000f -Call 0x0807f339 +Call sub_0807F338 StopScript WaitForSomething2 0x00000200 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800CB54.inc b/data/scripts/gUnk_0800CB54.inc index 284146b8..4efa72af 100644 --- a/data/scripts/gUnk_0800CB54.inc +++ b/data/scripts/gUnk_0800CB54.inc @@ -4,7 +4,7 @@ _0807EF80 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000f -Call 0x0807f339 +Call sub_0807F338 StopScript WaitForSomething2 0x00000800 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800CBD4.inc b/data/scripts/gUnk_0800CBD4.inc index d1f62aa0..2acff563 100644 --- a/data/scripts/gUnk_0800CBD4.inc +++ b/data/scripts/gUnk_0800CBD4.inc @@ -4,7 +4,7 @@ _0807EF80 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000f -Call 0x0807f339 +Call sub_0807F338 StopScript WaitForSomething2 0x00002000 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800CC6C.inc b/data/scripts/gUnk_0800CC6C.inc index 23266276..ebead315 100644 --- a/data/scripts/gUnk_0800CC6C.inc +++ b/data/scripts/gUnk_0800CC6C.inc @@ -4,7 +4,7 @@ _0807EF80 0x0008 _0807EF80 0x0000 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000f -Call 0x0807f339 +Call sub_0807F338 StopScript WaitForSomething2 0x00008000 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800CD04.inc b/data/scripts/gUnk_0800CD04.inc index a911d324..638c3e93 100644 --- a/data/scripts/gUnk_0800CD04.inc +++ b/data/scripts/gUnk_0800CD04.inc @@ -4,7 +4,7 @@ _0807EF80 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000f -Call 0x0807f339 +Call sub_0807F338 StopScript WaitForSomething2 0x00020000 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800CD7C.inc b/data/scripts/gUnk_0800CD7C.inc index b75b34d1..7cf413c8 100644 --- a/data/scripts/gUnk_0800CD7C.inc +++ b/data/scripts/gUnk_0800CD7C.inc @@ -2,18 +2,18 @@ SCRIPT_START gUnk_0800CD7C StartScript CheckInventory1 0x005b JumpIfNot 0xf87a -Call 0x08060091 +Call sub_08060090 _0807EF80 0x000a StopScript StopScript StartScript CheckEntityInteractType JumpIf 0x000c -Call 0x08060159 +Call sub_08060158 Jump 0xffee StopScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 CheckLocalFlag 0x009d JumpIf 0x000e SetLocalFlag 0x009d @@ -52,7 +52,7 @@ _0807F088 0x0022 WaitPlayerAction8 _0807EB8C SetGlobalFlag 0x0054 -Call 0x08060341 +Call sub_08060340 TextboxNoOverlap 0x213f Jump 0x00be CheckGlobalFlag 0x003c @@ -78,7 +78,7 @@ _0807F088 0x0027 WaitPlayerAction8 _0807EB8C SetGlobalFlag 0x0054 -Call 0x08060341 +Call sub_08060340 TextboxNoOverlap 0x2143 Jump 0x005e CheckGlobalFlag 0x003d @@ -104,55 +104,55 @@ _0807F088 0x0024 WaitPlayerAction8 _0807EB8C SetGlobalFlag 0x0054 -Call 0x08060341 +Call sub_08060340 TextboxNoOverlap 0x2147 _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 StopScript StartScript CheckEntityInteractType JumpIf 0x000c -Call 0x08060159 +Call sub_08060158 Jump 0xffee StopScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 TextboxNoOverlap 0x2140 _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffd2 TextboxNoOverlap 0x214a _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xfe46 .short 0x0000 StartScript -Call 0x08068105 +Call sub_08068104 _0807EF80 0x000a StopScript StartScript CheckEntityInteractType JumpIf 0x000e -Call 0x0806811d +Call sub_0806811C StopScript Jump 0xffee StopScript _0807E864 -Call 0x08068191 +Call sub_08068190 _0807EA94 Wait 0x000f _0807E878 Jump 0xffd8 StartScript -Call 0x08068105 +Call sub_08068104 _0807EF80 0x000a StopScript _0807E944 _0807E864 -Call 0x08068191 +Call sub_08068190 _0807EA94 Wait 0x000f _0807E878 @@ -179,39 +179,39 @@ JumpIfNot 0x0008 _0807E5F8 0x00000010 StopScript StartScript -Call 0x08068911 +Call sub_08068910 CheckEntityInteractType JumpIfNot 0xfff2 StopScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 CheckInventory1 0x0002 JumpIfNot 0x0018 _0807EB74 _0807E914 0x00000000 -Call 0x0806c029 +Call sub_0806C028 TextboxNoOverlap 0x1219 Jump 0x014c CheckInventory1 0x0041 JumpIfNot 0x0060 -StartPlayerScript 0x0800d190 +StartPlayerScript gUnk_0800D190 WaitForSomething2 0x00000008 _0807EB74 _0807E914 0x00000000 -Call 0x0806c029 +Call sub_0806C028 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x125c .short 0x0002 @ End of parameters _0807EA94 -StartPlayerScript 0x0800d1b4 +StartPlayerScript gUnk_0800D1B4 WaitForSomething2 0x00000008 _0807EB44 0x0002 _0807E914 0x00000000 -Call 0x0806c029 +Call sub_0806C028 Wait 0x000f _0807E5F8 0x00000020 -StartPlayerScript 0x0800d1e0 +StartPlayerScript gUnk_0800D1E0 WaitForSomething2 0x00000008 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x125d @@ -222,7 +222,7 @@ CheckLocalFlag 0x007e JumpIfNot 0x000a TextboxNoOverlapFollow 0x123e Jump 0x00d6 -StartPlayerScript 0x0800d190 +StartPlayerScript gUnk_0800D190 WaitForSomething2 0x00000008 _0807E5F8 0x00000001 WaitForSomething2 0x00000004 @@ -230,19 +230,19 @@ _0807E5F8 0x00000001 WaitForSomething2 0x00000004 _0807EB74 _0807E914 0x00000000 -Call 0x0806c029 +Call sub_0806C028 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x123d .short 0x0002 @ End of parameters _0807EA94 -StartPlayerScript 0x0800d1b4 +StartPlayerScript gUnk_0800D1B4 WaitForSomething2 0x00000008 _0807EB44 0x0002 _0807E914 0x00000000 -Call 0x0806c029 +Call sub_0806C028 SoundReq 0x00cd -Call 0x08068965 +Call sub_08068964 ComparePlayerAction 0x0008 JumpIf 0xfffa SoundReq 0x00f8 @@ -271,20 +271,11 @@ _0807E5F8 0x00000001 WaitForSomething2 0x00000004 _0807E930 0x0008 Wait 0x003c -Call 0x08095165 +Call sub_08095164 _0807EB28 0x1240 _0807EA94 Wait 0x000f _0807E878 -Call 0x0807df51 +Call sub_0807DF50 Jump 0xfe6e .short 0x0000 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x0170, 0x0140 -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807E5F8 0x00000008 -Call 0x080791bd -SCRIPT_END diff --git a/data/scripts/gUnk_0800D190.inc b/data/scripts/gUnk_0800D190.inc new file mode 100644 index 00000000..e03152f1 --- /dev/null +++ b/data/scripts/gUnk_0800D190.inc @@ -0,0 +1,10 @@ +SCRIPT_START gUnk_0800D190 +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807EDD4 0x0170, 0x0140 +_0807EB44 0x0002 +_0807EF80 0x0000 +_0807E5F8 0x00000008 +Call sub_080791BC +SCRIPT_END diff --git a/data/scripts/gUnk_0800D1B4.inc b/data/scripts/gUnk_0800D1B4.inc index 1f1d73e9..e0331c55 100644 --- a/data/scripts/gUnk_0800D1B4.inc +++ b/data/scripts/gUnk_0800D1B4.inc @@ -7,6 +7,6 @@ _0807EDD4 0x01a8, 0x0120 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000008 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800D1E0.inc b/data/scripts/gUnk_0800D1E0.inc index db9279e7..31122968 100644 --- a/data/scripts/gUnk_0800D1E0.inc +++ b/data/scripts/gUnk_0800D1E0.inc @@ -1,21 +1,19 @@ SCRIPT_START gUnk_0800D1E0 _0807F078 0x0002, 0x0001 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf919 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F918 .short 0x0002 .short 0x0000 @ End of parameters SoundReq 0x0109 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf239 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F238 .short 0x01e2 .short 0x0000 @ End of parameters -Call 0x0807f305 +Call sub_0807F304 TextboxNoOverlap 0x0502 _0807EA94 _0807E5F8 0x00000008 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0800D278.inc b/data/scripts/gUnk_0800D278.inc index 82667aba..dfc733c1 100644 --- a/data/scripts/gUnk_0800D278.inc +++ b/data/scripts/gUnk_0800D278.inc @@ -12,12 +12,12 @@ TestBit 0x00000001 JumpIf 0x002a CheckEntityInteractType JumpIf 0x000e -Call 0x0806811d +Call sub_0806811C StopScript Jump 0xffd4 StopScript _0807E864 -Call 0x08068191 +Call sub_08068190 _0807EA94 Wait 0x000f _0807E878 @@ -33,45 +33,45 @@ _0807E930 0x000b CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call 0x08068191 +Call sub_08068190 _0807EA94 Wait 0x000f _0807E878 Jump 0xffe8 StartScript -Call 0x08068885 +Call sub_08068884 _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0000 StopScript StopScript StartScript -Call 0x08068911 +Call sub_08068910 CheckEntityInteractType JumpIfNot 0xfff2 StopScript _0807E864 _0807EB74 _0807E914 0x00000000 -Call 0x0806c029 +Call sub_0806C028 TextboxNoOverlapFollow 0x1219 _0807EA94 Wait 0x000f _0807E878 Jump 0xffd0 StartScript -Call 0x08068105 +Call sub_08068104 _0807EF80 0x000a StopScript StartScript CheckEntityInteractType JumpIf 0x000e -Call 0x0806811d +Call sub_0806811C StopScript Jump 0xffee StopScript _0807E864 -Call 0x08068191 +Call sub_08068190 _0807EA94 Wait 0x000f CheckLocalFlag 0x007f @@ -82,7 +82,7 @@ _0807EF80 0x000b SetEntityNonPlanarMovement 0x0100 CheckPlayerInRegion 0x0090, 0x0130, 0x0810 JumpIfNot 0x000e -StartPlayerScript 0x0800d3ec +StartPlayerScript gUnk_0800D3EC WaitForSomething2 0x00000001 _0807EB44 0x0002 _0807E930 0x0005 @@ -90,7 +90,7 @@ _0807EDD4 0x00a0, 0x0130 _0807EB44 0x0006 _0807E930 0x0003 _0807E914 0x00000004 -Call 0x080681d9 +Call sub_080681D8 SoundReq 0x00cd Wait 0x001e _0807EF80 0x000a @@ -98,14 +98,3 @@ SetLocalFlag 0x007f _0807E878 Jump 0xff76 .short 0x0000 -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807EF80 0x000d -_0807ECC4 0x0020 -_0807E5F8 0x00000001 -Call 0x080791bd -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0800D3EC.inc b/data/scripts/gUnk_0800D3EC.inc new file mode 100644 index 00000000..d2d514cb --- /dev/null +++ b/data/scripts/gUnk_0800D3EC.inc @@ -0,0 +1,12 @@ +SCRIPT_START gUnk_0800D3EC +StartScript +SetEntityNonPlanarMovement 0x0080 +StopScript +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807EF80 0x000d +_0807ECC4 0x0020 +_0807E5F8 0x00000001 +Call sub_080791BC +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800D414.inc b/data/scripts/gUnk_0800D414.inc index 4d240ac4..d531a974 100644 --- a/data/scripts/gUnk_0800D414.inc +++ b/data/scripts/gUnk_0800D414.inc @@ -1,54 +1,53 @@ SCRIPT_START gUnk_0800D414 StartScript SetEntityNonPlanarMovement 0x0100 -Call 0x08068105 +Call sub_08068104 _0807EF80 0x000a StopScript _0807EB44 0x0002 _0807E914 0x00000000 -Call 0x0806af61 +Call sub_0806AF60 Wait 0x0014 _0807EB44 0x0004 _0807E914 0x00000000 -Call 0x0806af61 +Call sub_0806AF60 Wait 0x0014 _0807EB44 0x0006 _0807E914 0x00000000 -Call 0x0806af61 +Call sub_0806AF60 Wait 0x0014 _0807EB44 0x0006 _0807E914 0x00000004 -Call 0x0806af61 +Call sub_0806AF60 _0807EDD4 0x00a8, 0x01e8 _0807EB44 0x0006 _0807E914 0x00000000 -Call 0x0806af61 +Call sub_0806AF60 Wait 0x0014 _0807EB44 0x0004 _0807E914 0x00000000 -Call 0x0806af61 +Call sub_0806AF60 Wait 0x0014 _0807EB44 0x0002 _0807E914 0x00000000 -Call 0x0806af61 +Call sub_0806AF60 Wait 0x0014 _0807EB44 0x0002 _0807E914 0x00000004 -Call 0x0806af61 +Call sub_0806AF60 _0807EDD4 0x0228, 0x01e8 Jump 0xff5a .short 0x0000 StartScript _0807EF80 0x000a -Call 0x08062a49 +Call sub_08062A48 _0807EB44 0x0004 _0807EF80 0x0000 StopScript -Call 0x08062699 -Call 0x080626ad -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf0ed -.short 0x0807 +Call sub_08062698 +Call sub_080626AC +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F0EC .short 0x0009 .short 0x0000 @ End of parameters @@ -82,7 +81,7 @@ Jump 0x0008 _0807EE04 0x00b8, 0x00b8 StopScript StartScript -Call 0x080626c1 +Call sub_080626C0 JumpIf 0xff72 CheckEntityInteractType JumpIf 0x000c @@ -92,21 +91,20 @@ Jump 0xff62 StopScript _0807E864 _0807EB74 -Call 0x0806265d +Call sub_0806265C _0807EA94 Wait 0x000f _0807E878 Jump 0xff4a StartScript _0807EF80 0x000a -Call 0x08062a49 +Call sub_08062A48 _0807EF80 0x0000 StopScript -Call 0x08062699 -Call 0x080626ad -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf0ed -.short 0x0807 +Call sub_08062698 +Call sub_080626AC +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F0EC .short 0x0004 .short 0x0000 @ End of parameters @@ -125,7 +123,7 @@ Jump 0x0008 _0807EE04 0x0058, 0x00c8 StopScript StartScript -Call 0x080626c1 +Call sub_080626C0 JumpIf 0xffae _0807EE30 JumpIfNot 0xffee @@ -135,35 +133,34 @@ StartScript _0807EB44 0x0004 _0807EF80 0x000b _0807EF80 0x0008 -Call 0x0806daad +Call sub_0806DAAC JumpIf 0x008c -Call 0x0806dad1 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda05 -.short 0x0806 +Call sub_0806DAD0 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA04 .short 0x0002 .short 0x0000 @ End of parameters StopScript _0807EA4C _0807E9F0 -Call 0x0806daad +Call sub_0806DAAC JumpIf 0x000e -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffe8 _0807E864 -Call 0x0807df29 -Call 0x0807fbc5 -Call 0x0807fba1 +Call sub_0807DF28 +Call sub_0807FBC4 +Call sub_0807FBA0 SetEntityNonPlanarMovement 0x0700 _0807F0B4 0x0007 CameraTargetEntity _0807EDD4 0x01e8, 0x01b8 Wait 0x003c -Call 0x0806dae9 +Call sub_0806DAE8 Wait 0x0078 -Call 0x0806db45 +Call sub_0806DB44 JumpIfNot 0x000e LoadRoomEntityList 0x080dd730 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800D698.inc b/data/scripts/gUnk_0800D698.inc index 6413a8a2..69426176 100644 --- a/data/scripts/gUnk_0800D698.inc +++ b/data/scripts/gUnk_0800D698.inc @@ -2,8 +2,8 @@ SCRIPT_START gUnk_0800D698 _0807EEB4 _0807F0B4 0x0004 CameraTargetPlayer -Call 0x0807fbcd +Call sub_0807FBCC _0807E878 -Call 0x0807df51 +Call sub_0807DF50 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800D6B4.inc b/data/scripts/gUnk_0800D6B4.inc index c1e96dca..179fbbd5 100644 --- a/data/scripts/gUnk_0800D6B4.inc +++ b/data/scripts/gUnk_0800D6B4.inc @@ -2,8 +2,8 @@ SCRIPT_START gUnk_0800D6B4 StartScript _0807EF80 0x0007 _0807EF80 0x0011 -Call 0x0807f159 -Call 0x0807f739 +Call sub_0807F158 +Call sub_0807F738 StopScript SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800D710.inc b/data/scripts/gUnk_0800D710.inc index 1fc7aacd..815cf2fb 100644 --- a/data/scripts/gUnk_0800D710.inc +++ b/data/scripts/gUnk_0800D710.inc @@ -1,10 +1,10 @@ SCRIPT_START gUnk_0800D710 StartScript -Call 0x0807f361 +Call sub_0807F360 SetEntityNonPlanarMovement 0x0700 _0807F0B4 0x0007 CameraTargetEntity -Call 0x0807fbc5 +Call sub_0807FBC4 StopScript _0807E5F8 0x00000008 WaitForSomething2 0x00000010 @@ -15,9 +15,9 @@ WaitForSomething2 0x00000004 _0807EEB4 _0807F0B4 0x0004 CameraTargetPlayer -Call 0x0807fbcd +Call sub_0807FBCC _0807E878 -Call 0x0807df51 +Call sub_0807DF50 _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800D76C.inc b/data/scripts/gUnk_0800D76C.inc index e0742a70..95c12242 100644 --- a/data/scripts/gUnk_0800D76C.inc +++ b/data/scripts/gUnk_0800D76C.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_0800D76C StartScript -Call 0x0807f361 +Call sub_0807F360 _0807EF80 0x000b SetEntityNonPlanarMovement 0x0200 _0807EB44 0x0004 @@ -10,9 +10,8 @@ WaitForSomething2 0x00000008 _0807EF80 0x0004 Wait 0x003c SoundReq 0x0123 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf465 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F464 .short 0x01e0 .short 0x0000 @ End of parameters @@ -29,7 +28,7 @@ _0807EF80 0x0001 WaitForSomething2 0x00000008 Jump 0x0032 StartScript -Call 0x0807f361 +Call sub_0807F360 _0807EF80 0x000b SetEntityPositionRelative 0x01d80268 SetEntityNonPlanarMovement 0x0100 @@ -41,16 +40,15 @@ WaitForSomething2 0x00000002 SetEntityNonPlanarMovement 0x0100 _0807EEF4 0x0000, 0xffe0 _0807EF80 0x000e -Call 0x0806ca5d +Call sub_0806CA5C SetEntity0x20 0x00040000 SoundReq 0x00f5 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf8d1 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F8D0 .short 0xe000 .short 0xffff @ End of parameters -Call 0x0807f8bd +Call sub_0807F8BC JumpIf 0xffee _0807E5F8 0x00000004 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800D84C.inc b/data/scripts/gUnk_0800D84C.inc index 8329c8c8..8788dae9 100644 --- a/data/scripts/gUnk_0800D84C.inc +++ b/data/scripts/gUnk_0800D84C.inc @@ -4,9 +4,9 @@ StopScript CheckRoomFlag 0x0000 JumpIfNot 0xfffa _0807E864 -Call 0x0807df29 +Call sub_0807DF28 Wait 0x003c -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800D874.inc b/data/scripts/gUnk_0800D874.inc index 34038a2a..0daba44b 100644 --- a/data/scripts/gUnk_0800D874.inc +++ b/data/scripts/gUnk_0800D874.inc @@ -1,17 +1,17 @@ SCRIPT_START gUnk_0800D874 StartScript -Call 0x0807f935 +Call sub_0807F934 _0807EF80 0x0008 _0807E914 0x00000001 -Call 0x0806da05 +Call sub_0806DA04 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call 0x0807df29 +Call sub_0807DF28 CheckLocalFlag 0x0045 JumpIf 0x000e -StartPlayerScript 0x0800d92c +StartPlayerScript gUnk_0800D92C WaitForSomething2 0x00000001 _0807E8E4_0 TextboxNoOverlap 0x1324 @@ -23,7 +23,7 @@ JumpIf 0x0010 LoadRoomEntityList 0x080e3830 CheckLocalFlag 0x0045 JumpIfNot 0xfffa -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffae .short 0x0000 @@ -34,16 +34,16 @@ JumpIf 0x0034 StopScript CheckInventory1 0x0017 JumpIfNot 0xfffa -Call 0x0807df29 +Call sub_0807DF28 _0807E864 WaitPlayerAction8 _0807EB28 0x1325 _0807EA94 SoundReq 0x0113 _0807E914 0x00000000 -Call 0x0806da1d +Call sub_0806DA1C _0807E878 -Call 0x0807df51 +Call sub_0807DF50 _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800D92C.inc b/data/scripts/gUnk_0800D92C.inc index ceb77657..2cab83b5 100644 --- a/data/scripts/gUnk_0800D92C.inc +++ b/data/scripts/gUnk_0800D92C.inc @@ -7,5 +7,5 @@ _0807EDD4 0x00a0, 0x0078 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0800D954.inc b/data/scripts/gUnk_0800D954.inc index e62ca105..1b9aedd3 100644 --- a/data/scripts/gUnk_0800D954.inc +++ b/data/scripts/gUnk_0800D954.inc @@ -1,14 +1,14 @@ SCRIPT_START gUnk_0800D954 StartScript _0807EF80 0x0008 -Call 0x0807f181 +Call sub_0807F180 StopScript CheckPlayerInRegion 0x0118, 0x0038, 0x3050 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -StartPlayerScript 0x0800da00 +Call sub_0807F9A4 +Call sub_0807DF28 +StartPlayerScript gUnk_0800DA00 WaitForSomething2 0x00000001 Wait 0x003c _0807EB44 0x0004 @@ -33,8 +33,8 @@ Wait 0x003c SetLocalFlag 0x0032 SoundReq 0x0113 _0807E914 0x00000001 -Call 0x0806da1d -Call 0x0807df51 +Call sub_0806DA1C +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800DA00.inc b/data/scripts/gUnk_0800DA00.inc index d30696df..28b606d6 100644 --- a/data/scripts/gUnk_0800DA00.inc +++ b/data/scripts/gUnk_0800DA00.inc @@ -7,5 +7,5 @@ _0807EDD4 0x0118, 0x0060 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0800DA60.inc b/data/scripts/gUnk_0800DA60.inc index 27438ec7..48644d2a 100644 --- a/data/scripts/gUnk_0800DA60.inc +++ b/data/scripts/gUnk_0800DA60.inc @@ -4,15 +4,15 @@ StopScript CheckPlayerInRegion 0x0078, 0x0148, 0x4040 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 _0807E8E4_0 -Call 0x0807f3f9 +Call sub_0807F3F8 Wait 0x003c _0807F0B4 0x0004 SetEntityPositionRelative 0x00800078 CameraTargetEntity -Call 0x0807f5c1 +Call sub_0807F5C0 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters @@ -28,28 +28,27 @@ Wait 0x001e @ End of parameters _0807EA94 _0807E8E4_0 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf75d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F75C .short 0x0138 .short 0x0078 @ End of parameters _0807F0B4 0x0004 CameraTargetPlayer -Call 0x0807f5c1 +Call sub_0807F5C0 SetRoomFlag 0x0000 -Call 0x0807f40d +Call sub_0807F40C Wait 0x001e _0807E8E4_1 Wait 0x000a _0807E8E4_3 Wait 0x000a _0807E8E4_2 -Call 0x0807f3f9 +Call sub_0807F3F8 Wait 0x003c SetRoomFlag 0x0001 SetLocalFlag 0x0077 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800DB18.inc b/data/scripts/gUnk_0800DB18.inc index ed197a40..9017228d 100644 --- a/data/scripts/gUnk_0800DB18.inc +++ b/data/scripts/gUnk_0800DB18.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_0800DB18 StartScript _0807EF80 0x000a -Call 0x08066e39 +Call sub_08066E38 StopScript SCRIPT_END diff --git a/data/scripts/gUnk_0800DB28.inc b/data/scripts/gUnk_0800DB28.inc index 8dbae5d4..03568bd2 100644 --- a/data/scripts/gUnk_0800DB28.inc +++ b/data/scripts/gUnk_0800DB28.inc @@ -10,7 +10,7 @@ _0807EF80 0x0004 Wait 0x003c _0807EB44 0x0004 _0807EF80 0x001c -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EF80 0x0000 Wait 0x003c _0807E5F8 0x00000002 diff --git a/data/scripts/gUnk_0800DB78.inc b/data/scripts/gUnk_0800DB78.inc index 16d39429..92bd0e55 100644 --- a/data/scripts/gUnk_0800DB78.inc +++ b/data/scripts/gUnk_0800DB78.inc @@ -1,41 +1,40 @@ SCRIPT_START gUnk_0800DB78 StartScript StopScript -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf6b5 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F6B4 .short 0x00a0 .short 0x0000 @ End of parameters JumpIf 0xfff4 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 _0807F0B4 0x0001 SetEntityPositionRelative 0x00780078 CameraTargetEntity -Call 0x0807f5c1 +Call sub_0807F5C0 _0807EB28 0x1648 _0807EA94 -Call 0x0804d7ed +Call sub_0804D7EC _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 CheckRoomFlag 0x0000 JumpIfNot 0xfffa _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -Call 0x0804d811 -Call 0x0807f3f9 +Call sub_0807F9A4 +Call sub_0807DF28 +Call sub_0804D810 +Call sub_0807F3F8 Wait 0x003c -StartPlayerScript 0x0800ddd0 +StartPlayerScript gUnk_0800DDD0 WaitForSomething2 0x00000004 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 _0807E5F8 0x00000001 -StartPlayerScript 0x0800de00 +StartPlayerScript gUnk_0800DE00 WaitForSomething2 0x00000006 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1643 @@ -44,13 +43,12 @@ WaitForSomething2 0x00000006 _0807EA94 _0807EB28 0x1645 _0807EA94 -Call 0x0807f3f9 +Call sub_0807F3F8 _0807E5F8 0x00000001 SoundReq0x80100000 -Call 0x08094f99 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xdded -.short 0x0805 +Call sub_08094F98 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DDEC .short 0x0001 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0800DC4C.inc b/data/scripts/gUnk_0800DC4C.inc index 7af83bdf..ab340180 100644 --- a/data/scripts/gUnk_0800DC4C.inc +++ b/data/scripts/gUnk_0800DC4C.inc @@ -1,31 +1,29 @@ SCRIPT_START gUnk_0800DC4C Wait 0x003c SoundReq2 0x0031 -StartPlayerScript 0x0800de50 +StartPlayerScript gUnk_0800DE50 WaitForSomething2 0x00000006 _0807EB28 0x1646 _0807EA94 _0807E5F8 0x00000001 -StartPlayerScript 0x0800de2c +StartPlayerScript gUnk_0800DE2C CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xde19 -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DE18 .short 0x0001 .short 0x0000 @ End of parameters _0807F0C8 0x0000, 0x0000 SetLocalFlag 0x0079 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda1d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA1C .short 0x0002 .short 0x0000 @ End of parameters -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800DCAC.inc b/data/scripts/gUnk_0800DCAC.inc index efac71a8..9acf6f22 100644 --- a/data/scripts/gUnk_0800DCAC.inc +++ b/data/scripts/gUnk_0800DCAC.inc @@ -1,12 +1,11 @@ SCRIPT_START gUnk_0800DCAC StartScript _0807EF80 0x000a -Call 0x08066e39 +Call sub_08066E38 StopScript WaitForSomething2 0x00000001 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf8e9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F8E8 .short 0x0000 .short 0x0000 @ End of parameters @@ -19,9 +18,9 @@ _0807EF80 0x0010 SetEntityPositionRelative 0x00680078 WaitForSomething2 0x00000001 SoundReq0x80100000 -Call 0x08066e51 +Call sub_08066E50 SoundReq 0x01c9 -Call 0x0807f2d5 +Call sub_0807F2D4 SoundReq 0x01ca Wait 0x003c _0807EF80 0x0004 @@ -46,7 +45,7 @@ _0807EEF4 0x0000, 0x0008 _0807EB44 0x0004 _0807EF80 0x0000 Wait 0x001e -Call 0x08066e81 +Call sub_08066E80 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000002 diff --git a/data/scripts/gUnk_0800DDD0.inc b/data/scripts/gUnk_0800DDD0.inc index 927ff8b7..873bbe81 100644 --- a/data/scripts/gUnk_0800DDD0.inc +++ b/data/scripts/gUnk_0800DDD0.inc @@ -2,9 +2,8 @@ SCRIPT_START gUnk_0800DDD0 StartScript SetEntityNonPlanarMovement 0x0100 StopScript -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 .short 0x00a0 .short 0x0000 @ End of parameters @@ -12,6 +11,6 @@ _0807EDD4 0x0078, 0x00a0 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000004 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800DE00.inc b/data/scripts/gUnk_0800DE00.inc index 0db24874..024a0887 100644 --- a/data/scripts/gUnk_0800DE00.inc +++ b/data/scripts/gUnk_0800DE00.inc @@ -8,6 +8,6 @@ _0807EF80 0x0000 _0807ECC4 0x0010 _0807EF80 0x000c _0807E5F8 0x00000004 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800DE2C.inc b/data/scripts/gUnk_0800DE2C.inc index 4fd1716d..5e360b27 100644 --- a/data/scripts/gUnk_0800DE2C.inc +++ b/data/scripts/gUnk_0800DE2C.inc @@ -6,5 +6,5 @@ _0807EB44 0x0004 _0807EF80 0x0000 _0807EEF4 0x0000, 0x0080 _0807E5F8 0x00000004 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0800DE50.inc b/data/scripts/gUnk_0800DE50.inc index 9ba2ce82..522b2fab 100644 --- a/data/scripts/gUnk_0800DE50.inc +++ b/data/scripts/gUnk_0800DE50.inc @@ -2,13 +2,12 @@ SCRIPT_START gUnk_0800DE50 StopScript _0807EB44 0x0004 _0807EF80 0x0000 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf239 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F238 .short 0x03c5 .short 0x0000 @ End of parameters -Call 0x0807f305 +Call sub_0807F304 _0807E5F8 0x00000004 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0800DE78.inc b/data/scripts/gUnk_0800DE78.inc index cc5a1b73..25d1219d 100644 --- a/data/scripts/gUnk_0800DE78.inc +++ b/data/scripts/gUnk_0800DE78.inc @@ -1,14 +1,14 @@ SCRIPT_START gUnk_0800DE78 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -StartPlayerScript 0x0800deb0 +Call sub_0807F9A4 +Call sub_0807DF28 +StartPlayerScript gUnk_0800DEB0 WaitForSomething2 0x00000001 WaitForSomething2 0x00000002 _0807EB28 0x1647 _0807EA94 SetLocalFlag 0x007a -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800DEB0.inc b/data/scripts/gUnk_0800DEB0.inc index 6d86314c..9f9cb7d8 100644 --- a/data/scripts/gUnk_0800DEB0.inc +++ b/data/scripts/gUnk_0800DEB0.inc @@ -6,5 +6,5 @@ _0807EDD4 0x0198, 0x01c8 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0800DED4.inc b/data/scripts/gUnk_0800DED4.inc index 3e1a8115..09e1a3d8 100644 --- a/data/scripts/gUnk_0800DED4.inc +++ b/data/scripts/gUnk_0800DED4.inc @@ -4,10 +4,10 @@ _0807EB44 0x0004 _0807EF80 0x0000 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000b -Call 0x08066d05 +Call sub_08066D04 StopScript StartScript -Call 0x08066d15 +Call sub_08066D14 SetEntityPositionRelative 0x01480198 _0807EF80 0x0007 StopScript @@ -15,7 +15,7 @@ _0807EDD4 0x0198, 0x01a8 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000002 -Call 0x08066d4d +Call sub_08066D4C _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800DF24.inc b/data/scripts/gUnk_0800DF24.inc index 1a3b4d98..5edcc2dd 100644 --- a/data/scripts/gUnk_0800DF24.inc +++ b/data/scripts/gUnk_0800DF24.inc @@ -5,18 +5,18 @@ _0807EB44 0x0004 _0807EF80 0x0000 StopScript _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 SoundReq0x80100000 _0807E8E4_2 Wait 0x005a -Call 0x0807f3f9 +Call sub_0807F3F8 Wait 0x003c _0807E8E4_0 _0807F0B4 0x0001 CameraTargetEntity -Call 0x0807f5c1 -Call 0x08066c95 +Call sub_0807F5C0 +Call sub_08066C94 Wait 0x00e9 _0807EF80 0x0007 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters @@ -27,15 +27,15 @@ _0807EA94 SoundReq2 0x002f _0807EF80 0x0019 SoundReq 0x0198 -Call 0x0807f2d5 +Call sub_0807F2D4 SetRoomFlag 0x0000 _0807EF80 0x0008 Wait 0x0080 _0807F0B4 0x0004 CameraTargetPlayer -Call 0x0807f5c1 +Call sub_0807F5C0 SetLocalFlag 0x0078 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800DFB4.inc b/data/scripts/gUnk_0800DFB4.inc index 547f691a..26809abf 100644 --- a/data/scripts/gUnk_0800DFB4.inc +++ b/data/scripts/gUnk_0800DFB4.inc @@ -4,15 +4,14 @@ CheckRoomFlag 0x0001 JumpIfNot 0xfffa SoundReq0x80100000 _0807E864 -Call 0x0807df29 +Call sub_0807DF28 SoundReq 0x00f6 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda1d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA1C .short 0x0004 .short 0x0000 @ End of parameters -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800DFE4.inc b/data/scripts/gUnk_0800DFE4.inc index 0aa011b3..4c7c69b0 100644 --- a/data/scripts/gUnk_0800DFE4.inc +++ b/data/scripts/gUnk_0800DFE4.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_0800DFE4 StartScript -Call 0x0807df29 +Call sub_0807DF28 _0807E864 StopScript SoundReq0x80100000 @@ -13,12 +13,12 @@ SetRoomFlag 0x0003 CheckRoomFlag 0x0000 JumpIfNot 0xfffa SoundReq2 0x0030 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 CheckRoomFlag 0x0002 JumpIfNot 0xfffa _0807E864 -Call 0x0807df29 +Call sub_0807DF28 SetLocalFlag 0x007b .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1639 @@ -27,13 +27,12 @@ SetLocalFlag 0x007b _0807EA94 Wait 0x0096 SoundReq 0x00f6 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda1d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA1C .short 0x0005 .short 0x0000 @ End of parameters -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800E050.inc b/data/scripts/gUnk_0800E050.inc index 2bfb0644..848c9da0 100644 --- a/data/scripts/gUnk_0800E050.inc +++ b/data/scripts/gUnk_0800E050.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_0800E050 StartScript -Call 0x0807df29 +Call sub_0807DF28 _0807E864 StopScript SoundReq0x80100000 @@ -11,9 +11,9 @@ _0807EA94 SetRoomFlag 0x0000 Wait 0x001e _0807E5F8 0x00000001 -StartPlayerScript 0x0800e094 +StartPlayerScript gUnk_0800E094 WaitForSomething2 0x00000002 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800E094.inc b/data/scripts/gUnk_0800E094.inc index c91b7180..91828c3e 100644 --- a/data/scripts/gUnk_0800E094.inc +++ b/data/scripts/gUnk_0800E094.inc @@ -6,6 +6,6 @@ WaitForSomething2 0x00000001 _0807EF80 0x0001 _0807EDD4 0x00a8, 0x002c _0807E5F8 0x00000002 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800E0BC.inc b/data/scripts/gUnk_0800E0BC.inc index 30634329..b50cfa04 100644 --- a/data/scripts/gUnk_0800E0BC.inc +++ b/data/scripts/gUnk_0800E0BC.inc @@ -5,9 +5,8 @@ _0807EF80 0x000a CheckLocalFlag 0x0093 JumpIf 0x0062 _0807E930 0x0008 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf8e9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F8E8 .short 0x0000 .short 0x0000 @ End of parameters @@ -34,7 +33,7 @@ Wait 0x000a TextboxNoOverlap 0x2402 _0807EA94 SetLocalFlag 0x0093 -Call 0x080668f1 +Call sub_080668F0 _0807E878 StopScript CheckEntityInteractType @@ -53,9 +52,8 @@ _0807EF80 0x000a CheckLocalFlag 0x0094 JumpIf 0x006c _0807E930 0x0010 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf8e9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F8E8 .short 0x0001 .short 0x0000 @ End of parameters @@ -78,9 +76,8 @@ Wait 0x001e _0807EF80 0x0000 _0807EB8C _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -88,9 +85,8 @@ Wait 0x000a TextboxNoOverlap 0x2401 _0807EA94 SetLocalFlag 0x0094 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -101,9 +97,8 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -120,9 +115,8 @@ JumpIfNot 0x001e _0807E9D4 SetEntityPositionRelative 0x01680070 _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -131,9 +125,8 @@ Jump 0x00fe CheckLocalFlag 0x0095 JumpIf 0x0062 _0807E930 0x0010 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf8e9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F8E8 .short 0x0002 .short 0x0000 @ End of parameters @@ -156,17 +149,15 @@ Wait 0x001e _0807EF80 0x0000 _0807EB8C _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters SetLocalFlag 0x0095 _0807EF80 0x0000 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -187,25 +178,22 @@ _0807E9DC SetLocalFlag 0x0073 StopScript _0807EB44 0x0000 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0004 .short 0x0000 @ End of parameters _0807EDD4 0x0088, 0x0168 _0807EB44 0x0006 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0004 .short 0x0000 @ End of parameters _0807EDD4 0x0070, 0x0168 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -213,9 +201,8 @@ _0807E9D4 Jump 0x001e _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -228,9 +215,8 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -247,9 +233,8 @@ JumpIf 0x0088 CheckLocalFlag 0x0096 JumpIf 0x0056 _0807E930 0x000c -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf8e9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F8E8 .short 0x0000 .short 0x0000 @ End of parameters @@ -302,7 +287,7 @@ Jump 0xffe8 StartScript _0807EB44 0x0002 _0807EF80 0x000a -Call 0x080668f1 +Call sub_080668F0 StopScript CheckEntityInteractType JumpIfNot 0xfffc @@ -315,9 +300,8 @@ _0807E878 Jump 0xffe8 StartScript _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -328,9 +312,8 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -340,9 +323,8 @@ _0807E878 Jump 0xffe2 StartScript _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -353,9 +335,8 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -364,7 +345,7 @@ _0807EA94 _0807E878 Jump 0xffe2 StartScript -Call 0x0807f355 +Call sub_0807F354 StopScript CheckLocalFlag 0x007c JumpIf 0x0046 @@ -373,7 +354,7 @@ JumpIfNot 0xfff6 StartScript _0807E864 StopScript -Call 0x0807f3f9 +Call sub_0807F3F8 Wait 0x003c TextboxNoOverlapFollow 0x160c _0807EA94 diff --git a/data/scripts/gUnk_0800E504.inc b/data/scripts/gUnk_0800E504.inc index 6b3ce23d..9dac7cfa 100644 --- a/data/scripts/gUnk_0800E504.inc +++ b/data/scripts/gUnk_0800E504.inc @@ -7,7 +7,7 @@ CheckPlayerInRegion 0x00a8, 0x0178, 0x1080 JumpIfNot 0xfff6 _0807E864 Wait 0x001e -Call 0x0807f3f9 +Call sub_0807F3F8 Wait 0x003c SoundReq 0x0105 Wait 0x001e diff --git a/data/scripts/gUnk_0800E544.inc b/data/scripts/gUnk_0800E544.inc index 8b5cb87f..3b997d96 100644 --- a/data/scripts/gUnk_0800E544.inc +++ b/data/scripts/gUnk_0800E544.inc @@ -7,12 +7,12 @@ CheckPlayerInRegion 0x00a8, 0x00c0, 0x0880 JumpIfNot 0xfff6 _0807E864 Wait 0x001e -Call 0x0807f3f9 +Call sub_0807F3F8 Wait 0x003c SoundReq 0x0105 Wait 0x001e _0807EB28 0x1622 -Call 0x08053495 +Call sub_08053494 SetLocalFlag 0x007e _0807E878 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_0800E58C.inc b/data/scripts/gUnk_0800E58C.inc index 09c173f9..db10f91a 100644 --- a/data/scripts/gUnk_0800E58C.inc +++ b/data/scripts/gUnk_0800E58C.inc @@ -12,6 +12,6 @@ Wait 0x001e TextboxNoOverlap 0x1625 _0807EA94 Wait 0x003c -Call 0x08053c85 +Call sub_08053C84 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800E5D6.inc b/data/scripts/gUnk_0800E5D6.inc index 45eed0b2..27ed4a61 100644 --- a/data/scripts/gUnk_0800E5D6.inc +++ b/data/scripts/gUnk_0800E5D6.inc @@ -5,7 +5,7 @@ JumpIfNot 0xfffa _0807E864 Wait 0x003c _0807E914 0x00000905 -Call 0x0807f421 +Call sub_0807F420 SetRoomFlag 0x0001 Wait 0x001e _0807E878 diff --git a/data/scripts/gUnk_0800E600.inc b/data/scripts/gUnk_0800E600.inc index e0cf612c..fa047d0e 100644 --- a/data/scripts/gUnk_0800E600.inc +++ b/data/scripts/gUnk_0800E600.inc @@ -3,12 +3,12 @@ StartScript SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0000 _0807E864 -Call 0x0807f355 +Call sub_0807F354 StopScript WaitForPlayerAction0x17 _0807E8E4_0 _0807EF80 0x0001 -Call 0x080752ad +Call sub_080752AC _0807E878 -Call 0x080791d1 +Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/gUnk_0800E62C.inc b/data/scripts/gUnk_0800E62C.inc index 7c2303ff..b2267bf5 100644 --- a/data/scripts/gUnk_0800E62C.inc +++ b/data/scripts/gUnk_0800E62C.inc @@ -3,12 +3,12 @@ StartScript SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0008 _0807E864 -Call 0x0807f355 +Call sub_0807F354 StopScript WaitForPlayerAction0x17 _0807E8E4_1 _0807EF80 0x0001 -Call 0x080752ad +Call sub_080752AC _0807E878 -Call 0x080791d1 +Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/gUnk_0800E658.inc b/data/scripts/gUnk_0800E658.inc index 7d530b7a..f51cd3cf 100644 --- a/data/scripts/gUnk_0800E658.inc +++ b/data/scripts/gUnk_0800E658.inc @@ -3,12 +3,12 @@ StartScript SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0010 _0807E864 -Call 0x0807f355 +Call sub_0807F354 StopScript WaitForPlayerAction0x17 _0807E8E4_2 _0807EF80 0x0001 -Call 0x080752ad +Call sub_080752AC _0807E878 -Call 0x080791d1 +Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/gUnk_0800E684.inc b/data/scripts/gUnk_0800E684.inc index 98aa719d..d59676bc 100644 --- a/data/scripts/gUnk_0800E684.inc +++ b/data/scripts/gUnk_0800E684.inc @@ -3,12 +3,12 @@ StartScript SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0018 _0807E864 -Call 0x0807f355 +Call sub_0807F354 StopScript WaitForPlayerAction0x17 _0807E8E4_3 _0807EF80 0x0001 -Call 0x080752ad +Call sub_080752AC _0807E878 -Call 0x080791d1 +Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/gUnk_0800E6B0.inc b/data/scripts/gUnk_0800E6B0.inc index de8e1873..9029d166 100644 --- a/data/scripts/gUnk_0800E6B0.inc +++ b/data/scripts/gUnk_0800E6B0.inc @@ -1,33 +1,33 @@ SCRIPT_START gUnk_0800E6B0 StartScript -Call 0x08060091 +Call sub_08060090 _0807EF80 0x000a StopScript StartScript CheckEntityInteractType JumpIf 0x000e -Call 0x08060159 +Call sub_08060158 StopScript Jump 0xffee StopScript _0807E864 -Call 0x0806025d +Call sub_0806025C _0807EA94 Wait 0x000f _0807E878 Jump 0xffd8 StartScript -Call 0x0806adfd +Call sub_0806ADFC _0807EF80 0x000a StopScript StartScript CheckEntityInteractType JumpIf 0x000c -Call 0x0806aee5 +Call sub_0806AEE4 Jump 0xffee StopScript _0807E864 -Call 0x0806afe9 +Call sub_0806AFE8 JumpIf 0x000e _0807EA94 Wait 0x000f @@ -48,13 +48,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0000 .short 0x0000 @ End of parameters -Call 0x0806afe9 +Call sub_0806AFE8 _0807EA94 _0807E878 Jump 0xffe0 @@ -74,29 +73,28 @@ CheckGlobalFlag 0x002a JumpIf 0x002a CheckEntityInteractType JumpIf 0x000e -Call 0x0806aee5 +Call sub_0806AEE4 StopScript Jump 0xffe6 StopScript _0807E864 -Call 0x0806afe9 +Call sub_0806AFE8 _0807EA94 Wait 0x000f _0807E878 Jump 0xffd0 _0807EF80 0x000f _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0004 .short 0x0000 @ End of parameters -Call 0x0806af71 +Call sub_0806AF70 _0807EE04 0x0188, 0x0058 StopScript StartScript -Call 0x0806af79 +Call sub_0806AF78 _0807EE30 JumpIfNot 0xfff2 EntityHasHeight @@ -104,7 +102,7 @@ JumpIf 0xffec StopScript Jump 0xff02 StartScript -Call 0x0806c675 +Call sub_0806C674 _0807EF80 0x000a _0807EB44 0x0004 StopScript @@ -112,7 +110,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x0806c70d +Call sub_0806C70C _0807EA94 _0807E878 _0807EB44 0x0004 @@ -129,21 +127,18 @@ _0807E864 _0807EB44 0x0004 StartScript TextboxNoOverlapFollow 0x4501 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf855 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F854 .short 0x0032 .short 0x0001 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf855 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F854 .short 0x00c8 .short 0x0002 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf855 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F854 .short 0x0190 .short 0x0003 @ End of parameters @@ -158,9 +153,8 @@ _0807EB38 @ End of parameters StartScript TextboxNoOverlapFollow 0x4505 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf855 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F854 .short 0x0190 .short 0x0001 @ End of parameters @@ -172,5 +166,5 @@ ModRupees 0xfe70 SetLocalFlag 0x0091 TextboxNoOverlapFollow 0x4508 _0807EA94 -Call 0x0806c579 +Call sub_0806C578 SCRIPT_END diff --git a/data/scripts/gUnk_0800E8A4.inc b/data/scripts/gUnk_0800E8A4.inc index 84790e70..0e3e62d8 100644 --- a/data/scripts/gUnk_0800E8A4.inc +++ b/data/scripts/gUnk_0800E8A4.inc @@ -1,9 +1,8 @@ SCRIPT_START gUnk_0800E8A4 StartScript TextboxNoOverlapFollow 0x4504 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf855 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F854 .short 0x00c8 .short 0x0001 @ End of parameters @@ -15,5 +14,5 @@ ModRupees 0xff38 SetLocalFlag 0x0091 TextboxNoOverlapFollow 0x4508 _0807EA94 -Call 0x0806c589 +Call sub_0806C588 SCRIPT_END diff --git a/data/scripts/gUnk_0800E8D6.inc b/data/scripts/gUnk_0800E8D6.inc index 07bd962f..40eb094e 100644 --- a/data/scripts/gUnk_0800E8D6.inc +++ b/data/scripts/gUnk_0800E8D6.inc @@ -1,9 +1,8 @@ SCRIPT_START gUnk_0800E8D6 StartScript TextboxNoOverlapFollow 0x4503 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf855 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F854 .short 0x0032 .short 0x0001 @ End of parameters @@ -15,5 +14,5 @@ ModRupees 0xffce SetLocalFlag 0x0091 TextboxNoOverlapFollow 0x4508 _0807EA94 -Call 0x0806c599 +Call FUN_0806c598 SCRIPT_END diff --git a/data/scripts/gUnk_0800E908.inc b/data/scripts/gUnk_0800E908.inc index a716fb55..026b595b 100644 --- a/data/scripts/gUnk_0800E908.inc +++ b/data/scripts/gUnk_0800E908.inc @@ -7,7 +7,7 @@ _0807E878 _0807EB44 0x0000 Jump 0xff14 StartScript -Call 0x0806c4f9 +Call sub_0806C4F8 _0807EF80 0x000a _0807EB44 0x0000 StopScript @@ -16,9 +16,9 @@ JumpIfNot 0xfffc _0807E864 _0807EB44 0x0004 _0807E930 0x0004 -Call 0x0806c4a9 +Call sub_0806C4A8 JumpIfNot 0xfff8 -Call 0x0806c4dd +Call sub_0806C4DC _0807EA94 _0807E878 _0807EB44 0x0000 @@ -34,13 +34,13 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807E930 0x0008 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807E930 0x0009 -Call 0x0806b261 +Call sub_0806B260 JumpIfNot 0x0052 _0807EA94 _0807EF80 0x000b -StartPlayerScript 0x0800e9f4 +StartPlayerScript gUnk_0800E9F4 WaitForSomething2 0x00000001 _0807EF80 0x000a TextboxNoOverlapFollow 0x4a24 @@ -50,7 +50,7 @@ Wait 0x0014 TextboxNoOverlapFollow 0x4a25 _0807EA94 _0807E930 0x0000 -StartPlayerScript 0x0800ea1c +StartPlayerScript gUnk_0800EA1C WaitForSomething2 0x00000001 SetLocalFlag 0x0074 SoundReq 0x0072 @@ -63,13 +63,3 @@ Wait 0x000f _0807E878 _0807E930 0x0000 Jump 0xff82 -StartScript -_0807EB44 0x0004 -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EF80 0x0001 -_0807EDD4 0x0078, 0x0080 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call 0x080791bd -SCRIPT_END diff --git a/data/scripts/gUnk_0800E9F4.inc b/data/scripts/gUnk_0800E9F4.inc new file mode 100644 index 00000000..029ea843 --- /dev/null +++ b/data/scripts/gUnk_0800E9F4.inc @@ -0,0 +1,11 @@ +SCRIPT_START gUnk_0800E9F4 +StartScript +_0807EB44 0x0004 +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807EF80 0x0001 +_0807EDD4 0x0078, 0x0080 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call sub_080791BC +SCRIPT_END diff --git a/data/scripts/gUnk_0800EA1C.inc b/data/scripts/gUnk_0800EA1C.inc index f940e9b6..49a32db0 100644 --- a/data/scripts/gUnk_0800EA1C.inc +++ b/data/scripts/gUnk_0800EA1C.inc @@ -10,6 +10,6 @@ _0807EF80 0x0000 _0807EF80 0x0005 Wait 0x003c _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800EA54.inc b/data/scripts/gUnk_0800EA54.inc index 8ad06ddd..0a6bc3a1 100644 --- a/data/scripts/gUnk_0800EA54.inc +++ b/data/scripts/gUnk_0800EA54.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_0800EA54 StartScript -Call 0x0806ce5d +Call sub_0806CE5C _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0008 @@ -9,24 +9,23 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0004 .short 0x0000 @ End of parameters -Call 0x0807f2d5 +Call sub_0807F2D4 _0807E930 0x0009 -Call 0x0806ce81 +Call sub_0806CE80 _0807EA94 _0807E878 _0807E930 0x000a -Call 0x0807f2d5 +Call sub_0807F2D4 _0807E930 0x0008 Jump 0xffc8 StartScript _0807E9D4 -Call 0x0806c09d +Call sub_0806C09C _0807EF80 0x000a _0807E930 0x0000 _0807EB44 0x0004 @@ -36,24 +35,23 @@ JumpIfNot 0xfffc StartScript _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xc029 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806C028 .short 0x0004 .short 0x0000 @ End of parameters StopScript -Call 0x0806c00d +Call sub_0806C00C JumpIfNot 0xfff8 _0807E930 0x0008 -Call 0x0806c039 +Call sub_0806C038 _0807EA94 Wait 0x000f _0807E878 _0807E930 0x0000 Jump 0xffc6 StartScript -Call 0x0806c871 +Call sub_0806C870 _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0000 @@ -62,113 +60,112 @@ _0807E30C JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x0806c90d +Call sub_0806C90C _0807EA94 Wait 0x000f _0807E878 Jump 0xffe6 .short 0x0000 StartScript -Call 0x08061e71 +Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0004 -Call 0x08061fd9 +Call sub_08061FD8 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x08061fd9 -Call 0x08062049 +Call sub_08061FD8 +Call sub_08062048 _0807EA94 _0807E878 Jump 0xffe4 .short 0x0000 StartScript -Call 0x08061e71 +Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0006 -Call 0x08061fd9 +Call sub_08061FD8 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x08061fd9 -Call 0x08062049 +Call sub_08061FD8 +Call sub_08062048 _0807EA94 _0807E878 _0807EB44 0x0006 -Call 0x08061fd9 +Call sub_08061FD8 Jump 0xffda StartScript -Call 0x08061e71 +Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0002 -Call 0x08061fd9 +Call sub_08061FD8 StopScript Jump 0x0036 StartScript -Call 0x08061e71 +Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0004 -Call 0x08061fd9 +Call sub_08061FD8 StopScript Jump 0x001a StartScript -Call 0x08061e71 +Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0006 -Call 0x08061fd9 +Call sub_08061FD8 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x08061fd9 -Call 0x08062049 +Call sub_08061FD8 +Call sub_08062048 _0807EA94 _0807E878 Jump 0xffe4 .short 0x0000 StartScript -Call 0x08061e71 +Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0002 -Call 0x08061fd9 +Call sub_08061FD8 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x08061fd9 -Call 0x08062049 +Call sub_08061FD8 +Call sub_08062048 _0807EA94 _0807E878 _0807EB44 0x0002 -Call 0x08061fd9 +Call sub_08061FD8 Jump 0xffda StartScript -Call 0x08061e71 +Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0004 -Call 0x08061fd9 +Call sub_08061FD8 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x08061fd9 -Call 0x08062049 +Call sub_08061FD8 +Call sub_08062048 _0807EA94 _0807E878 Jump 0xffe4 .short 0x0000 StartScript _0807E9D4 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x1fb9 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08061FB8 .short 0x0001 .short 0x0000 @ End of parameters @@ -199,13 +196,12 @@ _0807E930 0x0003 Wait 0x001e Jump 0xffaa StartScript -Call 0x080639d1 +Call sub_080639D0 _0807EF80 0x000a StopScript StartScript -.short 0x140c @ CallWithArg with 4 parameters -.short 0x3851 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08063850 .short 0x0000 .short 0x0000 @ End of parameters @@ -214,28 +210,26 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x3851 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08063850 .short 0x0000 .short 0x0000 @ End of parameters -Call 0x08063945 +Call sub_08063944 _0807EA94 JumpIfNot 0x0008 _0807F050 0x0070 WaitPlayerAction8 _0807E878 -Call 0x08063875 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x3851 -.short 0x0806 +Call sub_08063874 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08063850 .short 0x0000 .short 0x0000 @ End of parameters Jump 0xffc6 StartScript -Call 0x08064cc1 +Call sub_08064CC0 _0807EF80 0x000a _0807EF80 0x0007 _0807EB44 0x0002 @@ -244,7 +238,7 @@ StopScript _0807E944 _0807E864 _0807EB74 -Call 0x08064cd9 +Call sub_08064CD8 _0807EA94 Wait 0x000f _0807E878 @@ -259,11 +253,11 @@ CheckEntityInteractType JumpIf 0x0016 TestBit 0x00000001 JumpIf 0x0068 -Call 0x0806aee5 +Call sub_0806AEE4 Jump 0xffe4 StopScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 CheckLocalFlag 0x00ae JumpIf 0x0078 Wait 0x000a @@ -277,28 +271,27 @@ _0807E5F8 0x00000020 TextboxNoOverlapFollow 0x4c09 _0807EA94 _0807E914 0x00000503 -Call 0x0807f421 +Call sub_0807F420 _0807E5F8 0x00000040 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 SetLocalFlag 0x00ae Jump 0xff88 StopScript WaitForSomething2 0x00000002 _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0008 .short 0x0000 @ End of parameters WaitForSomething2 0x00000004 -Call 0x0806aed9 +Call sub_0806AED8 WaitForSomething2 0x00000008 Jump 0xff5c TextboxNoOverlapFollow 0x4c16 _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xff4a StartScript @@ -310,11 +303,11 @@ CheckEntityInteractType JumpIf 0x0016 TestBit 0x00000001 JumpIf 0x0068 -Call 0x0806aee5 +Call sub_0806AEE4 Jump 0xffe4 StopScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 CheckLocalFlag 0x00ae JumpIf 0x0078 Wait 0x000a @@ -328,28 +321,27 @@ _0807E5F8 0x00000004 TextboxNoOverlapFollow 0x4c09 _0807EA94 _0807E914 0x00000503 -Call 0x0807f421 +Call sub_0807F420 _0807E5F8 0x00000008 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 SetLocalFlag 0x00ae Jump 0xff88 StopScript WaitForSomething2 0x00000010 _0807EB44 0x0006 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0008 .short 0x0000 @ End of parameters WaitForSomething2 0x00000020 -Call 0x0806aed9 +Call sub_0806AED8 WaitForSomething2 0x00000040 Jump 0xff5c TextboxNoOverlapFollow 0x4c15 _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xff4a TextboxNoOverlapFollow 0x4c07 @@ -362,5 +354,5 @@ _0807E5F8 0x00000024 TextboxNoOverlapFollow 0x4c09 _0807EA94 _0807E5F8 0x00000048 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0800EF40.inc b/data/scripts/gUnk_0800EF40.inc index 7054cbda..6cc675ef 100644 --- a/data/scripts/gUnk_0800EF40.inc +++ b/data/scripts/gUnk_0800EF40.inc @@ -4,14 +4,14 @@ _0807EF80 0x0007 CheckGlobalFlag 0x001f JumpIf 0x0046 StopScript -Call 0x080869a5 +Call sub_080869A4 JumpIfNot 0xfff8 _0807E864 CheckLocalFlagByOffset 0x0200, 0x006d JumpIf 0x001e TextboxNoOverlapFollow 0x4d01 _0807EA94 -StartPlayerScript 0x0800ef9c +StartPlayerScript gUnk_0800EF9C WaitForSomething2 0x00000001 Wait 0x000f _0807E878 @@ -21,6 +21,6 @@ TextboxNoOverlapFollow 0x4d02 _0807EA94 Wait 0x000f _0807E878 -Call 0x0808692d +Call sub_0808692C SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800EF9C.inc b/data/scripts/gUnk_0800EF9C.inc index aa4dbcd5..4dbc08f6 100644 --- a/data/scripts/gUnk_0800EF9C.inc +++ b/data/scripts/gUnk_0800EF9C.inc @@ -6,6 +6,6 @@ _0807EB44 0x0004 _0807EF80 0x0001 _0807ECC4 0x0008 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800EFC0.inc b/data/scripts/gUnk_0800EFC0.inc index b476d6be..70a1432d 100644 --- a/data/scripts/gUnk_0800EFC0.inc +++ b/data/scripts/gUnk_0800EFC0.inc @@ -8,66 +8,58 @@ JumpIf 0x00b0 StopScript Jump 0x0026 _0807EB44 0x0006 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0008 .short 0x0000 @ End of parameters Wait 0x0004 _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0008 .short 0x0000 @ End of parameters Wait 0x0004 _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0008 .short 0x0000 @ End of parameters Wait 0x0004 _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0004 .short 0x0000 @ End of parameters _0807EDD4 0x0088, 0x0040 _0807EF80 0x000a _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0008 .short 0x0000 @ End of parameters Wait 0x0004 _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0008 .short 0x0000 @ End of parameters Wait 0x0004 _0807EB44 0x0006 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0008 .short 0x0000 @ End of parameters Wait 0x0004 _0807EB44 0x0006 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0004 .short 0x0000 @ End of parameters @@ -77,7 +69,7 @@ CheckLocalFlag 0x007b JumpIf 0x0006 Jump 0xff5a StopScript -Call 0x0806aee5 +Call sub_0806AEE4 Jump 0xfff6 .short 0x0000 StartScript @@ -87,10 +79,10 @@ StopScript CheckPlayerInRegion 0x01f8, 0x0338, 0x1030 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 LoadRoomEntityList 0x080ee8ac -StartPlayerScript 0x0800f14c +StartPlayerScript gUnk_0800F14C WaitForSomething2 0x00000001 _0807E5F8 0x0000001e WaitForSomething2 0x00000040 @@ -117,18 +109,18 @@ WaitForSomething2 0x00000040 @ End of parameters _0807EA94 _0807E5F8 0x00000002 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 WaitForSomething2 0x00000040 CheckKinstoneFused 0x0032 JumpIfNot 0xfffa _0807E864 -Call 0x0807df29 +Call sub_0807DF28 _0807E5F8 0x0000001e Wait 0x003c _0807E8E4_1 WaitForSomething2 0x000003c0 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800F14C.inc b/data/scripts/gUnk_0800F14C.inc index 622ee0eb..d0f0517e 100644 --- a/data/scripts/gUnk_0800F14C.inc +++ b/data/scripts/gUnk_0800F14C.inc @@ -11,5 +11,5 @@ _0807EDD4 0x01f8, 0x0338 _0807EB44 0x0006 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0800F184.inc b/data/scripts/gUnk_0800F184.inc index d114d67c..43da522f 100644 --- a/data/scripts/gUnk_0800F184.inc +++ b/data/scripts/gUnk_0800F184.inc @@ -4,7 +4,7 @@ SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0008 _0807EF80 0x000a StopScript -Call 0x0807f349 +Call sub_0807F348 _0807EB44 0x0002 WaitForSomething2 0x00000002 _0807EF80 0x0007 @@ -16,22 +16,21 @@ _0807E930 0x0008 _0807E8E4_0 _0807E5F8 0x00000040 WaitForSomething2 0x00000002 -Call 0x0806e441 +Call sub_0806E440 Wait 0x0078 _0807E5F8 0x00000040 WaitForSomething2 0x00000002 StopScript StartScript -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf681 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F680 .short 0x01c0 .short 0x0000 @ End of parameters JumpIf 0x0034 StopScript _0807E864 -Call 0x0807f9a5 +Call sub_0807F9A4 _0807EB74 _0807E930 0x0008 _0807EF80 0x0004 @@ -41,20 +40,19 @@ Wait 0x003c .short 0x000c @ End of parameters _0807EA94 -StartPlayerScript 0x0800f33c +StartPlayerScript gUnk_0800F33C WaitForSomething2 0x00000400 _0807E878 Jump 0xffbe -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf681 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F680 .short 0x0230 .short 0x0000 @ End of parameters JumpIfNot 0x0034 StopScript _0807E864 -Call 0x0807f9a5 +Call sub_0807F9A4 _0807EB74 _0807E930 0x0008 _0807EF80 0x0004 @@ -64,20 +62,19 @@ Wait 0x003c .short 0x000c @ End of parameters _0807EA94 -StartPlayerScript 0x0800f354 +StartPlayerScript gUnk_0800F354 WaitForSomething2 0x00000400 _0807E878 Jump 0xff7e -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf6b5 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F6B4 .short 0x0310 .short 0x0000 @ End of parameters JumpIf 0x0034 StopScript _0807E864 -Call 0x0807f9a5 +Call sub_0807F9A4 _0807EB74 _0807E930 0x0008 _0807EF80 0x0004 @@ -87,20 +84,19 @@ Wait 0x003c .short 0x000c @ End of parameters _0807EA94 -StartPlayerScript 0x0800f36c +StartPlayerScript gUnk_0800F36C WaitForSomething2 0x00000400 _0807E878 Jump 0xff3e -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf6b5 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F6B4 .short 0x0340 .short 0x0000 @ End of parameters JumpIfNot 0x0034 StopScript _0807E864 -Call 0x0807f9a5 +Call sub_0807F9A4 _0807EB74 _0807E930 0x0008 _0807EF80 0x0004 @@ -110,7 +106,7 @@ Wait 0x003c .short 0x000c @ End of parameters _0807EA94 -StartPlayerScript 0x0800f384 +StartPlayerScript gUnk_0800F384 WaitForSomething2 0x00000400 _0807E878 Jump 0xfefe diff --git a/data/scripts/gUnk_0800F33C.inc b/data/scripts/gUnk_0800F33C.inc index d6632d61..620fc09f 100644 --- a/data/scripts/gUnk_0800F33C.inc +++ b/data/scripts/gUnk_0800F33C.inc @@ -2,6 +2,6 @@ SCRIPT_START gUnk_0800F33C SetEntityNonPlanarMovement 0x0100 _0807EC94 0x0008 _0807E5F8 0x00000400 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800F354.inc b/data/scripts/gUnk_0800F354.inc index f84638a3..c4513f21 100644 --- a/data/scripts/gUnk_0800F354.inc +++ b/data/scripts/gUnk_0800F354.inc @@ -2,6 +2,6 @@ SCRIPT_START gUnk_0800F354 SetEntityNonPlanarMovement 0x0100 _0807ECF4 0x0008 _0807E5F8 0x00000400 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800F36C.inc b/data/scripts/gUnk_0800F36C.inc index ce91e138..0b05d5ae 100644 --- a/data/scripts/gUnk_0800F36C.inc +++ b/data/scripts/gUnk_0800F36C.inc @@ -2,6 +2,6 @@ SCRIPT_START gUnk_0800F36C SetEntityNonPlanarMovement 0x0100 _0807ECC4 0x0008 _0807E5F8 0x00000400 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800F384.inc b/data/scripts/gUnk_0800F384.inc index 68bf6162..a71b75bf 100644 --- a/data/scripts/gUnk_0800F384.inc +++ b/data/scripts/gUnk_0800F384.inc @@ -2,6 +2,6 @@ SCRIPT_START gUnk_0800F384 SetEntityNonPlanarMovement 0x0100 _0807EC64 0x0008 _0807E5F8 0x00000400 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800F39C.inc b/data/scripts/gUnk_0800F39C.inc index 34f2ec83..ad33e0ef 100644 --- a/data/scripts/gUnk_0800F39C.inc +++ b/data/scripts/gUnk_0800F39C.inc @@ -7,7 +7,7 @@ _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 _0807EF80 0x000b StopScript -Call 0x0807f349 +Call sub_0807F348 WaitForSomething2 0x00000004 _0807EF80 0x0007 _0807EDD4 0x01f8, 0x0318 diff --git a/data/scripts/gUnk_0800F430.inc b/data/scripts/gUnk_0800F430.inc index 1570ff8a..94e2ad26 100644 --- a/data/scripts/gUnk_0800F430.inc +++ b/data/scripts/gUnk_0800F430.inc @@ -7,7 +7,7 @@ _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 _0807EF80 0x000b StopScript -Call 0x0807f349 +Call sub_0807F348 WaitForSomething2 0x00000008 _0807EF80 0x0007 _0807EDD4 0x01d8, 0x0328 diff --git a/data/scripts/gUnk_0800F4C4.inc b/data/scripts/gUnk_0800F4C4.inc index e9cdb3da..d9cf6d3f 100644 --- a/data/scripts/gUnk_0800F4C4.inc +++ b/data/scripts/gUnk_0800F4C4.inc @@ -7,7 +7,7 @@ _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 _0807EF80 0x000b StopScript -Call 0x0807f349 +Call sub_0807F348 WaitForSomething2 0x00000010 _0807EF80 0x0007 _0807EDD4 0x01c8, 0x0328 diff --git a/data/scripts/gUnk_0800F554.inc b/data/scripts/gUnk_0800F554.inc index 20dda5af..8498a957 100644 --- a/data/scripts/gUnk_0800F554.inc +++ b/data/scripts/gUnk_0800F554.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_0800F554 StartScript -Call 0x08061fe5 +Call sub_08061FE4 _0807E9D4 _0807EF80 0x000a StopScript @@ -8,8 +8,8 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x08061fe5 -Call 0x08061ff5 +Call sub_08061FE4 +Call sub_08061FF4 _0807EA94 _0807E878 Jump 0xffe4 @@ -23,7 +23,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x0806265d +Call sub_0806265C _0807EA94 _0807E878 _0807EF80 0x0001 @@ -33,9 +33,8 @@ StartScript _0807EB44 0x0006 _0807E9D4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0008 .short 0x0000 @ End of parameters @@ -44,13 +43,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0008 .short 0x0000 @ End of parameters -Call 0x08064429 +Call sub_08064428 _0807EA94 _0807E878 Jump 0xffe0 @@ -60,15 +58,14 @@ _0807EB44 0x0004 _0807E930 0x0000 _0807E9D4 _0807EF80 0x000a -Call 0x0807f349 +Call sub_0807F348 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0008 .short 0x0000 @ End of parameters @@ -86,7 +83,7 @@ _0807E30C JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x0806c90d +Call sub_0806C90C _0807EA94 _0807E878 Jump 0xffea @@ -102,7 +99,7 @@ JumpIfNot 0xfffc _0807E864 _0807EB74 _0807EF80 0x0001 -Call 0x0806b4f1 +Call sub_0806B4F0 _0807EA94 Wait 0x000f _0807E878 @@ -114,15 +111,14 @@ _0807EB44 0x0004 _0807E930 0x0000 _0807E9D4 _0807EF80 0x000a -Call 0x0807f349 +Call sub_0807F348 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0004 .short 0x0000 @ End of parameters @@ -134,9 +130,8 @@ TextboxNoOverlap 0x251f _0807EA94 Wait 0x000f _0807E878 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -146,7 +141,7 @@ StartScript _0807EF80 0x0001 _0807E9D4 _0807EF80 0x000a -Call 0x08062789 +Call sub_08062788 StopScript CheckLocalFlag 0x00cd JumpIf 0x001e @@ -154,11 +149,11 @@ CheckEntityInteractType JumpIfNot 0xfff4 _0807E864 _0807EB74 -Call 0x0806265d +Call sub_0806265C _0807EA94 _0807E878 _0807EF80 0x0001 Jump 0xffde -Call 0x080627e9 +Call sub_080627E8 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800F724.inc b/data/scripts/gUnk_0800F724.inc index cb0748e3..20e3c8ad 100644 --- a/data/scripts/gUnk_0800F724.inc +++ b/data/scripts/gUnk_0800F724.inc @@ -9,21 +9,21 @@ Jump 0xfe4a CheckLocalFlag 0x00cd JumpIf 0x030a _0807E864 -Call 0x0807df29 +Call sub_0807DF28 SetEntityPositionRelative 0x014800c8 -Call 0x0807f845 +Call sub_0807F844 _0807E778 0x0002 DoFade6 WaitFor_2 -StartPlayerScript 0x0800fa54 +StartPlayerScript gUnk_0800FA54 _0807E5F8 0x00000002 _0807F0B4 0x0001 SetEntityPositionRelative 0x021800c8 -Call 0x0807f5c1 +Call sub_0807F5C0 Wait 0x0064 _0807F0B4 0x0002 SetEntityPositionRelative 0x036800c8 -Call 0x0807f5c1 +Call sub_0807F5C0 WaitForSomething2 0x00000001 WaitForSomething2 0x00000004 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters @@ -35,13 +35,13 @@ _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807F0B4 0x0004 CameraTargetPlayer -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807E5F8 0x00000010 WaitForSomething2 0x00000004 _0807E864 -Call 0x0807df29 -StartPlayerScript 0x0800fa78 +Call sub_0807DF28 +StartPlayerScript gUnk_0800FA78 WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -52,12 +52,12 @@ WaitForSomething2 0x00000004 _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 WaitForSomething2 0x00000004 _0807E864 -Call 0x0807df29 -StartPlayerScript 0x0800fa9c +Call sub_0807DF28 +StartPlayerScript gUnk_0800FA9C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -68,12 +68,12 @@ WaitForSomething2 0x00000004 _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 WaitForSomething2 0x00000004 _0807E864 -Call 0x0807df29 -StartPlayerScript 0x0800fac0 +Call sub_0807DF28 +StartPlayerScript gUnk_0800FAC0 WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -84,28 +84,28 @@ WaitForSomething2 0x00000004 _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 WaitForSomething2 0x00000004 _0807E864 -Call 0x0807df29 -Call 0x08063c5d +Call sub_0807DF28 +Call sub_08063C5C SoundReq 0x00e2 Wait 0x001e _0807E8E4_0 -Call 0x0807f3f9 +Call sub_0807F3F8 Wait 0x003c .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1021 .short 0x000e @ End of parameters _0807EA94 -StartPlayerScript 0x0800fae4 +StartPlayerScript gUnk_0800FAE4 SetEntityPositionRelative 0x025800f0 _0807F0B4 0x0001 CameraTargetEntity Wait 0x001e -Call 0x08063c2d +Call sub_08063C2C WaitForSomething2 0x00000001 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1022 @@ -113,31 +113,31 @@ WaitForSomething2 0x00000001 @ End of parameters _0807EA94 _0807E8E4_0 -Call 0x08063c15 -Call 0x08094cdd +Call sub_08063C14 +Call sub_08094CDC Wait 0x001e .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1023 .short 0x000e @ End of parameters _0807EA94 -Call 0x08063c15 -Call 0x08094dd9 +Call sub_08063C14 +Call sub_08094DD8 Wait 0x001e .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1024 .short 0x000e @ End of parameters _0807EA94 -Call 0x08063c15 -Call 0x08094d35 +Call sub_08063C14 +Call sub_08094D34 Wait 0x001e .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1025 .short 0x000e @ End of parameters _0807EA94 -Call 0x08063c5d +Call sub_08063C5C .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1026 .short 0x000e @@ -146,15 +146,15 @@ _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807E8E4_1 -Call 0x08063c2d +Call sub_08063C2C .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1027 .short 0x0000 @ End of parameters _0807EA94 -Call 0x08063c75 +Call sub_08063C74 Wait 0x003c -Call 0x08063c15 +Call sub_08063C14 _0807E8E4_0 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1028 @@ -173,18 +173,18 @@ _0807E8E4_0 .short 0x000e @ End of parameters _0807EA94 -Call 0x08063c15 -Call 0x08094d71 +Call sub_08063C14 +Call sub_08094D70 SoundReq 0x0103 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 -Call 0x08063c15 -Call 0x08094d11 +Call sub_08063C14 +Call sub_08094D10 Wait 0x001e -Call 0x08094e0d +Call sub_08094E0C Wait 0x001e _0807E8E4_1 -Call 0x0807f3f9 +Call sub_0807F3F8 Wait 0x003c .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x102b @@ -193,44 +193,41 @@ Wait 0x003c _0807EA94 _0807F034 0x000d WaitPlayerAction8 -Call 0x0806dc3d -Call 0x080791bd -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf245 -.short 0x0807 +Call sub_0806DC3C +Call sub_080791BC +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F244 .short 0x000d .short 0x0000 @ End of parameters _0807E914 0x000000ff -Call 0x0807f5b1 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf29d -.short 0x0807 +Call sub_0807F5B0 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F29C .short 0x49d6 .short 0x0800 @ End of parameters Wait 0x00b7 _0807E914 0x00000000 -Call 0x0807f5b1 +Call sub_0807F5B0 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x102c .short 0x0000 @ End of parameters _0807EA94 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf29d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F29C .short 0x0000 .short 0x0000 @ End of parameters -Call 0x0806dc59 +Call sub_0806DC58 _0807F0B4 0x0004 CameraTargetPlayer Wait 0x000a _0807E5F8 0x00000002 -Call 0x08063c45 +Call sub_08063C44 SetLocalFlag 0x00cd -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800FA54.inc b/data/scripts/gUnk_0800FA54.inc index 0b51b2e4..bf484da1 100644 --- a/data/scripts/gUnk_0800FA54.inc +++ b/data/scripts/gUnk_0800FA54.inc @@ -6,5 +6,5 @@ SetEntityPositionRelative 0x039800d8 _0807EB44 0x0006 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0800FA78.inc b/data/scripts/gUnk_0800FA78.inc index fe2366d3..fa328ab6 100644 --- a/data/scripts/gUnk_0800FA78.inc +++ b/data/scripts/gUnk_0800FA78.inc @@ -6,5 +6,5 @@ _0807EDD4 0x00a0, 0x0278 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0800FA9C.inc b/data/scripts/gUnk_0800FA9C.inc index 303070de..a2e8fc7b 100644 --- a/data/scripts/gUnk_0800FA9C.inc +++ b/data/scripts/gUnk_0800FA9C.inc @@ -6,5 +6,5 @@ _0807EDD4 0x0078, 0x01c0 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0800FAC0.inc b/data/scripts/gUnk_0800FAC0.inc index 26a1c150..202b3a20 100644 --- a/data/scripts/gUnk_0800FAC0.inc +++ b/data/scripts/gUnk_0800FAC0.inc @@ -6,5 +6,5 @@ _0807EDD4 0x0108, 0x01c8 _0807EB44 0x0002 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0800FAE4.inc b/data/scripts/gUnk_0800FAE4.inc index 8075ddaa..ccbf8ef7 100644 --- a/data/scripts/gUnk_0800FAE4.inc +++ b/data/scripts/gUnk_0800FAE4.inc @@ -2,22 +2,20 @@ SCRIPT_START gUnk_0800FAE4 StartScript SetEntityNonPlanarMovement 0x0100 StopScript -Call 0x0807f585 +Call sub_0807F584 .short 0x1406 @ _0807E078 with 4 parameters .short 0x0012 .short 0x001a .short 0x000e .short 0x0002 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 .short 0x027c .short 0x0000 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf465 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F464 .short 0x00e8 .short 0x0000 @ End of parameters @@ -25,5 +23,5 @@ _0807EDD4 0x00e8, 0x0270 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0800FB2C.inc b/data/scripts/gUnk_0800FB2C.inc index 8a6d1083..28fbe705 100644 --- a/data/scripts/gUnk_0800FB2C.inc +++ b/data/scripts/gUnk_0800FB2C.inc @@ -2,6 +2,6 @@ SCRIPT_START gUnk_0800FB2C _0807EB44 0x0002 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0800FB44.inc b/data/scripts/gUnk_0800FB44.inc index 0dba8ca8..a3733e33 100644 --- a/data/scripts/gUnk_0800FB44.inc +++ b/data/scripts/gUnk_0800FB44.inc @@ -3,10 +3,10 @@ StartScript _0807EF80 0x0008 _0807EF80 0x000b SetEntityNonPlanarMovement 0x0080 -Call 0x08066d05 +Call sub_08066D04 StopScript WaitForSomething2 0x00000002 -Call 0x08066d15 +Call sub_08066D14 JumpIf 0x0004 MoveEntityToPlayer _0807EF80 0x0007 @@ -95,6 +95,6 @@ _0807EB44 0x0006 _0807EF80 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 -Call 0x08066d4d +Call sub_08066D4C _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800FD0C.inc b/data/scripts/gUnk_0800FD0C.inc index 1522960f..7e869814 100644 --- a/data/scripts/gUnk_0800FD0C.inc +++ b/data/scripts/gUnk_0800FD0C.inc @@ -7,35 +7,27 @@ JumpIfNot 0xfff6 CheckLocalFlag 0x00cd JumpIf 0x0030 _0807E864 -Call 0x0807f9a5 +Call sub_0807F9A4 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x2506 .short 0x0000 @ End of parameters _0807EA94 -StartPlayerScript 0x0800fd80 +StartPlayerScript gUnk_0800FD80 WaitForSomething2 0x00000008 _0807E878 Jump 0xffcc CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 +Call sub_0807F9A4 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x106c .short 0x0000 @ End of parameters _0807EA94 -StartPlayerScript 0x0800fd80 +StartPlayerScript gUnk_0800FD80 WaitForSomething2 0x00000008 _0807E878 Jump 0xffd4 .short 0x0000 -SetEntityNonPlanarMovement 0x0080 -_0807EC64 0x0020 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000008 -Call 0x080791bd -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_0800FD80.inc b/data/scripts/gUnk_0800FD80.inc new file mode 100644 index 00000000..b01200e6 --- /dev/null +++ b/data/scripts/gUnk_0800FD80.inc @@ -0,0 +1,9 @@ +SCRIPT_START gUnk_0800FD80 +SetEntityNonPlanarMovement 0x0080 +_0807EC64 0x0020 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000008 +Call sub_080791BC +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_0800FDA0.inc b/data/scripts/gUnk_0800FDA0.inc index 67e2c4fe..e8d9db8e 100644 --- a/data/scripts/gUnk_0800FDA0.inc +++ b/data/scripts/gUnk_0800FDA0.inc @@ -9,7 +9,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x08069889 +Call sub_08069888 _0807EA94 _0807E878 Jump 0xffea @@ -21,11 +21,11 @@ _0807EF80 0x000a _0807E9D4 SetEntityNonPlanarMovement 0x0040 StopScript -Call 0x08069a61 -Call 0x0806991d +Call sub_08069A60 +Call sub_0806991C StopScript StartScript -Call 0x08069acd +Call sub_08069ACC JumpIf 0x000c _0807EE30 JumpIfNot 0xffee @@ -43,7 +43,7 @@ Wait 0x001e _0807EB44 0x0006 _0807EF80 0x0000 Wait 0x003c -Call 0x08069a3d +Call sub_08069A3C Jump 0xffa8 .short 0x0000 StartScript @@ -53,11 +53,11 @@ _0807EF80 0x000a _0807E9D4 SetEntityNonPlanarMovement 0x0040 StopScript -Call 0x08069aa9 -Call 0x080699ad +Call sub_08069AA8 +Call sub_080699AC StopScript StartScript -Call 0x08069acd +Call sub_08069ACC JumpIf 0x000c _0807EE30 JumpIfNot 0xffee @@ -75,7 +75,7 @@ Wait 0x001e _0807EB44 0x0006 _0807EF80 0x0000 Wait 0x003c -Call 0x08069a85 +Call sub_08069A84 Jump 0xffa8 .short 0x0000 StartScript @@ -83,9 +83,8 @@ CheckInventory1 0x0012 JumpIf 0x004a _0807EB44 0x0006 _0807E9D4 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0008 .short 0x0000 @ End of parameters @@ -93,19 +92,18 @@ StopScript StopScript StartScript _0807EF80 0x000b -Call 0x080642b9 +Call sub_080642B8 CheckEntityInteractType JumpIfNot 0xffee StopScript _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0008 .short 0x0000 @ End of parameters -Call 0x08064429 +Call sub_08064428 _0807EA94 Wait 0x000f _0807E878 diff --git a/data/scripts/gUnk_0800FF18.inc b/data/scripts/gUnk_0800FF18.inc index e152daba..f84775de 100644 --- a/data/scripts/gUnk_0800FF18.inc +++ b/data/scripts/gUnk_0800FF18.inc @@ -4,9 +4,8 @@ CheckInventory1 0x0012 JumpIf 0x004a _0807EB44 0x0006 _0807E9D4 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0008 .short 0x0000 @ End of parameters @@ -14,19 +13,18 @@ StopScript StopScript StartScript _0807EF80 0x000b -Call 0x08064199 +Call sub_08064198 CheckEntityInteractType JumpIfNot 0xffee StopScript _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0008 .short 0x0000 @ End of parameters -Call 0x08064429 +Call sub_08064428 _0807EA94 Wait 0x000f _0807E878 diff --git a/data/scripts/gUnk_0800FF74.inc b/data/scripts/gUnk_0800FF74.inc index d1f5a7a9..e258b17d 100644 --- a/data/scripts/gUnk_0800FF74.inc +++ b/data/scripts/gUnk_0800FF74.inc @@ -2,13 +2,12 @@ SCRIPT_START gUnk_0800FF74 StartScript _0807EB44 0x0002 _0807E9D4 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0008 .short 0x0000 @ End of parameters -Call 0x080644a5 +Call sub_080644A4 ClearLocalFlag 0x00c7 StopScript StopScript @@ -17,13 +16,13 @@ _0807EF80 0x000a CheckLocalFlag 0x00ce JumpIf 0x002c _0807EF80 0x000b -Call 0x08064199 +Call sub_08064198 CheckLocalFlag 0x00c7 JumpIfNot 0x001a -Call 0x08064489 +Call sub_08064488 CheckPlayerInRegion2 0x4040 JumpIfNot 0x000c -Call 0x08064471 +Call sub_08064470 JumpIf 0x004a CheckEntityInteractType JumpIfNot 0xffc2 @@ -31,9 +30,8 @@ StopScript SetLocalFlag 0x00c7 _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0008 .short 0x0000 @ End of parameters @@ -52,12 +50,11 @@ _0807EA94 Jump 0x004e StopScript _0807E888 -Call 0x0807f595 +Call sub_0807F594 _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0008 .short 0x0000 @ End of parameters @@ -65,26 +62,23 @@ SoundReq 0x00cd TextboxNoOverlap 0x340a _0807EA94 _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x000c .short 0x0000 @ End of parameters SetEntityNonPlanarMovement 0x0100 _0807EDD4 0x0018, 0x0108 _0807EB44 0x0002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0008 .short 0x0000 @ End of parameters SetLocalFlag 0x00ce -Call 0x080644a5 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf5b1 -.short 0x0807 +Call sub_080644A4 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F5B0 .short 0x000a .short 0x0000 @ End of parameters @@ -95,9 +89,8 @@ StartScript _0807E9D4 _0807EF80 0x000a _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x72b1 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080672B0 .short 0x0000 .short 0x0000 @ End of parameters @@ -106,9 +99,8 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x72b1 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080672B0 .short 0x0004 .short 0x0000 @ End of parameters @@ -117,9 +109,8 @@ _0807EA94 Wait 0x000f _0807E878 _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x72b1 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080672B0 .short 0x0000 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_080100C8.inc b/data/scripts/gUnk_080100C8.inc index 26079488..340ed779 100644 --- a/data/scripts/gUnk_080100C8.inc +++ b/data/scripts/gUnk_080100C8.inc @@ -1,26 +1,26 @@ SCRIPT_START gUnk_080100C8 StartScript -Call 0x08061fe5 -Call 0x08061e71 +Call sub_08061FE4 +Call sub_08061E70 _0807EF80 0x000a StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x08061fe5 -Call 0x08062049 +Call sub_08061FE4 +Call sub_08062048 _0807EA94 _0807E878 Jump 0xffe4 .short 0x0000 StartScript -Call 0x08061fe5 -Call 0x08061e71 +Call sub_08061FE4 +Call sub_08061E70 _0807EF80 0x000a StopScript Wait 0x003c -Call 0x08061e91 +Call sub_08061E90 Jump 0xfff4 .short 0x0000 StartScript @@ -39,7 +39,7 @@ _0807E878 Jump 0xffec StartScript _0807EF80 0x0001 -Call 0x0806c355 +Call sub_0806C354 _0807EF80 0x000a StopScript CheckEntityInteractType @@ -55,12 +55,11 @@ JumpIf 0x0034 _0807EA94 _0807E3E8 JumpIfNot 0x002e -Call 0x080a1609 +Call sub_080A1608 _0807EA94 _0807E878 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x1551 -.short 0x080a +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080A1550 .short 0x01ac .short 0x0801 @ End of parameters @@ -68,17 +67,17 @@ JumpIfNot 0xffca SoundReq2 0x0015 SetRoomFlag 0x0001 Jump 0xffbe -Call 0x080a1609 +Call sub_080A1608 _0807EA94 _0807E878 Jump 0xffb0 StartScript _0807EF80 0x0008 -Call 0x080a1649 +Call sub_080A1648 StopScript -Call 0x080a1271 +Call sub_080A1270 _0807E864 -Call 0x0807df29 +Call sub_0807DF28 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x3004 .short 0x0007 @@ -88,45 +87,43 @@ SoundReq0x80100000 _0807E778 0x0004 DoFade5 WaitFor_2 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf75d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F75C .short 0x0378 .short 0x0340 @ End of parameters -Call 0x080791bd -Call 0x0807fb75 +Call sub_080791BC +Call sub_0807FB74 _0807E8E4_1 -Call 0x0807f169 -Call 0x080a1389 -Call 0x0806ec39 +Call sub_0807F168 +Call sub_080A1388 +Call sub_0806EC38 StartScript MoveEntityToPlayer -Call 0x0807f845 +Call sub_0807F844 CameraTargetPlayer StopScript _0807E778 0x0004 DoFade4 WaitFor_2 SoundReq2 0xffff -Call 0x080a13b5 +Call sub_080A13B4 _0807EA94 JumpIfNot 0x0018 -Call 0x080a13e9 +Call sub_080A13E8 WaitPlayerAction8 -Call 0x080a1461 +Call sub_080A1460 _0807EA94 -Call 0x080a14a9 -Call 0x0807df51 +Call sub_080A14A8 +Call sub_0807DF50 _0807E878 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf5b1 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F5B0 .short 0x0000 .short 0x0000 @ End of parameters ClearRoomFlag 0x0001 -Call 0x080a169d +Call sub_080A169C _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08010264.inc b/data/scripts/gUnk_08010264.inc index cb9e58ba..dfdd0f66 100644 --- a/data/scripts/gUnk_08010264.inc +++ b/data/scripts/gUnk_08010264.inc @@ -10,14 +10,14 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x08065f65 +Call sub_08065F64 _0807EA94 _0807E878 Jump 0xffea .short 0x0000 StartScript _0807EF80 0x0000 -Call 0x08062a49 +Call sub_08062A48 _0807EF80 0x000a StopScript CheckEntityInteractType @@ -26,28 +26,28 @@ CheckRoomFlag 0x0009 JumpIfNot 0x001a _0807E864 _0807EB74 -Call 0x0806265d +Call sub_0806265C _0807EA94 _0807E878 -Call 0x08062501 +Call sub_08062500 Jump 0xffdc _0807E864 _0807EB74 -Call 0x0806265d +Call sub_0806265C _0807EA94 _0807E878 Jump 0xffca .short 0x0000 StartScript _0807EF80 0x0000 -Call 0x08062a49 +Call sub_08062A48 _0807EF80 0x000a StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x0806265d +Call sub_0806265C _0807EA94 _0807E878 Jump 0xffea @@ -56,11 +56,10 @@ StartScript _0807EF80 0x0000 StopScript StopScript -Call 0x08062699 -Call 0x080626ad -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf0ed -.short 0x0807 +Call sub_08062698 +Call sub_080626AC +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F0EC .short 0x0009 .short 0x0000 @ End of parameters @@ -94,7 +93,7 @@ Jump 0x0008 _0807EE04 0x03c8, 0x00b8 StopScript StartScript -Call 0x080626c1 +Call sub_080626C0 JumpIf 0xff72 _0807EE30 JumpIfNot 0xffee @@ -102,34 +101,32 @@ Jump 0xff68 .short 0x0000 StartScript _0807EF80 0x0000 -Call 0x08062a49 +Call sub_08062A48 _0807EF80 0x000a StopScript Wait 0x001e -Call 0x08062949 +Call sub_08062948 Jump 0xfff4 StartScript _0807E9D4 _0807EB44 0x0004 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0004 .short 0x0000 @ End of parameters StopScript Wait 0x003c -Call 0x0806407d +Call sub_0806407C Jump 0xfff4 .short 0x0000 StartScript _0807E9D4 _0807EB44 0x0004 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -138,7 +135,7 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x08064429 +Call sub_08064428 _0807EA94 _0807E878 Jump 0xffea @@ -148,35 +145,33 @@ _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a _0807E914 0x08064689 -Call 0x08064645 +Call sub_08064644 StopScript Wait 0x003c -Call 0x080646a5 +Call sub_080646A4 Jump 0xfff4 StartScript _0807EB44 0x0004 _0807E930 0x0000 -Call 0x080636f5 +Call sub_080636F4 _0807EF80 0x000a -Call 0x0807f349 +Call sub_0807F348 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0004 .short 0x0000 @ End of parameters -Call 0x080636d9 +Call sub_080636D8 _0807EA94 Wait 0x000f _0807E878 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -184,27 +179,25 @@ Jump 0xffd2 StartScript _0807EB44 0x0004 _0807E930 0x0000 -Call 0x08063cad +Call sub_08063CAC _0807EF80 0x000a -Call 0x0807f349 +Call sub_0807F348 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0004 .short 0x0000 @ End of parameters -Call 0x08063c91 +Call sub_08063C90 _0807EA94 Wait 0x000f _0807E878 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -213,16 +206,15 @@ StartScript _0807EB44 0x0004 _0807E930 0x0000 _0807EF80 0x000a -Call 0x0807f349 +Call sub_0807F348 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call 0x0807df29 +Call sub_0807DF28 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0008 .short 0x0000 @ End of parameters @@ -231,7 +223,7 @@ JumpIf 0x000c SetRoomFlag 0x000e TextboxNoOverlap 0x2b10 _0807EA94 -Call 0x080634e5 +Call sub_080634E4 .short 0x2006 @ _0807E078 with 7 parameters .short 0x000e .short 0x0020 @@ -252,32 +244,29 @@ Jump 0x000e CheckGlobalFlag 0x003b JumpIfNot 0x0072 Jump 0x0002 -Call 0x080634ed -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf78d -.short 0x0807 +Call sub_080634EC +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F78C .short 0x0000 .short 0x0000 @ End of parameters _0807EA94 _0807E3E8 JumpIfNot 0x005a -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf7c5 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F7C4 .short 0x0000 .short 0x0000 @ End of parameters JumpIfNot 0x0030 _0807E48C 0x0020 JumpIfNot 0x0030 -Call 0x08063505 +Call sub_08063504 JumpIf 0x002e TextboxNoOverlap 0x2b07 _0807EA94 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf801 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F800 .short 0x0000 .short 0x0000 @ End of parameters @@ -293,7 +282,7 @@ TextboxNoOverlap 0x2b0b Jump 0x0006 TextboxNoOverlap 0x2b0e _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xff16 .short 0x0000 @@ -314,13 +303,13 @@ _0807EB44 0x0004 Jump 0xffe8 StartScript _0807E930 0x0008 -Call 0x08062a49 +Call sub_08062A48 _0807EF80 0x000a StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call 0x0806265d +Call sub_0806265C _0807EA94 _0807E878 Jump 0xffec @@ -351,7 +340,7 @@ JumpIfNot 0xfffc _0807E864 _0807EB74 .short 0x0411 @ HasRoomItemForSale with 0 parameters -Call 0x0807f77d +Call sub_0807F77C .short 0x0c5d @ _0807EAF0 with 2 parameters .short 0x3c08 .short 0x3c09 @@ -371,16 +360,15 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EF80 0x0000 .short 0x0411 @ HasRoomItemForSale with 0 parameters JumpIf 0x000a TextboxNoOverlap 0x3c07 Jump 0x0048 -Call 0x08062eb9 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf78d -.short 0x0807 +Call sub_08062EB8 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F78C .short 0x0000 .short 0x0000 @ End of parameters @@ -394,7 +382,7 @@ TextboxNoOverlap 0x3c04 Jump 0x001c WaitPlayerAction8 ModHealth 0x0008 -Call 0x08062edd +Call sub_08062EDC JumpIf 0x000a TextboxNoOverlap 0x3c06 Jump 0x0004 @@ -415,7 +403,7 @@ JumpIfNot 0xfffc _0807E864 _0807E930 0x0004 StartScript -Call 0x08062d19 +Call sub_08062D18 JumpIfNot 0x002a StopScript _0807EA94 @@ -426,7 +414,7 @@ JumpIf 0x000a TextboxNoOverlap 0x4008 Jump 0x0010 ModRupees 0xff38 -Call 0x08062e15 +Call sub_08062E14 TextboxNoOverlap 0x4007 StopScript _0807EA94 @@ -443,9 +431,9 @@ StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EF80 0x0001 -Call 0x08062cbd +Call sub_08062CBC _0807EA94 _0807E878 _0807EF80 0x0000 @@ -457,14 +445,14 @@ _0807EF80 0x0000 _0807EF80 0x000a _0807EF80 0x0007 _0807E9D4 -Call 0x0807f349 -Call 0x08069685 +Call sub_0807F348 +Call sub_08069684 StopScript StopScript StartScript CheckPlayerInRegion2 0x3030 JumpIfNot 0xfff6 -Call 0x080696b1 +Call sub_080696B0 StopScript StartScript CheckPlayerInRegion2 0x3030 @@ -475,7 +463,7 @@ CheckEntityInteractType JumpIfNot 0xffea StopScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 _0807EB74 CheckGlobalFlag 0x0042 JumpIfNot 0x002a @@ -493,13 +481,13 @@ TextboxNoOverlap 0x2c1a Jump 0x005c StopScript _0807E864 -Call 0x0807df39 +Call sub_0807DF38 _0807EB74 -Call 0x08069661 +Call sub_08069660 _0807EA94 _0807E3E8 JumpIfNot 0x003a -Call 0x08069719 +Call sub_08069718 JumpIfNot 0x0030 WaitPlayerAction8 _0807EA94 @@ -515,9 +503,9 @@ Jump 0x000a SetLocalFlag 0x00fa TextboxNoOverlap 0x2c20 _0807EA94 -Call 0x0807f83d +Call sub_0807F83C _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EB44 0x0004 _0807EF80 0x0000 @@ -525,15 +513,15 @@ Jump 0xff36 CheckPlayerInRegion2 0x0808 JumpIfNot 0xfffa _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -StartPlayerScript 0x080109f0 +Call sub_0807F9A4 +Call sub_0807DF28 +StartPlayerScript gUnk_080109F0 WaitForSomething2 0x00000001 CheckRoomFlag 0x0001 JumpIf 0x0008 _0807EB28 0x0b63 _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffc6 StartScript @@ -541,20 +529,20 @@ _0807EF80 0x0007 CheckKinstoneFused 0x001b JumpIf 0xe67a StopScript -Call 0x080869a5 +Call sub_080869A4 JumpIfNot 0xfff8 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 CheckRoomFlag 0x0001 JumpIf 0x0008 _0807EB28 0x0b62 _0807EA94 -StartPlayerScript 0x080109f0 +StartPlayerScript gUnk_080109F0 WaitForSomething2 0x00000001 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffc4 -Call 0x0808692d +Call sub_0808692C SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08010964.inc b/data/scripts/gUnk_08010964.inc index 2f63d2b3..68c6f138 100644 --- a/data/scripts/gUnk_08010964.inc +++ b/data/scripts/gUnk_08010964.inc @@ -2,15 +2,15 @@ SCRIPT_START gUnk_08010964 CheckPlayerInRegion2 0x0808 JumpIfNot 0xfffa _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -StartPlayerScript 0x08010a38 +Call sub_0807F9A4 +Call sub_0807DF28 +StartPlayerScript gUnk_08010A38 WaitForSomething2 0x00000001 CheckRoomFlag 0x0001 JumpIf 0x0008 _0807EB28 0x0b63 _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffc6 StartScript @@ -21,15 +21,15 @@ CheckPlayerInRegion2 0x0808 JumpIfNot 0xffee StopScript _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -StartPlayerScript 0x08010a38 +Call sub_0807F9A4 +Call sub_0807DF28 +StartPlayerScript gUnk_08010A38 WaitForSomething2 0x00000001 CheckRoomFlag 0x0001 JumpIf 0x0008 _0807EB28 0x0b64 _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffb8 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_080109F0.inc b/data/scripts/gUnk_080109F0.inc index 05097e85..335eaf5a 100644 --- a/data/scripts/gUnk_080109F0.inc +++ b/data/scripts/gUnk_080109F0.inc @@ -6,6 +6,6 @@ _0807ECC4 0x0010 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08010A14.inc b/data/scripts/gUnk_08010A14.inc index 2a01dc4f..196aa06f 100644 --- a/data/scripts/gUnk_08010A14.inc +++ b/data/scripts/gUnk_08010A14.inc @@ -6,6 +6,6 @@ _0807EC64 0x0010 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08010A38.inc b/data/scripts/gUnk_08010A38.inc index 77c712ad..9687579a 100644 --- a/data/scripts/gUnk_08010A38.inc +++ b/data/scripts/gUnk_08010A38.inc @@ -6,6 +6,6 @@ _0807EC94 0x0010 _0807EB44 0x0002 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08010A5C.inc b/data/scripts/gUnk_08010A5C.inc index e454f7a6..298feea6 100644 --- a/data/scripts/gUnk_08010A5C.inc +++ b/data/scripts/gUnk_08010A5C.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08010A5C StartScript -Call 0x0807df29 +Call sub_0807DF28 _0807E864 ModHealth 0x00a0 StopScript @@ -8,11 +8,11 @@ Wait 0x003c _0807E778 0x0004 DoFade4 WaitFor_2 -Call 0x0807f0d9 +Call sub_0807F0D8 JumpIfNot 0xfff8 _0807EF80 0x0014 _0807E878 -Call 0x0807df51 -Call 0x080791d1 +Call sub_0807DF50 +Call sub_080791D0 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08010A98.inc b/data/scripts/gUnk_08010A98.inc index d23275f4..60379c95 100644 --- a/data/scripts/gUnk_08010A98.inc +++ b/data/scripts/gUnk_08010A98.inc @@ -1,32 +1,29 @@ SCRIPT_START gUnk_08010A98 StartScript _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x72b1 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080672B0 .short 0x0000 .short 0x0000 @ End of parameters _0807EF80 0x000a -Call 0x08067315 +Call sub_08067314 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x72b1 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080672B0 .short 0x0004 .short 0x0000 @ End of parameters -Call 0x08067305 +Call sub_08067304 _0807EA94 _0807E878 _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x72b1 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080672B0 .short 0x0000 .short 0x0000 @ End of parameters @@ -37,25 +34,22 @@ JumpIfNot 0x0076 _0807EB44 0x0004 _0807EF80 0x0000 SetEntityNonPlanarMovement 0x0180 -.short 0x0c0c @ CallWithArg with 2 parameters -.short 0xf349 -.short 0x0807 -@ End of parameters -Call 0x0806075d +.short 0x0c0c @ CallWithArg with 0 parameters +.word sub_0807F348 +Call sub_0806075C StopScript _0807EA94 -Call 0x080606c1 +Call sub_080606C0 StopScript -Call 0x0806076d +Call sub_0806076C _0807EF80 0x0007 -Call 0x08060701 +Call sub_08060700 StopScript StartScript _0807E564 JumpIf 0x0010 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x08e5 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080608E4 .short 0x0000 .short 0x0000 @ End of parameters @@ -67,9 +61,8 @@ StopScript _0807EF80 0x0000 StopScript StartScript -.short 0x140c @ CallWithArg with 4 parameters -.short 0x08e5 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080608E4 .short 0x0001 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_08010B68.inc b/data/scripts/gUnk_08010B68.inc index cdeb2447..36afe5e4 100644 --- a/data/scripts/gUnk_08010B68.inc +++ b/data/scripts/gUnk_08010B68.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_08010B68 StartScript _0807E564 JumpIfNot 0x003e -Call 0x0807f925 +Call sub_0807F924 _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x0007 @@ -17,7 +17,7 @@ JumpIfNot 0xfff2 StopScript _0807E864 _0807EB74 -Call 0x0806e2dd +Call sub_0806E2DC _0807EA94 _0807E878 Jump 0xffde diff --git a/data/scripts/gUnk_08010BB4.inc b/data/scripts/gUnk_08010BB4.inc index 9ecb46e8..7ed5fa31 100644 --- a/data/scripts/gUnk_08010BB4.inc +++ b/data/scripts/gUnk_08010BB4.inc @@ -3,23 +3,23 @@ StartScript _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0008 -Call 0x0806e441 +Call sub_0806E440 StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 _0807EF80 0x0000 -Call 0x0806e419 +Call sub_0806E418 _0807EA94 _0807E878 _0807E930 0x0008 Jump 0xffe2 .short 0x0000 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -StartPlayerScript 0x08011074 +Call sub_0807F9A4 +Call sub_0807DF28 +StartPlayerScript gUnk_08011074 WaitForSomething2 0x00000400 _0807F078 0x0034, 0x0002 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters @@ -45,18 +45,18 @@ SoundReq0x80100000 _0807E778 0x0004 DoFade5 WaitFor_2 -Call 0x08064181 -Call 0x08064181 -Call 0x08064181 -Call 0x08064181 -Call 0x08064181 -Call 0x08064181 -Call 0x08064181 -Call 0x08064181 +Call sub_08064180 +Call sub_08064180 +Call sub_08064180 +Call sub_08064180 +Call sub_08064180 +Call sub_08064180 +Call sub_08064180 +Call sub_08064180 LoadRoomEntityList 0x080f06e0 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 -StartPlayerScript 0x08011098 +StartPlayerScript gUnk_08011098 WaitForSomething2 0x00000400 SetEntityPositionRelative 0x005001f8 _0807F0B4 0x0007 @@ -127,9 +127,8 @@ SoundReq 0x01c7 SoundReq 0x00e5 _0807E5F8 0x00000100 _0807E5F8 0x00002800 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfb29 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FB28 .short 0x0003 .short 0x0000 @ End of parameters @@ -150,9 +149,8 @@ _0807E5F8 0x00028000 _0807E5F8 0x00000100 WaitForSomething2 0x00000200 WaitForSomething2 0x00050000 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfb29 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FB28 .short 0x0003 .short 0x0000 @ End of parameters @@ -160,18 +158,16 @@ SoundReq 0x00e5 _0807E5F8 0x00028000 WaitForSomething2 0x00050000 SoundReq 0x0125 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfb29 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FB28 .short 0x0003 .short 0x0000 @ End of parameters _0807E5F8 0x08000000 _0807E5F8 0x00800000 WaitForSomething2 0x01000000 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xdded -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DDEC .short 0x0002 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_08010E5A.inc b/data/scripts/gUnk_08010E5A.inc index 013366c0..d38d26d0 100644 --- a/data/scripts/gUnk_08010E5A.inc +++ b/data/scripts/gUnk_08010E5A.inc @@ -1,25 +1,22 @@ SCRIPT_START gUnk_08010E5A Wait 0x001e SoundReq 0x0125 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfb29 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FB28 .short 0x0003 .short 0x0000 @ End of parameters Wait 0x003c SoundReq 0x0125 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfb29 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FB28 .short 0x0003 .short 0x0000 @ End of parameters Wait 0x0004 SoundReq 0x0125 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfb29 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FB28 .short 0x0003 .short 0x0000 @ End of parameters @@ -39,24 +36,21 @@ WaitForSomething2 0x00000020 _0807E778 0x0002 DoFade6 WaitFor_2 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xde19 -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DE18 .short 0x0002 .short 0x0000 @ End of parameters _0807F0C8 0x0000, 0x0000 -Call 0x0806dc3d -Call 0x080791bd -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf245 -.short 0x0807 +Call sub_0806DC3C +Call sub_080791BC +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F244 .short 0x000d .short 0x0000 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf29d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F29C .short 0x49f6 .short 0x0800 @ End of parameters @@ -70,13 +64,12 @@ WaitForSomething2 0x00000080 SoundReq 0x01c3 _0807E5F8 0x20000000 Wait 0x0078 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf29d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F29C .short 0x0000 .short 0x0000 @ End of parameters -Call 0x0806dc59 +Call sub_0806DC58 _0807E5F8 0x40000000 _0807E5F8 0x00000010 _0807E5F8 0x00000100 @@ -92,9 +85,8 @@ _0807EA94 .short 0x0000 @ End of parameters _0807EA94 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xdded -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DDEC .short 0x0002 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_08010F84.inc b/data/scripts/gUnk_08010F84.inc index 56905c01..a9b0d8c3 100644 --- a/data/scripts/gUnk_08010F84.inc +++ b/data/scripts/gUnk_08010F84.inc @@ -2,57 +2,51 @@ SCRIPT_START gUnk_08010F84 Wait 0x003c _0807E5F8 0x00000100 WaitForSomething2 0x00000200 -StartPlayerScript 0x080110bc +StartPlayerScript gUnk_080110BC WaitForSomething2 0x00000400 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1047 .short 0x0000 @ End of parameters _0807EA94 -Call 0x0806dc3d -Call 0x080791bd -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf245 -.short 0x0807 +Call sub_0806DC3C +Call sub_080791BC +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F244 .short 0x000d .short 0x0000 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf29d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F29C .short 0x49f6 .short 0x0800 @ End of parameters Wait 0x001e _0807E5F8 0x00000100 WaitForSomething2 0x00000200 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf29d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F29C .short 0x0000 .short 0x0000 @ End of parameters -Call 0x0806dc59 +Call sub_0806DC58 Wait 0x003c _0807E5F8 0x08000000 SoundReq 0x0125 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfb29 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FB28 .short 0x0003 .short 0x0000 @ End of parameters Wait 0x000f SoundReq 0x0125 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfb29 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FB28 .short 0x0003 .short 0x0000 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0xde19 -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DE18 .short 0x0002 .short 0x0000 @ End of parameters @@ -77,7 +71,7 @@ SetEntityPositionRelative 0x009801f8 Wait 0x0078 _0807E5F8 0x00000100 WaitForSomething2 0x00000200 -Call 0x0804bcdd +Call sub_0804BCDC _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08011074.inc b/data/scripts/gUnk_08011074.inc index 38da146f..e190a719 100644 --- a/data/scripts/gUnk_08011074.inc +++ b/data/scripts/gUnk_08011074.inc @@ -6,5 +6,5 @@ _0807EDD4 0x01e8, 0x0050 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000400 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08011098.inc b/data/scripts/gUnk_08011098.inc index a86bbcb8..48db15b4 100644 --- a/data/scripts/gUnk_08011098.inc +++ b/data/scripts/gUnk_08011098.inc @@ -5,5 +5,5 @@ _0807EF80 0x0000 _0807E5F8 0x00000400 _0807E610 0x00000002 StopScript -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_080110BC.inc b/data/scripts/gUnk_080110BC.inc index 5ff9e2a6..e37f55c2 100644 --- a/data/scripts/gUnk_080110BC.inc +++ b/data/scripts/gUnk_080110BC.inc @@ -8,5 +8,5 @@ _0807EDD4 0x01d8, 0x0068 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000400 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_080110E8.inc b/data/scripts/gUnk_080110E8.inc index 340d4165..888fb7cd 100644 --- a/data/scripts/gUnk_080110E8.inc +++ b/data/scripts/gUnk_080110E8.inc @@ -3,14 +3,14 @@ SoundReq 0x007a _0807EB44 0x0004 _0807EF80 0x000d SoundReq 0x0086 -Call 0x0807f36d +Call sub_0807F36C SetEntityNonPlanarMovement 0x0400 _0807ECF4 0x0008 StartScript -Call 0x0807f1e9 +Call sub_0807F1E8 _0807EF80 0x0011 StopScript -Call 0x0807f2d5 +Call sub_0807F2D4 WaitForSomething 0x80000000 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08011128.inc b/data/scripts/gUnk_08011128.inc index 9f6aef32..9ff7e44a 100644 --- a/data/scripts/gUnk_08011128.inc +++ b/data/scripts/gUnk_08011128.inc @@ -27,7 +27,7 @@ WaitForSomething2 0x00000004 _0807EF80 0x0010 Wait 0x001e _0807EF80 0x0010 -Call 0x0807f3c9 +Call sub_0807F3C8 SetEntityNonPlanarMovement 0x0400 SetEntityDirection 0x001c _0807EC1C 0x003c diff --git a/data/scripts/gUnk_080111CC.inc b/data/scripts/gUnk_080111CC.inc index 7f1b7db9..003e82a1 100644 --- a/data/scripts/gUnk_080111CC.inc +++ b/data/scripts/gUnk_080111CC.inc @@ -2,14 +2,14 @@ SCRIPT_START gUnk_080111CC StartScript _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 -Call 0x08066d05 +Call sub_08066D04 StopScript -Call 0x0807f339 +Call sub_0807F338 WaitForSomething2 0x00000010 -Call 0x08066d15 +Call sub_08066D14 JumpIf 0x0004 MoveEntityToPlayer -Call 0x0807f8bd +Call sub_0807F8BC JumpIf 0x0008 SetEntityPositionRelative 0x00b801f8 _0807EF80 0x0007 @@ -31,7 +31,7 @@ _0807EDD4 0x01e8, 0x0040 _0807EF80 0x0000 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 -Call 0x08095811 +Call sub_08095810 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 _0807EF80 0x0001 @@ -42,10 +42,10 @@ WaitForSomething2 0x00000010 SoundReq 0x01c9 _0807EF80 0x0010 Wait 0x0014 -Call 0x08066e21 +Call sub_08066E20 Wait 0x0014 _0807EF80 0x0010 -Call 0x0807f2d5 +Call sub_0807F2D4 SoundReq 0x01ca _0807E5F8 0x00000020 WaitForSomething2 0x00000010 diff --git a/data/scripts/gUnk_080112C4.inc b/data/scripts/gUnk_080112C4.inc index 8fa630b7..cba7271c 100644 --- a/data/scripts/gUnk_080112C4.inc +++ b/data/scripts/gUnk_080112C4.inc @@ -2,8 +2,8 @@ SCRIPT_START gUnk_080112C4 StartScript _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 -Call 0x08095245 -Call 0x0807f339 +Call sub_08095244 +Call sub_0807F338 StopScript WaitForSomething 0x0002a800 _0807EF80 0x0007 @@ -14,7 +14,7 @@ _0807ECC4 0x0010 Wait 0x003c _0807ECC4 0x0010 _0807E930 0x0002 -Call 0x08064051 +Call sub_08064050 .short 0x1406 @ _0807E078 with 4 parameters .short 0x0008 .short 0x009e @@ -46,7 +46,7 @@ WaitForSomething2 0x00000800 _0807EF80 0x0010 Wait 0x000a _0807EF80 0x0010 -Call 0x0807f3c9 +Call sub_0807F3C8 _0807E930 0x0014 SetEntityNonPlanarMovement 0x0400 SetEntityDirection 0x001e diff --git a/data/scripts/gUnk_080113AA.inc b/data/scripts/gUnk_080113AA.inc index 7eee5c8d..cfa9e768 100644 --- a/data/scripts/gUnk_080113AA.inc +++ b/data/scripts/gUnk_080113AA.inc @@ -24,7 +24,7 @@ WaitForSomething2 0x00002000 _0807EF80 0x0010 Wait 0x000a _0807EF80 0x0010 -Call 0x0807f3c9 +Call sub_0807F3C8 _0807E930 0x0014 SetEntityNonPlanarMovement 0x0400 SetEntityDirection 0x0002 diff --git a/data/scripts/gUnk_08011442.inc b/data/scripts/gUnk_08011442.inc index ce71ee93..1518a698 100644 --- a/data/scripts/gUnk_08011442.inc +++ b/data/scripts/gUnk_08011442.inc @@ -33,7 +33,7 @@ _0807E930 0x0013 _0807EF80 0x0010 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 -Call 0x0807f3c9 +Call sub_0807F3C8 _0807E930 0x0014 SetEntityNonPlanarMovement 0x0400 SetEntityDirection 0x001e diff --git a/data/scripts/gUnk_08011508.inc b/data/scripts/gUnk_08011508.inc index 5eda78db..0a58e4b7 100644 --- a/data/scripts/gUnk_08011508.inc +++ b/data/scripts/gUnk_08011508.inc @@ -33,7 +33,7 @@ _0807E930 0x0013 _0807EF80 0x0010 _0807E5F8 0x00040000 WaitForSomething2 0x00020000 -Call 0x0807f3c9 +Call sub_0807F3C8 _0807E930 0x0014 SetEntityNonPlanarMovement 0x0400 SetEntityDirection 0x0002 diff --git a/data/scripts/gUnk_08011640.inc b/data/scripts/gUnk_08011640.inc index c80b52e3..a78e490d 100644 --- a/data/scripts/gUnk_08011640.inc +++ b/data/scripts/gUnk_08011640.inc @@ -4,7 +4,7 @@ _0807EF80 0x0008 _0807EB44 0x0004 SetEntityNonPlanarMovement 0x0100 StopScript -Call 0x0807f339 +Call sub_0807F338 WaitForSomething2 0x00000040 _0807EF80 0x0007 _0807EF80 0x0001 @@ -16,7 +16,7 @@ WaitForSomething2 0x00000040 _0807EF80 0x0010 Wait 0x001e _0807EF80 0x0010 -Call 0x0807f3c9 +Call sub_0807F3C8 SetEntityNonPlanarMovement 0x0400 SetEntityDirection 0x0008 _0807EC1C 0x003c diff --git a/data/scripts/gUnk_080116A8.inc b/data/scripts/gUnk_080116A8.inc index e1a13f87..91e4eaa3 100644 --- a/data/scripts/gUnk_080116A8.inc +++ b/data/scripts/gUnk_080116A8.inc @@ -3,7 +3,7 @@ StartScript _0807EB44 0x0000 SetEntityNonPlanarMovement 0x0100 StopScript -Call 0x0807f339 +Call sub_0807F338 WaitForSomething2 0x00000100 _0807EF80 0x0001 _0807EDD4 0x01f8, 0x00d0 @@ -12,30 +12,29 @@ _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EB44 0x0004 _0807EF80 0x001c -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EB44 0x0000 _0807EF80 0x001c -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EB44 0x0000 _0807EF80 0x001a -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EF80 0x0000 _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EB44 0x0000 _0807EF80 0x0014 SoundReq 0x0120 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5421 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095420 .short 0x1890 .short 0x0801 @ End of parameters @@ -55,9 +54,8 @@ _0807E5F8 0x00000200 WaitForSomething2 0x00000100 _0807EF80 0x0014 SoundReq 0x01c4 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x545d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0809545C .short 0x18d4 .short 0x0801 @ End of parameters @@ -80,13 +78,13 @@ _0807EF80 0x0004 Wait 0x005a _0807EB44 0x0004 _0807EF80 0x001c -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EB44 0x0004 _0807EF80 0x0000 Wait 0x001e _0807E5F8 0x00000200 WaitForSomething2 0x00000100 -Call 0x08066ca5 +Call sub_08066CA4 _0807EF80 0x0008 Wait 0x0078 _0807E5F8 0x00000200 diff --git a/data/scripts/gUnk_0801183C.inc b/data/scripts/gUnk_0801183C.inc index 2eb2de7b..7de5a2a9 100644 --- a/data/scripts/gUnk_0801183C.inc +++ b/data/scripts/gUnk_0801183C.inc @@ -1,12 +1,12 @@ SCRIPT_START gUnk_0801183C StartScript -Call 0x08095331 +Call sub_08095330 StopScript WaitForSomething2 0x00800000 _0807EF3C 0x0000, 0x0020 _0807E5F8 0x01000000 WaitForSomething2 0x00800000 -Call 0x08095365 +Call sub_08095364 SoundReq 0x0122 Wait 0x003c _0807E5F8 0x01000000 diff --git a/data/scripts/gUnk_08011890.inc b/data/scripts/gUnk_08011890.inc index 116e1599..6f5e8b98 100644 --- a/data/scripts/gUnk_08011890.inc +++ b/data/scripts/gUnk_08011890.inc @@ -2,13 +2,13 @@ SCRIPT_START gUnk_08011890 StartScript _0807E930 0x0000 SetEntityNonPlanarMovement 0x0200 -Call 0x08095459 -Call 0x08094b81 +Call nullsub_527 +Call sub_08094B80 StopScript Wait 0x00f0 -Call 0x08094b6d +Call sub_08094B6C _0807EDD4 0x01f8, 0x0088 -Call 0x08094b81 +Call sub_08094B80 SoundReq 0x01cc _0807E5F8 0x10000000 WaitForSomething2 0x08000000 diff --git a/data/scripts/gUnk_080118D4.inc b/data/scripts/gUnk_080118D4.inc index ccd69ee2..b5ea3bbc 100644 --- a/data/scripts/gUnk_080118D4.inc +++ b/data/scripts/gUnk_080118D4.inc @@ -2,15 +2,15 @@ SCRIPT_START gUnk_080118D4 StartScript _0807E930 0x0000 SetEntityNonPlanarMovement 0x0200 -Call 0x08095459 -Call 0x08094b81 +Call nullsub_527 +Call sub_08094B80 StopScript WaitForSomething2 0x08000000 -Call 0x08094b6d +Call sub_08094B6C _0807EDD4 0x01d8, 0x0078 -StartPlayerScript 0x080110e8 +StartPlayerScript gUnk_080110E8 _0807EDD4 0x01d8, 0x0058 -Call 0x08094b81 +Call sub_08094B80 SoundReq 0x009a SoundReq 0x01c6 _0807E5F8 0x10000000 diff --git a/data/scripts/gUnk_08011930.inc b/data/scripts/gUnk_08011930.inc index 909e9250..586cc75a 100644 --- a/data/scripts/gUnk_08011930.inc +++ b/data/scripts/gUnk_08011930.inc @@ -1,5 +1,5 @@ SCRIPT_START gUnk_08011930 WaitForSomething 0x20000000 -Call 0x0809567d +Call sub_0809567C SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_0801194C.inc b/data/scripts/gUnk_0801194C.inc index 5783e0aa..725a60b7 100644 --- a/data/scripts/gUnk_0801194C.inc +++ b/data/scripts/gUnk_0801194C.inc @@ -11,9 +11,8 @@ StartScript _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -22,9 +21,8 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -41,15 +39,14 @@ StartScript _0807E9D4 _0807EB44 0x0004 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x000c .short 0x0000 @ End of parameters StopScript Wait 0x003c -Call 0x0806407d +Call sub_0806407C Jump 0xfff4 .short 0x0000 StartScript @@ -64,9 +61,8 @@ StartScript _0807EB44 0x0006 _0807E9D4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -75,13 +71,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters -Call 0x08064429 +Call sub_08064428 _0807EA94 _0807E878 Jump 0xffe0 @@ -90,9 +85,8 @@ StartScript _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -101,9 +95,8 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -115,9 +108,8 @@ StartScript _0807EB44 0x0002 _0807E9D4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -126,15 +118,13 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x44b5 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080644B4 .short 0x0006 .short 0x0000 @ End of parameters @@ -148,9 +138,8 @@ StartScript _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -159,9 +148,8 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -172,22 +160,21 @@ Jump 0xffe2 CheckRoomFlag 0x000f JumpIfNot 0xfffa _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1321 .short 0x0007 @ End of parameters _0807EA94 SetLocalFlag 0x0010 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda1d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA1C .short 0x0003 .short 0x0000 @ End of parameters _0807E878 -Call 0x0807df51 +Call sub_0807DF50 _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08011B20.inc b/data/scripts/gUnk_08011B20.inc index 7de59bd6..35081eb2 100644 --- a/data/scripts/gUnk_08011B20.inc +++ b/data/scripts/gUnk_08011B20.inc @@ -1,13 +1,13 @@ SCRIPT_START gUnk_08011B20 _0807E864 -Call 0x0807df29 +Call sub_0807DF28 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1320 .short 0x000c @ End of parameters _0807EA94 _0807E878 -Call 0x0807df51 +Call sub_0807DF50 _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08011B40.inc b/data/scripts/gUnk_08011B40.inc index 911947db..6ad1ab68 100644 --- a/data/scripts/gUnk_08011B40.inc +++ b/data/scripts/gUnk_08011B40.inc @@ -16,7 +16,7 @@ TextboxNoOverlap 0x3d07 _0807EA94 _0807EB44 0x0004 ClearGlobalFlag 0x0050 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 CheckEntityInteractType JumpIfNot 0xfffc @@ -39,22 +39,20 @@ ModRupees 0xfff6 Wait 0x001e TextboxNoOverlap 0x3d06 _0807EA94 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xc2a1 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806C2A0 .short 0x0000 .short 0x0000 @ End of parameters WaitFor_2 Wait 0x003c -Call 0x0806c225 +Call sub_0806C224 Jump 0xffb8 StartScript _0807E888 StopScript -.short 0x140c @ CallWithArg with 4 parameters -.short 0xc2a1 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806C2A0 .short 0x0001 .short 0x0000 @ End of parameters @@ -70,7 +68,7 @@ _0807E864 Wait 0x003c CameraTargetEntity Wait 0x003c -Call 0x0806c23d +Call Simon_CreateChest Wait 0x003c CameraTargetPlayer _0807E878 @@ -79,13 +77,12 @@ JumpIfNot 0xfffa _0807E888 WaitPlayerAction8 Wait 0x001e -.short 0x140c @ CallWithArg with 4 parameters -.short 0xc2a1 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806C2A0 .short 0x0000 .short 0x0000 @ End of parameters WaitFor_2 Wait 0x003c -Call 0x0806c281 +Call sub_0806C280 SCRIPT_END diff --git a/data/scripts/gUnk_08011C50.inc b/data/scripts/gUnk_08011C50.inc index d576008a..7edf3874 100644 --- a/data/scripts/gUnk_08011C50.inc +++ b/data/scripts/gUnk_08011C50.inc @@ -3,9 +3,8 @@ StartScript _0807E864 StopScript Wait 0x003c -.short 0x140c @ CallWithArg with 4 parameters -.short 0xc2a1 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806C2A0 .short 0x0001 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_08011C7C.inc b/data/scripts/gUnk_08011C7C.inc index 9ada852c..d1d98f08 100644 --- a/data/scripts/gUnk_08011C7C.inc +++ b/data/scripts/gUnk_08011C7C.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08011C7C StartScript -Call 0x08064829 +Call sub_08064828 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a @@ -55,7 +55,7 @@ _0807EF80 0x0001 Jump 0xffdc .short 0x0000 StartScript -Call 0x08064929 +Call sub_08064928 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a @@ -110,7 +110,7 @@ _0807EF80 0x0001 Jump 0xffdc .short 0x0000 StartScript -Call 0x08064a29 +Call sub_08064A28 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a @@ -165,7 +165,7 @@ _0807EF80 0x0001 Jump 0xffdc .short 0x0000 StartScript -Call 0x08064829 +Call sub_08064828 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a @@ -208,7 +208,7 @@ _0807EB44 0x0004 _0807EF80 0x0001 Jump 0xffdc StartScript -Call 0x08064929 +Call sub_08064928 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a @@ -251,7 +251,7 @@ _0807EB44 0x0004 _0807EF80 0x0001 Jump 0xffdc StartScript -Call 0x08064a29 +Call sub_08064A28 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a @@ -294,7 +294,7 @@ _0807EB44 0x0004 _0807EF80 0x0001 Jump 0xffdc StartScript -Call 0x08064829 +Call sub_08064828 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a @@ -325,7 +325,7 @@ TextboxNoOverlap 0x3125 _0807EA94 _0807F034 0x0031 WaitPlayerAction8 -Call 0x0807fc25 +Call sub_0807FC24 Jump 0x0006 TextboxNoOverlap 0x3127 _0807EA94 @@ -335,7 +335,7 @@ _0807EF80 0x0001 Jump 0xff8e .short 0x0000 StartScript -Call 0x08064929 +Call sub_08064928 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a @@ -366,7 +366,7 @@ TextboxNoOverlap 0x3119 _0807EA94 _0807F034 0x002f WaitPlayerAction8 -Call 0x0807fc25 +Call sub_0807FC24 Jump 0x0006 TextboxNoOverlap 0x311b _0807EA94 @@ -376,7 +376,7 @@ _0807EF80 0x0001 Jump 0xff8e .short 0x0000 StartScript -Call 0x08064a29 +Call sub_08064A28 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a @@ -407,7 +407,7 @@ TextboxNoOverlap 0x311f _0807EA94 _0807F034 0x0030 WaitPlayerAction8 -Call 0x0807fc25 +Call sub_0807FC24 Jump 0x0006 TextboxNoOverlap 0x3121 _0807EA94 @@ -417,7 +417,7 @@ _0807EF80 0x0001 Jump 0xff8e .short 0x0000 StartScript -Call 0x08064829 +Call sub_08064828 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a @@ -434,7 +434,7 @@ _0807EB44 0x0004 _0807EF80 0x0001 Jump 0xffe0 StartScript -Call 0x08064929 +Call sub_08064928 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a @@ -451,7 +451,7 @@ _0807EB44 0x0004 _0807EF80 0x0001 Jump 0xffe0 StartScript -Call 0x08064a29 +Call sub_08064A28 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a @@ -469,7 +469,7 @@ _0807EF80 0x0001 Jump 0xffe0 StartScript _0807EB44 0x0004 -Call 0x08061fd9 +Call sub_08061FD8 _0807E9D4 _0807EF80 0x000a StopScript @@ -484,7 +484,7 @@ JumpIfNot 0xffe8 StopScript _0807EB74 _0807E864 -Call 0x08061fd9 +Call sub_08061FD8 TextboxNoOverlapFollow 0x2302 _0807EA94 _0807E878 @@ -501,7 +501,7 @@ JumpIfNot 0xffe8 StopScript _0807EB74 _0807E864 -Call 0x08061fd9 +Call sub_08061FD8 TextboxNoOverlapFollow 0x2303 _0807EA94 _0807E878 @@ -509,10 +509,10 @@ Jump 0xffd0 StopScript _0807EB74 _0807E864 -Call 0x08061fd9 +Call sub_08061FD8 _0807EF80 0x000b -Call 0x08061fb1 -Call 0x08061f95 +Call sub_08061FB0 +Call sub_08061F94 LoadRoomEntityList 0x080f2758 _0807EF80 0x0008 Wait 0x003c diff --git a/data/scripts/gUnk_0801232C.inc b/data/scripts/gUnk_0801232C.inc index dbaf7cc8..2a3be8da 100644 --- a/data/scripts/gUnk_0801232C.inc +++ b/data/scripts/gUnk_0801232C.inc @@ -22,7 +22,7 @@ _0807EF80 0x0008 StopScript CheckLocalFlag 0x0004 JumpIfNot 0xfffa -Call 0x0807df29 +Call sub_0807DF28 _0807E864 SoundReq0x80100000 StartScript @@ -44,7 +44,7 @@ SoundReq 0x01ce SetEntity0x20 0xffff8000 Wait 0x003c _0807E8E4_0 -StartPlayerScript 0x08012410 +StartPlayerScript gUnk_08012410 WaitForSomething2 0x00000001 TextboxNoOverlap 0x1402 _0807EA94 @@ -64,8 +64,8 @@ SoundReq2 0xffff _0807EB28 0x1403 _0807EA94 _0807E914 0x00000203 -Call 0x0807f421 -Call 0x0807df51 +Call sub_0807F420 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08012410.inc b/data/scripts/gUnk_08012410.inc index 339a5051..39c087b1 100644 --- a/data/scripts/gUnk_08012410.inc +++ b/data/scripts/gUnk_08012410.inc @@ -5,6 +5,6 @@ StopScript _0807EF80 0x0004 Wait 0x003c _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08012430.inc b/data/scripts/gUnk_08012430.inc index a6b89ccb..ed93e9bb 100644 --- a/data/scripts/gUnk_08012430.inc +++ b/data/scripts/gUnk_08012430.inc @@ -8,9 +8,9 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807E930 0x0008 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807E930 0x0009 -Call 0x0806b2b5 +Call sub_0806B2B4 _0807EA94 CheckLocalFlag 0x00b3 JumpIf 0x0010 @@ -23,15 +23,15 @@ _0807E930 0x0000 Jump 0xffc4 .short 0x0000 StartScript -Call 0x08054565 +Call sub_08054564 StopScript CheckPlayerInRegion 0x0208, 0x02c8, 0x4020 JumpIfNot 0xfff6 SoundReq0x80100000 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -StartPlayerScript 0x08012ab0 +Call sub_0807F9A4 +Call sub_0807DF28 +StartPlayerScript gUnk_08012AB0 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1101 .short 0x0007 @@ -44,11 +44,11 @@ WaitFor_2 .short 0x0842 @ _0807E858 with 1 parameters .short 0x0000 @ End of parameters -Call 0x080791bd +Call sub_080791BC LoadRoomEntityList 0x080f4d70 -Call 0x0805ebcd +Call DeleteAllEnemies SetEntityPositionRelative 0x01680388 -Call 0x0807f845 +Call sub_0807F844 _0807E778 0x0004 _0807E800 0x00000000 WaitFor_2 @@ -68,23 +68,23 @@ _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 MoveEntityToPlayer -Call 0x0807f845 +Call sub_0807F844 CameraTargetPlayer _0807E788 0xffffffff _0807E778 0x0004 _0807E800 0x00000000 WaitFor_2 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 SoundReq2 0xffff CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -Call 0x0806dc7d +Call sub_0807F9A4 +Call sub_0807DF28 +Call sub_0806DC7C SoundReq0x80100000 -StartPlayerScript 0x08012ac8 +StartPlayerScript gUnk_08012AC8 WaitForSomething2 0x00000001 SetEntityPositionRelative 0x01680388 _0807F0B4 0x0001 @@ -107,19 +107,19 @@ _0807E5F8 0x00000004 WaitForSomething2 0x00000008 SoundReq0x80100000 SoundReq2 0x0033 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807E5F8 0x00000050 LoadRoomEntityList 0x080f51d0 WaitForSomething2 0x00000008 _0807E864 -Call 0x0807fa41 -Call 0x0807df29 +Call sub_0807FA40 +Call sub_0807DF28 SoundReq 0x0072 SoundReq0x80100000 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 -StartPlayerScript 0x08012af0 +StartPlayerScript gUnk_08012AF0 WaitForSomething2 0x00000001 _0807E8E4_0 SoundReq2 0x000e @@ -137,10 +137,10 @@ WaitForSomething2 0x00000008 SoundReq0x80100000 Wait 0x003c SoundReq2 0xffff -Call 0x0806dca1 +Call sub_0806DCA0 _0807F0B4 0x0004 CameraTargetPlayer -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 @@ -151,15 +151,14 @@ WaitForSomething2 0x00000008 SoundReq0x80100000 Wait 0x003c SoundReq2 0xffff -Call 0x08054571 +Call sub_08054570 SetGlobalFlag 0x0014 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf6f9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F6F8 .short 0x0008 .short 0x0000 @ End of parameters -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_080126FC.inc b/data/scripts/gUnk_080126FC.inc index 18426285..c78d88d0 100644 --- a/data/scripts/gUnk_080126FC.inc +++ b/data/scripts/gUnk_080126FC.inc @@ -6,7 +6,7 @@ StopScript _0807E930 0x0020 WaitForSomething2 0x00000004 _0807E930 0x0022 -Call 0x0807f3c9 +Call sub_0807F3C8 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1102 .short 0x000c @@ -16,7 +16,7 @@ _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 -Call 0x0807f3c9 +Call sub_0807F3C8 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1103 .short 0x000c @@ -40,14 +40,14 @@ _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0022 -Call 0x0807f3c9 +Call sub_0807F3C8 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1106 .short 0x000c @ End of parameters _0807EA94 _0807E930 0x001c -Call 0x0806d96d +Call sub_0806D96C .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1107 .short 0x000c @@ -57,14 +57,14 @@ _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 -Call 0x0807f3c9 +Call sub_0807F3C8 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1108 .short 0x000c @ End of parameters _0807EA94 _0807E930 0x001c -Call 0x0806d96d +Call sub_0806D96C .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1109 .short 0x000c @@ -82,7 +82,7 @@ CheckEntityInteractType JumpIfNot 0xfff0 StopScript _0807E864 -Call 0x0806d945 +Call sub_0806D944 _0807E930 0x0010 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1114 @@ -94,20 +94,19 @@ _0807E878 Jump 0xffd0 _0807E864 _0807E9DC -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf5b1 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F5B0 .short 0x003c .short 0x0000 @ End of parameters -Call 0x080791d1 +Call sub_080791D0 StopScript _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807EF80 0x000b _0807E5F8 0x00000008 WaitForSomething2 0x00000004 -Call 0x0806d945 +Call sub_0806D944 _0807E930 0x0010 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x110a @@ -154,7 +153,7 @@ _0807E930 0x0010 _0807EA94 _0807E930 0x0018 SetEntityNonPlanarMovement 0x0080 -Call 0x0806d909 +Call sub_0806D908 _0807EC1C 0x0010 _0807EF80 0x000a _0807E9D4 @@ -162,7 +161,7 @@ _0807E5F8 0x00000008 WaitForSomething2 0x00000004 StopScript StartScript -Call 0x0806d945 +Call sub_0806D944 CheckEntityInteractType JumpIf 0x000e CheckPlayerInRegion2 0x3030 @@ -181,10 +180,10 @@ _0807E878 Jump 0xffcc StopScript _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 _0807EB8C -Call 0x0806d945 +Call sub_0806D944 _0807E930 0x0010 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x110f @@ -192,16 +191,16 @@ _0807E930 0x0010 @ End of parameters _0807E930 0x0018 SetEntityNonPlanarMovement 0x0080 -Call 0x0806d909 +Call sub_0806D908 _0807EC1C 0x0050 _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 StopScript StartScript -Call 0x0806d945 +Call sub_0806D944 CheckEntityInteractType JumpIf 0x000e CheckPlayerInRegion2 0x3030 @@ -220,10 +219,10 @@ _0807E878 Jump 0xffcc StopScript _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 _0807EB8C -Call 0x0806d945 +Call sub_0806D944 _0807E930 0x0010 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1110 @@ -231,17 +230,17 @@ _0807E930 0x0010 @ End of parameters _0807E930 0x0018 SetEntityNonPlanarMovement 0x0080 -Call 0x0806d909 +Call sub_0806D908 _0807EC1C 0x0050 _0807E930 0x0018 _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 StopScript StartScript -Call 0x0806d945 +Call sub_0806D944 CheckEntityInteractType JumpIf 0x000e CheckPlayerInRegion2 0x3030 @@ -260,12 +259,12 @@ _0807E878 Jump 0xffcc StopScript _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 SoundReq0x80100000 _0807EF80 0x000b _0807EB8C -Call 0x0806d945 +Call sub_0806D944 _0807E930 0x0010 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1111 @@ -273,13 +272,13 @@ _0807E930 0x0010 @ End of parameters _0807E930 0x0018 SetEntityNonPlanarMovement 0x0080 -Call 0x0806d8a1 +Call sub_0806D8A0 _0807EE30 JumpIfNot 0xfffc _0807E930 0x001f _0807EA94 -StartPlayerScript 0x08012b18 -Call 0x0806d9a5 +StartPlayerScript gUnk_08012B18 +Call sub_0806D9A4 _0807EF80 0x0008 Wait 0x0078 SoundReq2 0x000e diff --git a/data/scripts/gUnk_08012AB0.inc b/data/scripts/gUnk_08012AB0.inc index 3af969c2..e8df3a1e 100644 --- a/data/scripts/gUnk_08012AB0.inc +++ b/data/scripts/gUnk_08012AB0.inc @@ -6,14 +6,3 @@ _0807EB44 0x0006 Wait 0x000a Jump 0xffee .short 0x0000 -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807EF80 0x0004 -Wait 0x003c -_0807E5F8 0x00000001 -Call 0x080791bd -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_08012AC8.inc b/data/scripts/gUnk_08012AC8.inc new file mode 100644 index 00000000..013e0433 --- /dev/null +++ b/data/scripts/gUnk_08012AC8.inc @@ -0,0 +1,12 @@ +SCRIPT_START gUnk_08012AC8 +StartScript +SetEntityNonPlanarMovement 0x0080 +StopScript +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807EF80 0x0004 +Wait 0x003c +_0807E5F8 0x00000001 +Call sub_080791BC +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08012AF0.inc b/data/scripts/gUnk_08012AF0.inc index 00bf8f5c..c3cf3c94 100644 --- a/data/scripts/gUnk_08012AF0.inc +++ b/data/scripts/gUnk_08012AF0.inc @@ -7,5 +7,5 @@ _0807EDD4 0x0388, 0x0180 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08012B18.inc b/data/scripts/gUnk_08012B18.inc index afa03369..22d140c9 100644 --- a/data/scripts/gUnk_08012B18.inc +++ b/data/scripts/gUnk_08012B18.inc @@ -1,4 +1,4 @@ SCRIPT_START gUnk_08012B18 _0807EF80 0x0015 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08012B24.inc b/data/scripts/gUnk_08012B24.inc index e8ce1754..8e8f794d 100644 --- a/data/scripts/gUnk_08012B24.inc +++ b/data/scripts/gUnk_08012B24.inc @@ -6,11 +6,10 @@ StopScript _0807EF80 0x0001 _0807ECC4 0x0008 _0807E5F8 0x00000002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfb65 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FB64 .short 0xffe2 .short 0xffff @ End of parameters -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08012B50.inc b/data/scripts/gUnk_08012B50.inc index 66c706b1..ff9ca34e 100644 --- a/data/scripts/gUnk_08012B50.inc +++ b/data/scripts/gUnk_08012B50.inc @@ -6,11 +6,10 @@ StopScript _0807EF80 0x0001 _0807EC64 0x0008 _0807E5F8 0x00000002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfb65 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FB64 .short 0xffe2 .short 0xffff @ End of parameters -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08012B7C.inc b/data/scripts/gUnk_08012B7C.inc index 0ba5da08..9083222f 100644 --- a/data/scripts/gUnk_08012B7C.inc +++ b/data/scripts/gUnk_08012B7C.inc @@ -6,11 +6,10 @@ StopScript _0807EF80 0x0001 _0807EC94 0x0008 _0807E5F8 0x00000002 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfb65 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FB64 .short 0xffe2 .short 0xffff @ End of parameters -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08012C68.inc b/data/scripts/gUnk_08012C68.inc index 9bc4b3a0..359e1040 100644 --- a/data/scripts/gUnk_08012C68.inc +++ b/data/scripts/gUnk_08012C68.inc @@ -3,7 +3,7 @@ StartScript _0807E9D4 _0807EF80 0x0008 _0807E914 0x00000000 -Call 0x0806da05 +Call sub_0806DA04 StopScript CheckEntityInteractType JumpIfNot 0xfffc @@ -24,11 +24,11 @@ _0807E564 JumpIf 0x001e StopScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 _0807EB28 0x2202 _0807EA94 SetLocalFlag 0x003b -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08012CD8.inc b/data/scripts/gUnk_08012CD8.inc index a25beeb9..6f29b3b4 100644 --- a/data/scripts/gUnk_08012CD8.inc +++ b/data/scripts/gUnk_08012CD8.inc @@ -8,12 +8,12 @@ JumpIfNot 0xffec ComparePlayerAction 0x0015 JumpIf 0xffe4 _0807E864 -Call 0x0807df29 +Call sub_0807DF28 StopScript _0807EB28 0x2203 _0807EA94 SetLocalFlag 0x003e -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08012D18.inc b/data/scripts/gUnk_08012D18.inc index 9abf4d3e..26bf871e 100644 --- a/data/scripts/gUnk_08012D18.inc +++ b/data/scripts/gUnk_08012D18.inc @@ -9,13 +9,13 @@ CheckPlayerInRegion 0x0000, 0x01a8, 0x2010 JumpIfNot 0xffe0 StopScript _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 _0807EB28 0x111a _0807EA94 -StartPlayerScript 0x08010a38 +StartPlayerScript gUnk_08010A38 WaitForSomething2 0x00000001 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffb2 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08012D70.inc b/data/scripts/gUnk_08012D70.inc index a7c2018a..0de8891d 100644 --- a/data/scripts/gUnk_08012D70.inc +++ b/data/scripts/gUnk_08012D70.inc @@ -2,14 +2,14 @@ SCRIPT_START gUnk_08012D70 CheckPlayerInRegion 0x0088, 0x0048, 0x3030 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -StartPlayerScript 0x08012db0 +Call sub_0807F9A4 +Call sub_0807DF28 +StartPlayerScript gUnk_08012DB0 WaitForSomething2 0x00000001 _0807EB28 0x132d _0807EA94 SetLocalFlag 0x0014 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08012DB0.inc b/data/scripts/gUnk_08012DB0.inc index a5e56c45..0a4d5b99 100644 --- a/data/scripts/gUnk_08012DB0.inc +++ b/data/scripts/gUnk_08012DB0.inc @@ -7,5 +7,5 @@ _0807EB44 0x0000 _0807EF80 0x0000 Wait 0x001e _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08012DD8.inc b/data/scripts/gUnk_08012DD8.inc index 4d937700..d4f24f4c 100644 --- a/data/scripts/gUnk_08012DD8.inc +++ b/data/scripts/gUnk_08012DD8.inc @@ -4,7 +4,7 @@ StopScript _0807E888 Wait 0x0018 _0807E864 -StartPlayerScript 0x08012df8 +StartPlayerScript gUnk_08012DF8 WaitForSomething2 0x00000001 _0807E908 0x0002 SCRIPT_END diff --git a/data/scripts/gUnk_08012E20.inc b/data/scripts/gUnk_08012E20.inc index 983f694c..4842fb51 100644 --- a/data/scripts/gUnk_08012E20.inc +++ b/data/scripts/gUnk_08012E20.inc @@ -4,7 +4,7 @@ _0807E864 StopScript Wait 0x0078 _0807E908 0x0004 -StartPlayerScript 0x08012e44 +StartPlayerScript gUnk_08012E44 WaitForSomething2 0x00000002 Wait 0x000c _0807E908 0x0005 diff --git a/data/scripts/gUnk_08012E88.inc b/data/scripts/gUnk_08012E88.inc index 85156a81..09b786f6 100644 --- a/data/scripts/gUnk_08012E88.inc +++ b/data/scripts/gUnk_08012E88.inc @@ -3,14 +3,14 @@ StartScript _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a -Call 0x0806b60d +Call sub_0806B60C StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 _0807EF80 0x0001 -Call 0x0806b4f1 +Call sub_0806B4F0 _0807EA94 _0807E878 _0807EF80 0x0000 @@ -18,32 +18,29 @@ Jump 0xffe2 .short 0x0000 StartScript _0807EB44 0x0004 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0008 .short 0x0000 @ End of parameters _0807EF80 0x000a -Call 0x0806b60d +Call sub_0806B60C StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x000c .short 0x0000 @ End of parameters -Call 0x0806b4f1 +Call sub_0806B4F0 _0807EA94 Wait 0x000f _0807E878 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0008 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_08012F0C.inc b/data/scripts/gUnk_08012F0C.inc index 32616911..3ec14ff9 100644 --- a/data/scripts/gUnk_08012F0C.inc +++ b/data/scripts/gUnk_08012F0C.inc @@ -1,8 +1,7 @@ SCRIPT_START gUnk_08012F0C StartScript -.short 0x140c @ CallWithArg with 4 parameters -.short 0xa93d -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806A93C .short 0x5678 .short 0x1234 @ End of parameters @@ -17,10 +16,10 @@ JumpIf 0x0050 StopScript CheckLocalFlag 0x0062 JumpIfNot 0x0008 -Call 0x0806a9b1 +Call sub_0806A9B0 CheckLocalFlag 0x0061 JumpIf 0x001e -Call 0x0806a96d +Call sub_0806A96C JumpIfNot 0xfff8 _0807E864 TextboxNoOverlap 0x4401 @@ -28,7 +27,7 @@ _0807EA94 SetLocalFlag 0x0061 _0807E878 _0807E908 0x0001 -Call 0x0806a96d +Call sub_0806A96C JumpIfNot 0xfff8 TextboxNoOverlap 0x4402 _0807EA94 diff --git a/data/scripts/gUnk_08012F86.inc b/data/scripts/gUnk_08012F86.inc index 69c0228a..d546118e 100644 --- a/data/scripts/gUnk_08012F86.inc +++ b/data/scripts/gUnk_08012F86.inc @@ -3,21 +3,20 @@ StartScript CheckLocalFlag 0x0060 JumpIf 0x0044 _0807E864 -Call 0x0807df29 -StartPlayerScript 0x080130e4 +Call sub_0807DF28 +StartPlayerScript gUnk_080130E4 SetLocalFlag 0x0060 ClearLocalFlag 0x0061 StopScript WaitForSomething2 0x00000004 _0807E908 0x0004 -Call 0x0806a959 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf93d -.short 0x0807 +Call sub_0806A958 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F93C .short 0xf2f4 .short 0x0000 @ End of parameters -Call 0x0807df51 +Call sub_0807DF50 _0807E878 SetLocalFlag 0x0062 Jump 0x002a @@ -25,13 +24,12 @@ StartScript _0807E930 0x000d _0807E908 0x0005 SetLocalFlag 0x0062 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf93d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F93C .short 0xf2f4 .short 0x0000 @ End of parameters -Call 0x0806aa11 +Call sub_0806AA10 StopScript CheckInventory1 0x0038 JumpIf 0x000e @@ -42,14 +40,14 @@ Jump 0xfff6 _0807E944 StartScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 StopScript SoundReq 0x00cd _0807F088 0x0038 WaitPlayerAction8 Wait 0x001e _0807E8E4_0 -Call 0x0806ab9d +Call sub_0806AB9C _0807E930 0x000b Wait 0x003c _0807EF80 0x0004 @@ -62,7 +60,7 @@ Wait 0x003c TextboxNoOverlap 0x440e _0807EA94 Wait 0x001e -Call 0x0806a9e9 +Call sub_0806A9E8 _0807E930 0x000f Wait 0x00f0 TextboxNoOverlap 0x4405 @@ -74,14 +72,14 @@ _0807EB8C TextboxNoOverlap 0x4406 _0807EA94 _0807E908 0x0001 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 -Call 0x0806a96d +Call sub_0806A96C JumpIfNot 0xfff8 TextboxNoOverlap 0x4407 _0807EA94 _0807E908 0x0001 -Call 0x0806a96d +Call sub_0806A96C JumpIfNot 0xfff8 TextboxNoOverlap 0x440d _0807EA94 @@ -89,26 +87,13 @@ _0807E908 0x0001 Jump 0xffd6 CheckLocalFlag 0x0062 JumpIfNot 0x0008 -Call 0x0806a9b1 +Call sub_0806A9B0 StopScript -Call 0x0806a96d +Call sub_0806A96C JumpIfNot 0xfff8 _0807E864 -Call 0x0806aa19 +Call sub_0806AA18 _0807EA94 _0807E878 _0807E908 0x0001 Jump 0xffe4 -StartScript -_0807EB44 0x0006 -SetEntityNonPlanarMovement 0x0140 -StopScript -_0807EDD4 0x00a8, 0x0060 -Wait 0x0008 -_0807EF80 0x0000 -Wait 0x0008 -_0807EF80 0x0004 -Wait 0x000f -_0807E5F8 0x00000004 -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_080130E4.inc b/data/scripts/gUnk_080130E4.inc new file mode 100644 index 00000000..9335c187 --- /dev/null +++ b/data/scripts/gUnk_080130E4.inc @@ -0,0 +1,14 @@ +SCRIPT_START gUnk_080130E4 +StartScript +_0807EB44 0x0006 +SetEntityNonPlanarMovement 0x0140 +StopScript +_0807EDD4 0x00a8, 0x0060 +Wait 0x0008 +_0807EF80 0x0000 +Wait 0x0008 +_0807EF80 0x0004 +Wait 0x000f +_0807E5F8 0x00000004 +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08013114.inc b/data/scripts/gUnk_08013114.inc index a32bf669..0dba30ec 100644 --- a/data/scripts/gUnk_08013114.inc +++ b/data/scripts/gUnk_08013114.inc @@ -3,35 +3,32 @@ StartScript _0807E9D4 _0807EF80 0x000a _0807EF80 0x0012 -Call 0x0807f349 +Call sub_0807F348 StopScript StopScript StartScript CheckEntityInteractType JumpIf 0x000c -Call 0x0806aee5 +Call sub_0806AEE4 Jump 0xffee _0807E864 StopScript _0807EB74 -Call 0x0806aed9 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaa51 -.short 0x0806 +Call sub_0806AED8 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AA50 .short 0x0000 .short 0x0000 @ End of parameters _0807EA94 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaa51 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AA50 .short 0x0001 .short 0x0000 @ End of parameters _0807EA94 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaa51 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AA50 .short 0x0002 .short 0x0000 @ End of parameters @@ -40,7 +37,7 @@ JumpIf 0x0008 _0807E878 Jump 0xffb4 _0807E914 0x00000403 -Call 0x0807f421 +Call sub_0807F420 _0807E878 Jump 0xffa2 StartScript diff --git a/data/scripts/gUnk_0801319A.inc b/data/scripts/gUnk_0801319A.inc index 428dcd96..1e129504 100644 --- a/data/scripts/gUnk_0801319A.inc +++ b/data/scripts/gUnk_0801319A.inc @@ -3,32 +3,32 @@ StopScript StartScript CameraTargetEntity MoveEntityToPlayer -Call 0x0806ab75 +Call sub_0806AB74 Jump 0xfff0 CheckPlayerInRegion 0x0098, 0x0038, 0x2060 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -StartPlayerScript 0x080132e4 +Call sub_0807F9A4 +Call sub_0807DF28 +StartPlayerScript gUnk_080132E4 WaitForSomething2 0x00000002 _0807EB28 0x1601 _0807EA94 -StartPlayerScript 0x0801330c +StartPlayerScript gUnk_0801330C WaitForSomething2 0x00000002 _0807E778 0x0004 DoFade5 WaitFor_2 LoadRoomEntityList 0x080f5680 -StartPlayerScript 0x08013330 +StartPlayerScript gUnk_08013330 WaitForSomething2 0x00000002 MoveEntityToPlayer SetEntityPosition 0x0000, 0xfff0 -Call 0x0807f845 +Call sub_0807F844 CameraTargetEntity -Call 0x080536b9 +Call sub_080536B8 _0807E864 -Call 0x0807df29 +Call sub_0807DF28 WaitFor_2 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1602 @@ -40,11 +40,11 @@ WaitForSomething2 0x00000010 _0807E5F8 0x00000020 WaitForSomething2 0x00000040 SoundReq2 0x000d -StartPlayerScript 0x0801334c +StartPlayerScript gUnk_0801334C WaitForSomething2 0x00000002 _0807E5F8 0x00000020 WaitForSomething2 0x00000040 -StartPlayerScript 0x08013378 +StartPlayerScript gUnk_08013378 _0807E5F8 0x00000020 WaitForSomething2 0x00000042 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters @@ -64,7 +64,7 @@ SoundReq0x80100000 @ End of parameters Wait 0x003c CameraTargetPlayer -Call 0x0807f5c1 +Call sub_0807F5C0 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1604 .short 0x0007 @@ -81,7 +81,7 @@ _0807EA94 SetLocalFlag 0x0078 SoundReq2 0x0031 SetGlobalFlag 0x005d -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_080132E4.inc b/data/scripts/gUnk_080132E4.inc index d97b2794..199fb75e 100644 --- a/data/scripts/gUnk_080132E4.inc +++ b/data/scripts/gUnk_080132E4.inc @@ -7,5 +7,5 @@ _0807EDD4 0x0098, 0x0058 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000002 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0801330C.inc b/data/scripts/gUnk_0801330C.inc index ff5c5c16..fc20a94b 100644 --- a/data/scripts/gUnk_0801330C.inc +++ b/data/scripts/gUnk_0801330C.inc @@ -6,6 +6,6 @@ _0807EF80 0x0001 _0807EC64 0x0020 _0807EF80 0x0000 _0807E5F8 0x00000002 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08013330.inc b/data/scripts/gUnk_08013330.inc index bf8a75d3..91ed7499 100644 --- a/data/scripts/gUnk_08013330.inc +++ b/data/scripts/gUnk_08013330.inc @@ -4,5 +4,5 @@ _0807EB44 0x0000 SetEntityPositionRelative 0x00700098 StopScript _0807E5F8 0x00000002 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_0801334C.inc b/data/scripts/gUnk_0801334C.inc index dbf10439..2782c624 100644 --- a/data/scripts/gUnk_0801334C.inc +++ b/data/scripts/gUnk_0801334C.inc @@ -8,6 +8,6 @@ _0807ECC4 0x0020 _0807EF80 0x0000 _0807EF80 0x000c _0807E5F8 0x00000002 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08013378.inc b/data/scripts/gUnk_08013378.inc index bee24285..5c3179ad 100644 --- a/data/scripts/gUnk_08013378.inc +++ b/data/scripts/gUnk_08013378.inc @@ -1,16 +1,16 @@ SCRIPT_START gUnk_08013378 -Call 0x0807f1c5 -Call 0x0807f2d5 -Call 0x0807f1e9 -Call 0x0807f2d5 +Call sub_0807F1C4 +Call sub_0807F2D4 +Call sub_0807F1E8 +Call sub_0807F2D4 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 SoundReq 0x007c _0807EB44 0x0004 -Call 0x0807f211 +Call sub_0807F210 _0807EF3C 0x0200, 0x0020 _0807EF80 0x0000 _0807E5F8 0x00000002 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_080133C4.inc b/data/scripts/gUnk_080133C4.inc index 31bde000..a753fd84 100644 --- a/data/scripts/gUnk_080133C4.inc +++ b/data/scripts/gUnk_080133C4.inc @@ -3,10 +3,10 @@ StartScript _0807EB44 0x0004 _0807EF80 0x0007 _0807EF80 0x000b -Call 0x0807f339 +Call sub_0807F338 StopScript WaitForSomething2 0x00000008 -Call 0x08061f95 +Call sub_08061F94 Wait 0x000a _0807E5F8 0x00000010 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_080133F8.inc b/data/scripts/gUnk_080133F8.inc index 67514e31..5aef14e5 100644 --- a/data/scripts/gUnk_080133F8.inc +++ b/data/scripts/gUnk_080133F8.inc @@ -3,11 +3,11 @@ StartScript _0807EB44 0x0004 _0807EF80 0x0008 _0807EF80 0x000b -Call 0x0807f339 +Call sub_0807F338 StopScript WaitForSomething2 0x00000020 SetEntityPositionRelative 0x00480098 -Call 0x08066c95 +Call sub_08066C94 Wait 0x00e9 _0807EF80 0x0007 _0807E5F8 0x00000040 @@ -15,9 +15,8 @@ WaitForSomething2 0x00000020 Wait 0x003c _0807EF80 0x0014 SoundReq 0x0120 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5421 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095420 .short 0x3494 .short 0x0801 @ End of parameters @@ -30,7 +29,7 @@ _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000040 WaitForSomething2 0x00000020 -Call 0x08066ca5 +Call sub_08066CA4 _0807EF80 0x0008 Wait 0x0078 _0807E5F8 0x00000040 diff --git a/data/scripts/gUnk_08013494.inc b/data/scripts/gUnk_08013494.inc index e0d9db10..c0ce7fd8 100644 --- a/data/scripts/gUnk_08013494.inc +++ b/data/scripts/gUnk_08013494.inc @@ -2,16 +2,16 @@ SCRIPT_START gUnk_08013494 StartScript _0807E930 0x0000 SetEntityNonPlanarMovement 0x0200 -Call 0x08095459 -Call 0x08094b81 +Call nullsub_527 +Call sub_08094B80 StopScript Wait 0x005a -Call 0x08094b6d +Call sub_08094B6C _0807EDD4 0x0098, 0x0080 StartScript -Call 0x08094b81 +Call sub_08094B80 SoundReq 0x01cc -Call 0x0807f36d +Call sub_0807F36C _0807E5F8 0x00000080 StopScript _0807EF80 0x0006 diff --git a/data/scripts/gUnk_080134DC.inc b/data/scripts/gUnk_080134DC.inc index f3eddbda..96dd691d 100644 --- a/data/scripts/gUnk_080134DC.inc +++ b/data/scripts/gUnk_080134DC.inc @@ -3,10 +3,9 @@ StartScript _0807EF80 0x0008 StopScript StartScript -Call 0x0807f92d -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda05 -.short 0x0806 +Call sub_0807F92C +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA04 .short 0x0003 .short 0x0000 @ End of parameters @@ -14,12 +13,11 @@ StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call 0x0807df29 -StartPlayerScript 0x080136d8 +Call sub_0807DF28 +StartPlayerScript gUnk_080136D8 WaitForSomething2 0x00000001 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5a1d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095A1C .short 0x3f04 .short 0x0801 @ End of parameters @@ -27,15 +25,13 @@ SoundReq 0x01cd Wait 0x005a StartScript SoundReq 0x01ce -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d55 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D54 .short 0x3e04 .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d55 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D54 .short 0x3e28 .short 0x0801 @ End of parameters @@ -43,15 +39,13 @@ StopScript WaitForSomething2 0x18000000 StartScript SoundReq 0x01cf -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4054 .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4074 .short 0x0801 @ End of parameters @@ -59,38 +53,33 @@ StopScript Wait 0x001e StartScript SoundReq 0x01d0 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x40dc .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4118 .short 0x0801 @ End of parameters StopScript Wait 0x003c -.short 0x140c @ CallWithArg with 4 parameters -.short 0xdded -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DDEC .short 0x0000 .short 0x0000 @ End of parameters _0807E5F8 0x00000200 WaitForSomething2 0x00002000 SoundReq 0x01d2 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x41dc .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4210 .short 0x0801 @ End of parameters @@ -98,9 +87,8 @@ _0807E5F8 0x00000400 WaitForSomething2 0x00004000 Wait 0x0078 _0807E5F8 0x00000060 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xde19 -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DE18 .short 0x0000 .short 0x0000 @ End of parameters @@ -108,12 +96,12 @@ Wait 0x0078 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 Wait 0x003c -StartPlayerScript 0x08013b70 +StartPlayerScript gUnk_08013B70 _0807E5F8 0x00000080 _0807F078 0x0003, 0x0001 -Call 0x0806dc3d -Call 0x0806dc59 -Call 0x0807f305 +Call sub_0806DC3C +Call sub_0806DC58 +Call sub_0807F304 Wait 0x003c _0807E778 0x0004 DoFade7 @@ -131,9 +119,8 @@ SoundReq 0x0109 @ End of parameters _0807EA94 _0807E5F8 0x00040000 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xdded -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DDEC .short 0x0001 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_08013650.inc b/data/scripts/gUnk_08013650.inc index 15406890..df963b06 100644 --- a/data/scripts/gUnk_08013650.inc +++ b/data/scripts/gUnk_08013650.inc @@ -1,5 +1,5 @@ SCRIPT_START gUnk_08013650 -Call 0x0807f3f9 +Call sub_0807F3F8 Wait 0x003c _0807F0B4 0x0007 SetEntityPositionRelative 0x00a800e8 @@ -7,22 +7,21 @@ CameraTargetEntity Wait 0x003c _0807E5F8 0x00000004 Wait 0x0078 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xde19 -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DE18 .short 0x0001 .short 0x0000 @ End of parameters _0807F0C8 0x0000, 0x0000 -StartPlayerScript 0x080136b4 +StartPlayerScript gUnk_080136B4 WaitForSomething2 0x00000002 _0807EB28 0x1501 _0807EA94 _0807F0B4 0x0004 CameraTargetPlayer SetLocalFlag 0x007a -Call 0x08053251 -Call 0x0807df51 +Call sub_08053250 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_080136B4.inc b/data/scripts/gUnk_080136B4.inc index f2db5f95..fc0471cc 100644 --- a/data/scripts/gUnk_080136B4.inc +++ b/data/scripts/gUnk_080136B4.inc @@ -6,5 +6,5 @@ _0807EDD4 0x00e8, 0x00a8 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000002 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_080136D8.inc b/data/scripts/gUnk_080136D8.inc index f63d1a5c..bee3975f 100644 --- a/data/scripts/gUnk_080136D8.inc +++ b/data/scripts/gUnk_080136D8.inc @@ -2,22 +2,20 @@ SCRIPT_START gUnk_080136D8 StartScript SetEntityNonPlanarMovement 0x0100 StopScript -Call 0x0807f585 +Call sub_0807F584 .short 0x1406 @ _0807E078 with 4 parameters .short 0x0008 .short 0x0010 .short 0x0018 .short 0x000c @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf465 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F464 .short 0x00d0 .short 0x0000 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf4f9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F4F8 .short 0x0124 .short 0x0000 @ End of parameters @@ -25,5 +23,5 @@ _0807EDD4 0x00e8, 0x0124 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08013720.inc b/data/scripts/gUnk_08013720.inc index be03a571..735a3f1e 100644 --- a/data/scripts/gUnk_08013720.inc +++ b/data/scripts/gUnk_08013720.inc @@ -3,10 +3,9 @@ StartScript _0807EF80 0x0008 StopScript StartScript -Call 0x0807f92d -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda05 -.short 0x0806 +Call sub_0807F92C +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA04 .short 0x0003 .short 0x0000 @ End of parameters @@ -14,12 +13,11 @@ StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call 0x0807df29 -StartPlayerScript 0x080136d8 +Call sub_0807DF28 +StartPlayerScript gUnk_080136D8 WaitForSomething2 0x00000001 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5a1d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095A1C .short 0x3f34 .short 0x0801 @ End of parameters @@ -27,9 +25,8 @@ SoundReq 0x01cd Wait 0x005a StartScript SoundReq 0x01ce -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d55 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D54 .short 0x3e4c .short 0x0801 @ End of parameters @@ -37,21 +34,18 @@ StopScript WaitForSomething2 0x20000000 StartScript SoundReq 0x01cf -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4054 .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4074 .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4094 .short 0x0801 @ End of parameters @@ -59,44 +53,38 @@ StopScript Wait 0x001e StartScript SoundReq 0x01d0 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x40dc .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4118 .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4154 .short 0x0801 @ End of parameters StopScript Wait 0x003c -.short 0x140c @ CallWithArg with 4 parameters -.short 0xdded -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DDEC .short 0x0000 .short 0x0000 @ End of parameters _0807E5F8 0x00000200 WaitForSomething2 0x00002000 SoundReq 0x01d2 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x41dc .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4210 .short 0x0801 @ End of parameters @@ -106,9 +94,8 @@ _0807E5F8 0x00000800 WaitForSomething2 0x00008000 Wait 0x0078 _0807E5F8 0x00000060 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xde19 -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DE18 .short 0x0000 .short 0x0000 @ End of parameters @@ -116,12 +103,12 @@ Wait 0x0078 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 Wait 0x003c -StartPlayerScript 0x08013b70 +StartPlayerScript gUnk_08013B70 _0807E5F8 0x00000080 _0807F078 0x0004, 0x0001 -Call 0x0806dc3d -Call 0x0806dc59 -Call 0x0807f305 +Call sub_0806DC3C +Call sub_0806DC58 +Call sub_0807F304 Wait 0x003c _0807E778 0x0004 DoFade7 @@ -140,8 +127,8 @@ SoundReq 0x0109 _0807EA94 _0807E5F8 0x00040000 SetLocalFlag 0x007b -Call 0x08053251 -Call 0x0807df51 +Call sub_08053250 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_080138B4.inc b/data/scripts/gUnk_080138B4.inc index bada7949..89f2d143 100644 --- a/data/scripts/gUnk_080138B4.inc +++ b/data/scripts/gUnk_080138B4.inc @@ -3,10 +3,9 @@ StartScript _0807EF80 0x0008 StopScript StartScript -Call 0x0807f92d -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda05 -.short 0x0806 +Call sub_0807F92C +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA04 .short 0x0003 .short 0x0000 @ End of parameters @@ -14,12 +13,11 @@ StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call 0x0807df29 -StartPlayerScript 0x080136d8 +Call sub_0807DF28 +StartPlayerScript gUnk_080136D8 WaitForSomething2 0x00000001 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5a1d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095A1C .short 0x3f64 .short 0x0801 @ End of parameters @@ -27,9 +25,8 @@ SoundReq 0x01cd Wait 0x005a StartScript SoundReq 0x01ce -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d55 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D54 .short 0x3e70 .short 0x0801 @ End of parameters @@ -37,27 +34,23 @@ StopScript WaitForSomething2 0x40000000 StartScript SoundReq 0x01cf -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4054 .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4074 .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4094 .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x40b8 .short 0x0801 @ End of parameters @@ -65,50 +58,43 @@ StopScript Wait 0x001e StartScript SoundReq 0x01d0 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x40dc .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4118 .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4154 .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4198 .short 0x0801 @ End of parameters StopScript Wait 0x003c -.short 0x140c @ CallWithArg with 4 parameters -.short 0xdded -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DDEC .short 0x0000 .short 0x0000 @ End of parameters _0807E5F8 0x00000200 WaitForSomething2 0x00002000 SoundReq 0x01d2 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x41dc .short 0x0801 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d8d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D8C .short 0x4210 .short 0x0801 @ End of parameters @@ -120,9 +106,8 @@ _0807E5F8 0x00001000 WaitForSomething2 0x00010000 Wait 0x0078 _0807E5F8 0x00000060 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xde19 -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DE18 .short 0x0000 .short 0x0000 @ End of parameters @@ -130,13 +115,13 @@ Wait 0x0078 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 Wait 0x003c -StartPlayerScript 0x08013ba8 +StartPlayerScript gUnk_08013BA8 _0807E5F8 0x00000080 _0807F078 0x0006, 0x0001 -Call 0x0807aee5 -Call 0x0806dc3d -Call 0x0806dc59 -Call 0x0807f305 +Call sub_0807AEE4 +Call sub_0806DC3C +Call sub_0806DC58 +Call sub_0807F304 Wait 0x003c _0807E778 0x0004 DoFade7 @@ -157,32 +142,28 @@ _0807E5F8 0x00040000 _0807F0B4 0x0002 SetEntityPositionRelative 0x00d800e8 CameraTargetEntity -Call 0x0806dc3d -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf245 -.short 0x0807 +Call sub_0806DC3C +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F244 .short 0x0001 .short 0x0001 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf29d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F29C .short 0x49fe .short 0x0800 @ End of parameters Wait 0x00c8 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf29d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F29C .short 0x0000 .short 0x0000 @ End of parameters -Call 0x0806dc59 +Call sub_0806DC58 CheckRoomFlag 0x0004 JumpIfNot 0xfffa -.short 0x140c @ CallWithArg with 4 parameters -.short 0xdded -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DDEC .short 0x0001 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_08013AA6.inc b/data/scripts/gUnk_08013AA6.inc index 89fae614..650f465a 100644 --- a/data/scripts/gUnk_08013AA6.inc +++ b/data/scripts/gUnk_08013AA6.inc @@ -1,11 +1,10 @@ SCRIPT_START gUnk_08013AA6 -Call 0x0807f3f9 +Call sub_0807F3F8 Wait 0x003c _0807E5F8 0x00000008 Wait 0x0078 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xde19 -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DE18 .short 0x0001 .short 0x0000 @ End of parameters @@ -26,8 +25,8 @@ _0807EA94 _0807F0B4 0x0004 CameraTargetPlayer SetLocalFlag 0x007c -Call 0x08053251 -Call 0x0807df51 +Call sub_08053250 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08013B18.inc b/data/scripts/gUnk_08013B18.inc index bafcadf3..944ceeee 100644 --- a/data/scripts/gUnk_08013B18.inc +++ b/data/scripts/gUnk_08013B18.inc @@ -3,9 +3,8 @@ StartScript _0807EF80 0x0008 StopScript StartScript -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf6b5 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F6B4 .short 0x01c8 .short 0x0000 @ End of parameters @@ -16,29 +15,13 @@ CheckLocalFlag 0x0078 JumpIf 0xffe0 StopScript _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 _0807EB28 0x1507 _0807EA94 -StartPlayerScript 0x08010a14 +StartPlayerScript gUnk_08010A14 WaitForSomething2 0x00000001 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffb2 .short 0x0000 -SoundReq 0x01d3 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf239 -.short 0x0807 -.short 0x08bf -.short 0x0000 -@ End of parameters -Call 0x08096029 -Wait 0x003c -_0807E5F8 0x00020000 -Call 0x0807f305 -Wait 0x0078 -WaitForSomething2 0x00040000 -Call 0x080791bd -SCRIPT_END -.short 0x0000 diff --git a/data/scripts/gUnk_08013B70.inc b/data/scripts/gUnk_08013B70.inc new file mode 100644 index 00000000..dd55bd47 --- /dev/null +++ b/data/scripts/gUnk_08013B70.inc @@ -0,0 +1,16 @@ +SCRIPT_START gUnk_08013B70 +SoundReq 0x01d3 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F238 +.short 0x08bf +.short 0x0000 +@ End of parameters +Call sub_08096028 +Wait 0x003c +_0807E5F8 0x00020000 +Call sub_0807F304 +Wait 0x0078 +WaitForSomething2 0x00040000 +Call sub_080791BC +SCRIPT_END +.short 0x0000 diff --git a/data/scripts/gUnk_08013BA8.inc b/data/scripts/gUnk_08013BA8.inc index 65d13d26..b47e2a60 100644 --- a/data/scripts/gUnk_08013BA8.inc +++ b/data/scripts/gUnk_08013BA8.inc @@ -1,22 +1,20 @@ SCRIPT_START gUnk_08013BA8 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5e7d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095E7C .short 0x4248 .short 0x0801 @ End of parameters SoundReq 0x01d3 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf239 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F238 .short 0x08e3 .short 0x0000 @ End of parameters -Call 0x08096029 +Call sub_08096028 Wait 0x0078 _0807E5F8 0x00020000 -Call 0x0807f305 +Call sub_0807F304 Wait 0x0078 WaitForSomething2 0x00040000 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08013BE8.inc b/data/scripts/gUnk_08013BE8.inc index 6982628d..9cf01e62 100644 --- a/data/scripts/gUnk_08013BE8.inc +++ b/data/scripts/gUnk_08013BE8.inc @@ -20,17 +20,15 @@ CheckLocalFlag 0x007c JumpIf 0x0068 StartScript _0807EF80 0x0007 -Call 0x0807f935 +Call sub_0807F934 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 4 parameters -.short 0x62f9 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_080962F8 .short 0x0000 .short 0x0000 @ End of parameters -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf8e9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F8E8 .short 0x0004 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_08013CA4.inc b/data/scripts/gUnk_08013CA4.inc index a0686709..2a507c25 100644 --- a/data/scripts/gUnk_08013CA4.inc +++ b/data/scripts/gUnk_08013CA4.inc @@ -3,22 +3,22 @@ StopScript CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -Call 0x0807f3f9 +Call sub_0807F9A4 +Call sub_0807DF28 +Call sub_0807F3F8 Wait 0x003c _0807F0B4 0x0001 SetEntityPositionRelative 0x013800e8 CameraTargetEntity -Call 0x0807f5c1 +Call sub_0807F5C0 Wait 0x0078 _0807F0B4 0x0004 CameraTargetPlayer -Call 0x0807f5c1 +Call sub_0807F5C0 _0807EB28 0x1504 _0807EA94 SetLocalFlag 0x0079 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08013D04.inc b/data/scripts/gUnk_08013D04.inc index 23514d46..13d55e1d 100644 --- a/data/scripts/gUnk_08013D04.inc +++ b/data/scripts/gUnk_08013D04.inc @@ -1,25 +1,23 @@ SCRIPT_START gUnk_08013D04 StartScript -Call 0x0807f92d +Call sub_0807F92C _0807EF80 0x0008 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda05 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA04 .short 0x0004 .short 0x0000 @ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d55 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D54 .short 0x0000 .short 0x0000 @ End of parameters SoundReq 0x01cd _0807E5F8 0x08000000 -Call 0x080791bd +Call sub_080791BC _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08013D44.inc b/data/scripts/gUnk_08013D44.inc index d6611b57..d8f002c5 100644 --- a/data/scripts/gUnk_08013D44.inc +++ b/data/scripts/gUnk_08013D44.inc @@ -1,25 +1,23 @@ SCRIPT_START gUnk_08013D44 StartScript -Call 0x0807f92d +Call sub_0807F92C _0807EF80 0x0008 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda05 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA04 .short 0x0004 .short 0x0000 @ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d55 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D54 .short 0x0001 .short 0x0000 @ End of parameters SoundReq 0x01cd _0807E5F8 0x10000000 -Call 0x080791bd +Call sub_080791BC _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08013D84.inc b/data/scripts/gUnk_08013D84.inc index b29efd5d..73d9938d 100644 --- a/data/scripts/gUnk_08013D84.inc +++ b/data/scripts/gUnk_08013D84.inc @@ -1,25 +1,23 @@ SCRIPT_START gUnk_08013D84 StartScript -Call 0x0807f92d +Call sub_0807F92C _0807EF80 0x0008 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda05 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA04 .short 0x0004 .short 0x0000 @ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d55 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D54 .short 0x0002 .short 0x0000 @ End of parameters SoundReq 0x01cd _0807E5F8 0x20000000 -Call 0x080791bd +Call sub_080791BC _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08013DC4.inc b/data/scripts/gUnk_08013DC4.inc index 2597652e..3385a818 100644 --- a/data/scripts/gUnk_08013DC4.inc +++ b/data/scripts/gUnk_08013DC4.inc @@ -1,25 +1,23 @@ SCRIPT_START gUnk_08013DC4 StartScript -Call 0x0807f92d +Call sub_0807F92C _0807EF80 0x0008 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda05 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA04 .short 0x0004 .short 0x0000 @ End of parameters StopScript CheckEntityInteractType JumpIfNot 0xfffc -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5d55 -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095D54 .short 0x0003 .short 0x0000 @ End of parameters SoundReq 0x01cd _0807E5F8 0x40000000 -Call 0x080791bd +Call sub_080791BC _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08013E94.inc b/data/scripts/gUnk_08013E94.inc index 3045337f..a70e41b9 100644 --- a/data/scripts/gUnk_08013E94.inc +++ b/data/scripts/gUnk_08013E94.inc @@ -1,7 +1,7 @@ SCRIPT_START gUnk_08013E94 StartScript _0807EF80 0x0007 -Call 0x0807f181 +Call sub_0807F180 SetEntityPositionRelative 0x00f800b0 _0807E930 0x0001 StopScript diff --git a/data/scripts/gUnk_08013EB0.inc b/data/scripts/gUnk_08013EB0.inc index 4ca0767f..3a4b3b44 100644 --- a/data/scripts/gUnk_08013EB0.inc +++ b/data/scripts/gUnk_08013EB0.inc @@ -1,7 +1,7 @@ SCRIPT_START gUnk_08013EB0 StartScript _0807EF80 0x0007 -Call 0x0807f181 +Call sub_0807F180 SetEntityPositionRelative 0x00f80120 _0807E930 0x0003 StopScript diff --git a/data/scripts/gUnk_08013ECC.inc b/data/scripts/gUnk_08013ECC.inc index 96385d5d..65f7af88 100644 --- a/data/scripts/gUnk_08013ECC.inc +++ b/data/scripts/gUnk_08013ECC.inc @@ -1,7 +1,7 @@ SCRIPT_START gUnk_08013ECC StartScript _0807EF80 0x0007 -Call 0x0807f181 +Call sub_0807F180 SetEntityPositionRelative 0x01680120 _0807E930 0x0005 StopScript diff --git a/data/scripts/gUnk_08013EE8.inc b/data/scripts/gUnk_08013EE8.inc index 63b7c705..6d498b41 100644 --- a/data/scripts/gUnk_08013EE8.inc +++ b/data/scripts/gUnk_08013EE8.inc @@ -1,7 +1,7 @@ SCRIPT_START gUnk_08013EE8 StartScript _0807EF80 0x0007 -Call 0x0807f181 +Call sub_0807F180 SetEntityPositionRelative 0x016800b0 _0807E930 0x0007 StopScript diff --git a/data/scripts/gUnk_08013F04.inc b/data/scripts/gUnk_08013F04.inc index 551b77fc..e6b22c50 100644 --- a/data/scripts/gUnk_08013F04.inc +++ b/data/scripts/gUnk_08013F04.inc @@ -5,7 +5,7 @@ _0807E930 0x0008 StopScript WaitForSomething2 0x00000080 _0807E930 0x000b -Call 0x0807f2d5 +Call sub_0807F2D4 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08013F34.inc b/data/scripts/gUnk_08013F34.inc index da8861b5..804fb892 100644 --- a/data/scripts/gUnk_08013F34.inc +++ b/data/scripts/gUnk_08013F34.inc @@ -5,7 +5,7 @@ _0807E930 0x0009 StopScript WaitForSomething2 0x00000080 _0807E930 0x000c -Call 0x0807f2d5 +Call sub_0807F2D4 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08013F64.inc b/data/scripts/gUnk_08013F64.inc index 78aa1e28..64131a9a 100644 --- a/data/scripts/gUnk_08013F64.inc +++ b/data/scripts/gUnk_08013F64.inc @@ -5,7 +5,7 @@ _0807E930 0x000a StopScript WaitForSomething2 0x00000080 _0807E930 0x000d -Call 0x0807f2d5 +Call sub_0807F2D4 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08013F94.inc b/data/scripts/gUnk_08013F94.inc index ff253afd..edfefdb8 100644 --- a/data/scripts/gUnk_08013F94.inc +++ b/data/scripts/gUnk_08013F94.inc @@ -11,14 +11,14 @@ JumpIfNot 0xfff6 CheckPlayerFlags 0x00400000 JumpIfNot 0xffec StopScript -Call 0x0807fa41 +Call sub_0807FA40 _0807E888 -Call 0x0807df39 +Call sub_0807DF38 Wait 0x0078 _0807EB28 0x1505 _0807EA94 SetLocalFlag 0x007d -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08013FE8.inc b/data/scripts/gUnk_08013FE8.inc index be7ca6b1..86297bb7 100644 --- a/data/scripts/gUnk_08013FE8.inc +++ b/data/scripts/gUnk_08013FE8.inc @@ -10,24 +10,23 @@ CheckLocalFlag 0x007a JumpIfNot 0xffee CheckInventory1 0x0003 JumpIfNot 0xffe6 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf6b5 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F6B4 .short 0x00d0 .short 0x0000 @ End of parameters JumpIfNot 0xffd8 StopScript -Call 0x0807f9a5 +Call sub_0807F9A4 StartScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 StopScript _0807EB28 0x1508 _0807EA94 -StartPlayerScript 0x08010a14 +StartPlayerScript gUnk_08010A14 WaitForSomething2 0x00000001 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffa6 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08014054.inc b/data/scripts/gUnk_08014054.inc index 83a143bc..134e969b 100644 --- a/data/scripts/gUnk_08014054.inc +++ b/data/scripts/gUnk_08014054.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_08014054 StartScript _0807EF80 0x0007 _0807E930 0x0000 -Call 0x0807f739 +Call sub_0807F738 StopScript WaitForSomething 0x00000040 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08014074.inc b/data/scripts/gUnk_08014074.inc index 324f5b3e..a7b8f9ff 100644 --- a/data/scripts/gUnk_08014074.inc +++ b/data/scripts/gUnk_08014074.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_08014074 StartScript _0807EF80 0x0007 _0807E930 0x0001 -Call 0x0807f739 +Call sub_0807F738 StopScript WaitForSomething 0x00000040 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08014094.inc b/data/scripts/gUnk_08014094.inc index add253c9..8f7f7fe5 100644 --- a/data/scripts/gUnk_08014094.inc +++ b/data/scripts/gUnk_08014094.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_08014094 StartScript _0807EF80 0x0007 _0807E930 0x0002 -Call 0x0807f739 +Call sub_0807F738 SetEntityPosition 0x0000, 0xfff0 StopScript WaitForSomething 0x00000040 diff --git a/data/scripts/gUnk_080140B8.inc b/data/scripts/gUnk_080140B8.inc index f4864b53..da2487e1 100644 --- a/data/scripts/gUnk_080140B8.inc +++ b/data/scripts/gUnk_080140B8.inc @@ -2,7 +2,7 @@ SCRIPT_START gUnk_080140B8 StartScript _0807EF80 0x0007 _0807E930 0x0003 -Call 0x0807f739 +Call sub_0807F738 SetEntityPosition 0x0000, 0xfff0 StopScript WaitForSomething 0x00000040 diff --git a/data/scripts/gUnk_080140DC.inc b/data/scripts/gUnk_080140DC.inc index e910fe33..f258679f 100644 --- a/data/scripts/gUnk_080140DC.inc +++ b/data/scripts/gUnk_080140DC.inc @@ -5,11 +5,11 @@ _0807E930 0x0004 StopScript WaitForSomething2 0x00000200 _0807E930 0x0008 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807E930 0x000c _0807E5F8 0x00002000 WaitForSomething 0x00000020 _0807E930 0x0010 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08014118.inc b/data/scripts/gUnk_08014118.inc index af3bce73..5891b34f 100644 --- a/data/scripts/gUnk_08014118.inc +++ b/data/scripts/gUnk_08014118.inc @@ -5,11 +5,11 @@ _0807E930 0x0005 StopScript WaitForSomething2 0x00000400 _0807E930 0x0009 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807E930 0x000d _0807E5F8 0x00004000 WaitForSomething 0x00000020 _0807E930 0x0011 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08014154.inc b/data/scripts/gUnk_08014154.inc index 02544d3a..5844b2da 100644 --- a/data/scripts/gUnk_08014154.inc +++ b/data/scripts/gUnk_08014154.inc @@ -6,12 +6,12 @@ SetEntityPosition 0x0000, 0xfff0 StopScript WaitForSomething2 0x00000800 _0807E930 0x000a -Call 0x0807f2d5 +Call sub_0807F2D4 _0807E930 0x000e _0807E5F8 0x00008000 WaitForSomething 0x00000020 _0807E930 0x0012 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08014198.inc b/data/scripts/gUnk_08014198.inc index cfe74586..599a6ecc 100644 --- a/data/scripts/gUnk_08014198.inc +++ b/data/scripts/gUnk_08014198.inc @@ -6,12 +6,12 @@ SetEntityPosition 0x0000, 0xfff0 StopScript WaitForSomething2 0x00001000 _0807E930 0x000b -Call 0x0807f2d5 +Call sub_0807F2D4 _0807E930 0x000f _0807E5F8 0x00010000 WaitForSomething 0x00000020 _0807E930 0x0013 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_080141DC.inc b/data/scripts/gUnk_080141DC.inc index a4a1d7a5..6474c661 100644 --- a/data/scripts/gUnk_080141DC.inc +++ b/data/scripts/gUnk_080141DC.inc @@ -2,17 +2,16 @@ SCRIPT_START gUnk_080141DC StartScript _0807EF80 0x0007 _0807E930 0x0014 -Call 0x0807f715 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf995 -.short 0x0807 +Call sub_0807F714 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F994 .short 0xfffc .short 0x0000 @ End of parameters StopScript WaitForSomething 0x00000020 Wait 0x0078 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08014210.inc b/data/scripts/gUnk_08014210.inc index 5a8afc07..a8253a5c 100644 --- a/data/scripts/gUnk_08014210.inc +++ b/data/scripts/gUnk_08014210.inc @@ -2,17 +2,16 @@ SCRIPT_START gUnk_08014210 StartScript _0807EF80 0x0007 _0807E930 0x0015 -Call 0x0807f715 -Call 0x0807f715 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf995 -.short 0x0807 +Call sub_0807F714 +Call sub_0807F714 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F994 .short 0xfffc .short 0x0000 @ End of parameters StopScript WaitForSomething 0x00000020 Wait 0x0078 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08014248.inc b/data/scripts/gUnk_08014248.inc index ed295289..dcbddfda 100644 --- a/data/scripts/gUnk_08014248.inc +++ b/data/scripts/gUnk_08014248.inc @@ -2,16 +2,14 @@ SCRIPT_START gUnk_08014248 TestBit 0x00020000 JumpIf 0x0014 Wait 0x0008 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5ead -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095EAC .short 0x0000 .short 0x0000 @ End of parameters Jump 0xffe6 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x5ead -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_08095EAC .short 0x0001 .short 0x0000 @ End of parameters @@ -23,10 +21,9 @@ StopScript CheckLocalFlag 0x0078 JumpIfNot 0xfffa StartScript -Call 0x0807f935 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda05 -.short 0x0806 +Call sub_0807F934 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA04 .short 0x0008 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_080142B0.inc b/data/scripts/gUnk_080142B0.inc index 80923c10..934901e7 100644 --- a/data/scripts/gUnk_080142B0.inc +++ b/data/scripts/gUnk_080142B0.inc @@ -16,7 +16,7 @@ _0807E864 SetLocalFlag 0x0053 Wait 0x0014 _0807E908 0x0004 -Call 0x080654dd +Call sub_080654DC Wait 0x001e _0807E930 0x0001 Wait 0x000a @@ -47,7 +47,7 @@ _0807E864 SetLocalFlag 0x0054 Wait 0x005a _0807E908 0x0004 -Call 0x080654ed +Call sub_080654EC Wait 0x001e _0807E930 0x0001 Wait 0x001e diff --git a/data/scripts/gUnk_08014384.inc b/data/scripts/gUnk_08014384.inc index 8d27c3d1..731675ae 100644 --- a/data/scripts/gUnk_08014384.inc +++ b/data/scripts/gUnk_08014384.inc @@ -5,7 +5,7 @@ _0807EA94 _0807E3E8 JumpIfNot 0x001e Wait 0x001e -Call 0x08065371 +Call sub_08065370 JumpIfNot 0x0010 Wait 0x003c _0807EA94 diff --git a/data/scripts/gUnk_080143C0.inc b/data/scripts/gUnk_080143C0.inc index 79b9f487..aa3ae6c0 100644 --- a/data/scripts/gUnk_080143C0.inc +++ b/data/scripts/gUnk_080143C0.inc @@ -1,37 +1,37 @@ SCRIPT_START gUnk_080143C0 StopScript _0807E864 -Call 0x0807df29 -Call 0x080654fd +Call sub_0807DF28 +Call sub_080654FC _0807E930 0x0001 -Call 0x080654ed +Call sub_080654EC Wait 0x003c TextboxNoOverlap 0x2c16 _0807EA94 _0807E3E8 JumpIf 0x0012 _0807E914 0x00000002 -Call 0x08065529 +Call sub_08065528 Jump 0x0046 -Call 0x080654ed +Call sub_080654EC Wait 0x001e TextboxNoOverlap 0x2c18 _0807EA94 Wait 0x000a _0807E914 0x00000000 -Call 0x08065529 +Call sub_08065528 _0807F034 0x0036 WaitPlayerAction8 TextboxNoOverlap 0x2c19 _0807EA94 _0807E914 0x00000303 -Call 0x0807f421 +Call sub_0807F420 Wait 0x001e _0807EB8C TextboxNoOverlap 0x2c22 _0807EA94 _0807E930 0x0004 _0807E908 0x0001 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 SCRIPT_END diff --git a/data/scripts/gUnk_08014450.inc b/data/scripts/gUnk_08014450.inc index 5cba5540..026708be 100644 --- a/data/scripts/gUnk_08014450.inc +++ b/data/scripts/gUnk_08014450.inc @@ -23,7 +23,7 @@ HasRupees 0x000a JumpIf 0x000a TextboxNoOverlapFollow 0x4204 Jump 0x005c -Call 0x0806e251 +Call sub_0806E250 JumpIfNot 0x000e TextboxNoOverlapFollow 0x420b _0807EB38 @@ -42,7 +42,7 @@ Wait 0x0018 SetRoomFlag 0x0000 SetLocalFlag 0x0092 _0807EEF4 0x0000, 0xffa0 -Call 0x0807df39 +Call sub_0807DF38 Jump 0x000e _0807E930 0x0009 Wait 0x003c diff --git a/data/scripts/gUnk_0801450C.inc b/data/scripts/gUnk_0801450C.inc index bf8d0973..4e8ca601 100644 --- a/data/scripts/gUnk_0801450C.inc +++ b/data/scripts/gUnk_0801450C.inc @@ -6,13 +6,13 @@ SetEntityNonPlanarMovement 0x01c0 _0807EF80 0x000a StopScript _0807E864 -Call 0x0807df29 -Call 0x0806e20d +Call sub_0807DF28 +Call sub_0806E20C _0807EA94 -Call 0x0806e23d +Call sub_0806E23C ClearLocalFlag 0x0093 ClearLocalFlag 0x0092 -Call 0x0807df51 +Call sub_0807DF50 Jump 0xffb8 .short 0x0000 StartScript @@ -24,7 +24,7 @@ JumpIfNot 0xffee _0807E864 _0807EB28 0x4217 _0807EA94 -StartPlayerScript 0x08014588 +StartPlayerScript gUnk_08014588 Wait 0x0010 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 diff --git a/data/scripts/gUnk_08014588.inc b/data/scripts/gUnk_08014588.inc index 23d8ddc7..a1b00da4 100644 --- a/data/scripts/gUnk_08014588.inc +++ b/data/scripts/gUnk_08014588.inc @@ -6,5 +6,5 @@ _0807EDD4 0x0078, 0x0078 _0807EF80 0x0000 Wait 0x0010 _0807E5F8 0x00000002 -Call 0x0807921d +Call sub_0807921C SCRIPT_END diff --git a/data/scripts/gUnk_080145E8.inc b/data/scripts/gUnk_080145E8.inc index 2ff86973..295e90ef 100644 --- a/data/scripts/gUnk_080145E8.inc +++ b/data/scripts/gUnk_080145E8.inc @@ -7,12 +7,12 @@ StopScript CheckRoomFlag 0x0000 JumpIfNot 0xfffa _0807E864 -Call 0x0807df29 +Call sub_0807DF28 CheckRoomFlag 0x0004 JumpIf 0xfffa _0807E5F8 0x00000004 WaitForSomething2 0x00000008 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffd2 StartScript @@ -27,7 +27,7 @@ TestBit 0x00000004 JumpIf 0x0132 CheckRoomFlag 0x0004 JumpIf 0x0022 -Call 0x0808861d +Call sub_0808861C JumpIfNot 0xffe0 CheckLocalFlag 0x005e JumpIf 0x003e @@ -38,12 +38,12 @@ _0807EB8C .short 0x000c @ End of parameters Jump 0x015e -Call 0x08088659 +Call sub_08088658 JumpIfNot 0xffc0 _0807E864 _0807EB28 0x431f _0807EA94 -StartPlayerScript 0x080147dc +StartPlayerScript gUnk_080147DC Wait 0x0010 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 @@ -70,7 +70,7 @@ CheckRoomFlag 0x0006 JumpIf 0x0052 CheckLocalFlag 0x005f JumpIf 0x003c -Call 0x08088575 +Call sub_08088574 SetRoomFlag 0x0009 Jump 0x004a .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters @@ -93,11 +93,11 @@ JumpIfNot 0x00b0 @ End of parameters Jump 0x001e SetRoomFlag 0x0009 -Call 0x08088505 +Call sub_08088504 Jump 0x0010 SetRoomFlag 0x0009 ClearRoomFlag 0x0006 -Call 0x08088545 +Call sub_08088544 _0807E3E8 JumpIfNot 0x0030 _0807EA94 @@ -122,9 +122,9 @@ CheckRoomFlag 0x0008 JumpIf 0x0034 CheckRoomFlag 0x0007 JumpIf 0x001c -Call 0x08088479 +Call sub_08088478 _0807EA94 -Call 0x080885b1 +Call sub_080885B0 WaitPlayerAction8 _0807E5F8 0x00000008 Jump 0x002c @@ -146,12 +146,3 @@ Wait 0x0004 _0807E878 Jump 0xfe62 .short 0x0000 -StopScript -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x00e0 -_0807EDD4 0x0078, 0x0068 -_0807EF80 0x0000 -Wait 0x0010 -_0807E5F8 0x00000001 -Call 0x0807921d -SCRIPT_END diff --git a/data/scripts/gUnk_080147DC.inc b/data/scripts/gUnk_080147DC.inc new file mode 100644 index 00000000..0db5a666 --- /dev/null +++ b/data/scripts/gUnk_080147DC.inc @@ -0,0 +1,10 @@ +SCRIPT_START gUnk_080147DC +StopScript +WaitForSomething2 0x00000002 +SetEntityNonPlanarMovement 0x00e0 +_0807EDD4 0x0078, 0x0068 +_0807EF80 0x0000 +Wait 0x0010 +_0807E5F8 0x00000001 +Call sub_0807921C +SCRIPT_END diff --git a/data/scripts/gUnk_08014804.inc b/data/scripts/gUnk_08014804.inc index 0f51cb04..599d21f1 100644 --- a/data/scripts/gUnk_08014804.inc +++ b/data/scripts/gUnk_08014804.inc @@ -5,7 +5,7 @@ _0807EB44 0x0000 _0807EF80 0x000a StopScript _0807E864 -Call 0x0807df39 +Call sub_0807DF38 Wait 0x0010 CheckLocalFlag 0x0093 JumpIf 0x0092 @@ -72,7 +72,7 @@ StopScript CheckRoomFlag 0x0000 JumpIfNot 0xfffa ClearRoomFlag 0x0000 -Call 0x0806e141 +Call sub_0806E140 JumpIfNot 0x002a _0807EA94 _0807E3E8 @@ -80,7 +80,7 @@ JumpIfNot 0x0028 _0807E864 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -Call 0x0806e1e1 +Call sub_0806E1E0 _0807EA94 Wait 0x0018 _0807E878 @@ -89,8 +89,8 @@ _0807EA94 Jump 0x0002 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 -Call 0x0806e1fd +Call sub_0806E1FC Wait 0x001e -Call 0x0807df51 +Call sub_0807DF50 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08014958.inc b/data/scripts/gUnk_08014958.inc index db98456c..cee8f3f6 100644 --- a/data/scripts/gUnk_08014958.inc +++ b/data/scripts/gUnk_08014958.inc @@ -1,6 +1,6 @@ SCRIPT_START gUnk_08014958 StartScript -Call 0x0806c871 +Call sub_0806C870 _0807EF80 0x000a CheckGlobalFlag 0x0058 JumpIf 0x000c @@ -11,13 +11,13 @@ _0807E30C JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x0806c90d +Call sub_0806C90C _0807EA94 Wait 0x000f _0807E878 Jump 0xffe6 StartScript -Call 0x0806c871 +Call sub_0806C870 _0807EF80 0x000a CheckGlobalFlag 0x0058 JumpIfNot 0x0020 @@ -26,7 +26,7 @@ _0807E30C JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x0806c90d +Call sub_0806C90C _0807EA94 Wait 0x000f _0807E878 diff --git a/data/scripts/gUnk_080149CC.inc b/data/scripts/gUnk_080149CC.inc index 1f1d577a..79537164 100644 --- a/data/scripts/gUnk_080149CC.inc +++ b/data/scripts/gUnk_080149CC.inc @@ -1,14 +1,14 @@ SCRIPT_START gUnk_080149CC StartScript SetEntityNonPlanarMovement 0x0080 -Call 0x0806c871 +Call sub_0806C870 _0807EF80 0x000a StopScript _0807E30C JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x0806c90d +Call sub_0806C90C _0807EA94 CheckLocalFlag 0x0064 JumpIfNot 0x002a @@ -26,28 +26,28 @@ _0807E878 Jump 0xffba .short 0x0000 StartScript -Call 0x0806c871 +Call sub_0806C870 _0807EF80 0x000a StopScript _0807E30C JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x0806c90d +Call sub_0806C90C _0807EA94 Wait 0x000f _0807E878 Jump 0xffe6 .short 0x0000 StartScript -Call 0x0806c871 +Call sub_0806C870 _0807EF80 0x000a StopScript _0807E30C JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x0806c90d +Call sub_0806C90C _0807EA94 Wait 0x000f _0807E878 diff --git a/data/scripts/gUnk_08014A80.inc b/data/scripts/gUnk_08014A80.inc index 0c7347cd..5c8538cb 100644 --- a/data/scripts/gUnk_08014A80.inc +++ b/data/scripts/gUnk_08014A80.inc @@ -20,14 +20,14 @@ _0807E878 Jump 0xffec .short 0x0000 StartScript -Call 0x0806c871 +Call sub_0806C870 _0807EF80 0x000a StopScript _0807E30C JumpIfNot 0xfffc _0807E864 _0807EB74 -StartPlayerScript 0x08014b10 +StartPlayerScript gUnk_08014B10 WaitForSomething2 0x00000001 _0807EB74 CheckLocalFlag 0x0064 @@ -41,12 +41,3 @@ 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_08014B10.inc b/data/scripts/gUnk_08014B10.inc new file mode 100644 index 00000000..2f777e41 --- /dev/null +++ b/data/scripts/gUnk_08014B10.inc @@ -0,0 +1,10 @@ +SCRIPT_START gUnk_08014B10 +StartScript +SetEntityNonPlanarMovement 0x0100 +StopScript +_0807EDD4 0x0078, 0x0040 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call sub_080791BC +SCRIPT_END diff --git a/data/scripts/gUnk_08014B34.inc b/data/scripts/gUnk_08014B34.inc index afc0cefd..386c67e3 100644 --- a/data/scripts/gUnk_08014B34.inc +++ b/data/scripts/gUnk_08014B34.inc @@ -21,31 +21,31 @@ _0807E878 Jump 0xffda StopScript _0807E864 -Call 0x0807df29 +Call sub_0807DF28 _0807E5F8 0x00000001 _0807EF80 0x0004 WaitForSomething2 0x00000002 _0807E930 0x0010 -Call 0x0806ccf9 +Call sub_0806CCF8 Wait 0x0014 -Call 0x0806cd05 +Call sub_0806CD04 Wait 0x0014 -Call 0x0806cd15 +Call sub_0806CD14 Wait 0x0014 -Call 0x0806cd21 +Call sub_0806CD20 Wait 0x0014 -Call 0x0806cd31 +Call sub_0806CD30 Wait 0x0014 -Call 0x0806cd3d +Call sub_0806CD3C Wait 0x0014 -Call 0x0806cd4d +Call sub_0806CD4C SoundReq 0x0072 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807E930 0x0010 -Call 0x0806cd4d +Call sub_0806CD4C CheckEntityInteractType JumpIfNot 0xfffc _0807E864 @@ -64,7 +64,7 @@ Wait 0x000f _0807E878 Jump 0xffc8 StartScript -Call 0x0806cd59 +Call sub_0806CD58 _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0006 @@ -73,9 +73,9 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -Call 0x0806ccd1 +Call sub_0806CCD0 JumpIfNot 0xfff8 -Call 0x0806ccb5 +Call sub_0806CCB4 JumpIfNot 0xfff8 CheckLocalFlag 0x0066 JumpIf 0x0016 @@ -95,7 +95,7 @@ Jump 0xffb0 StartScript CheckGlobalFlag 0x0024 JumpIf 0x0038 -Call 0x0806c871 +Call sub_0806C870 _0807EF80 0x000a _0807EF80 0x0000 StopScript @@ -108,7 +108,7 @@ JumpIfNot 0xfff0 StopScript _0807E864 _0807EB74 -Call 0x0806c90d +Call sub_0806C90C _0807EA94 _0807E878 Jump 0xffdc diff --git a/data/scripts/gUnk_08014CDC.inc b/data/scripts/gUnk_08014CDC.inc index 2ad6adef..93bb4a62 100644 --- a/data/scripts/gUnk_08014CDC.inc +++ b/data/scripts/gUnk_08014CDC.inc @@ -2,14 +2,14 @@ SCRIPT_START gUnk_08014CDC StartScript SetEntityNonPlanarMovement 0x0180 _0807EF80 0x000a -Call 0x08066d05 -Call 0x08066d15 +Call sub_08066D04 +Call sub_08066D14 SetEntityPositionRelative 0x018001e8 _0807EB44 0x0004 _0807EF80 0x0000 StopScript WaitForSomething2 0x00000001 -Call 0x08066e09 +Call sub_08066E08 _0807E864 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1010 @@ -23,43 +23,42 @@ CheckPlayerInRegion 0x01d8, 0x0160, 0x3050 JumpIfNot 0xfff2 StopScript _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 TextboxNoOverlap 0x1012 _0807EA94 _0807EC64 0x0040 _0807EB44 0x0004 -Call 0x08066e09 +Call sub_08066E08 SetEntityPositionRelative 0x00c801f8 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf6b5 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F6B4 .short 0x00e8 .short 0x0000 @ End of parameters JumpIf 0xfff4 _0807E864 -Call 0x0807df29 +Call sub_0807DF28 TextboxNoOverlap 0x1013 _0807EA94 _0807EC64 0x0040 _0807EB44 0x0004 _0807EF80 0x0000 SetEntityPositionRelative 0x002801e8 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 CheckPlayerInRegion 0x01f8, 0x0028, 0x2040 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 TextboxNoOverlap 0x1014 _0807EA94 _0807EC64 0x0018 SetLocalFlag 0x006d -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08014DCC.inc b/data/scripts/gUnk_08014DCC.inc index d689618e..48f3362c 100644 --- a/data/scripts/gUnk_08014DCC.inc +++ b/data/scripts/gUnk_08014DCC.inc @@ -1,10 +1,10 @@ SCRIPT_START gUnk_08014DCC StartScript SetEntityPositionRelative 0x01a80238 -Call 0x0807f845 -Call 0x0807f349 +Call sub_0807F844 +Call sub_0807F348 _0807E864 -Call 0x0807df29 +Call sub_0807DF28 StopScript _0807E778 0x0010 DoFade6 @@ -13,7 +13,7 @@ _0807E5F8 0x00000001 WaitForSomething2 0x00000002 _0807F0B4 0x0004 CameraTargetPlayer -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08014E14.inc b/data/scripts/gUnk_08014E14.inc index 31bf0b96..20aa9ea3 100644 --- a/data/scripts/gUnk_08014E14.inc +++ b/data/scripts/gUnk_08014E14.inc @@ -3,9 +3,8 @@ StartScript _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters @@ -14,13 +13,12 @@ CheckEntityInteractType JumpIfNot 0xfffc _0807E864 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf3d9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F3D8 .short 0x0000 .short 0x0000 @ End of parameters -Call 0x08064429 +Call sub_08064428 _0807EA94 _0807E878 Jump 0xffe0 @@ -34,29 +32,26 @@ StopScript CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call 0x0807df29 +Call sub_0807DF28 _0807EB74 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf78d -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F78C .short 0x0022 .short 0x0000 @ End of parameters _0807EA94 _0807E3E8 JumpIfNot 0x0038 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf7c5 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F7C4 .short 0x0022 .short 0x0000 @ End of parameters JumpIfNot 0x001e _0807E48C 0x0020 JumpIfNot 0x001e -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf801 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F800 .short 0x0022 .short 0x0000 @ End of parameters @@ -67,7 +62,7 @@ TextboxNoOverlap 0x0a03 Jump 0x0006 TextboxNoOverlap 0x0a02 _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xff9c .short 0x0000 @@ -110,18 +105,17 @@ _0807EF80 0x0007 _0807EB44 0x0004 _0807E930 0x000e StopScript -Call 0x08065915 +Call sub_08065914 CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call 0x0807df29 +Call sub_0807DF28 _0807EB74 _0807EF80 0x0000 StartScript TextboxNoOverlap 0x3b0b -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf855 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F854 .short 0x0064 .short 0x0001 @ End of parameters @@ -142,31 +136,31 @@ TextboxNoOverlap 0x3b0e Jump 0x0006 TextboxNoOverlap 0x3b0f _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EB44 0x0004 _0807E930 0x000e Jump 0xff90 StartScript SetEntityPositionRelative 0x00e001f8 -Call 0x08054565 +Call sub_08054564 StopScript CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 SoundReq0x80100000 _0807F0B4 0x0001 CameraTargetEntity -StartPlayerScript 0x080152b4 +StartPlayerScript gUnk_080152B4 WaitForSomething2 0x00000001 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1301 .short 0x0002 @ End of parameters _0807EA94 -Call 0x0807f3f9 +Call sub_0807F3F8 Wait 0x003c _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -192,69 +186,69 @@ WaitForSomething2 0x00000004 _0807EB28 0x1306 _0807EA94 SoundReq0x80100000 -StartPlayerScript 0x080152dc +StartPlayerScript gUnk_080152DC CameraTargetEntity _0807F0B4 0x0003 SetEntityPositionRelative 0x014801f8 WaitForSomething2 0x00000001 -Call 0x0804f6a9 +Call sub_0804F6A8 Wait 0x0004 -Call 0x0804f809 +Call sub_0804F808 SoundReq 0x010b -StartPlayerScript 0x08015304 -Call 0x0804f6c9 +StartPlayerScript gUnk_08015304 +Call sub_0804F6C8 Wait 0x0004 -Call 0x0804f831 +Call sub_0804F830 SoundReq 0x010b -Call 0x0804f6e9 +Call sub_0804F6E8 Wait 0x0004 -Call 0x0804f855 +Call sub_0804F854 SoundReq 0x010b -Call 0x0804f725 +Call sub_0804F724 Wait 0x0004 -Call 0x0804f89d +Call sub_0804F89C SoundReq 0x010b -Call 0x0804f761 +Call sub_0804F760 Wait 0x0004 -Call 0x0804f8e1 +Call sub_0804F8E0 SoundReq 0x010b Wait 0x003c WaitForSomething2 0x00000001 SoundReq 0x01b0 -Call 0x0804f79d +Call sub_0804F79C Wait 0x000a LoadRoomEntityList 0x080f7fc0 SoundReq2 0x002d -Call 0x0807df51 +Call sub_0807DF50 _0807E878 CheckRoomFlag 0x0000 JumpIfNot 0xfffa _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 SoundReq0x80100000 -StartPlayerScript 0x08015338 +StartPlayerScript gUnk_08015338 WaitForSomething2 0x00000001 Wait 0x003c -Call 0x0804f6a9 +Call sub_0804F6A8 Wait 0x0004 -Call 0x0804f929 +Call sub_0804F928 SoundReq 0x010b -Call 0x0804f6c9 +Call sub_0804F6C8 Wait 0x0004 -Call 0x0804f945 +Call sub_0804F944 SoundReq 0x010b -Call 0x0804f6e9 +Call sub_0804F6E8 Wait 0x0004 -Call 0x0804f961 +Call sub_0804F960 SoundReq 0x010b -Call 0x0804f725 +Call sub_0804F724 Wait 0x0004 -Call 0x0804f995 +Call sub_0804F994 SoundReq 0x010b -Call 0x0804f761 +Call sub_0804F760 Wait 0x0004 -Call 0x0804f9c9 +Call sub_0804F9C8 SoundReq 0x010b Wait 0x003c SoundReq 0x0072 @@ -267,12 +261,11 @@ CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 -Call 0x08053b3d +Call sub_08053B3C StartScript _0807E864 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf6e9 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F6E8 .short 0x0008 .short 0x0000 @ End of parameters @@ -283,7 +276,7 @@ _0807E778 0x0100 DoFade4 _0807E80C 0x00000000 StopScript -StartPlayerScript 0x08015360 +StartPlayerScript gUnk_08015360 WaitForSomething2 0x00000001 LoadRoomEntityList 0x080f7cb0 _0807E778 0x0004 @@ -298,9 +291,9 @@ StopScript _0807EA94 _0807F0B4 0x0004 CameraTargetPlayer -Call 0x08054571 +Call sub_08054570 SoundReq2 0xffff -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08015234.inc b/data/scripts/gUnk_08015234.inc index e5ebf690..55a848f6 100644 --- a/data/scripts/gUnk_08015234.inc +++ b/data/scripts/gUnk_08015234.inc @@ -3,10 +3,10 @@ StartScript _0807EF80 0x0008 _0807EB44 0x0004 _0807EF80 0x0000 -Call 0x0807f355 +Call sub_0807F354 StopScript WaitForSomething2 0x00000002 -Call 0x08066c95 +Call sub_08066C94 Wait 0x00e9 _0807EF80 0x0007 _0807EF80 0x001e @@ -15,7 +15,7 @@ WaitForSomething2 0x00000002 Wait 0x0014 _0807EB44 0x0000 _0807EF80 0x001c -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EF80 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 diff --git a/data/scripts/gUnk_080152B4.inc b/data/scripts/gUnk_080152B4.inc index ba07be80..034313cd 100644 --- a/data/scripts/gUnk_080152B4.inc +++ b/data/scripts/gUnk_080152B4.inc @@ -7,5 +7,5 @@ _0807EDD4 0x01f8, 0x00b8 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_080152DC.inc b/data/scripts/gUnk_080152DC.inc index 0e78d378..7875ca7a 100644 --- a/data/scripts/gUnk_080152DC.inc +++ b/data/scripts/gUnk_080152DC.inc @@ -7,5 +7,5 @@ _0807EDD4 0x01f8, 0x0148 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08015304.inc b/data/scripts/gUnk_08015304.inc index 1094991f..c0125a09 100644 --- a/data/scripts/gUnk_08015304.inc +++ b/data/scripts/gUnk_08015304.inc @@ -9,6 +9,6 @@ _0807EB44 0x0006 Wait 0x000a _0807EB44 0x0004 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08015338.inc b/data/scripts/gUnk_08015338.inc index 9865b028..2f546efa 100644 --- a/data/scripts/gUnk_08015338.inc +++ b/data/scripts/gUnk_08015338.inc @@ -7,5 +7,5 @@ _0807EDD4 0x01f8, 0x0148 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08015360.inc b/data/scripts/gUnk_08015360.inc index 6584a442..e686adc4 100644 --- a/data/scripts/gUnk_08015360.inc +++ b/data/scripts/gUnk_08015360.inc @@ -6,5 +6,5 @@ StopScript _0807EB44 0x0006 _0807EF80 0x0000 _0807E5F8 0x00000001 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08015384.inc b/data/scripts/gUnk_08015384.inc index e57ad001..e33a0bbc 100644 --- a/data/scripts/gUnk_08015384.inc +++ b/data/scripts/gUnk_08015384.inc @@ -1,4 +1,4 @@ SCRIPT_START gUnk_08015384 _0807EF80 0x0015 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08015390.inc b/data/scripts/gUnk_08015390.inc index ba244411..b54d6af8 100644 --- a/data/scripts/gUnk_08015390.inc +++ b/data/scripts/gUnk_08015390.inc @@ -4,7 +4,7 @@ SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 StopScript _0807E930 0x001f -Call 0x0806d945 +Call sub_0806D944 WaitForSomething2 0x00000008 _0807E930 0x0010 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters @@ -13,12 +13,12 @@ _0807E930 0x0010 @ End of parameters _0807EA94 _0807E930 0x0018 -Call 0x0806d8a1 +Call sub_0806D8A0 _0807EE30 JumpIfNot 0xfffc _0807E930 0x001f -StartPlayerScript 0x08015384 -Call 0x0806d9a5 +StartPlayerScript gUnk_08015384 +Call sub_0806D9A4 _0807EF80 0x0008 Wait 0x0078 _0807E5F8 0x00000010 diff --git a/data/scripts/gUnk_080153EC.inc b/data/scripts/gUnk_080153EC.inc index 96de3275..8b455b9f 100644 --- a/data/scripts/gUnk_080153EC.inc +++ b/data/scripts/gUnk_080153EC.inc @@ -47,9 +47,8 @@ _0807EA94 .short 0x000c @ End of parameters _0807EA94 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xdded -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DDEC .short 0x0001 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0801548E.inc b/data/scripts/gUnk_0801548E.inc index 4a450ef5..cad8956d 100644 --- a/data/scripts/gUnk_0801548E.inc +++ b/data/scripts/gUnk_0801548E.inc @@ -2,9 +2,8 @@ SCRIPT_START gUnk_0801548E _0807E5F8 0x00000800 WaitForSomething2 0x00001000 SoundReq 0x0125 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfb29 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FB28 .short 0x0003 .short 0x0000 @ End of parameters @@ -19,9 +18,8 @@ _0807E5F8 0x00008000 WaitForSomething2 0x00010000 _0807E5F8 0x00048000 WaitForSomething2 0x00010000 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xde19 -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DE18 .short 0x0001 .short 0x0000 @ End of parameters diff --git a/data/scripts/gUnk_0801550C.inc b/data/scripts/gUnk_0801550C.inc index 33234b3a..035ab2e5 100644 --- a/data/scripts/gUnk_0801550C.inc +++ b/data/scripts/gUnk_0801550C.inc @@ -3,26 +3,23 @@ StartScript SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 _0807EB44 0x0000 -Call 0x0807f339 +Call sub_0807F338 StopScript -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0000 .short 0x0000 @ End of parameters WaitForSomething2 0x00008000 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0004 .short 0x0000 @ End of parameters _0807EDD4 0x0078, 0x00b8 _0807EB44 0x0000 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0000 .short 0x0000 @ End of parameters @@ -30,9 +27,8 @@ _0807E5F8 0x00010000 WaitForSomething2 0x00008000 _0807EF80 0x000d _0807EB44 0x0000 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0004 .short 0x0000 @ End of parameters @@ -40,26 +36,23 @@ _0807EDD4 0x0078, 0x00c8 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 _0807EB44 0x0000 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xaf61 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806AF60 .short 0x0000 .short 0x0000 @ End of parameters _0807EF80 0x0010 Wait 0x0028 SoundReq 0x0125 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfb29 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FB28 .short 0x0003 .short 0x0000 @ End of parameters Wait 0x000a SoundReq 0x0125 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xfb29 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807FB28 .short 0x0003 .short 0x0000 @ End of parameters @@ -68,7 +61,7 @@ _0807EF80 0x0010 _0807E5F8 0x00010000 WaitForSomething2 0x00008000 _0807E930 0x000d -Call 0x0807f2d5 +Call sub_0807F2D4 _0807E5F8 0x00010000 Wait 0x003c _0807EF80 0x0005 diff --git a/data/scripts/gUnk_08015618.inc b/data/scripts/gUnk_08015618.inc index 7e6aa67d..873a6fb5 100644 --- a/data/scripts/gUnk_08015618.inc +++ b/data/scripts/gUnk_08015618.inc @@ -2,23 +2,21 @@ SCRIPT_START gUnk_08015618 StartScript _0807EF80 0x0007 SetEntityNonPlanarMovement 0x0040 -Call 0x08094b81 +Call sub_08094B80 StopScript WaitForSomething2 0x00000080 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xdded -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DDEC .short 0x0003 .short 0x0000 @ End of parameters -Call 0x08094b0d +Call sub_08094B0C _0807EDD4 0x0078, 0x0068 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EF3C 0xff80, 0x0000 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xde19 -.short 0x0805 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0805DE18 .short 0x0003 .short 0x0000 @ End of parameters @@ -26,7 +24,7 @@ Wait 0x003c _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0001 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08015684.inc b/data/scripts/gUnk_08015684.inc index fb4991b6..e2ce398e 100644 --- a/data/scripts/gUnk_08015684.inc +++ b/data/scripts/gUnk_08015684.inc @@ -4,7 +4,7 @@ _0807EF80 0x0007 _0807EF80 0x000b _0807EB44 0x0000 _0807EF80 0x0017 -Call 0x0807f181 +Call sub_0807F180 StopScript WaitForSomething2 0x00000800 _0807EB44 0x0002 @@ -22,16 +22,15 @@ Wait 0x0014 _0807E5F8 0x00001000 WaitForSomething2 0x00000800 _0807EF80 0x0018 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00001000 WaitForSomething2 0x00000800 _0807EB44 0x0004 _0807EF80 0x0014 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x545d -.short 0x0809 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0809545C .short 0x5754 .short 0x0801 @ End of parameters @@ -43,7 +42,7 @@ _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00001000 WaitForSomething2 0x00000800 -Call 0x08066ca5 +Call sub_08066CA4 _0807EF80 0x0008 Wait 0x0078 _0807E5F8 0x00001000 diff --git a/data/scripts/gUnk_08015754.inc b/data/scripts/gUnk_08015754.inc index 264d099f..8ec9bfa5 100644 --- a/data/scripts/gUnk_08015754.inc +++ b/data/scripts/gUnk_08015754.inc @@ -2,14 +2,14 @@ SCRIPT_START gUnk_08015754 StartScript _0807E930 0x0000 SetEntityNonPlanarMovement 0x0200 -Call 0x08094b81 +Call sub_08094B80 StopScript Wait 0x0078 SoundReq 0x01c5 -Call 0x08094b6d +Call sub_08094B6C _0807EDD4 0x0078, 0x00b8 SoundReq 0x01c6 -Call 0x08094b81 +Call sub_08094B80 _0807E5F8 0x00020000 SetEntityNonPlanarMovement 0x0080 WaitForSomething2 0x00040000 diff --git a/data/scripts/gUnk_080157AC.inc b/data/scripts/gUnk_080157AC.inc index bcc7ce8d..e0b5bc89 100644 --- a/data/scripts/gUnk_080157AC.inc +++ b/data/scripts/gUnk_080157AC.inc @@ -2,32 +2,32 @@ SCRIPT_START gUnk_080157AC CheckPlayerInRegion 0x01f8, 0x0310, 0x2020 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 CheckPlayerInRegion 0x0250, 0x0230, 0x3040 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -Call 0x0807f3f9 +Call sub_0807F9A4 +Call sub_0807DF28 +Call sub_0807F3F8 Wait 0x003c _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -StartPlayerScript 0x080158f8 +StartPlayerScript gUnk_080158F8 _0807F0B4 0x0001 SetEntityPositionRelative 0x02180248 CameraTargetEntity -Call 0x0807f5c1 +Call sub_0807F5C0 WaitForSomething2 0x00000010 _0807E5F8 0x00000008 WaitForSomething2 0x00000020 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -StartPlayerScript 0x08015918 +StartPlayerScript gUnk_08015918 WaitForSomething2 0x00000010 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 @@ -38,9 +38,9 @@ WaitForSomething2 0x00000002 _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 -Call 0x08066f95 +Call sub_08066F94 _0807E5F8 0x00000008 CheckRoomFlag 0x0000 JumpIfNot 0xfffa @@ -48,11 +48,11 @@ _0807EA94 ComparePlayerAction 0x001c JumpIf 0xfff8 _0807E864 -Call 0x0807df29 +Call sub_0807DF28 _0807F0B4 0x0002 SetEntityPositionRelative 0x02080248 CameraTargetEntity -StartPlayerScript 0x08015938 +StartPlayerScript gUnk_08015938 WaitForSomething2 0x00000010 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x106a @@ -70,8 +70,8 @@ _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 SetLocalFlag 0x008b -Call 0x08066fb9 -Call 0x0807df51 +Call sub_08066FB8 +Call sub_0807DF50 _0807E878 _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/gUnk_080158F8.inc b/data/scripts/gUnk_080158F8.inc index c762fb27..8c1025b2 100644 --- a/data/scripts/gUnk_080158F8.inc +++ b/data/scripts/gUnk_080158F8.inc @@ -4,5 +4,5 @@ _0807EDD4 0x0218, 0x0238 _0807EB44 0x0002 _0807EF80 0x0000 _0807E5F8 0x00000010 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08015918.inc b/data/scripts/gUnk_08015918.inc index f59b3bf5..010c2646 100644 --- a/data/scripts/gUnk_08015918.inc +++ b/data/scripts/gUnk_08015918.inc @@ -4,5 +4,5 @@ _0807EDD4 0x0238, 0x0228 _0807EB44 0x0002 _0807EF80 0x0000 _0807E5F8 0x00000010 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08015938.inc b/data/scripts/gUnk_08015938.inc index 41b54823..e2045e39 100644 --- a/data/scripts/gUnk_08015938.inc +++ b/data/scripts/gUnk_08015938.inc @@ -4,5 +4,5 @@ _0807EDD4 0x0248, 0x0208 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000010 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08015958.inc b/data/scripts/gUnk_08015958.inc index 9e00d5cd..3e1dd800 100644 --- a/data/scripts/gUnk_08015958.inc +++ b/data/scripts/gUnk_08015958.inc @@ -3,11 +3,11 @@ StartScript SetEntityNonPlanarMovement 0x0180 _0807EF80 0x0008 _0807EF80 0x000b -Call 0x08066d05 +Call sub_08066D04 StopScript WaitForSomething2 0x00000001 StartScript -Call 0x08066d15 +Call sub_08066D14 MoveEntityToPlayer StopScript _0807EF80 0x0007 @@ -30,12 +30,12 @@ _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 -Call 0x0807f3c9 +Call sub_0807F3C8 SoundReq 0x0096 SetEntityNonPlanarMovement 0x0200 _0807ECC4 0x0008 _0807E930 0x0040 -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EB44 0x0006 _0807EF80 0x0000 _0807E5F8 0x00000002 @@ -70,7 +70,7 @@ _0807EF80 0x000b _0807EB44 0x0000 _0807EF80 0x0000 WaitForSomething2 0x00000001 -Call 0x08066d4d +Call sub_08066D4C _0807E5F8 0x00000002 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08015A7C.inc b/data/scripts/gUnk_08015A7C.inc index 9992b499..6345c5f5 100644 --- a/data/scripts/gUnk_08015A7C.inc +++ b/data/scripts/gUnk_08015A7C.inc @@ -5,6 +5,6 @@ _0807EC64 0x0010 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000004 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08015AA0.inc b/data/scripts/gUnk_08015AA0.inc index 631a369a..72a3a9ee 100644 --- a/data/scripts/gUnk_08015AA0.inc +++ b/data/scripts/gUnk_08015AA0.inc @@ -5,6 +5,6 @@ _0807EC94 0x0010 _0807EB44 0x0002 _0807EF80 0x0000 _0807E5F8 0x00000004 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08015AC4.inc b/data/scripts/gUnk_08015AC4.inc index ed28d651..754b2b65 100644 --- a/data/scripts/gUnk_08015AC4.inc +++ b/data/scripts/gUnk_08015AC4.inc @@ -15,7 +15,7 @@ _0807EF80 0x0000 WaitForSomething2 0x00000008 Wait 0x003c SoundReq 0x0072 -Call 0x08046079 +Call sub_08046078 _0807EF80 0x0006 SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08015B34.inc b/data/scripts/gUnk_08015B34.inc index a9cd4e7b..2f23520e 100644 --- a/data/scripts/gUnk_08015B34.inc +++ b/data/scripts/gUnk_08015B34.inc @@ -3,25 +3,24 @@ StopScript StartScript CheckLocalFlag 0x008b JumpIf 0x0040 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf6b5 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F6B4 .short 0x0318 .short 0x0000 @ End of parameters JumpIfNot 0xffe8 StopScript _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 +Call sub_0807F9A4 +Call sub_0807DF28 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x2506 .short 0x0002 @ End of parameters _0807EA94 -StartPlayerScript 0x08015b84 +StartPlayerScript gUnk_08015B84 WaitForSomething2 0x00000004 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffb8 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08015B84.inc b/data/scripts/gUnk_08015B84.inc index 78063ce9..7893541f 100644 --- a/data/scripts/gUnk_08015B84.inc +++ b/data/scripts/gUnk_08015B84.inc @@ -5,6 +5,6 @@ _0807EC64 0x0010 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000004 -Call 0x080791bd +Call sub_080791BC SCRIPT_END .short 0x0000 diff --git a/data/scripts/gUnk_08015BA8.inc b/data/scripts/gUnk_08015BA8.inc index 637c2636..7ee39edb 100644 --- a/data/scripts/gUnk_08015BA8.inc +++ b/data/scripts/gUnk_08015BA8.inc @@ -8,7 +8,7 @@ SetEntityNonPlanarMovement 0x0200 StopScript Wait 0x000f _0807E8E4_2 -Call 0x0807f3f9 +Call sub_0807F3F8 Wait 0x001e _0807EDD4 0x00b8, 0x0258 Wait 0x001e diff --git a/data/scripts/gUnk_08015BE8.inc b/data/scripts/gUnk_08015BE8.inc index cb007668..b513bb6f 100644 --- a/data/scripts/gUnk_08015BE8.inc +++ b/data/scripts/gUnk_08015BE8.inc @@ -5,20 +5,20 @@ StopScript CheckPlayerInRegion 0x0160, 0x0020, 0x3040 JumpIfNot 0xfff6 _0807E864 -Call 0x0807f9a5 -Call 0x0807df29 -Call 0x0807fbc5 -StartPlayerScript 0x08015c7c +Call sub_0807F9A4 +Call sub_0807DF28 +Call sub_0807FBC4 +StartPlayerScript gUnk_08015C7C WaitForSomething2 0x00000100 CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 SoundReq0x80100000 -Call 0x08053be9 +Call sub_08053BE8 StartScript _0807E864 -Call 0x0807fbc5 +Call sub_0807FBC4 CameraTargetPlayer _0807E778 0x0100 DoFade4 @@ -31,8 +31,8 @@ SoundReq2 0xffff _0807EB28 0x131f _0807EA94 SetLocalFlag 0x009c -Call 0x0807fbcd -Call 0x0807df51 +Call sub_0807FBCC +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_08015C7C.inc b/data/scripts/gUnk_08015C7C.inc index e7ccc037..e7faab73 100644 --- a/data/scripts/gUnk_08015C7C.inc +++ b/data/scripts/gUnk_08015C7C.inc @@ -6,27 +6,25 @@ _0807EF80 0x0001 _0807EDD4 0x0168, 0x0058 _0807EB44 0x0004 _0807EF80 0x0000 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf239 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F238 .short 0x03c5 .short 0x0000 @ End of parameters -Call 0x0807f305 +Call sub_0807F304 .short 0x0c5c @ TextboxNoOverlapFollowPos with 2 parameters .short 0x1318 .short 0x000c @ End of parameters _0807EA94 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf239 -.short 0x0807 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F238 .short 0x03c9 .short 0x0000 @ End of parameters -Call 0x0807f305 +Call sub_0807F304 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000100 -Call 0x080791bd +Call sub_080791BC SCRIPT_END diff --git a/data/scripts/gUnk_08015E58.inc b/data/scripts/gUnk_08015E58.inc index 0a2f0969..99d6da07 100644 --- a/data/scripts/gUnk_08015E58.inc +++ b/data/scripts/gUnk_08015E58.inc @@ -6,24 +6,24 @@ _0807EF80 0x0000 _0807EF80 0x001d StopScript WaitForSomething2 0x00000010 -Call 0x08066c95 +Call sub_08066C94 Wait 0x00e9 _0807EF80 0x0007 _0807EF80 0x001e Wait 0x0014 _0807EB44 0x0000 _0807EF80 0x001c -Call 0x0807f2d5 +Call sub_0807F2D4 _0807EF80 0x0000 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 -Call 0x08066ca5 +Call sub_08066CA4 _0807EF80 0x0008 Wait 0x00bc _0807E5F8 0x00000020 WaitForSomething2 0x00000010 SetEntityPositionRelative 0x00680088 -Call 0x08066c95 +Call sub_08066C94 Wait 0x00e8 _0807EF80 0x0007 _0807EF80 0x001e diff --git a/data/scripts/gUnk_08015FA4.inc b/data/scripts/gUnk_08015FA4.inc index 249baa2e..83e92568 100644 --- a/data/scripts/gUnk_08015FA4.inc +++ b/data/scripts/gUnk_08015FA4.inc @@ -1,7 +1,7 @@ SCRIPT_START gUnk_08015FA4 StartScript _0807EF80 0x000a -Call 0x08066e39 +Call sub_08066E38 StopScript WaitForSomething 0x00000400 _0807EF80 0x0006 diff --git a/data/scripts/gUnk_08015FC0.inc b/data/scripts/gUnk_08015FC0.inc index 51545509..533149ba 100644 --- a/data/scripts/gUnk_08015FC0.inc +++ b/data/scripts/gUnk_08015FC0.inc @@ -1,12 +1,11 @@ SCRIPT_START gUnk_08015FC0 StartScript -Call 0x0806db85 +Call sub_0806DB84 CheckKinstoneFused 0x0009 JumpIf 0x005a _0807EA88 0x0009 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xda05 -.short 0x0806 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0806DA04 .short 0x0007 .short 0x0000 @ End of parameters @@ -17,7 +16,7 @@ _0807E9F0 _0807E864 CheckKinstoneFused 0x0009 JumpIf 0x000e -Call 0x0807df51 +Call sub_0807DF50 _0807E878 Jump 0xffe8 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/gUnk_08016004.inc b/data/scripts/gUnk_08016004.inc index 5acc71d6..0136d07a 100644 --- a/data/scripts/gUnk_08016004.inc +++ b/data/scripts/gUnk_08016004.inc @@ -5,7 +5,7 @@ _0807F0C8 0x0000, 0x0000 SoundReq 0x0072 _0807EB28 0x0b1f _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_080160A8.inc b/data/scripts/gUnk_080160A8.inc index 3133be5d..2a83a1ac 100644 --- a/data/scripts/gUnk_080160A8.inc +++ b/data/scripts/gUnk_080160A8.inc @@ -45,7 +45,7 @@ _0807E878 _0807EB44 0x0004 Jump 0xff76 StartScript -Call 0x080787b5 +Call sub_080787B4 StopScript CheckEntityInteractType JumpIfNot 0xfffc @@ -72,7 +72,7 @@ TextboxNoOverlapFollow 0x2d06 _0807E878 Jump 0xffb8 StartScript -Call 0x080787b5 +Call sub_080787B4 StopScript CheckEntityInteractType JumpIfNot 0xfffc @@ -101,104 +101,96 @@ TextboxNoOverlap 0x2d06 _0807E878 Jump 0xffb4 StartScript -Call 0x0807f349 +Call sub_0807F348 _0807EF80 0x000a _0807EB44 0x0004 _0807EF80 0x0000 StopScript -Call 0x08068c29 +Call sub_08068C28 CheckEntityInteractType JumpIfNot 0xfffc _0807E864 -Call 0x0807df29 +Call sub_0807DF28 _0807EB74 -Call 0x08068ca1 +Call sub_08068CA0 JumpIf 0x0122 -Call 0x08068cfd +Call sub_08068CFC JumpIfNot 0x010c -Call 0x08068db9 +Call sub_08068DB8 _0807EA94 -Call 0x08068dd1 +Call sub_08068DD0 _0807EA94 _0807E3E8 JumpIfNot 0x010a -StartPlayerScript 0x0801635c +StartPlayerScript gUnk_0801635C WaitForSomething2 0x00000001 _0807EB74 -Call 0x08068c8d +Call sub_08068C8C JumpIf 0x000e -Call 0x08068de9 +Call sub_08068DE8 _0807EA94 Wait 0x001e -Call 0x08068e01 +Call sub_08068E00 _0807EA94 _0807EF80 0x0001 -Call 0x0807f2d5 -Call 0x08068e91 -Call 0x08068c8d +Call sub_0807F2D4 +Call sub_08068E90 +Call sub_08068C8C JumpIf 0x009a -Call 0x08068f01 -Call 0x08068f15 -Call 0x08068bb5 -.short 0x140c @ CallWithArg with 4 parameters -.short 0xf245 -.short 0x0807 +Call sub_08068F00 +Call sub_08068F14 +Call sub_08068BB4 +.short 0x140c @ CallWithArg with 2 parameters +.word sub_0807F244 .short 0x0001 .short 0x0001 @ End of parameters -Call 0x08068b85 -Call 0x0807f2a9 -Call 0x08068bd1 +Call sub_08068B84 +Call sub_0807F2A8 +Call sub_08068BD0 Wait 0x001e -Call 0x08068e19 +Call sub_08068E18 _0807EA94 -Call 0x08068eb5 -Call 0x0807df51 +Call sub_08068EB4 +Call sub_0807DF50 _0807E878 StopScript StartScript -Call 0x08068ec5 +Call sub_08068EC4 JumpIf 0x001e CheckEntityInteractType JumpIf 0x0006 Jump 0xffea StopScript _0807E864 -Call 0x08068e79 +Call sub_08068E78 _0807EA94 _0807E878 Jump 0xffd8 StopScript _0807E888 -Call 0x0807f595 -Call 0x0807df29 +Call sub_0807F594 +Call sub_0807DF28 _0807E864 SoundReq0x80100000 SoundReq 0x00cd Wait 0x003c SoundReq2 0x005e -Call 0x08068f3d -Call 0x08068e31 +Call sub_08068F3C +Call sub_08068E30 _0807EA94 -Call 0x08068c6d +Call sub_08068C6C WaitPlayerAction8 _0807EA94 Jump 0x0016 -Call 0x08068e61 +Call sub_08068E60 _0807EA94 Jump 0x000a -Call 0x08068e49 +Call sub_08068E48 _0807EA94 -Call 0x0807df51 +Call sub_0807DF50 _0807E878 _0807EB44 0x0004 _0807EF80 0x0000 Jump 0xfea6 .short 0x0000 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0078, 0x0050 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call 0x080791bd -SCRIPT_END diff --git a/data/scripts/gUnk_0801635C.inc b/data/scripts/gUnk_0801635C.inc new file mode 100644 index 00000000..1698dde2 --- /dev/null +++ b/data/scripts/gUnk_0801635C.inc @@ -0,0 +1,8 @@ +SCRIPT_START gUnk_0801635C +SetEntityNonPlanarMovement 0x0100 +_0807EDD4 0x0078, 0x0050 +_0807EB44 0x0000 +_0807EF80 0x0000 +_0807E5F8 0x00000001 +Call sub_080791BC +SCRIPT_END diff --git a/data/scripts/gUnk_0801637C.inc b/data/scripts/gUnk_0801637C.inc index 7de920f0..7802a910 100644 --- a/data/scripts/gUnk_0801637C.inc +++ b/data/scripts/gUnk_0801637C.inc @@ -1,69 +1,9 @@ SCRIPT_START gUnk_0801637C +@ this seems to be assembly for +@ push { lr } +@ bl CreateDust +@ pop { pc } .short 0xb500 .short 0xf08c .short 0xfb1d .short 0xbd00 -StartScript -StopScript -Jump 0xfffa -JumpIf 0xfff6 -JumpIfNot 0xfff2 -.short 0x0c06 @ _0807E078 with 2 parameters -.short 0xffee -.short 0xffec -@ End of parameters -JumpAbsolute 0x08016384 -JumpAbsoluteIf 0x08016384 -JumpAbsoluteIfNot 0x08016384 -_0807E0E0 0x08016384, 0x08016384 -Call 0x08016384 -.short 0x140c @ CallWithArg with 4 parameters -.short 0x6384 -.short 0x0801 -.short 0x5678 -.short 0x1234 -@ End of parameters -LoadRoomEntityList 0x08016384 -TestBit 0x00000001 -CheckInventory1 0x0001 -CheckInventory2 0x0001 -.short 0x0411 @ HasRoomItemForSale with 0 parameters -CheckLocalFlag 0x0067 -CheckLocalFlagByOffset 0x0100, 0x006b -CheckGlobalFlag 0x0013 -CheckRoomFlag 0x0000 -CheckPlayerInRegion 0x0000, 0x0000, 0x0000 -CheckPlayerInRegion2 0x0000 -CheckEntityInteractType -_0807E30C -HasRupees 0x00c8 -_0807E3E8 -CheckKinstoneFused 0x0001 -BuyItem 0x006c, 0x0000 -_0807E48C 0x0020 -_0807E4CC 0x00000000 -_0807E4EC 0x00000000 -_0807E514 0x00000000 -CheckPlayerFlags 0x00000080 -_0807E564 -EntityHasHeight -ComparePlayerAction 0x0001 -ComparePlayerAnimationState 0x0004 -_0807E5F8 0x00000001 -_0807E610 0x00000002 -SetLocalFlag 0x0067 -SetLocalFlagByOffset 0x0100, 0x0001 -ClearLocalFlag 0x0067 -SetGlobalFlag 0x0013 -ClearGlobalFlag 0x0013 -SetRoomFlag 0x0000 -ClearRoomFlag 0x0000 -Wait 0x001e -WaitForSomething 0x00000001 -WaitForSomething2 0x00000002 -WaitPlayerAction8 -WaitForPlayerAction0x17 -WaitFor_1 -WaitFor_2 -_0807E778 0x0004 -_0807E788 0x0000ffff diff --git a/data/scripts/gUnk_08016384.inc b/data/scripts/gUnk_08016384.inc new file mode 100644 index 00000000..eeb26942 --- /dev/null +++ b/data/scripts/gUnk_08016384.inc @@ -0,0 +1,64 @@ +SCRIPT_START gUnk_08016384 +StartScript +StopScript +Jump 0xfffa +JumpIf 0xfff6 +JumpIfNot 0xfff2 +.short 0x0c06 @ _0807E078 with 2 parameters +.short 0xffee +.short 0xffec +@ End of parameters +JumpAbsolute gUnk_08016384 +JumpAbsoluteIf gUnk_08016384 +JumpAbsoluteIfNot gUnk_08016384 +_0807E0E0 gUnk_08016384, gUnk_08016384 +Call 0x08016384 +.short 0x140c @ CallWithArg with 2 parameters +.word 0x08016384 +.short 0x5678 +.short 0x1234 +@ End of parameters +LoadRoomEntityList 0x08016384 +TestBit 0x00000001 +CheckInventory1 0x0001 +CheckInventory2 0x0001 +.short 0x0411 @ HasRoomItemForSale with 0 parameters +CheckLocalFlag 0x0067 +CheckLocalFlagByOffset 0x0100, 0x006b +CheckGlobalFlag 0x0013 +CheckRoomFlag 0x0000 +CheckPlayerInRegion 0x0000, 0x0000, 0x0000 +CheckPlayerInRegion2 0x0000 +CheckEntityInteractType +_0807E30C +HasRupees 0x00c8 +_0807E3E8 +CheckKinstoneFused 0x0001 +BuyItem 0x006c, 0x0000 +_0807E48C 0x0020 +_0807E4CC 0x00000000 +_0807E4EC 0x00000000 +_0807E514 0x00000000 +CheckPlayerFlags 0x00000080 +_0807E564 +EntityHasHeight +ComparePlayerAction 0x0001 +ComparePlayerAnimationState 0x0004 +_0807E5F8 0x00000001 +_0807E610 0x00000002 +SetLocalFlag 0x0067 +SetLocalFlagByOffset 0x0100, 0x0001 +ClearLocalFlag 0x0067 +SetGlobalFlag 0x0013 +ClearGlobalFlag 0x0013 +SetRoomFlag 0x0000 +ClearRoomFlag 0x0000 +Wait 0x001e +WaitForSomething 0x00000001 +WaitForSomething2 0x00000002 +WaitPlayerAction8 +WaitForPlayerAction0x17 +WaitFor_1 +WaitFor_2 +_0807E778 0x0004 +_0807E788 0x0000ffff diff --git a/data/scripts/gUnk_08016482.inc b/data/scripts/gUnk_08016482.inc index 64bdb067..355c4d59 100644 --- a/data/scripts/gUnk_08016482.inc +++ b/data/scripts/gUnk_08016482.inc @@ -12,7 +12,7 @@ _0807E864 _0807E878 _0807E888 SetPlayerAction 0x00005408 -StartPlayerScript 0x08016384 +StartPlayerScript gUnk_08016384 _0807E8D4 0x03a0 _0807E8E4_0 _0807E8E4_1 diff --git a/data/scripts/gUnk_080165A4.inc b/data/scripts/gUnk_080165A4.inc index fd0d7ded..ed0ad838 100644 --- a/data/scripts/gUnk_080165A4.inc +++ b/data/scripts/gUnk_080165A4.inc @@ -11,244 +11,6 @@ Wait 0x001e CheckPlayerInRegion2 0x2020 JumpIfNot 0xfff6 _0807EF80 0x0003 -Call 0x0801637d +Call 0x0801637D Jump 0xffe8 .short 0x0000 -Wait 0x001e -CheckPlayerInRegion2 0x2020 -JumpAbsoluteIfNot 0x080165d8 -_0807EF80 0x0003 -Call 0x0801637d -JumpAbsolute 0x080165d8 -.short 0x0000 -StartScript -_0807E9D4 -StopScript -_0807E30C -JumpIfNot 0xfffc -TextboxNoOverlapFollow 0x0601 -Jump 0xfff4 -StartScript -_0807E9D4 -StopScript -_0807E944 -_0807E864 -TextboxNoOverlapFollow 0x0602 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffee -.short 0x0000 -StartScript -_0807E9D4 -StopScript -_0807E944 -_0807E864 -_0807EB28 0x0603 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffee -.short 0x0000 -SetEntityNonPlanarMovement 0x0100 -_0807ECF4 0x0030 -Wait 0x0008 -_0807ECC4 0x0030 -Wait 0x0008 -_0807EC94 0x0030 -Wait 0x0008 -_0807EC64 0x0030 -Wait 0x0008 -Jump 0xffde -_0807ED24 0x0055, 0x0039, 0x00b4 -Wait 0x0008 -_0807ED24 0x0075, 0x0076, 0x003c -Wait 0x0008 -_0807ED24 0x0105, 0x006c, 0x0078 -Wait 0x0008 -_0807ED24 0x018e, 0x007a, 0x0078 -Wait 0x0008 -_0807ED24 0x0173, 0x0023, 0x003c -Wait 0x0008 -_0807ED24 0x00d8, 0x003f, 0x003c -Wait 0x0008 -Jump 0xffb6 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0055, 0x0039 -Wait 0x0008 -_0807EDD4 0x0075, 0x0076 -Wait 0x0008 -_0807EDD4 0x0105, 0x006c -Wait 0x0008 -_0807EDD4 0x018e, 0x007a -Wait 0x0008 -_0807EDD4 0x0173, 0x0023 -Wait 0x0008 -_0807EDD4 0x00d8, 0x003f -Wait 0x0008 -Jump 0xffc2 -SetEntityNonPlanarMovement 0x0100 -_0807EC94 0x0030 -_0807E5F8 0x00000002 -Wait 0x000f -_0807EF80 0x0000 -_0807EB44 0x0004 -WaitForSomething 0x00000001 -_0807E610 0x00000001 -_0807EF80 0x0003 -Wait 0x0002 -_0807EB44 0x0006 -Wait 0x0002 -_0807EB44 0x0000 -Wait 0x0002 -_0807EB44 0x0002 -Wait 0x0002 -_0807EB44 0x0004 -WaitForSomething 0x00000001 -_0807E610 0x00000001 -_0807ECF4 0x0030 -Wait 0x000f -_0807EF80 0x0000 -_0807EB44 0x0004 -Wait 0x001e -_0807E5F8 0x00000006 -_0807EF80 0x0003 -Wait 0x0002 -_0807EB44 0x0006 -Wait 0x0002 -_0807EB44 0x0000 -Wait 0x0002 -_0807EB44 0x0002 -Wait 0x0002 -_0807EB44 0x0004 -Wait 0x003c -Jump 0xff6a -SetEntityNonPlanarMovement 0x0100 -WaitForSomething 0x00000002 -_0807E610 0x00000002 -_0807EC94 0x0030 -_0807E5F8 0x00000004 -Wait 0x000f -_0807EF80 0x0000 -_0807EB44 0x0004 -WaitForSomething 0x00000002 -_0807E610 0x00000002 -_0807EF80 0x0003 -Wait 0x0002 -_0807EB44 0x0006 -Wait 0x0002 -_0807EB44 0x0000 -Wait 0x0002 -_0807EB44 0x0002 -Wait 0x0002 -_0807EB44 0x0004 -WaitForSomething 0x00000002 -_0807E610 0x00000002 -_0807ECF4 0x0030 -_0807E5F8 0x00000001 -Wait 0x000f -_0807EF80 0x0000 -_0807EB44 0x0004 -WaitForSomething 0x00000002 -_0807E610 0x00000002 -_0807EF80 0x0003 -Wait 0x0002 -_0807EB44 0x0006 -Wait 0x0002 -_0807EB44 0x0000 -Wait 0x0002 -_0807EB44 0x0002 -Wait 0x0002 -_0807EB44 0x0004 -Jump 0xff5a -SetEntityNonPlanarMovement 0x0100 -WaitForSomething 0x00000004 -_0807E610 0x00000004 -_0807EC94 0x0030 -Wait 0x000f -_0807EF80 0x0000 -_0807EB44 0x0004 -Wait 0x001e -_0807E5F8 0x00000003 -_0807EF80 0x0003 -Wait 0x0002 -_0807EB44 0x0006 -Wait 0x0002 -_0807EB44 0x0000 -Wait 0x0002 -_0807EB44 0x0002 -Wait 0x0002 -_0807EB44 0x0004 -Wait 0x003c -_0807ECF4 0x0030 -_0807E5F8 0x00000002 -Wait 0x000f -_0807EF80 0x0000 -_0807EB44 0x0004 -WaitForSomething 0x00000004 -_0807E610 0x00000004 -_0807EF80 0x0003 -Wait 0x0002 -_0807EB44 0x0006 -Wait 0x0002 -_0807EB44 0x0000 -Wait 0x0002 -_0807EB44 0x0002 -Wait 0x0002 -_0807EB44 0x0004 -Jump 0xff6a -StartScript -_0807E9D4 -StopScript -_0807E944 -_0807E864 -Wait 0x000f -_0807E878 -Jump 0xfff4 -StartScript -Call 0x08064ea5 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call 0x08064f29 -_0807EA94 -JumpIfNot 0x0008 -_0807F034 0x003d -WaitPlayerAction8 -_0807E878 -SetGlobalFlag 0x005c -Jump 0xffdc -StartScript -_0807E9D4 -_0807EB44 0x0000 -_0807EF80 0x000a -StopScript -_0807E944 -_0807E864 -Wait 0x0018 -TextboxNoOverlapFollow 0x0a01 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffea -.short 0x0000 -StartScript -_0807E9D4 -_0807EB44 0x0000 -_0807EF80 0x000a -_0807E930 0x0000 -StopScript -_0807E944 -_0807E864 -Wait 0x0018 -TextboxNoOverlapFollow 0x0a01 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffea -.short 0x0000 diff --git a/data/scripts/gUnk_080165D8.inc b/data/scripts/gUnk_080165D8.inc new file mode 100644 index 00000000..3834a417 --- /dev/null +++ b/data/scripts/gUnk_080165D8.inc @@ -0,0 +1,239 @@ +SCRIPT_START gUnk_080165D8 +Wait 0x001e +CheckPlayerInRegion2 0x2020 +JumpAbsoluteIfNot gUnk_080165D8 +_0807EF80 0x0003 +Call 0x0801637D +JumpAbsolute gUnk_080165D8 +.short 0x0000 +StartScript +_0807E9D4 +StopScript +_0807E30C +JumpIfNot 0xfffc +TextboxNoOverlapFollow 0x0601 +Jump 0xfff4 +StartScript +_0807E9D4 +StopScript +_0807E944 +_0807E864 +TextboxNoOverlapFollow 0x0602 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffee +.short 0x0000 +StartScript +_0807E9D4 +StopScript +_0807E944 +_0807E864 +_0807EB28 0x0603 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffee +.short 0x0000 +SetEntityNonPlanarMovement 0x0100 +_0807ECF4 0x0030 +Wait 0x0008 +_0807ECC4 0x0030 +Wait 0x0008 +_0807EC94 0x0030 +Wait 0x0008 +_0807EC64 0x0030 +Wait 0x0008 +Jump 0xffde +_0807ED24 0x0055, 0x0039, 0x00b4 +Wait 0x0008 +_0807ED24 0x0075, 0x0076, 0x003c +Wait 0x0008 +_0807ED24 0x0105, 0x006c, 0x0078 +Wait 0x0008 +_0807ED24 0x018e, 0x007a, 0x0078 +Wait 0x0008 +_0807ED24 0x0173, 0x0023, 0x003c +Wait 0x0008 +_0807ED24 0x00d8, 0x003f, 0x003c +Wait 0x0008 +Jump 0xffb6 +SetEntityNonPlanarMovement 0x0100 +_0807EDD4 0x0055, 0x0039 +Wait 0x0008 +_0807EDD4 0x0075, 0x0076 +Wait 0x0008 +_0807EDD4 0x0105, 0x006c +Wait 0x0008 +_0807EDD4 0x018e, 0x007a +Wait 0x0008 +_0807EDD4 0x0173, 0x0023 +Wait 0x0008 +_0807EDD4 0x00d8, 0x003f +Wait 0x0008 +Jump 0xffc2 +SetEntityNonPlanarMovement 0x0100 +_0807EC94 0x0030 +_0807E5F8 0x00000002 +Wait 0x000f +_0807EF80 0x0000 +_0807EB44 0x0004 +WaitForSomething 0x00000001 +_0807E610 0x00000001 +_0807EF80 0x0003 +Wait 0x0002 +_0807EB44 0x0006 +Wait 0x0002 +_0807EB44 0x0000 +Wait 0x0002 +_0807EB44 0x0002 +Wait 0x0002 +_0807EB44 0x0004 +WaitForSomething 0x00000001 +_0807E610 0x00000001 +_0807ECF4 0x0030 +Wait 0x000f +_0807EF80 0x0000 +_0807EB44 0x0004 +Wait 0x001e +_0807E5F8 0x00000006 +_0807EF80 0x0003 +Wait 0x0002 +_0807EB44 0x0006 +Wait 0x0002 +_0807EB44 0x0000 +Wait 0x0002 +_0807EB44 0x0002 +Wait 0x0002 +_0807EB44 0x0004 +Wait 0x003c +Jump 0xff6a +SetEntityNonPlanarMovement 0x0100 +WaitForSomething 0x00000002 +_0807E610 0x00000002 +_0807EC94 0x0030 +_0807E5F8 0x00000004 +Wait 0x000f +_0807EF80 0x0000 +_0807EB44 0x0004 +WaitForSomething 0x00000002 +_0807E610 0x00000002 +_0807EF80 0x0003 +Wait 0x0002 +_0807EB44 0x0006 +Wait 0x0002 +_0807EB44 0x0000 +Wait 0x0002 +_0807EB44 0x0002 +Wait 0x0002 +_0807EB44 0x0004 +WaitForSomething 0x00000002 +_0807E610 0x00000002 +_0807ECF4 0x0030 +_0807E5F8 0x00000001 +Wait 0x000f +_0807EF80 0x0000 +_0807EB44 0x0004 +WaitForSomething 0x00000002 +_0807E610 0x00000002 +_0807EF80 0x0003 +Wait 0x0002 +_0807EB44 0x0006 +Wait 0x0002 +_0807EB44 0x0000 +Wait 0x0002 +_0807EB44 0x0002 +Wait 0x0002 +_0807EB44 0x0004 +Jump 0xff5a +SetEntityNonPlanarMovement 0x0100 +WaitForSomething 0x00000004 +_0807E610 0x00000004 +_0807EC94 0x0030 +Wait 0x000f +_0807EF80 0x0000 +_0807EB44 0x0004 +Wait 0x001e +_0807E5F8 0x00000003 +_0807EF80 0x0003 +Wait 0x0002 +_0807EB44 0x0006 +Wait 0x0002 +_0807EB44 0x0000 +Wait 0x0002 +_0807EB44 0x0002 +Wait 0x0002 +_0807EB44 0x0004 +Wait 0x003c +_0807ECF4 0x0030 +_0807E5F8 0x00000002 +Wait 0x000f +_0807EF80 0x0000 +_0807EB44 0x0004 +WaitForSomething 0x00000004 +_0807E610 0x00000004 +_0807EF80 0x0003 +Wait 0x0002 +_0807EB44 0x0006 +Wait 0x0002 +_0807EB44 0x0000 +Wait 0x0002 +_0807EB44 0x0002 +Wait 0x0002 +_0807EB44 0x0004 +Jump 0xff6a +StartScript +_0807E9D4 +StopScript +_0807E944 +_0807E864 +Wait 0x000f +_0807E878 +Jump 0xfff4 +StartScript +Call sub_08064EA4 +_0807EB44 0x0004 +_0807EF80 0x0000 +_0807EF80 0x000a +StopScript +_0807E30C +JumpIfNot 0xfffc +_0807E864 +_0807EB74 +Call sub_08064F28 +_0807EA94 +JumpIfNot 0x0008 +_0807F034 0x003d +WaitPlayerAction8 +_0807E878 +SetGlobalFlag 0x005c +Jump 0xffdc +StartScript +_0807E9D4 +_0807EB44 0x0000 +_0807EF80 0x000a +StopScript +_0807E944 +_0807E864 +Wait 0x0018 +TextboxNoOverlapFollow 0x0a01 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffea +.short 0x0000 +StartScript +_0807E9D4 +_0807EB44 0x0000 +_0807EF80 0x000a +_0807E930 0x0000 +StopScript +_0807E944 +_0807E864 +Wait 0x0018 +TextboxNoOverlapFollow 0x0a01 +_0807EA94 +Wait 0x000f +_0807E878 +Jump 0xffea +.short 0x0000 |