diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-03-06 22:44:09 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-03-07 01:25:44 +0100 |
| commit | 74e48d98b0edef729d90e070b65df748ecf3206f (patch) | |
| tree | 5a7230b89135e62a17949f41970c1b4d1525583b /data/scripts | |
| parent | 2bcea72f4982efbcacf5af162b1a8af4f6c27ca3 (diff) | |
Rename to Begin/EndBlock
Diffstat (limited to 'data/scripts')
350 files changed, 1428 insertions, 1428 deletions
diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc index 72121fe0..373c731b 100644 --- a/data/scripts/script_08008B5C.inc +++ b/data/scripts/script_08008B5C.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08008B5C - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0004 _0807E930 0x0000 _0807EF80 0x000a - StopScript + EndBlock script_08008B6E: _0807E944 _0807E864 @@ -16,12 +16,12 @@ script_08008B6E: _0807E878 Jump script_08008B6E .short 0x0000 - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0004 _0807EF80 0x000a _0807E930 0x0000 - StopScript + EndBlock script_08008BA2: _0807E944 _0807E864 @@ -32,12 +32,12 @@ script_08008BA2: _0807E930 0x0008 _0807E878 Jump script_08008BA2 - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0004 _0807EF80 0x000a _0807E930 0x0000 - StopScript + EndBlock script_08008BD2: _0807E944 _0807E864 @@ -74,14 +74,14 @@ script_08008C5C: _0807EA94 _0807E878 Jump script_08008BD2 - StartScript - SetEntityPositionRelative 0x00180068 + BeginBlock + SetEntityPositionRelative 0x0068, 0x0018 _0807EF80 0x000f _0807EB44 0x0004 _0807E930 0x0004 SetEntityNonPlanarMovement 0x0300 SoundReq 0x0121 - StopScript + EndBlock WaitForSomething 0x00000002 TextboxNoOverlap 0x490d _0807EA94 diff --git a/data/scripts/script_08008D50.inc b/data/scripts/script_08008D50.inc index 208c1630..3ed61266 100644 --- a/data/scripts/script_08008D50.inc +++ b/data/scripts/script_08008D50.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08008D50 - StartScript - SetEntityPositionRelative 0x00680068 + BeginBlock + SetEntityPositionRelative 0x0068, 0x0068 _0807F0B4 0x0004 CameraTargetEntity - StopScript + EndBlock Wait 0x001e _0807E5F8 0x00000002 WaitForSomething 0x00000001 diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc index d640ce56..23aeca90 100644 --- a/data/scripts/script_08008D8C.inc +++ b/data/scripts/script_08008D8C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08008D8C - StartScript + BeginBlock Call sub_08061FD8 Call sub_08061E70 _0807EF80 0x000a - StopScript + EndBlock script_08008DA0: CheckEntityInteractType JumpIfNot script_08008DA0 @@ -15,12 +15,12 @@ script_08008DA0: _0807E878 Jump script_08008DA0 .short 0x0000 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 - StopScript + EndBlock script_08008DD8: CheckEntityInteractType JumpIfNot script_08008DD8 @@ -33,9 +33,9 @@ script_08008DD8: _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 Jump script_08008DD8 - StartScript - SetEntityPositionRelative 0x00780088 - StopScript + BeginBlock + SetEntityPositionRelative 0x0088, 0x0078 + EndBlock script_08008E12: CheckPlayerInRegion 0x00d8, 0x0098, 0x4020 JumpIfNot script_08008E12 diff --git a/data/scripts/script_08008F74.inc b/data/scripts/script_08008F74.inc index e77c1d10..d9007ba2 100644 --- a/data/scripts/script_08008F74.inc +++ b/data/scripts/script_08008F74.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08008F74 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EF80 0x0001 _0807EDD4 0x00b8, 0x0090 _0807EB44 0x0006 diff --git a/data/scripts/script_08008FFC.inc b/data/scripts/script_08008FFC.inc index 2f52e90e..b77dea3b 100644 --- a/data/scripts/script_08008FFC.inc +++ b/data/scripts/script_08008FFC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08008FFC - StartScript + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 - StopScript + EndBlock WaitForSomething 0x00000010 SoundReq 0x011c _0807E930 0x0001 diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc index 15e7cb66..97ec4042 100644 --- a/data/scripts/script_0800903C.inc +++ b/data/scripts/script_0800903C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800903C - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000004 SoundReq 0x007c _0807EF3C 0x0180, 0x0030 @@ -11,19 +11,19 @@ SCRIPT_START script_0800903C WaitForSomething2 0x00000004 _0807EB44 0x0004 _0807E5F8 0x00000008 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a Jump script_0800927E .short 0x0000 - StartScript + BeginBlock Call sub_0807F348 SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0004 _0807EF80 0x0000 _0807E9D4 _0807EF80 0x000a - StopScript + EndBlock WaitForSomething2 0x00000080 _0807EB44 0x0004 _0807ECC4 0x0008 @@ -82,11 +82,11 @@ script_0800917C: Wait 0x000f _0807E878 Jump script_0800917C - StartScript + BeginBlock Call sub_0807F348 _0807EB44 0x0006 _0807EF80 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000001 _0807EB74 _0807EF80 0x0001 @@ -130,18 +130,18 @@ script_0800917C: _0807EA94 _0807EF80 0x0000 _0807E5F8 0x00000002 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a Jump script_080092B2 .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 script_0800927E: Call sub_080668F0 _0807EF80 0x000a - StopScript + EndBlock script_0800928A: CheckEntityInteractType JumpIfNot script_0800928A @@ -153,13 +153,13 @@ script_0800928A: _0807E878 Jump script_0800928A .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0006 _0807EF80 0x0000 script_080092B2: _0807E9D4 _0807EF80 0x000a - StopScript + EndBlock script_080092BA: CheckEntityInteractType JumpIfNot script_080092BA @@ -170,19 +170,19 @@ script_080092BA: Wait 0x000f _0807E878 Jump script_080092BA - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 Call sub_0806672C _0807EF80 0x000a - StopScript + EndBlock Jump script_0800917C .short 0x0000 - StartScript + BeginBlock _0807EF80 0x000a Call sub_08066E38 _0807E9D4 - StopScript + EndBlock script_08009300: CheckEntityInteractType JumpIfNot script_08009300 @@ -193,7 +193,7 @@ script_08009300: _0807E878 Jump script_08009300 .short 0x0000 - StartScript - StopScript + BeginBlock + EndBlock SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08009320.inc b/data/scripts/script_08009320.inc index f136823f..77b00bff 100644 --- a/data/scripts/script_08009320.inc +++ b/data/scripts/script_08009320.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08009320 - StartScript + BeginBlock Call sub_0806D650 SetEntityNonPlanarMovement 0x0010 - StopScript + EndBlock script_0800932E: _0807EEF4 0xfff8, 0x0000 _0807EEF4 0x0008, 0x0000 diff --git a/data/scripts/script_08009340.inc b/data/scripts/script_08009340.inc index 99204711..6385266f 100644 --- a/data/scripts/script_08009340.inc +++ b/data/scripts/script_08009340.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08009340 - StartScript - StopScript + BeginBlock + EndBlock SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08009348.inc b/data/scripts/script_08009348.inc index ee4e8ac4..9cddae5f 100644 --- a/data/scripts/script_08009348.inc +++ b/data/scripts/script_08009348.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08009348 - StartScript + BeginBlock _0807E9D4 - StopScript + EndBlock script_0800934E: CheckEntityInteractType JumpIfNot script_0800934E diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc index 74aaae79..553923bd 100644 --- a/data/scripts/script_08009464.inc +++ b/data/scripts/script_08009464.inc @@ -15,10 +15,10 @@ SCRIPT_START script_08009464 Wait 0x000a Jump script_08009376 .short 0x0000 - StartScript + BeginBlock Call sub_0806D7C4 SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock Wait 0x003c SetEntity0x20 0x00018000 script_080094BC: diff --git a/data/scripts/script_080094CC.inc b/data/scripts/script_080094CC.inc index a2d19eb9..3822f0b7 100644 --- a/data/scripts/script_080094CC.inc +++ b/data/scripts/script_080094CC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_080094CC - StartScript + BeginBlock Call sub_0806D804 SetEntityNonPlanarMovement 0x0180 - StopScript + EndBlock Wait 0x003c SetEntity0x20 0x00018000 Call sub_0806D858 diff --git a/data/scripts/script_080094FC.inc b/data/scripts/script_080094FC.inc index 9bf9b1a4..6ed41ece 100644 --- a/data/scripts/script_080094FC.inc +++ b/data/scripts/script_080094FC.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080094FC - StartScript + BeginBlock Call sub_08067100 _0807EF80 0x000a _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock script_08009512: CheckEntityInteractType JumpIfNot script_08009512 @@ -18,12 +18,12 @@ script_08009512: _0807EF80 0x0000 Jump script_08009512 .short 0x0000 - StartScript + BeginBlock Call sub_08067100 _0807EF80 0x000a _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock script_0800954E: CheckEntityInteractType JumpIfNot script_0800954E @@ -37,13 +37,13 @@ script_0800954E: _0807EF80 0x0000 Jump script_0800954E .short 0x0000 - StartScript + BeginBlock Call sub_08067314 _0807EF80 0x000a _0807EB44 0x0004 _0807E914 0x00000000 Call sub_080672B0 - StopScript + EndBlock script_08009592: CheckEntityInteractType JumpIfNot script_08009592 @@ -60,11 +60,11 @@ script_08009592: Call sub_080672B0 Jump script_08009592 .short 0x0000 - StartScript + BeginBlock Call sub_0806BE3C _0807EF80 0x000a _0807EF80 0x0007 - StopScript + EndBlock script_080095DE: Call sub_0806BF44 JumpIf script_080095F2 diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc index 1cadb7ab..0c6dda78 100644 --- a/data/scripts/script_080095F2.inc +++ b/data/scripts/script_080095F2.inc @@ -18,20 +18,20 @@ script_08009622: _0807E878 _0807EF80 0x0000 Jump script_080095DE - StartScript + BeginBlock _0807EF80 0x000b _0807EF80 0x0008 - StopScript + EndBlock script_08009638: - StopScript - StartScript + EndBlock + BeginBlock CheckGlobalFlag 0x0020 JumpIfNot script_08009638 - StopScript + EndBlock script_08009646: Call sub_0806BF44 JumpIf script_08009646 - StopScript + EndBlock Call sub_0806BE3C _0807EF80 0x000a _0807EF80 0x0007 @@ -52,12 +52,12 @@ script_0800968E: _0807E878 _0807EF80 0x0000 Jump script_08009660 - StartScript + BeginBlock _0807EF80 0x0007 Jump script_080096FC CheckGlobalFlag 0x0020 JumpIf script_080096FC - StopScript + EndBlock script_080096AC: CheckPlayerInRegion 0x0188, 0x01c0, 0x1020 JumpIfNot script_080096AC diff --git a/data/scripts/script_08009740.inc b/data/scripts/script_08009740.inc index e921a864..1cd49c67 100644 --- a/data/scripts/script_08009740.inc +++ b/data/scripts/script_08009740.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08009740 - StartScript + BeginBlock Call sub_08065D00 _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a _0807EF80 0x0007 - StopScript + EndBlock script_0800975A: CheckEntityInteractType JumpIfNot script_0800975A diff --git a/data/scripts/script_080097F0.inc b/data/scripts/script_080097F0.inc index 0e6e195b..d2b7de31 100644 --- a/data/scripts/script_080097F0.inc +++ b/data/scripts/script_080097F0.inc @@ -1,19 +1,19 @@ SCRIPT_START script_080097F0 - StartScript + BeginBlock _0807E930 0x0003 _0807EF80 0x0007 SetEntityNonPlanarMovement 0x0300 Call sub_0807F348 - StopScript + EndBlock WaitForSomething2 0x00000002 SoundReq 0x0123 Call sub_0807F1A0 script_08009816: - StopScript - StartScript + EndBlock + BeginBlock _0807EE30 JumpIfNot script_08009816 - StopScript + EndBlock _0807E5F8 0x00000004 Call sub_0807FBD4 SoundReq 0x01f3 diff --git a/data/scripts/script_08009838.inc b/data/scripts/script_08009838.inc index 54f4a5dc..1371f551 100644 --- a/data/scripts/script_08009838.inc +++ b/data/scripts/script_08009838.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08009838 - StartScript + BeginBlock _0807E930 0x0003 _0807EF80 0x0007 SetEntityNonPlanarMovement 0x0300 Call sub_0807F348 - StopScript + EndBlock WaitForSomething2 0x00000008 Call sub_0809E0A0 Call sub_0809E0D4 diff --git a/data/scripts/script_080098D4.inc b/data/scripts/script_080098D4.inc index 78e235cc..7f1277be 100644 --- a/data/scripts/script_080098D4.inc +++ b/data/scripts/script_080098D4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080098D4 - StartScript - StopScript + BeginBlock + EndBlock script_080098D8: CheckGlobalFlag 0x0020 JumpIfNot script_080098D8 diff --git a/data/scripts/script_08009918.inc b/data/scripts/script_08009918.inc index 263a4da6..79d4cbd7 100644 --- a/data/scripts/script_08009918.inc +++ b/data/scripts/script_08009918.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08009918 - StartScript + BeginBlock Call sub_0807DF28 _0807E864 _0807E5F8 0x00000000 - StopScript + EndBlock WaitFor_2 Wait 0x0078 _0807E5F8 0x00000004 diff --git a/data/scripts/script_08009950.inc b/data/scripts/script_08009950.inc index 2de6f57f..a83cd628 100644 --- a/data/scripts/script_08009950.inc +++ b/data/scripts/script_08009950.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08009950 - StartScript + BeginBlock Call sub_0807F348 SetEntityNonPlanarMovement 0x0040 _0807EB44 0x0004 _0807E930 0x000c _0807E908 0x0003 - StopScript + EndBlock Wait 0x001e CameraTargetEntity _0807E778 0x0004 diff --git a/data/scripts/script_080099DC.inc b/data/scripts/script_080099DC.inc index 5682be55..71648ce7 100644 --- a/data/scripts/script_080099DC.inc +++ b/data/scripts/script_080099DC.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080099DC - StartScript + BeginBlock Call sub_0807F348 SetEntityNonPlanarMovement 0x00c0 _0807EB44 0x0002 _0807EF80 0x0008 - StopScript + EndBlock WaitForSomething2 0x00000004 _0807EF80 0x0007 _0807EDD4 0x0068, 0x0060 diff --git a/data/scripts/script_08009A34.inc b/data/scripts/script_08009A34.inc index f0d821e2..3527bb00 100644 --- a/data/scripts/script_08009A34.inc +++ b/data/scripts/script_08009A34.inc @@ -6,7 +6,7 @@ script_08009A38: Call sub_08066258 Wait 0x005a Jump script_08009A38 - SetEntityPositionRelative 0x01780240 + SetEntityPositionRelative 0x0240, 0x0178 CameraTargetEntity SetEntityNonPlanarMovement 0x0080 Wait 0x0078 diff --git a/data/scripts/script_08009A84.inc b/data/scripts/script_08009A84.inc index b48e74e6..ee6102b7 100644 --- a/data/scripts/script_08009A84.inc +++ b/data/scripts/script_08009A84.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08009A84 - StartScript - SetEntityPositionRelative 0x011001e8 + BeginBlock + SetEntityPositionRelative 0x01e8, 0x0110 SetEntityNonPlanarMovement 0x00c0 _0807EF80 0x0008 - StopScript + EndBlock WaitForSomething2 0x00000004 _0807EF80 0x0007 _0807EDD4 0x01e8, 0x0200 diff --git a/data/scripts/script_08009AF8.inc b/data/scripts/script_08009AF8.inc index 9ba7e216..3ba22264 100644 --- a/data/scripts/script_08009AF8.inc +++ b/data/scripts/script_08009AF8.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08009AF8 - StartScript - StopScript + BeginBlock + EndBlock WaitForSomething2 0x00000010 SoundReq 0x00f0 _0807EF80 0x0008 diff --git a/data/scripts/script_08009B30.inc b/data/scripts/script_08009B30.inc index 685f2e66..5181c91f 100644 --- a/data/scripts/script_08009B30.inc +++ b/data/scripts/script_08009B30.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08009B30 - StartScript + BeginBlock Call sub_0807DF28 _0807E864 SetLocalFlag 0x0046 - StopScript + EndBlock WaitFor_2 Wait 0x001e TextboxNoOverlapFollow 0x1005 diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc index 2f5b2061..b340c2fb 100644 --- a/data/scripts/script_08009B78.inc +++ b/data/scripts/script_08009B78.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08009B78 - StartScript + BeginBlock _0807EB44 0x0006 SetEntityNonPlanarMovement 0x0080 _0807E9D4 Call sub_0807F348 - StopScript + EndBlock CheckGlobalFlag 0x0013 JumpIf script_08009C4C _0807E888 diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc index d81f699f..5584030d 100644 --- a/data/scripts/script_08009C68.inc +++ b/data/scripts/script_08009C68.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08009C68 - StartScript + BeginBlock _0807EB44 0x0002 SetEntityNonPlanarMovement 0x0100 Call sub_0807F348 - StopScript + EndBlock WaitForSomething2 0x00000004 _0807EF80 0x0004 _0807EB74 @@ -29,11 +29,11 @@ SCRIPT_START script_08009C68 _0807EDD4 0x0000, 0x0060 Call sub_080536A8 Wait 0x001e - StartScript + BeginBlock SetGlobalFlag 0x0013 Call sub_0807DF50 Call sub_080791D0 _0807E878 - StopScript + EndBlock SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08009CFC.inc b/data/scripts/script_08009CFC.inc index 39e00046..5b0fe695 100644 --- a/data/scripts/script_08009CFC.inc +++ b/data/scripts/script_08009CFC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08009CFC - StartScript + BeginBlock _0807E8E4_1 SetEntityNonPlanarMovement 0x00c0 - StopScript + EndBlock _0807E5F8 0x00000004 _0807EF80 0x0004 Wait 0x003c diff --git a/data/scripts/script_08009D6C.inc b/data/scripts/script_08009D6C.inc index e20bc108..2a302362 100644 --- a/data/scripts/script_08009D6C.inc +++ b/data/scripts/script_08009D6C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08009D6C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0006 - StopScript + EndBlock _0807EDD4 0x0078, 0x0060 _0807EDD4 0x0078, 0x007c Wait 0x001e diff --git a/data/scripts/script_08009DB0.inc b/data/scripts/script_08009DB0.inc index fe3be26d..eb4c471d 100644 --- a/data/scripts/script_08009DB0.inc +++ b/data/scripts/script_08009DB0.inc @@ -1,12 +1,12 @@ SCRIPT_START script_08009DB0 - StartScript + BeginBlock Call sub_0807F348 Call sub_08066288 Call sub_08066274 _0807EF80 0x000a _0807E930 0x000c _0807E908 0x0003 - StopScript + EndBlock script_08009DD2: _0807E944 _0807E908 0x0002 @@ -15,8 +15,8 @@ script_08009DD2: _0807E908 0x0003 _0807E930 0x000c Jump script_08009DD2 - StartScript - StopScript + BeginBlock + EndBlock script_08009DF0: CheckPlayerInRegion 0x00a0, 0x0038, 0x1830 JumpIfNot script_08009DF0 diff --git a/data/scripts/script_08009E58.inc b/data/scripts/script_08009E58.inc index a6106130..86a566ec 100644 --- a/data/scripts/script_08009E58.inc +++ b/data/scripts/script_08009E58.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08009E58 - StartScript + BeginBlock Call sub_0807DF28 - StopScript + EndBlock WaitForSomething2 0x00000002 _0807E778 0x0002 DoFade4 diff --git a/data/scripts/script_08009E80.inc b/data/scripts/script_08009E80.inc index 66e11e42..a7a249dd 100644 --- a/data/scripts/script_08009E80.inc +++ b/data/scripts/script_08009E80.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08009E80 - StartScript - StopScript + BeginBlock + EndBlock SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08009E88.inc b/data/scripts/script_08009E88.inc index e5cba4a5..c080230a 100644 --- a/data/scripts/script_08009E88.inc +++ b/data/scripts/script_08009E88.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08009E88 - StartScript + BeginBlock Call sub_0807DF28 _0807E864 SetLocalFlag 0x009f - StopScript + EndBlock Wait 0x003c _0807E778 0x0004 DoFade4 diff --git a/data/scripts/script_08009ECC.inc b/data/scripts/script_08009ECC.inc index 6a7dd099..025d3bd5 100644 --- a/data/scripts/script_08009ECC.inc +++ b/data/scripts/script_08009ECC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08009ECC - StartScript + BeginBlock _0807E914 0x00000002 _0807EF80 0x0001 - StopScript + EndBlock WaitForSomething2 0x00000004 - StartScript + BeginBlock _0807E914 0x00000003 _0807EF80 0x0001 - StopScript + EndBlock SCRIPT_END diff --git a/data/scripts/script_08009EF0.inc b/data/scripts/script_08009EF0.inc index 31f60a6b..2af8003f 100644 --- a/data/scripts/script_08009EF0.inc +++ b/data/scripts/script_08009EF0.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08009EF0 - StartScript + BeginBlock _0807E914 0x00000000 _0807EF80 0x0001 - StopScript + EndBlock WaitForSomething2 0x00000004 - StartScript + BeginBlock _0807E914 0x00000001 _0807EF80 0x0001 - StopScript + EndBlock SCRIPT_END diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc index c6a52566..27e3b581 100644 --- a/data/scripts/script_08009F14.inc +++ b/data/scripts/script_08009F14.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08009F14 - StartScript + BeginBlock _0807EB44 0x0004 Call sub_08060090 _0807EF80 0x000a @@ -7,14 +7,14 @@ SCRIPT_START script_08009F14 JumpIf script_08009FD2 CheckInventory1 0x0007 JumpIf script_08009F84 - StopScript + EndBlock script_08009F36: - StopScript - StartScript + EndBlock + BeginBlock Call sub_08060158 CheckEntityInteractType JumpIfNot script_08009F36 - StopScript + EndBlock _0807E864 Call sub_0807DF28 _0807EF80 0x000b @@ -30,14 +30,14 @@ script_08009F36: Call sub_0807DF50 _0807E878 script_08009F84: - StopScript + EndBlock script_08009F86: - StopScript - StartScript + EndBlock + BeginBlock Call sub_08060158 CheckEntityInteractType JumpIfNot script_08009F86 - StopScript + EndBlock _0807E864 Call sub_080602BC _0807EA94 @@ -53,16 +53,16 @@ script_08009FB6: _0807E878 Jump script_08009F86 script_08009FD2: - StopScript + EndBlock CheckLocalFlag 0x00b0 JumpIf script_0800A024 script_08009FDC: - StopScript - StartScript + EndBlock + BeginBlock Call sub_08060158 CheckEntityInteractType JumpIfNot script_08009FDC - StopScript + EndBlock _0807E864 TextboxNoOverlap 0x1f0e _0807EA94 @@ -82,12 +82,12 @@ script_0800A002: SetLocalFlag 0x00b0 _0807E878 script_0800A024: - StopScript - StartScript + EndBlock + BeginBlock Call sub_08060158 CheckEntityInteractType JumpIfNot script_0800A024 - StopScript + EndBlock _0807E864 CheckInventory1 0x0008 JumpIf script_0800A052 diff --git a/data/scripts/script_0800A088.inc b/data/scripts/script_0800A088.inc index 25189df6..ea40d645 100644 --- a/data/scripts/script_0800A088.inc +++ b/data/scripts/script_0800A088.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800A088 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807ECC4 0x0010 _0807EDD4 0x0078, 0x0060 _0807EB44 0x0000 diff --git a/data/scripts/script_0800A0B4.inc b/data/scripts/script_0800A0B4.inc index 88e85d50..db5885c1 100644 --- a/data/scripts/script_0800A0B4.inc +++ b/data/scripts/script_0800A0B4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A0B4 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0140 _0807E864 Call sub_0807DF28 - StopScript + EndBlock Wait 0x0078 SoundReq2 0x0018 Call sub_080A0464 diff --git a/data/scripts/script_0800A0FC.inc b/data/scripts/script_0800A0FC.inc index d89a6ae7..774a075d 100644 --- a/data/scripts/script_0800A0FC.inc +++ b/data/scripts/script_0800A0FC.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800A0FC - StopScript + EndBlock script_0800A0FE: CheckGlobalFlag 0x0051 JumpIfNot script_0800A0FE - StartScript + BeginBlock _0807E864 Call sub_0807DF28 SoundReq0x80100000 Call sub_0807FBFC - SetEntityPositionRelative 0x005800b0 + SetEntityPositionRelative 0x00b0, 0x0058 Call sub_0807F844 _0807E8E4_3 CallWithArg sub_0807F75C, 0x00d00060 @@ -16,7 +16,7 @@ script_0800A0FE: SoundReq 0x00f7 _0807E778 0x0002 DoFade6 - StopScript + EndBlock WaitFor_2 WaitForSomething2 0x00000004 CallWithArg sub_0806DA1C, 0x00000006 diff --git a/data/scripts/script_0800A160.inc b/data/scripts/script_0800A160.inc index 60aa3b19..6dda1842 100644 --- a/data/scripts/script_0800A160.inc +++ b/data/scripts/script_0800A160.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800A160 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 _0807EF80 0x000b _0807E930 0x0002 - SetEntityPositionRelative 0x008000b0 + SetEntityPositionRelative 0x00b0, 0x0080 CallWithArg sub_0807F98C, 0xff800000 CallWithArg sub_080960C4, 0x0800a1b4 - StopScript + EndBlock SoundReq 0x0142 _0807EF3C 0xff80, 0x0000 SoundReq 0x0143 diff --git a/data/scripts/script_0800A1B4.inc b/data/scripts/script_0800A1B4.inc index 6a5b0e52..a50269c7 100644 --- a/data/scripts/script_0800A1B4.inc +++ b/data/scripts/script_0800A1B4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A1B4 - StartScript + BeginBlock _0807EF80 0x0007 _0807EF80 0x000b CallWithArg sub_0807F994, 0x0000fff8 - StopScript + EndBlock WaitForSomething 0x00000002 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc index 1de72713..c66714f6 100644 --- a/data/scripts/script_0800A1D8.inc +++ b/data/scripts/script_0800A1D8.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800A1D8 - StartScript + BeginBlock _0807E864 Call sub_0807DF28 - SetEntityPositionRelative 0x00800088 + SetEntityPositionRelative 0x0088, 0x0080 Call sub_0807F844 _0807E8E4_3 CallWithArg sub_0807F75C, 0x00a80088 - StopScript + EndBlock Wait 0x003c StartPlayerScript script_0800A310 WaitForSomething2 0x00000001 diff --git a/data/scripts/script_0800A310.inc b/data/scripts/script_0800A310.inc index 13e28e4c..3ddd8246 100644 --- a/data/scripts/script_0800A310.inc +++ b/data/scripts/script_0800A310.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800A310 - StopScript + EndBlock _0807EB44 0x0002 Wait 0x000a _0807EB44 0x0006 @@ -11,13 +11,13 @@ SCRIPT_START script_0800A310 _0807E5F8 0x00000001 Call sub_080791BC .short 0x0000 - StartScript + BeginBlock _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 _0807EF80 0x000b _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 - StopScript + EndBlock WaitForSomething2 0x00000002 _0807E930 0x000e _0807EF80 0x0007 diff --git a/data/scripts/script_0800A3D8.inc b/data/scripts/script_0800A3D8.inc index 13202ee2..4e69732f 100644 --- a/data/scripts/script_0800A3D8.inc +++ b/data/scripts/script_0800A3D8.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800A3D8 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 _0807EF80 0x0007 _0807EF80 0x000b _0807EB44 0x0002 _0807EF80 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000004 - StartScript + BeginBlock _0807EF80 0x0004 Call sub_0807F3F8 - StopScript + EndBlock Wait 0x003c _0807EC94 0x0010 _0807EB44 0x0002 diff --git a/data/scripts/script_0800A500.inc b/data/scripts/script_0800A500.inc index 9b15189e..4503d7b4 100644 --- a/data/scripts/script_0800A500.inc +++ b/data/scripts/script_0800A500.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800A500 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 _0807EF80 0x000b _0807E930 0x0005 Call sub_0807F348 - StopScript + EndBlock WaitForSomething2 0x00000008 SoundReq 0x0142 _0807E610 0x00000800 diff --git a/data/scripts/script_0800A590.inc b/data/scripts/script_0800A590.inc index 0e52c71c..d55b6cad 100644 --- a/data/scripts/script_0800A590.inc +++ b/data/scripts/script_0800A590.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800A590 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 SetEntity0x20 0x00000000 _0807EF80 0x0008 @@ -7,7 +7,7 @@ SCRIPT_START script_0800A590 Call sub_0807F714 MoveEntityToPlayer CallWithArg sub_0807F98C, 0xfff00000 - StopScript + EndBlock _0807E930 0x0023 WaitForSomething2 0x00000010 CallWithArg sub_0807F6E8, 0x00000008 diff --git a/data/scripts/script_0800A638.inc b/data/scripts/script_0800A638.inc index db394caf..9b58af14 100644 --- a/data/scripts/script_0800A638.inc +++ b/data/scripts/script_0800A638.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A638 - StartScript + BeginBlock _0807EF80 0x0007 _0807EF80 0x000b CallWithArg sub_0807F994, 0x0000fff8 - StopScript + EndBlock WaitForSomething 0x00001000 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A65C.inc b/data/scripts/script_0800A65C.inc index e1065b79..2ea49e9e 100644 --- a/data/scripts/script_0800A65C.inc +++ b/data/scripts/script_0800A65C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A65C - StartScript + BeginBlock _0807EF80 0x0007 _0807EF80 0x000b CallWithArg sub_0807F994, 0x0000fff8 - StopScript + EndBlock WaitForSomething 0x00000800 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A680.inc b/data/scripts/script_0800A680.inc index 2c2211ae..da8c4144 100644 --- a/data/scripts/script_0800A680.inc +++ b/data/scripts/script_0800A680.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A680 - StartScript + BeginBlock _0807EF80 0x0007 _0807EF80 0x000b CallWithArg sub_0807F994, 0x0000fff8 - StopScript + EndBlock WaitForSomething 0x00000020 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A6A4.inc b/data/scripts/script_0800A6A4.inc index 82316f18..19933d36 100644 --- a/data/scripts/script_0800A6A4.inc +++ b/data/scripts/script_0800A6A4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A6A4 - StartScript + BeginBlock _0807E864 Call sub_0807DF28 - SetEntityPositionRelative 0x00680088 + SetEntityPositionRelative 0x0088, 0x0068 Call sub_0807F844 - StopScript + EndBlock Wait 0x003c SoundReq 0x00f6 CallWithArg sub_0806DA1C, 0x00000008 diff --git a/data/scripts/script_0800A6D4.inc b/data/scripts/script_0800A6D4.inc index f1396ad1..86b321d6 100644 --- a/data/scripts/script_0800A6D4.inc +++ b/data/scripts/script_0800A6D4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800A6D4 - StartScript + BeginBlock _0807E864 Call sub_0807DF28 - SetEntityPositionRelative 0x00700088 + SetEntityPositionRelative 0x0088, 0x0070 Call sub_0807F844 SoundReq 0x00f7 - StopScript + EndBlock Wait 0x003c CallWithArg sub_0806DA1C, 0x00000009 _0807EF80 0x0006 diff --git a/data/scripts/script_0800A704.inc b/data/scripts/script_0800A704.inc index 34836f30..5d8bd4e8 100644 --- a/data/scripts/script_0800A704.inc +++ b/data/scripts/script_0800A704.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A704 - StartScript + BeginBlock _0807E864 Call sub_0807DF28 - SetEntityPositionRelative 0x01c80198 + SetEntityPositionRelative 0x0198, 0x01c8 Call sub_0807F844 - StopScript + EndBlock Wait 0x003c SoundReq 0x00f6 CallWithArg sub_0806DA1C, 0x0000000a diff --git a/data/scripts/script_0800A734.inc b/data/scripts/script_0800A734.inc index 2f5ea451..bd94a8d3 100644 --- a/data/scripts/script_0800A734.inc +++ b/data/scripts/script_0800A734.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800A734 - StartScript + BeginBlock _0807E864 Call sub_0807DF28 - SetEntityPositionRelative 0x01c800d8 + SetEntityPositionRelative 0x00d8, 0x01c8 Call sub_0807F844 SoundReq 0x00f7 - StopScript + EndBlock Wait 0x003c CallWithArg sub_0806DA1C, 0x0000000b _0807EF80 0x0006 diff --git a/data/scripts/script_0800A764.inc b/data/scripts/script_0800A764.inc index bc1620b5..adf69a41 100644 --- a/data/scripts/script_0800A764.inc +++ b/data/scripts/script_0800A764.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A764 - StartScript + BeginBlock _0807E864 Call sub_0807DF28 - SetEntityPositionRelative 0x01b800f8 + SetEntityPositionRelative 0x00f8, 0x01b8 Call sub_0807F844 - StopScript + EndBlock Wait 0x003c SoundReq 0x00f6 _0807E778 0x0004 diff --git a/data/scripts/script_0800A7E4.inc b/data/scripts/script_0800A7E4.inc index 9155e29a..f92b1e92 100644 --- a/data/scripts/script_0800A7E4.inc +++ b/data/scripts/script_0800A7E4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A7E4 - StartScript + BeginBlock _0807EF80 0x0007 _0807EB44 0x0004 _0807E930 0x0010 - StopScript + EndBlock WaitForSomething 0x00000001 _0807E930 0x0002 WaitForSomething2 0x00000002 @@ -15,11 +15,11 @@ script_0800A80C: _0807E930 0x0003 Wait 0x001e Jump script_0800A80C - StartScript + BeginBlock _0807EF80 0x0007 _0807EB44 0x0004 _0807E930 0x0010 - StopScript + EndBlock WaitForSomething 0x00000001 _0807E930 0x0002 WaitForSomething2 0x00000004 @@ -31,11 +31,11 @@ script_0800A848: _0807E930 0x0003 Wait 0x0014 Jump script_0800A848 - StartScript + BeginBlock _0807EF80 0x0007 _0807EB44 0x0004 _0807E930 0x0010 - StopScript + EndBlock WaitForSomething 0x00000001 _0807E930 0x0002 WaitForSomething2 0x00000008 @@ -47,11 +47,11 @@ script_0800A884: _0807E930 0x0003 Wait 0x000a Jump script_0800A884 - StartScript + BeginBlock _0807EF80 0x0007 _0807EB44 0x0004 _0807E930 0x0008 - StopScript + EndBlock WaitForSomething 0x00000001 _0807EF80 0x0000 WaitForSomething2 0x00000010 @@ -63,11 +63,11 @@ script_0800A8C0: _0807EB44 0x0006 Wait 0x0019 Jump script_0800A8C0 - StartScript + BeginBlock _0807EF80 0x0007 _0807EB44 0x0004 _0807E930 0x0008 - StopScript + EndBlock WaitForSomething 0x00000001 _0807EF80 0x0000 WaitForSomething2 0x00000020 @@ -79,12 +79,12 @@ script_0800A8FC: _0807EB44 0x0006 Wait 0x000f Jump script_0800A8FC - StartScript + BeginBlock _0807E864 Call sub_0807DF28 - SetEntityPositionRelative 0x01780378 + SetEntityPositionRelative 0x0378, 0x0178 Call sub_0807F844 - StopScript + EndBlock Wait 0x003c _0807E5F8 0x00000001 Wait 0x001e diff --git a/data/scripts/script_0800A964.inc b/data/scripts/script_0800A964.inc index ca526a2c..fe9cce56 100644 --- a/data/scripts/script_0800A964.inc +++ b/data/scripts/script_0800A964.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A964 - StartScript + BeginBlock _0807EB44 0x0002 _0807EF80 0x0007 _0807E930 0x0001 - StopScript + EndBlock WaitForSomething2 0x00000001 Call CreateDust _0807EF80 0x0006 diff --git a/data/scripts/script_0800A988.inc b/data/scripts/script_0800A988.inc index d9cb36b6..2b55cd98 100644 --- a/data/scripts/script_0800A988.inc +++ b/data/scripts/script_0800A988.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A988 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0007 _0807E930 0x0002 - StopScript + EndBlock WaitForSomething2 0x00000002 Call CreateDust _0807EF80 0x0006 diff --git a/data/scripts/script_0800A9AC.inc b/data/scripts/script_0800A9AC.inc index be230b67..b98bf6c4 100644 --- a/data/scripts/script_0800A9AC.inc +++ b/data/scripts/script_0800A9AC.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A9AC - StartScript + BeginBlock _0807EB44 0x0000 _0807EF80 0x0007 _0807E930 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000004 Call CreateDust _0807EF80 0x0006 diff --git a/data/scripts/script_0800A9D0.inc b/data/scripts/script_0800A9D0.inc index 115da3fb..73e16655 100644 --- a/data/scripts/script_0800A9D0.inc +++ b/data/scripts/script_0800A9D0.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800A9D0 - StartScript + BeginBlock _0807EB44 0x0006 _0807EF80 0x0007 _0807E930 0x0003 - StopScript + EndBlock WaitForSomething2 0x00000008 Call CreateDust _0807EF80 0x0006 diff --git a/data/scripts/script_0800A9F4.inc b/data/scripts/script_0800A9F4.inc index c2e89b42..0eef461d 100644 --- a/data/scripts/script_0800A9F4.inc +++ b/data/scripts/script_0800A9F4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A9F4 - StartScript + BeginBlock _0807E864 Call sub_0807DF28 - SetEntityPositionRelative 0x00580128 + SetEntityPositionRelative 0x0128, 0x0058 Call sub_0807F844 - StopScript + EndBlock Wait 0x003c _0807E5F8 0x00000001 Wait 0x000a diff --git a/data/scripts/script_0800AA48.inc b/data/scripts/script_0800AA48.inc index e7b7408e..fa37eafb 100644 --- a/data/scripts/script_0800AA48.inc +++ b/data/scripts/script_0800AA48.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800AA48 - StartScript + BeginBlock _0807EB44 0x0002 _0807EF80 0x0007 _0807E930 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000001 Call CreateDust _0807EF80 0x0006 diff --git a/data/scripts/script_0800AA6C.inc b/data/scripts/script_0800AA6C.inc index 82bcf68a..e4418cc6 100644 --- a/data/scripts/script_0800AA6C.inc +++ b/data/scripts/script_0800AA6C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800AA6C - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0007 _0807E930 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000002 Call CreateDust _0807EF80 0x0006 diff --git a/data/scripts/script_0800AA90.inc b/data/scripts/script_0800AA90.inc index 975efbf8..35e554fc 100644 --- a/data/scripts/script_0800AA90.inc +++ b/data/scripts/script_0800AA90.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800AA90 - StartScript + BeginBlock _0807EB44 0x0000 _0807EF80 0x0007 _0807E930 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000004 Call CreateDust _0807EF80 0x0006 diff --git a/data/scripts/script_0800AAB4.inc b/data/scripts/script_0800AAB4.inc index dbd05c71..a5d82d5d 100644 --- a/data/scripts/script_0800AAB4.inc +++ b/data/scripts/script_0800AAB4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800AAB4 - StartScript + BeginBlock _0807EB44 0x0006 _0807EF80 0x0007 _0807E930 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000008 Call CreateDust _0807EF80 0x0006 diff --git a/data/scripts/script_0800AAD8.inc b/data/scripts/script_0800AAD8.inc index d7f59883..ee03ea94 100644 --- a/data/scripts/script_0800AAD8.inc +++ b/data/scripts/script_0800AAD8.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800AAD8 - StartScript + BeginBlock _0807E864 Call sub_0807DF28 - SetEntityPositionRelative 0x01480088 + SetEntityPositionRelative 0x0088, 0x0148 Call sub_0807F844 - StopScript + EndBlock Wait 0x003c SoundReq 0x00f6 CallWithArg sub_0806DA1C, 0x0000000f diff --git a/data/scripts/script_0800AB08.inc b/data/scripts/script_0800AB08.inc index c019f528..2c38aa99 100644 --- a/data/scripts/script_0800AB08.inc +++ b/data/scripts/script_0800AB08.inc @@ -1,17 +1,17 @@ SCRIPT_START script_0800AB08 - StartScript + BeginBlock _0807E864 Call sub_0807DF28 - SetEntityPositionRelative 0x01480088 + SetEntityPositionRelative 0x0088, 0x0148 Call sub_0807F844 _0807E8E4_3 CallWithArg sub_0807F6E8, 0x00000008 CallWithArg sub_0807F75C, 0x00a80088 SoundReq 0x00f7 - StopScript + EndBlock Wait 0x0078 _0807F0B4 0x0001 - SetEntityPositionRelative 0x00780088 + SetEntityPositionRelative 0x0088, 0x0078 Call sub_0807F5C0 TextboxNoOverlapFollowPos 0x1664, 0x0000 _0807EA94 diff --git a/data/scripts/script_0800ACBC.inc b/data/scripts/script_0800ACBC.inc index becd20d0..8d3e1eca 100644 --- a/data/scripts/script_0800ACBC.inc +++ b/data/scripts/script_0800ACBC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800ACBC - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EDD4 0x0088, 0x0080 _0807EB44 0x0000 _0807EF80 0x0000 diff --git a/data/scripts/script_0800ACE0.inc b/data/scripts/script_0800ACE0.inc index 205ba767..a8a8d990 100644 --- a/data/scripts/script_0800ACE0.inc +++ b/data/scripts/script_0800ACE0.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800ACE0 - StartScript + BeginBlock Call sub_08094BE0 CallWithArg sub_0807F238, 0x0000045b SoundReq 0x0109 - StopScript + EndBlock Call sub_0807F304 Wait 0x005a _0807E5F8 0x00000008 - StartScript + BeginBlock CallWithArg sub_0807F6F8, 0x00000008 CallWithArg sub_0807F238, 0x000008e4 - StopScript + EndBlock Call sub_0807F304 _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/script_0800AD54.inc b/data/scripts/script_0800AD54.inc index f29b0aea..c999af5c 100644 --- a/data/scripts/script_0800AD54.inc +++ b/data/scripts/script_0800AD54.inc @@ -1,19 +1,19 @@ SCRIPT_START script_0800AD54 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock _0807EC64 0x0020 _0807EB44 0x0000 _0807EF80 0x0000 _0807E5F8 0x00000001 Call sub_080791BC - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 _0807EF80 0x000b _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 - StopScript + EndBlock WaitForSomething2 0x00000002 _0807EF80 0x0004 Wait 0x001e diff --git a/data/scripts/script_0800AEA4.inc b/data/scripts/script_0800AEA4.inc index 43e75217..4dd2942b 100644 --- a/data/scripts/script_0800AEA4.inc +++ b/data/scripts/script_0800AEA4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AEA4 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 _0807EF80 0x000b _0807EB44 0x0002 _0807EF80 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000040 _0807EB44 0x0000 _0807EF80 0x0000 diff --git a/data/scripts/script_0800AEDC.inc b/data/scripts/script_0800AEDC.inc index b0cb89b6..b2eab374 100644 --- a/data/scripts/script_0800AEDC.inc +++ b/data/scripts/script_0800AEDC.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800AEDC - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 _0807EF80 0x000b _0807E930 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000008 Call sub_08094B80 _0807EF3C 0x0000, 0x0001 diff --git a/data/scripts/script_0800AF18.inc b/data/scripts/script_0800AF18.inc index f22ee38e..789396ce 100644 --- a/data/scripts/script_0800AF18.inc +++ b/data/scripts/script_0800AF18.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800AF18 - StartScript + BeginBlock _0807EF80 0x0007 _0807EF80 0x000b CallWithArg sub_0807F994, 0x0000fff8 SoundReq 0x0142 - StopScript + EndBlock WaitForSomething 0x00000020 SoundReq 0x0143 _0807EF80 0x0006 diff --git a/data/scripts/script_0800AFB0.inc b/data/scripts/script_0800AFB0.inc index 255c71f2..e79c08d9 100644 --- a/data/scripts/script_0800AFB0.inc +++ b/data/scripts/script_0800AFB0.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800AFB0 _0807E864 script_0800AFB2: - StopScript - StartScript + EndBlock + BeginBlock Call sub_0807FBB4 ComparePlayerAction 0x0001 JumpIfNot script_0800AFB2 - StopScript + EndBlock Call sub_0807DF28 _0807EB28 0x1c04 _0807EA94 diff --git a/data/scripts/script_0800B00C.inc b/data/scripts/script_0800B00C.inc index 02fad519..9e01e5ea 100644 --- a/data/scripts/script_0800B00C.inc +++ b/data/scripts/script_0800B00C.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800B00C - StartScript + BeginBlock Call sub_0807F934 Call sub_080A2124 _0807EF80 0x000a _0807EF80 0x0007 - StopScript + EndBlock script_0800B024: CheckEntityInteractType JumpIfNot script_0800B024 diff --git a/data/scripts/script_0800B0AC.inc b/data/scripts/script_0800B0AC.inc index acd761d1..24d9dcd8 100644 --- a/data/scripts/script_0800B0AC.inc +++ b/data/scripts/script_0800B0AC.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800B0AC - StopScript + EndBlock _0807E864 Call sub_0807FA40 Call sub_0807DF28 diff --git a/data/scripts/script_0800B0D0.inc b/data/scripts/script_0800B0D0.inc index f72fc30e..b5fccb39 100644 --- a/data/scripts/script_0800B0D0.inc +++ b/data/scripts/script_0800B0D0.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800B0D0 - StartScript + BeginBlock Call sub_0806BCD4 _0807EF80 0x000a CallWithArg sub_0806BC94, 0x00000000 - StopScript + EndBlock script_0800B0E8: Call sub_0807F434 JumpSwitch_3 script_0800B0E8, script_0800B0F6, script_0800B134 @@ -36,11 +36,11 @@ script_0800B160: Call sub_0806BCB8 CallWithArg sub_0806BC94, 0x00000000 Jump script_0800B0E8 - StartScript + BeginBlock Call sub_0807DF28 SetLocalFlag 0x0039 _0807E864 - StopScript + EndBlock WaitForPlayerAction0x17 StartPlayerScript script_0800B1C0 Wait 0x0018 diff --git a/data/scripts/script_0800B1C0.inc b/data/scripts/script_0800B1C0.inc index 8c2683e9..6310ff69 100644 --- a/data/scripts/script_0800B1C0.inc +++ b/data/scripts/script_0800B1C0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800B1C0 - StartScript + BeginBlock _0807EF80 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000002 SetEntityNonPlanarMovement 0x00e0 _0807EDD4 0x0088, 0x0090 diff --git a/data/scripts/script_0800B200.inc b/data/scripts/script_0800B200.inc index a1a25e7d..10efa475 100644 --- a/data/scripts/script_0800B200.inc +++ b/data/scripts/script_0800B200.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800B200 - StartScript + BeginBlock _0807E5F8 0x00000000 CheckLocalFlag 0x001d JumpIf script_0800B252 SetEntityNonPlanarMovement 0x00c0 - StopScript + EndBlock script_0800B216: WaitForSomething2 0x00000001 Call sub_0807DF28 diff --git a/data/scripts/script_0800B254.inc b/data/scripts/script_0800B254.inc index e6ffe461..a57bf6e8 100644 --- a/data/scripts/script_0800B254.inc +++ b/data/scripts/script_0800B254.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800B254 - StartScript + BeginBlock CheckKinstoneFused 0x0006 JumpIf script_0800B302 _0807EA88 0x0006 _0807EB44 0x0002 - StopScript + EndBlock script_0800B268: _0807EA4C _0807E9F0 @@ -15,12 +15,12 @@ script_0800B268: _0807E878 Jump script_0800B268 .short 0x0000 - StartScript + BeginBlock CheckKinstoneFused 0x0007 JumpIf script_0800B302 _0807EA88 0x0007 _0807EB44 0x0002 - StopScript + EndBlock script_0800B298: _0807EA4C _0807E9F0 @@ -31,12 +31,12 @@ script_0800B298: _0807E878 Jump script_0800B298 .short 0x0000 - StartScript + BeginBlock CheckKinstoneFused 0x0008 JumpIf script_0800B302 _0807EA88 0x0008 _0807EB44 0x0002 - StopScript + EndBlock script_0800B2C8: _0807EA4C _0807E9F0 @@ -55,6 +55,6 @@ script_0800B2E2: _0807EF80 0x0012 _0807E5F8 0x00000001 script_0800B302: - StopScript + EndBlock SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800B308.inc b/data/scripts/script_0800B308.inc index 7b0e2e4a..870fe39e 100644 --- a/data/scripts/script_0800B308.inc +++ b/data/scripts/script_0800B308.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800B308 - StartScript + BeginBlock CheckLocalFlag 0x001d JumpIf script_0800B39C _0807EF80 0x0001 @@ -17,17 +17,17 @@ script_0800B33A: JumpIfNot script_0800B348 Call sub_080676D8 script_0800B348: - StopScript + EndBlock Call sub_0806757C script_0800B350: - StopScript + EndBlock WaitForSomething2 0x00000002 SoundReq 0x00fd Call sub_080676D8 Call sub_0806757C Call sub_080675D4 Wait 0x0014 - StartScript + BeginBlock _0807E5F8 0x00000001 CheckKinstoneFused 0x0006 JumpIfNot script_0800B350 @@ -35,7 +35,7 @@ script_0800B350: JumpIfNot script_0800B350 CheckKinstoneFused 0x0008 JumpIfNot script_0800B350 - StopScript + EndBlock SetLocalFlag 0x001d SoundReq 0x0072 script_0800B39C: diff --git a/data/scripts/script_0800B3A4.inc b/data/scripts/script_0800B3A4.inc index db2c7930..d485f31e 100644 --- a/data/scripts/script_0800B3A4.inc +++ b/data/scripts/script_0800B3A4.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800B3A4 - StartScript + BeginBlock _0807EF80 0x000a Call sub_0807F158 SetEntityNonPlanarMovement 0x0120 _0807EB44 0x0004 _0807E908 0x0002 _0807E914 0x0000200a - StopScript + EndBlock script_0800B3C4: _0807EDD4 0x0158, 0x0290 Call sub_08065780 diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc index d498b4bd..e384808d 100644 --- a/data/scripts/script_0800B41C.inc +++ b/data/scripts/script_0800B41C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800B41C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x00c0 _0807E908 0x0001 _0807EF80 0x000b _0807E864 Call sub_0807FBC4 - StopScript + EndBlock Wait 0x000a _0807EF80 0x0004 _0807E5F8 0x00000008 diff --git a/data/scripts/script_0800B4AC.inc b/data/scripts/script_0800B4AC.inc index 5df7564c..78ce2000 100644 --- a/data/scripts/script_0800B4AC.inc +++ b/data/scripts/script_0800B4AC.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800B4AC - StartScript + BeginBlock _0807EF80 0x000a _0807EF80 0x0001 SetEntityNonPlanarMovement 0x00c0 _0807E9D4 script_0800B4BC: - StopScript - StartScript + EndBlock + BeginBlock CheckEntityInteractType JumpIf script_0800B4D4 TestBit 0x00000008 @@ -17,13 +17,13 @@ script_0800B4D4: _0807EB74 _0807EF80 0x0000 TextboxNoOverlapFollow 0x200b - StopScript + EndBlock _0807E878 _0807EB44 0x0004 _0807EF80 0x0001 Jump script_0800B4BC script_0800B4F0: - StopScript + EndBlock _0807E610 0x00000008 _0807EDD4 0x0134, 0x0288 _0807EB44 0x0004 diff --git a/data/scripts/script_0800B54C.inc b/data/scripts/script_0800B54C.inc index a0934d6f..fdf9b629 100644 --- a/data/scripts/script_0800B54C.inc +++ b/data/scripts/script_0800B54C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800B54C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EDD4 0x0128, 0x0298 Wait 0x000a _0807EB44 0x0002 diff --git a/data/scripts/script_0800B574.inc b/data/scripts/script_0800B574.inc index 6181966e..27bf8bf6 100644 --- a/data/scripts/script_0800B574.inc +++ b/data/scripts/script_0800B574.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800B574 - StartScript + BeginBlock _0807EF80 0x0007 CheckGlobalFlag 0x001d JumpIf script_0800B5BC - StopScript + EndBlock WaitForSomething2 0x00000010 _0807EF80 0x0008 SoundReq 0x0111 diff --git a/data/scripts/script_0800B5C4.inc b/data/scripts/script_0800B5C4.inc index b264a34e..3d18214c 100644 --- a/data/scripts/script_0800B5C4.inc +++ b/data/scripts/script_0800B5C4.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800B5C4 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0004 - StopScript + EndBlock Wait 0x001e SoundReq 0x00d1 _0807EDD4 0x008a, 0x005a diff --git a/data/scripts/script_0800B5EC.inc b/data/scripts/script_0800B5EC.inc index 22ee139e..aca848f1 100644 --- a/data/scripts/script_0800B5EC.inc +++ b/data/scripts/script_0800B5EC.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800B5EC - StartScript + BeginBlock _0807EF80 0x000a _0807EF80 0x0001 _0807E9D4 - StopScript + EndBlock script_0800B5FA: CheckEntityInteractType JumpIfNot script_0800B5FA @@ -14,8 +14,8 @@ script_0800B5FA: _0807E878 _0807EB44 0x0004 Jump script_0800B5FA - StartScript - StopScript + BeginBlock + EndBlock script_0800B618: CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 JumpIfNot script_0800B618 diff --git a/data/scripts/script_0800B6C8.inc b/data/scripts/script_0800B6C8.inc index 44d64afa..4168693b 100644 --- a/data/scripts/script_0800B6C8.inc +++ b/data/scripts/script_0800B6C8.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800B6C8 - StartScript - StopScript + BeginBlock + EndBlock script_0800B6CC: HasRupees 0x0001 JumpIfNot script_0800B6CC @@ -25,8 +25,8 @@ script_0800B6D4: _0807F034 0x0064 Jump script_0800B698 .short 0x0000 - StartScript - StopScript + BeginBlock + EndBlock script_0800B734: Call sub_0808747C JumpIfNot script_0800B734 diff --git a/data/scripts/script_0800B7C4.inc b/data/scripts/script_0800B7C4.inc index d3f15385..fa1ca762 100644 --- a/data/scripts/script_0800B7C4.inc +++ b/data/scripts/script_0800B7C4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800B7C4 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock CallWithArg sub_0807F6B4, 0x00000090 JumpIfNot script_0800B7FC CallWithArg sub_0807F464, 0x00000078 diff --git a/data/scripts/script_0800B7FC.inc b/data/scripts/script_0800B7FC.inc index 900e005e..4985e36b 100644 --- a/data/scripts/script_0800B7FC.inc +++ b/data/scripts/script_0800B7FC.inc @@ -3,10 +3,10 @@ script_0800B7FC: CallWithArg sub_0807F4F8, 0x00000090 CallWithArg sub_0807F464, 0x00000078 Jump script_0800B7EE - StartScript + BeginBlock _0807EF80 0x0007 _0807EB44 0x0004 _0807E930 0x0000 - StopScript + EndBlock SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc index 7b4b5591..b6c5ed0f 100644 --- a/data/scripts/script_0800B828.inc +++ b/data/scripts/script_0800B828.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800B828 - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0000 _0807EF80 0x000a - StopScript + EndBlock script_0800B836: _0807E944 _0807E864 @@ -13,32 +13,32 @@ script_0800B836: _0807E878 Jump script_0800B836 .short 0x0000 - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a - StopScript + EndBlock script_0800B85E: Wait 0x003c Call sub_080646A4 Jump script_0800B85E - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0004 _0807E930 0x0000 _0807EF80 0x000a - StopScript + EndBlock script_0800B87E: Wait 0x003c Call sub_0806407C Jump script_0800B87E - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a - StopScript + EndBlock script_0800B89E: CheckEntityInteractType JumpIfNot script_0800B89E @@ -49,24 +49,24 @@ script_0800B89E: Wait 0x000f _0807E878 Jump script_0800B89E - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a CallWithArg sub_08064644, 0x0806464d - StopScript + EndBlock script_0800B8D4: Wait 0x003c Call sub_080646A4 Jump script_0800B8D4 .short 0x0000 - StartScript + BeginBlock Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0004 Call sub_08061FD8 - StopScript + EndBlock script_0800B8FC: CheckEntityInteractType JumpIfNot script_0800B8FC @@ -78,11 +78,11 @@ script_0800B8FC: _0807E878 Jump script_0800B8FC .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a - StopScript + EndBlock CheckLocalFlag 0x005f JumpIf script_0800B94E script_0800B934: @@ -104,14 +104,14 @@ script_0800B94E: _0807EA94 _0807E878 Jump script_0800B94E - StartScript + BeginBlock _0807EF80 0x000b _0807EF80 0x0008 Call sub_0806DAAC JumpIf script_0800B9AC Call sub_0806DAD0 CallWithArg sub_0806DA04, 0x00000005 - StopScript + EndBlock script_0800B98A: _0807EA4C _0807E9F0 diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc index 3211a53b..133ef817 100644 --- a/data/scripts/script_0800B9B4.inc +++ b/data/scripts/script_0800B9B4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800B9B4 - StartScript + BeginBlock _0807E9D4 Call sub_080694EC _0807EF80 0x000a Call sub_080694B0 - StopScript + EndBlock script_0800B9CA: Call sub_0807F434 JumpSwitch_3 script_0800B9CA, script_0800B9D8, script_0800B9F4 @@ -39,9 +39,9 @@ script_0800BA24: Call sub_0807DF50 _0807E878 Jump script_0800B9CA - StartScript + BeginBlock Call sub_0807F934 - StopScript + EndBlock script_0800BA46: CheckEntityInteractType JumpIfNot script_0800BA46 @@ -58,12 +58,12 @@ script_0800BA6C: Call sub_0807DF50 _0807E878 Jump script_0800BA46 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 SetEntityNonPlanarMovement 0x0040 Call sub_0807F348 - StopScript + EndBlock script_0800BA8E: CheckRoomFlag 0x00ff JumpIfNot script_0800BA8E diff --git a/data/scripts/script_0800BACC.inc b/data/scripts/script_0800BACC.inc index 5a4d8e56..133a026c 100644 --- a/data/scripts/script_0800BACC.inc +++ b/data/scripts/script_0800BACC.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800BACC - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 Call sub_0807F348 - StopScript + EndBlock script_0800BADE: CheckRoomFlag 0x00ff JumpIfNot script_0800BADE diff --git a/data/scripts/script_0800BB00.inc b/data/scripts/script_0800BB00.inc index 71885490..10bfcea7 100644 --- a/data/scripts/script_0800BB00.inc +++ b/data/scripts/script_0800BB00.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800BB00 - StartScript - StopScript + BeginBlock + EndBlock script_0800BB04: CheckRoomFlag 0x00ff JumpIfNot script_0800BB04 diff --git a/data/scripts/script_0800BB30.inc b/data/scripts/script_0800BB30.inc index 22531885..0c4829d7 100644 --- a/data/scripts/script_0800BB30.inc +++ b/data/scripts/script_0800BB30.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800BB30 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 Call sub_0807F348 - StopScript + EndBlock script_0800BB42: CheckRoomFlag 0x00ff JumpIfNot script_0800BB42 diff --git a/data/scripts/script_0800BB64.inc b/data/scripts/script_0800BB64.inc index bd88b9c9..ad84165e 100644 --- a/data/scripts/script_0800BB64.inc +++ b/data/scripts/script_0800BB64.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800BB64 - StartScript + BeginBlock _0807EB44 0x0006 _0807EF80 0x0000 SetEntityNonPlanarMovement 0x0040 Call sub_0807F348 - StopScript + EndBlock script_0800BB7A: CheckRoomFlag 0x00ff JumpIfNot script_0800BB7A diff --git a/data/scripts/script_0800BBA4.inc b/data/scripts/script_0800BBA4.inc index 85355bf4..b7948c1a 100644 --- a/data/scripts/script_0800BBA4.inc +++ b/data/scripts/script_0800BBA4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800BBA4 - StartScript + BeginBlock _0807EF80 0x0007 _0807EB44 0x0004 _0807EF80 0x0000 Call sub_0807F348 - StopScript + EndBlock script_0800BBBA: CheckRoomFlag 0x00ff JumpIfNot script_0800BBBA diff --git a/data/scripts/script_0800BBDC.inc b/data/scripts/script_0800BBDC.inc index 917322b3..d575f774 100644 --- a/data/scripts/script_0800BBDC.inc +++ b/data/scripts/script_0800BBDC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800BBDC - StartScript + BeginBlock _0807E930 0x0000 - StopScript + EndBlock script_0800BBE4: CheckRoomFlag 0x00ff JumpIfNot script_0800BBE4 diff --git a/data/scripts/script_0800BC08.inc b/data/scripts/script_0800BC08.inc index 67633e0e..aa156173 100644 --- a/data/scripts/script_0800BC08.inc +++ b/data/scripts/script_0800BC08.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800BC08 - StartScript + BeginBlock _0807EF80 0x0007 _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock script_0800BC18: CheckRoomFlag 0x00ff JumpIfNot script_0800BC18 @@ -11,10 +11,10 @@ script_0800BC18: Wait 0x003c TextboxNoOverlap 0x0e07 _0807EA94 - StartScript + BeginBlock _0807EB44 0x0000 _0807E930 0x0004 - StopScript + EndBlock Wait 0x003c Call sub_08065CCC Wait 0x0078 diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc index 1341fcc8..1d5647e0 100644 --- a/data/scripts/script_0800BC50.inc +++ b/data/scripts/script_0800BC50.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800BC50 - StartScript + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_08054EB8 - StopScript + EndBlock script_0800BC62: CheckRoomFlag 0x00ff JumpIfNot script_0800BC62 diff --git a/data/scripts/script_0800BCE8.inc b/data/scripts/script_0800BCE8.inc index e19635f9..3203c912 100644 --- a/data/scripts/script_0800BCE8.inc +++ b/data/scripts/script_0800BCE8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800BCE8 - StartScript + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - StopScript + EndBlock WaitFor_2 Wait 0x00f0 _0807E930 0x0000 diff --git a/data/scripts/script_0800BD78.inc b/data/scripts/script_0800BD78.inc index 6e4bf7ee..22170a6f 100644 --- a/data/scripts/script_0800BD78.inc +++ b/data/scripts/script_0800BD78.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800BD78 - StartScript + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 Call sub_0807F348 - StopScript + EndBlock WaitForSomething2 0x00000002 _0807EF80 0x0007 CallWithArg sub_0807F4F8, 0x00000270 diff --git a/data/scripts/script_0800BE1C.inc b/data/scripts/script_0800BE1C.inc index 6b68a09c..f2f58345 100644 --- a/data/scripts/script_0800BE1C.inc +++ b/data/scripts/script_0800BE1C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800BE1C - StartScript + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - StopScript + EndBlock WaitFor_2 Wait 0x00f0 _0807E930 0x0000 @@ -15,11 +15,11 @@ SCRIPT_START script_0800BE1C Wait 0x003c Jump script_0800BE88 .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - StopScript + EndBlock WaitFor_2 Wait 0x00f0 _0807E930 0x0000 diff --git a/data/scripts/script_0800BECC.inc b/data/scripts/script_0800BECC.inc index c4559547..e1f86753 100644 --- a/data/scripts/script_0800BECC.inc +++ b/data/scripts/script_0800BECC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800BECC - StartScript + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 Call sub_0807F348 - StopScript + EndBlock WaitForSomething2 0x00000002 _0807EF80 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc index f4a9d017..991b6ba8 100644 --- a/data/scripts/script_0800BF38.inc +++ b/data/scripts/script_0800BF38.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800BF38 - StartScript + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - StopScript + EndBlock WaitFor_2 Wait 0x00f0 _0807E930 0x0000 @@ -15,11 +15,11 @@ SCRIPT_START script_0800BF38 Wait 0x003c Jump script_0800BFA4 .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - StopScript + EndBlock WaitFor_2 Wait 0x00f0 _0807E930 0x0000 diff --git a/data/scripts/script_0800C004.inc b/data/scripts/script_0800C004.inc index 635b8068..b9b431f3 100644 --- a/data/scripts/script_0800C004.inc +++ b/data/scripts/script_0800C004.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800C004 - StartScript + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 Call sub_0807F348 - StopScript + EndBlock WaitForSomething2 0x00000002 _0807EF80 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 diff --git a/data/scripts/script_0800C0B0.inc b/data/scripts/script_0800C0B0.inc index 37dfcb17..741f5256 100644 --- a/data/scripts/script_0800C0B0.inc +++ b/data/scripts/script_0800C0B0.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800C0B0 - StartScript + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - StopScript + EndBlock WaitFor_2 Wait 0x00f0 _0807E930 0x0000 @@ -15,11 +15,11 @@ SCRIPT_START script_0800C0B0 Wait 0x003c Jump script_0800C11C .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - StopScript + EndBlock WaitFor_2 Wait 0x00f0 _0807E930 0x0000 diff --git a/data/scripts/script_0800C160.inc b/data/scripts/script_0800C160.inc index 58c62453..89f66c7b 100644 --- a/data/scripts/script_0800C160.inc +++ b/data/scripts/script_0800C160.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800C160 - StartScript + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 Call sub_0807F348 - StopScript + EndBlock WaitForSomething2 0x00000002 _0807EF80 0x0007 CallWithArg sub_0807F4F8, 0x00000128 diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc index 9cbeb6f1..e8669b83 100644 --- a/data/scripts/script_0800C1D8.inc +++ b/data/scripts/script_0800C1D8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800C1D8 - StartScript + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - StopScript + EndBlock WaitFor_2 Wait 0x00f0 _0807E930 0x0000 @@ -15,11 +15,11 @@ SCRIPT_START script_0800C1D8 Wait 0x003c Jump script_0800C244 .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - StopScript + EndBlock WaitFor_2 Wait 0x00f0 _0807E930 0x0000 diff --git a/data/scripts/script_0800C2A4.inc b/data/scripts/script_0800C2A4.inc index 4a873345..efe7ad5e 100644 --- a/data/scripts/script_0800C2A4.inc +++ b/data/scripts/script_0800C2A4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800C2A4 - StartScript + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 Call sub_0807F348 - StopScript + EndBlock WaitForSomething2 0x00000002 _0807EF80 0x0007 CallWithArg sub_0807F4F8, 0x00000128 diff --git a/data/scripts/script_0800C350.inc b/data/scripts/script_0800C350.inc index 7d8ef911..e9df34fd 100644 --- a/data/scripts/script_0800C350.inc +++ b/data/scripts/script_0800C350.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C350 - StartScript + BeginBlock CallWithArg sub_0806D658, 0x00000003 SetEntityNonPlanarMovement 0x0200 - StopScript + EndBlock script_0800C362: CheckRoomFlag 0x00ff JumpIfNot script_0800C362 diff --git a/data/scripts/script_0800C3CC.inc b/data/scripts/script_0800C3CC.inc index 7d60617c..4c20b2fa 100644 --- a/data/scripts/script_0800C3CC.inc +++ b/data/scripts/script_0800C3CC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C3CC - StartScript + BeginBlock Call sub_0806D660 SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock WaitForSomething2 0x00000002 CallWithArg sub_0807F4F8, 0x00000048 Call sub_0806D66C diff --git a/data/scripts/script_0800C410.inc b/data/scripts/script_0800C410.inc index 5db4ce83..eb91cfce 100644 --- a/data/scripts/script_0800C410.inc +++ b/data/scripts/script_0800C410.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C410 - StartScript + BeginBlock Call sub_0806D660 SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock WaitForSomething2 0x00000004 CallWithArg sub_0807F4F8, 0x00000048 Call sub_0806D66C diff --git a/data/scripts/script_0800C45C.inc b/data/scripts/script_0800C45C.inc index f13cd822..3e5fcded 100644 --- a/data/scripts/script_0800C45C.inc +++ b/data/scripts/script_0800C45C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800C45C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0180 _0807E930 0x0004 Call sub_080A0B28 - StopScript + EndBlock Wait 0x000a _0807EF80 0x0007 SoundReq 0x0136 diff --git a/data/scripts/script_0800C494.inc b/data/scripts/script_0800C494.inc index 0c3f544c..f4f87e6c 100644 --- a/data/scripts/script_0800C494.inc +++ b/data/scripts/script_0800C494.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C494 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0120 _0807E930 0x0004 - StopScript + EndBlock Wait 0x000a _0807EF80 0x0007 SoundReq 0x0136 diff --git a/data/scripts/script_0800C4D0.inc b/data/scripts/script_0800C4D0.inc index fc78cae8..b4393ca1 100644 --- a/data/scripts/script_0800C4D0.inc +++ b/data/scripts/script_0800C4D0.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C4D0 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0180 _0807E930 0x0004 - StopScript + EndBlock Wait 0x000a _0807EF80 0x0007 SoundReq 0x0136 diff --git a/data/scripts/script_0800C50C.inc b/data/scripts/script_0800C50C.inc index cb7731f8..07445982 100644 --- a/data/scripts/script_0800C50C.inc +++ b/data/scripts/script_0800C50C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800C50C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 _0807E930 0x0004 _0807EF80 0x0008 - StopScript + EndBlock WaitForSomething2 0x00000001 Wait 0x000a _0807EF80 0x0007 diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc index f4d2ca1c..c52d06ce 100644 --- a/data/scripts/script_0800C550.inc +++ b/data/scripts/script_0800C550.inc @@ -1,35 +1,35 @@ SCRIPT_START script_0800C550 - StartScript + BeginBlock Call sub_08060090 _0807EF80 0x000a - StopScript + EndBlock script_0800C55E: - StartScript + BeginBlock CheckEntityInteractType JumpIf script_0800C572 Call sub_08060158 - StopScript + EndBlock Jump script_0800C55E script_0800C572: - StopScript + EndBlock _0807E864 Call sub_08060208 _0807EA94 _0807E878 Jump script_0800C55E - StartScript + BeginBlock Call sub_08060090 _0807EF80 0x000a - StopScript + EndBlock script_0800C592: - StartScript + BeginBlock CheckEntityInteractType JumpIf script_0800C5A6 Call sub_08060158 - StopScript + EndBlock Jump script_0800C592 script_0800C5A6: - StopScript + EndBlock _0807E864 CheckInventory1 0x0067 JumpIfNot script_0800C5BC @@ -41,45 +41,45 @@ script_0800C5C0: _0807EA94 _0807E878 Jump script_0800C592 - StartScript + BeginBlock Call sub_08060090 _0807EF80 0x000a - StopScript + EndBlock script_0800C5D6: - StartScript + BeginBlock CheckEntityInteractType JumpIf script_0800C5EA Call sub_08060158 - StopScript + EndBlock Jump script_0800C5D6 script_0800C5EA: - StopScript + EndBlock _0807E864 Call sub_08060270 _0807EA94 _0807E878 Jump script_0800C5D6 - StartScript + BeginBlock script_0800C5FE: Call sub_08060090 _0807EF80 0x000a - StopScript + EndBlock script_0800C60A: - StartScript + BeginBlock CheckEntityInteractType JumpIf script_0800C61E Call sub_08060158 - StopScript + EndBlock Jump script_0800C60A script_0800C61E: - StopScript + EndBlock _0807E864 Call sub_0806021C _0807EA94 Wait 0x000f _0807E878 Jump script_0800C60A - StartScript + BeginBlock _0807EF80 0x000a SetEntityNonPlanarMovement 0x0080 _0807EB44 0x0004 @@ -87,7 +87,7 @@ script_0800C61E: JumpIfNot script_0800C650 SetEntityPosition 0x0010, 0x0000 script_0800C650: - StopScript + EndBlock script_0800C652: _0807E944 _0807E864 @@ -170,10 +170,10 @@ script_0800C756: Call sub_0807DF50 _0807E878 Jump script_0800C652 - StartScript + BeginBlock _0807EF80 0x000a _0807EB44 0x0004 - StopScript + EndBlock script_0800C780: _0807E944 _0807E864 diff --git a/data/scripts/script_0800C8C8.inc b/data/scripts/script_0800C8C8.inc index 26a6b405..94925a3f 100644 --- a/data/scripts/script_0800C8C8.inc +++ b/data/scripts/script_0800C8C8.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800C8C8 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EDD4 0x00e8, 0x0068 _0807EB44 0x0000 Wait 0x000f diff --git a/data/scripts/script_0800C8F0.inc b/data/scripts/script_0800C8F0.inc index 2e809c16..6fd43f22 100644 --- a/data/scripts/script_0800C8F0.inc +++ b/data/scripts/script_0800C8F0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800C8F0 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807ECC4 0x0010 _0807EDD4 0x0078, 0x0058 _0807EB44 0x0000 diff --git a/data/scripts/script_0800C91C.inc b/data/scripts/script_0800C91C.inc index aa5b10a9..40415799 100644 --- a/data/scripts/script_0800C91C.inc +++ b/data/scripts/script_0800C91C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C91C - StartScript + BeginBlock _0807EB44 0x0004 SetEntityNonPlanarMovement 0x0300 - StopScript + EndBlock script_0800C928: CheckPlayerInRegion 0x0208, 0x0360, 0x2040 JumpIfNot script_0800C928 diff --git a/data/scripts/script_0800CA8C.inc b/data/scripts/script_0800CA8C.inc index c769676b..3136b4a9 100644 --- a/data/scripts/script_0800CA8C.inc +++ b/data/scripts/script_0800CA8C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800CA8C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EF80 0x0001 _0807EDD4 0x0208, 0x0358 SetEntityNonPlanarMovement 0x0080 diff --git a/data/scripts/script_0800CABC.inc b/data/scripts/script_0800CABC.inc index 55c914fd..d6f1ffe0 100644 --- a/data/scripts/script_0800CABC.inc +++ b/data/scripts/script_0800CABC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800CABC - StartScript + BeginBlock _0807EF80 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000f Call sub_0807F338 - StopScript + EndBlock WaitForSomething2 0x00000200 _0807EF80 0x0007 _0807EDD4 0x0208, 0x0308 diff --git a/data/scripts/script_0800CB54.inc b/data/scripts/script_0800CB54.inc index c27c42af..c72b75cf 100644 --- a/data/scripts/script_0800CB54.inc +++ b/data/scripts/script_0800CB54.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800CB54 - StartScript + BeginBlock _0807EF80 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000f Call sub_0807F338 - StopScript + EndBlock WaitForSomething2 0x00000800 _0807EF80 0x0007 _0807EB44 0x0002 diff --git a/data/scripts/script_0800CBD4.inc b/data/scripts/script_0800CBD4.inc index 474c6c95..c0589c83 100644 --- a/data/scripts/script_0800CBD4.inc +++ b/data/scripts/script_0800CBD4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800CBD4 - StartScript + BeginBlock _0807EF80 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000f Call sub_0807F338 - StopScript + EndBlock WaitForSomething2 0x00002000 _0807EF80 0x0007 _0807EDD4 0x0258, 0x0330 diff --git a/data/scripts/script_0800CC6C.inc b/data/scripts/script_0800CC6C.inc index 319b7d51..414479f7 100644 --- a/data/scripts/script_0800CC6C.inc +++ b/data/scripts/script_0800CC6C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800CC6C - StartScript + BeginBlock _0807EF80 0x0008 _0807EF80 0x0000 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000f Call sub_0807F338 - StopScript + EndBlock WaitForSomething2 0x00008000 _0807EF80 0x0007 _0807EDD4 0x01b8, 0x0320 diff --git a/data/scripts/script_0800CD04.inc b/data/scripts/script_0800CD04.inc index e5e1a880..d820e6ac 100644 --- a/data/scripts/script_0800CD04.inc +++ b/data/scripts/script_0800CD04.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800CD04 - StartScript + BeginBlock _0807EF80 0x0000 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000f Call sub_0807F338 - StopScript + EndBlock WaitForSomething2 0x00020000 _0807EF80 0x0007 _0807EDD4 0x0268, 0x0338 diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc index b0222105..4076c0d2 100644 --- a/data/scripts/script_0800CD7C.inc +++ b/data/scripts/script_0800CD7C.inc @@ -1,19 +1,19 @@ SCRIPT_START script_0800CD7C - StartScript + BeginBlock CheckInventory1 0x005b JumpIfNot script_0800C5FE Call sub_08060090 _0807EF80 0x000a - StopScript + EndBlock script_0800CD92: - StopScript - StartScript + EndBlock + BeginBlock CheckEntityInteractType JumpIf script_0800CDA6 Call sub_08060158 Jump script_0800CD92 script_0800CDA6: - StopScript + EndBlock _0807E864 Call sub_0807DF28 CheckLocalFlag 0x009d @@ -121,14 +121,14 @@ script_0800CF02: Call sub_0807DF50 _0807E878 script_0800CF0C: - StopScript - StartScript + EndBlock + BeginBlock CheckEntityInteractType JumpIf script_0800CF20 Call sub_08060158 Jump script_0800CF0C script_0800CF20: - StopScript + EndBlock _0807E864 Call sub_0807DF28 script_0800CF2A: @@ -145,29 +145,29 @@ script_0800CF40: _0807E878 Jump script_0800CD92 .short 0x0000 - StartScript + BeginBlock Call sub_08068104 _0807EF80 0x000a - StopScript + EndBlock script_0800CF5E: - StartScript + BeginBlock CheckEntityInteractType JumpIf script_0800CF72 Call sub_0806811C - StopScript + EndBlock Jump script_0800CF5E script_0800CF72: - StopScript + EndBlock _0807E864 Call sub_08068190 _0807EA94 Wait 0x000f _0807E878 Jump script_0800CF5E - StartScript + BeginBlock Call sub_08068104 _0807EF80 0x000a - StopScript + EndBlock script_0800CF96: _0807E944 _0807E864 @@ -176,12 +176,12 @@ script_0800CF96: Wait 0x000f _0807E878 Jump script_0800CF96 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0000 - StopScript + EndBlock CheckInventory1 0x0041 JumpIf script_0800CFD2 CheckLocalFlag 0x007e @@ -199,12 +199,12 @@ script_0800CFEC: JumpIfNot script_0800CFFA _0807E5F8 0x00000010 script_0800CFFA: - StopScript - StartScript + EndBlock + BeginBlock Call sub_08068910 CheckEntityInteractType JumpIfNot script_0800CFFA - StopScript + EndBlock _0807E864 Call sub_0807DF28 CheckInventory1 0x0002 diff --git a/data/scripts/script_0800D190.inc b/data/scripts/script_0800D190.inc index 5732aec5..b052bb90 100644 --- a/data/scripts/script_0800D190.inc +++ b/data/scripts/script_0800D190.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D190 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EDD4 0x0170, 0x0140 _0807EB44 0x0002 _0807EF80 0x0000 diff --git a/data/scripts/script_0800D1B4.inc b/data/scripts/script_0800D1B4.inc index 6cdc8b0a..4c6444ad 100644 --- a/data/scripts/script_0800D1B4.inc +++ b/data/scripts/script_0800D1B4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D1B4 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EDD4 0x0170, 0x0120 _0807EDD4 0x01a8, 0x0120 _0807EB44 0x0004 diff --git a/data/scripts/script_0800D218.inc b/data/scripts/script_0800D218.inc index eff7f8f0..85b3aa5d 100644 --- a/data/scripts/script_0800D218.inc +++ b/data/scripts/script_0800D218.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800D218 - StartScript + BeginBlock CheckInventory1 0x0041 JumpIf script_0800D24C CheckLocalFlag 0x007e JumpIf script_0800D242 _0807EF80 0x0008 - StopScript + EndBlock WaitForSomething2 0x00000010 _0807EF80 0x0007 WaitForSomething2 0x00000010 diff --git a/data/scripts/script_0800D254.inc b/data/scripts/script_0800D254.inc index a10af6f6..6d9ff822 100644 --- a/data/scripts/script_0800D254.inc +++ b/data/scripts/script_0800D254.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D254 - StartScript + BeginBlock _0807EF80 0x0008 - StopScript + EndBlock WaitForSomething2 0x00000020 _0807EF80 0x0007 WaitForSomething2 0x00000020 diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc index d72f4220..edd39c9c 100644 --- a/data/scripts/script_0800D278.inc +++ b/data/scripts/script_0800D278.inc @@ -1,24 +1,24 @@ SCRIPT_START script_0800D278 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a - StopScript + EndBlock script_0800D282: CheckInventory1 0x0041 JumpIf script_0800D292 CheckLocalFlag 0x007e JumpIf script_0800D2EA script_0800D292: - StartScript + BeginBlock TestBit 0x00000001 JumpIf script_0800D2C6 CheckEntityInteractType JumpIf script_0800D2B0 Call sub_0806811C - StopScript + EndBlock Jump script_0800D282 script_0800D2B0: - StopScript + EndBlock _0807E864 Call sub_08068190 _0807EA94 @@ -26,7 +26,7 @@ script_0800D2B0: _0807E878 Jump script_0800D282 script_0800D2C6: - StopScript + EndBlock _0807E5F8 0x00000004 WaitForSomething2 0x00000002 _0807E5F8 0x00000004 @@ -44,19 +44,19 @@ script_0800D2EE: Wait 0x000f _0807E878 Jump script_0800D2EE - StartScript + BeginBlock Call sub_08068884 _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0000 - StopScript + EndBlock script_0800D31E: - StopScript - StartScript + EndBlock + BeginBlock Call sub_08068910 CheckEntityInteractType JumpIfNot script_0800D31E - StopScript + EndBlock _0807E864 _0807EB74 _0807E914 0x00000000 @@ -66,19 +66,19 @@ script_0800D31E: Wait 0x000f _0807E878 Jump script_0800D31E - StartScript + BeginBlock Call sub_08068104 _0807EF80 0x000a - StopScript + EndBlock script_0800D35E: - StartScript + BeginBlock CheckEntityInteractType JumpIf script_0800D372 Call sub_0806811C - StopScript + EndBlock Jump script_0800D35E script_0800D372: - StopScript + EndBlock _0807E864 Call sub_08068190 _0807EA94 diff --git a/data/scripts/script_0800D3EC.inc b/data/scripts/script_0800D3EC.inc index 4977889d..42cf8c15 100644 --- a/data/scripts/script_0800D3EC.inc +++ b/data/scripts/script_0800D3EC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D3EC - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock _0807EB44 0x0000 _0807EF80 0x0000 _0807EF80 0x000d diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc index 00327d2a..90dabc5d 100644 --- a/data/scripts/script_0800D414.inc +++ b/data/scripts/script_0800D414.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800D414 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 Call sub_08068104 _0807EF80 0x000a - StopScript + EndBlock script_0800D426: _0807EB44 0x0002 _0807E914 0x00000000 @@ -39,13 +39,13 @@ script_0800D426: _0807EDD4 0x0228, 0x01e8 Jump script_0800D426 .short 0x0000 - StartScript + BeginBlock _0807EF80 0x000a Call sub_08062A48 _0807EB44 0x0004 _0807EF80 0x0000 script_0800D4E4: - StopScript + EndBlock Call sub_08062698 Call sub_080626AC CallWithArg sub_0807F0EC, 0x00000009 @@ -77,8 +77,8 @@ script_0800D556: script_0800D560: _0807EE04 0x00b8, 0x00b8 script_0800D566: - StopScript - StartScript + EndBlock + BeginBlock Call sub_080626C0 JumpIf script_0800D4E4 CheckEntityInteractType @@ -87,7 +87,7 @@ script_0800D566: JumpIfNot script_0800D566 Jump script_0800D4E4 script_0800D584: - StopScript + EndBlock _0807E864 _0807EB74 Call sub_0806265C @@ -95,12 +95,12 @@ script_0800D584: Wait 0x000f _0807E878 Jump script_0800D4E4 - StartScript + BeginBlock _0807EF80 0x000a Call sub_08062A48 _0807EF80 0x0000 script_0800D5AC: - StopScript + EndBlock Call sub_08062698 Call sub_080626AC CallWithArg sub_0807F0EC, 0x00000004 @@ -117,15 +117,15 @@ script_0800D5E2: script_0800D5EC: _0807EE04 0x0058, 0x00c8 script_0800D5F2: - StopScript - StartScript + EndBlock + BeginBlock Call sub_080626C0 JumpIf script_0800D5AC _0807EE30 JumpIfNot script_0800D5F2 Jump script_0800D5AC .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x000b _0807EF80 0x0008 @@ -133,7 +133,7 @@ script_0800D5F2: JumpIf script_0800D6AE Call sub_0806DAD0 CallWithArg sub_0806DA04, 0x00000002 - StopScript + EndBlock script_0800D636: _0807EA4C _0807E9F0 diff --git a/data/scripts/script_0800D6B4.inc b/data/scripts/script_0800D6B4.inc index d34c14ff..09e80f0c 100644 --- a/data/scripts/script_0800D6B4.inc +++ b/data/scripts/script_0800D6B4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800D6B4 - StartScript + BeginBlock _0807EF80 0x0007 _0807EF80 0x0011 Call sub_0807F158 Call sub_0807F738 - StopScript + EndBlock SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_0800D6D0.inc b/data/scripts/script_0800D6D0.inc index 03706d7b..70ce4312 100644 --- a/data/scripts/script_0800D6D0.inc +++ b/data/scripts/script_0800D6D0.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800D6D0 - StartScript + BeginBlock CheckLocalFlag 0x00f3 JumpIf script_0800D6E8 _0807EF80 0x0008 - StopScript + EndBlock script_0800D6E0: CheckLocalFlag 0x00f3 JumpIfNot script_0800D6E0 diff --git a/data/scripts/script_0800D6F0.inc b/data/scripts/script_0800D6F0.inc index 796f0c6c..20742cca 100644 --- a/data/scripts/script_0800D6F0.inc +++ b/data/scripts/script_0800D6F0.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800D6F0 - StartScript + BeginBlock CheckLocalFlag 0x00f5 JumpIf script_0800D6E8 _0807EF80 0x0008 - StopScript + EndBlock script_0800D700: CheckLocalFlag 0x00f5 JumpIfNot script_0800D700 diff --git a/data/scripts/script_0800D710.inc b/data/scripts/script_0800D710.inc index 657cb9b1..99cb9e11 100644 --- a/data/scripts/script_0800D710.inc +++ b/data/scripts/script_0800D710.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800D710 - StartScript + BeginBlock Call sub_0807F360 SetEntityNonPlanarMovement 0x0700 _0807F0B4 0x0007 CameraTargetEntity Call sub_0807FBC4 - StopScript + EndBlock _0807E5F8 0x00000008 WaitForSomething2 0x00000010 _0807E5F8 0x00000002 diff --git a/data/scripts/script_0800D76C.inc b/data/scripts/script_0800D76C.inc index b7eb9079..f22917cf 100644 --- a/data/scripts/script_0800D76C.inc +++ b/data/scripts/script_0800D76C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800D76C - StartScript + BeginBlock Call sub_0807F360 _0807EF80 0x000b SetEntityNonPlanarMovement 0x0200 _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000008 _0807EF80 0x0004 Wait 0x003c @@ -23,12 +23,12 @@ SCRIPT_START script_0800D76C _0807EF80 0x0001 WaitForSomething2 0x00000008 Jump script_0800D80C - StartScript + BeginBlock Call sub_0807F360 _0807EF80 0x000b - SetEntityPositionRelative 0x01d80268 + SetEntityPositionRelative 0x0268, 0x01d8 SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock WaitForSomething2 0x00000002 _0807EDD4 0x01f0, 0x01d8 _0807E5F8 0x00000004 diff --git a/data/scripts/script_0800D84C.inc b/data/scripts/script_0800D84C.inc index b4f2becc..964c646c 100644 --- a/data/scripts/script_0800D84C.inc +++ b/data/scripts/script_0800D84C.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800D84C - StartScript - StopScript + BeginBlock + EndBlock script_0800D850: CheckRoomFlag 0x0000 JumpIfNot script_0800D850 diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc index 0de3e444..44537ee1 100644 --- a/data/scripts/script_0800D874.inc +++ b/data/scripts/script_0800D874.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800D874 - StartScript + BeginBlock Call sub_0807F934 _0807EF80 0x0008 _0807E914 0x00000001 Call sub_0806DA04 - StopScript + EndBlock script_0800D88E: CheckEntityInteractType JumpIfNot script_0800D88E @@ -31,11 +31,11 @@ script_0800D8D6: _0807E878 Jump script_0800D88E .short 0x0000 - StartScript + BeginBlock _0807EF80 0x0008 CheckInventory1 0x0017 JumpIf script_0800D924 - StopScript + EndBlock script_0800D8F4: CheckInventory1 0x0017 JumpIfNot script_0800D8F4 diff --git a/data/scripts/script_0800D92C.inc b/data/scripts/script_0800D92C.inc index e87da7d3..f8b49843 100644 --- a/data/scripts/script_0800D92C.inc +++ b/data/scripts/script_0800D92C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D92C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock _0807EF80 0x0001 _0807EDD4 0x00a0, 0x0078 _0807EB44 0x0000 diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc index 40de08ce..3ba0cb1c 100644 --- a/data/scripts/script_0800D954.inc +++ b/data/scripts/script_0800D954.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800D954 - StartScript + BeginBlock _0807EF80 0x0008 Call sub_0807F180 - StopScript + EndBlock script_0800D962: CheckPlayerInRegion 0x0118, 0x0038, 0x3050 JumpIfNot script_0800D962 diff --git a/data/scripts/script_0800DA00.inc b/data/scripts/script_0800DA00.inc index 33601801..11619bda 100644 --- a/data/scripts/script_0800DA00.inc +++ b/data/scripts/script_0800DA00.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DA00 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock _0807EF80 0x0001 _0807EDD4 0x0118, 0x0060 _0807EB44 0x0000 diff --git a/data/scripts/script_0800DA28.inc b/data/scripts/script_0800DA28.inc index 8c30c6b2..93fb7c76 100644 --- a/data/scripts/script_0800DA28.inc +++ b/data/scripts/script_0800DA28.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800DA28 - StartScript + BeginBlock _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock WaitForSomething2 0x00000004 _0807EF80 0x0007 Wait 0x003c diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/script_0800DA60.inc index d5314e56..309c74fd 100644 --- a/data/scripts/script_0800DA60.inc +++ b/data/scripts/script_0800DA60.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800DA60 - StartScript - StopScript + BeginBlock + EndBlock script_0800DA64: CheckPlayerInRegion 0x0078, 0x0148, 0x4040 JumpIfNot script_0800DA64 @@ -11,7 +11,7 @@ script_0800DA64: Call sub_0807F3F8 Wait 0x003c _0807F0B4 0x0004 - SetEntityPositionRelative 0x00800078 + SetEntityPositionRelative 0x0078, 0x0080 CameraTargetEntity Call sub_0807F5C0 _0807E5F8 0x00000001 diff --git a/data/scripts/script_0800DB18.inc b/data/scripts/script_0800DB18.inc index 28eb65ea..0690c1db 100644 --- a/data/scripts/script_0800DB18.inc +++ b/data/scripts/script_0800DB18.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800DB18 - StartScript + BeginBlock _0807EF80 0x000a Call sub_08066E38 - StopScript + EndBlock SCRIPT_END diff --git a/data/scripts/script_0800DB28.inc b/data/scripts/script_0800DB28.inc index c633b659..b51c50a7 100644 --- a/data/scripts/script_0800DB28.inc +++ b/data/scripts/script_0800DB28.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800DB28 - StartScript + BeginBlock _0807EF80 0x0007 _0807EB44 0x0000 _0807EF80 0x0014 - StopScript + EndBlock WaitForSomething2 0x00000001 Wait 0x003c _0807EF80 0x0004 diff --git a/data/scripts/script_0800DB78.inc b/data/scripts/script_0800DB78.inc index 73eb3d1e..c810df2f 100644 --- a/data/scripts/script_0800DB78.inc +++ b/data/scripts/script_0800DB78.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800DB78 - StartScript - StopScript + BeginBlock + EndBlock script_0800DB7C: CallWithArg sub_0807F6B4, 0x000000a0 JumpIf script_0800DB7C @@ -8,7 +8,7 @@ script_0800DB7C: Call sub_0807F9A4 Call sub_0807DF28 _0807F0B4 0x0001 - SetEntityPositionRelative 0x00780078 + SetEntityPositionRelative 0x0078, 0x0078 CameraTargetEntity Call sub_0807F5C0 _0807EB28 0x1648 diff --git a/data/scripts/script_0800DCAC.inc b/data/scripts/script_0800DCAC.inc index fda1cc9e..a4e0fee5 100644 --- a/data/scripts/script_0800DCAC.inc +++ b/data/scripts/script_0800DCAC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800DCAC - StartScript + BeginBlock _0807EF80 0x000a Call sub_08066E38 - StopScript + EndBlock WaitForSomething2 0x00000001 CallWithArg sub_0807F8E8, 0x00000000 _0807E5F8 0x00000002 @@ -12,7 +12,7 @@ script_0800DCD0: _0807EF80 0x0010 Wait 0x003c _0807EF80 0x0010 - SetEntityPositionRelative 0x00680078 + SetEntityPositionRelative 0x0078, 0x0068 WaitForSomething2 0x00000001 SoundReq0x80100000 Call sub_08066E50 diff --git a/data/scripts/script_0800DDD0.inc b/data/scripts/script_0800DDD0.inc index 11cac803..318e60e8 100644 --- a/data/scripts/script_0800DDD0.inc +++ b/data/scripts/script_0800DDD0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DDD0 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock CallWithArg sub_0807F4F8, 0x000000a0 _0807EDD4 0x0078, 0x00a0 _0807EB44 0x0000 diff --git a/data/scripts/script_0800DE00.inc b/data/scripts/script_0800DE00.inc index 7d76102c..a5ed1fc5 100644 --- a/data/scripts/script_0800DE00.inc +++ b/data/scripts/script_0800DE00.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DE00 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EB44 0x0000 _0807EF80 0x000d _0807EF80 0x0000 diff --git a/data/scripts/script_0800DE2C.inc b/data/scripts/script_0800DE2C.inc index dabfc445..2a9997cb 100644 --- a/data/scripts/script_0800DE2C.inc +++ b/data/scripts/script_0800DE2C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DE2C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EB44 0x0004 _0807EF80 0x0000 _0807EEF4 0x0000, 0x0080 diff --git a/data/scripts/script_0800DE50.inc b/data/scripts/script_0800DE50.inc index 3ace4f33..56e71bbe 100644 --- a/data/scripts/script_0800DE50.inc +++ b/data/scripts/script_0800DE50.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800DE50 - StopScript + EndBlock _0807EB44 0x0004 _0807EF80 0x0000 CallWithArg sub_0807F238, 0x000003c5 diff --git a/data/scripts/script_0800DEB0.inc b/data/scripts/script_0800DEB0.inc index e6184c8a..fe8eb6e9 100644 --- a/data/scripts/script_0800DEB0.inc +++ b/data/scripts/script_0800DEB0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DEB0 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EDD4 0x0198, 0x01c8 _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/script_0800DED4.inc b/data/scripts/script_0800DED4.inc index 657180ad..410e9296 100644 --- a/data/scripts/script_0800DED4.inc +++ b/data/scripts/script_0800DED4.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800DED4 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 SetEntityNonPlanarMovement 0x0100 _0807EF80 0x000b Call sub_08066D04 - StopScript - StartScript + EndBlock + BeginBlock Call sub_08066D14 - SetEntityPositionRelative 0x01480198 + SetEntityPositionRelative 0x0198, 0x0148 _0807EF80 0x0007 - StopScript + EndBlock _0807EDD4 0x0198, 0x01a8 _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc index 8d67bf90..465aeb71 100644 --- a/data/scripts/script_0800DF24.inc +++ b/data/scripts/script_0800DF24.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800DF24 - StartScript + BeginBlock _0807EF80 0x0008 _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock _0807E864 Call sub_0807F9A4 Call sub_0807DF28 diff --git a/data/scripts/script_0800DFB4.inc b/data/scripts/script_0800DFB4.inc index c253847f..a8525746 100644 --- a/data/scripts/script_0800DFB4.inc +++ b/data/scripts/script_0800DFB4.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800DFB4 - StopScript + EndBlock script_0800DFB6: CheckRoomFlag 0x0001 JumpIfNot script_0800DFB6 diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc index 7ecaa728..533f67f8 100644 --- a/data/scripts/script_0800DFE4.inc +++ b/data/scripts/script_0800DFE4.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800DFE4 - StartScript + BeginBlock Call sub_0807DF28 _0807E864 - StopScript + EndBlock SoundReq0x80100000 TextboxNoOverlapFollowPos 0x1632, 0x0002 _0807EA94 diff --git a/data/scripts/script_0800E050.inc b/data/scripts/script_0800E050.inc index 1b8c6edb..f06ea0ba 100644 --- a/data/scripts/script_0800E050.inc +++ b/data/scripts/script_0800E050.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800E050 - StartScript + BeginBlock Call sub_0807DF28 _0807E864 - StopScript + EndBlock SoundReq0x80100000 SoundReq0x80100000 Wait 0x0078 diff --git a/data/scripts/script_0800E094.inc b/data/scripts/script_0800E094.inc index 35daad29..23bfe931 100644 --- a/data/scripts/script_0800E094.inc +++ b/data/scripts/script_0800E094.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800E094 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x00c0 - StopScript + EndBlock WaitForSomething2 0x00000001 _0807EF80 0x0001 _0807EDD4 0x00a8, 0x002c diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc index 3770edbc..51d48b48 100644 --- a/data/scripts/script_0800E0BC.inc +++ b/data/scripts/script_0800E0BC.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800E0BC - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x000a CheckLocalFlag 0x0093 JumpIf script_0800E12E _0807E930 0x0008 CallWithArg sub_0807F8E8, 0x00000000 - StopScript + EndBlock script_0800E0DE: CheckRoomFlag 0x0000 JumpIfNot script_0800E0DE @@ -33,7 +33,7 @@ script_0800E0DE: script_0800E12E: Call sub_080668F0 _0807E878 - StopScript + EndBlock script_0800E138: CheckEntityInteractType JumpIfNot script_0800E138 @@ -45,14 +45,14 @@ script_0800E138: _0807E878 Jump script_0800E138 .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x000a CheckLocalFlag 0x0094 JumpIf script_0800E1D0 _0807E930 0x0010 CallWithArg sub_0807F8E8, 0x00000001 - StopScript + EndBlock script_0800E176: CheckRoomFlag 0x0001 JumpIfNot script_0800E176 @@ -81,7 +81,7 @@ script_0800E1D0: CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 _0807E878 - StopScript + EndBlock script_0800E1E0: CheckEntityInteractType JumpIfNot script_0800E1E0 @@ -92,24 +92,24 @@ script_0800E1E0: _0807EA94 _0807E878 Jump script_0800E1E0 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0004 _0807EF80 0x000a CheckLocalFlag 0x0073 JumpIfNot script_0800E232 _0807E9D4 - SetEntityPositionRelative 0x01680070 + SetEntityPositionRelative 0x0070, 0x0168 _0807EB44 0x0002 CallWithArg sub_0807F3D8, 0x00000000 - StopScript + EndBlock Jump script_0800E32E script_0800E232: CheckLocalFlag 0x0095 JumpIf script_0800E29A _0807E930 0x0010 CallWithArg sub_0807F8E8, 0x00000002 - StopScript + EndBlock script_0800E24A: CheckRoomFlag 0x0002 JumpIfNot script_0800E24A @@ -136,10 +136,10 @@ script_0800E29A: CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 _0807E878 - StopScript + EndBlock script_0800E2AE: - StopScript - StartScript + EndBlock + BeginBlock CheckEntityInteractType JumpIf script_0800E312 CheckLocalFlag 0x0093 @@ -150,7 +150,7 @@ script_0800E2AE: JumpIfNot script_0800E2AE _0807E9DC SetLocalFlag 0x0073 - StopScript + EndBlock _0807EB44 0x0000 CallWithArg sub_0807F3D8, 0x00000004 _0807EDD4 0x0088, 0x0168 @@ -165,7 +165,7 @@ script_0800E312: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - StopScript + EndBlock TextboxNoOverlap 0x2404 _0807EA94 _0807E878 @@ -181,7 +181,7 @@ script_0800E32E: _0807E878 Jump script_0800E32E .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x000a CheckLocalFlag 0x0071 @@ -190,7 +190,7 @@ script_0800E32E: JumpIf script_0800E3BE _0807E930 0x000c CallWithArg sub_0807F8E8, 0x00000000 - StopScript + EndBlock script_0800E37A: CheckRoomFlag 0x0000 JumpIfNot script_0800E37A @@ -214,7 +214,7 @@ script_0800E3BE: _0807EF80 0x0000 _0807E9D4 _0807E878 - StopScript + EndBlock script_0800E3C8: CheckEntityInteractType JumpIfNot script_0800E3C8 @@ -230,7 +230,7 @@ script_0800E3C8: script_0800E3E8: _0807E9D4 _0807E878 - StopScript + EndBlock script_0800E3EE: CheckEntityInteractType JumpIfNot script_0800E3EE @@ -241,11 +241,11 @@ script_0800E3EE: Wait 0x000f _0807E878 Jump script_0800E3EE - StartScript + BeginBlock _0807EB44 0x0002 _0807EF80 0x000a Call sub_080668F0 - StopScript + EndBlock script_0800E41A: CheckEntityInteractType JumpIfNot script_0800E41A @@ -256,12 +256,12 @@ script_0800E41A: Wait 0x000f _0807E878 Jump script_0800E41A - StartScript + BeginBlock _0807EB44 0x0002 CallWithArg sub_0807F3D8, 0x00000000 _0807EF80 0x000a _0807E9D4 - StopScript + EndBlock script_0800E44C: CheckEntityInteractType JumpIfNot script_0800E44C @@ -272,12 +272,12 @@ script_0800E44C: _0807EA94 _0807E878 Jump script_0800E44C - StartScript + BeginBlock _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 _0807EF80 0x000a _0807E9D4 - StopScript + EndBlock script_0800E484: CheckEntityInteractType JumpIfNot script_0800E484 @@ -288,17 +288,17 @@ script_0800E484: _0807EA94 _0807E878 Jump script_0800E484 - StartScript + BeginBlock Call sub_0807F354 - StopScript + EndBlock CheckLocalFlag 0x007c JumpIf script_0800E4FA script_0800E4B6: CheckPlayerInRegion 0x0088, 0x00f8, 0x0820 JumpIfNot script_0800E4B6 - StartScript + BeginBlock _0807E864 - StopScript + EndBlock Call sub_0807F3F8 Wait 0x003c TextboxNoOverlapFollow 0x160c @@ -310,11 +310,11 @@ script_0800E4B6: _0807EB28 0x160e Wait 0x003c _0807EA94 - StartScript + BeginBlock SoundReq2 0x0033 SetLocalFlag 0x007c script_0800E4FA: _0807E878 _0807EF80 0x0006 - StopScript + EndBlock SCRIPT_END diff --git a/data/scripts/script_0800E504.inc b/data/scripts/script_0800E504.inc index 1b63855a..c0332ba7 100644 --- a/data/scripts/script_0800E504.inc +++ b/data/scripts/script_0800E504.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800E504 - StartScript - StopScript + BeginBlock + EndBlock CheckLocalFlag 0x007d JumpIf script_0800E53C script_0800E510: diff --git a/data/scripts/script_0800E544.inc b/data/scripts/script_0800E544.inc index b0a31238..f46e30bb 100644 --- a/data/scripts/script_0800E544.inc +++ b/data/scripts/script_0800E544.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800E544 - StartScript - StopScript + BeginBlock + EndBlock CheckLocalFlag 0x007e JumpIf script_0800E582 script_0800E550: diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/script_0800E58C.inc index 8fdde827..cdcde694 100644 --- a/data/scripts/script_0800E58C.inc +++ b/data/scripts/script_0800E58C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800E58C - StartScript + BeginBlock _0807EF80 0x0007 _0807EB44 0x0000 _0807EF80 0x0014 - StopScript + EndBlock Wait 0x003c SoundReq 0x0105 Wait 0x003c diff --git a/data/scripts/script_0800E5C4.inc b/data/scripts/script_0800E5C4.inc index 59366432..65098577 100644 --- a/data/scripts/script_0800E5C4.inc +++ b/data/scripts/script_0800E5C4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800E5C4 - StartScript + BeginBlock CheckLocalFlag 0x0086 JumpIfNot script_0800E5D6 _0807EF80 0x0006 - StopScript + EndBlock SCRIPT_END diff --git a/data/scripts/script_0800E5D6.inc b/data/scripts/script_0800E5D6.inc index f4fb76ae..79bb47dc 100644 --- a/data/scripts/script_0800E5D6.inc +++ b/data/scripts/script_0800E5D6.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800E5D6 script_0800E5D6: - StopScript + EndBlock script_0800E5D8: CheckLocalFlag 0x0086 JumpIfNot script_0800E5D8 diff --git a/data/scripts/script_0800E600.inc b/data/scripts/script_0800E600.inc index 36445e10..1f41c8bb 100644 --- a/data/scripts/script_0800E600.inc +++ b/data/scripts/script_0800E600.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800E600 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0000 _0807E864 Call sub_0807F354 - StopScript + EndBlock WaitForPlayerAction0x17 _0807E8E4_0 _0807EF80 0x0001 diff --git a/data/scripts/script_0800E62C.inc b/data/scripts/script_0800E62C.inc index 96b1273e..51379a5e 100644 --- a/data/scripts/script_0800E62C.inc +++ b/data/scripts/script_0800E62C.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800E62C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0008 _0807E864 Call sub_0807F354 - StopScript + EndBlock WaitForPlayerAction0x17 _0807E8E4_1 _0807EF80 0x0001 diff --git a/data/scripts/script_0800E658.inc b/data/scripts/script_0800E658.inc index 54d3c254..79adc65b 100644 --- a/data/scripts/script_0800E658.inc +++ b/data/scripts/script_0800E658.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800E658 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0010 _0807E864 Call sub_0807F354 - StopScript + EndBlock WaitForPlayerAction0x17 _0807E8E4_2 _0807EF80 0x0001 diff --git a/data/scripts/script_0800E684.inc b/data/scripts/script_0800E684.inc index 569e8ad8..cfddbd91 100644 --- a/data/scripts/script_0800E684.inc +++ b/data/scripts/script_0800E684.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800E684 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0140 SetEntityDirection 0x0018 _0807E864 Call sub_0807F354 - StopScript + EndBlock WaitForPlayerAction0x17 _0807E8E4_3 _0807EF80 0x0001 diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc index c1ff4dcb..b540d51a 100644 --- a/data/scripts/script_0800E6B0.inc +++ b/data/scripts/script_0800E6B0.inc @@ -1,35 +1,35 @@ SCRIPT_START script_0800E6B0 - StartScript + BeginBlock Call sub_08060090 _0807EF80 0x000a - StopScript + EndBlock script_0800E6BE: - StartScript + BeginBlock CheckEntityInteractType JumpIf script_0800E6D2 Call sub_08060158 - StopScript + EndBlock Jump script_0800E6BE script_0800E6D2: - StopScript + EndBlock _0807E864 Call sub_0806025C _0807EA94 Wait 0x000f _0807E878 Jump script_0800E6BE - StartScript + BeginBlock Call sub_0806ADFC _0807EF80 0x000a script_0800E6F4: - StopScript - StartScript + EndBlock + BeginBlock CheckEntityInteractType JumpIf script_0800E708 Call sub_0806AEE4 Jump script_0800E6F4 script_0800E708: - StopScript + EndBlock _0807E864 Call sub_0806AFE8 JumpIf script_0800E722 @@ -45,10 +45,10 @@ script_0800E722: _0807E878 Jump script_0800E6F4 .short 0x0000 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a - StopScript + EndBlock script_0800E73E: CheckEntityInteractType JumpIfNot script_0800E73E @@ -59,7 +59,7 @@ script_0800E73E: _0807EA94 _0807E878 Jump script_0800E73E - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a SetEntityNonPlanarMovement 0x0200 @@ -68,21 +68,21 @@ script_0800E73E: CheckGlobalFlag 0x002a JumpIfNot script_0800E786 script_0800E77C: - SetEntityPositionRelative 0x00980188 + SetEntityPositionRelative 0x0188, 0x0098 Jump script_0800E6F4 script_0800E786: - StopScript + EndBlock script_0800E788: - StartScript + BeginBlock CheckGlobalFlag 0x002a JumpIf script_0800E7BA CheckEntityInteractType JumpIf script_0800E7A4 Call sub_0806AEE4 - StopScript + EndBlock Jump script_0800E788 script_0800E7A4: - StopScript + EndBlock _0807E864 Call sub_0806AFE8 _0807EA94 @@ -96,20 +96,20 @@ script_0800E7BA: Call sub_0806AF70 _0807EE04 0x0188, 0x0058 script_0800E7D8: - StopScript - StartScript + EndBlock + BeginBlock Call sub_0806AF78 _0807EE30 JumpIfNot script_0800E7D8 EntityHasHeight JumpIf script_0800E7D8 - StopScript + EndBlock Jump script_0800E6F4 - StartScript + BeginBlock Call sub_0806C674 _0807EF80 0x000a _0807EB44 0x0004 - StopScript + EndBlock script_0800E806: CheckEntityInteractType JumpIfNot script_0800E806 @@ -121,30 +121,30 @@ script_0800E806: _0807EB44 0x0004 Jump script_0800E806 .short 0x0000 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a _0807EB44 0x0000 - StopScript + EndBlock script_0800E832: CheckEntityInteractType JumpIfNot script_0800E832 _0807E864 _0807EB44 0x0004 - StartScript + BeginBlock TextboxNoOverlapFollow 0x4501 CallWithArg sub_0807F854, 0x00010032 CallWithArg sub_0807F854, 0x000200c8 CallWithArg sub_0807F854, 0x00030190 - StopScript + EndBlock _0807EA94 _0807EB38 JumpSwitch_4 script_0800E910, script_0800E8D6, script_0800E8A4, script_0800E872 script_0800E872: - StartScript + BeginBlock TextboxNoOverlapFollow 0x4505 CallWithArg sub_0807F854, 0x00010190 - StopScript + EndBlock _0807EA94 HasRupees 0x0190 JumpIfNot script_0800E908 diff --git a/data/scripts/script_0800E8A4.inc b/data/scripts/script_0800E8A4.inc index 321568d2..9a857695 100644 --- a/data/scripts/script_0800E8A4.inc +++ b/data/scripts/script_0800E8A4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800E8A4 script_0800E8A4: - StartScript + BeginBlock TextboxNoOverlapFollow 0x4504 CallWithArg sub_0807F854, 0x000100c8 - StopScript + EndBlock _0807EA94 HasRupees 0x00c8 JumpIfNot script_0800E908 diff --git a/data/scripts/script_0800E8D6.inc b/data/scripts/script_0800E8D6.inc index 77873d81..47f4bfa7 100644 --- a/data/scripts/script_0800E8D6.inc +++ b/data/scripts/script_0800E8D6.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800E8D6 script_0800E8D6: - StartScript + BeginBlock TextboxNoOverlapFollow 0x4503 CallWithArg sub_0807F854, 0x00010032 - StopScript + EndBlock _0807EA94 HasRupees 0x0032 JumpIfNot script_0800E908 diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc index ccee015f..6c558ea9 100644 --- a/data/scripts/script_0800E908.inc +++ b/data/scripts/script_0800E908.inc @@ -9,11 +9,11 @@ script_0800E914: _0807E878 _0807EB44 0x0000 Jump script_0800E832 - StartScript + BeginBlock Call sub_0806C4F8 _0807EF80 0x000a _0807EB44 0x0000 - StopScript + EndBlock script_0800E932: CheckEntityInteractType JumpIfNot script_0800E932 @@ -30,11 +30,11 @@ script_0800E942: _0807E930 0x0000 Jump script_0800E932 .short 0x0000 - StartScript + BeginBlock _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0000 - StopScript + EndBlock script_0800E974: CheckEntityInteractType JumpIfNot script_0800E974 diff --git a/data/scripts/script_0800E9F4.inc b/data/scripts/script_0800E9F4.inc index f31ca4d3..0a268ef1 100644 --- a/data/scripts/script_0800E9F4.inc +++ b/data/scripts/script_0800E9F4.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800E9F4 - StartScript + BeginBlock _0807EB44 0x0004 SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EF80 0x0001 _0807EDD4 0x0078, 0x0080 _0807EF80 0x0000 diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc index 4177a721..d415dcea 100644 --- a/data/scripts/script_0800EA54.inc +++ b/data/scripts/script_0800EA54.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800EA54 - StartScript + BeginBlock Call sub_0806CE5C _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0008 - StopScript + EndBlock script_0800EA6A: CheckEntityInteractType JumpIfNot script_0800EA6A @@ -20,21 +20,21 @@ script_0800EA6A: Call sub_0807F2D4 _0807E930 0x0008 Jump script_0800EA6A - StartScript + BeginBlock _0807E9D4 Call sub_0806C09C _0807EF80 0x000a _0807E930 0x0000 _0807EB44 0x0004 - StopScript + EndBlock script_0800EABC: CheckEntityInteractType JumpIfNot script_0800EABC - StartScript + BeginBlock _0807E864 _0807EB74 CallWithArg sub_0806C028, 0x00000004 - StopScript + EndBlock script_0800EAD4: Call sub_0806C00C JumpIfNot script_0800EAD4 @@ -45,12 +45,12 @@ script_0800EAD4: _0807E878 _0807E930 0x0000 Jump script_0800EABC - StartScript + BeginBlock Call sub_0806C870 _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0000 - StopScript + EndBlock script_0800EB0E: _0807E30C JumpIfNot script_0800EB0E @@ -62,12 +62,12 @@ script_0800EB0E: _0807E878 Jump script_0800EB0E .short 0x0000 - StartScript + BeginBlock Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0004 Call sub_08061FD8 - StopScript + EndBlock script_0800EB44: CheckEntityInteractType JumpIfNot script_0800EB44 @@ -79,12 +79,12 @@ script_0800EB44: _0807E878 Jump script_0800EB44 .short 0x0000 - StartScript + BeginBlock Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0006 Call sub_08061FD8 - StopScript + EndBlock script_0800EB7C: CheckEntityInteractType JumpIfNot script_0800EB7C @@ -97,26 +97,26 @@ script_0800EB7C: _0807EB44 0x0006 Call sub_08061FD8 Jump script_0800EB7C - StartScript + BeginBlock Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0002 Call sub_08061FD8 - StopScript + EndBlock Jump script_0800EBF4 - StartScript + BeginBlock Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0004 Call sub_08061FD8 - StopScript + EndBlock Jump script_0800EBF4 - StartScript + BeginBlock Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0006 Call sub_08061FD8 - StopScript + EndBlock script_0800EBF4: CheckEntityInteractType JumpIfNot script_0800EBF4 @@ -128,12 +128,12 @@ script_0800EBF4: _0807E878 Jump script_0800EBF4 .short 0x0000 - StartScript + BeginBlock Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0002 Call sub_08061FD8 - StopScript + EndBlock script_0800EC2C: CheckEntityInteractType JumpIfNot script_0800EC2C @@ -146,12 +146,12 @@ script_0800EC2C: _0807EB44 0x0002 Call sub_08061FD8 Jump script_0800EC2C - StartScript + BeginBlock Call sub_08061E70 _0807EF80 0x000a _0807EB44 0x0004 Call sub_08061FD8 - StopScript + EndBlock script_0800EC6C: CheckEntityInteractType JumpIfNot script_0800EC6C @@ -163,14 +163,14 @@ script_0800EC6C: _0807E878 Jump script_0800EC6C .short 0x0000 - StartScript + BeginBlock _0807E9D4 CallWithArg sub_08061FB8, 0x00000001 SetEntityNonPlanarMovement 0x0040 _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0002 - StopScript + EndBlock script_0800ECAC: _0807EB44 0x0006 _0807E930 0x0007 @@ -193,13 +193,13 @@ script_0800ECAC: _0807E930 0x0003 Wait 0x001e Jump script_0800ECAC - StartScript + BeginBlock Call sub_080639D0 _0807EF80 0x000a - StopScript - StartScript + EndBlock + BeginBlock CallWithArg sub_08063850, 0x00000000 - StopScript + EndBlock script_0800ED20: CheckEntityInteractType JumpIfNot script_0800ED20 @@ -216,13 +216,13 @@ script_0800ED46: Call sub_08063874 CallWithArg sub_08063850, 0x00000000 Jump script_0800ED20 - StartScript + BeginBlock Call sub_08064CC0 _0807EF80 0x000a _0807EF80 0x0007 _0807EB44 0x0002 _0807E930 0x0000 - StopScript + EndBlock script_0800ED76: _0807E944 _0807E864 @@ -233,12 +233,12 @@ script_0800ED76: _0807E878 Jump script_0800ED76 .short 0x0000 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a script_0800ED98: - StopScript - StartScript + EndBlock + BeginBlock CheckEntityInteractType JumpIf script_0800EDB6 TestBit 0x00000001 @@ -246,7 +246,7 @@ script_0800ED98: Call sub_0806AEE4 Jump script_0800ED98 script_0800EDB6: - StopScript + EndBlock _0807E864 Call sub_0807DF28 CheckLocalFlag 0x00ae @@ -269,7 +269,7 @@ script_0800EDB6: SetLocalFlag 0x00ae Jump script_0800ED98 script_0800EE12: - StopScript + EndBlock WaitForSomething2 0x00000002 _0807EB44 0x0002 CallWithArg sub_0806AF60, 0x00000008 @@ -283,12 +283,12 @@ script_0800EE3E: Call sub_0807DF50 _0807E878 Jump script_0800ED98 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a script_0800EE58: - StopScript - StartScript + EndBlock + BeginBlock CheckEntityInteractType JumpIf script_0800EE76 TestBit 0x00000001 @@ -296,7 +296,7 @@ script_0800EE58: Call sub_0806AEE4 Jump script_0800EE58 script_0800EE76: - StopScript + EndBlock _0807E864 Call sub_0807DF28 CheckLocalFlag 0x00ae @@ -319,7 +319,7 @@ script_0800EE76: SetLocalFlag 0x00ae Jump script_0800EE58 script_0800EED2: - StopScript + EndBlock WaitForSomething2 0x00000010 _0807EB44 0x0006 CallWithArg sub_0806AF60, 0x00000008 diff --git a/data/scripts/script_0800EF40.inc b/data/scripts/script_0800EF40.inc index ac9171e9..793fb4de 100644 --- a/data/scripts/script_0800EF40.inc +++ b/data/scripts/script_0800EF40.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800EF40 - StartScript + BeginBlock _0807EF80 0x0007 CheckGlobalFlag 0x001f JumpIf script_0800EF92 - StopScript + EndBlock script_0800EF50: Call sub_080869A4 JumpIfNot script_0800EF50 diff --git a/data/scripts/script_0800EF9C.inc b/data/scripts/script_0800EF9C.inc index 3b34ef6f..21f358bb 100644 --- a/data/scripts/script_0800EF9C.inc +++ b/data/scripts/script_0800EF9C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800EF9C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EB44 0x0004 _0807EF80 0x0001 _0807ECC4 0x0008 diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc index e387487b..4a9dc22c 100644 --- a/data/scripts/script_0800EFC0.inc +++ b/data/scripts/script_0800EFC0.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800EFC0 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 _0807E9D4 _0807EF80 0x000a CheckLocalFlag 0x007b JumpIf script_0800F082 - StopScript + EndBlock Jump script_0800EFFE script_0800EFDA: _0807EB44 0x0006 @@ -39,14 +39,14 @@ script_0800EFFE: JumpIf script_0800F082 Jump script_0800EFDA script_0800F082: - StopScript + EndBlock Call sub_0806AEE4 Jump script_0800F082 .short 0x0000 - StartScript + BeginBlock _0807F0B4 0x0001 CameraTargetPlayer - StopScript + EndBlock script_0800F09A: CheckPlayerInRegion 0x01f8, 0x0338, 0x1030 JumpIfNot script_0800F09A diff --git a/data/scripts/script_0800F14C.inc b/data/scripts/script_0800F14C.inc index caf956b4..424a5b99 100644 --- a/data/scripts/script_0800F14C.inc +++ b/data/scripts/script_0800F14C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800F14C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock _0807EF80 0x0000 _0807EB44 0x0006 _0807EF80 0x0004 diff --git a/data/scripts/script_0800F184.inc b/data/scripts/script_0800F184.inc index c1d99864..a11ddc09 100644 --- a/data/scripts/script_0800F184.inc +++ b/data/scripts/script_0800F184.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800F184 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0008 _0807EF80 0x000a - StopScript + EndBlock Call sub_0807F348 _0807EB44 0x0002 WaitForSomething2 0x00000002 @@ -21,11 +21,11 @@ SCRIPT_START script_0800F184 _0807E5F8 0x00000040 WaitForSomething2 0x00000002 script_0800F1E6: - StopScript - StartScript + EndBlock + BeginBlock CallWithArg sub_0807F680, 0x000001c0 JumpIf script_0800F22A - StopScript + EndBlock _0807E864 Call sub_0807F9A4 _0807EB74 @@ -41,7 +41,7 @@ script_0800F1E6: script_0800F22A: CallWithArg sub_0807F680, 0x00000230 JumpIfNot script_0800F26A - StopScript + EndBlock _0807E864 Call sub_0807F9A4 _0807EB74 @@ -57,7 +57,7 @@ script_0800F22A: script_0800F26A: CallWithArg sub_0807F6B4, 0x00000310 JumpIf script_0800F2AA - StopScript + EndBlock _0807E864 Call sub_0807F9A4 _0807EB74 @@ -73,7 +73,7 @@ script_0800F26A: script_0800F2AA: CallWithArg sub_0807F6B4, 0x00000340 JumpIfNot script_0800F2EA - StopScript + EndBlock _0807E864 Call sub_0807F9A4 _0807EB74 @@ -87,13 +87,13 @@ script_0800F2AA: _0807E878 Jump script_0800F1E6 script_0800F2EA: - StopScript - StartScript + EndBlock + BeginBlock CheckKinstoneFused 0x0032 JumpIf script_0800F314 CheckEntityInteractType JumpIfNot script_0800F2EA - StopScript + EndBlock _0807E864 _0807EB74 _0807E930 0x0008 @@ -102,7 +102,7 @@ script_0800F2EA: _0807E878 Jump script_0800F1E6 script_0800F314: - StopScript + EndBlock _0807E5F8 0x00000040 WaitForSomething2 0x00000002 SetEntityNonPlanarMovement 0x0100 diff --git a/data/scripts/script_0800F39C.inc b/data/scripts/script_0800F39C.inc index 2bd4c895..bcc37575 100644 --- a/data/scripts/script_0800F39C.inc +++ b/data/scripts/script_0800F39C.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800F39C - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0002 _0807EF80 0x0001 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 _0807EF80 0x000b - StopScript + EndBlock Call sub_0807F348 WaitForSomething2 0x00000004 _0807EF80 0x0007 @@ -18,11 +18,11 @@ SCRIPT_START script_0800F39C _0807EF80 0x000a _0807E5F8 0x00000080 script_0800F3EA: - StopScript - StartScript + EndBlock + BeginBlock CheckEntityInteractType JumpIfNot script_0800F402 - StopScript + EndBlock _0807E864 _0807EB74 TextboxNoOverlap 0x1237 @@ -31,7 +31,7 @@ script_0800F3EA: script_0800F402: TestBit 0x00000004 JumpIfNot script_0800F3EA - StopScript + EndBlock _0807EF80 0x000b Wait 0x0010 SetEntityNonPlanarMovement 0x0100 diff --git a/data/scripts/script_0800F430.inc b/data/scripts/script_0800F430.inc index 1eb6f57c..a8fdfe28 100644 --- a/data/scripts/script_0800F430.inc +++ b/data/scripts/script_0800F430.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800F430 - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0002 _0807EF80 0x0001 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 _0807EF80 0x000b - StopScript + EndBlock Call sub_0807F348 WaitForSomething2 0x00000008 _0807EF80 0x0007 @@ -17,11 +17,11 @@ SCRIPT_START script_0800F430 _0807EF80 0x000a _0807E5F8 0x00000100 script_0800F478: - StopScript - StartScript + EndBlock + BeginBlock CheckEntityInteractType JumpIfNot script_0800F490 - StopScript + EndBlock _0807E864 _0807EB74 TextboxNoOverlap 0x1238 @@ -30,7 +30,7 @@ script_0800F478: script_0800F490: TestBit 0x00000008 JumpIfNot script_0800F478 - StopScript + EndBlock _0807EF80 0x000b Wait 0x0018 SetEntityNonPlanarMovement 0x0100 diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/script_0800F4C4.inc index f3fe6d92..2e0a260f 100644 --- a/data/scripts/script_0800F4C4.inc +++ b/data/scripts/script_0800F4C4.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800F4C4 - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0002 _0807EF80 0x0001 _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0080 _0807EF80 0x000b - StopScript + EndBlock Call sub_0807F348 WaitForSomething2 0x00000010 _0807EF80 0x0007 @@ -17,11 +17,11 @@ SCRIPT_START script_0800F4C4 _0807EF80 0x000a _0807E5F8 0x00000200 script_0800F50C: - StopScript - StartScript + EndBlock + BeginBlock CheckEntityInteractType JumpIfNot script_0800F524 - StopScript + EndBlock _0807E864 _0807EB74 TextboxNoOverlap 0x1239 @@ -30,7 +30,7 @@ script_0800F50C: script_0800F524: TestBit 0x00000010 JumpIfNot script_0800F50C - StopScript + EndBlock _0807EF80 0x000b Wait 0x0028 SetEntityNonPlanarMovement 0x0100 diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc index e67e84b7..e0320f22 100644 --- a/data/scripts/script_0800F554.inc +++ b/data/scripts/script_0800F554.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800F554 - StartScript + BeginBlock Call sub_08061FE4 _0807E9D4 _0807EF80 0x000a - StopScript + EndBlock script_0800F564: CheckEntityInteractType JumpIfNot script_0800F564 @@ -16,11 +16,11 @@ script_0800F564: Jump script_0800F564 .short 0x0000 script_0800F584: - StartScript + BeginBlock _0807EF80 0x0001 _0807E9D4 _0807EF80 0x000a - StopScript + EndBlock script_0800F592: CheckEntityInteractType JumpIfNot script_0800F592 @@ -32,12 +32,12 @@ script_0800F592: _0807EF80 0x0001 Jump script_0800F592 .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0006 _0807E9D4 _0807EF80 0x000a CallWithArg sub_0807F3D8, 0x00000008 - StopScript + EndBlock script_0800F5C8: CheckEntityInteractType JumpIfNot script_0800F5C8 @@ -49,13 +49,13 @@ script_0800F5C8: _0807E878 Jump script_0800F5C8 .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807E930 0x0000 _0807E9D4 _0807EF80 0x000a Call sub_0807F348 - StopScript + EndBlock script_0800F604: CheckEntityInteractType JumpIfNot script_0800F604 @@ -67,11 +67,11 @@ script_0800F604: Wait 0x000f _0807E878 Jump script_0800F604 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a _0807EF80 0x0001 - StopScript + EndBlock script_0800F636: _0807E30C JumpIfNot script_0800F636 @@ -82,12 +82,12 @@ script_0800F636: _0807E878 Jump script_0800F636 .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a _0807E9D4 - StopScript + EndBlock script_0800F662: CheckEntityInteractType JumpIfNot script_0800F662 @@ -101,13 +101,13 @@ script_0800F662: _0807EF80 0x0000 Jump script_0800F662 .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807E930 0x0000 _0807E9D4 _0807EF80 0x000a Call sub_0807F348 - StopScript + EndBlock script_0800F6A0: CheckEntityInteractType JumpIfNot script_0800F6A0 @@ -127,12 +127,12 @@ script_0800F6C8: CallWithArg sub_0807F3D8, 0x00000000 Jump script_0800F6A0 .short 0x0000 - StartScript + BeginBlock _0807EF80 0x0001 _0807E9D4 _0807EF80 0x000a Call sub_08062788 - StopScript + EndBlock script_0800F6F4: CheckLocalFlag 0x00cd JumpIf script_0800F718 diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc index bcf3f800..3f530de8 100644 --- a/data/scripts/script_0800F724.inc +++ b/data/scripts/script_0800F724.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800F724 - StartScript + BeginBlock _0807EF80 0x0008 - StopScript + EndBlock script_0800F72C: CheckLocalFlag 0x00cd JumpIfNot script_0800F72C @@ -11,7 +11,7 @@ script_0800F72C: JumpIf script_0800FA4C _0807E864 Call sub_0807DF28 - SetEntityPositionRelative 0x014800c8 + SetEntityPositionRelative 0x00c8, 0x0148 Call sub_0807F844 _0807E778 0x0002 DoFade6 @@ -19,11 +19,11 @@ script_0800F72C: StartPlayerScript script_0800FA54 _0807E5F8 0x00000002 _0807F0B4 0x0001 - SetEntityPositionRelative 0x021800c8 + SetEntityPositionRelative 0x00c8, 0x0218 Call sub_0807F5C0 Wait 0x0064 _0807F0B4 0x0002 - SetEntityPositionRelative 0x036800c8 + SetEntityPositionRelative 0x00c8, 0x0368 Call sub_0807F5C0 WaitForSomething2 0x00000001 WaitForSomething2 0x00000004 @@ -87,7 +87,7 @@ script_0800F72C: TextboxNoOverlapFollowPos 0x1021, 0x000e _0807EA94 StartPlayerScript script_0800FAE4 - SetEntityPositionRelative 0x025800f0 + SetEntityPositionRelative 0x00f0, 0x0258 _0807F0B4 0x0001 CameraTargetEntity Wait 0x001e diff --git a/data/scripts/script_0800FA54.inc b/data/scripts/script_0800FA54.inc index f81e8316..593a4b3e 100644 --- a/data/scripts/script_0800FA54.inc +++ b/data/scripts/script_0800FA54.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800FA54 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript - SetEntityPositionRelative 0x039800d8 + EndBlock + SetEntityPositionRelative 0x00d8, 0x0398 _0807EB44 0x0006 _0807EF80 0x0000 _0807E5F8 0x00000001 diff --git a/data/scripts/script_0800FA78.inc b/data/scripts/script_0800FA78.inc index 70a38166..b93f0644 100644 --- a/data/scripts/script_0800FA78.inc +++ b/data/scripts/script_0800FA78.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FA78 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EDD4 0x00a0, 0x0278 _0807EB44 0x0000 _0807EF80 0x0000 diff --git a/data/scripts/script_0800FA9C.inc b/data/scripts/script_0800FA9C.inc index ae3e58e0..2d2128af 100644 --- a/data/scripts/script_0800FA9C.inc +++ b/data/scripts/script_0800FA9C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FA9C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EDD4 0x0078, 0x01c0 _0807EB44 0x0000 _0807EF80 0x0000 diff --git a/data/scripts/script_0800FAC0.inc b/data/scripts/script_0800FAC0.inc index bfd30c11..f3571b1b 100644 --- a/data/scripts/script_0800FAC0.inc +++ b/data/scripts/script_0800FAC0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FAC0 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EDD4 0x0108, 0x01c8 _0807EB44 0x0002 _0807EF80 0x0000 diff --git a/data/scripts/script_0800FAE4.inc b/data/scripts/script_0800FAE4.inc index 6dc86894..ebab7689 100644 --- a/data/scripts/script_0800FAE4.inc +++ b/data/scripts/script_0800FAE4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FAE4 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock Call sub_0807F584 JumpSwitch_4 script_0800FB06, script_0800FB10, script_0800FB06, script_0800FAFC script_0800FAFC: diff --git a/data/scripts/script_0800FB44.inc b/data/scripts/script_0800FB44.inc index b741e922..fb92befb 100644 --- a/data/scripts/script_0800FB44.inc +++ b/data/scripts/script_0800FB44.inc @@ -1,24 +1,24 @@ SCRIPT_START script_0800FB44 - StartScript + BeginBlock _0807EF80 0x0008 _0807EF80 0x000b SetEntityNonPlanarMovement 0x0080 Call sub_08066D04 - StopScript + EndBlock WaitForSomething2 0x00000002 Call sub_08066D14 JumpIf script_0800FB6C MoveEntityToPlayer script_0800FB6C: _0807EF80 0x0007 - SetEntityPositionRelative 0x039800b8 + SetEntityPositionRelative 0x00b8, 0x0398 _0807EB44 0x0002 _0807EF80 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 SetEntityNonPlanarMovement 0x0200 _0807EDD4 0x00b8, 0x0318 - SetEntityPositionRelative 0x026000a0 + SetEntityPositionRelative 0x00a0, 0x0260 _0807EB44 0x0000 _0807EF80 0x0001 _0807E5F8 0x00000004 @@ -38,7 +38,7 @@ script_0800FBAE: _0807EDD4 0x00a0, 0x0268 _0807EDD4 0x0070, 0x0268 _0807EDD4 0x0070, 0x0208 - SetEntityPositionRelative 0x01a80078 + SetEntityPositionRelative 0x0078, 0x01a8 _0807EB44 0x0000 _0807EF80 0x0001 _0807E5F8 0x00000004 @@ -55,7 +55,7 @@ script_0800FC06: WaitForSomething2 0x00000002 SetEntityNonPlanarMovement 0x0200 _0807EDD4 0x00f8, 0x01a8 - SetEntityPositionRelative 0x01c80118 + SetEntityPositionRelative 0x0118, 0x01c8 _0807EB44 0x0002 _0807EF80 0x0001 _0807E5F8 0x00000004 @@ -72,7 +72,7 @@ script_0800FC52: WaitForSomething2 0x00000002 SetEntityNonPlanarMovement 0x0200 _0807EDD4 0x0118, 0x0260 - SetEntityPositionRelative 0x027000f8 + SetEntityPositionRelative 0x00f8, 0x0270 _0807EB44 0x0000 _0807EF80 0x0001 _0807E5F8 0x00000004 diff --git a/data/scripts/script_0800FDA0.inc b/data/scripts/script_0800FDA0.inc index fcbc78bd..dc10ff58 100644 --- a/data/scripts/script_0800FDA0.inc +++ b/data/scripts/script_0800FDA0.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800FDA0 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a _0807E9D4 - StopScript + EndBlock script_0800FDB2: CheckEntityInteractType JumpIfNot script_0800FDB2 @@ -15,27 +15,27 @@ script_0800FDB2: _0807E878 Jump script_0800FDB2 .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a _0807E9D4 SetEntityNonPlanarMovement 0x0040 - StopScript + EndBlock script_0800FDE2: Call sub_08069A60 script_0800FDE8: Call sub_0806991C script_0800FDEE: - StopScript - StartScript + EndBlock + BeginBlock Call sub_08069ACC JumpIf script_0800FE06 _0807EE30 JumpIfNot script_0800FDEE Jump script_0800FDE2 script_0800FE06: - StopScript + EndBlock _0807EB44 0x0002 _0807EF80 0x0000 Wait 0x001e @@ -51,27 +51,27 @@ script_0800FE06: Call sub_08069A3C Jump script_0800FDE8 .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a _0807E9D4 SetEntityNonPlanarMovement 0x0040 - StopScript + EndBlock script_0800FE5A: Call sub_08069AA8 script_0800FE60: Call sub_080699AC script_0800FE66: - StopScript - StartScript + EndBlock + BeginBlock Call sub_08069ACC JumpIf script_0800FE7E _0807EE30 JumpIfNot script_0800FE66 Jump script_0800FE5A script_0800FE7E: - StopScript + EndBlock _0807EB44 0x0002 _0807EF80 0x0000 Wait 0x001e @@ -87,21 +87,21 @@ script_0800FE7E: Call sub_08069A84 Jump script_0800FE60 .short 0x0000 - StartScript + BeginBlock CheckInventory1 0x0012 JumpIf script_0800FF0E _0807EB44 0x0006 _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 - StopScript + EndBlock script_0800FED8: - StopScript - StartScript + EndBlock + BeginBlock _0807EF80 0x000b Call sub_080642B8 CheckEntityInteractType JumpIfNot script_0800FED8 - StopScript + EndBlock _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 diff --git a/data/scripts/script_0800FF18.inc b/data/scripts/script_0800FF18.inc index 2f212a83..d659f684 100644 --- a/data/scripts/script_0800FF18.inc +++ b/data/scripts/script_0800FF18.inc @@ -1,19 +1,19 @@ SCRIPT_START script_0800FF18 - StartScript + BeginBlock CheckInventory1 0x0012 JumpIf script_0800FF6A _0807EB44 0x0006 _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 - StopScript + EndBlock script_0800FF34: - StopScript - StartScript + EndBlock + BeginBlock _0807EF80 0x000b Call sub_08064198 CheckEntityInteractType JumpIfNot script_0800FF34 - StopScript + EndBlock _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc index 58b01a6e..18283eb4 100644 --- a/data/scripts/script_0800FF74.inc +++ b/data/scripts/script_0800FF74.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800FF74 - StartScript + BeginBlock _0807EB44 0x0002 _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 Call sub_080644A4 ClearLocalFlag 0x00c7 - StopScript + EndBlock script_0800FF92: - StopScript - StartScript + EndBlock + BeginBlock _0807EF80 0x000a CheckLocalFlag 0x00ce JumpIf script_0800FFCC @@ -24,7 +24,7 @@ script_0800FF92: script_0800FFCC: CheckEntityInteractType JumpIfNot script_0800FF92 - StopScript + EndBlock SetLocalFlag 0x00c7 _0807E864 _0807EB74 @@ -45,7 +45,7 @@ script_0801000A: _0807EA94 Jump script_08010060 script_08010014: - StopScript + EndBlock _0807E888 Call sub_0807F594 _0807E864 @@ -67,12 +67,12 @@ script_08010060: _0807E878 Jump script_0800FF92 .short 0x0000 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a _0807EB44 0x0004 CallWithArg sub_080672B0, 0x00000000 - StopScript + EndBlock script_08010090: CheckEntityInteractType JumpIfNot script_08010090 diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc index 809f6ca7..9c1b8c94 100644 --- a/data/scripts/script_080100C8.inc +++ b/data/scripts/script_080100C8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_080100C8 - StartScript + BeginBlock Call sub_08061FE4 Call sub_08061E70 _0807EF80 0x000a - StopScript + EndBlock script_080100DC: CheckEntityInteractType JumpIfNot script_080100DC @@ -15,22 +15,22 @@ script_080100DC: _0807E878 Jump script_080100DC .short 0x0000 - StartScript + BeginBlock Call sub_08061FE4 Call sub_08061E70 _0807EF80 0x000a - StopScript + EndBlock script_08010110: Wait 0x003c Call sub_08061E90 Jump script_08010110 .short 0x0000 - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a - StopScript + EndBlock script_08010132: CheckEntityInteractType JumpIfNot script_08010132 @@ -40,11 +40,11 @@ script_08010132: _0807EA94 _0807E878 Jump script_08010132 - StartScript + BeginBlock _0807EF80 0x0001 Call sub_0806C354 _0807EF80 0x000a - StopScript + EndBlock script_0801015A: CheckEntityInteractType JumpIfNot script_0801015A @@ -70,10 +70,10 @@ script_0801019E: script_080101A6: _0807E878 Jump script_0801015A - StartScript + BeginBlock _0807EF80 0x0008 Call sub_080A1648 - StopScript + EndBlock Call sub_080A1270 _0807E864 Call sub_0807DF28 @@ -90,11 +90,11 @@ script_080101A6: Call sub_0807F168 Call sub_080A1388 Call sub_0806EC38 - StartScript + BeginBlock MoveEntityToPlayer Call sub_0807F844 CameraTargetPlayer - StopScript + EndBlock _0807E778 0x0004 DoFade4 WaitFor_2 diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc index a2666a68..4f8f03de 100644 --- a/data/scripts/script_08010264.inc +++ b/data/scripts/script_08010264.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08010264 - StartScript + BeginBlock _0807EF80 0x0007 _0807E9D4 _0807EF80 0x000a _0807EB44 0x0006 _0807EF80 0x0000 - StopScript + EndBlock script_0801027A: CheckEntityInteractType JumpIfNot script_0801027A @@ -16,11 +16,11 @@ script_0801027A: _0807E878 Jump script_0801027A .short 0x0000 - StartScript + BeginBlock _0807EF80 0x0000 Call sub_08062A48 _0807EF80 0x000a - StopScript + EndBlock script_080102A6: CheckEntityInteractType JumpIfNot script_080102A6 @@ -41,11 +41,11 @@ script_080102CC: _0807E878 Jump script_080102A6 .short 0x0000 - StartScript + BeginBlock _0807EF80 0x0000 Call sub_08062A48 _0807EF80 0x000a - StopScript + EndBlock script_080102F2: CheckEntityInteractType JumpIfNot script_080102F2 @@ -56,11 +56,11 @@ script_080102F2: _0807E878 Jump script_080102F2 .short 0x0000 - StartScript + BeginBlock _0807EF80 0x0000 - StopScript + EndBlock script_08010314: - StopScript + EndBlock Call sub_08062698 Call sub_080626AC CallWithArg sub_0807F0EC, 0x00000009 @@ -92,40 +92,40 @@ script_08010386: script_08010390: _0807EE04 0x03c8, 0x00b8 script_08010396: - StopScript - StartScript + EndBlock + BeginBlock Call sub_080626C0 JumpIf script_08010314 _0807EE30 JumpIfNot script_08010396 Jump script_08010314 .short 0x0000 - StartScript + BeginBlock _0807EF80 0x0000 Call sub_08062A48 _0807EF80 0x000a - StopScript + EndBlock script_080103C2: Wait 0x001e Call sub_08062948 Jump script_080103C2 - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0004 _0807EF80 0x000a CallWithArg sub_0807F3D8, 0x00000004 - StopScript + EndBlock script_080103E8: Wait 0x003c Call sub_0806407C Jump script_080103E8 .short 0x0000 - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0004 _0807EF80 0x000a CallWithArg sub_0807F3D8, 0x00000000 - StopScript + EndBlock script_08010410: CheckEntityInteractType JumpIfNot script_08010410 @@ -135,25 +135,25 @@ script_08010410: _0807EA94 _0807E878 Jump script_08010410 - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a _0807E914 0x08064689 Call sub_08064644 - StopScript + EndBlock script_08010446: Wait 0x003c Call sub_080646A4 Jump script_08010446 - StartScript + BeginBlock _0807EB44 0x0004 _0807E930 0x0000 Call sub_080636F4 _0807EF80 0x000a Call sub_0807F348 - StopScript + EndBlock script_08010470: CheckEntityInteractType JumpIfNot script_08010470 @@ -166,13 +166,13 @@ script_08010470: _0807E878 CallWithArg sub_0807F3D8, 0x00000000 Jump script_08010470 - StartScript + BeginBlock _0807EB44 0x0004 _0807E930 0x0000 Call sub_08063CAC _0807EF80 0x000a Call sub_0807F348 - StopScript + EndBlock script_080104BC: CheckEntityInteractType JumpIfNot script_080104BC @@ -185,12 +185,12 @@ script_080104BC: _0807E878 CallWithArg sub_0807F3D8, 0x00000000 Jump script_080104BC - StartScript + BeginBlock _0807EB44 0x0004 _0807E930 0x0000 _0807EF80 0x000a Call sub_0807F348 - StopScript + EndBlock script_08010502: CheckEntityInteractType JumpIfNot script_08010502 @@ -257,12 +257,12 @@ script_080105E0: _0807E878 Jump script_08010502 .short 0x0000 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock script_08010602: CheckEntityInteractType JumpIfNot script_08010602 @@ -273,12 +273,12 @@ script_08010602: _0807E878 _0807EB44 0x0004 Jump script_08010602 - StartScript + BeginBlock _0807E930 0x0008 script_08010622: Call sub_08062A48 _0807EF80 0x000a - StopScript + EndBlock script_0801062E: CheckEntityInteractType JumpIfNot script_0801062E @@ -287,28 +287,28 @@ script_0801062E: _0807EA94 _0807E878 Jump script_0801062E - StartScript + BeginBlock _0807E930 0x0009 Jump script_08010622 .short 0x0000 - StartScript + BeginBlock _0807E930 0x000b Jump script_08010622 .short 0x0000 - StartScript + BeginBlock _0807E930 0x000c Jump script_08010622 .short 0x0000 - StartScript + BeginBlock _0807E930 0x000d Jump script_08010622 .short 0x0000 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock script_08010686: CheckEntityInteractType JumpIfNot script_08010686 @@ -322,12 +322,12 @@ script_08010686: _0807EB44 0x0004 Jump script_08010686 .short 0x0000 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock script_080106BE: CheckEntityInteractType JumpIfNot script_080106BE @@ -365,21 +365,21 @@ script_08010726: _0807EF80 0x0001 Jump script_080106BE .short 0x0000 - StartScript + BeginBlock _0807EF80 0x0007 _0807E9D4 _0807EF80 0x000a _0807E930 0x0000 - StopScript + EndBlock script_08010746: CheckEntityInteractType JumpIfNot script_08010746 _0807E864 _0807E930 0x0004 - StartScript + BeginBlock Call sub_08062D18 JumpIfNot script_08010786 - StopScript + EndBlock _0807EA94 _0807E3E8 JumpIfNot script_08010786 @@ -392,18 +392,18 @@ script_08010778: Call sub_08062E14 TextboxNoOverlap 0x4007 script_08010786: - StopScript + EndBlock _0807EA94 _0807E878 _0807E930 0x0008 Jump script_08010746 - StartScript + BeginBlock _0807EF80 0x0007 _0807E9D4 _0807EF80 0x000a _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock script_080107AA: CheckEntityInteractType JumpIfNot script_080107AA @@ -416,7 +416,7 @@ script_080107AA: _0807EF80 0x0000 Jump script_080107AA .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a @@ -424,23 +424,23 @@ script_080107AA: _0807E9D4 Call sub_0807F348 Call sub_08069684 - StopScript + EndBlock script_080107F2: - StopScript - StartScript + EndBlock + BeginBlock CheckPlayerInRegion2 0x3030 JumpIfNot script_080107F2 Call sub_080696B0 script_08010804: - StopScript - StartScript + EndBlock + BeginBlock CheckPlayerInRegion2 0x3030 JumpIfNot script_080107F2 HasRoomItemForSale JumpIf script_08010860 CheckEntityInteractType JumpIfNot script_08010804 - StopScript + EndBlock _0807E864 Call sub_0807DF28 _0807EB74 @@ -461,7 +461,7 @@ script_08010858: TextboxNoOverlap 0x2c1a Jump script_080108BA script_08010860: - StopScript + EndBlock _0807E864 Call sub_0807DF38 _0807EB74 @@ -511,11 +511,11 @@ script_08010900: Call sub_0807DF50 _0807E878 Jump script_080108D0 - StartScript + BeginBlock _0807EF80 0x0007 CheckKinstoneFused 0x001b JumpIf script_0800EF92 - StopScript + EndBlock script_0801091C: Call sub_080869A4 JumpIfNot script_0801091C diff --git a/data/scripts/script_08010964.inc b/data/scripts/script_08010964.inc index d8a83f03..21fad75c 100644 --- a/data/scripts/script_08010964.inc +++ b/data/scripts/script_08010964.inc @@ -16,13 +16,13 @@ script_08010994: _0807E878 Jump script_08010964 script_080109A0: - StartScript - StopScript + BeginBlock + EndBlock CheckLocalFlag 0x00d1 JumpIf script_080109EA CheckPlayerInRegion2 0x0808 JumpIfNot script_080109A0 - StopScript + EndBlock _0807E864 Call sub_0807F9A4 Call sub_0807DF28 diff --git a/data/scripts/script_080109F0.inc b/data/scripts/script_080109F0.inc index 9bbf1e4f..3c55ca52 100644 --- a/data/scripts/script_080109F0.inc +++ b/data/scripts/script_080109F0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080109F0 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807ECC4 0x0010 _0807EB44 0x0004 _0807EF80 0x0000 diff --git a/data/scripts/script_08010A14.inc b/data/scripts/script_08010A14.inc index 9d650196..020139cf 100644 --- a/data/scripts/script_08010A14.inc +++ b/data/scripts/script_08010A14.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08010A14 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EC64 0x0010 _0807EB44 0x0000 _0807EF80 0x0000 diff --git a/data/scripts/script_08010A38.inc b/data/scripts/script_08010A38.inc index 0089c3fa..5e924e89 100644 --- a/data/scripts/script_08010A38.inc +++ b/data/scripts/script_08010A38.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08010A38 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EC94 0x0010 _0807EB44 0x0002 _0807EF80 0x0000 diff --git a/data/scripts/script_08010A5C.inc b/data/scripts/script_08010A5C.inc index 22e1090b..22b8abef 100644 --- a/data/scripts/script_08010A5C.inc +++ b/data/scripts/script_08010A5C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08010A5C - StartScript + BeginBlock Call sub_0807DF28 _0807E864 ModHealth 0x00a0 - StopScript + EndBlock Wait 0x003c _0807E778 0x0004 DoFade4 diff --git a/data/scripts/script_08010A98.inc b/data/scripts/script_08010A98.inc index 12cf866c..b9ba3821 100644 --- a/data/scripts/script_08010A98.inc +++ b/data/scripts/script_08010A98.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08010A98 - StartScript + BeginBlock _0807EB44 0x0004 CallWithArg sub_080672B0, 0x00000000 _0807EF80 0x000a Call sub_08067314 - StopScript + EndBlock script_08010AB4: CheckEntityInteractType JumpIfNot script_08010AB4 @@ -17,7 +17,7 @@ script_08010AB4: _0807EB44 0x0004 CallWithArg sub_080672B0, 0x00000000 Jump script_08010AB4 - StartScript + BeginBlock CheckInventory1 0x0067 JumpIfNot script_08010B62 _0807EB44 0x0004 @@ -25,18 +25,18 @@ script_08010AB4: SetEntityNonPlanarMovement 0x0180 CallWithArg_2 sub_0807F348 Call sub_0806075C - StopScript + EndBlock _0807EA94 Call sub_080606C0 script_08010B10: - StopScript + EndBlock Call sub_0806076C _0807EF80 0x0007 script_08010B1C: Call sub_08060700 script_08010B22: - StopScript - StartScript + EndBlock + BeginBlock _0807E564 JumpIf script_08010B3A CallWithArg sub_080608E4, 0x00000000 @@ -46,14 +46,14 @@ script_08010B3A: JumpIfNot script_08010B22 Jump script_08010B10 script_08010B44: - StopScript + EndBlock _0807EF80 0x0000 script_08010B4A: - StopScript - StartScript + EndBlock + BeginBlock CallWithArg sub_080608E4, 0x00000001 JumpIf script_08010B4A - StopScript + EndBlock Jump script_08010B1C script_08010B62: _0807EF80 0x0006 diff --git a/data/scripts/script_08010B68.inc b/data/scripts/script_08010B68.inc index 119ca37c..450e733f 100644 --- a/data/scripts/script_08010B68.inc +++ b/data/scripts/script_08010B68.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08010B68 - StartScript + BeginBlock _0807E564 JumpIfNot script_08010BAC Call sub_0807F924 @@ -7,15 +7,15 @@ SCRIPT_START script_08010B68 _0807EF80 0x0000 _0807EF80 0x0007 _0807EF80 0x000a - StopScript + EndBlock script_08010B88: - StopScript - StartScript + EndBlock + BeginBlock _0807E564 JumpIfNot script_08010BAC CheckEntityInteractType JumpIfNot script_08010B88 - StopScript + EndBlock _0807E864 _0807EB74 Call sub_0806E2DC diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc index fdf4640c..c6b72220 100644 --- a/data/scripts/script_08010BB4.inc +++ b/data/scripts/script_08010BB4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08010BB4 - StartScript + BeginBlock _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0008 Call sub_0806E440 - StopScript + EndBlock script_08010BCA: CheckEntityInteractType JumpIfNot script_08010BCA @@ -50,7 +50,7 @@ script_08010BCA: WaitForSomething2 0x00000008 StartPlayerScript script_08011098 WaitForSomething2 0x00000400 - SetEntityPositionRelative 0x005001f8 + SetEntityPositionRelative 0x01f8, 0x0050 _0807F0B4 0x0007 CameraTargetEntity Wait 0x000a @@ -59,7 +59,7 @@ script_08010BCA: DoFade4 _0807E5F8 0x0002a800 WaitForSomething2 0x00055000 - SetEntityPositionRelative 0x007801f8 + SetEntityPositionRelative 0x01f8, 0x0078 Wait 0x003c _0807E5F8 0x00800000 WaitForSomething2 0x01000000 @@ -83,13 +83,13 @@ script_08010BCA: WaitForSomething2 0x00000008 TextboxNoOverlapFollowPos 0x103a, 0x000c _0807EA94 - SetEntityPositionRelative 0x01c001f8 + SetEntityPositionRelative 0x01f8, 0x01c0 _0807F0B4 0x0004 Wait 0x0078 _0807E5F8 0x00280000 WaitForSomething2 0x00500000 _0807E5F8 0x00000100 - SetEntityPositionRelative 0x022001f8 + SetEntityPositionRelative 0x01f8, 0x0220 SetEntityNonPlanarMovement 0x0100 _0807EDD4 0x01f8, 0x0098 Wait 0x003c @@ -117,7 +117,7 @@ script_08010BCA: WaitForSomething2 0x00050000 TextboxNoOverlapFollowPos 0x1044, 0x0000 _0807EA94 - SetEntityPositionRelative 0x009801f8 + SetEntityPositionRelative 0x01f8, 0x0098 SoundReq0x80100000 Wait 0x003c SoundReq2 0x002f diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/script_08010E5A.inc index ced5503b..8785e391 100644 --- a/data/scripts/script_08010E5A.inc +++ b/data/scripts/script_08010E5A.inc @@ -31,7 +31,7 @@ SCRIPT_START script_08010E5A CallWithArg sub_0807F244, 0x0000000d CallWithArg sub_0807F29C, 0x080049f6 _0807F0B4 0x0001 - SetEntityPositionRelative 0x006801f8 + SetEntityPositionRelative 0x01f8, 0x0068 _0807E5F8 0x00000004 Wait 0x001e _0807E5F8 0x00000040 diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc index 59a442f0..39454d09 100644 --- a/data/scripts/script_08010F84.inc +++ b/data/scripts/script_08010F84.inc @@ -34,7 +34,7 @@ SCRIPT_START script_08010F84 WaitForSomething2 0x00000200 TextboxNoOverlapFollowPos 0x1049, 0x0000 _0807EA94 - SetEntityPositionRelative 0x009801f8 + SetEntityPositionRelative 0x01f8, 0x0098 Wait 0x0078 _0807E5F8 0x00000100 WaitForSomething2 0x00000200 diff --git a/data/scripts/script_08011074.inc b/data/scripts/script_08011074.inc index 65a2a6f0..9b71ddce 100644 --- a/data/scripts/script_08011074.inc +++ b/data/scripts/script_08011074.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08011074 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock _0807EDD4 0x01e8, 0x0050 _0807EB44 0x0000 _0807EF80 0x0000 diff --git a/data/scripts/script_08011098.inc b/data/scripts/script_08011098.inc index 2a7af781..99edfb68 100644 --- a/data/scripts/script_08011098.inc +++ b/data/scripts/script_08011098.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08011098 - SetEntityPositionRelative 0x005801a8 + SetEntityPositionRelative 0x01a8, 0x0058 _0807EB44 0x0004 _0807EF80 0x0000 _0807E5F8 0x00000400 _0807E610 0x00000002 - StopScript + EndBlock Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080110BC.inc b/data/scripts/script_080110BC.inc index 1c93b869..631f5ca5 100644 --- a/data/scripts/script_080110BC.inc +++ b/data/scripts/script_080110BC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080110BC - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0040 - StopScript + EndBlock SetEntityNonPlanarMovement 0x0200 _0807EF80 0x0001 _0807EDD4 0x01d8, 0x0068 diff --git a/data/scripts/script_080110E8.inc b/data/scripts/script_080110E8.inc index 16dc59f0..a8e836b4 100644 --- a/data/scripts/script_080110E8.inc +++ b/data/scripts/script_080110E8.inc @@ -6,10 +6,10 @@ SCRIPT_START script_080110E8 Call sub_0807F36C SetEntityNonPlanarMovement 0x0400 _0807ECF4 0x0008 - StartScript + BeginBlock Call sub_0807F1E8 _0807EF80 0x0011 - StopScript + EndBlock Call sub_0807F2D4 WaitForSomething 0x80000000 Call sub_080791BC diff --git a/data/scripts/script_08011128.inc b/data/scripts/script_08011128.inc index 5427f0d9..a643786f 100644 --- a/data/scripts/script_08011128.inc +++ b/data/scripts/script_08011128.inc @@ -1,15 +1,15 @@ SCRIPT_START script_08011128 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock script_08011134: CheckPlayerInRegion 0x01f8, 0x0048, 0x1040 JumpIfNot script_08011134 LoadRoomEntityList gUnk_080F06B0 _0807EF80 0x000b WaitForSomething2 0x00000004 - SetEntityPositionRelative 0x005801b8 + SetEntityPositionRelative 0x01b8, 0x0058 _0807EB44 0x0004 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_080111CC.inc b/data/scripts/script_080111CC.inc index 1abef76f..50541810 100644 --- a/data/scripts/script_080111CC.inc +++ b/data/scripts/script_080111CC.inc @@ -1,9 +1,9 @@ SCRIPT_START script_080111CC - StartScript + BeginBlock _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 Call sub_08066D04 - StopScript + EndBlock Call sub_0807F338 WaitForSomething2 0x00000010 Call sub_08066D14 @@ -12,7 +12,7 @@ SCRIPT_START script_080111CC script_080111F6: Call sub_0807F8BC JumpIf script_08011206 - SetEntityPositionRelative 0x00b801f8 + SetEntityPositionRelative 0x01f8, 0x00b8 script_08011206: _0807EF80 0x0007 _0807EF80 0x0001 diff --git a/data/scripts/script_080112C4.inc b/data/scripts/script_080112C4.inc index fe2bc3f8..2e729ab4 100644 --- a/data/scripts/script_080112C4.inc +++ b/data/scripts/script_080112C4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080112C4 - StartScript + BeginBlock _0807EF80 0x0008 SetEntityNonPlanarMovement 0x0100 Call sub_08095244 Call sub_0807F338 - StopScript + EndBlock WaitForSomething 0x0002a800 _0807EF80 0x0007 _0807E930 0x0006 diff --git a/data/scripts/script_080115D0.inc b/data/scripts/script_080115D0.inc index 17db073e..d28dc323 100644 --- a/data/scripts/script_080115D0.inc +++ b/data/scripts/script_080115D0.inc @@ -1,9 +1,9 @@ SCRIPT_START script_080115D0 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0002 _0807E930 0x0001 - StopScript + EndBlock WaitForSomething2 0x00080000 _0807E930 0x0005 SoundReq 0x011c diff --git a/data/scripts/script_08011608.inc b/data/scripts/script_08011608.inc index 7c1f94fe..ce79cf08 100644 --- a/data/scripts/script_08011608.inc +++ b/data/scripts/script_08011608.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08011608 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0006 _0807E930 0x0003 - StopScript + EndBlock WaitForSomething2 0x00200000 _0807E930 0x0007 SoundReq 0x011c diff --git a/data/scripts/script_08011640.inc b/data/scripts/script_08011640.inc index 6a94cb85..504dd3c9 100644 --- a/data/scripts/script_08011640.inc +++ b/data/scripts/script_08011640.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08011640 - StartScript + BeginBlock _0807EF80 0x0008 _0807EB44 0x0004 SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock Call sub_0807F338 WaitForSomething2 0x00000040 _0807EF80 0x0007 diff --git a/data/scripts/script_080116A8.inc b/data/scripts/script_080116A8.inc index 034deb1b..dbfb12e9 100644 --- a/data/scripts/script_080116A8.inc +++ b/data/scripts/script_080116A8.inc @@ -1,8 +1,8 @@ SCRIPT_START script_080116A8 - StartScript + BeginBlock _0807EB44 0x0000 SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock Call sub_0807F338 WaitForSomething2 0x00000100 _0807EF80 0x0001 diff --git a/data/scripts/script_0801183C.inc b/data/scripts/script_0801183C.inc index a3ddcd66..4c95cf75 100644 --- a/data/scripts/script_0801183C.inc +++ b/data/scripts/script_0801183C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0801183C - StartScript + BeginBlock Call sub_08095330 - StopScript + EndBlock WaitForSomething2 0x00800000 _0807EF3C 0x0000, 0x0020 _0807E5F8 0x01000000 diff --git a/data/scripts/script_08011890.inc b/data/scripts/script_08011890.inc index aa846e13..626b893c 100644 --- a/data/scripts/script_08011890.inc +++ b/data/scripts/script_08011890.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08011890 - StartScript + BeginBlock _0807E930 0x0000 SetEntityNonPlanarMovement 0x0200 Call nullsub_527 Call sub_08094B80 - StopScript + EndBlock Wait 0x00f0 Call sub_08094B6C _0807EDD4 0x01f8, 0x0088 diff --git a/data/scripts/script_080118D4.inc b/data/scripts/script_080118D4.inc index 6c05e051..f4d24323 100644 --- a/data/scripts/script_080118D4.inc +++ b/data/scripts/script_080118D4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080118D4 - StartScript + BeginBlock _0807E930 0x0000 SetEntityNonPlanarMovement 0x0200 Call nullsub_527 Call sub_08094B80 - StopScript + EndBlock WaitForSomething2 0x08000000 Call sub_08094B6C _0807EDD4 0x01d8, 0x0078 diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc index d452f8c9..adfa48c9 100644 --- a/data/scripts/script_0801194C.inc +++ b/data/scripts/script_0801194C.inc @@ -1,19 +1,19 @@ SCRIPT_START script_0801194C - StartScript + BeginBlock _0807EB44 0x0002 Jump script_0801196A .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0006 Jump script_0801196A .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 script_0801196A: _0807E9D4 _0807EF80 0x000a CallWithArg sub_0807F3D8, 0x00000000 - StopScript + EndBlock script_0801197C: CheckEntityInteractType JumpIfNot script_0801197C @@ -31,32 +31,32 @@ script_080119A4: Wait 0x000f _0807E878 Jump script_0801197C - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0004 _0807EF80 0x000a CallWithArg sub_0807F3D8, 0x0000000c - StopScript + EndBlock script_080119C8: Wait 0x003c Call sub_0806407C Jump script_080119C8 .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0002 Jump script_080119F6 .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 Jump script_080119F6 .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0006 script_080119F6: _0807E9D4 _0807EF80 0x000a CallWithArg sub_0807F3D8, 0x00000000 - StopScript + EndBlock script_08011A08: CheckEntityInteractType JumpIfNot script_08011A08 @@ -68,12 +68,12 @@ script_08011A08: _0807E878 Jump script_08011A08 .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a CallWithArg sub_0807F3D8, 0x00000000 - StopScript + EndBlock script_08011A44: CheckEntityInteractType JumpIfNot script_08011A44 @@ -84,12 +84,12 @@ script_08011A44: _0807EA94 _0807E878 Jump script_08011A44 - StartScript + BeginBlock _0807EB44 0x0002 _0807E9D4 _0807EF80 0x000a CallWithArg sub_0807F3D8, 0x00000000 - StopScript + EndBlock script_08011A7C: CheckEntityInteractType JumpIfNot script_08011A7C @@ -103,12 +103,12 @@ script_08011A7C: _0807E878 Jump script_08011A7C .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a CallWithArg sub_0807F3D8, 0x00000000 - StopScript + EndBlock script_08011AC4: CheckEntityInteractType JumpIfNot script_08011AC4 diff --git a/data/scripts/script_08011B40.inc b/data/scripts/script_08011B40.inc index bc4f4c26..785af9f9 100644 --- a/data/scripts/script_08011B40.inc +++ b/data/scripts/script_08011B40.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08011B40 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock CheckGlobalFlag 0x0050 JumpIfNot script_08011B84 WaitForSomething2 0x00000004 @@ -48,9 +48,9 @@ script_08011BBC: Wait 0x003c Call sub_0806C224 Jump script_08011B9A - StartScript + BeginBlock _0807E888 - StopScript + EndBlock CallWithArg sub_0806C2A0, 0x00000001 WaitFor_2 Wait 0x003c diff --git a/data/scripts/script_08011C50.inc b/data/scripts/script_08011C50.inc index fb147eb5..3e32c45d 100644 --- a/data/scripts/script_08011C50.inc +++ b/data/scripts/script_08011C50.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08011C50 - StartScript + BeginBlock _0807E864 - StopScript + EndBlock Wait 0x003c CallWithArg sub_0806C2A0, 0x00000001 WaitFor_2 diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc index 3c70f88d..41e79e5b 100644 --- a/data/scripts/script_08011C7C.inc +++ b/data/scripts/script_08011C7C.inc @@ -1,18 +1,18 @@ SCRIPT_START script_08011C7C - StartScript + BeginBlock Call sub_08064828 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a CheckGlobalFlag 0x0047 JumpIf script_08011CC2 - StopScript + EndBlock script_08011C9A: - StopScript - StartScript + EndBlock + BeginBlock CheckEntityInteractType JumpIfNot script_08011C9A - StopScript + EndBlock _0807E864 _0807EB74 _0807EF80 0x0000 @@ -23,15 +23,15 @@ script_08011C9A: _0807EF80 0x0001 Jump script_08011C9A script_08011CC2: - StopScript - StartScript + EndBlock + BeginBlock CheckGlobalFlag 0x002c JumpIf script_08011C9A CheckGlobalFlag 0x002d JumpIf script_08011C9A CheckEntityInteractType JumpIfNot script_08011CC2 - StopScript + EndBlock _0807E864 _0807EB74 _0807EF80 0x0000 @@ -58,20 +58,20 @@ script_08011D0E: _0807EF80 0x0001 Jump script_08011D00 .short 0x0000 - StartScript + BeginBlock Call sub_08064928 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a CheckGlobalFlag 0x0047 JumpIf script_08011D6E - StopScript + EndBlock script_08011D46: - StopScript - StartScript + EndBlock + BeginBlock CheckEntityInteractType JumpIfNot script_08011D46 - StopScript + EndBlock _0807E864 _0807EB74 _0807EF80 0x0000 @@ -82,15 +82,15 @@ script_08011D46: _0807EF80 0x0001 Jump script_08011D46 script_08011D6E: - StopScript - StartScript + EndBlock + BeginBlock CheckGlobalFlag 0x002b JumpIf script_08011D46 CheckGlobalFlag 0x002d JumpIf script_08011D46 CheckEntityInteractType JumpIfNot script_08011D6E - StopScript + EndBlock _0807E864 _0807EB74 _0807EF80 0x0000 @@ -117,20 +117,20 @@ script_08011DBA: _0807EF80 0x0001 Jump script_08011DAC .short 0x0000 - StartScript + BeginBlock Call sub_08064A28 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a CheckGlobalFlag 0x0047 JumpIf script_08011E1A - StopScript + EndBlock script_08011DF2: - StopScript - StartScript + EndBlock + BeginBlock CheckEntityInteractType JumpIfNot script_08011DF2 - StopScript + EndBlock _0807E864 _0807EB74 _0807EF80 0x0000 @@ -141,15 +141,15 @@ script_08011DF2: _0807EF80 0x0001 Jump script_08011DF2 script_08011E1A: - StopScript - StartScript + EndBlock + BeginBlock CheckGlobalFlag 0x002b JumpIf script_08011DF2 CheckGlobalFlag 0x002c JumpIf script_08011DF2 CheckEntityInteractType JumpIfNot script_08011E1A - StopScript + EndBlock _0807E864 _0807EB74 _0807EF80 0x0000 @@ -176,22 +176,22 @@ script_08011E66: _0807EF80 0x0001 Jump script_08011E58 .short 0x0000 - StartScript + BeginBlock Call sub_08064828 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a - StopScript + EndBlock script_08011E96: - StopScript - StartScript + EndBlock + BeginBlock CheckGlobalFlag 0x002f JumpIf script_08011C9A CheckGlobalFlag 0x0030 JumpIf script_08011C9A CheckEntityInteractType JumpIfNot script_08011E96 - StopScript + EndBlock _0807E864 _0807EB74 _0807EF80 0x0000 @@ -224,22 +224,22 @@ script_08011EF4: _0807EB44 0x0004 _0807EF80 0x0001 Jump script_08011EE6 - StartScript + BeginBlock Call sub_08064928 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a - StopScript + EndBlock script_08011F22: - StopScript - StartScript + EndBlock + BeginBlock CheckGlobalFlag 0x002e JumpIf script_08011D46 CheckGlobalFlag 0x0030 JumpIf script_08011D46 CheckEntityInteractType JumpIfNot script_08011F22 - StopScript + EndBlock _0807E864 _0807EB74 _0807EF80 0x0000 @@ -272,22 +272,22 @@ script_08011F80: _0807EB44 0x0004 _0807EF80 0x0001 Jump script_08011F72 - StartScript + BeginBlock Call sub_08064A28 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a - StopScript + EndBlock script_08011FAE: - StopScript - StartScript + EndBlock + BeginBlock CheckGlobalFlag 0x002e JumpIf script_08011DF2 CheckGlobalFlag 0x002f JumpIf script_08011DF2 CheckEntityInteractType JumpIfNot script_08011FAE - StopScript + EndBlock _0807E864 _0807EB74 _0807EF80 0x0000 @@ -320,12 +320,12 @@ script_0801200C: _0807EB44 0x0004 _0807EF80 0x0001 Jump script_08011FFE - StartScript + BeginBlock Call sub_08064828 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a - StopScript + EndBlock script_0801203A: CheckEntityInteractType JumpIfNot script_0801203A @@ -366,12 +366,12 @@ script_0801209E: _0807EF80 0x0001 Jump script_0801203A .short 0x0000 - StartScript + BeginBlock Call sub_08064928 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a - StopScript + EndBlock script_080120C6: CheckEntityInteractType JumpIfNot script_080120C6 @@ -412,12 +412,12 @@ script_0801212A: _0807EF80 0x0001 Jump script_080120C6 .short 0x0000 - StartScript + BeginBlock Call sub_08064A28 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a - StopScript + EndBlock script_08012152: CheckEntityInteractType JumpIfNot script_08012152 @@ -458,12 +458,12 @@ script_080121B6: _0807EF80 0x0001 Jump script_08012152 .short 0x0000 - StartScript + BeginBlock Call sub_08064828 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a - StopScript + EndBlock script_080121DE: CheckEntityInteractType JumpIfNot script_080121DE @@ -476,12 +476,12 @@ script_080121DE: _0807EB44 0x0004 _0807EF80 0x0001 Jump script_080121DE - StartScript + BeginBlock Call sub_08064928 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a - StopScript + EndBlock script_08012216: CheckEntityInteractType JumpIfNot script_08012216 @@ -494,12 +494,12 @@ script_08012216: _0807EB44 0x0004 _0807EF80 0x0001 Jump script_08012216 - StartScript + BeginBlock Call sub_08064A28 _0807EB44 0x0004 _0807EF80 0x0001 _0807EF80 0x000a - StopScript + EndBlock script_0801224E: CheckEntityInteractType JumpIfNot script_0801224E @@ -512,15 +512,15 @@ script_0801224E: _0807EB44 0x0004 _0807EF80 0x0001 Jump script_0801224E - StartScript + BeginBlock _0807EB44 0x0004 Call sub_08061FD8 _0807E9D4 _0807EF80 0x000a - StopScript + EndBlock script_08012284: - StopScript - StartScript + EndBlock + BeginBlock CheckGlobalFlag 0x001e JumpIfNot script_08012298 CheckInventory1 0x0015 @@ -528,7 +528,7 @@ script_08012284: script_08012298: CheckEntityInteractType JumpIfNot script_08012284 - StopScript + EndBlock _0807EB74 _0807E864 Call sub_08061FD8 @@ -538,8 +538,8 @@ script_08012298: SetGlobalFlag 0x001e Jump script_08012284 script_080122BA: - StopScript - StartScript + EndBlock + BeginBlock CheckRoomFlag 0x0000 JumpIfNot script_080122CE CheckRoomFlag 0x0001 @@ -547,7 +547,7 @@ script_080122BA: script_080122CE: CheckEntityInteractType JumpIfNot script_080122BA - StopScript + EndBlock _0807EB74 _0807E864 Call sub_08061FD8 @@ -556,7 +556,7 @@ script_080122CE: _0807E878 Jump script_080122BA script_080122EC: - StopScript + EndBlock _0807EB74 _0807E864 Call sub_08061FD8 diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc index c434f93b..db355ae8 100644 --- a/data/scripts/script_0801232C.inc +++ b/data/scripts/script_0801232C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0801232C - StartScript + BeginBlock _0807EB74 _0807E9D4 _0807EF80 0x000a - StopScript + EndBlock script_08012338: CheckEntityInteractType JumpIfNot script_08012338 @@ -19,21 +19,21 @@ script_08012338: script_0801235A: _0807E878 Jump script_08012338 - StartScript + BeginBlock _0807EF80 0x0008 - StopScript + EndBlock script_08012368: CheckLocalFlag 0x0004 JumpIfNot script_08012368 Call sub_0807DF28 _0807E864 SoundReq0x80100000 - StartScript + BeginBlock _0807E778 0x0004 _0807E788 0x00007fff DoFade5 _0807E858 0x0080 - StopScript + EndBlock WaitFor_2 SoundReq2 0x002c _0807EB28 0x1401 @@ -52,12 +52,12 @@ script_08012368: SoundReq0x80100000 SetEntity0x20 0x00010000 Wait 0x003c - StartScript + BeginBlock _0807E778 0x0004 _0807E788 0xffffffff DoFade4 _0807E858 0x0080 - StopScript + EndBlock WaitFor_2 SoundReq2 0xffff _0807EB28 0x1403 diff --git a/data/scripts/script_08012410.inc b/data/scripts/script_08012410.inc index ce244ad3..867eacda 100644 --- a/data/scripts/script_08012410.inc +++ b/data/scripts/script_08012410.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012410 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock _0807EF80 0x0004 Wait 0x003c _0807E5F8 0x00000001 diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc index fc868d72..eb4dfa12 100644 --- a/data/scripts/script_08012430.inc +++ b/data/scripts/script_08012430.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08012430 - StartScript + BeginBlock _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0000 - StopScript + EndBlock script_08012440: CheckEntityInteractType JumpIfNot script_08012440 @@ -24,9 +24,9 @@ script_08012474: _0807E930 0x0000 Jump script_08012440 .short 0x0000 - StartScript + BeginBlock Call sub_08054564 - StopScript + EndBlock script_0801248A: CheckPlayerInRegion 0x0208, 0x02c8, 0x4020 JumpIfNot script_0801248A @@ -45,7 +45,7 @@ script_0801248A: Call sub_080791BC LoadRoomEntityList gUnk_080F4D70 Call DeleteAllEnemies - SetEntityPositionRelative 0x01680388 + SetEntityPositionRelative 0x0388, 0x0168 Call sub_0807F844 _0807E778 0x0004 _0807E800 0x00000000 @@ -85,7 +85,7 @@ script_08012566: SoundReq0x80100000 StartPlayerScript script_08012AC8 WaitForSomething2 0x00000001 - SetEntityPositionRelative 0x01680388 + SetEntityPositionRelative 0x0388, 0x0168 _0807F0B4 0x0001 CameraTargetEntity Wait 0x005a diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc index 58b2de20..775b6340 100644 --- a/data/scripts/script_080126FC.inc +++ b/data/scripts/script_080126FC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_080126FC - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0040 _0807EF80 0x0007 - StopScript + EndBlock _0807E930 0x0020 WaitForSomething2 0x00000004 _0807E930 0x0022 @@ -54,13 +54,13 @@ SCRIPT_START script_080126FC _0807E9D4 _0807E5F8 0x00000008 script_080127F2: - StopScript - StartScript + EndBlock + BeginBlock CheckRoomFlag 0x0000 JumpIf script_08012824 CheckEntityInteractType JumpIfNot script_080127F2 - StopScript + EndBlock _0807E864 Call sub_0806D944 _0807E930 0x0010 @@ -74,7 +74,7 @@ script_08012824: _0807E9DC CallWithArg sub_0807F5B0, 0x0000003c Call sub_080791D0 - StopScript + EndBlock _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807EF80 0x000b @@ -119,8 +119,8 @@ script_08012824: _0807E5F8 0x00000008 WaitForSomething2 0x00000004 script_08012904: - StopScript - StartScript + EndBlock + BeginBlock Call sub_0806D944 CheckEntityInteractType JumpIf script_08012920 @@ -130,14 +130,14 @@ script_08012904: script_08012920: _0807E864 _0807E930 0x0010 - StopScript + EndBlock TextboxNoOverlapFollowPos 0x1115, 0x000c _0807EA94 _0807E930 0x0018 _0807E878 Jump script_08012904 script_0801293A: - StopScript + EndBlock _0807E864 Call sub_0807F9A4 Call sub_0807DF28 @@ -155,8 +155,8 @@ script_0801293A: _0807E5F8 0x00000008 WaitForSomething2 0x00000004 script_08012984: - StopScript - StartScript + EndBlock + BeginBlock Call sub_0806D944 CheckEntityInteractType JumpIf script_080129A0 @@ -166,14 +166,14 @@ script_08012984: script_080129A0: _0807E864 _0807E930 0x0010 - StopScript + EndBlock TextboxNoOverlapFollowPos 0x1115, 0x000c _0807EA94 _0807E930 0x0018 _0807E878 Jump script_08012984 script_080129BA: - StopScript + EndBlock _0807E864 Call sub_0807F9A4 Call sub_0807DF28 @@ -192,8 +192,8 @@ script_080129BA: _0807E5F8 0x00000008 WaitForSomething2 0x00000004 script_08012A08: - StopScript - StartScript + EndBlock + BeginBlock Call sub_0806D944 CheckEntityInteractType JumpIf script_08012A24 @@ -203,14 +203,14 @@ script_08012A08: script_08012A24: _0807E864 _0807E930 0x0010 - StopScript + EndBlock TextboxNoOverlapFollowPos 0x1115, 0x000c _0807EA94 _0807E930 0x0018 _0807E878 Jump script_08012A08 script_08012A3E: - StopScript + EndBlock _0807E864 Call sub_0807F9A4 Call sub_0807DF28 @@ -233,10 +233,10 @@ script_08012A74: _0807EF80 0x0008 Wait 0x0078 SoundReq2 0x000e - StartScript + BeginBlock _0807E8E4_2 _0807EB28 0x1112 - StopScript + EndBlock _0807EA94 _0807E5F8 0x00000008 _0807EF80 0x0006 diff --git a/data/scripts/script_08012AB0.inc b/data/scripts/script_08012AB0.inc index 8cc59657..bb737cda 100644 --- a/data/scripts/script_08012AB0.inc +++ b/data/scripts/script_08012AB0.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08012AB0 - StopScript + EndBlock script_08012AB2: _0807EB44 0x0002 Wait 0x000a diff --git a/data/scripts/script_08012AC8.inc b/data/scripts/script_08012AC8.inc index b50a637d..cefbed66 100644 --- a/data/scripts/script_08012AC8.inc +++ b/data/scripts/script_08012AC8.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012AC8 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock _0807EB44 0x0000 _0807EF80 0x0000 _0807EF80 0x0004 diff --git a/data/scripts/script_08012AF0.inc b/data/scripts/script_08012AF0.inc index 0b5cb168..eb7e88ac 100644 --- a/data/scripts/script_08012AF0.inc +++ b/data/scripts/script_08012AF0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012AF0 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EF80 0x0001 _0807EDD4 0x0388, 0x0180 _0807EB44 0x0000 diff --git a/data/scripts/script_08012B24.inc b/data/scripts/script_08012B24.inc index 0bdf249c..66f6d97c 100644 --- a/data/scripts/script_08012B24.inc +++ b/data/scripts/script_08012B24.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012B24 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0004 - StopScript + EndBlock _0807EF80 0x0001 _0807ECC4 0x0008 _0807E5F8 0x00000002 diff --git a/data/scripts/script_08012B50.inc b/data/scripts/script_08012B50.inc index 32a9f788..1cc013d5 100644 --- a/data/scripts/script_08012B50.inc +++ b/data/scripts/script_08012B50.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012B50 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0000 - StopScript + EndBlock _0807EF80 0x0001 _0807EC64 0x0008 _0807E5F8 0x00000002 diff --git a/data/scripts/script_08012B7C.inc b/data/scripts/script_08012B7C.inc index df1d2ec1..a7ce8981 100644 --- a/data/scripts/script_08012B7C.inc +++ b/data/scripts/script_08012B7C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012B7C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 _0807EB44 0x0002 - StopScript + EndBlock _0807EF80 0x0001 _0807EC94 0x0008 _0807E5F8 0x00000002 diff --git a/data/scripts/script_08012BA8.inc b/data/scripts/script_08012BA8.inc index e87df7ea..3aed7170 100644 --- a/data/scripts/script_08012BA8.inc +++ b/data/scripts/script_08012BA8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08012BA8 - StartScript + BeginBlock _0807EB44 0x0002 _0807EF80 0x0007 _0807E930 0x0001 - StopScript + EndBlock WaitForSomething2 0x00000040 _0807E930 0x0005 Wait 0x001e diff --git a/data/scripts/script_08012BF8.inc b/data/scripts/script_08012BF8.inc index 643c7cdf..775c193c 100644 --- a/data/scripts/script_08012BF8.inc +++ b/data/scripts/script_08012BF8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08012BF8 - StartScript + BeginBlock _0807EB44 0x0006 _0807EF80 0x0007 _0807E930 0x0003 - StopScript + EndBlock WaitForSomething2 0x00000010 _0807E930 0x0007 Wait 0x001e diff --git a/data/scripts/script_08012C48.inc b/data/scripts/script_08012C48.inc index 5d7ab8c6..de175629 100644 --- a/data/scripts/script_08012C48.inc +++ b/data/scripts/script_08012C48.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012C48 - StartScript + BeginBlock _0807EF80 0x0007 SetEntityNonPlanarMovement 0x0280 - StopScript + EndBlock _0807EDD4 0x0388, 0x0168 _0807E5F8 0x00000100 _0807EF80 0x0006 diff --git a/data/scripts/script_08012C68.inc b/data/scripts/script_08012C68.inc index de28d340..9be0127d 100644 --- a/data/scripts/script_08012C68.inc +++ b/data/scripts/script_08012C68.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08012C68 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x0008 _0807E914 0x00000000 Call sub_0806DA04 - StopScript + EndBlock script_08012C7E: CheckEntityInteractType JumpIfNot script_08012C7E @@ -19,13 +19,13 @@ script_08012C98: CheckGlobalFlag 0x0014 JumpIfNot script_08012C98 script_08012CA0: - StopScript - StartScript + EndBlock + BeginBlock CheckPlayerInRegion 0x0398, 0x03b0, 0x2040 JumpIfNot script_08012CA0 _0807E564 JumpIf script_08012CD2 - StopScript + EndBlock _0807E864 Call sub_0807DF28 _0807EB28 0x2202 diff --git a/data/scripts/script_08012CD8.inc b/data/scripts/script_08012CD8.inc index 8d27c8c6..754bf33d 100644 --- a/data/scripts/script_08012CD8.inc +++ b/data/scripts/script_08012CD8.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012CD8 script_08012CD8: - StopScript - StartScript + EndBlock + BeginBlock _0807E564 JumpIfNot script_08012CD8 CheckPlayerInRegion 0x0380, 0x03b0, 0x4040 @@ -10,7 +10,7 @@ script_08012CD8: JumpIf script_08012CD8 _0807E864 Call sub_0807DF28 - StopScript + EndBlock _0807EB28 0x2203 _0807EA94 SetLocalFlag 0x003e diff --git a/data/scripts/script_08012D18.inc b/data/scripts/script_08012D18.inc index d3bcc14c..e0d086e1 100644 --- a/data/scripts/script_08012D18.inc +++ b/data/scripts/script_08012D18.inc @@ -1,14 +1,14 @@ SCRIPT_START script_08012D18 script_08012D18: - StopScript - StartScript + EndBlock + BeginBlock CheckGlobalFlag 0x0014 JumpIfNot script_08012D18 CheckLocalFlagByOffset 0x0200, 0x008d JumpIf script_08012D68 CheckPlayerInRegion 0x0000, 0x01a8, 0x2010 JumpIfNot script_08012D18 - StopScript + EndBlock _0807E864 Call sub_0807F9A4 Call sub_0807DF28 diff --git a/data/scripts/script_08012DB0.inc b/data/scripts/script_08012DB0.inc index 11d4783c..d4247f15 100644 --- a/data/scripts/script_08012DB0.inc +++ b/data/scripts/script_08012DB0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012DB0 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EDD4 0x0088, 0x0068 _0807EB44 0x0000 _0807EF80 0x0000 diff --git a/data/scripts/script_08012DD8.inc b/data/scripts/script_08012DD8.inc index 44f9936e..02f50996 100644 --- a/data/scripts/script_08012DD8.inc +++ b/data/scripts/script_08012DD8.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08012DD8 - StartScript - StopScript + BeginBlock + EndBlock _0807E888 Wait 0x0018 _0807E864 diff --git a/data/scripts/script_08012DF8.inc b/data/scripts/script_08012DF8.inc index 801db2c3..9a36403b 100644 --- a/data/scripts/script_08012DF8.inc +++ b/data/scripts/script_08012DF8.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012DF8 - StartScript + BeginBlock _0807EB44 0x0000 SetEntityNonPlanarMovement 0x0140 - StopScript + EndBlock _0807EDD4 0x00b8, 0x0094 Wait 0x0008 _0807EF80 0x0000 diff --git a/data/scripts/script_08012E20.inc b/data/scripts/script_08012E20.inc index 5c9488c8..3bae5d40 100644 --- a/data/scripts/script_08012E20.inc +++ b/data/scripts/script_08012E20.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012E20 - StartScript + BeginBlock _0807E864 - StopScript + EndBlock Wait 0x0078 _0807E908 0x0004 StartPlayerScript script_08012E44 diff --git a/data/scripts/script_08012E44.inc b/data/scripts/script_08012E44.inc index 1ccebdf6..3f2b72df 100644 --- a/data/scripts/script_08012E44.inc +++ b/data/scripts/script_08012E44.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012E44 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0140 - StopScript + EndBlock Wait 0x003c _0807EB44 0x0004 Wait 0x000f diff --git a/data/scripts/script_08012E88.inc b/data/scripts/script_08012E88.inc index a6b10e48..f1168887 100644 --- a/data/scripts/script_08012E88.inc +++ b/data/scripts/script_08012E88.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08012E88 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a Call sub_0806B60C - StopScript + EndBlock script_08012E9E: CheckEntityInteractType JumpIfNot script_08012E9E @@ -17,12 +17,12 @@ script_08012E9E: _0807EF80 0x0000 Jump script_08012E9E .short 0x0000 - StartScript + BeginBlock _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000008 _0807EF80 0x000a Call sub_0806B60C - StopScript + EndBlock script_08012EDC: CheckEntityInteractType JumpIfNot script_08012EDC diff --git a/data/scripts/script_08012F0C.inc b/data/scripts/script_08012F0C.inc index 47b3a5cc..1b76edf7 100644 --- a/data/scripts/script_08012F0C.inc +++ b/data/scripts/script_08012F0C.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08012F0C - StartScript + BeginBlock CallWithArg sub_0806A93C, 0x12345678 _0807EB44 0x0004 _0807E930 0x0002 @@ -9,7 +9,7 @@ SCRIPT_START script_08012F0C JumpIf script_08012FD2 CheckGlobalFlag 0x001e JumpIf script_08012F86 - StopScript + EndBlock CheckLocalFlag 0x0062 JumpIfNot script_08012F48 Call sub_0806A9B0 diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc index 4b4ddb49..f97acf88 100644 --- a/data/scripts/script_08012F86.inc +++ b/data/scripts/script_08012F86.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08012F86 script_08012F86: - StartScript + BeginBlock CheckLocalFlag 0x0060 JumpIf script_08012FD2 _0807E864 @@ -8,7 +8,7 @@ script_08012F86: StartPlayerScript script_080130E4 SetLocalFlag 0x0060 ClearLocalFlag 0x0061 - StopScript + EndBlock WaitForSomething2 0x00000004 _0807E908 0x0004 Call sub_0806A958 @@ -18,13 +18,13 @@ script_08012F86: SetLocalFlag 0x0062 Jump script_08012FFA script_08012FD2: - StartScript + BeginBlock _0807E930 0x000d _0807E908 0x0005 SetLocalFlag 0x0062 CallWithArg sub_0807F93C, 0x0000f2f4 Call sub_0806AA10 - StopScript + EndBlock CheckInventory1 0x0038 JumpIf script_08013006 script_08012FFA: @@ -34,10 +34,10 @@ script_08012FFA: Jump script_08012FFA script_08013006: _0807E944 - StartScript + BeginBlock _0807E864 Call sub_0807DF28 - StopScript + EndBlock SoundReq 0x00cd _0807F088 0x0038 WaitPlayerAction8 @@ -88,7 +88,7 @@ script_080130B6: JumpIfNot script_080130C4 Call sub_0806A9B0 script_080130C4: - StopScript + EndBlock script_080130C6: Call sub_0806A96C JumpIfNot script_080130C6 diff --git a/data/scripts/script_080130E4.inc b/data/scripts/script_080130E4.inc index 434cfb38..fed8e431 100644 --- a/data/scripts/script_080130E4.inc +++ b/data/scripts/script_080130E4.inc @@ -1,8 +1,8 @@ SCRIPT_START script_080130E4 - StartScript + BeginBlock _0807EB44 0x0006 SetEntityNonPlanarMovement 0x0140 - StopScript + EndBlock _0807EDD4 0x00a8, 0x0060 Wait 0x0008 _0807EF80 0x0000 diff --git a/data/scripts/script_08013114.inc b/data/scripts/script_08013114.inc index 1b916d14..dd53dbc3 100644 --- a/data/scripts/script_08013114.inc +++ b/data/scripts/script_08013114.inc @@ -1,20 +1,20 @@ SCRIPT_START script_08013114 - StartScript + BeginBlock _0807E9D4 _0807EF80 0x000a _0807EF80 0x0012 Call sub_0807F348 - StopScript + EndBlock script_08013128: - StopScript - StartScript + EndBlock + BeginBlock CheckEntityInteractType JumpIf script_0801313C Call sub_0806AEE4 Jump script_08013128 script_0801313C: _0807E864 - StopScript + EndBlock _0807EB74 Call sub_0806AED8 CallWithArg sub_0806AA50, 0x00000000 @@ -31,9 +31,9 @@ script_08013176: Call sub_0807F420 _0807E878 Jump script_08013128 - StartScript + BeginBlock CheckLocalFlag 0x0062 JumpIfNot script_0801319A _0807EF80 0x0006 - StopScript + EndBlock SCRIPT_END diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc index 6e61a26f..b3e2a28c 100644 --- a/data/scripts/script_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0801319A script_0801319A: - StopScript - StartScript + EndBlock + BeginBlock CameraTargetEntity MoveEntityToPlayer Call sub_0806AB74 diff --git a/data/scripts/script_080132E4.inc b/data/scripts/script_080132E4.inc index 8d723657..d76346d9 100644 --- a/data/scripts/script_080132E4.inc +++ b/data/scripts/script_080132E4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080132E4 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock _0807EF80 0x0001 _0807EDD4 0x0098, 0x0058 _0807EB44 0x0000 diff --git a/data/scripts/script_0801330C.inc b/data/scripts/script_0801330C.inc index 6d58d535..e9c28cf6 100644 --- a/data/scripts/script_0801330C.inc +++ b/data/scripts/script_0801330C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0801330C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock _0807EF80 0x0001 _0807EC64 0x0020 _0807EF80 0x0000 diff --git a/data/scripts/script_08013330.inc b/data/scripts/script_08013330.inc index 74b1c20f..082f3afb 100644 --- a/data/scripts/script_08013330.inc +++ b/data/scripts/script_08013330.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013330 - StartScript + BeginBlock _0807EB44 0x0000 - SetEntityPositionRelative 0x00700098 - StopScript + SetEntityPositionRelative 0x0098, 0x0070 + EndBlock _0807E5F8 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0801334C.inc b/data/scripts/script_0801334C.inc index 5d92b476..c525ece7 100644 --- a/data/scripts/script_0801334C.inc +++ b/data/scripts/script_0801334C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0801334C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 _0807EF80 0x000d - StopScript + EndBlock _0807EF80 0x0001 _0807ECC4 0x0020 _0807EF80 0x0000 diff --git a/data/scripts/script_080133C4.inc b/data/scripts/script_080133C4.inc index b4dad1da..b1c6656a 100644 --- a/data/scripts/script_080133C4.inc +++ b/data/scripts/script_080133C4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080133C4 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0007 _0807EF80 0x000b Call sub_0807F338 - StopScript + EndBlock WaitForSomething2 0x00000008 Call sub_08061F94 Wait 0x000a diff --git a/data/scripts/script_080133F8.inc b/data/scripts/script_080133F8.inc index b863f4fa..ca760b2d 100644 --- a/data/scripts/script_080133F8.inc +++ b/data/scripts/script_080133F8.inc @@ -1,12 +1,12 @@ SCRIPT_START script_080133F8 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0008 _0807EF80 0x000b Call sub_0807F338 - StopScript + EndBlock WaitForSomething2 0x00000020 - SetEntityPositionRelative 0x00480098 + SetEntityPositionRelative 0x0098, 0x0048 Call sub_08066C94 Wait 0x00e9 _0807EF80 0x0007 diff --git a/data/scripts/script_08013494.inc b/data/scripts/script_08013494.inc index f8b3499b..043ebc9a 100644 --- a/data/scripts/script_08013494.inc +++ b/data/scripts/script_08013494.inc @@ -1,18 +1,18 @@ SCRIPT_START script_08013494 - StartScript + BeginBlock _0807E930 0x0000 SetEntityNonPlanarMovement 0x0200 Call nullsub_527 Call sub_08094B80 - StopScript + EndBlock Wait 0x005a Call sub_08094B6C _0807EDD4 0x0098, 0x0080 - StartScript + BeginBlock Call sub_08094B80 SoundReq 0x01cc Call sub_0807F36C _0807E5F8 0x00000080 - StopScript + EndBlock _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc index 1a121f7a..38000013 100644 --- a/data/scripts/script_080134DC.inc +++ b/data/scripts/script_080134DC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_080134DC - StartScript + BeginBlock _0807EF80 0x0008 - StopScript - StartScript + EndBlock + BeginBlock Call sub_0807F92C CallWithArg sub_0806DA04, 0x00000003 - StopScript + EndBlock script_080134F8: CheckEntityInteractType JumpIfNot script_080134F8 @@ -16,23 +16,23 @@ script_080134F8: CallWithArg sub_08095A1C, 0x08013f04 SoundReq 0x01cd Wait 0x005a - StartScript + BeginBlock SoundReq 0x01ce CallWithArg sub_08095D54, 0x08013e04 CallWithArg sub_08095D54, 0x08013e28 - StopScript + EndBlock WaitForSomething2 0x18000000 - StartScript + BeginBlock SoundReq 0x01cf CallWithArg sub_08095D8C, 0x08014054 CallWithArg sub_08095D8C, 0x08014074 - StopScript + EndBlock Wait 0x001e - StartScript + BeginBlock SoundReq 0x01d0 CallWithArg sub_08095D8C, 0x080140dc CallWithArg sub_08095D8C, 0x08014118 - StopScript + EndBlock Wait 0x003c CallWithArg sub_0805DDEC, 0x00000000 _0807E5F8 0x00000200 diff --git a/data/scripts/script_08013650.inc b/data/scripts/script_08013650.inc index ee3a03ea..9661f4f6 100644 --- a/data/scripts/script_08013650.inc +++ b/data/scripts/script_08013650.inc @@ -2,7 +2,7 @@ SCRIPT_START script_08013650 Call sub_0807F3F8 Wait 0x003c _0807F0B4 0x0007 - SetEntityPositionRelative 0x00a800e8 + SetEntityPositionRelative 0x00e8, 0x00a8 CameraTargetEntity Wait 0x003c _0807E5F8 0x00000004 diff --git a/data/scripts/script_080136B4.inc b/data/scripts/script_080136B4.inc index 45522e05..b4063e78 100644 --- a/data/scripts/script_080136B4.inc +++ b/data/scripts/script_080136B4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080136B4 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EDD4 0x00e8, 0x00a8 _0807EB44 0x0000 _0807EF80 0x0000 diff --git a/data/scripts/script_080136D8.inc b/data/scripts/script_080136D8.inc index a69e0b6e..33bbb792 100644 --- a/data/scripts/script_080136D8.inc +++ b/data/scripts/script_080136D8.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080136D8 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock Call sub_0807F584 JumpSwitch_4 script_080136F0, script_080136FA, script_08013704, script_080136FA script_080136F0: diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc index cf3426f9..9de5c1f6 100644 --- a/data/scripts/script_08013720.inc +++ b/data/scripts/script_08013720.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08013720 - StartScript + BeginBlock _0807EF80 0x0008 - StopScript - StartScript + EndBlock + BeginBlock Call sub_0807F92C CallWithArg sub_0806DA04, 0x00000003 - StopScript + EndBlock script_0801373C: CheckEntityInteractType JumpIfNot script_0801373C @@ -16,24 +16,24 @@ script_0801373C: CallWithArg sub_08095A1C, 0x08013f34 SoundReq 0x01cd Wait 0x005a - StartScript + BeginBlock SoundReq 0x01ce CallWithArg sub_08095D54, 0x08013e4c - StopScript + EndBlock WaitForSomething2 0x20000000 - StartScript + BeginBlock SoundReq 0x01cf CallWithArg sub_08095D8C, 0x08014054 CallWithArg sub_08095D8C, 0x08014074 CallWithArg sub_08095D8C, 0x08014094 - StopScript + EndBlock Wait 0x001e - StartScript + BeginBlock SoundReq 0x01d0 CallWithArg sub_08095D8C, 0x080140dc CallWithArg sub_08095D8C, 0x08014118 CallWithArg sub_08095D8C, 0x08014154 - StopScript + EndBlock Wait 0x003c CallWithArg sub_0805DDEC, 0x00000000 _0807E5F8 0x00000200 diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc index 065e960e..f3521f49 100644 --- a/data/scripts/script_080138B4.inc +++ b/data/scripts/script_080138B4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_080138B4 - StartScript + BeginBlock _0807EF80 0x0008 - StopScript - StartScript + EndBlock + BeginBlock Call sub_0807F92C CallWithArg sub_0806DA04, 0x00000003 - StopScript + EndBlock script_080138D0: CheckEntityInteractType JumpIfNot script_080138D0 @@ -16,26 +16,26 @@ script_080138D0: CallWithArg sub_08095A1C, 0x08013f64 SoundReq 0x01cd Wait 0x005a - StartScript + BeginBlock SoundReq 0x01ce CallWithArg sub_08095D54, 0x08013e70 - StopScript + EndBlock WaitForSomething2 0x40000000 - StartScript + BeginBlock SoundReq 0x01cf CallWithArg sub_08095D8C, 0x08014054 CallWithArg sub_08095D8C, 0x08014074 CallWithArg sub_08095D8C, 0x08014094 CallWithArg sub_08095D8C, 0x080140b8 - StopScript + EndBlock Wait 0x001e - StartScript + BeginBlock SoundReq 0x01d0 CallWithArg sub_08095D8C, 0x080140dc CallWithArg sub_08095D8C, 0x08014118 CallWithArg sub_08095D8C, 0x08014154 CallWithArg sub_08095D8C, 0x08014198 - StopScript + EndBlock Wait 0x003c CallWithArg sub_0805DDEC, 0x00000000 _0807E5F8 0x00000200 @@ -78,7 +78,7 @@ script_080138D0: _0807EA94 _0807E5F8 0x00040000 _0807F0B4 0x0002 - SetEntityPositionRelative 0x00d800e8 + SetEntityPositionRelative 0x00e8, 0x00d8 CameraTargetEntity Call sub_0806DC3C CallWithArg sub_0807F244, 0x00010001 diff --git a/data/scripts/script_08013AA6.inc b/data/scripts/script_08013AA6.inc index d078369c..7ff4f62e 100644 --- a/data/scripts/script_08013AA6.inc +++ b/data/scripts/script_08013AA6.inc @@ -7,7 +7,7 @@ SCRIPT_START script_08013AA6 _0807F0C8 0x0000, 0x0000 Wait 0x003c _0807F0B4 0x0004 - SetEntityPositionRelative 0x005000e8 + SetEntityPositionRelative 0x00e8, 0x0050 CameraTargetEntity Wait 0x003c LoadRoomEntityList gUnk_080F55D8 diff --git a/data/scripts/script_08013B18.inc b/data/scripts/script_08013B18.inc index 75643d49..528cee4f 100644 --- a/data/scripts/script_08013B18.inc +++ b/data/scripts/script_08013B18.inc @@ -1,16 +1,16 @@ SCRIPT_START script_08013B18 - StartScript + BeginBlock _0807EF80 0x0008 script_08013B1E: - StopScript - StartScript + EndBlock + BeginBlock CallWithArg sub_0807F6B4, 0x000001c8 JumpIfNot script_08013B1E CheckInventory1 0x0006 JumpIfNot script_08013B1E CheckLocalFlag 0x0078 JumpIf script_08013B1E - StopScript + EndBlock _0807E864 Call sub_0807F9A4 Call sub_0807DF28 diff --git a/data/scripts/script_08013BE8.inc b/data/scripts/script_08013BE8.inc index 3208a12e..032e80cf 100644 --- a/data/scripts/script_08013BE8.inc +++ b/data/scripts/script_08013BE8.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08013BE8 - StartScript + BeginBlock CheckLocalFlag 0x007a JumpIf script_08013C2A CheckInventory1 0x0003 @@ -10,7 +10,7 @@ SCRIPT_START script_08013BE8 JumpIfNot script_08013C98 CheckInventory1 0x0041 JumpIfNot script_08013C98 - StopScript + EndBlock _0807EF80 0x0008 WaitForSomething2 0x00000004 _0807E908 0x0002 @@ -20,21 +20,21 @@ script_08013C2A: CheckLocalFlag 0x007c JumpIf script_08013C98 script_08013C32: - StartScript + BeginBlock _0807EF80 0x0007 Call sub_0807F934 _0807EF80 0x000a CallWithArg sub_080962F8, 0x00000000 CallWithArg sub_0807F8E8, 0x00000004 - StopScript + EndBlock script_08013C58: - StopScript - StartScript + EndBlock + BeginBlock TestBit 0x00000008 JumpIf script_08013C92 CheckEntityInteractType JumpIfNot script_08013C58 - StopScript + EndBlock _0807E864 _0807EB74 CheckLocalFlag 0x007d @@ -49,7 +49,7 @@ script_08013C86: _0807E878 Jump script_08013C58 script_08013C92: - StopScript + EndBlock _0807E908 0x0004 script_08013C98: _0807EF80 0x0008 diff --git a/data/scripts/script_08013CA4.inc b/data/scripts/script_08013CA4.inc index e54c4494..5f0219a6 100644 --- a/data/scripts/script_08013CA4.inc +++ b/data/scripts/script_08013CA4.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08013CA4 - StopScript + EndBlock script_08013CA6: CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080 JumpIfNot script_08013CA6 @@ -9,7 +9,7 @@ script_08013CA6: Call sub_0807F3F8 Wait 0x003c _0807F0B4 0x0001 - SetEntityPositionRelative 0x013800e8 + SetEntityPositionRelative 0x00e8, 0x0138 CameraTargetEntity Call sub_0807F5C0 Wait 0x0078 diff --git a/data/scripts/script_08013D04.inc b/data/scripts/script_08013D04.inc index 5bc69e89..2d14d794 100644 --- a/data/scripts/script_08013D04.inc +++ b/data/scripts/script_08013D04.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013D04 - StartScript + BeginBlock Call sub_0807F92C _0807EF80 0x0008 CallWithArg sub_0806DA04, 0x00000004 - StopScript + EndBlock script_08013D1C: CheckEntityInteractType JumpIfNot script_08013D1C diff --git a/data/scripts/script_08013D44.inc b/data/scripts/script_08013D44.inc index e662df9c..e4ad6652 100644 --- a/data/scripts/script_08013D44.inc +++ b/data/scripts/script_08013D44.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013D44 - StartScript + BeginBlock Call sub_0807F92C _0807EF80 0x0008 CallWithArg sub_0806DA04, 0x00000004 - StopScript + EndBlock script_08013D5C: CheckEntityInteractType JumpIfNot script_08013D5C diff --git a/data/scripts/script_08013D84.inc b/data/scripts/script_08013D84.inc index f4d79746..e4b43a10 100644 --- a/data/scripts/script_08013D84.inc +++ b/data/scripts/script_08013D84.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013D84 - StartScript + BeginBlock Call sub_0807F92C _0807EF80 0x0008 CallWithArg sub_0806DA04, 0x00000004 - StopScript + EndBlock script_08013D9C: CheckEntityInteractType JumpIfNot script_08013D9C diff --git a/data/scripts/script_08013DC4.inc b/data/scripts/script_08013DC4.inc index ed233bf1..42e07201 100644 --- a/data/scripts/script_08013DC4.inc +++ b/data/scripts/script_08013DC4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013DC4 - StartScript + BeginBlock Call sub_0807F92C _0807EF80 0x0008 CallWithArg sub_0806DA04, 0x00000004 - StopScript + EndBlock script_08013DDC: CheckEntityInteractType JumpIfNot script_08013DDC diff --git a/data/scripts/script_08013E04.inc b/data/scripts/script_08013E04.inc index a5ab5e98..d401ba90 100644 --- a/data/scripts/script_08013E04.inc +++ b/data/scripts/script_08013E04.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013E04 - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0000 - StopScript + EndBlock SetEntityNonPlanarMovement 0x0080 _0807EDD4 0x00b0, 0x00f8 _0807E930 0x0001 diff --git a/data/scripts/script_08013E28.inc b/data/scripts/script_08013E28.inc index bf0f960f..b0477348 100644 --- a/data/scripts/script_08013E28.inc +++ b/data/scripts/script_08013E28.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013E28 - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0002 - StopScript + EndBlock SetEntityNonPlanarMovement 0x0080 _0807EDD4 0x0120, 0x00f8 _0807E930 0x0003 diff --git a/data/scripts/script_08013E4C.inc b/data/scripts/script_08013E4C.inc index 8b29d123..242f4f06 100644 --- a/data/scripts/script_08013E4C.inc +++ b/data/scripts/script_08013E4C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013E4C - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0004 - StopScript + EndBlock SetEntityNonPlanarMovement 0x0080 _0807EDD4 0x0120, 0x0168 _0807E930 0x0005 diff --git a/data/scripts/script_08013E70.inc b/data/scripts/script_08013E70.inc index 1f2dee86..4fd09419 100644 --- a/data/scripts/script_08013E70.inc +++ b/data/scripts/script_08013E70.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013E70 - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0006 - StopScript + EndBlock SetEntityNonPlanarMovement 0x0080 _0807EDD4 0x00b0, 0x0168 _0807E930 0x0007 diff --git a/data/scripts/script_08013E94.inc b/data/scripts/script_08013E94.inc index bbaeb0af..e6bb7c0b 100644 --- a/data/scripts/script_08013E94.inc +++ b/data/scripts/script_08013E94.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013E94 - StartScript + BeginBlock _0807EF80 0x0007 Call sub_0807F180 - SetEntityPositionRelative 0x00f800b0 + SetEntityPositionRelative 0x00b0, 0x00f8 _0807E930 0x0001 - StopScript + EndBlock SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08013EB0.inc b/data/scripts/script_08013EB0.inc index 07e14095..e0da07f3 100644 --- a/data/scripts/script_08013EB0.inc +++ b/data/scripts/script_08013EB0.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013EB0 - StartScript + BeginBlock _0807EF80 0x0007 Call sub_0807F180 - SetEntityPositionRelative 0x00f80120 + SetEntityPositionRelative 0x0120, 0x00f8 _0807E930 0x0003 - StopScript + EndBlock SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08013ECC.inc b/data/scripts/script_08013ECC.inc index 6798155b..23f48e40 100644 --- a/data/scripts/script_08013ECC.inc +++ b/data/scripts/script_08013ECC.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013ECC - StartScript + BeginBlock _0807EF80 0x0007 Call sub_0807F180 - SetEntityPositionRelative 0x01680120 + SetEntityPositionRelative 0x0120, 0x0168 _0807E930 0x0005 - StopScript + EndBlock SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08013EE8.inc b/data/scripts/script_08013EE8.inc index 9f5fe111..ead09cb8 100644 --- a/data/scripts/script_08013EE8.inc +++ b/data/scripts/script_08013EE8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013EE8 - StartScript + BeginBlock _0807EF80 0x0007 Call sub_0807F180 - SetEntityPositionRelative 0x016800b0 + SetEntityPositionRelative 0x00b0, 0x0168 _0807E930 0x0007 - StopScript + EndBlock SCRIPT_END .short 0x0000 diff --git a/data/scripts/script_08013F04.inc b/data/scripts/script_08013F04.inc index 3f4d8395..757805a3 100644 --- a/data/scripts/script_08013F04.inc +++ b/data/scripts/script_08013F04.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013F04 - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0008 - StopScript + EndBlock WaitForSomething2 0x00000080 _0807E930 0x000b Call sub_0807F2D4 diff --git a/data/scripts/script_08013F34.inc b/data/scripts/script_08013F34.inc index 2ead57a2..c9d52cc3 100644 --- a/data/scripts/script_08013F34.inc +++ b/data/scripts/script_08013F34.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013F34 - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0009 - StopScript + EndBlock WaitForSomething2 0x00000080 _0807E930 0x000c Call sub_0807F2D4 diff --git a/data/scripts/script_08013F64.inc b/data/scripts/script_08013F64.inc index 6dded1b5..ab8809de 100644 --- a/data/scripts/script_08013F64.inc +++ b/data/scripts/script_08013F64.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013F64 - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x000a - StopScript + EndBlock WaitForSomething2 0x00000080 _0807E930 0x000d Call sub_0807F2D4 diff --git a/data/scripts/script_08013F94.inc b/data/scripts/script_08013F94.inc index 78f7d4a3..c3d2e778 100644 --- a/data/scripts/script_08013F94.inc +++ b/data/scripts/script_08013F94.inc @@ -1,17 +1,17 @@ SCRIPT_START script_08013F94 - StartScript + BeginBlock _0807EF80 0x0008 - StopScript + EndBlock CheckLocalFlag 0x007d JumpIf script_08013FE0 script_08013FA4: - StopScript - StartScript + EndBlock + BeginBlock CheckInventory1 0x0003 JumpIfNot script_08013FA4 CheckPlayerFlags 0x00400000 JumpIfNot script_08013FA4 - StopScript + EndBlock Call sub_0807FA40 _0807E888 Call sub_0807DF38 diff --git a/data/scripts/script_08013FE8.inc b/data/scripts/script_08013FE8.inc index 52526efd..ec00e1a9 100644 --- a/data/scripts/script_08013FE8.inc +++ b/data/scripts/script_08013FE8.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08013FE8 - StartScript + BeginBlock _0807EF80 0x0008 - StopScript + EndBlock script_08013FF0: - StopScript - StartScript + EndBlock + BeginBlock CheckLocalFlag 0x007d JumpIf script_0801404C CheckLocalFlag 0x007a @@ -13,12 +13,12 @@ script_08013FF0: JumpIfNot script_08013FF0 CallWithArg sub_0807F6B4, 0x000000d0 JumpIfNot script_08013FF0 - StopScript + EndBlock Call sub_0807F9A4 - StartScript + BeginBlock _0807E864 Call sub_0807DF28 - StopScript + EndBlock _0807EB28 0x1508 _0807EA94 StartPlayerScript script_08010A14 diff --git a/data/scripts/script_08014054.inc b/data/scripts/script_08014054.inc index 9e5c3776..c7edd934 100644 --- a/data/scripts/script_08014054.inc +++ b/data/scripts/script_08014054.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08014054 - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0000 Call sub_0807F738 - StopScript + EndBlock WaitForSomething 0x00000040 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014074.inc b/data/scripts/script_08014074.inc index cec22a8a..82ec7f2e 100644 --- a/data/scripts/script_08014074.inc +++ b/data/scripts/script_08014074.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08014074 - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0001 Call sub_0807F738 - StopScript + EndBlock WaitForSomething 0x00000040 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014094.inc b/data/scripts/script_08014094.inc index de27e295..8ad5b706 100644 --- a/data/scripts/script_08014094.inc +++ b/data/scripts/script_08014094.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08014094 - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0002 Call sub_0807F738 SetEntityPosition 0x0000, 0xfff0 - StopScript + EndBlock WaitForSomething 0x00000040 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080140B8.inc b/data/scripts/script_080140B8.inc index 9586896b..e557ffcc 100644 --- a/data/scripts/script_080140B8.inc +++ b/data/scripts/script_080140B8.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080140B8 - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0003 Call sub_0807F738 SetEntityPosition 0x0000, 0xfff0 - StopScript + EndBlock WaitForSomething 0x00000040 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080140DC.inc b/data/scripts/script_080140DC.inc index 0dcfc894..86b594cb 100644 --- a/data/scripts/script_080140DC.inc +++ b/data/scripts/script_080140DC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_080140DC - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0004 - StopScript + EndBlock WaitForSomething2 0x00000200 _0807E930 0x0008 Call sub_0807F2D4 diff --git a/data/scripts/script_08014118.inc b/data/scripts/script_08014118.inc index 30148b13..58d8ec5f 100644 --- a/data/scripts/script_08014118.inc +++ b/data/scripts/script_08014118.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08014118 - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0005 - StopScript + EndBlock WaitForSomething2 0x00000400 _0807E930 0x0009 Call sub_0807F2D4 diff --git a/data/scripts/script_08014154.inc b/data/scripts/script_08014154.inc index a8845394..3a36b36e 100644 --- a/data/scripts/script_08014154.inc +++ b/data/scripts/script_08014154.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08014154 - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0006 SetEntityPosition 0x0000, 0xfff0 - StopScript + EndBlock WaitForSomething2 0x00000800 _0807E930 0x000a Call sub_0807F2D4 diff --git a/data/scripts/script_08014198.inc b/data/scripts/script_08014198.inc index fcccb52d..d8f28858 100644 --- a/data/scripts/script_08014198.inc +++ b/data/scripts/script_08014198.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08014198 - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0007 SetEntityPosition 0x0000, 0xfff0 - StopScript + EndBlock WaitForSomething2 0x00001000 _0807E930 0x000b Call sub_0807F2D4 diff --git a/data/scripts/script_080141DC.inc b/data/scripts/script_080141DC.inc index bec09d97..1b744211 100644 --- a/data/scripts/script_080141DC.inc +++ b/data/scripts/script_080141DC.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080141DC - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0014 Call sub_0807F714 CallWithArg sub_0807F994, 0x0000fffc - StopScript + EndBlock WaitForSomething 0x00000020 Wait 0x0078 Call sub_0807F2D4 diff --git a/data/scripts/script_08014210.inc b/data/scripts/script_08014210.inc index 912c58e2..b3f78c2e 100644 --- a/data/scripts/script_08014210.inc +++ b/data/scripts/script_08014210.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08014210 - StartScript + BeginBlock _0807EF80 0x0007 _0807E930 0x0015 Call sub_0807F714 Call sub_0807F714 CallWithArg sub_0807F994, 0x0000fffc - StopScript + EndBlock WaitForSomething 0x00000020 Wait 0x0078 Call sub_0807F2D4 diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc index 8fee8151..2d48d1f8 100644 --- a/data/scripts/script_08014248.inc +++ b/data/scripts/script_08014248.inc @@ -9,16 +9,16 @@ script_08014264: CallWithArg sub_08095EAC, 0x00000001 Jump script_08014264 .short 0x0000 - StartScript + BeginBlock _0807EF80 0x0008 - StopScript + EndBlock script_0801427C: CheckLocalFlag 0x0078 JumpIfNot script_0801427C - StartScript + BeginBlock Call sub_0807F934 CallWithArg sub_0806DA04, 0x00000008 - StopScript + EndBlock script_08014298: CheckEntityInteractType JumpIfNot script_08014298 diff --git a/data/scripts/script_080142B0.inc b/data/scripts/script_080142B0.inc index 53bd4bf9..44a7709f 100644 --- a/data/scripts/script_080142B0.inc +++ b/data/scripts/script_080142B0.inc @@ -1,18 +1,18 @@ SCRIPT_START script_080142B0 - StartScript + BeginBlock CheckLocalFlag 0x0054 JumpIf script_08014382 CheckLocalFlag 0x0053 JumpIf script_08014330 - StopScript + EndBlock script_080142C4: - StopScript - StartScript + EndBlock + BeginBlock _0807E564 JumpIfNot script_080142C4 CheckPlayerInRegion 0x0098, 0x0058, 0x1818 JumpIfNot script_080142C4 - StopScript + EndBlock _0807E864 SetLocalFlag 0x0053 Wait 0x0014 @@ -36,15 +36,15 @@ script_080142C4: _0807E878 _0807E908 0x0001 script_08014330: - StopScript - StartScript + EndBlock + BeginBlock _0807E564 JumpIf script_08014330 EntityHasHeight JumpIf script_08014330 CheckPlayerInRegion 0x00c0, 0x0068, 0x1010 JumpIfNot script_08014330 - StopScript + EndBlock _0807E864 SetLocalFlag 0x0054 Wait 0x005a diff --git a/data/scripts/script_08014384.inc b/data/scripts/script_08014384.inc index 6fb0f6f0..3d215c0e 100644 --- a/data/scripts/script_08014384.inc +++ b/data/scripts/script_08014384.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08014384 - StopScript + EndBlock _0807E864 _0807EA94 _0807E3E8 diff --git a/data/scripts/script_080143C0.inc b/data/scripts/script_080143C0.inc index 0ca9df4c..1d6fe9f3 100644 --- a/data/scripts/script_080143C0.inc +++ b/data/scripts/script_080143C0.inc @@ -1,5 +1,5 @@ SCRIPT_START script_080143C0 - StopScript + EndBlock _0807E864 Call sub_0807DF28 Call sub_080654FC diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc index 8a8db693..828eaf5b 100644 --- a/data/scripts/script_08014450.inc +++ b/data/scripts/script_08014450.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08014450 - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0000 SetEntityNonPlanarMovement 0x01c0 _0807EF80 0x000a - StopScript + EndBlock script_08014462: _0807E30C JumpIfNot script_08014462 diff --git a/data/scripts/script_0801450C.inc b/data/scripts/script_0801450C.inc index 9b0cb2ac..ecbad4ab 100644 --- a/data/scripts/script_0801450C.inc +++ b/data/scripts/script_0801450C.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0801450C - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0000 SetEntityNonPlanarMovement 0x01c0 _0807EF80 0x000a - StopScript + EndBlock _0807E864 Call sub_0807DF28 Call sub_0806E20C @@ -15,8 +15,8 @@ SCRIPT_START script_0801450C Call sub_0807DF50 Jump script_080144FC .short 0x0000 - StartScript - StopScript + BeginBlock + EndBlock script_0801454C: CheckPlayerInRegion 0x0078, 0x0088, 0x0810 JumpIfNot script_0801454C diff --git a/data/scripts/script_08014588.inc b/data/scripts/script_08014588.inc index 07ce3e88..212980d9 100644 --- a/data/scripts/script_08014588.inc +++ b/data/scripts/script_08014588.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08014588 - StopScript + EndBlock WaitForSomething2 0x00000001 SetEntityNonPlanarMovement 0x00e0 _0807EDD4 0x0078, 0x0078 diff --git a/data/scripts/script_080145B0.inc b/data/scripts/script_080145B0.inc index e15261ce..8cc995b4 100644 --- a/data/scripts/script_080145B0.inc +++ b/data/scripts/script_080145B0.inc @@ -1,9 +1,9 @@ SCRIPT_START script_080145B0 - StartScript - SetEntityPositionRelative 0x00e001f8 + BeginBlock + SetEntityPositionRelative 0x01f8, 0x00e0 CheckLocalFlag 0x005e JumpIf script_080145E4 - StopScript + EndBlock script_080145C2: CheckRoomFlag 0x0005 JumpIfNot script_080145C2 @@ -16,5 +16,5 @@ script_080145C2: _0807E878 Jump script_080145C2 script_080145E4: - StopScript + EndBlock SCRIPT_END diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc index 86add4f9..122ff8c1 100644 --- a/data/scripts/script_080145E8.inc +++ b/data/scripts/script_080145E8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_080145E8 - StartScript + BeginBlock _0807EF80 0x0008 _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock script_080145F8: CheckRoomFlag 0x0000 JumpIfNot script_080145F8 @@ -17,12 +17,12 @@ script_08014608: Call sub_0807DF50 _0807E878 Jump script_080145F8 - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0004 SetEntityDirection 0x0000 _0807EF80 0x000a - StopScript + EndBlock script_0801463A: _0807E30C JumpIf script_080146A0 diff --git a/data/scripts/script_080147DC.inc b/data/scripts/script_080147DC.inc index 554da330..68f82c4c 100644 --- a/data/scripts/script_080147DC.inc +++ b/data/scripts/script_080147DC.inc @@ -1,5 +1,5 @@ SCRIPT_START script_080147DC - StopScript + EndBlock WaitForSomething2 0x00000002 SetEntityNonPlanarMovement 0x00e0 _0807EDD4 0x0078, 0x0068 diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc index 47613e6e..c6fbfaa7 100644 --- a/data/scripts/script_08014804.inc +++ b/data/scripts/script_08014804.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08014804 - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0000 _0807EF80 0x000a - StopScript + EndBlock _0807E864 Call sub_0807DF38 Wait 0x0010 @@ -65,8 +65,8 @@ script_080148D8: _0807E5F8 0x00000008 Jump script_0801488E .short 0x0000 - StartScript - StopScript + BeginBlock + EndBlock script_080148F4: CheckRoomFlag 0x0000 JumpIfNot script_080148F4 diff --git a/data/scripts/script_08014958.inc b/data/scripts/script_08014958.inc index e175c1b4..1360301f 100644 --- a/data/scripts/script_08014958.inc +++ b/data/scripts/script_08014958.inc @@ -1,13 +1,13 @@ SCRIPT_START script_08014958 - StartScript + BeginBlock Call sub_0806C870 _0807EF80 0x000a CheckGlobalFlag 0x0058 JumpIf script_08014976 _0807EB44 0x0004 - SetEntityPositionRelative 0x01280078 + SetEntityPositionRelative 0x0078, 0x0128 script_08014976: - StopScript + EndBlock script_08014978: _0807E30C JumpIfNot script_08014978 @@ -18,12 +18,12 @@ script_08014978: Wait 0x000f _0807E878 Jump script_08014978 - StartScript + BeginBlock Call sub_0806C870 _0807EF80 0x000a CheckGlobalFlag 0x0058 JumpIfNot script_080149C6 - StopScript + EndBlock script_080149AA: _0807E30C JumpIfNot script_080149AA diff --git a/data/scripts/script_080149CC.inc b/data/scripts/script_080149CC.inc index 7d4d8505..cbe83bdc 100644 --- a/data/scripts/script_080149CC.inc +++ b/data/scripts/script_080149CC.inc @@ -1,9 +1,9 @@ SCRIPT_START script_080149CC - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 Call sub_0806C870 _0807EF80 0x000a - StopScript + EndBlock script_080149DE: _0807E30C JumpIfNot script_080149DE @@ -27,10 +27,10 @@ script_08014A20: _0807E878 Jump script_080149DE .short 0x0000 - StartScript + BeginBlock Call sub_0806C870 _0807EF80 0x000a - StopScript + EndBlock script_08014A36: _0807E30C JumpIfNot script_08014A36 @@ -42,10 +42,10 @@ script_08014A36: _0807E878 Jump script_08014A36 .short 0x0000 - StartScript + BeginBlock Call sub_0806C870 _0807EF80 0x000a - StopScript + EndBlock script_08014A62: _0807E30C JumpIfNot script_08014A62 diff --git a/data/scripts/script_08014A80.inc b/data/scripts/script_08014A80.inc index ff644ca7..4f88f247 100644 --- a/data/scripts/script_08014A80.inc +++ b/data/scripts/script_08014A80.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08014A80 - StartScript + BeginBlock _0807EF80 0x000a - StopScript + EndBlock WaitForSomething2 0x00000001 _0807EB74 _0807EF80 0x0004 @@ -20,10 +20,10 @@ script_08014AAC: _0807E878 Jump script_08014AAC .short 0x0000 - StartScript + BeginBlock Call sub_0806C870 _0807EF80 0x000a - StopScript + EndBlock script_08014AD2: _0807E30C JumpIfNot script_08014AD2 diff --git a/data/scripts/script_08014B10.inc b/data/scripts/script_08014B10.inc index 381bb6fb..d961acfe 100644 --- a/data/scripts/script_08014B10.inc +++ b/data/scripts/script_08014B10.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08014B10 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EDD4 0x0078, 0x0040 _0807EB44 0x0000 _0807EF80 0x0000 diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc index 974af618..bfa75dec 100644 --- a/data/scripts/script_08014B34.inc +++ b/data/scripts/script_08014B34.inc @@ -1,18 +1,18 @@ SCRIPT_START script_08014B34 - StartScript + BeginBlock _0807EF80 0x000a _0807E930 0x0000 - StopScript + EndBlock CheckLocalFlag 0x0063 JumpIf script_08014BE8 script_08014B48: - StopScript - StartScript + EndBlock + BeginBlock CheckRoomFlag 0x0000 JumpIf script_08014B70 CheckEntityInteractType JumpIfNot script_08014B48 - StopScript + EndBlock _0807E864 _0807EB74 TextboxNoOverlap 0x2f01 @@ -21,7 +21,7 @@ script_08014B48: _0807E878 Jump script_08014B48 script_08014B70: - StopScript + EndBlock _0807E864 Call sub_0807DF28 _0807E5F8 0x00000001 @@ -69,12 +69,12 @@ script_08014C22: Wait 0x000f _0807E878 Jump script_08014BF2 - StartScript + BeginBlock Call sub_0806CD58 _0807EF80 0x000a _0807EB44 0x0004 _0807E930 0x0006 - StopScript + EndBlock script_08014C42: CheckEntityInteractType JumpIfNot script_08014C42 @@ -103,21 +103,21 @@ script_08014C82: _0807EB44 0x0004 _0807E930 0x0006 Jump script_08014C42 - StartScript + BeginBlock CheckGlobalFlag 0x0024 JumpIf script_08014CD4 Call sub_0806C870 _0807EF80 0x000a _0807EF80 0x0000 - StopScript + EndBlock script_08014CAE: - StopScript - StartScript + EndBlock + BeginBlock CheckGlobalFlag 0x0024 JumpIf script_08014CD4 _0807E30C JumpIfNot script_08014CAE - StopScript + EndBlock _0807E864 _0807EB74 Call sub_0806C90C diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc index e077f2ee..8ea91ea5 100644 --- a/data/scripts/script_08014CDC.inc +++ b/data/scripts/script_08014CDC.inc @@ -1,13 +1,13 @@ SCRIPT_START script_08014CDC - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0180 _0807EF80 0x000a Call sub_08066D04 Call sub_08066D14 - SetEntityPositionRelative 0x018001e8 + SetEntityPositionRelative 0x01e8, 0x0180 _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000001 Call sub_08066E08 _0807E864 @@ -15,11 +15,11 @@ SCRIPT_START script_08014CDC _0807EA94 _0807E5F8 0x00000002 script_08014D1E: - StopScript - StartScript + EndBlock + BeginBlock CheckPlayerInRegion 0x01d8, 0x0160, 0x3050 JumpIfNot script_08014D1E - StopScript + EndBlock _0807E864 Call sub_0807F9A4 Call sub_0807DF28 @@ -28,7 +28,7 @@ script_08014D1E: _0807EC64 0x0040 _0807EB44 0x0004 Call sub_08066E08 - SetEntityPositionRelative 0x00c801f8 + SetEntityPositionRelative 0x01f8, 0x00c8 Call sub_0807DF50 _0807E878 script_08014D60: @@ -41,7 +41,7 @@ script_08014D60: _0807EC64 0x0040 _0807EB44 0x0004 _0807EF80 0x0000 - SetEntityPositionRelative 0x002801e8 + SetEntityPositionRelative 0x01e8, 0x0028 Call sub_0807DF50 _0807E878 script_08014D96: diff --git a/data/scripts/script_08014DCC.inc b/data/scripts/script_08014DCC.inc index a84cdb1b..be6b4d4a 100644 --- a/data/scripts/script_08014DCC.inc +++ b/data/scripts/script_08014DCC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08014DCC - StartScript - SetEntityPositionRelative 0x01a80238 + BeginBlock + SetEntityPositionRelative 0x0238, 0x01a8 Call sub_0807F844 Call sub_0807F348 _0807E864 Call sub_0807DF28 - StopScript + EndBlock _0807E778 0x0010 DoFade6 WaitFor_2 diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc index f306f83d..0785f772 100644 --- a/data/scripts/script_08014E14.inc +++ b/data/scripts/script_08014E14.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08014E14 - StartScript + BeginBlock _0807EB44 0x0004 _0807E9D4 _0807EF80 0x000a CallWithArg sub_0807F3D8, 0x00000000 - StopScript + EndBlock script_08014E2C: CheckEntityInteractType JumpIfNot script_08014E2C @@ -16,12 +16,12 @@ script_08014E2C: _0807E878 Jump script_08014E2C .short 0x0000 - StartScript + BeginBlock _0807EF80 0x000a _0807EF80 0x0007 _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock script_08014E64: CheckEntityInteractType JumpIfNot script_08014E64 @@ -51,12 +51,12 @@ script_08014EBC: _0807E878 Jump script_08014E64 .short 0x0000 - StartScript + BeginBlock _0807EF80 0x000a _0807EF80 0x0007 _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock script_08014EE0: CheckEntityInteractType JumpIfNot script_08014EE0 @@ -67,12 +67,12 @@ script_08014EE0: _0807E878 Jump script_08014EE0 .short 0x0000 - StartScript + BeginBlock _0807EF80 0x000a _0807EF80 0x0007 _0807EB44 0x0004 _0807E930 0x000a - StopScript + EndBlock script_08014F0C: CheckEntityInteractType JumpIfNot script_08014F0C @@ -86,12 +86,12 @@ script_08014F0C: _0807E930 0x000a Jump script_08014F0C .short 0x0000 - StartScript + BeginBlock _0807EF80 0x000a _0807EF80 0x0007 _0807EB44 0x0004 _0807E930 0x000e - StopScript + EndBlock Call sub_08065914 script_08014F4A: CheckEntityInteractType @@ -100,10 +100,10 @@ script_08014F4A: Call sub_0807DF28 _0807EB74 _0807EF80 0x0000 - StartScript + BeginBlock TextboxNoOverlap 0x3b0b CallWithArg sub_0807F854, 0x00010064 - StopScript + EndBlock _0807EA94 _0807E3E8 JumpIfNot script_08014FA6 @@ -128,10 +128,10 @@ script_08014FA6: _0807EB44 0x0004 _0807E930 0x000e Jump script_08014F4A - StartScript - SetEntityPositionRelative 0x00e001f8 + BeginBlock + SetEntityPositionRelative 0x01f8, 0x00e0 Call sub_08054564 - StopScript + EndBlock script_08014FCC: CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040 JumpIfNot script_08014FCC @@ -168,7 +168,7 @@ script_08014FCC: StartPlayerScript script_080152DC CameraTargetEntity _0807F0B4 0x0003 - SetEntityPositionRelative 0x014801f8 + SetEntityPositionRelative 0x01f8, 0x0148 WaitForSomething2 0x00000001 Call sub_0804F6A8 Wait 0x0004 @@ -242,7 +242,7 @@ script_08015104: _0807E80C 0x00000000 WaitFor_2 Call sub_08053B3C - StartScript + BeginBlock _0807E864 CallWithArg sub_0807F6E8, 0x00000008 MoveEntityToPlayer @@ -251,7 +251,7 @@ script_08015104: _0807E778 0x0100 DoFade4 _0807E80C 0x00000000 - StopScript + EndBlock StartPlayerScript script_08015360 WaitForSomething2 0x00000001 LoadRoomEntityList gUnk_080F7CB0 @@ -260,10 +260,10 @@ script_08015104: WaitFor_2 _0807E5F8 0x00000008 WaitForSomething2 0x00000010 - StartScript + BeginBlock _0807E8E4_2 _0807EB28 0x1315 - StopScript + EndBlock _0807EA94 _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/script_08015234.inc b/data/scripts/script_08015234.inc index aa9d41d0..22b00245 100644 --- a/data/scripts/script_08015234.inc +++ b/data/scripts/script_08015234.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08015234 - StartScript + BeginBlock _0807EF80 0x0008 _0807EB44 0x0004 _0807EF80 0x0000 Call sub_0807F354 - StopScript + EndBlock WaitForSomething2 0x00000002 Call sub_08066C94 Wait 0x00e9 diff --git a/data/scripts/script_080152B4.inc b/data/scripts/script_080152B4.inc index 0107c8c1..5d81c0e8 100644 --- a/data/scripts/script_080152B4.inc +++ b/data/scripts/script_080152B4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080152B4 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock _0807EF80 0x0001 _0807EDD4 0x01f8, 0x00b8 _0807EB44 0x0004 diff --git a/data/scripts/script_080152DC.inc b/data/scripts/script_080152DC.inc index 2f474890..963e9473 100644 --- a/data/scripts/script_080152DC.inc +++ b/data/scripts/script_080152DC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080152DC - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0200 - StopScript + EndBlock _0807EF80 0x0001 _0807EDD4 0x01f8, 0x0148 _0807EB44 0x0004 diff --git a/data/scripts/script_08015338.inc b/data/scripts/script_08015338.inc index 0c1407f2..7675dc35 100644 --- a/data/scripts/script_08015338.inc +++ b/data/scripts/script_08015338.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08015338 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - StopScript + EndBlock _0807EF80 0x0001 _0807EDD4 0x01f8, 0x0148 _0807EB44 0x0004 diff --git a/data/scripts/script_08015360.inc b/data/scripts/script_08015360.inc index fc63dc99..0d162f83 100644 --- a/data/scripts/script_08015360.inc +++ b/data/scripts/script_08015360.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015360 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0100 - SetEntityPositionRelative 0x01480208 - StopScript + SetEntityPositionRelative 0x0208, 0x0148 + EndBlock _0807EB44 0x0006 _0807EF80 0x0000 _0807E5F8 0x00000001 diff --git a/data/scripts/script_08015390.inc b/data/scripts/script_08015390.inc index d9d9aa3f..1832e1b9 100644 --- a/data/scripts/script_08015390.inc +++ b/data/scripts/script_08015390.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015390 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 - StopScript + EndBlock _0807E930 0x001f Call sub_0806D944 WaitForSomething2 0x00000008 diff --git a/data/scripts/script_080153EC.inc b/data/scripts/script_080153EC.inc index 32586f5c..4d1bc1ee 100644 --- a/data/scripts/script_080153EC.inc +++ b/data/scripts/script_080153EC.inc @@ -1,9 +1,9 @@ SCRIPT_START script_080153EC - StartScript + BeginBlock _0807F0B4 0x0007 - SetEntityPositionRelative 0x00680078 + SetEntityPositionRelative 0x0078, 0x0068 CameraTargetEntity - StopScript + EndBlock SoundReq2 0x002a _0807E778 0x0004 DoFade4 @@ -16,7 +16,7 @@ SCRIPT_START script_080153EC _0807E5F8 0x00000880 WaitForSomething2 0x00001100 _0807F0B4 0x0004 - SetEntityPositionRelative 0x00900078 + SetEntityPositionRelative 0x0078, 0x0090 TextboxNoOverlapFollowPos 0x1330, 0x0002 _0807EA94 _0807E5F8 0x00008000 diff --git a/data/scripts/script_0801550C.inc b/data/scripts/script_0801550C.inc index e7cf2435..678b91a9 100644 --- a/data/scripts/script_0801550C.inc +++ b/data/scripts/script_0801550C.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0801550C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 _0807EF80 0x0007 _0807EB44 0x0000 Call sub_0807F338 - StopScript + EndBlock CallWithArg sub_0806AF60, 0x00000000 WaitForSomething2 0x00008000 CallWithArg sub_0806AF60, 0x00000004 diff --git a/data/scripts/script_08015618.inc b/data/scripts/script_08015618.inc index 7338d9e1..49d79afe 100644 --- a/data/scripts/script_08015618.inc +++ b/data/scripts/script_08015618.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08015618 - StartScript + BeginBlock _0807EF80 0x0007 SetEntityNonPlanarMovement 0x0040 Call sub_08094B80 - StopScript + EndBlock WaitForSomething2 0x00000080 CallWithArg sub_0805DDEC, 0x00000003 Call sub_08094B0C diff --git a/data/scripts/script_08015684.inc b/data/scripts/script_08015684.inc index 28a67405..bb16a0f1 100644 --- a/data/scripts/script_08015684.inc +++ b/data/scripts/script_08015684.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08015684 - StartScript + BeginBlock _0807EF80 0x0007 _0807EF80 0x000b _0807EB44 0x0000 _0807EF80 0x0017 Call sub_0807F180 - StopScript + EndBlock WaitForSomething2 0x00000800 _0807EB44 0x0002 _0807EF80 0x0017 diff --git a/data/scripts/script_08015754.inc b/data/scripts/script_08015754.inc index f3b19d0a..38b4c33d 100644 --- a/data/scripts/script_08015754.inc +++ b/data/scripts/script_08015754.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08015754 - StartScript + BeginBlock _0807E930 0x0000 SetEntityNonPlanarMovement 0x0200 Call sub_08094B80 - StopScript + EndBlock Wait 0x0078 SoundReq 0x01c5 Call sub_08094B6C diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc index 52110428..8029861e 100644 --- a/data/scripts/script_080157AC.inc +++ b/data/scripts/script_080157AC.inc @@ -21,7 +21,7 @@ script_080157DA: WaitForSomething2 0x00000002 StartPlayerScript script_080158F8 _0807F0B4 0x0001 - SetEntityPositionRelative 0x02180248 + SetEntityPositionRelative 0x0248, 0x0218 CameraTargetEntity Call sub_0807F5C0 WaitForSomething2 0x00000010 @@ -51,7 +51,7 @@ script_08015888: _0807E864 Call sub_0807DF28 _0807F0B4 0x0002 - SetEntityPositionRelative 0x02080248 + SetEntityPositionRelative 0x0248, 0x0208 CameraTargetEntity StartPlayerScript script_08015938 WaitForSomething2 0x00000010 diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc index 908c7e24..1ef2dc75 100644 --- a/data/scripts/script_08015958.inc +++ b/data/scripts/script_08015958.inc @@ -1,15 +1,15 @@ SCRIPT_START script_08015958 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0180 _0807EF80 0x0008 _0807EF80 0x000b Call sub_08066D04 - StopScript + EndBlock WaitForSomething2 0x00000001 - StartScript + BeginBlock Call sub_08066D14 MoveEntityToPlayer - StopScript + EndBlock _0807EF80 0x0007 _0807EB74 _0807EDD4 0x01f8, 0x02f8 @@ -18,7 +18,7 @@ SCRIPT_START script_08015958 TextboxNoOverlapFollowPos 0x1011, 0x0002 _0807EA94 _0807EDD4 0x01f8, 0x0268 - SetEntityPositionRelative 0x02180248 + SetEntityPositionRelative 0x0248, 0x0218 _0807EB44 0x0006 _0807EF80 0x0000 _0807E5F8 0x00000002 @@ -49,19 +49,19 @@ SCRIPT_START script_08015958 _0807E9D4 _0807E5F8 0x00000002 script_08015A32: - StopScript - StartScript + EndBlock + BeginBlock _0807EB74 CheckRoomFlag 0x0000 JumpIf script_08015A54 CheckEntityInteractType JumpIfNot script_08015A32 - StopScript + EndBlock TextboxNoOverlapFollowPos 0x1067, 0x0002 _0807EA94 Jump script_08015A32 script_08015A54: - StopScript + EndBlock _0807EF80 0x000b _0807EB44 0x0000 _0807EF80 0x0000 diff --git a/data/scripts/script_08015AC4.inc b/data/scripts/script_08015AC4.inc index 9e69d527..63c27059 100644 --- a/data/scripts/script_08015AC4.inc +++ b/data/scripts/script_08015AC4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08015AC4 - StartScript + BeginBlock _0807EF80 0x0007 _0807EF80 0x000a _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000008 _0807E908 0x0007 WaitForSomething2 0x00000008 diff --git a/data/scripts/script_08015B14.inc b/data/scripts/script_08015B14.inc index 911275e2..8b0d85ba 100644 --- a/data/scripts/script_08015B14.inc +++ b/data/scripts/script_08015B14.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015B14 - StartScript + BeginBlock _0807E930 0x0018 SetEntityNonPlanarMovement 0x0300 - StopScript + EndBlock _0807EDD4 0x0248, 0x0218 _0807E5F8 0x00000020 _0807EF80 0x0006 diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc index c81f01b7..4740736d 100644 --- a/data/scripts/script_08015B34.inc +++ b/data/scripts/script_08015B34.inc @@ -1,12 +1,12 @@ SCRIPT_START script_08015B34 script_08015B34: - StopScript - StartScript + EndBlock + BeginBlock CheckLocalFlag 0x008b JumpIf script_08015B7E CallWithArg sub_0807F6B4, 0x00000318 JumpIfNot script_08015B34 - StopScript + EndBlock _0807E864 Call sub_0807F9A4 Call sub_0807DF28 diff --git a/data/scripts/script_08015BA8.inc b/data/scripts/script_08015BA8.inc index e1984478..2169ce97 100644 --- a/data/scripts/script_08015BA8.inc +++ b/data/scripts/script_08015BA8.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08015BA8 - StartScript + BeginBlock SetLocalFlag 0x008e _0807E864 MoveEntityToPlayer CameraTargetEntity SetEntityNonPlanarMovement 0x0200 - StopScript + EndBlock Wait 0x000f _0807E8E4_2 Call sub_0807F3F8 diff --git a/data/scripts/script_08015BE8.inc b/data/scripts/script_08015BE8.inc index c601091c..9367894c 100644 --- a/data/scripts/script_08015BE8.inc +++ b/data/scripts/script_08015BE8.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08015BE8 - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock script_08015BF0: CheckPlayerInRegion 0x0160, 0x0020, 0x3040 JumpIfNot script_08015BF0 @@ -17,14 +17,14 @@ script_08015BF0: WaitFor_2 SoundReq0x80100000 Call sub_08053BE8 - StartScript + BeginBlock _0807E864 Call sub_0807FBC4 CameraTargetPlayer _0807E778 0x0100 DoFade4 _0807E80C 0x00000000 - StopScript + EndBlock _0807E778 0x0004 _0807E800 0x00000000 WaitFor_2 diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/script_08015C7C.inc index b7b116b1..c992078f 100644 --- a/data/scripts/script_08015C7C.inc +++ b/data/scripts/script_08015C7C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08015C7C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 - StopScript + EndBlock _0807EF80 0x0001 _0807EDD4 0x0168, 0x0058 _0807EB44 0x0004 diff --git a/data/scripts/script_08015CD4.inc b/data/scripts/script_08015CD4.inc index 6ac01e07..2e0a49ca 100644 --- a/data/scripts/script_08015CD4.inc +++ b/data/scripts/script_08015CD4.inc @@ -1,34 +1,34 @@ SCRIPT_START script_08015CD4 - StartScript + BeginBlock _0807F0B4 0x0007 - SetEntityPositionRelative 0x00680088 + SetEntityPositionRelative 0x0088, 0x0068 CameraTargetEntity - StopScript + EndBlock _0807E778 0x0004 DoFade4 WaitFor_2 Wait 0x003c _0807F0B4 0x0004 - SetEntityPositionRelative 0x00e00088 + SetEntityPositionRelative 0x0088, 0x00e0 CameraTargetEntity Wait 0x003c SoundReq2 0x000d _0807E5F8 0x00000010 WaitForSomething2 0x00000020 _0807F0B4 0x0004 - SetEntityPositionRelative 0x00700088 + SetEntityPositionRelative 0x0088, 0x0070 CameraTargetEntity Wait 0x003c _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807F0B4 0x0004 - SetEntityPositionRelative 0x00e00088 + SetEntityPositionRelative 0x0088, 0x00e0 CameraTargetEntity Wait 0x003c _0807E5F8 0x00000010 WaitForSomething2 0x00000020 _0807F0B4 0x0004 - SetEntityPositionRelative 0x00700088 + SetEntityPositionRelative 0x0088, 0x0070 CameraTargetEntity Wait 0x003c _0807E5F8 0x00000010 diff --git a/data/scripts/script_08015DF0.inc b/data/scripts/script_08015DF0.inc index 7be58e36..e6525c72 100644 --- a/data/scripts/script_08015DF0.inc +++ b/data/scripts/script_08015DF0.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015DF0 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000004 _0807EF80 0x0004 Wait 0x003c diff --git a/data/scripts/script_08015E58.inc b/data/scripts/script_08015E58.inc index ee744730..207f81d0 100644 --- a/data/scripts/script_08015E58.inc +++ b/data/scripts/script_08015E58.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08015E58 - StartScript + BeginBlock _0807EF80 0x0008 _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x001d - StopScript + EndBlock WaitForSomething2 0x00000010 Call sub_08066C94 Wait 0x00e9 @@ -22,7 +22,7 @@ SCRIPT_START script_08015E58 Wait 0x00bc _0807E5F8 0x00000020 WaitForSomething2 0x00000010 - SetEntityPositionRelative 0x00680088 + SetEntityPositionRelative 0x0088, 0x0068 Call sub_08066C94 Wait 0x00e8 _0807EF80 0x0007 diff --git a/data/scripts/script_08015F08.inc b/data/scripts/script_08015F08.inc index fe23f8c9..7dd91177 100644 --- a/data/scripts/script_08015F08.inc +++ b/data/scripts/script_08015F08.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015F08 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock WaitForSomething2 0x00000001 TextboxNoOverlap 0x131c _0807EA94 diff --git a/data/scripts/script_08015F3C.inc b/data/scripts/script_08015F3C.inc index 9f9553a3..b5dcb92d 100644 --- a/data/scripts/script_08015F3C.inc +++ b/data/scripts/script_08015F3C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08015F3C - StartScript + BeginBlock SetEntityNonPlanarMovement 0x0080 _0807EB44 0x0000 _0807E930 0x0000 - StopScript + EndBlock WaitForSomething 0x00000040 _0807E930 0x0004 _0807EC64 0x00c0 diff --git a/data/scripts/script_08015F80.inc b/data/scripts/script_08015F80.inc index f54a96d6..786f82f2 100644 --- a/data/scripts/script_08015F80.inc +++ b/data/scripts/script_08015F80.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015F80 - StartScript + BeginBlock _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock WaitForSomething 0x00000200 _0807EF80 0x0005 WaitForSomething 0x00000400 diff --git a/data/scripts/script_08015FA4.inc b/data/scripts/script_08015FA4.inc index 169a9df3..a51c761c 100644 --- a/data/scripts/script_08015FA4.inc +++ b/data/scripts/script_08015FA4.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015FA4 - StartScript + BeginBlock _0807EF80 0x000a Call sub_08066E38 - StopScript + EndBlock WaitForSomething 0x00000400 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015FC0.inc b/data/scripts/script_08015FC0.inc index fd04d0dd..7a2076ee 100644 --- a/data/scripts/script_08015FC0.inc +++ b/data/scripts/script_08015FC0.inc @@ -1,12 +1,12 @@ SCRIPT_START script_08015FC0 - StartScript + BeginBlock Call sub_0806DB84 CheckKinstoneFused 0x0009 JumpIf script_08016028 _0807EA88 0x0009 CallWithArg sub_0806DA04, 0x00000007 _0807EF80 0x000a - StopScript + EndBlock script_08015FE4: _0807EA4C _0807E9F0 diff --git a/data/scripts/script_08016030.inc b/data/scripts/script_08016030.inc index 58668a32..9c15297f 100644 --- a/data/scripts/script_08016030.inc +++ b/data/scripts/script_08016030.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08016030 - StartScript + BeginBlock CheckKinstoneFused 0x0009 JumpIf script_08016062 - StopScript + EndBlock WaitForSomething2 0x00000001 _0807EF80 0x0010 Wait 0x003c diff --git a/data/scripts/script_0801606C.inc b/data/scripts/script_0801606C.inc index f1af3170..c265fce4 100644 --- a/data/scripts/script_0801606C.inc +++ b/data/scripts/script_0801606C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0801606C - StartScript + BeginBlock CheckKinstoneFused 0x0009 JumpIf script_0801609E - StopScript + EndBlock WaitForSomething2 0x00000002 _0807EF80 0x0010 Wait 0x003c diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc index 45482726..972de427 100644 --- a/data/scripts/script_080160A8.inc +++ b/data/scripts/script_080160A8.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080160A8 - StartScript + BeginBlock _0807E9D4 _0807E930 0x0008 script_080160B0: - StopScript - StartScript + EndBlock + BeginBlock CheckEntityInteractType JumpIf script_080160E0 TestBit 0x00000008 @@ -13,14 +13,14 @@ script_080160B0: JumpIf script_080160D2 Jump script_080160B0 script_080160D2: - StopScript + EndBlock _0807EB74 WaitForSomething2 0x00000004 Jump script_080160B0 script_080160E0: _0807E864 _0807EB74 - StopScript + EndBlock HasRoomItemForSale JumpIfNot script_0801611A TextboxNoOverlapFollow 0x2d07 @@ -51,9 +51,9 @@ script_08016132: _0807E878 _0807EB44 0x0004 Jump script_080160B0 - StartScript + BeginBlock Call sub_080787B4 - StopScript + EndBlock script_08016146: CheckEntityInteractType JumpIfNot script_08016146 @@ -77,9 +77,9 @@ script_08016184: script_0801618A: _0807E878 Jump script_08016146 - StartScript + BeginBlock Call sub_080787B4 - StopScript + EndBlock script_0801619A: CheckEntityInteractType JumpIfNot script_0801619A @@ -105,12 +105,12 @@ script_080161D8: script_080161E2: _0807E878 Jump script_0801619A - StartScript + BeginBlock Call sub_0807F348 _0807EF80 0x000a _0807EB44 0x0004 _0807EF80 0x0000 - StopScript + EndBlock script_080161FE: Call sub_08068C28 script_08016204: @@ -159,22 +159,22 @@ script_08016262: Call sub_0807DF50 _0807E878 script_080162CC: - StopScript - StartScript + EndBlock + BeginBlock Call sub_08068EC4 JumpIf script_080162F6 CheckEntityInteractType JumpIf script_080162E4 Jump script_080162CC script_080162E4: - StopScript + EndBlock _0807E864 Call sub_08068E78 _0807EA94 _0807E878 Jump script_080162CC script_080162F6: - StopScript + EndBlock _0807E888 Call sub_0807F594 Call sub_0807DF28 diff --git a/data/scripts/script_08016384.inc b/data/scripts/script_08016384.inc index 98cb9a21..d74e5e1d 100644 --- a/data/scripts/script_08016384.inc +++ b/data/scripts/script_08016384.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08016384 script_08016384: - StartScript - StopScript + BeginBlock + EndBlock Jump script_08016384 JumpIf script_08016384 JumpIfNot script_08016384 diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc index f983b93c..cc13f1bf 100644 --- a/data/scripts/script_08016482.inc +++ b/data/scripts/script_08016482.inc @@ -44,7 +44,7 @@ SCRIPT_START script_08016482 SetEntityDirectionWithAnimationState 0x0000 SetEntityNonPlanarMovement 0x0100 SetEntity0x20 0x00018000 - SetEntityPositionRelative 0x00000000 + SetEntityPositionRelative 0x0000, 0x0000 MoveEntityToPlayer ScriptCommandNop3 _0807EC1C 0x0010 diff --git a/data/scripts/script_080165A4.inc b/data/scripts/script_080165A4.inc index 888efad8..287147df 100644 --- a/data/scripts/script_080165A4.inc +++ b/data/scripts/script_080165A4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_080165A4 - StartScript + BeginBlock _0807EF80 0x000a _0807EB44 0x0004 _0807E9D4 - StopScript + EndBlock script_080165B2: _0807E974 0x0601 Jump script_080165B2 diff --git a/data/scripts/script_080165D8.inc b/data/scripts/script_080165D8.inc index c774fcfa..b217604e 100644 --- a/data/scripts/script_080165D8.inc +++ b/data/scripts/script_080165D8.inc @@ -6,17 +6,17 @@ SCRIPT_START script_080165D8 Call script_0801637C+1 JumpAbsolute script_080165D8 .short 0x0000 - StartScript + BeginBlock _0807E9D4 - StopScript + EndBlock script_080165FE: _0807E30C JumpIfNot script_080165FE TextboxNoOverlapFollow 0x0601 Jump script_080165FE - StartScript + BeginBlock _0807E9D4 - StopScript + EndBlock script_08016612: _0807E944 _0807E864 @@ -26,9 +26,9 @@ script_08016612: _0807E878 Jump script_08016612 .short 0x0000 - StartScript + BeginBlock _0807E9D4 - StopScript + EndBlock script_0801662E: _0807E944 _0807E864 @@ -191,21 +191,21 @@ script_08016848: Wait 0x0002 _0807EB44 0x0004 Jump script_08016848 - StartScript + BeginBlock _0807E9D4 - StopScript + EndBlock script_080168E6: _0807E944 _0807E864 Wait 0x000f _0807E878 Jump script_080168E6 - StartScript + BeginBlock Call sub_08064EA4 _0807EB44 0x0004 _0807EF80 0x0000 _0807EF80 0x000a - StopScript + EndBlock script_0801690A: _0807E30C JumpIfNot script_0801690A @@ -220,11 +220,11 @@ script_08016926: _0807E878 SetGlobalFlag 0x005c Jump script_0801690A - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0000 _0807EF80 0x000a - StopScript + EndBlock script_0801693E: _0807E944 _0807E864 @@ -235,12 +235,12 @@ script_0801693E: _0807E878 Jump script_0801693E .short 0x0000 - StartScript + BeginBlock _0807E9D4 _0807EB44 0x0000 _0807EF80 0x000a _0807E930 0x0000 - StopScript + EndBlock script_0801696A: _0807E944 _0807E864 |